diff --git a/common/src/main/java/muramasa/gregtech/GTRemapping.java b/common/src/main/java/muramasa/gregtech/GTRemapping.java index b30315a4c..2bf615e73 100644 --- a/common/src/main/java/muramasa/gregtech/GTRemapping.java +++ b/common/src/main/java/muramasa/gregtech/GTRemapping.java @@ -1,5 +1,6 @@ package muramasa.gregtech; +import io.github.gregtechintergalactical.gtcore.GTCore; import it.unimi.dsi.fastutil.objects.Object2ObjectArrayMap; import muramasa.antimatter.AntimatterRemapping; import net.minecraft.resources.ResourceLocation; @@ -46,24 +47,24 @@ public static void init(){ remap("circuit_wetware", "wetware_circuit"); remap("vacuumtube", "vacuum_tube"); remap("adv_circuit_parts", "advanced_circuit_parts"); - remap("battery_hull_small", "small_battery_hull"); - remap("battery_hull_medium", "medium_battery_hull"); - remap("battery_hull_large", "large_battery_hull"); - remap("battery_small_mercury", "small_mercury_battery"); - remap("battery_small_acid", "small_acid_battery"); - remap("battery_small_cadmium", "small_cadmium_battery"); - remap("battery_small_lithium", "small_lithium_battery"); - remap("battery_small_sodium", "small_sodium_battery"); - remap("battery_medium_mercury", "medium_mercury_battery"); - remap("battery_medium_acid", "medium_acid_battery"); - remap("battery_medium_cadmium", "medium_cadmium_battery"); - remap("battery_medium_lithium", "medium_lithium_battery"); - remap("battery_medium_sodium", "medium_sodium_battery"); - remap("battery_large_mercury", "large_mercury_battery"); - remap("battery_large_acid", "large_acid_battery"); - remap("battery_large_cadmium", "large_cadmium_battery"); - remap("battery_large_lithium", "large_lithium_battery"); - remap("battery_large_sodium", "large_sodium_battery"); + remapGTCore("battery_hull_small", "small_battery_hull"); + remapGTCore("battery_hull_medium", "medium_battery_hull"); + remapGTCore("battery_hull_large", "large_battery_hull"); + remapGTCore("battery_small_mercury", "small_mercury_battery"); + remapGTCore("battery_small_acid", "small_acid_battery"); + remapGTCore("battery_small_cadmium", "small_cadmium_battery"); + remapGTCore("battery_small_lithium", "small_lithium_battery"); + remapGTCore("battery_small_sodium", "small_sodium_battery"); + remapGTCore("battery_medium_mercury", "medium_mercury_battery"); + remapGTCore("battery_medium_acid", "medium_acid_battery"); + remapGTCore("battery_medium_cadmium", "medium_cadmium_battery"); + remapGTCore("battery_medium_lithium", "medium_lithium_battery"); + remapGTCore("battery_medium_sodium", "medium_sodium_battery"); + remapGTCore("battery_large_mercury", "large_mercury_battery"); + remapGTCore("battery_large_acid", "large_acid_battery"); + remapGTCore("battery_large_cadmium", "large_cadmium_battery"); + remapGTCore("battery_large_lithium", "large_lithium_battery"); + remapGTCore("battery_large_sodium", "large_sodium_battery"); remap("coil_cupronickel", "cupronickel_coil"); remap("coil_kanthal", "kanthal_coil"); remap("coil_nichrome", "nichrome_coil"); @@ -108,6 +109,10 @@ private static void remap(String oldId, String newId){ AntimatterRemapping.remap(GTIRef.ID, oldId, newId); } + private static void remapGTCore(String oldId, String newId){ + AntimatterRemapping.remap(new ResourceLocation(GTIRef.ID, oldId), new ResourceLocation(GTCore.ID, newId)); + } + public static Map getRemappingMap() { return REMAPPING_MAP; } diff --git a/common/src/main/java/muramasa/gregtech/data/GregTechData.java b/common/src/main/java/muramasa/gregtech/data/GregTechData.java index 394542bc5..b3dd99abc 100644 --- a/common/src/main/java/muramasa/gregtech/data/GregTechData.java +++ b/common/src/main/java/muramasa/gregtech/data/GregTechData.java @@ -245,29 +245,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 BatteryHullSmall = new ItemBasic<>(GTIRef.ID, "small_battery_hull").tip("An empty LV Battery Hull"); - public static ItemBasic BatteryHullMedium = new ItemBasic<>(GTIRef.ID, "medium_battery_hull").tip("An empty MV Battery Hull"); - public static ItemBasic BatteryHullLarge = new ItemBasic<>(GTIRef.ID, "large_battery_hull").tip("An empty HV Battery Hull"); - public static ItemBasic BatteryRE = new ItemMultiTextureBattery(GTIRef.ID, "re_battery", Tier.LV, 10000, true).tip("Reusable Battery"); - public static ItemBasic BatterySmallAcid = new ItemMultiTextureBattery(GTIRef.ID, "small_acid_battery", Tier.LV, 18000, false).tip("Single Use"); - public static ItemBasic BatterySmallMercury = new ItemMultiTextureBattery(GTIRef.ID, "small_mercury_battery", Tier.LV, 32000, false).tip("Single Use"); - public static ItemBasic BatterySmallCadmium = new ItemMultiTextureBattery(GTIRef.ID, "small_cadmium_battery", Tier.LV,75000, 2, true).tip("Reusable"); - public static ItemBasic BatterySmallLithium = new ItemMultiTextureBattery(GTIRef.ID, "small_lithium_battery", Tier.LV, 100000, true).tip("Reusable"); - public static ItemBasic BatterySmallSodium = new ItemMultiTextureBattery(GTIRef.ID, "small_sodium_battery", Tier.LV, 50000, true).tip("Reusable"); - public static ItemBasic BatteryMediumAcid = new ItemMultiTextureBattery(GTIRef.ID, "medium_acid_battery", Tier.MV, 72000, false).tip("Single Use"); - public static ItemBasic BatteryMediumMercury = new ItemMultiTextureBattery(GTIRef.ID, "medium_mercury_battery", Tier.MV, 128000, false).tip("Single Use"); - public static ItemBasic BatteryMediumCadmium = new ItemMultiTextureBattery(GTIRef.ID, "medium_cadmium_battery", Tier.MV, 300000, 2, true).tip("Reusable"); - public static ItemBasic BatteryMediumLithium = new ItemMultiTextureBattery(GTIRef.ID, "medium_lithium_battery", Tier.MV, 400000, true).tip("Reusable"); - public static ItemBasic BatteryMediumSodium = new ItemMultiTextureBattery(GTIRef.ID, "medium_sodium_battery", Tier.MV,200000, true).tip("Reusable"); - public static ItemBasic BatteryLargeAcid = new ItemMultiTextureBattery(GTIRef.ID, "large_acid_battery", Tier.HV, 288000, false).tip("Single Use"); - public static ItemBasic BatteryLargeMercury = new ItemMultiTextureBattery(GTIRef.ID, "large_mercury_battery", Tier.HV, 512000, false).tip("Single Use"); - public static ItemBasic BatteryLargeCadmium = new ItemMultiTextureBattery(GTIRef.ID, "large_cadmium_battery", Tier.HV, 1200000, 2, true).tip("Reusable"); - public static ItemBasic BatteryLargeLithium = new ItemMultiTextureBattery(GTIRef.ID, "large_lithium_battery", Tier.HV, 1600000, true).tip("Reusable"); - public static ItemBasic BatteryLargeSodium = new ItemMultiTextureBattery(GTIRef.ID, "large_sodium_battery", Tier.HV, 800000, true).tip("Reusable"); - public static ItemBasic LapotronCrystal = new ItemMultiTextureBattery(GTIRef.ID, "lapotron_crystal", Tier.EV, 10000000, true); - public static ItemBasic EnergyCrystal = new ItemMultiTextureBattery(GTIRef.ID, "energy_crystal", Tier.HV, 1000000, true); - public static ItemBasic BatteryEnergyOrb = new ItemBasic<>(GTIRef.ID, "battery_energy_orb"); - public static ItemBasic BatteryEnergyOrbCluster = new ItemBasic<>(GTIRef.ID, "battery_energy_orb_cluster"); 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"); diff --git a/common/src/main/java/muramasa/gregtech/datagen/GregTechItemTagProvider.java b/common/src/main/java/muramasa/gregtech/datagen/GregTechItemTagProvider.java index 89dc35a25..52bb06c9f 100644 --- a/common/src/main/java/muramasa/gregtech/datagen/GregTechItemTagProvider.java +++ b/common/src/main/java/muramasa/gregtech/datagen/GregTechItemTagProvider.java @@ -1,5 +1,6 @@ package muramasa.gregtech.datagen; +import io.github.gregtechintergalactical.gtcore.data.GTCoreTags; import muramasa.antimatter.datagen.providers.AntimatterBlockTagProvider; import muramasa.antimatter.datagen.providers.AntimatterItemTagProvider; import muramasa.antimatter.util.TagUtils; @@ -27,10 +28,6 @@ protected void processTags(String domain) { this.tag(CIRCUITS_ELITE).add(CircuitDataControl, NanoProcessor); this.tag(GregTechTags.CIRCUITS_MASTER).add(CircuitEnergyFlow, QuantumProcessor); this.tag(CIRCUITS_DATA_ORB).add(DataOrb); - this.tag(BATTERIES_RE).add(BatteryRE); - this.tag(BATTERIES_SMALL).add(BatterySmallSodium, BatterySmallCadmium, BatterySmallLithium); - this.tag(BATTERIES_MEDIUM).add(BatteryMediumSodium, BatteryMediumCadmium, BatteryMediumLithium); - this.tag(BATTERIES_LARGE).add(BatteryLargeSodium, BatteryLargeCadmium, BatteryLargeLithium, EnergyCrystal); this.tag(POWER_UNIT_LV).add(PowerUnitLV); this.tag(POWER_UNIT_MV).add(PowerUnitMV); this.tag(POWER_UNIT_HV).add(PowerUnitHV); diff --git a/common/src/main/java/muramasa/gregtech/loader/crafting/Parts.java b/common/src/main/java/muramasa/gregtech/loader/crafting/Parts.java index ccedb7d5e..42f22f36d 100644 --- a/common/src/main/java/muramasa/gregtech/loader/crafting/Parts.java +++ b/common/src/main/java/muramasa/gregtech/loader/crafting/Parts.java @@ -1,6 +1,7 @@ package muramasa.gregtech.loader.crafting; import com.google.common.collect.ImmutableMap; +import io.github.gregtechintergalactical.gtcore.data.GTCoreItems; import muramasa.antimatter.AntimatterAPI; import muramasa.antimatter.data.AntimatterMaterialTypes; import muramasa.antimatter.datagen.providers.AntimatterRecipeProvider; @@ -60,12 +61,12 @@ public static void loadRecipes(Consumer output, AntimatterRecipe of('F', Items.FLINT, 'C', DUST.getMaterialTag(Coal)), "CCC", "CFC", "CCC"); provider.addItemRecipe(output, GTIRef.ID, "", "carbon", "has_coal", provider.hasSafeItem(DUST.getMaterialTag(Coal)), CoalChunk, of('F', Items.OBSIDIAN, 'C', CompressedCoalBall), "CCC", "CFC", "CCC"); - provider.addItemRecipe(output, GTIRef.ID, "","batteries", "has_wrench", provider.hasSafeItem(WRENCH.getTag()), BatteryHullSmall, of( + provider.addItemRecipe(output, GTIRef.ID, "","batteries", "has_wrench", provider.hasSafeItem(WRENCH.getTag()), GTCoreItems.BatteryHullSmall, of( 'P', PLATE.get(BatteryAlloy), 'C', CABLE_GETTER.apply(PipeSize.VTINY, LV, false) ), "C", "P", "P"); - provider.addItemRecipe(output, GTIRef.ID, "","batteries", "has_wrench", provider.hasSafeItem(WRENCH.getTag()), BatteryHullMedium, of( + provider.addItemRecipe(output, GTIRef.ID, "","batteries", "has_wrench", provider.hasSafeItem(WRENCH.getTag()), GTCoreItems.BatteryHullMedium, of( 'P', PLATE.get(BatteryAlloy), 'C', CABLE_GETTER.apply(PipeSize.VTINY, MV, false) ), "C C", "PPP", "PPP"); diff --git a/common/src/main/java/muramasa/gregtech/loader/items/Circuitry.java b/common/src/main/java/muramasa/gregtech/loader/items/Circuitry.java index 9f103a436..97edfe58e 100644 --- a/common/src/main/java/muramasa/gregtech/loader/items/Circuitry.java +++ b/common/src/main/java/muramasa/gregtech/loader/items/Circuitry.java @@ -155,9 +155,9 @@ private static void circuits(Consumer output, AntimatterRecipePr .build(), "CNC", "CSC", "CNC"); provider.addItemRecipe(output, GTIRef.ID, "", "circuits", "has_item_casing", provider.hasSafeItem(ITEM_CASING.getMaterialTag(Steel)), NandChip, ImmutableMap.of('C', ITEM_CASING.getMaterialTag(Steel), 'R', WIRE_RED_ALLOY.getBlockItem(PipeSize.VTINY), 'T', WIRE_GETTER.apply(PipeSize.VTINY, LV)), "CR", "RT"); - provider.addItemRecipe(output, GTIRef.ID, "lapotron_crystal_upgrade", "energy_orbs", "has_circuit", provider.hasSafeItem(CIRCUITS_ADVANCED), LapotronCrystal, - ImmutableMap.of('C', CIRCUITS_ADVANCED, 'L', GregTechTags.DUST_LAPIS_LAZURITE, 'E', EnergyCrystal), "LCL", "LEL", "LCL"); - provider.addItemRecipe(output, GTIRef.ID, "", "energy_orbs", "has_circuit", provider.hasSafeItem(CIRCUITS_ADVANCED), LapotronCrystal, + provider.addItemRecipe(output, GTIRef.ID, "lapotron_crystal_upgrade", "energy_orbs", "has_circuit", provider.hasSafeItem(CIRCUITS_ADVANCED), GTCoreItems.LapotronCrystal, + ImmutableMap.of('C', CIRCUITS_ADVANCED, 'L', GregTechTags.DUST_LAPIS_LAZURITE, 'E', GTCoreItems.EnergyCrystal), "LCL", "LEL", "LCL"); + provider.addItemRecipe(output, GTIRef.ID, "", "energy_orbs", "has_circuit", provider.hasSafeItem(CIRCUITS_ADVANCED), GTCoreItems.LapotronCrystal, ImmutableMap.of('C', CIRCUITS_ADVANCED, 'L', GregTechTags.DUST_LAPIS_LAZURITE, 'S', GEM.getMaterialTag(Sapphire)), "LCL", "LSL", "LCL"); } diff --git a/common/src/main/java/muramasa/gregtech/loader/machines/AssemblyLoader.java b/common/src/main/java/muramasa/gregtech/loader/machines/AssemblyLoader.java index a4a73eaf4..3f69f9f98 100644 --- a/common/src/main/java/muramasa/gregtech/loader/machines/AssemblyLoader.java +++ b/common/src/main/java/muramasa/gregtech/loader/machines/AssemblyLoader.java @@ -1,6 +1,7 @@ package muramasa.gregtech.loader.machines; import com.google.common.collect.ImmutableSet; +import io.github.gregtechintergalactical.gtcore.data.GTCoreItems; import muramasa.antimatter.AntimatterAPI; import muramasa.antimatter.item.ItemBasic; import muramasa.antimatter.machine.Tier; @@ -54,9 +55,9 @@ public static void init() { //TODO proper type check for the cables private static void batteries() { - ASSEMBLING.RB().ii(PLATE.getMaterialIngredient(BatteryAlloy,1), ofObject(CABLE_GETTER.apply(PipeSize.VTINY, LV, false) ,1)).fi(Polyethylene.getLiquid(L)).io(BatteryHullSmall.getDefaultInstance()).add("battery_hull_small",800, 1); - ASSEMBLING.RB().ii(PLATE.getMaterialIngredient(BatteryAlloy,3), ofObject(CABLE_GETTER.apply(PipeSize.VTINY, MV, false) ,2)).fi(Polyethylene.getLiquid(L * 3)).io(BatteryHullMedium.getDefaultInstance()).add("battery_hull_medium",1600, 2); - ASSEMBLING.RB().ii(PLATE.getMaterialIngredient(BatteryAlloy,9), ofObject(CABLE_GETTER.apply(PipeSize.VTINY, HV, false) ,4)).fi(Polyethylene.getLiquid(L * 9)).io(BatteryHullLarge.getDefaultInstance()).add("battery_hull_large",3200, 4); + ASSEMBLING.RB().ii(PLATE.getMaterialIngredient(BatteryAlloy,1), ofObject(CABLE_GETTER.apply(PipeSize.VTINY, LV, false) ,1)).fi(Polyethylene.getLiquid(L)).io(GTCoreItems.BatteryHullSmall.getDefaultInstance()).add("battery_hull_small",800, 1); + ASSEMBLING.RB().ii(PLATE.getMaterialIngredient(BatteryAlloy,3), ofObject(CABLE_GETTER.apply(PipeSize.VTINY, MV, false) ,2)).fi(Polyethylene.getLiquid(L * 3)).io(GTCoreItems.BatteryHullMedium.getDefaultInstance()).add("battery_hull_medium",1600, 2); + ASSEMBLING.RB().ii(PLATE.getMaterialIngredient(BatteryAlloy,9), ofObject(CABLE_GETTER.apply(PipeSize.VTINY, HV, false) ,4)).fi(Polyethylene.getLiquid(L * 9)).io(GTCoreItems.BatteryHullLarge.getDefaultInstance()).add("battery_hull_large",3200, 4); ASSEMBLING.RB().ii(DUST.getMaterialIngredient(Tantalum, 1), FOIL.getMaterialIngredient(Manganese, 1)).fi(Polyethylene.getLiquid(L)).io(new ItemStack(BatteryTantalum, 8)).add("tantalum_capacitor", 100, 4); } diff --git a/common/src/main/java/muramasa/gregtech/loader/machines/Autoclave.java b/common/src/main/java/muramasa/gregtech/loader/machines/Autoclave.java index 8c8e8df26..0e1516f2c 100644 --- a/common/src/main/java/muramasa/gregtech/loader/machines/Autoclave.java +++ b/common/src/main/java/muramasa/gregtech/loader/machines/Autoclave.java @@ -6,11 +6,11 @@ import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.Items; +import static io.github.gregtechintergalactical.gtcore.data.GTCoreItems.EnergyCrystal; import static muramasa.antimatter.Ref.L; import static muramasa.antimatter.data.AntimatterMaterialTypes.*; import static muramasa.antimatter.data.AntimatterMaterials.Water; import static muramasa.antimatter.recipe.ingredient.RecipeIngredient.of; -import static muramasa.gregtech.data.GregTechData.EnergyCrystal; import static muramasa.gregtech.data.Materials.*; import static muramasa.gregtech.data.RecipeMaps.AUTOCLAVING; import static muramasa.gregtech.data.RecipeMaps.COMPRESSING; diff --git a/common/src/main/java/muramasa/gregtech/loader/machines/CanningLoader.java b/common/src/main/java/muramasa/gregtech/loader/machines/CanningLoader.java index 505d196bc..f93118796 100644 --- a/common/src/main/java/muramasa/gregtech/loader/machines/CanningLoader.java +++ b/common/src/main/java/muramasa/gregtech/loader/machines/CanningLoader.java @@ -1,5 +1,7 @@ package muramasa.gregtech.loader.machines; +import io.github.gregtechintergalactical.gtcore.data.GTCoreItems; + import static muramasa.antimatter.data.AntimatterMaterialTypes.DUST; import static muramasa.gregtech.data.GregTechData.*; import static muramasa.gregtech.data.RecipeMaps.CANNING; @@ -13,16 +15,16 @@ public class CanningLoader { static int MULTIPLE_LARGE = 32; public static void init() { - CANNING.RB().ii(of(BatteryHullSmall.getDefaultInstance()), of(DUST.get(Sodium, MULTIPLE_SMALL))).io(BatterySmallSodium.getDefaultInstance()).add("battery_small_sodium",100, 2); - CANNING.RB().ii(of(BatteryHullSmall.getDefaultInstance()), of(DUST.get(Cadmium, MULTIPLE_SMALL))).io(BatterySmallCadmium.getDefaultInstance()).add("battery_small_cadmium",100, 2); - CANNING.RB().ii(of(BatteryHullSmall.getDefaultInstance()), of(DUST.get(Lithium, MULTIPLE_SMALL))).io(BatterySmallLithium.getDefaultInstance()).add("battery_small_lithium",100, 2); + CANNING.RB().ii(of(GTCoreItems.BatteryHullSmall.getDefaultInstance()), of(DUST.get(Sodium, MULTIPLE_SMALL))).io(GTCoreItems.BatterySmallSodium.getDefaultInstance()).add("battery_small_sodium",100, 2); + CANNING.RB().ii(of(GTCoreItems.BatteryHullSmall.getDefaultInstance()), of(DUST.get(Cadmium, MULTIPLE_SMALL))).io(GTCoreItems.BatterySmallCadmium.getDefaultInstance()).add("battery_small_cadmium",100, 2); + CANNING.RB().ii(of(GTCoreItems.BatteryHullSmall.getDefaultInstance()), of(DUST.get(Lithium, MULTIPLE_SMALL))).io(GTCoreItems.BatterySmallLithium.getDefaultInstance()).add("battery_small_lithium",100, 2); - CANNING.RB().ii(of(BatteryHullMedium.getDefaultInstance()), of(DUST.get(Sodium, MULTIPLE_MEDIUM))).io(BatteryMediumSodium.getDefaultInstance()).add("battery_medium_sodium",400, 2); - CANNING.RB().ii(of(BatteryHullMedium.getDefaultInstance()), of(DUST.get(Cadmium, MULTIPLE_MEDIUM))).io(BatteryMediumCadmium.getDefaultInstance()).add("battery_medium_cadmium",400, 2); - CANNING.RB().ii(of(BatteryHullMedium.getDefaultInstance()), of(DUST.get(Lithium, MULTIPLE_MEDIUM))).io(BatteryMediumLithium.getDefaultInstance()).add("battery_medium_lithium",400, 2); + CANNING.RB().ii(of(GTCoreItems.BatteryHullMedium.getDefaultInstance()), of(DUST.get(Sodium, MULTIPLE_MEDIUM))).io(GTCoreItems.BatteryMediumSodium.getDefaultInstance()).add("battery_medium_sodium",400, 2); + CANNING.RB().ii(of(GTCoreItems.BatteryHullMedium.getDefaultInstance()), of(DUST.get(Cadmium, MULTIPLE_MEDIUM))).io(GTCoreItems.BatteryMediumCadmium.getDefaultInstance()).add("battery_medium_cadmium",400, 2); + CANNING.RB().ii(of(GTCoreItems.BatteryHullMedium.getDefaultInstance()), of(DUST.get(Lithium, MULTIPLE_MEDIUM))).io(GTCoreItems.BatteryMediumLithium.getDefaultInstance()).add("battery_medium_lithium",400, 2); - CANNING.RB().ii(of(BatteryHullLarge.getDefaultInstance()), of(DUST.get(Sodium, MULTIPLE_LARGE))).io(BatteryLargeSodium.getDefaultInstance()).add("battery_large_sodium",1600, 2); - CANNING.RB().ii(of(BatteryHullLarge.getDefaultInstance()), of(DUST.get(Cadmium, MULTIPLE_LARGE))).io(BatteryLargeCadmium.getDefaultInstance()).add("battery_large_cadmium",1600, 2); - CANNING.RB().ii(of(BatteryHullLarge.getDefaultInstance()), of(DUST.get(Lithium, MULTIPLE_LARGE))).io(BatteryLargeLithium.getDefaultInstance()).add("battery_large_lithium",1600, 2); + CANNING.RB().ii(of(GTCoreItems.BatteryHullLarge.getDefaultInstance()), of(DUST.get(Sodium, MULTIPLE_LARGE))).io(GTCoreItems.BatteryLargeSodium.getDefaultInstance()).add("battery_large_sodium",1600, 2); + CANNING.RB().ii(of(GTCoreItems.BatteryHullLarge.getDefaultInstance()), of(DUST.get(Cadmium, MULTIPLE_LARGE))).io(GTCoreItems.BatteryLargeCadmium.getDefaultInstance()).add("battery_large_cadmium",1600, 2); + CANNING.RB().ii(of(GTCoreItems.BatteryHullLarge.getDefaultInstance()), of(DUST.get(Lithium, MULTIPLE_LARGE))).io(GTCoreItems.BatteryLargeLithium.getDefaultInstance()).add("battery_large_lithium",1600, 2); } } diff --git a/common/src/main/java/muramasa/gregtech/loader/machines/FluidCanningLoader.java b/common/src/main/java/muramasa/gregtech/loader/machines/FluidCanningLoader.java index 991274b3b..808716ddb 100644 --- a/common/src/main/java/muramasa/gregtech/loader/machines/FluidCanningLoader.java +++ b/common/src/main/java/muramasa/gregtech/loader/machines/FluidCanningLoader.java @@ -1,5 +1,6 @@ package muramasa.gregtech.loader.machines; +import io.github.gregtechintergalactical.gtcore.data.GTCoreItems; import muramasa.antimatter.AntimatterAPI; import muramasa.antimatter.item.ItemBattery; import muramasa.antimatter.item.ItemFluidCell; @@ -19,12 +20,12 @@ public class FluidCanningLoader { public static void init() { - FLUID_CANNING.RB().ii(RecipeIngredient.of(GregTechData.BatteryHullSmall, 1)).fi(Mercury.getLiquid(1000)).io(ItemBattery.getFilledBattery(GregTechData.BatterySmallMercury)).add("battery_small_mercury",16, 1); - FLUID_CANNING.RB().ii(RecipeIngredient.of(GregTechData.BatteryHullMedium, 1)).fi(Mercury.getLiquid(4000)).io(ItemBattery.getFilledBattery(GregTechData.BatteryMediumMercury)).add("battery_medium_mercury",64, 1); - FLUID_CANNING.RB().ii(RecipeIngredient.of(GregTechData.BatteryHullLarge, 1)).fi(Mercury.getLiquid(16000)).io(ItemBattery.getFilledBattery(GregTechData.BatteryLargeMercury)).add("battery_large_mercury",258, 1); - FLUID_CANNING.RB().ii(RecipeIngredient.of(GregTechData.BatteryHullSmall, 1)).fi(SulfuricAcid.getLiquid(1000)).io(ItemBattery.getFilledBattery(GregTechData.BatterySmallAcid)).add("battery_small_acid",16, 1); - FLUID_CANNING.RB().ii(RecipeIngredient.of(GregTechData.BatteryHullMedium, 1)).fi(SulfuricAcid.getLiquid(4000)).io(ItemBattery.getFilledBattery(GregTechData.BatteryMediumAcid)).add("battery_medium_acid",64, 1); - FLUID_CANNING.RB().ii(RecipeIngredient.of(GregTechData.BatteryHullLarge, 1)).fi(SulfuricAcid.getLiquid(16000)).io(ItemBattery.getFilledBattery(GregTechData.BatteryLargeAcid)).add("battery_large_acid",258, 1); + FLUID_CANNING.RB().ii(RecipeIngredient.of(GTCoreItems.BatteryHullSmall, 1)).fi(Mercury.getLiquid(1000)).io(ItemBattery.getFilledBattery(GTCoreItems.BatterySmallMercury)).add("battery_small_mercury",16, 1); + FLUID_CANNING.RB().ii(RecipeIngredient.of(GTCoreItems.BatteryHullMedium, 1)).fi(Mercury.getLiquid(4000)).io(ItemBattery.getFilledBattery(GTCoreItems.BatteryMediumMercury)).add("battery_medium_mercury",64, 1); + FLUID_CANNING.RB().ii(RecipeIngredient.of(GTCoreItems.BatteryHullLarge, 1)).fi(Mercury.getLiquid(16000)).io(ItemBattery.getFilledBattery(GTCoreItems.BatteryLargeMercury)).add("battery_large_mercury",258, 1); + FLUID_CANNING.RB().ii(RecipeIngredient.of(GTCoreItems.BatteryHullSmall, 1)).fi(SulfuricAcid.getLiquid(1000)).io(ItemBattery.getFilledBattery(GTCoreItems.BatterySmallAcid)).add("battery_small_acid",16, 1); + FLUID_CANNING.RB().ii(RecipeIngredient.of(GTCoreItems.BatteryHullMedium, 1)).fi(SulfuricAcid.getLiquid(4000)).io(ItemBattery.getFilledBattery(GTCoreItems.BatteryMediumAcid)).add("battery_medium_acid",64, 1); + FLUID_CANNING.RB().ii(RecipeIngredient.of(GTCoreItems.BatteryHullLarge, 1)).fi(SulfuricAcid.getLiquid(16000)).io(ItemBattery.getFilledBattery(GTCoreItems.BatteryLargeAcid)).add("battery_large_acid",258, 1); AntimatterPlatformUtils.getAllFluids().forEach(fluid -> { Item bucket = fluid.getBucket(); if (bucket == Items.AIR) return; diff --git a/common/src/main/java/muramasa/gregtech/loader/machines/LaserEngraverLoader.java b/common/src/main/java/muramasa/gregtech/loader/machines/LaserEngraverLoader.java index 420d87ca5..48f1c11c3 100644 --- a/common/src/main/java/muramasa/gregtech/loader/machines/LaserEngraverLoader.java +++ b/common/src/main/java/muramasa/gregtech/loader/machines/LaserEngraverLoader.java @@ -1,5 +1,6 @@ package muramasa.gregtech.loader.machines; +import io.github.gregtechintergalactical.gtcore.data.GTCoreItems; import muramasa.antimatter.recipe.ingredient.RecipeIngredient; import muramasa.gregtech.data.GregTechData; import muramasa.gregtech.data.RecipeMaps; @@ -11,9 +12,9 @@ public class LaserEngraverLoader { public static void init(){ - RecipeMaps.LASER_ENGRAVING.RB().ii(RecipeIngredient.of(GregTechData.LapotronCrystal, 1), LENS.getMaterialIngredient(Sapphire, 1).setNoConsume().setNoConsume()).io(new ItemStack(GregTechData.EngravedLapotronChip, 3)).add("engraved_lapotron_chip_sapphire", 256, 480); - RecipeMaps.LASER_ENGRAVING.RB().ii(RecipeIngredient.of(GregTechData.LapotronCrystal, 1), LENS.getMaterialIngredient(BlueTopaz, 1).setNoConsume().setNoConsume()).io(new ItemStack(GregTechData.EngravedLapotronChip, 3)).add("engraved_lapotron_chip_blue_topaz", 256, 480); - RecipeMaps.LASER_ENGRAVING.RB().ii(RecipeIngredient.of(GregTechData.LapotronCrystal, 1), LENS.getMaterialIngredient(Opal, 1).setNoConsume().setNoConsume()).io(new ItemStack(GregTechData.EngravedLapotronChip, 3)).add("engraved_lapotron_chip_opal", 256, 480); + RecipeMaps.LASER_ENGRAVING.RB().ii(RecipeIngredient.of(GTCoreItems.LapotronCrystal, 1), LENS.getMaterialIngredient(Sapphire, 1).setNoConsume().setNoConsume()).io(new ItemStack(GregTechData.EngravedLapotronChip, 3)).add("engraved_lapotron_chip_sapphire", 256, 480); + RecipeMaps.LASER_ENGRAVING.RB().ii(RecipeIngredient.of(GTCoreItems.LapotronCrystal, 1), LENS.getMaterialIngredient(BlueTopaz, 1).setNoConsume().setNoConsume()).io(new ItemStack(GregTechData.EngravedLapotronChip, 3)).add("engraved_lapotron_chip_blue_topaz", 256, 480); + RecipeMaps.LASER_ENGRAVING.RB().ii(RecipeIngredient.of(GTCoreItems.LapotronCrystal, 1), LENS.getMaterialIngredient(Opal, 1).setNoConsume().setNoConsume()).io(new ItemStack(GregTechData.EngravedLapotronChip, 3)).add("engraved_lapotron_chip_opal", 256, 480); RecipeMaps.LASER_ENGRAVING.RB().ii(PLATE.getMaterialIngredient(Emerald, 1), LENS.getMaterialIngredient(Emerald, 1).setNoConsume()).io(new ItemStack(GregTechData.EngravedCrystalChip)).add("engraved_crystal_chip_emerald", 256, 480); RecipeMaps.LASER_ENGRAVING.RB().ii(PLATE.getMaterialIngredient(Olivine, 1), LENS.getMaterialIngredient(Emerald, 1).setNoConsume()).io(new ItemStack(GregTechData.EngravedCrystalChip)).add("engraved_crystal_chip_olivine", 256, 480); RecipeMaps.LASER_ENGRAVING.RB().ii(FOIL.getMaterialIngredient(Copper, 1), LENS.getMaterialIngredient(Ruby, 1).setNoConsume()).io(new ItemStack(GregTechData.EtchedWiringMV)).add("etched_wiring_mv_1", 64, 30);