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

Replaced tags with procedural tags

Browse source
This commit is contained in:
paulevsGitch 2021-07-12 10:19:20 +03:00
parent f6d4684427
commit c61b90bd2a
8 changed files with 21 additions and 320 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -3,6 +3,8 @@ package ru.betterend.registry;
import com.google.common.collect.Lists;
import net.fabricmc.fabric.impl.tool.attribute.ToolManagerImpl;
import net.fabricmc.fabric.impl.tool.attribute.handlers.ModdedToolsVanillaBlocksToolHandler;
import net.fabricmc.fabric.mixin.object.builder.AbstractBlockAccessor;
import net.fabricmc.fabric.mixin.object.builder.AbstractBlockSettingsAccessor;
import net.minecraft.core.Registry;
import net.minecraft.tags.BlockTags;
import net.minecraft.tags.ItemTags;
@ -14,6 +16,7 @@ import net.minecraft.world.level.biome.Biome;
import net.minecraft.world.level.biome.Biome.BiomeCategory;
import net.minecraft.world.level.block.Block;
import net.minecraft.world.level.block.LeavesBlock;
import net.minecraft.world.level.block.state.BlockBehaviour.Properties;
import net.minecraft.world.level.levelgen.surfacebuilders.SurfaceBuilderConfiguration;
import net.minecraft.world.level.material.Material;
import ru.bclib.api.BonemealAPI;
@ -47,6 +50,23 @@ public class EndTags {
TagAPI.addEndGround(EndBlocks.AMBER_ORE);
EndBlocks.getModBlocks().forEach(block -> {
Properties properties = ((AbstractBlockAccessor) block).getSettings();
Material material = ((AbstractBlockSettingsAccessor) properties).getMaterial();
if (material.equals(Material.STONE)) {
TagHelper.addTag(TagAPI.MINEABLE_PICKAXE, block);
}
else if (material.equals(Material.WOOD)) {
TagHelper.addTag(TagAPI.MINEABLE_AXE, block);
}
else if (material.equals(Material.LEAVES) || material.equals(Material.PLANT) || material.equals(Material.WATER_PLANT)) {
TagHelper.addTag(TagAPI.MINEABLE_HOE, block);
}
else if (material.equals(Material.SAND)) {
TagHelper.addTag(TagAPI.MINEABLE_HOE, block);
}
System.out.println(block + " " + material);
if (block instanceof EndTerrainBlock) {
TagAPI.addEndGround(block);
TagHelper.addTag(BlockTags.NYLIUM, block);

6
src/main/resources/data/c/tags/blocks/bookshelves.json
View file

@ -1,6 +0,0 @@
{
"replace": "false",
"values": [
"minecraft:bookshelf"
]
}

11
src/main/resources/data/fabric/tags/items/hammers.json
View file

@ -1,11 +0,0 @@
{
"replace": false,
"values": [
"betterend:iron_hammer",
"betterend:golden_hammer",
"betterend:diamond_hammer",
"betterend:netherite_hammer",
"betterend:terminite_hammer",
"betterend:aeternium_hammer"
]
}

31
src/main/resources/data/minecraft/tags/blocks/mineable/axe.json
View file

@ -1,31 +0,0 @@
{
"replace": "false",
"values": [
"betterend:amaranita_cap",
"betterend:amaranita_hymenophore",
"betterend:amaranita_lantern",
"betterend:aurant_polypore",
"betterend:blue_vine_lantern",
"betterend:filalux_lantern",
"betterend:hydralux_petal_block",
"betterend:hydralux_petal_block_black",
"betterend:hydralux_petal_block_blue",
"betterend:hydralux_petal_block_brown",
"betterend:hydralux_petal_block_cyan",
"betterend:hydralux_petal_block_gray",
"betterend:hydralux_petal_block_green",
"betterend:hydralux_petal_block_light_blue",
"betterend:hydralux_petal_block_light_gray",
"betterend:hydralux_petal_block_lime",
"betterend:hydralux_petal_block_magenta",
"betterend:hydralux_petal_block_orange",
"betterend:hydralux_petal_block_pink",
"betterend:hydralux_petal_block_purple",
"betterend:hydralux_petal_block_red",
"betterend:hydralux_petal_block_white",
"betterend:hydralux_petal_block_yellow",
"betterend:mossy_glowshroom_cap",
"betterend:mossy_glowshroom_hymenophore",
"betterend:purple_polypore"
]
}

14
src/main/resources/data/minecraft/tags/blocks/mineable/hoe.json
View file

@ -1,14 +0,0 @@
{
"replace": "false",
"values": [
"betterend:amber_root_seed",
"betterend:blossom_berry_seed",
"betterend:chorus_mushroom_seed",
"betterend:dragon_tree_leaves",
"betterend:lacugrove_leaves",
"betterend:lucernia_leaves",
"betterend:pythadendron_leaves",
"betterend:shadow_berry",
"betterend:tenanea_leaves"
]
}

251
src/main/resources/data/minecraft/tags/blocks/mineable/pickaxe.json
View file

@ -1,251 +0,0 @@
{
"replace": "false",
"values": [
"betterend:aeternium_anvil",
"betterend:aeternium_block",
"betterend:amber_block",
"betterend:amber_moss",
"betterend:amber_moss_path",
"betterend:andesite_lantern",
"betterend:andesite_pedestal",
"betterend:aurora_crystal",
"betterend:azure_jadestone",
"betterend:azure_jadestone_bricks",
"betterend:azure_jadestone_bricks_slab",
"betterend:azure_jadestone_bricks_stairs",
"betterend:azure_jadestone_bricks_wall",
"betterend:azure_jadestone_button",
"betterend:azure_jadestone_furnace",
"betterend:azure_jadestone_lantern",
"betterend:azure_jadestone_pedestal",
"betterend:azure_jadestone_pillar",
"betterend:azure_jadestone_plate",
"betterend:azure_jadestone_polished",
"betterend:azure_jadestone_slab",
"betterend:azure_jadestone_stairs",
"betterend:azure_jadestone_tiles",
"betterend:azure_jadestone_wall",
"betterend:blackstone_lantern",
"betterend:brimstone",
"betterend:cave_moss",
"betterend:cave_moss_path",
"betterend:charcoal_block",
"betterend:chorus_nylium",
"betterend:chorus_nylium_path",
"betterend:crystal_moss",
"betterend:crystal_moss_path",
"betterend:diorite_lantern",
"betterend:diorite_pedestal",
"betterend:dragon_bone_block",
"betterend:dragon_bone_slab",
"betterend:dragon_bone_stairs",
"betterend:end_moss",
"betterend:end_moss_path",
"betterend:end_mycelium",
"betterend:end_mycelium_path",
"betterend:end_stone_furnace",
"betterend:end_stone_lantern",
"betterend:end_stone_smelter",
"betterend:ender_block",
"betterend:eternal_pedestal",
"betterend:flavolite",
"betterend:flavolite_bricks",
"betterend:flavolite_bricks_slab",
"betterend:flavolite_bricks_stairs",
"betterend:flavolite_bricks_wall",
"betterend:flavolite_button",
"betterend:flavolite_furnace",
"betterend:flavolite_lantern",
"betterend:flavolite_pedestal",
"betterend:flavolite_pillar",
"betterend:flavolite_plate",
"betterend:flavolite_polished",
"betterend:flavolite_runed",
"betterend:flavolite_runed_eternal",
"betterend:flavolite_slab",
"betterend:flavolite_stairs",
"betterend:flavolite_tiles",
"betterend:flavolite_wall",
"betterend:gold_chandelier",
"betterend:granite_lantern",
"betterend:granite_pedestal",
"betterend:hydrothermal_vent",
"betterend:infusion_pedestal",
"betterend:iron_bulb_lantern",
"betterend:iron_bulb_lantern_black",
"betterend:iron_bulb_lantern_blue",
"betterend:iron_bulb_lantern_brown",
"betterend:iron_bulb_lantern_cyan",
"betterend:iron_bulb_lantern_gray",
"betterend:iron_bulb_lantern_green",
"betterend:iron_bulb_lantern_light_blue",
"betterend:iron_bulb_lantern_light_gray",
"betterend:iron_bulb_lantern_lime",
"betterend:iron_bulb_lantern_magenta",
"betterend:iron_bulb_lantern_orange",
"betterend:iron_bulb_lantern_pink",
"betterend:iron_bulb_lantern_purple",
"betterend:iron_bulb_lantern_red",
"betterend:iron_bulb_lantern_white",
"betterend:iron_bulb_lantern_yellow",
"betterend:iron_chandelier",
"betterend:jungle_moss",
"betterend:jungle_moss_path",
"betterend:missing_tile",
"betterend:mossy_dragon_bone",
"betterend:mossy_obsidian",
"betterend:pink_moss",
"betterend:pink_moss_path",
"betterend:purpur_lantern",
"betterend:purpur_pedestal",
"betterend:quartz_lantern",
"betterend:quartz_pedestal",
"betterend:respawn_obelisk",
"betterend:rutiscus",
"betterend:rutiscus_path",
"betterend:sandy_jadestone",
"betterend:sandy_jadestone_bricks",
"betterend:sandy_jadestone_bricks_slab",
"betterend:sandy_jadestone_bricks_stairs",
"betterend:sandy_jadestone_bricks_wall",
"betterend:sandy_jadestone_button",
"betterend:sandy_jadestone_furnace",
"betterend:sandy_jadestone_lantern",
"betterend:sandy_jadestone_pedestal",
"betterend:sandy_jadestone_pillar",
"betterend:sandy_jadestone_plate",
"betterend:sandy_jadestone_polished",
"betterend:sandy_jadestone_slab",
"betterend:sandy_jadestone_stairs",
"betterend:sandy_jadestone_tiles",
"betterend:sandy_jadestone_wall",
"betterend:sangnum",
"betterend:sangnum_path",
"betterend:shadow_grass",
"betterend:shadow_grass_path",
"betterend:smaragdant_crystal",
"betterend:smaragdant_crystal_bricks",
"betterend:smaragdant_crystal_bricks_slab",
"betterend:smaragdant_crystal_bricks_stairs",
"betterend:smaragdant_crystal_bricks_wall",
"betterend:smaragdant_crystal_pedestal",
"betterend:smaragdant_crystal_pillar",
"betterend:smaragdant_crystal_polished",
"betterend:smaragdant_crystal_shard",
"betterend:smaragdant_crystal_slab",
"betterend:smaragdant_crystal_stairs",
"betterend:smaragdant_crystal_tiles",
"betterend:smaragdant_crystal_wall",
"betterend:sulphur_crystal",
"betterend:sulphuric_rock",
"betterend:sulphuric_rock_bricks",
"betterend:sulphuric_rock_bricks_slab",
"betterend:sulphuric_rock_bricks_stairs",
"betterend:sulphuric_rock_bricks_wall",
"betterend:sulphuric_rock_button",
"betterend:sulphuric_rock_furnace",
"betterend:sulphuric_rock_lantern",
"betterend:sulphuric_rock_pedestal",
"betterend:sulphuric_rock_pillar",
"betterend:sulphuric_rock_plate",
"betterend:sulphuric_rock_polished",
"betterend:sulphuric_rock_slab",
"betterend:sulphuric_rock_stairs",
"betterend:sulphuric_rock_tiles",
"betterend:sulphuric_rock_wall",
"betterend:terminite_anvil",
"betterend:terminite_bars",
"betterend:terminite_block",
"betterend:terminite_bulb_lantern",
"betterend:terminite_bulb_lantern_black",
"betterend:terminite_bulb_lantern_blue",
"betterend:terminite_bulb_lantern_brown",
"betterend:terminite_bulb_lantern_cyan",
"betterend:terminite_bulb_lantern_gray",
"betterend:terminite_bulb_lantern_green",
"betterend:terminite_bulb_lantern_light_blue",
"betterend:terminite_bulb_lantern_light_gray",
"betterend:terminite_bulb_lantern_lime",
"betterend:terminite_bulb_lantern_magenta",
"betterend:terminite_bulb_lantern_orange",
"betterend:terminite_bulb_lantern_pink",
"betterend:terminite_bulb_lantern_purple",
"betterend:terminite_bulb_lantern_red",
"betterend:terminite_bulb_lantern_white",
"betterend:terminite_bulb_lantern_yellow",
"betterend:terminite_chain",
"betterend:terminite_chandelier",
"betterend:terminite_door",
"betterend:terminite_plate",
"betterend:terminite_slab",
"betterend:terminite_stairs",
"betterend:terminite_tile",
"betterend:terminite_trapdoor",
"betterend:thallasium_anvil",
"betterend:thallasium_bars",
"betterend:thallasium_block",
"betterend:thallasium_bulb_lantern",
"betterend:thallasium_bulb_lantern_black",
"betterend:thallasium_bulb_lantern_blue",
"betterend:thallasium_bulb_lantern_brown",
"betterend:thallasium_bulb_lantern_cyan",
"betterend:thallasium_bulb_lantern_gray",
"betterend:thallasium_bulb_lantern_green",
"betterend:thallasium_bulb_lantern_light_blue",
"betterend:thallasium_bulb_lantern_light_gray",
"betterend:thallasium_bulb_lantern_lime",
"betterend:thallasium_bulb_lantern_magenta",
"betterend:thallasium_bulb_lantern_orange",
"betterend:thallasium_bulb_lantern_pink",
"betterend:thallasium_bulb_lantern_purple",
"betterend:thallasium_bulb_lantern_red",
"betterend:thallasium_bulb_lantern_white",
"betterend:thallasium_bulb_lantern_yellow",
"betterend:thallasium_chain",
"betterend:thallasium_chandelier",
"betterend:thallasium_door",
"betterend:thallasium_ore",
"betterend:thallasium_plate",
"betterend:thallasium_slab",
"betterend:thallasium_stairs",
"betterend:thallasium_tile",
"betterend:thallasium_trapdoor",
"betterend:violecite",
"betterend:violecite_bricks",
"betterend:violecite_bricks_slab",
"betterend:violecite_bricks_stairs",
"betterend:violecite_bricks_wall",
"betterend:violecite_button",
"betterend:violecite_furnace",
"betterend:violecite_lantern",
"betterend:violecite_pedestal",
"betterend:violecite_pillar",
"betterend:violecite_plate",
"betterend:violecite_polished",
"betterend:violecite_slab",
"betterend:violecite_stairs",
"betterend:violecite_tiles",
"betterend:violecite_wall",
"betterend:virid_jadestone",
"betterend:virid_jadestone_bricks",
"betterend:virid_jadestone_bricks_slab",
"betterend:virid_jadestone_bricks_stairs",
"betterend:virid_jadestone_bricks_wall",
"betterend:virid_jadestone_button",
"betterend:virid_jadestone_furnace",
"betterend:virid_jadestone_lantern",
"betterend:virid_jadestone_pedestal",
"betterend:virid_jadestone_pillar",
"betterend:virid_jadestone_plate",
"betterend:virid_jadestone_polished",
"betterend:virid_jadestone_slab",
"betterend:virid_jadestone_stairs",
"betterend:virid_jadestone_tiles",
"betterend:virid_jadestone_wall",
"betterend:amber_ore",
"betterend:end_stone_stalactite",
"betterend:end_stone_stalactite_cavemoss",
"betterend:ender_ore"
]
}

6
src/main/resources/data/minecraft/tags/blocks/mineable/shovel.json
View file

@ -1,6 +0,0 @@
{
"replace": "false",
"values": [
"betterend:endstone_dust"
]
}