Merge 1.18 into 1.19.2

embeddedt · embeddedt · commit 8bb70222ce8a · 2023-11-05T21:59:08.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
@@ -166,11 +166,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", p -> p.getPath().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", p -> p.getPath().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
`@@ -166,11 +166,11 @@ public static void gatherModelMaterials(ResourceManager manager, Predicate<PackR`
`166`	`166`	`for(String namespace : pack.getNamespaces(PackType.CLIENT_RESOURCES)) {`
`167`	`167`	`Collection<ResourceLocation> allBlockstates = pack.getResources(PackType.CLIENT_RESOURCES, namespace, "blockstates", p -> p.getPath().endsWith(".json"));`
`168`	`168`	`for(ResourceLocation blockstate : allBlockstates) {`
`169`		`- allAvailableStates.add(new ResourceLocation(blockstate.getNamespace(), blockstate.getPath().replace("blockstates/", "").replace(".json", "")));`
	`169`	`+ allAvailableStates.add(new ResourceLocation(blockstate.getNamespace(), blockstate.getPath().replaceFirst("blockstates/", "").replace(".json", "")));`
`170`	`170`	`}`
`171`	`171`	`Collection<ResourceLocation> allModels = pack.getResources(PackType.CLIENT_RESOURCES, namespace, "models", p -> p.getPath().endsWith(".json"));`
`172`	`172`	`for(ResourceLocation blockstate : allModels) {`
`173`		`- allAvailableModels.add(new ResourceLocation(blockstate.getNamespace(), blockstate.getPath().replace("models/", "").replace(".json", "")));`
	`173`	`+ allAvailableModels.add(new ResourceLocation(blockstate.getNamespace(), blockstate.getPath().replaceFirst("models/", "").replace(".json", "")));`
`174`	`174`	`}`
`175`	`175`	`}`
`176`	`176`	`if(!isTrustedPack.test(pack)) {`