Update CTM integration for 1.20.4

Requires Chisel-Team/ConnectedTexturesMod#229 to be built from source

Author: embeddedt

neoforge/build.gradle

@@ -45,7 +45,7 @@ dependencies {
     modCompileOnly("me.shedaniel:RoughlyEnoughItems-forge:${rei_version}") { transitive false }
     modCompileOnly("dev.latvian.mods:kubejs-forge:${kubejs_version}")
     //modRuntimeOnly("curse.maven:ferritecore-429235:4441949")
-    modCompileOnly("team.chisel.ctm:CTM:${ctm_version}")
+    modCompileOnly files("deps/ctm.jar")
 
     modCompileOnly("curse.maven:supermartijncore-454372:4455391")
     modCompileOnly("vazkii.patchouli:Patchouli:1.19.2-77")

neoforge/deps/ctm.jar

@@ -3,26 +3,33 @@
 import com.google.common.collect.Multimap;
 import com.google.common.collect.Sets;
 import com.mojang.datafixers.util.Pair;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.renderer.texture.TextureAtlasSprite;
 import net.minecraft.client.resources.model.*;
 import net.minecraft.resources.ResourceLocation;
 import org.embeddedt.modernfix.ModernFixClient;
 import org.embeddedt.modernfix.annotation.ClientOnlyMixin;
 import org.embeddedt.modernfix.annotation.RequiresMod;
 import org.embeddedt.modernfix.api.entrypoint.ModernFixClientIntegration;
+import org.embeddedt.modernfix.neoforge.dynresources.IModelBakerImpl;
 import org.spongepowered.asm.mixin.Final;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 import team.chisel.ctm.CTM;
+import team.chisel.ctm.api.model.IModelCTM;
+import team.chisel.ctm.client.model.AbstractCTMBakedModel;
+import team.chisel.ctm.client.model.ModelCTM;
 import team.chisel.ctm.client.texture.IMetadataSectionCTM;
 import team.chisel.ctm.client.util.ResourceUtil;
 import team.chisel.ctm.client.util.TextureMetadataHandler;
 
 import javax.annotation.Nonnull;
 import java.io.IOException;
 import java.util.*;
+import java.util.function.Function;
 
 @Mixin(TextureMetadataHandler.class)
 @RequiresMod("ctm")
@@ -31,22 +38,21 @@ public abstract class TextureMetadataHandlerMixin implements ModernFixClientInte
 
     @Shadow(remap = false) @Nonnull protected abstract BakedModel wrap(UnbakedModel model, BakedModel object) throws IOException;
 
-    @Shadow(remap = false) @Final public static Multimap<ResourceLocation, Material> TEXTURES_SCRAPED;
+    @Shadow @Final private Multimap<ResourceLocation, Material> scrapedTextures;
 
     @Inject(method = "<init>", at = @At("RETURN"))
     private void subscribeDynamic(CallbackInfo ci) {
         ModernFixClient.CLIENT_INTEGRATIONS.add(this);
     }
 
-    @Inject(method = { "onModelBake(Lnet/minecraftforge/client/event/ModelEvent$ModifyBakingResult;)V", "onModelBake(Lnet/minecraftforge/client/event/ModelEvent$BakingCompleted;)V" }, at = @At("HEAD"), cancellable = true, remap = false)
+    @Inject(method = { "onModelBake(Lnet/neoforged/neoforge/client/event/ModelEvent$ModifyBakingResult;)V", "onModelBake(Lnet/neoforged/neoforge/client/event/ModelEvent$BakingCompleted;)V" }, at = @At("HEAD"), cancellable = true, remap = false)
     private void noIteration(CallbackInfo ci) {
         ci.cancel();
     }
 
     @Override
     public BakedModel onBakedModelLoad(ResourceLocation rl, UnbakedModel rootModel, BakedModel baked, ModelState state, ModelBakery bakery) {
-        if(true) throw new UnsupportedOperationException("not ported yet");
-        if (rl instanceof ModelResourceLocation && false /* !(baked instanceof AbstractCTMBakedModel) && !baked.isCustomRenderer() */) {
+        if (rl instanceof ModelResourceLocation && !(baked instanceof AbstractCTMBakedModel) && !baked.isCustomRenderer()) {
             Deque<ResourceLocation> dependencies = new ArrayDeque<>();
             Set<ResourceLocation> seenModels = new HashSet<>();
             dependencies.push(rl);
@@ -63,7 +69,7 @@ public BakedModel onBakedModelLoad(ResourceLocation rl, UnbakedModel rootModel,
                     continue;
                 }
 
-                Collection<Material> textures = Sets.newHashSet(TEXTURES_SCRAPED.get(dep));
+                Collection<Material> textures = Sets.newHashSet(scrapedTextures.get(dep));
                 Collection<ResourceLocation> newDependencies = model.getDependencies();
                 for (Material tex : textures) {
                     IMetadataSectionCTM meta = null;
@@ -97,24 +103,21 @@ public BakedModel onBakedModelLoad(ResourceLocation rl, UnbakedModel rootModel,
     }
 
     private void handleInit(ResourceLocation key, BakedModel wrappedModel, ModelBakery bakery) {
-        if(true) throw new UnsupportedOperationException("not ported yet");
-        /*
         if(wrappedModel instanceof AbstractCTMBakedModel baked) {
             IModelCTM var10 = baked.getModel();
             if (var10 instanceof ModelCTM ctmModel) {
                 if (!ctmModel.isInitialized()) {
                     Function<Material, TextureAtlasSprite> spriteGetter = (m) -> {
                         return Minecraft.getInstance().getModelManager().getAtlas(m.atlasLocation()).getSprite(m.texture());
                     };
-                    ModelBakery.ModelBakerImpl baker = ModelBakerImplAccessor.createImpl(bakery, ($, m) -> {
-                        return spriteGetter.apply(m);
+                    ModelBakery.ModelBakerImpl baker = bakery.new ModelBakerImpl((rl, m) -> {
+                        return m.sprite();
                     }, key);
                     // bypass bakedCache so that dependent models get re-baked and thus retrieve their sprites again
                     ((IModelBakerImpl)baker).mfix$ignoreCache();
                     ctmModel.bake(baker, spriteGetter, BlockModelRotation.X0_Y0, key);
                 }
             }
         }
-         */
     }
 }