Merge branch 'architectury-1.17.1' into architectury-1.18.1

UnlikePaladin · Dec 28, 2023 · 585521f · 585521f
2 parents 094af0b + ae8d50e
commit 585521f
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 2 deletions.
diff --git a/...ain/resources/assets/pfm/models/block/table_modern_dinner/table_modern_dinner_middle.json b/...ain/resources/assets/pfm/models/block/table_modern_dinner/table_modern_dinner_middle.json
@@ -1,7 +1,6 @@
 {
 	"credit": "By UnlikePaladin",
 	"textures": {
-		"particle": "block/oak_planks",
 		"legs": "block/oak_log"
 	},
 	"elements": [

diff --git a/forge/src/main/java/com/unlikepaladin/pfm/blocks/models/forge/PFMForgeBakedModel.java b/forge/src/main/java/com/unlikepaladin/pfm/blocks/models/forge/PFMForgeBakedModel.java
@@ -62,6 +62,7 @@ public List<BakedQuad> getQuadsWithTexture(List<BakedQuad> quads, List<Sprite> t
                 continue;
             }
             List<BakedQuad> list = new ArrayList<>();
+            list.add(quad);
             separatedQuads.put(sprite, list);
         }
 

diff --git a/.../unlikepaladin/pfm/blocks/models/modernDinnerTable/forge/ForgeModernDinnerTableModel.java b/.../unlikepaladin/pfm/blocks/models/modernDinnerTable/forge/ForgeModernDinnerTableModel.java
@@ -67,7 +67,7 @@ public List<BakedQuad> getQuads(@Nullable BlockState state, @Nullable Direction
             boolean right = set.get(1);
             baseQuads.addAll(getTemplateBakedModels().get(0).getQuads(state, side, rand, extraData));
             if (left && right) {
-                baseQuads.addAll(getTemplateBakedModels().get(4).getQuads(state, side, rand, extraData));
+                secondaryQuads.addAll(getTemplateBakedModels().get(4).getQuads(state, side, rand, extraData));
             }
             if (!left && right) {
                 secondaryQuads.addAll(getTemplateBakedModels().get(1).getQuads(state, side, rand, extraData));