The big update (aka 1.0.10 without the breaking stuff)

- Updated mappings to stable_39
- Cherrypicked PR for Ping bugs
- Made sure OptiFine compat works again
- Cherrypicked fix for CustomMainMenu and ReplayMod throwing a fit with us
- Finally got Chisel textures to animate again (Shocking, I know)
- Added BlockStateContainer fix from Aaron
- Lots and lots of refractoring to get it to even compile
- Stuff for ru_ru and pt_br
- Probably more, but I give up at this point

More fixes coming before the new release

Author: ZombieHDGaming

build.gradle

@@ -19,6 +19,8 @@ apply plugin: "org.spongepowered.mixin"
 repositories {
     maven { url "http://repo.spongepowered.org/maven" }
     maven { url "http://chickenbones.net/maven/" }
+    maven { url "http://www.dimdev.org/maven" }
+    maven { url "http://maven.tterrag.com/" }
     ivy {
         url "https://google.com/404"
         ivyPattern("https://google.com/404") // Workaround for https://github.com/gradle/gradle/issues/4107
@@ -27,7 +29,7 @@ repositories {
 }
 
 dependencies {
-    implementation("org.spongepowered:mixin:0.7.10-SNAPSHOT") {
+    implementation("org.dimdev:mixin:0.7.11-SNAPSHOT") {
         exclude module: "asm-commons"
         exclude module: "asm-tree"
         exclude module: "launchwrapper"
@@ -43,12 +45,14 @@ dependencies {
     compileOnly "2568:0:TConstruct-1.12.2-2.10.1.84@jar"
     compileOnly "2511:625:Avaritia-1.12-3.2.0.13-universal@jar"
     compileOnly "codechicken:CodeChickenLib:1.12.2-3.1.9.344:deobf"
+    compileOnly "2482:584:CustomMainMenu-MC1.12.2-2.0.8@jar"
+    compileOnly "team.chisel.ctm:CTM:MC1.12-0.2.3.12"
 }
 
 def travisBuildNumber = System.getenv("TRAVIS_BUILD_NUMBER")
 def versionSuffix = travisBuildNumber != null ? travisBuildNumber : "SNAPSHOT"
 
-version "1.0.9-$versionSuffix"
+version "1.0.10-$versionSuffix"
 group "org.dimdev.vanillafix"
 archivesBaseName = "VanillaFix"
 
@@ -58,13 +62,14 @@ targetCompatibility = 1.8
 minecraft {
     version "1.12.2-14.23.4.2703"
     runDir "run"
-    mappings "snapshot_20180607"
+    mappings "stable_39"
     makeObfSourceJar false
 
     def args = [
             "-Dfml.coreMods.load=org.dimdev.vanillafix.VanillaFixLoadingPlugin",
             "-Dmixin.hotSwap=true",
-            "-Dmixin.checks.interfaces=true"
+            "-Dmixin.checks.interfaces=true",
+            "-Dmixin.debug.export=true"
     ]
     clientJvmArgs.addAll(args)
     serverJvmArgs.addAll(args)
@@ -119,4 +124,4 @@ artifacts {
 
 // These are broken
 runClient.group "other"
-runServer.group "other"
+runServer.group "other"

src/main/java/org/dimdev/vanillafix/VanillaFix.java

@@ -8,6 +8,7 @@
 import net.minecraft.item.ItemBlock;
 import net.minecraft.util.ReportedException;
 import net.minecraft.util.ResourceLocation;
+import net.minecraftforge.common.ForgeModContainer;
 import net.minecraftforge.common.MinecraftForge;
 import net.minecraftforge.common.config.Config;
 import net.minecraftforge.common.config.ConfigManager;
@@ -29,8 +30,6 @@
      updateJSON = "https://gist.githubusercontent.com/Runemoro/28e8cf4c24a5f17f508a5d34f66d229f/raw/vanillafix_update.json")
 public class VanillaFix {
     private static final int CONFIG_VERSION = 1;
-    private static final boolean DEBUG_BLOCK_IDS = false;
-    private static final boolean DEBUG_ITEM_IDS = false;
     private static final boolean DEBUG_INIT_ERROR = false; // For testing the init error screen outside of dev. Don't forget to unset!
 
     @Mod.EventHandler
@@ -73,31 +72,8 @@ public void onPreInit(FMLPreInitializationEvent event) {
         // Register event listeners
         MinecraftForge.EVENT_BUS.register(ModConfig.class);
 
-        IForgeRegistry<Block> blockRegistry = GameRegistry.findRegistry(Block.class);
-        IForgeRegistry<Item> itemRegistry = GameRegistry.findRegistry(Item.class);
-
-        if (DEBUG_BLOCK_IDS) {
-            for (int i = 0; i < 5000; i++) {
-                Block block = new Block(Material.GROUND)
-                        .setCreativeTab(CreativeTabs.BUILDING_BLOCKS)
-                        .setUnlocalizedName("block_" + i)
-                        .setRegistryName(new ResourceLocation("vanillafix:block_" + i));
-
-                blockRegistry.register(block);
-                itemRegistry.register(new ItemBlock(block).setRegistryName(new ResourceLocation("vanillafix:block_" + i)));
-            }
-        }
-
-        if (DEBUG_ITEM_IDS) {
-            for (int i = 0; i < 40000; i++) {
-                Item item = new Item()
-                        .setCreativeTab(CreativeTabs.FOOD)
-                        .setUnlocalizedName("item_" + i)
-                        .setRegistryName(new ResourceLocation("vanillafix:item_" + i));
-
-                itemRegistry.register(item);
-            }
-        }
+        // Don't render terrain on main thread for higher FPS, but possibly seeing missing chunks
+        ForgeModContainer.alwaysSetupTerrainOffThread = true;
 
         if (DEBUG_INIT_ERROR) throw new ReportedException(new CrashReport("Debug init crash", new Throwable()));
     }

src/main/java/org/dimdev/vanillafix/VanillaFixLoadingPlugin.java

@@ -25,7 +25,6 @@
 @IFMLLoadingPlugin.SortingIndex(-100000)
 public class VanillaFixLoadingPlugin implements IFMLLoadingPlugin {
     private static final Logger log = LogManager.getLogger();
-    private static final String MCP_VERSION = "20180618-1.12"; // TODO: Use version for current Minecraft version!
     private static boolean initialized = false;
 
     public static LoadingConfig config;
@@ -68,13 +67,13 @@ public static void initialize() {
         // Initialize StacktraceDeobfuscator
         log.info("Initializing StacktraceDeobfuscator");
         try {
-            File mappings = new File(modDir, "methods-" + MCP_VERSION + ".csv");
+            File mappings = new File(modDir, "methods-stable_39.csv");
             if (mappings.exists()) {
                 log.info("Found MCP method mappings: " + mappings.getName());
             } else {
                 log.info("Downloading MCP method mappings to: " + mappings.getName());
             }
-            StacktraceDeobfuscator.init(mappings, MCP_VERSION);
+            StacktraceDeobfuscator.init(mappings);
         } catch (Exception e) {
             log.error("Failed to get MCP data!", e);
         }

src/main/java/org/dimdev/vanillafix/bugs/IPatchedSPacketPong.java

@@ -0,0 +1,4 @@
+package org.dimdev.vanillafix.bugs;
+public interface IPatchedSPacketPong {
+    long getClientTime();
+}

src/main/java/org/dimdev/vanillafix/bugs/mixins/MixinBlockStateContainer.java

@@ -0,0 +1,38 @@
+package org.dimdev.vanillafix.bugs.mixins;
+
+import net.minecraft.util.BitArray;
+import net.minecraft.world.chunk.BlockStateContainer;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Redirect;
+
+/**
+ * Provided by Aaron from Sponge. All code on this page is used in rights
+ * with the Sponge license and was taken from SpongeCommon
+ */
+@Mixin(BlockStateContainer.class)
+public class MixinBlockStateContainer {
+
+    /**
+     * Serializing a BlockStateContainer to a PacketBuffer is done in two parts:
+     * calculating the size of the allocation needed in the PacketBuffer, and actually
+     * writing it.
+     *
+     * When the BlockStateContainer is actually written to the PacketBuffer,
+     * its 'storage.BitArray.getBackingLongArray' is written as a VarInt-length-prefixed
+     * array. However, when calculating the size of the allocation needed, the size of
+     * 'storage.size()' encoded as a VarInt is used, not the size of 'getBackingLongArray'
+     * encoded as a VarInt. If the size of getBackingLongArray is ever large enough to require
+     * an extra byte in its VarInt encoding, the allocated buffer will be too small, resuling in a crash.
+     *
+     * To fix this issue, we calculate the length of getBackingLongArray encoded as a VarInt,
+     * when we're calculating the necessary allocation size.
+     * @param bits
+     * @return
+     */
+    @Redirect(method = "getSerializedSize", at = @At(value = "INVOKE", target = "Lnet/minecraft/util/BitArray;size()I"))
+    private int onGetStorageSize$FixVanillaBug(BitArray bits) {
+        return bits.getBackingLongArray().length;
+    }
+
+}

src/main/java/org/dimdev/vanillafix/bugs/mixins/MixinMinecraftServer.java

@@ -0,0 +1,13 @@
+package org.dimdev.vanillafix.bugs.mixins;
+import net.minecraft.server.MinecraftServer;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Overwrite;
+@Mixin(MinecraftServer.class)
+public class MixinMinecraftServer {
+    /**
+     * @reason Disable initial world chunk load. This makes world load much faster, but in exchange
+     * the player may see incomplete chunks (like when teleporting to a new area).
+     */
+    @Overwrite
+    public void initialWorldChunkLoad() {}
+}

src/main/java/org/dimdev/vanillafix/bugs/mixins/MixinSPacketPong.java

@@ -0,0 +1,16 @@
+package org.dimdev.vanillafix.bugs.mixins;
+
+import net.minecraft.network.status.server.SPacketPong;
+import org.dimdev.vanillafix.bugs.IPatchedSPacketPong;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Shadow;
+
+@Mixin(SPacketPong.class)
+public class MixinSPacketPong implements IPatchedSPacketPong {
+    @Shadow private long clientTime;
+
+    @Override
+    public long getClientTime() {
+        return clientTime;
+    }
+}

src/main/java/org/dimdev/vanillafix/bugs/mixins/client/MixinIntegratedServer.java

@@ -19,4 +19,4 @@ public abstract class MixinIntegratedServer {
     private <V> V getUnchecked(Future<V> future) {
         return null;
     }
-}
+}

src/main/java/org/dimdev/vanillafix/bugs/mixins/client/MixinMinecraft.java

@@ -29,7 +29,7 @@
 @Mixin(Minecraft.class)
 public abstract class MixinMinecraft implements IThreadListener, ISnooperInfo {
     @Shadow @Final private static Logger LOGGER;
-    @Shadow @Final public Profiler mcProfiler;
+    @Shadow @Final public Profiler profiler;
 
     @Shadow public GuiIngame ingameGUI;
 
@@ -42,9 +42,9 @@ private void endStartGUISection(Profiler profiler, String name) {
     /** @reason Part 2 of GUI logic fix. */
     @Redirect(method = "runTick", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/renderer/texture/TextureManager;tick()V", ordinal = 0))
     private void tickTextureManagerWithCorrectProfiler(TextureManager textureManager) {
-        mcProfiler.endStartSection("textures");
+        profiler.endStartSection("textures");
         textureManager.tick();
-        mcProfiler.endStartSection("gui");
+        profiler.endStartSection("gui");
     }
 
     /** @reason Make saving screenshots async (https://bugs.mojang.com/browse/MC-33383) */

src/main/java/org/dimdev/vanillafix/bugs/mixins/client/MixinNetHandlerPlayClient.java

@@ -12,7 +12,7 @@
 import org.spongepowered.asm.mixin.Overwrite;
 import org.spongepowered.asm.mixin.Shadow;
 
-@Mixin(NetHandlerPlayClient.class)
+@Mixin(value = NetHandlerPlayClient.class, priority = 500)
 public abstract class MixinNetHandlerPlayClient implements INetHandlerPlayClient {
     @Shadow private boolean doneLoadingTerrain;
     @Shadow(aliases = "clientWorldController") private WorldClient world;
@@ -35,7 +35,7 @@ public void handleRespawn(SPacketRespawn packetIn) {
             client.displayGuiScreen(null);
 
             Scoreboard scoreboard = world.getScoreboard();
-            world = new WorldClient((NetHandlerPlayClient) (Object) this, new WorldSettings(0L, packetIn.getGameType(), false, client.world.getWorldInfo().isHardcoreModeEnabled(), packetIn.getWorldType()), packetIn.getDimensionID(), packetIn.getDifficulty(), client.mcProfiler);
+            world = new WorldClient((NetHandlerPlayClient) (Object) this, new WorldSettings(0L, packetIn.getGameType(), false, client.world.getWorldInfo().isHardcoreModeEnabled(), packetIn.getWorldType()), packetIn.getDimensionID(), packetIn.getDifficulty(), client.profiler);
             world.setWorldScoreboard(scoreboard);
             client.loadWorld(world);
             client.player.dimension = packetIn.getDimensionID();