Use new dynamic loader logic for the generate command

SlimeKnights · Nov 21, 2022 · b837b46 · b837b46
1 parent f41c5df
commit b837b46
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/...in/java/slimeknights/tconstruct/library/client/data/util/ResourceManagerSpriteReader.java b/...in/java/slimeknights/tconstruct/library/client/data/util/ResourceManagerSpriteReader.java
@@ -1,10 +1,11 @@
 package slimeknights.tconstruct.library.client.data.util;
 
-import lombok.RequiredArgsConstructor;
 import com.mojang.blaze3d.platform.NativeImage;
+import lombok.RequiredArgsConstructor;
+import net.minecraft.resources.ResourceLocation;
 import net.minecraft.server.packs.resources.Resource;
 import net.minecraft.server.packs.resources.ResourceManager;
-import net.minecraft.resources.ResourceLocation;
+import slimeknights.tconstruct.library.client.model.DynamicTextureLoader;
 
 import java.io.IOException;
 
@@ -20,7 +21,7 @@ private ResourceLocation getLocation(ResourceLocation base) {
 
   @Override
   public boolean exists(ResourceLocation path) {
-    return manager.hasResource(getLocation(path));
+    return DynamicTextureLoader.textureExists(manager, DynamicTextureLoader.getTextureFolder(path), path);
   }
 
   @Override

diff --git a/src/main/java/slimeknights/tconstruct/shared/client/ClientGeneratePartTexturesCommand.java b/src/main/java/slimeknights/tconstruct/shared/client/ClientGeneratePartTexturesCommand.java
@@ -28,6 +28,7 @@
 import slimeknights.tconstruct.library.client.materials.MaterialRenderInfoJson;
 import slimeknights.tconstruct.library.client.materials.MaterialRenderInfoJson.MaterialGeneratorJson;
 import slimeknights.tconstruct.library.client.materials.MaterialRenderInfoLoader;
+import slimeknights.tconstruct.library.client.model.DynamicTextureLoader;
 import slimeknights.tconstruct.library.materials.definition.MaterialVariantId;
 import slimeknights.tconstruct.library.materials.stats.MaterialStatsId;
 import slimeknights.tconstruct.shared.network.GeneratePartTexturesPacket.Operation;
@@ -130,6 +131,7 @@ public static void generateTextures(Operation operation, String modId, String ma
       }
     }
     spriteReader.closeAll();
+    DynamicTextureLoader.clearCache();
 
     // success message
     long deltaTime = System.nanoTime() - time;