Fix compatibility with Extended Cogwheels

copycats-plus · Jul 19, 2024 · 6068e92 · 6068e92
1 parent be7d021
commit 6068e92
Show file tree

Hide file tree

Showing 10 changed files with 18 additions and 28 deletions.
diff --git a/common/src/main/java/com/copycatsplus/copycats/foundation/copycat/ICopycatBlock.java b/common/src/main/java/com/copycatsplus/copycats/foundation/copycat/ICopycatBlock.java
@@ -1,6 +1,7 @@
 package com.copycatsplus.copycats.foundation.copycat;
 
 import com.copycatsplus.copycats.foundation.copycat.multistate.IMultiStateCopycatBlock;
+import com.copycatsplus.copycats.utility.BlockEntityUtils;
 import com.copycatsplus.copycats.utility.BlockFaceUtils;
 import com.simibubi.create.AllBlocks;
 import com.simibubi.create.AllItems;
@@ -103,7 +104,7 @@ default InteractionResult toggleCT(BlockState pState, Level pLevel, BlockPos pPo
             if (!canToggleCT(pState, pLevel, pPos))
                 return InteractionResult.PASS;
             fbe.setCTEnabled(!fbe.isCTEnabled());
-            fbe.redraw();
+            BlockEntityUtils.redraw((BlockEntity) fbe);
             return InteractionResult.SUCCESS;
         }
         return InteractionResult.PASS;

diff --git a/common/src/main/java/com/copycatsplus/copycats/foundation/copycat/ICopycatBlockEntity.java b/common/src/main/java/com/copycatsplus/copycats/foundation/copycat/ICopycatBlockEntity.java
@@ -114,7 +114,7 @@ default void setMaterial(BlockState blockState) {
             notifyUpdate();
             return;
         }
-        redraw();
+        BlockEntityUtils.redraw((BlockEntity) this);
     }
 
     default boolean cycleMaterial() {
@@ -196,7 +196,7 @@ static void read(ICopycatBlockEntity self, CompoundTag tag, boolean clientPacket
         }
 
         if (clientPacket && prevMaterial != self.getMaterial())
-            self.redraw();
+            BlockEntityUtils.redraw((BlockEntity) self); // not calling self.redraw() because Extended Cogwheels overwrites it to be protected
     }
 
     static void writeSafe(ICopycatBlockEntity self, CompoundTag tag) {
@@ -215,8 +215,4 @@ static void write(CompoundTag tag, ItemStack stack, BlockState material, boolean
         tag.put("Material", NbtUtils.writeBlockState(material));
         tag.putBoolean("EnableCT", enableCT);
     }
-
-    default void redraw() {
-        BlockEntityUtils.redraw((BlockEntity) this);
-    }
 }
diff --git a/...java/com/copycatsplus/copycats/foundation/copycat/multistate/IMultiStateCopycatBlock.java b/...java/com/copycatsplus/copycats/foundation/copycat/multistate/IMultiStateCopycatBlock.java
@@ -9,10 +9,10 @@
 import com.copycatsplus.copycats.foundation.copycat.model.ScaledBlockAndTintGetter;
 import com.copycatsplus.copycats.network.CCPackets;
 import com.copycatsplus.copycats.network.FillCopycatPacket;
+import com.copycatsplus.copycats.utility.BlockEntityUtils;
 import com.copycatsplus.copycats.utility.BlockFaceUtils;
 import com.simibubi.create.AllBlocks;
 import com.simibubi.create.AllItems;
-import com.simibubi.create.AllKeys;
 import com.simibubi.create.AllTags;
 import com.simibubi.create.content.contraptions.StructureTransform;
 import com.simibubi.create.foundation.block.IBE;
@@ -186,7 +186,7 @@ default InteractionResult toggleCT(BlockState state, Level level, BlockPos pos,
             if (be == null)
                 return InteractionResult.PASS;
             be.setEnableCT(property, !be.getMaterialItemStorage().getMaterialItem(property).enableCT());
-            be.redraw();
+            BlockEntityUtils.redraw((BlockEntity) be);
             return InteractionResult.SUCCESS;
         }
         return InteractionResult.PASS;

diff --git a/...om/copycatsplus/copycats/foundation/copycat/multistate/IMultiStateCopycatBlockEntity.java b/...om/copycatsplus/copycats/foundation/copycat/multistate/IMultiStateCopycatBlockEntity.java
@@ -1,6 +1,7 @@
 package com.copycatsplus.copycats.foundation.copycat.multistate;
 
 import com.copycatsplus.copycats.foundation.copycat.ICopycatBlockEntity;
+import com.copycatsplus.copycats.utility.BlockEntityUtils;
 import com.simibubi.create.AllBlocks;
 import com.simibubi.create.content.contraptions.StructureTransform;
 import com.simibubi.create.content.redstone.RoseQuartzLampBlock;
@@ -11,6 +12,7 @@
 import net.minecraft.nbt.CompoundTag;
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.level.block.TrapDoorBlock;
+import net.minecraft.world.level.block.entity.BlockEntity;
 import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.world.level.block.state.properties.BlockStateProperties;
 import org.jetbrains.annotations.ApiStatus;
@@ -115,7 +117,7 @@ default void setMaterial(String property, BlockState blockState) {
             notifyUpdate();
             return;
         }
-        redraw();
+        BlockEntityUtils.redraw((BlockEntity) this);
     }
 
     default boolean cycleMaterial(String property) {
@@ -167,7 +169,7 @@ static void read(IMultiStateCopycatBlockEntity self, CompoundTag tag, boolean cl
             boolean anyUpdated = self.getMaterialItemStorage().deserialize(tag.getCompound("material_data"));
 
             if (clientPacket && anyUpdated)
-                self.redraw();
+                BlockEntityUtils.redraw((BlockEntity) self); // not calling self.redraw() because Extended Cogwheels overwrites it to be protected
         }
     }
 

diff --git a/...com/copycatsplus/copycats/foundation/copycat/multistate/MultiStateCopycatBlockEntity.java b/...com/copycatsplus/copycats/foundation/copycat/multistate/MultiStateCopycatBlockEntity.java
@@ -2,6 +2,7 @@
 
 import com.copycatsplus.copycats.Copycats;
 import com.copycatsplus.copycats.foundation.copycat.ICopycatBlockEntity;
+import com.copycatsplus.copycats.utility.BlockEntityUtils;
 import com.simibubi.create.foundation.blockEntity.SmartBlockEntity;
 import com.simibubi.create.foundation.blockEntity.behaviour.BlockEntityBehaviour;
 import net.minecraft.MethodsReturnNonnullByDefault;
@@ -76,7 +77,7 @@ public void migrateData(ICopycatBlockEntity copycatBlockEntity) {
                     .orElse(null);
             if (firstProperty == null) {
                 Copycats.LOGGER.error("Failed to convert block({}) at @{} to a multistate copycat: no valid properties found", blockId.toString(), copycatBlockEntity.getBlockPos().toShortString());
-                redraw();
+                BlockEntityUtils.redraw(this);
                 return;
             }
             MaterialItemStorage.MaterialItem materialItem = materialItemStorage.getMaterialItem(firstProperty);
@@ -93,7 +94,7 @@ public void migrateData(ICopycatBlockEntity copycatBlockEntity) {
                     }
                 }
             }
-            redraw();
+            BlockEntityUtils.redraw(this);
         }
     }
 }
diff --git a/fabric/build.gradle b/fabric/build.gradle
@@ -56,6 +56,7 @@ dependencies {
     modImplementation("curse.maven:athena-841890:${athena_fabric_curse_id}")
     modImplementation("curse.maven:indium-459496:${indium_fabric_curse_id}")
     modLocalRuntime("maven.modrinth:sodium:${sodium_fabric_version}")
+    modLocalRuntime("maven.modrinth:extended-cogwheels:${extended_cogwheels_fabric_version}")
 
     annotationProcessor(implementation(include("io.github.llamalad7:mixinextras-fabric:${mixin_extras_version}")))
 

diff --git a/forge/build.gradle b/forge/build.gradle
@@ -57,6 +57,7 @@ dependencies {
     modImplementation("curse.maven:additional-placements-674852:${additionalplacements_forge_curse_id}")
     modImplementation("curse.maven:athena-841890:${athena_forge_curse_id}")
     modLocalRuntime("curse.maven:create-industry-693815:${tfmg_forge_curse_id}")
+    modLocalRuntime("curse.maven:create-extended-cogs-739973:${extended_cogwheels_forge_curse_id}")
 
     modCompileOnly("curse.maven:double-slabs-350179:${double_slabs_curse_id}")
 

diff --git a/...main/java/com/copycatsplus/copycats/forge/mixin/copycat/base/CopycatBlockEntityMixin.java b/...main/java/com/copycatsplus/copycats/forge/mixin/copycat/base/CopycatBlockEntityMixin.java
@@ -33,13 +33,6 @@ public CopycatBlockEntityMixin(BlockEntityType<?> type, BlockPos pos, BlockState
         super(type, pos, state);
     }
 
-    @Override
-    public void redraw() {
-        if (!isVirtual())
-            requestModelDataUpdate();
-        BlockEntityUtils.redraw(this);
-    }
-
     @Override
     public @NotNull ModelData getModelData() {
         return KineticCopycatRendererImpl.mergeData(

diff --git a/...splus/copycats/forge/mixin/copycat/base/multistate/MultiStateCopycatBlockEntityMixin.java b/...splus/copycats/forge/mixin/copycat/base/multistate/MultiStateCopycatBlockEntityMixin.java
@@ -32,13 +32,6 @@ public MultiStateCopycatBlockEntityMixin(BlockEntityType<?> type, BlockPos pos,
         super(type, pos, state);
     }
 
-    @Override
-    public void redraw() {
-        if (!isVirtual())
-            requestModelDataUpdate();
-        BlockEntityUtils.redraw(this);
-    }
-
     @Override
     public @NotNull ModelData getModelData() {
         return KineticCopycatRendererImpl.mergeData(

diff --git a/gradle.properties b/gradle.properties
@@ -17,7 +17,7 @@ parchment_version=2023.09.03
 
 #Mod Loaders
 enabled_platforms=fabric,forge
-fabric_loader_version=0.15.7
+fabric_loader_version=0.15.9
 fabric_api_version=0.92.0+1.20.1
 forge_version=1.20.1-47.2.20
 
@@ -43,6 +43,7 @@ additionalplacements_forge_curse_id=5142065
 jade_forge_curse_id=5390389
 athena_forge_curse_id=5176879
 tfmg_forge_curse_id=5505872
+extended_cogwheels_forge_curse_id=5229925
 
 #Fabric Properties
 create_fabric_version=0.5.1-f-build.1335+mc1.20.1
@@ -55,3 +56,4 @@ jade_fabric_curse_id=5339230
 athena_fabric_curse_id=5176880
 indium_fabric_curse_id=5493195
 sodium_fabric_version=mc1.20.1-0.5.11
+extended_cogwheels_fabric_version=2.1.1-1.20.1-0.5.1.f-fabric