aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/Java/gtPlusPlus/core/item/chemistry/RocketFuels.java20
-rw-r--r--src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java126
2 files changed, 71 insertions, 75 deletions
diff --git a/src/Java/gtPlusPlus/core/item/chemistry/RocketFuels.java b/src/Java/gtPlusPlus/core/item/chemistry/RocketFuels.java
index bbdf322817..25151a91c5 100644
--- a/src/Java/gtPlusPlus/core/item/chemistry/RocketFuels.java
+++ b/src/Java/gtPlusPlus/core/item/chemistry/RocketFuels.java
@@ -19,6 +19,7 @@ import gtPlusPlus.core.util.math.MathUtils;
import gtPlusPlus.core.util.minecraft.FluidUtils;
import gtPlusPlus.core.util.minecraft.ItemUtils;
import gtPlusPlus.core.util.minecraft.MaterialUtils;
+import gtPlusPlus.core.item.chemistry.*;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraftforge.fluids.Fluid;
@@ -82,19 +83,24 @@ public class RocketFuels extends ItemPackage {
}
public static void createNitrogenTetroxide(){
- CORE.RA.addDehydratorRecipe(
+ CORE.RA.addChemicalPlantRecipe(
new ItemStack[]{
- ItemUtils.getItemStackOfAmountFromOreDict("dustCopper", 4)
+ ItemUtils.getItemStackOfAmountFromOreDict("dustCopper", 4),
+ ItemUtils.getSimpleStack(mOrangeCatalyst, 0),
},
- FluidUtils.getFluidStack("nitricacid", 2000),
- FluidUtils.getFluidStack(Nitrogen_Tetroxide, 450),
+ new FluidStack[] {
+ FluidUtils.getFluidStack("nitricacid", 2000)
+ },
new ItemStack[]{
ItemUtils.getItemStackOfAmountFromOreDict("dustTinyAsh", 1),
ItemUtils.getItemStackOfAmountFromOreDict("dustTinyDarkAsh", 1)
},
- new int[]{100, 50},
+ new FluidStack[] {
+ FluidUtils.getFluidStack(Nitrogen_Tetroxide, 2000),
+ },
20*16,
- 500);
+ 500,
+ 4);
}
public static void createHydrazine(){
@@ -125,7 +131,7 @@ public class RocketFuels extends ItemPackage {
FluidUtils.getFluidStack("hydrogen", 2000),
FluidUtils.getFluidStack(Monomethylhydrazine, 3000),
new ItemStack[] {
- CI.emptyCells(4)
+ CI.emptyCells(2)
},
new int[] {10000},
20*48,
diff --git a/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java b/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java
index 52de45efa5..db382836ce 100644
--- a/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java
+++ b/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java
@@ -109,6 +109,9 @@ public class RECIPES_GREGTECH {
addFuels();
}
+
+ static int[] aVoltageRecipe = {8,30,120,480,1920,7680,30720,122880,491520,1966080};
+
private static void chemplantRecipes() {
@@ -191,7 +194,7 @@ public class RECIPES_GREGTECH {
ALLOY.QUANTUM.getFluid(256),
ELEMENT.STANDALONE.HYPOGEN.getFluid(4),
2048 * 4,
- (int) GT_Values.V[9],
+ (int) aVoltageRecipe[9],
600000000 * 2);
//Rhugnor
@@ -200,7 +203,7 @@ public class RECIPES_GREGTECH {
ALLOY.PIKYONIUM.getFluid(128),
ELEMENT.STANDALONE.RHUGNOR.getFluid(8),
2048 * 4,
- (int) GT_Values.V[7],
+ (int) aVoltageRecipe[7],
150000000 * 2);
}
@@ -211,9 +214,9 @@ public class RECIPES_GREGTECH {
ItemStack[] aCoilWire = new ItemStack[] {
ItemUtils.simpleMetaStack("miscutils:itemDehydratorCoilWire", 0, GTNH ? 64 : 32),
- ItemUtils.simpleMetaStack("miscutils:itemDehydratorCoilWire", 1, GTNH ? 48 : 16),
- ItemUtils.simpleMetaStack("miscutils:itemDehydratorCoilWire", 2, GTNH ? 32 : 8),
- ItemUtils.simpleMetaStack("miscutils:itemDehydratorCoilWire", 3, GTNH ? 16 : 4),
+ ItemUtils.simpleMetaStack("miscutils:itemDehydratorCoilWire", 1, GTNH ? 64 : 32),
+ ItemUtils.simpleMetaStack("miscutils:itemDehydratorCoilWire", 2, GTNH ? 64 : 32),
+ ItemUtils.simpleMetaStack("miscutils:itemDehydratorCoilWire", 3, GTNH ? 64 : 32),
};
@@ -248,7 +251,7 @@ public class RECIPES_GREGTECH {
},
ItemUtils.getSimpleStack(ModBlocks.blockCasings3Misc, 15, 32),
20 * 60 * 10 * (GTNH ? 2 : 1),
- (int) GT_Values.V[6]);
+ (int) aVoltageRecipe[6]);
//Slow Fusion Controller
CORE.RA.addAssemblylineRecipe(
@@ -276,7 +279,7 @@ public class RECIPES_GREGTECH {
},
GregtechItemList.Miniature_Fusion.get(1),
20 * 60 * 5 * (GTNH ? 2 : 1),
- (int) GT_Values.V[7]);
+ (int) aVoltageRecipe[7]);
//Plasma Tank
@@ -299,7 +302,7 @@ public class RECIPES_GREGTECH {
},
GregtechItemList.Plasma_Tank.get(1),
20 * 60 * 1 * (GTNH ? 2 : 1),
- (int) GT_Values.V[5]);
+ (int) aVoltageRecipe[5]);
// Turbine Automation Port
CORE.RA.addAssemblylineRecipe(
@@ -328,7 +331,7 @@ public class RECIPES_GREGTECH {
},
GregtechItemList.Hatch_Input_TurbineHousing.get(4),
20 * 60 * 60 * (GTNH ? 2 : 1),
- (int) GT_Values.V[8]);
+ (int) aVoltageRecipe[8]);
/*
@@ -354,21 +357,20 @@ public class RECIPES_GREGTECH {
aResearch[aCasingSlot],
20 * 60 * 60,
new ItemStack[] {
- CI.getTieredComponent(OrePrefixes.plate, j-1, GTNH ? 32 : 16),
- CI.getTieredComponent(OrePrefixes.circuit, j-2, GTNH ? 16 : 8),
- CI.getTieredComponent(OrePrefixes.cableGt08, j+1, GTNH ? 32 : 16),
- CI.getTieredComponent(OrePrefixes.gearGt, j-1, GTNH ? 8 : 4),
+ CI.getTieredComponent(OrePrefixes.plate, j-1,16),
+ CI.getTieredComponent(OrePrefixes.cableGt08, j+1,(GTNH ? 32 : 16)),
+ CI.getTieredComponent(OrePrefixes.gearGt, j-1, 4),
aCoilWire[aCasingSlot]
},
new FluidStack[] {
- CI.getTieredFluid(j, 144 * 3 * (GTNH ? 16 : 8)),
- CI.getTertiaryTieredFluid(j-2, 144 * 4 * (GTNH ? 16 : 8)),
- CI.getAlternativeTieredFluid(j, 144 * 6 * (GTNH ? 16 : 8)),
+ CI.getTieredFluid(j, 144 *(GTNH ? 8 : 4)),
+ CI.getTertiaryTieredFluid(j-2, 144 * (GTNH ? 16 : 8)),
+ CI.getAlternativeTieredFluid(j, 144 * (GTNH ? 16 : 12)),
},
aGemCasings[aCasingSlot++],
20 * 60 * 1 * (GTNH ? 2 : 1),
- (int) GT_Values.V[j]);
+ (int) aVoltageRecipe[j]);
}
/*
@@ -395,22 +397,22 @@ public class RECIPES_GREGTECH {
20 * 60 * 60 * 5,
new ItemStack[] {
aGemCasings[aCasingSlot],
- ItemUtils.getSimpleStack(aExoticInputs[aCasingSlot], GTNH ? 32 : 16),
- CI.getTieredComponent(OrePrefixes.plate, j, GTNH ? 32 : 16),
- CI.getTieredComponent(OrePrefixes.circuit, j, GTNH ? 16 : 8),
+ ItemUtils.getSimpleStack(aExoticInputs[aCasingSlot], 16),
+ CI.getTieredComponent(OrePrefixes.plate, j, 16),
+ CI.getTieredComponent(OrePrefixes.circuit, j, 8),
CI.getTieredComponent(OrePrefixes.wireGt16, j+1, GTNH ? 32 : 16),
CI.getTieredComponent(OrePrefixes.bolt, j, GTNH ? 8 : 4),
CI.getTieredComponent(OrePrefixes.screw, j-1, GTNH ? 8 : 4),
},
new FluidStack[] {
- CI.getTieredFluid(j, 144 * 3 * (GTNH ? 16 : 8)),
- CI.getTertiaryTieredFluid(j-2, 144 * 4 * (GTNH ? 16 : 8)),
- CI.getAlternativeTieredFluid(j, 144 * 6 * (GTNH ? 16 : 8)),
- CI.getTertiaryTieredFluid(j-1, 144 * 5 * (GTNH ? 16 : 8)),
+ CI.getTieredFluid(j, 144 * 1 * (GTNH ? 16 : 8)),
+ CI.getTertiaryTieredFluid(j-2, 144 * 2 * (GTNH ? 16 : 8)),
+ CI.getAlternativeTieredFluid(j, 144 * (GTNH ? 16 : 8)),
+ CI.getTertiaryTieredFluid(j-1, 144 * (GTNH ? 16 : 8)),
},
aGemBatteries[aCasingSlot++],
20 * 60 * 1 * (GTNH ? 2 : 1),
- (int) GT_Values.V[j]);
+ (int) aVoltageRecipe[j]);
}
@@ -439,7 +441,7 @@ public class RECIPES_GREGTECH {
},
ItemUtils.getItemStackFromFQRN("miscutils:personalHealingDevice", 1),
20 * 60 * 30 * (GTNH ? 2 : 1),
- (int) GT_Values.V[7]);
+ (int) aVoltageRecipe[7]);
@@ -447,9 +449,9 @@ public class RECIPES_GREGTECH {
ItemStack[] aChargeResearch = new ItemStack[] {
ItemUtils.getItemStackFromFQRN("miscutils:item.itemBufferCore7", 1),
- ItemUtils.getSimpleStack(ModItems.itemChargePack_High_1, 1),
- ItemUtils.getSimpleStack(ModItems.itemChargePack_High_2, 1),
- ItemUtils.getSimpleStack(ModItems.itemChargePack_High_3, 1),
+ ItemUtils.getItemStackFromFQRN("miscutils:item.itemBufferCore8", 1),
+ ItemUtils.getItemStackFromFQRN("miscutils:item.itemBufferCore9", 1),
+ ItemUtils.getItemStackFromFQRN("miscutils:item.itemBufferCore10", 1),
};
ItemStack[] aChargeOutputs = new ItemStack[] {
@@ -458,44 +460,32 @@ public class RECIPES_GREGTECH {
ItemUtils.getSimpleStack(ModItems.itemChargePack_High_3, 1),
ItemUtils.getSimpleStack(ModItems.itemChargePack_High_4, 1),
};
-
- ItemStack[] aBufferCoreInputs = new ItemStack[] {
- ItemUtils.getItemStackFromFQRN("miscutils:item.itemBufferCore7", GTNH ? 8 : 4),
- ItemUtils.getItemStackFromFQRN("miscutils:item.itemBufferCore8", GTNH ? 8 : 4),
- ItemUtils.getItemStackFromFQRN("miscutils:item.itemBufferCore9", GTNH ? 8 : 4),
- ItemUtils.getItemStackFromFQRN("miscutils:item.itemBufferCore10", GTNH ? 8 : 4),
- };
-
+
int aCurrSlot = 0;
for (int h = 6; h < 10; h++) {
CORE.RA.addAssemblylineRecipe(
aChargeResearch[aCurrSlot],
20 * 60 * 10 * (aCurrSlot + 1),
new ItemStack[] {
- ItemUtils.getSimpleStack(
- aGemBatteries[aCurrSlot], GTNH ? 4 : 2),
- aBufferCoreInputs[aCurrSlot],
+ ItemUtils.getSimpleStack(aGemBatteries[aCurrSlot],2),
aCoilWire[aCurrSlot],
- CI.getTieredComponent(OrePrefixes.plate, h, GTNH ? 16 : 8),
- CI.getTieredComponent(OrePrefixes.plate, h-1, GTNH ? 32 : 16),
- CI.getTieredComponent(OrePrefixes.circuit, h, GTNH ? 16 : 4),
- CI.getTieredComponent(OrePrefixes.circuit, h-1, GTNH ? 32 : 8),
- CI.getTieredComponent(OrePrefixes.cableGt12, h-1, GTNH ? 32 : 16),
+ CI.getTieredComponent(OrePrefixes.plate, h, 8),
+ CI.getTieredComponent(OrePrefixes.circuit, h, 4),
+ CI.getTieredComponent(OrePrefixes.circuit, h-1, 8),
+ CI.getTieredComponent(OrePrefixes.cableGt12, h-1, 16),
CI.getTieredComponent(OrePrefixes.screw, h, GTNH ? 16 : 8),
CI.getTieredComponent(OrePrefixes.bolt, h-2, GTNH ? 32 : 16),
- CI.getElectricMotor(h, GTNH ? 8 : 4),
- CI.getFieldGenerator(h-1, 2),
- CI.getRobotArm(h-2, GTNH ? 4 : 2),
+ CI.getFieldGenerator(h, 1),
},
new FluidStack[] {
- CI.getTieredFluid(h, 144 * 18 * (GTNH ? 8 : 4)),
- CI.getTertiaryTieredFluid(h-1, 144 * 18 * (GTNH ? 8 : 4)),
- CI.getAlternativeTieredFluid(h-1, 144 * 18 * (GTNH ? 8 : 4)),
- CI.getAlternativeTieredFluid(h-2, 144 * 18 * (GTNH ? 8 : 4)),
+ CI.getTieredFluid(h, 144 * 4 * (GTNH ? 8 : 4)),
+ CI.getTertiaryTieredFluid(h-1, 144 * 4 * (GTNH ? 8 : 4)),
+ CI.getAlternativeTieredFluid(h-1, 144 * 4 * (GTNH ? 8 : 4)),
+ CI.getAlternativeTieredFluid(h-2, 144 * 4 * (GTNH ? 8 : 4)),
},
aChargeOutputs[aCurrSlot],
20 * 60 * 30 * (GTNH ? 2 : 1) * (aCurrSlot+1),
- (int) GT_Values.V[h]);
+ (int) aVoltageRecipe[h]);
aCurrSlot++;
}
@@ -523,7 +513,7 @@ public class RECIPES_GREGTECH {
},
ItemUtils.getItemStackFromFQRN("miscutils:personalCloakingDevice", 1),
20 * 60 * 30 * (GTNH ? 2 : 1),
- (int) GT_Values.V[8]);
+ (int) aVoltageRecipe[8]);
}
@@ -2170,7 +2160,7 @@ public class RECIPES_GREGTECH {
null,
new int[] { 50, 50, 50, 50, 50, 50 },
20 * 300 * 9,
- (int) GT_Values.V[7],
+ (int) aVoltageRecipe[7],
750 * 20);
// Lepton Smash
@@ -2186,9 +2176,9 @@ public class RECIPES_GREGTECH {
Particle.getBaseParticle(Particle.TAU_NEUTRINO),
},
null,
- new int[] { 600, 40, 20, 15, 10, 5 },
- 20 * 300 * 8,
- (int) GT_Values.V[7],
+ new int[] { 1500, 40, 20, 15, 10, 5 },
+ 20 * 10,
+ (int) aVoltageRecipe[7],
750 * 20);
// Boson Smash
@@ -2205,7 +2195,7 @@ public class RECIPES_GREGTECH {
null,
new int[] { 160, 260, 150, 150, 1 },
20 * 300 * 6,
- (int) GT_Values.V[7],
+ (int) aVoltageRecipe[7],
750 * 20);
@@ -2226,7 +2216,7 @@ public class RECIPES_GREGTECH {
null,
new int[] { 10, 20, 20, 10, 10, 5, 5, 2 },
17 * 247 * 32,
- (int) GT_Values.V[8],
+ (int) aVoltageRecipe[8],
750 * 20);
// Graviton Smash
@@ -2240,7 +2230,7 @@ public class RECIPES_GREGTECH {
null,
new int[] {15, 100},
20 * (GTNH ? 90 : 30),
- (int) GT_Values.V[6],
+ (int) aVoltageRecipe[6],
1000 * 20);
FluidStack aPlasma = Materials.Duranium.getMolten(GTNH ? 40 : 10);
@@ -2263,7 +2253,7 @@ public class RECIPES_GREGTECH {
null,
new int[] {100},
20 * (GTNH ? 300 : 60),
- (int) GT_Values.V[6],
+ (int) aVoltageRecipe[6],
1000 * 20);
/*
@@ -2300,7 +2290,7 @@ public class RECIPES_GREGTECH {
null,
new int[] { 275, 250, 225, 275, 250, 225, 275, 250, 275},
20 * 20 * (IonCount++) * tenCountA,
- (int) GT_Values.V[7],
+ (int) aVoltageRecipe[7],
1500 * 20 * tenCountA);
}
else {
@@ -2334,7 +2324,7 @@ public class RECIPES_GREGTECH {
null,
new int[] { 125, 125, 125, 125, 125, 125, 125, 125, 125 },
20 * 20,
- (int) GT_Values.V[6],
+ (int) aVoltageRecipe[6],
15000);
// Generate Hydrogen Plasma Recipe
@@ -2356,7 +2346,7 @@ public class RECIPES_GREGTECH {
FluidUtils.getFluidStack("plasma.hydrogen", 1),
new int[] { 250, 250, 250, 500, 500, 500, 10000 },
20 * 60 * 2,
- (int) GT_Values.V[7],
+ (int) aVoltageRecipe[6],
750 * 20);
@@ -2381,7 +2371,7 @@ public class RECIPES_GREGTECH {
null,
new int[] { 750, 750, 750, 750, 750, 750, 750, 750, 750 },
20 * 20,
- (int) GT_Values.V[6],
+ (int) aVoltageRecipe[6],
15000);
CORE.RA.addCyclotronRecipe(
@@ -2404,7 +2394,7 @@ public class RECIPES_GREGTECH {
null,
new int[] { 375, 375, 375, 375, 375, 375, 375, 375, 375 },
20 * 20,
- (int) GT_Values.V[6],
+ (int) aVoltageRecipe[6],
15000);
@@ -2428,7 +2418,7 @@ public class RECIPES_GREGTECH {
null,
new int[] { 2500 },
20 * 60 * 15,
- (int) GT_Values.V[7],
+ (int) aVoltageRecipe[7],
15000);
generated by cgit (git 2.46.0) at 2025-03-10 14:50:15 +0000