removed an unnecessary tag

KyaniteMods · Dec 3, 2023 · 020c1f2 · 020c1f2
1 parent 1f8d3fa
commit 020c1f2
Show file tree

Hide file tree

Showing 5 changed files with 2 additions and 13 deletions.
diff --git a/src/generated/resources/.cache/2b1c4c301b77a741c666834d476e7a049e70d3df b/src/generated/resources/.cache/2b1c4c301b77a741c666834d476e7a049e70d3df
@@ -1,7 +1,6 @@
-// 1.20.1	2023-12-03T14:33:13.0903743	Tags for minecraft:block mod id deeperdarker
+// 1.20.1	2023-12-03T14:35:48.5597206	Tags for minecraft:block mod id deeperdarker
 7d44281ae960cc3804e46c4d7ae2b88440d7a7cf data/deeperdarker/tags/blocks/bloom_stems.json
 3254a070f3d679712b15610724ab74c5900e0204 data/deeperdarker/tags/blocks/echo_logs.json
-7bc8986cab053fefad0438a574d6ee6ae0f5a2b2 data/deeperdarker/tags/blocks/echo_sapling_placeable.json
 5fc75620cbf33b6fbe8762687116de2f0df1bd34 data/deeperdarker/tags/blocks/gloomslate_replaceable.json
 1b524a72db2dc423a915068148fa9e921f2e46f5 data/deeperdarker/tags/blocks/gloomy_sculk_replaceable.json
 8578e12406e1c266232a54a95ac849d05041d948 data/deeperdarker/tags/blocks/infiniburn_otherside.json

diff --git a/src/generated/resources/data/deeperdarker/tags/blocks/echo_sapling_placeable.json b/src/generated/resources/data/deeperdarker/tags/blocks/echo_sapling_placeable.json
diff --git a/src/main/java/com/kyanite/deeperdarker/content/DDBlocks.java b/src/main/java/com/kyanite/deeperdarker/content/DDBlocks.java
@@ -6,7 +6,6 @@
 import com.kyanite.deeperdarker.content.blocks.vegetation.*;
 import com.kyanite.deeperdarker.content.entities.blocks.DDHangingSignBlockEntity;
 import com.kyanite.deeperdarker.content.entities.blocks.DDSignBlockEntity;
-import com.kyanite.deeperdarker.util.DDTags;
 import com.kyanite.deeperdarker.world.trees.EchoTreeGrower;
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.Direction;
@@ -51,7 +50,7 @@ public class DDBlocks {
     public static final RegistryObject<SaplingBlock> ECHO_SAPLING = register("echo_sapling", () -> new SaplingBlock(new EchoTreeGrower(), BlockBehaviour.Properties.copy(Blocks.OAK_SAPLING)) {
         @Override
         protected boolean mayPlaceOn(BlockState pState, BlockGetter pLevel, BlockPos pPos) {
-            return pState.is(DDTags.Blocks.ECHO_SAPLING_PLACEABLE);
+            return pState.is(DDBlocks.ECHO_SOIL.get()) || pState.is(DDBlocks.SCULK_GRIME.get());
         }
     });
     public static final RegistryObject<StandingSignBlock> ECHO_SIGN = BLOCKS.register("echo_sign", () -> new StandingSignBlock(BlockBehaviour.Properties.copy(Blocks.OAK_SIGN).mapColor(MapColor.COLOR_LIGHT_GRAY), ECHO) {

diff --git a/src/main/java/com/kyanite/deeperdarker/datagen/data/DDBlockTagsProvider.java b/src/main/java/com/kyanite/deeperdarker/datagen/data/DDBlockTagsProvider.java
@@ -99,7 +99,6 @@ protected void addTags(HolderLookup.@NotNull Provider pProvider) {
         tag(Tags.Blocks.ORES_DIAMOND).add(DDBlocks.SCULK_STONE_DIAMOND_ORE.get(), DDBlocks.GLOOMSLATE_DIAMOND_ORE.get());
 
         tag(DDTags.Blocks.ECHO_LOGS).add(DDBlocks.ECHO_LOG.get(), DDBlocks.ECHO_WOOD.get(), DDBlocks.STRIPPED_ECHO_LOG.get(), DDBlocks.STRIPPED_ECHO_WOOD.get());
-        tag(DDTags.Blocks.ECHO_SAPLING_PLACEABLE).add(DDBlocks.ECHO_SOIL.get(), DDBlocks.SCULK_GRIME.get(), Blocks.SCULK);
         tag(DDTags.Blocks.BLOOM_STEMS).add(DDBlocks.BLOOMING_STEM.get(), DDBlocks.STRIPPED_BLOOMING_STEM.get());
         tag(DDTags.Blocks.SCULK_STONE_REPLACEABLES).add(DDBlocks.SCULK_STONE.get(), DDBlocks.SCULK_GRIME.get());
         tag(DDTags.Blocks.SCULK_REPLACEABLES).add(Blocks.SCULK, DDBlocks.SCULK_GRIME.get());

diff --git a/src/main/java/com/kyanite/deeperdarker/util/DDTags.java b/src/main/java/com/kyanite/deeperdarker/util/DDTags.java
@@ -13,7 +13,6 @@
 public class DDTags {
     public static class Blocks {
         public static final TagKey<Block> ECHO_LOGS = tag("echo_logs");
-        public static final TagKey<Block> ECHO_SAPLING_PLACEABLE = tag("echo_sapling_placeable");
         public static final TagKey<Block> BLOOM_STEMS = tag("bloom_stems");
         public static final TagKey<Block> SCULK_STONE_REPLACEABLES = tag("sculk_stone_replaceables");
         public static final TagKey<Block> SCULK_REPLACEABLES = tag("sculk_replaceables");