Fix merge

copycats-plus · Jul 18, 2024 · 36224ca · 36224ca
1 parent bef810b
commit 36224ca
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 12 deletions.
diff --git a/common/src/main/java/com/copycatsplus/copycats/CCBlocks.java b/common/src/main/java/com/copycatsplus/copycats/CCBlocks.java
@@ -8,6 +8,7 @@
 import com.copycatsplus.copycats.content.copycat.block.CopycatBlockModelCore;
 import com.copycatsplus.copycats.content.copycat.board.CopycatBoardBlock;
 import com.copycatsplus.copycats.content.copycat.board.CopycatMultiBoardModelCore;
+import com.copycatsplus.copycats.content.copycat.button.CopycatStoneButtonBlock;
 import com.copycatsplus.copycats.content.copycat.button.CopycatWoodButtonBlock;
 import com.copycatsplus.copycats.content.copycat.button.CopycatButtonModelCore;
 import com.copycatsplus.copycats.content.copycat.bytes.CopycatByteBlock;
@@ -80,20 +81,17 @@
 import com.simibubi.create.content.kinetics.simpleRelays.BracketedKineticBlockModel;
 import com.simibubi.create.content.kinetics.simpleRelays.CogwheelBlockItem;
 import com.simibubi.create.foundation.data.BuilderTransformers;
+import com.simibubi.create.foundation.data.SharedProperties;
 import com.tterrag.registrate.providers.DataGenContext;
 import com.tterrag.registrate.providers.RegistrateBlockstateProvider;
 import com.tterrag.registrate.util.entry.BlockEntry;
 import com.tterrag.registrate.util.entry.RegistryEntry;
 import dev.architectury.injectables.annotations.ExpectPlatform;
-import net.minecraft.core.registries.BuiltInRegistries;
+import net.minecraft.core.Registry;
 import net.minecraft.tags.BlockTags;
 import net.minecraft.tags.ItemTags;
 import net.minecraft.world.level.block.Block;
 import net.minecraft.world.level.block.PressurePlateBlock;
-import net.minecraft.world.level.block.state.BlockBehaviour;
-import net.minecraft.world.level.block.state.properties.BlockSetType;
-import net.minecraft.world.level.material.MaterialColor;
-import org.jetbrains.annotations.NotNull;
 
 import java.util.HashSet;
 import java.util.Set;

diff --git a/fabric/src/main/java/com/copycatsplus/copycats/fabric/CCBuilderTransformersImpl.java b/fabric/src/main/java/com/copycatsplus/copycats/fabric/CCBuilderTransformersImpl.java
@@ -1,15 +1,14 @@
 package com.copycatsplus.copycats.fabric;
 
-import com.copycatsplus.copycats.datagen.CCBlockStateGen;
 import com.copycatsplus.copycats.foundation.copycat.ICopycatBlock;
 import com.copycatsplus.copycats.foundation.copycat.multistate.IMultiStateCopycatBlock;
 import com.simibubi.create.AllTags;
 import com.simibubi.create.foundation.data.SharedProperties;
 import com.simibubi.create.foundation.data.TagGen;
 import com.tterrag.registrate.builders.BlockBuilder;
 import com.tterrag.registrate.util.nullness.NonNullUnaryOperator;
-import net.minecraft.world.level.block.Block;
 import net.minecraft.client.renderer.RenderType;
+import net.minecraft.world.level.block.Block;
 import net.minecraft.world.level.material.MaterialColor;
 
 import static com.simibubi.create.foundation.data.TagGen.pickaxeOnly;
@@ -46,7 +45,7 @@ public static <B extends Block, P> NonNullUnaryOperator<BlockBuilder<B, P>> mult
 
     public static <B extends Block, P> NonNullUnaryOperator<BlockBuilder<B, P>> copycatBase() {
         return b -> b.initialProperties(SharedProperties::softMetal)
-                .properties(p -> p.mapColor(MapColor.GLOW_LICHEN).noOcclusion())
+                .properties(p -> p.color(MaterialColor.GLOW_LICHEN).noOcclusion())
                 .addLayer(() -> RenderType::cutoutMipped)
                 .tag(AllTags.AllBlockTags.FAN_TRANSPARENT.tag)
                 .transform(pickaxeOnly());

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}")
-    modImplementation("curse.maven:athena-841890:${athena_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/forge/src/main/java/com/copycatsplus/copycats/forge/CCBuilderTransformersImpl.java b/forge/src/main/java/com/copycatsplus/copycats/forge/CCBuilderTransformersImpl.java
@@ -47,7 +47,7 @@ public static <B extends Block, P> NonNullUnaryOperator<BlockBuilder<B, P>> mult
 
     public static <B extends Block, P> NonNullUnaryOperator<BlockBuilder<B, P>> copycatBase() {
         return b -> b.initialProperties(SharedProperties::softMetal)
-                .properties(p -> p.mapColor(MapColor.GLOW_LICHEN).noOcclusion())
+                .properties(p -> p.color(MaterialColor.GLOW_LICHEN).noOcclusion())
                 .addLayer(() -> RenderType::cutoutMipped)
                 .tag(AllTags.AllBlockTags.FAN_TRANSPARENT.tag)
                 .transform(pickaxeOnly());

diff --git a/gradle.properties b/gradle.properties
@@ -41,8 +41,7 @@ jei_forge_version=11.6.0.1019
 rubidium_forge_curse_id=4763255
 additionalplacements_forge_curse_id=5142062
 jade_forge_curse_id=4914105
-athena_forge_curse_id=5176879
-tfmg_forge_curse_id=5505872
+tfmg_forge_curse_id=5505873
 
 #Fabric Properties
 create_fabric_version=0.5.1-f-build.1347+mc1.19.2