Get rid of all the ATs in favor of Mixins

This commit is contained in:
Jonas Herzig
2019-05-06 16:53:39 +02:00
parent 2094c518a0
commit bd91d0d3bd
41 changed files with 302 additions and 778 deletions

View File

@@ -1,3 +1,4 @@
net.minecraft.client.resources.ResourcePackRepository setServerResourcePack() setResourcePackInstance()
net.minecraft.client.Minecraft fontRenderer fontRendererObj
net.minecraft.client.renderer.BufferBuilder net.minecraft.client.renderer.VertexBuffer
net.minecraft.client.gui.GuiButton x xPosition

View File

@@ -1,3 +1,7 @@
net.minecraft.entity.EntityLivingBase LIVING_FLAGS HAND_STATES
net.minecraft.client.resources.DownloadingPackFinder net.minecraft.client.resources.ResourcePackRepository
net.minecraft.client.resources.DownloadingPackFinder func_195741_a() setServerResourcePack()
net.minecraft.client.renderer.color.ItemColors getColor() getColorFromItemstack()
net.minecraft.client.renderer.GlStateManager activeTexture activeTextureUnit
net.minecraft.client.renderer.FirstPersonRenderer net.minecraft.client.renderer.ItemRenderer
net.minecraft.client.renderer.chunk.ChunkRenderTask net.minecraft.client.renderer.chunk.ChunkCompileTaskGenerator
@@ -13,6 +17,7 @@ net.minecraftforge.eventbus.api.IEventBus net.minecraftforge.fml.common.eventhan
com.replaymod.core.versions.MCVer.Keyboard org.lwjgl.input.Keyboard
net.minecraft.client.Minecraft gameDir mcDataDir
net.minecraft.client.Minecraft getInstance() getMinecraft()
net.minecraft.client.Minecraft getPackFinder() getResourcePackRepository()
net.minecraft.client.renderer.WorldRenderer net.minecraft.client.renderer.RenderGlobal
net.minecraft.network.play.server.SPacketEntity.Move net.minecraft.network.play.server.SPacketEntity.S17PacketEntityLookMove
net.minecraft.entity.Entity isPassenger() isRiding()

View File

@@ -1,7 +1,11 @@
net.minecraft.util.Timer counter field_74285_i
net.minecraft.client.resources.ResourcePackRepository downloadResourcePack() func_180601_a()
net.minecraft.client.resources.ResourcePackRepository setResourcePackInstance() func_177319_a()
net.minecraft.network.play.server.S38PacketPlayerListItem getAction() func_179768_b()
net.minecraft.network.play.server.S38PacketPlayerListItem.AddPlayerData getProfile() func_179962_a()
net.minecraft.network.play.server.S48PacketResourcePackSend getURL() func_179783_a()
net.minecraft.network.play.server.S48PacketResourcePackSend getHash() func_179784_b()
net.minecraft.network.play.server.S0CPacketSpawnPlayer watcher field_148960_i
net.minecraft.network.play.server.S0CPacketSpawnPlayer getPlayer() func_179819_c()
net.minecraft.network.play.server.S40PacketDisconnect getReason() func_149165_c()
net.minecraft.network.play.server.S2BPacketChangeGameState getGameState() func_149138_c()

View File

@@ -6,6 +6,7 @@ net.minecraft.util.text.Style net.minecraft.util.ChatStyle
net.minecraft.util.text.TextFormatting net.minecraft.util.EnumChatFormatting
net.minecraft.util.text.ITextComponent net.minecraft.util.IChatComponent
net.minecraft.network.datasync.EntityDataManager net.minecraft.entity.DataWatcher
net.minecraft.network.datasync.EntityDataManager.DataEntry net.minecraft.entity.DataWatcher.WatchableObject
net.minecraft.client.renderer.VertexBuffer net.minecraft.client.renderer.WorldRenderer
net.minecraft.client.renderer.Tessellator getBuffer() getWorldRenderer()
net.minecraft.client.particle.Particle net.minecraft.client.particle.EntityFX
@@ -30,8 +31,11 @@ net.minecraft.network.play.server.SPacketPlayerPosLook net.minecraft.network.pla
net.minecraft.network.play.server.SPacketPlayerListItem net.minecraft.network.play.server.S38PacketPlayerListItem
net.minecraft.network.play.server.SPacketRespawn net.minecraft.network.play.server.S07PacketRespawn
net.minecraft.network.play.server.SPacketSpawnPlayer net.minecraft.network.play.server.S0CPacketSpawnPlayer
net.minecraft.network.play.server.SPacketSpawnPlayer getDataManagerEntries() func_148944_c()
net.minecraft.network.play.server.SPacketSpawnObject net.minecraft.network.play.server.S0EPacketSpawnObject
net.minecraft.network.play.server.SPacketSpawnMob net.minecraft.network.play.server.S0FPacketSpawnMob
net.minecraft.network.play.server.SPacketSpawnMob dataManager field_149043_l
net.minecraft.network.play.server.SPacketSpawnMob getDataManagerEntries() func_149027_c()
net.minecraft.network.play.server.SPacketSpawnGlobalEntity net.minecraft.network.play.server.S2CPacketSpawnGlobalEntity
net.minecraft.network.play.server.SPacketSpawnPainting net.minecraft.network.play.server.S10PacketSpawnPainting
net.minecraft.network.play.server.SPacketSpawnExperienceOrb net.minecraft.network.play.server.S11PacketSpawnExperienceOrb

View File

@@ -301,34 +301,11 @@ if (mcVersion <= 10710) {
}
if (project.name != 'core') {
def preprocessedRes = 'build/preprocessed/res'
def preprocessedAT = 'build/preprocessed/at.cfg'
def originalRes = '../../src/main/resources'
def originalAT = originalRes + '/META-INF/replaymod_at.cfg'
def vars = [MC: mcVersion as int]
if (FABRIC) {
// Fabric doesn't have ATs, so we've stopped using them on 1.13+
} else if (FG3) {
// FG3 reads the AT file right after project evaluation, so we need to convert it right now
PreprocessTask.convertFile(PreprocessTask.CFG_KEYWORDS, vars, file(originalAT), file(preprocessedAT))
minecraft.accessTransformers << file(preprocessedAT)
} else {
(mcVersion >= 10800 ? [deobfMcMCP, deobfMcSRG] : [deobfuscateJar, deobfBinJar]).each { task ->
task.dependsOn preprocessResources
}
minecraft.accessTransformer preprocessedRes + '/META-INF/replaymod_at.cfg'
}
def jGui = project.evaluationDependsOn(":jGui:$jGuiVersion")
// Make sure the corresponding jGui setCoreVersion task runs
project.tasks.setCoreVersionJava.dependsOn jGui.tasks.setCoreVersion
// and it doesn't run too early (i.e. before we're done with preprocessing)
jGui.tasks.setCoreVersionJava.mustRunAfter project.tasks.preprocessJava
} else {
if (FG3) {
minecraft.accessTransformers << file('../../src/main/resources/META-INF/replaymod_at.cfg')
}
}
task configureRelocation() {