diff --git a/src/generated/resources/assets/tfmg/lang/en_ud.json b/src/generated/resources/assets/tfmg/lang/en_ud.json index 550eadb1..781f4d54 100644 --- a/src/generated/resources/assets/tfmg/lang/en_ud.json +++ b/src/generated/resources/assets/tfmg/lang/en_ud.json @@ -747,7 +747,6 @@ "item.tfmg.cyan_multimeter.tooltip.condition2": "buıɥɔnoɹɔ ǝןıɥʍ ʇuǝuodɯoɔ ɔıɹʇɔǝןǝ uɐ ʇɐ buıʞooן uǝɥM", "item.tfmg.cyan_multimeter.tooltip.summary": "ʞɹoʍʇǝu sʇı puɐ ʞɔoןq ןɐɔıɹʇɔǝןǝ uɐ ʇnoqɐ ɐʇɐp sʍoɥS", "item.tfmg.debug_cinderblock": "ʞɔoןqɹǝpuıƆ bnqǝᗡ", - "item.tfmg.deposit_item": "ɯǝʇI ʇısodǝᗡ", "item.tfmg.diesel_bucket": "ʇǝʞɔnᗺ ןǝsǝıᗡ", "item.tfmg.diesel_engine_cylinder": "ɹǝpuıןʎƆ ǝuıbuƎ ןǝsǝıᗡ", "item.tfmg.electricians_wrench": "ɥɔuǝɹM uoıʇɐɹnbıɟuoƆ", diff --git a/src/generated/resources/assets/tfmg/lang/en_us.json b/src/generated/resources/assets/tfmg/lang/en_us.json index 3d18525c..f1668f39 100644 --- a/src/generated/resources/assets/tfmg/lang/en_us.json +++ b/src/generated/resources/assets/tfmg/lang/en_us.json @@ -747,7 +747,6 @@ "item.tfmg.cyan_multimeter.tooltip.condition2": "When looking at an electric component while crouching", "item.tfmg.cyan_multimeter.tooltip.summary": "Shows data about an electrical block and its network", "item.tfmg.debug_cinderblock": "Debug Cinderblock", - "item.tfmg.deposit_item": "Deposit Item", "item.tfmg.diesel_bucket": "Diesel Bucket", "item.tfmg.diesel_engine_cylinder": "Diesel Engine Cylinder", "item.tfmg.electricians_wrench": "Configuration Wrench", diff --git a/src/generated/resources/assets/tfmg/models/item/deposit_item.json b/src/generated/resources/assets/tfmg/models/item/deposit_item.json deleted file mode 100644 index 180e3bb6..00000000 --- a/src/generated/resources/assets/tfmg/models/item/deposit_item.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "tfmg:item/deposit_item" - } -} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/dusts.json b/src/generated/resources/data/c/tags/item/dusts.json index 07433a0a..13263c9c 100644 --- a/src/generated/resources/data/c/tags/item/dusts.json +++ b/src/generated/resources/data/c/tags/item/dusts.json @@ -1,6 +1,7 @@ { "values": [ "tfmg:sulfur_dust", + "tfmg:nitrate_dust", "tfmg:rubber_sheet", "tfmg:silicon_ingot", "tfmg:coal_coke_dust" diff --git a/src/generated/resources/data/c/tags/item/dusts/saltpeter.json b/src/generated/resources/data/c/tags/item/dusts/saltpeter.json new file mode 100644 index 00000000..452ce7d1 --- /dev/null +++ b/src/generated/resources/data/c/tags/item/dusts/saltpeter.json @@ -0,0 +1,5 @@ +{ + "values": [ + "tfmg:nitrate_dust" + ] +} \ 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 7202f017..97a1bdd7 100644 --- a/src/generated/resources/data/minecraft/tags/block/mineable/axe.json +++ b/src/generated/resources/data/minecraft/tags/block/mineable/axe.json @@ -30,11 +30,6 @@ "tfmg:steel_encased_aluminum_cogwheel", "tfmg:heavy_casing_encased_aluminum_cogwheel", "tfmg:steel_encased_large_aluminum_cogwheel", - "tfmg:heavy_casing_encased_large_aluminum_cogwheel", - "tfmg:copper_encased_brass_pipe", - "tfmg:copper_encased_steel_pipe", - "tfmg:copper_encased_aluminum_pipe", - "tfmg:copper_encased_cast_iron_pipe", - "tfmg:copper_encased_plastic_pipe" + "tfmg:heavy_casing_encased_large_aluminum_cogwheel" ] } \ No newline at end of file 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 4fae4c03..baeefd2d 100644 --- a/src/generated/resources/data/minecraft/tags/block/mineable/pickaxe.json +++ b/src/generated/resources/data/minecraft/tags/block/mineable/pickaxe.json @@ -1,602 +1,312 @@ { "values": [ - "tfmg:heavy_machinery_casing", "tfmg:aluminum_fluid_tank", - "tfmg:industrial_aluminum_casing", "tfmg:cast_iron_fluid_tank", - "tfmg:steel_block", "tfmg:steel_fluid_tank", - "tfmg:cast_iron_block", "tfmg:steel_distillation_output", - "tfmg:aluminum_block", "tfmg:steel_distillation_controller", - "tfmg:plastic_block", "tfmg:industrial_pipe", - "tfmg:lead_block", "tfmg:concrete_encased_industrial_pipe", - "tfmg:constantan_block", "tfmg:pumpjack_hammer", "tfmg:pumpjack_crank", - "tfmg:nickel_block", "tfmg:pumpjack_hammer_part", - "tfmg:lithium_block", "tfmg:pumpjack_hammer_head", - "tfmg:coal_coke_block", "tfmg:pumpjack_hammer_connector", "tfmg:large_pumpjack_hammer_part", "tfmg:large_pumpjack_hammer_head", - "tfmg:heavy_casing_door", "tfmg:large_pumpjack_hammer_connector", "tfmg:pumpjack_base", - "tfmg:steel_door", "tfmg:oil_deposit", - "tfmg:aluminum_door", "tfmg:steel_chemical_vat", "tfmg:cast_iron_chemical_vat", - "tfmg:heavy_plated_door", "tfmg:fireproof_chemical_vat", - "tfmg:steel_gearbox", "tfmg:industrial_mixer", - "tfmg:steel_bars", "tfmg:electrode_holder", "tfmg:lead_ore", - "tfmg:aluminum_bars", "tfmg:deepslate_lead_ore", - "tfmg:cast_iron_bars", "tfmg:nickel_ore", - "tfmg:lead_bars", "tfmg:deepslate_nickel_ore", - "tfmg:nickel_bars", "tfmg:lithium_ore", - "tfmg:steel_ladder", "tfmg:deepslate_lithium_ore", - "tfmg:aluminum_ladder", "tfmg:sulfur", - "tfmg:cast_iron_ladder", "tfmg:lignite", - "tfmg:lead_ladder", - "tfmg:nickel_ladder", "tfmg:fossilstone", - "tfmg:constantan_ladder", "tfmg:slag_block", "tfmg:raw_nickel_block", - "tfmg:steel_scaffolding", "tfmg:raw_lead_block", - "tfmg:aluminum_scaffolding", "tfmg:raw_lithium_block", - "tfmg:slag_bricks", "tfmg:air_intake", - "tfmg:cinder_block", "tfmg:firebox", - "tfmg:cinderflour_block", "tfmg:winding_machine", - "tfmg:factory_floor", "tfmg:surface_scanner", "tfmg:machine_input", - "tfmg:steel_trapdoor", "tfmg:concrete_hose", - "tfmg:steel_flywheel", "tfmg:blast_furnace_output", - "tfmg:lead_flywheel", "tfmg:blast_furnace_hatch", - "tfmg:cast_iron_flywheel", "tfmg:fireproof_bricks", - "tfmg:aluminum_flywheel", "tfmg:reinforced_fireproof_bricks", - "tfmg:nickel_flywheel", "tfmg:blast_furnace_reinforcement", - "tfmg:steel_truss", "tfmg:blast_furnace_reinforcement_wall", "tfmg:rusted_blast_furnace_reinforcement", - "tfmg:steel_frame", "tfmg:rusted_blast_furnace_reinforcement_wall", - "tfmg:aluminum_truss", "tfmg:fireproof_brick_reinforcement", - "tfmg:aluminum_frame", "tfmg:coke_oven", - "tfmg:cast_iron_truss", "tfmg:blast_stove", - "tfmg:cast_iron_frame", "tfmg:casting_basin", - "tfmg:lead_truss", "tfmg:napalm_bomb", "tfmg:generator", "tfmg:cable_connector", "tfmg:glass_cable_insulator", - "tfmg:lead_frame", "tfmg:resistor", - "tfmg:nickel_truss", "tfmg:copycat_cable_block", - "tfmg:nickel_frame", "tfmg:copycat_cable_base", "tfmg:brass_cable_hub", - "tfmg:constantan_truss", "tfmg:copper_cable_hub", - "tfmg:constantan_frame", "tfmg:steel_cable_hub", - "tfmg:copper_truss", "tfmg:aluminum_cable_hub", - "tfmg:copper_frame", "tfmg:steel_casing_cable_hub", - "tfmg:zinc_truss", - "tfmg:zinc_frame", "tfmg:heavy_cable_hub", - "tfmg:brass_truss", "tfmg:cable_tube", - "tfmg:brass_frame", "tfmg:concrete_encased_cable_tube", - "tfmg:white_caution_block", "tfmg:electric_post", - "tfmg:blue_caution_block", "tfmg:concrete_encased_electric_post", - "tfmg:light_blue_caution_block", "tfmg:diagonal_cable_block", - "tfmg:red_caution_block", "tfmg:electric_motor", - "tfmg:green_caution_block", "tfmg:creative_generator", - "tfmg:lime_caution_block", "tfmg:accumulator", - "tfmg:pink_caution_block", "tfmg:light_bulb", - "tfmg:magenta_caution_block", "tfmg:circular_light", - "tfmg:yellow_caution_block", "tfmg:modern_light", - "tfmg:gray_caution_block", "tfmg:aluminum_lamp", - "tfmg:light_gray_caution_block", "tfmg:neon_tube", - "tfmg:brown_caution_block", "tfmg:electric_diode", - "tfmg:cyan_caution_block", "tfmg:encased_diode", "tfmg:potentiometer", - "tfmg:purple_caution_block", - "tfmg:orange_caution_block", "tfmg:electrical_switch", - "tfmg:concrete_wall", "tfmg:encased_potentiometer", - "tfmg:concrete", "tfmg:electric_pump", - "tfmg:concrete_stairs", "tfmg:voltage_observer", - "tfmg:concrete_slab", "tfmg:voltmeter", - "tfmg:rebar_concrete_wall", "tfmg:polarizer", - "tfmg:rebar_concrete", "tfmg:rotor", - "tfmg:rebar_concrete_stairs", "tfmg:stator", - "tfmg:rebar_concrete_slab", "tfmg:traffic_light", - "tfmg:white_concrete", "tfmg:segmented_display", - "tfmg:white_concrete_wall", "tfmg:transformer", - "tfmg:white_concrete_stairs", "tfmg:converter", - "tfmg:white_concrete_slab", "tfmg:brick_smokestack", - "tfmg:blue_concrete", "tfmg:metal_smokestack", - "tfmg:blue_concrete_wall", "tfmg:concrete_smokestack", - "tfmg:blue_concrete_stairs", "tfmg:exhaust", - "tfmg:blue_concrete_slab", "tfmg:flarestack", - "tfmg:light_blue_concrete", "tfmg:steel_cogwheel", - "tfmg:light_blue_concrete_wall", "tfmg:large_steel_cogwheel", - "tfmg:light_blue_concrete_stairs", "tfmg:aluminum_cogwheel", - "tfmg:light_blue_concrete_slab", "tfmg:large_aluminum_cogwheel", - "tfmg:red_concrete", "tfmg:steel_casing", - "tfmg:red_concrete_wall", "tfmg:heavy_machinery_casing", - "tfmg:red_concrete_stairs", "tfmg:industrial_aluminum_casing", - "tfmg:red_concrete_slab", "tfmg:steel_block", - "tfmg:green_concrete", "tfmg:cast_iron_block", - "tfmg:green_concrete_wall", "tfmg:aluminum_block", - "tfmg:green_concrete_stairs", "tfmg:plastic_block", - "tfmg:green_concrete_slab", "tfmg:lead_block", - "tfmg:lime_concrete", "tfmg:constantan_block", - "tfmg:lime_concrete_wall", "tfmg:nickel_block", - "tfmg:lime_concrete_stairs", "tfmg:lithium_block", - "tfmg:lime_concrete_slab", "tfmg:coal_coke_block", - "tfmg:pink_concrete", - "tfmg:pink_concrete_wall", "tfmg:heavy_casing_door", - "tfmg:pink_concrete_stairs", "tfmg:steel_door", - "tfmg:pink_concrete_slab", "tfmg:aluminum_door", - "tfmg:magenta_concrete", "tfmg:heavy_plated_door", - "tfmg:magenta_concrete_wall", "tfmg:steel_gearbox", - "tfmg:magenta_concrete_stairs", "tfmg:steel_bars", - "tfmg:magenta_concrete_slab", "tfmg:aluminum_bars", "tfmg:cast_iron_bars", - "tfmg:yellow_concrete", "tfmg:lead_bars", - "tfmg:yellow_concrete_wall", "tfmg:nickel_bars", - "tfmg:yellow_concrete_stairs", "tfmg:steel_ladder", - "tfmg:yellow_concrete_slab", "tfmg:aluminum_ladder", - "tfmg:gray_concrete", "tfmg:cast_iron_ladder", - "tfmg:gray_concrete_wall", "tfmg:lead_ladder", - "tfmg:gray_concrete_stairs", "tfmg:nickel_ladder", - "tfmg:gray_concrete_slab", "tfmg:constantan_ladder", - "tfmg:light_gray_concrete", "tfmg:steel_scaffolding", - "tfmg:light_gray_concrete_wall", "tfmg:aluminum_scaffolding", - "tfmg:light_gray_concrete_stairs", "tfmg:slag_bricks", - "tfmg:light_gray_concrete_slab", "tfmg:cinder_block", - "tfmg:brown_concrete", "tfmg:cinderflour_block", - "tfmg:brown_concrete_wall", "tfmg:factory_floor", - "tfmg:brown_concrete_stairs", "tfmg:steel_trapdoor", "tfmg:steel_flywheel", - "tfmg:brown_concrete_slab", "tfmg:lead_flywheel", "tfmg:cast_iron_flywheel", - "tfmg:cyan_concrete", "tfmg:aluminum_flywheel", - "tfmg:cyan_concrete_wall", "tfmg:nickel_flywheel", - "tfmg:cyan_concrete_stairs", "tfmg:steel_truss", - "tfmg:cyan_concrete_slab", "tfmg:steel_frame", - "tfmg:purple_concrete", "tfmg:aluminum_truss", - "tfmg:purple_concrete_wall", "tfmg:aluminum_frame", - "tfmg:purple_concrete_stairs", "tfmg:cast_iron_truss", - "tfmg:purple_concrete_slab", "tfmg:cast_iron_frame", - "tfmg:orange_concrete", "tfmg:lead_truss", - "tfmg:orange_concrete_wall", "tfmg:lead_frame", - "tfmg:orange_concrete_stairs", "tfmg:nickel_truss", - "tfmg:orange_concrete_slab", "tfmg:nickel_frame", - "tfmg:black_concrete", "tfmg:constantan_truss", - "tfmg:black_concrete_wall", "tfmg:constantan_frame", - "tfmg:black_concrete_stairs", "tfmg:copper_truss", - "tfmg:black_concrete_slab", "tfmg:copper_frame", - "tfmg:white_rebar_concrete", "tfmg:zinc_truss", - "tfmg:white_rebar_concrete_wall", "tfmg:zinc_frame", - "tfmg:white_rebar_concrete_stairs", "tfmg:brass_truss", "tfmg:brass_frame", - "tfmg:white_rebar_concrete_slab", "tfmg:white_caution_block", - "tfmg:blue_rebar_concrete", "tfmg:blue_caution_block", - "tfmg:blue_rebar_concrete_wall", "tfmg:light_blue_caution_block", - "tfmg:blue_rebar_concrete_stairs", "tfmg:red_caution_block", - "tfmg:blue_rebar_concrete_slab", "tfmg:green_caution_block", - "tfmg:light_blue_rebar_concrete", "tfmg:lime_caution_block", - "tfmg:light_blue_rebar_concrete_wall", "tfmg:pink_caution_block", - "tfmg:light_blue_rebar_concrete_stairs", "tfmg:magenta_caution_block", - "tfmg:light_blue_rebar_concrete_slab", "tfmg:yellow_caution_block", - "tfmg:red_rebar_concrete", "tfmg:gray_caution_block", - "tfmg:red_rebar_concrete_wall", "tfmg:light_gray_caution_block", - "tfmg:red_rebar_concrete_stairs", "tfmg:brown_caution_block", - "tfmg:red_rebar_concrete_slab", "tfmg:cyan_caution_block", - "tfmg:green_rebar_concrete", "tfmg:purple_caution_block", - "tfmg:green_rebar_concrete_wall", "tfmg:orange_caution_block", - "tfmg:green_rebar_concrete_stairs", "tfmg:concrete_wall", - "tfmg:green_rebar_concrete_slab", "tfmg:concrete", - "tfmg:lime_rebar_concrete", "tfmg:concrete_stairs", - "tfmg:lime_rebar_concrete_wall", "tfmg:concrete_slab", - "tfmg:lime_rebar_concrete_stairs", "tfmg:rebar_concrete_wall", - "tfmg:lime_rebar_concrete_slab", "tfmg:rebar_concrete", "tfmg:rebar_concrete_stairs", - "tfmg:pink_rebar_concrete", "tfmg:rebar_concrete_slab", "tfmg:white_concrete", - "tfmg:pink_rebar_concrete_wall", "tfmg:white_concrete_wall", - "tfmg:pink_rebar_concrete_stairs", "tfmg:white_concrete_stairs", - "tfmg:pink_rebar_concrete_slab", "tfmg:white_concrete_slab", - "tfmg:magenta_rebar_concrete", "tfmg:blue_concrete", - "tfmg:magenta_rebar_concrete_wall", "tfmg:blue_concrete_wall", - "tfmg:magenta_rebar_concrete_stairs", "tfmg:blue_concrete_stairs", "tfmg:blue_concrete_slab", - "tfmg:magenta_rebar_concrete_slab", "tfmg:light_blue_concrete", - "tfmg:yellow_rebar_concrete", "tfmg:light_blue_concrete_wall", - "tfmg:yellow_rebar_concrete_wall", "tfmg:light_blue_concrete_stairs", - "tfmg:yellow_rebar_concrete_stairs", "tfmg:light_blue_concrete_slab", - "tfmg:yellow_rebar_concrete_slab", "tfmg:red_concrete", - "tfmg:gray_rebar_concrete", "tfmg:red_concrete_wall", "tfmg:red_concrete_stairs", - "tfmg:gray_rebar_concrete_wall", "tfmg:red_concrete_slab", - "tfmg:gray_rebar_concrete_stairs", "tfmg:green_concrete", - "tfmg:gray_rebar_concrete_slab", "tfmg:green_concrete_wall", - "tfmg:light_gray_rebar_concrete", "tfmg:green_concrete_stairs", - "tfmg:light_gray_rebar_concrete_wall", "tfmg:green_concrete_slab", - "tfmg:light_gray_rebar_concrete_stairs", "tfmg:lime_concrete", - "tfmg:light_gray_rebar_concrete_slab", "tfmg:lime_concrete_wall", - "tfmg:brown_rebar_concrete", "tfmg:lime_concrete_stairs", - "tfmg:brown_rebar_concrete_wall", "tfmg:lime_concrete_slab", - "tfmg:brown_rebar_concrete_stairs", "tfmg:pink_concrete", - "tfmg:brown_rebar_concrete_slab", "tfmg:pink_concrete_wall", - "tfmg:cyan_rebar_concrete", "tfmg:pink_concrete_stairs", - "tfmg:cyan_rebar_concrete_wall", "tfmg:pink_concrete_slab", - "tfmg:cyan_rebar_concrete_stairs", "tfmg:magenta_concrete", - "tfmg:cyan_rebar_concrete_slab", "tfmg:magenta_concrete_wall", - "tfmg:purple_rebar_concrete", "tfmg:magenta_concrete_stairs", - "tfmg:purple_rebar_concrete_wall", "tfmg:magenta_concrete_slab", - "tfmg:purple_rebar_concrete_stairs", "tfmg:yellow_concrete", - "tfmg:purple_rebar_concrete_slab", "tfmg:yellow_concrete_wall", - "tfmg:orange_rebar_concrete", "tfmg:yellow_concrete_stairs", - "tfmg:orange_rebar_concrete_wall", "tfmg:yellow_concrete_slab", - "tfmg:orange_rebar_concrete_stairs", "tfmg:gray_concrete", - "tfmg:orange_rebar_concrete_slab", "tfmg:gray_concrete_wall", - "tfmg:black_rebar_concrete", "tfmg:gray_concrete_stairs", - "tfmg:black_rebar_concrete_wall", "tfmg:gray_concrete_slab", - "tfmg:black_rebar_concrete_stairs", "tfmg:light_gray_concrete", - "tfmg:black_rebar_concrete_slab", "tfmg:light_gray_concrete_wall", - "tfmg:asphalt", "tfmg:light_gray_concrete_stairs", - "tfmg:asphalt_wall", "tfmg:light_gray_concrete_slab", - "tfmg:asphalt_slab", "tfmg:brown_concrete", - "tfmg:asphalt_stairs", "tfmg:brown_concrete_wall", - "tfmg:brass_pipe", "tfmg:brown_concrete_stairs", - "tfmg:copper_encased_brass_pipe", "tfmg:brown_concrete_slab", - "tfmg:glass_brass_pipe", "tfmg:cyan_concrete", - "tfmg:brass_mechanical_pump", "tfmg:cyan_concrete_wall", - "tfmg:brass_smart_fluid_pipe", "tfmg:cyan_concrete_stairs", - "tfmg:brass_fluid_valve", "tfmg:cyan_concrete_slab", - "tfmg:steel_pipe", "tfmg:purple_concrete", - "tfmg:copper_encased_steel_pipe", "tfmg:purple_concrete_wall", - "tfmg:glass_steel_pipe", "tfmg:purple_concrete_stairs", - "tfmg:steel_mechanical_pump", "tfmg:purple_concrete_slab", - "tfmg:steel_smart_fluid_pipe", "tfmg:orange_concrete", - "tfmg:steel_fluid_valve", "tfmg:orange_concrete_wall", - "tfmg:aluminum_pipe", "tfmg:orange_concrete_stairs", - "tfmg:copper_encased_aluminum_pipe", "tfmg:orange_concrete_slab", - "tfmg:glass_aluminum_pipe", "tfmg:black_concrete", - "tfmg:aluminum_mechanical_pump", "tfmg:black_concrete_wall", - "tfmg:aluminum_smart_fluid_pipe", "tfmg:black_concrete_stairs", - "tfmg:aluminum_fluid_valve", "tfmg:black_concrete_slab", - "tfmg:cast_iron_pipe", "tfmg:white_rebar_concrete", - "tfmg:copper_encased_cast_iron_pipe", "tfmg:white_rebar_concrete_wall", - "tfmg:glass_cast_iron_pipe", "tfmg:white_rebar_concrete_stairs", - "tfmg:cast_iron_mechanical_pump", "tfmg:white_rebar_concrete_slab", - "tfmg:cast_iron_smart_fluid_pipe", "tfmg:blue_rebar_concrete", - "tfmg:cast_iron_fluid_valve", "tfmg:blue_rebar_concrete_wall", - "tfmg:plastic_pipe", "tfmg:blue_rebar_concrete_stairs", - "tfmg:copper_encased_plastic_pipe", "tfmg:blue_rebar_concrete_slab", - "tfmg:glass_plastic_pipe", "tfmg:light_blue_rebar_concrete", - "tfmg:plastic_mechanical_pump", "tfmg:light_blue_rebar_concrete_wall", - "tfmg:plastic_smart_fluid_pipe", "tfmg:light_blue_rebar_concrete_stairs", "tfmg:light_blue_rebar_concrete_slab", - "tfmg:plastic_fluid_valve", "tfmg:red_rebar_concrete", - "tfmg:steel_encased_shaft", "tfmg:red_rebar_concrete_wall", - "tfmg:heavy_casing_encased_shaft", "tfmg:red_rebar_concrete_stairs", - "tfmg:steel_encased_steel_cogwheel", "tfmg:red_rebar_concrete_slab", - "tfmg:heavy_casing_encased_steel_cogwheel", "tfmg:green_rebar_concrete", - "tfmg:steel_encased_large_steel_cogwheel", "tfmg:green_rebar_concrete_wall", - "tfmg:heavy_casing_encased_large_steel_cogwheel", "tfmg:green_rebar_concrete_stairs", - "tfmg:steel_encased_aluminum_cogwheel", "tfmg:green_rebar_concrete_slab", - "tfmg:heavy_casing_encased_aluminum_cogwheel", "tfmg:lime_rebar_concrete", - "tfmg:steel_encased_large_aluminum_cogwheel", "tfmg:lime_rebar_concrete_wall", - "tfmg:heavy_casing_encased_large_aluminum_cogwheel", "tfmg:lime_rebar_concrete_stairs", "tfmg:lime_rebar_concrete_slab", - "tfmg:bauxite", "tfmg:pink_rebar_concrete", - "tfmg:cut_bauxite", "tfmg:pink_rebar_concrete_wall", - "tfmg:cut_bauxite_stairs", "tfmg:pink_rebar_concrete_stairs", - "tfmg:cut_bauxite_slab", "tfmg:pink_rebar_concrete_slab", - "tfmg:cut_bauxite_wall", "tfmg:magenta_rebar_concrete", - "tfmg:polished_cut_bauxite", "tfmg:magenta_rebar_concrete_wall", - "tfmg:polished_cut_bauxite_stairs", "tfmg:magenta_rebar_concrete_stairs", - "tfmg:polished_cut_bauxite_slab", "tfmg:magenta_rebar_concrete_slab", - "tfmg:polished_cut_bauxite_wall", "tfmg:yellow_rebar_concrete", - "tfmg:cut_bauxite_bricks", "tfmg:yellow_rebar_concrete_wall", - "tfmg:cut_bauxite_brick_stairs", "tfmg:yellow_rebar_concrete_stairs", - "tfmg:cut_bauxite_brick_slab", "tfmg:yellow_rebar_concrete_slab", - "tfmg:cut_bauxite_brick_wall", "tfmg:gray_rebar_concrete", - "tfmg:small_bauxite_bricks", "tfmg:gray_rebar_concrete_wall", - "tfmg:small_bauxite_brick_stairs", "tfmg:gray_rebar_concrete_stairs", - "tfmg:small_bauxite_brick_slab", "tfmg:gray_rebar_concrete_slab", - "tfmg:small_bauxite_brick_wall", "tfmg:light_gray_rebar_concrete", - "tfmg:layered_bauxite", "tfmg:light_gray_rebar_concrete_wall", - "tfmg:bauxite_pillar", "tfmg:light_gray_rebar_concrete_stairs", - "tfmg:galena", "tfmg:light_gray_rebar_concrete_slab", - "tfmg:cut_galena", - "tfmg:cut_galena_stairs", "tfmg:brown_rebar_concrete", - "tfmg:cut_galena_slab", - "tfmg:cut_galena_wall", "tfmg:brown_rebar_concrete_wall", - "tfmg:polished_cut_galena", "tfmg:brown_rebar_concrete_stairs", - "tfmg:polished_cut_galena_stairs", "tfmg:brown_rebar_concrete_slab", - "tfmg:polished_cut_galena_slab", "tfmg:cyan_rebar_concrete", - "tfmg:polished_cut_galena_wall", "tfmg:cyan_rebar_concrete_wall", - "tfmg:cut_galena_bricks", "tfmg:cyan_rebar_concrete_stairs", - "tfmg:cut_galena_brick_stairs", "tfmg:cyan_rebar_concrete_slab", - "tfmg:cut_galena_brick_slab", "tfmg:purple_rebar_concrete", - "tfmg:cut_galena_brick_wall", "tfmg:purple_rebar_concrete_wall", - "tfmg:small_galena_bricks", "tfmg:purple_rebar_concrete_stairs", - "tfmg:small_galena_brick_stairs", "tfmg:purple_rebar_concrete_slab", - "tfmg:small_galena_brick_slab", "tfmg:orange_rebar_concrete", - "tfmg:small_galena_brick_wall", "tfmg:orange_rebar_concrete_wall", - "tfmg:layered_galena", "tfmg:orange_rebar_concrete_stairs", - "tfmg:galena_pillar", "tfmg:orange_rebar_concrete_slab", "tfmg:black_rebar_concrete", "tfmg:black_rebar_concrete_wall", diff --git a/src/main/java/com/drmangotea/tfmg/base/TFMGSpriteShifts.java b/src/main/java/com/drmangotea/tfmg/base/TFMGSpriteShifts.java index 72d27c86..152b343c 100644 --- a/src/main/java/com/drmangotea/tfmg/base/TFMGSpriteShifts.java +++ b/src/main/java/com/drmangotea/tfmg/base/TFMGSpriteShifts.java @@ -12,7 +12,7 @@ import net.createmod.catnip.render.SpriteShifter; public class TFMGSpriteShifts { public static final CTSpriteShiftEntry CAST_IRON_BLOCK = omni("cast_iron_block"), LEAD_BLOCK = omni("lead_block"), STEEL_BLOCK = omni("steel_block"); - public static final CTSpriteShiftEntry HEAVY_MACHINERY_CASING = omni("heavy_machinery_casing"), INDUSTRIAL_ALUMINUM_CASING = omni("industrial_aluminum_casing"); + public static final CTSpriteShiftEntry HEAVY_MACHINERY_CASING = omni("heavy_machinery_casing"), INDUSTRIAL_ALUMINUM_CASING = omni("industrial_aluminum_casing"),STEEL_CASING = omni("steel_casing"); public static final CTSpriteShiftEntry ACCUMULATOR = getCT(AllCTTypes.RECTANGLE, "accumulator_side"); public static final CTSpriteShiftEntry STEEL_SCAFFOLD = horizontal("scaffold/steel_scaffold"), ALUMINUM_SCAFFOLD = horizontal("scaffold/aluminum_scaffold"); public static final CTSpriteShiftEntry ALUMINUM_SCAFFOLD_TOP = omni("aluminum_casing"); diff --git a/src/main/java/com/drmangotea/tfmg/registry/TFMGBlockEntities.java b/src/main/java/com/drmangotea/tfmg/registry/TFMGBlockEntities.java index 2cb3a563..326a0bdf 100644 --- a/src/main/java/com/drmangotea/tfmg/registry/TFMGBlockEntities.java +++ b/src/main/java/com/drmangotea/tfmg/registry/TFMGBlockEntities.java @@ -40,8 +40,7 @@ import com.drmangotea.tfmg.content.electricity.utilities.diode.ElectricDiodeBloc import com.drmangotea.tfmg.content.electricity.utilities.electric_motor.ElectricMotorBlockEntity; import com.drmangotea.tfmg.content.electricity.utilities.electric_pump.ElectricPumpBlockEntity; import com.drmangotea.tfmg.content.electricity.utilities.electric_switch.ElectricSwitchBlockEntity; -import com.drmangotea.tfmg.content.electricity.utilities.fuse_block.FuseBlockEntity; -import com.drmangotea.tfmg.content.electricity.utilities.fuse_block.FuseBlockRenderer; + import com.drmangotea.tfmg.content.electricity.utilities.polarizer.PolarizerBlockEntity; import com.drmangotea.tfmg.content.electricity.utilities.polarizer.PolarizerRenderer; import com.drmangotea.tfmg.content.electricity.utilities.potentiometer.PotentiometerBlockEntity;