MinecraftMods/BetterEnd
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Tag update

Browse source
This commit is contained in:
paulevsGitch 2021-07-20 05:05:34 +03:00
parent b2bb33d644
commit a3d2b2458a
8 changed files with 78 additions and 84 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/main/java/ru/betterend/blocks/complex/CrystalSubblocksMaterial.java
View file

@ -4,11 +4,11 @@ import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings;
import net.minecraft.tags.BlockTags; import net.minecraft.tags.BlockTags;
import net.minecraft.tags.ItemTags; import net.minecraft.tags.ItemTags;
import net.minecraft.world.level.block.Block; import net.minecraft.world.level.block.Block;
import ru.bclib.api.TagAPI;
import ru.bclib.blocks.BaseSlabBlock; import ru.bclib.blocks.BaseSlabBlock;
import ru.bclib.blocks.BaseStairsBlock; import ru.bclib.blocks.BaseStairsBlock;
import ru.bclib.blocks.BaseWallBlock; import ru.bclib.blocks.BaseWallBlock;
import ru.bclib.recipes.GridRecipe; import ru.bclib.recipes.GridRecipe;
import ru.bclib.util.TagHelper;
import ru.betterend.BetterEnd; import ru.betterend.BetterEnd;
import ru.betterend.blocks.EndPedestal; import ru.betterend.blocks.EndPedestal;
import ru.betterend.blocks.basis.LitBaseBlock; import ru.betterend.blocks.basis.LitBaseBlock;
@ -120,14 +120,14 @@ public class CrystalSubblocksMaterial {
CraftingRecipes.registerPedestal(name + "_pedestal", pedestal, slab, pillar); CraftingRecipes.registerPedestal(name + "_pedestal", pedestal, slab, pillar);
// Item Tags // // Item Tags //
TagHelper.addTag(ItemTags.SLABS, slab, brick_slab); TagAPI.addTag(ItemTags.SLABS, slab, brick_slab);
TagHelper.addTag(ItemTags.STONE_BRICKS, bricks); TagAPI.addTag(ItemTags.STONE_BRICKS, bricks);
TagHelper.addTag(ItemTags.STONE_CRAFTING_MATERIALS, source); TagAPI.addTag(ItemTags.STONE_CRAFTING_MATERIALS, source);
TagHelper.addTag(ItemTags.STONE_TOOL_MATERIALS, source); TagAPI.addTag(ItemTags.STONE_TOOL_MATERIALS, source);
// Block Tags // // Block Tags //
TagHelper.addTag(BlockTags.STONE_BRICKS, bricks); TagAPI.addTag(BlockTags.STONE_BRICKS, bricks);
TagHelper.addTag(BlockTags.WALLS, wall, brick_wall); TagAPI.addTag(BlockTags.WALLS, wall, brick_wall);
TagHelper.addTag(BlockTags.SLABS, slab, brick_slab); TagAPI.addTag(BlockTags.SLABS, slab, brick_slab);
} }
} }

13
src/main/java/ru/betterend/blocks/complex/MetalMaterial.java
View file

@ -33,7 +33,6 @@ import ru.bclib.items.tool.BaseSwordItem;
import ru.bclib.recipes.FurnaceRecipe; import ru.bclib.recipes.FurnaceRecipe;
import ru.bclib.recipes.GridRecipe; import ru.bclib.recipes.GridRecipe;
import ru.bclib.recipes.SmithingTableRecipe; import ru.bclib.recipes.SmithingTableRecipe;
import ru.bclib.util.TagHelper;
import ru.betterend.BetterEnd; import ru.betterend.BetterEnd;
import ru.betterend.blocks.BulbVineLanternBlock; import ru.betterend.blocks.BulbVineLanternBlock;
import ru.betterend.blocks.BulbVineLanternColoredBlock; import ru.betterend.blocks.BulbVineLanternColoredBlock;
@ -154,7 +153,7 @@ public class MetalMaterial {
ore = hasOre ? EndBlocks.registerBlock(name + "_ore", new BaseOreBlock(rawOre, 1, 3, 1)) : null; ore = hasOre ? EndBlocks.registerBlock(name + "_ore", new BaseOreBlock(rawOre, 1, 3, 1)) : null;
alloyingOre = hasOre ? TagAPI.makeItemTag(BetterEnd.MOD_ID, name + "_alloying") : null; alloyingOre = hasOre ? TagAPI.makeItemTag(BetterEnd.MOD_ID, name + "_alloying") : null;
if (hasOre) { if (hasOre) {
TagHelper.addTag(alloyingOre, ore, rawOre); TagAPI.addTag(alloyingOre, ore, rawOre);
} }
block = EndBlocks.registerBlock(name + "_block", new BaseBlock(settings)); block = EndBlocks.registerBlock(name + "_block", new BaseBlock(settings));
@ -485,10 +484,10 @@ public class MetalMaterial {
.setGroup("end_metal_boots") .setGroup("end_metal_boots")
.build(); .build();
TagHelper.addTag(BlockTags.ANVIL, anvilBlock); TagAPI.addTag(BlockTags.ANVIL, anvilBlock);
TagHelper.addTag(BlockTags.BEACON_BASE_BLOCKS, block); TagAPI.addTag(BlockTags.BEACON_BASE_BLOCKS, block);
TagHelper.addTag(ItemTags.BEACON_PAYMENT_ITEMS, ingot); TagAPI.addTag(ItemTags.BEACON_PAYMENT_ITEMS, ingot);
TagHelper.addTag(TagAPI.DRAGON_IMMUNE, ore, bars); TagAPI.addTag(TagAPI.DRAGON_IMMUNE, ore, bars);
TagHelper.addTag(TagAPI.HAMMERS, hammer); TagAPI.addTag(TagAPI.HAMMERS, hammer);
} }
} }

23
src/main/java/ru/betterend/blocks/complex/StoneMaterial.java
View file

@ -16,7 +16,6 @@ import ru.bclib.blocks.BaseStoneButtonBlock;
import ru.bclib.blocks.BaseWallBlock; import ru.bclib.blocks.BaseWallBlock;
import ru.bclib.blocks.StonePressurePlateBlock; import ru.bclib.blocks.StonePressurePlateBlock;
import ru.bclib.recipes.GridRecipe; import ru.bclib.recipes.GridRecipe;
import ru.bclib.util.TagHelper;
import ru.betterend.BetterEnd; import ru.betterend.BetterEnd;
import ru.betterend.blocks.EndPedestal; import ru.betterend.blocks.EndPedestal;
import ru.betterend.blocks.FlowerPotBlock; import ru.betterend.blocks.FlowerPotBlock;
@ -178,19 +177,19 @@ public class StoneMaterial {
CraftingRecipes.registerPedestal(name + "_pedestal", pedestal, slab, pillar); CraftingRecipes.registerPedestal(name + "_pedestal", pedestal, slab, pillar);
// Item Tags // // Item Tags //
TagHelper.addTag(ItemTags.SLABS, slab, brickSlab); TagAPI.addTag(ItemTags.SLABS, slab, brickSlab);
TagHelper.addTag(ItemTags.STONE_BRICKS, bricks); TagAPI.addTag(ItemTags.STONE_BRICKS, bricks);
TagHelper.addTag(ItemTags.STONE_CRAFTING_MATERIALS, stone); TagAPI.addTag(ItemTags.STONE_CRAFTING_MATERIALS, stone);
TagHelper.addTag(ItemTags.STONE_TOOL_MATERIALS, stone); TagAPI.addTag(ItemTags.STONE_TOOL_MATERIALS, stone);
TagHelper.addTag(TagAPI.FURNACES, furnace); TagAPI.addTag(TagAPI.FURNACES, furnace);
// Block Tags // // Block Tags //
TagHelper.addTag(BlockTags.STONE_BRICKS, bricks); TagAPI.addTag(BlockTags.STONE_BRICKS, bricks);
TagHelper.addTag(BlockTags.WALLS, wall, brickWall); TagAPI.addTag(BlockTags.WALLS, wall, brickWall);
TagHelper.addTag(BlockTags.SLABS, slab, brickSlab); TagAPI.addTag(BlockTags.SLABS, slab, brickSlab);
TagHelper.addTags(pressurePlate, BlockTags.PRESSURE_PLATES, BlockTags.STONE_PRESSURE_PLATES); TagAPI.addTags(pressurePlate, BlockTags.PRESSURE_PLATES, BlockTags.STONE_PRESSURE_PLATES);
TagHelper.addTag(TagAPI.END_STONES, stone); TagAPI.addTag(TagAPI.END_STONES, stone);
TagHelper.addTag(TagAPI.DRAGON_IMMUNE, stone, stairs, slab, wall); TagAPI.addTag(TagAPI.DRAGON_IMMUNE, stone, stairs, slab, wall);
} }
} }

51
src/main/java/ru/betterend/blocks/complex/WoodenMaterial.java
View file

@ -33,7 +33,6 @@ import ru.bclib.blocks.BaseWoodenButtonBlock;
import ru.bclib.blocks.StripableBarkBlock; import ru.bclib.blocks.StripableBarkBlock;
import ru.bclib.blocks.WoodenPressurePlateBlock; import ru.bclib.blocks.WoodenPressurePlateBlock;
import ru.bclib.recipes.GridRecipe; import ru.bclib.recipes.GridRecipe;
import ru.bclib.util.TagHelper;
import ru.betterend.BetterEnd; import ru.betterend.BetterEnd;
import ru.betterend.config.Configs; import ru.betterend.config.Configs;
import ru.betterend.registry.EndBlocks; import ru.betterend.registry.EndBlocks;
@ -226,38 +225,38 @@ public class WoodenMaterial {
.build(); .build();
// Item Tags // // Item Tags //
TagHelper.addTag(ItemTags.PLANKS, planks); TagAPI.addTag(ItemTags.PLANKS, planks);
TagHelper.addTag(ItemTags.WOODEN_PRESSURE_PLATES, pressurePlate); TagAPI.addTag(ItemTags.WOODEN_PRESSURE_PLATES, pressurePlate);
TagHelper.addTag(ItemTags.LOGS, log, bark, log_stripped, bark_stripped); TagAPI.addTag(ItemTags.LOGS, log, bark, log_stripped, bark_stripped);
TagHelper.addTag(ItemTags.LOGS_THAT_BURN, log, bark, log_stripped, bark_stripped); TagAPI.addTag(ItemTags.LOGS_THAT_BURN, log, bark, log_stripped, bark_stripped);
TagHelper.addTags(button, ItemTags.WOODEN_BUTTONS, ItemTags.BUTTONS); TagAPI.addTags(button, ItemTags.WOODEN_BUTTONS, ItemTags.BUTTONS);
TagHelper.addTags(door, ItemTags.WOODEN_DOORS, ItemTags.DOORS); TagAPI.addTags(door, ItemTags.WOODEN_DOORS, ItemTags.DOORS);
TagHelper.addTags(fence, ItemTags.WOODEN_FENCES, ItemTags.FENCES); TagAPI.addTags(fence, ItemTags.WOODEN_FENCES, ItemTags.FENCES);
TagHelper.addTags(slab, ItemTags.WOODEN_SLABS, ItemTags.SLABS); TagAPI.addTags(slab, ItemTags.WOODEN_SLABS, ItemTags.SLABS);
TagHelper.addTags(stairs, ItemTags.WOODEN_STAIRS, ItemTags.STAIRS); TagAPI.addTags(stairs, ItemTags.WOODEN_STAIRS, ItemTags.STAIRS);
TagHelper.addTags(trapdoor, ItemTags.WOODEN_TRAPDOORS, ItemTags.TRAPDOORS); TagAPI.addTags(trapdoor, ItemTags.WOODEN_TRAPDOORS, ItemTags.TRAPDOORS);
TagHelper.addTag(TagAPI.ITEM_CHEST, chest); TagAPI.addTag(TagAPI.ITEM_CHEST, chest);
// Block Tags // // Block Tags //
TagHelper.addTag(BlockTags.PLANKS, planks); TagAPI.addTag(BlockTags.PLANKS, planks);
TagHelper.addTag(BlockTags.CLIMBABLE, ladder); TagAPI.addTag(BlockTags.CLIMBABLE, ladder);
TagHelper.addTag(BlockTags.LOGS, log, bark, log_stripped, bark_stripped); TagAPI.addTag(BlockTags.LOGS, log, bark, log_stripped, bark_stripped);
TagHelper.addTag(BlockTags.LOGS_THAT_BURN, log, bark, log_stripped, bark_stripped); TagAPI.addTag(BlockTags.LOGS_THAT_BURN, log, bark, log_stripped, bark_stripped);
TagHelper.addTags(button, BlockTags.WOODEN_BUTTONS, BlockTags.BUTTONS); TagAPI.addTags(button, BlockTags.WOODEN_BUTTONS, BlockTags.BUTTONS);
TagHelper.addTags(door, BlockTags.WOODEN_DOORS, BlockTags.DOORS); TagAPI.addTags(door, BlockTags.WOODEN_DOORS, BlockTags.DOORS);
TagHelper.addTags(fence, BlockTags.WOODEN_FENCES, BlockTags.FENCES); TagAPI.addTags(fence, BlockTags.WOODEN_FENCES, BlockTags.FENCES);
TagHelper.addTags(slab, BlockTags.WOODEN_SLABS, BlockTags.SLABS); TagAPI.addTags(slab, BlockTags.WOODEN_SLABS, BlockTags.SLABS);
TagHelper.addTags(stairs, BlockTags.WOODEN_STAIRS, BlockTags.STAIRS); TagAPI.addTags(stairs, BlockTags.WOODEN_STAIRS, BlockTags.STAIRS);
TagHelper.addTags(trapdoor, BlockTags.WOODEN_TRAPDOORS, BlockTags.TRAPDOORS); TagAPI.addTags(trapdoor, BlockTags.WOODEN_TRAPDOORS, BlockTags.TRAPDOORS);
TagHelper.addTag(TagAPI.BOOKSHELVES, shelf); TagAPI.addTag(TagAPI.BOOKSHELVES, shelf);
TagHelper.addTag(TagAPI.BLOCK_CHEST, chest); TagAPI.addTag(TagAPI.BLOCK_CHEST, chest);
logBlockTag = TagAPI.makeBlockTag(BetterEnd.MOD_ID, name + "_logs"); logBlockTag = TagAPI.makeBlockTag(BetterEnd.MOD_ID, name + "_logs");
logItemTag = TagAPI.makeItemTag(BetterEnd.MOD_ID, name + "_logs"); logItemTag = TagAPI.makeItemTag(BetterEnd.MOD_ID, name + "_logs");
TagHelper.addTag(logBlockTag, log_stripped, bark_stripped, log, bark); TagAPI.addTag(logBlockTag, log_stripped, bark_stripped, log, bark);
TagHelper.addTag(logItemTag, log_stripped, bark_stripped, log, bark); TagAPI.addTag(logItemTag, log_stripped, bark_stripped, log, bark);
FlammableBlockRegistry.getDefaultInstance().add(log, 5, 5); FlammableBlockRegistry.getDefaultInstance().add(log, 5, 5);
FlammableBlockRegistry.getDefaultInstance().add(bark, 5, 5); FlammableBlockRegistry.getDefaultInstance().add(bark, 5, 5);

10
src/main/java/ru/betterend/integration/NourishIntegration.java
View file

@ -2,8 +2,8 @@ package ru.betterend.integration;
import net.minecraft.tags.Tag; import net.minecraft.tags.Tag;
import net.minecraft.world.item.Item; import net.minecraft.world.item.Item;
import ru.bclib.api.TagAPI;
import ru.bclib.integration.ModIntegration; import ru.bclib.integration.ModIntegration;
import ru.bclib.util.TagHelper;
import ru.betterend.registry.EndItems; import ru.betterend.registry.EndItems;
public class NourishIntegration extends ModIntegration { public class NourishIntegration extends ModIntegration {
@ -18,8 +18,8 @@ public class NourishIntegration extends ModIntegration {
Tag.Named<Item> protein = getItemTag("protein"); Tag.Named<Item> protein = getItemTag("protein");
Tag.Named<Item> sweets = getItemTag("sweets"); Tag.Named<Item> sweets = getItemTag("sweets");
TagHelper.addTag(fats, EndItems.END_FISH_RAW, EndItems.END_FISH_COOKED); TagAPI.addTag(fats, EndItems.END_FISH_RAW, EndItems.END_FISH_COOKED);
TagHelper.addTag( TagAPI.addTag(
fruit, fruit,
EndItems.SHADOW_BERRY_RAW, EndItems.SHADOW_BERRY_RAW,
EndItems.SHADOW_BERRY_COOKED, EndItems.SHADOW_BERRY_COOKED,
@ -32,7 +32,7 @@ public class NourishIntegration extends ModIntegration {
EndItems.CHORUS_MUSHROOM_COOKED, EndItems.CHORUS_MUSHROOM_COOKED,
EndItems.BOLUX_MUSHROOM_COOKED EndItems.BOLUX_MUSHROOM_COOKED
); );
TagHelper.addTag( TagAPI.addTag(
protein, protein,
EndItems.END_FISH_RAW, EndItems.END_FISH_RAW,
EndItems.END_FISH_COOKED, EndItems.END_FISH_COOKED,
@ -40,7 +40,7 @@ public class NourishIntegration extends ModIntegration {
EndItems.BOLUX_MUSHROOM_COOKED, EndItems.BOLUX_MUSHROOM_COOKED,
EndItems.CAVE_PUMPKIN_PIE EndItems.CAVE_PUMPKIN_PIE
); );
TagHelper.addTag( TagAPI.addTag(
sweets, sweets,
EndItems.SHADOW_BERRY_JELLY, EndItems.SHADOW_BERRY_JELLY,
EndItems.SWEET_BERRY_JELLY, EndItems.SWEET_BERRY_JELLY,

3
src/main/java/ru/betterend/integration/byg/BYGIntegration.java
View file

@ -8,7 +8,6 @@ import net.minecraft.world.level.block.Block;
import ru.bclib.api.BiomeAPI; import ru.bclib.api.BiomeAPI;
import ru.bclib.api.TagAPI; import ru.bclib.api.TagAPI;
import ru.bclib.integration.ModIntegration; import ru.bclib.integration.ModIntegration;
import ru.bclib.util.TagHelper;
import ru.bclib.world.biomes.BCLBiome; import ru.bclib.world.biomes.BCLBiome;
import ru.betterend.integration.EndBiomeIntegration; import ru.betterend.integration.EndBiomeIntegration;
import ru.betterend.integration.Integrations; import ru.betterend.integration.Integrations;
@ -28,7 +27,7 @@ public class BYGIntegration extends ModIntegration implements EndBiomeIntegratio
public void init() { public void init() {
Block block = Integrations.BYG.getBlock("ivis_phylium"); Block block = Integrations.BYG.getBlock("ivis_phylium");
if (block != null) { if (block != null) {
TagHelper.addTags(block, TagAPI.END_GROUND, TagAPI.GEN_TERRAIN); TagAPI.addTags(block, TagAPI.END_GROUND, TagAPI.GEN_TERRAIN);
} }
BYGBlocks.register(); BYGBlocks.register();
BYGFeatures.register(); BYGFeatures.register();

1
src/main/java/ru/betterend/registry/EndBlocks.java
View file

@ -125,7 +125,6 @@ import ru.betterend.blocks.UmbrellaTreeClusterEmptyBlock;
import ru.betterend.blocks.UmbrellaTreeMembraneBlock; import ru.betterend.blocks.UmbrellaTreeMembraneBlock;
import ru.betterend.blocks.UmbrellaTreeSaplingBlock; import ru.betterend.blocks.UmbrellaTreeSaplingBlock;
import ru.betterend.blocks.VentBubbleColumnBlock; import ru.betterend.blocks.VentBubbleColumnBlock;
import ru.betterend.blocks.basis.EndAnvilBlock;
import ru.betterend.blocks.basis.EndTerrainBlock; import ru.betterend.blocks.basis.EndTerrainBlock;
import ru.betterend.blocks.basis.EndTripleTerrain; import ru.betterend.blocks.basis.EndTripleTerrain;
import ru.betterend.blocks.basis.EndUnderwaterWallPlantBlock; import ru.betterend.blocks.basis.EndUnderwaterWallPlantBlock;

45
src/main/java/ru/betterend/registry/EndTags.java
View file

@ -24,7 +24,6 @@ import ru.bclib.api.BonemealAPI;
import ru.bclib.api.TagAPI; import ru.bclib.api.TagAPI;
import ru.bclib.blocks.BaseVineBlock; import ru.bclib.blocks.BaseVineBlock;
import ru.bclib.blocks.SimpleLeavesBlock; import ru.bclib.blocks.SimpleLeavesBlock;
import ru.bclib.util.TagHelper;
import ru.betterend.BetterEnd; import ru.betterend.BetterEnd;
import ru.betterend.blocks.basis.EndTerrainBlock; import ru.betterend.blocks.basis.EndTerrainBlock;
import ru.betterend.blocks.basis.PedestalBlock; import ru.betterend.blocks.basis.PedestalBlock;
@ -55,32 +54,32 @@ public class EndTags {
Material material = ((AbstractBlockSettingsAccessor) properties).getMaterial(); Material material = ((AbstractBlockSettingsAccessor) properties).getMaterial();
if (material.equals(Material.STONE) || material.equals(Material.METAL) || material.equals(Material.HEAVY_METAL)) { if (material.equals(Material.STONE) || material.equals(Material.METAL) || material.equals(Material.HEAVY_METAL)) {
TagHelper.addTag(TagAPI.MINEABLE_PICKAXE, block); TagAPI.addTag(TagAPI.MINEABLE_PICKAXE, block);
} }
else if (material.equals(Material.WOOD)) { else if (material.equals(Material.WOOD)) {
TagHelper.addTag(TagAPI.MINEABLE_AXE, block); TagAPI.addTag(TagAPI.MINEABLE_AXE, block);
} }
else if (material.equals(Material.LEAVES) || material.equals(Material.PLANT) || material.equals(Material.WATER_PLANT)) { else if (material.equals(Material.LEAVES) || material.equals(Material.PLANT) || material.equals(Material.WATER_PLANT)) {
TagHelper.addTag(TagAPI.MINEABLE_HOE, block); TagAPI.addTag(TagAPI.MINEABLE_HOE, block);
} }
else if (material.equals(Material.SAND)) { else if (material.equals(Material.SAND)) {
TagHelper.addTag(TagAPI.MINEABLE_SHOVEL, block); TagAPI.addTag(TagAPI.MINEABLE_SHOVEL, block);
} }
if (block instanceof EndTerrainBlock) { if (block instanceof EndTerrainBlock) {
TagAPI.addEndGround(block); TagAPI.addEndGround(block);
TagHelper.addTag(BlockTags.NYLIUM, block); TagAPI.addTag(BlockTags.NYLIUM, block);
BonemealAPI.addSpreadableBlock(block, Blocks.END_STONE); BonemealAPI.addSpreadableBlock(block, Blocks.END_STONE);
} }
else if (block instanceof LeavesBlock || block instanceof SimpleLeavesBlock) { else if (block instanceof LeavesBlock || block instanceof SimpleLeavesBlock) {
TagHelper.addTag(BlockTags.LEAVES, block); TagAPI.addTag(BlockTags.LEAVES, block);
ComposterBlockAccessor.callAdd(0.3F, block); ComposterBlockAccessor.callAdd(0.3F, block);
} }
else if (block instanceof BaseVineBlock) { else if (block instanceof BaseVineBlock) {
TagHelper.addTag(BlockTags.CLIMBABLE, block); TagAPI.addTag(BlockTags.CLIMBABLE, block);
} }
else if (block instanceof PedestalBlock) { else if (block instanceof PedestalBlock) {
TagHelper.addTag(PEDESTALS, block); TagAPI.addTag(PEDESTALS, block);
} }
Material mat = block.defaultBlockState().getMaterial(); Material mat = block.defaultBlockState().getMaterial();
@ -89,7 +88,7 @@ public class EndTags {
} }
}); });
TagAPI.addEndGround(EndBlocks.CAVE_MOSS); TagAPI.addEndGround(EndBlocks.CAVE_MOSS);
TagHelper.addTag(BlockTags.NYLIUM, EndBlocks.CAVE_MOSS); TagAPI.addTag(BlockTags.NYLIUM, EndBlocks.CAVE_MOSS);
BonemealAPI.addSpreadableBlock(EndBlocks.CAVE_MOSS, Blocks.END_STONE); BonemealAPI.addSpreadableBlock(EndBlocks.CAVE_MOSS, Blocks.END_STONE);
BonemealAPI.addSpreadableBlock(EndBlocks.MOSSY_OBSIDIAN, Blocks.OBSIDIAN); BonemealAPI.addSpreadableBlock(EndBlocks.MOSSY_OBSIDIAN, Blocks.OBSIDIAN);
BonemealAPI.addSpreadableBlock(EndBlocks.MOSSY_DRAGON_BONE, EndBlocks.DRAGON_BONE_BLOCK); BonemealAPI.addSpreadableBlock(EndBlocks.MOSSY_DRAGON_BONE, EndBlocks.DRAGON_BONE_BLOCK);
@ -108,9 +107,9 @@ public class EndTags {
} }
}); });
ToolManagerImpl.tag(TagAPI.HAMMERS).register(new ModdedToolsVanillaBlocksToolHandler(hammers)); ToolManagerImpl.tag(TagAPI.HAMMERS).register(new ModdedToolsVanillaBlocksToolHandler(hammers));
TagHelper.addTag(TagAPI.HAMMERS, EndItems.AETERNIUM_HAMMER); TagAPI.addTag(TagAPI.HAMMERS, EndItems.AETERNIUM_HAMMER);
TagHelper.addTag( TagAPI.addTag(
TagAPI.GEN_TERRAIN, TagAPI.GEN_TERRAIN,
EndBlocks.ENDER_ORE, EndBlocks.ENDER_ORE,
EndBlocks.FLAVOLITE.stone, EndBlocks.FLAVOLITE.stone,
@ -121,22 +120,22 @@ public class EndTags {
EndBlocks.AZURE_JADESTONE.stone, EndBlocks.AZURE_JADESTONE.stone,
EndBlocks.SANDY_JADESTONE.stone EndBlocks.SANDY_JADESTONE.stone
); );
TagHelper.addTag(TagAPI.END_GROUND, EndBlocks.SULPHURIC_ROCK.stone, EndBlocks.BRIMSTONE); TagAPI.addTag(TagAPI.END_GROUND, EndBlocks.SULPHURIC_ROCK.stone, EndBlocks.BRIMSTONE);
TagHelper.addTag(BlockTags.ANVIL, EndBlocks.AETERNIUM_ANVIL); TagAPI.addTag(BlockTags.ANVIL, EndBlocks.AETERNIUM_ANVIL);
TagHelper.addTag(BlockTags.BEACON_BASE_BLOCKS, EndBlocks.AETERNIUM_BLOCK); TagAPI.addTag(BlockTags.BEACON_BASE_BLOCKS, EndBlocks.AETERNIUM_BLOCK);
TagHelper.addTag(ItemTags.BEACON_PAYMENT_ITEMS, EndItems.AETERNIUM_INGOT); TagAPI.addTag(ItemTags.BEACON_PAYMENT_ITEMS, EndItems.AETERNIUM_INGOT);
TagHelper.addTag( TagAPI.addTag(
TagAPI.DRAGON_IMMUNE, TagAPI.DRAGON_IMMUNE,
EndBlocks.ENDER_ORE, EndBlocks.ENDER_ORE,
EndBlocks.ETERNAL_PEDESTAL, EndBlocks.ETERNAL_PEDESTAL,
EndBlocks.FLAVOLITE_RUNED_ETERNAL, EndBlocks.FLAVOLITE_RUNED_ETERNAL,
EndBlocks.FLAVOLITE_RUNED EndBlocks.FLAVOLITE_RUNED
); );
TagHelper.addTag(TagAPI.IRON_INGOTS, EndBlocks.THALLASIUM.ingot); TagAPI.addTag(TagAPI.IRON_INGOTS, EndBlocks.THALLASIUM.ingot);
TagHelper.addTag(ALLOYING_IRON, Items.IRON_ORE, Items.DEEPSLATE_IRON_ORE, Items.RAW_IRON); TagAPI.addTag(ALLOYING_IRON, Items.IRON_ORE, Items.DEEPSLATE_IRON_ORE, Items.RAW_IRON);
TagHelper.addTag(ALLOYING_GOLD, Items.GOLD_ORE, Items.DEEPSLATE_GOLD_ORE, Items.RAW_GOLD); TagAPI.addTag(ALLOYING_GOLD, Items.GOLD_ORE, Items.DEEPSLATE_GOLD_ORE, Items.RAW_GOLD);
TagHelper.addTag(ALLOYING_COPPER, Items.COPPER_ORE, Items.DEEPSLATE_COPPER_ORE, Items.RAW_COPPER); TagAPI.addTag(ALLOYING_COPPER, Items.COPPER_ORE, Items.DEEPSLATE_COPPER_ORE, Items.RAW_COPPER);
} }
public static void addTerrainTags(Registry<Biome> biomeRegistry) { public static void addTerrainTags(Registry<Biome> biomeRegistry) {
@ -145,8 +144,8 @@ public class EndTags {
SurfaceBuilderConfiguration config = biome.getGenerationSettings().getSurfaceBuilderConfig(); SurfaceBuilderConfiguration config = biome.getGenerationSettings().getSurfaceBuilderConfig();
Block under = config.getUnderMaterial().getBlock(); Block under = config.getUnderMaterial().getBlock();
Block surface = config.getTopMaterial().getBlock(); Block surface = config.getTopMaterial().getBlock();
TagHelper.addTag(TagAPI.GEN_TERRAIN, under, surface); TagAPI.addTag(TagAPI.GEN_TERRAIN, under, surface);
TagHelper.addTag(TagAPI.END_GROUND, surface); TagAPI.addTag(TagAPI.END_GROUND, surface);
} }
}); });
END_STONES.getValues().forEach(TagAPI::addEndGround); END_STONES.getValues().forEach(TagAPI::addEndGround);