Bump mixin and mappings version, fix packet registration, fixes #31

Mumfrey
1 parent aa74fddf
Showing 10 changed files with 31 additions and 136 deletions
build.gradle
gradle.properties
src/client/java/com/mumfrey/liteloader/client/gui/GuiCheckbox.java
src/client/java/com/mumfrey/liteloader/client/gui/GuiHoverLabel.java
src/client/java/com/mumfrey/liteloader/client/gui/GuiPanel.java
src/client/java/com/mumfrey/liteloader/client/mixin/IKeyBinding.java
src/client/java/com/mumfrey/liteloader/client/mixin/MixinMinecraft.java
src/client/java/com/mumfrey/liteloader/client/mixin/MixinTileEntityRendererDispatcher.java
src/client/java/com/mumfrey/liteloader/modconfig/AbstractConfigPanel.java
src/main/java/com/mumfrey/liteloader/core/runtime/Packets.java
@@ -72,7 +72,7 @@ repositories {
 }
 dependencies {
-    compile('org.spongepowered:mixin:0.6.10-SNAPSHOT') {
+    compile('org.spongepowered:mixin:0.6.12-SNAPSHOT') {
         exclude module: 'asm-commons'
         exclude module: 'asm-tree'
         exclude module: 'launchwrapper'
@@ -7,4 +7,4 @@ organization=LiteLoader
 buildType=SNAPSHOT
 buildVersion=1.12
 mcVersion=1.12
-mcMappings=snapshot_20170609
 \ No newline at end of file
+mcMappings=snapshot_20170627
 \ No newline at end of file
@@ -27,7 +27,7 @@ public class GuiCheckbox extends GuiButton
     }
     @Override
-    public void func_191745_a(Minecraft minecraft, int mouseX, int mouseY, float partialTicks) // drawButton
+    public void drawButton(Minecraft minecraft, int mouseX, int mouseY, float partialTicks)
     {
         if (this.visible)
         {
@@ -37,7 +37,7 @@ public class GuiHoverLabel extends GuiButton
     }
     @Override
-    public void func_191745_a(Minecraft minecraft, int mouseX, int mouseY, float partialTicks) // drawButton
+    public void drawButton(Minecraft minecraft, int mouseX, int mouseY, float partialTicks)
     {
         if (this.visible)
         {
@@ -106,7 +106,7 @@ public abstract class GuiPanel extends Gui
     {
         for (GuiButton control : this.controls)
         {
-            control.func_191745_a(this.mc, mouseX, mouseY, partialTicks); // drawButton
+            control.drawButton(this.mc, mouseX, mouseY, partialTicks);
         }
     }
@@ -16,7 +16,7 @@ import net.minecraft.client.settings.KeyBinding;
 @Mixin(KeyBinding.class)
 public interface IKeyBinding
 {
-    @Accessor(value = "field_193627_d")
+    @Accessor(value = "CATEGORY_ORDER")
     public static Map<String, Integer> getCategorySort()
     {
         throw new NotImplementedException("IKeyBinding mixin failed to apply");
@@ -36,7 +36,7 @@ public abstract class MixinMinecraft implements IMinecraft
     @Shadow private String serverName;
     @Shadow private int serverPort;
     @Shadow private boolean isGamePaused;
-    @Shadow private float field_193996_ah;
+    @Shadow private float renderPartialTicksPaused;
     @Shadow abstract void resize(int width, int height);
     @Shadow private void clickMouse() {}
@@ -82,7 +82,7 @@ public abstract class MixinMinecraft implements IMinecraft
     private void onTick(CallbackInfo ci)
     {
         boolean clock = this.timer.elapsedTicks > 0;
-        float partialTicks = this.isGamePaused ? this.field_193996_ah : this.timer.field_194147_b;
+        float partialTicks = this.isGamePaused ? this.renderPartialTicksPaused : this.timer.renderPartialTicks;
         this.broker.onTick(clock, partialTicks);
     }
@@ -19,11 +19,11 @@ import net.minecraft.tileentity.TileEntity;
 @Mixin(TileEntityRendererDispatcher.class)
 public abstract class MixinTileEntityRendererDispatcher implements ITileEntityRendererDispatcher
 {
-    @Shadow private Map<Class<? extends TileEntity>, TileEntitySpecialRenderer<? extends TileEntity>> mapSpecialRenderers;
+    @Shadow private Map<Class<? extends TileEntity>, TileEntitySpecialRenderer<? extends TileEntity>> renderers;
     @Override
     public Map<Class<? extends TileEntity>, TileEntitySpecialRenderer<? extends TileEntity>> getSpecialRenderMap()
     {
-        return this.mapSpecialRenderers;
+        return this.renderers;
     }
 }
@@ -75,7 +75,7 @@ public abstract class AbstractConfigPanel implements ConfigPanel
             if (this.control != null)
             {
-                this.control.func_191745_a(minecraft, mouseX, mouseY, partialTicks); // drawButton
+                this.control.drawButton(minecraft, mouseX, mouseY, partialTicks);
             }
         }
@@ -5,6 +5,7 @@
  */
 package com.mumfrey.liteloader.core.runtime;
+import java.lang.reflect.Field;
 import java.util.HashMap;
 import java.util.Map;
@@ -163,131 +164,7 @@ public final class Packets extends Obf
     // CHECKSTYLE:ON
-    public static final Packets[] packets = new Packets[] {
-        Packets.CPacketEncryptionResponse,
-        Packets.CPacketLoginStart,
-        Packets.SPacketDisconnectLogin,
-        Packets.SPacketEnableCompression,
-        Packets.SPacketEncryptionRequest,
-        Packets.SPacketLoginSuccess,
-        Packets.CPacketAnimation,
-        Packets.CPacketChatMessage,
-        Packets.CPacketClickWindow,
-        Packets.CPacketClientSettings,
-        Packets.CPacketClientStatus,
-        Packets.CPacketCloseWindow,
-        Packets.CPacketConfirmTeleport,
-        Packets.CPacketConfirmTransaction,
-        Packets.CPacketCreativeInventoryAction,
-        Packets.CPacketCustomPayload,
-        Packets.CPacketEnchantItem,
-        Packets.CPacketEntityAction,
-        Packets.CPacketHeldItemChange,
-        Packets.CPacketInput,
-        Packets.C00Handshake,
-        Packets.CPacketKeepAlive,
-        Packets.CPacketPlayer,
-        Packets.CPacketPlayerPosition,
-        Packets.CPacketPlayerPositionRotation,
-        Packets.CPacketPlayerRotation,
-        Packets.CPacketPlayerAbilities,
-        Packets.CPacketPlayerDigging,
-        Packets.CPacketPlayerTryUseItem,
-        Packets.CPacketPlayerTryUseItemOnBlock,
-        Packets.CPacketResourcePackStatus,
-        Packets.CPacketSpectate,
-        Packets.CPacketSteerBoat,
-        Packets.CPacketTabComplete,
-        Packets.CPacketUpdateSign,
-        Packets.CPacketUseEntity,
-        Packets.CPacketVehicleMove,
-        Packets.SPacketAnimation,
-        Packets.SPacketBlockAction,
-        Packets.SPacketBlockBreakAnim,
-        Packets.SPacketBlockChange,
-        Packets.SPacketCamera,
-        Packets.SPacketChangeGameState,
-        Packets.SPacketChat,
-        Packets.SPacketChunkData,
-        Packets.SPacketCloseWindow,
-        Packets.SPacketCollectItem,
-        Packets.SPacketCombatEvent,
-        Packets.SPacketConfirmTransaction,
-        Packets.SPacketCooldown,
-        Packets.SPacketCustomPayload,
-        Packets.SPacketCustomSound,
-        Packets.SPacketDestroyEntities,
-        Packets.SPacketDisconnect,
-        Packets.SPacketDisplayObjective,
-        Packets.SPacketEffect,
-        Packets.SPacketEntity,
-        Packets.S15PacketEntityRelMove,
-        Packets.S16PacketEntityLook,
-        Packets.S17PacketEntityLookMove,
-        Packets.SPacketEntityAttach,
-        Packets.SPacketEntityEffect,
-        Packets.SPacketEntityEquipment,
-        Packets.SPacketEntityHeadLook,
-        Packets.SPacketEntityMetadata,
-        Packets.SPacketEntityProperties,
-        Packets.SPacketEntityStatus,
-        Packets.SPacketEntityTeleport,
-        Packets.SPacketEntityVelocity,
-        Packets.SPacketExplosion,
-        Packets.SPacketHeldItemChange,
-        Packets.SPacketJoinGame,
-        Packets.SPacketKeepAlive,
-        Packets.SPacketMaps,
-        Packets.SPacketMoveVehicle,
-        Packets.SPacketMultiBlockChange,
-        Packets.SPacketOpenWindow,
-        Packets.SPacketParticles,
-        Packets.SPacketPlayerAbilities,
-        Packets.SPacketPlayerListHeaderFooter,
-        Packets.SPacketPlayerListItem,
-        Packets.SPacketPlayerPosLook,
-        Packets.SPacketRemoveEntityEffect,
-        Packets.SPacketResourcePackSend,
-        Packets.SPacketRespawn,
-        Packets.SPacketScoreboardObjective,
-        Packets.SPacketServerDifficulty,
-        Packets.SPacketSetExperience,
-        Packets.SPacketSetPassengers,
-        Packets.SPacketSetSlot,
-        Packets.SPacketSignEditorOpen,
-        Packets.SPacketSoundEffect,
-        Packets.SPacketSpawnExperienceOrb,
-        Packets.SPacketSpawnGlobalEntity,
-        Packets.SPacketSpawnMob,
-        Packets.SPacketSpawnObject,
-        Packets.SPacketSpawnPainting,
-        Packets.SPacketSpawnPlayer,
-        Packets.SPacketSpawnPosition,
-        Packets.SPacketStatistics,
-        Packets.SPacketTabComplete,
-        Packets.SPacketTeams,
-        Packets.SPacketTimeUpdate,
-        Packets.SPacketTitle,
-        Packets.SPacketUnloadChunk,
-        Packets.SPacketUpdateBossInfo,
-        Packets.SPacketUpdateHealth,
-        Packets.SPacketUpdateScore,
-        Packets.SPacketUpdateTileEntity,
-        Packets.SPacketUseBed,
-        Packets.SPacketWindowItems,
-        Packets.SPacketWindowProperty,
-        Packets.SPacketWorldBorder,
-        Packets.CPacketPing,
-        Packets.CPacketServerQuery,
-        Packets.SPacketPong,
-        Packets.SPacketServerInfo,
-        Packets.CPacketRecipeInfo,
-        Packets.CPacketRecipePlacement,
-        Packets.CPacketSeenAdvancements,
-        Packets.SPacketAdvancementInfo,
-        Packets.SPacketRecipeBook,
-        Packets.SPacketSelectAdvancementsTab
-    };
+    public static final Packets[] packets = Packets.toArray();
     private static int nextPacketIndex;
@@ -307,6 +184,24 @@ public final class Packets extends Obf
         this.context = context;
     }
+    private static Packets[] toArray()
+    {
+        Field[] fields = Packets.class.getFields();
+        Packets[] packets = new Packets[Packets.nextPacketIndex];
+        for (int index = 0; index < Packets.nextPacketIndex; index++)
+        {
+            try
+            {
+                packets[index] = (Packets)fields[index].get(null);
+            }
+            catch (Exception ex)
+            {
+                throw new RuntimeException(ex);
+            }
+        }
+        return packets;
+    }
+
     public int getIndex()
     {
         return this.index;