Merge branch 'architectury-1.18.2' into architectury-1.19.2

UnlikePaladin · Jan 2, 2024 · 7cc605f · 7cc605f
2 parents d8541a8 + 20caadf
commit 7cc605f
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 2 deletions.
diff --git a/...ain/java/com/unlikepaladin/pfm/blocks/models/basicTable/fabric/FabricBasicTableModel.java b/...ain/java/com/unlikepaladin/pfm/blocks/models/basicTable/fabric/FabricBasicTableModel.java
@@ -142,7 +142,7 @@ public void emitBlockQuads(BlockRenderView world, BlockState state, BlockPos pos
                 }
 
                 if (north && south && !east) {
-                    ((FabricBakedModel) getTemplateBakedModels().get(2)).emitBlockQuads(world, state, pos, randomSupplier, context);
+                    ((FabricBakedModel) getTemplateBakedModels().get(12)).emitBlockQuads(world, state, pos, randomSupplier, context);
                 }
                 if (north && south && !west) {
                     ((FabricBakedModel) getTemplateBakedModels().get(11)).emitBlockQuads(world, state, pos, randomSupplier, context);

diff --git a/fabric/src/main/resources/pfm.mixins.json b/fabric/src/main/resources/pfm.mixins.json
@@ -11,7 +11,6 @@
     "PFMAbstractTagProvider$ObjectBuilderMixin",
     "PFMCookingPotBlockEntityMixin",
     "PFMMinecraftServerMixin",
-    "PFMMixinPointOfInterestType",
     "PFMReloadableResourceManagerImplMixin",
     "PFMSaveLoaderMixin",
     "PFMModResourcePackCreatorMixin"