Fix merge

copycats-plus · Jul 18, 2024 · d930200 · d930200
1 parent 16c6f96
commit d930200
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 4 deletions.
diff --git a/...on/src/main/java/com/copycatsplus/copycats/foundation/copycat/model/CopycatModelCore.java b/...on/src/main/java/com/copycatsplus/copycats/foundation/copycat/model/CopycatModelCore.java
@@ -7,6 +7,7 @@
 import dev.architectury.injectables.annotations.ExpectPlatform;
 import net.fabricmc.api.EnvType;
 import net.fabricmc.api.Environment;
+import net.minecraft.client.renderer.RenderType;
 import net.minecraft.client.resources.model.BakedModel;
 import net.minecraft.world.level.block.state.BlockState;
 import org.jetbrains.annotations.NotNull;

diff --git a/...src/main/java/com/copycatsplus/copycats/mixin/copycat/fluid_pipe/FluidPipeBlockMixin.java b/...src/main/java/com/copycatsplus/copycats/mixin/copycat/fluid_pipe/FluidPipeBlockMixin.java
@@ -26,11 +26,11 @@ public class FluidPipeBlockMixin {
             at = @At(value = "INVOKE", target = "Lnet/minecraft/world/level/Level;setBlockAndUpdate(Lnet/minecraft/core/BlockPos;Lnet/minecraft/world/level/block/state/BlockState;)Z")
     )
     private boolean onWrenched(Level instance, BlockPos pos, BlockState state, Operation<Boolean> original) {
-/*        if (state.is(AllBlocks.GLASS_FLUID_PIPE.get()) && instance.getBlockState(pos).is(CCBlocks.COPYCAT_FLUID_PIPE.get())) {
+        if (state.is(AllBlocks.GLASS_FLUID_PIPE.get()) && instance.getBlockState(pos).is(CCBlocks.COPYCAT_FLUID_PIPE.get())) {
             return original.call(instance, pos, CCBlocks.COPYCAT_GLASS_FLUID_PIPE.getDefaultState()
                     .setValue(CopycatGlassFluidPipeBlock.AXIS, state.getValue(GlassFluidPipeBlock.AXIS))
                     .setValue(BlockStateProperties.WATERLOGGED, state.getValue(BlockStateProperties.WATERLOGGED)));
-        }*/
+        }
         return original.call(instance, pos, state);
     }
 }
diff --git a/forge/build.gradle b/forge/build.gradle
@@ -55,7 +55,6 @@ dependencies {
 
     modLocalRuntime("curse.maven:rubidium-574856:${rubidium_forge_curse_id}")
     modImplementation("curse.maven:additional-placements-674852:${additionalplacements_forge_curse_id}")
-    modLocalRuntime("curse.maven:create-industry-693815:${tfmg_forge_curse_id}")
 
     modCompileOnly("curse.maven:double-slabs-350179:${double_slabs_curse_id}")
 

diff --git a/gradle.properties b/gradle.properties
@@ -40,7 +40,6 @@ jei_forge_version=10.2.1.280
 rubidium_forge_curse_id=4494903
 additionalplacements_forge_curse_id=5142060
 jade_forge_curse_id=5079263
-tfmg_forge_curse_id=5505873
 
 #Fabric Properties
 create_fabric_version=0.5.1-f-build.1349+mc1.18.2