Merge 1.16 into 1.18

embeddedt · embeddedt · commit 2f3df11220d6 · 2023-11-05T21:59:07.000-05:00
diff --git a/common/src/main/java/org/embeddedt/modernfix/dynamicresources/ModelBakeryHelpers.java b/common/src/main/java/org/embeddedt/modernfix/dynamicresources/ModelBakeryHelpers.java
@@ -167,11 +167,11 @@ public static void gatherModelMaterials(ResourceManager manager, Predicate<PackR
             for(String namespace : pack.getNamespaces(PackType.CLIENT_RESOURCES)) {
                 Collection<ResourceLocation> allBlockstates = pack.getResources(PackType.CLIENT_RESOURCES, namespace, "blockstates", Integer.MAX_VALUE, p -> p.endsWith(".json"));
                 for(ResourceLocation blockstate : allBlockstates) {
-                    allAvailableStates.add(new ResourceLocation(blockstate.getNamespace(), blockstate.getPath().replace("blockstates/", "").replace(".json", "")));
+                    allAvailableStates.add(new ResourceLocation(blockstate.getNamespace(), blockstate.getPath().replaceFirst("blockstates/", "").replace(".json", "")));
                 }
                 Collection<ResourceLocation> allModels = pack.getResources(PackType.CLIENT_RESOURCES, namespace, "models", Integer.MAX_VALUE, p -> p.endsWith(".json"));
                 for(ResourceLocation blockstate : allModels) {
-                    allAvailableModels.add(new ResourceLocation(blockstate.getNamespace(), blockstate.getPath().replace("models/", "").replace(".json", "")));
+                    allAvailableModels.add(new ResourceLocation(blockstate.getNamespace(), blockstate.getPath().replaceFirst("models/", "").replace(".json", "")));
                 }
             }
             if(!isTrustedPack.test(pack)) {

Original file line number	Diff line number	Diff line change
`@@ -167,11 +167,11 @@ public static void gatherModelMaterials(ResourceManager manager, Predicate<PackR`
`167`	`167`	`for(String namespace : pack.getNamespaces(PackType.CLIENT_RESOURCES)) {`
`168`	`168`	`Collection<ResourceLocation> allBlockstates = pack.getResources(PackType.CLIENT_RESOURCES, namespace, "blockstates", Integer.MAX_VALUE, p -> p.endsWith(".json"));`
`169`	`169`	`for(ResourceLocation blockstate : allBlockstates) {`
`170`		`- allAvailableStates.add(new ResourceLocation(blockstate.getNamespace(), blockstate.getPath().replace("blockstates/", "").replace(".json", "")));`
	`170`	`+ allAvailableStates.add(new ResourceLocation(blockstate.getNamespace(), blockstate.getPath().replaceFirst("blockstates/", "").replace(".json", "")));`
`171`	`171`	`}`
`172`	`172`	`Collection<ResourceLocation> allModels = pack.getResources(PackType.CLIENT_RESOURCES, namespace, "models", Integer.MAX_VALUE, p -> p.endsWith(".json"));`
`173`	`173`	`for(ResourceLocation blockstate : allModels) {`
`174`		`- allAvailableModels.add(new ResourceLocation(blockstate.getNamespace(), blockstate.getPath().replace("models/", "").replace(".json", "")));`
	`174`	`+ allAvailableModels.add(new ResourceLocation(blockstate.getNamespace(), blockstate.getPath().replaceFirst("models/", "").replace(".json", "")));`
`175`	`175`	`}`
`176`	`176`	`}`
`177`	`177`	`if(!isTrustedPack.test(pack)) {`