From 51e4d9a6a31a26ee16967fba485655ec92ddffac Mon Sep 17 00:00:00 2001 From: UnlikePaladin <36827970+UnlikePaladin@users.noreply.github.com> Date: Sun, 24 Dec 2023 18:02:41 -0600 Subject: [PATCH 1/2] For real a bruh moment --- .../pfm/blocks/models/forge/PFMForgeBakedModel.java | 1 + 1 file changed, 1 insertion(+) 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 index 4ea85c8c8..8043bb2a9 100644 --- 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 getQuadsWithTexture(List quads, List t continue; } List list = new ArrayList<>(); + list.add(quad); separatedQuads.put(sprite, list); } From ae8d50ee20e073d9e97a84b85222aa27688d9fde Mon Sep 17 00:00:00 2001 From: UnlikePaladin <36827970+UnlikePaladin@users.noreply.github.com> Date: Wed, 27 Dec 2023 19:20:12 -0600 Subject: [PATCH 2/2] fixed a model error on Forge --- .../block/table_modern_dinner/table_modern_dinner_middle.json | 1 - .../modernDinnerTable/forge/ForgeModernDinnerTableModel.java | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/common/src/main/resources/assets/pfm/models/block/table_modern_dinner/table_modern_dinner_middle.json b/common/src/main/resources/assets/pfm/models/block/table_modern_dinner/table_modern_dinner_middle.json index 284a98267..fe43da1d2 100644 --- a/common/src/main/resources/assets/pfm/models/block/table_modern_dinner/table_modern_dinner_middle.json +++ b/common/src/main/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/modernDinnerTable/forge/ForgeModernDinnerTableModel.java b/forge/src/main/java/com/unlikepaladin/pfm/blocks/models/modernDinnerTable/forge/ForgeModernDinnerTableModel.java index d5fa630e4..2e8737418 100644 --- a/forge/src/main/java/com/unlikepaladin/pfm/blocks/models/modernDinnerTable/forge/ForgeModernDinnerTableModel.java +++ b/forge/src/main/java/com/unlikepaladin/pfm/blocks/models/modernDinnerTable/forge/ForgeModernDinnerTableModel.java @@ -67,7 +67,7 @@ public List 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));