updated gtcore, switced to gt core versions of a bunch of items

common/src/main/java/muramasa/gregtech/data/GregTechData.java

@@ -97,20 +97,7 @@ public static void init(Side side) {
     public static ItemFluidCell CellTin = new ItemFluidCell(GTIRef.ID, Tin, 1000);
     public static ItemFluidCell CellSteel = new ItemFluidCell(GTIRef.ID, Steel, 16000);
     public static ItemFluidCell CellTungstensteel = new ItemFluidCell(GTIRef.ID, TungstenSteel, 64000);
-
-    public static ItemBasic<?> Biochaff = new ItemBasic<>(GTIRef.ID, "biochaff");
-    public static ItemBasic<?> CarbonFibre = new ItemBasic<>(GTIRef.ID, "raw_carbon_fibre");
-    public static ItemBasic<?> CarbonMesh = new ItemBasic<>(GTIRef.ID, "carbon_mesh");
-    public static ItemBasic<?> CoalBall = new ItemBasic<>(GTIRef.ID, "coal_ball");
-    public static ItemBasic<?> CompressedCoalBall = new ItemBasic<>(GTIRef.ID, "compressed_coal_ball");
-    public static ItemBasic<?> CoalChunk = new ItemBasic<>(GTIRef.ID, "coal_chunk");
     public static ItemBasic<?> Scrap = new ItemBasic<>(GTIRef.ID, "scrap");
-    public static ItemBasic<?> DiamondSawBlade = new ItemBasic<>(GTIRef.ID, "diamond_saw_blade");
-    public static ItemBasic<?> DiamondGrindHead = new ItemBasic<>(GTIRef.ID, "diamond_grind_head");
-    public static ItemBasic<?> TungstenGrindHead = new ItemBasic<>(GTIRef.ID, "tungsten_grind_head");
-    public static ItemBasic<?> IridiumAlloyIngot = new ItemBasic<>(GTIRef.ID, "iridium_alloy_ingot").tip("Used to make Iridium Plates");
-    public static ItemBasic<?> IridiumReinforcedPlate = new ItemBasic<>(GTIRef.ID, "iridium_reinforced_plate").tip("GT2s Most Expensive Component");
-    public static ItemBasic<?> IridiumNeutronReflector = new ItemBasic<>(GTIRef.ID, "iridium_neutron_reflector").tip("Indestructible");
     public static ItemBasic<?> QuantumEye = new ItemBasic<>(GTIRef.ID, "quantum_eye").tip("Improved Ender Eye");
     public static ItemBasic<?> QuantumStar = new ItemBasic<>(GTIRef.ID, "quantum_star").tip("Improved Nether Star");
     public static ItemBasic<?> GraviStar = new ItemBasic<>(GTIRef.ID, "gravi_star").tip("Ultimate Nether Star");
@@ -230,43 +217,6 @@ public static void init(Side side) {
     public static ItemBasic<?> SOC = new ItemBasic<>(GTIRef.ID, "soc", "silicon/");
 
     public static ItemBasic<?> BatteryTantalum = new ItemBattery(GTIRef.ID, "tantalum_capacitor", Tier.ULV, 10000, true).tip("Reusable");
-
-    public static ItemBasic<?> EmptyShape = new ItemBasic<>(GTIRef.ID, "empty_shape_plate", "molds/").tip("Raw plate to make Molds and Extruder Shapes");
-    public static ItemBasic<?> MoldPlate = new ItemBasic<>(GTIRef.ID, "mold_plate", "molds/").tip("Mold for making Plates");
-    public static ItemBasic<?> MoldCasing = new ItemBasic<>(GTIRef.ID, "mold_casing", "molds/").tip("Mold for making Item Casings");
-    public static ItemBasic<?> MoldGear = new ItemBasic<>(GTIRef.ID, "mold_gear", "molds/").tip("Mold for making Gears");
-    public static ItemBasic<?> MoldGearSmall = new ItemBasic<>(GTIRef.ID, "mold_small_gear", "molds/").tip("Mold for making Small Gears");
-    public static ItemBasic<?> MoldCoinage = new ItemBasic<>(GTIRef.ID, "mold_coinage", "molds/").tip("Secure Mold for making Coins (Don't lose it!)");
-    public static ItemBasic<?> MoldBottle = new ItemBasic<>(GTIRef.ID, "mold_bottle", "molds/").tip("Mold for making Bottles");
-    public static ItemBasic<?> MoldIngot = new ItemBasic<>(GTIRef.ID, "mold_ingot", "molds/").tip("Mold for making Ingots");
-    public static ItemBasic<?> MoldBall = new ItemBasic<>(GTIRef.ID, "mold_ball", "molds/").tip("Mold for making Balls");
-    public static ItemBasic<?> MoldBlock = new ItemBasic<>(GTIRef.ID, "mold_block", "molds/").tip("Mold for making Blocks");
-    public static ItemBasic<?> MoldNugget = new ItemBasic<>(GTIRef.ID, "mold_nugget", "molds/").tip("Mold for making Nuggets");
-    public static ItemBasic<?> MoldAnvil = new ItemBasic<>(GTIRef.ID, "mold_anvil", "molds/").tip("Mold for making Anvils");
-    public static ItemBasic<?> ShapePlate = new ItemBasic<>(GTIRef.ID, "shape_plate", "molds/").tip("Shape for making Plates");
-    public static ItemBasic<?> ShapeCasing = new ItemBasic<>(GTIRef.ID, "shape_casing", "molds/").tip("Shape for making Item Casings");
-    public static ItemBasic<?> ShapeRod = new ItemBasic<>(GTIRef.ID, "shape_rod", "molds/").tip("Shape for making Rods");
-    public static ItemBasic<?> ShapeBolt = new ItemBasic<>(GTIRef.ID, "shape_bolt", "molds/").tip("Shape for making Bolts");
-    public static ItemBasic<?> ShapeRing = new ItemBasic<>(GTIRef.ID, "shape_ring", "molds/").tip("Shape for making Rings");
-    public static ItemBasic<?> ShapeCell = new ItemBasic<>(GTIRef.ID, "shape_cell", "molds/").tip("Shape for making Cells");
-    public static ItemBasic<?> ShapeIngot = new ItemBasic<>(GTIRef.ID, "shape_ingot", "molds/").tip("Shape for making Ingots");
-    public static ItemBasic<?> ShapeWire = new ItemBasic<>(GTIRef.ID, "shape_wire", "molds/").tip("Shape for making Wires");
-    public static ItemBasic<?> ShapePipeTiny = new ItemBasic<>(GTIRef.ID, "shape_pipe_tiny", "molds/").tip("Shape for making Tiny Pipes");
-    public static ItemBasic<?> ShapePipeSmall = new ItemBasic<>(GTIRef.ID, "shape_pipe_small", "molds/").tip("Shape for making Small Pipes");
-    public static ItemBasic<?> ShapePipeNormal = new ItemBasic<>(GTIRef.ID, "shape_pipe_normal", "molds/").tip("Shape for making Normal Pipes");
-    public static ItemBasic<?> ShapePipeLarge = new ItemBasic<>(GTIRef.ID, "shape_pipe_large", "molds/").tip("Shape for making Large Pipes");
-    public static ItemBasic<?> ShapePipeHuge = new ItemBasic<>(GTIRef.ID, "shape_pipe_huge", "molds/").tip("Shape for making Huge Pipes");
-    public static ItemBasic<?> ShapeBlock = new ItemBasic<>(GTIRef.ID, "shape_block", "molds/").tip("Shape for making Blocks");
-    public static ItemBasic<?> ShapeHeadSword = new ItemBasic<>(GTIRef.ID, "shape_head_sword", "molds/").tip("Shape for making Sword Blades");
-    public static ItemBasic<?> ShapeHeadPickaxe = new ItemBasic<>(GTIRef.ID, "shape_head_pickaxe", "molds/").tip("Shape for making Pickaxe Heads");
-    public static ItemBasic<?> ShapeHeadShovel = new ItemBasic<>(GTIRef.ID, "shape_head_shovel", "molds/").tip("Shape for making Shovel Heads");
-    public static ItemBasic<?> ShapeHeadAxe = new ItemBasic<>(GTIRef.ID, "shape_head_axe", "molds/").tip("Shape for making Axe Heads");
-    public static ItemBasic<?> ShapeHeadHoe = new ItemBasic<>(GTIRef.ID, "shape_head_hoe", "molds/").tip("Shape for making Hoe Heads");
-    public static ItemBasic<?> ShapeHeadHammer = new ItemBasic<>(GTIRef.ID, "shape_head_hammer", "molds/").tip("Shape for making Hammer Heads");
-    public static ItemBasic<?> ShapeHeadFile = new ItemBasic<>(GTIRef.ID, "shape_head_file", "molds/").tip("Shape for making File Heads");
-    public static ItemBasic<?> ShapeHeadSaw = new ItemBasic<>(GTIRef.ID, "shape_head_saw", "molds/").tip("Shape for making Saw Heads");
-    public static ItemBasic<?> ShapeGear = new ItemBasic<>(GTIRef.ID, "shape_gear", "molds/").tip("Shape for making Gears");
-    public static ItemBasic<?> ShapeGearSmall = new ItemBasic<>(GTIRef.ID, "shape_gear_small", "molds/").tip("Shape for making Small Gears");
     public static ItemBasic<?> NuclearWaste = new ItemBasic<>(GTIRef.ID, "nuclear_waste").tip("Common Waste extracted from depleted Fuel");
     public static ItemBasic<?> AlkalineWaste = new ItemBasic<>(GTIRef.ID, "alkaline_waste").tip("Waste containing alkaline metals");
     public static ItemBasic<?> NonmetalWaste = new ItemBasic<>(GTIRef.ID, "nonmetal_waste").tip("Waste containing non-metal substances");

common/src/main/java/muramasa/gregtech/loader/crafting/Parts.java

@@ -29,7 +29,7 @@
 import java.util.function.Consumer;
 
 import static com.google.common.collect.ImmutableMap.of;
-import static io.github.gregtechintergalactical.gtcore.data.GTCoreItems.CircuitBasic;
+import static io.github.gregtechintergalactical.gtcore.data.GTCoreItems.*;
 import static io.github.gregtechintergalactical.gtcore.data.GTCoreTags.PLATES_IRON_ALUMINIUM;
 import static muramasa.antimatter.data.AntimatterMaterials.*;
 import static muramasa.antimatter.data.AntimatterMaterialTypes.*;

common/src/main/java/muramasa/gregtech/loader/machines/AlloyLoader.java

@@ -1,5 +1,6 @@
 package muramasa.gregtech.loader.machines;
 
+import io.github.gregtechintergalactical.gtcore.data.GTCoreItems;
 import muramasa.antimatter.material.Material;
 import muramasa.antimatter.material.MaterialStack;
 import muramasa.antimatter.material.MaterialTags;
@@ -45,32 +46,32 @@ public static void init() {
                 .io(INGOT.get(Rubber, 1)).add("rubber_via_alloy_smelter",20, 10);
         PLATE.all().stream().filter(m -> !m.has(GregTechMaterialTags.NEEDS_BLAST_FURNACE) && m.has(INGOT)).forEach(m ->{
             int euPerTick = m.has(RUBBERTOOLS) ? 8 : 32;
-            ALLOY_SMELTING.RB().ii(INGOT.getMaterialIngredient(m, 2), RecipeIngredient.of(GregTechData.MoldPlate, 1).setNoConsume()).io(PLATE.get(m, 1)).add(m.getId() + "_plate", m.getMass() * 2, euPerTick);
+            ALLOY_SMELTING.RB().ii(INGOT.getMaterialIngredient(m, 2), RecipeIngredient.of(GTCoreItems.MoldPlate, 1).setNoConsume()).io(PLATE.get(m, 1)).add(m.getId() + "_plate", m.getMass() * 2, euPerTick);
             if (m.has(RUBBERTOOLS)) {
-                ALLOY_SMELTING.RB().ii(DUST.getMaterialIngredient(m, 2), RecipeIngredient.of(GregTechData.MoldPlate, 1).setNoConsume()).io(PLATE.get(m, 1)).add(m.getId() + "_plate_from_dust", m.getMass() * 2, euPerTick);
+                ALLOY_SMELTING.RB().ii(DUST.getMaterialIngredient(m, 2), RecipeIngredient.of(GTCoreItems.MoldPlate, 1).setNoConsume()).io(PLATE.get(m, 1)).add(m.getId() + "_plate_from_dust", m.getMass() * 2, euPerTick);
             }
         });
         INGOT.all().stream().filter(m -> !m.has(GregTechMaterialTags.NEEDS_BLAST_FURNACE)).forEach(m -> { //TODO other ingot recipes
             if (m.has(NUGGET)){
-                ALLOY_SMELTING.RB().ii(NUGGET.getMaterialIngredient(m, 9), RecipeIngredient.of(GregTechData.MoldIngot, 1).setNoConsume()).io(INGOT.get(m, 1)).add(m.getId() + "_ingot_from_nugget", 200, 2);
+                ALLOY_SMELTING.RB().ii(NUGGET.getMaterialIngredient(m, 9), RecipeIngredient.of(GTCoreItems.MoldIngot, 1).setNoConsume()).io(INGOT.get(m, 1)).add(m.getId() + "_ingot_from_nugget", 200, 2);
             }
             if (m.has(RUBBERTOOLS)) {
-                ALLOY_SMELTING.RB().ii(DUST.getMaterialIngredient(m, 1), RecipeIngredient.of(GregTechData.MoldIngot, 1).setNoConsume()).io(INGOT.get(m, 1)).add(m.getId() + "_ingot_from_dust", m.getMass(), 10);
+                ALLOY_SMELTING.RB().ii(DUST.getMaterialIngredient(m, 1), RecipeIngredient.of(GTCoreItems.MoldIngot, 1).setNoConsume()).io(INGOT.get(m, 1)).add(m.getId() + "_ingot_from_dust", m.getMass(), 10);
             }
         });
         ITEM_CASING.all().forEach(m -> {
-            ALLOY_SMELTING.RB().ii(INGOT.getMaterialIngredient(m, 2), of(GregTechData.MoldCasing, 1).setNoConsume()).io(ITEM_CASING.get(m, 3)).add(m.getId() + "_item_casing", Math.max(m.getMass() * 2 / 3, 1), 16);
+            ALLOY_SMELTING.RB().ii(INGOT.getMaterialIngredient(m, 2), of(GTCoreItems.MoldCasing, 1).setNoConsume()).io(ITEM_CASING.get(m, 3)).add(m.getId() + "_item_casing", Math.max(m.getMass() * 2 / 3, 1), 16);
         });
         GEAR.all().stream().filter(m -> !m.has(GregTechMaterialTags.NEEDS_BLAST_FURNACE) && m.has(INGOT)).forEach(m ->{
             int euPerTick = m.has(RUBBERTOOLS) ? 8 : 32;
-            ALLOY_SMELTING.RB().ii(INGOT.getMaterialIngredient(m, 8), RecipeIngredient.of(GregTechData.MoldGear, 1).setNoConsume()).io(GEAR.get(m, 1)).add(m.getId() + "_gear", m.getMass() * 8, euPerTick);
+            ALLOY_SMELTING.RB().ii(INGOT.getMaterialIngredient(m, 8), RecipeIngredient.of(GTCoreItems.MoldGear, 1).setNoConsume()).io(GEAR.get(m, 1)).add(m.getId() + "_gear", m.getMass() * 8, euPerTick);
             if (m.has(RUBBERTOOLS)) {
-                ALLOY_SMELTING.RB().ii(DUST.getMaterialIngredient(m, 8), RecipeIngredient.of(GregTechData.MoldGear, 1).setNoConsume()).io(GEAR.get(m, 1)).add(m.getId() + "_gear_from_dust", m.getMass() * 8, euPerTick);
+                ALLOY_SMELTING.RB().ii(DUST.getMaterialIngredient(m, 8), RecipeIngredient.of(GTCoreItems.MoldGear, 1).setNoConsume()).io(GEAR.get(m, 1)).add(m.getId() + "_gear_from_dust", m.getMass() * 8, euPerTick);
             }
         });
-        ALLOY_SMELTING.RB().ii(DUST.getMaterialIngredient(Glass, 1), RecipeIngredient.of(GregTechData.MoldBall, 1).setNoConsume()).io(GregTechData.GlassTube).add("glass_tube", 160, 8);
-        ALLOY_SMELTING.RB().ii(DUST.getMaterialIngredient(Glass, 1), RecipeIngredient.of(GregTechData.MoldBottle, 1).setNoConsume()).io(Items.GLASS_BOTTLE).add("glass_bottle", 64, 4);
-        ALLOY_SMELTING.RB().ii(INGOT.getMaterialIngredient(Iron, 31), RecipeIngredient.of(GregTechData.MoldAnvil, 1).setNoConsume()).io(Items.ANVIL).add("anvil", 512, 64);
+        ALLOY_SMELTING.RB().ii(DUST.getMaterialIngredient(Glass, 1), RecipeIngredient.of(GTCoreItems.MoldBall, 1).setNoConsume()).io(GregTechData.GlassTube).add("glass_tube", 160, 8);
+        ALLOY_SMELTING.RB().ii(DUST.getMaterialIngredient(Glass, 1), RecipeIngredient.of(GTCoreItems.MoldBottle, 1).setNoConsume()).io(Items.GLASS_BOTTLE).add("glass_bottle", 64, 4);
+        ALLOY_SMELTING.RB().ii(INGOT.getMaterialIngredient(Iron, 31), RecipeIngredient.of(GTCoreItems.MoldAnvil, 1).setNoConsume()).io(Items.ANVIL).add("anvil", 512, 64);
 
         //Fissile Fuels
         FISSILE_FUEL.all().forEach(f -> ALLOY_SMELTING.RB().ii(of(INGOT.get(f), 1), of(INGOT.get(f))).io(FISSILE_FUEL.get(f)).add(f.getId() + "_fissile_fuel_smelting"));

common/src/main/java/muramasa/gregtech/loader/machines/AssemblyLoader.java

@@ -27,6 +27,8 @@
 
 import java.util.Arrays;
 
+import static io.github.gregtechintergalactical.gtcore.data.GTCoreItems.CarbonFibre;
+import static io.github.gregtechintergalactical.gtcore.data.GTCoreItems.CarbonMesh;
 import static io.github.gregtechintergalactical.gtcore.data.GTCoreTags.*;
 import static muramasa.antimatter.Ref.L;
 import static muramasa.antimatter.data.AntimatterMaterials.*;

common/src/main/java/muramasa/gregtech/loader/machines/Autoclave.java

@@ -1,5 +1,6 @@
 package muramasa.gregtech.loader.machines;
 
+import io.github.gregtechintergalactical.gtcore.data.GTCoreItems;
 import muramasa.gregtech.data.GregTechData;
 import muramasa.gregtech.data.GregTechMaterialTags;
 import muramasa.gregtech.data.Materials;
@@ -31,9 +32,9 @@ public static void init() {
         });
         AUTOCLAVING.RB().ii(DUST.getMaterialIngredient(Bauxite, 2), DUST.getMaterialIngredient(SodiumHydroxide, 3)).fi(DistilledWater.getLiquid(1000)).io(DUST.get(SodiumAluminate, 4), DUST_TINY.get(Ilmenite, 1), DUST_TINY.get(Rutile, 1)).chances(1.0, 0.25, 0.5).add("bauxite_distilled_water", 1500, 16);
         AUTOCLAVING.RB().ii(DUST.getMaterialIngredient(Bauxite, 2), DUST.getMaterialIngredient(SodiumHydroxide, 3)).fi(Water.getLiquid(1000)).io(DUST.get(SodiumAluminate, 4), DUST_TINY.get(Ilmenite, 1), DUST_TINY.get(Rutile, 1)).chances(1.0, 0.25, 0.5).add("bauxite", 3000, 16);
-        AUTOCLAVING.RB().ii(DUST.getMaterialIngredient(Materials.Carbon, 4)).fi(Materials.Platinum.getLiquid(1)).io(new ItemStack(GregTechData.CarbonFibre, 2)).add("carbon_fibre", 150, 5);
-        AUTOCLAVING.RB().ii(DUST.getMaterialIngredient(Materials.Carbon, 4)).fi(Materials.Lutetium.getLiquid(1)).io(new ItemStack(GregTechData.CarbonFibre, 2)).add("carbon_fibre_1", 150, 5);
-        AUTOCLAVING.RB().ii(DUST.getMaterialIngredient(Materials.Carbon, 4)).fi(Materials.Palladium.getLiquid(1)).io(new ItemStack(GregTechData.CarbonFibre, 2)).add("carbon_fibre_2", 150, 5);
+        AUTOCLAVING.RB().ii(DUST.getMaterialIngredient(Materials.Carbon, 4)).fi(Materials.Platinum.getLiquid(1)).io(new ItemStack(GTCoreItems.CarbonFibre, 2)).add("carbon_fibre", 150, 5);
+        AUTOCLAVING.RB().ii(DUST.getMaterialIngredient(Materials.Carbon, 4)).fi(Materials.Lutetium.getLiquid(1)).io(new ItemStack(GTCoreItems.CarbonFibre, 2)).add("carbon_fibre_1", 150, 5);
+        AUTOCLAVING.RB().ii(DUST.getMaterialIngredient(Materials.Carbon, 4)).fi(Materials.Palladium.getLiquid(1)).io(new ItemStack(GTCoreItems.CarbonFibre, 2)).add("carbon_fibre_2", 150, 5);
         AUTOCLAVING.RB().ii(DUST.getMaterialIngredient(Energium, 9)).fi(DistilledWater.getLiquid(1000)).io(EnergyCrystal).add("energy_crystal_distilled_water", 250, 256);
         AUTOCLAVING.RB().ii(DUST.getMaterialIngredient(Energium, 9)).fi(Water.getLiquid(1000)).io(EnergyCrystal).add("energy_crystal", 500, 256);
         AUTOCLAVING.RB().ii(of(Items.NETHER_STAR)).fi(Neutronium.getLiquid(L * 2)).io(GregTechData.GraviStar).add("gravistar", 480, 7680);

common/src/main/java/muramasa/gregtech/loader/machines/CompressorLoader.java

@@ -12,6 +12,7 @@
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.item.Items;
 
+import static io.github.gregtechintergalactical.gtcore.data.GTCoreItems.*;
 import static muramasa.antimatter.data.AntimatterMaterialTypes.DUST;
 import static muramasa.antimatter.data.AntimatterMaterialTypes.GEM;
 import static muramasa.antimatter.data.AntimatterMaterials.Diamond;