Add dynamic textures support for Chisel

Author: Runemoro

build.gradle

@@ -20,6 +20,7 @@ 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
@@ -45,6 +46,7 @@ dependencies {
     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")

src/main/java/org/dimdev/vanillafix/dynamicresources/DynamicTextureMap.java

@@ -46,21 +46,19 @@ public void loadTextureAtlas(IResourceManager resourceManager) {
     }
 
     public void init() {
-        initMissingImage();
         deleteGlTexture();
-
         int maximumTextureSize = Minecraft.getGLMaximumTextureSize();
 
         stitcher = new DynamicStitcher(maximumTextureSize, maximumTextureSize, 0, mipmapLevels);
-
-        mapUploadedSprites.clear();
         listAnimatedSprites.clear();
 
+        initMissingImage();
         missingImage.generateMipmaps(mipmapLevels);
-
-        LOGGER.info("Created {}x{} '{}' atlas", stitcher.getImageWidth(), stitcher.getImageHeight(), basePath);
+        spritesNeedingUpload.add(missingImage);
+        stitcher.addSprite(missingImage);
 
         TextureUtil.allocateTextureImpl(getGlTextureId(), mipmapLevels, stitcher.getImageWidth(), stitcher.getImageHeight());
+        LOGGER.info("Created {}x{} '{}' atlas", stitcher.getImageWidth(), stitcher.getImageHeight(), basePath);
 
         ForgeHooksClient.onTextureStitchedPre(this);
         ForgeHooksClient.onTextureStitchedPost(this);

src/main/java/org/dimdev/vanillafix/dynamicresources/modsupport/mixins/client/MixinMagicStitchingSprite.java

@@ -0,0 +1,24 @@
+package org.dimdev.vanillafix.dynamicresources.modsupport.mixins.client;
+
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.renderer.texture.TextureAtlasSprite;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Overwrite;
+import org.spongepowered.asm.mixin.Pseudo;
+import org.spongepowered.asm.mixin.Shadow;
+import team.chisel.client.TextureStitcher;
+
+@Pseudo
+@Mixin(TextureStitcher.MagicStitchingSprite.class)
+@SuppressWarnings("deprecation")
+public abstract class MixinMagicStitchingSprite extends TextureAtlasSprite {
+    @Shadow abstract void postStitch();
+    @Shadow private TextureAtlasSprite parent;
+
+    @Overwrite(remap = false)
+    public MixinMagicStitchingSprite(String spriteName) {
+        super(spriteName);
+        parent = Minecraft.getMinecraft().getTextureMapBlocks().getAtlasSprite(spriteName);
+        postStitch();
+    }
+}

src/main/java/org/dimdev/vanillafix/dynamicresources/modsupport/mixins/client/MixinModelParserV1.java

@@ -0,0 +1,12 @@
+package org.dimdev.vanillafix.dynamicresources.modsupport.mixins.client;
+
+import net.minecraftforge.client.model.ICustomModelLoader;
+import org.dimdev.vanillafix.dynamicresources.model.VanillaLoader;
+import org.spongepowered.asm.mixin.*;
+import team.chisel.ctm.client.model.parsing.ModelParserV1;
+
+@Pseudo
+@Mixin(ModelParserV1.class)
+public class MixinModelParserV1 {
+    @SuppressWarnings("unused") @Shadow(remap = false) @Mutable @Final private static ICustomModelLoader VANILLA_LOADER = VanillaLoader.INSTANCE;
+}

src/main/java/org/dimdev/vanillafix/modsupport/mixins/MixinLoader.java

@@ -42,6 +42,7 @@ private void beforeConstructingMods(List<String> injectedModContainers, Callback
 
         // Add and reload mixin configs
         if (VanillaFixLoadingPlugin.config.textureFixes) Mixins.addConfiguration("mixins.vanillafix.textures.modsupport.json");
+        if (VanillaFixLoadingPlugin.config.dynamicResources) Mixins.addConfiguration("mixins.vanillafix.dynamicresources.modsupport.json");
         Proxy mixinProxy = (Proxy) Launch.classLoader.getTransformers().stream().filter(transformer -> transformer instanceof Proxy).findFirst().get();
         try {
             Field transformerField = Proxy.class.getDeclaredField("transformer");

src/main/resources/mixins.vanillafix.dynamicresources.modsupport.json

@@ -0,0 +1,17 @@
+{
+  "package": "org.dimdev.vanillafix.dynamicresources.modsupport.mixins",
+  "required": true,
+  "refmap": "mixins.vanillafix.refmap.json",
+  "target": "@env(DEFAULT)",
+  "minVersion": "0.6",
+  "plugin": "org.dimdev.vanillafix.ModCompatibilityMixinPlugin",
+  "compatibilityLevel": "JAVA_8",
+  "mixins": [],
+  "client": [
+    "client.MixinModelParserV1",
+    "client.MixinMagicStitchingSprite"
+  ],
+  "injectors": {
+    "maxShiftBy": 10
+  }
+}