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,219 +0,0 @@
##if MC<11300
#$$ # To apply changes in this file run: ./gradlew clean setupDecompWorkspace idea
#$$
#$$ # Minecraft
##if MC>=11300
#$$ public net.minecraft.client.Minecraft func_184117_aA()V # processKeyBinds
##endif
##if MC>=11002
#$$ public-f net.minecraft.client.Minecraft field_71428_T # timer
##else
#$$ public net.minecraft.client.Minecraft field_71428_T # timer
##endif
#$$ public net.minecraft.client.Minecraft field_83002_am # debugCrashKeyPressTime
#$$ public net.minecraft.client.Minecraft field_71467_ac # rightClickDelayTimer
#$$ public net.minecraft.client.Minecraft field_71423_H # systemTime
#$$ public net.minecraft.client.Minecraft field_71429_W # leftClickCounter
#$$ public net.minecraft.client.Minecraft field_71445_n # isGamePaused
#$$ public net.minecraft.client.Minecraft field_152351_aB # scheduledTasks
#$$ public net.minecraft.client.Minecraft field_110449_ao # defaultResourcePacks
#$$ public net.minecraft.client.Minecraft field_110448_aq # mcResourcePackRepository
#$$ public net.minecraft.client.Minecraft field_71434_R # hasCrashed
#$$ public net.minecraft.client.Minecraft field_71433_S # crashReporter
#$$
#$$ #public net.minecraft.client.Minecraft func_71386_F()L # getSystemTime
#$$ public net.minecraft.client.Minecraft func_71383_b(I)V # updateDebugProfilerName
#$$ public net.minecraft.client.Minecraft func_147116_af()V # clickMouse
#$$ public net.minecraft.client.Minecraft func_147121_ag()V # rightClickMouse
#$$ public net.minecraft.client.Minecraft func_147112_ai()V # middleClickMouse
#$$ public net.minecraft.client.Minecraft func_147115_a(Z)V # sendClickBlockToController
#$$
##if MC>=11300
#$$ # MainWindow
#$$ public net.minecraft.client.MainWindow field_198131_r # framebufferWidth
#$$ public net.minecraft.client.MainWindow field_198132_s # framebufferHeight
##endif
#$$
##if MC>=11300
#$$ # FirstPersonRenderer
#$$ public net.minecraft.client.renderer.FirstPersonRenderer *
##endif
#$$
#$$ # Packets
##if MC>=11300
#$$ public net.minecraft.network.play.server.SPacketJoinGame field_149200_f # maxPlayers
##endif
##if MC>=10904
#$$ public net.minecraft.network.play.server.SPacketSpawnMob field_149043_l # dataManager
#$$ public net.minecraft.network.play.server.SPacketSpawnPlayer field_148960_i # watcher
##else
#$$ public net.minecraft.network.play.server.S0FPacketSpawnMob field_149043_l # dataWatcher
#$$ public net.minecraft.network.play.server.S1DPacketEntityEffect field_149434_a # entityId
#$$ public net.minecraft.network.play.server.S1CPacketEntityMetadata field_149379_a # entityId
#$$ public net.minecraft.network.play.server.S1CPacketEntityMetadata field_149378_b # list
#$$ public net.minecraft.network.play.server.S0BPacketAnimation field_148981_a # entityId
#$$ public net.minecraft.network.play.server.S02PacketChat field_179842_b # position
#$$ public net.minecraft.network.play.server.S19PacketEntityStatus field_149164_a # entityId
#$$ public net.minecraft.network.play.server.S0CPacketSpawnPlayer *
#$$ public net.minecraft.network.play.server.S18PacketEntityTeleport *
#$$ public net.minecraft.network.play.server.S14PacketEntity *
#$$ public net.minecraft.network.play.server.S19PacketEntityHeadLook *
#$$ public net.minecraft.network.play.server.S12PacketEntityVelocity *
#$$ public net.minecraft.network.play.server.S04PacketEntityEquipment *
#$$ public net.minecraft.network.play.server.S1BPacketEntityAttach *
#$$ public net.minecraft.network.play.server.S0DPacketCollectItem *
#$$ public net.minecraft.network.play.server.S13PacketDestroyEntities *
##endif
#$$
#$$ # GuiTextField
#$$ public net.minecraft.client.gui.GuiTextField field_146216_j # text
#$$
#$$ # GuiMainMenu
##if MC>=11202
#$$ public net.minecraft.client.gui.GuiMainMenu field_175372_K # realmsButton
#$$ public net.minecraft.client.gui.GuiMainMenu field_183503_M # realmsNotification
##endif
#$$
#$$ # Entity
#$$ public net.minecraft.entity.Entity field_70180_af # dataWatcher
#$$
#$$ # ResourcePackRepository
#$$ public net.minecraft.client.resources.ResourcePackRepository field_148534_e # dirServerResourcepacks
##if MC>=10800
#$$ public net.minecraft.client.resources.ResourcePackRepository field_177321_h # lock
#$$ public net.minecraft.client.resources.ResourcePackRepository field_177322_i # httpRequest
##else
#$$ public net.minecraft.client.resources.ResourcePackRepository field_148532_f # resourcePack
#$$ public net.minecraft.client.resources.ResourcePackRepository field_148533_g # currentlyDownloading
##endif
#$$
#$$ # EntityRenderer
#$$ public net.minecraft.client.renderer.EntityRenderer *
#$$ public net.minecraft.client.renderer.EntityRenderer *()
#$$
#$$ # RenderGlobal
##if MC>=11300
#$$ public net.minecraft.client.renderer.WorldRenderer field_174995_M # renderDispatcher
#$$ public net.minecraft.client.renderer.WorldRenderer field_147595_R # displayListEntitiesDirty
#$$ public net.minecraft.client.renderer.WorldRenderer field_175009_l # chunksToUpdate
#$$ public net.minecraft.client.renderer.WorldRenderer field_72755_R # renderInfos
#$$ public net.minecraft.client.renderer.WorldRenderer field_175009_l # chunksToUpdate
#$$ public net.minecraft.client.renderer.WorldRenderer field_72740_G # renderEntitiesStartupCounter
##else
#$$ public net.minecraft.client.renderer.RenderGlobal field_174995_M # renderDispatcher
#$$ public net.minecraft.client.renderer.RenderGlobal field_147595_R # displayListEntitiesDirty
#$$ public net.minecraft.client.renderer.RenderGlobal field_175009_l # chunksToUpdate
#$$ public net.minecraft.client.renderer.RenderGlobal field_72755_R # renderInfos
#$$ public net.minecraft.client.renderer.RenderGlobal field_175009_l # chunksToUpdate
#$$ public net.minecraft.client.renderer.RenderGlobal field_72740_G # renderEntitiesStartupCounter
##if MC<10904
#$$ public net.minecraft.client.renderer.RenderGlobal func_174983_a(Lnet.minecraft.util.BlockPos;Lnet.minecraft.client.renderer.chunk.RenderChunk;)Z # isPositionInRenderChunk
##endif
##endif
#$$
##if MC>=11300
#$$ public net.minecraft.client.renderer.WorldRenderer$ContainerLocalRenderInformation
#$$ public net.minecraft.client.renderer.WorldRenderer$ContainerLocalRenderInformation field_178036_a # renderChunk
##else
#$$ public net.minecraft.client.renderer.RenderGlobal$ContainerLocalRenderInformation
#$$ public net.minecraft.client.renderer.RenderGlobal$ContainerLocalRenderInformation field_178036_a # renderChunk
##endif
#$$
#$$ # ChunkRenderDispatcher
#$$ public-f net.minecraft.client.renderer.chunk.ChunkRenderDispatcher field_178519_d # queueChunkUpdates
#$$ public net.minecraft.client.renderer.chunk.ChunkRenderDispatcher field_178524_h # queueChunkUploads
#$$ public net.minecraft.client.renderer.chunk.ChunkRenderDispatcher field_178522_c # listThreadedWorkers
#$$
#$$ # TextureUtil
#$$ public net.minecraft.client.renderer.texture.TextureUtil func_147947_a(I[IIIIIZZZ)V # uploadTextureSub
#$$
#$$ # RenderManager
#$$ public net.minecraft.client.renderer.entity.RenderManager field_178636_l # skinMap
#$$
#$$ # ItemRenderer
#$$ public net.minecraft.client.renderer.ItemRenderer *
#$$ public net.minecraft.client.renderer.ItemRenderer *()
#$$
#$$ # RenderItem
##if MC>=10904
#$$ public net.minecraft.client.renderer.RenderItem field_184395_f # itemColors
##endif
#$$
#$$ # EntityPlayer
#$$ public net.minecraft.entity.player.EntityPlayer *
#$$
#$$ # EntityOtherPlayerMP
#$$ public net.minecraft.client.entity.EntityOtherPlayerMP *
#$$
#$$ # EffectRenderer
##if MC<10904
#$$ public net.minecraft.client.particle.EffectRenderer field_110737_b # particleTextures
#$$ public net.minecraft.client.particle.EffectRenderer field_78876_b # fxLayers
##endif
#$$
#$$ # IntegratedServer
#$$ public net.minecraft.server.integrated.IntegratedServer field_71348_o # isGamePaused
#$$
#$$ # GameSettings
##if MC>=10904
##if MC>=11002
##if MC>=11300
#$$ public-f net.minecraft.client.GameSettings field_186714_aM # soundLevels
##else
#$$ public-f net.minecraft.client.settings.GameSettings field_186714_aM # soundLevels
##endif
##else
#$$ public net.minecraft.client.settings.GameSettings field_186714_aM # soundLevels
##endif
##else
#$$ public net.minecraft.client.settings.GameSettings field_151446_aD # mapSoundLevels
##endif
#$$
#$$ # Frustum
##if MC>=11002
#$$ public-f net.minecraft.client.renderer.culling.Frustum field_78552_a # clippingHelper
##else
#$$ public net.minecraft.client.renderer.culling.Frustum field_78552_a # clippingHelper
##endif
#$$
#$$ # CrashReportCategory
#$$ public net.minecraft.crash.CrashReportCategory field_85077_c # children
#$$ public net.minecraft.crash.CrashReportCategory$Entry
#$$
#$$ # KeyBinding
#$$ public net.minecraft.client.settings.KeyBinding field_151474_i # pressTime
#$$
#$$ # Timer
#$$ public-f net.minecraft.util.Timer *
#$$
#$$ # GlStateManager
#$$ public net.minecraft.client.renderer.GlStateManager *
#$$ public net.minecraft.client.renderer.GlStateManager$TextureState
#$$ public net.minecraft.client.renderer.GlStateManager$FogState
#$$ public net.minecraft.client.renderer.GlStateManager$BooleanState
#$$ public net.minecraft.client.renderer.GlStateManager$BooleanState *
#$$
##if MC>=10904
#$$ # EntityLivingBase
#$$ public net.minecraft.entity.EntityLivingBase field_184621_as # HAND_STATES
#$$ public net.minecraft.entity.EntityLivingBase field_184628_bn # activeItemStackUseCount
##if MC>=11300
#$$ public net.minecraft.entity.EntityLivingBase field_184623_bh # interpTargetX
#$$ public net.minecraft.entity.EntityLivingBase field_184624_bi # interpTargetY
#$$ public net.minecraft.entity.EntityLivingBase field_184625_bj # interpTargetZ
#$$ public net.minecraft.entity.EntityLivingBase field_184626_bk # interpTargetYaw
#$$ public net.minecraft.entity.EntityLivingBase field_70709_bj # interpTargetPitch
##endif
##endif
#$$
#$$ # Particles
##if MC>=10904
#$$ public net.minecraft.client.particle.Particle *
##endif
#$$
#$$ # ScreenShotHelper
#$$ public net.minecraft.util.ScreenShotHelper func_74290_a(Ljava/io/File;)Ljava/io/File; # getTimestampedPNGFileForDirectory
#$$
#$$ # Example
#$$ # public net.minecraft.package.ClassName func_some_id(Ljava/lang/Class;IZS)V # methodName
##endif

View File

@@ -13,8 +13,11 @@
//#endif
//#if MC>=11300
"MixinKeyboardListener",
"MixinMinecraft",
//#endif
//#if MC<10800
//$$ "ResourcePackRepositoryAccessor",
//#endif
"MixinMinecraft",
"GuiMainMenuAccessor",
"GuiScreenAccessor",
"KeyBindingAccessor",

View File

@@ -9,7 +9,7 @@
//#if MC<10904
//$$ "EntityAccessor",
//#endif
//#if MC>=11300
//#if MC>=10904
"ItemRendererAccessor",
//#endif
"ParticleAccessor",

View File

@@ -9,6 +9,9 @@
//$$ "MixinInGameHud",
//#endif
"EntityLivingBaseAccessor",
//#if MC<11300
//$$ "EntityOtherPlayerMPAccessor",
//#endif
"EntityPlayerAccessor",
"FirstPersonRendererAccessor",
//#if MC>=10904
@@ -16,15 +19,13 @@
//#endif
//#if MC>=10800
"MixinGuiSpectator",
//#if MC>=11300
"MixinKeyboardListener",
//#endif
"MixinRenderArrow",
//#if MC<11400
"MixinRenderManager",
//#endif
"MixinViewFrustum",
//#endif
"MixinKeyboardListener",
"MixinPlayerControllerMP",
"MixinRenderItem",
"MixinRenderLivingBase",