diff options
Diffstat (limited to 'src/main/java/gregtech')
13 files changed, 618 insertions, 683 deletions
diff --git a/src/main/java/gregtech/api/enums/Mods.java b/src/main/java/gregtech/api/enums/Mods.java index ee95a98874..797be4e55b 100644 --- a/src/main/java/gregtech/api/enums/Mods.java +++ b/src/main/java/gregtech/api/enums/Mods.java @@ -92,6 +92,7 @@ public enum Mods { IC2NuclearControl(Names.I_C2_NUCLEAR_CONTROL), IguanaTweaksTinkerConstruct(Names.IGUANA_TWEAKS_TINKER_CONSTRUCT), IndustrialCraft2(Names.INDUSTRIAL_CRAFT2), + InfernalMobs(Names.INFERNAL_MOBS), IronChests(Names.IRON_CHESTS), IronChestsMinecarts(Names.IRON_CHESTS_MINECARTS), IronTanks(Names.IRON_TANKS), @@ -105,6 +106,7 @@ public enum Mods { Mantle(Names.MANTLE), MineAndBladeBattleGear2(Names.MINE_AND_BLADE_BATTLE_GEAR2), Minecraft(Names.MINECRAFT), + MineTweaker(Names.MINE_TWEAKER), NEICustomDiagrams(Names.N_E_I_CUSTOM_DIAGRAMS), NEIOrePlugin(Names.N_E_I_ORE_PLUGIN), Natura(Names.NATURA), @@ -269,6 +271,7 @@ public enum Mods { public static final String I_C2_NUCLEAR_CONTROL = "IC2NuclearControl"; public static final String IGUANA_TWEAKS_TINKER_CONSTRUCT = "IguanaTweaksTConstruct"; public static final String INDUSTRIAL_CRAFT2 = "IC2"; + public static final String INFERNAL_MOBS = "InfernalMobs"; public static final String IRON_CHESTS = "IronChest"; public static final String IRON_CHESTS_MINECARTS = "ironchestminecarts"; public static final String IRON_TANKS = "irontank"; @@ -282,6 +285,7 @@ public enum Mods { public static final String MANTLE = "Mantle"; public static final String MINE_AND_BLADE_BATTLE_GEAR2 = "battlegear2"; public static final String MINECRAFT = "minecraft"; + public static final String MINE_TWEAKER = "MineTweaker3"; public static final String N_E_I_CUSTOM_DIAGRAMS = "neicustomdiagram"; public static final String N_E_I_ORE_PLUGIN = "gtneioreplugin"; public static final String NATURA = "Natura"; diff --git a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_BasicMachine_GT_Recipe.java b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_BasicMachine_GT_Recipe.java index 8bba0fee25..a10e735843 100644 --- a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_BasicMachine_GT_Recipe.java +++ b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_BasicMachine_GT_Recipe.java @@ -4,7 +4,6 @@ import static gregtech.api.enums.GT_Values.V; import static gregtech.api.enums.GT_Values.VN; import static gregtech.api.enums.GT_Values.W; import static gregtech.api.enums.GT_Values.ticksBetweenSounds; -import static gregtech.api.enums.Mods.BartWorks; import static gregtech.api.objects.XSTR.XSTR_INSTANCE; import static net.minecraftforge.common.util.ForgeDirection.UP; @@ -42,7 +41,6 @@ import gregtech.api.util.ExternalMaterials; import gregtech.api.util.GT_ModHandler; import gregtech.api.util.GT_Utility; import gregtech.api.util.WorldSpawnedEventBuilder.ParticleEventBuilder; -import ic2.core.Ic2Items; /** * NEVER INCLUDE THIS FILE IN YOUR MOD!!! @@ -192,8 +190,8 @@ public class GT_MetaTileEntity_BasicMachine_GT_Recipe extends GT_MetaTileEntity_ case GLASS -> switch (this.mTier) { case 0, 1, 2, 3 -> new ItemStack(Blocks.glass, 1, W); - case 4, 5, 6, 7, 8 -> BartWorks.isModLoaded() ? "blockGlass" + VN[aTier] : Ic2Items.reinforcedGlass; - default -> BartWorks.isModLoaded() ? "blockGlass" + VN[8] : Ic2Items.reinforcedGlass; + case 4, 5, 6, 7, 8 -> "blockGlass" + VN[aTier]; + default -> "blockGlass" + VN[8]; }; case PLATE -> switch (this.mTier) { diff --git a/src/main/java/gregtech/api/recipe/RecipeMaps.java b/src/main/java/gregtech/api/recipe/RecipeMaps.java index 4494d1efba..409703fbad 100644 --- a/src/main/java/gregtech/api/recipe/RecipeMaps.java +++ b/src/main/java/gregtech/api/recipe/RecipeMaps.java @@ -648,18 +648,16 @@ public final class RecipeMaps { .setOutputs(aOutput1, aOutput2, Materials.Ash.getDustTiny(aCoalAmount / 2)) .setDuration(aDuration * 2 / 3); } - if (GTPlusPlus.isModLoaded()) { - ItemStack cactusCoke = GT_ModHandler.getModItem(GTPlusPlus.ID, "itemCactusCoke", aCoalAmount * 2L); - ItemStack sugarCoke = GT_ModHandler.getModItem(GTPlusPlus.ID, "itemSugarCoke", aCoalAmount * 2L); - coll.derive() - .setInputs(aInput1, aInput2, cactusCoke) - .setOutputs(aOutput1, aOutput2, Materials.Ash.getDustTiny(aCoalAmount * 2)) - .setDuration(aDuration * 2 / 3); - coll.derive() - .setInputs(aInput1, aInput2, sugarCoke) - .setOutputs(aOutput1, aOutput2, Materials.Ash.getDustTiny(aCoalAmount * 2)) - .setDuration(aDuration * 2 / 3); - } + ItemStack cactusCoke = GT_ModHandler.getModItem(GTPlusPlus.ID, "itemCactusCoke", aCoalAmount * 2L); + ItemStack sugarCoke = GT_ModHandler.getModItem(GTPlusPlus.ID, "itemSugarCoke", aCoalAmount * 2L); + coll.derive() + .setInputs(aInput1, aInput2, cactusCoke) + .setOutputs(aOutput1, aOutput2, Materials.Ash.getDustTiny(aCoalAmount * 2)) + .setDuration(aDuration * 2 / 3); + coll.derive() + .setInputs(aInput1, aInput2, sugarCoke) + .setOutputs(aOutput1, aOutput2, Materials.Ash.getDustTiny(aCoalAmount * 2)) + .setDuration(aDuration * 2 / 3); if ((aInput1 == null || aInput1.stackSize <= 6) && (aInput2 == null || aInput2.stackSize <= 6) && (aOutput1 == null || aOutput1.stackSize <= 6) && (aOutput2 == null || aOutput2.stackSize <= 6)) { diff --git a/src/main/java/gregtech/common/GT_RecipeAdder.java b/src/main/java/gregtech/common/GT_RecipeAdder.java index d236bbc4f2..f0225fd241 100644 --- a/src/main/java/gregtech/common/GT_RecipeAdder.java +++ b/src/main/java/gregtech/common/GT_RecipeAdder.java @@ -627,32 +627,30 @@ public class GT_RecipeAdder implements IGT_RecipeAdder { 0, 0); } - if (GTPlusPlus.isModLoaded()) { - RecipeMaps.primitiveBlastRecipes.addRecipe( - true, - new ItemStack[] { aInput1, aInput2, - GT_ModHandler.getModItem(GTPlusPlus.ID, "itemCactusCoke", (aCoalAmount * 2L)) }, - new ItemStack[] { aOutput1, aOutput2, Materials.Ash.getDustTiny(aCoalAmount * 2) }, - null, - null, - null, - null, - aDuration * 2 / 3, - 0, - 0); - RecipeMaps.primitiveBlastRecipes.addRecipe( - true, - new ItemStack[] { aInput1, aInput2, - GT_ModHandler.getModItem(GTPlusPlus.ID, "itemSugarCoke", (aCoalAmount * 2L)) }, - new ItemStack[] { aOutput1, aOutput2, Materials.Ash.getDustTiny(aCoalAmount * 2) }, - null, - null, - null, - null, - aDuration * 2 / 3, - 0, - 0); - } + RecipeMaps.primitiveBlastRecipes.addRecipe( + true, + new ItemStack[] { aInput1, aInput2, + GT_ModHandler.getModItem(GTPlusPlus.ID, "itemCactusCoke", (aCoalAmount * 2L)) }, + new ItemStack[] { aOutput1, aOutput2, Materials.Ash.getDustTiny(aCoalAmount * 2) }, + null, + null, + null, + null, + aDuration * 2 / 3, + 0, + 0); + RecipeMaps.primitiveBlastRecipes.addRecipe( + true, + new ItemStack[] { aInput1, aInput2, + GT_ModHandler.getModItem(GTPlusPlus.ID, "itemSugarCoke", (aCoalAmount * 2L)) }, + new ItemStack[] { aOutput1, aOutput2, Materials.Ash.getDustTiny(aCoalAmount * 2) }, + null, + null, + null, + null, + aDuration * 2 / 3, + 0, + 0); if ((aInput1 == null || aInput1.stackSize <= 6) && (aInput2 == null || aInput2.stackSize <= 6) && (aOutput1 == null || aOutput1.stackSize <= 6) && (aOutput2 == null || aOutput2.stackSize <= 6)) { diff --git a/src/main/java/gregtech/loaders/postload/GT_CraftingRecipeLoader.java b/src/main/java/gregtech/loaders/postload/GT_CraftingRecipeLoader.java index da749e5b31..5226976d0d 100644 --- a/src/main/java/gregtech/loaders/postload/GT_CraftingRecipeLoader.java +++ b/src/main/java/gregtech/loaders/postload/GT_CraftingRecipeLoader.java @@ -2015,14 +2015,12 @@ public class GT_CraftingRecipeLoader implements Runnable { Materials.Fireclay.getDust(2), new Object[] { Materials.Brick.getDust(1), Materials.Clay.getDust(1) }); - if (BartWorks.isModLoaded()) { - GT_ModHandler.addCraftingRecipe( - ItemList.Casing_Advanced_Rhodium_Palladium.get(1L), - bits, - new Object[] { "PhP", "PFP", aTextPlateWrench, 'P', - GT_ModHandler.getModItem(BartWorks.ID, "gt.bwMetaGeneratedplate", 1L, 88), 'F', - OrePrefixes.frameGt.get(Materials.Chrome) }); - } + GT_ModHandler.addCraftingRecipe( + ItemList.Casing_Advanced_Rhodium_Palladium.get(1L), + bits, + new Object[] { "PhP", "PFP", aTextPlateWrench, 'P', + GT_ModHandler.getModItem(BartWorks.ID, "gt.bwMetaGeneratedplate", 1L, 88), 'F', + OrePrefixes.frameGt.get(Materials.Chrome) }); if (Forestry.isModLoaded()) { ItemStack[] coverIDs = { ItemList.Plank_Larch.get(2L), ItemList.Plank_Teak.get(2L), diff --git a/src/main/java/gregtech/loaders/postload/chains/GT_PCBFactoryRecipes.java b/src/main/java/gregtech/loaders/postload/chains/GT_PCBFactoryRecipes.java index 392e6fa154..7c3beec6aa 100644 --- a/src/main/java/gregtech/loaders/postload/chains/GT_PCBFactoryRecipes.java +++ b/src/main/java/gregtech/loaders/postload/chains/GT_PCBFactoryRecipes.java @@ -58,44 +58,42 @@ public class GT_PCBFactoryRecipes { .duration(5 * MINUTES) .addTo(AssemblyLine); - if (GTPlusPlus.isModLoaded()) { - GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.NaquadahAlloy, 1), - Materials.get("Artherium-Sn") - .getPlates(6)) - .itemOutputs(ItemList.BasicPhotolithographicFrameworkCasing.get(1)) - .duration(30 * SECONDS) - .eut(TierEU.RECIPE_ZPM) - .addTo(assemblerRecipes); - GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.Infinity, 1), - Materials.EnrichedHolmium.getPlates(6)) - .itemOutputs(ItemList.ReinforcedPhotolithographicFrameworkCasing.get(1)) - .duration(30 * SECONDS) - .eut(TierEU.RECIPE_UHV) - .addTo(assemblerRecipes); - GT_Values.RA.stdBuilder() - .itemInputs( - GT_ModHandler.getModItem(GTPlusPlus.ID, "blockFrameGtCelestialTungsten", 1), - Materials.get("Quantum") - .getPlates(6)) - .itemOutputs(ItemList.RadiationProofPhotolithographicFrameworkCasing.get(1)) - .duration(30 * SECONDS) - .eut(TierEU.RECIPE_UIV) - .addTo(assemblerRecipes); - GT_Values.RA.stdBuilder() - .itemInputs( - GT_ModHandler.getModItem(GTPlusPlus.ID, "blockFrameGtHypogen", 1), - GT_OreDictUnificator.get(OrePrefixes.rotor, Materials.Infinity, 2), - Materials.Thulium.getPlates(6)) - .itemOutputs(ItemList.InfinityCooledCasing.get(1)) - .fluidInputs(MaterialsUEVplus.SpaceTime.getMolten(8 * 144)) - .duration(10 * SECONDS) - .eut(TierEU.RECIPE_UMV) - .addTo(assemblerRecipes); - } + GT_Values.RA.stdBuilder() + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.NaquadahAlloy, 1), + Materials.get("Artherium-Sn") + .getPlates(6)) + .itemOutputs(ItemList.BasicPhotolithographicFrameworkCasing.get(1)) + .duration(30 * SECONDS) + .eut(TierEU.RECIPE_ZPM) + .addTo(assemblerRecipes); + GT_Values.RA.stdBuilder() + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.Infinity, 1), + Materials.EnrichedHolmium.getPlates(6)) + .itemOutputs(ItemList.ReinforcedPhotolithographicFrameworkCasing.get(1)) + .duration(30 * SECONDS) + .eut(TierEU.RECIPE_UHV) + .addTo(assemblerRecipes); + GT_Values.RA.stdBuilder() + .itemInputs( + GT_ModHandler.getModItem(GTPlusPlus.ID, "blockFrameGtCelestialTungsten", 1), + Materials.get("Quantum") + .getPlates(6)) + .itemOutputs(ItemList.RadiationProofPhotolithographicFrameworkCasing.get(1)) + .duration(30 * SECONDS) + .eut(TierEU.RECIPE_UIV) + .addTo(assemblerRecipes); + GT_Values.RA.stdBuilder() + .itemInputs( + GT_ModHandler.getModItem(GTPlusPlus.ID, "blockFrameGtHypogen", 1), + GT_OreDictUnificator.get(OrePrefixes.rotor, Materials.Infinity, 2), + Materials.Thulium.getPlates(6)) + .itemOutputs(ItemList.InfinityCooledCasing.get(1)) + .fluidInputs(MaterialsUEVplus.SpaceTime.getMolten(8 * 144)) + .duration(10 * SECONDS) + .eut(TierEU.RECIPE_UMV) + .addTo(assemblerRecipes); // Load CircuitBoard Recipes @@ -597,106 +595,95 @@ public class GT_PCBFactoryRecipes { .addTo(RecipeMaps.pcbFactoryRecipes); } - if (GTPlusPlus.isModLoaded()) { - // Optical Circuit Board - for (int tier = 7; tier <= GT_PCBFactoryManager.mTiersOfPlastics; tier++) { - int amountOfBoards = (int) Math.ceil(8 * (Math.sqrt(Math.pow(2, tier - 7)))); - List<ItemStack> aBoards = new ArrayList<>(); - for (int i = amountOfBoards; i > 64; i -= 64) { - aBoards.add(ItemList.Circuit_Board_Optical.get(i)); - amountOfBoards -= 64; - } - aBoards.add(ItemList.Circuit_Board_Optical.get(amountOfBoards)); - GT_Values.RA.stdBuilder() - .itemInputs( - GT_Utility.getIntegratedCircuit(1), - GT_PCBFactoryManager.getPlasticMaterialFromTier(tier) - .getPlates(1), - GT_ModHandler.getModItem( - BartWorks.ID, - "gt.bwMetaGeneratedfoil", - (long) (16 * (Math.sqrt(tier - 6))), - 10106), - GT_OreDictUnificator - .get(OrePrefixes.foil, Materials.InfinityCatalyst, (long) (16 * (Math.sqrt(tier - 6)))), - GT_ModHandler - .getModItem("miscutils", "itemFoilChromaticGlass", (long) (16 * (Math.sqrt(tier - 6))))) - .fluidInputs( - Materials.SulfuricAcid.getFluid((long) (500 * (Math.sqrt(tier - 6)))), - Materials.IronIIIChloride.getFluid((long) (12500 * (Math.sqrt(tier - 6)))), - Materials.MysteriousCrystal.getMolten((long) (2880 * (Math.sqrt(tier - 6))))) - .itemOutputs(aBoards.toArray(new ItemStack[0])) - .duration((int) Math.ceil(600 / Math.sqrt(Math.pow(1.5, tier - 5.5)))) - .eut((int) GT_Values.VP[tier] * 3 / 4) - .metadata(TIER, 1) - .addTo(RecipeMaps.pcbFactoryRecipes); + // Optical Circuit Board + for (int tier = 7; tier <= GT_PCBFactoryManager.mTiersOfPlastics; tier++) { + int amountOfBoards = (int) Math.ceil(8 * (Math.sqrt(Math.pow(2, tier - 7)))); + List<ItemStack> aBoards = new ArrayList<>(); + for (int i = amountOfBoards; i > 64; i -= 64) { + aBoards.add(ItemList.Circuit_Board_Optical.get(i)); + amountOfBoards -= 64; } - for (int tier = 7; tier <= GT_PCBFactoryManager.mTiersOfPlastics; tier++) { - int amountOfBoards = (int) Math.ceil(8 * (Math.sqrt(Math.pow(2, tier - 6.5)))); - List<ItemStack> aBoards = new ArrayList<>(); - for (int i = amountOfBoards; i > 64; i -= 64) { - aBoards.add(ItemList.Circuit_Board_Optical.get(i)); - amountOfBoards -= 64; - } - aBoards.add(ItemList.Circuit_Board_Optical.get(amountOfBoards)); - GT_Values.RA.stdBuilder() - .itemInputs( - GT_Utility.getIntegratedCircuit(2), - GT_Utility.getNaniteAsCatalyst(Materials.Silver), - GT_PCBFactoryManager.getPlasticMaterialFromTier(tier) - .getPlates(1), - GT_ModHandler.getModItem( - BartWorks.ID, - "gt.bwMetaGeneratedfoil", - (long) (16 * (Math.sqrt(tier - 6))), - 10106), - GT_OreDictUnificator - .get(OrePrefixes.foil, Materials.InfinityCatalyst, (long) (16 * (Math.sqrt(tier - 6)))), - GT_ModHandler - .getModItem("miscutils", "itemFoilChromaticGlass", (long) (16 * (Math.sqrt(tier - 6))))) - .fluidInputs( - Materials.SulfuricAcid.getFluid((long) (500 * (Math.sqrt(tier - 6)))), - Materials.IronIIIChloride.getFluid((long) (12500 * (Math.sqrt(tier - 6)))), - Materials.MysteriousCrystal.getMolten((long) (2880 * (Math.sqrt(tier - 6))))) - .itemOutputs(aBoards.toArray(new ItemStack[0])) - .duration((int) Math.ceil(500 / Math.sqrt(Math.pow(1.5, tier - 6.5)))) - .eut((int) GT_Values.VP[tier + 1] * 3 / 4) - .metadata(TIER, 2) - .addTo(RecipeMaps.pcbFactoryRecipes); + aBoards.add(ItemList.Circuit_Board_Optical.get(amountOfBoards)); + GT_Values.RA.stdBuilder() + .itemInputs( + GT_Utility.getIntegratedCircuit(1), + GT_PCBFactoryManager.getPlasticMaterialFromTier(tier) + .getPlates(1), + GT_ModHandler + .getModItem(BartWorks.ID, "gt.bwMetaGeneratedfoil", (long) (16 * (Math.sqrt(tier - 6))), 10106), + GT_OreDictUnificator + .get(OrePrefixes.foil, Materials.InfinityCatalyst, (long) (16 * (Math.sqrt(tier - 6)))), + GT_ModHandler + .getModItem(GTPlusPlus.ID, "itemFoilChromaticGlass", (long) (16 * (Math.sqrt(tier - 6))))) + .fluidInputs( + Materials.SulfuricAcid.getFluid((long) (500 * (Math.sqrt(tier - 6)))), + Materials.IronIIIChloride.getFluid((long) (12500 * (Math.sqrt(tier - 6)))), + Materials.MysteriousCrystal.getMolten((long) (2880 * (Math.sqrt(tier - 6))))) + .itemOutputs(aBoards.toArray(new ItemStack[0])) + .duration((int) Math.ceil(600 / Math.sqrt(Math.pow(1.5, tier - 5.5)))) + .eut((int) GT_Values.VP[tier] * 3 / 4) + .metadata(TIER, 1) + .addTo(RecipeMaps.pcbFactoryRecipes); + } + for (int tier = 7; tier <= GT_PCBFactoryManager.mTiersOfPlastics; tier++) { + int amountOfBoards = (int) Math.ceil(8 * (Math.sqrt(Math.pow(2, tier - 6.5)))); + List<ItemStack> aBoards = new ArrayList<>(); + for (int i = amountOfBoards; i > 64; i -= 64) { + aBoards.add(ItemList.Circuit_Board_Optical.get(i)); + amountOfBoards -= 64; } - for (int tier = 7; tier <= GT_PCBFactoryManager.mTiersOfPlastics; tier++) { - int amountOfBoards = (int) Math.ceil(8 * (Math.sqrt(Math.pow(2, tier - 6)))); - List<ItemStack> aBoards = new ArrayList<>(); - for (int i = amountOfBoards; i > 64; i -= 64) { - aBoards.add(ItemList.Circuit_Board_Optical.get(i)); - amountOfBoards -= 64; - } - aBoards.add(ItemList.Circuit_Board_Optical.get(amountOfBoards)); - GT_Values.RA.stdBuilder() - .itemInputs( - GT_Utility.getIntegratedCircuit(3), - GT_Utility.getNaniteAsCatalyst(Materials.Gold), - GT_PCBFactoryManager.getPlasticMaterialFromTier(tier) - .getPlates(1), - GT_ModHandler.getModItem( - BartWorks.ID, - "gt.bwMetaGeneratedfoil", - (long) (16 * (Math.sqrt(tier - 6))), - 10106), - GT_OreDictUnificator - .get(OrePrefixes.foil, Materials.InfinityCatalyst, (long) (16 * (Math.sqrt(tier - 6)))), - GT_ModHandler - .getModItem("miscutils", "itemFoilChromaticGlass", (long) (16 * (Math.sqrt(tier - 6))))) - .fluidInputs( - Materials.SulfuricAcid.getFluid((long) (500 * (Math.sqrt(tier - 6)))), - Materials.IronIIIChloride.getFluid((long) (12500 * (Math.sqrt(tier - 6)))), - Materials.MysteriousCrystal.getMolten((long) (2880 * (Math.sqrt(tier - 6))))) - .itemOutputs(aBoards.toArray(new ItemStack[0])) - .duration((int) Math.ceil(400 / Math.sqrt(Math.pow(1.5, tier - 6.5)))) - .eut((int) GT_Values.VP[tier + 1] * 3 / 4) - .metadata(TIER, 3) - .addTo(RecipeMaps.pcbFactoryRecipes); + aBoards.add(ItemList.Circuit_Board_Optical.get(amountOfBoards)); + GT_Values.RA.stdBuilder() + .itemInputs( + GT_Utility.getIntegratedCircuit(2), + GT_Utility.getNaniteAsCatalyst(Materials.Silver), + GT_PCBFactoryManager.getPlasticMaterialFromTier(tier) + .getPlates(1), + GT_ModHandler + .getModItem(BartWorks.ID, "gt.bwMetaGeneratedfoil", (long) (16 * (Math.sqrt(tier - 6))), 10106), + GT_OreDictUnificator + .get(OrePrefixes.foil, Materials.InfinityCatalyst, (long) (16 * (Math.sqrt(tier - 6)))), + GT_ModHandler + .getModItem(GTPlusPlus.ID, "itemFoilChromaticGlass", (long) (16 * (Math.sqrt(tier - 6))))) + .fluidInputs( + Materials.SulfuricAcid.getFluid((long) (500 * (Math.sqrt(tier - 6)))), + Materials.IronIIIChloride.getFluid((long) (12500 * (Math.sqrt(tier - 6)))), + Materials.MysteriousCrystal.getMolten((long) (2880 * (Math.sqrt(tier - 6))))) + .itemOutputs(aBoards.toArray(new ItemStack[0])) + .duration((int) Math.ceil(500 / Math.sqrt(Math.pow(1.5, tier - 6.5)))) + .eut((int) GT_Values.VP[tier + 1] * 3 / 4) + .metadata(TIER, 2) + .addTo(RecipeMaps.pcbFactoryRecipes); + } + for (int tier = 7; tier <= GT_PCBFactoryManager.mTiersOfPlastics; tier++) { + int amountOfBoards = (int) Math.ceil(8 * (Math.sqrt(Math.pow(2, tier - 6)))); + List<ItemStack> aBoards = new ArrayList<>(); + for (int i = amountOfBoards; i > 64; i -= 64) { + aBoards.add(ItemList.Circuit_Board_Optical.get(i)); + amountOfBoards -= 64; } + aBoards.add(ItemList.Circuit_Board_Optical.get(amountOfBoards)); + GT_Values.RA.stdBuilder() + .itemInputs( + GT_Utility.getIntegratedCircuit(3), + GT_Utility.getNaniteAsCatalyst(Materials.Gold), + GT_PCBFactoryManager.getPlasticMaterialFromTier(tier) + .getPlates(1), + GT_ModHandler + .getModItem(BartWorks.ID, "gt.bwMetaGeneratedfoil", (long) (16 * (Math.sqrt(tier - 6))), 10106), + GT_OreDictUnificator + .get(OrePrefixes.foil, Materials.InfinityCatalyst, (long) (16 * (Math.sqrt(tier - 6)))), + GT_ModHandler + .getModItem(GTPlusPlus.ID, "itemFoilChromaticGlass", (long) (16 * (Math.sqrt(tier - 6))))) + .fluidInputs( + Materials.SulfuricAcid.getFluid((long) (500 * (Math.sqrt(tier - 6)))), + Materials.IronIIIChloride.getFluid((long) (12500 * (Math.sqrt(tier - 6)))), + Materials.MysteriousCrystal.getMolten((long) (2880 * (Math.sqrt(tier - 6))))) + .itemOutputs(aBoards.toArray(new ItemStack[0])) + .duration((int) Math.ceil(400 / Math.sqrt(Math.pow(1.5, tier - 6.5)))) + .eut((int) GT_Values.VP[tier + 1] * 3 / 4) + .metadata(TIER, 3) + .addTo(RecipeMaps.pcbFactoryRecipes); } } } diff --git a/src/main/java/gregtech/loaders/postload/recipes/AssemblerRecipes.java b/src/main/java/gregtech/loaders/postload/recipes/AssemblerRecipes.java index 76fcbfe346..b41340e52e 100644 --- a/src/main/java/gregtech/loaders/postload/recipes/AssemblerRecipes.java +++ b/src/main/java/gregtech/loaders/postload/recipes/AssemblerRecipes.java @@ -2,11 +2,9 @@ package gregtech.loaders.postload.recipes; import static gregtech.api.enums.Mods.AppliedEnergistics2; import static gregtech.api.enums.Mods.AvaritiaAddons; -import static gregtech.api.enums.Mods.BartWorks; import static gregtech.api.enums.Mods.BuildCraftFactory; import static gregtech.api.enums.Mods.ExtraUtilities; import static gregtech.api.enums.Mods.Forestry; -import static gregtech.api.enums.Mods.GTNHLanthanides; import static gregtech.api.enums.Mods.GTPlusPlus; import static gregtech.api.enums.Mods.GalacticraftCore; import static gregtech.api.enums.Mods.GalacticraftMars; @@ -6447,9 +6445,6 @@ public class AssemblerRecipes implements Runnable { } public void withBartWorks() { - if (!BartWorks.isModLoaded()) { - return; - } GT_Values.RA.stdBuilder() .itemInputs( @@ -6632,9 +6627,6 @@ public class AssemblerRecipes implements Runnable { } public void withGTNHLanthAndGTPP() { - if (!(GTNHLanthanides.isModLoaded() && GTPlusPlus.isModLoaded())) { - return; - } GT_Values.RA.stdBuilder() .itemInputs( diff --git a/src/main/java/gregtech/loaders/postload/recipes/AssemblyLineRecipes.java b/src/main/java/gregtech/loaders/postload/recipes/AssemblyLineRecipes.java index 8748c96654..8c6bfc8100 100644 --- a/src/main/java/gregtech/loaders/postload/recipes/AssemblyLineRecipes.java +++ b/src/main/java/gregtech/loaders/postload/recipes/AssemblyLineRecipes.java @@ -1,9 +1,7 @@ package gregtech.loaders.postload.recipes; -import static gregtech.api.enums.Mods.GTPlusPlus; import static gregtech.api.enums.Mods.GregTech; import static gregtech.api.enums.Mods.NewHorizonsCoreMod; -import static gregtech.api.enums.Mods.TecTech; import static gregtech.api.util.GT_RecipeBuilder.HOURS; import static gregtech.api.util.GT_RecipeBuilder.MINUTES; import static gregtech.api.util.GT_RecipeBuilder.SECONDS; @@ -31,8 +29,7 @@ public class AssemblyLineRecipes implements Runnable { private final Materials LuVMat; public AssemblyLineRecipes() { - solderIndalloy = GTPlusPlus.isModLoaded() ? FluidRegistry.getFluid("molten.indalloy140") - : FluidRegistry.getFluid("molten.solderingalloy"); + solderIndalloy = FluidRegistry.getFluid("molten.indalloy140"); LuVMat = ExternalMaterials.getRuridit(); } @@ -861,9 +858,7 @@ public class AssemblyLineRecipes implements Runnable { ItemList.Energy_Module.get(1), ItemList.Cover_WirelessNeedsMaintainance.get(1)) .itemOutputs(ItemList.TierdDrone1.get(4)) - .fluidInputs( - new FluidStack(solderIndalloy, 576), - FluidRegistry.getFluidStack(GTPlusPlus.isModLoaded() ? "fluid.rocketfuelmixc" : "nitrofuel", 4000)) + .fluidInputs(new FluidStack(solderIndalloy, 576), FluidRegistry.getFluidStack("fluid.rocketfuelmixc", 4000)) .duration(60 * SECONDS) .eut(TierEU.RECIPE_UV) .addTo(AssemblyLine); @@ -878,15 +873,13 @@ public class AssemblyLineRecipes implements Runnable { ItemList.Field_Generator_UV.get(16), ItemList.Gravistar.get(8), ItemList.Emitter_UV.get(4), - TecTech.isModLoaded() ? GT_ModHandler.getModItem(GregTech.ID, "gt.blockmachines", 16, 15497) - : ItemList.Hatch_AutoMaintenance.get(64), + GT_ModHandler.getModItem(GregTech.ID, "gt.blockmachines", 16, 15497), ItemList.Energy_Cluster.get(8), ItemList.Cover_WirelessNeedsMaintainance.get(1)) .itemOutputs(ItemList.TierdDrone2.get(1)) .fluidInputs( new FluidStack(solderIndalloy, 144000), - GTPlusPlus.isModLoaded() ? FluidRegistry.getFluidStack("molten.ethylcyanoacrylatesuperglue", 2000) - : Materials.AdvancedGlue.getFluid(256000)) + FluidRegistry.getFluidStack("molten.ethylcyanoacrylatesuperglue", 2000)) .duration(60 * SECONDS) .eut(TierEU.RECIPE_UHV) .addTo(AssemblyLine); diff --git a/src/main/java/gregtech/loaders/postload/recipes/BlastFurnaceRecipes.java b/src/main/java/gregtech/loaders/postload/recipes/BlastFurnaceRecipes.java index b05f585950..36bfb67de5 100644 --- a/src/main/java/gregtech/loaders/postload/recipes/BlastFurnaceRecipes.java +++ b/src/main/java/gregtech/loaders/postload/recipes/BlastFurnaceRecipes.java @@ -1,8 +1,6 @@ package gregtech.loaders.postload.recipes; import static gregtech.api.enums.Mods.BartWorks; -import static gregtech.api.enums.Mods.GTNHLanthanides; -import static gregtech.api.enums.Mods.GTPlusPlus; import static gregtech.api.recipe.RecipeMaps.blastFurnaceRecipes; import static gregtech.api.recipe.RecipeMaps.primitiveBlastRecipes; import static gregtech.api.util.GT_ModHandler.getModItem; @@ -631,31 +629,26 @@ public class BlastFurnaceRecipes implements Runnable { .metadata(COIL_HEAT, 1200) .addTo(blastFurnaceRecipes); - if (GTNHLanthanides.isModLoaded() && GTPlusPlus.isModLoaded()) { - - GT_Values.RA.stdBuilder() - .itemInputs(MaterialsUEVplus.TranscendentMetal.getDust(1), GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.ingotHot, MaterialsUEVplus.TranscendentMetal, 1)) - .fluidInputs(Materials.Tungsten.getMolten(144)) - .fluidOutputs(new FluidStack(FluidRegistry.getFluid("molten.celestialtungsten"), 72)) - .duration(3 * MINUTES) - .eut(32000000) - .metadata(COIL_HEAT, 11701) - .addTo(blastFurnaceRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(MaterialsUEVplus.TranscendentMetal.getDust(1), GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.ingotHot, MaterialsUEVplus.TranscendentMetal, 1)) + .fluidInputs(Materials.Tungsten.getMolten(144)) + .fluidOutputs(new FluidStack(FluidRegistry.getFluid("molten.celestialtungsten"), 72)) + .duration(3 * MINUTES) + .eut(32000000) + .metadata(COIL_HEAT, 11701) + .addTo(blastFurnaceRecipes); - // Rh + 3Cl = RhCl3 + // Rh + 3Cl = RhCl3 - GT_Values.RA.stdBuilder() - .itemInputs( - getModItem(BartWorks.ID, "gt.bwMetaGenerateddust", 1L, 78), - GT_Utility.getIntegratedCircuit(2)) - .itemOutputs(MaterialsKevlar.RhodiumChloride.getDust(4)) - .fluidInputs(Materials.Chlorine.getGas(3000)) - .duration(30 * SECONDS) - .eut((int) TierEU.RECIPE_HV) - .metadata(COIL_HEAT, 573) - .addTo(blastFurnaceRecipes); - } + GT_Values.RA.stdBuilder() + .itemInputs(getModItem(BartWorks.ID, "gt.bwMetaGenerateddust", 1L, 78), GT_Utility.getIntegratedCircuit(2)) + .itemOutputs(MaterialsKevlar.RhodiumChloride.getDust(4)) + .fluidInputs(Materials.Chlorine.getGas(3000)) + .duration(30 * SECONDS) + .eut((int) TierEU.RECIPE_HV) + .metadata(COIL_HEAT, 573) + .addTo(blastFurnaceRecipes); } public void registerPrimitiveBlastFurnaceRecipes() { diff --git a/src/main/java/gregtech/loaders/postload/recipes/ChemicalRecipes.java b/src/main/java/gregtech/loaders/postload/recipes/ChemicalRecipes.java index d099157c1c..5add456f34 100644 --- a/src/main/java/gregtech/loaders/postload/recipes/ChemicalRecipes.java +++ b/src/main/java/gregtech/loaders/postload/recipes/ChemicalRecipes.java @@ -1,7 +1,6 @@ package gregtech.loaders.postload.recipes; import static gregtech.api.enums.Mods.BartWorks; -import static gregtech.api.enums.Mods.GTNHLanthanides; import static gregtech.api.enums.Mods.GTPlusPlus; import static gregtech.api.enums.Mods.GalaxySpace; import static gregtech.api.enums.Mods.NewHorizonsCoreMod; @@ -3699,108 +3698,103 @@ public class ChemicalRecipes implements Runnable { .eut(30) .addTo(UniversalChemical); - if (BartWorks.isModLoaded()) { - // CaSi2 + 2HCl = 2Si + CaCl2 + 2H + // CaSi2 + 2HCl = 2Si + CaCl2 + 2H - GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.CalciumDisilicide, 3), - GT_Utility.getIntegratedCircuit(1)) - .itemOutputs( - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Silicon, 2), - getModItem(BartWorks.ID, "gt.bwMetaGenerateddust", 3L, 63)) - .fluidInputs(Materials.HydrochloricAcid.getFluid(2000)) - .fluidOutputs(Materials.Hydrogen.getGas(2000)) - .duration(45 * SECONDS) - .eut(30) - .addTo(UniversalChemical); - - // SiCl4 + 2Zn = 2ZnCl2 + Si + GT_Values.RA.stdBuilder() + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.CalciumDisilicide, 3), + GT_Utility.getIntegratedCircuit(1)) + .itemOutputs( + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Silicon, 2), + getModItem(BartWorks.ID, "gt.bwMetaGenerateddust", 3L, 63)) + .fluidInputs(Materials.HydrochloricAcid.getFluid(2000)) + .fluidOutputs(Materials.Hydrogen.getGas(2000)) |