From 0f5d4e73faf7ae6fca943c1adfa888f628a0ca4f Mon Sep 17 00:00:00 2001 From: Frank Date: Sun, 19 Jun 2022 23:31:08 +0200 Subject: [PATCH] [Fix] Correct Tags for Dragon-Immune (#11) --- .../org/betterx/betterend/complexmaterials/MetalMaterial.java | 4 ++-- .../org/betterx/betterend/complexmaterials/StoneMaterial.java | 3 ++- src/main/java/org/betterx/betterend/registry/EndTags.java | 3 ++- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/main/java/org/betterx/betterend/complexmaterials/MetalMaterial.java b/src/main/java/org/betterx/betterend/complexmaterials/MetalMaterial.java index dd095eda..a332dc25 100644 --- a/src/main/java/org/betterx/betterend/complexmaterials/MetalMaterial.java +++ b/src/main/java/org/betterx/betterend/complexmaterials/MetalMaterial.java @@ -1,6 +1,5 @@ package org.betterx.betterend.complexmaterials; -import org.betterx.bclib.api.v2.tag.CommonBlockTags; import org.betterx.bclib.api.v2.tag.NamedBlockTags; import org.betterx.bclib.api.v2.tag.NamedItemTags; import org.betterx.bclib.api.v2.tag.TagAPI; @@ -27,6 +26,7 @@ import org.betterx.betterend.recipe.builders.AlloyingRecipe; import org.betterx.betterend.registry.EndBlocks; import org.betterx.betterend.registry.EndItems; +import net.minecraft.tags.BlockTags; import net.minecraft.tags.TagKey; import net.minecraft.world.entity.EquipmentSlot; import net.minecraft.world.item.ArmorMaterial; @@ -509,6 +509,6 @@ public class MetalMaterial { TagAPI.addBlockTag(NamedBlockTags.ANVIL, anvilBlock); TagAPI.addBlockTag(NamedBlockTags.BEACON_BASE_BLOCKS, block); TagAPI.addItemTag(NamedItemTags.BEACON_PAYMENT_ITEMS, ingot); - TagAPI.addBlockTag(CommonBlockTags.DRAGON_IMMUNE, ore, bars); + TagAPI.addBlockTag(BlockTags.DRAGON_IMMUNE, ore, bars); } } \ No newline at end of file diff --git a/src/main/java/org/betterx/betterend/complexmaterials/StoneMaterial.java b/src/main/java/org/betterx/betterend/complexmaterials/StoneMaterial.java index db8b112c..ea898a34 100644 --- a/src/main/java/org/betterx/betterend/complexmaterials/StoneMaterial.java +++ b/src/main/java/org/betterx/betterend/complexmaterials/StoneMaterial.java @@ -12,6 +12,7 @@ import org.betterx.betterend.recipe.CraftingRecipes; import org.betterx.betterend.registry.EndBlocks; import org.betterx.betterend.registry.EndItems; +import net.minecraft.tags.BlockTags; import net.minecraft.world.level.block.Block; import net.minecraft.world.level.block.Blocks; import net.minecraft.world.level.material.MaterialColor; @@ -187,7 +188,7 @@ public class StoneMaterial { TagAPI.addBlockTags(pressurePlate, NamedBlockTags.PRESSURE_PLATES, NamedBlockTags.STONE_PRESSURE_PLATES); TagAPI.addBlockTag(CommonBlockTags.END_STONES, stone); - TagAPI.addBlockTag(CommonBlockTags.DRAGON_IMMUNE, stone, stairs, slab, wall); + TagAPI.addBlockTag(BlockTags.DRAGON_IMMUNE, stone, stairs, slab, wall); TagAPI.addBlockTag(CommonBlockTags.END_STONES, stone); TagAPI.addBlockTag(CommonBlockTags.END_STONES, stone); diff --git a/src/main/java/org/betterx/betterend/registry/EndTags.java b/src/main/java/org/betterx/betterend/registry/EndTags.java index 82c2a38b..97eb4751 100644 --- a/src/main/java/org/betterx/betterend/registry/EndTags.java +++ b/src/main/java/org/betterx/betterend/registry/EndTags.java @@ -11,6 +11,7 @@ import org.betterx.betterend.blocks.basis.PedestalBlock; import org.betterx.betterend.item.tool.EndHammerItem; import org.betterx.betterend.world.biome.EndBiome; +import net.minecraft.tags.BlockTags; import net.minecraft.tags.TagKey; import net.minecraft.world.food.FoodProperties; import net.minecraft.world.item.Item; @@ -109,7 +110,7 @@ public class EndTags { TagAPI.addBlockTag(NamedBlockTags.BEACON_BASE_BLOCKS, EndBlocks.AETERNIUM_BLOCK); TagAPI.addItemTag(NamedItemTags.BEACON_PAYMENT_ITEMS, EndItems.AETERNIUM_INGOT); TagAPI.addBlockTag( - CommonBlockTags.DRAGON_IMMUNE, + BlockTags.DRAGON_IMMUNE, EndBlocks.ENDER_ORE, EndBlocks.ETERNAL_PEDESTAL, EndBlocks.FLAVOLITE_RUNED_ETERNAL,