aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java
diff options
context:
space:
mode:
Diffstat (limited to 'src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java')
-rw-r--r--src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java186
1 files changed, 106 insertions, 80 deletions
diff --git a/src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java b/src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java
index 2ed04f7816..b749e08378 100644
--- a/src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java
+++ b/src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java
@@ -1,13 +1,10 @@
package gregtech.loaders.postload;
import com.dreammaster.gthandler.CustomItemList;
-import com.dreammaster.gthandler.GT_CustomLoader;
-import com.dreammaster.item.*;
import cpw.mods.fml.common.Loader;
import gregtech.GT_Mod;
import gregtech.api.GregTech_API;
import gregtech.api.enums.*;
-import gregtech.api.enums.ItemList;
import gregtech.api.objects.MaterialStack;
import gregtech.api.util.*;
import gregtech.common.GT_DummyWorld;
@@ -378,6 +375,7 @@ public class GT_MachineRecipeLoader implements Runnable {
GT_Values.RA.addAutoclaveRecipe(GT_ModHandler.getModItem(aTextAE, "item.ItemCrystalSeed", 1L, 0), GT_ModHandler.getDistilledWater(200L), GT_ModHandler.getModItem(aTextAE, aTextAEMM, 1L, 10), 10000, 1000, 24);
GT_Values.RA.addAutoclaveRecipe(GT_ModHandler.getModItem(aTextAE, "item.ItemCrystalSeed", 1L, 600), GT_ModHandler.getDistilledWater(200L), GT_ModHandler.getModItem(aTextAE, aTextAEMM, 1L, 11), 10000, 1000, 24);
GT_Values.RA.addAutoclaveRecipe(GT_ModHandler.getModItem(aTextAE, "item.ItemCrystalSeed", 1L, 1200), GT_ModHandler.getDistilledWater(200L), GT_ModHandler.getModItem(aTextAE, aTextAEMM, 1L, 12), 10000, 1000, 24);
+ GT_Values.RA.addAutoclaveRecipe(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Carbon, 16), Materials.Iridium.getMolten(4), GT_ModHandler.getIC2Item("carbonFiber", 8L), 10000, 600, 5);
GT_Values.RA.addAutoclaveRecipe(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Carbon, 16), Materials.Palladium.getMolten(4), GT_ModHandler.getIC2Item("carbonFiber", 8L), 9000, 600, 5);
GT_Values.RA.addAutoclaveRecipe(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Carbon, 16), Materials.Platinum.getMolten(4), GT_ModHandler.getIC2Item("carbonFiber", 8L), 5000, 600, 5);
GT_Values.RA.addAutoclaveRecipe(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Carbon, 16), Materials.Lutetium.getMolten(4), GT_ModHandler.getIC2Item("carbonFiber", 8L), 3333, 600, 5);
@@ -1749,104 +1747,131 @@ public class GT_MachineRecipeLoader implements Runnable {
ItemStack tCrop;
// Metals Line
tCrop = ItemList.Crop_Drop_Coppon.get(1, new Object[0]);
- addProcess(tCrop, Materials.Copper, 100);
- addProcess(tCrop, Materials.Tetrahedrite, 100);
- addProcess(tCrop, Materials.Chalcopyrite, 100);
- addProcess(tCrop, Materials.Malachite, 100);
- addProcess(tCrop, Materials.Pyrite, 100);
- addProcess(tCrop, Materials.Stibnite, 100);
+ addProcess(tCrop, Materials.Copper, 100, true);
+ addProcess(tCrop, Materials.Tetrahedrite, 100, false);
+ addProcess(tCrop, Materials.Chalcopyrite, 100, false);
+ addProcess(tCrop, Materials.Malachite, 100, false);
+ addProcess(tCrop, Materials.Pyrite, 100, false);
+ addProcess(tCrop, Materials.Stibnite, 100, false);
tCrop = ItemList.Crop_Drop_Tine.get(1, new Object[0]);
- addProcess(tCrop, Materials.Tin, 100);
- addProcess(tCrop, Materials.Cassiterite, 100);
+ addProcess(tCrop, Materials.Tin, 100, true);
+ addProcess(tCrop, Materials.Cassiterite, 100, false);
tCrop = ItemList.Crop_Drop_Plumbilia.get(1, new Object[0]);
- addProcess(tCrop, Materials.Lead, 100);
- addProcess(tCrop, Materials.Galena, 100);
+ addProcess(tCrop, Materials.Lead, 100, true);
+ addProcess(tCrop, Materials.Galena, 100, false);
tCrop = ItemList.Crop_Drop_Ferru.get(1, new Object[0]);
- addProcess(tCrop, Materials.Iron, 100);
- addProcess(tCrop, Materials.Magnetite, 100);
- addProcess(tCrop, Materials.BrownLimonite, 100);
- addProcess(tCrop, Materials.YellowLimonite, 100);
- addProcess(tCrop, Materials.VanadiumMagnetite, 100);
- addProcess(tCrop, Materials.BandedIron, 100);
- addProcess(tCrop, Materials.Pyrite, 100);
- addProcess(tCrop, Materials.MeteoricIron, 100);
+ addProcess(tCrop, Materials.Iron, 100, true);
+ addProcess(tCrop, Materials.Magnetite, 100, false);
+ addProcess(tCrop, Materials.BrownLimonite, 100, false);
+ addProcess(tCrop, Materials.YellowLimonite, 100, false);
+ addProcess(tCrop, Materials.VanadiumMagnetite, 100, false);
+ addProcess(tCrop, Materials.BandedIron, 100, false);
+ addProcess(tCrop, Materials.Pyrite, 100, false);
+ addProcess(tCrop, Materials.MeteoricIron, 100, false);
tCrop = ItemList.Crop_Drop_Nickel.get(1, new Object[0]);
- addProcess(tCrop, Materials.Nickel, 100);
- addProcess(tCrop, Materials.Garnierite, 100);
- addProcess(tCrop, Materials.Pentlandite, 100);
- addProcess(tCrop, Materials.Cobaltite, 100);
- addProcess(tCrop, Materials.Wulfenite, 100);
- addProcess(tCrop, Materials.Powellite, 100);
+ addProcess(tCrop, Materials.Nickel, 100, true);
+ addProcess(tCrop, Materials.Garnierite, 100, false);
+ addProcess(tCrop, Materials.Pentlandite, 100, false);
+ addProcess(tCrop, Materials.Cobaltite, 100, false);
+ addProcess(tCrop, Materials.Wulfenite, 100, false);
+ addProcess(tCrop, Materials.Powellite, 100, false);
tCrop = ItemList.Crop_Drop_Zinc.get(1, new Object[0]);
- addProcess(tCrop, Materials.Zinc, 100);
- addProcess(tCrop, Materials.Sphalerite, 100);
- addProcess(tCrop, Materials.Sulfur, 100);
+ addProcess(tCrop, Materials.Zinc, 100, true);
+ addProcess(tCrop, Materials.Sphalerite, 100, false);
+ addProcess(tCrop, Materials.Sulfur, 100, false);
tCrop = ItemList.Crop_Drop_Argentia.get(1, new Object[0]);
- addProcess(tCrop, Materials.Silver, 100);
- addProcess(tCrop, Materials.Galena, 100);
+ addProcess(tCrop, Materials.Silver, 100, true);
+ addProcess(tCrop, Materials.Galena, 100, false);
tCrop = ItemList.Crop_Drop_Aurelia.get(1, new Object[0]);
- addProcess(tCrop, Materials.Gold, 100);
- addProcess(tCrop, Materials.Magnetite, 100);
+ addProcess(tCrop, Materials.Gold, 100, true);
+ addProcess(tCrop, Materials.Magnetite, Materials.Gold, 100, false);
// Rare Metals Line
tCrop = ItemList.Crop_Drop_Bauxite.get(1, new Object[0]);
- addProcess(tCrop,Materials.Aluminium,60);
- addProcess(tCrop,Materials.Bauxite,100);
+ addProcess(tCrop,Materials.Aluminium,60, true);
+ addProcess(tCrop,Materials.Bauxite,100, false);
tCrop = ItemList.Crop_Drop_Manganese.get(1, new Object[0]);
- addProcess(tCrop,Materials.Manganese,30);
- addProcess(tCrop,Materials.Grossular,100);
- addProcess(tCrop,Materials.Spessartine,100);
- addProcess(tCrop,Materials.Pyrolusite,100);
- addProcess(tCrop,Materials.Tantalite,100);
+ addProcess(tCrop,Materials.Manganese,30, true);
+ addProcess(tCrop,Materials.Grossular,100, false);
+ addProcess(tCrop,Materials.Spessartine,100, false);
+ addProcess(tCrop,Materials.Pyrolusite,100, false);
+ addProcess(tCrop,Materials.Tantalite,100, false);
tCrop = ItemList.Crop_Drop_Ilmenite.get(1, new Object[0]);
- addProcess(tCrop,Materials.Titanium,100);
- addProcess(tCrop,Materials.Ilmenite,100);
- addProcess(tCrop,Materials.Bauxite,100);
+ addProcess(tCrop,Materials.Titanium,100, true);
+ addProcess(tCrop,Materials.Ilmenite,100, false);
+ addProcess(tCrop,Materials.Bauxite,100, false);
tCrop = ItemList.Crop_Drop_Scheelite.get(1, new Object[0]);
- addProcess(tCrop,Materials.Scheelite,100);
- addProcess(tCrop,Materials.Tungstate,100);
- addProcess(tCrop,Materials.Lithium,100);
+ addProcess(tCrop,Materials.Scheelite,100, true);
+ addProcess(tCrop,Materials.Tungstate,100, false);
+ addProcess(tCrop,Materials.Lithium,100, false);
tCrop = ItemList.Crop_Drop_Platinum.get(1, new Object[0]);
- addProcess(tCrop,Materials.Platinum,40);
- addProcess(tCrop,Materials.Cooperite,40);
- addProcess(tCrop,Materials.Palladium,40);
- addProcess(tCrop, Materials.Neodymium, 100);
- addProcess(tCrop, Materials.Bastnasite, 100);
+ addProcess(tCrop,Materials.Platinum,40, true);
+ addProcess(tCrop,Materials.Cooperite,40, false);
+ addProcess(tCrop,Materials.Palladium,40, false);
+ addProcess(tCrop, Materials.Neodymium, 100, false);
+ addProcess(tCrop, Materials.Bastnasite, 100, false);
tCrop = ItemList.Crop_Drop_Iridium.get(1, new Object[0]);
- addProcess(tCrop,Materials.Iridium,20);
+ addProcess(tCrop,Materials.Iridium,20, true);
tCrop = ItemList.Crop_Drop_Osmium.get(1, new Object[0]);
- addProcess(tCrop,Materials.Osmium,20);
+ addProcess(tCrop,Materials.Osmium,20, true);
// Radioactive Line
- tCrop = ItemList.Crop_Drop_Pitchblende.get(1, new Object[0]);
- addProcess(tCrop,Materials.Pitchblende,50);
+ tCrop = ItemList.Crop_Drop_Pitchblende.get(1, new Object[0]);
+ addProcess(tCrop,Materials.Pitchblende,50, true);
tCrop = ItemList.Crop_Drop_Uraninite.get(1, new Object[0]);
- addProcess(tCrop,Materials.Uraninite,50);
- addProcess(tCrop,Materials.Uranium,50);
- addProcess(tCrop,Materials.Pitchblende,50);
- addProcess(tCrop,Materials.Uranium235,50);
+ addProcess(tCrop,Materials.Uraninite,50, false);
+ addProcess(tCrop,Materials.Uranium,50, true);
+ addProcess(tCrop,Materials.Pitchblende,50, false);
+ addProcess(tCrop,Materials.Uranium235,50, false);
tCrop = ItemList.Crop_Drop_Thorium.get(1, new Object[0]);
- addProcess(tCrop,Materials.Thorium,50);
+ addProcess(tCrop,Materials.Thorium,50, true);
tCrop = ItemList.Crop_Drop_Naquadah.get(1, new Object[0]);
- addProcess(tCrop,Materials.Naquadah,10);
- addProcess(tCrop,Materials.NaquadahEnriched,10);
- addProcess(tCrop,Materials.Naquadria,10);
+ addProcess(tCrop,Materials.Naquadah,10, true);
+ addProcess(tCrop,Materials.NaquadahEnriched,10, false);
+ addProcess(tCrop,Materials.Naquadria,10, false);
//Gem Line
tCrop = ItemList.Crop_Drop_BobsYerUncleRanks.get(1, new Object[0]);
- addProcess(tCrop, Materials.Emerald, 100);
- addProcess(tCrop, Materials.Beryllium, 100);
+ addProcess(tCrop, Materials.Emerald, 100, true);
+ addProcess(tCrop, Materials.Beryllium, 100, false);
}
- public void addProcess(ItemStack tCrop, Materials aMaterial, int chance){
- if(GT_Mod.gregtechproxy.mNerfedCombs){
- GT_Values.RA.addChemicalRecipe(GT_Utility.copyAmount(9, tCrop), GT_OreDictUnificator.get(OrePrefixes.crushed, aMaterial, 1), Materials.Water.getFluid(1000), aMaterial.mOreByProducts.isEmpty() ? null : aMaterial.mOreByProducts.get(0).getMolten(144), GT_OreDictUnificator.get(OrePrefixes.crushedPurified, aMaterial, 4), 96, 24);
- GT_Values.RA.addAutoclaveRecipe(GT_Utility.copyAmount(16, tCrop), Materials.UUMatter.getFluid(Math.max(1, ((aMaterial.getMass()+9)/10))), GT_OreDictUnificator.get(OrePrefixes.crushedPurified, aMaterial, 1), 10000, (int) (aMaterial.getMass() * 128), 384);
- }else{
- GT_ModHandler.addExtractionRecipe(tCrop, GT_OreDictUnificator.get(OrePrefixes.dustTiny, aMaterial, 1));
-}
- }
+ public void addProcess(ItemStack tCrop, Materials aMaterial, int chance, boolean aMainOutput) {
+ if (GT_Mod.gregtechproxy.mNerfedCrops) {
+ GT_Values.RA.addChemicalRecipe(GT_Utility.copyAmount(9, tCrop), GT_OreDictUnificator.get(OrePrefixes.crushed, aMaterial, 1), Materials.Water.getFluid(1000), aMaterial.mOreByProducts.isEmpty() ? null : aMaterial.mOreByProducts.get(0).getMolten(144), GT_OreDictUnificator.get(OrePrefixes.crushedPurified, aMaterial, 4), 96, 24);
+ GT_Values.RA.addAutoclaveRecipe(GT_Utility.copyAmount(16, tCrop), Materials.UUMatter.getFluid(Math.max(1, ((aMaterial.getMass()+9)/10))), GT_OreDictUnificator.get(OrePrefixes.crushedPurified, aMaterial, 1), 10000, (int) (aMaterial.getMass() * 128), 384);
+ } else {
+ if (aMainOutput) GT_ModHandler.addExtractionRecipe(tCrop, GT_OreDictUnificator.get(OrePrefixes.dustTiny, aMaterial, 1));
+ }
+ }
+
+ public void addProcess(ItemStack tCrop, Materials aMaterial, int chance){
+ if (GT_Mod.gregtechproxy.mNerfedCrops) {
+ GT_Values.RA.addChemicalRecipe(GT_Utility.copyAmount(9, tCrop), GT_OreDictUnificator.get(OrePrefixes.crushed, aMaterial, 1), Materials.Water.getFluid(1000), aMaterial.mOreByProducts.isEmpty() ? null : aMaterial.mOreByProducts.get(0).getMolten(144), GT_OreDictUnificator.get(OrePrefixes.crushedPurified, aMaterial, 4), 96, 24);
+ GT_Values.RA.addAutoclaveRecipe(GT_Utility.copyAmount(16, tCrop), Materials.UUMatter.getFluid(Math.max(1, ((aMaterial.getMass()+9)/10))), GT_OreDictUnificator.get(OrePrefixes.crushedPurified, aMaterial, 1), 10000, (int) (aMaterial.getMass() * 128), 384);
+ } else {
+ GT_ModHandler.addExtractionRecipe(tCrop, GT_OreDictUnificator.get(OrePrefixes.dustTiny, aMaterial, 1));
+ }
+ }
+
+ public void addProcess(ItemStack tCrop, Materials aMaterial, Materials aMaterialOut, int chance, boolean aMainOutput){
+ if (GT_Mod.gregtechproxy.mNerfedCrops) {
+ GT_Values.RA.addChemicalRecipe(GT_Utility.copyAmount(9, tCrop), GT_OreDictUnificator.get(OrePrefixes.crushed, aMaterial, 1), Materials.Water.getFluid(1000), aMaterialOut.mOreByProducts.isEmpty() ? null : aMaterialOut.mOreByProducts.get(0).getMolten(144), GT_OreDictUnificator.get(OrePrefixes.crushedPurified, aMaterialOut, 4), 96, 24);
+ GT_Values.RA.addAutoclaveRecipe(GT_Utility.copyAmount(16, tCrop), Materials.UUMatter.getFluid(Math.max(1, ((aMaterial.getMass()+9)/10))), GT_OreDictUnificator.get(OrePrefixes.crushedPurified, aMaterial, 1), 10000, (int) (aMaterial.getMass() * 128), 384);
+ } else {
+ if (aMainOutput) GT_ModHandler.addExtractionRecipe(tCrop, GT_OreDictUnificator.get(OrePrefixes.dustTiny, aMaterial, 1));
+ }
+ }
+
+ public void addProcess(ItemStack tCrop, Materials aMaterial, Materials aMaterialOut, int chance){
+ if (GT_Mod.gregtechproxy.mNerfedCrops) {
+ GT_Values.RA.addChemicalRecipe(GT_Utility.copyAmount(9, tCrop), GT_OreDictUnificator.get(OrePrefixes.crushed, aMaterial, 1), Materials.Water.getFluid(1000), aMaterialOut.mOreByProducts.isEmpty() ? null : aMaterialOut.mOreByProducts.get(0).getMolten(144), GT_OreDictUnificator.get(OrePrefixes.crushedPurified, aMaterialOut, 4), 96, 24);
+ GT_Values.RA.addAutoclaveRecipe(GT_Utility.copyAmount(16, tCrop), Materials.UUMatter.getFluid(Math.max(1, ((aMaterial.getMass()+9)/10))), GT_OreDictUnificator.get(OrePrefixes.crushedPurified, aMaterial, 1), 10000, (int) (aMaterial.getMass() * 128), 384);
+ } else {
+ GT_ModHandler.addExtractionRecipe(tCrop, GT_OreDictUnificator.get(OrePrefixes.dustTiny, aMaterial, 1));
+ }
+ }
private void run2(){
@@ -1924,7 +1949,7 @@ public class GT_MachineRecipeLoader implements Runnable {
Materials.SolderingAlloy.getMolten(1296),
Materials.Lubricant.getFluid(2000)}, ItemList.Electric_Pump_UV.get(1, new Object[]{}), 1800, 122880);
-// Conveyor
+// Conveyor
GT_Values.RA.addAssemblylineRecipe(ItemList.Conveyor_Module_IV.get(1, new Object(){}),144000,new ItemStack[]{
ItemList.Electric_Motor_LuV.get(2, new Object(){}),
@@ -1953,7 +1978,7 @@ public class GT_MachineRecipeLoader implements Runnable {
Materials.Rubber.getMolten(2880),
Materials.Lubricant.getFluid(2000)}, ItemList.Conveyor_Module_UV.get(1, new Object[]{}), 1800, 122880);
-// Piston
+// Piston
GT_Values.RA.addAssemblylineRecipe(ItemList.Electric_Piston_IV.get(1, new Object(){}),144000,new ItemStack[]{
ItemList.Electric_Motor_LuV.get(1, new Object(){}),
@@ -1992,7 +2017,8 @@ public class GT_MachineRecipeLoader implements Runnable {
Materials.SolderingAlloy.getMolten(1296),
Materials.Lubricant.getFluid(2000)}, ItemList.Electric_Piston_UV.get(1, new Object[]{}), 1800, 122880);
-// RobotArm
+// RobotArm
+
GT_Values.RA.addAssemblylineRecipe(ItemList.Robot_Arm_IV.get(1, new Object(){}),144000,new ItemStack[]{
GT_OreDictUnificator.get(OrePrefixes.stickLong, Materials.HSSG, 4L),
@@ -2034,7 +2060,7 @@ public class GT_MachineRecipeLoader implements Runnable {
Materials.Lubricant.getFluid(2000)}, ItemList.Robot_Arm_UV.get(1, new Object[]{}), 1800, 122880);
-// Emitter
+// Emitter
GT_Values.RA.addAssemblylineRecipe(ItemList.Emitter_IV.get(1, new Object(){}),144000,new ItemStack[]{
GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.HSSG, 1L),
@@ -2078,7 +2104,7 @@ public class GT_MachineRecipeLoader implements Runnable {
Materials.SolderingAlloy.getMolten(2304)},
ItemList.Emitter_UV.get(1, new Object[]{}), 1800, 122880);
-// Sensor
+// Sensor
GT_Values.RA.addAssemblylineRecipe(ItemList.Sensor_IV.get(1, new Object(){}),144000,new ItemStack[]{
GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.HSSG, 1L),
@@ -2122,7 +2148,7 @@ public class GT_MachineRecipeLoader implements Runnable {
Materials.SolderingAlloy.getMolten(2304)},
ItemList.Sensor_UV.get(1, new Object[]{}), 1800, 122880);
-// Field Generator
+// Field Generator
GT_Values.RA.addAssemblylineRecipe(ItemList.Field_Generator_IV.get(1, new Object(){}),144000,new ItemStack[]{
GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.HSSG, 1L),
generated by cgit (git 2.46.0) at 2025-06-13 13:21:29 +0000