aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gtPlusPlus
diff options
context:
space:
mode:
authorchochem <40274384+chochem@users.noreply.github.com>2024-08-21 12:37:02 +0100
committerGitHub <noreply@github.com>2024-08-21 11:37:02 +0000
commitde0452c4d800d671bc38757c85966850cfd4b8b2 (patch)
tree7822a54cb05382fd6bd15b4917bc59e87ed4e131 /src/main/java/gtPlusPlus
parent8130497452b4aa7df26f4b61672113775bcf0442 (diff)
downloadGT5-Unofficial-de0452c4d800d671bc38757c85966850cfd4b8b2.tar.gz
GT5-Unofficial-de0452c4d800d671bc38757c85966850cfd4b8b2.tar.bz2
GT5-Unofficial-de0452c4d800d671bc38757c85966850cfd4b8b2.zip
Fix full amp recipes (#2930)
* round 1 * RS-AL recipes * round 3 with a bit of cleanup * round 4 --------- Co-authored-by: Martin Robertz <dream-master@gmx.net>
Diffstat (limited to 'src/main/java/gtPlusPlus')
-rw-r--r--src/main/java/gtPlusPlus/core/item/chemistry/GenericChem.java6
-rw-r--r--src/main/java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java8
-rw-r--r--src/main/java/gtPlusPlus/core/recipe/RECIPES_General.java4
-rw-r--r--src/main/java/gtPlusPlus/core/recipe/RECIPES_Machines.java18
-rw-r--r--src/main/java/gtPlusPlus/core/recipe/RECIPES_SeleniumProcessing.java5
-rw-r--r--src/main/java/gtPlusPlus/plugin/agrichem/BioRecipes.java2
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/items/MetaGeneratedGregtechItems.java4
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoader_GlueLine.java8
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoader_MolecularTransformer.java2
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoader_Nuclear.java30
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechConduits.java53
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialMassFabricator.java4
-rw-r--r--src/main/java/gtPlusPlus/xmod/ic2/recipe/RECIPE_IC2.java8
13 files changed, 51 insertions, 101 deletions
diff --git a/src/main/java/gtPlusPlus/core/item/chemistry/GenericChem.java b/src/main/java/gtPlusPlus/core/item/chemistry/GenericChem.java
index 1a2da7c060..65bc52739d 100644
--- a/src/main/java/gtPlusPlus/core/item/chemistry/GenericChem.java
+++ b/src/main/java/gtPlusPlus/core/item/chemistry/GenericChem.java
@@ -728,7 +728,7 @@ public class GenericChem extends ItemPackage {
.fluidInputs(FluidUtils.getFluidStack(NitroBenzene, 1000), FluidUtils.getFluidStack("hydrogen", 6000))
.fluidOutputs(FluidUtils.getFluidStack(Aniline, 1000))
.duration(30 * SECONDS)
- .eut(500)
+ .eut(TierEU.RECIPE_HV)
.metadata(CHEMPLANT_CASING_TIER, 3)
.addTo(chemicalPlantRecipes);
@@ -746,7 +746,7 @@ public class GenericChem extends ItemPackage {
FluidUtils.getDistilledWater(10000))
.fluidOutputs(FluidUtils.getFluidStack(NitroBenzene, 5000))
.duration(30 * SECONDS)
- .eut(500)
+ .eut(TierEU.RECIPE_HV)
.metadata(CHEMPLANT_CASING_TIER, 4)
.addTo(chemicalPlantRecipes);
@@ -791,7 +791,7 @@ public class GenericChem extends ItemPackage {
.fluidOutputs(FluidUtils.getFluidStack("fluid.hydrogenperoxide", 1000))
.itemOutputs(ItemUtils.getItemStackOfAmountFromOreDict("dustLithiumPeroxide", 4))
.duration(100 * SECONDS)
- .eut(120)
+ .eut(TierEU.RECIPE_MV)
.noOptimize()
.addTo(chemicalDehydratorRecipes);
}
diff --git a/src/main/java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java b/src/main/java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java
index b1e6b976ff..9cc82b2f1d 100644
--- a/src/main/java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java
+++ b/src/main/java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java
@@ -812,7 +812,7 @@ public class RECIPES_GREGTECH {
ELEMENT.getInstance().CARBON.getDust(16))
.fluidInputs(Materials.SulfuricAcid.getFluid(1250))
.fluidOutputs(ELEMENT.getInstance().THALLIUM.getFluidStack(288))
- .eut(8000)
+ .eut(TierEU.RECIPE_IV)
.duration(1 * MINUTES + 15 * SECONDS)
.noOptimize()
.addTo(alloyBlastSmelterRecipes);
@@ -889,7 +889,7 @@ public class RECIPES_GREGTECH {
.outputChances(20_00, 5_00, 10, 7, 6, 5, 4, 3, 2)
.fluidInputs(FluidUtils.getFluidStack("sludge", 1000))
.fluidOutputs(Materials.Methane.getGas(100))
- .eut(500)
+ .eut(TierEU.RECIPE_HV)
.duration(2 * SECONDS)
.addTo(chemicalDehydratorRecipes);
@@ -1567,7 +1567,7 @@ public class RECIPES_GREGTECH {
.outputChances(100)
.fluidInputs(FluidUtils.getFluidStack("molten.bismuth", 1))
.duration(8 * HOURS + 20 * MINUTES)
- .eut(8160)
+ .eut(TierEU.RECIPE_IV)
.addTo(cyclotronRecipes);
// Americium
@@ -1627,7 +1627,7 @@ public class RECIPES_GREGTECH {
.outputChances(500)
.fluidInputs(FluidUtils.getFluidStack("deuterium", 400))
.duration(5 * SECONDS)
- .eut(2000)
+ .eut(TierEU.RECIPE_EV)
.addTo(cyclotronRecipes);
/*
diff --git a/src/main/java/gtPlusPlus/core/recipe/RECIPES_General.java b/src/main/java/gtPlusPlus/core/recipe/RECIPES_General.java
index 7a88062345..454810ae47 100644
--- a/src/main/java/gtPlusPlus/core/recipe/RECIPES_General.java
+++ b/src/main/java/gtPlusPlus/core/recipe/RECIPES_General.java
@@ -364,7 +364,7 @@ public class RECIPES_General {
// No Material for void, natch.
if (Thaumcraft.isModLoaded()) {
- generatePipeRecipes(GT_Materials.Void.mDefaultLocalName, GT_Materials.Void.getMass(), 16);
+ generatePipeRecipes(GT_Materials.Void.mDefaultLocalName, GT_Materials.Void.getMass(), 15);
}
Material[] gtpp = new Material[] { ALLOY.STABALLOY, ALLOY.TANTALLOY_60, ALLOY.TANTALLOY_61, ALLOY.POTIN,
@@ -385,7 +385,7 @@ public class RECIPES_General {
continue;
}
}
- int tVoltageMultiplier = (e.mBlastFurnaceTemp >= 2800) ? 64 : 16;
+ int tVoltageMultiplier = (e.mBlastFurnaceTemp >= 2800) ? 60 : 15;
generatePipeRecipes(e.mDefaultLocalName, e.getMass(), tVoltageMultiplier);
}
diff --git a/src/main/java/gtPlusPlus/core/recipe/RECIPES_Machines.java b/src/main/java/gtPlusPlus/core/recipe/RECIPES_Machines.java
index ac940aeecf..f8acb12367 100644
--- a/src/main/java/gtPlusPlus/core/recipe/RECIPES_Machines.java
+++ b/src/main/java/gtPlusPlus/core/recipe/RECIPES_Machines.java
@@ -949,7 +949,7 @@ public class RECIPES_Machines {
.itemOutputs(GregtechItemList.Gregtech_Computer_Cube.get(1))
.fluidInputs(ELEMENT.getInstance().TANTALUM.getFluidStack(144 * 16))
.duration(3 * MINUTES)
- .eut(8000)
+ .eut(TierEU.RECIPE_IV)
.addTo(assemblerRecipes);
// Circuit programmer
GT_Values.RA.stdBuilder()
@@ -986,7 +986,7 @@ public class RECIPES_Machines {
.itemOutputs(GregtechItemList.RTG.get(1))
.fluidInputs(ALLOY.NIOBIUM_CARBIDE.getFluidStack(144 * 16))
.duration(10 * MINUTES)
- .eut(8000)
+ .eut(TierEU.RECIPE_IV)
.addTo(assemblerRecipes);
// Super Jukebox
GT_Values.RA.stdBuilder()
@@ -1024,7 +1024,7 @@ public class RECIPES_Machines {
.itemOutputs(ItemUtils.getSimpleStack(ModBlocks.blockPooCollector, 8, 1))
.fluidInputs(CI.getAlternativeTieredFluid(5, 144 * 9))
.duration(5 * MINUTES)
- .eut(500)
+ .eut(TierEU.RECIPE_HV)
.addTo(assemblerRecipes);
ItemStack aBronzeBricks = ItemUtils.simpleMetaStack(GregTech_API.sBlockCasings1, 10, 1);
@@ -1960,7 +1960,7 @@ public class RECIPES_Machines {
.itemOutputs(washers.get(i))
.fluidInputs(CI.getTieredFluid(tier, 144 * tier))
.duration(20 * 5 * tier)
- .eut(GT_Values.V[tier])
+ .eut(GT_Values.VP[tier])
.addTo(assemblerRecipes);
}
@@ -2249,7 +2249,7 @@ public class RECIPES_Machines {
CI.fieldGenerator_HV)
.itemOutputs(controlCircuit)
.duration(4 * MINUTES)
- .eut(500)
+ .eut(TierEU.RECIPE_HV)
.addTo(assemblerRecipes);
// Fission Fuel Plant
@@ -2906,7 +2906,7 @@ public class RECIPES_Machines {
.itemOutputs(GregtechItemList.Casing_BedrockMiner.get(1))
.fluidInputs(ALLOY.MARAGING350.getFluidStack(144 * 16 * 1))
.duration((int) GT_Values.V[4])
- .eut(GT_Values.V[6])
+ .eut(TierEU.RECIPE_LuV)
.addTo(assemblerRecipes);
int aCostMultiplier = 1;
@@ -3355,7 +3355,7 @@ public class RECIPES_Machines {
.itemInputs(CI.getTieredMachineCasing(i))
.itemOutputs(aTier[i])
.duration(i * 5 * SECONDS)
- .eut(GT_Values.V[i])
+ .eut(GT_Values.VP[i])
.addTo(cutterRecipes);
}
}
@@ -3400,7 +3400,7 @@ public class RECIPES_Machines {
.itemOutputs(mSuperBusesInput[tier - 1].get(1))
.fluidInputs(CI.getAlternativeTieredFluid(tier, 144 * 8))
.duration(60 * SECONDS)
- .eut(GT_Values.V[tier])
+ .eut(GT_Values.VP[tier])
.addTo(assemblerRecipes);
}
@@ -3417,7 +3417,7 @@ public class RECIPES_Machines {
.itemOutputs(mSuperBusesOutput[tier - 1].get(1))
.fluidInputs(CI.getTertiaryTieredFluid(tier, 144 * 8))
.duration(60 * SECONDS)
- .eut(GT_Values.V[tier])
+ .eut(GT_Values.VP[tier])
.addTo(assemblerRecipes);
}
diff --git a/src/main/java/gtPlusPlus/core/recipe/RECIPES_SeleniumProcessing.java b/src/main/java/gtPlusPlus/core/recipe/RECIPES_SeleniumProcessing.java
index 1192a68d45..454e24f0d1 100644
--- a/src/main/java/gtPlusPlus/core/recipe/RECIPES_SeleniumProcessing.java
+++ b/src/main/java/gtPlusPlus/core/recipe/RECIPES_SeleniumProcessing.java
@@ -9,6 +9,7 @@ import static gtPlusPlus.api.recipe.GTPPRecipeMaps.chemicalDehydratorRecipes;
import gregtech.api.enums.GT_Values;
import gregtech.api.enums.Materials;
import gregtech.api.enums.OrePrefixes;
+import gregtech.api.enums.TierEU;
import gregtech.api.util.GT_Utility;
import gtPlusPlus.core.material.ELEMENT;
import gtPlusPlus.core.material.MISC_MATERIALS;
@@ -43,7 +44,7 @@ public class RECIPES_SeleniumProcessing {
.fluidInputs(FluidUtils.getHotWater(4000))
.fluidOutputs(MISC_MATERIALS.SELENIOUS_ACID.getFluidStack(1000))
.duration(24 * SECONDS)
- .eut(2048)
+ .eut(TierEU.RECIPE_EV)
.addTo(pyrolyseRecipes);
// Make Selenium
@@ -53,7 +54,7 @@ public class RECIPES_SeleniumProcessing {
.outputChances(100_00, 20_00)
.fluidInputs(MISC_MATERIALS.SELENIOUS_ACID.getFluidStack(750), Materials.SulfuricAcid.getFluid(8000))
.fluidOutputs(ELEMENT.getInstance().SELENIUM.getFluidStack(144 * 1))
- .eut(7200)
+ .eut(TierEU.RECIPE_IV)
.duration(5 * MINUTES)
.addTo(alloyBlastSmelterRecipes);
}
diff --git a/src/main/java/gtPlusPlus/plugin/agrichem/BioRecipes.java b/src/main/java/gtPlusPlus/plugin/agrichem/BioRecipes.java
index 30011cddbc..de5e010350 100644
--- a/src/main/java/gtPlusPlus/plugin/agrichem/BioRecipes.java
+++ b/src/main/java/gtPlusPlus/plugin/agrichem/BioRecipes.java
@@ -675,7 +675,7 @@ public class BioRecipes {
FluidUtils.getFluidStack(BioRecipes.mAcetone, 9000),
FluidUtils.getFluidStack(BioRecipes.mEthanol, 3000))
.duration(100 * SECONDS)
- .eut(32)
+ .eut(TierEU.RECIPE_LV)
.metadata(CHEMPLANT_CASING_TIER, 1)
.noOptimize()
.addTo(chemicalPlantRecipes);
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/items/MetaGeneratedGregtechItems.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/items/MetaGeneratedGregtechItems.java
index 3cd82939d4..ec9416be02 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/items/MetaGeneratedGregtechItems.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/items/MetaGeneratedGregtechItems.java
@@ -341,14 +341,14 @@ public class MetaGeneratedGregtechItems extends Gregtech_MetaItem_X32 {
GT_Values.RA.stdBuilder()
.itemInputs(GregtechItemList.Pellet_RTG_SR90.get(1))
.duration(0)
- .eut(32)
+ .eut(TierEU.RECIPE_LV)
.metadata(RTG_DURATION_IN_DAYS, MathUtils.roundToClosestInt(28.8f))
.addTo(rtgFuels);
GT_Values.RA.stdBuilder()
.itemInputs(GregtechItemList.Pellet_RTG_PO210.get(1))
.duration(0)
- .eut(TierEU.HV)
+ .eut(TierEU.RECIPE_HV)
.metadata(RTG_DURATION_IN_DAYS, 1)
.addTo(rtgFuels);
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoader_GlueLine.java b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoader_GlueLine.java
index 40cf569df6..da4a68d7f5 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoader_GlueLine.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoader_GlueLine.java
@@ -62,7 +62,7 @@ public class RecipeLoader_GlueLine {
FluidUtils.getFluidStack("methylacetate", 1000))
.fluidOutputs(MISC_MATERIALS.ACETIC_ANHYDRIDE.getFluidStack(1000))
.duration(10 * SECONDS)
- .eut(500)
+ .eut(TierEU.RECIPE_HV)
.metadata(CHEMPLANT_CASING_TIER, 3)
.addTo(chemicalPlantRecipes);
GT_Values.RA.stdBuilder()
@@ -129,7 +129,7 @@ public class RecipeLoader_GlueLine {
FluidUtils.getFluidStack(BioRecipes.mFormaldehyde, 100))
.fluidOutputs(MISC_MATERIALS.CYANOACRYLATE_POLYMER.getFluidStack(100), FluidUtils.getWater(1000))
.duration(10 * SECONDS)
- .eut(8000)
+ .eut(TierEU.RECIPE_IV)
.metadata(CHEMPLANT_CASING_TIER, 5)
.addTo(chemicalPlantRecipes);
// CH4 + NH3 + 3O = HCN + 3H2O
@@ -141,7 +141,7 @@ public class RecipeLoader_GlueLine {
FluidUtils.getFluidStack("oxygen", 6000))
.fluidOutputs(MISC_MATERIALS.HYDROGEN_CYANIDE.getFluidStack(2000), FluidUtils.getWater(6000))
.duration(10 * SECONDS)
- .eut(500)
+ .eut(TierEU.RECIPE_HV)
.metadata(CHEMPLANT_CASING_TIER, 3)
.addTo(chemicalPlantRecipes);
@@ -234,7 +234,7 @@ public class RecipeLoader_GlueLine {
.fluidInputs(MISC_MATERIALS.CYANOACRYLATE_POLYMER.getFluidStack(100))
.fluidOutputs(MISC_MATERIALS.ETHYL_CYANOACRYLATE.getFluidStack(100))
.duration(45 * SECONDS)
- .eut(500)
+ .eut(TierEU.RECIPE_HV)
.addTo(fluidHeaterRecipes);
}
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoader_MolecularTransformer.java b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoader_MolecularTransformer.java
index df9ef3b1b3..b1d71ca120 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoader_MolecularTransformer.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoader_MolecularTransformer.java
@@ -80,7 +80,7 @@ public class RecipeLoader_MolecularTransformer {
.itemInputs(GT_ModHandler.getModItem(GalaxySpace.ID, "item.GlowstoneDusts", 1L, 4))
.itemOutputs(GT_ModHandler.getModItem(AdvancedSolarPanel.ID, "asp_crafting_items", 1L, 9))
.duration(1 * TICKS)
- .eut(1996080)
+ .eut(TierEU.RECIPE_UHV)
.addTo(molecularTransformerRecipes);
}
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoader_Nuclear.java b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoader_Nuclear.java
index e6e529ff3a..d8faac834d 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoader_Nuclear.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoader_Nuclear.java
@@ -82,7 +82,7 @@ public class RecipeLoader_Nuclear {
.itemInputs(FLUORIDES.LITHIUM_FLUORIDE.getDust(4), FLUORIDES.BERYLLIUM_FLUORIDE.getDust(3))
.itemOutputs(NUCLIDE.Li2BeF4.getDust(7))
.duration(2 * MINUTES + 20 * SECONDS)
- .eut(2000)
+ .eut(TierEU.RECIPE_EV)
.metadata(COIL_HEAT, 3000)
.addTo(blastFurnaceRecipes);
@@ -389,7 +389,7 @@ public class RecipeLoader_Nuclear {
.itemOutputs(FLUORIDES.ZIRCONIUM_TETRAFLUORIDE.getDust(1))
.fluidInputs(FluidUtils.getFluidStack("hydrofluoricacid", 400))
.fluidOutputs(aHydrogenChloride)
- .eut(500)
+ .eut(TierEU.RECIPE_HV)
.duration(15 * SECONDS)
.addTo(chemicalDehydratorRecipes);
@@ -401,7 +401,7 @@ public class RecipeLoader_Nuclear {
.itemOutputs(FLUORIDES.ZIRCONIUM_TETRAFLUORIDE.getDust(1))
.fluidInputs(FluidUtils.getFluidStack("hydrofluoricacid_gt5u", 800))
.fluidOutputs(aHydrogenChloride)
- .eut(500)
+ .eut(TierEU.RECIPE_HV)
.duration(30 * SECONDS)
.addTo(chemicalDehydratorRecipes);
@@ -497,7 +497,7 @@ public class RecipeLoader_Nuclear {
.itemInputs(NUCLIDE.Li2BeF4.getDust(1))
.fluidOutputs(NUCLIDE.Li2BeF4.getFluidStack(144))
.duration(5 * SECONDS)
- .eut(500)
+ .eut(TierEU.RECIPE_HV)
.addTo(fluidExtractionRecipes);
// Lithium Fluoride
@@ -505,7 +505,7 @@ public class RecipeLoader_Nuclear {
.itemInputs(ItemUtils.getItemStackOfAmountFromOreDict("dustLithiumFluoride", 1))
.fluidOutputs(FLUORIDES.LITHIUM_FLUORIDE.getFluidStack(144))
.duration(5 * SECONDS)
- .eut(500)
+ .eut(TierEU.RECIPE_HV)
.addTo(fluidExtractionRecipes);
// LFTR Fuel 1
@@ -527,7 +527,7 @@ public class RecipeLoader_Nuclear {
.itemInputs(NUCLIDE.LiFBeF2ThF4UF4.getDust(1))
.fluidOutputs(NUCLIDE.LiFBeF2ThF4UF4.getFluidStack(144))
.duration(7 * SECONDS + 10 * TICKS)
- .eut(2000)
+ .eut(TierEU.RECIPE_EV)
.addTo(fluidExtractionRecipes);
// ZIRCONIUM_TETRAFLUORIDE
@@ -640,7 +640,7 @@ public class RecipeLoader_Nuclear {
.fluidInputs(FluidUtils.getFluidStack("hydrofluoricacid", 10000))
.fluidOutputs(FLUORIDES.URANIUM_TETRAFLUORIDE.getFluidStack(3600))
.duration(2 * MINUTES + 30 * SECONDS)
- .eut(500)
+ .eut(TierEU.RECIPE_HV)
.addTo(mixerRecipes);
}
@@ -658,7 +658,7 @@ public class RecipeLoader_Nuclear {
ItemUtils.getItemStackOfAmountFromOreDict("dustHafnium", 1))
.outputChances(5000, 278, 1000, 1000, 300, 300)
.duration(30 * SECONDS)
- .eut(500)
+ .eut(TierEU.RECIPE_HV)
.addTo(sifterRecipes);
GT_Values.RA.stdBuilder()
.itemInputs(ItemUtils.getItemStackOfAmountFromOreDict("crushedPurifiedTin", 1))
@@ -671,7 +671,7 @@ public class RecipeLoader_Nuclear {
ItemUtils.getItemStackOfAmountFromOreDict("dustZirconium", 1))
.outputChances(10000, 556, 1500, 1000, 500, 500)
.duration(30 * SECONDS)
- .eut(500)
+ .eut(TierEU.RECIPE_HV)
.addTo(sifterRecipes);
GT_Values.RA.stdBuilder()
.itemInputs(ItemUtils.getItemStackOfAmountFromOreDict("crushedPurifiedCassiterite", 1))
@@ -684,7 +684,7 @@ public class RecipeLoader_Nuclear {
ItemUtils.getItemStackOfAmountFromOreDict("dustZirconium", 1))
.outputChances(10000, 556, 1500, 1000, 500, 500)
.duration(30 * SECONDS)
- .eut(500)
+ .eut(TierEU.RECIPE_HV)
.addTo(sifterRecipes);
// Radium
GT_Values.RA.stdBuilder()
@@ -698,7 +698,7 @@ public class RecipeLoader_Nuclear {
ItemUtils.getItemStackOfAmountFromOreDict("dustRadium226", 1))
.outputChances(10000, 500, 300, 200, 100, 100)
.duration(30 * SECONDS)
- .eut(500)
+ .eut(TierEU.RECIPE_HV)
.addTo(sifterRecipes);
GT_Values.RA.stdBuilder()
.itemInputs(ItemUtils.getItemStackOfAmountFromOreDict("crushedPurifiedUranium", 1))
@@ -711,7 +711,7 @@ public class RecipeLoader_Nuclear {
ItemUtils.getItemStackOfAmountFromOreDict("dustRadium226", 1))
.outputChances(10000, 556, 1000, 500, 500, 500)
.duration(30 * SECONDS)
- .eut(500)
+ .eut(TierEU.RECIPE_HV)
.addTo(sifterRecipes);
GT_Values.RA.stdBuilder()
.itemInputs(ItemUtils.getItemStackOfAmountFromOreDict("crushedPurifiedUraninite", 1))
@@ -724,7 +724,7 @@ public class RecipeLoader_Nuclear {
ItemUtils.getItemStackOfAmountFromOreDict("dustRadium226", 1))
.outputChances(10000, 556, 500, 250, 250, 250)
.duration(30 * SECONDS)
- .eut(500)
+ .eut(TierEU.RECIPE_HV)
.addTo(sifterRecipes);
GT_Values.RA.stdBuilder()
.itemInputs(ItemUtils.getItemStackOfAmountFromOreDict("crushedPurifiedPitchblende", 1))
@@ -737,7 +737,7 @@ public class RecipeLoader_Nuclear {
ItemUtils.getItemStackOfAmountFromOreDict("dustRadium226", 1))
.outputChances(10000, 556, 500, 250, 250, 250)
.duration(30 * SECONDS)
- .eut(500)
+ .eut(TierEU.RECIPE_HV)
.addTo(sifterRecipes);
}
@@ -747,7 +747,7 @@ public class RecipeLoader_Nuclear {
.itemInputs(FLUORIDES.SODIUM_FLUORIDE.getDust(1))
.fluidOutputs(FLUORIDES.SODIUM_FLUORIDE.getFluidStack(144))
.duration(30 * SECONDS)
- .eut(500)
+ .eut(TierEU.RECIPE_HV)
.addTo(fluidHeaterRecipes);
}
}
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechConduits.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechConduits.java
index f747b8bc20..9b12d4ca11 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechConduits.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechConduits.java
@@ -157,15 +157,6 @@ public class GregtechConduits {
Logger.INFO("Failed during Hexadecuple pipe generation. [Ecx]");
e.printStackTrace();
}
-
- // Generate Heat Pipes
- // GregtechItemList.HeatPipe_Tier_1.set(new GT_MetaPipeEntity_Heat(31021, "gtpp.pipe.heat.basic.01", "Lead Heat
- // Pipe (500C)", Materials.Lead, 500).getStackForm(1L));
- // GregtechItemList.HeatPipe_Tier_2.set(new GT_MetaPipeEntity_Heat(31022, "gtpp.pipe.heat.basic.02", "Iron Heat
- // Pipe (500C)", Materials.Iron, 500).getStackForm(1L));
- // GregtechItemList.HeatPipe_Tier_3.set(new GT_MetaPipeEntity_Heat(31023, "gtpp.pipe.heat.basic.03", "Silver
- // Heat Pipe (1500C)", Materials.Silver, 1500).getStackForm(1L));
-
}
private static void generateFluidMultiPipes(Constructor<GT_MetaPipeEntity_Fluid> aClazz, Materials aMaterial,
@@ -636,37 +627,6 @@ public class GregtechConduits {
}
}
- private static void superConductorFactory(final GT_Materials Material, final int Voltage, final int ID,
- final long insulatedLoss, final long uninsulatedLoss, final long Amps) {
- final GT_Materials T = Material;
- int V = 0;
- if (Voltage == 8) {
- V = 0;
- } else if (Voltage == 32) {
- V = 1;
- } else if (Voltage == 128) {
- V = 2;
- } else if (Voltage == 512) {
- V = 3;
- } else if (Voltage == 2048) {
- V = 4;
- } else if (Voltage == 8196) {
- V = 5;
- } else if (Voltage == 32768) {
- V = 6;
- } else if (Voltage == 131072) {
- V = 7;
- } else if (Voltage == 524288) {
- V = 8;
- } else if (Voltage == Integer.MAX_VALUE) {
- V = 9;
- } else {
- Logger.ERROR("Failed to set voltage on " + Material.name() + ". Invalid voltage of " + Voltage + "V set.");
- Logger.ERROR(Material.name() + " has defaulted to 8v.");
- V = 0;
- }
- }
-
private static void generateGTFluidPipes(final Materials material, final int startID, final int transferRatePerSec,
final int heatResistance, final boolean isGasProof) {
final int transferRatePerTick = transferRatePerSec / 20;
@@ -727,20 +687,11 @@ public class GregtechConduits {
transferRatePerTick * 48,
heatResistance,
isGasProof).getStackForm(1L));
- // generatePipeRecipes(material.mDefaultLocalName, mass, voltage);
}
private static void generateNonGTFluidPipes(final GT_Materials material, final Material myMaterial,
final int startID, final int transferRatePerSec, final int heatResistance, final boolean isGasProof) {
final int transferRatePerTick = transferRatePerSec / 20;
- long mass;
- if (myMaterial != null) {
- mass = myMaterial.getMass();
- } else {
- mass = ELEMENT.getInstance().IRON.getMass();
- }
-
- int tVoltageMultiplier = (material.mBlastFurnaceTemp >= 2800) ? 64 : 16;
GT_OreDictUnificator.registerOre(
OrePrefixes.pipeTiny.get(material),
@@ -797,7 +748,6 @@ public class GregtechConduits {
transferRatePerTick * 48,
heatResistance,
isGasProof).getStackForm(1L));
- // generatePipeRecipes(material.mDefaultLocalName, mass, tVoltageMultiplier);
}
@@ -844,8 +794,7 @@ public class GregtechConduits {
+ "? "
+ ((ItemUtils.getItemStackOfAmountFromOreDict("pipe" + "Huge" + output, 1) != null) ? true : false));
- int eut = 120;
- eut = (int) (8 * vMulti);
+ int eut = (int) (8 * vMulti);
// Add the Three Shaped Recipes First
RecipeUtils.addShapedRecipe(
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialMassFabricator.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialMassFabricator.java
index c3233bf0d5..c3cfd04418 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialMassFabricator.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialMassFabricator.java
@@ -45,7 +45,7 @@ public class GregtechIndustrialMassFabricator {
ItemUtils.getSimpleStack(ItemUtils.getItemFromFQRN("IC2:itemScrap"), 9))
.fluidOutputs(Materials.UUAmplifier.getFluid(1))
.duration(9 * SECONDS)
- .eut(TierEU.LV)
+ .eut(TierEU.RECIPE_LV)
.noOptimize()
.addTo(multiblockMassFabricatorRecipes);
@@ -56,7 +56,7 @@ public class GregtechIndustrialMassFabricator {
ItemUtils.getSimpleStack(ItemUtils.getItemFromFQRN("IC2:itemScrapbox")))
.fluidOutputs(Materials.UUAmplifier.getFluid(1))
.duration(9 * SECONDS)
- .eut(TierEU.LV)
+ .eut(TierEU.RECIPE_LV)
.noOptimize()
.addTo(multiblockMassFabricatorRecipes);
diff --git a/src/main/java/gtPlusPlus/xmod/ic2/recipe/RECIPE_IC2.java b/src/main/java/gtPlusPlus/xmod/ic2/recipe/RECIPE_IC2.java
index 9c3f501dfc..921feffbd0 100644
--- a/src/main/java/gtPlusPlus/xmod/ic2/recipe/RECIPE_IC2.java
+++ b/src/main/java/gtPlusPlus/xmod/ic2/recipe/RECIPE_IC2.java
@@ -243,7 +243,7 @@ public class RECIPE_IC2 {
.itemInputs(GT_Utility.copyAmount(9L, block_T2), GregtechItemList.Shape_Extruder_WindmillShaft.get(0L))
.itemOutputs(shaft_T2)
.duration(4 * MINUTES + 16 * SECONDS)
- .eut(500)
+ .eut(TierEU.RECIPE_HV)
.addTo(extruderRecipes);
GT_Values.RA.stdBuilder()
.itemInputs(
@@ -251,7 +251,7 @@ public class RECIPE_IC2 {
GregtechItemList.Shape_Extruder_WindmillShaft.get(0L))
.itemOutputs(shaft_T2)
.duration(4 * MINUTES + 16 * SECONDS)
- .eut(500)
+ .eut(TierEU.RECIPE_HV)
.addTo(extruderRecipes);
Logger.INFO("Added recipe for GT5 Extruder: Windmill Shaft [TungstenSteel]");
@@ -259,7 +259,7 @@ public class RECIPE_IC2 {
.itemInputs(GT_Utility.copyAmount(9L, block_T3), GregtechItemList.Shape_Extruder_WindmillShaft.get(0L))
.itemOutputs(shaft_T3)
.duration(8 * MINUTES + 32 * SECONDS)
- .eut(2000)
+ .eut(TierEU.RECIPE_EV)
.addTo(extruderRecipes);
GT_Values.RA.stdBuilder()
.itemInputs(
@@ -267,7 +267,7 @@ public class RECIPE_IC2 {
GregtechItemList.Shape_Extruder_WindmillShaft.get(0L))
.itemOutputs(shaft_T3)
.duration(8 * MINUTES + 32 * SECONDS)
- .eut(2000)
+ .eut(TierEU.RECIPE_EV)
.addTo(extruderRecipes);
Logger.INFO("Added recipe for GT5 Extruder: Windmill Shaft [Vibrant]");