Fix code after merge

copycats-plus · Aug 2, 2024 · f2e5732 · f2e5732
1 parent 44651d8
commit f2e5732
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 6 deletions.
diff --git a/...c/main/java/com/copycatsplus/copycats/content/copycat/button/CopycatStoneButtonBlock.java b/...c/main/java/com/copycatsplus/copycats/content/copycat/button/CopycatStoneButtonBlock.java
@@ -62,8 +62,7 @@ public void setPlacedBy(Level pLevel, BlockPos pPos, BlockState pState, @Nullabl
 
     @Override
     public void onRemove(BlockState pState, Level pLevel, BlockPos pPos, BlockState pNewState, boolean pIsMoving) {
-        ICopycatBlock.super.onRemove(pState, pLevel, pPos, pNewState, pIsMoving);
-        super.onRemove(pState, pLevel, pPos, pNewState, pIsMoving);
+        ICopycatBlock.super.onRemove(pState, pLevel, pPos, pNewState, pIsMoving, super::onRemove);
     }
 
     @Override

diff --git a/fabric/src/main/java/com/copycatsplus/copycats/fabric/CCBuilderTransformersImpl.java b/fabric/src/main/java/com/copycatsplus/copycats/fabric/CCBuilderTransformersImpl.java
@@ -17,7 +17,7 @@ public static <B extends Block, P> NonNullUnaryOperator<BlockBuilder<B, P>> copy
                 .blockstate((c, p) -> p.simpleBlock(c.get(), p.models()
                         .getExistingFile(p.mcLoc("air"))))
                 .initialProperties(SharedProperties::softMetal)
-                .properties(p -> p.noOcclusion().color(MaterialColor.NONE).forceSolidOn())
+                .properties(p -> p.noOcclusion().color(MaterialColor.NONE))
                 // fabric: only render base model on cutout. When rendering the wrapped model's material is copied.
                 .addLayer(() -> RenderType::cutout)
                 .color(() -> ICopycatBlock::wrappedColor)
@@ -29,7 +29,7 @@ public static <B extends Block, P> NonNullUnaryOperator<BlockBuilder<B, P>> mult
                 .blockstate((c, p) -> p.simpleBlock(c.get(), p.models()
                         .getExistingFile(p.mcLoc("air"))))
                 .initialProperties(SharedProperties::softMetal)
-                .properties(p -> p.noOcclusion().color(MaterialColor.NONE).forceSolidOn())
+                .properties(p -> p.noOcclusion().color(MaterialColor.NONE))
                 .addLayer(() -> RenderType::solid)
                 .addLayer(() -> RenderType::cutout)
                 .addLayer(() -> RenderType::cutoutMipped)

diff --git a/forge/src/main/java/com/copycatsplus/copycats/forge/CCBuilderTransformersImpl.java b/forge/src/main/java/com/copycatsplus/copycats/forge/CCBuilderTransformersImpl.java
@@ -17,7 +17,7 @@ public static <B extends Block, P> NonNullUnaryOperator<BlockBuilder<B, P>> copy
                 .blockstate((c, p) -> p.simpleBlock(c.get(), p.models()
                         .getExistingFile(p.mcLoc("air"))))
                 .initialProperties(SharedProperties::softMetal)
-                .properties(p -> p.noOcclusion().color(MaterialColor.NONE).forceSolidOn())
+                .properties(p -> p.noOcclusion().color(MaterialColor.NONE))
                 .addLayer(() -> RenderType::solid)
                 .addLayer(() -> RenderType::cutout)
                 .addLayer(() -> RenderType::cutoutMipped)
@@ -31,7 +31,7 @@ public static <B extends Block, P> NonNullUnaryOperator<BlockBuilder<B, P>> mult
                 .blockstate((c, p) -> p.simpleBlock(c.get(), p.models()
                         .getExistingFile(p.mcLoc("air"))))
                 .initialProperties(SharedProperties::softMetal)
-                .properties(p -> p.noOcclusion().color(MaterialColor.NONE).forceSolidOn())
+                .properties(p -> p.noOcclusion().color(MaterialColor.NONE))
                 .addLayer(() -> RenderType::solid)
                 .addLayer(() -> RenderType::cutout)
                 .addLayer(() -> RenderType::cutoutMipped)