From 4f0f63707852859ce66d6cf6f8e19e7ce827b289 Mon Sep 17 00:00:00 2001 From: Frizi Date: Fri, 31 Oct 2025 20:05:02 +0100 Subject: [PATCH] Do not run tag generators twice. --- .../data/c/tags/block/concretes.json | 8 + .../resources/data/c/tags/item/concretes.json | 6 + .../resources/data/c/tags/item/ingots.json | 12 + .../resources/data/c/tags/item/rods.json | 6 + .../data/c/tags/item/rots/steel.json | 5 + .../tags/block/azalea_root_replaceable.json | 2 - .../block/dripstone_replaceable_blocks.json | 2 - .../tags/block/lush_ground_replaceable.json | 2 - .../minecraft/tags/block/mineable/axe.json | 31 -- .../tags/block/mineable/pickaxe.json | 365 ------------------ .../tags/block/moss_replaceable.json | 2 - .../tags/block/needs_stone_tool.json | 165 -------- .../data/minecraft/tags/block/slabs.json | 43 --- .../data/minecraft/tags/block/stairs.json | 43 --- .../data/minecraft/tags/block/walls.json | 44 --- .../data/tfmg/tags/block/pumpjack_head.json | 1 - .../data/tfmg/tags/block/pumpjack_part.json | 2 - .../tfmg/base/TFMGRegistrateTags.java | 14 +- .../drmangotea/tfmg/registry/TFMGTags.java | 152 ++------ 19 files changed, 65 insertions(+), 840 deletions(-) create mode 100644 src/generated/resources/data/c/tags/block/concretes.json create mode 100644 src/generated/resources/data/c/tags/item/concretes.json create mode 100644 src/generated/resources/data/c/tags/item/ingots.json create mode 100644 src/generated/resources/data/c/tags/item/rods.json create mode 100644 src/generated/resources/data/c/tags/item/rots/steel.json diff --git a/src/generated/resources/data/c/tags/block/concretes.json b/src/generated/resources/data/c/tags/block/concretes.json new file mode 100644 index 00000000..d9e58c53 --- /dev/null +++ b/src/generated/resources/data/c/tags/block/concretes.json @@ -0,0 +1,8 @@ +{ + "values": [ + "tfmg:concrete", + "tfmg:rebar_concrete", + "tfmg:concrete", + "tfmg:rebar_concrete" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/concretes.json b/src/generated/resources/data/c/tags/item/concretes.json new file mode 100644 index 00000000..4fa61502 --- /dev/null +++ b/src/generated/resources/data/c/tags/item/concretes.json @@ -0,0 +1,6 @@ +{ + "values": [ + "tfmg:concrete", + "tfmg:rebar_concrete" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/ingots.json b/src/generated/resources/data/c/tags/item/ingots.json new file mode 100644 index 00000000..56c764e0 --- /dev/null +++ b/src/generated/resources/data/c/tags/item/ingots.json @@ -0,0 +1,12 @@ +{ + "values": [ + "tfmg:steel_ingot", + "tfmg:cast_iron_ingot", + "tfmg:aluminum_ingot", + "tfmg:plastic_sheet", + "tfmg:lead_ingot", + "tfmg:nickel_ingot", + "tfmg:constantan_ingot", + "tfmg:lithium_ingot" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/rods.json b/src/generated/resources/data/c/tags/item/rods.json new file mode 100644 index 00000000..847a2fcf --- /dev/null +++ b/src/generated/resources/data/c/tags/item/rods.json @@ -0,0 +1,6 @@ +{ + "values": [ + "tfmg:rebar", + "minecraft:stick" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/rots/steel.json b/src/generated/resources/data/c/tags/item/rots/steel.json new file mode 100644 index 00000000..625e3c2f --- /dev/null +++ b/src/generated/resources/data/c/tags/item/rots/steel.json @@ -0,0 +1,5 @@ +{ + "values": [ + "tfmg:rebar" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/tags/block/azalea_root_replaceable.json b/src/generated/resources/data/minecraft/tags/block/azalea_root_replaceable.json index 4f2dd661..258d635d 100644 --- a/src/generated/resources/data/minecraft/tags/block/azalea_root_replaceable.json +++ b/src/generated/resources/data/minecraft/tags/block/azalea_root_replaceable.json @@ -1,8 +1,6 @@ { "values": [ "tfmg:bauxite", - "tfmg:bauxite", - "tfmg:galena", "tfmg:galena" ] } \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/tags/block/dripstone_replaceable_blocks.json b/src/generated/resources/data/minecraft/tags/block/dripstone_replaceable_blocks.json index 4f2dd661..258d635d 100644 --- a/src/generated/resources/data/minecraft/tags/block/dripstone_replaceable_blocks.json +++ b/src/generated/resources/data/minecraft/tags/block/dripstone_replaceable_blocks.json @@ -1,8 +1,6 @@ { "values": [ "tfmg:bauxite", - "tfmg:bauxite", - "tfmg:galena", "tfmg:galena" ] } \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/tags/block/lush_ground_replaceable.json b/src/generated/resources/data/minecraft/tags/block/lush_ground_replaceable.json index 4f2dd661..258d635d 100644 --- a/src/generated/resources/data/minecraft/tags/block/lush_ground_replaceable.json +++ b/src/generated/resources/data/minecraft/tags/block/lush_ground_replaceable.json @@ -1,8 +1,6 @@ { "values": [ "tfmg:bauxite", - "tfmg:bauxite", - "tfmg:galena", "tfmg:galena" ] } \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/tags/block/mineable/axe.json b/src/generated/resources/data/minecraft/tags/block/mineable/axe.json index d5ac573c..478ac519 100644 --- a/src/generated/resources/data/minecraft/tags/block/mineable/axe.json +++ b/src/generated/resources/data/minecraft/tags/block/mineable/axe.json @@ -2,26 +2,10 @@ "values": [ "tfmg:machine_input", "tfmg:copycat_cable_block", - "tfmg:machine_input", "tfmg:steel_cogwheel", "tfmg:large_steel_cogwheel", "tfmg:aluminum_cogwheel", "tfmg:large_aluminum_cogwheel", - "tfmg:copycat_cable_block", - "tfmg:steel_casing", - "tfmg:heavy_machinery_casing", - "tfmg:industrial_aluminum_casing", - "tfmg:steel_gearbox", - "tfmg:hardened_planks", - "tfmg:steel_flywheel", - "tfmg:lead_flywheel", - "tfmg:cast_iron_flywheel", - "tfmg:steel_cogwheel", - "tfmg:aluminum_flywheel", - "tfmg:large_steel_cogwheel", - "tfmg:nickel_flywheel", - "tfmg:aluminum_cogwheel", - "tfmg:large_aluminum_cogwheel", "tfmg:steel_casing", "tfmg:heavy_machinery_casing", "tfmg:industrial_aluminum_casing", @@ -42,21 +26,6 @@ "tfmg:steel_encased_steel_cogwheel", "tfmg:heavy_casing_encased_steel_cogwheel", "tfmg:steel_encased_large_steel_cogwheel", - "tfmg:encased_brass_pipe", - "tfmg:heavy_casing_encased_large_steel_cogwheel", - "tfmg:steel_encased_aluminum_cogwheel", - "tfmg:heavy_casing_encased_aluminum_cogwheel", - "tfmg:encased_steel_pipe", - "tfmg:steel_encased_large_aluminum_cogwheel", - "tfmg:heavy_casing_encased_large_aluminum_cogwheel", - "tfmg:encased_aluminum_pipe", - "tfmg:encased_cast_iron_pipe", - "tfmg:encased_plastic_pipe", - "tfmg:steel_encased_shaft", - "tfmg:heavy_casing_encased_shaft", - "tfmg:steel_encased_steel_cogwheel", - "tfmg:heavy_casing_encased_steel_cogwheel", - "tfmg:steel_encased_large_steel_cogwheel", "tfmg:heavy_casing_encased_large_steel_cogwheel", "tfmg:steel_encased_aluminum_cogwheel", "tfmg:heavy_casing_encased_aluminum_cogwheel", diff --git a/src/generated/resources/data/minecraft/tags/block/mineable/pickaxe.json b/src/generated/resources/data/minecraft/tags/block/mineable/pickaxe.json index 995ab081..a5623d1c 100644 --- a/src/generated/resources/data/minecraft/tags/block/mineable/pickaxe.json +++ b/src/generated/resources/data/minecraft/tags/block/mineable/pickaxe.json @@ -1,763 +1,398 @@ { "values": [ - "tfmg:fossilstone", - "tfmg:slag_block", "tfmg:aluminum_fluid_tank", - "tfmg:raw_nickel_block", "tfmg:cast_iron_fluid_tank", - "tfmg:raw_lead_block", "tfmg:steel_fluid_tank", - "tfmg:raw_lithium_block", "tfmg:steel_distillation_output", - "tfmg:air_intake", "tfmg:steel_distillation_controller", - "tfmg:firebox", "tfmg:industrial_pipe", - "tfmg:winding_machine", "tfmg:concrete_encased_industrial_pipe", - "tfmg:surface_scanner", "tfmg:pumpjack_hammer", - "tfmg:machine_input", "tfmg:pumpjack_crank", - "tfmg:concrete_hose", "tfmg:pumpjack_hammer_part", - "tfmg:blast_furnace_output", "tfmg:pumpjack_hammer_head", - "tfmg:blast_furnace_hatch", "tfmg:pumpjack_hammer_connector", - "tfmg:fireproof_bricks", "tfmg:large_pumpjack_hammer_part", - "tfmg:reinforced_fireproof_bricks", "tfmg:large_pumpjack_hammer_head", - "tfmg:blast_furnace_reinforcement", "tfmg:large_pumpjack_hammer_connector", - "tfmg:blast_furnace_reinforcement_wall", "tfmg:pumpjack_base", - "tfmg:rusted_blast_furnace_reinforcement", "tfmg:oil_deposit", - "tfmg:rusted_blast_furnace_reinforcement_wall", "tfmg:steel_chemical_vat", - "tfmg:fireproof_brick_reinforcement", "tfmg:cast_iron_chemical_vat", - "tfmg:coke_oven", "tfmg:fireproof_chemical_vat", - "tfmg:blast_stove", "tfmg:industrial_mixer", - "tfmg:casting_basin", - "tfmg:napalm_bomb", - "tfmg:generator", "tfmg:electrode_holder", - "tfmg:cable_connector", "tfmg:lead_ore", - "tfmg:glass_cable_insulator", - "tfmg:resistor", "tfmg:deepslate_lead_ore", - "tfmg:copycat_cable_block", "tfmg:nickel_ore", - "tfmg:copycat_cable_base", - "tfmg:brass_cable_hub", "tfmg:deepslate_nickel_ore", - "tfmg:copper_cable_hub", - "tfmg:steel_cable_hub", "tfmg:lithium_ore", - "tfmg:aluminum_cable_hub", "tfmg:deepslate_lithium_ore", - "tfmg:steel_casing_cable_hub", - "tfmg:heavy_cable_hub", "tfmg:sulfur", - "tfmg:cable_tube", - "tfmg:concrete_encased_cable_tube", "tfmg:lignite", - "tfmg:electric_post", - "tfmg:concrete_encased_electric_post", "tfmg:fossilstone", - "tfmg:diagonal_cable_block", "tfmg:slag_block", - "tfmg:electric_motor", - "tfmg:creative_generator", "tfmg:raw_nickel_block", - "tfmg:accumulator", "tfmg:raw_lead_block", - "tfmg:light_bulb", - "tfmg:circular_light", "tfmg:raw_lithium_block", - "tfmg:modern_light", - "tfmg:aluminum_lamp", "tfmg:air_intake", - "tfmg:neon_tube", - "tfmg:electric_diode", "tfmg:firebox", - "tfmg:encased_diode", "tfmg:winding_machine", - "tfmg:potentiometer", - "tfmg:electrical_switch", "tfmg:surface_scanner", - "tfmg:encased_potentiometer", - "tfmg:electric_pump", "tfmg:machine_input", - "tfmg:voltage_observer", "tfmg:concrete_hose", - "tfmg:voltmeter", "tfmg:blast_furnace_output", - "tfmg:polarizer", "tfmg:blast_furnace_hatch", - "tfmg:rotor", "tfmg:fireproof_bricks", - "tfmg:stator", "tfmg:reinforced_fireproof_bricks", - "tfmg:traffic_light", "tfmg:blast_furnace_reinforcement", - "tfmg:segmented_display", "tfmg:blast_furnace_reinforcement_wall", - "tfmg:transformer", "tfmg:rusted_blast_furnace_reinforcement", - "tfmg:converter", "tfmg:rusted_blast_furnace_reinforcement_wall", - "tfmg:brick_smokestack", "tfmg:fireproof_brick_reinforcement", - "tfmg:metal_smokestack", "tfmg:coke_oven", - "tfmg:concrete_smokestack", "tfmg:blast_stove", - "tfmg:exhaust", "tfmg:casting_basin", - "tfmg:flarestack", "tfmg:napalm_bomb", - "tfmg:gas_lamp", "tfmg:generator", - "tfmg:steel_cogwheel", "tfmg:cable_connector", - "tfmg:large_steel_cogwheel", "tfmg:glass_cable_insulator", - "tfmg:aluminum_cogwheel", "tfmg:resistor", - "tfmg:large_aluminum_cogwheel", "tfmg:copycat_cable_block", - "tfmg:steel_casing", "tfmg:copycat_cable_base", - "tfmg:heavy_machinery_casing", "tfmg:brass_cable_hub", - "tfmg:industrial_aluminum_casing", "tfmg:copper_cable_hub", - "tfmg:steel_block", "tfmg:steel_cable_hub", - "tfmg:cast_iron_block", "tfmg:aluminum_cable_hub", - "tfmg:aluminum_block", "tfmg:steel_casing_cable_hub", - "tfmg:plastic_block", "tfmg:heavy_cable_hub", - "tfmg:lead_block", "tfmg:cable_tube", - "tfmg:constantan_block", "tfmg:concrete_encased_cable_tube", - "tfmg:nickel_block", "tfmg:electric_post", - "tfmg:lithium_block", "tfmg:concrete_encased_electric_post", - "tfmg:coal_coke_block", "tfmg:diagonal_cable_block", "tfmg:electric_motor", - "tfmg:heavy_casing_door", "tfmg:creative_generator", - "tfmg:steel_door", "tfmg:accumulator", - "tfmg:aluminum_door", "tfmg:light_bulb", - "tfmg:heavy_plated_door", "tfmg:circular_light", - "tfmg:steel_gearbox", "tfmg:modern_light", - "tfmg:steel_bars", "tfmg:aluminum_lamp", - "tfmg:aluminum_bars", "tfmg:neon_tube", - "tfmg:cast_iron_bars", "tfmg:electric_diode", - "tfmg:lead_bars", "tfmg:encased_diode", - "tfmg:nickel_bars", "tfmg:potentiometer", - "tfmg:steel_ladder", "tfmg:electrical_switch", - "tfmg:aluminum_ladder", "tfmg:encased_potentiometer", - "tfmg:cast_iron_ladder", "tfmg:electric_pump", - "tfmg:lead_ladder", "tfmg:voltage_observer", - "tfmg:nickel_ladder", "tfmg:voltmeter", - "tfmg:constantan_ladder", "tfmg:polarizer", - "tfmg:steel_scaffolding", "tfmg:rotor", - "tfmg:aluminum_scaffolding", "tfmg:stator", - "tfmg:slag_bricks", "tfmg:traffic_light", - "tfmg:cinder_block", "tfmg:segmented_display", - "tfmg:cinderflour_block", "tfmg:transformer", "tfmg:converter", "tfmg:brick_smokestack", - "tfmg:factory_floor", "tfmg:metal_smokestack", "tfmg:concrete_smokestack", - "tfmg:steel_trapdoor", "tfmg:exhaust", - "tfmg:steel_flywheel", "tfmg:flarestack", - "tfmg:lead_flywheel", "tfmg:gas_lamp", - "tfmg:cast_iron_flywheel", "tfmg:steel_cogwheel", - "tfmg:aluminum_flywheel", "tfmg:large_steel_cogwheel", - "tfmg:nickel_flywheel", "tfmg:aluminum_cogwheel", "tfmg:large_aluminum_cogwheel", - "tfmg:steel_truss", "tfmg:steel_casing", - "tfmg:steel_frame", "tfmg:heavy_machinery_casing", - "tfmg:aluminum_truss", "tfmg:industrial_aluminum_casing", - "tfmg:aluminum_frame", "tfmg:steel_block", - "tfmg:cast_iron_truss", "tfmg:cast_iron_block", - "tfmg:cast_iron_frame", "tfmg:aluminum_block", - "tfmg:lead_truss", "tfmg:plastic_block", - "tfmg:lead_frame", "tfmg:lead_block", - "tfmg:nickel_truss", "tfmg:constantan_block", - "tfmg:nickel_frame", "tfmg:nickel_block", - "tfmg:constantan_truss", "tfmg:lithium_block", - "tfmg:constantan_frame", "tfmg:coal_coke_block", - "tfmg:copper_truss", - "tfmg:copper_frame", "tfmg:heavy_casing_door", - "tfmg:zinc_truss", "tfmg:steel_door", - "tfmg:zinc_frame", "tfmg:aluminum_door", - "tfmg:brass_truss", "tfmg:heavy_plated_door", - "tfmg:brass_frame", "tfmg:steel_gearbox", - "tfmg:white_caution_block", "tfmg:steel_bars", - "tfmg:blue_caution_block", "tfmg:aluminum_bars", - "tfmg:light_blue_caution_block", "tfmg:cast_iron_bars", - "tfmg:red_caution_block", "tfmg:lead_bars", - "tfmg:green_caution_block", "tfmg:nickel_bars", - "tfmg:lime_caution_block", "tfmg:steel_ladder", - "tfmg:pink_caution_block", "tfmg:aluminum_ladder", - "tfmg:magenta_caution_block", "tfmg:cast_iron_ladder", - "tfmg:yellow_caution_block", "tfmg:lead_ladder", - "tfmg:gray_caution_block", "tfmg:nickel_ladder", - "tfmg:light_gray_caution_block", "tfmg:constantan_ladder", - "tfmg:brown_caution_block", "tfmg:steel_scaffolding", - "tfmg:cyan_caution_block", "tfmg:aluminum_scaffolding", - "tfmg:purple_caution_block", "tfmg:slag_bricks", - "tfmg:orange_caution_block", "tfmg:cinder_block", - "tfmg:concrete_wall", "tfmg:cinderflour_block", - "tfmg:concrete", "tfmg:factory_floor", - "tfmg:concrete_stairs", - "tfmg:concrete_slab", "tfmg:steel_trapdoor", - "tfmg:rebar_concrete_wall", "tfmg:steel_flywheel", - "tfmg:rebar_concrete", "tfmg:lead_flywheel", - "tfmg:rebar_concrete_stairs", "tfmg:cast_iron_flywheel", - "tfmg:rebar_concrete_slab", "tfmg:aluminum_flywheel", - "tfmg:white_concrete", "tfmg:nickel_flywheel", - "tfmg:white_concrete_wall", "tfmg:steel_truss", - "tfmg:white_concrete_stairs", "tfmg:steel_frame", - "tfmg:white_concrete_slab", "tfmg:aluminum_truss", - "tfmg:blue_concrete", "tfmg:aluminum_frame", - "tfmg:blue_concrete_wall", "tfmg:cast_iron_truss", - "tfmg:blue_concrete_stairs", "tfmg:cast_iron_frame", - "tfmg:blue_concrete_slab", "tfmg:lead_truss", - "tfmg:light_blue_concrete", "tfmg:lead_frame", - "tfmg:light_blue_concrete_wall", "tfmg:nickel_truss", - "tfmg:light_blue_concrete_stairs", "tfmg:nickel_frame", - "tfmg:light_blue_concrete_slab", "tfmg:constantan_truss", - "tfmg:red_concrete", "tfmg:constantan_frame", - "tfmg:red_concrete_wall", "tfmg:copper_truss", - "tfmg:red_concrete_stairs", "tfmg:copper_frame", - "tfmg:red_concrete_slab", "tfmg:zinc_truss", - "tfmg:green_concrete", "tfmg:zinc_frame", - "tfmg:green_concrete_wall", "tfmg:brass_truss", - "tfmg:green_concrete_stairs", "tfmg:brass_frame", - "tfmg:green_concrete_slab", "tfmg:white_caution_block", - "tfmg:lime_concrete", "tfmg:blue_caution_block", - "tfmg:lime_concrete_wall", "tfmg:light_blue_caution_block", - "tfmg:lime_concrete_stairs", "tfmg:red_caution_block", - "tfmg:lime_concrete_slab", "tfmg:green_caution_block", - "tfmg:pink_concrete", "tfmg:lime_caution_block", - "tfmg:pink_concrete_wall", "tfmg:pink_caution_block", - "tfmg:pink_concrete_stairs", "tfmg:magenta_caution_block", - "tfmg:pink_concrete_slab", "tfmg:yellow_caution_block", - "tfmg:magenta_concrete", "tfmg:gray_caution_block", - "tfmg:magenta_concrete_wall", "tfmg:light_gray_caution_block", - "tfmg:magenta_concrete_stairs", "tfmg:brown_caution_block", - "tfmg:magenta_concrete_slab", "tfmg:cyan_caution_block", - "tfmg:yellow_concrete", "tfmg:purple_caution_block", - "tfmg:yellow_concrete_wall", "tfmg:orange_caution_block", - "tfmg:yellow_concrete_stairs", "tfmg:concrete_wall", - "tfmg:yellow_concrete_slab", "tfmg:concrete", - "tfmg:gray_concrete", "tfmg:concrete_stairs", - "tfmg:gray_concrete_wall", "tfmg:concrete_slab", - "tfmg:gray_concrete_stairs", "tfmg:rebar_concrete_wall", - "tfmg:gray_concrete_slab", "tfmg:rebar_concrete", - "tfmg:light_gray_concrete", "tfmg:rebar_concrete_stairs", - "tfmg:light_gray_concrete_wall", "tfmg:rebar_concrete_slab", - "tfmg:light_gray_concrete_stairs", "tfmg:white_concrete", - "tfmg:light_gray_concrete_slab", "tfmg:white_concrete_wall", - "tfmg:brown_concrete", "tfmg:white_concrete_stairs", - "tfmg:brown_concrete_wall", "tfmg:white_concrete_slab", - "tfmg:brown_concrete_stairs", "tfmg:blue_concrete", - "tfmg:brown_concrete_slab", "tfmg:blue_concrete_wall", - "tfmg:cyan_concrete", "tfmg:blue_concrete_stairs", - "tfmg:cyan_concrete_wall", "tfmg:blue_concrete_slab", - "tfmg:cyan_concrete_stairs", "tfmg:light_blue_concrete", - "tfmg:cyan_concrete_slab", "tfmg:light_blue_concrete_wall", - "tfmg:purple_concrete", "tfmg:light_blue_concrete_stairs", - "tfmg:purple_concrete_wall", "tfmg:light_blue_concrete_slab", - "tfmg:purple_concrete_stairs", "tfmg:red_concrete", - "tfmg:purple_concrete_slab", "tfmg:red_concrete_wall", - "tfmg:orange_concrete", "tfmg:red_concrete_stairs", - "tfmg:orange_concrete_wall", "tfmg:red_concrete_slab", - "tfmg:orange_concrete_stairs", "tfmg:green_concrete", - "tfmg:orange_concrete_slab", "tfmg:green_concrete_wall", - "tfmg:black_concrete", "tfmg:green_concrete_stairs", - "tfmg:black_concrete_wall", "tfmg:green_concrete_slab", - "tfmg:black_concrete_stairs", "tfmg:lime_concrete", - "tfmg:black_concrete_slab", "tfmg:lime_concrete_wall", - "tfmg:white_rebar_concrete", "tfmg:lime_concrete_stairs", - "tfmg:white_rebar_concrete_wall", "tfmg:lime_concrete_slab", - "tfmg:white_rebar_concrete_stairs", "tfmg:pink_concrete", - "tfmg:white_rebar_concrete_slab", "tfmg:pink_concrete_wall", - "tfmg:blue_rebar_concrete", "tfmg:pink_concrete_stairs", - "tfmg:blue_rebar_concrete_wall", "tfmg:pink_concrete_slab", - "tfmg:blue_rebar_concrete_stairs", "tfmg:magenta_concrete", - "tfmg:blue_rebar_concrete_slab", "tfmg:magenta_concrete_wall", - "tfmg:light_blue_rebar_concrete", "tfmg:magenta_concrete_stairs", - "tfmg:light_blue_rebar_concrete_wall", "tfmg:magenta_concrete_slab", - "tfmg:light_blue_rebar_concrete_stairs", "tfmg:yellow_concrete", - "tfmg:light_blue_rebar_concrete_slab", "tfmg:yellow_concrete_wall", - "tfmg:red_rebar_concrete", "tfmg:yellow_concrete_stairs", - "tfmg:red_rebar_concrete_wall", "tfmg:yellow_concrete_slab", - "tfmg:red_rebar_concrete_stairs", "tfmg:gray_concrete", - "tfmg:red_rebar_concrete_slab", "tfmg:gray_concrete_wall", - "tfmg:green_rebar_concrete", "tfmg:gray_concrete_stairs", - "tfmg:green_rebar_concrete_wall", "tfmg:gray_concrete_slab", - "tfmg:green_rebar_concrete_stairs", "tfmg:light_gray_concrete", - "tfmg:green_rebar_concrete_slab", "tfmg:light_gray_concrete_wall", - "tfmg:lime_rebar_concrete", "tfmg:light_gray_concrete_stairs", - "tfmg:lime_rebar_concrete_wall", "tfmg:light_gray_concrete_slab", - "tfmg:lime_rebar_concrete_stairs", "tfmg:brown_concrete", - "tfmg:lime_rebar_concrete_slab", "tfmg:brown_concrete_wall", - "tfmg:pink_rebar_concrete", "tfmg:brown_concrete_stairs", - "tfmg:pink_rebar_concrete_wall", "tfmg:brown_concrete_slab", - "tfmg:pink_rebar_concrete_stairs", "tfmg:cyan_concrete", - "tfmg:pink_rebar_concrete_slab", "tfmg:cyan_concrete_wall", - "tfmg:magenta_rebar_concrete", "tfmg:cyan_concrete_stairs", - "tfmg:magenta_rebar_concrete_wall", "tfmg:cyan_concrete_slab", - "tfmg:magenta_rebar_concrete_stairs", "tfmg:purple_concrete", - "tfmg:magenta_rebar_concrete_slab", "tfmg:purple_concrete_wall", - "tfmg:yellow_rebar_concrete", "tfmg:purple_concrete_stairs", - "tfmg:yellow_rebar_concrete_wall", "tfmg:purple_concrete_slab", - "tfmg:yellow_rebar_concrete_stairs", "tfmg:orange_concrete", - "tfmg:yellow_rebar_concrete_slab", "tfmg:orange_concrete_wall", - "tfmg:gray_rebar_concrete", "tfmg:orange_concrete_stairs", - "tfmg:gray_rebar_concrete_wall", "tfmg:orange_concrete_slab", - "tfmg:gray_rebar_concrete_stairs", "tfmg:black_concrete", - "tfmg:gray_rebar_concrete_slab", "tfmg:black_concrete_wall", - "tfmg:light_gray_rebar_concrete", "tfmg:black_concrete_stairs", - "tfmg:light_gray_rebar_concrete_wall", "tfmg:black_concrete_slab", - "tfmg:light_gray_rebar_concrete_stairs", "tfmg:white_rebar_concrete", - "tfmg:light_gray_rebar_concrete_slab", "tfmg:white_rebar_concrete_wall", - "tfmg:brown_rebar_concrete", "tfmg:white_rebar_concrete_stairs", - "tfmg:brown_rebar_concrete_wall", "tfmg:white_rebar_concrete_slab", - "tfmg:brown_rebar_concrete_stairs", "tfmg:blue_rebar_concrete", - "tfmg:brown_rebar_concrete_slab", "tfmg:blue_rebar_concrete_wall", - "tfmg:cyan_rebar_concrete", "tfmg:blue_rebar_concrete_stairs", - "tfmg:cyan_rebar_concrete_wall", "tfmg:blue_rebar_concrete_slab", - "tfmg:cyan_rebar_concrete_stairs", "tfmg:light_blue_rebar_concrete", - "tfmg:cyan_rebar_concrete_slab", "tfmg:light_blue_rebar_concrete_wall", - "tfmg:purple_rebar_concrete", "tfmg:light_blue_rebar_concrete_stairs", - "tfmg:purple_rebar_concrete_wall", "tfmg:light_blue_rebar_concrete_slab", - "tfmg:purple_rebar_concrete_stairs", "tfmg:red_rebar_concrete", - "tfmg:purple_rebar_concrete_slab", "tfmg:red_rebar_concrete_wall", - "tfmg:orange_rebar_concrete", "tfmg:red_rebar_concrete_stairs", - "tfmg:orange_rebar_concrete_wall", "tfmg:red_rebar_concrete_slab", - "tfmg:orange_rebar_concrete_stairs", "tfmg:green_rebar_concrete", - "tfmg:orange_rebar_concrete_slab", "tfmg:green_rebar_concrete_wall", "tfmg:green_rebar_concrete_stairs", - "tfmg:black_rebar_concrete", "tfmg:green_rebar_concrete_slab", - "tfmg:black_rebar_concrete_wall", "tfmg:lime_rebar_concrete", - "tfmg:black_rebar_concrete_stairs", "tfmg:lime_rebar_concrete_wall", - "tfmg:black_rebar_concrete_slab", "tfmg:lime_rebar_concrete_stairs", - "tfmg:asphalt", "tfmg:lime_rebar_concrete_slab", - "tfmg:asphalt_wall", "tfmg:pink_rebar_concrete", - "tfmg:asphalt_slab", "tfmg:pink_rebar_concrete_wall", - "tfmg:asphalt_stairs", "tfmg:pink_rebar_concrete_stairs", - "tfmg:brass_pipe", "tfmg:pink_rebar_concrete_slab", - "tfmg:encased_brass_pipe", "tfmg:magenta_rebar_concrete", - "tfmg:glass_brass_pipe", "tfmg:magenta_rebar_concrete_wall", - "tfmg:brass_mechanical_pump", "tfmg:magenta_rebar_concrete_stairs", - "tfmg:brass_smart_fluid_pipe", "tfmg:magenta_rebar_concrete_slab", - "tfmg:brass_fluid_valve", "tfmg:yellow_rebar_concrete", - "tfmg:steel_pipe", "tfmg:yellow_rebar_concrete_wall", - "tfmg:encased_steel_pipe", "tfmg:yellow_rebar_concrete_stairs", - "tfmg:glass_steel_pipe", "tfmg:yellow_rebar_concrete_slab", - "tfmg:steel_mechanical_pump", "tfmg:gray_rebar_concrete", - "tfmg:steel_smart_fluid_pipe", "tfmg:gray_rebar_concrete_wall", - "tfmg:steel_fluid_valve", "tfmg:gray_rebar_concrete_stairs", - "tfmg:aluminum_pipe", "tfmg:gray_rebar_concrete_slab", - "tfmg:encased_aluminum_pipe", "tfmg:light_gray_rebar_concrete", - "tfmg:glass_aluminum_pipe", "tfmg:light_gray_rebar_concrete_wall", - "tfmg:aluminum_mechanical_pump", "tfmg:light_gray_rebar_concrete_stairs", - "tfmg:aluminum_smart_fluid_pipe", "tfmg:light_gray_rebar_concrete_slab", - "tfmg:aluminum_fluid_valve", "tfmg:brown_rebar_concrete", - "tfmg:cast_iron_pipe", "tfmg:brown_rebar_concrete_wall", "tfmg:brown_rebar_concrete_stairs", - "tfmg:encased_cast_iron_pipe", "tfmg:brown_rebar_concrete_slab", - "tfmg:glass_cast_iron_pipe", "tfmg:cyan_rebar_concrete", - "tfmg:cast_iron_mechanical_pump", "tfmg:cyan_rebar_concrete_wall", - "tfmg:cast_iron_smart_fluid_pipe", "tfmg:cyan_rebar_concrete_stairs", - "tfmg:cast_iron_fluid_valve", "tfmg:cyan_rebar_concrete_slab", - "tfmg:plastic_pipe", "tfmg:purple_rebar_concrete", "tfmg:purple_rebar_concrete_wall", - "tfmg:encased_plastic_pipe", "tfmg:purple_rebar_concrete_stairs", "tfmg:purple_rebar_concrete_slab", - "tfmg:glass_plastic_pipe", "tfmg:orange_rebar_concrete", - "tfmg:plastic_mechanical_pump", "tfmg:orange_rebar_concrete_wall", "tfmg:orange_rebar_concrete_stairs", - "tfmg:plastic_smart_fluid_pipe", "tfmg:orange_rebar_concrete_slab", - "tfmg:plastic_fluid_valve", "tfmg:black_rebar_concrete", "tfmg:black_rebar_concrete_wall", - "tfmg:steel_encased_shaft", "tfmg:black_rebar_concrete_stairs", - "tfmg:heavy_casing_encased_shaft", "tfmg:black_rebar_concrete_slab", "tfmg:asphalt", - "tfmg:steel_encased_steel_cogwheel", "tfmg:asphalt_wall", "tfmg:asphalt_slab", - "tfmg:heavy_casing_encased_steel_cogwheel", "tfmg:asphalt_stairs", "tfmg:brass_pipe", - "tfmg:steel_encased_large_steel_cogwheel", "tfmg:encased_brass_pipe", "tfmg:glass_brass_pipe", - "tfmg:heavy_casing_encased_large_steel_cogwheel", "tfmg:brass_mechanical_pump", - "tfmg:steel_encased_aluminum_cogwheel", "tfmg:brass_smart_fluid_pipe", "tfmg:brass_fluid_valve", - "tfmg:heavy_casing_encased_aluminum_cogwheel", "tfmg:steel_pipe", "tfmg:encased_steel_pipe", - "tfmg:steel_encased_large_aluminum_cogwheel", "tfmg:glass_steel_pipe", "tfmg:steel_mechanical_pump", - "tfmg:heavy_casing_encased_large_aluminum_cogwheel", "tfmg:steel_smart_fluid_pipe", "tfmg:steel_fluid_valve", - "tfmg:bauxite", "tfmg:aluminum_pipe", "tfmg:encased_aluminum_pipe", "tfmg:glass_aluminum_pipe", - "tfmg:cut_bauxite", "tfmg:aluminum_mechanical_pump", "tfmg:aluminum_smart_fluid_pipe", - "tfmg:cut_bauxite_stairs", "tfmg:aluminum_fluid_valve", "tfmg:cast_iron_pipe", - "tfmg:cut_bauxite_slab", "tfmg:encased_cast_iron_pipe", "tfmg:glass_cast_iron_pipe", - "tfmg:cut_bauxite_wall", "tfmg:cast_iron_mechanical_pump", "tfmg:cast_iron_smart_fluid_pipe", - "tfmg:polished_cut_bauxite", "tfmg:cast_iron_fluid_valve", - "tfmg:polished_cut_bauxite_stairs", "tfmg:plastic_pipe", "tfmg:encased_plastic_pipe", - "tfmg:polished_cut_bauxite_slab", "tfmg:glass_plastic_pipe", "tfmg:plastic_mechanical_pump", - "tfmg:polished_cut_bauxite_wall", "tfmg:plastic_smart_fluid_pipe", "tfmg:plastic_fluid_valve", - "tfmg:cut_bauxite_bricks", "tfmg:steel_encased_shaft", "tfmg:heavy_casing_encased_shaft", - "tfmg:cut_bauxite_brick_stairs", "tfmg:steel_encased_steel_cogwheel", "tfmg:heavy_casing_encased_steel_cogwheel", - "tfmg:cut_bauxite_brick_slab", "tfmg:steel_encased_large_steel_cogwheel", "tfmg:heavy_casing_encased_large_steel_cogwheel", - "tfmg:cut_bauxite_brick_wall", "tfmg:steel_encased_aluminum_cogwheel", "tfmg:heavy_casing_encased_aluminum_cogwheel", - "tfmg:small_bauxite_bricks", "tfmg:steel_encased_large_aluminum_cogwheel", - "tfmg:small_bauxite_brick_stairs", "tfmg:heavy_casing_encased_large_aluminum_cogwheel", - "tfmg:small_bauxite_brick_slab", "tfmg:bauxite", "tfmg:cut_bauxite", - "tfmg:small_bauxite_brick_wall", "tfmg:cut_bauxite_stairs", - "tfmg:layered_bauxite", "tfmg:cut_bauxite_slab", "tfmg:cut_bauxite_wall", - "tfmg:bauxite_pillar", "tfmg:polished_cut_bauxite", - "tfmg:galena", "tfmg:polished_cut_bauxite_stairs", - "tfmg:cut_galena", "tfmg:polished_cut_bauxite_slab", "tfmg:polished_cut_bauxite_wall", - "tfmg:cut_galena_stairs", "tfmg:cut_bauxite_bricks", "tfmg:cut_bauxite_brick_stairs", - "tfmg:cut_galena_slab", "tfmg:cut_bauxite_brick_slab", "tfmg:cut_bauxite_brick_wall", - "tfmg:cut_galena_wall", "tfmg:small_bauxite_bricks", "tfmg:small_bauxite_brick_stairs", - "tfmg:polished_cut_galena", "tfmg:small_bauxite_brick_slab", "tfmg:small_bauxite_brick_wall", - "tfmg:polished_cut_galena_stairs", "tfmg:layered_bauxite", "tfmg:bauxite_pillar", - "tfmg:polished_cut_galena_slab", "tfmg:galena", "tfmg:cut_galena", - "tfmg:polished_cut_galena_wall", "tfmg:cut_galena_stairs", - "tfmg:cut_galena_bricks", "tfmg:cut_galena_slab", "tfmg:cut_galena_wall", - "tfmg:cut_galena_brick_stairs", "tfmg:polished_cut_galena", "tfmg:polished_cut_galena_stairs", - "tfmg:cut_galena_brick_slab", "tfmg:polished_cut_galena_slab", "tfmg:polished_cut_galena_wall", - "tfmg:cut_galena_brick_wall", "tfmg:cut_galena_bricks", "tfmg:cut_galena_brick_stairs", - "tfmg:small_galena_bricks", "tfmg:cut_galena_brick_slab", "tfmg:cut_galena_brick_wall", - "tfmg:small_galena_brick_stairs", "tfmg:small_galena_bricks", "tfmg:small_galena_brick_stairs", "tfmg:small_galena_brick_slab", - "tfmg:small_galena_brick_slab", "tfmg:small_galena_brick_wall", - "tfmg:small_galena_brick_wall", - "tfmg:layered_galena", - "tfmg:galena_pillar", "tfmg:layered_galena", "tfmg:galena_pillar" ] diff --git a/src/generated/resources/data/minecraft/tags/block/moss_replaceable.json b/src/generated/resources/data/minecraft/tags/block/moss_replaceable.json index 4f2dd661..258d635d 100644 --- a/src/generated/resources/data/minecraft/tags/block/moss_replaceable.json +++ b/src/generated/resources/data/minecraft/tags/block/moss_replaceable.json @@ -1,8 +1,6 @@ { "values": [ "tfmg:bauxite", - "tfmg:bauxite", - "tfmg:galena", "tfmg:galena" ] } \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/tags/block/needs_stone_tool.json b/src/generated/resources/data/minecraft/tags/block/needs_stone_tool.json index aece7fc6..de9af0ce 100644 --- a/src/generated/resources/data/minecraft/tags/block/needs_stone_tool.json +++ b/src/generated/resources/data/minecraft/tags/block/needs_stone_tool.json @@ -1,13 +1,5 @@ { "values": [ - "tfmg:blast_furnace_output", - "tfmg:blast_furnace_hatch", - "tfmg:fireproof_bricks", - "tfmg:reinforced_fireproof_bricks", - "tfmg:blast_furnace_reinforcement", - "tfmg:blast_furnace_reinforcement_wall", - "tfmg:rusted_blast_furnace_reinforcement", - "tfmg:rusted_blast_furnace_reinforcement_wall", "tfmg:lead_ore", "tfmg:deepslate_lead_ore", "tfmg:nickel_ore", @@ -24,8 +16,6 @@ "tfmg:rusted_blast_furnace_reinforcement_wall", "tfmg:plastic_block", "tfmg:coal_coke_block", - "tfmg:plastic_block", - "tfmg:coal_coke_block", "tfmg:white_caution_block", "tfmg:blue_caution_block", "tfmg:light_blue_caution_block", @@ -69,231 +59,76 @@ "tfmg:green_concrete_wall", "tfmg:green_concrete_stairs", "tfmg:green_concrete_slab", - "tfmg:white_caution_block", "tfmg:lime_concrete", - "tfmg:blue_caution_block", "tfmg:lime_concrete_wall", - "tfmg:light_blue_caution_block", "tfmg:lime_concrete_stairs", - "tfmg:red_caution_block", "tfmg:lime_concrete_slab", - "tfmg:green_caution_block", "tfmg:pink_concrete", - "tfmg:lime_caution_block", "tfmg:pink_concrete_wall", - "tfmg:pink_caution_block", "tfmg:pink_concrete_stairs", - "tfmg:magenta_caution_block", "tfmg:pink_concrete_slab", - "tfmg:yellow_caution_block", "tfmg:magenta_concrete", - "tfmg:gray_caution_block", "tfmg:magenta_concrete_wall", - "tfmg:light_gray_caution_block", "tfmg:magenta_concrete_stairs", - "tfmg:brown_caution_block", "tfmg:magenta_concrete_slab", - "tfmg:cyan_caution_block", "tfmg:yellow_concrete", - "tfmg:purple_caution_block", "tfmg:yellow_concrete_wall", - "tfmg:orange_caution_block", "tfmg:yellow_concrete_stairs", - "tfmg:concrete_wall", "tfmg:yellow_concrete_slab", - "tfmg:concrete", "tfmg:gray_concrete", - "tfmg:concrete_stairs", "tfmg:gray_concrete_wall", - "tfmg:concrete_slab", "tfmg:gray_concrete_stairs", - "tfmg:rebar_concrete_wall", "tfmg:gray_concrete_slab", - "tfmg:rebar_concrete", "tfmg:light_gray_concrete", - "tfmg:rebar_concrete_stairs", "tfmg:light_gray_concrete_wall", - "tfmg:rebar_concrete_slab", "tfmg:light_gray_concrete_stairs", - "tfmg:white_concrete", "tfmg:light_gray_concrete_slab", - "tfmg:white_concrete_wall", "tfmg:brown_concrete", - "tfmg:white_concrete_stairs", "tfmg:brown_concrete_wall", - "tfmg:white_concrete_slab", "tfmg:brown_concrete_stairs", - "tfmg:blue_concrete", "tfmg:brown_concrete_slab", - "tfmg:blue_concrete_wall", "tfmg:cyan_concrete", - "tfmg:blue_concrete_stairs", "tfmg:cyan_concrete_wall", - "tfmg:blue_concrete_slab", "tfmg:cyan_concrete_stairs", - "tfmg:light_blue_concrete", "tfmg:cyan_concrete_slab", - "tfmg:light_blue_concrete_wall", "tfmg:purple_concrete", - "tfmg:light_blue_concrete_stairs", "tfmg:purple_concrete_wall", - "tfmg:light_blue_concrete_slab", "tfmg:purple_concrete_stairs", - "tfmg:red_concrete", "tfmg:purple_concrete_slab", - "tfmg:red_concrete_wall", "tfmg:orange_concrete", - "tfmg:red_concrete_stairs", "tfmg:orange_concrete_wall", - "tfmg:red_concrete_slab", "tfmg:orange_concrete_stairs", - "tfmg:green_concrete", "tfmg:orange_concrete_slab", - "tfmg:green_concrete_wall", "tfmg:black_concrete", - "tfmg:green_concrete_stairs", "tfmg:black_concrete_wall", - "tfmg:green_concrete_slab", "tfmg:black_concrete_stairs", - "tfmg:lime_concrete", "tfmg:black_concrete_slab", - "tfmg:lime_concrete_wall", "tfmg:white_rebar_concrete", - "tfmg:lime_concrete_stairs", "tfmg:white_rebar_concrete_wall", - "tfmg:lime_concrete_slab", "tfmg:white_rebar_concrete_stairs", - "tfmg:pink_concrete", "tfmg:white_rebar_concrete_slab", - "tfmg:pink_concrete_wall", "tfmg:blue_rebar_concrete", - "tfmg:pink_concrete_stairs", "tfmg:blue_rebar_concrete_wall", - "tfmg:pink_concrete_slab", "tfmg:blue_rebar_concrete_stairs", - "tfmg:magenta_concrete", "tfmg:blue_rebar_concrete_slab", - "tfmg:magenta_concrete_wall", "tfmg:light_blue_rebar_concrete", - "tfmg:magenta_concrete_stairs", "tfmg:light_blue_rebar_concrete_wall", - "tfmg:magenta_concrete_slab", "tfmg:light_blue_rebar_concrete_stairs", - "tfmg:yellow_concrete", "tfmg:light_blue_rebar_concrete_slab", - "tfmg:yellow_concrete_wall", "tfmg:red_rebar_concrete", - "tfmg:yellow_concrete_stairs", "tfmg:red_rebar_concrete_wall", - "tfmg:yellow_concrete_slab", "tfmg:red_rebar_concrete_stairs", - "tfmg:gray_concrete", "tfmg:red_rebar_concrete_slab", - "tfmg:gray_concrete_wall", "tfmg:green_rebar_concrete", - "tfmg:gray_concrete_stairs", - "tfmg:green_rebar_concrete_wall", - "tfmg:gray_concrete_slab", - "tfmg:green_rebar_concrete_stairs", - "tfmg:light_gray_concrete", - "tfmg:green_rebar_concrete_slab", - "tfmg:light_gray_concrete_wall", - "tfmg:lime_rebar_concrete", - "tfmg:light_gray_concrete_stairs", - "tfmg:lime_rebar_concrete_wall", - "tfmg:light_gray_concrete_slab", - "tfmg:lime_rebar_concrete_stairs", - "tfmg:brown_concrete", - "tfmg:lime_rebar_concrete_slab", - "tfmg:brown_concrete_wall", - "tfmg:pink_rebar_concrete", - "tfmg:brown_concrete_stairs", - "tfmg:pink_rebar_concrete_wall", - "tfmg:brown_concrete_slab", - "tfmg:pink_rebar_concrete_stairs", - "tfmg:cyan_concrete", - "tfmg:pink_rebar_concrete_slab", - "tfmg:cyan_concrete_wall", - "tfmg:magenta_rebar_concrete", - "tfmg:cyan_concrete_stairs", - "tfmg:magenta_rebar_concrete_wall", - "tfmg:cyan_concrete_slab", - "tfmg:magenta_rebar_concrete_stairs", - "tfmg:purple_concrete", - "tfmg:magenta_rebar_concrete_slab", - "tfmg:purple_concrete_wall", - "tfmg:yellow_rebar_concrete", - "tfmg:purple_concrete_stairs", - "tfmg:yellow_rebar_concrete_wall", - "tfmg:purple_concrete_slab", - "tfmg:yellow_rebar_concrete_stairs", - "tfmg:orange_concrete", - "tfmg:yellow_rebar_concrete_slab", - "tfmg:orange_concrete_wall", - "tfmg:gray_rebar_concrete", - "tfmg:orange_concrete_stairs", - "tfmg:gray_rebar_concrete_wall", - "tfmg:orange_concrete_slab", - "tfmg:gray_rebar_concrete_stairs", - "tfmg:black_concrete", - "tfmg:gray_rebar_concrete_slab", - "tfmg:black_concrete_wall", - "tfmg:light_gray_rebar_concrete", - "tfmg:black_concrete_stairs", - "tfmg:light_gray_rebar_concrete_wall", - "tfmg:black_concrete_slab", - "tfmg:light_gray_rebar_concrete_stairs", - "tfmg:white_rebar_concrete", - "tfmg:light_gray_rebar_concrete_slab", - "tfmg:white_rebar_concrete_wall", - "tfmg:brown_rebar_concrete", - "tfmg:white_rebar_concrete_stairs", - "tfmg:brown_rebar_concrete_wall", - "tfmg:white_rebar_concrete_slab", - "tfmg:brown_rebar_concrete_stairs", - "tfmg:blue_rebar_concrete", - "tfmg:brown_rebar_concrete_slab", - "tfmg:blue_rebar_concrete_wall", - "tfmg:cyan_rebar_concrete", - "tfmg:blue_rebar_concrete_stairs", - "tfmg:cyan_rebar_concrete_wall", - "tfmg:blue_rebar_concrete_slab", - "tfmg:cyan_rebar_concrete_stairs", - "tfmg:light_blue_rebar_concrete", - "tfmg:cyan_rebar_concrete_slab", - "tfmg:light_blue_rebar_concrete_wall", - "tfmg:purple_rebar_concrete", - "tfmg:light_blue_rebar_concrete_stairs", - "tfmg:purple_rebar_concrete_wall", - "tfmg:light_blue_rebar_concrete_slab", - "tfmg:purple_rebar_concrete_stairs", - "tfmg:red_rebar_concrete", - "tfmg:purple_rebar_concrete_slab", - "tfmg:red_rebar_concrete_wall", - "tfmg:orange_rebar_concrete", - "tfmg:red_rebar_concrete_stairs", - "tfmg:orange_rebar_concrete_wall", - "tfmg:red_rebar_concrete_slab", - "tfmg:orange_rebar_concrete_stairs", - "tfmg:green_rebar_concrete", - "tfmg:orange_rebar_concrete_slab", "tfmg:green_rebar_concrete_wall", "tfmg:green_rebar_concrete_stairs", - "tfmg:black_rebar_concrete", "tfmg:green_rebar_concrete_slab", - "tfmg:black_rebar_concrete_wall", "tfmg:lime_rebar_concrete", - "tfmg:black_rebar_concrete_stairs", "tfmg:lime_rebar_concrete_wall", - "tfmg:black_rebar_concrete_slab", "tfmg:lime_rebar_concrete_stairs", - "tfmg:asphalt", "tfmg:lime_rebar_concrete_slab", - "tfmg:asphalt_wall", "tfmg:pink_rebar_concrete", - "tfmg:asphalt_slab", "tfmg:pink_rebar_concrete_wall", - "tfmg:asphalt_stairs", "tfmg:pink_rebar_concrete_stairs", "tfmg:pink_rebar_concrete_slab", "tfmg:magenta_rebar_concrete", diff --git a/src/generated/resources/data/minecraft/tags/block/slabs.json b/src/generated/resources/data/minecraft/tags/block/slabs.json index b1e659ca..2c9aded5 100644 --- a/src/generated/resources/data/minecraft/tags/block/slabs.json +++ b/src/generated/resources/data/minecraft/tags/block/slabs.json @@ -11,54 +11,19 @@ "tfmg:pink_concrete_slab", "tfmg:magenta_concrete_slab", "tfmg:yellow_concrete_slab", - "tfmg:concrete_slab", "tfmg:gray_concrete_slab", - "tfmg:rebar_concrete_slab", "tfmg:light_gray_concrete_slab", - "tfmg:white_concrete_slab", "tfmg:brown_concrete_slab", - "tfmg:blue_concrete_slab", "tfmg:cyan_concrete_slab", - "tfmg:light_blue_concrete_slab", "tfmg:purple_concrete_slab", - "tfmg:red_concrete_slab", "tfmg:orange_concrete_slab", - "tfmg:green_concrete_slab", "tfmg:black_concrete_slab", - "tfmg:lime_concrete_slab", "tfmg:white_rebar_concrete_slab", - "tfmg:pink_concrete_slab", "tfmg:blue_rebar_concrete_slab", - "tfmg:magenta_concrete_slab", "tfmg:light_blue_rebar_concrete_slab", - "tfmg:yellow_concrete_slab", "tfmg:red_rebar_concrete_slab", - "tfmg:gray_concrete_slab", "tfmg:green_rebar_concrete_slab", - "tfmg:light_gray_concrete_slab", "tfmg:lime_rebar_concrete_slab", - "tfmg:brown_concrete_slab", - "tfmg:pink_rebar_concrete_slab", - "tfmg:cyan_concrete_slab", - "tfmg:magenta_rebar_concrete_slab", - "tfmg:purple_concrete_slab", - "tfmg:yellow_rebar_concrete_slab", - "tfmg:orange_concrete_slab", - "tfmg:gray_rebar_concrete_slab", - "tfmg:black_concrete_slab", - "tfmg:light_gray_rebar_concrete_slab", - "tfmg:white_rebar_concrete_slab", - "tfmg:brown_rebar_concrete_slab", - "tfmg:blue_rebar_concrete_slab", - "tfmg:cyan_rebar_concrete_slab", - "tfmg:light_blue_rebar_concrete_slab", - "tfmg:purple_rebar_concrete_slab", - "tfmg:red_rebar_concrete_slab", - "tfmg:orange_rebar_concrete_slab", - "tfmg:green_rebar_concrete_slab", - "tfmg:black_rebar_concrete_slab", - "tfmg:lime_rebar_concrete_slab", - "tfmg:asphalt_slab", "tfmg:pink_rebar_concrete_slab", "tfmg:magenta_rebar_concrete_slab", "tfmg:yellow_rebar_concrete_slab", @@ -74,17 +39,9 @@ "tfmg:polished_cut_bauxite_slab", "tfmg:cut_bauxite_brick_slab", "tfmg:small_bauxite_brick_slab", - "tfmg:cut_bauxite_slab", - "tfmg:polished_cut_bauxite_slab", "tfmg:cut_galena_slab", - "tfmg:cut_bauxite_brick_slab", - "tfmg:small_bauxite_brick_slab", - "tfmg:polished_cut_galena_slab", - "tfmg:cut_galena_slab", - "tfmg:cut_galena_brick_slab", "tfmg:polished_cut_galena_slab", "tfmg:cut_galena_brick_slab", - "tfmg:small_galena_brick_slab", "tfmg:small_galena_brick_slab" ] } \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/tags/block/stairs.json b/src/generated/resources/data/minecraft/tags/block/stairs.json index 0e0fb76a..c53cbef6 100644 --- a/src/generated/resources/data/minecraft/tags/block/stairs.json +++ b/src/generated/resources/data/minecraft/tags/block/stairs.json @@ -11,54 +11,19 @@ "tfmg:pink_concrete_stairs", "tfmg:magenta_concrete_stairs", "tfmg:yellow_concrete_stairs", - "tfmg:concrete_stairs", "tfmg:gray_concrete_stairs", - "tfmg:rebar_concrete_stairs", "tfmg:light_gray_concrete_stairs", - "tfmg:white_concrete_stairs", "tfmg:brown_concrete_stairs", - "tfmg:blue_concrete_stairs", "tfmg:cyan_concrete_stairs", - "tfmg:light_blue_concrete_stairs", "tfmg:purple_concrete_stairs", - "tfmg:red_concrete_stairs", "tfmg:orange_concrete_stairs", - "tfmg:green_concrete_stairs", "tfmg:black_concrete_stairs", - "tfmg:lime_concrete_stairs", "tfmg:white_rebar_concrete_stairs", - "tfmg:pink_concrete_stairs", "tfmg:blue_rebar_concrete_stairs", - "tfmg:magenta_concrete_stairs", "tfmg:light_blue_rebar_concrete_stairs", - "tfmg:yellow_concrete_stairs", "tfmg:red_rebar_concrete_stairs", - "tfmg:gray_concrete_stairs", "tfmg:green_rebar_concrete_stairs", - "tfmg:light_gray_concrete_stairs", "tfmg:lime_rebar_concrete_stairs", - "tfmg:brown_concrete_stairs", - "tfmg:pink_rebar_concrete_stairs", - "tfmg:cyan_concrete_stairs", - "tfmg:magenta_rebar_concrete_stairs", - "tfmg:purple_concrete_stairs", - "tfmg:yellow_rebar_concrete_stairs", - "tfmg:orange_concrete_stairs", - "tfmg:gray_rebar_concrete_stairs", - "tfmg:black_concrete_stairs", - "tfmg:light_gray_rebar_concrete_stairs", - "tfmg:white_rebar_concrete_stairs", - "tfmg:brown_rebar_concrete_stairs", - "tfmg:blue_rebar_concrete_stairs", - "tfmg:cyan_rebar_concrete_stairs", - "tfmg:light_blue_rebar_concrete_stairs", - "tfmg:purple_rebar_concrete_stairs", - "tfmg:red_rebar_concrete_stairs", - "tfmg:orange_rebar_concrete_stairs", - "tfmg:green_rebar_concrete_stairs", - "tfmg:black_rebar_concrete_stairs", - "tfmg:lime_rebar_concrete_stairs", - "tfmg:asphalt_stairs", "tfmg:pink_rebar_concrete_stairs", "tfmg:magenta_rebar_concrete_stairs", "tfmg:yellow_rebar_concrete_stairs", @@ -74,17 +39,9 @@ "tfmg:polished_cut_bauxite_stairs", "tfmg:cut_bauxite_brick_stairs", "tfmg:small_bauxite_brick_stairs", - "tfmg:cut_bauxite_stairs", - "tfmg:polished_cut_bauxite_stairs", "tfmg:cut_galena_stairs", - "tfmg:cut_bauxite_brick_stairs", - "tfmg:small_bauxite_brick_stairs", - "tfmg:polished_cut_galena_stairs", - "tfmg:cut_galena_stairs", - "tfmg:cut_galena_brick_stairs", "tfmg:polished_cut_galena_stairs", "tfmg:cut_galena_brick_stairs", - "tfmg:small_galena_brick_stairs", "tfmg:small_galena_brick_stairs" ] } \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/tags/block/walls.json b/src/generated/resources/data/minecraft/tags/block/walls.json index 0488d91c..c0c10283 100644 --- a/src/generated/resources/data/minecraft/tags/block/walls.json +++ b/src/generated/resources/data/minecraft/tags/block/walls.json @@ -1,6 +1,5 @@ { "values": [ - "tfmg:fireproof_brick_reinforcement", "tfmg:fireproof_brick_reinforcement", "tfmg:concrete_wall", "tfmg:rebar_concrete_wall", @@ -13,54 +12,19 @@ "tfmg:pink_concrete_wall", "tfmg:magenta_concrete_wall", "tfmg:yellow_concrete_wall", - "tfmg:concrete_wall", "tfmg:gray_concrete_wall", - "tfmg:rebar_concrete_wall", "tfmg:light_gray_concrete_wall", - "tfmg:white_concrete_wall", "tfmg:brown_concrete_wall", - "tfmg:blue_concrete_wall", "tfmg:cyan_concrete_wall", - "tfmg:light_blue_concrete_wall", "tfmg:purple_concrete_wall", - "tfmg:red_concrete_wall", "tfmg:orange_concrete_wall", - "tfmg:green_concrete_wall", "tfmg:black_concrete_wall", - "tfmg:lime_concrete_wall", "tfmg:white_rebar_concrete_wall", - "tfmg:pink_concrete_wall", "tfmg:blue_rebar_concrete_wall", - "tfmg:magenta_concrete_wall", "tfmg:light_blue_rebar_concrete_wall", - "tfmg:yellow_concrete_wall", "tfmg:red_rebar_concrete_wall", - "tfmg:gray_concrete_wall", "tfmg:green_rebar_concrete_wall", - "tfmg:light_gray_concrete_wall", "tfmg:lime_rebar_concrete_wall", - "tfmg:brown_concrete_wall", - "tfmg:pink_rebar_concrete_wall", - "tfmg:cyan_concrete_wall", - "tfmg:magenta_rebar_concrete_wall", - "tfmg:purple_concrete_wall", - "tfmg:yellow_rebar_concrete_wall", - "tfmg:orange_concrete_wall", - "tfmg:gray_rebar_concrete_wall", - "tfmg:black_concrete_wall", - "tfmg:light_gray_rebar_concrete_wall", - "tfmg:white_rebar_concrete_wall", - "tfmg:brown_rebar_concrete_wall", - "tfmg:blue_rebar_concrete_wall", - "tfmg:cyan_rebar_concrete_wall", - "tfmg:light_blue_rebar_concrete_wall", - "tfmg:purple_rebar_concrete_wall", - "tfmg:red_rebar_concrete_wall", - "tfmg:orange_rebar_concrete_wall", - "tfmg:green_rebar_concrete_wall", - "tfmg:black_rebar_concrete_wall", - "tfmg:lime_rebar_concrete_wall", - "tfmg:asphalt_wall", "tfmg:pink_rebar_concrete_wall", "tfmg:magenta_rebar_concrete_wall", "tfmg:yellow_rebar_concrete_wall", @@ -76,17 +40,9 @@ "tfmg:polished_cut_bauxite_wall", "tfmg:cut_bauxite_brick_wall", "tfmg:small_bauxite_brick_wall", - "tfmg:cut_bauxite_wall", - "tfmg:polished_cut_bauxite_wall", - "tfmg:cut_bauxite_brick_wall", - "tfmg:cut_galena_wall", - "tfmg:small_bauxite_brick_wall", - "tfmg:polished_cut_galena_wall", "tfmg:cut_galena_wall", "tfmg:polished_cut_galena_wall", "tfmg:cut_galena_brick_wall", - "tfmg:cut_galena_brick_wall", - "tfmg:small_galena_brick_wall", "tfmg:small_galena_brick_wall" ] } \ No newline at end of file diff --git a/src/generated/resources/data/tfmg/tags/block/pumpjack_head.json b/src/generated/resources/data/tfmg/tags/block/pumpjack_head.json index db702d86..48fdf33a 100644 --- a/src/generated/resources/data/tfmg/tags/block/pumpjack_head.json +++ b/src/generated/resources/data/tfmg/tags/block/pumpjack_head.json @@ -2,7 +2,6 @@ "values": [ "tfmg:pumpjack_hammer_head", "tfmg:large_pumpjack_hammer_head", - "minecraft:iron_block", "minecraft:iron_block" ] } \ No newline at end of file diff --git a/src/generated/resources/data/tfmg/tags/block/pumpjack_part.json b/src/generated/resources/data/tfmg/tags/block/pumpjack_part.json index feef8cde..a3607049 100644 --- a/src/generated/resources/data/tfmg/tags/block/pumpjack_part.json +++ b/src/generated/resources/data/tfmg/tags/block/pumpjack_part.json @@ -1,8 +1,6 @@ { "values": [ "tfmg:large_pumpjack_hammer_part", - "tfmg:large_pumpjack_hammer_part", - "#tfmg:pumpjack_small_part", "#tfmg:pumpjack_small_part" ] } \ No newline at end of file diff --git a/src/main/java/com/drmangotea/tfmg/base/TFMGRegistrateTags.java b/src/main/java/com/drmangotea/tfmg/base/TFMGRegistrateTags.java index 1a677f95..04491d89 100644 --- a/src/main/java/com/drmangotea/tfmg/base/TFMGRegistrateTags.java +++ b/src/main/java/com/drmangotea/tfmg/base/TFMGRegistrateTags.java @@ -25,26 +25,14 @@ public class TFMGRegistrateTags { prov.tag(Tags.Items.RODS) .add(Items.STICK); - - for (TFMGTags.TFMGItemTags tag : TFMGTags.TFMGItemTags.values()) { - if (tag.alwaysDatagen) { - prov.getOrCreateRawBuilder(tag.tag); - } - } } private static void genBlockTags(RegistrateTagsProvider provIn) { TagGen.CreateTagsProvider prov = new TagGen.CreateTagsProvider<>(provIn, Block::builtInRegistryHolder); - prov.tag(TFMGTags.TFMGBlockTags.PUMPJACK_HEAD.tag) .add(Blocks.IRON_BLOCK); + prov.tag(TFMGTags.TFMGBlockTags.PUMPJACK_PART.tag) .addTag(TFMGTags.TFMGBlockTags.PUMPJACK_SMALL_PART.tag); - - for (TFMGTags.TFMGBlockTags tag : TFMGTags.TFMGBlockTags.values()) { - if (tag.alwaysDatagen) { - prov.getOrCreateRawBuilder(tag.tag); - } - } } } diff --git a/src/main/java/com/drmangotea/tfmg/registry/TFMGTags.java b/src/main/java/com/drmangotea/tfmg/registry/TFMGTags.java index 8e45a789..e0dc36ed 100644 --- a/src/main/java/com/drmangotea/tfmg/registry/TFMGTags.java +++ b/src/main/java/com/drmangotea/tfmg/registry/TFMGTags.java @@ -1,46 +1,30 @@ package com.drmangotea.tfmg.registry; - import com.drmangotea.tfmg.TFMG; - import com.drmangotea.tfmg.base.lang.TFMGLang; import net.minecraft.resources.ResourceLocation; import net.minecraft.tags.BlockTags; import net.minecraft.tags.FluidTags; import net.minecraft.tags.ItemTags; import net.minecraft.tags.TagKey; -import net.minecraft.world.item.BlockItem; import net.minecraft.world.item.Item; -import net.minecraft.world.item.ItemStack; import net.minecraft.world.level.block.Block; -import net.minecraft.world.level.block.state.BlockState; import net.minecraft.world.level.material.Fluid; -import net.minecraft.world.level.material.FluidState; - -import static com.drmangotea.tfmg.registry.TFMGTags.NameSpace.COMMON; -import static com.drmangotea.tfmg.registry.TFMGTags.NameSpace.MOD; +import static com.drmangotea.tfmg.registry.TFMGTags.NameSpace.*; public class TFMGTags { public enum NameSpace { - - MOD(TFMG.MOD_ID, true), + MOD(TFMG.MOD_ID), COMMON("c") ; public final String id; - public final boolean alwaysDatagenDefault; - NameSpace(String id) { - this(id, false); - } - - NameSpace(String id, boolean alwaysDatagenDefault) { this.id = id; - this.alwaysDatagenDefault = alwaysDatagenDefault; } } @@ -65,46 +49,17 @@ public class TFMGTags { ; public final TagKey tag; - public final boolean alwaysDatagen; TFMGBlockTags() { this(MOD); } - TFMGBlockTags(NameSpace namespace) { - this(namespace, namespace.alwaysDatagenDefault); + this(namespace, null); } - - TFMGBlockTags(NameSpace namespace, boolean alwaysDatagen) { - this(namespace, null, alwaysDatagen); - } - TFMGBlockTags(NameSpace namespace, String path) { - this(namespace, path, namespace.alwaysDatagenDefault); - } - - TFMGBlockTags(NameSpace namespace, String path, boolean alwaysDatagen) { ResourceLocation id = ResourceLocation.fromNamespaceAndPath(namespace.id, path == null ? TFMGLang.asId(name()) : path); this.tag = BlockTags.create(id); - this.alwaysDatagen = alwaysDatagen; } - - @SuppressWarnings("deprecation") - public boolean matches(Block block) { - return block.builtInRegistryHolder() - .is(tag); - } - - public boolean matches(ItemStack stack) { - return stack != null && stack.getItem() instanceof BlockItem blockItem && matches(blockItem.getBlock()); - } - - public boolean matches(BlockState state) { - return state.is(tag); - } - - private static void init() {} - } public enum TFMGItemTags { BLAST_FURNACE_FUEL, @@ -137,108 +92,55 @@ public class TFMGTags { ; public final TagKey tag; - public final boolean alwaysDatagen; TFMGItemTags() { this(NameSpace.MOD); } - TFMGItemTags(NameSpace namespace) { - this(namespace, namespace.alwaysDatagenDefault); + this(namespace, null); } - TFMGItemTags(NameSpace namespace, String path) { - this(namespace, path, namespace.alwaysDatagenDefault); - } - - TFMGItemTags(NameSpace namespace, boolean alwaysDatagen) { - this(namespace, null, alwaysDatagen); - } - - TFMGItemTags(NameSpace namespace, String path, boolean alwaysDatagen) { ResourceLocation id = ResourceLocation.fromNamespaceAndPath(namespace.id, path == null ? TFMGLang.asId(name()) : path); this.tag = ItemTags.create(id); - this.alwaysDatagen = alwaysDatagen; } - - @SuppressWarnings("deprecation") - public boolean matches(Item item) { - return item.builtInRegistryHolder() - .is(tag); - } - - public boolean matches(ItemStack stack) { - return stack.is(tag); - } - - private static void init() {} - } public enum TFMGFluidTags { - GAS(MOD), + GAS, - FLAMMABLE(MOD), - FIREBOX_FUEL(MOD), - BLAST_STOVE_FUEL(MOD), - AIR(NameSpace.COMMON), - COOLING_FLUID(NameSpace.COMMON), + FLAMMABLE, + FIREBOX_FUEL, + BLAST_STOVE_FUEL, + AIR(COMMON), + COOLING_FLUID(COMMON), - GASOLINE(NameSpace.COMMON), - DIESEL(NameSpace.COMMON), - KEROSENE(NameSpace.COMMON), + GASOLINE(COMMON), + DIESEL(COMMON), + KEROSENE(COMMON), - CREOSOTE(NameSpace.COMMON), - FURNACE_GAS(NameSpace.COMMON), + CREOSOTE(COMMON), + FURNACE_GAS(COMMON), - LPG(NameSpace.COMMON), - HEAVY_OIL(NameSpace.COMMON), - LUBRICATION_OIL(NameSpace.COMMON), - NAPHTHA(NameSpace.COMMON), - CRUDE_OIL(NameSpace.COMMON), - MOLTEN_STEEL(NameSpace.COMMON), - FUEL(NameSpace.COMMON) + LPG(COMMON), + HEAVY_OIL(COMMON), + LUBRICATION_OIL(COMMON), + NAPHTHA(COMMON), + CRUDE_OIL(COMMON), + MOLTEN_STEEL(COMMON), + FUEL(COMMON) ; public final TagKey tag; - public final boolean alwaysDatagen; - - + TFMGFluidTags() { + this(NameSpace.MOD); + } TFMGFluidTags(NameSpace namespace) { - this(namespace, namespace.alwaysDatagenDefault); + this(namespace, null); } - - - TFMGFluidTags(NameSpace namespace, boolean alwaysDatagen) { - this(namespace, null, alwaysDatagen); - } - - TFMGFluidTags(NameSpace namespace, String path, boolean alwaysDatagen) { + TFMGFluidTags(NameSpace namespace, String path) { ResourceLocation id = ResourceLocation.fromNamespaceAndPath(namespace.id, path == null ? TFMGLang.asId(name()) : path); this.tag = FluidTags.create(id); - this.alwaysDatagen = alwaysDatagen; } - - - public boolean matches(Fluid fluid) { - return fluid.is(tag); - } - - public boolean matches(FluidState state) { - return state.is(tag); - } - - private static void init() {} - - } - - - public static void init() { - TFMGBlockTags.init(); - // TFMGItemTags.init(); - TFMGFluidTags.init(); - //TFMGEntityTags.init(); - //TFMGRecipeSerializerTags.init(); } }