From 332b74084289bb392ca56d1bbaa2504915385855 Mon Sep 17 00:00:00 2001 From: luxtracon Date: Fri, 24 May 2024 19:24:22 +0200 Subject: [PATCH] minor block tags refactoring --- ...ain_summons_on.json => dirt_and_sand.json} | 3 -- .../tags/blocks/myrmeke_summons_on.json | 14 --------- .../tags/blocks/slug_hide_blocks.json | 12 ------- .../goal/CaptainRevenantSummonGoal.java | 2 +- .../common/goal/MyrmekeQueenSummonGoal.java | 2 +- .../icaria/data/tags/IcariaBlockTags.java | 31 ++++++++----------- 6 files changed, 15 insertions(+), 49 deletions(-) rename src/generated/resources/data/landsoficaria/tags/blocks/{captain_summons_on.json => dirt_and_sand.json} (70%) delete mode 100644 src/generated/resources/data/landsoficaria/tags/blocks/myrmeke_summons_on.json delete mode 100644 src/generated/resources/data/landsoficaria/tags/blocks/slug_hide_blocks.json diff --git a/src/generated/resources/data/landsoficaria/tags/blocks/captain_summons_on.json b/src/generated/resources/data/landsoficaria/tags/blocks/dirt_and_sand.json similarity index 70% rename from src/generated/resources/data/landsoficaria/tags/blocks/captain_summons_on.json rename to src/generated/resources/data/landsoficaria/tags/blocks/dirt_and_sand.json index 4da6cae29..504b78d3e 100644 --- a/src/generated/resources/data/landsoficaria/tags/blocks/captain_summons_on.json +++ b/src/generated/resources/data/landsoficaria/tags/blocks/dirt_and_sand.json @@ -2,9 +2,6 @@ "values": [ "landsoficaria:grassy_marl", "landsoficaria:marl", - "landsoficaria:marl_chert", - "landsoficaria:marl_bones", - "landsoficaria:marl_lignite", "landsoficaria:coarse_marl", "landsoficaria:dry_lake_bed", "landsoficaria:loam", diff --git a/src/generated/resources/data/landsoficaria/tags/blocks/myrmeke_summons_on.json b/src/generated/resources/data/landsoficaria/tags/blocks/myrmeke_summons_on.json deleted file mode 100644 index 4da6cae29..000000000 --- a/src/generated/resources/data/landsoficaria/tags/blocks/myrmeke_summons_on.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "values": [ - "landsoficaria:grassy_marl", - "landsoficaria:marl", - "landsoficaria:marl_chert", - "landsoficaria:marl_bones", - "landsoficaria:marl_lignite", - "landsoficaria:coarse_marl", - "landsoficaria:dry_lake_bed", - "landsoficaria:loam", - "landsoficaria:grainel", - "landsoficaria:silksand" - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/landsoficaria/tags/blocks/slug_hide_blocks.json b/src/generated/resources/data/landsoficaria/tags/blocks/slug_hide_blocks.json deleted file mode 100644 index fc544e703..000000000 --- a/src/generated/resources/data/landsoficaria/tags/blocks/slug_hide_blocks.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "values": [ - "landsoficaria:grassy_marl", - "landsoficaria:marl", - "landsoficaria:marl_chert", - "landsoficaria:marl_bones", - "landsoficaria:marl_lignite", - "landsoficaria:coarse_marl", - "landsoficaria:dry_lake_bed", - "landsoficaria:loam" - ] -} \ No newline at end of file diff --git a/src/main/java/com/axanthic/icaria/common/goal/CaptainRevenantSummonGoal.java b/src/main/java/com/axanthic/icaria/common/goal/CaptainRevenantSummonGoal.java index de08570a2..b881e36e8 100644 --- a/src/main/java/com/axanthic/icaria/common/goal/CaptainRevenantSummonGoal.java +++ b/src/main/java/com/axanthic/icaria/common/goal/CaptainRevenantSummonGoal.java @@ -36,7 +36,7 @@ public void tick() { var blockPos = this.entity.blockPosition().offset(-8 + this.entity.getRandom().nextInt(16), 0, -8 + this.entity.getRandom().nextInt(16)); if (entity != null) { if (level.getBlockState(blockPos).canBeReplaced()) { - if (this.entity.getBlockStateOn().is(IcariaBlockTags.CAPTAIN_SUMMONS_ON)) { + if (this.entity.getBlockStateOn().is(IcariaBlockTags.DIRT_AND_SAND)) { entity.moveTo(blockPos, 0.0F, 0.0F); level.addFreshEntity(entity); } diff --git a/src/main/java/com/axanthic/icaria/common/goal/MyrmekeQueenSummonGoal.java b/src/main/java/com/axanthic/icaria/common/goal/MyrmekeQueenSummonGoal.java index 0386333b0..179d10589 100644 --- a/src/main/java/com/axanthic/icaria/common/goal/MyrmekeQueenSummonGoal.java +++ b/src/main/java/com/axanthic/icaria/common/goal/MyrmekeQueenSummonGoal.java @@ -37,7 +37,7 @@ public void tick() { var blockPos = this.entity.blockPosition().offset(-4 + this.entity.getRandom().nextInt(8), 0, -4 + this.entity.getRandom().nextInt(8)); if (entity != null) { if (level.getBlockState(blockPos).canBeReplaced()) { - if (this.entity.getBlockStateOn().is(IcariaBlockTags.MYRMEKE_SUMMONS_ON)) { + if (this.entity.getBlockStateOn().is(IcariaBlockTags.DIRT_AND_SAND)) { entity.moveTo(blockPos, 0.0F, 0.0F); level.addFreshEntity(entity); } diff --git a/src/main/java/com/axanthic/icaria/data/tags/IcariaBlockTags.java b/src/main/java/com/axanthic/icaria/data/tags/IcariaBlockTags.java index 00ad995d2..cab0ac8de 100644 --- a/src/main/java/com/axanthic/icaria/data/tags/IcariaBlockTags.java +++ b/src/main/java/com/axanthic/icaria/data/tags/IcariaBlockTags.java @@ -26,10 +26,10 @@ public class IcariaBlockTags extends BlockTagsProvider { // BLOCK TAGS - public static final TagKey SLUG_HIDE_BLOCKS = IcariaBlockTags.icariaTag("slug_hide_blocks"); + public static final TagKey DIRT_AND_SAND = IcariaBlockTags.icariaTag("dirt_and_sand"); - public static final TagKey MYRMEKE_SUMMONS_ON = IcariaBlockTags.icariaTag("myrmeke_summons_on"); - public static final TagKey CAPTAIN_SUMMONS_ON = IcariaBlockTags.icariaTag("captain_summons_on"); + public static final TagKey RUBBLE_SPAWNS_ON = IcariaBlockTags.icariaTag("rubble_spawns_on"); + public static final TagKey RELICSTONE_RUBBLE_SPAWNS_ON = IcariaBlockTags.icariaTag("relicstone_rubble_spawns_on"); public static final TagKey VILLAGE_REPLACE_BLOCKS = IcariaBlockTags.icariaTag("village_replace_blocks"); public static final TagKey RUINED_VILLAGE_REPLACE_BLOCKS = IcariaBlockTags.icariaTag("ruined_village_replace_blocks"); @@ -141,39 +141,34 @@ public IcariaBlockTags(PackOutput pOutput, CompletableFuture