Merge pull request #279 from Frizi/create-6.0.7

Create 6.0.7 support

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}")
 }

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
+jei_version = 19.25.0.322
-create_version = 6.0.6-98
+create_version = 6.0.7-159
-ponder_version = 1.0.56
+ponder_version = 1.0.63
-flywheel_version = 1.0.4
+flywheel_version = 1.0.5
 registrate_version = MC1.21-1.3.0+62
 
 mod_id=tfmg

src/generated/resources/data/c/tags/item/dusts.json

@@ -2,8 +2,6 @@
   "values": [
     "tfmg:sulfur_dust",
     "tfmg:nitrate_dust",
-    "tfmg:rubber_sheet",
-    "tfmg:silicon_ingot",
     "tfmg:coal_coke_dust"
   ]
 }

src/generated/resources/data/c/tags/item/ingots.json

@@ -0,0 +1,12 @@
+{
+  "values": [
+    "tfmg:steel_ingot",
+    "tfmg:cast_iron_ingot",
+    "tfmg:aluminum_ingot",
+    "tfmg:plastic_sheet",
+    "tfmg:lead_ingot",
+    "tfmg:nickel_ingot",
+    "tfmg:constantan_ingot",
+    "tfmg:lithium_ingot"
+  ]
+}

src/generated/resources/data/c/tags/item/leather.json

@@ -1,5 +0,0 @@
-{
-  "values": [
-    "tfmg:synthetic_leather"
-  ]
-}

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"
   ]
 }

src/generated/resources/data/c/tags/item/rods.json

@@ -1,5 +1,6 @@
 {
   "values": [
+    "tfmg:rebar",
     "minecraft:stick"
   ]
 }

src/generated/resources/data/c/tags/item/string.json

@@ -1,5 +0,0 @@
-{
-  "values": [
-    "tfmg:synthetic_string"
-  ]
-}

src/generated/resources/data/create/tags/item/create_ingots.json

@@ -7,6 +7,7 @@
     "tfmg:lead_ingot",
     "tfmg:nickel_ingot",
     "tfmg:constantan_ingot",
-    "tfmg:lithium_ingot"
+    "tfmg:lithium_ingot",
+    "tfmg:silicon_ingot"
   ]
 }

src/generated/resources/data/tfmg/recipe/casting/cinderblock.json

@@ -2,7 +2,7 @@
   "type": "tfmg:casting",
   "ingredients": [
     {
-      "type": "fluid_stack",
+      "type": "neoforge:single",
       "amount": 144,
       "fluid": "tfmg:liquid_concrete"
     }

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"
     }

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"
     }

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"
     }

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"
     }

src/generated/resources/data/tfmg/recipe/compacting/bitumen.json

@@ -3,7 +3,7 @@
   "heat_requirement": "heated",
   "ingredients": [
     {
-      "type": "fluid_stack",
+      "type": "neoforge:single",
       "amount": 1000,
       "fluid": "tfmg:heavy_oil"
     }

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"

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"

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"
     }

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"
     }

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"
     }

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"
     }

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"
     }

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"
     }

src/generated/resources/data/tfmg/recipe/filling/air_tank.json

@@ -5,7 +5,7 @@
       "item": "minecraft:bucket"
     },
     {
-      "type": "fluid_stack",
+      "type": "neoforge:single",
       "amount": 1000,
       "fluid": "tfmg:air"
     }

src/generated/resources/data/tfmg/recipe/filling/carbon_dioxide_tank.json

@@ -5,7 +5,7 @@
       "item": "minecraft:bucket"
     },
     {
-      "type": "fluid_stack",
+      "type": "neoforge:single",
       "amount": 1000,
       "fluid": "tfmg:carbon_dioxide"
     }

src/generated/resources/data/tfmg/recipe/filling/ethylene_tank.json

@@ -5,7 +5,7 @@
       "item": "minecraft:bucket"
     },
     {
-      "type": "fluid_stack",
+      "type": "neoforge:single",
       "amount": 1000,
       "fluid": "tfmg:ethylene"
     }

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"
     }

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"
     }

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"
     }

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"
     }

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"
     }

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"
     }

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"
     }

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"
     }

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"
     }

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,

src/generated/resources/data/tfmg/recipe/mixing/cooling_fluid.json

@@ -2,12 +2,12 @@
   "type": "create:mixing",
   "ingredients": [
     {
-      "type": "fluid_stack",
+      "type": "neoforge:single",
       "amount": 250,
       "fluid": "minecraft:water"
     },
     {
-      "type": "fluid_stack",
+      "type": "neoforge:single",
       "amount": 1000,
       "fluid": "tfmg:ethylene"
     }

src/generated/resources/data/tfmg/recipe/mixing/copper_sulfate.json

@@ -5,7 +5,7 @@
       "item": "minecraft:copper_ingot"
     },
     {
-      "type": "fluid_stack",
+      "type": "neoforge:single",
       "amount": 500,
       "fluid": "tfmg:sulfuric_acid"
     }

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"
     }

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"
     }

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"
     }

src/generated/resources/data/tfmg/recipe/sequenced_assembly/capacitor.json

@@ -3,7 +3,6 @@
   "ingredient": {
     "tag": "c:plates/steel"
   },
-  "loops": 1,
   "results": [
     {
       "count": 4,

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"

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"
         }

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,

src/generated/resources/data/tfmg/recipe/vat_machine_recipe/concrete.json

@@ -15,7 +15,7 @@
       "item": "tfmg:limesand"
     },
     {
-      "type": "fluid_stack",
+      "type": "neoforge:single",
       "amount": 250,
       "fluid": "minecraft:water"
     }

src/generated/resources/data/tfmg/recipe/vat_machine_recipe/etched_circuit_board.json

@@ -5,7 +5,7 @@
       "item": "tfmg:coated_circuit_board"
     },
     {
-      "type": "fluid_stack",
+      "type": "neoforge:single",
       "amount": 250,
       "fluid": "tfmg:sulfuric_acid"
     }

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"
     }

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"
     }

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"
     }

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"
     }

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"
     }

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"
     }

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 {
 

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<Registry<CableType>> CABLE_TYPE = createRegistryKey("cable_types");
     public static final ResourceKey<Registry<Electrode>> ELECTRODE = createRegistryKey("electrodes");

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;

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<TrussBlock> 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())
+                .initialProperties(blockEntry::get)
-                .properties(p -> p.requiresCorrectToolForDrops())
+                .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();

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) {

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,28 +23,16 @@ public class TFMGRegistrateTags {
     private static void genItemTags(RegistrateTagsProvider<Item> provIn) {
         TagGen.CreateTagsProvider<Item> 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()) {
-            if (tag.alwaysDatagen) {
-                prov.getOrCreateRawBuilder(tag.tag);
-            }
-        }
     }
     private static void genBlockTags(RegistrateTagsProvider<Block> provIn) {
         TagGen.CreateTagsProvider<Block> prov = new TagGen.CreateTagsProvider<>(provIn, Block::builtInRegistryHolder);
 
-
         prov.tag(TFMGTags.TFMGBlockTags.PUMPJACK_HEAD.tag)
                 .add(Blocks.IRON_BLOCK);
+
         prov.tag(TFMGTags.TFMGBlockTags.PUMPJACK_PART.tag)
                 .addTag(TFMGTags.TFMGBlockTags.PUMPJACK_SMALL_PART.tag);
-
-        for (TFMGTags.TFMGBlockTags tag : TFMGTags.TFMGBlockTags.values()) {
-            if (tag.alwaysDatagen) {
-                prov.getOrCreateRawBuilder(tag.tag);
-            }
-        }
     }
 }

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)

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;

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;

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.foundation.data.recipe.CommonMetal;
-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 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"))),
+    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(AllTags.commonItemTag("ingots/aluminum"))),
+    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(AllTags.commonItemTag("ingots/lead")));
+    LEAD(TFMG.asResource("lead").toString(),32, 2, 0.5f, 5,()-> Ingredient.of(CommonMetal.LEAD.ingots));
 
 
     public final String name;

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;

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 {
 

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) {

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) {

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

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 {

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);

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;
 

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;

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(

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;

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;

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;

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;

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;

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;

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;

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;

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<ModConfig.Type, ConfigBase> CONFIGS = new EnumMap<>(ModConfig.Type.class);

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;

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;

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_) {

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 {
 

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;

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;

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;

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;

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<SlidingDoorBlockEntity> {
 

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;
 

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;

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<FluidValveBlockEntity>, ProperWaterloggedBlock {
 

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 {
 

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;

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;

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;