Merge branch 'architectury-1.17.1' into architectury-1.16.5

# Conflicts: # common/src/main/java/com/unlikepaladin/pfm/blocks/models/ModelHelper.java
UnlikePaladin · Dec 28, 2023 · 90d853a · 90d853a
2 parents 674ba2a + 205c317
commit 90d853a
Showing 1 changed file with 8 additions and 2 deletions.
diff --git a/common/src/main/java/com/unlikepaladin/pfm/blocks/models/ModelHelper.java b/common/src/main/java/com/unlikepaladin/pfm/blocks/models/ModelHelper.java
@@ -189,12 +189,12 @@ public static Identifier getTextureId(Block block, String postfix) {
             BakedModel model = MinecraftClient.getInstance().getBakedModelManager().getBlockModels().getModel(block.getDefaultState());
             if (model != null) {
                 id = ((BakedQuadAccessor)model.getQuads(block.getDefaultState(), Direction.UP, new Random(42L)).get(0)).pfm$getSprite().getId();
-                if (id != null) {
+                if (id != null && id != MissingSprite.getMissingSpriteId()) {
                     blockToTextureMap.put(pair, new Pair<>(id, attemptNum));
                     return id;
                 }
                 id = ((BakedQuadAccessor)model.getQuads(block.getDefaultState(), Direction.DOWN, new Random(42L)).get(0)).pfm$getSprite().getId();
-                if (id != null) {
+                if (id != null && id != MissingSprite.getMissingSpriteId()) {
                     blockToTextureMap.put(pair, new Pair<>(id, attemptNum));
                     return id;
                 }
@@ -269,6 +269,9 @@ public static Identifier getPlankId(Block block) {
                 path = path.replace("ultra_", "").replace("_ultra", "");
                 path = "ultra_space/" + path;
             }
+            if (namespace.equals("blue_skies")) {
+                path = "wood/" + path;
+            }
             id = new Identifier(namespace, "block/" + path);
             path = path.replace("mining", "mine").replace("sorting", "sort").replace("transformation", "trans").replace("dark", "darkwood").replace("alpha_", "alpha_oak_").replace("flowering_pink", "flowerypink").replace("flowering_purple", "floweringpurple");
             Identifier id2 = new Identifier(namespace, "block/wood/" + path);
@@ -313,6 +316,9 @@ public static Identifier getLogId(Block block, String postFix) {
             path = path.replace("ultra_", "").replace("_ultra", "");
             path = "ultra_space/" + path;
         }
+        if (namespace.equals("blue_skies")) {
+            path = "wood/" + path;
+        }
         if (namespace.equals("byg") && path.contains("pedu"))
             path = path.replace("pedu", "log");
         if (path.contains("log") || path.contains("stem")) {