diff --git a/src/main/resources/data/botania/tags/blocks/pebble_sources.json b/garden_of_glass/src/main/resources/data/gardenofglass/tags/blocks/pebble_sources.json similarity index 96% rename from src/main/resources/data/botania/tags/blocks/pebble_sources.json rename to garden_of_glass/src/main/resources/data/gardenofglass/tags/blocks/pebble_sources.json index 7041e6ab2..cd67d8c1d 100644 --- a/src/main/resources/data/botania/tags/blocks/pebble_sources.json +++ b/garden_of_glass/src/main/resources/data/gardenofglass/tags/blocks/pebble_sources.json @@ -1,16 +1,16 @@ -{ - "__comment": "Blocks in this tag provide pebbles in Garden of Glass mode", - "replace": false, - "values": [ - "minecraft:grass_block", - "minecraft:dirt", - "minecraft:farmland", - "minecraft:grass_path", - "botania:dry_grass", - "botania:golden_grass", - "botania:vivid_grass", - "botania:scorched_grass", - "botania:infused_grass", - "botania:mutated_grass" - ] +{ + "__comment": "Blocks in this tag provide pebbles in Garden of Glass mode", + "replace": false, + "values": [ + "minecraft:grass_block", + "minecraft:dirt", + "minecraft:farmland", + "minecraft:grass_path", + "botania:dry_grass", + "botania:golden_grass", + "botania:vivid_grass", + "botania:scorched_grass", + "botania:infused_grass", + "botania:mutated_grass" + ] } \ No newline at end of file diff --git a/src/main/java/vazkii/botania/common/lib/ModTags.java b/src/main/java/vazkii/botania/common/lib/ModTags.java index afa9e5533..9450d633b 100644 --- a/src/main/java/vazkii/botania/common/lib/ModTags.java +++ b/src/main/java/vazkii/botania/common/lib/ModTags.java @@ -172,7 +172,6 @@ public class ModTags { public static final ITag.INamedTag GAIA_BREAK_BLACKLIST = tag("gaia_break_blacklist"); public static final ITag.INamedTag MAGNET_RING_BLACKLIST = tag("magnet_ring_blacklist"); - public static final ITag.INamedTag PEBBLE_SOURCES = tag("pebble_sources"); public static final ITag.INamedTag TERRAFORMABLE = tag("terraformable"); private static ITag.INamedTag tag(String name) { diff --git a/src/main/java/vazkii/botania/common/world/SkyblockWorldEvents.java b/src/main/java/vazkii/botania/common/world/SkyblockWorldEvents.java index 8f9e33db7..2eb609623 100644 --- a/src/main/java/vazkii/botania/common/world/SkyblockWorldEvents.java +++ b/src/main/java/vazkii/botania/common/world/SkyblockWorldEvents.java @@ -18,6 +18,8 @@ import net.minecraft.entity.player.ServerPlayerEntity; import net.minecraft.item.ItemStack; import net.minecraft.item.Items; import net.minecraft.nbt.CompoundNBT; +import net.minecraft.tags.BlockTags; +import net.minecraft.tags.ITag; import net.minecraft.util.ActionResultType; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.BlockRayTraceResult; @@ -40,6 +42,7 @@ public final class SkyblockWorldEvents { private SkyblockWorldEvents() {} + private static final ITag.INamedTag PEBBLE_SOURCES = BlockTags.makeWrapperTag("gardenofglass:pebble_sources"); private static final String TAG_MADE_ISLAND = "Botania-MadeIsland"; private static final String TAG_HAS_OWN_ISLAND = "Botania-HasOwnIsland"; private static final String TAG_ISLAND_X = "Botania-IslandX"; @@ -83,7 +86,7 @@ public final class SkyblockWorldEvents { BlockState state = event.getWorld().getBlockState(event.getPos()); Block block = state.getBlock(); - if (ModTags.Blocks.PEBBLE_SOURCES.contains(block)) { + if (PEBBLE_SOURCES.contains(block)) { SoundType st = state.getSoundType(event.getWorld(), event.getPos(), player); player.playSound(st.getBreakSound(), st.getVolume() * 0.4F, st.getPitch() + (float) (Math.random() * 0.2 - 0.1));