Merge branch 'johni/1.13-pre' into johni/blend

src/main/resources/META-INF/mods.toml

@@ -0,0 +1,28 @@
+modLoader="javafml"
+loaderVersion="[13,)"
+updateJSONURL="https://raw.githubusercontent.com/ReplayMod/ReplayMod/master/versions.json"
+issueTrackerURL="https://replaymod.com/forum"
+displayURL="https://replaymod.com"
+logoFile="replaymod_logo.png"
+authors="CrushedPixel, johni0702"
+
+[[mods]]
+modId="replaymod"
+version="${version}"
+displayName="Replay Mod"
+description='''
+A Mod which allows you to record, replay and share your Minecraft experience.
+'''
+
+[[dependencies.replaymod]]
+    modId="forge"
+    mandatory=true
+    versionRange="[15.0,)"
+    ordering="NONE"
+    side="BOTH"
+[[dependencies.replaymod]]
+    modId="minecraft"
+    mandatory=true
+    versionRange="[ 1.13.2 ]"
+    ordering="NONE"
+    side="BOTH"

src/main/resources/META-INF/replaymod_at.cfg

@@ -1,6 +1,9 @@
 # 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
@@ -24,7 +27,21 @@ 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
@@ -74,15 +91,24 @@ public net.minecraft.client.renderer.EntityRenderer *
 public net.minecraft.client.renderer.EntityRenderer *()
 
 # RenderGlobal
-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>=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
 
 public net.minecraft.client.renderer.RenderGlobal$ContainerLocalRenderInformation
 #public net.minecraft.client.renderer.RenderGlobal$ContainerLocalRenderInformation field_178553_a # renderChunk
@@ -125,7 +151,11 @@ public net.minecraft.server.integrated.IntegratedServer field_71348_o # isGamePa
 # GameSettings
 ##if MC>=10904
 ##if MC>=11002
-public-f net.minecraft.client.settings.GameSettings field_186714_aM # soundLevels
+##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
@@ -148,7 +178,7 @@ public net.minecraft.crash.CrashReportCategory$Entry
 public net.minecraft.client.settings.KeyBinding field_151474_i # pressTime
 
 # Timer
-public net.minecraft.util.Timer *
+public-f net.minecraft.util.Timer *
 
 # GlStateManager
 public net.minecraft.client.renderer.GlStateManager *
@@ -161,6 +191,13 @@ public net.minecraft.client.renderer.GlStateManager$BooleanState *
 # 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

src/main/resources/mixins.recording.replaymod.json

@@ -4,8 +4,15 @@
   "mixins": [],
   "server": [],
   "client": [
+    //#if MC>=11300
+    "MixinDownloadingPackFinder",
+    "MixinKeyboardListener",
+    "MixinMouseHelper",
+    //#endif
     //#if MC>=10904
-    "MixinPlayerControllerMP",
+    //#if MC<11300
+    //$$ "MixinPlayerControllerMP",
+    //#endif
     "MixinWorldClient",
     //#endif
     //#if MC<=10710
@@ -14,7 +21,9 @@
     //#endif
     "MixinNetHandlerLoginClient",
     "MixinNetHandlerPlayClient",
-    "MixinNetworkDispatcher",
+    //#if MC<11300
+    //$$ "MixinNetworkDispatcher",
+    //#endif
     "MixinRenderGlobal"
   ],
   "compatibilityLevel": "JAVA_8",

src/main/resources/mixins.render.replaymod.json

@@ -11,6 +11,9 @@
     //$$ "MixinRendererLivingEntity",
     //#endif
     "MixinEntityRenderer",
+    //#if MC>=11300
+    "MixinFogRenderer",
+    //#endif
     "MixinFrustum",
     "MixinRender",
     //#if MC>=10800

src/main/resources/pack.mcmeta

@@ -0,0 +1,14 @@
+{
+    "pack": {
+        "description": "ReplayMod resources",
+        //#if MC>=11300
+        "pack_format": 4
+        //#else
+        //#if MC>=11002
+        //$$ "pack_format": 2
+        //#else
+        //$$ "pack_format": 1
+        //#endif
+        //#endif
+    }
+}