diff --git a/build.gradle b/build.gradle index effa0af0..0dbb2c55 100644 --- a/build.gradle +++ b/build.gradle @@ -100,6 +100,7 @@ repositories { maven { url = "https://mvn.devos.one/snapshots" } // Registrate maven { url = "https://raw.githubusercontent.com/Fuzss/modresources/main/maven/" } // ForgeConfigAPIPort maven { url = "https://maven.blamejared.com" } // JEI, Vazkii's Mods + maven { url = "https://cursemaven.com" } } dependencies { @@ -107,6 +108,7 @@ dependencies { implementation("net.createmod.ponder:Ponder-NeoForge-${minecraft_version}:${ponder_version}") compileOnly("dev.engine-room.flywheel:flywheel-neoforge-api-${minecraft_version}:${flywheel_version}") runtimeOnly("dev.engine-room.flywheel:flywheel-neoforge-${minecraft_version}:${flywheel_version}") + runtimeOnly("curse.maven:configured-457570:7122915") implementation("mezz.jei:jei-${jei_minecraft_version}-neoforge:${jei_version}") implementation("com.tterrag.registrate:Registrate:${registrate_version}") } diff --git a/gradle.properties b/gradle.properties index 6fcbb49d..6a0e8a39 100644 --- a/gradle.properties +++ b/gradle.properties @@ -9,7 +9,7 @@ minecraft_version=1.21.1 minecraft_version_range=[1.21.1,1.22) -neo_version=21.1.152 +neo_version=21.1.213 neo_version_range=[21,) @@ -22,10 +22,10 @@ mixin_extras_version = 0.4.1 jei_minecraft_version = 1.21.1 -jei_version = 19.21.0.247 -create_version = 6.0.6-98 -ponder_version = 1.0.56 -flywheel_version = 1.0.4 +jei_version = 19.25.0.322 +create_version = 6.0.7-159 +ponder_version = 1.0.63 +flywheel_version = 1.0.5 registrate_version = MC1.21-1.3.0+62 mod_id=tfmg diff --git a/src/generated/resources/data/c/tags/block/ores.json b/src/generated/resources/data/c/tags/block/ores.json index 20d648fe..44374b8d 100644 --- a/src/generated/resources/data/c/tags/block/ores.json +++ b/src/generated/resources/data/c/tags/block/ores.json @@ -1,5 +1,11 @@ { "values": [ + "tfmg:lead_ore", + "tfmg:deepslate_lead_ore", + "tfmg:nickel_ore", + "tfmg:deepslate_nickel_ore", + "tfmg:lithium_ore", + "tfmg:deepslate_lithium_ore", "tfmg:lead_ore", "tfmg:deepslate_lead_ore", "tfmg:nickel_ore", diff --git a/src/generated/resources/data/c/tags/block/ores/lead.json b/src/generated/resources/data/c/tags/block/ores/lead.json index 264048ac..95b82d4c 100644 --- a/src/generated/resources/data/c/tags/block/ores/lead.json +++ b/src/generated/resources/data/c/tags/block/ores/lead.json @@ -1,5 +1,7 @@ { "values": [ + "tfmg:lead_ore", + "tfmg:deepslate_lead_ore", "tfmg:lead_ore", "tfmg:deepslate_lead_ore" ] diff --git a/src/generated/resources/data/c/tags/block/ores/lithium.json b/src/generated/resources/data/c/tags/block/ores/lithium.json index 396a2d05..d9175086 100644 --- a/src/generated/resources/data/c/tags/block/ores/lithium.json +++ b/src/generated/resources/data/c/tags/block/ores/lithium.json @@ -1,5 +1,7 @@ { "values": [ + "tfmg:lithium_ore", + "tfmg:deepslate_lithium_ore", "tfmg:lithium_ore", "tfmg:deepslate_lithium_ore" ] diff --git a/src/generated/resources/data/c/tags/block/ores/nickel.json b/src/generated/resources/data/c/tags/block/ores/nickel.json index ddc59df5..20b3e2fd 100644 --- a/src/generated/resources/data/c/tags/block/ores/nickel.json +++ b/src/generated/resources/data/c/tags/block/ores/nickel.json @@ -1,5 +1,7 @@ { "values": [ + "tfmg:nickel_ore", + "tfmg:deepslate_nickel_ore", "tfmg:nickel_ore", "tfmg:deepslate_nickel_ore" ] diff --git a/src/generated/resources/data/c/tags/block/ores_in_ground/deepslate.json b/src/generated/resources/data/c/tags/block/ores_in_ground/deepslate.json index 3931b56e..362d13f6 100644 --- a/src/generated/resources/data/c/tags/block/ores_in_ground/deepslate.json +++ b/src/generated/resources/data/c/tags/block/ores_in_ground/deepslate.json @@ -1,5 +1,8 @@ { "values": [ + "tfmg:deepslate_lead_ore", + "tfmg:deepslate_nickel_ore", + "tfmg:deepslate_lithium_ore", "tfmg:deepslate_lead_ore", "tfmg:deepslate_nickel_ore", "tfmg:deepslate_lithium_ore" diff --git a/src/generated/resources/data/c/tags/block/ores_in_ground/stone.json b/src/generated/resources/data/c/tags/block/ores_in_ground/stone.json index bc683351..7d7698cc 100644 --- a/src/generated/resources/data/c/tags/block/ores_in_ground/stone.json +++ b/src/generated/resources/data/c/tags/block/ores_in_ground/stone.json @@ -1,5 +1,8 @@ { "values": [ + "tfmg:lead_ore", + "tfmg:nickel_ore", + "tfmg:lithium_ore", "tfmg:lead_ore", "tfmg:nickel_ore", "tfmg:lithium_ore" diff --git a/src/generated/resources/data/c/tags/block/storage_blocks.json b/src/generated/resources/data/c/tags/block/storage_blocks.json index 1499a549..707efbce 100644 --- a/src/generated/resources/data/c/tags/block/storage_blocks.json +++ b/src/generated/resources/data/c/tags/block/storage_blocks.json @@ -1,5 +1,8 @@ { "values": [ + "tfmg:raw_nickel_block", + "tfmg:raw_lead_block", + "tfmg:raw_lithium_block", "tfmg:raw_nickel_block", "tfmg:raw_lead_block", "tfmg:raw_lithium_block", @@ -11,6 +14,15 @@ "tfmg:constantan_block", "tfmg:nickel_block", "tfmg:lithium_block", + "tfmg:coal_coke_block", + "tfmg:steel_block", + "tfmg:cast_iron_block", + "tfmg:aluminum_block", + "tfmg:plastic_block", + "tfmg:lead_block", + "tfmg:constantan_block", + "tfmg:nickel_block", + "tfmg:lithium_block", "tfmg:coal_coke_block" ] } \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/block/storage_blocks/aluminum.json b/src/generated/resources/data/c/tags/block/storage_blocks/aluminum.json index a88e7648..1fe74cf2 100644 --- a/src/generated/resources/data/c/tags/block/storage_blocks/aluminum.json +++ b/src/generated/resources/data/c/tags/block/storage_blocks/aluminum.json @@ -1,5 +1,6 @@ { "values": [ + "tfmg:aluminum_block", "tfmg:aluminum_block" ] } \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/block/storage_blocks/cast_iron.json b/src/generated/resources/data/c/tags/block/storage_blocks/cast_iron.json index 498da03a..080415cd 100644 --- a/src/generated/resources/data/c/tags/block/storage_blocks/cast_iron.json +++ b/src/generated/resources/data/c/tags/block/storage_blocks/cast_iron.json @@ -1,5 +1,6 @@ { "values": [ + "tfmg:cast_iron_block", "tfmg:cast_iron_block" ] } \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/block/storage_blocks/coal_coke.json b/src/generated/resources/data/c/tags/block/storage_blocks/coal_coke.json index 5490b710..1c3c2e38 100644 --- a/src/generated/resources/data/c/tags/block/storage_blocks/coal_coke.json +++ b/src/generated/resources/data/c/tags/block/storage_blocks/coal_coke.json @@ -1,5 +1,6 @@ { "values": [ + "tfmg:coal_coke_block", "tfmg:coal_coke_block" ] } \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/block/storage_blocks/constantan.json b/src/generated/resources/data/c/tags/block/storage_blocks/constantan.json index 625838b4..4aee7f01 100644 --- a/src/generated/resources/data/c/tags/block/storage_blocks/constantan.json +++ b/src/generated/resources/data/c/tags/block/storage_blocks/constantan.json @@ -1,5 +1,6 @@ { "values": [ + "tfmg:constantan_block", "tfmg:constantan_block" ] } \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/block/storage_blocks/lead.json b/src/generated/resources/data/c/tags/block/storage_blocks/lead.json index aac1dd9c..a1f9eeec 100644 --- a/src/generated/resources/data/c/tags/block/storage_blocks/lead.json +++ b/src/generated/resources/data/c/tags/block/storage_blocks/lead.json @@ -1,5 +1,6 @@ { "values": [ + "tfmg:lead_block", "tfmg:lead_block" ] } \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/block/storage_blocks/lithium.json b/src/generated/resources/data/c/tags/block/storage_blocks/lithium.json index bc9a4fd3..70b9d554 100644 --- a/src/generated/resources/data/c/tags/block/storage_blocks/lithium.json +++ b/src/generated/resources/data/c/tags/block/storage_blocks/lithium.json @@ -1,5 +1,6 @@ { "values": [ + "tfmg:lithium_block", "tfmg:lithium_block" ] } \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/block/storage_blocks/nickel.json b/src/generated/resources/data/c/tags/block/storage_blocks/nickel.json index ec57e0a0..27723268 100644 --- a/src/generated/resources/data/c/tags/block/storage_blocks/nickel.json +++ b/src/generated/resources/data/c/tags/block/storage_blocks/nickel.json @@ -1,5 +1,6 @@ { "values": [ + "tfmg:nickel_block", "tfmg:nickel_block" ] } \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/block/storage_blocks/plastic.json b/src/generated/resources/data/c/tags/block/storage_blocks/plastic.json index 108f3f95..aa452c4f 100644 --- a/src/generated/resources/data/c/tags/block/storage_blocks/plastic.json +++ b/src/generated/resources/data/c/tags/block/storage_blocks/plastic.json @@ -1,5 +1,6 @@ { "values": [ + "tfmg:plastic_block", "tfmg:plastic_block" ] } \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/block/storage_blocks/raw_lead.json b/src/generated/resources/data/c/tags/block/storage_blocks/raw_lead.json index 41c1cbc2..43983399 100644 --- a/src/generated/resources/data/c/tags/block/storage_blocks/raw_lead.json +++ b/src/generated/resources/data/c/tags/block/storage_blocks/raw_lead.json @@ -1,5 +1,6 @@ { "values": [ + "tfmg:raw_lead_block", "tfmg:raw_lead_block" ] } \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/block/storage_blocks/raw_lithium.json b/src/generated/resources/data/c/tags/block/storage_blocks/raw_lithium.json index af200fbd..621b46f3 100644 --- a/src/generated/resources/data/c/tags/block/storage_blocks/raw_lithium.json +++ b/src/generated/resources/data/c/tags/block/storage_blocks/raw_lithium.json @@ -1,5 +1,6 @@ { "values": [ + "tfmg:raw_lithium_block", "tfmg:raw_lithium_block" ] } \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/block/storage_blocks/raw_nickel.json b/src/generated/resources/data/c/tags/block/storage_blocks/raw_nickel.json index 4e01dbfe..35d89b00 100644 --- a/src/generated/resources/data/c/tags/block/storage_blocks/raw_nickel.json +++ b/src/generated/resources/data/c/tags/block/storage_blocks/raw_nickel.json @@ -1,5 +1,6 @@ { "values": [ + "tfmg:raw_nickel_block", "tfmg:raw_nickel_block" ] } \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/block/storage_blocks/steel.json b/src/generated/resources/data/c/tags/block/storage_blocks/steel.json index 72a5c238..374f91ed 100644 --- a/src/generated/resources/data/c/tags/block/storage_blocks/steel.json +++ b/src/generated/resources/data/c/tags/block/storage_blocks/steel.json @@ -1,5 +1,6 @@ { "values": [ + "tfmg:steel_block", "tfmg:steel_block" ] } \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/leather.json b/src/generated/resources/data/c/tags/item/leather.json deleted file mode 100644 index 8325db53..00000000 --- a/src/generated/resources/data/c/tags/item/leather.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "values": [ - "tfmg:synthetic_leather" - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/plates.json b/src/generated/resources/data/c/tags/item/plates.json index c00e47c2..068b9332 100644 --- a/src/generated/resources/data/c/tags/item/plates.json +++ b/src/generated/resources/data/c/tags/item/plates.json @@ -4,6 +4,7 @@ "tfmg:aluminum_sheet", "tfmg:nickel_sheet", "tfmg:cast_iron_sheet", - "tfmg:lead_sheet" + "tfmg:lead_sheet", + "tfmg:rubber_sheet" ] } \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/rods/steel.json b/src/generated/resources/data/c/tags/item/rods/steel.json deleted file mode 100644 index 625e3c2f..00000000 --- a/src/generated/resources/data/c/tags/item/rods/steel.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "values": [ - "tfmg:rebar" - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/string.json b/src/generated/resources/data/c/tags/item/string.json deleted file mode 100644 index 193758e6..00000000 --- a/src/generated/resources/data/c/tags/item/string.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "values": [ - "tfmg:synthetic_string" - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/create/tags/block/casing.json b/src/generated/resources/data/create/tags/block/casing.json index e210d238..a36867e2 100644 --- a/src/generated/resources/data/create/tags/block/casing.json +++ b/src/generated/resources/data/create/tags/block/casing.json @@ -1,5 +1,8 @@ { "values": [ + "tfmg:steel_casing", + "tfmg:heavy_machinery_casing", + "tfmg:industrial_aluminum_casing", "tfmg:steel_casing", "tfmg:heavy_machinery_casing", "tfmg:industrial_aluminum_casing" diff --git a/src/generated/resources/data/create/tags/block/fan_transparent.json b/src/generated/resources/data/create/tags/block/fan_transparent.json index d80575ae..b9d51a74 100644 --- a/src/generated/resources/data/create/tags/block/fan_transparent.json +++ b/src/generated/resources/data/create/tags/block/fan_transparent.json @@ -1,6 +1,12 @@ { "values": [ "tfmg:copycat_cable_base", + "tfmg:copycat_cable_base", + "tfmg:steel_bars", + "tfmg:aluminum_bars", + "tfmg:cast_iron_bars", + "tfmg:lead_bars", + "tfmg:nickel_bars", "tfmg:steel_bars", "tfmg:aluminum_bars", "tfmg:cast_iron_bars", diff --git a/src/generated/resources/data/create/tags/block/non_movable.json b/src/generated/resources/data/create/tags/block/non_movable.json index b01ff787..c760a8a1 100644 --- a/src/generated/resources/data/create/tags/block/non_movable.json +++ b/src/generated/resources/data/create/tags/block/non_movable.json @@ -1,5 +1,6 @@ { "values": [ + "tfmg:oil_deposit", "tfmg:oil_deposit" ] } \ No newline at end of file diff --git a/src/generated/resources/data/create/tags/block/wrench_pickup.json b/src/generated/resources/data/create/tags/block/wrench_pickup.json index c72282b9..7919c0f0 100644 --- a/src/generated/resources/data/create/tags/block/wrench_pickup.json +++ b/src/generated/resources/data/create/tags/block/wrench_pickup.json @@ -1,5 +1,10 @@ { "values": [ + "tfmg:steel_bars", + "tfmg:aluminum_bars", + "tfmg:cast_iron_bars", + "tfmg:lead_bars", + "tfmg:nickel_bars", "tfmg:steel_bars", "tfmg:aluminum_bars", "tfmg:cast_iron_bars", 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 258d635d..4f2dd661 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,6 +1,8 @@ { "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/beacon_base_blocks.json b/src/generated/resources/data/minecraft/tags/block/beacon_base_blocks.json index c2febb4a..13620d4b 100644 --- a/src/generated/resources/data/minecraft/tags/block/beacon_base_blocks.json +++ b/src/generated/resources/data/minecraft/tags/block/beacon_base_blocks.json @@ -1,5 +1,12 @@ { "values": [ + "tfmg:steel_block", + "tfmg:cast_iron_block", + "tfmg:aluminum_block", + "tfmg:lead_block", + "tfmg:constantan_block", + "tfmg:nickel_block", + "tfmg:lithium_block", "tfmg:steel_block", "tfmg:cast_iron_block", "tfmg:aluminum_block", diff --git a/src/generated/resources/data/minecraft/tags/block/climbable.json b/src/generated/resources/data/minecraft/tags/block/climbable.json index fa6c6601..52adbc8d 100644 --- a/src/generated/resources/data/minecraft/tags/block/climbable.json +++ b/src/generated/resources/data/minecraft/tags/block/climbable.json @@ -1,5 +1,13 @@ { "values": [ + "tfmg:steel_ladder", + "tfmg:aluminum_ladder", + "tfmg:cast_iron_ladder", + "tfmg:lead_ladder", + "tfmg:nickel_ladder", + "tfmg:constantan_ladder", + "tfmg:steel_scaffolding", + "tfmg:aluminum_scaffolding", "tfmg:steel_ladder", "tfmg:aluminum_ladder", "tfmg:cast_iron_ladder", diff --git a/src/generated/resources/data/minecraft/tags/block/doors.json b/src/generated/resources/data/minecraft/tags/block/doors.json index 73c4858a..46187c7e 100644 --- a/src/generated/resources/data/minecraft/tags/block/doors.json +++ b/src/generated/resources/data/minecraft/tags/block/doors.json @@ -1,5 +1,9 @@ { "values": [ + "tfmg:heavy_casing_door", + "tfmg:steel_door", + "tfmg:aluminum_door", + "tfmg:heavy_plated_door", "tfmg:heavy_casing_door", "tfmg:steel_door", "tfmg:aluminum_door", diff --git a/src/generated/resources/data/minecraft/tags/block/dragon_immune.json b/src/generated/resources/data/minecraft/tags/block/dragon_immune.json index b01ff787..c760a8a1 100644 --- a/src/generated/resources/data/minecraft/tags/block/dragon_immune.json +++ b/src/generated/resources/data/minecraft/tags/block/dragon_immune.json @@ -1,5 +1,6 @@ { "values": [ + "tfmg:oil_deposit", "tfmg:oil_deposit" ] } \ 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 258d635d..4f2dd661 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,6 +1,8 @@ { "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/features_cannot_replace.json b/src/generated/resources/data/minecraft/tags/block/features_cannot_replace.json index b01ff787..c760a8a1 100644 --- a/src/generated/resources/data/minecraft/tags/block/features_cannot_replace.json +++ b/src/generated/resources/data/minecraft/tags/block/features_cannot_replace.json @@ -1,5 +1,6 @@ { "values": [ + "tfmg:oil_deposit", "tfmg:oil_deposit" ] } \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/tags/block/infiniburn_overworld.json b/src/generated/resources/data/minecraft/tags/block/infiniburn_overworld.json index b01ff787..c760a8a1 100644 --- a/src/generated/resources/data/minecraft/tags/block/infiniburn_overworld.json +++ b/src/generated/resources/data/minecraft/tags/block/infiniburn_overworld.json @@ -1,5 +1,6 @@ { "values": [ + "tfmg:oil_deposit", "tfmg:oil_deposit" ] } \ 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 258d635d..4f2dd661 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,6 +1,8 @@ { "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 478ac519..d5ac573c 100644 --- a/src/generated/resources/data/minecraft/tags/block/mineable/axe.json +++ b/src/generated/resources/data/minecraft/tags/block/mineable/axe.json @@ -2,10 +2,26 @@ "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", @@ -26,6 +42,21 @@ "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 a5623d1c..995ab081 100644 --- a/src/generated/resources/data/minecraft/tags/block/mineable/pickaxe.json +++ b/src/generated/resources/data/minecraft/tags/block/mineable/pickaxe.json @@ -1,398 +1,763 @@ { "values": [ - "tfmg:aluminum_fluid_tank", - "tfmg:cast_iron_fluid_tank", - "tfmg:steel_fluid_tank", - "tfmg:steel_distillation_output", - "tfmg:steel_distillation_controller", - "tfmg:industrial_pipe", - "tfmg:concrete_encased_industrial_pipe", - "tfmg:pumpjack_hammer", - "tfmg:pumpjack_crank", - "tfmg:pumpjack_hammer_part", - "tfmg:pumpjack_hammer_head", - "tfmg:pumpjack_hammer_connector", - "tfmg:large_pumpjack_hammer_part", - "tfmg:large_pumpjack_hammer_head", - "tfmg:large_pumpjack_hammer_connector", - "tfmg:pumpjack_base", - "tfmg:oil_deposit", - "tfmg:steel_chemical_vat", - "tfmg:cast_iron_chemical_vat", - "tfmg:fireproof_chemical_vat", - "tfmg:industrial_mixer", - "tfmg:electrode_holder", - "tfmg:lead_ore", - "tfmg:deepslate_lead_ore", - "tfmg:nickel_ore", - "tfmg:deepslate_nickel_ore", - "tfmg:lithium_ore", - "tfmg:deepslate_lithium_ore", - "tfmg:sulfur", - "tfmg:lignite", "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_casing", - "tfmg:heavy_machinery_casing", - "tfmg:industrial_aluminum_casing", - "tfmg:steel_block", - "tfmg:cast_iron_block", - "tfmg:aluminum_block", - "tfmg:plastic_block", - "tfmg:lead_block", - "tfmg:constantan_block", - "tfmg:nickel_block", - "tfmg:lithium_block", - "tfmg:coal_coke_block", - "tfmg:heavy_casing_door", - "tfmg:steel_door", - "tfmg:aluminum_door", - "tfmg:heavy_plated_door", - "tfmg:steel_gearbox", - "tfmg:steel_bars", - "tfmg:aluminum_bars", - "tfmg:cast_iron_bars", - "tfmg:lead_bars", - "tfmg:nickel_bars", - "tfmg:steel_ladder", - "tfmg:aluminum_ladder", - "tfmg:cast_iron_ladder", - "tfmg:lead_ladder", - "tfmg:nickel_ladder", - "tfmg:constantan_ladder", - "tfmg:steel_scaffolding", - "tfmg:aluminum_scaffolding", - "tfmg:slag_bricks", - "tfmg:cinder_block", - "tfmg:cinderflour_block", - "tfmg:factory_floor", - "tfmg:steel_trapdoor", - "tfmg:steel_flywheel", - "tfmg:lead_flywheel", - "tfmg:cast_iron_flywheel", - "tfmg:aluminum_flywheel", - "tfmg:nickel_flywheel", "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/mineable/shovel.json b/src/generated/resources/data/minecraft/tags/block/mineable/shovel.json index 61259ee5..bc3f712e 100644 --- a/src/generated/resources/data/minecraft/tags/block/mineable/shovel.json +++ b/src/generated/resources/data/minecraft/tags/block/mineable/shovel.json @@ -1,6 +1,8 @@ { "values": [ "tfmg:fireclay", + "tfmg:fireclay", + "tfmg:cement", "tfmg:cement" ] } \ No newline at end of file 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 258d635d..4f2dd661 100644 --- a/src/generated/resources/data/minecraft/tags/block/moss_replaceable.json +++ b/src/generated/resources/data/minecraft/tags/block/moss_replaceable.json @@ -1,6 +1,8 @@ { "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_iron_tool.json b/src/generated/resources/data/minecraft/tags/block/needs_iron_tool.json index 8dd016f0..acc49e70 100644 --- a/src/generated/resources/data/minecraft/tags/block/needs_iron_tool.json +++ b/src/generated/resources/data/minecraft/tags/block/needs_iron_tool.json @@ -1,5 +1,8 @@ { "values": [ + "tfmg:raw_nickel_block", + "tfmg:raw_lead_block", + "tfmg:raw_lithium_block", "tfmg:raw_nickel_block", "tfmg:raw_lead_block", "tfmg:raw_lithium_block", @@ -9,6 +12,13 @@ "tfmg:lead_block", "tfmg:constantan_block", "tfmg:nickel_block", + "tfmg:lithium_block", + "tfmg:steel_block", + "tfmg:cast_iron_block", + "tfmg:aluminum_block", + "tfmg:lead_block", + "tfmg:constantan_block", + "tfmg:nickel_block", "tfmg:lithium_block" ] } \ 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 de9af0ce..aece7fc6 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,5 +1,13 @@ { "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", @@ -16,6 +24,8 @@ "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", @@ -59,76 +69,231 @@ "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 2c9aded5..b1e659ca 100644 --- a/src/generated/resources/data/minecraft/tags/block/slabs.json +++ b/src/generated/resources/data/minecraft/tags/block/slabs.json @@ -11,19 +11,54 @@ "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", @@ -39,9 +74,17 @@ "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 c53cbef6..0e0fb76a 100644 --- a/src/generated/resources/data/minecraft/tags/block/stairs.json +++ b/src/generated/resources/data/minecraft/tags/block/stairs.json @@ -11,19 +11,54 @@ "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", @@ -39,9 +74,17 @@ "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/trapdoors.json b/src/generated/resources/data/minecraft/tags/block/trapdoors.json index 73d5d7eb..1acf1924 100644 --- a/src/generated/resources/data/minecraft/tags/block/trapdoors.json +++ b/src/generated/resources/data/minecraft/tags/block/trapdoors.json @@ -1,5 +1,6 @@ { "values": [ + "tfmg:steel_trapdoor", "tfmg:steel_trapdoor" ] } \ 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 c0c10283..0488d91c 100644 --- a/src/generated/resources/data/minecraft/tags/block/walls.json +++ b/src/generated/resources/data/minecraft/tags/block/walls.json @@ -1,5 +1,6 @@ { "values": [ + "tfmg:fireproof_brick_reinforcement", "tfmg:fireproof_brick_reinforcement", "tfmg:concrete_wall", "tfmg:rebar_concrete_wall", @@ -12,19 +13,54 @@ "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", @@ -40,9 +76,17 @@ "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/minecraft/tags/block/wither_immune.json b/src/generated/resources/data/minecraft/tags/block/wither_immune.json index b01ff787..c760a8a1 100644 --- a/src/generated/resources/data/minecraft/tags/block/wither_immune.json +++ b/src/generated/resources/data/minecraft/tags/block/wither_immune.json @@ -1,5 +1,6 @@ { "values": [ + "tfmg:oil_deposit", "tfmg:oil_deposit" ] } \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/tags/block/wooden_doors.json b/src/generated/resources/data/minecraft/tags/block/wooden_doors.json index 73c4858a..46187c7e 100644 --- a/src/generated/resources/data/minecraft/tags/block/wooden_doors.json +++ b/src/generated/resources/data/minecraft/tags/block/wooden_doors.json @@ -1,5 +1,9 @@ { "values": [ + "tfmg:heavy_casing_door", + "tfmg:steel_door", + "tfmg:aluminum_door", + "tfmg:heavy_plated_door", "tfmg:heavy_casing_door", "tfmg:steel_door", "tfmg:aluminum_door", diff --git a/src/generated/resources/data/quark/tags/block/non_double_door.json b/src/generated/resources/data/quark/tags/block/non_double_door.json index 73c4858a..46187c7e 100644 --- a/src/generated/resources/data/quark/tags/block/non_double_door.json +++ b/src/generated/resources/data/quark/tags/block/non_double_door.json @@ -1,5 +1,9 @@ { "values": [ + "tfmg:heavy_casing_door", + "tfmg:steel_door", + "tfmg:aluminum_door", + "tfmg:heavy_plated_door", "tfmg:heavy_casing_door", "tfmg:steel_door", "tfmg:aluminum_door", diff --git a/src/generated/resources/data/tfmg/recipe/casting/plastic_sheet.json b/src/generated/resources/data/tfmg/recipe/casting/plastic_sheet.json index bcccb2df..c9c6350c 100644 --- a/src/generated/resources/data/tfmg/recipe/casting/plastic_sheet.json +++ b/src/generated/resources/data/tfmg/recipe/casting/plastic_sheet.json @@ -2,7 +2,7 @@ "type": "tfmg:casting", "ingredients": [ { - "type": "fluid_stack", + "type": "neoforge:single", "amount": 200, "fluid": "tfmg:molten_plastic" } diff --git a/src/generated/resources/data/tfmg/recipe/casting/silicon.json b/src/generated/resources/data/tfmg/recipe/casting/silicon.json index 945363e0..fccd56d8 100644 --- a/src/generated/resources/data/tfmg/recipe/casting/silicon.json +++ b/src/generated/resources/data/tfmg/recipe/casting/silicon.json @@ -2,7 +2,7 @@ "type": "tfmg:casting", "ingredients": [ { - "type": "fluid_stack", + "type": "neoforge:single", "amount": 144, "fluid": "tfmg:liquid_silicon" } diff --git a/src/generated/resources/data/tfmg/recipe/casting/slag_block.json b/src/generated/resources/data/tfmg/recipe/casting/slag_block.json index 079b6a15..9e5c7949 100644 --- a/src/generated/resources/data/tfmg/recipe/casting/slag_block.json +++ b/src/generated/resources/data/tfmg/recipe/casting/slag_block.json @@ -2,7 +2,7 @@ "type": "tfmg:casting", "ingredients": [ { - "type": "fluid_stack", + "type": "neoforge:single", "amount": 20, "fluid": "tfmg:molten_slag" } diff --git a/src/generated/resources/data/tfmg/recipe/casting/steel.json b/src/generated/resources/data/tfmg/recipe/casting/steel.json index b54ac351..bcce044d 100644 --- a/src/generated/resources/data/tfmg/recipe/casting/steel.json +++ b/src/generated/resources/data/tfmg/recipe/casting/steel.json @@ -2,7 +2,7 @@ "type": "tfmg:casting", "ingredients": [ { - "type": "fluid_stack", + "type": "neoforge:single", "amount": 144, "fluid": "tfmg:molten_steel" } diff --git a/src/generated/resources/data/tfmg/recipe/crafting/materials/pumpjack_base.json b/src/generated/resources/data/tfmg/recipe/crafting/materials/pumpjack_base.json index ba6d9141..ee11d19d 100644 --- a/src/generated/resources/data/tfmg/recipe/crafting/materials/pumpjack_base.json +++ b/src/generated/resources/data/tfmg/recipe/crafting/materials/pumpjack_base.json @@ -15,7 +15,7 @@ "item": "tfmg:industrial_pipe" }, "S": { - "tag": "c:string" + "tag": "c:strings" }, "T": { "item": "tfmg:steel_fluid_tank" diff --git a/src/generated/resources/data/tfmg/recipe/crafting/materials/pumpjack_crank.json b/src/generated/resources/data/tfmg/recipe/crafting/materials/pumpjack_crank.json index c4c0cb09..5d4bc44f 100644 --- a/src/generated/resources/data/tfmg/recipe/crafting/materials/pumpjack_crank.json +++ b/src/generated/resources/data/tfmg/recipe/crafting/materials/pumpjack_crank.json @@ -12,7 +12,7 @@ "item": "tfmg:steel_mechanism" }, "P": { - "tag": "c:string" + "tag": "c:strings" }, "R": { "item": "tfmg:rebar" diff --git a/src/generated/resources/data/tfmg/recipe/distillation/crude_oil.json b/src/generated/resources/data/tfmg/recipe/distillation/crude_oil.json index 15adc8ee..5ce1fc9f 100644 --- a/src/generated/resources/data/tfmg/recipe/distillation/crude_oil.json +++ b/src/generated/resources/data/tfmg/recipe/distillation/crude_oil.json @@ -2,7 +2,7 @@ "type": "tfmg:distillation", "ingredients": [ { - "type": "fluid_stack", + "type": "neoforge:single", "amount": 340, "fluid": "tfmg:crude_oil" } diff --git a/src/generated/resources/data/tfmg/recipe/distillation/crude_oil_light_distillation.json b/src/generated/resources/data/tfmg/recipe/distillation/crude_oil_light_distillation.json index d255a09f..ff8f96e5 100644 --- a/src/generated/resources/data/tfmg/recipe/distillation/crude_oil_light_distillation.json +++ b/src/generated/resources/data/tfmg/recipe/distillation/crude_oil_light_distillation.json @@ -2,7 +2,7 @@ "type": "tfmg:distillation", "ingredients": [ { - "type": "fluid_stack", + "type": "neoforge:single", "amount": 200, "fluid": "tfmg:crude_oil" } diff --git a/src/generated/resources/data/tfmg/recipe/distillation/crude_oil_no_naphtha.json b/src/generated/resources/data/tfmg/recipe/distillation/crude_oil_no_naphtha.json index f8635622..170d7d61 100644 --- a/src/generated/resources/data/tfmg/recipe/distillation/crude_oil_no_naphtha.json +++ b/src/generated/resources/data/tfmg/recipe/distillation/crude_oil_no_naphtha.json @@ -2,7 +2,7 @@ "type": "tfmg:distillation", "ingredients": [ { - "type": "fluid_stack", + "type": "neoforge:single", "amount": 330, "fluid": "tfmg:crude_oil" } diff --git a/src/generated/resources/data/tfmg/recipe/distillation/heavy_oil.json b/src/generated/resources/data/tfmg/recipe/distillation/heavy_oil.json index 03d4ac2e..d09724a4 100644 --- a/src/generated/resources/data/tfmg/recipe/distillation/heavy_oil.json +++ b/src/generated/resources/data/tfmg/recipe/distillation/heavy_oil.json @@ -2,7 +2,7 @@ "type": "tfmg:distillation", "ingredients": [ { - "type": "fluid_stack", + "type": "neoforge:single", "amount": 200, "fluid": "tfmg:heavy_oil" } diff --git a/src/generated/resources/data/tfmg/recipe/distillation/heavy_oil_light_distillation.json b/src/generated/resources/data/tfmg/recipe/distillation/heavy_oil_light_distillation.json index c2b1abd9..75da46a9 100644 --- a/src/generated/resources/data/tfmg/recipe/distillation/heavy_oil_light_distillation.json +++ b/src/generated/resources/data/tfmg/recipe/distillation/heavy_oil_light_distillation.json @@ -2,7 +2,7 @@ "type": "tfmg:distillation", "ingredients": [ { - "type": "fluid_stack", + "type": "neoforge:single", "amount": 200, "fluid": "tfmg:heavy_oil" } diff --git a/src/generated/resources/data/tfmg/recipe/distillation/heavy_oil_no_naphtha.json b/src/generated/resources/data/tfmg/recipe/distillation/heavy_oil_no_naphtha.json index 049f278f..bfa2429f 100644 --- a/src/generated/resources/data/tfmg/recipe/distillation/heavy_oil_no_naphtha.json +++ b/src/generated/resources/data/tfmg/recipe/distillation/heavy_oil_no_naphtha.json @@ -2,7 +2,7 @@ "type": "tfmg:distillation", "ingredients": [ { - "type": "fluid_stack", + "type": "neoforge:single", "amount": 200, "fluid": "tfmg:heavy_oil" } diff --git a/src/generated/resources/data/tfmg/recipe/filling/filled_fire_extinguisher.json b/src/generated/resources/data/tfmg/recipe/filling/filled_fire_extinguisher.json index e74f9678..8d0a299c 100644 --- a/src/generated/resources/data/tfmg/recipe/filling/filled_fire_extinguisher.json +++ b/src/generated/resources/data/tfmg/recipe/filling/filled_fire_extinguisher.json @@ -5,7 +5,7 @@ "item": "tfmg:fire_extinguisher" }, { - "type": "fluid_stack", + "type": "neoforge:single", "amount": 1000, "fluid": "tfmg:carbon_dioxide" } diff --git a/src/generated/resources/data/tfmg/recipe/filling/furnace_gas_tank.json b/src/generated/resources/data/tfmg/recipe/filling/furnace_gas_tank.json index e6442ebb..52929eda 100644 --- a/src/generated/resources/data/tfmg/recipe/filling/furnace_gas_tank.json +++ b/src/generated/resources/data/tfmg/recipe/filling/furnace_gas_tank.json @@ -5,7 +5,7 @@ "item": "minecraft:bucket" }, { - "type": "fluid_stack", + "type": "neoforge:single", "amount": 1000, "fluid": "tfmg:furnace_gas" } diff --git a/src/generated/resources/data/tfmg/recipe/filling/hardened_planks.json b/src/generated/resources/data/tfmg/recipe/filling/hardened_planks.json index 6b73f87b..5911c89b 100644 --- a/src/generated/resources/data/tfmg/recipe/filling/hardened_planks.json +++ b/src/generated/resources/data/tfmg/recipe/filling/hardened_planks.json @@ -5,7 +5,7 @@ "tag": "minecraft:planks" }, { - "type": "fluid_stack", + "type": "neoforge:single", "amount": 250, "fluid": "tfmg:creosote" } diff --git a/src/generated/resources/data/tfmg/recipe/filling/hot_air_tank.json b/src/generated/resources/data/tfmg/recipe/filling/hot_air_tank.json index 910033e7..960b56d3 100644 --- a/src/generated/resources/data/tfmg/recipe/filling/hot_air_tank.json +++ b/src/generated/resources/data/tfmg/recipe/filling/hot_air_tank.json @@ -5,7 +5,7 @@ "item": "minecraft:bucket" }, { - "type": "fluid_stack", + "type": "neoforge:single", "amount": 1000, "fluid": "tfmg:hot_air" } diff --git a/src/generated/resources/data/tfmg/recipe/filling/hydrogen_tank.json b/src/generated/resources/data/tfmg/recipe/filling/hydrogen_tank.json index 1df56b0b..7fc80c2e 100644 --- a/src/generated/resources/data/tfmg/recipe/filling/hydrogen_tank.json +++ b/src/generated/resources/data/tfmg/recipe/filling/hydrogen_tank.json @@ -5,7 +5,7 @@ "item": "minecraft:bucket" }, { - "type": "fluid_stack", + "type": "neoforge:single", "amount": 1000, "fluid": "tfmg:hydrogen" } diff --git a/src/generated/resources/data/tfmg/recipe/filling/lpg_tank.json b/src/generated/resources/data/tfmg/recipe/filling/lpg_tank.json index 4336d688..0be99aa5 100644 --- a/src/generated/resources/data/tfmg/recipe/filling/lpg_tank.json +++ b/src/generated/resources/data/tfmg/recipe/filling/lpg_tank.json @@ -5,7 +5,7 @@ "item": "minecraft:bucket" }, { - "type": "fluid_stack", + "type": "neoforge:single", "amount": 1000, "fluid": "tfmg:lpg" } diff --git a/src/generated/resources/data/tfmg/recipe/filling/napalm_potato.json b/src/generated/resources/data/tfmg/recipe/filling/napalm_potato.json index 922361bb..aa71a7c7 100644 --- a/src/generated/resources/data/tfmg/recipe/filling/napalm_potato.json +++ b/src/generated/resources/data/tfmg/recipe/filling/napalm_potato.json @@ -5,7 +5,7 @@ "item": "minecraft:potato" }, { - "type": "fluid_stack", + "type": "neoforge:single", "amount": 500, "fluid": "tfmg:napalm" } diff --git a/src/generated/resources/data/tfmg/recipe/filling/neon_tank.json b/src/generated/resources/data/tfmg/recipe/filling/neon_tank.json index 4b35533c..557ff22f 100644 --- a/src/generated/resources/data/tfmg/recipe/filling/neon_tank.json +++ b/src/generated/resources/data/tfmg/recipe/filling/neon_tank.json @@ -5,7 +5,7 @@ "item": "minecraft:bucket" }, { - "type": "fluid_stack", + "type": "neoforge:single", "amount": 1000, "fluid": "tfmg:neon" } diff --git a/src/generated/resources/data/tfmg/recipe/filling/propylene_tank.json b/src/generated/resources/data/tfmg/recipe/filling/propylene_tank.json index e8972a2b..1bc07347 100644 --- a/src/generated/resources/data/tfmg/recipe/filling/propylene_tank.json +++ b/src/generated/resources/data/tfmg/recipe/filling/propylene_tank.json @@ -5,7 +5,7 @@ "item": "minecraft:bucket" }, { - "type": "fluid_stack", + "type": "neoforge:single", "amount": 1000, "fluid": "tfmg:propylene" } diff --git a/src/generated/resources/data/tfmg/recipe/hot_blast/hot_air.json b/src/generated/resources/data/tfmg/recipe/hot_blast/hot_air.json index bf70a7c0..657bd429 100644 --- a/src/generated/resources/data/tfmg/recipe/hot_blast/hot_air.json +++ b/src/generated/resources/data/tfmg/recipe/hot_blast/hot_air.json @@ -2,14 +2,14 @@ "type": "tfmg:hot_blast", "ingredients": [ { - "type": "fluid_stack", + "type": "neoforge:single", "amount": 25, "fluid": "tfmg:air" }, { - "type": "fluid_tag", + "type": "neoforge:tag", "amount": 5, - "fluid_tag": "tfmg:blast_stove_fuel" + "tag": "tfmg:blast_stove_fuel" } ], "processing_time": 200, diff --git a/src/generated/resources/data/tfmg/recipe/mixing/liquid_asphalt.json b/src/generated/resources/data/tfmg/recipe/mixing/liquid_asphalt.json index caf942a9..6365ddf7 100644 --- a/src/generated/resources/data/tfmg/recipe/mixing/liquid_asphalt.json +++ b/src/generated/resources/data/tfmg/recipe/mixing/liquid_asphalt.json @@ -5,7 +5,7 @@ "item": "tfmg:asphalt_mixture" }, { - "type": "fluid_stack", + "type": "neoforge:single", "amount": 250, "fluid": "minecraft:water" } diff --git a/src/generated/resources/data/tfmg/recipe/mixing/liquid_concrete.json b/src/generated/resources/data/tfmg/recipe/mixing/liquid_concrete.json index 5296efe9..c35557df 100644 --- a/src/generated/resources/data/tfmg/recipe/mixing/liquid_concrete.json +++ b/src/generated/resources/data/tfmg/recipe/mixing/liquid_concrete.json @@ -5,7 +5,7 @@ "item": "tfmg:concrete_mixture" }, { - "type": "fluid_stack", + "type": "neoforge:single", "amount": 250, "fluid": "minecraft:water" } diff --git a/src/generated/resources/data/tfmg/recipe/mixing/napalm.json b/src/generated/resources/data/tfmg/recipe/mixing/napalm.json index 368a2144..e76cfdbb 100644 --- a/src/generated/resources/data/tfmg/recipe/mixing/napalm.json +++ b/src/generated/resources/data/tfmg/recipe/mixing/napalm.json @@ -5,7 +5,7 @@ "tag": "c:ingots/aluminum" }, { - "type": "fluid_stack", + "type": "neoforge:single", "amount": 1000, "fluid": "tfmg:gasoline" } diff --git a/src/generated/resources/data/tfmg/recipe/sequenced_assembly/heavy_plate.json b/src/generated/resources/data/tfmg/recipe/sequenced_assembly/heavy_plate.json index 10e6c5c8..b56cabc7 100644 --- a/src/generated/resources/data/tfmg/recipe/sequenced_assembly/heavy_plate.json +++ b/src/generated/resources/data/tfmg/recipe/sequenced_assembly/heavy_plate.json @@ -3,7 +3,6 @@ "ingredient": { "tag": "c:ingots/steel" }, - "loops": 1, "results": [ { "id": "tfmg:heavy_plate" diff --git a/src/generated/resources/data/tfmg/recipe/sequenced_assembly/potentiometer.json b/src/generated/resources/data/tfmg/recipe/sequenced_assembly/potentiometer.json index d6cd250a..22141c62 100644 --- a/src/generated/resources/data/tfmg/recipe/sequenced_assembly/potentiometer.json +++ b/src/generated/resources/data/tfmg/recipe/sequenced_assembly/potentiometer.json @@ -79,7 +79,7 @@ "item": "tfmg:unfinished_potentiometer" }, { - "type": "fluid_stack", + "type": "neoforge:single", "amount": 50, "fluid": "tfmg:lubrication_oil" } diff --git a/src/generated/resources/data/tfmg/recipe/sequenced_assembly/transistor.json b/src/generated/resources/data/tfmg/recipe/sequenced_assembly/transistor.json index e63179b3..995924f4 100644 --- a/src/generated/resources/data/tfmg/recipe/sequenced_assembly/transistor.json +++ b/src/generated/resources/data/tfmg/recipe/sequenced_assembly/transistor.json @@ -3,7 +3,6 @@ "ingredient": { "item": "tfmg:plastic_sheet" }, - "loops": 1, "results": [ { "chance": 120.0, diff --git a/src/generated/resources/data/tfmg/recipe/vat_machine_recipe/naphtha.json b/src/generated/resources/data/tfmg/recipe/vat_machine_recipe/naphtha.json index caac7097..58529dae 100644 --- a/src/generated/resources/data/tfmg/recipe/vat_machine_recipe/naphtha.json +++ b/src/generated/resources/data/tfmg/recipe/vat_machine_recipe/naphtha.json @@ -7,7 +7,7 @@ "heat_requirement": "heated", "ingredients": [ { - "type": "fluid_stack", + "type": "neoforge:single", "amount": 500, "fluid": "tfmg:naphtha" } diff --git a/src/generated/resources/data/tfmg/recipe/vat_machine_recipe/neon.json b/src/generated/resources/data/tfmg/recipe/vat_machine_recipe/neon.json index 24bcb89c..032277b2 100644 --- a/src/generated/resources/data/tfmg/recipe/vat_machine_recipe/neon.json +++ b/src/generated/resources/data/tfmg/recipe/vat_machine_recipe/neon.json @@ -2,7 +2,7 @@ "type": "tfmg:vat_machine_recipe", "ingredients": [ { - "type": "fluid_stack", + "type": "neoforge:single", "amount": 1000, "fluid": "tfmg:air" } diff --git a/src/generated/resources/data/tfmg/recipe/vat_machine_recipe/plastic_from_ethylene.json b/src/generated/resources/data/tfmg/recipe/vat_machine_recipe/plastic_from_ethylene.json index 89ca733a..73eb89c6 100644 --- a/src/generated/resources/data/tfmg/recipe/vat_machine_recipe/plastic_from_ethylene.json +++ b/src/generated/resources/data/tfmg/recipe/vat_machine_recipe/plastic_from_ethylene.json @@ -7,7 +7,7 @@ "heat_requirement": "heated", "ingredients": [ { - "type": "fluid_stack", + "type": "neoforge:single", "amount": 500, "fluid": "tfmg:ethylene" } diff --git a/src/generated/resources/data/tfmg/recipe/vat_machine_recipe/plastic_from_propylene.json b/src/generated/resources/data/tfmg/recipe/vat_machine_recipe/plastic_from_propylene.json index e0ba37d2..b376d6c1 100644 --- a/src/generated/resources/data/tfmg/recipe/vat_machine_recipe/plastic_from_propylene.json +++ b/src/generated/resources/data/tfmg/recipe/vat_machine_recipe/plastic_from_propylene.json @@ -7,7 +7,7 @@ "heat_requirement": "heated", "ingredients": [ { - "type": "fluid_stack", + "type": "neoforge:single", "amount": 500, "fluid": "tfmg:propylene" } diff --git a/src/generated/resources/data/tfmg/recipe/vat_machine_recipe/rubber.json b/src/generated/resources/data/tfmg/recipe/vat_machine_recipe/rubber.json index fd762815..74f1a0d2 100644 --- a/src/generated/resources/data/tfmg/recipe/vat_machine_recipe/rubber.json +++ b/src/generated/resources/data/tfmg/recipe/vat_machine_recipe/rubber.json @@ -10,7 +10,7 @@ "item": "tfmg:sulfur_dust" }, { - "type": "fluid_stack", + "type": "neoforge:single", "amount": 250, "fluid": "tfmg:heavy_oil" } diff --git a/src/generated/resources/data/tfmg/recipe/vat_machine_recipe/sulfuric_acid.json b/src/generated/resources/data/tfmg/recipe/vat_machine_recipe/sulfuric_acid.json index d6ea62df..0a46c561 100644 --- a/src/generated/resources/data/tfmg/recipe/vat_machine_recipe/sulfuric_acid.json +++ b/src/generated/resources/data/tfmg/recipe/vat_machine_recipe/sulfuric_acid.json @@ -18,7 +18,7 @@ "item": "tfmg:nitrate_dust" }, { - "type": "fluid_stack", + "type": "neoforge:single", "amount": 1000, "fluid": "minecraft:water" } diff --git a/src/generated/resources/data/tfmg/tags/block/blast_furnace_support.json b/src/generated/resources/data/tfmg/tags/block/blast_furnace_support.json index 5fd7e38a..ee3ccb7b 100644 --- a/src/generated/resources/data/tfmg/tags/block/blast_furnace_support.json +++ b/src/generated/resources/data/tfmg/tags/block/blast_furnace_support.json @@ -1,5 +1,6 @@ { "values": [ + "tfmg:fireproof_brick_reinforcement", "tfmg:fireproof_brick_reinforcement" ] } \ No newline at end of file diff --git a/src/generated/resources/data/tfmg/tags/block/blast_furnace_wall.json b/src/generated/resources/data/tfmg/tags/block/blast_furnace_wall.json index a989ac25..72850a8b 100644 --- a/src/generated/resources/data/tfmg/tags/block/blast_furnace_wall.json +++ b/src/generated/resources/data/tfmg/tags/block/blast_furnace_wall.json @@ -1,5 +1,7 @@ { "values": [ + "tfmg:blast_furnace_hatch", + "tfmg:fireproof_bricks", "tfmg:blast_furnace_hatch", "tfmg:fireproof_bricks" ] diff --git a/src/generated/resources/data/tfmg/tags/block/pumpjack_connector.json b/src/generated/resources/data/tfmg/tags/block/pumpjack_connector.json index 6c9720a8..4bbca4ec 100644 --- a/src/generated/resources/data/tfmg/tags/block/pumpjack_connector.json +++ b/src/generated/resources/data/tfmg/tags/block/pumpjack_connector.json @@ -1,5 +1,7 @@ { "values": [ + "tfmg:pumpjack_hammer_connector", + "tfmg:large_pumpjack_hammer_connector", "tfmg:pumpjack_hammer_connector", "tfmg:large_pumpjack_hammer_connector" ] 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 48fdf33a..db702d86 100644 --- a/src/generated/resources/data/tfmg/tags/block/pumpjack_head.json +++ b/src/generated/resources/data/tfmg/tags/block/pumpjack_head.json @@ -2,6 +2,7 @@ "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 a3607049..feef8cde 100644 --- a/src/generated/resources/data/tfmg/tags/block/pumpjack_part.json +++ b/src/generated/resources/data/tfmg/tags/block/pumpjack_part.json @@ -1,6 +1,8 @@ { "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/generated/resources/data/tfmg/tags/block/reinforced_blast_furnace_support.json b/src/generated/resources/data/tfmg/tags/block/reinforced_blast_furnace_support.json index af307d92..f262c7d9 100644 --- a/src/generated/resources/data/tfmg/tags/block/reinforced_blast_furnace_support.json +++ b/src/generated/resources/data/tfmg/tags/block/reinforced_blast_furnace_support.json @@ -2,6 +2,9 @@ "values": [ "tfmg:blast_furnace_reinforcement", "tfmg:rusted_blast_furnace_reinforcement", + "tfmg:blast_furnace_reinforcement", + "tfmg:rusted_blast_furnace_reinforcement", + "tfmg:steel_block", "tfmg:steel_block" ] } \ No newline at end of file diff --git a/src/generated/resources/data/tfmg/tags/block/reinforced_blast_furnace_wall.json b/src/generated/resources/data/tfmg/tags/block/reinforced_blast_furnace_wall.json index 7ef490f9..b4eccafd 100644 --- a/src/generated/resources/data/tfmg/tags/block/reinforced_blast_furnace_wall.json +++ b/src/generated/resources/data/tfmg/tags/block/reinforced_blast_furnace_wall.json @@ -2,6 +2,9 @@ "values": [ "tfmg:blast_furnace_hatch", "tfmg:reinforced_fireproof_bricks", + "tfmg:blast_furnace_hatch", + "tfmg:reinforced_fireproof_bricks", + "tfmg:steel_block", "tfmg:steel_block" ] } \ No newline at end of file diff --git a/src/generated/resources/data/tfmg/tags/block/surface_scanner_findable.json b/src/generated/resources/data/tfmg/tags/block/surface_scanner_findable.json index 9a903fb1..25965084 100644 --- a/src/generated/resources/data/tfmg/tags/block/surface_scanner_findable.json +++ b/src/generated/resources/data/tfmg/tags/block/surface_scanner_findable.json @@ -1,6 +1,7 @@ { "values": [ "tfmg:oil_deposit", + "tfmg:heavy_machinery_casing", "tfmg:heavy_machinery_casing" ] } \ No newline at end of file diff --git a/src/generated/resources/data/tfmg/tags/item/rods.json b/src/generated/resources/data/tfmg/tags/item/rods.json deleted file mode 100644 index 019b63dd..00000000 --- a/src/generated/resources/data/tfmg/tags/item/rods.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "values": [ - "minecraft:stick" - ] -} \ No newline at end of file diff --git a/src/main/java/com/drmangotea/tfmg/TFMGClient.java b/src/main/java/com/drmangotea/tfmg/TFMGClient.java index 758000ba..928618cb 100644 --- a/src/main/java/com/drmangotea/tfmg/TFMGClient.java +++ b/src/main/java/com/drmangotea/tfmg/TFMGClient.java @@ -3,36 +3,15 @@ package com.drmangotea.tfmg; import com.drmangotea.tfmg.content.items.weapons.advanced_potato_cannon.AdvancedPotatoCannonRenderHandler; import com.drmangotea.tfmg.content.items.weapons.flamethrover.FlamethrowerRenderHandler; import com.drmangotea.tfmg.content.items.weapons.quad_potato_cannon.QuadPotatoCannonRenderHandler; -import com.drmangotea.tfmg.content.machinery.vat.electrode_holder.ElectrodeHolderRenderer; import com.drmangotea.tfmg.ponder.TFMGPonderPlugin; import com.drmangotea.tfmg.registry.TFMGParticleTypes; -import com.mojang.blaze3d.vertex.MeshData; -import com.mojang.blaze3d.vertex.PoseStack; -import com.simibubi.create.Create; -import com.simibubi.create.CreateClient; -import com.simibubi.create.content.equipment.potatoCannon.PotatoCannonRenderHandler; -import com.simibubi.create.content.kinetics.base.KineticBlockEntityRenderer; -import com.simibubi.create.foundation.ponder.CreatePonderPlugin; -import dev.engine_room.flywheel.lib.model.baked.EmptyVirtualBlockGetter; -import dev.engine_room.flywheel.lib.model.baked.PartialModel; -import net.createmod.catnip.client.render.model.BakedModelBufferer; -import net.createmod.catnip.render.SuperBufferFactory; -import net.createmod.catnip.render.SuperByteBuffer; -import net.createmod.catnip.render.SuperByteBufferCache; import net.createmod.ponder.foundation.PonderIndex; -import net.minecraft.client.resources.model.BakedModel; -import net.minecraft.core.BlockPos; -import net.minecraft.world.item.ItemStack; -import net.minecraft.world.level.block.state.BlockState; import net.neoforged.api.distmarker.Dist; import net.neoforged.bus.api.IEventBus; -import net.neoforged.bus.api.SubscribeEvent; import net.neoforged.fml.common.Mod; import net.neoforged.fml.event.lifecycle.FMLClientSetupEvent; import net.neoforged.neoforge.common.NeoForge; -import javax.annotation.Nullable; - @Mod(value = TFMG.MOD_ID, dist = Dist.CLIENT) public class TFMGClient { diff --git a/src/main/java/com/drmangotea/tfmg/TFMGRegistries.java b/src/main/java/com/drmangotea/tfmg/TFMGRegistries.java index 03a52a53..8b4ab5af 100644 --- a/src/main/java/com/drmangotea/tfmg/TFMGRegistries.java +++ b/src/main/java/com/drmangotea/tfmg/TFMGRegistries.java @@ -3,13 +3,10 @@ package com.drmangotea.tfmg; import com.drmangotea.tfmg.content.electricity.connection.cable_type.CableType; import com.drmangotea.tfmg.content.items.weapons.flamethrover.FlamethrowerFuelType; import com.drmangotea.tfmg.content.machinery.vat.electrode_holder.electrode.Electrode; -import com.simibubi.create.api.equipment.potatoCannon.PotatoCannonProjectileType; import net.minecraft.core.Registry; import net.minecraft.resources.ResourceKey; import net.neoforged.neoforge.registries.RegistryBuilder; -import static com.drmangotea.tfmg.TFMG.REGISTRATE; - public class TFMGRegistries { public static final ResourceKey> CABLE_TYPE = createRegistryKey("cable_types"); public static final ResourceKey> ELECTRODE = createRegistryKey("electrodes"); diff --git a/src/main/java/com/drmangotea/tfmg/base/TFMGArmorMaterials.java b/src/main/java/com/drmangotea/tfmg/base/TFMGArmorMaterials.java index d21d5947..b9c5c218 100644 --- a/src/main/java/com/drmangotea/tfmg/base/TFMGArmorMaterials.java +++ b/src/main/java/com/drmangotea/tfmg/base/TFMGArmorMaterials.java @@ -2,16 +2,13 @@ package com.drmangotea.tfmg.base; import com.drmangotea.tfmg.TFMG; import com.drmangotea.tfmg.registry.TFMGItems; -import com.google.common.base.Suppliers; import com.simibubi.create.AllSoundEvents; import com.simibubi.create.Create; import net.minecraft.core.Holder; import net.minecraft.core.registries.Registries; import net.minecraft.sounds.SoundEvent; -import net.minecraft.sounds.SoundEvents; import net.minecraft.world.item.ArmorItem; import net.minecraft.world.item.ArmorMaterial; -import net.minecraft.world.item.Items; import net.minecraft.world.item.crafting.Ingredient; import net.neoforged.bus.api.IEventBus; import net.neoforged.neoforge.registries.DeferredRegister; diff --git a/src/main/java/com/drmangotea/tfmg/base/TFMGBuilderTransformers.java b/src/main/java/com/drmangotea/tfmg/base/TFMGBuilderTransformers.java index 852d89e0..074ff1fb 100644 --- a/src/main/java/com/drmangotea/tfmg/base/TFMGBuilderTransformers.java +++ b/src/main/java/com/drmangotea/tfmg/base/TFMGBuilderTransformers.java @@ -23,6 +23,7 @@ import com.simibubi.create.content.kinetics.base.RotatedPillarKineticBlock; import com.simibubi.create.content.kinetics.simpleRelays.encased.EncasedCogCTBehaviour; import com.simibubi.create.foundation.block.connected.CTSpriteShiftEntry; import com.simibubi.create.foundation.data.*; +import com.simibubi.create.foundation.data.recipe.CommonMetal; import com.tterrag.registrate.builders.BlockBuilder; import com.tterrag.registrate.providers.DataGenContext; import com.tterrag.registrate.providers.RegistrateBlockstateProvider; @@ -40,6 +41,7 @@ import net.minecraft.world.level.block.*; import net.minecraft.world.level.block.state.BlockBehaviour; import net.neoforged.neoforge.client.model.generators.ModelFile; import net.neoforged.neoforge.client.model.generators.MultiPartBlockStateBuilder; +import net.neoforged.neoforge.common.Tags; import java.util.*; @@ -216,7 +218,7 @@ public class TFMGBuilderTransformers { public static BlockEntry truss(String name) { return REGISTRATE.block(name + "_truss", TrussBlock::new) .initialProperties(() -> Blocks.IRON_BLOCK) - .properties(p -> p.noOcclusion()) + .properties(BlockBehaviour.Properties::noOcclusion) .properties(p -> p.sound(SoundType.NETHERITE_BLOCK)) .transform(pickaxeOnly()) .addLayer(() -> RenderType::cutoutMipped) @@ -268,7 +270,7 @@ public class TFMGBuilderTransformers { REGISTRATE.block(color + "_caution_block", TFMGHorizontalDirectionalBlock::new) .initialProperties(() -> Blocks.COPPER_BLOCK) - .properties(p -> p.requiresCorrectToolForDrops()) + .properties(BlockBehaviour.Properties::requiresCorrectToolForDrops) .properties(p -> p.sound(SoundType.NETHERITE_BLOCK)) .transform(pickaxeOnly()) .blockstate((c, p) -> p.horizontalBlock(c.get(), p.models() @@ -277,7 +279,7 @@ public class TFMGBuilderTransformers { .texture("particle", p.modLoc("block/caution_block/" + color)) )) .tag(BlockTags.NEEDS_STONE_TOOL) - .recipe((c, p) -> p.stonecutting(DataIngredient.tag(AllTags.commonItemTag("ingots/aluminum")), RecipeCategory.BUILDING_BLOCKS, c::get, 2)) + .recipe((c, p) -> p.stonecutting(DataIngredient.tag(CommonMetal.ALUMINUM.ingots), RecipeCategory.BUILDING_BLOCKS, c, 2)) .item() .build() .lang(upperCaseColor + " Caution Block") @@ -295,13 +297,13 @@ public class TFMGBuilderTransformers { concrete.wall = REGISTRATE.block(name + "_wall", WallBlock::new) .initialProperties(() -> Blocks.STONE) - .properties(p -> p.requiresCorrectToolForDrops()) + .properties(BlockBehaviour.Properties::requiresCorrectToolForDrops) .properties(p -> p.strength(rebar ? 12f : 3.5f, rebar ? 1200f : 3.5f)) .transform(pickaxeOnly()) .blockstate((c, p) -> TFMGVanillaBlockStates.generateWallBlockState(c, p, "concrete")) .tag(BlockTags.NEEDS_STONE_TOOL) .tag(BlockTags.WALLS) - .recipe((c, p) -> p.stonecutting(DataIngredient.items(concrete.block.get()), RecipeCategory.BUILDING_BLOCKS, c::get, 1)) + .recipe((c, p) -> p.stonecutting(DataIngredient.items(concrete.block.get()), RecipeCategory.BUILDING_BLOCKS, c, 1)) .item() .transform(b -> TFMGVanillaBlockStates.transformWallItem(b, "concrete")) .build() @@ -310,23 +312,23 @@ public class TFMGBuilderTransformers { concrete.block = REGISTRATE.block(name, Block::new) .initialProperties(() -> Blocks.STONE) .properties(p -> p.strength(rebar ? 12f : 3.5f, rebar ? 1200f : 3.5f)) - .properties(p -> p.requiresCorrectToolForDrops()) + .properties(BlockBehaviour.Properties::requiresCorrectToolForDrops) .transform(pickaxeOnly()) .blockstate(simpleCubeAll("concrete")) .tag(BlockTags.NEEDS_STONE_TOOL) - .transform(tagBlockAndItem("concrete")) + .transform(tagBlockAndItem(Tags.Blocks.CONCRETES, Tags.Items.CONCRETES)) .build() .register(); concrete.stairs = REGISTRATE.block(name + "_stairs", p -> new StairBlock(concrete.block.get().defaultBlockState(), p)) .initialProperties(() -> Blocks.STONE) - .properties(p -> p.requiresCorrectToolForDrops()) + .properties(BlockBehaviour.Properties::requiresCorrectToolForDrops) .properties(p -> p.strength(rebar ? 12f : 3.5f, rebar ? 1200f : 3.5f)) .transform(pickaxeOnly()) .blockstate((c, p) -> TFMGVanillaBlockStates.generateStairBlockState(c, p, name)) .tag(BlockTags.NEEDS_STONE_TOOL) .tag(BlockTags.STAIRS) - .recipe((c, p) -> p.stonecutting(DataIngredient.items(concrete.block.get()), RecipeCategory.BUILDING_BLOCKS, c::get, 1)) + .recipe((c, p) -> p.stonecutting(DataIngredient.items(concrete.block.get()), RecipeCategory.BUILDING_BLOCKS, c, 1)) .item() .transform(customItemModel(name + "_stairs")) .register(); @@ -336,12 +338,12 @@ public class TFMGBuilderTransformers { concrete.slab = REGISTRATE.block(name + "_slab", SlabBlock::new) .initialProperties(() -> Blocks.STONE) .properties(p -> p.strength(rebar ? 12f : 3.5f, rebar ? 1200f : 3.5f)) - .properties(p -> p.requiresCorrectToolForDrops()) + .properties(BlockBehaviour.Properties::requiresCorrectToolForDrops) .transform(pickaxeOnly()) .blockstate((c, p) -> TFMGVanillaBlockStates.generateSlabBlockState(c, p, "concrete")) .tag(BlockTags.NEEDS_STONE_TOOL) .tag(BlockTags.SLABS) - .recipe((c, p) -> p.stonecutting(DataIngredient.items(concrete.block.get()), RecipeCategory.BUILDING_BLOCKS, c::get, 2)) + .recipe((c, p) -> p.stonecutting(DataIngredient.items(concrete.block.get()), RecipeCategory.BUILDING_BLOCKS, c, 2)) .item() .transform(customItemModel("concrete_bottom")) .register(); @@ -362,7 +364,7 @@ public class TFMGBuilderTransformers { set.block=REGISTRATE.block(color + name, Block::new) .initialProperties(() -> Blocks.STONE) .properties(p -> p.strength(rebar ? 12f : 3.5f, rebar ? 1200f : 3.5f)) - .properties(p -> p.requiresCorrectToolForDrops()) + .properties(BlockBehaviour.Properties::requiresCorrectToolForDrops) .transform(pickaxeOnly()) .blockstate(simpleCubeAll(color + "_concrete")) .tag(BlockTags.NEEDS_STONE_TOOL) @@ -374,12 +376,12 @@ public class TFMGBuilderTransformers { set.wall=REGISTRATE.block(color + name + "_wall", WallBlock::new) .initialProperties(() -> Blocks.STONE) .properties(p -> p.strength(rebar ? 12f : 3.5f, rebar ? 1200f : 3.5f)) - .properties(p -> p.requiresCorrectToolForDrops()) + .properties(BlockBehaviour.Properties::requiresCorrectToolForDrops) .transform(pickaxeOnly()) .blockstate((c, p) -> TFMGVanillaBlockStates.generateWallBlockState(c, p, color + "_concrete")) .tag(BlockTags.NEEDS_STONE_TOOL) .tag(BlockTags.WALLS) - .recipe((c, p) -> p.stonecutting(DataIngredient.items(set.block.asItem()), RecipeCategory.BUILDING_BLOCKS, c::get, 1)) + .recipe((c, p) -> p.stonecutting(DataIngredient.items(set.block.asItem()), RecipeCategory.BUILDING_BLOCKS, c, 1)) .item() .transform(b -> TFMGVanillaBlockStates.transformWallItem(b, color + "_concrete")) .build() @@ -388,12 +390,12 @@ public class TFMGBuilderTransformers { set.stairs=REGISTRATE.block(color + name + "_stairs", p -> new StairBlock(TFMGBlocks.CONCRETE.block.get().defaultBlockState(), p)) .initialProperties(() -> Blocks.STONE) .properties(p -> p.strength(rebar ? 12f : 3.5f, rebar ? 1200f : 3.5f)) - .properties(p -> p.requiresCorrectToolForDrops()) + .properties(BlockBehaviour.Properties::requiresCorrectToolForDrops) .transform(pickaxeOnly()) .blockstate((c, p) -> TFMGVanillaBlockStates.generateStairBlockState(c, p, color + "_concrete")) .tag(BlockTags.NEEDS_STONE_TOOL) .tag(BlockTags.STAIRS) - .recipe((c, p) -> p.stonecutting(DataIngredient.items(set.block.asItem()), RecipeCategory.BUILDING_BLOCKS, c::get, 1)) + .recipe((c, p) -> p.stonecutting(DataIngredient.items(set.block.asItem()), RecipeCategory.BUILDING_BLOCKS, c, 1)) .item() // .transform(b -> TFMGVanillaBlockStates.transformStairItem(b, color + "_concrete")) .transform(customItemModel(color + "_concrete_stairs")) @@ -404,12 +406,12 @@ public class TFMGBuilderTransformers { set.slab=REGISTRATE.block(color + name + "_slab", SlabBlock::new) .initialProperties(() -> Blocks.STONE) .properties(p -> p.strength(rebar ? 12f : 3.5f, rebar ? 1200f : 3.5f)) - .properties(p -> p.requiresCorrectToolForDrops()) + .properties(BlockBehaviour.Properties::requiresCorrectToolForDrops) .transform(pickaxeOnly()) .blockstate((c, p) -> TFMGVanillaBlockStates.generateSlabBlockState(c, p, color + "_concrete")) .tag(BlockTags.NEEDS_STONE_TOOL) .tag(BlockTags.SLABS) - .recipe((c, p) -> p.stonecutting(DataIngredient.items(set.block.asItem()), RecipeCategory.BUILDING_BLOCKS, c::get, 2)) + .recipe((c, p) -> p.stonecutting(DataIngredient.items(set.block.asItem()), RecipeCategory.BUILDING_BLOCKS, c, 2)) .item() .transform(customItemModel(color + "_concrete_bottom")) .register(); @@ -433,25 +435,25 @@ public class TFMGBuilderTransformers { REGISTRATE.block(name + "_wall", WallBlock::new) - .initialProperties(() -> blockEntry.get()) + .initialProperties(blockEntry::get) .transform(pickaxeOnly()) .blockstate((c, p) -> TFMGVanillaBlockStates.generateWallBlockState(c, p, name)) .tag(BlockTags.NEEDS_STONE_TOOL) .tag(BlockTags.WALLS) - .recipe((c, p) -> p.stonecutting(DataIngredient.items(blockEntry.asItem()), RecipeCategory.BUILDING_BLOCKS, c::get, 1)) + .recipe((c, p) -> p.stonecutting(DataIngredient.items(blockEntry.asItem()), RecipeCategory.BUILDING_BLOCKS, c, 1)) .item() .transform(b -> TFMGVanillaBlockStates.transformWallItem(b, name)) .build() .register(); REGISTRATE.block(name + "_slab", SlabBlock::new) - .initialProperties(() -> blockEntry.get()) - .properties(p -> p.requiresCorrectToolForDrops()) + .initialProperties(blockEntry::get) + .properties(BlockBehaviour.Properties::requiresCorrectToolForDrops) .transform(pickaxeOnly()) .blockstate((c, p) -> TFMGVanillaBlockStates.generateSlabBlockState(c, p, name)) .tag(BlockTags.NEEDS_STONE_TOOL) .tag(BlockTags.SLABS) - .recipe((c, p) -> p.stonecutting(DataIngredient.items(blockEntry.asItem()), RecipeCategory.BUILDING_BLOCKS, c::get, 2)) + .recipe((c, p) -> p.stonecutting(DataIngredient.items(blockEntry.asItem()), RecipeCategory.BUILDING_BLOCKS, c, 2)) .item() .transform(customItemModel(name + "_bottom")) .register(); @@ -461,7 +463,7 @@ public class TFMGBuilderTransformers { .blockstate((c, p) -> TFMGVanillaBlockStates.generateStairBlockState(c, p, name)) .tag(BlockTags.NEEDS_STONE_TOOL) .tag(BlockTags.STAIRS) - .recipe((c, p) -> p.stonecutting(DataIngredient.items(blockEntry.asItem()), RecipeCategory.BUILDING_BLOCKS, c::get, 1)) + .recipe((c, p) -> p.stonecutting(DataIngredient.items(blockEntry.asItem()), RecipeCategory.BUILDING_BLOCKS, c, 1)) .item() .transform(customItemModel(name + "_stairs")) .register(); diff --git a/src/main/java/com/drmangotea/tfmg/base/TFMGRegistrate.java b/src/main/java/com/drmangotea/tfmg/base/TFMGRegistrate.java index 4988c023..881f29cb 100644 --- a/src/main/java/com/drmangotea/tfmg/base/TFMGRegistrate.java +++ b/src/main/java/com/drmangotea/tfmg/base/TFMGRegistrate.java @@ -10,22 +10,15 @@ import com.simibubi.create.content.fluids.VirtualFluid; import com.simibubi.create.foundation.data.CreateRegistrate; import com.simibubi.create.foundation.data.VirtualFluidBuilder; import com.simibubi.create.foundation.item.TooltipModifier; -import com.tterrag.registrate.Registrate; import com.tterrag.registrate.builders.FluidBuilder; import com.tterrag.registrate.util.nullness.NonNullFunction; -import net.minecraft.core.registries.BuiltInRegistries; import net.minecraft.core.registries.Registries; -import net.minecraft.resources.ResourceKey; -import net.minecraft.resources.ResourceLocation; -import net.minecraft.world.item.CreativeModeTab; import net.minecraft.world.item.Item; -import net.minecraft.world.level.block.*; import org.jetbrains.annotations.Nullable; import java.util.function.Function; import static com.drmangotea.tfmg.registry.TFMGFluids.getGasTexture; -import static com.simibubi.create.foundation.data.ModelGen.customItemModel; public class TFMGRegistrate extends CreateRegistrate { protected TFMGRegistrate(String modid) { diff --git a/src/main/java/com/drmangotea/tfmg/base/TFMGRegistrateTags.java b/src/main/java/com/drmangotea/tfmg/base/TFMGRegistrateTags.java index 831a484c..1a677f95 100644 --- a/src/main/java/com/drmangotea/tfmg/base/TFMGRegistrateTags.java +++ b/src/main/java/com/drmangotea/tfmg/base/TFMGRegistrateTags.java @@ -9,6 +9,7 @@ import net.minecraft.world.item.Item; import net.minecraft.world.item.Items; import net.minecraft.world.level.block.Block; import net.minecraft.world.level.block.Blocks; +import net.neoforged.neoforge.common.Tags; public class TFMGRegistrateTags { private static final TFMGRegistrate REGISTRATE = TFMG.registrate(); @@ -22,7 +23,7 @@ public class TFMGRegistrateTags { private static void genItemTags(RegistrateTagsProvider provIn) { TagGen.CreateTagsProvider prov = new TagGen.CreateTagsProvider<>(provIn, Item::builtInRegistryHolder); - prov.tag(TFMGTags.TFMGItemTags.RODS.tag) + prov.tag(Tags.Items.RODS) .add(Items.STICK); for (TFMGTags.TFMGItemTags tag : TFMGTags.TFMGItemTags.values()) { diff --git a/src/main/java/com/drmangotea/tfmg/base/TFMGRemapper.java b/src/main/java/com/drmangotea/tfmg/base/TFMGRemapper.java index b2165d57..f54f9f0d 100644 --- a/src/main/java/com/drmangotea/tfmg/base/TFMGRemapper.java +++ b/src/main/java/com/drmangotea/tfmg/base/TFMGRemapper.java @@ -12,7 +12,7 @@ import java.util.HashMap; import java.util.Map; -@EventBusSubscriber(bus = EventBusSubscriber.Bus.MOD) +@EventBusSubscriber public class TFMGRemapper { /** * @see String The old name of the block/item (String) diff --git a/src/main/java/com/drmangotea/tfmg/base/TFMGShapes.java b/src/main/java/com/drmangotea/tfmg/base/TFMGShapes.java index 53aaec37..9ee58bb1 100644 --- a/src/main/java/com/drmangotea/tfmg/base/TFMGShapes.java +++ b/src/main/java/com/drmangotea/tfmg/base/TFMGShapes.java @@ -3,7 +3,6 @@ package com.drmangotea.tfmg.base; import net.createmod.catnip.math.VoxelShaper; import net.minecraft.core.Direction; -import net.minecraft.core.Direction.*; import net.minecraft.world.level.block.Block; import net.minecraft.world.phys.shapes.BooleanOp; import net.minecraft.world.phys.shapes.Shapes; diff --git a/src/main/java/com/drmangotea/tfmg/base/TFMGSpriteShifts.java b/src/main/java/com/drmangotea/tfmg/base/TFMGSpriteShifts.java index 4da90462..854df392 100644 --- a/src/main/java/com/drmangotea/tfmg/base/TFMGSpriteShifts.java +++ b/src/main/java/com/drmangotea/tfmg/base/TFMGSpriteShifts.java @@ -1,7 +1,6 @@ package com.drmangotea.tfmg.base; import com.drmangotea.tfmg.TFMG; -import com.simibubi.create.Create; import com.simibubi.create.foundation.block.connected.AllCTTypes; import com.simibubi.create.foundation.block.connected.CTSpriteShiftEntry; import com.simibubi.create.foundation.block.connected.CTSpriteShifter; diff --git a/src/main/java/com/drmangotea/tfmg/base/TFMGTiers.java b/src/main/java/com/drmangotea/tfmg/base/TFMGTiers.java index 228d4c8e..18046c22 100644 --- a/src/main/java/com/drmangotea/tfmg/base/TFMGTiers.java +++ b/src/main/java/com/drmangotea/tfmg/base/TFMGTiers.java @@ -1,30 +1,14 @@ package com.drmangotea.tfmg.base; import com.drmangotea.tfmg.TFMG; -import com.drmangotea.tfmg.registry.TFMGItems; -import com.simibubi.create.AllSoundEvents; -import com.simibubi.create.AllTags; -import com.simibubi.create.Create; -import net.minecraft.core.Holder; -import net.minecraft.core.registries.Registries; -import net.minecraft.sounds.SoundEvent; +import com.simibubi.create.foundation.data.recipe.CommonMetal; import net.minecraft.tags.BlockTags; import net.minecraft.tags.TagKey; -import net.minecraft.util.LazyLoadedValue; -import net.minecraft.world.item.ArmorItem; -import net.minecraft.world.item.ArmorMaterial; import net.minecraft.world.item.Tier; import net.minecraft.world.item.crafting.Ingredient; import net.minecraft.world.level.block.Block; -import net.neoforged.bus.api.IEventBus; -import net.neoforged.neoforge.common.SimpleTier; -import net.neoforged.neoforge.common.Tags; -import net.neoforged.neoforge.registries.DeferredRegister; -import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; -import java.util.EnumMap; -import java.util.List; import java.util.function.Supplier; public enum TFMGTiers implements Tier { @@ -33,9 +17,9 @@ public enum TFMGTiers implements Tier { - STEEL(TFMG.asResource("steel").toString(),1000, 7.5f, 3f, 12,()-> Ingredient.of(AllTags.commonItemTag("ingots/steel"))), - ALUMINUM(TFMG.asResource("aluminum").toString(),220, 6, 2f, 22,()-> Ingredient.of(AllTags.commonItemTag("ingots/aluminum"))), - LEAD(TFMG.asResource("lead").toString(),32, 2, 0.5f, 5,()-> Ingredient.of(AllTags.commonItemTag("ingots/lead"))); + STEEL(TFMG.asResource("steel").toString(),1000, 7.5f, 3f, 12,()-> Ingredient.of(CommonMetal.STEEL.ingots)), + ALUMINUM(TFMG.asResource("aluminum").toString(),220, 6, 2f, 22,()-> Ingredient.of(CommonMetal.ALUMINUM.ingots)), + LEAD(TFMG.asResource("lead").toString(),32, 2, 0.5f, 5,()-> Ingredient.of(CommonMetal.LEAD.ingots)); public final String name; diff --git a/src/main/java/com/drmangotea/tfmg/base/TFMGUtils.java b/src/main/java/com/drmangotea/tfmg/base/TFMGUtils.java index 55b1df3f..588f1406 100644 --- a/src/main/java/com/drmangotea/tfmg/base/TFMGUtils.java +++ b/src/main/java/com/drmangotea/tfmg/base/TFMGUtils.java @@ -34,7 +34,6 @@ import net.minecraft.world.entity.player.Player; import net.minecraft.world.item.ItemStack; import net.minecraft.world.level.Level; import net.minecraft.world.level.LightLayer; -import net.minecraft.world.level.block.Block; import net.minecraft.world.level.block.entity.BlockEntity; import net.minecraft.world.level.material.Fluid; import net.minecraft.world.phys.AABB; diff --git a/src/main/java/com/drmangotea/tfmg/base/blocks/TFMGDirectionalBlock.java b/src/main/java/com/drmangotea/tfmg/base/blocks/TFMGDirectionalBlock.java index 43269781..334f9ef4 100644 --- a/src/main/java/com/drmangotea/tfmg/base/blocks/TFMGDirectionalBlock.java +++ b/src/main/java/com/drmangotea/tfmg/base/blocks/TFMGDirectionalBlock.java @@ -1,13 +1,11 @@ package com.drmangotea.tfmg.base.blocks; -import com.drmangotea.tfmg.content.electricity.generators.large_generator.StatorBlock; import com.mojang.serialization.MapCodec; import net.minecraft.world.item.context.BlockPlaceContext; import net.minecraft.world.level.block.Block; import net.minecraft.world.level.block.DirectionalBlock; import net.minecraft.world.level.block.state.BlockState; import net.minecraft.world.level.block.state.StateDefinition; -import org.checkerframework.checker.units.qual.C; public class TFMGDirectionalBlock extends DirectionalBlock { diff --git a/src/main/java/com/drmangotea/tfmg/base/events/TFMGClientEvents.java b/src/main/java/com/drmangotea/tfmg/base/events/TFMGClientEvents.java index 9c741ba8..3d32071c 100644 --- a/src/main/java/com/drmangotea/tfmg/base/events/TFMGClientEvents.java +++ b/src/main/java/com/drmangotea/tfmg/base/events/TFMGClientEvents.java @@ -68,7 +68,7 @@ public class TFMGClientEvents { return !(Minecraft.getInstance().level == null || Minecraft.getInstance().player == null); } - @EventBusSubscriber(value = Dist.CLIENT, bus = EventBusSubscriber.Bus.MOD) + @EventBusSubscriber(value = Dist.CLIENT) public static class ModBusEvents { @SubscribeEvent public static void registerItemDecorations(RegisterItemDecorationsEvent event) { diff --git a/src/main/java/com/drmangotea/tfmg/base/events/TFMGCommonEvents.java b/src/main/java/com/drmangotea/tfmg/base/events/TFMGCommonEvents.java index a463ad38..4ca21d1c 100644 --- a/src/main/java/com/drmangotea/tfmg/base/events/TFMGCommonEvents.java +++ b/src/main/java/com/drmangotea/tfmg/base/events/TFMGCommonEvents.java @@ -80,7 +80,7 @@ public class TFMGCommonEvents { public static void addReloadListeners(AddReloadListenerEvent event) { event.addListener(EngineFuelTypeManager.ReloadListener.INSTANCE); } - @EventBusSubscriber(bus = EventBusSubscriber.Bus.MOD) + @EventBusSubscriber public static class ModBusEvents { @net.neoforged.bus.api.SubscribeEvent public static void registerCapabilities(RegisterCapabilitiesEvent event) { diff --git a/src/main/java/com/drmangotea/tfmg/base/events/TFMGRegistriesImpl.java b/src/main/java/com/drmangotea/tfmg/base/events/TFMGRegistriesImpl.java index ba8a4750..1292baf2 100644 --- a/src/main/java/com/drmangotea/tfmg/base/events/TFMGRegistriesImpl.java +++ b/src/main/java/com/drmangotea/tfmg/base/events/TFMGRegistriesImpl.java @@ -7,7 +7,7 @@ import net.neoforged.fml.common.EventBusSubscriber; import net.neoforged.neoforge.registries.DataPackRegistryEvent; import org.jetbrains.annotations.ApiStatus; -@EventBusSubscriber(bus = EventBusSubscriber.Bus.MOD) +@EventBusSubscriber public class TFMGRegistriesImpl { @ApiStatus.Internal @SubscribeEvent diff --git a/src/main/java/com/drmangotea/tfmg/base/fluid/AcidFluidType.java b/src/main/java/com/drmangotea/tfmg/base/fluid/AcidFluidType.java index 79bf80ba..995b934d 100644 --- a/src/main/java/com/drmangotea/tfmg/base/fluid/AcidFluidType.java +++ b/src/main/java/com/drmangotea/tfmg/base/fluid/AcidFluidType.java @@ -2,14 +2,12 @@ package com.drmangotea.tfmg.base.fluid; import com.drmangotea.tfmg.datagen.TFMGDamageSources; -import com.drmangotea.tfmg.datagen.TFMGDamageTypes; import com.simibubi.create.AllFluids; import com.simibubi.create.Create; import com.tterrag.registrate.builders.FluidBuilder; import net.createmod.catnip.theme.Color; import net.minecraft.core.BlockPos; import net.minecraft.resources.ResourceLocation; -import net.minecraft.world.damagesource.DamageSource; import net.minecraft.world.entity.LivingEntity; import net.minecraft.world.level.BlockAndTintGetter; import net.minecraft.world.level.material.FluidState; @@ -17,7 +15,6 @@ import net.minecraft.world.phys.Vec3; import net.neoforged.neoforge.fluids.FluidStack; import org.joml.Vector3f; -import java.awt.*; import java.util.function.Supplier; public class AcidFluidType extends AllFluids.TintedFluidType { diff --git a/src/main/java/com/drmangotea/tfmg/base/fluid/ConcreteFluid.java b/src/main/java/com/drmangotea/tfmg/base/fluid/ConcreteFluid.java index 60a322ce..ca521d5b 100644 --- a/src/main/java/com/drmangotea/tfmg/base/fluid/ConcreteFluid.java +++ b/src/main/java/com/drmangotea/tfmg/base/fluid/ConcreteFluid.java @@ -10,8 +10,6 @@ import net.minecraft.world.level.material.Fluid; import net.minecraft.world.level.material.FluidState; import net.neoforged.neoforge.fluids.BaseFlowingFluid; -import static com.drmangotea.tfmg.content.decoration.concrete.ConcreteloggedBlock.CONCRETELOGGED; - public class ConcreteFluid extends BaseFlowingFluid { protected ConcreteFluid(Properties properties) { super(properties); diff --git a/src/main/java/com/drmangotea/tfmg/base/fluid/GasFluidType.java b/src/main/java/com/drmangotea/tfmg/base/fluid/GasFluidType.java index a7cefefb..25fef7f6 100644 --- a/src/main/java/com/drmangotea/tfmg/base/fluid/GasFluidType.java +++ b/src/main/java/com/drmangotea/tfmg/base/fluid/GasFluidType.java @@ -4,7 +4,6 @@ package com.drmangotea.tfmg.base.fluid; import com.drmangotea.tfmg.registry.TFMGFluids; import com.mojang.blaze3d.shaders.FogShape; import com.mojang.blaze3d.systems.RenderSystem; -import com.simibubi.create.AllFluids; import com.tterrag.registrate.builders.FluidBuilder; import net.minecraft.client.Camera; import net.minecraft.client.multiplayer.ClientLevel; @@ -19,7 +18,6 @@ import org.jetbrains.annotations.NotNull; import org.joml.Vector3f; import java.util.function.Consumer; -import java.util.function.Supplier; import static com.drmangotea.tfmg.registry.TFMGFluids.getGasTexture; diff --git a/src/main/java/com/drmangotea/tfmg/base/fluid/HotFluidType.java b/src/main/java/com/drmangotea/tfmg/base/fluid/HotFluidType.java index e6bdf6d9..df3e19a4 100644 --- a/src/main/java/com/drmangotea/tfmg/base/fluid/HotFluidType.java +++ b/src/main/java/com/drmangotea/tfmg/base/fluid/HotFluidType.java @@ -1,14 +1,11 @@ package com.drmangotea.tfmg.base.fluid; import com.drmangotea.tfmg.registry.TFMGFluids; -import com.simibubi.create.AllFluids; import com.simibubi.create.Create; import com.tterrag.registrate.builders.FluidBuilder; import net.createmod.catnip.theme.Color; import net.minecraft.core.BlockPos; import net.minecraft.resources.ResourceLocation; -import net.minecraft.world.damagesource.DamageSource; -import net.minecraft.world.damagesource.DamageSources; import net.minecraft.world.entity.Entity; import net.minecraft.world.entity.LivingEntity; import net.minecraft.world.level.BlockAndTintGetter; diff --git a/src/main/java/com/drmangotea/tfmg/base/fluid/TFMGFluidInteractions.java b/src/main/java/com/drmangotea/tfmg/base/fluid/TFMGFluidInteractions.java index a1f038ee..5dc4312d 100644 --- a/src/main/java/com/drmangotea/tfmg/base/fluid/TFMGFluidInteractions.java +++ b/src/main/java/com/drmangotea/tfmg/base/fluid/TFMGFluidInteractions.java @@ -1,15 +1,5 @@ package com.drmangotea.tfmg.base.fluid; -import com.drmangotea.tfmg.TFMG; -import com.drmangotea.tfmg.registry.TFMGBlocks; -import com.simibubi.create.content.decoration.palettes.AllPaletteBlocks; -import com.simibubi.create.content.decoration.palettes.AllPaletteStoneTypes; -import net.minecraft.world.level.block.Blocks; -import net.neoforged.neoforge.fluids.FluidInteractionRegistry; - - -import static com.drmangotea.tfmg.registry.TFMGFluids.*; - public class TFMGFluidInteractions { public static void registerFluidInteractions() { // FluidInteractionRegistry.addInteraction(ForgeMod.LAVA_TYPE.get(), new FluidInteractionRegistry.InteractionInformation( diff --git a/src/main/java/com/drmangotea/tfmg/base/lang/TFMGLang.java b/src/main/java/com/drmangotea/tfmg/base/lang/TFMGLang.java index 5ddc6657..e692eb7c 100644 --- a/src/main/java/com/drmangotea/tfmg/base/lang/TFMGLang.java +++ b/src/main/java/com/drmangotea/tfmg/base/lang/TFMGLang.java @@ -1,8 +1,6 @@ package com.drmangotea.tfmg.base.lang; import com.drmangotea.tfmg.TFMG; -import com.simibubi.create.Create; -import com.simibubi.create.foundation.utility.CreateLang; import net.createmod.catnip.lang.Lang; import net.createmod.catnip.lang.LangBuilder; import net.createmod.catnip.lang.LangNumberFormat; diff --git a/src/main/java/com/drmangotea/tfmg/base/lang/TFMGTexts.java b/src/main/java/com/drmangotea/tfmg/base/lang/TFMGTexts.java index 55c9bc75..87a7149b 100644 --- a/src/main/java/com/drmangotea/tfmg/base/lang/TFMGTexts.java +++ b/src/main/java/com/drmangotea/tfmg/base/lang/TFMGTexts.java @@ -2,7 +2,6 @@ package com.drmangotea.tfmg.base.lang; import com.drmangotea.tfmg.base.TFMGUtils; import com.simibubi.create.content.processing.recipe.HeatCondition; -import com.simibubi.create.foundation.utility.CreateLang; import net.createmod.catnip.lang.LangBuilder; import net.createmod.catnip.theme.Color; import net.minecraft.ChatFormatting; diff --git a/src/main/java/com/drmangotea/tfmg/base/palettes/TFMGPaletteBlockPartial.java b/src/main/java/com/drmangotea/tfmg/base/palettes/TFMGPaletteBlockPartial.java index bd610c7e..3d487c52 100644 --- a/src/main/java/com/drmangotea/tfmg/base/palettes/TFMGPaletteBlockPartial.java +++ b/src/main/java/com/drmangotea/tfmg/base/palettes/TFMGPaletteBlockPartial.java @@ -4,7 +4,6 @@ package com.drmangotea.tfmg.base.palettes; import com.drmangotea.tfmg.TFMG; import com.drmangotea.tfmg.base.TFMGCreativeTabs; import com.drmangotea.tfmg.registry.TFMGPaletteStoneTypes; -import com.simibubi.create.Create; import com.simibubi.create.foundation.data.CreateRegistrate; import com.simibubi.create.foundation.utility.CreateLang; diff --git a/src/main/java/com/drmangotea/tfmg/base/spark/BlueSpark.java b/src/main/java/com/drmangotea/tfmg/base/spark/BlueSpark.java index 407481b0..7e287c78 100644 --- a/src/main/java/com/drmangotea/tfmg/base/spark/BlueSpark.java +++ b/src/main/java/com/drmangotea/tfmg/base/spark/BlueSpark.java @@ -1,6 +1,5 @@ package com.drmangotea.tfmg.base.spark; -import com.drmangotea.tfmg.content.items.weapons.explosives.thermite_grenades.fire.BlueFireBlock; import net.minecraft.core.BlockPos; import net.minecraft.world.entity.EntityType; import net.minecraft.world.level.Level; diff --git a/src/main/java/com/drmangotea/tfmg/base/spark/DryIceFlake.java b/src/main/java/com/drmangotea/tfmg/base/spark/DryIceFlake.java index 2f66edbf..0542c097 100644 --- a/src/main/java/com/drmangotea/tfmg/base/spark/DryIceFlake.java +++ b/src/main/java/com/drmangotea/tfmg/base/spark/DryIceFlake.java @@ -7,7 +7,6 @@ import net.minecraft.core.BlockPos; import net.minecraft.core.particles.ParticleOptions; import net.minecraft.core.particles.ParticleTypes; import net.minecraft.resources.ResourceLocation; -import net.minecraft.server.packs.resources.Resource; import net.minecraft.world.effect.MobEffectInstance; import net.minecraft.world.effect.MobEffects; import net.minecraft.world.entity.Entity; diff --git a/src/main/java/com/drmangotea/tfmg/base/spark/GreenSpark.java b/src/main/java/com/drmangotea/tfmg/base/spark/GreenSpark.java index a32844f1..cee76e45 100644 --- a/src/main/java/com/drmangotea/tfmg/base/spark/GreenSpark.java +++ b/src/main/java/com/drmangotea/tfmg/base/spark/GreenSpark.java @@ -1,6 +1,5 @@ package com.drmangotea.tfmg.base.spark; -import com.drmangotea.tfmg.content.items.weapons.explosives.thermite_grenades.fire.BlueFireBlock; import com.drmangotea.tfmg.content.items.weapons.explosives.thermite_grenades.fire.GreenFireBlock; import net.minecraft.core.BlockPos; import net.minecraft.world.entity.EntityType; diff --git a/src/main/java/com/drmangotea/tfmg/base/spark/LithiumSpark.java b/src/main/java/com/drmangotea/tfmg/base/spark/LithiumSpark.java index 7d8ec35e..21a78ce5 100644 --- a/src/main/java/com/drmangotea/tfmg/base/spark/LithiumSpark.java +++ b/src/main/java/com/drmangotea/tfmg/base/spark/LithiumSpark.java @@ -1,6 +1,5 @@ package com.drmangotea.tfmg.base.spark; -import com.drmangotea.tfmg.content.items.weapons.explosives.thermite_grenades.fire.GreenFireBlock; import net.minecraft.core.BlockPos; import net.minecraft.world.entity.EntityType; import net.minecraft.world.level.Level; diff --git a/src/main/java/com/drmangotea/tfmg/base/spark/SparkRenderer.java b/src/main/java/com/drmangotea/tfmg/base/spark/SparkRenderer.java index b0a17cd1..d1717358 100644 --- a/src/main/java/com/drmangotea/tfmg/base/spark/SparkRenderer.java +++ b/src/main/java/com/drmangotea/tfmg/base/spark/SparkRenderer.java @@ -1,6 +1,5 @@ package com.drmangotea.tfmg.base.spark; -import com.drmangotea.tfmg.TFMG; import com.mojang.blaze3d.vertex.PoseStack; import com.mojang.blaze3d.vertex.VertexConsumer; import com.mojang.math.Axis; diff --git a/src/main/java/com/drmangotea/tfmg/config/TFMGConfigs.java b/src/main/java/com/drmangotea/tfmg/config/TFMGConfigs.java index d77db6a6..f6acb1ff 100644 --- a/src/main/java/com/drmangotea/tfmg/config/TFMGConfigs.java +++ b/src/main/java/com/drmangotea/tfmg/config/TFMGConfigs.java @@ -2,7 +2,6 @@ package com.drmangotea.tfmg.config; import com.drmangotea.tfmg.content.electricity.connection.cable_type.ResistivityValues; import com.simibubi.create.api.stress.BlockStressValues; -import com.simibubi.create.infrastructure.config.CCommon; import net.createmod.catnip.config.ConfigBase; import net.neoforged.bus.api.SubscribeEvent; @@ -18,7 +17,7 @@ import java.util.EnumMap; import java.util.Map; import java.util.function.Supplier; -@EventBusSubscriber(bus = EventBusSubscriber.Bus.MOD) +@EventBusSubscriber public class TFMGConfigs { private static final Map CONFIGS = new EnumMap<>(ModConfig.Type.class); diff --git a/src/main/java/com/drmangotea/tfmg/config/TFMGStress.java b/src/main/java/com/drmangotea/tfmg/config/TFMGStress.java index af887321..43b03dc2 100644 --- a/src/main/java/com/drmangotea/tfmg/config/TFMGStress.java +++ b/src/main/java/com/drmangotea/tfmg/config/TFMGStress.java @@ -7,7 +7,6 @@ import com.tterrag.registrate.util.nullness.NonNullUnaryOperator; import it.unimi.dsi.fastutil.objects.Object2DoubleMap; import it.unimi.dsi.fastutil.objects.Object2DoubleOpenHashMap; import net.createmod.catnip.config.ConfigBase; -import net.createmod.catnip.platform.CatnipServices; import net.createmod.catnip.registry.RegisteredObjectsHelper; import net.minecraft.resources.ResourceLocation; import net.minecraft.world.level.block.Block; diff --git a/src/main/java/com/drmangotea/tfmg/content/decoration/FrameBlock.java b/src/main/java/com/drmangotea/tfmg/content/decoration/FrameBlock.java index 8bdbc54e..b40e1621 100644 --- a/src/main/java/com/drmangotea/tfmg/content/decoration/FrameBlock.java +++ b/src/main/java/com/drmangotea/tfmg/content/decoration/FrameBlock.java @@ -7,7 +7,6 @@ import net.minecraft.core.Direction; import net.minecraft.world.item.context.BlockPlaceContext; import net.minecraft.world.level.LevelAccessor; import net.minecraft.world.level.block.Block; -import net.minecraft.world.level.block.RotatedPillarBlock; import net.minecraft.world.level.block.state.BlockState; import net.minecraft.world.level.block.state.StateDefinition; import net.minecraft.world.level.material.FluidState; diff --git a/src/main/java/com/drmangotea/tfmg/content/decoration/LithiumBlock.java b/src/main/java/com/drmangotea/tfmg/content/decoration/LithiumBlock.java index 6d3470ad..9bd4688d 100644 --- a/src/main/java/com/drmangotea/tfmg/content/decoration/LithiumBlock.java +++ b/src/main/java/com/drmangotea/tfmg/content/decoration/LithiumBlock.java @@ -1,16 +1,10 @@ package com.drmangotea.tfmg.content.decoration; -import com.drmangotea.tfmg.registry.TFMGEntityTypes; -import com.simibubi.create.Create; import net.minecraft.core.BlockPos; -import net.minecraft.core.Direction; import net.minecraft.server.level.ServerLevel; -import net.minecraft.util.Mth; import net.minecraft.util.RandomSource; -import net.minecraft.world.level.Level; import net.minecraft.world.level.block.Block; import net.minecraft.world.level.block.state.BlockState; -import net.minecraft.world.level.material.Fluids; public class LithiumBlock extends Block { public LithiumBlock(Properties p_49795_) { diff --git a/src/main/java/com/drmangotea/tfmg/content/decoration/TrussBlock.java b/src/main/java/com/drmangotea/tfmg/content/decoration/TrussBlock.java index e0793b9f..d99712fc 100644 --- a/src/main/java/com/drmangotea/tfmg/content/decoration/TrussBlock.java +++ b/src/main/java/com/drmangotea/tfmg/content/decoration/TrussBlock.java @@ -8,15 +8,9 @@ import net.minecraft.world.item.context.BlockPlaceContext; import net.minecraft.world.level.LevelAccessor; import net.minecraft.world.level.block.Block; import net.minecraft.world.level.block.RotatedPillarBlock; -import net.minecraft.world.level.block.Rotation; -import net.minecraft.world.level.block.SimpleWaterloggedBlock; import net.minecraft.world.level.block.state.BlockState; import net.minecraft.world.level.block.state.StateDefinition; -import net.minecraft.world.level.block.state.properties.BlockStateProperties; -import net.minecraft.world.level.block.state.properties.BooleanProperty; -import net.minecraft.world.level.block.state.properties.EnumProperty; import net.minecraft.world.level.material.FluidState; -import net.minecraft.world.level.material.Fluids; public class TrussBlock extends RotatedPillarBlock implements ProperWaterloggedBlock, IWrenchable { diff --git a/src/main/java/com/drmangotea/tfmg/content/decoration/concrete/ConcreteloggedBlock.java b/src/main/java/com/drmangotea/tfmg/content/decoration/concrete/ConcreteloggedBlock.java index b0bd9fe4..494a27af 100644 --- a/src/main/java/com/drmangotea/tfmg/content/decoration/concrete/ConcreteloggedBlock.java +++ b/src/main/java/com/drmangotea/tfmg/content/decoration/concrete/ConcreteloggedBlock.java @@ -1,13 +1,10 @@ package com.drmangotea.tfmg.content.decoration.concrete; -import com.drmangotea.tfmg.registry.TFMGBlocks; import com.drmangotea.tfmg.registry.TFMGFluids; -import com.simibubi.create.foundation.data.SharedProperties; import net.minecraft.core.BlockPos; import net.minecraft.sounds.SoundEvents; import net.minecraft.util.RandomSource; import net.minecraft.world.InteractionHand; -import net.minecraft.world.InteractionResult; import net.minecraft.world.ItemInteractionResult; import net.minecraft.world.entity.player.Player; import net.minecraft.world.item.ItemStack; @@ -15,9 +12,7 @@ import net.minecraft.world.item.Items; import net.minecraft.world.item.context.BlockPlaceContext; import net.minecraft.world.level.Level; import net.minecraft.world.level.LevelAccessor; -import net.minecraft.world.level.block.SimpleWaterloggedBlock; import net.minecraft.world.level.block.state.BlockState; -import net.minecraft.world.level.block.state.properties.BlockStateProperties; import net.minecraft.world.level.block.state.properties.BooleanProperty; import net.minecraft.world.level.material.FluidState; import net.minecraft.world.level.material.Fluids; diff --git a/src/main/java/com/drmangotea/tfmg/content/decoration/concrete/RebarPillarBlock.java b/src/main/java/com/drmangotea/tfmg/content/decoration/concrete/RebarPillarBlock.java index 66ce4e2a..eaa18b6f 100644 --- a/src/main/java/com/drmangotea/tfmg/content/decoration/concrete/RebarPillarBlock.java +++ b/src/main/java/com/drmangotea/tfmg/content/decoration/concrete/RebarPillarBlock.java @@ -8,7 +8,6 @@ import net.minecraft.core.Direction; import net.minecraft.server.level.ServerLevel; import net.minecraft.util.RandomSource; import net.minecraft.world.InteractionHand; -import net.minecraft.world.InteractionResult; import net.minecraft.world.ItemInteractionResult; import net.minecraft.world.entity.player.Player; import net.minecraft.world.item.ItemStack; diff --git a/src/main/java/com/drmangotea/tfmg/content/decoration/concrete/RebarStairsBlock.java b/src/main/java/com/drmangotea/tfmg/content/decoration/concrete/RebarStairsBlock.java index 696d895d..78e41a2c 100644 --- a/src/main/java/com/drmangotea/tfmg/content/decoration/concrete/RebarStairsBlock.java +++ b/src/main/java/com/drmangotea/tfmg/content/decoration/concrete/RebarStairsBlock.java @@ -7,7 +7,6 @@ import net.minecraft.core.Direction; import net.minecraft.server.level.ServerLevel; import net.minecraft.util.RandomSource; import net.minecraft.world.InteractionHand; -import net.minecraft.world.InteractionResult; import net.minecraft.world.ItemInteractionResult; import net.minecraft.world.entity.player.Player; import net.minecraft.world.item.ItemStack; diff --git a/src/main/java/com/drmangotea/tfmg/content/decoration/concrete/SimpleConcreteloggedBlock.java b/src/main/java/com/drmangotea/tfmg/content/decoration/concrete/SimpleConcreteloggedBlock.java index a67eec83..50e8fbfb 100644 --- a/src/main/java/com/drmangotea/tfmg/content/decoration/concrete/SimpleConcreteloggedBlock.java +++ b/src/main/java/com/drmangotea/tfmg/content/decoration/concrete/SimpleConcreteloggedBlock.java @@ -6,7 +6,6 @@ import net.minecraft.core.Direction; import net.minecraft.server.level.ServerLevel; import net.minecraft.util.RandomSource; import net.minecraft.world.InteractionHand; -import net.minecraft.world.InteractionResult; import net.minecraft.world.ItemInteractionResult; import net.minecraft.world.entity.player.Player; import net.minecraft.world.item.ItemStack; diff --git a/src/main/java/com/drmangotea/tfmg/content/decoration/doors/TFMGSlidingDoorBlock.java b/src/main/java/com/drmangotea/tfmg/content/decoration/doors/TFMGSlidingDoorBlock.java index 7917baf8..d4cd53bb 100644 --- a/src/main/java/com/drmangotea/tfmg/content/decoration/doors/TFMGSlidingDoorBlock.java +++ b/src/main/java/com/drmangotea/tfmg/content/decoration/doors/TFMGSlidingDoorBlock.java @@ -1,48 +1,13 @@ package com.drmangotea.tfmg.content.decoration.doors; -import com.drmangotea.tfmg.mixin.accessor.SlidingDoorBlockEntityAccessor; import com.drmangotea.tfmg.registry.TFMGBlockEntities; -import com.simibubi.create.AllBlockEntityTypes; -import com.simibubi.create.content.contraptions.ContraptionWorld; import com.simibubi.create.content.decoration.slidingDoor.SlidingDoorBlock; import com.simibubi.create.content.decoration.slidingDoor.SlidingDoorBlockEntity; -import com.simibubi.create.content.decoration.slidingDoor.SlidingDoorShapes; import com.simibubi.create.content.equipment.wrench.IWrenchable; import com.simibubi.create.foundation.block.IBE; -import net.minecraft.core.BlockPos; -import net.minecraft.core.Direction; -import net.minecraft.world.InteractionHand; -import net.minecraft.world.InteractionResult; -import net.minecraft.world.ItemInteractionResult; -import net.minecraft.world.entity.Entity; -import net.minecraft.world.entity.player.Player; -import net.minecraft.world.item.ItemStack; -import net.minecraft.world.item.context.BlockPlaceContext; -import net.minecraft.world.level.BlockGetter; -import net.minecraft.world.level.Level; -import net.minecraft.world.level.LevelAccessor; -import net.minecraft.world.level.LevelReader; -import net.minecraft.world.level.block.Block; -import net.minecraft.world.level.block.Blocks; -import net.minecraft.world.level.block.DoorBlock; -import net.minecraft.world.level.block.RenderShape; -import net.minecraft.world.level.block.entity.BlockEntity; import net.minecraft.world.level.block.entity.BlockEntityType; -import net.minecraft.world.level.block.state.BlockState; -import net.minecraft.world.level.block.state.StateDefinition.Builder; import net.minecraft.world.level.block.state.properties.BlockSetType; -import net.minecraft.world.level.block.state.properties.BooleanProperty; -import net.minecraft.world.level.block.state.properties.DoorHingeSide; -import net.minecraft.world.level.block.state.properties.DoubleBlockHalf; -import net.minecraft.world.level.gameevent.GameEvent; -import net.minecraft.world.phys.BlockHitResult; -import net.minecraft.world.phys.shapes.CollisionContext; -import net.minecraft.world.phys.shapes.VoxelShape; - -import javax.annotation.Nullable; - -import static com.simibubi.create.content.decoration.slidingDoor.SlidingDoorBlock.TRAIN_SET_TYPE; public class TFMGSlidingDoorBlock extends SlidingDoorBlock implements IWrenchable, IBE { diff --git a/src/main/java/com/drmangotea/tfmg/content/decoration/doors/TFMGSlidingDoorRenderer.java b/src/main/java/com/drmangotea/tfmg/content/decoration/doors/TFMGSlidingDoorRenderer.java index 76870084..41cf2ddf 100644 --- a/src/main/java/com/drmangotea/tfmg/content/decoration/doors/TFMGSlidingDoorRenderer.java +++ b/src/main/java/com/drmangotea/tfmg/content/decoration/doors/TFMGSlidingDoorRenderer.java @@ -6,8 +6,6 @@ import com.drmangotea.tfmg.mixin.accessor.SlidingDoorBlockEntityAccessor; import com.drmangotea.tfmg.registry.TFMGPartialModels; import com.mojang.blaze3d.vertex.PoseStack; import com.mojang.blaze3d.vertex.VertexConsumer; -import com.simibubi.create.AllPartialModels; -import com.simibubi.create.content.decoration.slidingDoor.SlidingDoorBlock; import com.simibubi.create.content.decoration.slidingDoor.SlidingDoorBlockEntity; import com.simibubi.create.foundation.blockEntity.renderer.SafeBlockEntityRenderer; diff --git a/src/main/java/com/drmangotea/tfmg/content/decoration/pipes/TFMGEncasedPipeBlock.java b/src/main/java/com/drmangotea/tfmg/content/decoration/pipes/TFMGEncasedPipeBlock.java index e23a245b..cc70ed17 100644 --- a/src/main/java/com/drmangotea/tfmg/content/decoration/pipes/TFMGEncasedPipeBlock.java +++ b/src/main/java/com/drmangotea/tfmg/content/decoration/pipes/TFMGEncasedPipeBlock.java @@ -1,7 +1,6 @@ package com.drmangotea.tfmg.content.decoration.pipes; import com.drmangotea.tfmg.registry.TFMGBlockEntities; -import com.simibubi.create.AllBlocks; import com.simibubi.create.content.fluids.FluidTransportBehaviour; import com.simibubi.create.content.fluids.pipes.EncasedPipeBlock; import com.simibubi.create.content.fluids.pipes.FluidPipeBlockEntity; @@ -14,7 +13,6 @@ import net.minecraft.world.InteractionResult; import net.minecraft.world.entity.player.Player; import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.context.UseOnContext; -import net.minecraft.world.level.BlockGetter; import net.minecraft.world.level.Level; import net.minecraft.world.level.LevelReader; import net.minecraft.world.level.block.Block; diff --git a/src/main/java/com/drmangotea/tfmg/content/decoration/pipes/TFMGFluidValveBlock.java b/src/main/java/com/drmangotea/tfmg/content/decoration/pipes/TFMGFluidValveBlock.java index 582f6356..4f4ae18b 100644 --- a/src/main/java/com/drmangotea/tfmg/content/decoration/pipes/TFMGFluidValveBlock.java +++ b/src/main/java/com/drmangotea/tfmg/content/decoration/pipes/TFMGFluidValveBlock.java @@ -8,7 +8,6 @@ import com.simibubi.create.content.fluids.pipes.valve.FluidValveBlockEntity; import com.simibubi.create.foundation.block.IBE; import com.simibubi.create.foundation.block.ProperWaterloggedBlock; import net.minecraft.world.level.block.entity.BlockEntityType; -import net.minecraft.world.level.block.state.properties.BooleanProperty; public class TFMGFluidValveBlock extends FluidValveBlock implements IAxisPipe, IBE, ProperWaterloggedBlock { diff --git a/src/main/java/com/drmangotea/tfmg/content/decoration/pipes/TFMGPipes.java b/src/main/java/com/drmangotea/tfmg/content/decoration/pipes/TFMGPipes.java index 4e385bf7..b047c422 100644 --- a/src/main/java/com/drmangotea/tfmg/content/decoration/pipes/TFMGPipes.java +++ b/src/main/java/com/drmangotea/tfmg/content/decoration/pipes/TFMGPipes.java @@ -3,38 +3,12 @@ package com.drmangotea.tfmg.content.decoration.pipes; import com.drmangotea.tfmg.base.TFMGCreativeTabs; import com.drmangotea.tfmg.base.TFMGRegistrate; import com.drmangotea.tfmg.base.TFMGSpriteShifts; -import com.drmangotea.tfmg.config.TFMGStress; -import com.simibubi.create.AllBlocks; -import com.simibubi.create.AllSpriteShifts; -import com.simibubi.create.content.decoration.encasing.EncasedCTBehaviour; -import com.simibubi.create.content.decoration.encasing.EncasingRegistry; -import com.simibubi.create.content.fluids.PipeAttachmentModel; -import com.simibubi.create.content.fluids.pipes.SmartFluidPipeGenerator; -import com.simibubi.create.content.fluids.pipes.valve.FluidValveBlock; import com.simibubi.create.foundation.block.connected.CTSpriteShiftEntry; -import com.simibubi.create.foundation.data.AssetLookup; -import com.simibubi.create.foundation.data.BlockStateGen; -import com.simibubi.create.foundation.data.CreateRegistrate; -import com.simibubi.create.foundation.data.SharedProperties; -import com.tterrag.registrate.util.entry.BlockEntry; -import com.tterrag.registrate.util.nullness.NonNullFunction; -import net.minecraft.client.renderer.RenderType; -import net.minecraft.client.resources.model.BakedModel; -import net.minecraft.core.Direction; -import net.minecraft.world.level.block.Block; -import net.minecraft.world.level.block.state.properties.BlockStateProperties; -import net.minecraft.world.level.material.MapColor; -import net.neoforged.neoforge.client.model.generators.ConfiguredModel; -import java.util.ArrayList; import java.util.HashMap; -import java.util.List; import java.util.Map; import static com.drmangotea.tfmg.TFMG.REGISTRATE; -import static com.simibubi.create.foundation.data.ModelGen.customItemModel; -import static com.simibubi.create.foundation.data.TagGen.axeOrPickaxe; -import static com.simibubi.create.foundation.data.TagGen.pickaxeOnly; public class TFMGPipes { diff --git a/src/main/java/com/drmangotea/tfmg/content/decoration/tanks/TFMGFluidTankBlockEntity.java b/src/main/java/com/drmangotea/tfmg/content/decoration/tanks/TFMGFluidTankBlockEntity.java index e95c1b18..1f7ea84e 100644 --- a/src/main/java/com/drmangotea/tfmg/content/decoration/tanks/TFMGFluidTankBlockEntity.java +++ b/src/main/java/com/drmangotea/tfmg/content/decoration/tanks/TFMGFluidTankBlockEntity.java @@ -2,7 +2,6 @@ package com.drmangotea.tfmg.content.decoration.tanks; import com.drmangotea.tfmg.mixin.accessor.FluidTankBlockEntityAccessor; import com.drmangotea.tfmg.registry.TFMGBlockEntities; -import com.simibubi.create.AllBlockEntityTypes; import com.simibubi.create.content.fluids.tank.FluidTankBlockEntity; import net.minecraft.core.BlockPos; import net.minecraft.world.level.block.entity.BlockEntityType; diff --git a/src/main/java/com/drmangotea/tfmg/content/decoration/tanks/TFMGFluidTankRenderer.java b/src/main/java/com/drmangotea/tfmg/content/decoration/tanks/TFMGFluidTankRenderer.java index 9c5d1069..654020b7 100644 --- a/src/main/java/com/drmangotea/tfmg/content/decoration/tanks/TFMGFluidTankRenderer.java +++ b/src/main/java/com/drmangotea/tfmg/content/decoration/tanks/TFMGFluidTankRenderer.java @@ -1,11 +1,9 @@ package com.drmangotea.tfmg.content.decoration.tanks; -import com.drmangotea.tfmg.content.decoration.tanks.steel.SteelTankBlockEntity; import com.mojang.blaze3d.vertex.PoseStack; import com.simibubi.create.content.fluids.tank.FluidTankBlockEntity; import com.simibubi.create.foundation.blockEntity.renderer.SafeBlockEntityRenderer; -import com.simibubi.create.foundation.fluid.FluidRenderer; import net.createmod.catnip.animation.LerpedFloat; import net.createmod.catnip.platform.NeoForgeCatnipServices; import net.minecraft.client.renderer.MultiBufferSource; diff --git a/src/main/java/com/drmangotea/tfmg/content/decoration/tanks/steel/SteelFluidTankRenderer.java b/src/main/java/com/drmangotea/tfmg/content/decoration/tanks/steel/SteelFluidTankRenderer.java index eba62252..515f6d32 100644 --- a/src/main/java/com/drmangotea/tfmg/content/decoration/tanks/steel/SteelFluidTankRenderer.java +++ b/src/main/java/com/drmangotea/tfmg/content/decoration/tanks/steel/SteelFluidTankRenderer.java @@ -7,7 +7,6 @@ import com.mojang.blaze3d.vertex.PoseStack; import com.mojang.blaze3d.vertex.VertexConsumer; import com.simibubi.create.AllPartialModels; import com.simibubi.create.foundation.blockEntity.renderer.SafeBlockEntityRenderer; -import com.simibubi.create.foundation.fluid.FluidRenderer; import dev.engine_room.flywheel.lib.transform.TransformStack; import net.createmod.catnip.data.Iterate; import net.createmod.catnip.animation.LerpedFloat; diff --git a/src/main/java/com/drmangotea/tfmg/content/decoration/tanks/steel/SteelTankBlock.java b/src/main/java/com/drmangotea/tfmg/content/decoration/tanks/steel/SteelTankBlock.java index 0ebad5f3..b720ffe5 100644 --- a/src/main/java/com/drmangotea/tfmg/content/decoration/tanks/steel/SteelTankBlock.java +++ b/src/main/java/com/drmangotea/tfmg/content/decoration/tanks/steel/SteelTankBlock.java @@ -23,7 +23,6 @@ import net.minecraft.sounds.SoundEvent; import net.minecraft.sounds.SoundEvents; import net.minecraft.sounds.SoundSource; import net.minecraft.util.Mth; -import net.minecraft.util.StringRepresentable; import net.minecraft.world.InteractionHand; import net.minecraft.world.InteractionResult; import net.minecraft.world.ItemInteractionResult; diff --git a/src/main/java/com/drmangotea/tfmg/content/decoration/tanks/steel/SteelTankBlockEntity.java b/src/main/java/com/drmangotea/tfmg/content/decoration/tanks/steel/SteelTankBlockEntity.java index 66fd17af..07553155 100644 --- a/src/main/java/com/drmangotea/tfmg/content/decoration/tanks/steel/SteelTankBlockEntity.java +++ b/src/main/java/com/drmangotea/tfmg/content/decoration/tanks/steel/SteelTankBlockEntity.java @@ -3,11 +3,9 @@ package com.drmangotea.tfmg.content.decoration.tanks.steel; import com.drmangotea.tfmg.mixin.accessor.FluidTankBlockEntityAccessor; import com.drmangotea.tfmg.registry.TFMGBlockEntities; import com.drmangotea.tfmg.registry.TFMGBlocks; -import com.simibubi.create.AllBlockEntityTypes; import com.simibubi.create.api.boiler.BoilerHeater; import com.simibubi.create.api.connectivity.ConnectivityHandler; import com.simibubi.create.api.equipment.goggles.IHaveGoggleInformation; -import com.simibubi.create.content.fluids.tank.BoilerHeaters; import com.simibubi.create.content.fluids.tank.FluidTankBlock; import com.simibubi.create.content.fluids.tank.FluidTankBlockEntity; import com.simibubi.create.foundation.blockEntity.IMultiBlockEntityContainer; @@ -36,7 +34,6 @@ import net.neoforged.neoforge.fluids.capability.IFluidHandler; import net.neoforged.neoforge.fluids.capability.templates.FluidTank; -import javax.annotation.Nonnull; import javax.annotation.Nullable; import java.util.List; import java.util.Objects; diff --git a/src/main/java/com/drmangotea/tfmg/content/electricity/base/ConnectNeightborsPacket.java b/src/main/java/com/drmangotea/tfmg/content/electricity/base/ConnectNeightborsPacket.java index 6e0cc209..7ada55d4 100644 --- a/src/main/java/com/drmangotea/tfmg/content/electricity/base/ConnectNeightborsPacket.java +++ b/src/main/java/com/drmangotea/tfmg/content/electricity/base/ConnectNeightborsPacket.java @@ -2,15 +2,10 @@ package com.drmangotea.tfmg.content.electricity.base; import com.drmangotea.tfmg.registry.TFMGPackets; -import com.simibubi.create.content.logistics.tunnel.TunnelFlapPacket; import com.simibubi.create.foundation.blockEntity.SmartBlockEntity; import com.simibubi.create.foundation.networking.BlockEntityDataPacket; import io.netty.buffer.ByteBuf; -import net.createmod.catnip.codecs.stream.CatnipStreamCodecBuilders; import net.minecraft.core.BlockPos; -import net.minecraft.core.Direction; -import net.minecraft.network.FriendlyByteBuf; -import net.minecraft.network.codec.ByteBufCodecs; import net.minecraft.network.codec.StreamCodec; public class ConnectNeightborsPacket extends BlockEntityDataPacket { diff --git a/src/main/java/com/drmangotea/tfmg/content/electricity/base/ConnectionPacket.java b/src/main/java/com/drmangotea/tfmg/content/electricity/base/ConnectionPacket.java index e4072706..7dc2012f 100644 --- a/src/main/java/com/drmangotea/tfmg/content/electricity/base/ConnectionPacket.java +++ b/src/main/java/com/drmangotea/tfmg/content/electricity/base/ConnectionPacket.java @@ -6,7 +6,6 @@ import com.simibubi.create.foundation.blockEntity.SmartBlockEntity; import com.simibubi.create.foundation.networking.BlockEntityDataPacket; import io.netty.buffer.ByteBuf; import net.minecraft.core.BlockPos; -import net.minecraft.network.FriendlyByteBuf; import net.minecraft.network.codec.StreamCodec; public class ConnectionPacket extends BlockEntityDataPacket { diff --git a/src/main/java/com/drmangotea/tfmg/content/electricity/base/KineticElectricBlockEntity.java b/src/main/java/com/drmangotea/tfmg/content/electricity/base/KineticElectricBlockEntity.java index 93f65cde..092ef0e6 100644 --- a/src/main/java/com/drmangotea/tfmg/content/electricity/base/KineticElectricBlockEntity.java +++ b/src/main/java/com/drmangotea/tfmg/content/electricity/base/KineticElectricBlockEntity.java @@ -1,28 +1,16 @@ package com.drmangotea.tfmg.content.electricity.base; -import com.drmangotea.tfmg.TFMG; import com.drmangotea.tfmg.content.engines.types.regular_engine.RegularEngineBlockEntity; -import com.drmangotea.tfmg.registry.TFMGPackets; import com.simibubi.create.api.equipment.goggles.IHaveGoggleInformation; import com.simibubi.create.api.equipment.goggles.IHaveHoveringInformation; import com.simibubi.create.content.kinetics.base.GeneratingKineticBlockEntity; -import com.simibubi.create.foundation.blockEntity.behaviour.BlockEntityBehaviour; -import com.simibubi.create.foundation.networking.LeftClickPacket; -import net.createmod.catnip.platform.CatnipServices; import net.minecraft.core.BlockPos; -import net.minecraft.core.Direction; import net.minecraft.core.HolderLookup; import net.minecraft.nbt.CompoundTag; -import net.minecraft.server.level.ServerLevel; -import net.minecraft.world.level.ChunkPos; import net.minecraft.world.level.LevelAccessor; import net.minecraft.world.level.block.entity.BlockEntityType; import net.minecraft.world.level.block.state.BlockState; - -import java.util.ArrayList; -import java.util.List; - public class KineticElectricBlockEntity extends GeneratingKineticBlockEntity implements IElectric, IHaveGoggleInformation, IHaveHoveringInformation { public ElectricBlockValues data = new ElectricBlockValues(getPos()); diff --git a/src/main/java/com/drmangotea/tfmg/content/electricity/configuration_wrench/ElectriciansWrenchItem.java b/src/main/java/com/drmangotea/tfmg/content/electricity/configuration_wrench/ElectriciansWrenchItem.java index 36a27b31..ade8a590 100644 --- a/src/main/java/com/drmangotea/tfmg/content/electricity/configuration_wrench/ElectriciansWrenchItem.java +++ b/src/main/java/com/drmangotea/tfmg/content/electricity/configuration_wrench/ElectriciansWrenchItem.java @@ -2,7 +2,6 @@ package com.drmangotea.tfmg.content.electricity.configuration_wrench; import com.drmangotea.tfmg.base.TFMGUtils; import com.drmangotea.tfmg.content.electricity.base.IElectric; -import com.drmangotea.tfmg.content.electricity.base.KineticElectricBlockEntity; import com.drmangotea.tfmg.content.electricity.utilities.electric_motor.ElectricMotorBlockEntity; import com.drmangotea.tfmg.content.engines.base.AbstractEngineBlockEntity; import com.drmangotea.tfmg.registry.TFMGDataComponents; @@ -14,7 +13,6 @@ import net.minecraft.sounds.SoundSource; import net.minecraft.world.InteractionHand; import net.minecraft.world.InteractionResult; import net.minecraft.world.InteractionResultHolder; -import net.minecraft.world.entity.Entity; import net.minecraft.world.entity.player.Player; import net.minecraft.world.item.Item; import net.minecraft.world.item.ItemStack; diff --git a/src/main/java/com/drmangotea/tfmg/content/electricity/connection/CableHubBlock.java b/src/main/java/com/drmangotea/tfmg/content/electricity/connection/CableHubBlock.java index 38de5868..d9b8df91 100644 --- a/src/main/java/com/drmangotea/tfmg/content/electricity/connection/CableHubBlock.java +++ b/src/main/java/com/drmangotea/tfmg/content/electricity/connection/CableHubBlock.java @@ -7,7 +7,6 @@ import com.simibubi.create.content.equipment.wrench.IWrenchable; import com.simibubi.create.foundation.block.IBE; import net.minecraft.core.BlockPos; import net.minecraft.world.level.Level; -import net.minecraft.world.level.LevelReader; import net.minecraft.world.level.block.Block; import net.minecraft.world.level.block.entity.BlockEntityType; import net.minecraft.world.level.block.state.BlockState; diff --git a/src/main/java/com/drmangotea/tfmg/content/electricity/connection/cable_type/CableTypeBuilder.java b/src/main/java/com/drmangotea/tfmg/content/electricity/connection/cable_type/CableTypeBuilder.java index a246a485..0d2ee6f5 100644 --- a/src/main/java/com/drmangotea/tfmg/content/electricity/connection/cable_type/CableTypeBuilder.java +++ b/src/main/java/com/drmangotea/tfmg/content/electricity/connection/cable_type/CableTypeBuilder.java @@ -1,6 +1,5 @@ package com.drmangotea.tfmg.content.electricity.connection.cable_type; -import com.drmangotea.tfmg.TFMG; import com.drmangotea.tfmg.TFMGRegistries; import com.tterrag.registrate.AbstractRegistrate; import com.tterrag.registrate.builders.AbstractBuilder; @@ -10,7 +9,6 @@ import com.tterrag.registrate.util.nullness.NonNullFunction; import com.tterrag.registrate.util.nullness.NonNullSupplier; import com.tterrag.registrate.util.nullness.NonNullUnaryOperator; import com.tterrag.registrate.util.nullness.NonnullType; -import net.minecraft.core.Registry; import net.minecraft.resources.ResourceLocation; import net.neoforged.neoforge.registries.DeferredHolder; diff --git a/src/main/java/com/drmangotea/tfmg/content/electricity/connection/cables/CableConnection.java b/src/main/java/com/drmangotea/tfmg/content/electricity/connection/cables/CableConnection.java index b8d28198..f294b1dd 100644 --- a/src/main/java/com/drmangotea/tfmg/content/electricity/connection/cables/CableConnection.java +++ b/src/main/java/com/drmangotea/tfmg/content/electricity/connection/cables/CableConnection.java @@ -2,14 +2,9 @@ package com.drmangotea.tfmg.content.electricity.connection.cables; import com.drmangotea.tfmg.base.TFMGUtils; import com.drmangotea.tfmg.content.electricity.connection.cable_type.CableType; -import com.drmangotea.tfmg.registry.TFMGItems; -import com.tterrag.registrate.util.entry.ItemEntry; import net.minecraft.core.BlockPos; import net.minecraft.nbt.CompoundTag; import net.minecraft.resources.ResourceLocation; -import net.minecraft.world.item.Item; -import net.minecraft.world.item.Items; -import org.checkerframework.checker.units.qual.C; public class CableConnection { diff --git a/src/main/java/com/drmangotea/tfmg/content/electricity/connection/cables/CableConnectorRenderer.java b/src/main/java/com/drmangotea/tfmg/content/electricity/connection/cables/CableConnectorRenderer.java index 0dbe4910..0273b3fd 100644 --- a/src/main/java/com/drmangotea/tfmg/content/electricity/connection/cables/CableConnectorRenderer.java +++ b/src/main/java/com/drmangotea/tfmg/content/electricity/connection/cables/CableConnectorRenderer.java @@ -1,22 +1,16 @@ package com.drmangotea.tfmg.content.electricity.connection.cables; -import com.drmangotea.tfmg.TFMG; import com.drmangotea.tfmg.base.TFMGUtils; -import com.drmangotea.tfmg.content.machinery.misc.winding_machine.SpoolItem; import com.drmangotea.tfmg.registry.TFMGDataComponents; import com.drmangotea.tfmg.registry.TFMGTags; import com.mojang.blaze3d.vertex.PoseStack; import com.simibubi.create.foundation.blockEntity.renderer.SafeBlockEntityRenderer; -import net.createmod.catnip.animation.LerpedFloat; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.MultiBufferSource; import net.minecraft.client.renderer.blockentity.BlockEntityRendererProvider; import net.minecraft.core.BlockPos; -import net.minecraft.nbt.CompoundTag; import net.minecraft.world.entity.player.Player; import net.minecraft.world.item.ItemStack; -import net.minecraft.world.level.block.Block; -import net.minecraft.world.phys.Vec3; import java.awt.*; diff --git a/src/main/java/com/drmangotea/tfmg/content/electricity/connection/cables/CablePlacePacket.java b/src/main/java/com/drmangotea/tfmg/content/electricity/connection/cables/CablePlacePacket.java index f068df46..6f29d24a 100644 --- a/src/main/java/com/drmangotea/tfmg/content/electricity/connection/cables/CablePlacePacket.java +++ b/src/main/java/com/drmangotea/tfmg/content/electricity/connection/cables/CablePlacePacket.java @@ -1,13 +1,11 @@ package com.drmangotea.tfmg.content.electricity.connection.cables; -import com.drmangotea.tfmg.content.electricity.base.ConnectNeightborsPacket; import com.drmangotea.tfmg.registry.TFMGPackets; import com.simibubi.create.foundation.blockEntity.SmartBlockEntity; import com.simibubi.create.foundation.networking.BlockEntityDataPacket; import io.netty.buffer.ByteBuf; import net.minecraft.core.BlockPos; -import net.minecraft.network.FriendlyByteBuf; import net.minecraft.network.codec.StreamCodec; public class CablePlacePacket extends BlockEntityDataPacket { diff --git a/src/main/java/com/drmangotea/tfmg/content/electricity/connection/copycat_cable/CopycatCableBlock.java b/src/main/java/com/drmangotea/tfmg/content/electricity/connection/copycat_cable/CopycatCableBlock.java index 72b5471a..ce9ccb69 100644 --- a/src/main/java/com/drmangotea/tfmg/content/electricity/connection/copycat_cable/CopycatCableBlock.java +++ b/src/main/java/com/drmangotea/tfmg/content/electricity/connection/copycat_cable/CopycatCableBlock.java @@ -14,8 +14,6 @@ import net.minecraft.client.color.block.BlockColor; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; import net.minecraft.server.level.ServerLevel; -import net.minecraft.sounds.SoundEvents; -import net.minecraft.sounds.SoundSource; import net.minecraft.world.InteractionHand; import net.minecraft.world.InteractionResult; import net.minecraft.world.entity.Entity; diff --git a/src/main/java/com/drmangotea/tfmg/content/electricity/connection/copycat_cable/CopycatCableBlockEntity.java b/src/main/java/com/drmangotea/tfmg/content/electricity/connection/copycat_cable/CopycatCableBlockEntity.java index 2bb60b3b..57173f1a 100644 --- a/src/main/java/com/drmangotea/tfmg/content/electricity/connection/copycat_cable/CopycatCableBlockEntity.java +++ b/src/main/java/com/drmangotea/tfmg/content/electricity/connection/copycat_cable/CopycatCableBlockEntity.java @@ -1,32 +1,18 @@ package com.drmangotea.tfmg.content.electricity.connection.copycat_cable; -import com.drmangotea.tfmg.TFMG; import com.drmangotea.tfmg.content.electricity.base.*; -import com.drmangotea.tfmg.registry.TFMGBlocks; -import com.drmangotea.tfmg.registry.TFMGPackets; import com.simibubi.create.AllBlocks; import com.simibubi.create.content.decoration.copycat.CopycatBlock; import com.simibubi.create.content.decoration.copycat.CopycatBlockEntity; -import com.simibubi.create.api.equipment.goggles.IHaveGoggleInformation; import com.simibubi.create.api.equipment.goggles.IHaveHoveringInformation; -import com.simibubi.create.content.schematics.cannon.ConfigureSchematicannonPacket; -import com.simibubi.create.foundation.blockEntity.behaviour.BlockEntityBehaviour; -import net.createmod.catnip.platform.CatnipServices; import net.minecraft.core.BlockPos; -import net.minecraft.core.Direction; import net.minecraft.core.HolderLookup; import net.minecraft.nbt.CompoundTag; -import net.minecraft.network.chat.Component; -import net.minecraft.server.level.ServerLevel; import net.minecraft.world.item.ItemStack; -import net.minecraft.world.level.ChunkPos; import net.minecraft.world.level.LevelAccessor; import net.minecraft.world.level.block.entity.BlockEntityType; import net.minecraft.world.level.block.state.BlockState; - -import java.util.List; - public class CopycatCableBlockEntity extends CopycatBlockEntity implements IElectric, IHaveHoveringInformation { public ElectricBlockValues data = new ElectricBlockValues(getPos()); diff --git a/src/main/java/com/drmangotea/tfmg/content/electricity/connection/copycat_cable/CopycatCableBlockModel.java b/src/main/java/com/drmangotea/tfmg/content/electricity/connection/copycat_cable/CopycatCableBlockModel.java index a9abf63b..e8ffa296 100644 --- a/src/main/java/com/drmangotea/tfmg/content/electricity/connection/copycat_cable/CopycatCableBlockModel.java +++ b/src/main/java/com/drmangotea/tfmg/content/electricity/connection/copycat_cable/CopycatCableBlockModel.java @@ -1,7 +1,6 @@ package com.drmangotea.tfmg.content.electricity.connection.copycat_cable; import com.drmangotea.tfmg.registry.TFMGBlocks; -import com.simibubi.create.AllBlocks; import com.simibubi.create.content.decoration.copycat.CopycatSpecialCases; import com.simibubi.create.foundation.model.BakedModelHelper; import com.simibubi.create.foundation.model.BakedQuadHelper; @@ -15,7 +14,6 @@ import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; import net.minecraft.util.RandomSource; import net.minecraft.world.level.BlockAndTintGetter; -import net.minecraft.world.level.block.DirectionalBlock; import net.minecraft.world.level.block.state.BlockState; import net.minecraft.world.phys.AABB; import net.minecraft.world.phys.Vec3; diff --git a/src/main/java/com/drmangotea/tfmg/content/electricity/connection/diagonal/DiagonalCableBlock.java b/src/main/java/com/drmangotea/tfmg/content/electricity/connection/diagonal/DiagonalCableBlock.java index 86a54bba..00167f5a 100644 --- a/src/main/java/com/drmangotea/tfmg/content/electricity/connection/diagonal/DiagonalCableBlock.java +++ b/src/main/java/com/drmangotea/tfmg/content/electricity/connection/diagonal/DiagonalCableBlock.java @@ -6,7 +6,6 @@ import com.drmangotea.tfmg.content.electricity.base.IElectric; import com.drmangotea.tfmg.registry.TFMGBlockEntities; import com.mojang.serialization.MapCodec; import com.simibubi.create.content.equipment.wrench.IWrenchable; -import com.simibubi.create.content.kinetics.crusher.CrushingWheelControllerBlock; import com.simibubi.create.foundation.block.IBE; import net.minecraft.MethodsReturnNonnullByDefault; import net.minecraft.core.BlockPos; diff --git a/src/main/java/com/drmangotea/tfmg/content/electricity/connection/diagonal/DiagonalCableBlockEntity.java b/src/main/java/com/drmangotea/tfmg/content/electricity/connection/diagonal/DiagonalCableBlockEntity.java index 19fb6944..5baac2f0 100644 --- a/src/main/java/com/drmangotea/tfmg/content/electricity/connection/diagonal/DiagonalCableBlockEntity.java +++ b/src/main/java/com/drmangotea/tfmg/content/electricity/connection/diagonal/DiagonalCableBlockEntity.java @@ -3,7 +3,6 @@ package com.drmangotea.tfmg.content.electricity.connection.diagonal; import com.drmangotea.tfmg.content.electricity.base.ElectricBlockEntity; -import com.drmangotea.tfmg.registry.TFMGBlockEntities; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; import net.minecraft.world.level.block.entity.BlockEntityType; diff --git a/src/main/java/com/drmangotea/tfmg/content/electricity/connection/tube/CableTubeBlock.java b/src/main/java/com/drmangotea/tfmg/content/electricity/connection/tube/CableTubeBlock.java index 1ed11ee2..b6a799c4 100644 --- a/src/main/java/com/drmangotea/tfmg/content/electricity/connection/tube/CableTubeBlock.java +++ b/src/main/java/com/drmangotea/tfmg/content/electricity/connection/tube/CableTubeBlock.java @@ -6,7 +6,6 @@ import com.drmangotea.tfmg.content.decoration.concrete.ConcreteloggedBlock; import com.drmangotea.tfmg.content.electricity.base.IElectric; import com.drmangotea.tfmg.registry.TFMGBlockEntities; import com.drmangotea.tfmg.registry.TFMGBlocks; -import com.drmangotea.tfmg.registry.TFMGPackets; import com.simibubi.create.foundation.block.IBE; import com.simibubi.create.foundation.placement.PoleHelper; import net.createmod.catnip.placement.IPlacementHelper; @@ -18,7 +17,6 @@ import net.minecraft.core.Direction; import net.minecraft.server.level.ServerLevel; import net.minecraft.util.RandomSource; import net.minecraft.world.InteractionHand; -import net.minecraft.world.InteractionResult; import net.minecraft.world.ItemInteractionResult; import net.minecraft.world.entity.player.Player; import net.minecraft.world.item.BlockItem; @@ -29,14 +27,10 @@ import net.minecraft.world.level.Level; import net.minecraft.world.level.LevelAccessor; import net.minecraft.world.level.block.Block; import net.minecraft.world.level.block.RotatedPillarBlock; -import net.minecraft.world.level.block.SimpleWaterloggedBlock; import net.minecraft.world.level.block.entity.BlockEntityType; import net.minecraft.world.level.block.state.BlockState; import net.minecraft.world.level.block.state.StateDefinition; -import net.minecraft.world.level.block.state.properties.BlockStateProperties; -import net.minecraft.world.level.block.state.properties.BooleanProperty; import net.minecraft.world.level.material.FluidState; -import net.minecraft.world.level.material.Fluids; import net.minecraft.world.phys.BlockHitResult; import net.minecraft.world.phys.shapes.CollisionContext; import net.minecraft.world.phys.shapes.VoxelShape; diff --git a/src/main/java/com/drmangotea/tfmg/content/electricity/connection/tube/CableTubeBlockEntity.java b/src/main/java/com/drmangotea/tfmg/content/electricity/connection/tube/CableTubeBlockEntity.java index 37318e4e..896409b5 100644 --- a/src/main/java/com/drmangotea/tfmg/content/electricity/connection/tube/CableTubeBlockEntity.java +++ b/src/main/java/com/drmangotea/tfmg/content/electricity/connection/tube/CableTubeBlockEntity.java @@ -3,7 +3,6 @@ package com.drmangotea.tfmg.content.electricity.connection.tube; import com.drmangotea.tfmg.content.electricity.base.ElectricBlockEntity; -import com.drmangotea.tfmg.registry.TFMGBlockEntities; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; import net.minecraft.world.level.block.entity.BlockEntityType; diff --git a/src/main/java/com/drmangotea/tfmg/content/electricity/display_link/network/NetConsumptionDisplaySource.java b/src/main/java/com/drmangotea/tfmg/content/electricity/display_link/network/NetConsumptionDisplaySource.java index 294b049e..aa01e25d 100644 --- a/src/main/java/com/drmangotea/tfmg/content/electricity/display_link/network/NetConsumptionDisplaySource.java +++ b/src/main/java/com/drmangotea/tfmg/content/electricity/display_link/network/NetConsumptionDisplaySource.java @@ -7,7 +7,6 @@ import com.simibubi.create.content.redstone.displayLink.DisplayLinkContext; import com.simibubi.create.content.redstone.displayLink.source.SingleLineDisplaySource; import com.simibubi.create.content.redstone.displayLink.target.DisplayTargetStats; import com.simibubi.create.foundation.blockEntity.SmartBlockEntity; -import com.simibubi.create.foundation.utility.CreateLang; import net.minecraft.network.chat.Component; import net.minecraft.network.chat.MutableComponent; import net.minecraft.world.level.block.entity.BlockEntity; diff --git a/src/main/java/com/drmangotea/tfmg/content/electricity/display_link/network/NetGenerationDisplaySource.java b/src/main/java/com/drmangotea/tfmg/content/electricity/display_link/network/NetGenerationDisplaySource.java index a70d9038..aad42a5f 100644 --- a/src/main/java/com/drmangotea/tfmg/content/electricity/display_link/network/NetGenerationDisplaySource.java +++ b/src/main/java/com/drmangotea/tfmg/content/electricity/display_link/network/NetGenerationDisplaySource.java @@ -7,7 +7,6 @@ import com.simibubi.create.content.redstone.displayLink.DisplayLinkContext; import com.simibubi.create.content.redstone.displayLink.source.SingleLineDisplaySource; import com.simibubi.create.content.redstone.displayLink.target.DisplayTargetStats; import com.simibubi.create.foundation.blockEntity.SmartBlockEntity; -import com.simibubi.create.foundation.utility.CreateLang; import net.minecraft.network.chat.Component; import net.minecraft.network.chat.MutableComponent; import net.minecraft.world.level.block.entity.BlockEntity; diff --git a/src/main/java/com/drmangotea/tfmg/content/electricity/generators/GeneratorBlock.java b/src/main/java/com/drmangotea/tfmg/content/electricity/generators/GeneratorBlock.java index 70afb455..e560fc5f 100644 --- a/src/main/java/com/drmangotea/tfmg/content/electricity/generators/GeneratorBlock.java +++ b/src/main/java/com/drmangotea/tfmg/content/electricity/generators/GeneratorBlock.java @@ -11,7 +11,6 @@ import net.minecraft.world.item.context.BlockPlaceContext; import net.minecraft.world.level.BlockGetter; import net.minecraft.world.level.Level; import net.minecraft.world.level.LevelReader; -import net.minecraft.world.level.block.DirectionalBlock; import net.minecraft.world.level.block.entity.BlockEntityType; import net.minecraft.world.level.block.state.BlockState; import net.minecraft.world.phys.shapes.CollisionContext; diff --git a/src/main/java/com/drmangotea/tfmg/content/electricity/generators/GeneratorBlockEntity.java b/src/main/java/com/drmangotea/tfmg/content/electricity/generators/GeneratorBlockEntity.java index 944b242d..c11615bf 100644 --- a/src/main/java/com/drmangotea/tfmg/content/electricity/generators/GeneratorBlockEntity.java +++ b/src/main/java/com/drmangotea/tfmg/content/electricity/generators/GeneratorBlockEntity.java @@ -1,6 +1,5 @@ package com.drmangotea.tfmg.content.electricity.generators; -import com.drmangotea.tfmg.TFMG; import com.drmangotea.tfmg.config.TFMGConfigs; import com.drmangotea.tfmg.content.electricity.base.KineticElectricBlockEntity; import net.minecraft.core.BlockPos; diff --git a/src/main/java/com/drmangotea/tfmg/content/electricity/generators/creative_generator/CreativeGeneratorBlockEntity.java b/src/main/java/com/drmangotea/tfmg/content/electricity/generators/creative_generator/CreativeGeneratorBlockEntity.java index 6598ede8..272f52e8 100644 --- a/src/main/java/com/drmangotea/tfmg/content/electricity/generators/creative_generator/CreativeGeneratorBlockEntity.java +++ b/src/main/java/com/drmangotea/tfmg/content/electricity/generators/creative_generator/CreativeGeneratorBlockEntity.java @@ -1,15 +1,12 @@ package com.drmangotea.tfmg.content.electricity.generators.creative_generator; -import com.drmangotea.tfmg.TFMG; import com.drmangotea.tfmg.base.lang.TFMGLang; import com.drmangotea.tfmg.content.electricity.base.ElectricBlockEntity; import com.mojang.blaze3d.vertex.PoseStack; -import com.simibubi.create.Create; import com.simibubi.create.foundation.blockEntity.behaviour.BlockEntityBehaviour; import com.simibubi.create.foundation.blockEntity.behaviour.ValueBoxTransform; import com.simibubi.create.foundation.blockEntity.behaviour.scrollValue.ScrollValueBehaviour; -import com.simibubi.create.foundation.utility.CreateLang; import net.createmod.catnip.math.VecHelper; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; diff --git a/src/main/java/com/drmangotea/tfmg/content/electricity/generators/large_generator/RotorBlock.java b/src/main/java/com/drmangotea/tfmg/content/electricity/generators/large_generator/RotorBlock.java index 0dc240dd..61024c9c 100644 --- a/src/main/java/com/drmangotea/tfmg/content/electricity/generators/large_generator/RotorBlock.java +++ b/src/main/java/com/drmangotea/tfmg/content/electricity/generators/large_generator/RotorBlock.java @@ -2,10 +2,8 @@ package com.drmangotea.tfmg.content.electricity.generators.large_generator; import com.drmangotea.tfmg.base.TFMGShapes; -import com.drmangotea.tfmg.content.electricity.base.ConnectNeightborsPacket; import com.drmangotea.tfmg.content.electricity.base.IElectric; import com.drmangotea.tfmg.registry.TFMGBlockEntities; -import com.drmangotea.tfmg.registry.TFMGPackets; import com.simibubi.create.content.kinetics.base.RotatedPillarKineticBlock; import com.simibubi.create.foundation.block.IBE; import net.minecraft.core.BlockPos; diff --git a/src/main/java/com/drmangotea/tfmg/content/electricity/generators/large_generator/RotorRenderer.java b/src/main/java/com/drmangotea/tfmg/content/electricity/generators/large_generator/RotorRenderer.java index c618a7c6..03885c9d 100644 --- a/src/main/java/com/drmangotea/tfmg/content/electricity/generators/large_generator/RotorRenderer.java +++ b/src/main/java/com/drmangotea/tfmg/content/electricity/generators/large_generator/RotorRenderer.java @@ -11,11 +11,8 @@ import net.createmod.catnip.render.SuperByteBuffer; import net.minecraft.client.renderer.MultiBufferSource; import net.minecraft.client.renderer.RenderType; import net.minecraft.client.renderer.blockentity.BlockEntityRendererProvider; -import net.minecraft.core.Direction; import net.minecraft.world.level.block.state.BlockState; -import static com.simibubi.create.content.kinetics.base.RotatedPillarKineticBlock.AXIS; - public class RotorRenderer extends KineticBlockEntityRenderer { public RotorRenderer(BlockEntityRendererProvider.Context context) { diff --git a/src/main/java/com/drmangotea/tfmg/content/electricity/generators/large_generator/StatorBlock.java b/src/main/java/com/drmangotea/tfmg/content/electricity/generators/large_generator/StatorBlock.java index 4863adcb..0c409756 100644 --- a/src/main/java/com/drmangotea/tfmg/content/electricity/generators/large_generator/StatorBlock.java +++ b/src/main/java/com/drmangotea/tfmg/content/electricity/generators/large_generator/StatorBlock.java @@ -2,9 +2,7 @@ package com.drmangotea.tfmg.content.electricity.generators.large_generator; import com.drmangotea.tfmg.base.TFMGShapes; import com.drmangotea.tfmg.content.electricity.base.IElectric; -import com.drmangotea.tfmg.content.electricity.connection.diagonal.DiagonalCableBlock; import com.drmangotea.tfmg.registry.TFMGBlockEntities; -import com.drmangotea.tfmg.registry.TFMGPackets; import com.mojang.serialization.MapCodec; import com.simibubi.create.foundation.block.IBE; import net.minecraft.core.BlockPos; diff --git a/src/main/java/com/drmangotea/tfmg/content/electricity/generators/large_generator/StatorBlockEntity.java b/src/main/java/com/drmangotea/tfmg/content/electricity/generators/large_generator/StatorBlockEntity.java index 90472ee6..5003a56b 100644 --- a/src/main/java/com/drmangotea/tfmg/content/electricity/generators/large_generator/StatorBlockEntity.java +++ b/src/main/java/com/drmangotea/tfmg/content/electricity/generators/large_generator/StatorBlockEntity.java @@ -5,10 +5,6 @@ import com.simibubi.create.api.equipment.goggles.IHaveGoggleInformation; import net.minecraft.core.BlockPos; import net.minecraft.world.level.block.entity.BlockEntityType; import net.minecraft.world.level.block.state.BlockState; -import net.minecraft.world.phys.AABB; - -import java.util.Iterator; -import java.util.List; public class StatorBlockEntity extends ElectricBlockEntity implements IHaveGoggleInformation { diff --git a/src/main/java/com/drmangotea/tfmg/content/electricity/lights/LampGenerator.java b/src/main/java/com/drmangotea/tfmg/content/electricity/lights/LampGenerator.java index 749e30f3..d719fd42 100644 --- a/src/main/java/com/drmangotea/tfmg/content/electricity/lights/LampGenerator.java +++ b/src/main/java/com/drmangotea/tfmg/content/electricity/lights/LampGenerator.java @@ -5,7 +5,6 @@ import com.simibubi.create.foundation.data.AssetLookup; import com.simibubi.create.foundation.data.SpecialBlockStateGen; import com.tterrag.registrate.providers.DataGenContext; import com.tterrag.registrate.providers.RegistrateBlockstateProvider; -import net.minecraft.core.Direction; import net.minecraft.world.level.block.Block; import net.minecraft.world.level.block.state.BlockState; import net.neoforged.neoforge.client.model.generators.ModelFile; diff --git a/src/main/java/com/drmangotea/tfmg/content/electricity/lights/LightBulbBlock.java b/src/main/java/com/drmangotea/tfmg/content/electricity/lights/LightBulbBlock.java index 175d9bda..b38b281d 100644 --- a/src/main/java/com/drmangotea/tfmg/content/electricity/lights/LightBulbBlock.java +++ b/src/main/java/com/drmangotea/tfmg/content/electricity/lights/LightBulbBlock.java @@ -3,7 +3,6 @@ package com.drmangotea.tfmg.content.electricity.lights; import com.drmangotea.tfmg.base.blocks.WallMountBlock; import com.drmangotea.tfmg.content.electricity.base.IElectric; -import com.drmangotea.tfmg.content.electricity.lights.neon_tube.NeonTubeBlockEntity; import com.simibubi.create.content.equipment.wrench.IWrenchable; import com.simibubi.create.foundation.block.IBE; import com.tterrag.registrate.util.entry.BlockEntityEntry; @@ -13,7 +12,6 @@ import net.minecraft.core.Direction; import net.minecraft.sounds.SoundEvents; import net.minecraft.sounds.SoundSource; import net.minecraft.world.InteractionHand; -import net.minecraft.world.InteractionResult; import net.minecraft.world.ItemInteractionResult; import net.minecraft.world.entity.player.Player; import net.minecraft.world.item.DyeColor; diff --git a/src/main/java/com/drmangotea/tfmg/content/electricity/measurement/MultimeterOverlayRenderer.java b/src/main/java/com/drmangotea/tfmg/content/electricity/measurement/MultimeterOverlayRenderer.java index e222e9d4..b1fe2ff7 100644 --- a/src/main/java/com/drmangotea/tfmg/content/electricity/measurement/MultimeterOverlayRenderer.java +++ b/src/main/java/com/drmangotea/tfmg/content/electricity/measurement/MultimeterOverlayRenderer.java @@ -1,6 +1,5 @@ package com.drmangotea.tfmg.content.electricity.measurement; -import com.drmangotea.tfmg.TFMG; import com.drmangotea.tfmg.base.lang.TFMGLang; import com.drmangotea.tfmg.content.electricity.base.IElectric; import com.drmangotea.tfmg.registry.TFMGItems; @@ -11,7 +10,6 @@ import com.simibubi.create.compat.Mods; import com.simibubi.create.foundation.blockEntity.behaviour.ValueBox; import com.simibubi.create.foundation.gui.RemovedGuiUtils; import com.simibubi.create.foundation.mixin.accessor.MouseHandlerAccessor; -import com.simibubi.create.foundation.utility.CreateLang; import com.simibubi.create.infrastructure.config.AllConfigs; import com.simibubi.create.infrastructure.config.CClient; import net.createmod.catnip.gui.element.BoxElement; diff --git a/src/main/java/com/drmangotea/tfmg/content/electricity/measurement/VoltMeterBlockEntity.java b/src/main/java/com/drmangotea/tfmg/content/electricity/measurement/VoltMeterBlockEntity.java index 0e70c33f..53b58447 100644 --- a/src/main/java/com/drmangotea/tfmg/content/electricity/measurement/VoltMeterBlockEntity.java +++ b/src/main/java/com/drmangotea/tfmg/content/electricity/measurement/VoltMeterBlockEntity.java @@ -1,16 +1,12 @@ package com.drmangotea.tfmg.content.electricity.measurement; -import com.drmangotea.tfmg.TFMG; -import com.drmangotea.tfmg.base.TFMGUtils; import com.drmangotea.tfmg.base.lang.TFMGTexts; import com.drmangotea.tfmg.content.electricity.base.IElectric; import com.drmangotea.tfmg.content.electricity.storage.AccumulatorBlockEntity; import com.simibubi.create.api.equipment.goggles.IHaveGoggleInformation; import com.simibubi.create.foundation.blockEntity.SmartBlockEntity; import com.simibubi.create.foundation.blockEntity.behaviour.BlockEntityBehaviour; -import com.simibubi.create.foundation.utility.CreateLang; import net.createmod.catnip.animation.LerpedFloat; -import net.minecraft.ChatFormatting; import net.minecraft.core.BlockPos; import net.minecraft.network.chat.Component; import net.minecraft.world.level.block.entity.BlockEntity; diff --git a/src/main/java/com/drmangotea/tfmg/content/electricity/measurement/VoltMeterRenderer.java b/src/main/java/com/drmangotea/tfmg/content/electricity/measurement/VoltMeterRenderer.java index 66e8c691..ba4f9370 100644 --- a/src/main/java/com/drmangotea/tfmg/content/electricity/measurement/VoltMeterRenderer.java +++ b/src/main/java/com/drmangotea/tfmg/content/electricity/measurement/VoltMeterRenderer.java @@ -1,7 +1,6 @@ package com.drmangotea.tfmg.content.electricity.measurement; -import com.drmangotea.tfmg.TFMG; import com.drmangotea.tfmg.registry.TFMGPartialModels; import com.mojang.blaze3d.vertex.PoseStack; import com.mojang.blaze3d.vertex.VertexConsumer; diff --git a/src/main/java/com/drmangotea/tfmg/content/electricity/network/transformer/TransformerBlockEntity.java b/src/main/java/com/drmangotea/tfmg/content/electricity/network/transformer/TransformerBlockEntity.java index cd9ab2b1..64137d3f 100644 --- a/src/main/java/com/drmangotea/tfmg/content/electricity/network/transformer/TransformerBlockEntity.java +++ b/src/main/java/com/drmangotea/tfmg/content/electricity/network/transformer/TransformerBlockEntity.java @@ -1,6 +1,5 @@ package com.drmangotea.tfmg.content.electricity.network.transformer; -import com.drmangotea.tfmg.TFMG; import com.drmangotea.tfmg.base.TFMGUtils; import com.drmangotea.tfmg.base.lang.TFMGTexts; import com.drmangotea.tfmg.content.electricity.base.IElectric; @@ -9,12 +8,7 @@ import com.drmangotea.tfmg.content.electricity.base.VoltageAlteringBlockEntity; import com.drmangotea.tfmg.registry.TFMGBlocks; import com.drmangotea.tfmg.registry.TFMGDataComponents; import com.drmangotea.tfmg.registry.TFMGItems; -import com.simibubi.create.AllBlocks; -import com.simibubi.create.AllItems; -import com.simibubi.create.content.decoration.girder.GirderWrenchBehavior; import net.createmod.catnip.animation.AnimationTickHolder; -import net.createmod.catnip.data.Couple; -import net.createmod.catnip.data.Pair; import net.createmod.catnip.math.VecHelper; import net.createmod.catnip.placement.IPlacementHelper; import net.createmod.catnip.theme.Color; @@ -32,14 +26,12 @@ import net.minecraft.world.item.Items; import net.minecraft.world.level.Level; import net.minecraft.world.level.block.entity.BlockEntityType; import net.minecraft.world.level.block.state.BlockState; -import net.minecraft.world.phys.AABB; import net.minecraft.world.phys.BlockHitResult; import net.minecraft.world.phys.Vec3; import net.neoforged.api.distmarker.Dist; import net.neoforged.api.distmarker.OnlyIn; -import java.awt.*; import java.util.ArrayList; import java.util.Collection; import java.util.List; diff --git a/src/main/java/com/drmangotea/tfmg/content/electricity/storage/AccumulatorItem.java b/src/main/java/com/drmangotea/tfmg/content/electricity/storage/AccumulatorItem.java index e1c26b11..bc5ff977 100644 --- a/src/main/java/com/drmangotea/tfmg/content/electricity/storage/AccumulatorItem.java +++ b/src/main/java/com/drmangotea/tfmg/content/electricity/storage/AccumulatorItem.java @@ -2,7 +2,6 @@ package com.drmangotea.tfmg.content.electricity.storage; import com.drmangotea.tfmg.config.TFMGConfigs; import com.drmangotea.tfmg.registry.TFMGDataComponents; -import net.minecraft.nbt.CompoundTag; import net.minecraft.world.item.BlockItem; import net.minecraft.world.item.ItemStack; import net.minecraft.world.level.block.Block; diff --git a/src/main/java/com/drmangotea/tfmg/content/electricity/utilities/converter/ConverterGenerator.java b/src/main/java/com/drmangotea/tfmg/content/electricity/utilities/converter/ConverterGenerator.java index 55e8e6f8..927f26a9 100644 --- a/src/main/java/com/drmangotea/tfmg/content/electricity/utilities/converter/ConverterGenerator.java +++ b/src/main/java/com/drmangotea/tfmg/content/electricity/utilities/converter/ConverterGenerator.java @@ -5,9 +5,7 @@ import com.tterrag.registrate.providers.DataGenContext; import com.tterrag.registrate.providers.RegistrateBlockstateProvider; import net.minecraft.world.level.block.Block; import net.minecraft.world.level.block.HorizontalDirectionalBlock; -import net.minecraft.world.level.block.StairBlock; import net.minecraft.world.level.block.state.BlockState; -import net.minecraft.world.level.block.state.properties.Half; import net.neoforged.neoforge.client.model.generators.ModelFile; import static com.simibubi.create.foundation.data.AssetLookup.partialBaseModel; diff --git a/src/main/java/com/drmangotea/tfmg/content/electricity/utilities/electric_motor/ElectricMotorBlockEntity.java b/src/main/java/com/drmangotea/tfmg/content/electricity/utilities/electric_motor/ElectricMotorBlockEntity.java index f897825a..e0d3c389 100644 --- a/src/main/java/com/drmangotea/tfmg/content/electricity/utilities/electric_motor/ElectricMotorBlockEntity.java +++ b/src/main/java/com/drmangotea/tfmg/content/electricity/utilities/electric_motor/ElectricMotorBlockEntity.java @@ -1,25 +1,19 @@ package com.drmangotea.tfmg.content.electricity.utilities.electric_motor; -import com.drmangotea.tfmg.TFMG; -import com.drmangotea.tfmg.config.MachineConfig; import com.drmangotea.tfmg.config.TFMGConfigs; import com.drmangotea.tfmg.content.electricity.base.IElectric; import com.drmangotea.tfmg.content.electricity.base.KineticElectricBlockEntity; import com.mojang.blaze3d.vertex.PoseStack; import com.simibubi.create.content.contraptions.bearing.WindmillBearingBlockEntity; -import com.simibubi.create.content.kinetics.motor.KineticScrollValueBehaviour; import com.simibubi.create.foundation.blockEntity.behaviour.BlockEntityBehaviour; import com.simibubi.create.foundation.blockEntity.behaviour.ValueBoxTransform; import com.simibubi.create.foundation.blockEntity.behaviour.scrollValue.ScrollOptionBehaviour; -import com.simibubi.create.foundation.blockEntity.behaviour.scrollValue.ScrollValueBehaviour; import com.simibubi.create.foundation.utility.CreateLang; import dev.engine_room.flywheel.lib.transform.TransformStack; import net.createmod.catnip.math.AngleHelper; import net.createmod.catnip.math.VecHelper; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; -import net.minecraft.core.HolderLookup; -import net.minecraft.nbt.CompoundTag; import net.minecraft.world.level.LevelAccessor; import net.minecraft.world.level.block.entity.BlockEntityType; import net.minecraft.world.level.block.state.BlockState; diff --git a/src/main/java/com/drmangotea/tfmg/content/electricity/utilities/electric_pump/ElectricPumpBlock.java b/src/main/java/com/drmangotea/tfmg/content/electricity/utilities/electric_pump/ElectricPumpBlock.java index a1e723aa..f2d98a6e 100644 --- a/src/main/java/com/drmangotea/tfmg/content/electricity/utilities/electric_pump/ElectricPumpBlock.java +++ b/src/main/java/com/drmangotea/tfmg/content/electricity/utilities/electric_pump/ElectricPumpBlock.java @@ -1,11 +1,7 @@ package com.drmangotea.tfmg.content.electricity.utilities.electric_pump; import com.drmangotea.tfmg.base.TFMGShapes; -import com.drmangotea.tfmg.content.electricity.base.ConnectNeightborsPacket; -import com.drmangotea.tfmg.content.electricity.base.ElectricBlockEntity; -import com.drmangotea.tfmg.content.electricity.base.IElectric; import com.drmangotea.tfmg.registry.TFMGBlockEntities; -import com.drmangotea.tfmg.registry.TFMGPackets; import com.simibubi.create.content.fluids.pump.PumpBlock; import com.simibubi.create.content.fluids.pump.PumpBlockEntity; import com.simibubi.create.foundation.block.IBE; diff --git a/src/main/java/com/drmangotea/tfmg/content/electricity/utilities/electric_pump/ElectricPumpBlockEntity.java b/src/main/java/com/drmangotea/tfmg/content/electricity/utilities/electric_pump/ElectricPumpBlockEntity.java index f0da0d81..70edfb96 100644 --- a/src/main/java/com/drmangotea/tfmg/content/electricity/utilities/electric_pump/ElectricPumpBlockEntity.java +++ b/src/main/java/com/drmangotea/tfmg/content/electricity/utilities/electric_pump/ElectricPumpBlockEntity.java @@ -1,8 +1,6 @@ package com.drmangotea.tfmg.content.electricity.utilities.electric_pump; -import com.drmangotea.tfmg.TFMG; import com.drmangotea.tfmg.content.electricity.base.*; -import com.drmangotea.tfmg.registry.TFMGPackets; import com.simibubi.create.content.fluids.FluidPropagator; import com.simibubi.create.content.fluids.FluidTransportBehaviour; import com.simibubi.create.content.fluids.PipeConnection; @@ -14,15 +12,11 @@ import com.simibubi.create.foundation.blockEntity.behaviour.BlockEntityBehaviour import net.createmod.catnip.data.Couple; import net.createmod.catnip.data.Pair; import net.createmod.catnip.math.BlockFace; -import net.createmod.catnip.platform.CatnipServices; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; import net.minecraft.core.HolderLookup; import net.minecraft.nbt.CompoundTag; -import net.minecraft.network.chat.Component; -import net.minecraft.server.level.ServerLevel; import net.minecraft.world.level.BlockAndTintGetter; -import net.minecraft.world.level.ChunkPos; import net.minecraft.world.level.LevelAccessor; import net.minecraft.world.level.block.entity.BlockEntity; import net.minecraft.world.level.block.entity.BlockEntityType; diff --git a/src/main/java/com/drmangotea/tfmg/content/electricity/utilities/polarizer/PolarizeByLightningEvent.java b/src/main/java/com/drmangotea/tfmg/content/electricity/utilities/polarizer/PolarizeByLightningEvent.java index e6cde0f9..75d72b8a 100644 --- a/src/main/java/com/drmangotea/tfmg/content/electricity/utilities/polarizer/PolarizeByLightningEvent.java +++ b/src/main/java/com/drmangotea/tfmg/content/electricity/utilities/polarizer/PolarizeByLightningEvent.java @@ -1,9 +1,7 @@ package com.drmangotea.tfmg.content.electricity.utilities.polarizer; -import com.drmangotea.tfmg.TFMG; import com.drmangotea.tfmg.base.TFMGUtils; import com.drmangotea.tfmg.registry.TFMGItems; -import net.minecraft.core.BlockPos; import net.minecraft.world.entity.item.ItemEntity; import net.minecraft.world.item.ItemStack; import net.neoforged.bus.api.SubscribeEvent; diff --git a/src/main/java/com/drmangotea/tfmg/content/electricity/utilities/polarizer/PolarizerBlock.java b/src/main/java/com/drmangotea/tfmg/content/electricity/utilities/polarizer/PolarizerBlock.java index b0f6f943..673a1497 100644 --- a/src/main/java/com/drmangotea/tfmg/content/electricity/utilities/polarizer/PolarizerBlock.java +++ b/src/main/java/com/drmangotea/tfmg/content/electricity/utilities/polarizer/PolarizerBlock.java @@ -7,7 +7,6 @@ import com.drmangotea.tfmg.registry.TFMGBlockEntities; import com.simibubi.create.foundation.block.IBE; import net.minecraft.core.BlockPos; import net.minecraft.world.InteractionHand; -import net.minecraft.world.InteractionResult; import net.minecraft.world.ItemInteractionResult; import net.minecraft.world.entity.player.Player; import net.minecraft.world.item.ItemStack; diff --git a/src/main/java/com/drmangotea/tfmg/content/electricity/utilities/polarizer/PolarizerBlockEntity.java b/src/main/java/com/drmangotea/tfmg/content/electricity/utilities/polarizer/PolarizerBlockEntity.java index cea8530e..28213ced 100644 --- a/src/main/java/com/drmangotea/tfmg/content/electricity/utilities/polarizer/PolarizerBlockEntity.java +++ b/src/main/java/com/drmangotea/tfmg/content/electricity/utilities/polarizer/PolarizerBlockEntity.java @@ -1,8 +1,6 @@ package com.drmangotea.tfmg.content.electricity.utilities.polarizer; -import com.drmangotea.tfmg.TFMG; import com.drmangotea.tfmg.base.TFMGUtils; -import com.drmangotea.tfmg.base.lang.TFMGLang; import com.drmangotea.tfmg.base.lang.TFMGTexts; import com.drmangotea.tfmg.config.TFMGConfigs; import com.drmangotea.tfmg.content.electricity.base.ElectricBlockEntity; @@ -13,7 +11,6 @@ import com.simibubi.create.api.equipment.goggles.IHaveGoggleInformation; import com.simibubi.create.content.processing.sequenced.SequencedAssemblyRecipe; import com.simibubi.create.foundation.item.SmartInventory; -import com.simibubi.create.foundation.utility.CreateLang; import net.createmod.catnip.animation.LerpedFloat; import net.minecraft.ChatFormatting; import net.minecraft.core.BlockPos; @@ -29,8 +26,6 @@ import net.neoforged.neoforge.capabilities.Capabilities; import net.neoforged.neoforge.capabilities.RegisterCapabilitiesEvent; import net.neoforged.neoforge.items.IItemHandlerModifiable; import net.neoforged.neoforge.items.wrapper.RecipeWrapper; -import org.jetbrains.annotations.NotNull; -import org.jetbrains.annotations.Nullable; import java.util.List; import java.util.Optional; @@ -143,7 +138,7 @@ public class PolarizerBlockEntity extends ElectricBlockEntity implements IHaveGo } public void performRecipe(PolarizingRecipe recipe) { - ItemStack stack = recipe.getRollableResults().get(0).rollOutput(); + ItemStack stack = recipe.getRollableResults().get(0).rollOutput(level.random); inventory.setStackInSlot(0, stack); TFMGUtils.spawnElectricParticles(level, getBlockPos()); capacitorPercentage = 0; diff --git a/src/main/java/com/drmangotea/tfmg/content/electricity/utilities/polarizer/PolarizerRenderer.java b/src/main/java/com/drmangotea/tfmg/content/electricity/utilities/polarizer/PolarizerRenderer.java index b3ec8eb1..e57015d3 100644 --- a/src/main/java/com/drmangotea/tfmg/content/electricity/utilities/polarizer/PolarizerRenderer.java +++ b/src/main/java/com/drmangotea/tfmg/content/electricity/utilities/polarizer/PolarizerRenderer.java @@ -17,7 +17,6 @@ import net.minecraft.world.item.ItemStack; import net.minecraft.world.level.block.HorizontalDirectionalBlock; import net.minecraft.world.level.block.state.BlockState; -import static com.simibubi.create.content.kinetics.base.HorizontalKineticBlock.HORIZONTAL_FACING; import static net.minecraft.world.level.block.HorizontalDirectionalBlock.FACING; public class PolarizerRenderer extends SafeBlockEntityRenderer { diff --git a/src/main/java/com/drmangotea/tfmg/content/electricity/utilities/resistor/ResistorBlockEntity.java b/src/main/java/com/drmangotea/tfmg/content/electricity/utilities/resistor/ResistorBlockEntity.java index 3fa192b5..d5fa98e5 100644 --- a/src/main/java/com/drmangotea/tfmg/content/electricity/utilities/resistor/ResistorBlockEntity.java +++ b/src/main/java/com/drmangotea/tfmg/content/electricity/utilities/resistor/ResistorBlockEntity.java @@ -1,6 +1,5 @@ package com.drmangotea.tfmg.content.electricity.utilities.resistor; -import com.drmangotea.tfmg.TFMG; import com.drmangotea.tfmg.content.electricity.base.ElectricBlockEntity; import com.drmangotea.tfmg.registry.TFMGDataComponents; import net.minecraft.core.BlockPos; diff --git a/src/main/java/com/drmangotea/tfmg/content/electricity/utilities/resistor/ResistorBlockItem.java b/src/main/java/com/drmangotea/tfmg/content/electricity/utilities/resistor/ResistorBlockItem.java index 8724c8e0..e5cf7c0f 100644 --- a/src/main/java/com/drmangotea/tfmg/content/electricity/utilities/resistor/ResistorBlockItem.java +++ b/src/main/java/com/drmangotea/tfmg/content/electricity/utilities/resistor/ResistorBlockItem.java @@ -3,7 +3,6 @@ package com.drmangotea.tfmg.content.electricity.utilities.resistor; import com.drmangotea.tfmg.base.lang.TFMGLang; import com.drmangotea.tfmg.registry.TFMGDataComponents; -import com.simibubi.create.foundation.utility.CreateLang; import net.minecraft.ChatFormatting; import net.minecraft.network.chat.Component; import net.minecraft.world.item.BlockItem; diff --git a/src/main/java/com/drmangotea/tfmg/content/electricity/utilities/resistor/ResistorItem.java b/src/main/java/com/drmangotea/tfmg/content/electricity/utilities/resistor/ResistorItem.java index cfb6b23f..55423eb4 100644 --- a/src/main/java/com/drmangotea/tfmg/content/electricity/utilities/resistor/ResistorItem.java +++ b/src/main/java/com/drmangotea/tfmg/content/electricity/utilities/resistor/ResistorItem.java @@ -3,15 +3,11 @@ package com.drmangotea.tfmg.content.electricity.utilities.resistor; import com.drmangotea.tfmg.base.lang.TFMGLang; import com.drmangotea.tfmg.registry.TFMGDataComponents; -import com.simibubi.create.foundation.utility.CreateLang; import net.minecraft.ChatFormatting; import net.minecraft.network.chat.Component; -import net.minecraft.world.item.BlockItem; import net.minecraft.world.item.Item; import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.TooltipFlag; -import net.minecraft.world.level.Level; -import net.minecraft.world.level.block.Block; import net.neoforged.api.distmarker.Dist; import net.neoforged.api.distmarker.OnlyIn; diff --git a/src/main/java/com/drmangotea/tfmg/content/electricity/utilities/segmented_display/SegmentedDisplayBlock.java b/src/main/java/com/drmangotea/tfmg/content/electricity/utilities/segmented_display/SegmentedDisplayBlock.java index 485c9bb6..827bd155 100644 --- a/src/main/java/com/drmangotea/tfmg/content/electricity/utilities/segmented_display/SegmentedDisplayBlock.java +++ b/src/main/java/com/drmangotea/tfmg/content/electricity/utilities/segmented_display/SegmentedDisplayBlock.java @@ -9,13 +9,10 @@ import com.simibubi.create.foundation.block.IBE; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; import net.minecraft.core.component.DataComponents; -import net.minecraft.nbt.CompoundTag; -import net.minecraft.nbt.Tag; import net.minecraft.network.chat.Component; import net.minecraft.sounds.SoundEvents; import net.minecraft.sounds.SoundSource; import net.minecraft.world.InteractionHand; -import net.minecraft.world.InteractionResult; import net.minecraft.world.ItemInteractionResult; import net.minecraft.world.entity.player.Player; import net.minecraft.world.item.DyeColor; diff --git a/src/main/java/com/drmangotea/tfmg/content/electricity/utilities/segmented_display/SegmentedDisplayRenderer.java b/src/main/java/com/drmangotea/tfmg/content/electricity/utilities/segmented_display/SegmentedDisplayRenderer.java index 47c3fce9..1c3156c2 100644 --- a/src/main/java/com/drmangotea/tfmg/content/electricity/utilities/segmented_display/SegmentedDisplayRenderer.java +++ b/src/main/java/com/drmangotea/tfmg/content/electricity/utilities/segmented_display/SegmentedDisplayRenderer.java @@ -16,8 +16,6 @@ import net.minecraft.client.renderer.blockentity.BlockEntityRendererProvider; import net.minecraft.world.level.block.HorizontalDirectionalBlock; import net.minecraft.world.level.block.state.BlockState; -import java.util.*; - public class SegmentedDisplayRenderer extends SafeBlockEntityRenderer { public SegmentedDisplayRenderer(BlockEntityRendererProvider.Context context) {} diff --git a/src/main/java/com/drmangotea/tfmg/content/electricity/utilities/traffic_light/TrafficLightBlockEntity.java b/src/main/java/com/drmangotea/tfmg/content/electricity/utilities/traffic_light/TrafficLightBlockEntity.java index 7866c123..bf0a2ed2 100644 --- a/src/main/java/com/drmangotea/tfmg/content/electricity/utilities/traffic_light/TrafficLightBlockEntity.java +++ b/src/main/java/com/drmangotea/tfmg/content/electricity/utilities/traffic_light/TrafficLightBlockEntity.java @@ -2,11 +2,9 @@ package com.drmangotea.tfmg.content.electricity.utilities.traffic_light; import com.drmangotea.tfmg.base.lang.TFMGLang; import com.drmangotea.tfmg.content.electricity.base.ElectricBlockEntity; -import com.simibubi.create.Create; import com.simibubi.create.foundation.blockEntity.behaviour.BlockEntityBehaviour; import com.simibubi.create.foundation.blockEntity.behaviour.scrollValue.ScrollValueBehaviour; -import com.simibubi.create.foundation.utility.CreateLang; import net.createmod.catnip.animation.LerpedFloat; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; diff --git a/src/main/java/com/drmangotea/tfmg/content/electricity/utilities/voltage_observer/VoltageObserverBlock.java b/src/main/java/com/drmangotea/tfmg/content/electricity/utilities/voltage_observer/VoltageObserverBlock.java index 68009bc7..1c96d5a4 100644 --- a/src/main/java/com/drmangotea/tfmg/content/electricity/utilities/voltage_observer/VoltageObserverBlock.java +++ b/src/main/java/com/drmangotea/tfmg/content/electricity/utilities/voltage_observer/VoltageObserverBlock.java @@ -4,7 +4,6 @@ package com.drmangotea.tfmg.content.electricity.utilities.voltage_observer; import com.drmangotea.tfmg.base.blocks.WallMountBlock; import com.drmangotea.tfmg.content.electricity.base.ConnectNeightborsPacket; import com.drmangotea.tfmg.registry.TFMGBlockEntities; -import com.drmangotea.tfmg.registry.TFMGPackets; import com.simibubi.create.foundation.block.IBE; import net.createmod.catnip.platform.CatnipServices; import net.minecraft.core.BlockPos; diff --git a/src/main/java/com/drmangotea/tfmg/content/engines/CylinderItem.java b/src/main/java/com/drmangotea/tfmg/content/engines/CylinderItem.java index 9a784fd1..d15d41a6 100644 --- a/src/main/java/com/drmangotea/tfmg/content/engines/CylinderItem.java +++ b/src/main/java/com/drmangotea/tfmg/content/engines/CylinderItem.java @@ -3,16 +3,13 @@ package com.drmangotea.tfmg.content.engines; import com.drmangotea.tfmg.base.lang.TFMGLang; import com.drmangotea.tfmg.registry.TFMGDataComponents; -import com.simibubi.create.foundation.utility.CreateLang; import net.minecraft.ChatFormatting; import net.minecraft.nbt.CompoundTag; import net.minecraft.network.chat.Component; -import net.minecraft.network.chat.ComponentContents; import net.minecraft.network.chat.MutableComponent; import net.minecraft.world.item.Item; import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.TooltipFlag; -import net.minecraft.world.level.Level; import net.neoforged.api.distmarker.Dist; import net.neoforged.api.distmarker.OnlyIn; diff --git a/src/main/java/com/drmangotea/tfmg/content/engines/FluidContainingItem.java b/src/main/java/com/drmangotea/tfmg/content/engines/FluidContainingItem.java index ff2e9c6a..c4cd7a10 100644 --- a/src/main/java/com/drmangotea/tfmg/content/engines/FluidContainingItem.java +++ b/src/main/java/com/drmangotea/tfmg/content/engines/FluidContainingItem.java @@ -1,17 +1,12 @@ package com.drmangotea.tfmg.content.engines; import com.drmangotea.tfmg.base.lang.TFMGLang; -import com.drmangotea.tfmg.content.items.weapons.flamethrover.FlamethrowerFuel; -import com.drmangotea.tfmg.content.items.weapons.flamethrover.FlamethrowerItem; import com.drmangotea.tfmg.registry.TFMGDataComponents; -import com.drmangotea.tfmg.registry.TFMGItems; import com.simibubi.create.content.fluids.tank.FluidTankBlockEntity; -import com.simibubi.create.foundation.utility.CreateLang; import com.tterrag.registrate.util.entry.FluidEntry; import net.minecraft.ChatFormatting; import net.minecraft.core.BlockPos; -import net.minecraft.nbt.CompoundTag; import net.minecraft.network.chat.Component; import net.minecraft.sounds.SoundEvents; import net.minecraft.sounds.SoundSource; @@ -21,8 +16,6 @@ import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.TooltipFlag; import net.minecraft.world.item.context.UseOnContext; import net.minecraft.world.level.Level; -import net.neoforged.api.distmarker.Dist; -import net.neoforged.api.distmarker.OnlyIn; import net.neoforged.neoforge.fluids.capability.IFluidHandler; diff --git a/src/main/java/com/drmangotea/tfmg/content/engines/base/EngineCTBehavior.java b/src/main/java/com/drmangotea/tfmg/content/engines/base/EngineCTBehavior.java index 7673403c..96045a14 100644 --- a/src/main/java/com/drmangotea/tfmg/content/engines/base/EngineCTBehavior.java +++ b/src/main/java/com/drmangotea/tfmg/content/engines/base/EngineCTBehavior.java @@ -9,8 +9,6 @@ import net.minecraft.world.level.BlockAndTintGetter; import net.minecraft.world.level.block.state.BlockState; import org.jetbrains.annotations.Nullable; -import static com.simibubi.create.content.kinetics.base.HorizontalKineticBlock.HORIZONTAL_FACING; - public class EngineCTBehavior extends ConnectedTextureBehaviour.Base { protected CTSpriteShiftEntry topShift; diff --git a/src/main/java/com/drmangotea/tfmg/content/engines/base/EngineFluidTank.java b/src/main/java/com/drmangotea/tfmg/content/engines/base/EngineFluidTank.java index 60e0230c..a7c13229 100644 --- a/src/main/java/com/drmangotea/tfmg/content/engines/base/EngineFluidTank.java +++ b/src/main/java/com/drmangotea/tfmg/content/engines/base/EngineFluidTank.java @@ -1,6 +1,5 @@ package com.drmangotea.tfmg.content.engines.base; -import com.drmangotea.tfmg.TFMG; import com.simibubi.create.foundation.fluid.SmartFluidTank; import net.minecraft.tags.TagKey; import net.minecraft.world.level.material.Fluid; diff --git a/src/main/java/com/drmangotea/tfmg/content/engines/base/EngineRenderer.java b/src/main/java/com/drmangotea/tfmg/content/engines/base/EngineRenderer.java index 0a7e432d..044333fd 100644 --- a/src/main/java/com/drmangotea/tfmg/content/engines/base/EngineRenderer.java +++ b/src/main/java/com/drmangotea/tfmg/content/engines/base/EngineRenderer.java @@ -7,7 +7,6 @@ import com.simibubi.create.content.kinetics.base.KineticBlockEntityRenderer; import net.createmod.catnip.render.CachedBuffers; import net.createmod.catnip.render.SuperByteBuffer; import net.minecraft.client.renderer.MultiBufferSource; -import net.minecraft.client.renderer.RenderType; import net.minecraft.client.renderer.blockentity.BlockEntityRendererProvider; import net.minecraft.world.level.block.state.BlockState; diff --git a/src/main/java/com/drmangotea/tfmg/content/engines/engine_controller/EngineControllerBlockEntity.java b/src/main/java/com/drmangotea/tfmg/content/engines/engine_controller/EngineControllerBlockEntity.java index 7c204655..0fdb4346 100644 --- a/src/main/java/com/drmangotea/tfmg/content/engines/engine_controller/EngineControllerBlockEntity.java +++ b/src/main/java/com/drmangotea/tfmg/content/engines/engine_controller/EngineControllerBlockEntity.java @@ -1,17 +1,13 @@ package com.drmangotea.tfmg.content.engines.engine_controller; -import com.drmangotea.tfmg.TFMG; import com.drmangotea.tfmg.content.engines.types.AbstractSmallEngineBlockEntity; import com.drmangotea.tfmg.content.engines.upgrades.TransmissionUpgrade; -import com.drmangotea.tfmg.registry.TFMGMenuTypes; import com.simibubi.create.api.equipment.goggles.IHaveGoggleInformation; import com.simibubi.create.content.redstone.link.RedstoneLinkNetworkHandler; import com.simibubi.create.foundation.blockEntity.SmartBlockEntity; import com.simibubi.create.foundation.blockEntity.behaviour.BlockEntityBehaviour; -import com.simibubi.create.foundation.utility.CreateLang; import net.createmod.catnip.animation.LerpedFloat; import net.createmod.catnip.data.Couple; -import net.createmod.catnip.gui.ScreenOpener; import net.createmod.catnip.platform.CatnipServices; import net.minecraft.client.Minecraft; import net.minecraft.core.BlockPos; @@ -19,7 +15,6 @@ import net.minecraft.core.HolderLookup; import net.minecraft.nbt.CompoundTag; import net.minecraft.network.chat.Component; import net.minecraft.server.level.ServerLevel; -import net.minecraft.server.level.ServerPlayer; import net.minecraft.world.InteractionResult; import net.minecraft.world.MenuProvider; import net.minecraft.world.entity.Entity; diff --git a/src/main/java/com/drmangotea/tfmg/content/engines/engine_controller/EngineControllerClientHandler.java b/src/main/java/com/drmangotea/tfmg/content/engines/engine_controller/EngineControllerClientHandler.java index bf396e57..c6f2ed5b 100644 --- a/src/main/java/com/drmangotea/tfmg/content/engines/engine_controller/EngineControllerClientHandler.java +++ b/src/main/java/com/drmangotea/tfmg/content/engines/engine_controller/EngineControllerClientHandler.java @@ -1,10 +1,8 @@ package com.drmangotea.tfmg.content.engines.engine_controller; -import com.drmangotea.tfmg.TFMG; import com.drmangotea.tfmg.content.engines.engine_controller.packets.*; import com.drmangotea.tfmg.registry.TFMGBlocks; import com.drmangotea.tfmg.registry.TFMGKeys; -import com.drmangotea.tfmg.registry.TFMGPackets; import com.mojang.blaze3d.platform.InputConstants; import com.simibubi.create.*; import com.simibubi.create.content.redstone.link.LinkBehaviour; diff --git a/src/main/java/com/drmangotea/tfmg/content/engines/engine_controller/EngineControllerMenu.java b/src/main/java/com/drmangotea/tfmg/content/engines/engine_controller/EngineControllerMenu.java index 33238446..4d909bb8 100644 --- a/src/main/java/com/drmangotea/tfmg/content/engines/engine_controller/EngineControllerMenu.java +++ b/src/main/java/com/drmangotea/tfmg/content/engines/engine_controller/EngineControllerMenu.java @@ -1,21 +1,16 @@ package com.drmangotea.tfmg.content.engines.engine_controller; import com.drmangotea.tfmg.registry.TFMGMenuTypes; -import com.simibubi.create.AllMenuTypes; import com.simibubi.create.foundation.gui.menu.GhostItemMenu; -import com.simibubi.create.foundation.gui.menu.MenuBase; import net.minecraft.client.Minecraft; import net.minecraft.client.multiplayer.ClientLevel; import net.minecraft.core.BlockPos; -import net.minecraft.network.FriendlyByteBuf; import net.minecraft.network.RegistryFriendlyByteBuf; -import net.minecraft.network.chat.Component; import net.minecraft.world.entity.player.Inventory; import net.minecraft.world.entity.player.Player; import net.minecraft.world.inventory.ClickType; import net.minecraft.world.inventory.MenuType; -import net.minecraft.world.item.ItemStack; import net.minecraft.world.level.block.entity.BlockEntity; import net.neoforged.neoforge.items.ItemStackHandler; import net.neoforged.neoforge.items.SlotItemHandler; diff --git a/src/main/java/com/drmangotea/tfmg/content/engines/engine_controller/EngineControllerScreen.java b/src/main/java/com/drmangotea/tfmg/content/engines/engine_controller/EngineControllerScreen.java index 6e082d5c..1658e9c9 100644 --- a/src/main/java/com/drmangotea/tfmg/content/engines/engine_controller/EngineControllerScreen.java +++ b/src/main/java/com/drmangotea/tfmg/content/engines/engine_controller/EngineControllerScreen.java @@ -3,12 +3,10 @@ package com.drmangotea.tfmg.content.engines.engine_controller; import com.drmangotea.tfmg.base.lang.TFMGLang; import com.drmangotea.tfmg.registry.TFMGGuiTextures; import com.google.common.collect.ImmutableList; -import com.simibubi.create.foundation.gui.AllGuiTextures; import com.simibubi.create.foundation.gui.AllIcons; import com.simibubi.create.foundation.gui.menu.AbstractSimiContainerScreen; import com.simibubi.create.foundation.gui.widget.IconButton; import com.simibubi.create.foundation.utility.ControlsUtil; -import com.simibubi.create.foundation.utility.CreateLang; import net.createmod.catnip.gui.element.GuiGameElement; import net.minecraft.ChatFormatting; import net.minecraft.client.gui.GuiGraphics; diff --git a/src/main/java/com/drmangotea/tfmg/content/engines/engine_controller/TransmissionRemovePacket.java b/src/main/java/com/drmangotea/tfmg/content/engines/engine_controller/TransmissionRemovePacket.java index 09695fc4..c8a99b0c 100644 --- a/src/main/java/com/drmangotea/tfmg/content/engines/engine_controller/TransmissionRemovePacket.java +++ b/src/main/java/com/drmangotea/tfmg/content/engines/engine_controller/TransmissionRemovePacket.java @@ -1,13 +1,11 @@ package com.drmangotea.tfmg.content.engines.engine_controller; -import com.drmangotea.tfmg.content.electricity.base.ConnectNeightborsPacket; import com.drmangotea.tfmg.content.engines.base.AbstractEngineBlockEntity; import com.drmangotea.tfmg.registry.TFMGPackets; import com.simibubi.create.foundation.blockEntity.SmartBlockEntity; import com.simibubi.create.foundation.networking.BlockEntityDataPacket; import io.netty.buffer.ByteBuf; import net.minecraft.core.BlockPos; -import net.minecraft.network.FriendlyByteBuf; import net.minecraft.network.codec.StreamCodec; public class TransmissionRemovePacket extends BlockEntityDataPacket { diff --git a/src/main/java/com/drmangotea/tfmg/content/engines/engine_controller/packets/EngineControllerBindPacket.java b/src/main/java/com/drmangotea/tfmg/content/engines/engine_controller/packets/EngineControllerBindPacket.java index a5a64615..6ff1c584 100644 --- a/src/main/java/com/drmangotea/tfmg/content/engines/engine_controller/packets/EngineControllerBindPacket.java +++ b/src/main/java/com/drmangotea/tfmg/content/engines/engine_controller/packets/EngineControllerBindPacket.java @@ -1,10 +1,5 @@ package com.drmangotea.tfmg.content.engines.engine_controller.packets; -import com.drmangotea.tfmg.content.engines.engine_controller.EngineControllerBlockEntity; -import net.minecraft.core.BlockPos; -import net.minecraft.network.FriendlyByteBuf; -import net.minecraft.server.level.ServerPlayer; - //public class EngineControllerBindPacket extends EngineControllerPacketBase { // diff --git a/src/main/java/com/drmangotea/tfmg/content/engines/engine_controller/packets/EngineControllerInputPacket.java b/src/main/java/com/drmangotea/tfmg/content/engines/engine_controller/packets/EngineControllerInputPacket.java index d82750e1..8c7fdf10 100644 --- a/src/main/java/com/drmangotea/tfmg/content/engines/engine_controller/packets/EngineControllerInputPacket.java +++ b/src/main/java/com/drmangotea/tfmg/content/engines/engine_controller/packets/EngineControllerInputPacket.java @@ -1,8 +1,6 @@ package com.drmangotea.tfmg.content.engines.engine_controller.packets; -import com.drmangotea.tfmg.TFMG; import com.drmangotea.tfmg.content.engines.engine_controller.EngineControllerBlockEntity; -import com.drmangotea.tfmg.registry.TFMGDataComponents; import com.drmangotea.tfmg.registry.TFMGPackets; import com.simibubi.create.content.redstone.link.RedstoneLinkNetworkHandler; import com.simibubi.create.content.redstone.link.controller.*; @@ -11,7 +9,6 @@ import net.createmod.catnip.codecs.stream.CatnipStreamCodecBuilders; import net.createmod.catnip.codecs.stream.CatnipStreamCodecs; import net.createmod.catnip.data.Couple; import net.minecraft.core.BlockPos; -import net.minecraft.network.FriendlyByteBuf; import net.minecraft.network.codec.ByteBufCodecs; import net.minecraft.network.codec.StreamCodec; import net.minecraft.server.level.ServerPlayer; @@ -19,7 +16,6 @@ import net.minecraft.world.item.ItemStack; import net.minecraft.world.level.Level; import java.util.*; -import java.util.stream.Collectors; public class EngineControllerInputPacket extends EngineControllerPacketBase { diff --git a/src/main/java/com/drmangotea/tfmg/content/engines/engine_controller/packets/EngineControllerStopControllerPacket.java b/src/main/java/com/drmangotea/tfmg/content/engines/engine_controller/packets/EngineControllerStopControllerPacket.java index a9546bf2..d7744733 100644 --- a/src/main/java/com/drmangotea/tfmg/content/engines/engine_controller/packets/EngineControllerStopControllerPacket.java +++ b/src/main/java/com/drmangotea/tfmg/content/engines/engine_controller/packets/EngineControllerStopControllerPacket.java @@ -1,13 +1,9 @@ package com.drmangotea.tfmg.content.engines.engine_controller.packets; -import com.drmangotea.tfmg.TFMG; import com.drmangotea.tfmg.content.engines.engine_controller.EngineControllerBlockEntity; import com.drmangotea.tfmg.registry.TFMGPackets; -import com.simibubi.create.content.redstone.link.controller.LinkedControllerPacketBase; -import com.simibubi.create.content.redstone.link.controller.LinkedControllerStopLecternPacket; import io.netty.buffer.ByteBuf; import net.minecraft.core.BlockPos; -import net.minecraft.network.FriendlyByteBuf; import net.minecraft.network.codec.StreamCodec; import net.minecraft.server.level.ServerPlayer; import net.minecraft.world.item.ItemStack; diff --git a/src/main/java/com/drmangotea/tfmg/content/engines/engine_controller/packets/EngineStartPacket.java b/src/main/java/com/drmangotea/tfmg/content/engines/engine_controller/packets/EngineStartPacket.java index 11772cd7..27ef52ce 100644 --- a/src/main/java/com/drmangotea/tfmg/content/engines/engine_controller/packets/EngineStartPacket.java +++ b/src/main/java/com/drmangotea/tfmg/content/engines/engine_controller/packets/EngineStartPacket.java @@ -1,19 +1,13 @@ package com.drmangotea.tfmg.content.engines.engine_controller.packets; -import com.drmangotea.tfmg.TFMG; import com.drmangotea.tfmg.content.engines.engine_controller.EngineControllerBlockEntity; -import com.drmangotea.tfmg.registry.TFMGDataComponents; import com.drmangotea.tfmg.registry.TFMGPackets; import io.netty.buffer.ByteBuf; import net.minecraft.core.BlockPos; -import net.minecraft.network.FriendlyByteBuf; import net.minecraft.network.codec.StreamCodec; import net.minecraft.server.level.ServerPlayer; import net.minecraft.world.item.ItemStack; -import java.util.ArrayList; -import java.util.Collection; - public class EngineStartPacket extends EngineControllerPacketBase { diff --git a/src/main/java/com/drmangotea/tfmg/content/engines/engine_controller/packets/TransmissionShiftPacket.java b/src/main/java/com/drmangotea/tfmg/content/engines/engine_controller/packets/TransmissionShiftPacket.java index 3661ad95..39ab6fe3 100644 --- a/src/main/java/com/drmangotea/tfmg/content/engines/engine_controller/packets/TransmissionShiftPacket.java +++ b/src/main/java/com/drmangotea/tfmg/content/engines/engine_controller/packets/TransmissionShiftPacket.java @@ -1,20 +1,16 @@ package com.drmangotea.tfmg.content.engines.engine_controller.packets; -import com.drmangotea.tfmg.TFMG; import com.drmangotea.tfmg.content.engines.engine_controller.EngineControllerBlockEntity; import com.drmangotea.tfmg.registry.TFMGPackets; import io.netty.buffer.ByteBuf; import net.createmod.catnip.codecs.stream.CatnipStreamCodecBuilders; import net.createmod.catnip.codecs.stream.CatnipStreamCodecs; import net.minecraft.core.BlockPos; -import net.minecraft.network.FriendlyByteBuf; import net.minecraft.network.codec.ByteBufCodecs; import net.minecraft.network.codec.StreamCodec; import net.minecraft.server.level.ServerPlayer; import net.minecraft.world.item.ItemStack; -import java.util.ArrayList; -import java.util.Collection; import java.util.List; public class TransmissionShiftPacket extends EngineControllerPacketBase { diff --git a/src/main/java/com/drmangotea/tfmg/content/engines/engine_gearbox/EngineGearboxBlock.java b/src/main/java/com/drmangotea/tfmg/content/engines/engine_gearbox/EngineGearboxBlock.java index e0b0bed1..84469dd8 100644 --- a/src/main/java/com/drmangotea/tfmg/content/engines/engine_gearbox/EngineGearboxBlock.java +++ b/src/main/java/com/drmangotea/tfmg/content/engines/engine_gearbox/EngineGearboxBlock.java @@ -9,7 +9,6 @@ import net.minecraft.core.Direction; import net.minecraft.world.item.context.BlockPlaceContext; import net.minecraft.world.level.BlockGetter; import net.minecraft.world.level.LevelReader; -import net.minecraft.world.level.block.HorizontalDirectionalBlock; import net.minecraft.world.level.block.entity.BlockEntityType; import net.minecraft.world.level.block.state.BlockState; import net.minecraft.world.phys.shapes.CollisionContext; diff --git a/src/main/java/com/drmangotea/tfmg/content/engines/engine_gearbox/EngineGearboxRenderer.java b/src/main/java/com/drmangotea/tfmg/content/engines/engine_gearbox/EngineGearboxRenderer.java index 72ccffe2..fb57367d 100644 --- a/src/main/java/com/drmangotea/tfmg/content/engines/engine_gearbox/EngineGearboxRenderer.java +++ b/src/main/java/com/drmangotea/tfmg/content/engines/engine_gearbox/EngineGearboxRenderer.java @@ -1,7 +1,6 @@ package com.drmangotea.tfmg.content.engines.engine_gearbox; import com.simibubi.create.content.kinetics.base.KineticBlockEntityRenderer; -import com.simibubi.create.content.kinetics.gearbox.GearboxBlockEntity; import net.minecraft.client.renderer.blockentity.BlockEntityRendererProvider; public class EngineGearboxRenderer extends KineticBlockEntityRenderer { diff --git a/src/main/java/com/drmangotea/tfmg/content/engines/fuels/EngineFuelTypeManager.java b/src/main/java/com/drmangotea/tfmg/content/engines/fuels/EngineFuelTypeManager.java index e8734856..7b8372f3 100644 --- a/src/main/java/com/drmangotea/tfmg/content/engines/fuels/EngineFuelTypeManager.java +++ b/src/main/java/com/drmangotea/tfmg/content/engines/fuels/EngineFuelTypeManager.java @@ -1,15 +1,11 @@ package com.drmangotea.tfmg.content.engines.fuels; import com.drmangotea.tfmg.TFMG; -import com.drmangotea.tfmg.registry.TFMGPackets; import com.google.gson.Gson; import com.google.gson.JsonElement; import com.google.gson.JsonObject; -import net.minecraft.core.registries.BuiltInRegistries; -import net.minecraft.core.registries.Registries; import net.minecraft.network.FriendlyByteBuf; import net.minecraft.resources.ResourceLocation; -import net.minecraft.server.level.ServerPlayer; import net.minecraft.server.packs.resources.ResourceManager; import net.minecraft.server.packs.resources.SimpleJsonResourceReloadListener; import net.minecraft.tags.TagKey; @@ -21,7 +17,6 @@ import java.util.HashMap; import java.util.IdentityHashMap; import java.util.Map; import java.util.Optional; -import java.util.function.Supplier; public class EngineFuelTypeManager { public static final Map BUILTIN_TYPE_MAP = new HashMap<>(); diff --git a/src/main/java/com/drmangotea/tfmg/content/engines/fuels/FuelType.java b/src/main/java/com/drmangotea/tfmg/content/engines/fuels/FuelType.java index 8da95838..99a5749e 100644 --- a/src/main/java/com/drmangotea/tfmg/content/engines/fuels/FuelType.java +++ b/src/main/java/com/drmangotea/tfmg/content/engines/fuels/FuelType.java @@ -4,20 +4,13 @@ import com.drmangotea.tfmg.registry.TFMGTags; import com.google.gson.JsonElement; import com.google.gson.JsonObject; import com.google.gson.JsonPrimitive; -import com.simibubi.create.AllTags; -import net.minecraft.ResourceLocationException; -import net.minecraft.core.Holder; -import net.minecraft.core.registries.BuiltInRegistries; -import net.minecraft.core.registries.Registries; import net.minecraft.network.FriendlyByteBuf; import net.minecraft.resources.ResourceLocation; +import net.minecraft.tags.FluidTags; import net.minecraft.tags.TagKey; import net.minecraft.world.level.material.Fluid; import java.util.function.Consumer; import java.util.function.Predicate; -import java.util.function.Supplier; - -import static com.simibubi.create.AllTags.optionalTag; public class FuelType { TagKey fluid = TFMGTags.TFMGFluidTags.GASOLINE.tag; @@ -51,7 +44,7 @@ public class FuelType { public static FuelType fromJson(JsonObject object) { FuelType type = new FuelType(); try { - parseJsonPrimitive(object, "fluid", JsonPrimitive::isString, primitive -> type.fluid = optionalTag(BuiltInRegistries.FLUID, ResourceLocation.fromNamespaceAndPath("",primitive.getAsString()))); + parseJsonPrimitive(object, "fluid", JsonPrimitive::isString, primitive -> type.fluid = FluidTags.create(ResourceLocation.fromNamespaceAndPath("",primitive.getAsString()))); parseJsonPrimitive(object, "speed", JsonPrimitive::isNumber, primitive -> type.speed = primitive.getAsFloat()); parseJsonPrimitive(object, "efficiency", JsonPrimitive::isNumber, primitive -> type.efficiency = primitive.getAsFloat()); @@ -83,7 +76,7 @@ public class FuelType { public static FuelType fromBuffer(FriendlyByteBuf buffer) { FuelType type = new FuelType(); - type.fluid = optionalTag(BuiltInRegistries.FLUID,buffer.readResourceLocation()); + type.fluid = FluidTags.create(buffer.readResourceLocation()); type.speed = buffer.readFloat(); type.efficiency = buffer.readFloat(); type.stress = buffer.readFloat(); @@ -114,7 +107,7 @@ public class FuelType { result.stress = stress; return this; } - + public final Builder addFluids(TagKey tag) { diff --git a/src/main/java/com/drmangotea/tfmg/content/engines/types/AbstractSmallEngineBlockEntity.java b/src/main/java/com/drmangotea/tfmg/content/engines/types/AbstractSmallEngineBlockEntity.java index 3ac263f5..580c2af4 100644 --- a/src/main/java/com/drmangotea/tfmg/content/engines/types/AbstractSmallEngineBlockEntity.java +++ b/src/main/java/com/drmangotea/tfmg/content/engines/types/AbstractSmallEngineBlockEntity.java @@ -17,7 +17,6 @@ import com.drmangotea.tfmg.registry.TFMGFluids; import com.drmangotea.tfmg.registry.TFMGItems; import com.simibubi.create.AllBlocks; import com.simibubi.create.foundation.fluid.CombinedTankWrapper; -import com.simibubi.create.foundation.utility.CreateLang; import net.minecraft.ChatFormatting; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; diff --git a/src/main/java/com/drmangotea/tfmg/content/engines/types/large_engine/LargeEngineBlock.java b/src/main/java/com/drmangotea/tfmg/content/engines/types/large_engine/LargeEngineBlock.java index 495ae430..5dd7fc5c 100644 --- a/src/main/java/com/drmangotea/tfmg/content/engines/types/large_engine/LargeEngineBlock.java +++ b/src/main/java/com/drmangotea/tfmg/content/engines/types/large_engine/LargeEngineBlock.java @@ -22,7 +22,6 @@ import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; import net.minecraft.core.Direction.Axis; import net.minecraft.world.InteractionHand; -import net.minecraft.world.InteractionResult; import net.minecraft.world.ItemInteractionResult; import net.minecraft.world.entity.player.Player; import net.minecraft.world.item.BlockItem; @@ -32,7 +31,6 @@ import net.minecraft.world.level.BlockGetter; import net.minecraft.world.level.Level; import net.minecraft.world.level.LevelAccessor; import net.minecraft.world.level.block.Block; -import net.minecraft.world.level.block.CocoaBlock; import net.minecraft.world.level.block.HorizontalDirectionalBlock; import net.minecraft.world.level.block.entity.BlockEntityType; import net.minecraft.world.level.block.state.BlockState; diff --git a/src/main/java/com/drmangotea/tfmg/content/engines/types/large_engine/LargeEngineBlockEntity.java b/src/main/java/com/drmangotea/tfmg/content/engines/types/large_engine/LargeEngineBlockEntity.java index 975f3a93..4c2df6a5 100644 --- a/src/main/java/com/drmangotea/tfmg/content/engines/types/large_engine/LargeEngineBlockEntity.java +++ b/src/main/java/com/drmangotea/tfmg/content/engines/types/large_engine/LargeEngineBlockEntity.java @@ -10,14 +10,12 @@ import com.drmangotea.tfmg.registry.TFMGBlockEntities; import com.drmangotea.tfmg.registry.TFMGBlocks; import com.drmangotea.tfmg.registry.TFMGSoundEvents; import com.drmangotea.tfmg.registry.TFMGTags; -import com.simibubi.create.content.kinetics.base.GeneratingKineticBlockEntity; import com.simibubi.create.content.kinetics.base.KineticBlockEntityRenderer; import com.simibubi.create.content.kinetics.belt.behaviour.DirectBeltInputBehaviour; import com.simibubi.create.content.kinetics.steamEngine.PoweredShaftBlockEntity; import com.simibubi.create.content.kinetics.steamEngine.SteamEngineBlock; import com.simibubi.create.foundation.blockEntity.behaviour.BlockEntityBehaviour; import com.simibubi.create.foundation.fluid.CombinedTankWrapper; -import com.simibubi.create.foundation.utility.CreateLang; import net.createmod.catnip.math.AngleHelper; import net.minecraft.ChatFormatting; import net.minecraft.core.BlockPos; @@ -41,7 +39,6 @@ import net.neoforged.neoforge.fluids.FluidStack; import net.neoforged.neoforge.fluids.capability.IFluidHandler; -import javax.annotation.Nonnull; import javax.annotation.Nullable; import java.lang.ref.WeakReference; import java.util.List; diff --git a/src/main/java/com/drmangotea/tfmg/content/engines/types/radial_engine/RadialEngineBlock.java b/src/main/java/com/drmangotea/tfmg/content/engines/types/radial_engine/RadialEngineBlock.java index fe4854f1..1df2b0ad 100644 --- a/src/main/java/com/drmangotea/tfmg/content/engines/types/radial_engine/RadialEngineBlock.java +++ b/src/main/java/com/drmangotea/tfmg/content/engines/types/radial_engine/RadialEngineBlock.java @@ -4,7 +4,6 @@ import com.drmangotea.tfmg.base.TFMGShapes; import com.drmangotea.tfmg.content.engines.types.regular_engine.RegularEngineBlock; import com.drmangotea.tfmg.content.engines.types.regular_engine.RegularEngineBlockEntity; import com.drmangotea.tfmg.registry.TFMGBlockEntities; -import com.simibubi.create.foundation.block.IBE; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; import net.minecraft.world.level.BlockGetter; diff --git a/src/main/java/com/drmangotea/tfmg/content/engines/types/radial_engine/RadialEngineBlockEntity.java b/src/main/java/com/drmangotea/tfmg/content/engines/types/radial_engine/RadialEngineBlockEntity.java index 38b02e35..6f4cb9f7 100644 --- a/src/main/java/com/drmangotea/tfmg/content/engines/types/radial_engine/RadialEngineBlockEntity.java +++ b/src/main/java/com/drmangotea/tfmg/content/engines/types/radial_engine/RadialEngineBlockEntity.java @@ -1,6 +1,5 @@ package com.drmangotea.tfmg.content.engines.types.radial_engine; -import com.drmangotea.tfmg.content.engines.base.AbstractEngineBlockEntity; import com.drmangotea.tfmg.content.engines.types.AbstractSmallEngineBlockEntity; import com.drmangotea.tfmg.content.engines.types.regular_engine.RegularEngineBlockEntity; import net.minecraft.core.BlockPos; @@ -12,7 +11,6 @@ import net.minecraft.world.phys.AABB; import static com.drmangotea.tfmg.content.engines.base.EngineBlock.ENGINE_STATE; import static com.drmangotea.tfmg.content.engines.base.EngineBlock.EngineState.*; import static com.drmangotea.tfmg.content.engines.base.EngineBlock.SHAFT_FACING; -import static com.simibubi.create.content.kinetics.base.HorizontalKineticBlock.HORIZONTAL_FACING; public class RadialEngineBlockEntity extends RegularEngineBlockEntity { diff --git a/src/main/java/com/drmangotea/tfmg/content/engines/types/regular_engine/RegularEngineBlock.java b/src/main/java/com/drmangotea/tfmg/content/engines/types/regular_engine/RegularEngineBlock.java index d3a118c3..eb1e0c5a 100644 --- a/src/main/java/com/drmangotea/tfmg/content/engines/types/regular_engine/RegularEngineBlock.java +++ b/src/main/java/com/drmangotea/tfmg/content/engines/types/regular_engine/RegularEngineBlock.java @@ -1,7 +1,6 @@ package com.drmangotea.tfmg.content.engines.types.regular_engine; import com.drmangotea.tfmg.content.electricity.base.IElectric; -import com.drmangotea.tfmg.content.engines.base.AbstractEngineBlockEntity; import com.drmangotea.tfmg.content.engines.base.EngineBlock; import com.drmangotea.tfmg.content.engines.types.AbstractSmallEngineBlockEntity; import com.drmangotea.tfmg.registry.TFMGBlockEntities; @@ -9,7 +8,6 @@ import com.drmangotea.tfmg.registry.TFMGItems; import com.simibubi.create.foundation.block.IBE; import net.minecraft.core.BlockPos; import net.minecraft.world.InteractionHand; -import net.minecraft.world.InteractionResult; import net.minecraft.world.ItemInteractionResult; import net.minecraft.world.entity.player.Player; import net.minecraft.world.item.ItemStack; diff --git a/src/main/java/com/drmangotea/tfmg/content/engines/types/regular_engine/RegularEngineBlockEntity.java b/src/main/java/com/drmangotea/tfmg/content/engines/types/regular_engine/RegularEngineBlockEntity.java index 51e81a64..9d21d34f 100644 --- a/src/main/java/com/drmangotea/tfmg/content/engines/types/regular_engine/RegularEngineBlockEntity.java +++ b/src/main/java/com/drmangotea/tfmg/content/engines/types/regular_engine/RegularEngineBlockEntity.java @@ -1,8 +1,6 @@ package com.drmangotea.tfmg.content.engines.types.regular_engine; -import com.drmangotea.tfmg.TFMG; import com.drmangotea.tfmg.base.TFMGUtils; -import com.drmangotea.tfmg.base.lang.TFMGLang; import com.drmangotea.tfmg.base.lang.TFMGTexts; import com.drmangotea.tfmg.config.TFMGConfigs; import com.drmangotea.tfmg.content.engines.types.AbstractSmallEngineBlockEntity; @@ -13,7 +11,6 @@ import com.drmangotea.tfmg.registry.TFMGSoundEvents; import com.simibubi.create.AllItems; import com.simibubi.create.AllSoundEvents; import com.simibubi.create.foundation.item.SmartInventory; -import com.simibubi.create.foundation.utility.CreateLang; import net.minecraft.ChatFormatting; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; @@ -22,6 +19,7 @@ import net.minecraft.core.registries.BuiltInRegistries; import net.minecraft.nbt.CompoundTag; import net.minecraft.network.chat.Component; import net.minecraft.resources.ResourceLocation; +import net.minecraft.tags.FluidTags; import net.minecraft.tags.TagKey; import net.minecraft.world.InteractionHand; import net.minecraft.world.entity.player.Player; @@ -95,7 +93,7 @@ public class RegularEngineBlockEntity extends AbstractSmallEngineBlockEntity { String id = fuelsToAllow.getString(key); - TagKey tag = optionalTag(BuiltInRegistries.FLUID, ResourceLocation.fromNamespaceAndPath("c",id.replace("c:",""))); + TagKey tag = FluidTags.create(ResourceLocation.fromNamespaceAndPath("c",id.replace("c:",""))); fuelsFound.add(tag); } diff --git a/src/main/java/com/drmangotea/tfmg/content/engines/types/regular_engine/RegularEngineRenderer.java b/src/main/java/com/drmangotea/tfmg/content/engines/types/regular_engine/RegularEngineRenderer.java index 462db710..c520aa24 100644 --- a/src/main/java/com/drmangotea/tfmg/content/engines/types/regular_engine/RegularEngineRenderer.java +++ b/src/main/java/com/drmangotea/tfmg/content/engines/types/regular_engine/RegularEngineRenderer.java @@ -1,6 +1,5 @@ package com.drmangotea.tfmg.content.engines.types.regular_engine; -import com.drmangotea.tfmg.content.engines.base.AbstractEngineBlockEntity; import com.drmangotea.tfmg.content.engines.base.EngineRenderer; import com.drmangotea.tfmg.content.engines.types.AbstractSmallEngineBlockEntity; import com.drmangotea.tfmg.content.engines.types.turbine_engine.TurbineEngineBlockEntity; diff --git a/src/main/java/com/drmangotea/tfmg/content/engines/types/regular_engine/RegularEngineVisual.java b/src/main/java/com/drmangotea/tfmg/content/engines/types/regular_engine/RegularEngineVisual.java index 48ec4d8f..771fcd88 100644 --- a/src/main/java/com/drmangotea/tfmg/content/engines/types/regular_engine/RegularEngineVisual.java +++ b/src/main/java/com/drmangotea/tfmg/content/engines/types/regular_engine/RegularEngineVisual.java @@ -1,14 +1,10 @@ package com.drmangotea.tfmg.content.engines.types.regular_engine; -import com.drmangotea.tfmg.content.engines.base.AbstractEngineBlockEntity; -import com.drmangotea.tfmg.content.engines.base.EngineBlock; import com.drmangotea.tfmg.content.engines.types.AbstractSmallEngineBlockEntity; -import com.drmangotea.tfmg.content.machinery.vat.industrial_mixer.IndustrialMixerBlockEntity; import com.simibubi.create.AllPartialModels; import com.simibubi.create.content.kinetics.base.IRotate; import com.simibubi.create.content.kinetics.base.KineticBlockEntityVisual; import com.simibubi.create.content.kinetics.base.RotatingInstance; -import com.simibubi.create.content.kinetics.simpleRelays.BracketedKineticBlockEntityRenderer; import com.simibubi.create.foundation.render.AllInstanceTypes; import dev.engine_room.flywheel.api.instance.Instance; import dev.engine_room.flywheel.api.visualization.VisualizationContext; diff --git a/src/main/java/com/drmangotea/tfmg/content/engines/types/turbine_engine/TurbineEngineBlock.java b/src/main/java/com/drmangotea/tfmg/content/engines/types/turbine_engine/TurbineEngineBlock.java index 83df5d90..c9c24a9f 100644 --- a/src/main/java/com/drmangotea/tfmg/content/engines/types/turbine_engine/TurbineEngineBlock.java +++ b/src/main/java/com/drmangotea/tfmg/content/engines/types/turbine_engine/TurbineEngineBlock.java @@ -1,16 +1,12 @@ package com.drmangotea.tfmg.content.engines.types.turbine_engine; import com.drmangotea.tfmg.base.TFMGShapes; -import com.drmangotea.tfmg.content.electricity.base.IElectric; -import com.drmangotea.tfmg.content.engines.base.EngineBlock; import com.drmangotea.tfmg.content.engines.types.radial_engine.RadialEngineBlock; import com.drmangotea.tfmg.content.engines.types.regular_engine.RegularEngineBlockEntity; import com.drmangotea.tfmg.registry.TFMGBlockEntities; -import com.simibubi.create.foundation.block.IBE; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; import net.minecraft.world.level.BlockGetter; -import net.minecraft.world.level.Level; import net.minecraft.world.level.LevelReader; import net.minecraft.world.level.block.entity.BlockEntityType; import net.minecraft.world.level.block.state.BlockState; diff --git a/src/main/java/com/drmangotea/tfmg/content/engines/types/turbine_engine/TurbineEngineBlockEntity.java b/src/main/java/com/drmangotea/tfmg/content/engines/types/turbine_engine/TurbineEngineBlockEntity.java index 7a5850f9..605d93c1 100644 --- a/src/main/java/com/drmangotea/tfmg/content/engines/types/turbine_engine/TurbineEngineBlockEntity.java +++ b/src/main/java/com/drmangotea/tfmg/content/engines/types/turbine_engine/TurbineEngineBlockEntity.java @@ -1,33 +1,20 @@ package com.drmangotea.tfmg.content.engines.types.turbine_engine; -import com.drmangotea.tfmg.content.engines.base.AbstractEngineBlockEntity; import com.drmangotea.tfmg.content.engines.base.EngineComponentsInventory; import com.drmangotea.tfmg.content.engines.base.EngineProperties; import com.drmangotea.tfmg.content.engines.types.AbstractSmallEngineBlockEntity; -import com.drmangotea.tfmg.content.engines.types.radial_engine.RadialEngineBlockEntity; import com.drmangotea.tfmg.content.engines.types.regular_engine.RegularEngineBlockEntity; import com.drmangotea.tfmg.registry.TFMGItems; -import com.drmangotea.tfmg.registry.TFMGTags; -import com.simibubi.create.foundation.item.SmartInventory; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; -import net.minecraft.nbt.CompoundTag; -import net.minecraft.tags.TagKey; -import net.minecraft.world.InteractionHand; -import net.minecraft.world.entity.player.Player; import net.minecraft.world.item.ItemStack; import net.minecraft.world.level.block.entity.BlockEntityType; import net.minecraft.world.level.block.state.BlockState; -import net.minecraft.world.level.material.Fluid; -import net.minecraft.world.phys.AABB; - -import java.util.ArrayList; -import java.util.List; import static com.drmangotea.tfmg.content.engines.base.EngineBlock.ENGINE_STATE; import static com.drmangotea.tfmg.content.engines.base.EngineBlock.EngineState.*; import static com.drmangotea.tfmg.content.engines.base.EngineBlock.SHAFT_FACING; -import static com.simibubi.create.content.kinetics.base.HorizontalKineticBlock.HORIZONTAL_FACING; + public class TurbineEngineBlockEntity extends RegularEngineBlockEntity { public TurbineEngineBlockEntity(BlockEntityType typeIn, BlockPos pos, BlockState state) { diff --git a/src/main/java/com/drmangotea/tfmg/content/engines/types/turbine_engine/TurbineEngineGenerator.java b/src/main/java/com/drmangotea/tfmg/content/engines/types/turbine_engine/TurbineEngineGenerator.java index 823e1a1b..152dfbfe 100644 --- a/src/main/java/com/drmangotea/tfmg/content/engines/types/turbine_engine/TurbineEngineGenerator.java +++ b/src/main/java/com/drmangotea/tfmg/content/engines/types/turbine_engine/TurbineEngineGenerator.java @@ -12,7 +12,6 @@ import net.minecraft.world.level.block.state.BlockState; import net.neoforged.neoforge.client.model.generators.ModelFile; import static com.drmangotea.tfmg.content.engines.base.EngineBlock.ENGINE_STATE; -import static com.drmangotea.tfmg.content.engines.types.regular_engine.RegularEngineBlock.EXTENDED; public class TurbineEngineGenerator extends SpecialBlockStateGen { diff --git a/src/main/java/com/drmangotea/tfmg/content/engines/upgrades/EnginePipingUpgrade.java b/src/main/java/com/drmangotea/tfmg/content/engines/upgrades/EnginePipingUpgrade.java index 42be5a3c..d8161e7d 100644 --- a/src/main/java/com/drmangotea/tfmg/content/engines/upgrades/EnginePipingUpgrade.java +++ b/src/main/java/com/drmangotea/tfmg/content/engines/upgrades/EnginePipingUpgrade.java @@ -1,8 +1,6 @@ package com.drmangotea.tfmg.content.engines.upgrades; -import com.drmangotea.tfmg.TFMG; - import com.drmangotea.tfmg.content.engines.types.AbstractSmallEngineBlockEntity; import com.drmangotea.tfmg.registry.TFMGBlocks; import com.simibubi.create.content.fluids.tank.FluidTankBlockEntity; diff --git a/src/main/java/com/drmangotea/tfmg/content/engines/upgrades/TransmissionItem.java b/src/main/java/com/drmangotea/tfmg/content/engines/upgrades/TransmissionItem.java index 61668981..227e8b87 100644 --- a/src/main/java/com/drmangotea/tfmg/content/engines/upgrades/TransmissionItem.java +++ b/src/main/java/com/drmangotea/tfmg/content/engines/upgrades/TransmissionItem.java @@ -3,7 +3,6 @@ package com.drmangotea.tfmg.content.engines.upgrades; import com.drmangotea.tfmg.base.lang.TFMGLang; import com.drmangotea.tfmg.content.engines.engine_controller.EngineControllerBlockEntity; import com.drmangotea.tfmg.registry.TFMGDataComponents; -import com.simibubi.create.foundation.utility.CreateLang; import net.minecraft.ChatFormatting; import net.minecraft.core.BlockPos; import net.minecraft.network.chat.Component; @@ -20,7 +19,6 @@ import net.neoforged.api.distmarker.Dist; import net.neoforged.api.distmarker.OnlyIn; -import javax.tools.Tool; import java.util.List; public class TransmissionItem extends Item { diff --git a/src/main/java/com/drmangotea/tfmg/content/engines/upgrades/TransmissionUpgrade.java b/src/main/java/com/drmangotea/tfmg/content/engines/upgrades/TransmissionUpgrade.java index df95834d..5c18d51b 100644 --- a/src/main/java/com/drmangotea/tfmg/content/engines/upgrades/TransmissionUpgrade.java +++ b/src/main/java/com/drmangotea/tfmg/content/engines/upgrades/TransmissionUpgrade.java @@ -9,7 +9,6 @@ import net.createmod.catnip.render.CachedBuffers; import net.minecraft.client.renderer.MultiBufferSource; import net.minecraft.client.renderer.RenderType; import net.minecraft.core.Direction; -import net.minecraft.nbt.CompoundTag; import net.minecraft.world.item.Item; import net.minecraft.world.level.block.state.BlockState; diff --git a/src/main/java/com/drmangotea/tfmg/content/items/weapons/LeadAxeItem.java b/src/main/java/com/drmangotea/tfmg/content/items/weapons/LeadAxeItem.java index a6c91962..cd4571bc 100644 --- a/src/main/java/com/drmangotea/tfmg/content/items/weapons/LeadAxeItem.java +++ b/src/main/java/com/drmangotea/tfmg/content/items/weapons/LeadAxeItem.java @@ -2,7 +2,6 @@ package com.drmangotea.tfmg.content.items.weapons; import net.minecraft.world.effect.MobEffectInstance; import net.minecraft.world.effect.MobEffects; -import net.minecraft.world.entity.EquipmentSlot; import net.minecraft.world.entity.LivingEntity; import net.minecraft.world.item.AxeItem; import net.minecraft.world.item.ItemStack; diff --git a/src/main/java/com/drmangotea/tfmg/content/items/weapons/LeadSwordItem.java b/src/main/java/com/drmangotea/tfmg/content/items/weapons/LeadSwordItem.java index dab541ea..0d1db838 100644 --- a/src/main/java/com/drmangotea/tfmg/content/items/weapons/LeadSwordItem.java +++ b/src/main/java/com/drmangotea/tfmg/content/items/weapons/LeadSwordItem.java @@ -2,7 +2,6 @@ package com.drmangotea.tfmg.content.items.weapons; import net.minecraft.world.effect.MobEffectInstance; import net.minecraft.world.effect.MobEffects; -import net.minecraft.world.entity.EquipmentSlot; import net.minecraft.world.entity.LivingEntity; import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.SwordItem; diff --git a/src/main/java/com/drmangotea/tfmg/content/items/weapons/advanced_potato_cannon/AdvancedPotatoCannonItem.java b/src/main/java/com/drmangotea/tfmg/content/items/weapons/advanced_potato_cannon/AdvancedPotatoCannonItem.java index 5e1e0546..1ea8a161 100644 --- a/src/main/java/com/drmangotea/tfmg/content/items/weapons/advanced_potato_cannon/AdvancedPotatoCannonItem.java +++ b/src/main/java/com/drmangotea/tfmg/content/items/weapons/advanced_potato_cannon/AdvancedPotatoCannonItem.java @@ -13,10 +13,8 @@ import com.simibubi.create.content.equipment.zapper.ShootableGadgetItemMethods; import com.simibubi.create.foundation.item.CustomArmPoseItem; import com.simibubi.create.foundation.item.render.SimpleCustomRenderer; import com.simibubi.create.infrastructure.config.AllConfigs; -import net.minecraft.client.Minecraft; import net.minecraft.client.model.HumanoidModel.ArmPose; import net.minecraft.client.player.AbstractClientPlayer; -import net.minecraft.client.player.LocalPlayer; import net.minecraft.core.BlockPos; import net.minecraft.world.InteractionHand; import net.minecraft.world.InteractionResult; diff --git a/src/main/java/com/drmangotea/tfmg/content/items/weapons/advanced_potato_cannon/AdvancedPotatoCannonItemRenderer.java b/src/main/java/com/drmangotea/tfmg/content/items/weapons/advanced_potato_cannon/AdvancedPotatoCannonItemRenderer.java index a9633266..418661af 100644 --- a/src/main/java/com/drmangotea/tfmg/content/items/weapons/advanced_potato_cannon/AdvancedPotatoCannonItemRenderer.java +++ b/src/main/java/com/drmangotea/tfmg/content/items/weapons/advanced_potato_cannon/AdvancedPotatoCannonItemRenderer.java @@ -2,11 +2,8 @@ package com.drmangotea.tfmg.content.items.weapons.advanced_potato_cannon; import com.drmangotea.tfmg.TFMGClient; -import com.drmangotea.tfmg.content.items.weapons.quad_potato_cannon.QuadPotatoCannonItem; -import com.drmangotea.tfmg.registry.TFMGItems; import com.mojang.blaze3d.vertex.PoseStack; import com.mojang.math.Axis; -import com.simibubi.create.content.equipment.potatoCannon.PotatoCannonItem; import com.simibubi.create.foundation.item.render.CustomRenderedItemModel; import com.simibubi.create.foundation.item.render.CustomRenderedItemModelRenderer; import com.simibubi.create.foundation.item.render.PartialItemModelRenderer; @@ -14,7 +11,6 @@ import net.createmod.catnip.animation.AnimationTickHolder; import net.minecraft.client.Minecraft; import net.minecraft.client.player.LocalPlayer; import net.minecraft.client.renderer.MultiBufferSource; -import net.minecraft.client.renderer.entity.ItemRenderer; import net.minecraft.util.Mth; import net.minecraft.world.entity.HumanoidArm; import net.minecraft.world.item.ItemDisplayContext; diff --git a/src/main/java/com/drmangotea/tfmg/content/items/weapons/advanced_potato_cannon/AdvancedPotatoCannonPacket.java b/src/main/java/com/drmangotea/tfmg/content/items/weapons/advanced_potato_cannon/AdvancedPotatoCannonPacket.java index 22f375d8..1b42d460 100644 --- a/src/main/java/com/drmangotea/tfmg/content/items/weapons/advanced_potato_cannon/AdvancedPotatoCannonPacket.java +++ b/src/main/java/com/drmangotea/tfmg/content/items/weapons/advanced_potato_cannon/AdvancedPotatoCannonPacket.java @@ -1,15 +1,10 @@ package com.drmangotea.tfmg.content.items.weapons.advanced_potato_cannon; -import com.drmangotea.tfmg.TFMG; import com.drmangotea.tfmg.TFMGClient; import com.drmangotea.tfmg.registry.TFMGPackets; -import com.simibubi.create.AllPackets; -import com.simibubi.create.CreateClient; -import com.simibubi.create.content.equipment.potatoCannon.PotatoCannonPacket; import com.simibubi.create.content.equipment.zapper.ShootGadgetPacket; import com.simibubi.create.content.equipment.zapper.ShootableGadgetRenderHandler; import net.createmod.catnip.codecs.stream.CatnipStreamCodecs; -import net.minecraft.network.FriendlyByteBuf; import net.minecraft.network.RegistryFriendlyByteBuf; import net.minecraft.network.codec.ByteBufCodecs; import net.minecraft.network.codec.StreamCodec; diff --git a/src/main/java/com/drmangotea/tfmg/content/items/weapons/explosives/napalm/NapalmBombBlock.java b/src/main/java/com/drmangotea/tfmg/content/items/weapons/explosives/napalm/NapalmBombBlock.java index 19607b1f..a237dddf 100644 --- a/src/main/java/com/drmangotea/tfmg/content/items/weapons/explosives/napalm/NapalmBombBlock.java +++ b/src/main/java/com/drmangotea/tfmg/content/items/weapons/explosives/napalm/NapalmBombBlock.java @@ -5,7 +5,6 @@ import net.minecraft.sounds.SoundEvents; import net.minecraft.sounds.SoundSource; import net.minecraft.stats.Stats; import net.minecraft.world.InteractionHand; -import net.minecraft.world.InteractionResult; import net.minecraft.world.ItemInteractionResult; import net.minecraft.world.entity.Entity; import net.minecraft.world.entity.LivingEntity; diff --git a/src/main/java/com/drmangotea/tfmg/content/items/weapons/explosives/napalm/NapalmBombEntity.java b/src/main/java/com/drmangotea/tfmg/content/items/weapons/explosives/napalm/NapalmBombEntity.java index f87aaeea..a05809fc 100644 --- a/src/main/java/com/drmangotea/tfmg/content/items/weapons/explosives/napalm/NapalmBombEntity.java +++ b/src/main/java/com/drmangotea/tfmg/content/items/weapons/explosives/napalm/NapalmBombEntity.java @@ -6,14 +6,10 @@ import com.drmangotea.tfmg.registry.TFMGEntityTypes; import net.minecraft.core.BlockPos; import net.minecraft.core.particles.ParticleTypes; import net.minecraft.nbt.CompoundTag; -import net.minecraft.network.protocol.Packet; -import net.minecraft.network.protocol.game.ClientGamePacketListener; -import net.minecraft.network.protocol.game.ClientboundAddEntityPacket; import net.minecraft.network.syncher.EntityDataAccessor; import net.minecraft.network.syncher.EntityDataSerializers; import net.minecraft.network.syncher.SynchedEntityData; import net.minecraft.world.entity.*; -import net.minecraft.world.entity.item.PrimedTnt; import net.minecraft.world.level.Level; import javax.annotation.Nullable; diff --git a/src/main/java/com/drmangotea/tfmg/content/items/weapons/explosives/thermite_grenades/ThermiteGrenade.java b/src/main/java/com/drmangotea/tfmg/content/items/weapons/explosives/thermite_grenades/ThermiteGrenade.java index 84d42497..e4b29185 100644 --- a/src/main/java/com/drmangotea/tfmg/content/items/weapons/explosives/thermite_grenades/ThermiteGrenade.java +++ b/src/main/java/com/drmangotea/tfmg/content/items/weapons/explosives/thermite_grenades/ThermiteGrenade.java @@ -1,6 +1,5 @@ package com.drmangotea.tfmg.content.items.weapons.explosives.thermite_grenades; -import com.drmangotea.tfmg.TFMG; import com.drmangotea.tfmg.base.spark.BlueSpark; import com.drmangotea.tfmg.base.spark.GreenSpark; import com.drmangotea.tfmg.base.spark.Spark; diff --git a/src/main/java/com/drmangotea/tfmg/content/items/weapons/fire_extinguisher/FireExtinguisherItem.java b/src/main/java/com/drmangotea/tfmg/content/items/weapons/fire_extinguisher/FireExtinguisherItem.java index b2ba9dc7..2c0c2251 100644 --- a/src/main/java/com/drmangotea/tfmg/content/items/weapons/fire_extinguisher/FireExtinguisherItem.java +++ b/src/main/java/com/drmangotea/tfmg/content/items/weapons/fire_extinguisher/FireExtinguisherItem.java @@ -1,12 +1,10 @@ package com.drmangotea.tfmg.content.items.weapons.fire_extinguisher; -import com.drmangotea.tfmg.TFMGClient; import com.drmangotea.tfmg.base.spark.DryIceFlake; import com.drmangotea.tfmg.registry.TFMGEntityTypes; import com.simibubi.create.foundation.item.CustomArmPoseItem; import net.minecraft.client.model.HumanoidModel; import net.minecraft.client.player.AbstractClientPlayer; -import net.minecraft.nbt.CompoundTag; import net.minecraft.sounds.SoundEvents; import net.minecraft.sounds.SoundSource; import net.minecraft.world.InteractionHand; diff --git a/src/main/java/com/drmangotea/tfmg/content/items/weapons/flamethrover/FlamethrowerFuel.java b/src/main/java/com/drmangotea/tfmg/content/items/weapons/flamethrover/FlamethrowerFuel.java index 160891a9..7cb5b4f7 100644 --- a/src/main/java/com/drmangotea/tfmg/content/items/weapons/flamethrover/FlamethrowerFuel.java +++ b/src/main/java/com/drmangotea/tfmg/content/items/weapons/flamethrover/FlamethrowerFuel.java @@ -8,7 +8,6 @@ import com.mojang.serialization.codecs.RecordCodecBuilder; import io.netty.buffer.ByteBuf; import net.minecraft.core.Holder; import net.minecraft.core.RegistryAccess; -import net.minecraft.nbt.Tag; import net.minecraft.network.codec.ByteBufCodecs; import net.minecraft.network.codec.StreamCodec; import net.minecraft.resources.ResourceKey; diff --git a/src/main/java/com/drmangotea/tfmg/content/items/weapons/flamethrover/FlamethrowerFuelType.java b/src/main/java/com/drmangotea/tfmg/content/items/weapons/flamethrover/FlamethrowerFuelType.java index a62f5450..09e21dd9 100644 --- a/src/main/java/com/drmangotea/tfmg/content/items/weapons/flamethrover/FlamethrowerFuelType.java +++ b/src/main/java/com/drmangotea/tfmg/content/items/weapons/flamethrover/FlamethrowerFuelType.java @@ -3,16 +3,12 @@ package com.drmangotea.tfmg.content.items.weapons.flamethrover; import com.drmangotea.tfmg.TFMGRegistries; import com.mojang.serialization.Codec; import com.mojang.serialization.codecs.RecordCodecBuilder; -import com.simibubi.create.api.equipment.potatoCannon.PotatoCannonProjectileType; -import com.simibubi.create.api.registry.CreateRegistries; import com.simibubi.create.foundation.fluid.FluidHelper; import net.minecraft.core.Holder; import net.minecraft.core.HolderSet; import net.minecraft.core.RegistryAccess; import net.minecraft.core.RegistryCodecs; import net.minecraft.core.registries.Registries; -import net.minecraft.world.item.Item; -import net.minecraft.world.level.ItemLike; import net.minecraft.world.level.material.Fluid; import java.util.ArrayList; diff --git a/src/main/java/com/drmangotea/tfmg/content/items/weapons/flamethrover/FlamethrowerItem.java b/src/main/java/com/drmangotea/tfmg/content/items/weapons/flamethrover/FlamethrowerItem.java index 1d87d114..c49971a0 100644 --- a/src/main/java/com/drmangotea/tfmg/content/items/weapons/flamethrover/FlamethrowerItem.java +++ b/src/main/java/com/drmangotea/tfmg/content/items/weapons/flamethrover/FlamethrowerItem.java @@ -8,9 +8,7 @@ import com.drmangotea.tfmg.base.spark.Spark; import com.drmangotea.tfmg.registry.TFMGDataComponents; import com.drmangotea.tfmg.registry.TFMGEntityTypes; import com.drmangotea.tfmg.registry.TFMGFlamethrowerFuelTypes; -import com.simibubi.create.content.equipment.zapper.ShootableGadgetItemMethods; import com.simibubi.create.foundation.item.CustomArmPoseItem; -import com.simibubi.create.foundation.utility.CreateLang; import net.minecraft.ChatFormatting; import net.minecraft.client.Minecraft; import net.minecraft.client.model.HumanoidModel; @@ -48,7 +46,6 @@ import net.neoforged.neoforge.fluids.capability.IFluidHandler; import org.jetbrains.annotations.Nullable; import java.util.List; -import java.util.Objects; public class FlamethrowerItem extends Item implements CustomArmPoseItem { diff --git a/src/main/java/com/drmangotea/tfmg/content/items/weapons/lithium_blade/LitLithiumBladeItem.java b/src/main/java/com/drmangotea/tfmg/content/items/weapons/lithium_blade/LitLithiumBladeItem.java index 36812431..ad497caa 100644 --- a/src/main/java/com/drmangotea/tfmg/content/items/weapons/lithium_blade/LitLithiumBladeItem.java +++ b/src/main/java/com/drmangotea/tfmg/content/items/weapons/lithium_blade/LitLithiumBladeItem.java @@ -2,7 +2,6 @@ package com.drmangotea.tfmg.content.items.weapons.lithium_blade; import com.drmangotea.tfmg.base.spark.LithiumSpark; -import com.drmangotea.tfmg.base.spark.Spark; import com.drmangotea.tfmg.registry.TFMGDataComponents; import com.drmangotea.tfmg.registry.TFMGEntityTypes; import com.drmangotea.tfmg.registry.TFMGItems; diff --git a/src/main/java/com/drmangotea/tfmg/content/items/weapons/lithium_blade/LithiumBladeItem.java b/src/main/java/com/drmangotea/tfmg/content/items/weapons/lithium_blade/LithiumBladeItem.java index 78f3ceb9..4dbe69bf 100644 --- a/src/main/java/com/drmangotea/tfmg/content/items/weapons/lithium_blade/LithiumBladeItem.java +++ b/src/main/java/com/drmangotea/tfmg/content/items/weapons/lithium_blade/LithiumBladeItem.java @@ -10,12 +10,9 @@ import net.minecraft.world.entity.player.Player; import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.SwordItem; import net.minecraft.world.item.Tier; -import net.minecraft.world.item.enchantment.Enchantment; import net.minecraft.world.item.enchantment.ItemEnchantments; import net.minecraft.world.level.Level; -import java.util.Map; - public class LithiumBladeItem extends SwordItem { diff --git a/src/main/java/com/drmangotea/tfmg/content/items/weapons/quad_potato_cannon/QuadPotatoCannonItem.java b/src/main/java/com/drmangotea/tfmg/content/items/weapons/quad_potato_cannon/QuadPotatoCannonItem.java index 866dd1f5..61004323 100644 --- a/src/main/java/com/drmangotea/tfmg/content/items/weapons/quad_potato_cannon/QuadPotatoCannonItem.java +++ b/src/main/java/com/drmangotea/tfmg/content/items/weapons/quad_potato_cannon/QuadPotatoCannonItem.java @@ -15,7 +15,6 @@ import com.simibubi.create.content.equipment.potatoCannon.PotatoProjectileEntity import com.simibubi.create.content.equipment.zapper.ShootableGadgetItemMethods; import com.simibubi.create.foundation.item.CustomArmPoseItem; import com.simibubi.create.foundation.item.render.SimpleCustomRenderer; -import com.simibubi.create.foundation.utility.CreateLang; import com.simibubi.create.foundation.utility.GlobalRegistryAccess; import com.simibubi.create.infrastructure.config.AllConfigs; import net.createmod.catnip.math.VecHelper; @@ -54,6 +53,7 @@ import net.minecraft.world.phys.Vec3; import net.neoforged.api.distmarker.Dist; import net.neoforged.api.distmarker.OnlyIn; import net.neoforged.neoforge.client.extensions.common.IClientItemExtensions; +import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import java.util.List; @@ -91,7 +91,7 @@ public class QuadPotatoCannonItem extends ProjectileWeaponItem implements Custom } @Override - public InteractionResultHolder use(Level level, Player player, InteractionHand hand) { + public @NotNull InteractionResultHolder use(Level level, Player player, InteractionHand hand) { ItemStack heldStack = player.getItemInHand(hand); if (ShootableGadgetItemMethods.shouldSwap(player, heldStack, hand, s -> s.getItem() instanceof QuadPotatoCannonItem)) { return InteractionResultHolder.fail(heldStack); diff --git a/src/main/java/com/drmangotea/tfmg/content/machinery/metallurgy/blast_furnace/BlastFurnaceHatchBlockEntity.java b/src/main/java/com/drmangotea/tfmg/content/machinery/metallurgy/blast_furnace/BlastFurnaceHatchBlockEntity.java index 0f1afb53..8db3dcdf 100644 --- a/src/main/java/com/drmangotea/tfmg/content/machinery/metallurgy/blast_furnace/BlastFurnaceHatchBlockEntity.java +++ b/src/main/java/com/drmangotea/tfmg/content/machinery/metallurgy/blast_furnace/BlastFurnaceHatchBlockEntity.java @@ -2,7 +2,6 @@ package com.drmangotea.tfmg.content.machinery.metallurgy.blast_furnace; import com.drmangotea.tfmg.base.TFMGUtils; import com.drmangotea.tfmg.registry.TFMGBlockEntities; -import com.drmangotea.tfmg.registry.TFMGFluids; import com.simibubi.create.api.equipment.goggles.IHaveGoggleInformation; import com.simibubi.create.foundation.blockEntity.SmartBlockEntity; import com.simibubi.create.foundation.blockEntity.behaviour.BlockEntityBehaviour; @@ -10,7 +9,6 @@ import com.simibubi.create.foundation.item.ItemHelper; import com.simibubi.create.foundation.item.SmartInventory; import net.createmod.catnip.math.VecHelper; import net.minecraft.core.BlockPos; -import net.minecraft.core.Direction; import net.minecraft.core.HolderLookup; import net.minecraft.nbt.CompoundTag; import net.minecraft.network.chat.Component; @@ -26,7 +24,6 @@ import net.neoforged.neoforge.fluids.FluidStack; import net.neoforged.neoforge.fluids.capability.IFluidHandler; import net.neoforged.neoforge.fluids.capability.templates.FluidTank; import net.neoforged.neoforge.items.IItemHandlerModifiable; -import org.jetbrains.annotations.NotNull; import java.util.List; diff --git a/src/main/java/com/drmangotea/tfmg/content/machinery/metallurgy/blast_furnace/BlastFurnaceOutputBlockEntity.java b/src/main/java/com/drmangotea/tfmg/content/machinery/metallurgy/blast_furnace/BlastFurnaceOutputBlockEntity.java index e334be56..e8ab302e 100644 --- a/src/main/java/com/drmangotea/tfmg/content/machinery/metallurgy/blast_furnace/BlastFurnaceOutputBlockEntity.java +++ b/src/main/java/com/drmangotea/tfmg/content/machinery/metallurgy/blast_furnace/BlastFurnaceOutputBlockEntity.java @@ -14,9 +14,7 @@ import com.simibubi.create.foundation.fluid.CombinedTankWrapper; import com.simibubi.create.foundation.fluid.SmartFluidTank; import com.simibubi.create.foundation.item.ItemHelper; import com.simibubi.create.foundation.item.SmartInventory; -import com.simibubi.create.foundation.utility.CreateLang; import net.createmod.catnip.animation.LerpedFloat; -import net.minecraft.ChatFormatting; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; import net.minecraft.core.HolderLookup; @@ -40,7 +38,6 @@ import net.neoforged.neoforge.items.IItemHandlerModifiable; import net.neoforged.neoforge.items.wrapper.CombinedInvWrapper; import net.neoforged.neoforge.items.wrapper.RecipeWrapper; -import javax.annotation.Nonnull; import java.util.List; import java.util.Optional; import java.util.Random; diff --git a/src/main/java/com/drmangotea/tfmg/content/machinery/metallurgy/blast_stove/BlastStoveBlock.java b/src/main/java/com/drmangotea/tfmg/content/machinery/metallurgy/blast_stove/BlastStoveBlock.java index 3b08f0bb..3e661baf 100644 --- a/src/main/java/com/drmangotea/tfmg/content/machinery/metallurgy/blast_stove/BlastStoveBlock.java +++ b/src/main/java/com/drmangotea/tfmg/content/machinery/metallurgy/blast_stove/BlastStoveBlock.java @@ -4,25 +4,9 @@ package com.drmangotea.tfmg.content.machinery.metallurgy.blast_stove; import com.drmangotea.tfmg.registry.TFMGBlockEntities; import com.simibubi.create.api.connectivity.ConnectivityHandler; import com.simibubi.create.content.equipment.wrench.IWrenchable; -import com.simibubi.create.content.fluids.transfer.GenericItemEmptying; -import com.simibubi.create.content.fluids.transfer.GenericItemFilling; import com.simibubi.create.foundation.block.IBE; -import com.simibubi.create.foundation.fluid.FluidHelper; import net.minecraft.core.BlockPos; -import net.minecraft.core.Direction; -import net.minecraft.core.particles.BlockParticleOption; -import net.minecraft.core.particles.ParticleTypes; -import net.minecraft.sounds.SoundEvent; -import net.minecraft.sounds.SoundSource; -import net.minecraft.util.Mth; -import net.minecraft.world.InteractionHand; -import net.minecraft.world.InteractionResult; -import net.minecraft.world.entity.player.Player; -import net.minecraft.world.item.ItemStack; -import net.minecraft.world.item.context.UseOnContext; -import net.minecraft.world.level.BlockGetter; import net.minecraft.world.level.Level; -import net.minecraft.world.level.LevelAccessor; import net.minecraft.world.level.block.Block; import net.minecraft.world.level.block.entity.BlockEntity; import net.minecraft.world.level.block.entity.BlockEntityType; diff --git a/src/main/java/com/drmangotea/tfmg/content/machinery/metallurgy/casting_basin/CastingBasinRenderer.java b/src/main/java/com/drmangotea/tfmg/content/machinery/metallurgy/casting_basin/CastingBasinRenderer.java index f90d0bf5..08d68ce7 100644 --- a/src/main/java/com/drmangotea/tfmg/content/machinery/metallurgy/casting_basin/CastingBasinRenderer.java +++ b/src/main/java/com/drmangotea/tfmg/content/machinery/metallurgy/casting_basin/CastingBasinRenderer.java @@ -2,7 +2,6 @@ package com.drmangotea.tfmg.content.machinery.metallurgy.casting_basin; import com.mojang.blaze3d.vertex.PoseStack; import com.simibubi.create.foundation.blockEntity.renderer.SafeBlockEntityRenderer; -import com.simibubi.create.foundation.fluid.FluidRenderer; import net.createmod.catnip.platform.NeoForgeCatnipServices; import net.minecraft.client.renderer.MultiBufferSource; import net.minecraft.client.renderer.blockentity.BlockEntityRendererProvider; diff --git a/src/main/java/com/drmangotea/tfmg/content/machinery/metallurgy/coke_oven/CokeOvenBlockEntity.java b/src/main/java/com/drmangotea/tfmg/content/machinery/metallurgy/coke_oven/CokeOvenBlockEntity.java index b6aeb2b1..ee56264b 100644 --- a/src/main/java/com/drmangotea/tfmg/content/machinery/metallurgy/coke_oven/CokeOvenBlockEntity.java +++ b/src/main/java/com/drmangotea/tfmg/content/machinery/metallurgy/coke_oven/CokeOvenBlockEntity.java @@ -1,18 +1,13 @@ package com.drmangotea.tfmg.content.machinery.metallurgy.coke_oven; -import com.drmangotea.tfmg.TFMG; import com.drmangotea.tfmg.base.TFMGUtils; import com.drmangotea.tfmg.base.lang.TFMGLang; import com.drmangotea.tfmg.base.lang.TFMGTexts; import com.drmangotea.tfmg.config.TFMGConfigs; -import com.drmangotea.tfmg.content.electricity.base.ConnectNeightborsPacket; import com.drmangotea.tfmg.recipes.CokingRecipe; -import com.drmangotea.tfmg.recipes.IndustrialBlastingRecipe; import com.drmangotea.tfmg.registry.TFMGBlockEntities; import com.drmangotea.tfmg.registry.TFMGBlocks; -import com.drmangotea.tfmg.registry.TFMGPackets; import com.drmangotea.tfmg.registry.TFMGRecipeTypes; -import com.simibubi.create.Create; import com.simibubi.create.api.equipment.goggles.IHaveGoggleInformation; import com.simibubi.create.foundation.blockEntity.SmartBlockEntity; import com.simibubi.create.foundation.blockEntity.behaviour.BlockEntityBehaviour; @@ -35,10 +30,8 @@ import net.minecraft.nbt.CompoundTag; import net.minecraft.network.chat.Component; import net.minecraft.server.level.ServerLevel; import net.minecraft.world.entity.item.ItemEntity; -import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.crafting.RecipeHolder; import net.minecraft.world.level.ChunkPos; -import net.minecraft.world.level.block.Blocks; import net.minecraft.world.level.block.entity.BlockEntityType; import net.minecraft.world.level.block.state.BlockState; import net.minecraft.world.phys.Vec3; @@ -49,8 +42,6 @@ import net.neoforged.neoforge.fluids.capability.IFluidHandler; import net.neoforged.neoforge.fluids.capability.templates.FluidTank; import net.neoforged.neoforge.items.IItemHandlerModifiable; import net.neoforged.neoforge.items.wrapper.RecipeWrapper; -import org.jetbrains.annotations.NotNull; -import org.jetbrains.annotations.Nullable; import java.util.List; import java.util.Optional; diff --git a/src/main/java/com/drmangotea/tfmg/content/machinery/metallurgy/coke_oven/CokeOvenPacket.java b/src/main/java/com/drmangotea/tfmg/content/machinery/metallurgy/coke_oven/CokeOvenPacket.java index b07fe9e7..8fe22add 100644 --- a/src/main/java/com/drmangotea/tfmg/content/machinery/metallurgy/coke_oven/CokeOvenPacket.java +++ b/src/main/java/com/drmangotea/tfmg/content/machinery/metallurgy/coke_oven/CokeOvenPacket.java @@ -1,14 +1,11 @@ package com.drmangotea.tfmg.content.machinery.metallurgy.coke_oven; -import com.drmangotea.tfmg.content.electricity.base.ConnectNeightborsPacket; -import com.drmangotea.tfmg.content.electricity.base.IElectric; import com.drmangotea.tfmg.registry.TFMGPackets; import com.simibubi.create.foundation.blockEntity.SmartBlockEntity; import com.simibubi.create.foundation.networking.BlockEntityDataPacket; import io.netty.buffer.ByteBuf; import net.minecraft.core.BlockPos; -import net.minecraft.network.FriendlyByteBuf; import net.minecraft.network.codec.StreamCodec; public class CokeOvenPacket extends BlockEntityDataPacket { diff --git a/src/main/java/com/drmangotea/tfmg/content/machinery/misc/concrete_hose/ConcreteFillingBehavior.java b/src/main/java/com/drmangotea/tfmg/content/machinery/misc/concrete_hose/ConcreteFillingBehavior.java index 6d782443..95963ef5 100644 --- a/src/main/java/com/drmangotea/tfmg/content/machinery/misc/concrete_hose/ConcreteFillingBehavior.java +++ b/src/main/java/com/drmangotea/tfmg/content/machinery/misc/concrete_hose/ConcreteFillingBehavior.java @@ -1,8 +1,6 @@ package com.drmangotea.tfmg.content.machinery.misc.concrete_hose; -import com.drmangotea.tfmg.TFMG; import com.drmangotea.tfmg.registry.TFMGFluids; -import com.simibubi.create.content.fluids.transfer.FluidManipulationBehaviour; import com.simibubi.create.foundation.advancement.AllAdvancements; import com.simibubi.create.foundation.blockEntity.SmartBlockEntity; import com.simibubi.create.foundation.blockEntity.behaviour.BehaviourType; @@ -16,22 +14,15 @@ import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; import net.minecraft.sounds.SoundEvents; import net.minecraft.sounds.SoundSource; -import net.minecraft.tags.BlockTags; import net.minecraft.tags.FluidTags; -import net.minecraft.world.level.BlockGetter; import net.minecraft.world.level.Level; import net.minecraft.world.level.block.Block; -import net.minecraft.world.level.block.Blocks; -import net.minecraft.world.level.block.DoorBlock; -import net.minecraft.world.level.block.LiquidBlock; import net.minecraft.world.level.block.entity.BlockEntity; import net.minecraft.world.level.block.state.BlockState; -import net.minecraft.world.level.block.state.properties.BlockStateProperties; import net.minecraft.world.level.levelgen.structure.BoundingBox; import net.minecraft.world.level.material.Fluid; import net.minecraft.world.level.material.FluidState; import net.minecraft.world.level.material.Fluids; -import net.minecraft.world.phys.shapes.CollisionContext; import net.minecraft.world.ticks.LevelTickAccess; import net.minecraft.world.ticks.LevelTicks; diff --git a/src/main/java/com/drmangotea/tfmg/content/machinery/misc/concrete_hose/ConcreteHoseBlock.java b/src/main/java/com/drmangotea/tfmg/content/machinery/misc/concrete_hose/ConcreteHoseBlock.java index fbdc5587..eff6b2bc 100644 --- a/src/main/java/com/drmangotea/tfmg/content/machinery/misc/concrete_hose/ConcreteHoseBlock.java +++ b/src/main/java/com/drmangotea/tfmg/content/machinery/misc/concrete_hose/ConcreteHoseBlock.java @@ -1,8 +1,6 @@ package com.drmangotea.tfmg.content.machinery.misc.concrete_hose; import com.drmangotea.tfmg.registry.TFMGBlockEntities; -import com.simibubi.create.AllBlockEntityTypes; -import com.simibubi.create.content.fluids.hosePulley.HosePulleyBlockEntity; import com.simibubi.create.content.fluids.pipes.FluidPipeBlock; import com.simibubi.create.content.kinetics.base.HorizontalKineticBlock; import com.simibubi.create.foundation.block.IBE; @@ -12,7 +10,6 @@ import net.minecraft.core.Direction; import net.minecraft.world.item.context.BlockPlaceContext; import net.minecraft.world.level.LevelReader; import net.minecraft.world.level.block.entity.BlockEntityType; -import net.minecraft.world.level.block.state.BlockBehaviour; import net.minecraft.world.level.block.state.BlockState; public class ConcreteHoseBlock extends HorizontalKineticBlock implements IBE { diff --git a/src/main/java/com/drmangotea/tfmg/content/machinery/misc/concrete_hose/ConcreteHoseBlockEntity.java b/src/main/java/com/drmangotea/tfmg/content/machinery/misc/concrete_hose/ConcreteHoseBlockEntity.java index c51eab83..cf092f8b 100644 --- a/src/main/java/com/drmangotea/tfmg/content/machinery/misc/concrete_hose/ConcreteHoseBlockEntity.java +++ b/src/main/java/com/drmangotea/tfmg/content/machinery/misc/concrete_hose/ConcreteHoseBlockEntity.java @@ -1,20 +1,14 @@ package com.drmangotea.tfmg.content.machinery.misc.concrete_hose; import com.drmangotea.tfmg.registry.TFMGBlockEntities; -import com.simibubi.create.AllBlockEntityTypes; import com.simibubi.create.content.fluids.hosePulley.HosePulleyBlock; -import com.simibubi.create.content.fluids.hosePulley.HosePulleyFluidHandler; -import com.simibubi.create.content.fluids.transfer.FluidDrainingBehaviour; -import com.simibubi.create.content.fluids.transfer.FluidFillingBehaviour; import com.simibubi.create.content.kinetics.base.KineticBlockEntity; -import com.simibubi.create.foundation.advancement.AllAdvancements; import com.simibubi.create.foundation.blockEntity.behaviour.BlockEntityBehaviour; import com.simibubi.create.foundation.fluid.SmartFluidTank; import com.simibubi.create.foundation.item.TooltipHelper; import com.simibubi.create.foundation.utility.ServerSpeedProvider; import net.createmod.catnip.animation.LerpedFloat; import net.minecraft.core.BlockPos; -import net.minecraft.core.Direction; import net.minecraft.core.HolderLookup; import net.minecraft.nbt.CompoundTag; import net.minecraft.network.chat.Component; diff --git a/src/main/java/com/drmangotea/tfmg/content/machinery/misc/concrete_hose/ConcreteHoseFluidHandler.java b/src/main/java/com/drmangotea/tfmg/content/machinery/misc/concrete_hose/ConcreteHoseFluidHandler.java index 83d25d04..7c2548d2 100644 --- a/src/main/java/com/drmangotea/tfmg/content/machinery/misc/concrete_hose/ConcreteHoseFluidHandler.java +++ b/src/main/java/com/drmangotea/tfmg/content/machinery/misc/concrete_hose/ConcreteHoseFluidHandler.java @@ -1,8 +1,6 @@ package com.drmangotea.tfmg.content.machinery.misc.concrete_hose; import com.drmangotea.tfmg.registry.TFMGFluids; -import com.simibubi.create.content.fluids.transfer.FluidDrainingBehaviour; -import com.simibubi.create.content.fluids.transfer.FluidFillingBehaviour; import com.simibubi.create.foundation.fluid.FluidHelper; import com.simibubi.create.foundation.fluid.SmartFluidTank; import net.minecraft.core.BlockPos; @@ -10,7 +8,6 @@ import net.neoforged.neoforge.fluids.FluidStack; import net.neoforged.neoforge.fluids.capability.IFluidHandler; -import javax.annotation.Nullable; import java.util.function.Supplier; public class ConcreteHoseFluidHandler implements IFluidHandler { diff --git a/src/main/java/com/drmangotea/tfmg/content/machinery/misc/concrete_hose/TFMGFluidManipulationBehaviour.java b/src/main/java/com/drmangotea/tfmg/content/machinery/misc/concrete_hose/TFMGFluidManipulationBehaviour.java index 12610fce..00ae8002 100644 --- a/src/main/java/com/drmangotea/tfmg/content/machinery/misc/concrete_hose/TFMGFluidManipulationBehaviour.java +++ b/src/main/java/com/drmangotea/tfmg/content/machinery/misc/concrete_hose/TFMGFluidManipulationBehaviour.java @@ -1,6 +1,5 @@ package com.drmangotea.tfmg.content.machinery.misc.concrete_hose; -import com.simibubi.create.AllPackets; import com.simibubi.create.AllTags; import com.simibubi.create.content.fluids.transfer.FluidSplashPacket; import com.simibubi.create.foundation.blockEntity.SmartBlockEntity; diff --git a/src/main/java/com/drmangotea/tfmg/content/machinery/misc/exhaust/ExhaustBlockEntity.java b/src/main/java/com/drmangotea/tfmg/content/machinery/misc/exhaust/ExhaustBlockEntity.java index bcf772a4..fc15cc30 100644 --- a/src/main/java/com/drmangotea/tfmg/content/machinery/misc/exhaust/ExhaustBlockEntity.java +++ b/src/main/java/com/drmangotea/tfmg/content/machinery/misc/exhaust/ExhaustBlockEntity.java @@ -12,7 +12,6 @@ import com.simibubi.create.foundation.blockEntity.behaviour.BlockEntityBehaviour import com.simibubi.create.foundation.fluid.SmartFluidTank; -import net.minecraft.ChatFormatting; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; import net.minecraft.core.HolderLookup; @@ -29,10 +28,7 @@ import net.neoforged.neoforge.fluids.capability.IFluidHandler; import net.neoforged.neoforge.fluids.capability.templates.FluidTank; -import javax.annotation.Nonnull; -import javax.annotation.Nullable; import java.util.List; -import java.util.Optional; import java.util.Random; @SuppressWarnings("removal") diff --git a/src/main/java/com/drmangotea/tfmg/content/machinery/misc/firebox/FireboxBlockEntity.java b/src/main/java/com/drmangotea/tfmg/content/machinery/misc/firebox/FireboxBlockEntity.java index a7ef2633..050097e7 100644 --- a/src/main/java/com/drmangotea/tfmg/content/machinery/misc/firebox/FireboxBlockEntity.java +++ b/src/main/java/com/drmangotea/tfmg/content/machinery/misc/firebox/FireboxBlockEntity.java @@ -1,6 +1,5 @@ package com.drmangotea.tfmg.content.machinery.misc.firebox; -import com.drmangotea.tfmg.TFMG; import com.drmangotea.tfmg.base.TFMGUtils; import com.drmangotea.tfmg.config.TFMGConfigs; import com.drmangotea.tfmg.registry.TFMGBlockEntities; @@ -34,7 +33,6 @@ import net.neoforged.neoforge.fluids.IFluidTank; import net.neoforged.neoforge.fluids.capability.IFluidHandler; import net.neoforged.neoforge.fluids.capability.templates.FluidTank; -import javax.annotation.Nonnull; import javax.annotation.Nullable; import java.util.List; import java.util.Objects; diff --git a/src/main/java/com/drmangotea/tfmg/content/machinery/misc/flarestack/FlarestackBlock.java b/src/main/java/com/drmangotea/tfmg/content/machinery/misc/flarestack/FlarestackBlock.java index f9de586a..82ce450c 100644 --- a/src/main/java/com/drmangotea/tfmg/content/machinery/misc/flarestack/FlarestackBlock.java +++ b/src/main/java/com/drmangotea/tfmg/content/machinery/misc/flarestack/FlarestackBlock.java @@ -3,14 +3,11 @@ package com.drmangotea.tfmg.content.machinery.misc.flarestack; import com.drmangotea.tfmg.base.TFMGShapes; import com.drmangotea.tfmg.registry.TFMGBlockEntities; -import com.simibubi.create.Create; import com.simibubi.create.content.equipment.wrench.IWrenchable; import com.simibubi.create.foundation.block.IBE; import net.minecraft.core.BlockPos; -import net.minecraft.core.particles.ParticleTypes; import net.minecraft.world.item.context.BlockPlaceContext; import net.minecraft.world.level.BlockGetter; -import net.minecraft.world.level.Level; import net.minecraft.world.level.block.Block; import net.minecraft.world.level.block.entity.BlockEntityType; import net.minecraft.world.level.block.state.BlockState; diff --git a/src/main/java/com/drmangotea/tfmg/content/machinery/misc/flarestack/FlarestackBlockEntity.java b/src/main/java/com/drmangotea/tfmg/content/machinery/misc/flarestack/FlarestackBlockEntity.java index 5abaddd0..05bb38ff 100644 --- a/src/main/java/com/drmangotea/tfmg/content/machinery/misc/flarestack/FlarestackBlockEntity.java +++ b/src/main/java/com/drmangotea/tfmg/content/machinery/misc/flarestack/FlarestackBlockEntity.java @@ -3,7 +3,6 @@ package com.drmangotea.tfmg.content.machinery.misc.flarestack; import com.drmangotea.tfmg.base.TFMGUtils; import com.drmangotea.tfmg.registry.TFMGBlockEntities; -import com.drmangotea.tfmg.registry.TFMGFluids; import com.drmangotea.tfmg.registry.TFMGTags; import com.simibubi.create.Create; import com.simibubi.create.api.equipment.goggles.IHaveGoggleInformation; @@ -12,9 +11,7 @@ import com.simibubi.create.foundation.blockEntity.behaviour.BlockEntityBehaviour import com.simibubi.create.foundation.fluid.SmartFluidTank; -import net.minecraft.ChatFormatting; import net.minecraft.core.BlockPos; -import net.minecraft.core.Direction; import net.minecraft.core.HolderLookup; import net.minecraft.core.particles.ParticleTypes; import net.minecraft.nbt.CompoundTag; @@ -28,10 +25,7 @@ import net.neoforged.neoforge.fluids.FluidStack; import net.neoforged.neoforge.fluids.capability.IFluidHandler; import net.neoforged.neoforge.fluids.capability.templates.FluidTank; -import javax.annotation.Nonnull; -import javax.annotation.Nullable; import java.util.List; -import java.util.Optional; import java.util.Random; public class FlarestackBlockEntity extends SmartBlockEntity implements IHaveGoggleInformation { diff --git a/src/main/java/com/drmangotea/tfmg/content/machinery/misc/gas_lamp/GasLampBlockEntity.java b/src/main/java/com/drmangotea/tfmg/content/machinery/misc/gas_lamp/GasLampBlockEntity.java index 07a692de..17af439d 100644 --- a/src/main/java/com/drmangotea/tfmg/content/machinery/misc/gas_lamp/GasLampBlockEntity.java +++ b/src/main/java/com/drmangotea/tfmg/content/machinery/misc/gas_lamp/GasLampBlockEntity.java @@ -8,7 +8,6 @@ import com.simibubi.create.foundation.blockEntity.SmartBlockEntity; import com.simibubi.create.foundation.blockEntity.behaviour.BlockEntityBehaviour; import com.simibubi.create.foundation.fluid.SmartFluidTank; import net.minecraft.core.BlockPos; -import net.minecraft.core.Direction; import net.minecraft.core.HolderLookup; import net.minecraft.nbt.CompoundTag; import net.minecraft.network.chat.Component; @@ -21,8 +20,6 @@ import net.neoforged.neoforge.fluids.capability.IFluidHandler; import net.neoforged.neoforge.fluids.capability.templates.FluidTank; -import javax.annotation.Nonnull; -import javax.annotation.Nullable; import java.util.List; public class GasLampBlockEntity extends SmartBlockEntity implements IHaveGoggleInformation { diff --git a/src/main/java/com/drmangotea/tfmg/content/machinery/misc/machine_input/MachineInputBlock.java b/src/main/java/com/drmangotea/tfmg/content/machinery/misc/machine_input/MachineInputBlock.java index 92d4dfb7..b8b757ea 100644 --- a/src/main/java/com/drmangotea/tfmg/content/machinery/misc/machine_input/MachineInputBlock.java +++ b/src/main/java/com/drmangotea/tfmg/content/machinery/misc/machine_input/MachineInputBlock.java @@ -6,7 +6,6 @@ import com.simibubi.create.content.kinetics.base.DirectionalKineticBlock; import com.simibubi.create.foundation.block.IBE; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; -import net.minecraft.world.level.BlockGetter; import net.minecraft.world.level.LevelReader; import net.minecraft.world.level.block.entity.BlockEntityType; import net.minecraft.world.level.block.state.BlockState; diff --git a/src/main/java/com/drmangotea/tfmg/content/machinery/misc/machine_input/MachineInputBlockEntity.java b/src/main/java/com/drmangotea/tfmg/content/machinery/misc/machine_input/MachineInputBlockEntity.java index ecb6589e..10997de5 100644 --- a/src/main/java/com/drmangotea/tfmg/content/machinery/misc/machine_input/MachineInputBlockEntity.java +++ b/src/main/java/com/drmangotea/tfmg/content/machinery/misc/machine_input/MachineInputBlockEntity.java @@ -3,15 +3,10 @@ package com.drmangotea.tfmg.content.machinery.misc.machine_input; import com.simibubi.create.content.kinetics.base.KineticBlockEntity; -import net.minecraft.ChatFormatting; import net.minecraft.core.BlockPos; -import net.minecraft.nbt.CompoundTag; -import net.minecraft.network.chat.Component; import net.minecraft.world.level.block.entity.BlockEntityType; import net.minecraft.world.level.block.state.BlockState; -import java.util.List; - public class MachineInputBlockEntity extends KineticBlockEntity { public MachineInputBlockEntity(BlockEntityType typeIn, BlockPos pos, BlockState state) { super(typeIn, pos, state); diff --git a/src/main/java/com/drmangotea/tfmg/content/machinery/misc/smokestack/SmokestackBlockEntity.java b/src/main/java/com/drmangotea/tfmg/content/machinery/misc/smokestack/SmokestackBlockEntity.java index 7aeeeb2f..5eedd67c 100644 --- a/src/main/java/com/drmangotea/tfmg/content/machinery/misc/smokestack/SmokestackBlockEntity.java +++ b/src/main/java/com/drmangotea/tfmg/content/machinery/misc/smokestack/SmokestackBlockEntity.java @@ -7,15 +7,12 @@ import com.simibubi.create.foundation.blockEntity.SmartBlockEntity; import com.simibubi.create.foundation.blockEntity.behaviour.BlockEntityBehaviour; import com.simibubi.create.foundation.fluid.SmartFluidTank; import net.minecraft.core.BlockPos; -import net.minecraft.core.Direction; -import net.minecraft.core.Holder; import net.minecraft.core.HolderLookup; import net.minecraft.core.particles.ParticleTypes; import net.minecraft.nbt.CompoundTag; import net.minecraft.world.level.Level; import net.minecraft.world.level.block.entity.BlockEntityType; import net.minecraft.world.level.block.state.BlockState; -import net.minecraft.world.level.material.Fluid; import net.neoforged.neoforge.capabilities.Capabilities; import net.neoforged.neoforge.capabilities.RegisterCapabilitiesEvent; import net.neoforged.neoforge.fluids.FluidStack; @@ -23,7 +20,6 @@ import net.neoforged.neoforge.fluids.capability.IFluidHandler; import net.neoforged.neoforge.fluids.capability.templates.FluidTank; -import javax.annotation.Nonnull; import java.util.List; import java.util.Random; diff --git a/src/main/java/com/drmangotea/tfmg/content/machinery/misc/winding_machine/SpoolItem.java b/src/main/java/com/drmangotea/tfmg/content/machinery/misc/winding_machine/SpoolItem.java index ecc31eb7..122401a4 100644 --- a/src/main/java/com/drmangotea/tfmg/content/machinery/misc/winding_machine/SpoolItem.java +++ b/src/main/java/com/drmangotea/tfmg/content/machinery/misc/winding_machine/SpoolItem.java @@ -7,17 +7,12 @@ import com.drmangotea.tfmg.base.lang.TFMGLang; import com.drmangotea.tfmg.content.electricity.connection.cable_type.CableType; import com.drmangotea.tfmg.content.electricity.connection.cables.CableConnection; import com.drmangotea.tfmg.content.electricity.connection.cables.CableConnectorBlockEntity; -import com.drmangotea.tfmg.content.electricity.connection.cables.CablePos; -import com.drmangotea.tfmg.registry.TFMGBlocks; import com.drmangotea.tfmg.registry.TFMGDataComponents; import com.drmangotea.tfmg.registry.TFMGItems; -import com.simibubi.create.foundation.utility.CreateLang; -import dev.engine_room.flywheel.lib.model.baked.PartialModel; import net.minecraft.ChatFormatting; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; -import net.minecraft.nbt.CompoundTag; import net.minecraft.network.chat.Component; import net.minecraft.resources.ResourceLocation; import net.minecraft.world.InteractionHand; @@ -27,7 +22,6 @@ import net.minecraft.world.entity.Entity; import net.minecraft.world.entity.player.Player; import net.minecraft.world.item.Item; import net.minecraft.world.item.ItemStack; -import net.minecraft.world.item.Items; import net.minecraft.world.item.TooltipFlag; import net.minecraft.world.item.context.UseOnContext; import net.minecraft.world.level.Level; @@ -39,7 +33,6 @@ import java.util.List; import java.util.Objects; import static com.drmangotea.tfmg.base.blocks.WallMountBlock.FACING; -import static com.simibubi.create.foundation.utility.Debug.debugMessage; public class SpoolItem extends Item { diff --git a/src/main/java/com/drmangotea/tfmg/content/machinery/misc/winding_machine/WindingMachineBlock.java b/src/main/java/com/drmangotea/tfmg/content/machinery/misc/winding_machine/WindingMachineBlock.java index 9e5eef59..18c93094 100644 --- a/src/main/java/com/drmangotea/tfmg/content/machinery/misc/winding_machine/WindingMachineBlock.java +++ b/src/main/java/com/drmangotea/tfmg/content/machinery/misc/winding_machine/WindingMachineBlock.java @@ -7,7 +7,6 @@ import com.simibubi.create.foundation.block.IBE; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; import net.minecraft.world.InteractionHand; -import net.minecraft.world.InteractionResult; import net.minecraft.world.ItemInteractionResult; import net.minecraft.world.entity.player.Player; import net.minecraft.world.item.ItemStack; diff --git a/src/main/java/com/drmangotea/tfmg/content/machinery/misc/winding_machine/WindingMachineBlockEntity.java b/src/main/java/com/drmangotea/tfmg/content/machinery/misc/winding_machine/WindingMachineBlockEntity.java index 65486ce3..2b643357 100644 --- a/src/main/java/com/drmangotea/tfmg/content/machinery/misc/winding_machine/WindingMachineBlockEntity.java +++ b/src/main/java/com/drmangotea/tfmg/content/machinery/misc/winding_machine/WindingMachineBlockEntity.java @@ -1,10 +1,7 @@ package com.drmangotea.tfmg.content.machinery.misc.winding_machine; -import com.drmangotea.tfmg.TFMG; import com.drmangotea.tfmg.base.lang.TFMGLang; import com.drmangotea.tfmg.base.lang.TFMGTexts; -import com.drmangotea.tfmg.content.engines.base.AbstractEngineBlockEntity; -import com.drmangotea.tfmg.recipes.PolarizingRecipe; import com.drmangotea.tfmg.recipes.WindingRecipe; import com.drmangotea.tfmg.registry.*; import com.simibubi.create.api.equipment.goggles.IHaveGoggleInformation; @@ -16,7 +13,6 @@ import com.simibubi.create.foundation.blockEntity.behaviour.scrollValue.ScrollVa import com.simibubi.create.foundation.item.ItemHelper; import com.simibubi.create.foundation.item.SmartInventory; -import com.simibubi.create.foundation.utility.CreateLang; import net.createmod.catnip.math.VecHelper; import net.createmod.catnip.animation.LerpedFloat; import net.minecraft.ChatFormatting; @@ -35,8 +31,6 @@ import net.neoforged.neoforge.capabilities.Capabilities; import net.neoforged.neoforge.capabilities.RegisterCapabilitiesEvent; import net.neoforged.neoforge.items.IItemHandlerModifiable; import net.neoforged.neoforge.items.wrapper.RecipeWrapper; -import org.jetbrains.annotations.NotNull; -import org.jetbrains.annotations.Nullable; import java.util.List; import java.util.Optional; @@ -208,7 +202,7 @@ public class WindingMachineBlockEntity extends KineticBlockEntity implements IHa if (amountWinded >= recipe.getProcessingDuration()) { - inventory.setStackInSlot(0, recipe.rollResults().get(0)); + inventory.setStackInSlot(0, recipe.rollResults(level.random).get(0)); recipe = null; amountWinded = 0; @@ -225,7 +219,7 @@ public class WindingMachineBlockEntity extends KineticBlockEntity implements IHa amountWinded++; } } else { - inventory.setStackInSlot(0, recipe.rollResults().get(0)); + inventory.setStackInSlot(0, recipe.rollResults(level.random).get(0)); sendData(); setChanged(); } diff --git a/src/main/java/com/drmangotea/tfmg/content/machinery/misc/winding_machine/WindingMachineRenderer.java b/src/main/java/com/drmangotea/tfmg/content/machinery/misc/winding_machine/WindingMachineRenderer.java index 37da64c6..6ece0f76 100644 --- a/src/main/java/com/drmangotea/tfmg/content/machinery/misc/winding_machine/WindingMachineRenderer.java +++ b/src/main/java/com/drmangotea/tfmg/content/machinery/misc/winding_machine/WindingMachineRenderer.java @@ -1,7 +1,6 @@ package com.drmangotea.tfmg.content.machinery.misc.winding_machine; import com.drmangotea.tfmg.registry.TFMGPartialModels; -import com.drmangotea.tfmg.registry.TFMGTags; import com.mojang.blaze3d.vertex.PoseStack; import com.mojang.blaze3d.vertex.VertexConsumer; @@ -20,6 +19,7 @@ import net.minecraft.core.Direction; import net.minecraft.world.item.ItemDisplayContext; import net.minecraft.world.item.ItemStack; import net.minecraft.world.level.block.state.BlockState; +import net.neoforged.neoforge.common.Tags; import static com.simibubi.create.content.kinetics.base.HorizontalKineticBlock.HORIZONTAL_FACING; import static net.minecraft.world.level.block.HorizontalDirectionalBlock.FACING; @@ -90,7 +90,7 @@ public class WindingMachineRenderer extends KineticBlockEntityRenderer tank.getFluidAmount()) + if (recipe.getInputFluid().amount() * speedModifier > tank.getFluidAmount()) return; if (recipe.getFluidResults().toArray().length != getOutputs().toArray().length) @@ -143,7 +138,7 @@ public class DistillationControllerBlockEntity extends SmartBlockEntity implemen break; output.tank.fill(new FluidStack(fluidStack.getFluidHolder(), (int) (fluidStack.getAmount() * speedModifier)), IFluidHandler.FluidAction.EXECUTE); - int consumption = (recipe.getInputFluid().getRequiredAmount() / 6); + int consumption = (recipe.getInputFluid().amount() / 6); tank.drain((int) (consumption * speedModifier), IFluidHandler.FluidAction.EXECUTE); numero++; @@ -189,9 +184,9 @@ public class DistillationControllerBlockEntity extends SmartBlockEntity implemen for (int i = 0; i < list.toArray().length; i++) { DistillationRecipe recipe = (DistillationRecipe) list.get(i).value(); if (recipe.getFluidResults().toArray().length == getOutputs().toArray().length) - for (int y = 0; y < recipe.getFluidIngredients().get(0).getMatchingFluidStacks().toArray().length; y++) - if (tank.getFluid().getFluid() == recipe.getFluidIngredients().get(0).getMatchingFluidStacks().get(y).getFluid()) - if (tank.getFluidAmount() >= recipe.getFluidIngredients().get(0).getRequiredAmount()) + for (int y = 0; y < recipe.getFluidIngredients().getFirst().getFluids().length; y++) + if (tank.getFluid().getFluid() == recipe.getFluidIngredients().getFirst().getFluids()[y].getFluid()) + if (tank.getFluidAmount() >= recipe.getFluidIngredients().getFirst().amount()) return recipe; } return null; diff --git a/src/main/java/com/drmangotea/tfmg/content/machinery/oil_processing/distillation_tower/controller/DistillationControllerRenderer.java b/src/main/java/com/drmangotea/tfmg/content/machinery/oil_processing/distillation_tower/controller/DistillationControllerRenderer.java index a8fdc1ef..8562e9b0 100644 --- a/src/main/java/com/drmangotea/tfmg/content/machinery/oil_processing/distillation_tower/controller/DistillationControllerRenderer.java +++ b/src/main/java/com/drmangotea/tfmg/content/machinery/oil_processing/distillation_tower/controller/DistillationControllerRenderer.java @@ -1,22 +1,15 @@ package com.drmangotea.tfmg.content.machinery.oil_processing.distillation_tower.controller; -import com.drmangotea.tfmg.content.electricity.utilities.polarizer.PolarizerBlockEntity; import com.drmangotea.tfmg.registry.TFMGPartialModels; import com.mojang.blaze3d.vertex.PoseStack; import com.mojang.blaze3d.vertex.VertexConsumer; import com.simibubi.create.foundation.blockEntity.renderer.SafeBlockEntityRenderer; import net.createmod.catnip.render.CachedBuffers; -import net.createmod.catnip.animation.LerpedFloat; -import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.MultiBufferSource; import net.minecraft.client.renderer.RenderType; import net.minecraft.client.renderer.blockentity.BlockEntityRendererProvider; -import net.minecraft.client.renderer.entity.ItemRenderer; import net.minecraft.core.Direction; -import net.minecraft.world.item.ItemDisplayContext; -import net.minecraft.world.item.ItemStack; -import net.minecraft.world.level.block.HorizontalDirectionalBlock; import net.minecraft.world.level.block.state.BlockState; import static net.minecraft.world.level.block.HorizontalDirectionalBlock.FACING; diff --git a/src/main/java/com/drmangotea/tfmg/content/machinery/oil_processing/distillation_tower/controller/DistillationTowerPacket.java b/src/main/java/com/drmangotea/tfmg/content/machinery/oil_processing/distillation_tower/controller/DistillationTowerPacket.java index 0b1ced60..35903edd 100644 --- a/src/main/java/com/drmangotea/tfmg/content/machinery/oil_processing/distillation_tower/controller/DistillationTowerPacket.java +++ b/src/main/java/com/drmangotea/tfmg/content/machinery/oil_processing/distillation_tower/controller/DistillationTowerPacket.java @@ -2,9 +2,7 @@ package com.drmangotea.tfmg.content.machinery.oil_processing.distillation_tower. import com.drmangotea.tfmg.content.decoration.tanks.steel.SteelTankBlock; -import com.drmangotea.tfmg.content.machinery.metallurgy.coke_oven.CokeOvenBlockEntity; import com.drmangotea.tfmg.registry.TFMGPackets; -import com.simibubi.create.compat.computercraft.AttachedComputerPacket; import com.simibubi.create.foundation.blockEntity.SmartBlockEntity; import com.simibubi.create.foundation.networking.BlockEntityDataPacket; import io.netty.buffer.ByteBuf; diff --git a/src/main/java/com/drmangotea/tfmg/content/machinery/oil_processing/distillation_tower/output/DistillationOutputBlockEntity.java b/src/main/java/com/drmangotea/tfmg/content/machinery/oil_processing/distillation_tower/output/DistillationOutputBlockEntity.java index b2757360..2fd19c65 100644 --- a/src/main/java/com/drmangotea/tfmg/content/machinery/oil_processing/distillation_tower/output/DistillationOutputBlockEntity.java +++ b/src/main/java/com/drmangotea/tfmg/content/machinery/oil_processing/distillation_tower/output/DistillationOutputBlockEntity.java @@ -12,7 +12,6 @@ import com.simibubi.create.foundation.blockEntity.behaviour.scrollValue.ScrollOp import com.simibubi.create.foundation.fluid.SmartFluidTank; import com.simibubi.create.foundation.gui.AllIcons; -import com.simibubi.create.foundation.utility.CreateLang; import net.createmod.catnip.math.VecHelper; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; diff --git a/src/main/java/com/drmangotea/tfmg/content/machinery/oil_processing/pumpjack/base/PumpjackBaseBlockEntity.java b/src/main/java/com/drmangotea/tfmg/content/machinery/oil_processing/pumpjack/base/PumpjackBaseBlockEntity.java index 68f3957c..2b013120 100644 --- a/src/main/java/com/drmangotea/tfmg/content/machinery/oil_processing/pumpjack/base/PumpjackBaseBlockEntity.java +++ b/src/main/java/com/drmangotea/tfmg/content/machinery/oil_processing/pumpjack/base/PumpjackBaseBlockEntity.java @@ -15,8 +15,6 @@ import com.simibubi.create.foundation.blockEntity.SmartBlockEntity; import com.simibubi.create.foundation.blockEntity.behaviour.BlockEntityBehaviour; import com.simibubi.create.foundation.fluid.SmartFluidTank; -import com.simibubi.create.foundation.utility.CreateLang; -import net.minecraft.ChatFormatting; import net.minecraft.core.BlockPos; import net.minecraft.core.HolderLookup; import net.minecraft.nbt.CompoundTag; diff --git a/src/main/java/com/drmangotea/tfmg/content/machinery/oil_processing/pumpjack/hammer/PumpjackBlock.java b/src/main/java/com/drmangotea/tfmg/content/machinery/oil_processing/pumpjack/hammer/PumpjackBlock.java index 002eadc5..e0783a78 100644 --- a/src/main/java/com/drmangotea/tfmg/content/machinery/oil_processing/pumpjack/hammer/PumpjackBlock.java +++ b/src/main/java/com/drmangotea/tfmg/content/machinery/oil_processing/pumpjack/hammer/PumpjackBlock.java @@ -4,23 +4,13 @@ package com.drmangotea.tfmg.content.machinery.oil_processing.pumpjack.hammer; import com.drmangotea.tfmg.registry.TFMGBlockEntities; import com.drmangotea.tfmg.registry.TFMGBlocks; import com.simibubi.create.content.contraptions.bearing.BearingBlock; -import com.simibubi.create.content.kinetics.base.IRotate; import com.simibubi.create.foundation.block.IBE; -import net.createmod.catnip.data.Iterate; -import net.minecraft.core.BlockPos; -import net.minecraft.core.Direction; -import net.minecraft.world.InteractionHand; -import net.minecraft.world.ItemInteractionResult; -import net.minecraft.world.entity.player.Player; -import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.context.BlockPlaceContext; -import net.minecraft.world.level.Level; import net.minecraft.world.level.block.Block; import net.minecraft.world.level.block.entity.BlockEntityType; import net.minecraft.world.level.block.state.BlockState; import net.minecraft.world.level.block.state.StateDefinition; import net.minecraft.world.level.block.state.properties.BooleanProperty; -import net.minecraft.world.phys.BlockHitResult; public class PumpjackBlock extends BearingBlock implements IBE { diff --git a/src/main/java/com/drmangotea/tfmg/content/machinery/oil_processing/surface_scanner/SurfaceScannerBlockEntity.java b/src/main/java/com/drmangotea/tfmg/content/machinery/oil_processing/surface_scanner/SurfaceScannerBlockEntity.java index 2f4e765d..3f9c59a0 100644 --- a/src/main/java/com/drmangotea/tfmg/content/machinery/oil_processing/surface_scanner/SurfaceScannerBlockEntity.java +++ b/src/main/java/com/drmangotea/tfmg/content/machinery/oil_processing/surface_scanner/SurfaceScannerBlockEntity.java @@ -1,33 +1,22 @@ package com.drmangotea.tfmg.content.machinery.oil_processing.surface_scanner; -import com.drmangotea.tfmg.TFMG; -import com.drmangotea.tfmg.base.lang.TFMGLang; import com.drmangotea.tfmg.base.lang.TFMGTexts; import com.drmangotea.tfmg.config.TFMGConfigs; import com.drmangotea.tfmg.content.machinery.misc.machine_input.MachineInputBlockEntity; import com.drmangotea.tfmg.registry.TFMGTags; -import com.simibubi.create.Create; import com.simibubi.create.api.equipment.goggles.IHaveGoggleInformation; import com.simibubi.create.foundation.blockEntity.SmartBlockEntity; import com.simibubi.create.foundation.blockEntity.behaviour.BlockEntityBehaviour; -import com.simibubi.create.foundation.blockEntity.behaviour.ValueBoxTransform; -import com.simibubi.create.foundation.blockEntity.behaviour.scrollValue.ScrollValueBehaviour; -import com.simibubi.create.foundation.utility.CreateLang; -import net.createmod.catnip.math.VecHelper; import net.minecraft.ChatFormatting; import net.minecraft.core.BlockPos; -import net.minecraft.core.Direction; import net.minecraft.network.chat.Component; -import net.minecraft.world.level.block.Blocks; import net.minecraft.world.level.block.entity.BlockEntityType; import net.minecraft.world.level.block.state.BlockState; import net.minecraft.world.level.chunk.ChunkAccess; import net.minecraft.world.phys.AABB; -import net.minecraft.world.phys.Vec3; import java.util.List; -import java.util.Random; public class SurfaceScannerBlockEntity extends SmartBlockEntity implements IHaveGoggleInformation { diff --git a/src/main/java/com/drmangotea/tfmg/content/machinery/oil_processing/surface_scanner/SurfaceScannerRenderer.java b/src/main/java/com/drmangotea/tfmg/content/machinery/oil_processing/surface_scanner/SurfaceScannerRenderer.java index cc0fc86f..7fa2a2d4 100644 --- a/src/main/java/com/drmangotea/tfmg/content/machinery/oil_processing/surface_scanner/SurfaceScannerRenderer.java +++ b/src/main/java/com/drmangotea/tfmg/content/machinery/oil_processing/surface_scanner/SurfaceScannerRenderer.java @@ -1,6 +1,5 @@ package com.drmangotea.tfmg.content.machinery.oil_processing.surface_scanner; -import com.drmangotea.tfmg.TFMG; import com.drmangotea.tfmg.registry.TFMGPartialModels; import com.mojang.blaze3d.vertex.PoseStack; import com.simibubi.create.foundation.blockEntity.renderer.SafeBlockEntityRenderer; @@ -8,7 +7,6 @@ import net.createmod.catnip.render.CachedBuffers; import com.simibubi.create.foundation.render.RenderTypes; import net.minecraft.client.renderer.LightTexture; import net.minecraft.client.renderer.MultiBufferSource; -import net.minecraft.client.renderer.RenderType; import net.minecraft.client.renderer.blockentity.BlockEntityRendererProvider; import net.minecraft.world.level.block.state.BlockState; diff --git a/src/main/java/com/drmangotea/tfmg/content/machinery/vat/base/VatBlock.java b/src/main/java/com/drmangotea/tfmg/content/machinery/vat/base/VatBlock.java index f206ffcb..26157de3 100644 --- a/src/main/java/com/drmangotea/tfmg/content/machinery/vat/base/VatBlock.java +++ b/src/main/java/com/drmangotea/tfmg/content/machinery/vat/base/VatBlock.java @@ -6,7 +6,6 @@ import com.simibubi.create.api.connectivity.ConnectivityHandler; import com.simibubi.create.content.equipment.wrench.IWrenchable; import com.simibubi.create.foundation.block.IBE; -import com.simibubi.create.foundation.utility.CreateLang; import net.minecraft.core.BlockPos; import net.minecraft.sounds.SoundEvents; import net.minecraft.util.StringRepresentable; diff --git a/src/main/java/com/drmangotea/tfmg/content/machinery/vat/base/VatBlockEntity.java b/src/main/java/com/drmangotea/tfmg/content/machinery/vat/base/VatBlockEntity.java index a79e4e37..e389d89d 100644 --- a/src/main/java/com/drmangotea/tfmg/content/machinery/vat/base/VatBlockEntity.java +++ b/src/main/java/com/drmangotea/tfmg/content/machinery/vat/base/VatBlockEntity.java @@ -16,7 +16,6 @@ import com.simibubi.create.foundation.blockEntity.SmartBlockEntity; import com.simibubi.create.foundation.blockEntity.behaviour.BlockEntityBehaviour; import com.simibubi.create.foundation.blockEntity.behaviour.fluid.SmartFluidTankBehaviour; import com.simibubi.create.foundation.fluid.CombinedTankWrapper; -import com.simibubi.create.foundation.fluid.FluidIngredient; import com.simibubi.create.foundation.fluid.SmartFluidTank; import com.simibubi.create.foundation.item.SmartInventory; import com.simibubi.create.foundation.recipe.RecipeConditions; @@ -51,6 +50,7 @@ import net.neoforged.neoforge.fluids.FluidType; import net.neoforged.neoforge.fluids.IFluidTank; import net.neoforged.neoforge.fluids.capability.IFluidHandler; import net.neoforged.neoforge.fluids.capability.templates.FluidTank; +import net.neoforged.neoforge.fluids.crafting.SizedFluidIngredient; import net.neoforged.neoforge.items.IItemHandler; import net.neoforged.neoforge.items.IItemHandlerModifiable; import net.neoforged.neoforge.items.wrapper.CombinedInvWrapper; @@ -275,9 +275,9 @@ public class VatBlockEntity extends SmartBlockEntity implements IHaveGoggleInfor //checks if vat contains needed fluids Map isFluidFound = new HashMap<>(); for (int i = 0; i < testedRecipe.getFluidIngredients().size(); i++) { - FluidIngredient ingredient = testedRecipe.getFluidIngredients().get(i); + SizedFluidIngredient ingredient = testedRecipe.getFluidIngredients().get(i); Integer foundAt = null; - if (ingredient.getMatchingFluidStacks().isEmpty()) + if (ingredient.getFluids().length == 0) break; for (int y = 0; y < fluidHandler.getTanks(); y++) { @@ -486,11 +486,11 @@ public class VatBlockEntity extends SmartBlockEntity implements IHaveGoggleInfor //fluid input - for (FluidIngredient ingredient : recipe.getFluidIngredients()) { + for (SizedFluidIngredient ingredient : recipe.getFluidIngredients()) { for (int i = 0; i < fluidHandler.getTanks(); i++) { FluidStack fluidInTank = fluidHandler.getFluidInTank(i); if (ingredient.test(new FluidStack(fluidInTank.getFluidHolder(), 4000))) { - fluidHandler.getFluidInTank(i).setAmount(fluidInTank.getAmount() - ingredient.getRequiredAmount()); + fluidHandler.getFluidInTank(i).setAmount(fluidInTank.getAmount() - ingredient.amount()); break; } } @@ -499,7 +499,7 @@ public class VatBlockEntity extends SmartBlockEntity implements IHaveGoggleInfor for (ProcessingOutput output : recipe.getRollableResults()) { - ItemStack itemStack = output.rollOutput(); + ItemStack itemStack = output.rollOutput(level.random); boolean handled = false; diff --git a/src/main/java/com/drmangotea/tfmg/content/machinery/vat/base/VatEvaluationPacket.java b/src/main/java/com/drmangotea/tfmg/content/machinery/vat/base/VatEvaluationPacket.java index 9f97b806..ef40b626 100644 --- a/src/main/java/com/drmangotea/tfmg/content/machinery/vat/base/VatEvaluationPacket.java +++ b/src/main/java/com/drmangotea/tfmg/content/machinery/vat/base/VatEvaluationPacket.java @@ -1,14 +1,11 @@ package com.drmangotea.tfmg.content.machinery.vat.base; -import com.drmangotea.tfmg.content.electricity.base.ConnectNeightborsPacket; import com.drmangotea.tfmg.registry.TFMGPackets; import com.simibubi.create.foundation.blockEntity.SmartBlockEntity; import com.simibubi.create.foundation.networking.BlockEntityConfigurationPacket; -import com.simibubi.create.foundation.networking.BlockEntityDataPacket; import io.netty.buffer.ByteBuf; import net.minecraft.core.BlockPos; -import net.minecraft.network.FriendlyByteBuf; import net.minecraft.network.codec.StreamCodec; import net.minecraft.server.level.ServerPlayer; diff --git a/src/main/java/com/drmangotea/tfmg/content/machinery/vat/base/VatInventory.java b/src/main/java/com/drmangotea/tfmg/content/machinery/vat/base/VatInventory.java index 050317ec..61b857ec 100644 --- a/src/main/java/com/drmangotea/tfmg/content/machinery/vat/base/VatInventory.java +++ b/src/main/java/com/drmangotea/tfmg/content/machinery/vat/base/VatInventory.java @@ -2,7 +2,6 @@ package com.drmangotea.tfmg.content.machinery.vat.base; import com.simibubi.create.foundation.item.SmartInventory; import net.minecraft.world.item.ItemStack; -import net.neoforged.neoforge.items.ItemHandlerHelper; public class VatInventory extends SmartInventory { diff --git a/src/main/java/com/drmangotea/tfmg/content/machinery/vat/base/VatRenderer.java b/src/main/java/com/drmangotea/tfmg/content/machinery/vat/base/VatRenderer.java index 56f1eb6b..91ce8dbc 100644 --- a/src/main/java/com/drmangotea/tfmg/content/machinery/vat/base/VatRenderer.java +++ b/src/main/java/com/drmangotea/tfmg/content/machinery/vat/base/VatRenderer.java @@ -2,18 +2,13 @@ package com.drmangotea.tfmg.content.machinery.vat.base; import com.mojang.blaze3d.vertex.PoseStack; -import com.simibubi.create.content.processing.basin.BasinBlockEntity; import com.simibubi.create.foundation.blockEntity.behaviour.fluid.SmartFluidTankBehaviour; import com.simibubi.create.foundation.blockEntity.renderer.SafeBlockEntityRenderer; -import com.simibubi.create.foundation.fluid.FluidRenderer; -import com.simibubi.create.foundation.fluid.SmartFluidTank; -import net.createmod.catnip.animation.LerpedFloat; import net.createmod.catnip.platform.NeoForgeCatnipServices; import net.minecraft.client.renderer.MultiBufferSource; import net.minecraft.client.renderer.blockentity.BlockEntityRendererProvider; import net.minecraft.util.Mth; import net.neoforged.neoforge.fluids.FluidStack; -import net.neoforged.neoforge.fluids.capability.IFluidHandler; public class VatRenderer extends SafeBlockEntityRenderer { diff --git a/src/main/java/com/drmangotea/tfmg/content/machinery/vat/electrode_holder/ElectrodeHolderBlock.java b/src/main/java/com/drmangotea/tfmg/content/machinery/vat/electrode_holder/ElectrodeHolderBlock.java index ac37db3b..15b32c95 100644 --- a/src/main/java/com/drmangotea/tfmg/content/machinery/vat/electrode_holder/ElectrodeHolderBlock.java +++ b/src/main/java/com/drmangotea/tfmg/content/machinery/vat/electrode_holder/ElectrodeHolderBlock.java @@ -8,7 +8,6 @@ import com.drmangotea.tfmg.registry.TFMGBlockEntities; import com.simibubi.create.foundation.block.IBE; import net.minecraft.core.BlockPos; import net.minecraft.world.InteractionHand; -import net.minecraft.world.InteractionResult; import net.minecraft.world.ItemInteractionResult; import net.minecraft.world.entity.player.Player; import net.minecraft.world.item.ItemStack; diff --git a/src/main/java/com/drmangotea/tfmg/content/machinery/vat/electrode_holder/ElectrodeHolderBlockEntity.java b/src/main/java/com/drmangotea/tfmg/content/machinery/vat/electrode_holder/ElectrodeHolderBlockEntity.java index f55da43d..41fe00ed 100644 --- a/src/main/java/com/drmangotea/tfmg/content/machinery/vat/electrode_holder/ElectrodeHolderBlockEntity.java +++ b/src/main/java/com/drmangotea/tfmg/content/machinery/vat/electrode_holder/ElectrodeHolderBlockEntity.java @@ -10,8 +10,6 @@ import com.drmangotea.tfmg.content.machinery.vat.base.IVatMachine; import com.drmangotea.tfmg.content.machinery.vat.base.VatBlock; import com.drmangotea.tfmg.content.machinery.vat.base.VatBlockEntity; import com.drmangotea.tfmg.content.machinery.vat.electrode_holder.electrode.Electrode; -import com.simibubi.create.foundation.utility.CreateLang; -import net.minecraft.ChatFormatting; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; import net.minecraft.core.HolderLookup; diff --git a/src/main/java/com/drmangotea/tfmg/content/machinery/vat/electrode_holder/electrode/ElectrodeBuilder.java b/src/main/java/com/drmangotea/tfmg/content/machinery/vat/electrode_holder/electrode/ElectrodeBuilder.java index fde1a4ad..d67646de 100644 --- a/src/main/java/com/drmangotea/tfmg/content/machinery/vat/electrode_holder/electrode/ElectrodeBuilder.java +++ b/src/main/java/com/drmangotea/tfmg/content/machinery/vat/electrode_holder/electrode/ElectrodeBuilder.java @@ -9,7 +9,6 @@ import com.tterrag.registrate.util.nullness.NonNullFunction; import com.tterrag.registrate.util.nullness.NonNullSupplier; import com.tterrag.registrate.util.nullness.NonNullUnaryOperator; import com.tterrag.registrate.util.nullness.NonnullType; -import net.minecraft.core.Registry; import net.minecraft.resources.ResourceLocation; import net.neoforged.neoforge.registries.DeferredHolder; diff --git a/src/main/java/com/drmangotea/tfmg/content/machinery/vat/industrial_mixer/IndustrialMixerBlock.java b/src/main/java/com/drmangotea/tfmg/content/machinery/vat/industrial_mixer/IndustrialMixerBlock.java index 81165e7b..80ac6e2a 100644 --- a/src/main/java/com/drmangotea/tfmg/content/machinery/vat/industrial_mixer/IndustrialMixerBlock.java +++ b/src/main/java/com/drmangotea/tfmg/content/machinery/vat/industrial_mixer/IndustrialMixerBlock.java @@ -7,7 +7,6 @@ import com.simibubi.create.foundation.block.IBE; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; import net.minecraft.world.InteractionHand; -import net.minecraft.world.InteractionResult; import net.minecraft.world.ItemInteractionResult; import net.minecraft.world.entity.player.Player; import net.minecraft.world.item.ItemStack; diff --git a/src/main/java/com/drmangotea/tfmg/content/machinery/vat/industrial_mixer/IndustrialMixerBlockEntity.java b/src/main/java/com/drmangotea/tfmg/content/machinery/vat/industrial_mixer/IndustrialMixerBlockEntity.java index 6e14a675..abbcaa69 100644 --- a/src/main/java/com/drmangotea/tfmg/content/machinery/vat/industrial_mixer/IndustrialMixerBlockEntity.java +++ b/src/main/java/com/drmangotea/tfmg/content/machinery/vat/industrial_mixer/IndustrialMixerBlockEntity.java @@ -1,20 +1,11 @@ package com.drmangotea.tfmg.content.machinery.vat.industrial_mixer; -import com.drmangotea.tfmg.TFMG; import com.drmangotea.tfmg.content.machinery.vat.base.IVatMachine; import com.drmangotea.tfmg.content.machinery.vat.base.VatBlock; import com.drmangotea.tfmg.content.machinery.vat.base.VatBlockEntity; import com.drmangotea.tfmg.registry.TFMGItems; -import com.drmangotea.tfmg.registry.TFMGPartialModels; -import com.simibubi.create.AllPartialModels; import com.simibubi.create.content.kinetics.base.IRotate; import com.simibubi.create.content.kinetics.base.KineticBlockEntity; -import com.simibubi.create.content.kinetics.base.OrientedRotatingVisual; -import com.simibubi.create.content.kinetics.gantry.GantryShaftBlock; -import com.simibubi.create.content.kinetics.gantry.GantryShaftBlockEntity; -import dev.engine_room.flywheel.api.visual.BlockEntityVisual; -import dev.engine_room.flywheel.api.visualization.VisualizationContext; -import dev.engine_room.flywheel.lib.model.Models; import net.createmod.catnip.animation.LerpedFloat; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; diff --git a/src/main/java/com/drmangotea/tfmg/content/machinery/vat/industrial_mixer/IndustrialMixerVisual.java b/src/main/java/com/drmangotea/tfmg/content/machinery/vat/industrial_mixer/IndustrialMixerVisual.java index 62fe5a17..d7429090 100644 --- a/src/main/java/com/drmangotea/tfmg/content/machinery/vat/industrial_mixer/IndustrialMixerVisual.java +++ b/src/main/java/com/drmangotea/tfmg/content/machinery/vat/industrial_mixer/IndustrialMixerVisual.java @@ -3,19 +3,15 @@ package com.drmangotea.tfmg.content.machinery.vat.industrial_mixer; import com.simibubi.create.AllPartialModels; import com.simibubi.create.content.kinetics.base.KineticBlockEntityVisual; import com.simibubi.create.content.kinetics.base.RotatingInstance; -import com.simibubi.create.content.kinetics.fan.EncasedFanBlockEntity; import com.simibubi.create.foundation.render.AllInstanceTypes; import dev.engine_room.flywheel.api.instance.Instance; import dev.engine_room.flywheel.api.visualization.VisualizationContext; import dev.engine_room.flywheel.lib.model.Models; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; -import net.minecraft.util.Mth; import java.util.function.Consumer; -import static net.minecraft.world.level.block.state.properties.BlockStateProperties.FACING; - public class IndustrialMixerVisual extends KineticBlockEntityVisual { protected final RotatingInstance shaft; diff --git a/src/main/java/com/drmangotea/tfmg/datagen/TFMGDatagen.java b/src/main/java/com/drmangotea/tfmg/datagen/TFMGDatagen.java index fbe6e874..85508def 100644 --- a/src/main/java/com/drmangotea/tfmg/datagen/TFMGDatagen.java +++ b/src/main/java/com/drmangotea/tfmg/datagen/TFMGDatagen.java @@ -9,7 +9,6 @@ import com.drmangotea.tfmg.datagen.recipes.values.create.TFMGSequencedAssemblyRe import com.drmangotea.tfmg.ponder.TFMGPonderPlugin; import com.google.gson.JsonElement; import com.google.gson.JsonObject; -import com.simibubi.create.Create; import com.simibubi.create.foundation.utility.FilesHelper; import com.tterrag.registrate.providers.ProviderType; import net.createmod.ponder.foundation.PonderIndex; @@ -18,8 +17,6 @@ import net.minecraft.data.DataGenerator; import net.minecraft.data.PackOutput; import net.neoforged.neoforge.data.event.GatherDataEvent; -import java.util.ArrayList; -import java.util.List; import java.util.Map; import java.util.concurrent.CompletableFuture; import java.util.function.BiConsumer; diff --git a/src/main/java/com/drmangotea/tfmg/datagen/recipes/TFMGRecipeProvider.java b/src/main/java/com/drmangotea/tfmg/datagen/recipes/TFMGRecipeProvider.java index b25116ca..69587a43 100644 --- a/src/main/java/com/drmangotea/tfmg/datagen/recipes/TFMGRecipeProvider.java +++ b/src/main/java/com/drmangotea/tfmg/datagen/recipes/TFMGRecipeProvider.java @@ -24,7 +24,6 @@ import net.minecraft.tags.TagKey; import net.minecraft.world.item.Item; import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.Items; -import net.minecraft.world.item.crafting.Ingredient; import net.minecraft.world.level.ItemLike; import net.minecraft.world.level.material.Fluid; import net.minecraft.world.level.material.Fluids; @@ -48,7 +47,7 @@ public class TFMGRecipeProvider extends RecipeProvider { } @Override - protected void buildRecipes(@NotNull RecipeOutput pRecipeOutput) { + protected void buildRecipes(RecipeOutput pRecipeOutput) { all.forEach(c -> c.register(pRecipeOutput)); TFMG.LOGGER.info("{} registered {} recipe{}", getName(), all.size(), all.size() == 1 ? "" : "s"); } @@ -75,12 +74,12 @@ public class TFMGRecipeProvider extends RecipeProvider { gen.addProvider(true, new DataProvider() { @Override - public String getName() { + public @NotNull String getName() { return "TFMG's Processing Recipes"; } @Override - public CompletableFuture run(CachedOutput dc) { + public @NotNull CompletableFuture run(CachedOutput dc) { return CompletableFuture.allOf(GENERATORS.stream() .map(gen -> gen.run(dc)) .toArray(CompletableFuture[]::new)); @@ -120,91 +119,87 @@ public class TFMGRecipeProvider extends RecipeProvider { return TFMGItems.COAL_COKE_DUST.get(); } public static TagKey steelIngot() { - return AllTags.commonItemTag("ingots/steel"); + return CommonMetal.STEEL.ingots; } public static TagKey steelNugget() { - return AllTags.commonItemTag("nuggets/steel"); + return CommonMetal.STEEL.nuggets; } public static TagKey steelSheet() { - return AllTags.commonItemTag("plates/steel"); + return CommonMetal.STEEL.plates; } public static TagKey steelBlock() { - return AllTags.commonItemTag("storage_blocks/steel"); + return CommonMetal.STEEL.storageBlocks.items(); } public static TagKey aluminumIngot() { - return AllTags.commonItemTag("ingots/aluminum"); + return CommonMetal.ALUMINUM.ingots; } public static TagKey aluminumNugget() { - return AllTags.commonItemTag("nuggets/aluminum"); - } - public static TagKey aluminumBlock() { - return AllTags.commonItemTag("storage_blocks/aluminum"); - } - public static TagKey aluminumSheet() { - return AllTags.commonItemTag("plates/aluminum"); + return CommonMetal.ALUMINUM.nuggets; } + public static TagKey aluminumBlock() { return CommonMetal.ALUMINUM.storageBlocks.items(); } + public static TagKey aluminumSheet() { return CommonMetal.ALUMINUM.plates; } public static TagKey castIronIngot() { - return AllTags.commonItemTag("ingots/cast_iron"); + return TFMGTags.TFMGItemTags.INGOTS_CAST_IRON.tag; } public static TagKey castIronNugget() { - return AllTags.commonItemTag("nuggets/cast_iron"); + return TFMGTags.TFMGItemTags.NUGGETS_CAST_IRON.tag; } public static TagKey castIronBlock() { - return AllTags.commonItemTag("storage_blocks/cast_iron"); + return TFMGTags.TFMGItemTags.STORAGE_BLOCKS_CAST_IRON.tag; } public static TagKey castIronSheet() { - return AllTags.commonItemTag("plates/cast_iron"); + return TFMGTags.TFMGItemTags.PLATES_CAST_IRON.tag; } public static TagKey leadIngot() { - return AllTags.commonItemTag("ingots/lead"); + return CommonMetal.LEAD.ingots; } public static TagKey leadNugget() { - return AllTags.commonItemTag("nuggets/lead"); + return CommonMetal.LEAD.nuggets; } public static TagKey leadSheet() { - return AllTags.commonItemTag("plates/lead"); + return CommonMetal.LEAD.plates; } public static TagKey leadBlock() { - return AllTags.commonItemTag("storage_blocks/lead"); + return CommonMetal.LEAD.storageBlocks.items(); } public static TagKey nickelIngot() { - return AllTags.commonItemTag("ingots/nickel"); + return CommonMetal.NICKEL.ingots; } public static TagKey nickelNugget() { - return AllTags.commonItemTag("nuggets/nickel"); + return CommonMetal.NICKEL.nuggets; } public static TagKey nickelBlock() { - return AllTags.commonItemTag("storage_blocks/nickel"); + return CommonMetal.NICKEL.storageBlocks.items(); } public static TagKey nickelSheet() { - return AllTags.commonItemTag("plates/nickel"); + return CommonMetal.NICKEL.plates; } public static TagKey lithiumIngot() { - return AllTags.commonItemTag("ingots/lithium"); + return TFMGTags.TFMGItemTags.INGOTS_LITHIUM.tag; } public static TagKey lithiumNugget() { - return AllTags.commonItemTag("nuggets/lithium"); + return TFMGTags.TFMGItemTags.NUGGETS_LITHIUM.tag; } public static TagKey lithiumBlock() { - return AllTags.commonItemTag("storage_blocks/lithium"); + return TFMGTags.TFMGItemTags.STORAGE_BLOCKS_LITHIUM.tag; } public static TagKey constantanIngot() { - return AllTags.commonItemTag("ingots/constantan"); + return CommonMetal.CONSTANTAN.ingots; } public static TagKey constantanNugget() { - return AllTags.commonItemTag("nuggets/constantan"); + return CommonMetal.CONSTANTAN.nuggets; } public static TagKey constantanBlock() { - return AllTags.commonItemTag("storage_blocks/constantan"); + return CommonMetal.CONSTANTAN.storageBlocks.items(); } public static TagKey copperWire() { - return AllTags.commonItemTag("wires/copper"); + return TFMGTags.TFMGItemTags.WIRES_COPPER.tag; } public static TagKey constantanWire() { - return AllTags.commonItemTag("wires/constantan"); + return TFMGTags.TFMGItemTags.WIRES_CONSTANTAN.tag; } public static TagKey aluminumWire() { - return AllTags.commonItemTag("wires/aluminum"); + return TFMGTags.TFMGItemTags.WIRES_ALUMINUM.tag; } // @@ -224,15 +219,9 @@ public class TFMGRecipeProvider extends RecipeProvider { } - public static ItemLike crimsite() { - return AllPaletteStoneTypes.CRIMSITE.getBaseBlock().get(); - } public static ItemLike thermitePowder() { return TFMGItems.THERMITE_POWDER.get(); } - public static ItemLike crushedRawAluminum() { - return AllItems.CRUSHED_BAUXITE.get(); - } public static ItemLike experienceNugget() { return AllItems.EXP_NUGGET.get(); } @@ -278,15 +267,6 @@ public class TFMGRecipeProvider extends RecipeProvider { public static ItemLike bucket() { return Items.BUCKET; } - public static ItemLike bottle() { - return Items.GLASS_BOTTLE; - } - public static ItemLike potato() { - return Items.POTATO; - } - public static ItemLike napalmPotato() { - return TFMGItems.NAPALM_POTATO.get(); - } public static ItemLike heavyMachineryCasing() { return TFMGBlocks.HEAVY_MACHINERY_CASING.get(); } @@ -355,15 +335,9 @@ public class TFMGRecipeProvider extends RecipeProvider { public static ItemLike cement() { return TFMGBlocks.CEMENT; } - public static ItemLike aluminumTank() { - return TFMGBlocks.ALUMINUM_FLUID_TANK; - } public static ItemLike syntheticLeather() { return TFMGItems.SYNTHETIC_LEATHER.get(); } - public static ItemLike engineChamber() { - return TFMGItems.ENGINE_CYLINDER.get(); - } public static ItemLike screw() { return TFMGItems.SCREW.get(); } @@ -399,21 +373,11 @@ public class TFMGRecipeProvider extends RecipeProvider { return Tags.Items.DUSTS_REDSTONE; } - public static TagKey planks() { - return ItemTags.PLANKS; - } - - public static TagKey woodSlab() { - return ItemTags.WOODEN_SLABS; - } public static TagKey log() { return ItemTags.LOGS_THAT_BURN; } - public static TagKey gold() { - return AllTags.commonItemTag("ingots/gold"); - } public static TagKey string() { - return AllTags.commonItemTag("string"); + return Tags.Items.STRINGS; } public static ItemLike propeller() { @@ -491,15 +455,7 @@ public class TFMGRecipeProvider extends RecipeProvider { public static TagKey goldSheet() { - return AllTags.commonItemTag("plates/gold"); - } - - //public static TagKey stone() { - // return Tags.Items.STONE; - //} - - public static ItemLike andesite() { - return AllItems.ANDESITE_ALLOY.get(); + return CommonMetal.GOLD.plates; } public static ItemLike fireproofBricks() { @@ -519,52 +475,29 @@ public class TFMGRecipeProvider extends RecipeProvider { return TFMGItems.RUBBER_SHEET.get(); } - public static ItemLike largeCog() { - return AllBlocks.LARGE_COGWHEEL.get(); - } - - public static ItemLike andesiteCasing() { - return AllBlocks.ANDESITE_CASING.get(); - } - public static TagKey brassIngot() { - return AllTags.commonItemTag("ingots/brass"); + return CommonMetal.BRASS.ingots; } public static TagKey brassSheet() { - return AllTags.commonItemTag("plates/brass"); + + return CommonMetal.BRASS.plates; } public static TagKey iron() { return Tags.Items.INGOTS_IRON; } - public static TagKey ironNugget() { - return AllTags.commonItemTag("nuggets/iron"); - } - public static TagKey ironDust() { - return AllTags.commonItemTag("dusts/iron"); + return TFMGTags.TFMGItemTags.DUSTS_IRON.tag; } public static TagKey zincIngot() { - return AllTags.commonItemTag("ingots/zinc"); + return CommonMetal.ZINC.ingots; } public static TagKey ironSheet() { - return AllTags.commonItemTag("plates/iron"); - } - - public static TagKey sturdySheet() { - return AllTags.commonItemTag("plates/obsidian"); - } - - public static ItemLike brassCasing() { - return AllBlocks.BRASS_CASING.get(); - } - - public static ItemLike railwayCasing() { - return AllBlocks.RAILWAY_CASING.get(); + return CommonMetal.IRON.plates; } public static ItemLike electronTube() { @@ -575,59 +508,26 @@ public class TFMGRecipeProvider extends RecipeProvider { return AllItems.PRECISION_MECHANISM.get(); } - public static ItemLike copperBlock() { - return Items.COPPER_BLOCK; - } - - public static TagKey brassBlock() { - return AllTags.commonItemTag("storage_blocks/brass"); - } - - public static TagKey zincBlock() { - return AllTags.commonItemTag("storage_blocks/zinc"); - } - - public static TagKey wheatFlour() { - return AllTags.commonItemTag("flour/wheat"); - } - public static ItemLike copperIngot() { return Items.COPPER_INGOT; } public static TagKey copperSheet() { - return AllTags.commonItemTag("plates/copper"); + return CommonMetal.COPPER.plates; } public static TagKey copperNugget() { - return AllTags.commonItemTag("nuggets/copper"); + return CommonMetal.COPPER.nuggets; } public static TagKey brassNugget() { - return AllTags.commonItemTag("nuggets/brass"); + return CommonMetal.BRASS.nuggets; } public static TagKey zincNugget() { - return AllTags.commonItemTag("nuggets/zinc"); + return CommonMetal.ZINC.nuggets; } - public static ItemLike copperCasing() { - return AllBlocks.COPPER_CASING.get(); - } - - public static ItemLike refinedRadiance() { - return AllItems.REFINED_RADIANCE.get(); - } - - public static ItemLike shadowSteel() { - return AllItems.SHADOW_STEEL.get(); - } - - public static Ingredient netherite() { - return Ingredient.of(AllTags.commonItemTag("ingots/netherite")); - } - - public static ItemStack resistor10Ohms(){ ItemStack stack = TFMGBlocks.RESISTOR.asStack(); @@ -662,66 +562,66 @@ public class TFMGRecipeProvider extends RecipeProvider { public static class F { //GASSES public static Fluid air() { - return TFMGFluids.AIR.get(); + return TFMGFluids.AIR.getSource(); } public static Fluid hotAir() { - return TFMGFluids.HOT_AIR.get(); + return TFMGFluids.HOT_AIR.getSource(); } public static Fluid carbonDioxide() { - return TFMGFluids.CARBON_DIOXIDE.get(); + return TFMGFluids.CARBON_DIOXIDE.getSource(); } public static Fluid ethylene() { - return TFMGFluids.ETHYLENE.get(); + return TFMGFluids.ETHYLENE.getSource(); } public static Fluid propylene() { - return TFMGFluids.PROPYLENE.get(); + return TFMGFluids.PROPYLENE.getSource(); } public static Fluid propane() { - return TFMGFluids.PROPANE.get(); + return TFMGFluids.PROPANE.getSource(); } public static Fluid hydrogen() { - return TFMGFluids.HYDROGEN.get(); + return TFMGFluids.HYDROGEN.getSource(); } public static Fluid butane() { - return TFMGFluids.BUTANE.get(); + return TFMGFluids.BUTANE.getSource(); } public static Fluid lpg() { - return TFMGFluids.LPG.get(); + return TFMGFluids.LPG.getSource(); } public static Fluid neon() { - return TFMGFluids.NEON.get(); + return TFMGFluids.NEON.getSource(); } public static Fluid blastFurnaceGas() { - return TFMGFluids.FURNACE_GAS.get(); + return TFMGFluids.FURNACE_GAS.getSource(); } //LIQUIDS public static Fluid crudeOil() { - return TFMGFluids.CRUDE_OIL.get(); + return TFMGFluids.CRUDE_OIL.getSource(); } public static Fluid heavyOil() { - return TFMGFluids.HEAVY_OIL.get(); + return TFMGFluids.HEAVY_OIL.getSource(); } public static Fluid lubricationOil() { - return TFMGFluids.LUBRICATION_OIL.get(); + return TFMGFluids.LUBRICATION_OIL.getSource(); } public static Fluid napalm() { - return TFMGFluids.NAPALM.get(); + return TFMGFluids.NAPALM.getSource(); } public static Fluid naphtha() { - return TFMGFluids.NAPHTHA.get(); + return TFMGFluids.NAPHTHA.getSource(); } public static Fluid kerosene() { - return TFMGFluids.KEROSENE.get(); + return TFMGFluids.KEROSENE.getSource(); } public static Fluid gasoline() { - return TFMGFluids.GASOLINE.get(); + return TFMGFluids.GASOLINE.getSource(); } public static Fluid diesel() { - return TFMGFluids.DIESEL.get(); + return TFMGFluids.DIESEL.getSource(); } public static Fluid creosote() { - return TFMGFluids.CREOSOTE.get(); + return TFMGFluids.CREOSOTE.getSource(); } public static Fluid water() { return Fluids.WATER; @@ -729,28 +629,28 @@ public class TFMGRecipeProvider extends RecipeProvider { //MISC public static Fluid coolingFluid() { - return TFMGFluids.COOLING_FLUID.get(); + return TFMGFluids.COOLING_FLUID.getSource(); } public static Fluid sulfuricAcid() { - return TFMGFluids.SULFURIC_ACID.get(); + return TFMGFluids.SULFURIC_ACID.getSource(); } public static Fluid liquidConcrete() { - return TFMGFluids.LIQUID_CONCRETE.get(); + return TFMGFluids.LIQUID_CONCRETE.getSource(); } public static Fluid liquidAsphalt() { - return TFMGFluids.LIQUID_ASPHALT.get(); + return TFMGFluids.LIQUID_ASPHALT.getSource(); } public static Fluid liquidPlastic() { - return TFMGFluids.MOLTEN_PLASTIC.get(); + return TFMGFluids.MOLTEN_PLASTIC.getSource(); } public static Fluid moltenSteel() { - return TFMGFluids.MOLTEN_STEEL.get(); + return TFMGFluids.MOLTEN_STEEL.getSource(); } public static Fluid moltenSlag() { - return TFMGFluids.MOLTEN_SLAG.get(); + return TFMGFluids.MOLTEN_SLAG.getSource(); } public static Fluid potion() { - return AllFluids.POTION.get(); + return AllFluids.POTION.getSource(); } //BUCKETS @@ -773,6 +673,12 @@ public class TFMGRecipeProvider extends RecipeProvider { return TFMGRegistrate.getBucket("propane"); } public static ItemLike hydrogenTank() { +// LOGGER.info("hydrogen fluid: {}", TFMGFluids.HYDROGEN); +// LOGGER.info("hydrogen source: {}", TFMGFluids.HYDROGEN.getSource()); +// LOGGER.info("hydrogen bucket: {}", TFMGFluids.HYDROGEN.getSource().getBucket()); +// var bucket = TFMGFluids.HYDROGEN.getSource().getBucket(); +// LOGGER.info("bucket: {}", bucket); +// return bucket; return TFMGRegistrate.getBucket("hydrogen"); } public static ItemLike butaneTank() { diff --git a/src/main/java/com/drmangotea/tfmg/datagen/recipes/builder/CokingRecipeGen.java b/src/main/java/com/drmangotea/tfmg/datagen/recipes/builder/CokingRecipeGen.java index 2f019f2a..3a4f83e7 100644 --- a/src/main/java/com/drmangotea/tfmg/datagen/recipes/builder/CokingRecipeGen.java +++ b/src/main/java/com/drmangotea/tfmg/datagen/recipes/builder/CokingRecipeGen.java @@ -1,6 +1,5 @@ package com.drmangotea.tfmg.datagen.recipes.builder; -import com.drmangotea.tfmg.recipes.CastingRecipe; import com.drmangotea.tfmg.recipes.CokingRecipe; import com.drmangotea.tfmg.registry.TFMGRecipeTypes; import com.simibubi.create.api.data.recipe.StandardProcessingRecipeGen; diff --git a/src/main/java/com/drmangotea/tfmg/datagen/recipes/builder/DistillationRecipeGen.java b/src/main/java/com/drmangotea/tfmg/datagen/recipes/builder/DistillationRecipeGen.java index 18466929..efa524a4 100644 --- a/src/main/java/com/drmangotea/tfmg/datagen/recipes/builder/DistillationRecipeGen.java +++ b/src/main/java/com/drmangotea/tfmg/datagen/recipes/builder/DistillationRecipeGen.java @@ -1,6 +1,5 @@ package com.drmangotea.tfmg.datagen.recipes.builder; -import com.drmangotea.tfmg.recipes.CastingRecipe; import com.drmangotea.tfmg.recipes.DistillationRecipe; import com.drmangotea.tfmg.registry.TFMGRecipeTypes; import com.simibubi.create.api.data.recipe.StandardProcessingRecipeGen; diff --git a/src/main/java/com/drmangotea/tfmg/datagen/recipes/builder/HotBlastRecipeGen.java b/src/main/java/com/drmangotea/tfmg/datagen/recipes/builder/HotBlastRecipeGen.java index 29dcabab..d6ac3e39 100644 --- a/src/main/java/com/drmangotea/tfmg/datagen/recipes/builder/HotBlastRecipeGen.java +++ b/src/main/java/com/drmangotea/tfmg/datagen/recipes/builder/HotBlastRecipeGen.java @@ -1,6 +1,5 @@ package com.drmangotea.tfmg.datagen.recipes.builder; -import com.drmangotea.tfmg.recipes.CastingRecipe; import com.drmangotea.tfmg.recipes.HotBlastRecipe; import com.drmangotea.tfmg.registry.TFMGRecipeTypes; import com.simibubi.create.api.data.recipe.StandardProcessingRecipeGen; diff --git a/src/main/java/com/drmangotea/tfmg/datagen/recipes/builder/IndustrialBlastingRecipeGen.java b/src/main/java/com/drmangotea/tfmg/datagen/recipes/builder/IndustrialBlastingRecipeGen.java index fdc2d7f6..1061e94a 100644 --- a/src/main/java/com/drmangotea/tfmg/datagen/recipes/builder/IndustrialBlastingRecipeGen.java +++ b/src/main/java/com/drmangotea/tfmg/datagen/recipes/builder/IndustrialBlastingRecipeGen.java @@ -1,14 +1,10 @@ package com.drmangotea.tfmg.datagen.recipes.builder; import java.util.concurrent.CompletableFuture; -import java.util.function.Supplier; -import java.util.function.UnaryOperator; -import com.drmangotea.tfmg.TFMG; import com.drmangotea.tfmg.recipes.IndustrialBlastingRecipe; import com.drmangotea.tfmg.recipes.IndustrialBlastingRecipeParams; import com.drmangotea.tfmg.registry.TFMGRecipeTypes; -import com.simibubi.create.AllRecipeTypes; import com.simibubi.create.api.data.recipe.ProcessingRecipeGen; @@ -18,12 +14,6 @@ import com.simibubi.create.content.processing.recipe.ProcessingRecipeParams; import net.minecraft.core.HolderLookup; import net.minecraft.data.PackOutput; import net.minecraft.resources.ResourceLocation; -import net.minecraft.tags.TagKey; -import net.minecraft.world.item.Item; -import net.minecraft.world.item.crafting.Ingredient; -import net.minecraft.world.level.ItemLike; - -import net.neoforged.neoforge.common.Tags; public abstract class IndustrialBlastingRecipeGen

, B extends ProcessingRecipeBuilder> extends ProcessingRecipeGen> { diff --git a/src/main/java/com/drmangotea/tfmg/datagen/recipes/builder/PolarizingRecipeGen.java b/src/main/java/com/drmangotea/tfmg/datagen/recipes/builder/PolarizingRecipeGen.java index cdc3d1bc..bf436e50 100644 --- a/src/main/java/com/drmangotea/tfmg/datagen/recipes/builder/PolarizingRecipeGen.java +++ b/src/main/java/com/drmangotea/tfmg/datagen/recipes/builder/PolarizingRecipeGen.java @@ -1,6 +1,5 @@ package com.drmangotea.tfmg.datagen.recipes.builder; -import com.drmangotea.tfmg.recipes.CastingRecipe; import com.drmangotea.tfmg.recipes.PolarizingRecipe; import com.drmangotea.tfmg.registry.TFMGRecipeTypes; import com.simibubi.create.api.data.recipe.StandardProcessingRecipeGen; diff --git a/src/main/java/com/drmangotea/tfmg/datagen/recipes/builder/VatRecipeGen.java b/src/main/java/com/drmangotea/tfmg/datagen/recipes/builder/VatRecipeGen.java index b9ddeeda..20574de3 100644 --- a/src/main/java/com/drmangotea/tfmg/datagen/recipes/builder/VatRecipeGen.java +++ b/src/main/java/com/drmangotea/tfmg/datagen/recipes/builder/VatRecipeGen.java @@ -1,7 +1,5 @@ package com.drmangotea.tfmg.datagen.recipes.builder; -import com.drmangotea.tfmg.recipes.VatMachineRecipe; -import com.drmangotea.tfmg.recipes.IndustrialBlastingRecipeParams; import com.drmangotea.tfmg.recipes.VatMachineRecipe; import com.drmangotea.tfmg.recipes.VatRecipeParams; import com.drmangotea.tfmg.registry.TFMGRecipeTypes; @@ -14,8 +12,6 @@ import net.minecraft.data.PackOutput; import net.minecraft.resources.ResourceLocation; import java.util.concurrent.CompletableFuture; -import java.util.function.Supplier; -import java.util.function.UnaryOperator; public abstract class VatRecipeGen

, B extends ProcessingRecipeBuilder> extends ProcessingRecipeGen> { diff --git a/src/main/java/com/drmangotea/tfmg/datagen/recipes/builder/WindingRecipeGen.java b/src/main/java/com/drmangotea/tfmg/datagen/recipes/builder/WindingRecipeGen.java index 04858bba..ec507711 100644 --- a/src/main/java/com/drmangotea/tfmg/datagen/recipes/builder/WindingRecipeGen.java +++ b/src/main/java/com/drmangotea/tfmg/datagen/recipes/builder/WindingRecipeGen.java @@ -1,6 +1,5 @@ package com.drmangotea.tfmg.datagen.recipes.builder; -import com.drmangotea.tfmg.recipes.CastingRecipe; import com.drmangotea.tfmg.recipes.WindingRecipe; import com.drmangotea.tfmg.registry.TFMGRecipeTypes; import com.simibubi.create.api.data.recipe.StandardProcessingRecipeGen; diff --git a/src/main/java/com/drmangotea/tfmg/datagen/recipes/values/TFMGStandardRecipeGen.java b/src/main/java/com/drmangotea/tfmg/datagen/recipes/values/TFMGStandardRecipeGen.java index ffd51cde..96aec550 100644 --- a/src/main/java/com/drmangotea/tfmg/datagen/recipes/values/TFMGStandardRecipeGen.java +++ b/src/main/java/com/drmangotea/tfmg/datagen/recipes/values/TFMGStandardRecipeGen.java @@ -15,7 +15,7 @@ import com.mojang.serialization.codecs.RecordCodecBuilder; import com.simibubi.create.AllBlocks; import com.simibubi.create.AllItems; import com.simibubi.create.content.decoration.palettes.AllPaletteBlocks; -import com.simibubi.create.foundation.data.recipe.CompatMetals; +import com.simibubi.create.foundation.data.recipe.CommonMetal; import com.simibubi.create.foundation.data.recipe.Mods; import com.simibubi.create.foundation.mixin.accessor.MappedRegistryAccessor; import com.tterrag.registrate.util.entry.BlockEntry; @@ -61,7 +61,6 @@ import java.util.function.Function; import java.util.function.UnaryOperator; import static com.drmangotea.tfmg.datagen.recipes.TFMGRecipeProvider.I.*; -import static com.drmangotea.tfmg.datagen.recipes.TFMGRecipeProvider.I.brassPipe; public class TFMGStandardRecipeGen extends TFMGRecipeProvider { @@ -2425,8 +2424,8 @@ public class TFMGStandardRecipeGen extends TFMGRecipeProvider { .inBlastFurnace(); } - TFMGRecipeProvider.GeneratedRecipe blastModdedCrushedMetal(ItemEntry ingredient, CompatMetals metal) { - for (Mods mod : metal.getMods()) { + TFMGRecipeProvider.GeneratedRecipe blastModdedCrushedMetal(ItemEntry ingredient, CommonMetal metal) { + for (Mods mod : metal.mods) { String metalName = metal.getName(mod); ResourceLocation ingot = mod.ingotOf(metalName); String modId = mod.getId(); diff --git a/src/main/java/com/drmangotea/tfmg/datagen/recipes/values/create/TFMGCompactingRecipeGen.java b/src/main/java/com/drmangotea/tfmg/datagen/recipes/values/create/TFMGCompactingRecipeGen.java index 27763f22..422988f0 100644 --- a/src/main/java/com/drmangotea/tfmg/datagen/recipes/values/create/TFMGCompactingRecipeGen.java +++ b/src/main/java/com/drmangotea/tfmg/datagen/recipes/values/create/TFMGCompactingRecipeGen.java @@ -7,7 +7,7 @@ import com.simibubi.create.api.data.recipe.CompactingRecipeGen; import com.simibubi.create.content.processing.recipe.HeatCondition; import net.minecraft.core.HolderLookup; import net.minecraft.data.PackOutput; -import net.minecraft.world.item.Items; +import net.neoforged.neoforge.fluids.crafting.SizedFluidIngredient; import java.util.concurrent.CompletableFuture; @@ -18,7 +18,7 @@ public class TFMGCompactingRecipeGen extends CompactingRecipeGen { GeneratedRecipe BITUMEN = create(TFMG.asResource("bitumen"), b -> b - .require(heavyOil(),1000) + .require(SizedFluidIngredient.of(heavyOil(),1000)) .output(bitumen(), 1) .requiresHeat(HeatCondition.HEATED) ), diff --git a/src/main/java/com/drmangotea/tfmg/datagen/recipes/values/create/TFMGFillingRecipeGen.java b/src/main/java/com/drmangotea/tfmg/datagen/recipes/values/create/TFMGFillingRecipeGen.java index 8964caf5..0f16d8a5 100644 --- a/src/main/java/com/drmangotea/tfmg/datagen/recipes/values/create/TFMGFillingRecipeGen.java +++ b/src/main/java/com/drmangotea/tfmg/datagen/recipes/values/create/TFMGFillingRecipeGen.java @@ -5,13 +5,13 @@ import com.drmangotea.tfmg.content.items.weapons.fire_extinguisher.FireExtinguis import com.drmangotea.tfmg.registry.TFMGBlocks; import com.drmangotea.tfmg.registry.TFMGFluids; import com.drmangotea.tfmg.registry.TFMGItems; -import com.simibubi.create.AllRecipeTypes; import com.simibubi.create.api.data.recipe.FillingRecipeGen; import net.minecraft.core.HolderLookup; import net.minecraft.data.PackOutput; import net.minecraft.tags.ItemTags; import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.Items; +import net.neoforged.neoforge.fluids.crafting.SizedFluidIngredient; import java.util.concurrent.CompletableFuture; @@ -38,7 +38,7 @@ public class TFMGFillingRecipeGen extends FillingRecipeGen { LPG_TANK = create(TFMG.asResource("lpg_tank"), b -> b .require(Items.BUCKET) - .require(lpg(), 1000) + .require(SizedFluidIngredient.of(lpg(), 1000)) .output(lpgTank()) ), //BUTANE_TANK = create("butane_tank"), b -> b @@ -51,47 +51,47 @@ public class TFMGFillingRecipeGen extends FillingRecipeGen { //), HYDROGEN_TANK = create(TFMG.asResource("hydrogen_tank"), b -> b .require(Items.BUCKET) - .require(hydrogen(), 1000) + .require(SizedFluidIngredient.of(hydrogen(), 1000)) .output(hydrogenTank()) ), FURNACE_GAS_TANK = create(TFMG.asResource("furnace_gas_tank"), b -> b .require(Items.BUCKET) - .require(blastFurnaceGas(), 1000) + .require(SizedFluidIngredient.of(blastFurnaceGas(), 1000)) .output(furnaceGasTank()) ), ETHYLENE_TANK = create(TFMG.asResource("ethylene_tank"), b -> b .require(Items.BUCKET) - .require(ethylene(), 1000) + .require(SizedFluidIngredient.of(ethylene(), 1000)) .output(ethyleneTank()) ), PROPYLENE_TANK = create(TFMG.asResource("propylene_tank"), b -> b .require(Items.BUCKET) - .require(propylene(), 1000) + .require(SizedFluidIngredient.of(propylene(), 1000)) .output(propyleneTank()) ), NEON_TANK = create(TFMG.asResource("neon_tank"), b -> b .require(Items.BUCKET) - .require(neon(), 1000) + .require(SizedFluidIngredient.of(neon(), 1000)) .output(neonTank()) ), CARBON_DIOXIDE_TANK = create(TFMG.asResource("carbon_dioxide_tank"), b -> b .require(Items.BUCKET) - .require(carbonDioxide(), 1000) + .require(SizedFluidIngredient.of(carbonDioxide(), 1000)) .output(carbonDioxideTank()) ), AIR_TANK = create(TFMG.asResource("air_tank"), b -> b .require(Items.BUCKET) - .require(air(), 1000) + .require(SizedFluidIngredient.of(air(), 1000)) .output(airTank()) ), HOT_AIR_TANK = create(TFMG.asResource("hot_air_tank"), b -> b .require(Items.BUCKET) - .require(hotAir(), 1000) + .require(SizedFluidIngredient.of(hotAir(), 1000)) .output(hotAirTank()) ), FILLED_FIRE_EXTINGUISHER = create("filled_fire_extinguisher", b -> b .require(TFMGItems.FIRE_EXTINGUISHER) - .require(carbonDioxide(), 1000) + .require(SizedFluidIngredient.of(carbonDioxide(), 1000)) .output(createFilledExtinguisherStack()) ); @@ -102,14 +102,7 @@ public class TFMGFillingRecipeGen extends FillingRecipeGen { return stack; } - public TFMGFillingRecipeGen(PackOutput generator, CompletableFuture registries) { super(generator, registries, TFMG.MOD_ID); } - - @Override - protected AllRecipeTypes getRecipeType() { - return AllRecipeTypes.FILLING; - } - } \ No newline at end of file diff --git a/src/main/java/com/drmangotea/tfmg/datagen/recipes/values/create/TFMGItemApplicationRecipeGen.java b/src/main/java/com/drmangotea/tfmg/datagen/recipes/values/create/TFMGItemApplicationRecipeGen.java index 8e72a407..0bbcf1f4 100644 --- a/src/main/java/com/drmangotea/tfmg/datagen/recipes/values/create/TFMGItemApplicationRecipeGen.java +++ b/src/main/java/com/drmangotea/tfmg/datagen/recipes/values/create/TFMGItemApplicationRecipeGen.java @@ -2,7 +2,6 @@ package com.drmangotea.tfmg.datagen.recipes.values.create; import com.drmangotea.tfmg.TFMG; import com.drmangotea.tfmg.registry.TFMGBlocks; -import com.drmangotea.tfmg.registry.TFMGItems; import com.simibubi.create.api.data.recipe.ItemApplicationRecipeGen; import net.minecraft.core.HolderLookup; import net.minecraft.data.PackOutput; diff --git a/src/main/java/com/drmangotea/tfmg/datagen/recipes/values/create/TFMGMechanicalCraftingRecipeGen.java b/src/main/java/com/drmangotea/tfmg/datagen/recipes/values/create/TFMGMechanicalCraftingRecipeGen.java index 2dca5ee4..75a67aef 100644 --- a/src/main/java/com/drmangotea/tfmg/datagen/recipes/values/create/TFMGMechanicalCraftingRecipeGen.java +++ b/src/main/java/com/drmangotea/tfmg/datagen/recipes/values/create/TFMGMechanicalCraftingRecipeGen.java @@ -1,23 +1,14 @@ package com.drmangotea.tfmg.datagen.recipes.values.create; import java.util.concurrent.CompletableFuture; -import java.util.function.UnaryOperator; import com.drmangotea.tfmg.TFMG; -import com.drmangotea.tfmg.datagen.recipes.TFMGRecipeProvider; import com.drmangotea.tfmg.registry.TFMGBlocks; import com.drmangotea.tfmg.registry.TFMGItems; -import com.google.common.base.Supplier; -import com.simibubi.create.Create; -import com.simibubi.create.api.data.recipe.MechanicalCraftingRecipeBuilder; import com.simibubi.create.api.data.recipe.MechanicalCraftingRecipeGen; -import net.createmod.catnip.platform.CatnipServices; -import net.createmod.catnip.registry.RegisteredObjectsHelper; import net.minecraft.core.HolderLookup; import net.minecraft.data.PackOutput; -import net.minecraft.resources.ResourceLocation; import net.minecraft.world.item.Items; -import net.minecraft.world.level.ItemLike; import static com.drmangotea.tfmg.datagen.recipes.TFMGRecipeProvider.I.*; diff --git a/src/main/java/com/drmangotea/tfmg/datagen/recipes/values/create/TFMGMixingRecipeGen.java b/src/main/java/com/drmangotea/tfmg/datagen/recipes/values/create/TFMGMixingRecipeGen.java index 3782957e..2e7890aa 100644 --- a/src/main/java/com/drmangotea/tfmg/datagen/recipes/values/create/TFMGMixingRecipeGen.java +++ b/src/main/java/com/drmangotea/tfmg/datagen/recipes/values/create/TFMGMixingRecipeGen.java @@ -8,6 +8,7 @@ import com.simibubi.create.content.decoration.palettes.AllPaletteStoneTypes; import com.simibubi.create.content.processing.recipe.HeatCondition; import net.minecraft.core.HolderLookup; import net.minecraft.data.PackOutput; +import net.neoforged.neoforge.fluids.crafting.SizedFluidIngredient; import java.util.concurrent.CompletableFuture; @@ -67,19 +68,19 @@ public class TFMGMixingRecipeGen extends MixingRecipeGen { ), COPPER_SULFATE = create("copper_sulfate", b -> b - .require(sulfuricAcid(),500) + .require(SizedFluidIngredient.of(sulfuricAcid(),500)) .require(copperIngot()) .output(copperSulfate()) ), LIQUID_CONCRETE = create("liquid_concrete", b -> b - .require(water(),250) + .require(SizedFluidIngredient.of(water(),250)) .require(concreteMixture()) .output(liquidConcrete(),1000) ), LIQUID_ASPHALT = create("liquid_asphalt", b -> b - .require(water(),250) + .require(SizedFluidIngredient.of(water(),250)) .require(asphaltMixture()) .output(liquidAsphalt(),1000) ), @@ -107,14 +108,14 @@ public class TFMGMixingRecipeGen extends MixingRecipeGen { ), NAPALM = create("napalm", b -> b - .require(gasoline(),1000) + .require(SizedFluidIngredient.of(gasoline(),1000)) .require(aluminumIngot()) .output(napalm(),250) ), COOLING_FLUID = create("cooling_fluid", b -> b - .require(water(),250) - .require(ethylene(),1000) + .require(SizedFluidIngredient.of(water(),250)) + .require(SizedFluidIngredient.of(ethylene(),1000)) .output(coolingFluid(),250) ), diff --git a/src/main/java/com/drmangotea/tfmg/datagen/recipes/values/create/TFMGSequencedAssemblyRecipeGen.java b/src/main/java/com/drmangotea/tfmg/datagen/recipes/values/create/TFMGSequencedAssemblyRecipeGen.java index 7773925f..0b3ba396 100644 --- a/src/main/java/com/drmangotea/tfmg/datagen/recipes/values/create/TFMGSequencedAssemblyRecipeGen.java +++ b/src/main/java/com/drmangotea/tfmg/datagen/recipes/values/create/TFMGSequencedAssemblyRecipeGen.java @@ -10,14 +10,13 @@ import com.simibubi.create.api.data.recipe.SequencedAssemblyRecipeGen; import com.simibubi.create.content.fluids.transfer.FillingRecipe; import com.simibubi.create.content.kinetics.deployer.DeployerApplicationRecipe; import com.simibubi.create.content.kinetics.press.PressingRecipe; -import com.simibubi.create.foundation.data.recipe.CreateRecipeProvider; import net.minecraft.core.HolderLookup; import net.minecraft.data.PackOutput; import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.Items; +import net.neoforged.neoforge.fluids.crafting.SizedFluidIngredient; import java.util.concurrent.CompletableFuture; -import java.util.function.UnaryOperator; import static com.drmangotea.tfmg.datagen.recipes.TFMGRecipeProvider.F.lubricationOil; import static com.drmangotea.tfmg.datagen.recipes.TFMGRecipeProvider.I.*; @@ -35,7 +34,7 @@ public class TFMGSequencedAssemblyRecipeGen extends SequencedAssemblyRecipeGen { .addStep(WindingRecipe::new, rb -> rb.require(TFMGItems.CONSTANTAN_SPOOL.get()).duration(100)) .addStep(DeployerApplicationRecipe::new, rb -> rb.require(TFMGBlocks.STEEL_COGWHEEL)) .addStep(DeployerApplicationRecipe::new, rb -> rb.require(TFMGItems.COPPER_WIRE)) - .addStep(FillingRecipe::new, rb -> rb.require(lubricationOil(), 50))), + .addStep(FillingRecipe::new, rb -> rb.require(SizedFluidIngredient.of(lubricationOil(), 50)))), GENERATOR = create("generator", b -> b.require(shaft()) .transitionTo(TFMGItems.UNFINISHED_GENERATOR.get()) diff --git a/src/main/java/com/drmangotea/tfmg/datagen/recipes/values/tfmg/TFMGCastingRecipeGen.java b/src/main/java/com/drmangotea/tfmg/datagen/recipes/values/tfmg/TFMGCastingRecipeGen.java index d380acfd..7dc4d092 100644 --- a/src/main/java/com/drmangotea/tfmg/datagen/recipes/values/tfmg/TFMGCastingRecipeGen.java +++ b/src/main/java/com/drmangotea/tfmg/datagen/recipes/values/tfmg/TFMGCastingRecipeGen.java @@ -5,7 +5,6 @@ import com.drmangotea.tfmg.datagen.recipes.builder.CastingRecipeGen; import com.drmangotea.tfmg.registry.TFMGBlocks; import com.drmangotea.tfmg.registry.TFMGFluids; import com.drmangotea.tfmg.registry.TFMGItems; -import com.drmangotea.tfmg.registry.TFMGRecipeTypes; import com.simibubi.create.api.data.recipe.BaseRecipeProvider; import net.minecraft.core.HolderLookup; import net.minecraft.data.PackOutput; diff --git a/src/main/java/com/drmangotea/tfmg/datagen/recipes/values/tfmg/TFMGCokingRecipeGen.java b/src/main/java/com/drmangotea/tfmg/datagen/recipes/values/tfmg/TFMGCokingRecipeGen.java index c0063347..601f013b 100644 --- a/src/main/java/com/drmangotea/tfmg/datagen/recipes/values/tfmg/TFMGCokingRecipeGen.java +++ b/src/main/java/com/drmangotea/tfmg/datagen/recipes/values/tfmg/TFMGCokingRecipeGen.java @@ -4,12 +4,9 @@ import com.drmangotea.tfmg.TFMG; import com.drmangotea.tfmg.datagen.recipes.builder.CokingRecipeGen; import com.drmangotea.tfmg.registry.TFMGFluids; import com.drmangotea.tfmg.registry.TFMGItems; -import com.drmangotea.tfmg.registry.TFMGRecipeTypes; -import com.simibubi.create.foundation.recipe.IRecipeTypeInfo; import net.minecraft.core.HolderLookup; import net.minecraft.data.PackOutput; import net.minecraft.world.item.Items; -import net.neoforged.neoforge.fluids.FluidStack; import java.util.concurrent.CompletableFuture; diff --git a/src/main/java/com/drmangotea/tfmg/datagen/recipes/values/tfmg/TFMGDistillationRecipeGen.java b/src/main/java/com/drmangotea/tfmg/datagen/recipes/values/tfmg/TFMGDistillationRecipeGen.java index 755c5cc3..f29eea2a 100644 --- a/src/main/java/com/drmangotea/tfmg/datagen/recipes/values/tfmg/TFMGDistillationRecipeGen.java +++ b/src/main/java/com/drmangotea/tfmg/datagen/recipes/values/tfmg/TFMGDistillationRecipeGen.java @@ -5,6 +5,7 @@ import com.drmangotea.tfmg.datagen.recipes.builder.DistillationRecipeGen; import com.drmangotea.tfmg.registry.TFMGRecipeTypes; import net.minecraft.core.HolderLookup; import net.minecraft.data.PackOutput; +import net.neoforged.neoforge.fluids.crafting.SizedFluidIngredient; import java.util.concurrent.CompletableFuture; @@ -15,7 +16,7 @@ public class TFMGDistillationRecipeGen extends DistillationRecipeGen { GeneratedRecipe CRUDE_OIL = create(TFMG.asResource("crude_oil"), b ->b - .require(crudeOil(),340) + .require(SizedFluidIngredient.of(crudeOil(),340)) .output(heavyOil(), 120) .output(diesel(), 60) .output(kerosene(), 30) @@ -23,21 +24,21 @@ public class TFMGDistillationRecipeGen extends DistillationRecipeGen { .output(gasoline(), 60) .output(lpg(), 60)), CRUDE_OIL_NO_NAPHTHA = create(TFMG.asResource("crude_oil_no_naphtha"), b ->b - .require(crudeOil(),330) + .require(SizedFluidIngredient.of(crudeOil(),330)) .output(heavyOil(), 120) .output(diesel(), 60) .output(kerosene(), 30) .output(gasoline(), 60) .output(lpg(), 60)), CRUDE_OIL_LIGHT_DISTILLATION = create(TFMG.asResource("crude_oil_light_distillation"), b ->b - .require(crudeOil(),200) + .require(SizedFluidIngredient.of(crudeOil(),200)) .output(heavyOil(), 150) .output(diesel(), 45) .output(gasoline(), 5)), HEAVY_OIL = create(TFMG.asResource("heavy_oil"), b ->b - .require(heavyOil(),200) + .require(SizedFluidIngredient.of(heavyOil(),200)) .output(heavyOil(), 100) .output(lubricationOil(), 25) .output(diesel(), 50) @@ -45,14 +46,14 @@ public class TFMGDistillationRecipeGen extends DistillationRecipeGen { .output(naphtha(), 5)), HEAVY_OIL_NO_NAPHTHA = create(TFMG.asResource("heavy_oil_no_naphtha"), b ->b - .require(heavyOil(),200) + .require(SizedFluidIngredient.of(heavyOil(),200)) .output(heavyOil(), 100) .output(lubricationOil(), 30) .output(diesel(), 50) .output(kerosene(), 20)), HEAVY_OIL_LIGHT_DISTILLATION = create(TFMG.asResource("heavy_oil_light_distillation"), b ->b - .require(heavyOil(),200) + .require(SizedFluidIngredient.of(heavyOil(),200)) .output(heavyOil(), 100) .output(diesel(), 50) .output(lubricationOil(), 50)); diff --git a/src/main/java/com/drmangotea/tfmg/datagen/recipes/values/tfmg/TFMGHotBlastRecipeGen.java b/src/main/java/com/drmangotea/tfmg/datagen/recipes/values/tfmg/TFMGHotBlastRecipeGen.java index a9d11e8d..6e5d9bc4 100644 --- a/src/main/java/com/drmangotea/tfmg/datagen/recipes/values/tfmg/TFMGHotBlastRecipeGen.java +++ b/src/main/java/com/drmangotea/tfmg/datagen/recipes/values/tfmg/TFMGHotBlastRecipeGen.java @@ -2,10 +2,10 @@ package com.drmangotea.tfmg.datagen.recipes.values.tfmg; import com.drmangotea.tfmg.TFMG; import com.drmangotea.tfmg.datagen.recipes.builder.HotBlastRecipeGen; -import com.drmangotea.tfmg.registry.TFMGRecipeTypes; import com.drmangotea.tfmg.registry.TFMGTags; import net.minecraft.core.HolderLookup; import net.minecraft.data.PackOutput; +import net.neoforged.neoforge.fluids.crafting.SizedFluidIngredient; import java.util.concurrent.CompletableFuture; @@ -17,7 +17,7 @@ public class TFMGHotBlastRecipeGen extends HotBlastRecipeGen { HOT_AIR = create(TFMG.asResource("hot_air"), b ->b - .require(air(),25) + .require(SizedFluidIngredient.of(air(),25)) .require(TFMGTags.TFMGFluidTags.BLAST_STOVE_FUEL.tag,5) .output(hotAir(), 25) .output(carbonDioxide(), 25) diff --git a/src/main/java/com/drmangotea/tfmg/datagen/recipes/values/tfmg/TFMGIndustrialBlastingRecipeGen.java b/src/main/java/com/drmangotea/tfmg/datagen/recipes/values/tfmg/TFMGIndustrialBlastingRecipeGen.java index 14aae361..3370585c 100644 --- a/src/main/java/com/drmangotea/tfmg/datagen/recipes/values/tfmg/TFMGIndustrialBlastingRecipeGen.java +++ b/src/main/java/com/drmangotea/tfmg/datagen/recipes/values/tfmg/TFMGIndustrialBlastingRecipeGen.java @@ -5,10 +5,8 @@ import com.drmangotea.tfmg.TFMG; import com.drmangotea.tfmg.datagen.recipes.builder.IndustrialBlastingRecipeGen; import com.drmangotea.tfmg.recipes.IndustrialBlastingRecipe; import com.drmangotea.tfmg.registry.TFMGFluids; -import com.drmangotea.tfmg.registry.TFMGRecipeTypes; import com.drmangotea.tfmg.registry.TFMGTags; import com.simibubi.create.AllItems; -import com.simibubi.create.foundation.recipe.IRecipeTypeInfo; import net.minecraft.core.HolderLookup; import net.minecraft.data.PackOutput; import net.minecraft.world.item.Items; diff --git a/src/main/java/com/drmangotea/tfmg/datagen/recipes/values/tfmg/TFMGPolarizingRecipeGen.java b/src/main/java/com/drmangotea/tfmg/datagen/recipes/values/tfmg/TFMGPolarizingRecipeGen.java index 506963e5..4a2ac5a7 100644 --- a/src/main/java/com/drmangotea/tfmg/datagen/recipes/values/tfmg/TFMGPolarizingRecipeGen.java +++ b/src/main/java/com/drmangotea/tfmg/datagen/recipes/values/tfmg/TFMGPolarizingRecipeGen.java @@ -3,7 +3,6 @@ package com.drmangotea.tfmg.datagen.recipes.values.tfmg; import com.drmangotea.tfmg.TFMG; import com.drmangotea.tfmg.datagen.recipes.builder.PolarizingRecipeGen; import com.drmangotea.tfmg.registry.TFMGItems; -import com.drmangotea.tfmg.registry.TFMGRecipeTypes; import net.minecraft.core.HolderLookup; import net.minecraft.data.PackOutput; diff --git a/src/main/java/com/drmangotea/tfmg/datagen/recipes/values/tfmg/TFMGVatRecipeGen.java b/src/main/java/com/drmangotea/tfmg/datagen/recipes/values/tfmg/TFMGVatRecipeGen.java index 24c9f628..72f29017 100644 --- a/src/main/java/com/drmangotea/tfmg/datagen/recipes/values/tfmg/TFMGVatRecipeGen.java +++ b/src/main/java/com/drmangotea/tfmg/datagen/recipes/values/tfmg/TFMGVatRecipeGen.java @@ -4,17 +4,15 @@ package com.drmangotea.tfmg.datagen.recipes.values.tfmg; import com.drmangotea.tfmg.TFMG; import com.drmangotea.tfmg.datagen.recipes.builder.VatRecipeGen; import com.drmangotea.tfmg.recipes.VatMachineRecipe; -import com.drmangotea.tfmg.recipes.VatRecipeParams; import com.drmangotea.tfmg.registry.TFMGFluids; import com.drmangotea.tfmg.registry.TFMGItems; -import com.drmangotea.tfmg.registry.TFMGRecipeTypes; import com.drmangotea.tfmg.registry.TFMGTags; import com.simibubi.create.content.processing.recipe.HeatCondition; -import com.simibubi.create.foundation.recipe.IRecipeTypeInfo; import net.minecraft.core.HolderLookup; import net.minecraft.data.PackOutput; import net.minecraft.world.level.block.Blocks; import net.minecraft.world.level.material.Fluids; +import net.neoforged.neoforge.fluids.crafting.SizedFluidIngredient; import java.util.ArrayList; import java.util.List; @@ -54,7 +52,7 @@ public class TFMGVatRecipeGen extends VatRecipeGen { .duration(10) .values(centrifuge())), SULFURIC_ACID = create("sulfuric_acid", b -> ((VatMachineRecipe.Builder) b) - .require(water(), 1000) + .require(SizedFluidIngredient.of(water(), 1000)) .require(sulfurDust()) .require(sulfurDust()) .require(sulfurDust()) @@ -63,26 +61,26 @@ public class TFMGVatRecipeGen extends VatRecipeGen { .values(mixing())), RUBBER = create("rubber", b -> ((VatMachineRecipe.Builder) b) - .require(heavyOil(), 250) + .require(SizedFluidIngredient.of(heavyOil(), 250)) .require(sulfurDust()) .output(rubber()) .requiresHeat(HeatCondition.HEATED) .values(mixing())), NAPHTHA = create("naphtha", b -> ((VatMachineRecipe.Builder) b) - .require(naphtha(), 500) + .require(SizedFluidIngredient.of(naphtha(), 500)) .output(ethylene(), 250) .output(propylene(), 250) .requiresHeat(HeatCondition.HEATED) .values(mixing())), PLASTIC_FROM_ETHYLENE = create("plastic_from_ethylene", b -> ((VatMachineRecipe.Builder) b) - .require(ethylene(), 500) + .require(SizedFluidIngredient.of(ethylene(), 500)) .output(liquidPlastic(), 500) .requiresHeat(HeatCondition.HEATED) .values(mixing())), PLASTIC_FROM_PROPYLENE = create("plastic_from_propylene", b -> ((VatMachineRecipe.Builder) b) - .require(propylene(), 500) + .require(SizedFluidIngredient.of(propylene(), 500)) .output(liquidPlastic(), 500) .requiresHeat(HeatCondition.HEATED) .values(mixing())), diff --git a/src/main/java/com/drmangotea/tfmg/datagen/recipes/values/tfmg/TFMGWindingRecipeGen.java b/src/main/java/com/drmangotea/tfmg/datagen/recipes/values/tfmg/TFMGWindingRecipeGen.java index 79b08f61..f9de24cc 100644 --- a/src/main/java/com/drmangotea/tfmg/datagen/recipes/values/tfmg/TFMGWindingRecipeGen.java +++ b/src/main/java/com/drmangotea/tfmg/datagen/recipes/values/tfmg/TFMGWindingRecipeGen.java @@ -3,8 +3,6 @@ package com.drmangotea.tfmg.datagen.recipes.values.tfmg; import com.drmangotea.tfmg.TFMG; import com.drmangotea.tfmg.datagen.recipes.builder.WindingRecipeGen; import com.drmangotea.tfmg.registry.TFMGItems; -import com.drmangotea.tfmg.registry.TFMGRecipeTypes; -import com.simibubi.create.api.data.recipe.WashingRecipeGen; import net.minecraft.core.HolderLookup; import net.minecraft.data.PackOutput; diff --git a/src/main/java/com/drmangotea/tfmg/mixin/FluidTankBlockEntityMixin.java b/src/main/java/com/drmangotea/tfmg/mixin/FluidTankBlockEntityMixin.java index 238335a4..843250ca 100644 --- a/src/main/java/com/drmangotea/tfmg/mixin/FluidTankBlockEntityMixin.java +++ b/src/main/java/com/drmangotea/tfmg/mixin/FluidTankBlockEntityMixin.java @@ -1,6 +1,5 @@ package com.drmangotea.tfmg.mixin; -import com.drmangotea.tfmg.TFMG; import com.drmangotea.tfmg.content.decoration.tanks.aluminum.AluminumTankBlock; import com.drmangotea.tfmg.content.decoration.tanks.cast_iron.CastIronTankBlock; import com.drmangotea.tfmg.mixin.accessor.FluidTankBlockEntityAccessor; diff --git a/src/main/java/com/drmangotea/tfmg/mixin/accessor/ProcessingRecipeAccessor.java b/src/main/java/com/drmangotea/tfmg/mixin/accessor/ProcessingRecipeAccessor.java index b8d8e367..65565b95 100644 --- a/src/main/java/com/drmangotea/tfmg/mixin/accessor/ProcessingRecipeAccessor.java +++ b/src/main/java/com/drmangotea/tfmg/mixin/accessor/ProcessingRecipeAccessor.java @@ -1,15 +1,13 @@ package com.drmangotea.tfmg.mixin.accessor; -import com.drmangotea.tfmg.registry.TFMGRecipeTypes; -import com.simibubi.create.content.fluids.tank.FluidTankBlockEntity; import com.simibubi.create.content.processing.recipe.ProcessingOutput; import com.simibubi.create.content.processing.recipe.ProcessingRecipe; -import com.simibubi.create.foundation.fluid.FluidIngredient; import com.simibubi.create.foundation.recipe.IRecipeTypeInfo; import net.minecraft.core.NonNullList; import net.minecraft.world.item.crafting.Ingredient; import net.neoforged.neoforge.fluids.FluidStack; +import net.neoforged.neoforge.fluids.crafting.SizedFluidIngredient; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.gen.Accessor; @@ -19,7 +17,7 @@ public interface ProcessingRecipeAccessor { @Accessor("ingredients") NonNullList tfmg$ingredients(); @Accessor("fluidIngredients") - NonNullList tfmg$fluidIngredients(); + NonNullList tfmg$fluidIngredients(); @Accessor("results") NonNullList tfmg$results(); @Accessor("fluidResults") diff --git a/src/main/java/com/drmangotea/tfmg/mixin/accessor/TankSegmentAccessor.java b/src/main/java/com/drmangotea/tfmg/mixin/accessor/TankSegmentAccessor.java index f7f66345..898b6d5c 100644 --- a/src/main/java/com/drmangotea/tfmg/mixin/accessor/TankSegmentAccessor.java +++ b/src/main/java/com/drmangotea/tfmg/mixin/accessor/TankSegmentAccessor.java @@ -1,11 +1,9 @@ package com.drmangotea.tfmg.mixin.accessor; -import com.simibubi.create.content.fluids.tank.FluidTankBlockEntity; import com.simibubi.create.foundation.blockEntity.behaviour.fluid.SmartFluidTankBehaviour; import com.simibubi.create.foundation.fluid.SmartFluidTank; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.gen.Accessor; -import org.spongepowered.asm.mixin.gen.Invoker; @Mixin(SmartFluidTankBehaviour.TankSegment.class) public interface TankSegmentAccessor { diff --git a/src/main/java/com/drmangotea/tfmg/ponder/TFMGPonderPlugin.java b/src/main/java/com/drmangotea/tfmg/ponder/TFMGPonderPlugin.java index 9c878cd2..e62ba87b 100644 --- a/src/main/java/com/drmangotea/tfmg/ponder/TFMGPonderPlugin.java +++ b/src/main/java/com/drmangotea/tfmg/ponder/TFMGPonderPlugin.java @@ -1,17 +1,8 @@ package com.drmangotea.tfmg.ponder; import com.drmangotea.tfmg.TFMG; -import com.simibubi.create.AllBlocks; -import com.simibubi.create.Create; -import com.simibubi.create.content.kinetics.crank.ValveHandleBlock; -import com.simibubi.create.content.logistics.packagePort.postbox.PostboxBlock; -import com.simibubi.create.content.logistics.tableCloth.TableClothBlock; -import com.simibubi.create.infrastructure.ponder.AllCreatePonderScenes; -import com.simibubi.create.infrastructure.ponder.AllCreatePonderTags; -import net.createmod.ponder.api.level.PonderLevel; import net.createmod.ponder.api.registration.*; import net.minecraft.resources.ResourceLocation; -import net.minecraft.world.item.DyeColor; public class TFMGPonderPlugin implements PonderPlugin { diff --git a/src/main/java/com/drmangotea/tfmg/ponder/TFMGPonderScenes.java b/src/main/java/com/drmangotea/tfmg/ponder/TFMGPonderScenes.java index 20c503d1..c3c7dc8d 100644 --- a/src/main/java/com/drmangotea/tfmg/ponder/TFMGPonderScenes.java +++ b/src/main/java/com/drmangotea/tfmg/ponder/TFMGPonderScenes.java @@ -4,9 +4,7 @@ import com.drmangotea.tfmg.content.decoration.pipes.TFMGPipes; import com.drmangotea.tfmg.ponder.scenes.MetallurgyScenes; import com.drmangotea.tfmg.ponder.scenes.MiscTFMGScenes; import com.drmangotea.tfmg.registry.TFMGBlocks; -import com.simibubi.create.AllBlocks; import com.simibubi.create.Create; -import com.simibubi.create.infrastructure.ponder.AllCreatePonderScenes; import com.simibubi.create.infrastructure.ponder.AllCreatePonderTags; import com.simibubi.create.infrastructure.ponder.scenes.fluid.PipeScenes; import com.simibubi.create.infrastructure.ponder.scenes.fluid.PumpScenes; diff --git a/src/main/java/com/drmangotea/tfmg/ponder/TFMGPonderTags.java b/src/main/java/com/drmangotea/tfmg/ponder/TFMGPonderTags.java index f807cc12..053907e1 100644 --- a/src/main/java/com/drmangotea/tfmg/ponder/TFMGPonderTags.java +++ b/src/main/java/com/drmangotea/tfmg/ponder/TFMGPonderTags.java @@ -3,10 +3,7 @@ package com.drmangotea.tfmg.ponder; import com.drmangotea.tfmg.TFMG; import com.drmangotea.tfmg.registry.TFMGBlocks; import com.drmangotea.tfmg.registry.TFMGItems; -import com.simibubi.create.AllBlocks; -import com.simibubi.create.AllItems; import com.tterrag.registrate.util.entry.RegistryEntry; -import net.createmod.catnip.platform.CatnipServices; import net.createmod.catnip.registry.RegisteredObjectsHelper; import net.createmod.ponder.api.registration.PonderTagRegistrationHelper; import net.minecraft.resources.ResourceLocation; diff --git a/src/main/java/com/drmangotea/tfmg/ponder/TFMGSceneBuilder.java b/src/main/java/com/drmangotea/tfmg/ponder/TFMGSceneBuilder.java index 22a65c5a..a7845080 100644 --- a/src/main/java/com/drmangotea/tfmg/ponder/TFMGSceneBuilder.java +++ b/src/main/java/com/drmangotea/tfmg/ponder/TFMGSceneBuilder.java @@ -1,18 +1,11 @@ package com.drmangotea.tfmg.ponder; -import com.drmangotea.tfmg.content.engines.base.EngineBlock; import com.drmangotea.tfmg.content.engines.types.regular_engine.RegularEngineBlockEntity; import com.drmangotea.tfmg.registry.TFMGItems; -import com.simibubi.create.content.fluids.pump.PumpBlockEntity; -import com.simibubi.create.content.kinetics.base.KineticBlockEntity; -import com.simibubi.create.content.kinetics.gauge.SpeedGaugeBlockEntity; import com.simibubi.create.foundation.ponder.CreateSceneBuilder; import net.createmod.ponder.api.scene.SceneBuilder; -import net.createmod.ponder.api.scene.Selection; import net.minecraft.core.BlockPos; -import java.util.function.UnaryOperator; - public class TFMGSceneBuilder extends CreateSceneBuilder { private final TFMGWorldInstructions tfmgInstructions; diff --git a/src/main/java/com/drmangotea/tfmg/ponder/scenes/MiscTFMGScenes.java b/src/main/java/com/drmangotea/tfmg/ponder/scenes/MiscTFMGScenes.java index e47816aa..d57d40c3 100644 --- a/src/main/java/com/drmangotea/tfmg/ponder/scenes/MiscTFMGScenes.java +++ b/src/main/java/com/drmangotea/tfmg/ponder/scenes/MiscTFMGScenes.java @@ -18,9 +18,6 @@ import net.minecraft.core.Direction; import net.minecraft.world.item.ItemStack; import net.minecraft.world.phys.AABB; import net.minecraft.world.phys.Vec3; -import org.checkerframework.checker.units.qual.A; - -import java.util.Vector; public class MiscTFMGScenes { diff --git a/src/main/java/com/drmangotea/tfmg/recipes/CokingRecipe.java b/src/main/java/com/drmangotea/tfmg/recipes/CokingRecipe.java index efd73975..9713c233 100644 --- a/src/main/java/com/drmangotea/tfmg/recipes/CokingRecipe.java +++ b/src/main/java/com/drmangotea/tfmg/recipes/CokingRecipe.java @@ -1,14 +1,12 @@ package com.drmangotea.tfmg.recipes; import com.drmangotea.tfmg.registry.TFMGRecipeTypes; -import com.simibubi.create.content.processing.recipe.ProcessingRecipe; import com.simibubi.create.content.processing.recipe.ProcessingRecipeParams; import com.simibubi.create.content.processing.recipe.StandardProcessingRecipe; import net.minecraft.world.item.crafting.Ingredient; import net.minecraft.world.item.crafting.RecipeInput; import net.minecraft.world.level.Level; import net.neoforged.neoforge.fluids.FluidStack; -import net.neoforged.neoforge.items.wrapper.RecipeWrapper; public class CokingRecipe extends StandardProcessingRecipe { diff --git a/src/main/java/com/drmangotea/tfmg/recipes/DistillationRecipe.java b/src/main/java/com/drmangotea/tfmg/recipes/DistillationRecipe.java index 92e4556e..7d256f86 100644 --- a/src/main/java/com/drmangotea/tfmg/recipes/DistillationRecipe.java +++ b/src/main/java/com/drmangotea/tfmg/recipes/DistillationRecipe.java @@ -4,17 +4,13 @@ package com.drmangotea.tfmg.recipes; import com.drmangotea.tfmg.registry.TFMGRecipeTypes; -import com.simibubi.create.content.processing.recipe.ProcessingRecipe; -import com.simibubi.create.content.processing.recipe.ProcessingRecipeBuilder; import com.simibubi.create.content.processing.recipe.ProcessingRecipeParams; import com.simibubi.create.content.processing.recipe.StandardProcessingRecipe; -import com.simibubi.create.foundation.fluid.FluidIngredient; -import com.simibubi.create.foundation.item.SmartInventory; -import net.minecraft.core.NonNullList; import net.minecraft.world.item.crafting.RecipeInput; import net.minecraft.world.level.Level; import net.neoforged.neoforge.fluids.FluidStack; import net.neoforged.neoforge.fluids.capability.templates.FluidTank; +import net.neoforged.neoforge.fluids.crafting.SizedFluidIngredient; public class DistillationRecipe extends StandardProcessingRecipe { @@ -32,7 +28,7 @@ public class DistillationRecipe extends StandardProcessingRecipe { return true; } - public FluidIngredient getInputFluid(){ + public SizedFluidIngredient getInputFluid(){ return getFluidIngredients().get(0); } diff --git a/src/main/java/com/drmangotea/tfmg/recipes/HotBlastRecipe.java b/src/main/java/com/drmangotea/tfmg/recipes/HotBlastRecipe.java index 1c1ef353..ffd031fa 100644 --- a/src/main/java/com/drmangotea/tfmg/recipes/HotBlastRecipe.java +++ b/src/main/java/com/drmangotea/tfmg/recipes/HotBlastRecipe.java @@ -1,16 +1,11 @@ package com.drmangotea.tfmg.recipes; import com.drmangotea.tfmg.registry.TFMGRecipeTypes; -import com.google.gson.JsonObject; -import com.simibubi.create.content.processing.recipe.ProcessingRecipe; -import com.simibubi.create.content.processing.recipe.ProcessingRecipeBuilder; import com.simibubi.create.content.processing.recipe.ProcessingRecipeParams; import com.simibubi.create.content.processing.recipe.StandardProcessingRecipe; -import com.simibubi.create.foundation.fluid.FluidIngredient; -import net.minecraft.util.GsonHelper; -import net.minecraft.world.item.crafting.Ingredient; import net.minecraft.world.level.Level; import net.neoforged.neoforge.fluids.FluidStack; +import net.neoforged.neoforge.fluids.crafting.SizedFluidIngredient; import net.neoforged.neoforge.items.wrapper.RecipeWrapper; public class HotBlastRecipe extends StandardProcessingRecipe { @@ -48,10 +43,10 @@ public class HotBlastRecipe extends StandardProcessingRecipe { return getFluidResults().get(1); } - public FluidIngredient getPrimaryIngredient(){ + public SizedFluidIngredient getPrimaryIngredient(){ return getFluidIngredients().get(0); } - public FluidIngredient getSecondaryIngredient(){ + public SizedFluidIngredient getSecondaryIngredient(){ return getFluidIngredients().get(1); } diff --git a/src/main/java/com/drmangotea/tfmg/recipes/IndustrialBlastingRecipe.java b/src/main/java/com/drmangotea/tfmg/recipes/IndustrialBlastingRecipe.java index e4914fb6..70d870ed 100644 --- a/src/main/java/com/drmangotea/tfmg/recipes/IndustrialBlastingRecipe.java +++ b/src/main/java/com/drmangotea/tfmg/recipes/IndustrialBlastingRecipe.java @@ -1,32 +1,17 @@ package com.drmangotea.tfmg.recipes; import com.drmangotea.tfmg.registry.TFMGRecipeTypes; -import com.google.gson.JsonObject; -import com.mojang.datafixers.util.Either; -import com.mojang.serialization.Codec; import com.mojang.serialization.MapCodec; -import com.mojang.serialization.codecs.RecordCodecBuilder; -import com.simibubi.create.content.kinetics.deployer.ItemApplicationRecipe; import com.simibubi.create.content.processing.recipe.*; -import com.simibubi.create.foundation.fluid.FluidIngredient; -import net.minecraft.core.NonNullList; import net.minecraft.network.RegistryFriendlyByteBuf; import net.minecraft.network.codec.StreamCodec; import net.minecraft.resources.ResourceLocation; -import net.minecraft.util.ExtraCodecs; -import net.minecraft.util.GsonHelper; -import net.minecraft.world.item.crafting.Ingredient; import net.minecraft.world.item.crafting.RecipeInput; import net.minecraft.world.item.crafting.RecipeSerializer; import net.minecraft.world.level.Level; import net.neoforged.neoforge.fluids.FluidStack; -import net.neoforged.neoforge.items.wrapper.RecipeWrapper; - -import java.util.ArrayList; -import java.util.List; -import java.util.function.Function; public class IndustrialBlastingRecipe extends ProcessingRecipe { diff --git a/src/main/java/com/drmangotea/tfmg/recipes/PolarizingRecipe.java b/src/main/java/com/drmangotea/tfmg/recipes/PolarizingRecipe.java index 08d43fe3..7f4952c7 100644 --- a/src/main/java/com/drmangotea/tfmg/recipes/PolarizingRecipe.java +++ b/src/main/java/com/drmangotea/tfmg/recipes/PolarizingRecipe.java @@ -4,24 +4,16 @@ import com.drmangotea.tfmg.base.lang.TFMGLang; import com.drmangotea.tfmg.recipes.jei.PolarizingCategory; import com.drmangotea.tfmg.registry.TFMGBlocks; import com.drmangotea.tfmg.registry.TFMGRecipeTypes; -import com.google.gson.JsonObject; import com.simibubi.create.compat.jei.category.sequencedAssembly.SequencedAssemblySubCategory; -import com.simibubi.create.content.processing.recipe.ProcessingRecipe; -import com.simibubi.create.content.processing.recipe.ProcessingRecipeBuilder; import com.simibubi.create.content.processing.recipe.ProcessingRecipeParams; import com.simibubi.create.content.processing.recipe.StandardProcessingRecipe; import com.simibubi.create.content.processing.sequenced.IAssemblyRecipe; -import com.simibubi.create.foundation.utility.CreateLang; -import net.minecraft.network.FriendlyByteBuf; import net.minecraft.network.chat.Component; -import net.minecraft.util.GsonHelper; import net.minecraft.world.item.crafting.Ingredient; import net.minecraft.world.item.crafting.RecipeInput; -import net.minecraft.world.item.crafting.SingleRecipeInput; import net.minecraft.world.level.ItemLike; import net.minecraft.world.level.Level; -import net.neoforged.neoforge.items.wrapper.RecipeWrapper; import javax.annotation.ParametersAreNonnullByDefault; import java.util.List; diff --git a/src/main/java/com/drmangotea/tfmg/recipes/VatMachineRecipe.java b/src/main/java/com/drmangotea/tfmg/recipes/VatMachineRecipe.java index ff637e65..0895eda2 100644 --- a/src/main/java/com/drmangotea/tfmg/recipes/VatMachineRecipe.java +++ b/src/main/java/com/drmangotea/tfmg/recipes/VatMachineRecipe.java @@ -2,31 +2,18 @@ package com.drmangotea.tfmg.recipes; import com.drmangotea.tfmg.datagen.recipes.values.tfmg.TFMGVatRecipeGen; import com.drmangotea.tfmg.registry.TFMGRecipeTypes; -import com.google.gson.JsonArray; -import com.google.gson.JsonObject; -import com.mojang.datafixers.util.Either; -import com.mojang.serialization.Codec; import com.mojang.serialization.MapCodec; -import com.mojang.serialization.codecs.RecordCodecBuilder; import com.simibubi.create.content.processing.recipe.ProcessingRecipe; import com.simibubi.create.content.processing.recipe.ProcessingRecipeBuilder; -import com.simibubi.create.content.processing.recipe.ProcessingRecipeParams; -import com.simibubi.create.foundation.fluid.FluidIngredient; -import net.minecraft.network.FriendlyByteBuf; import net.minecraft.network.RegistryFriendlyByteBuf; import net.minecraft.network.codec.StreamCodec; import net.minecraft.resources.ResourceLocation; -import net.minecraft.util.GsonHelper; -import net.minecraft.world.item.crafting.Ingredient; import net.minecraft.world.item.crafting.RecipeInput; import net.minecraft.world.item.crafting.RecipeSerializer; import net.minecraft.world.level.Level; -import net.neoforged.neoforge.items.wrapper.RecipeWrapper; -import java.util.ArrayList; import java.util.List; -import java.util.function.Function; public class VatMachineRecipe extends ProcessingRecipe { diff --git a/src/main/java/com/drmangotea/tfmg/recipes/VatRecipeParams.java b/src/main/java/com/drmangotea/tfmg/recipes/VatRecipeParams.java index 71abccb9..0cc4591d 100644 --- a/src/main/java/com/drmangotea/tfmg/recipes/VatRecipeParams.java +++ b/src/main/java/com/drmangotea/tfmg/recipes/VatRecipeParams.java @@ -1,6 +1,5 @@ package com.drmangotea.tfmg.recipes; -import com.drmangotea.tfmg.TFMG; import com.mojang.serialization.Codec; import com.mojang.serialization.MapCodec; import com.mojang.serialization.codecs.RecordCodecBuilder; diff --git a/src/main/java/com/drmangotea/tfmg/recipes/WindingRecipe.java b/src/main/java/com/drmangotea/tfmg/recipes/WindingRecipe.java index ec1300e3..a27bb7ab 100644 --- a/src/main/java/com/drmangotea/tfmg/recipes/WindingRecipe.java +++ b/src/main/java/com/drmangotea/tfmg/recipes/WindingRecipe.java @@ -5,12 +5,10 @@ import com.drmangotea.tfmg.recipes.jei.WindingCategory; import com.drmangotea.tfmg.registry.TFMGBlocks; import com.drmangotea.tfmg.registry.TFMGRecipeTypes; import com.simibubi.create.compat.jei.category.sequencedAssembly.SequencedAssemblySubCategory; -import com.simibubi.create.content.processing.recipe.ProcessingRecipe; import com.simibubi.create.content.processing.recipe.ProcessingRecipeParams; import com.simibubi.create.content.processing.recipe.StandardProcessingRecipe; import com.simibubi.create.content.processing.sequenced.IAssemblyRecipe; -import com.simibubi.create.foundation.utility.CreateLang; import net.minecraft.network.chat.Component; import net.minecraft.world.item.crafting.Ingredient; import net.minecraft.world.level.ItemLike; diff --git a/src/main/java/com/drmangotea/tfmg/recipes/jei/CastingCategory.java b/src/main/java/com/drmangotea/tfmg/recipes/jei/CastingCategory.java index 51cb5a6c..82ddc5a4 100644 --- a/src/main/java/com/drmangotea/tfmg/recipes/jei/CastingCategory.java +++ b/src/main/java/com/drmangotea/tfmg/recipes/jei/CastingCategory.java @@ -3,7 +3,6 @@ package com.drmangotea.tfmg.recipes.jei; import com.drmangotea.tfmg.recipes.CastingRecipe; import com.drmangotea.tfmg.recipes.jei.machines.CastingSetup; -import com.drmangotea.tfmg.registry.TFMGItems; import com.simibubi.create.compat.jei.category.CreateRecipeCategory; import com.simibubi.create.foundation.gui.AllGuiTextures; @@ -14,7 +13,6 @@ import mezz.jei.api.recipe.RecipeIngredientRole; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiGraphics; import net.minecraft.core.RegistryAccess; -import net.minecraft.world.item.ItemStack; import javax.annotation.ParametersAreNonnullByDefault; diff --git a/src/main/java/com/drmangotea/tfmg/recipes/jei/ChemicalVatCategory.java b/src/main/java/com/drmangotea/tfmg/recipes/jei/ChemicalVatCategory.java index bb65b5ab..7d1d059d 100644 --- a/src/main/java/com/drmangotea/tfmg/recipes/jei/ChemicalVatCategory.java +++ b/src/main/java/com/drmangotea/tfmg/recipes/jei/ChemicalVatCategory.java @@ -1,23 +1,16 @@ package com.drmangotea.tfmg.recipes.jei; -import com.drmangotea.tfmg.recipes.PolarizingRecipe; import com.drmangotea.tfmg.recipes.VatMachineRecipe; -import com.drmangotea.tfmg.recipes.jei.machines.Polarizer; import com.drmangotea.tfmg.registry.TFMGGuiTextures; -import com.mojang.blaze3d.vertex.PoseStack; import com.simibubi.create.compat.jei.category.CreateRecipeCategory; -import com.simibubi.create.compat.jei.category.sequencedAssembly.SequencedAssemblySubCategory; import com.simibubi.create.content.processing.recipe.HeatCondition; import com.simibubi.create.content.processing.recipe.ProcessingOutput; -import com.simibubi.create.content.processing.sequenced.SequencedRecipe; -import com.simibubi.create.foundation.gui.AllGuiTextures; import com.simibubi.create.foundation.item.ItemHelper; import mezz.jei.api.gui.builder.IRecipeLayoutBuilder; import mezz.jei.api.gui.ingredient.IRecipeSlotsView; import mezz.jei.api.recipe.IFocusGroup; import mezz.jei.api.recipe.RecipeIngredientRole; import net.createmod.catnip.data.Pair; -import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiGraphics; import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.crafting.Ingredient; diff --git a/src/main/java/com/drmangotea/tfmg/recipes/jei/CokingCategory.java b/src/main/java/com/drmangotea/tfmg/recipes/jei/CokingCategory.java index 38cbd8ba..14f6edc9 100644 --- a/src/main/java/com/drmangotea/tfmg/recipes/jei/CokingCategory.java +++ b/src/main/java/com/drmangotea/tfmg/recipes/jei/CokingCategory.java @@ -2,17 +2,13 @@ package com.drmangotea.tfmg.recipes.jei; import com.drmangotea.tfmg.recipes.CokingRecipe; import com.drmangotea.tfmg.recipes.jei.machines.CokeOven; -import com.drmangotea.tfmg.registry.TFMGFluids; import com.simibubi.create.compat.jei.category.CreateRecipeCategory; import com.simibubi.create.foundation.gui.AllGuiTextures; import mezz.jei.api.gui.builder.IRecipeLayoutBuilder; import mezz.jei.api.gui.ingredient.IRecipeSlotsView; import mezz.jei.api.recipe.IFocusGroup; import mezz.jei.api.recipe.RecipeIngredientRole; -import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiGraphics; -import net.minecraft.core.RegistryAccess; -import net.neoforged.neoforge.fluids.FluidStack; import javax.annotation.ParametersAreNonnullByDefault; diff --git a/src/main/java/com/drmangotea/tfmg/recipes/jei/DistillationCategory.java b/src/main/java/com/drmangotea/tfmg/recipes/jei/DistillationCategory.java index 2fe5895e..cacf049c 100644 --- a/src/main/java/com/drmangotea/tfmg/recipes/jei/DistillationCategory.java +++ b/src/main/java/com/drmangotea/tfmg/recipes/jei/DistillationCategory.java @@ -3,13 +3,12 @@ package com.drmangotea.tfmg.recipes.jei; import com.drmangotea.tfmg.recipes.DistillationRecipe; import com.drmangotea.tfmg.registry.TFMGGuiTextures; import com.simibubi.create.compat.jei.category.CreateRecipeCategory; -import com.simibubi.create.foundation.fluid.FluidIngredient; import com.simibubi.create.foundation.gui.AllGuiTextures; +import net.neoforged.neoforge.fluids.crafting.SizedFluidIngredient; import mezz.jei.api.gui.builder.IRecipeLayoutBuilder; import mezz.jei.api.gui.ingredient.IRecipeSlotsView; import mezz.jei.api.recipe.IFocusGroup; -import mezz.jei.api.recipe.RecipeIngredientRole; import net.minecraft.client.gui.GuiGraphics; import javax.annotation.ParametersAreNonnullByDefault; @@ -23,7 +22,7 @@ public class DistillationCategory extends CreateRecipeCategory { private final WindingMachine windingMachine = new WindingMachine(); diff --git a/src/main/java/com/drmangotea/tfmg/recipes/jei/machines/BlastFurnace.java b/src/main/java/com/drmangotea/tfmg/recipes/jei/machines/BlastFurnace.java index eeb3d121..17289120 100644 --- a/src/main/java/com/drmangotea/tfmg/recipes/jei/machines/BlastFurnace.java +++ b/src/main/java/com/drmangotea/tfmg/recipes/jei/machines/BlastFurnace.java @@ -5,7 +5,6 @@ import com.drmangotea.tfmg.registry.TFMGBlocks; import com.mojang.blaze3d.vertex.PoseStack; import com.mojang.math.Axis; import com.simibubi.create.compat.jei.category.animations.AnimatedKinetics; -import com.simibubi.create.content.processing.burner.BlazeBurnerBlock; import net.minecraft.client.gui.GuiGraphics; import net.minecraft.world.level.block.state.properties.WallSide; diff --git a/src/main/java/com/drmangotea/tfmg/recipes/jei/machines/CastingSetup.java b/src/main/java/com/drmangotea/tfmg/recipes/jei/machines/CastingSetup.java index db78eafe..60bd8857 100644 --- a/src/main/java/com/drmangotea/tfmg/recipes/jei/machines/CastingSetup.java +++ b/src/main/java/com/drmangotea/tfmg/recipes/jei/machines/CastingSetup.java @@ -2,7 +2,6 @@ package com.drmangotea.tfmg.recipes.jei.machines; import com.drmangotea.tfmg.registry.TFMGBlocks; -import com.drmangotea.tfmg.registry.TFMGPartialModels; import com.mojang.blaze3d.vertex.PoseStack; import com.mojang.math.Axis; import com.simibubi.create.compat.jei.category.animations.AnimatedKinetics; diff --git a/src/main/java/com/drmangotea/tfmg/recipes/jei/machines/WindingMachine.java b/src/main/java/com/drmangotea/tfmg/recipes/jei/machines/WindingMachine.java index 488c0b70..54eddbec 100644 --- a/src/main/java/com/drmangotea/tfmg/recipes/jei/machines/WindingMachine.java +++ b/src/main/java/com/drmangotea/tfmg/recipes/jei/machines/WindingMachine.java @@ -8,7 +8,6 @@ import com.mojang.blaze3d.vertex.PoseStack; import com.simibubi.create.AllPartialModels; import com.simibubi.create.compat.jei.category.animations.AnimatedKinetics; import com.simibubi.create.foundation.gui.AllGuiTextures; -import dev.engine_room.flywheel.lib.model.baked.PartialModel; import net.createmod.catnip.gui.element.GuiGameElement; import net.minecraft.client.gui.GuiGraphics; import net.minecraft.core.Direction; diff --git a/src/main/java/com/drmangotea/tfmg/registry/TFMGBlocks.java b/src/main/java/com/drmangotea/tfmg/registry/TFMGBlocks.java index 338edb72..ff002c8c 100644 --- a/src/main/java/com/drmangotea/tfmg/registry/TFMGBlocks.java +++ b/src/main/java/com/drmangotea/tfmg/registry/TFMGBlocks.java @@ -129,6 +129,7 @@ import com.simibubi.create.content.kinetics.motor.CreativeMotorGenerator; import com.simibubi.create.content.kinetics.simpleRelays.BracketedKineticBlockModel; import com.simibubi.create.foundation.block.connected.HorizontalCTBehaviour; import com.simibubi.create.foundation.data.*; +import com.simibubi.create.foundation.data.recipe.CommonMetal; import com.tterrag.registrate.util.DataIngredient; import com.tterrag.registrate.util.entry.BlockEntry; import net.minecraft.client.renderer.RenderType; @@ -153,6 +154,7 @@ import java.util.Map; import static com.drmangotea.tfmg.TFMG.REGISTRATE; import static com.drmangotea.tfmg.base.TFMGBuilderTransformers.*; import static com.drmangotea.tfmg.content.electricity.lights.LightBulbBlock.LIGHT; +import static com.drmangotea.tfmg.registry.TFMGTags.*; import static com.simibubi.create.api.behaviour.display.DisplaySource.displaySource; import static com.simibubi.create.api.behaviour.movement.MovementBehaviour.movementBehaviour; import static com.simibubi.create.api.contraption.storage.fluid.MountedFluidStorageType.mountedFluidStorage; @@ -315,11 +317,11 @@ public class TFMGBlocks { .register(); public static final BlockEntry INDUSTRIAL_PIPE = REGISTRATE.block("industrial_pipe", IndustrialPipeBlock::new) .initialProperties(SharedProperties::softMetal) - .properties(p -> p.requiresCorrectToolForDrops()) + .properties(BlockBehaviour.Properties::requiresCorrectToolForDrops) .properties(p -> p.sound(SoundType.STONE)) .transform(pickaxeOnly()) - .tag(TFMGTags.TFMGBlockTags.INDUSTRIAL_PIPE.tag) - .recipe((c, p) -> p.stonecutting(DataIngredient.tag(AllTags.commonItemTag("ingots/steel")), RecipeCategory.BUILDING_BLOCKS, c::get, 8)) + .tag(TFMGBlockTags.INDUSTRIAL_PIPE.tag) + .recipe((c, p) -> p.stonecutting(DataIngredient.tag(CommonMetal.STEEL.ingots), RecipeCategory.BUILDING_BLOCKS, c, 8)) .blockstate((ctx, prov) -> prov.simpleBlock(ctx.getEntry(), AssetLookup.partialBaseModel(ctx, prov))) .simpleItem() .register(); @@ -329,7 +331,7 @@ public class TFMGBlocks { .properties(p -> p.sound(SoundType.NETHERITE_BLOCK)) .transform(pickaxeOnly()) .loot((lt, block) -> lt.dropOther(block, TFMGBlocks.INDUSTRIAL_PIPE.get().asItem())) - .tag(TFMGTags.TFMGBlockTags.INDUSTRIAL_PIPE.tag) + .tag(TFMGBlockTags.INDUSTRIAL_PIPE.tag) .blockstate((ctx, prov) -> prov.simpleBlock(ctx.getEntry(), AssetLookup.partialBaseModel(ctx, prov))) .register(); @@ -364,9 +366,9 @@ public class TFMGBlocks { .transform(pickaxeOnly()) .properties(BlockBehaviour.Properties::noOcclusion) .blockstate(BlockStateGen.horizontalBlockProvider(false)) - .tag(TFMGTags.TFMGBlockTags.PUMPJACK_SMALL_PART.tag) - .recipe((c, p) -> p.stonecutting(DataIngredient.tag(AllTags.commonItemTag("storage_blocks/steel")), - RecipeCategory.DECORATIONS, c::get, 2)) + .tag(TFMGBlockTags.PUMPJACK_SMALL_PART.tag) + .recipe((c, p) -> p.stonecutting(DataIngredient.tag(CommonMetal.STEEL.storageBlocks.items()), + RecipeCategory.DECORATIONS, c, 2)) .simpleItem() .register(); public static final BlockEntry PUMPJACK_HAMMER_HEAD = REGISTRATE.block("pumpjack_hammer_head", PumpjackHammerHeadBlock::new) @@ -374,7 +376,7 @@ public class TFMGBlocks { .transform(pickaxeOnly()) .properties(BlockBehaviour.Properties::noOcclusion) .blockstate(BlockStateGen.horizontalBlockProvider(false)) - .tag(TFMGTags.TFMGBlockTags.PUMPJACK_HEAD.tag) + .tag(TFMGBlockTags.PUMPJACK_HEAD.tag) .simpleItem() .register(); @@ -383,16 +385,16 @@ public class TFMGBlocks { .transform(pickaxeOnly()) .properties(BlockBehaviour.Properties::noOcclusion) .blockstate(BlockStateGen.horizontalBlockProvider(false)) - .tag(TFMGTags.TFMGBlockTags.PUMPJACK_CONNECTOR.tag) + .tag(TFMGBlockTags.PUMPJACK_CONNECTOR.tag) .simpleItem() .register(); public static final BlockEntry LARGE_PUMPJACK_HAMMER_PART = REGISTRATE.block("large_pumpjack_hammer_part", LargePumpjackHammerPartBlock::new) .initialProperties(SharedProperties::softMetal) .transform(pickaxeOnly()) .blockstate(BlockStateGen.horizontalBlockProvider(false)) - .tag(TFMGTags.TFMGBlockTags.PUMPJACK_PART.tag) - .recipe((c, p) -> p.stonecutting(DataIngredient.tag(AllTags.commonItemTag("storage_blocks/steel")), - RecipeCategory.DECORATIONS, c::get, 2)) + .tag(TFMGBlockTags.PUMPJACK_PART.tag) + .recipe((c, p) -> p.stonecutting(DataIngredient.tag(CommonMetal.STEEL.storageBlocks.items()), + RecipeCategory.DECORATIONS, c, 2)) .simpleItem() .register(); @@ -400,14 +402,14 @@ public class TFMGBlocks { .initialProperties(SharedProperties::softMetal) .transform(pickaxeOnly()) .blockstate(BlockStateGen.horizontalBlockProvider(false)) - .tag(TFMGTags.TFMGBlockTags.PUMPJACK_HEAD.tag) + .tag(TFMGBlockTags.PUMPJACK_HEAD.tag) .simpleItem() .register(); public static final BlockEntry LARGE_PUMPJACK_HAMMER_CONNECTOR = REGISTRATE.block("large_pumpjack_hammer_connector", LargePumpjackHammerConnectorBlock::new) .initialProperties(SharedProperties::softMetal) .transform(pickaxeOnly()) .blockstate(BlockStateGen.horizontalBlockProvider(false)) - .tag(TFMGTags.TFMGBlockTags.PUMPJACK_CONNECTOR.tag) + .tag(TFMGBlockTags.PUMPJACK_CONNECTOR.tag) .simpleItem() .register(); public static final BlockEntry PUMPJACK_BASE = REGISTRATE.block("pumpjack_base", PumpjackBaseBlock::new) @@ -420,9 +422,9 @@ public class TFMGBlocks { public static final BlockEntry OIL_DEPOSIT = REGISTRATE.block("oil_deposit", Block::new) .initialProperties(() -> Blocks.BEDROCK) .properties(p -> p.strength(69696969)) - .properties(p -> p.requiresCorrectToolForDrops()) + .properties(BlockBehaviour.Properties::requiresCorrectToolForDrops) .transform(pickaxeOnly()) - .tag(TFMGTags.TFMGBlockTags.SURFACE_SCANNER_FINDABLE.tag) + .tag(TFMGBlockTags.SURFACE_SCANNER_FINDABLE.tag) .tag(BlockTags.WITHER_IMMUNE) .tag(BlockTags.DRAGON_IMMUNE) .tag(BlockTags.DRAGON_IMMUNE) @@ -508,9 +510,11 @@ public class TFMGBlocks { .apply(ApplyBonusCount.addOreBonusCount(enchantmentRegistryLookup.getOrThrow(Enchantments.FORTUNE)))))); }) .tag(BlockTags.NEEDS_STONE_TOOL) - .tag(Tags.Blocks.ORES) - .transform(tagBlockAndItem("ores/lead", "ores_in_ground/stone")) - .tag(Tags.Items.ORES) + .transform(tagBlockAndItem(Map.of( + Tags.Blocks.ORES, Tags.Items.ORES, + CommonMetal.LEAD.ores.blocks(), CommonMetal.LEAD.ores.items(), + Tags.Blocks.ORES_IN_GROUND_STONE, Tags.Items.ORES_IN_GROUND_STONE + ))) .build() .register(); @@ -529,9 +533,11 @@ public class TFMGBlocks { .apply(ApplyBonusCount.addOreBonusCount(enchantmentRegistryLookup.getOrThrow(Enchantments.FORTUNE)))))); }) .tag(BlockTags.NEEDS_STONE_TOOL) - .tag(Tags.Blocks.ORES) - .transform(tagBlockAndItem("ores/lead", "ores_in_ground/deepslate")) - .tag(Tags.Items.ORES) + .transform(tagBlockAndItem(Map.of( + Tags.Blocks.ORES, Tags.Items.ORES, + CommonMetal.LEAD.ores.blocks(), CommonMetal.LEAD.ores.items(), + Tags.Blocks.ORES_IN_GROUND_DEEPSLATE, Tags.Items.ORES_IN_GROUND_DEEPSLATE + ))) .build() .register(); @@ -550,9 +556,11 @@ public class TFMGBlocks { .apply(ApplyBonusCount.addOreBonusCount(enchantmentRegistryLookup.getOrThrow(Enchantments.FORTUNE)))))); }) .tag(BlockTags.NEEDS_STONE_TOOL) - .tag(Tags.Blocks.ORES) - .transform(tagBlockAndItem("ores/nickel", "ores_in_ground/stone")) - .tag(Tags.Items.ORES) + .transform(tagBlockAndItem(Map.of( + Tags.Blocks.ORES, Tags.Items.ORES, + CommonMetal.NICKEL.ores.blocks(), CommonMetal.NICKEL.ores.items(), + Tags.Blocks.ORES_IN_GROUND_STONE, Tags.Items.ORES_IN_GROUND_STONE + ))) .build() .register(); @@ -571,9 +579,11 @@ public class TFMGBlocks { .apply(ApplyBonusCount.addOreBonusCount(enchantmentRegistryLookup.getOrThrow(Enchantments.FORTUNE)))))); }) .tag(BlockTags.NEEDS_STONE_TOOL) - .tag(Tags.Blocks.ORES) - .transform(tagBlockAndItem("ores/nickel", "ores_in_ground/deepslate")) - .tag(Tags.Items.ORES) + .transform(tagBlockAndItem(Map.of( + Tags.Blocks.ORES, Tags.Items.ORES, + CommonMetal.NICKEL.ores.blocks(), CommonMetal.NICKEL.ores.items(), + Tags.Blocks.ORES_IN_GROUND_DEEPSLATE, Tags.Items.ORES_IN_GROUND_DEEPSLATE + ))) .build() .register(); @@ -592,9 +602,11 @@ public class TFMGBlocks { .apply(ApplyBonusCount.addOreBonusCount(enchantmentRegistryLookup.getOrThrow(Enchantments.FORTUNE)))))); }) .tag(BlockTags.NEEDS_STONE_TOOL) - .tag(Tags.Blocks.ORES) - .transform(tagBlockAndItem("ores/lithium", "ores_in_ground/stone")) - .tag(Tags.Items.ORES) + .transform(tagBlockAndItem(Map.of( + Tags.Blocks.ORES, Tags.Items.ORES, + TFMGBlockTags.ORES_LITHIUM.tag, TFMGItemTags.ORES_LITHIUM.tag, + Tags.Blocks.ORES_IN_GROUND_STONE, Tags.Items.ORES_IN_GROUND_STONE + ))) .build() .register(); @@ -613,9 +625,11 @@ public class TFMGBlocks { .apply(ApplyBonusCount.addOreBonusCount(enchantmentRegistryLookup.getOrThrow(Enchantments.FORTUNE)))))); }) .tag(BlockTags.NEEDS_STONE_TOOL) - .tag(Tags.Blocks.ORES) - .transform(tagBlockAndItem("ores/lithium", "ores_in_ground/deepslate")) - .tag(Tags.Items.ORES) + .transform(tagBlockAndItem(Map.of( + Tags.Blocks.ORES, Tags.Items.ORES, + TFMGBlockTags.ORES_LITHIUM.tag, TFMGItemTags.ORES_LITHIUM.tag, + Tags.Blocks.ORES_IN_GROUND_DEEPSLATE, Tags.Items.ORES_IN_GROUND_DEEPSLATE + ))) .build() .register(); public static final BlockEntry SULFUR = REGISTRATE.block("sulfur", Block::new) @@ -639,7 +653,7 @@ public class TFMGBlocks { public static final BlockEntry FOSSILSTONE = REGISTRATE.block("fossilstone", Block::new) .initialProperties(() -> Blocks.OBSIDIAN) .properties(p -> p.strength(100f, 1200f)) - .properties(p -> p.requiresCorrectToolForDrops()) + .properties(BlockBehaviour.Properties::requiresCorrectToolForDrops) .transform(pickaxeOnly()) .simpleItem() .register(); @@ -655,39 +669,41 @@ public class TFMGBlocks { .register(); public static final BlockEntry RAW_NICKEL_BLOCK = REGISTRATE.block("raw_nickel_block", Block::new) .initialProperties(() -> Blocks.RAW_GOLD_BLOCK) - .properties(p -> p.requiresCorrectToolForDrops()) + .properties(BlockBehaviour.Properties::requiresCorrectToolForDrops) .transform(pickaxeOnly()) - .tag(Tags.Blocks.STORAGE_BLOCKS) - .tag(BlockTags.NEEDS_IRON_TOOL) .lang("Block of Raw Nickel") - .transform(tagBlockAndItem("storage_blocks/raw_nickel")) - .tag(Tags.Items.STORAGE_BLOCKS) + .tag(BlockTags.NEEDS_IRON_TOOL) + .transform(tagBlockAndItem(Map.of( + Tags.Blocks.STORAGE_BLOCKS, Tags.Items.STORAGE_BLOCKS, + CommonMetal.NICKEL.rawStorageBlocks.blocks(), CommonMetal.NICKEL.rawStorageBlocks.items() + ))) .build() .register(); public static final BlockEntry RAW_LEAD_BLOCK = REGISTRATE.block("raw_lead_block", Block::new) .initialProperties(() -> Blocks.RAW_GOLD_BLOCK) - .properties(p -> p.requiresCorrectToolForDrops()) + .properties(BlockBehaviour.Properties::requiresCorrectToolForDrops) .transform(pickaxeOnly()) - .tag(Tags.Blocks.STORAGE_BLOCKS) - .tag(BlockTags.NEEDS_IRON_TOOL) .lang("Block of Raw Lead") - .transform(tagBlockAndItem("storage_blocks/raw_lead")) - .tag(Tags.Items.STORAGE_BLOCKS) + .tag(BlockTags.NEEDS_IRON_TOOL) + .transform(tagBlockAndItem(Map.of( + Tags.Blocks.STORAGE_BLOCKS, Tags.Items.STORAGE_BLOCKS, + CommonMetal.LEAD.rawStorageBlocks.blocks(), CommonMetal.LEAD.rawStorageBlocks.items() + ))) .build() .register(); public static final BlockEntry RAW_LITHIUM_BLOCK = REGISTRATE.block("raw_lithium_block", Block::new) .initialProperties(() -> Blocks.RAW_GOLD_BLOCK) - .properties(p -> p.requiresCorrectToolForDrops()) + .properties(BlockBehaviour.Properties::requiresCorrectToolForDrops) .transform(pickaxeOnly()) - .tag(Tags.Blocks.STORAGE_BLOCKS) - .tag(BlockTags.NEEDS_IRON_TOOL) .lang("Block of Raw Lithium") - .transform(tagBlockAndItem("storage_blocks/raw_lithium")) - .tag(Tags.Items.STORAGE_BLOCKS) + .tag(BlockTags.NEEDS_IRON_TOOL) + .transform(tagBlockAndItem(Map.of( + Tags.Blocks.STORAGE_BLOCKS, Tags.Items.STORAGE_BLOCKS, + TFMGBlockTags.STORAGE_BLOCKS_RAW_LITHIUM.tag, TFMGItemTags.STORAGE_BLOCKS_RAW_LITHIUM.tag + ))) .build() .register(); - //------------------MISC_MACHINERY------------------// public static final BlockEntry AIR_INTAKE = REGISTRATE.block("air_intake", AirIntakeBlock::new) .initialProperties(SharedProperties::copperMetal) @@ -698,7 +714,6 @@ public class TFMGBlocks { .item() .transform(customItemModel()) .register(); - @SuppressWarnings("'addLayer(java.util.function.Supplier>)' is deprecated and marked for removal ") public static final BlockEntry FIREBOX = REGISTRATE.block("firebox", FireboxBlock::new) .initialProperties(SharedProperties::stone) @@ -767,8 +782,8 @@ public class TFMGBlocks { .initialProperties(() -> Blocks.NETHER_BRICKS) .properties(BlockBehaviour.Properties::requiresCorrectToolForDrops) .transform(pickaxeOnly()) - .tag(TFMGTags.TFMGBlockTags.BLAST_FURNACE_WALL.tag) - .tag(TFMGTags.TFMGBlockTags.REINFORCED_BLAST_FURNACE_WALL.tag) + .tag(TFMGBlockTags.BLAST_FURNACE_WALL.tag) + .tag(TFMGBlockTags.REINFORCED_BLAST_FURNACE_WALL.tag) .tag(BlockTags.NEEDS_STONE_TOOL) .simpleItem() .register(); @@ -776,7 +791,7 @@ public class TFMGBlocks { .initialProperties(() -> Blocks.NETHER_BRICKS) .properties(BlockBehaviour.Properties::requiresCorrectToolForDrops) .transform(pickaxeOnly()) - .tag(TFMGTags.TFMGBlockTags.BLAST_FURNACE_WALL.tag) + .tag(TFMGBlockTags.BLAST_FURNACE_WALL.tag) .tag(BlockTags.NEEDS_STONE_TOOL) .simpleItem() .register(); @@ -785,7 +800,7 @@ public class TFMGBlocks { .initialProperties(() -> Blocks.NETHER_BRICKS) .properties(BlockBehaviour.Properties::requiresCorrectToolForDrops) .transform(pickaxeOnly()) - .tag(TFMGTags.TFMGBlockTags.REINFORCED_BLAST_FURNACE_WALL.tag) + .tag(TFMGBlockTags.REINFORCED_BLAST_FURNACE_WALL.tag) .tag(BlockTags.NEEDS_STONE_TOOL) .blockstate(simpleCubeAll("fireproof_bricks")) .loot((lt, block) -> lt.dropOther(block, TFMGBlocks.FIREPROOF_BRICKS.get().asItem())) @@ -796,7 +811,7 @@ public class TFMGBlocks { .properties(BlockBehaviour.Properties::requiresCorrectToolForDrops) .transform(pickaxeOnly()) .onRegister(connectedTextures(() -> new HorizontalCTBehaviour(TFMGSpriteShifts.BLAST_FURNACE_REINFORCEMENT))) - .tag(TFMGTags.TFMGBlockTags.REINFORCED_BLAST_FURNACE_SUPPORT.tag) + .tag(TFMGBlockTags.REINFORCED_BLAST_FURNACE_SUPPORT.tag) .tag(BlockTags.NEEDS_STONE_TOOL) .item(BlastFurnaceReinforcementBlockItem::new) .build() @@ -818,7 +833,7 @@ public class TFMGBlocks { .properties(BlockBehaviour.Properties::requiresCorrectToolForDrops) .transform(pickaxeOnly()) .onRegister(connectedTextures(() -> new HorizontalCTBehaviour(TFMGSpriteShifts.RUSTED_BLAST_FURNACE_REINFORCEMENT))) - .tag(TFMGTags.TFMGBlockTags.REINFORCED_BLAST_FURNACE_SUPPORT.tag) + .tag(TFMGBlockTags.REINFORCED_BLAST_FURNACE_SUPPORT.tag) .tag(BlockTags.NEEDS_STONE_TOOL) .item(BlastFurnaceReinforcementBlockItem::new) .build() @@ -841,7 +856,7 @@ public class TFMGBlocks { .properties(BlockBehaviour.Properties::requiresCorrectToolForDrops) .transform(pickaxeOnly()) .tag(BlockTags.WALLS) - .tag(TFMGTags.TFMGBlockTags.BLAST_FURNACE_SUPPORT.tag) + .tag(TFMGBlockTags.BLAST_FURNACE_SUPPORT.tag) .blockstate((c, p) -> TFMGVanillaBlockStates.generateWallBlockState(c, p, "fireproof_brick_reinforcement")) .item() .transform(b -> TFMGVanillaBlockStates.transformWallItem(b, "fireproof_brick_reinforcement")) @@ -850,7 +865,7 @@ public class TFMGBlocks { public static final BlockEntry COKE_OVEN = REGISTRATE.block("coke_oven", CokeOvenBlock::new) .initialProperties(() -> Blocks.BRICKS) - .properties(p -> p.requiresCorrectToolForDrops()) + .properties(BlockBehaviour.Properties::requiresCorrectToolForDrops) .blockstate(new CokeOvenGenerator()::generate) .transform(pickaxeOnly()) .onRegister(connectedTextures(CokeOvenCTBehavior::new)) @@ -883,7 +898,7 @@ public class TFMGBlocks { public static final BlockEntry NAPALM_BOMB = REGISTRATE.block("napalm_bomb", NapalmBombBlock::new) .initialProperties(SharedProperties::softMetal) - .properties(p -> p.requiresCorrectToolForDrops()) + .properties(BlockBehaviour.Properties::requiresCorrectToolForDrops) .transform(pickaxeOnly()) .properties(BlockBehaviour.Properties::noOcclusion) .blockstate((ctx, prov) -> prov.simpleBlock(ctx.getEntry(), AssetLookup.partialBaseModel(ctx, prov))) @@ -1000,7 +1015,7 @@ public class TFMGBlocks { REGISTRATE.block("cable_tube", p -> new CableTubeBlock(p, false)) .initialProperties(SharedProperties::softMetal) .transform(pickaxeOnly()) - .properties(p -> p.noOcclusion()) + .properties(BlockBehaviour.Properties::noOcclusion) .blockstate(BlockStateGen.axisBlockProvider(false)) .item() .build() @@ -1037,7 +1052,7 @@ public class TFMGBlocks { .transform(pickaxeOnly()) .addLayer(() -> RenderType::cutoutMipped) .blockstate(new DiagonalCableGenerator()::generate) - .properties(p -> p.noOcclusion()) + .properties(BlockBehaviour.Properties::noOcclusion) .item() .transform(customItemModel()) .register(); @@ -1056,7 +1071,7 @@ public class TFMGBlocks { public static final BlockEntry CREATIVE_GENERATOR = REGISTRATE.block("creative_generator", CreativeGeneratorBlock::new) .initialProperties(SharedProperties::softMetal) - .properties(p -> p.requiresCorrectToolForDrops()) + .properties(BlockBehaviour.Properties::requiresCorrectToolForDrops) .transform(pickaxeOnly()) .simpleItem() .register(); @@ -1299,7 +1314,7 @@ public class TFMGBlocks { //------------------EXHAUST/WASTE_REMOVAL------------------// public static final BlockEntry BRICK_SMOKESTACK = REGISTRATE.block("brick_smokestack", SmokestackBlock::new) .initialProperties(() -> Blocks.BRICKS) - .properties(p -> p.requiresCorrectToolForDrops()) + .properties(BlockBehaviour.Properties::requiresCorrectToolForDrops) .transform(pickaxeOnly()) .blockstate(new SmokestackGenerator()::generate) .item() @@ -1308,7 +1323,7 @@ public class TFMGBlocks { public static final BlockEntry METAL_SMOKESTACK = REGISTRATE.block("metal_smokestack", SmokestackBlock::new) .initialProperties(SharedProperties::softMetal) - .properties(p -> p.requiresCorrectToolForDrops()) + .properties(BlockBehaviour.Properties::requiresCorrectToolForDrops) .transform(pickaxeOnly()) .blockstate(new SmokestackGenerator()::generate) .item() @@ -1317,7 +1332,7 @@ public class TFMGBlocks { public static final BlockEntry CONCRETE_SMOKESTACK = REGISTRATE.block("concrete_smokestack", SmokestackBlock::new) .initialProperties(() -> Blocks.STONE) - .properties(p -> p.requiresCorrectToolForDrops()) + .properties(BlockBehaviour.Properties::requiresCorrectToolForDrops) .transform(pickaxeOnly()) .blockstate(new SmokestackGenerator()::generate) .item() @@ -1330,7 +1345,7 @@ public class TFMGBlocks { .addLayer(() -> RenderType::cutoutMipped) .properties(p -> p.sound(SoundType.NETHERITE_BLOCK)) .blockstate(BlockStateGen.directionalBlockProvider(false)) - .properties(p -> p.noOcclusion()) + .properties(BlockBehaviour.Properties::noOcclusion) .transform(pickaxeOnly()) .item() .transform(customItemModel()) @@ -1423,7 +1438,7 @@ public class TFMGBlocks { .transform(BuilderTransformers.casing(() -> TFMGSpriteShifts.STEEL_CASING)) .register(); public static final BlockEntry HEAVY_MACHINERY_CASING = REGISTRATE.block("heavy_machinery_casing", CasingBlock::new) - .tag(TFMGTags.TFMGBlockTags.SURFACE_SCANNER_FINDABLE.tag) + .tag(TFMGBlockTags.SURFACE_SCANNER_FINDABLE.tag) .transform(BuilderTransformers.casing(() -> TFMGSpriteShifts.HEAVY_MACHINERY_CASING)) .properties(p -> p.sound(SoundType.NETHERITE_BLOCK)) .register(); @@ -1436,34 +1451,36 @@ public class TFMGBlocks { public static final BlockEntry STEEL_BLOCK = REGISTRATE.block("steel_block", Block::new) .initialProperties(SharedProperties::softMetal) - .properties(p -> p.requiresCorrectToolForDrops()) + .properties(BlockBehaviour.Properties::requiresCorrectToolForDrops) .onRegister(connectedTextures(() -> new EncasedCTBehaviour(TFMGSpriteShifts.STEEL_BLOCK))) .onRegister(casingConnectivity((block, cc) -> cc.makeCasing(block, TFMGSpriteShifts.STEEL_BLOCK))) .transform(pickaxeOnly()) .blockstate(simpleCubeAll("steel_block")) .tag(BlockTags.NEEDS_IRON_TOOL) - .tag(TFMGTags.TFMGBlockTags.REINFORCED_BLAST_FURNACE_WALL.tag) - .tag(TFMGTags.TFMGBlockTags.REINFORCED_BLAST_FURNACE_SUPPORT.tag) - .tag(Tags.Blocks.STORAGE_BLOCKS) + .tag(TFMGBlockTags.REINFORCED_BLAST_FURNACE_WALL.tag) + .tag(TFMGBlockTags.REINFORCED_BLAST_FURNACE_SUPPORT.tag) .tag(BlockTags.BEACON_BASE_BLOCKS) - .transform(tagBlockAndItem("storage_blocks/steel")) - .tag(Tags.Items.STORAGE_BLOCKS) + .transform(tagBlockAndItem(Map.of( + Tags.Blocks.STORAGE_BLOCKS, Tags.Items.STORAGE_BLOCKS, + CommonMetal.STEEL.storageBlocks.blocks(), CommonMetal.STEEL.storageBlocks.items() + ))) .build() .lang("Block of Steel") .register(); public static final BlockEntry CAST_IRON_BLOCK = REGISTRATE.block("cast_iron_block", Block::new) .initialProperties(SharedProperties::softMetal) - .properties(p -> p.requiresCorrectToolForDrops()) + .properties(BlockBehaviour.Properties::requiresCorrectToolForDrops) .onRegister(connectedTextures(() -> new EncasedCTBehaviour(TFMGSpriteShifts.CAST_IRON_BLOCK))) .onRegister(casingConnectivity((block, cc) -> cc.makeCasing(block, TFMGSpriteShifts.CAST_IRON_BLOCK))) .transform(pickaxeOnly()) .blockstate(simpleCubeAll("cast_iron_block")) .tag(BlockTags.NEEDS_IRON_TOOL) - .tag(Tags.Blocks.STORAGE_BLOCKS) .tag(BlockTags.BEACON_BASE_BLOCKS) - .transform(tagBlockAndItem("storage_blocks/cast_iron")) - .tag(Tags.Items.STORAGE_BLOCKS) + .transform(tagBlockAndItem(Map.of( + Tags.Blocks.STORAGE_BLOCKS, Tags.Items.STORAGE_BLOCKS, + TFMGBlockTags.STORAGE_BLOCKS_CAST_IRON.tag, TFMGItemTags.STORAGE_BLOCKS_CAST_IRON.tag + ))) .build() .lang("Block of Cast Iron") .register(); @@ -1471,92 +1488,96 @@ public class TFMGBlocks { public static final BlockEntry ALUMINUM_BLOCK = REGISTRATE.block("aluminum_block", Block::new) .initialProperties(SharedProperties::softMetal) - .properties(p -> p.requiresCorrectToolForDrops()) + .properties(BlockBehaviour.Properties::requiresCorrectToolForDrops) .onRegister(connectedTextures(() -> new EncasedCTBehaviour(TFMGSpriteShifts.CAST_IRON_BLOCK))) .onRegister(casingConnectivity((block, cc) -> cc.makeCasing(block, TFMGSpriteShifts.CAST_IRON_BLOCK))) .transform(pickaxeOnly()) .blockstate(simpleCubeAll("aluminum_block")) .tag(BlockTags.NEEDS_IRON_TOOL) - .tag(Tags.Blocks.STORAGE_BLOCKS) .tag(BlockTags.BEACON_BASE_BLOCKS) - .transform(tagBlockAndItem("storage_blocks/aluminum")) - .tag(Tags.Items.STORAGE_BLOCKS) + .transform(tagBlockAndItem(Map.of( + Tags.Blocks.STORAGE_BLOCKS, Tags.Items.STORAGE_BLOCKS, + CommonMetal.ALUMINUM.storageBlocks.blocks(), CommonMetal.ALUMINUM.storageBlocks.items() + ))) .build() .lang("Block of Aluminum") .register(); public static final BlockEntry PLASTIC_BLOCK = REGISTRATE.block("plastic_block", Block::new) .initialProperties(() -> Blocks.QUARTZ_BLOCK) - .properties(p -> p.requiresCorrectToolForDrops()) + .properties(BlockBehaviour.Properties::requiresCorrectToolForDrops) .transform(pickaxeOnly()) .blockstate(simpleCubeAll("plastic_block")) .tag(BlockTags.NEEDS_STONE_TOOL) - .tag(Tags.Blocks.STORAGE_BLOCKS) - .transform(tagBlockAndItem("storage_blocks/plastic")) - .tag(Tags.Items.STORAGE_BLOCKS) + .transform(tagBlockAndItem(Map.of( + Tags.Blocks.STORAGE_BLOCKS, Tags.Items.STORAGE_BLOCKS, + TFMGBlockTags.STORAGE_BLOCKS_PLASTIC.tag, TFMGItemTags.STORAGE_BLOCKS_PLASTIC.tag + ))) .build() .lang("Block of Plastic") .register(); public static final BlockEntry LEAD_BLOCK = REGISTRATE.block("lead_block", Block::new) .initialProperties(SharedProperties::softMetal) - .properties(p -> p.requiresCorrectToolForDrops()) + .properties(BlockBehaviour.Properties::requiresCorrectToolForDrops) .onRegister(connectedTextures(() -> new EncasedCTBehaviour(TFMGSpriteShifts.LEAD_BLOCK))) .onRegister(casingConnectivity((block, cc) -> cc.makeCasing(block, TFMGSpriteShifts.LEAD_BLOCK))) .transform(pickaxeOnly()) .blockstate(simpleCubeAll("lead_block")) .tag(BlockTags.NEEDS_IRON_TOOL) - .tag(Tags.Blocks.STORAGE_BLOCKS) .tag(BlockTags.BEACON_BASE_BLOCKS) - .transform(tagBlockAndItem("storage_blocks/lead")) - .tag(Tags.Items.STORAGE_BLOCKS) + .transform(tagBlockAndItem(Map.of( + Tags.Blocks.STORAGE_BLOCKS, Tags.Items.STORAGE_BLOCKS, + CommonMetal.LEAD.storageBlocks.blocks(), CommonMetal.LEAD.storageBlocks.items() + ))) .build() .lang("Block of Lead") .register(); public static final BlockEntry CONSTANTAN_BLOCK = REGISTRATE.block("constantan_block", Block::new) .initialProperties(SharedProperties::softMetal) - .properties(p -> p.requiresCorrectToolForDrops()) + .properties(BlockBehaviour.Properties::requiresCorrectToolForDrops) .transform(pickaxeOnly()) .blockstate(simpleCubeAll("constantan_block")) .tag(BlockTags.NEEDS_IRON_TOOL) - .tag(Tags.Blocks.STORAGE_BLOCKS) .tag(BlockTags.BEACON_BASE_BLOCKS) - .transform(tagBlockAndItem("storage_blocks/constantan")) - .tag(Tags.Items.STORAGE_BLOCKS) + .transform(tagBlockAndItem(Map.of( + Tags.Blocks.STORAGE_BLOCKS, Tags.Items.STORAGE_BLOCKS, + CommonMetal.CONSTANTAN.storageBlocks.blocks(), CommonMetal.CONSTANTAN.storageBlocks.items() + ))) .build() .lang("Block of Constantan") .register(); public static final BlockEntry NICKEL_BLOCK = REGISTRATE.block("nickel_block", Block::new) .initialProperties(SharedProperties::softMetal) - .properties(p -> p.requiresCorrectToolForDrops()) + .properties(BlockBehaviour.Properties::requiresCorrectToolForDrops) .onRegister(connectedTextures(() -> new EncasedCTBehaviour(TFMGSpriteShifts.LEAD_BLOCK))) .onRegister(casingConnectivity((block, cc) -> cc.makeCasing(block, TFMGSpriteShifts.LEAD_BLOCK))) .transform(pickaxeOnly()) .tag(BlockTags.NEEDS_IRON_TOOL) - .tag(Tags.Blocks.STORAGE_BLOCKS) .tag(BlockTags.BEACON_BASE_BLOCKS) - .transform(tagBlockAndItem("storage_blocks/nickel")) - .tag(Tags.Items.STORAGE_BLOCKS) + .transform(tagBlockAndItem(Map.of( + Tags.Blocks.STORAGE_BLOCKS, Tags.Items.STORAGE_BLOCKS, + CommonMetal.NICKEL.storageBlocks.blocks(), CommonMetal.NICKEL.storageBlocks.items() + ))) .build() .lang("Block of Nickel") .register(); public static final BlockEntry LITHIUM_BLOCK = REGISTRATE.block("lithium_block", LithiumBlock::new) .initialProperties(SharedProperties::softMetal) - .properties(p -> p.requiresCorrectToolForDrops()) + .properties(BlockBehaviour.Properties::requiresCorrectToolForDrops) .onRegister(connectedTextures(() -> new EncasedCTBehaviour(TFMGSpriteShifts.LEAD_BLOCK))) .onRegister(casingConnectivity((block, cc) -> cc.makeCasing(block, TFMGSpriteShifts.LEAD_BLOCK))) .transform(pickaxeOnly()) .blockstate(simpleCubeAll("lithium_block")) .tag(BlockTags.NEEDS_IRON_TOOL) - .tag(Tags.Blocks.STORAGE_BLOCKS) .tag(BlockTags.BEACON_BASE_BLOCKS) - .tag(AllTags.commonBlockTag("storage_blocks/lithium")) - .item() - .tag(AllTags.commonItemTag("storage_blocks/lithium")) - .tag(Tags.Items.STORAGE_BLOCKS) + .transform(tagBlockAndItem(Map.of( + Tags.Blocks.STORAGE_BLOCKS, Tags.Items.STORAGE_BLOCKS, + TFMGBlockTags.STORAGE_BLOCKS_LITHIUM.tag, TFMGItemTags.STORAGE_BLOCKS_LITHIUM.tag + ))) .build() .lang("Block of Lithium") .register(); @@ -1564,15 +1585,15 @@ public class TFMGBlocks { public static final BlockEntry COAL_COKE_BLOCK = REGISTRATE.block("coal_coke_block", Block::new) .initialProperties(SharedProperties::softMetal) - .properties(p -> p.requiresCorrectToolForDrops()) + .properties(BlockBehaviour.Properties::requiresCorrectToolForDrops) .transform(pickaxeOnly()) .blockstate(simpleCubeAll("coal_coke_block")) - .tag(AllTags.commonBlockTag("storage_blocks/coal_coke")) .tag(BlockTags.NEEDS_STONE_TOOL) .tag(Tags.Blocks.STORAGE_BLOCKS) + .tag(TFMGBlockTags.STORAGE_BLOCKS_COAL_COKE.tag) .item(CoalCokeBlockItem::new) - .tag(AllTags.commonItemTag("storage_blocks/coal_coke")) .tag(Tags.Items.STORAGE_BLOCKS) + .tag(TFMGItemTags.STORAGE_BLOCKS_COAL_COKE.tag) .build() .lang("Block of Coal Coke") .register(); @@ -1624,7 +1645,7 @@ public class TFMGBlocks { .initialProperties(SharedProperties::stone) .transform(TFMGStress.setNoImpact()) .transform(axeOrPickaxe()) - .properties(p -> p.noOcclusion()) + .properties(BlockBehaviour.Properties::noOcclusion) .onRegister(CreateRegistrate.connectedTextures(() -> new EncasedCTBehaviour(TFMGSpriteShifts.HEAVY_MACHINERY_CASING))) .onRegister(CreateRegistrate.casingConnectivity((block, cc) -> cc.make(block, TFMGSpriteShifts.HEAVY_MACHINERY_CASING, (s, f) -> f.getAxis() == s.getValue(GearboxBlock.AXIS)))) @@ -1635,53 +1656,53 @@ public class TFMGBlocks { //------------------BARS------------------// public static final BlockEntry STEEL_BARS = TFMGMetalBarsGen.createBars("steel", true, - () -> DataIngredient.tag(AllTags.commonItemTag("ingots/steel")), MapColor.TERRACOTTA_CYAN); + () -> DataIngredient.tag(CommonMetal.STEEL.ingots), MapColor.TERRACOTTA_CYAN); public static final BlockEntry ALUMINUM_BARS = TFMGMetalBarsGen.createBars("aluminum", true, - () -> DataIngredient.tag(AllTags.commonItemTag("ingots/aluminum")), MapColor.TERRACOTTA_WHITE); + () -> DataIngredient.tag(CommonMetal.ALUMINUM.ingots), MapColor.TERRACOTTA_WHITE); public static final BlockEntry CAST_IRON_BARS = TFMGMetalBarsGen.createBars("cast_iron", true, - () -> DataIngredient.tag(AllTags.commonItemTag("ingots/cast_iron")), MapColor.COLOR_BLACK); + () -> DataIngredient.tag(TFMGItemTags.INGOTS_CAST_IRON.tag), MapColor.COLOR_BLACK); public static final BlockEntry LEAD_BARS = TFMGMetalBarsGen.createBars("lead", true, - () -> DataIngredient.tag(AllTags.commonItemTag("ingots/lead")), MapColor.TERRACOTTA_BLUE); + () -> DataIngredient.tag(CommonMetal.LEAD.ingots), MapColor.TERRACOTTA_BLUE); public static final BlockEntry NICKEL_BARS = TFMGMetalBarsGen.createBars("nickel", true, - () -> DataIngredient.tag(AllTags.commonItemTag("ingots/nickel")), MapColor.TERRACOTTA_YELLOW); + () -> DataIngredient.tag(CommonMetal.NICKEL.ingots), MapColor.TERRACOTTA_YELLOW); //------------------LADDERS------------------// public static final BlockEntry STEEL_LADDER = REGISTRATE.block("steel_ladder", MetalLadderBlock::new) .transform(BuilderTransformers.ladder("steel", - () -> DataIngredient.tag(AllTags.commonItemTag("ingots/steel")), MapColor.TERRACOTTA_CYAN)) + () -> DataIngredient.tag(CommonMetal.STEEL.ingots), MapColor.TERRACOTTA_CYAN)) .register(); public static final BlockEntry ALUMINUM_LADDER = REGISTRATE.block("aluminum_ladder", MetalLadderBlock::new) .transform(BuilderTransformers.ladder("aluminum", - () -> DataIngredient.tag(AllTags.commonItemTag("ingots/aluminum")), MapColor.TERRACOTTA_WHITE)) + () -> DataIngredient.tag(CommonMetal.ALUMINUM.ingots), MapColor.TERRACOTTA_WHITE)) .register(); public static final BlockEntry CAST_IRON_LADDER = REGISTRATE.block("cast_iron_ladder", MetalLadderBlock::new) .transform(BuilderTransformers.ladder("cast_iron", - () -> DataIngredient.tag(AllTags.commonItemTag("ingots/cast_iron")), MapColor.TERRACOTTA_WHITE)) + () -> DataIngredient.tag(TFMGItemTags.INGOTS_CAST_IRON.tag), MapColor.TERRACOTTA_WHITE)) .register(); public static final BlockEntry LEAD_LADDER = REGISTRATE.block("lead_ladder", MetalLadderBlock::new) .transform(BuilderTransformers.ladder("lead", - () -> DataIngredient.tag(AllTags.commonItemTag("ingots/lead")), MapColor.TERRACOTTA_WHITE)) + () -> DataIngredient.tag(CommonMetal.LEAD.ingots), MapColor.TERRACOTTA_WHITE)) .lang("Leadder") .register(); public static final BlockEntry NICKEL_LADDER = REGISTRATE.block("nickel_ladder", MetalLadderBlock::new) .transform(BuilderTransformers.ladder("nickel", - () -> DataIngredient.tag(AllTags.commonItemTag("ingots/nickel")), MapColor.TERRACOTTA_WHITE)) + () -> DataIngredient.tag(CommonMetal.NICKEL.ingots), MapColor.TERRACOTTA_WHITE)) .register(); public static final BlockEntry CONSTANTAN_LADDER = REGISTRATE.block("constantan_ladder", MetalLadderBlock::new) .transform(BuilderTransformers.ladder("constantan", - () -> DataIngredient.tag(AllTags.commonItemTag("ingots/constantan")), MapColor.TERRACOTTA_WHITE)) + () -> DataIngredient.tag(CommonMetal.CONSTANTAN.ingots), MapColor.TERRACOTTA_WHITE)) .register(); //------------------SCAFFOLDINGS------------------// public static final BlockEntry STEEL_SCAFFOLD = @@ -1690,7 +1711,7 @@ public class TFMGBlocks { .strength(4.0F) .requiresCorrectToolForDrops()) .transform(BuilderTransformers.scaffold("steel", - () -> DataIngredient.tag(AllTags.commonItemTag("ingots/steel")), MapColor.TERRACOTTA_CYAN, + () -> DataIngredient.tag(CommonMetal.STEEL.ingots), MapColor.TERRACOTTA_CYAN, TFMGSpriteShifts.STEEL_SCAFFOLD, TFMGSpriteShifts.STEEL_SCAFFOLD_INSIDE, TFMGSpriteShifts.STEEL_CASING)) .register(); @@ -1701,7 +1722,7 @@ public class TFMGBlocks { .requiresCorrectToolForDrops()) .transform(BuilderTransformers.scaffold("aluminum", - () -> DataIngredient.tag(AllTags.commonItemTag("ingots/aluminum")), MapColor.TERRACOTTA_CYAN, + () -> DataIngredient.tag(CommonMetal.ALUMINUM.ingots), MapColor.TERRACOTTA_CYAN, TFMGSpriteShifts.ALUMINUM_SCAFFOLD, TFMGSpriteShifts.ALUMINUM_SCAFFOLD_INSIDE, TFMGSpriteShifts.ALUMINUM_SCAFFOLD_TOP)) .register(); //------------------DECOR------------------// @@ -1711,7 +1732,7 @@ public class TFMGBlocks { .strength(3.0F) .requiresCorrectToolForDrops() .sound(SoundType.CALCITE)) - .recipe((c, p) -> p.stonecutting(DataIngredient.items(TFMGBlocks.SLAG_BLOCK.asItem()), RecipeCategory.BUILDING_BLOCKS, c::get, 4)) + .recipe((c, p) -> p.stonecutting(DataIngredient.items(TFMGBlocks.SLAG_BLOCK.asItem()), RecipeCategory.BUILDING_BLOCKS, c, 4)) .transform(pickaxeOnly()) .simpleItem() .register(); @@ -1758,7 +1779,7 @@ public class TFMGBlocks { .strength(3.0F) .requiresCorrectToolForDrops() .sound(SoundType.NETHERITE_BLOCK)) - .recipe((c, p) -> p.stonecutting(DataIngredient.tag(AllTags.commonItemTag("ingots/aluminum")), RecipeCategory.BUILDING_BLOCKS, c::get, 1)) + .recipe((c, p) -> p.stonecutting(DataIngredient.tag(CommonMetal.ALUMINUM.ingots), RecipeCategory.BUILDING_BLOCKS, c, 1)) .transform(pickaxeOnly()) .simpleItem() .register(); @@ -1778,7 +1799,7 @@ public class TFMGBlocks { // public static final MaterialSet HARDENED_PLANKS_SET = makeVariants(HARDENED_PLANKS, true); public static final BlockEntry STEEL_TRAPDOOR = - REGISTRATE.block("steel_trapdoor", TrainTrapdoorBlock::new) + REGISTRATE.block("steel_trapdoor", TrainTrapdoorBlock::metal) .initialProperties(SharedProperties::softMetal) .properties(p -> p.mapColor(MapColor.TERRACOTTA_CYAN) .sound(SoundType.NETHERITE_BLOCK)) @@ -1815,7 +1836,7 @@ public class TFMGBlocks { public static final BlockEntry REBAR_BLOCK = REGISTRATE.block("rebar_block", SimpleConcreteloggedBlock::new) .initialProperties(SharedProperties::softMetal) - .properties(p -> p.noOcclusion()) + .properties(BlockBehaviour.Properties::noOcclusion) .properties(p -> p.sound(SoundType.NETHERITE_BLOCK)) .addLayer(() -> RenderType::cutoutMipped) .blockstate((ctx, prov) -> prov.simpleBlock(ctx.getEntry(), AssetLookup.partialBaseModel(ctx, prov))) @@ -1825,7 +1846,7 @@ public class TFMGBlocks { public static final BlockEntry REBAR_FLOOR = REGISTRATE.block("rebar_floor", RebarFloorBlock::new) .initialProperties(SharedProperties::softMetal) - .properties(p -> p.noOcclusion()) + .properties(BlockBehaviour.Properties::noOcclusion) .properties(p -> p.sound(SoundType.NETHERITE_BLOCK)) .addLayer(() -> RenderType::cutoutMipped) .blockstate((ctx, prov) -> prov.simpleBlock(ctx.getEntry(), AssetLookup.partialBaseModel(ctx, prov))) @@ -1835,7 +1856,7 @@ public class TFMGBlocks { public static final BlockEntry REBAR_WALL = REGISTRATE.block("rebar_wall", RebarWallBlock::new) .initialProperties(SharedProperties::softMetal) - .properties(p -> p.noOcclusion()) + .properties(BlockBehaviour.Properties::noOcclusion) .properties(p -> p.sound(SoundType.NETHERITE_BLOCK)) .addLayer(() -> RenderType::cutoutMipped) .blockstate((ctx, prov) -> prov.simpleBlock(ctx.getEntry(), AssetLookup.partialBaseModel(ctx, prov))) @@ -1854,7 +1875,7 @@ public class TFMGBlocks { public static final BlockEntry REBAR_STAIRS = REGISTRATE.block("rebar_stairs", p -> new RebarStairsBlock(REBAR_PILE.getDefaultState(), p)) .initialProperties(SharedProperties::softMetal) - .properties(p -> p.noOcclusion()) + .properties(BlockBehaviour.Properties::noOcclusion) .properties(p -> p.sound(SoundType.NETHERITE_BLOCK)) .addLayer(() -> RenderType::cutoutMipped) .blockstate(new RebarStairsGenerator()::generate) @@ -1865,7 +1886,7 @@ public class TFMGBlocks { public static final BlockEntry REBAR_PILLAR = REGISTRATE.block("rebar_pillar", RebarPillarBlock::new) .initialProperties(SharedProperties::softMetal) - .properties(p -> p.noOcclusion()) + .properties(BlockBehaviour.Properties::noOcclusion) .properties(p -> p.sound(SoundType.NETHERITE_BLOCK)) .addLayer(() -> RenderType::cutoutMipped) .blockstate(BlockStateGen.directionalBlockProvider(true)) @@ -1884,7 +1905,7 @@ public class TFMGBlocks { public static final BlockEntry ASPHALT = REGISTRATE.block("asphalt", Block::new) .initialProperties(() -> Blocks.STONE) - .properties(p -> p.requiresCorrectToolForDrops()) + .properties(BlockBehaviour.Properties::requiresCorrectToolForDrops) .transform(pickaxeOnly()) .tag(BlockTags.NEEDS_STONE_TOOL) .simpleItem() @@ -1895,7 +1916,6 @@ public class TFMGBlocks { REGISTRATE.setCreativeTab(TFMGCreativeTabs.TFMG_MAIN); } - public static void init() { } diff --git a/src/main/java/com/drmangotea/tfmg/registry/TFMGDataComponents.java b/src/main/java/com/drmangotea/tfmg/registry/TFMGDataComponents.java index cc81ebbc..6f73fa25 100644 --- a/src/main/java/com/drmangotea/tfmg/registry/TFMGDataComponents.java +++ b/src/main/java/com/drmangotea/tfmg/registry/TFMGDataComponents.java @@ -1,54 +1,19 @@ package com.drmangotea.tfmg.registry; -import java.util.List; -import java.util.UUID; import java.util.function.UnaryOperator; import com.drmangotea.tfmg.TFMG; import com.drmangotea.tfmg.content.items.weapons.flamethrover.FlamethrowerFuel; -import net.minecraft.resources.ResourceLocation; import org.jetbrains.annotations.ApiStatus.Internal; import com.mojang.serialization.Codec; -import com.simibubi.create.content.equipment.clipboard.ClipboardEntry; -import com.simibubi.create.content.equipment.clipboard.ClipboardOverrides.ClipboardType; -import com.simibubi.create.content.equipment.sandPaper.SandPaperItemComponent; -import com.simibubi.create.content.equipment.symmetryWand.mirror.SymmetryMirror; -import com.simibubi.create.content.equipment.zapper.PlacementPatterns; -import com.simibubi.create.content.equipment.zapper.terrainzapper.PlacementOptions; -import com.simibubi.create.content.equipment.zapper.terrainzapper.TerrainBrushes; -import com.simibubi.create.content.equipment.zapper.terrainzapper.TerrainTools; -import com.simibubi.create.content.fluids.potion.PotionFluid.BottleType; -import com.simibubi.create.content.logistics.box.PackageItem.PackageOrderData; -import com.simibubi.create.content.logistics.filter.AttributeFilterWhitelistMode; -import com.simibubi.create.content.logistics.item.filter.attribute.ItemAttribute.ItemAttributeEntry; -import com.simibubi.create.content.logistics.redstoneRequester.AutoRequestData; -import com.simibubi.create.content.logistics.stockTicker.PackageOrderWithCrafts; -import com.simibubi.create.content.logistics.tableCloth.ShoppingListItem.ShoppingList; -import com.simibubi.create.content.processing.sequenced.SequencedAssemblyRecipe.SequencedAssembly; -import com.simibubi.create.content.redstone.displayLink.ClickToLinkBlockItem.ClickToLinkData; -import com.simibubi.create.content.schematics.cannon.SchematicannonBlockEntity.SchematicannonOptions; -import com.simibubi.create.content.trains.track.BezierTrackPointLocation; -import com.simibubi.create.content.trains.track.TrackPlacement.ConnectingFrom; -import net.createmod.catnip.codecs.stream.CatnipStreamCodecBuilders; -import net.createmod.catnip.codecs.stream.CatnipStreamCodecs; -import net.minecraft.core.BlockPos; -import net.minecraft.core.UUIDUtil; -import net.minecraft.core.Vec3i; import net.minecraft.core.component.DataComponentType; import net.minecraft.core.component.DataComponentType.Builder; import net.minecraft.core.registries.Registries; import net.minecraft.nbt.CompoundTag; import net.minecraft.network.codec.ByteBufCodecs; -import net.minecraft.network.codec.StreamCodec; import net.minecraft.util.ExtraCodecs; -import net.minecraft.util.Unit; -import net.minecraft.world.item.component.ItemContainerContents; -import net.minecraft.world.level.block.Block; -import net.minecraft.world.level.block.Mirror; -import net.minecraft.world.level.block.Rotation; -import net.minecraft.world.level.block.state.BlockState; import net.neoforged.bus.api.IEventBus; import net.neoforged.neoforge.registries.DeferredRegister; diff --git a/src/main/java/com/drmangotea/tfmg/registry/TFMGEntityTypes.java b/src/main/java/com/drmangotea/tfmg/registry/TFMGEntityTypes.java index 6746f9c9..2c585938 100644 --- a/src/main/java/com/drmangotea/tfmg/registry/TFMGEntityTypes.java +++ b/src/main/java/com/drmangotea/tfmg/registry/TFMGEntityTypes.java @@ -13,7 +13,6 @@ import com.drmangotea.tfmg.content.items.weapons.explosives.pipe_bomb.PipeBombRe import com.drmangotea.tfmg.content.items.weapons.explosives.thermite_grenades.ThermiteGrenade; import com.drmangotea.tfmg.content.items.weapons.explosives.thermite_grenades.ThermiteGrenadeRenderer; import com.simibubi.create.foundation.data.CreateEntityBuilder; -import com.simibubi.create.foundation.utility.CreateLang; import com.tterrag.registrate.util.entry.EntityEntry; import com.tterrag.registrate.util.nullness.NonNullConsumer; import com.tterrag.registrate.util.nullness.NonNullFunction; diff --git a/src/main/java/com/drmangotea/tfmg/registry/TFMGFluids.java b/src/main/java/com/drmangotea/tfmg/registry/TFMGFluids.java index d588b6c6..0c9131bf 100644 --- a/src/main/java/com/drmangotea/tfmg/registry/TFMGFluids.java +++ b/src/main/java/com/drmangotea/tfmg/registry/TFMGFluids.java @@ -15,12 +15,12 @@ import com.tterrag.registrate.util.nullness.NonNullFunction; import net.createmod.catnip.theme.Color; import net.minecraft.core.BlockPos; import net.minecraft.resources.ResourceLocation; +import net.minecraft.tags.ItemTags; import net.minecraft.tags.TagKey; import net.minecraft.world.level.BlockAndTintGetter; import net.minecraft.world.level.material.Fluid; import net.minecraft.world.level.material.FluidState; import net.neoforged.neoforge.fluids.BaseFlowingFluid; -import net.neoforged.neoforge.fluids.FluidStack; import org.joml.Vector3f; import java.util.function.Supplier; @@ -79,7 +79,7 @@ public class TFMGFluids { .tag(tags) .source(BaseFlowingFluid.Source::new) .bucket() - .tag(AllTags.commonItemTag("buckets/" + name)) + .tag(ItemTags.create(ResourceLocation.fromNamespaceAndPath("c", "buckets/" + name))) .build() .register(); } @@ -97,7 +97,7 @@ public class TFMGFluids { .tag(tags) .source(BaseFlowingFluid.Source::new) .bucket() - .tag(AllTags.commonItemTag("buckets/" + name)) + .tag(ItemTags.create(ResourceLocation.fromNamespaceAndPath("c", "buckets/" + name))) .build() .register(); } @@ -117,7 +117,7 @@ public class TFMGFluids { .tag(TFMGTags.TFMGFluidTags.FUEL.tag, TFMGTags.TFMGFluidTags.FLAMMABLE.tag) .source(BaseFlowingFluid.Source::new) .bucket() - .tag(AllTags.commonItemTag("buckets/" + name)) + .tag(ItemTags.create(ResourceLocation.fromNamespaceAndPath("c", "buckets/" + name))) .build() .register(); } @@ -136,7 +136,7 @@ public class TFMGFluids { .tag(tags) .source(BaseFlowingFluid.Source::new) .bucket() - .tag(AllTags.commonItemTag("buckets/" + name)) + .tag(ItemTags.create(ResourceLocation.fromNamespaceAndPath("c", "buckets/" + name))) .build() .register(); } @@ -155,7 +155,7 @@ public class TFMGFluids { .tag(tags) .source(factory) .bucket() - .tag(AllTags.commonItemTag("buckets/" + name)) + .tag(ItemTags.create(ResourceLocation.fromNamespaceAndPath("c", "buckets/" + name))) .build() .register(); } @@ -169,7 +169,7 @@ public class TFMGFluids { .tag(TFMGTags.TFMGFluidTags.GAS.tag) .bucket() .lang(TFMGUtils.fromId(name) + " Tank") - .tag(AllTags.commonItemTag("buckets/" + name)) + .tag(ItemTags.create(ResourceLocation.fromNamespaceAndPath("c", "buckets/" + name))) .build() .register(); } @@ -184,7 +184,7 @@ public class TFMGFluids { .tag(TFMGTags.TFMGFluidTags.FLAMMABLE.tag) .bucket() .lang(TFMGUtils.fromId(name) + " Tank") - .tag(AllTags.commonItemTag("buckets/" + name)) + .tag(ItemTags.create(ResourceLocation.fromNamespaceAndPath("c", "buckets/" + name))) .build() .register(); } diff --git a/src/main/java/com/drmangotea/tfmg/registry/TFMGItems.java b/src/main/java/com/drmangotea/tfmg/registry/TFMGItems.java index 519fc49a..c5953532 100644 --- a/src/main/java/com/drmangotea/tfmg/registry/TFMGItems.java +++ b/src/main/java/com/drmangotea/tfmg/registry/TFMGItems.java @@ -29,10 +29,12 @@ import com.drmangotea.tfmg.content.items.weapons.lithium_blade.LithiumBladeItem; import com.drmangotea.tfmg.content.items.weapons.quad_potato_cannon.QuadPotatoCannonItem; import com.drmangotea.tfmg.content.machinery.misc.winding_machine.SpoolItem; import com.drmangotea.tfmg.content.machinery.oil_processing.OilHammerItem; +import com.drmangotea.tfmg.registry.TFMGTags.TFMGItemTags; import com.simibubi.create.AllTags; import com.simibubi.create.content.processing.sequenced.SequencedAssemblyItem; import com.simibubi.create.foundation.data.AssetLookup; import com.simibubi.create.foundation.data.CreateRegistrate; +import com.simibubi.create.foundation.data.recipe.CommonMetal; import com.tterrag.registrate.builders.ItemBuilder; import com.tterrag.registrate.util.DataIngredient; import com.tterrag.registrate.util.entry.ItemEntry; @@ -52,7 +54,7 @@ import java.util.Map; import static com.drmangotea.tfmg.base.TFMGBuilderTransformers.COLORS; import static com.drmangotea.tfmg.content.items.weapons.explosives.thermite_grenades.ThermiteGrenade.ChemicalColor.*; import static com.simibubi.create.AllTags.AllItemTags.CREATE_INGOTS; -import static com.simibubi.create.AllTags.commonItemTag; +import static com.simibubi.create.AllTags.AllItemTags.PLATES; public class TFMGItems { @@ -61,56 +63,56 @@ public class TFMGItems { public static final ItemEntry - STEEL_INGOT = taggedIngredient("steel_ingot", commonItemTag("ingots/steel"), CREATE_INGOTS.tag), - CAST_IRON_INGOT = taggedIngredient("cast_iron_ingot", commonItemTag("ingots/cast_iron"), CREATE_INGOTS.tag), - ALUMINUM_INGOT = taggedIngredient("aluminum_ingot", commonItemTag("ingots/aluminum"), CREATE_INGOTS.tag), - PLASTIC_SHEET = taggedIngredient("plastic_sheet", commonItemTag("ingots/plastic"), CREATE_INGOTS.tag), - HEAVY_PLATE = taggedIngredient("heavy_plate", commonItemTag("plates/steel"), commonItemTag("plates")), - ALUMINUM_SHEET = taggedIngredient("aluminum_sheet", commonItemTag("plates/aluminum"), commonItemTag("plates")), - NICKEL_SHEET = taggedIngredient("nickel_sheet", commonItemTag("plates/nickel"), commonItemTag("plates")), - CAST_IRON_SHEET = taggedIngredient("cast_iron_sheet", commonItemTag("plates/cast_iron"), commonItemTag("plates")), - LEAD_SHEET = taggedIngredient("lead_sheet", commonItemTag("plates/lead"), commonItemTag("plates")), - LEAD_INGOT = taggedIngredient("lead_ingot", commonItemTag("ingots/lead"), CREATE_INGOTS.tag), - NICKEL_INGOT = taggedIngredient("nickel_ingot", commonItemTag("ingots/nickel"), CREATE_INGOTS.tag), - CONSTANTAN_INGOT = taggedIngredient("constantan_ingot", commonItemTag("ingots/constantan"), CREATE_INGOTS.tag), - LITHIUM_INGOT = taggedIngredient("lithium_ingot", commonItemTag("ingots/lithium"), CREATE_INGOTS.tag), - ALUMINUM_NUGGET = taggedIngredient("aluminum_nugget", commonItemTag("nuggets/aluminum"), commonItemTag("nuggets")), - STEEL_NUGGET = taggedIngredient("steel_nugget", commonItemTag("nuggets/steel"), commonItemTag("nuggets")), - CAST_IRON_NUGGET = taggedIngredient("cast_iron_nugget", commonItemTag("nuggets/cast_iron"), commonItemTag("nuggets")), - CONSTANTAN_NUGGET = taggedIngredient("constantan_nugget", commonItemTag("nuggets/constantan"), commonItemTag("nuggets")), - LEAD_NUGGET = taggedIngredient("lead_nugget", commonItemTag("nuggets/lead"), commonItemTag("nuggets")), - NICKEL_NUGGET = taggedIngredient("nickel_nugget", commonItemTag("nuggets/nickel"), commonItemTag("nuggets")), - LITHIUM_NUGGET = taggedIngredient("lithium_nugget", commonItemTag("nuggets/lithium"), commonItemTag("nuggets")), - RAW_LEAD = taggedIngredient("raw_lead", commonItemTag("raw_materials/lead"), commonItemTag("raw_materials")), - RAW_NICKEL = taggedIngredient("raw_nickel", commonItemTag("raw_materials/nickel"), commonItemTag("raw_materials")), - RAW_LITHIUM = taggedIngredient("raw_lithium", commonItemTag("raw_materials/lithium"), commonItemTag("raw_materials")), - SYNTHETIC_LEATHER = taggedIngredient("synthetic_leather", Tags.Items.LEATHERS, AllTags.commonItemTag("leather")), - LIMESAND = taggedIngredient("limesand", TFMGTags.TFMGItemTags.FLUX.tag), - SULFUR_DUST = taggedIngredient("sulfur_dust", commonItemTag("dusts/sulfur"), commonItemTag("dusts")), - NITRATE_DUST = taggedIngredient("nitrate_dust", commonItemTag("dusts/saltpeter"), commonItemTag("dusts")), - RUBBER_SHEET = taggedIngredient("rubber_sheet", commonItemTag("ingots/rubber"), commonItemTag("dusts")), - SILICON_INGOT = taggedIngredient("silicon_ingot", commonItemTag("ingots/silicon"), commonItemTag("dusts")), + STEEL_INGOT = taggedIngredient("steel_ingot", CommonMetal.STEEL.ingots, Tags.Items.INGOTS, CREATE_INGOTS.tag), + CAST_IRON_INGOT = taggedIngredient("cast_iron_ingot", TFMGItemTags.INGOTS_CAST_IRON.tag, Tags.Items.INGOTS, CREATE_INGOTS.tag), + ALUMINUM_INGOT = taggedIngredient("aluminum_ingot", CommonMetal.ALUMINUM.ingots, Tags.Items.INGOTS, CREATE_INGOTS.tag), + PLASTIC_SHEET = taggedIngredient("plastic_sheet", TFMGItemTags.INGOTS_PLASTIC.tag, Tags.Items.INGOTS, CREATE_INGOTS.tag), + HEAVY_PLATE = taggedIngredient("heavy_plate", CommonMetal.STEEL.plates, PLATES.tag), + ALUMINUM_SHEET = taggedIngredient("aluminum_sheet", CommonMetal.ALUMINUM.plates, PLATES.tag), + NICKEL_SHEET = taggedIngredient("nickel_sheet", CommonMetal.NICKEL.plates, PLATES.tag), + CAST_IRON_SHEET = taggedIngredient("cast_iron_sheet", TFMGItemTags.PLATES_CAST_IRON.tag, PLATES.tag), + LEAD_SHEET = taggedIngredient("lead_sheet", CommonMetal.LEAD.plates, PLATES.tag), + LEAD_INGOT = taggedIngredient("lead_ingot", CommonMetal.LEAD.ingots, Tags.Items.INGOTS, CREATE_INGOTS.tag), + NICKEL_INGOT = taggedIngredient("nickel_ingot", CommonMetal.NICKEL.ingots, Tags.Items.INGOTS, CREATE_INGOTS.tag), + CONSTANTAN_INGOT = taggedIngredient("constantan_ingot", CommonMetal.CONSTANTAN.ingots, Tags.Items.INGOTS, CREATE_INGOTS.tag), + LITHIUM_INGOT = taggedIngredient("lithium_ingot", TFMGItemTags.INGOTS_LITHIUM.tag, Tags.Items.INGOTS, CREATE_INGOTS.tag), + ALUMINUM_NUGGET = taggedIngredient("aluminum_nugget", CommonMetal.ALUMINUM.nuggets, Tags.Items.NUGGETS), + STEEL_NUGGET = taggedIngredient("steel_nugget", CommonMetal.STEEL.nuggets, Tags.Items.NUGGETS), + CAST_IRON_NUGGET = taggedIngredient("cast_iron_nugget", TFMGItemTags.NUGGETS_CAST_IRON.tag, Tags.Items.NUGGETS), + CONSTANTAN_NUGGET = taggedIngredient("constantan_nugget", CommonMetal.CONSTANTAN.nuggets, Tags.Items.NUGGETS), + LEAD_NUGGET = taggedIngredient("lead_nugget", CommonMetal.LEAD.nuggets, Tags.Items.NUGGETS), + NICKEL_NUGGET = taggedIngredient("nickel_nugget", CommonMetal.NICKEL.nuggets, Tags.Items.NUGGETS), + LITHIUM_NUGGET = taggedIngredient("lithium_nugget", TFMGItemTags.NUGGETS_LITHIUM.tag, Tags.Items.NUGGETS), + RAW_LEAD = taggedIngredient("raw_lead", CommonMetal.LEAD.rawOres, Tags.Items.RAW_MATERIALS), + RAW_NICKEL = taggedIngredient("raw_nickel", CommonMetal.NICKEL.rawOres, Tags.Items.RAW_MATERIALS), + RAW_LITHIUM = taggedIngredient("raw_lithium", TFMGItemTags.RAW_LITHIUM.tag, Tags.Items.RAW_MATERIALS), + SYNTHETIC_LEATHER = taggedIngredient("synthetic_leather", Tags.Items.LEATHERS), + LIMESAND = taggedIngredient("limesand", TFMGItemTags.FLUX.tag), + SULFUR_DUST = taggedIngredient("sulfur_dust", TFMGItemTags.DUSTS_SULFUR.tag, Tags.Items.DUSTS), + NITRATE_DUST = taggedIngredient("nitrate_dust", TFMGItemTags.DUSTS_SALTPETER.tag, Tags.Items.DUSTS), + RUBBER_SHEET = taggedIngredient("rubber_sheet", TFMGItemTags.INGOTS_RUBBER.tag, PLATES.tag), + SILICON_INGOT = taggedIngredient("silicon_ingot", TFMGItemTags.INGOTS_SILICON.tag, CREATE_INGOTS.tag), CRUSHED_LITHIUM = taggedIngredient("crushed_raw_lithium", AllTags.AllItemTags.CRUSHED_RAW_MATERIALS.tag) ; public static final ItemEntry REBAR = REGISTRATE.item("rebar", Item::new) - .tag(AllTags.commonItemTag("rods/steel")) - .recipe((c, p) -> p.stonecutting(DataIngredient.tag(AllTags.commonItemTag("ingots/steel")), RecipeCategory.BUILDING_BLOCKS, c::get, 4)) + .tag(TFMGItemTags.RODS_STEEL.tag, Tags.Items.RODS) + .recipe((c, p) -> p.stonecutting(DataIngredient.tag(CommonMetal.STEEL.ingots), RecipeCategory.BUILDING_BLOCKS, c, 4)) .register(), SYNTHETIC_STRING = REGISTRATE.item("synthetic_string", Item::new) - .tag(Tags.Items.STRINGS, AllTags.commonItemTag("string")) - .recipe((c, p) -> p.stonecutting(DataIngredient.tag(AllTags.commonItemTag("ingots/rubber")), RecipeCategory.MISC, c::get, 4)) + .tag(Tags.Items.STRINGS) + .recipe((c, p) -> p.stonecutting(DataIngredient.tag(TFMGItemTags.INGOTS_RUBBER.tag), RecipeCategory.MISC, c, 4)) .register(); public static final ItemEntry - COPPER_WIRE = REGISTRATE.item("copper_wire", Item::new).tag(AllTags.commonItemTag("wires/copper"), commonItemTag("wires")) - .recipe((c, p) -> p.stonecutting(DataIngredient.tag(AllTags.commonItemTag("ingots/copper")), RecipeCategory.BUILDING_BLOCKS, c::get, 2)).register(), - ALUMINUM_WIRE = REGISTRATE.item("aluminum_wire", Item::new).tag(AllTags.commonItemTag("wires/aluminum"), commonItemTag("wires")) - .recipe((c, p) -> p.stonecutting(DataIngredient.tag(AllTags.commonItemTag("ingots/aluminum")), RecipeCategory.BUILDING_BLOCKS, c::get, 2)).register(), - CONSTANTAN_WIRE = REGISTRATE.item("constantan_wire", Item::new).tag(AllTags.commonItemTag("wires/constantan"), commonItemTag("wires")) - .recipe((c, p) -> p.stonecutting(DataIngredient.tag(AllTags.commonItemTag("ingots/constantan")), RecipeCategory.BUILDING_BLOCKS, c::get, 2)).register(); + COPPER_WIRE = REGISTRATE.item("copper_wire", Item::new).tag(TFMGItemTags.WIRES_COPPER.tag, TFMGItemTags.WIRES.tag) + .recipe((c, p) -> p.stonecutting(DataIngredient.tag(CommonMetal.COPPER.ingots), RecipeCategory.BUILDING_BLOCKS, c, 2)).register(), + ALUMINUM_WIRE = REGISTRATE.item("aluminum_wire", Item::new).tag(TFMGItemTags.WIRES_ALUMINUM.tag, TFMGItemTags.WIRES.tag) + .recipe((c, p) -> p.stonecutting(DataIngredient.tag(CommonMetal.ALUMINUM.ingots), RecipeCategory.BUILDING_BLOCKS, c, 2)).register(), + CONSTANTAN_WIRE = REGISTRATE.item("constantan_wire", Item::new).tag(TFMGItemTags.WIRES_CONSTANTAN.tag, TFMGItemTags.WIRES.tag) + .recipe((c, p) -> p.stonecutting(DataIngredient.tag(CommonMetal.CONSTANTAN.ingots), RecipeCategory.BUILDING_BLOCKS, c, 2)).register(); public static final ItemEntry SPARK_PLUG = REGISTRATE.item("spark_plug", Item::new).register(), @@ -119,7 +121,7 @@ public class TFMGItems { FIREPROOF_BRICK = REGISTRATE.item("fireproof_brick", Item::new).register(), FIRECLAY_BALL = REGISTRATE.item("fireclay_ball", Item::new).register(), SCREW = REGISTRATE.item("screw", Item::new) - .recipe((c, p) -> p.stonecutting(DataIngredient.tag(AllTags.commonItemTag("ingots/steel")), RecipeCategory.BUILDING_BLOCKS, c::get, 4)) + .recipe((c, p) -> p.stonecutting(DataIngredient.tag(CommonMetal.STEEL.ingots), RecipeCategory.BUILDING_BLOCKS, c, 4)) .lang("Screws") .register(), THERMITE_POWDER = REGISTRATE.item("thermite_powder", Item::new).register(), @@ -140,7 +142,7 @@ public class TFMGItems { TURBO = REGISTRATE.item("turbo", Item::new).register(), GOLDEN_TURBO = REGISTRATE.item("golden_turbo", Item::new).register(), CINDERBLOCK = REGISTRATE.item("cinderblock", Item::new) - .recipe((c, p) -> p.stonecutting(DataIngredient.items(TFMGBlocks.CONCRETE.block.asItem()), RecipeCategory.BUILDING_BLOCKS, c::get, 8)) + .recipe((c, p) -> p.stonecutting(DataIngredient.items(TFMGBlocks.CONCRETE.block.asItem()), RecipeCategory.BUILDING_BLOCKS, c, 8)) .register(), CINDERFLOURBLOCK = REGISTRATE.item("cinderflourblock", Item::new).register(), NAPALM_POTATO = REGISTRATE.item("napalm_potato", Item::new).register(), @@ -156,19 +158,19 @@ public class TFMGItems { UNFINISHED_ELECTROMAGNETIC_COIL = REGISTRATE.item("unfinished_electromagnetic_coil", Item::new).register(), COPPER_ELECTRODE = REGISTRATE.item("copper_electrode", Item::new) .properties(p -> p.stacksTo(1)) - .recipe((c, p) -> p.stonecutting(DataIngredient.tag(AllTags.commonItemTag("storage_blocks/copper")), RecipeCategory.BUILDING_BLOCKS, c::get, 1)) + .recipe((c, p) -> p.stonecutting(DataIngredient.tag(CommonMetal.COPPER.storageBlocks.items()), RecipeCategory.BUILDING_BLOCKS, c, 1)) .model((c, p) -> p.withExistingParent(c.getName(), TFMG.asResource("item/copper_electrode_model"))).register(), ZINC_ELECTRODE = REGISTRATE.item("zinc_electrode", Item::new) .properties(p -> p.stacksTo(1)) - .recipe((c, p) -> p.stonecutting(DataIngredient.tag(AllTags.commonItemTag("storage_blocks/zinc")), RecipeCategory.BUILDING_BLOCKS, c::get, 1)) + .recipe((c, p) -> p.stonecutting(DataIngredient.tag(CommonMetal.ZINC.storageBlocks.items()), RecipeCategory.BUILDING_BLOCKS, c, 1)) .model((c, p) -> p.withExistingParent(c.getName(), TFMG.asResource("item/zinc_electrode_model"))).register(), GRAPHITE_ELECTRODE = REGISTRATE.item("graphite_electrode", Item::new) .properties(p -> p.stacksTo(1)) - .recipe((c, p) -> p.stonecutting(DataIngredient.tag(AllTags.commonItemTag("storage_blocks/coal_coke")), RecipeCategory.BUILDING_BLOCKS, c::get, 1)) + .recipe((c, p) -> p.stonecutting(DataIngredient.tag(TFMGItemTags.STORAGE_BLOCKS_COAL_COKE.tag), RecipeCategory.BUILDING_BLOCKS, c, 1)) .model((c, p) -> p.withExistingParent(c.getName(), TFMG.asResource("item/graphite_electrode_model"))).register(), UNFIRED_INSULATOR = REGISTRATE.item("unfired_insulator", Item::new) .model((c, p) -> p.withExistingParent(c.getName(), TFMG.asResource("item/unfired_insulator_model"))) - .recipe((c, p) -> p.stonecutting(DataIngredient.items(Blocks.CLAY.asItem()), RecipeCategory.BUILDING_BLOCKS, c::get, 1)) + .recipe((c, p) -> p.stonecutting(DataIngredient.items(Blocks.CLAY.asItem()), RecipeCategory.BUILDING_BLOCKS, c, 1)) .register(), UNFINISHED_INSULATOR = REGISTRATE.item("unfinished_insulator", Item::new) .model((c, p) -> p.withExistingParent(c.getName(), TFMG.asResource("item/unfinished_insulator_model"))).register(), @@ -190,7 +192,7 @@ public class TFMGItems { TURBINE_BLADE = REGISTRATE.item("turbine_blade", CylinderItem::new).register(); public static final ItemEntry EMPTY_SPOOL = spoolItem("empty", 0x000000, TFMG.asResource("empty")) - .recipe((c, p) -> p.stonecutting(DataIngredient.items(TFMGBlocks.HARDENED_PLANKS.asItem()), RecipeCategory.BUILDING_BLOCKS, c::get, 1)) + .recipe((c, p) -> p.stonecutting(DataIngredient.items(TFMGBlocks.HARDENED_PLANKS.asItem()), RecipeCategory.BUILDING_BLOCKS, c, 1)) .register(), COPPER_SPOOL = spoolItem("copper", 0xD8735A, TFMG.asResource("copper")) .register(), @@ -207,7 +209,7 @@ public class TFMGItems { // .properties(p -> p.stacksTo(1)) // .register(); public static final ItemEntry COAL_COKE_DUST = REGISTRATE.item("coal_coke_dust", CoalCokeItem::new) - .tag(commonItemTag("dusts/coal_coke"), TFMGTags.TFMGItemTags.BLAST_FURNACE_FUEL.tag, commonItemTag("dusts")) + .tag(TFMGItemTags.DUSTS_COAL_COKE.tag, TFMGItemTags.BLAST_FURNACE_FUEL.tag, Tags.Items.DUSTS) .register(); public static final ItemEntry OIL_HAMMER = REGISTRATE.item("oil_hammer", OilHammerItem::new) @@ -450,7 +452,7 @@ public class TFMGItems { public static ItemBuilder spoolItem(String name, int barColor, ResourceLocation type) { return REGISTRATE.item(name + "_spool", p -> new SpoolItem(p, barColor, type)) - .tag(TFMGTags.TFMGItemTags.SPOOLS.tag) + .tag(TFMGItemTags.SPOOLS.tag) .properties(p -> p.stacksTo(1)); } diff --git a/src/main/java/com/drmangotea/tfmg/registry/TFMGKeys.java b/src/main/java/com/drmangotea/tfmg/registry/TFMGKeys.java index 4d258510..3cea8317 100644 --- a/src/main/java/com/drmangotea/tfmg/registry/TFMGKeys.java +++ b/src/main/java/com/drmangotea/tfmg/registry/TFMGKeys.java @@ -15,7 +15,7 @@ import org.lwjgl.glfw.GLFW; import java.util.function.BiConsumer; -@EventBusSubscriber(value = Dist.CLIENT, bus = EventBusSubscriber.Bus.MOD) +@EventBusSubscriber(value = Dist.CLIENT) public enum TFMGKeys { TRANSMISSION_SHIFT_UP("transmission_shift_up", GLFW.GLFW_KEY_V, "Increases transmission shift"), diff --git a/src/main/java/com/drmangotea/tfmg/registry/TFMGMenuTypes.java b/src/main/java/com/drmangotea/tfmg/registry/TFMGMenuTypes.java index 577fc230..84feb523 100644 --- a/src/main/java/com/drmangotea/tfmg/registry/TFMGMenuTypes.java +++ b/src/main/java/com/drmangotea/tfmg/registry/TFMGMenuTypes.java @@ -3,7 +3,6 @@ package com.drmangotea.tfmg.registry; import com.drmangotea.tfmg.TFMG; import com.drmangotea.tfmg.content.engines.engine_controller.EngineControllerMenu; import com.drmangotea.tfmg.content.engines.engine_controller.EngineControllerScreen; -import com.simibubi.create.Create; import com.tterrag.registrate.builders.MenuBuilder.ForgeMenuFactory; import com.tterrag.registrate.builders.MenuBuilder.ScreenFactory; import com.tterrag.registrate.util.entry.MenuEntry; diff --git a/src/main/java/com/drmangotea/tfmg/registry/TFMGPackets.java b/src/main/java/com/drmangotea/tfmg/registry/TFMGPackets.java index fafe91c0..6d3e11a5 100644 --- a/src/main/java/com/drmangotea/tfmg/registry/TFMGPackets.java +++ b/src/main/java/com/drmangotea/tfmg/registry/TFMGPackets.java @@ -14,7 +14,6 @@ import com.drmangotea.tfmg.content.items.weapons.quad_potato_cannon.QuadPotatoCa import com.drmangotea.tfmg.content.machinery.metallurgy.coke_oven.CokeOvenPacket; import com.drmangotea.tfmg.content.machinery.oil_processing.distillation_tower.controller.DistillationTowerPacket; import com.drmangotea.tfmg.content.machinery.vat.base.VatEvaluationPacket; -import com.simibubi.create.AllPackets; import com.simibubi.create.Create; import net.createmod.catnip.net.base.BasePacketPayload; import net.createmod.catnip.net.base.CatnipPacketRegistry; diff --git a/src/main/java/com/drmangotea/tfmg/registry/TFMGPaletteStoneTypes.java b/src/main/java/com/drmangotea/tfmg/registry/TFMGPaletteStoneTypes.java index 756e0955..571cfd41 100644 --- a/src/main/java/com/drmangotea/tfmg/registry/TFMGPaletteStoneTypes.java +++ b/src/main/java/com/drmangotea/tfmg/registry/TFMGPaletteStoneTypes.java @@ -9,7 +9,6 @@ import com.drmangotea.tfmg.base.palettes.TFMGPalettesVariantEntry; import com.simibubi.create.AllTags; import com.simibubi.create.foundation.data.CreateRegistrate; -import com.simibubi.create.foundation.utility.CreateLang; import com.tterrag.registrate.util.nullness.NonNullSupplier; import net.minecraft.core.registries.BuiltInRegistries; import net.minecraft.tags.TagKey; diff --git a/src/main/java/com/drmangotea/tfmg/registry/TFMGPartialModels.java b/src/main/java/com/drmangotea/tfmg/registry/TFMGPartialModels.java index 490f793c..ee6a1a74 100644 --- a/src/main/java/com/drmangotea/tfmg/registry/TFMGPartialModels.java +++ b/src/main/java/com/drmangotea/tfmg/registry/TFMGPartialModels.java @@ -6,7 +6,6 @@ import com.drmangotea.tfmg.base.lang.TFMGLang; import com.drmangotea.tfmg.content.decoration.pipes.TFMGPipes; import com.simibubi.create.content.fluids.FluidTransportBehaviour; -import com.simibubi.create.foundation.utility.CreateLang; import dev.engine_room.flywheel.lib.model.baked.PartialModel; import net.createmod.catnip.data.Couple; import net.createmod.catnip.data.Iterate; diff --git a/src/main/java/com/drmangotea/tfmg/registry/TFMGParticleTypes.java b/src/main/java/com/drmangotea/tfmg/registry/TFMGParticleTypes.java index eb572ba8..671106f3 100644 --- a/src/main/java/com/drmangotea/tfmg/registry/TFMGParticleTypes.java +++ b/src/main/java/com/drmangotea/tfmg/registry/TFMGParticleTypes.java @@ -6,7 +6,6 @@ import com.drmangotea.tfmg.base.lang.TFMGLang; import com.drmangotea.tfmg.base.spark.ElectricSparkParticle; import com.simibubi.create.foundation.particle.ICustomParticleData; -import com.simibubi.create.foundation.utility.CreateLang; import net.minecraft.core.particles.ParticleOptions; import net.minecraft.core.particles.ParticleType; import net.minecraft.core.registries.Registries; diff --git a/src/main/java/com/drmangotea/tfmg/registry/TFMGTags.java b/src/main/java/com/drmangotea/tfmg/registry/TFMGTags.java index 4ea4c9ea..8e45a789 100644 --- a/src/main/java/com/drmangotea/tfmg/registry/TFMGTags.java +++ b/src/main/java/com/drmangotea/tfmg/registry/TFMGTags.java @@ -4,7 +4,6 @@ package com.drmangotea.tfmg.registry; import com.drmangotea.tfmg.TFMG; import com.drmangotea.tfmg.base.lang.TFMGLang; -import net.minecraft.core.registries.BuiltInRegistries; import net.minecraft.resources.ResourceLocation; import net.minecraft.tags.BlockTags; import net.minecraft.tags.FluidTags; @@ -21,7 +20,6 @@ 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.simibubi.create.AllTags.optionalTag; public class TFMGTags { @@ -29,36 +27,41 @@ public class TFMGTags { public enum NameSpace { - MOD(TFMG.MOD_ID, false, true), + MOD(TFMG.MOD_ID, true), COMMON("c") ; public final String id; - public final boolean optionalDefault; public final boolean alwaysDatagenDefault; NameSpace(String id) { - this(id, true, false); + this(id, false); } - NameSpace(String id, boolean optionalDefault, boolean alwaysDatagenDefault) { + NameSpace(String id, boolean alwaysDatagenDefault) { this.id = id; - this.optionalDefault = optionalDefault; this.alwaysDatagenDefault = alwaysDatagenDefault; } } public enum TFMGBlockTags { - BLAST_FURNACE_WALL, - REINFORCED_BLAST_FURNACE_WALL, BLAST_FURNACE_SUPPORT, + BLAST_FURNACE_WALL, INDUSTRIAL_PIPE, - REINFORCED_BLAST_FURNACE_SUPPORT, - SURFACE_SCANNER_FINDABLE, - PUMPJACK_PART, - PUMPJACK_HEAD, + ORES_LITHIUM(COMMON, "ores/lithium"), PUMPJACK_CONNECTOR, - PUMPJACK_SMALL_PART + PUMPJACK_HEAD, + PUMPJACK_PART, + PUMPJACK_SMALL_PART, + RAW_LITHIUM(COMMON, "raw_materials/lithium"), + REINFORCED_BLAST_FURNACE_SUPPORT, + REINFORCED_BLAST_FURNACE_WALL, + STORAGE_BLOCKS_CAST_IRON(COMMON, "storage_blocks/cast_iron"), + STORAGE_BLOCKS_COAL_COKE(COMMON, "storage_blocks/coal_coke"), + STORAGE_BLOCKS_LITHIUM(COMMON, "storage_blocks/lithium"), + STORAGE_BLOCKS_PLASTIC(COMMON, "storage_blocks/plastic"), + STORAGE_BLOCKS_RAW_LITHIUM(COMMON, "storage_blocks/raw_lithium"), + SURFACE_SCANNER_FINDABLE, ; public final TagKey tag; @@ -69,20 +72,20 @@ public class TFMGTags { } TFMGBlockTags(NameSpace namespace) { - this(namespace, namespace.optionalDefault, namespace.alwaysDatagenDefault); + this(namespace, namespace.alwaysDatagenDefault); } - TFMGBlockTags(NameSpace namespace, boolean optional, boolean alwaysDatagen) { - this(namespace, null, optional, alwaysDatagen); + TFMGBlockTags(NameSpace namespace, boolean alwaysDatagen) { + this(namespace, null, alwaysDatagen); } - TFMGBlockTags(NameSpace namespace, String path, boolean optional, boolean 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); - if (optional) { - tag = optionalTag(BuiltInRegistries.BLOCK, id); - } else { - tag = BlockTags.create(id); - } + this.tag = BlockTags.create(id); this.alwaysDatagen = alwaysDatagen; } @@ -104,14 +107,33 @@ public class TFMGTags { } public enum TFMGItemTags { - - FLUX, - SPOOLS, BLAST_FURNACE_FUEL, - RODS, - IRON_PLATES(COMMON, "plates/iron"), - ALUMINUM_PLATES(COMMON, "plates/aluminum") - + DUSTS_COAL_COKE(COMMON, "dusts/coal_coke"), + DUSTS_IRON(COMMON, "dusts/iron"), + DUSTS_SALTPETER(COMMON, "dusts/saltpeter"), + DUSTS_SULFUR(COMMON, "dusts/sulfur"), + FLUX, + INGOTS_CAST_IRON(COMMON, "ingots/cast_iron"), + INGOTS_LITHIUM(COMMON, "ingots/lithium"), + INGOTS_PLASTIC(COMMON, "ingots/plastic"), + INGOTS_RUBBER(COMMON, "ingots/rubber"), + INGOTS_SILICON(COMMON, "ingots/silicon"), + NUGGETS_CAST_IRON(COMMON, "nuggets/cast_iron"), + NUGGETS_LITHIUM(COMMON, "nuggets/lithium"), + ORES_LITHIUM(COMMON, "ores/lithium"), + PLATES_CAST_IRON(COMMON, "plates/cast_iron"), + RAW_LITHIUM(COMMON, "raw_materials/lithium"), + RODS_STEEL(COMMON, "rots/steel"), + SPOOLS, + STORAGE_BLOCKS_CAST_IRON(COMMON, "storage_blocks/cast_iron"), + STORAGE_BLOCKS_COAL_COKE(COMMON, "storage_blocks/coal_coke"), + STORAGE_BLOCKS_LITHIUM(COMMON, "storage_blocks/lithium"), + STORAGE_BLOCKS_PLASTIC(COMMON, "storage_blocks/plastic"), + STORAGE_BLOCKS_RAW_LITHIUM(COMMON, "storage_blocks/raw_lithium"), + WIRES(COMMON), + WIRES_ALUMINUM(COMMON, "wires/aluminum"), + WIRES_CONSTANTAN(COMMON, "wires/constantan"), + WIRES_COPPER(COMMON, "wires/copper"), ; public final TagKey tag; @@ -122,24 +144,20 @@ public class TFMGTags { } TFMGItemTags(NameSpace namespace) { - this(namespace, namespace.optionalDefault, namespace.alwaysDatagenDefault); + this(namespace, namespace.alwaysDatagenDefault); } TFMGItemTags(NameSpace namespace, String path) { - this(namespace, path, namespace.optionalDefault, namespace.alwaysDatagenDefault); + this(namespace, path, namespace.alwaysDatagenDefault); } - TFMGItemTags(NameSpace namespace, boolean optional, boolean alwaysDatagen) { - this(namespace, null, optional, alwaysDatagen); + TFMGItemTags(NameSpace namespace, boolean alwaysDatagen) { + this(namespace, null, alwaysDatagen); } - TFMGItemTags(NameSpace namespace, String path, boolean optional, boolean alwaysDatagen) { + TFMGItemTags(NameSpace namespace, String path, boolean alwaysDatagen) { ResourceLocation id = ResourceLocation.fromNamespaceAndPath(namespace.id, path == null ? TFMGLang.asId(name()) : path); - if (optional) { - tag = optionalTag(BuiltInRegistries.ITEM, id); - } else { - tag = ItemTags.create(id); - } + this.tag = ItemTags.create(id); this.alwaysDatagen = alwaysDatagen; } @@ -188,21 +206,17 @@ public class TFMGTags { TFMGFluidTags(NameSpace namespace) { - this(namespace, namespace.optionalDefault, namespace.alwaysDatagenDefault); + this(namespace, namespace.alwaysDatagenDefault); } - TFMGFluidTags(NameSpace namespace, boolean optional, boolean alwaysDatagen) { - this(namespace, null, optional, alwaysDatagen); + TFMGFluidTags(NameSpace namespace, boolean alwaysDatagen) { + this(namespace, null, alwaysDatagen); } - TFMGFluidTags(NameSpace namespace, String path, boolean optional, boolean alwaysDatagen) { + TFMGFluidTags(NameSpace namespace, String path, boolean alwaysDatagen) { ResourceLocation id = ResourceLocation.fromNamespaceAndPath(namespace.id, path == null ? TFMGLang.asId(name()) : path); - if (optional) { - tag = optionalTag(BuiltInRegistries.FLUID, id); - } else { - tag = FluidTags.create(id); - } + this.tag = FluidTags.create(id); this.alwaysDatagen = alwaysDatagen; } diff --git a/src/main/java/com/drmangotea/tfmg/worldgen/TFMGPlacedFeatures.java b/src/main/java/com/drmangotea/tfmg/worldgen/TFMGPlacedFeatures.java index b2078f6d..6dda648b 100644 --- a/src/main/java/com/drmangotea/tfmg/worldgen/TFMGPlacedFeatures.java +++ b/src/main/java/com/drmangotea/tfmg/worldgen/TFMGPlacedFeatures.java @@ -1,14 +1,12 @@ package com.drmangotea.tfmg.worldgen; import com.drmangotea.tfmg.TFMG; -import com.simibubi.create.infrastructure.worldgen.AllConfiguredFeatures; import com.simibubi.create.infrastructure.worldgen.ConfigPlacementFilter; import net.minecraft.core.Holder; import net.minecraft.core.HolderGetter; import net.minecraft.core.registries.Registries; import net.minecraft.data.worldgen.BootstrapContext; import net.minecraft.resources.ResourceKey; -import net.minecraft.world.level.block.Blocks; import net.minecraft.world.level.levelgen.VerticalAnchor; import net.minecraft.world.level.levelgen.feature.ConfiguredFeature; import net.minecraft.world.level.levelgen.placement.*; diff --git a/src/main/java/com/drmangotea/tfmg/worldgen/deposits/OilDepositFeature.java b/src/main/java/com/drmangotea/tfmg/worldgen/deposits/OilDepositFeature.java index 5b8b9c1f..3a6fd815 100644 --- a/src/main/java/com/drmangotea/tfmg/worldgen/deposits/OilDepositFeature.java +++ b/src/main/java/com/drmangotea/tfmg/worldgen/deposits/OilDepositFeature.java @@ -7,7 +7,6 @@ import com.mojang.serialization.Codec; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; import net.minecraft.util.RandomSource; -import net.minecraft.world.level.Level; import net.minecraft.world.level.WorldGenLevel; import net.minecraft.world.level.block.state.BlockState; import net.minecraft.world.level.levelgen.feature.Feature;