Merge branch 'stable' into blend

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

@@ -61,8 +61,13 @@ 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 *

src/main/resources/mixins.compat.shaders.replaymod.json

@@ -4,9 +4,13 @@
   "mixins": [],
   "server": [],
   "client": [
+    //#if MC>=10800
     "MixinShaderEntityRenderer",
     "MixinShaderRenderChunk",
     "MixinShaderRenderGlobal",
+    //#else
+    //$$ "MixinShaders",
+    //#endif
     "MixinShadersRender"
   ],
   "compatibilityLevel": "JAVA_8",

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

@@ -8,6 +8,10 @@
     "MixinPlayerControllerMP",
     "MixinWorldClient",
     //#endif
+    //#if MC<=10710
+    //$$ "MixinGuiScreen",
+    //$$ "MixinS26PacketMapChunkBulk",
+    //#endif
     "MixinNetHandlerLoginClient",
     "MixinNetHandlerPlayClient",
     "MixinNetworkDispatcher",

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

@@ -13,7 +13,11 @@
     "MixinEntityRenderer",
     "MixinFrustum",
     "MixinRender",
+    //#if MC>=10800
     "MixinRenderGlobal",
+    //#else
+    //$$ "MixinOpenGlHelper",
+    //#endif
     "MixinRenderManager"
   ],
   "compatibilityLevel": "JAVA_8",

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

@@ -7,14 +7,16 @@
     //#if MC>=10904
     "MixinParticleManager",
     //#endif
+    //#if MC>=10800
     "MixinGuiSpectator",
-    "MixinPlayerControllerMP",
     "MixinRenderArrow",
+    "MixinRenderManager",
+    "MixinViewFrustum",
+    //#endif
+    "MixinPlayerControllerMP",
     "MixinRenderItem",
     "MixinRenderLivingBase",
-    "MixinRenderManager",
     "MixinTileEntityEndPortalRenderer",
-    "MixinViewFrustum",
     "MixinWorldClient"
   ],
   "compatibilityLevel": "JAVA_8",