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

Mumfrey
1 parent 4b167b40
Showing 5 changed files with 36 additions and 129 deletions
build.gradle
gradle.properties
src/client/java/com/mumfrey/liteloader/client/mixin/MixinMinecraft.java
src/client/java/com/mumfrey/liteloader/client/mixin/MixinTileEntityRendererDispatcher.java
src/main/java/com/mumfrey/liteloader/core/runtime/Packets.java
@@ -60,8 +60,8 @@ archivesBaseName = &quot;liteloader&quot;
 version = buildVersion + (project.isReleaseBuild ? '' : '-' + project.classifier)
  
 // Minimum version of Java required
-sourceCompatibility = '1.6'
-targetCompatibility = '1.6'
+sourceCompatibility = '1.8'
+targetCompatibility = '1.8'
  
 repositories {
     mavenLocal()
@@ -89,11 +89,11 @@ minecraft {
  
 sourceSets {
     main {
-        refMap = "mixins.liteloader.core.refmap.json"
+        ext.refMap = "mixins.liteloader.core.refmap.json"
     }
     client {
         compileClasspath += main.compileClasspath + main.output
-        refMap = "mixins.liteloader.client.refmap.json"
+        ext.refMap = "mixins.liteloader.client.refmap.json"
     }
     debug {
         compileClasspath += client.compileClasspath + client.output
@@ -123,7 +123,7 @@ javadoc {
 afterEvaluate {
     logger.lifecycle '================================================='
     logger.lifecycle '  LiteLoader'
-    logger.lifecycle '  Copyright (C) 2011-2016 Adam Mummery-Smith'
+    logger.lifecycle '  Copyright (C) 2011-2017 Adam Mummery-Smith'
     logger.lifecycle '  Running in {} mode', (project.isReleaseBuild ? "RELEASE" : "SNAPSHOT")
     logger.lifecycle '================================================='
  
@@ -5,6 +5,12 @@ description=LiteLoader
 url=http://www.liteloader.com
 organization=LiteLoader
 buildType=SNAPSHOT
+<<<<<<< Upstream, based on origin/1.11.2
 buildVersion=1.11.2
 mcVersion=1.11.2
-mcMappings=snapshot_20161224
 \ No newline at end of file
+mcMappings=snapshot_20161224
+=======
+buildVersion=1.12
+mcVersion=1.12
+mcMappings=snapshot_20170627
+>>>>>>> 647e49f Bump mixin and mappings version, fix packet registration, fixes #31
@@ -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;
     }
 }
@@ -5,6 +5,7 @@
  */
 package com.mumfrey.liteloader.core.runtime;
  
+import java.lang.reflect.Field;
 import java.util.HashMap;
 import java.util.Map;
  
@@ -157,125 +158,7 @@ public final class Packets extends Obf
  
     // CHECKSTYLE:ON
  
-    public static final Packets[] packets = new Packets[] {
-            CPacketEncryptionResponse,
-            CPacketLoginStart,
-            SPacketDisconnectLogin,
-            SPacketEnableCompression,
-            SPacketEncryptionRequest,
-            SPacketLoginSuccess,
-            CPacketAnimation,
-            CPacketChatMessage,
-            CPacketClickWindow,
-            CPacketClientSettings,
-            CPacketClientStatus,
-            CPacketCloseWindow,
-            CPacketConfirmTeleport,
-            CPacketConfirmTransaction,
-            CPacketCreativeInventoryAction,
-            CPacketCustomPayload,
-            CPacketEnchantItem,
-            CPacketEntityAction,
-            CPacketHeldItemChange,
-            CPacketInput,
-            C00Handshake,
-            CPacketKeepAlive,
-            CPacketPlayer,
-            CPacketPlayerPosition,
-            CPacketPlayerPositionRotation,
-            CPacketPlayerRotation,
-            CPacketPlayerAbilities,
-            CPacketPlayerDigging,
-            CPacketPlayerTryUseItem,
-            CPacketPlayerTryUseItemOnBlock,
-            CPacketResourcePackStatus,
-            CPacketSpectate,
-            CPacketSteerBoat,
-            CPacketTabComplete,
-            CPacketUpdateSign,
-            CPacketUseEntity,
-            CPacketVehicleMove,
-            SPacketAnimation,
-            SPacketBlockAction,
-            SPacketBlockBreakAnim,
-            SPacketBlockChange,
-            SPacketCamera,
-            SPacketChangeGameState,
-            SPacketChat,
-            SPacketChunkData,
-            SPacketCloseWindow,
-            SPacketCollectItem,
-            SPacketCombatEvent,
-            SPacketConfirmTransaction,
-            SPacketCooldown,
-            SPacketCustomPayload,
-            SPacketCustomSound,
-            SPacketDestroyEntities,
-            SPacketDisconnect,
-            SPacketDisplayObjective,
-            SPacketEffect,
-            SPacketEntity,
-            S15PacketEntityRelMove,
-            S16PacketEntityLook,
-            S17PacketEntityLookMove,
-            SPacketEntityAttach,
-            SPacketEntityEffect,
-            SPacketEntityEquipment,
-            SPacketEntityHeadLook,
-            SPacketEntityMetadata,
-            SPacketEntityProperties,
-            SPacketEntityStatus,
-            SPacketEntityTeleport,
-            SPacketEntityVelocity,
-            SPacketExplosion,
-            SPacketHeldItemChange,
-            SPacketJoinGame,
-            SPacketKeepAlive,
-            SPacketMaps,
-            SPacketMoveVehicle,
-            SPacketMultiBlockChange,
-            SPacketOpenWindow,
-            SPacketParticles,
-            SPacketPlayerAbilities,
-            SPacketPlayerListHeaderFooter,
-            SPacketPlayerListItem,
-            SPacketPlayerPosLook,
-            SPacketRemoveEntityEffect,
-            SPacketResourcePackSend,
-            SPacketRespawn,
-            SPacketScoreboardObjective,
-            SPacketServerDifficulty,
-            SPacketSetExperience,
-            SPacketSetPassengers,
-            SPacketSetSlot,
-            SPacketSignEditorOpen,
-            SPacketSoundEffect,
-            SPacketSpawnExperienceOrb,
-            SPacketSpawnGlobalEntity,
-            SPacketSpawnMob,
-            SPacketSpawnObject,
-            SPacketSpawnPainting,
-            SPacketSpawnPlayer,
-            SPacketSpawnPosition,
-            SPacketStatistics,
-            SPacketTabComplete,
-            SPacketTeams,
-            SPacketTimeUpdate,
-            SPacketTitle,
-            SPacketUnloadChunk,
-            SPacketUpdateBossInfo,
-            SPacketUpdateHealth,
-            SPacketUpdateScore,
-            SPacketUpdateTileEntity,
-            SPacketUseBed,
-            SPacketWindowItems,
-            SPacketWindowProperty,
-            SPacketWorldBorder,
-            CPacketPing,
-            CPacketServerQuery,
-            SPacketPong,
-            SPacketServerInfo
-    };
+    public static final Packets[] packets = Packets.toArray();
  
     private static int nextPacketIndex;
  
@@ -295,6 +178,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;