fix: facade issues

- remove facades when removing the block - fix facade dupe - remove unused code
Team-EnderIO · Dec 30, 2024 · ff23e13 · ff23e13
1 parent cb5d016
commit ff23e13
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 7 deletions.
diff --git a/enderio-conduits/src/main/java/com/enderio/conduits/client/ConduitClientSetup.java b/enderio-conduits/src/main/java/com/enderio/conduits/client/ConduitClientSetup.java
@@ -42,12 +42,6 @@ public class ConduitClientSetup {
     public static final ModelResourceLocation CONDUIT_IO_OUT = loc("block/io/output");
     public static final ModelResourceLocation CONDUIT_IO_REDSTONE = loc("block/io/redstone");
 
-    public static final ModelResourceLocation CONDUIT_FACADE = loc("block/conduit_facade");
-    public static final ModelResourceLocation CONDUIT_FACADE_HARDENED = loc("block/conduit_facade_hardened");
-    public static final ModelResourceLocation CONDUIT_FACADE_TRANSLUCENT = loc("block/conduit_facade_translucent");
-    public static final ModelResourceLocation CONDUIT_FACADE_TRANSLUCENT_HARDENED = loc(
-            "block/conduit_facade_translucent_hardened");
-
     private ConduitClientSetup() {
     }
 

diff --git a/enderio-conduits/src/main/java/com/enderio/conduits/common/conduit/ConduitBundle.java b/enderio-conduits/src/main/java/com/enderio/conduits/common/conduit/ConduitBundle.java
@@ -309,7 +309,7 @@ public Optional<FacadeType> facadeType() {
     }
 
     public void facade(ItemStack facadeItem) {
-        this.facadeItem = facadeItem.copy();
+        this.facadeItem = facadeItem.copyWithCount(1);
         onChanged();
     }
 

diff --git a/...its/src/main/java/com/enderio/conduits/common/conduit/block/ConduitBundleBlockEntity.java b/...its/src/main/java/com/enderio/conduits/common/conduit/block/ConduitBundleBlockEntity.java
@@ -222,6 +222,14 @@ private void onChunkUnloaded(ConduitSavedData savedData, Holder<Conduit<?>> cond
         savedData.putUnloadedNodeIdentifier(conduit, this.worldPosition, node);
     }
 
+    @Override
+    public void setRemoved() {
+        super.setRemoved();
+        if (level != null && level.isClientSide) {
+            FACADES.remove(worldPosition);
+        }
+    }
+
     public void everyTick() {
         if (level != null && !level.isClientSide) {
             serverTick();