aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/main/java/goodgenerator/loader/Loaders.java2
-rw-r--r--src/main/java/goodgenerator/loader/RecipeLoader_02.java6
-rw-r--r--src/main/java/goodgenerator/util/MaterialFix.java54
3 files changed, 59 insertions, 3 deletions
diff --git a/src/main/java/goodgenerator/loader/Loaders.java b/src/main/java/goodgenerator/loader/Loaders.java
index 3874c1254f..f53598eb51 100644
--- a/src/main/java/goodgenerator/loader/Loaders.java
+++ b/src/main/java/goodgenerator/loader/Loaders.java
@@ -22,6 +22,7 @@ import goodgenerator.main.GoodGenerator;
import cpw.mods.fml.common.Loader;
import cpw.mods.fml.common.registry.GameRegistry;
import goodgenerator.util.CrackRecipeAdder;
+import goodgenerator.util.MaterialFix;
import gregtech.api.enums.GT_Values;
import gregtech.api.enums.Textures;
import gregtech.api.interfaces.ITexture;
@@ -247,6 +248,7 @@ public class Loaders {
public static void completeLoad(){
RecipeLoader_02.FinishLoadRecipe();
+ MaterialFix.addRecipeForMultiItems();
}
public static void initLoadRecipes(){
diff --git a/src/main/java/goodgenerator/loader/RecipeLoader_02.java b/src/main/java/goodgenerator/loader/RecipeLoader_02.java
index d6f48f3641..a10a8a0f68 100644
--- a/src/main/java/goodgenerator/loader/RecipeLoader_02.java
+++ b/src/main/java/goodgenerator/loader/RecipeLoader_02.java
@@ -183,7 +183,7 @@ public class RecipeLoader_02 {
GT_Values.RA.addAssemblerRecipe(
new ItemStack[]{
ItemList.Hatch_Output_IV.get(1),
- GT_ModHandler.getModItem("extracells", "part.base", 1, 9),
+ GT_ModHandler.getModItem("appliedenergistics2", "item.ItemMultiPart", 1, 440),
GT_OreDictUnificator.get(OrePrefixes.screw, Materials.CertusQuartz, 8),
GT_Utility.getIntegratedCircuit(1)
},
@@ -1049,7 +1049,7 @@ public class RecipeLoader_02 {
ItemRefer.HiC_T1.get(4),
ItemList.Tool_DataOrb.get(3),
GT_OreDictUnificator.get(OrePrefixes.cableGt08, Materials.Titanium, 4),
- MyMaterial.adamantiumAlloy.get(OrePrefixes.gearGt, 4),
+ MyMaterial.hikarium.get(OrePrefixes.gearGt, 4),
MyMaterial.marM200.get(OrePrefixes.plateDouble, 2),
ItemRefer.IC2_Ir_Plate.get(2),
MyMaterial.lumiium.get(OrePrefixes.bolt, 48),
@@ -1068,7 +1068,7 @@ public class RecipeLoader_02 {
GT_OreDictUnificator.get(OrePrefixes.cableGt04, MyMaterial.lumiium.getBridgeMaterial(), 2),
MyMaterial.marCeM200.get(OrePrefixes.plateDouble, 2),
ItemRefer.HiC_T1.get(1),
- GT_OreDictUnificator.get(OrePrefixes.bolt, Materials.Draconium, 32),
+ MyMaterial.signalium.get(OrePrefixes.bolt, 32),
MyMaterial.titaniumBetaC.get(OrePrefixes.gearGtSmall, 8)
},
Materials.BlackSteel.getMolten(576),
diff --git a/src/main/java/goodgenerator/util/MaterialFix.java b/src/main/java/goodgenerator/util/MaterialFix.java
index ad3468dd98..c402e96ab3 100644
--- a/src/main/java/goodgenerator/util/MaterialFix.java
+++ b/src/main/java/goodgenerator/util/MaterialFix.java
@@ -2,9 +2,12 @@ package goodgenerator.util;
import com.github.bartimaeusnek.bartworks.system.material.Werkstoff;
import gregtech.api.enums.GT_Values;
+import gregtech.api.enums.ItemList;
import gregtech.api.enums.Materials;
import gregtech.api.enums.OrePrefixes;
+import gregtech.api.util.GT_ModHandler;
import gregtech.api.util.GT_OreDictUnificator;
+import gregtech.api.util.GT_Utility;
public class MaterialFix {
public static void MaterialFluidExtractionFix(Werkstoff material){
@@ -47,4 +50,55 @@ public class MaterialFix {
if (material.hasItemType(OrePrefixes.gearGt))
GT_Values.RA.addFluidExtractionRecipe(material.get(OrePrefixes.gearGt),null,material.getMolten(576),0,128,8);
}
+
+ public static void addRecipeForMultiItems() {
+ for (Werkstoff tMaterial : Werkstoff.werkstoffHashSet) {
+ if (tMaterial == null) continue;
+ if (tMaterial.hasItemType(OrePrefixes.plateDouble) && tMaterial.hasItemType(OrePrefixes.ingotDouble)) {
+ GT_Values.RA.addBenderRecipe(tMaterial.get(OrePrefixes.plate, 2), GT_Utility.getIntegratedCircuit(2), tMaterial.get(OrePrefixes.plateDouble, 1), (int) Math.max(tMaterial.getStats().getMass() * 2, 1L), 60);
+ GT_Values.RA.addBenderRecipe(tMaterial.get(OrePrefixes.ingotDouble, 1), GT_Utility.getIntegratedCircuit(1), tMaterial.get(OrePrefixes.plateDouble, 1), (int) Math.max(tMaterial.getStats().getMass(), 1L), 60);
+ GT_ModHandler.addCraftingRecipe(tMaterial.get(OrePrefixes.plateDouble, 1), new Object[] {"P","P","h",'P',tMaterial.get(OrePrefixes.plate, 1)});
+ GT_ModHandler.addCraftingRecipe(tMaterial.get(OrePrefixes.ingotDouble, 1), new Object[] {"P","P","h",'P',tMaterial.get(OrePrefixes.ingot, 1)});
+ }
+ if (tMaterial.hasItemType(OrePrefixes.plateTriple) && tMaterial.hasItemType(OrePrefixes.ingotTriple)) {
+ GT_Values.RA.addBenderRecipe(tMaterial.get(OrePrefixes.plate, 3), GT_Utility.getIntegratedCircuit(3), tMaterial.get(OrePrefixes.plateTriple, 1), (int) Math.max(tMaterial.getStats().getMass() * 3, 1L), 60);
+ GT_Values.RA.addBenderRecipe(tMaterial.get(OrePrefixes.ingot, 3), GT_Utility.getIntegratedCircuit(3), tMaterial.get(OrePrefixes.plateTriple, 1), (int) Math.max(tMaterial.getStats().getMass() * 3, 1L), 60);
+ GT_Values.RA.addBenderRecipe(tMaterial.get(OrePrefixes.ingotTriple, 1), GT_Utility.getIntegratedCircuit(1), tMaterial.get(OrePrefixes.plateTriple, 1), (int) Math.max(tMaterial.getStats().getMass(), 1L), 60);
+ GT_ModHandler.addCraftingRecipe(tMaterial.get(OrePrefixes.plateTriple, 1), new Object[] {"B","P","h",'P',tMaterial.get(OrePrefixes.plate, 1),'B',tMaterial.get(OrePrefixes.plateDouble, 1)});
+ GT_ModHandler.addCraftingRecipe(tMaterial.get(OrePrefixes.ingotTriple, 1), new Object[] {"B","P","h",'P',tMaterial.get(OrePrefixes.ingot, 1),'B',tMaterial.get(OrePrefixes.ingotDouble, 1)});
+ }
+ if (tMaterial.hasItemType(OrePrefixes.plateDense)) {
+ GT_Values.RA.addBenderRecipe(tMaterial.get(OrePrefixes.plate, 9), GT_Utility.getIntegratedCircuit(9), tMaterial.get(OrePrefixes.plateDense, 1), (int) Math.max(tMaterial.getStats().getMass() * 9, 1L), 60);
+ GT_Values.RA.addBenderRecipe(tMaterial.get(OrePrefixes.ingot, 9), GT_Utility.getIntegratedCircuit(9), tMaterial.get(OrePrefixes.plateDense, 1), (int) Math.max(tMaterial.getStats().getMass() * 9, 1L), 60);
+ if (tMaterial.hasItemType(OrePrefixes.plateTriple) && tMaterial.hasItemType(OrePrefixes.ingotTriple)) {
+ GT_Values.RA.addBenderRecipe(tMaterial.get(OrePrefixes.plateTriple, 3), GT_Utility.getIntegratedCircuit(3), tMaterial.get(OrePrefixes.plateDense, 1), (int) Math.max(tMaterial.getStats().getMass() * 3, 1L), 60);
+ GT_Values.RA.addBenderRecipe(tMaterial.get(OrePrefixes.ingotTriple, 3), GT_Utility.getIntegratedCircuit(3), tMaterial.get(OrePrefixes.plateDense, 1), (int) Math.max(tMaterial.getStats().getMass() * 3, 1L), 60);
+ }
+ }
+ if (tMaterial.hasItemType(OrePrefixes.stick)) {
+ if (tMaterial.hasItemType(OrePrefixes.cellMolten)) {
+ GT_Values.RA.addFluidSolidifierRecipe(ItemList.Shape_Mold_Rod.get(0), tMaterial.getMolten(72), tMaterial.get(OrePrefixes.stick, 1), (int) Math.max(tMaterial.getStats().getMass() >> 1, 1L), 480);
+ }
+ }
+ if (tMaterial.hasItemType(OrePrefixes.stickLong)) {
+ if (tMaterial.hasItemType(OrePrefixes.cellMolten)) {
+ GT_Values.RA.addFluidSolidifierRecipe(ItemList.Shape_Mold_Rod_Long.get(0), tMaterial.getMolten(144), tMaterial.get(OrePrefixes.stickLong, 1), (int) Math.max(tMaterial.getStats().getMass(), 1L), 480);
+ }
+ if (tMaterial.hasItemType(OrePrefixes.stick)) {
+ GT_ModHandler.addCraftingRecipe(tMaterial.get(OrePrefixes.stickLong, 1), new Object[] {"PhP",'P',tMaterial.get(OrePrefixes.stick, 1)});
+ GT_Values.RA.addForgeHammerRecipe(tMaterial.get(OrePrefixes.stick, 2), tMaterial.get(OrePrefixes.stickLong, 1), (int) Math.max(tMaterial.getStats().getMass(), 1L), 16);
+ }
+ }
+ if (tMaterial.hasItemType(OrePrefixes.spring)) {
+ GT_ModHandler.addCraftingRecipe(tMaterial.get(OrePrefixes.spring, 1), new Object[] {" s ","fPx"," P ",'P',tMaterial.get(OrePrefixes.stickLong, 1)});
+ GT_Values.RA.addBenderRecipe(tMaterial.get(OrePrefixes.stickLong, 1), GT_Utility.getIntegratedCircuit(1), tMaterial.get(OrePrefixes.spring, 1), (int) Math.max(tMaterial.getStats().getMass() * 2, 1L), 16);
+ }
+ if (tMaterial.hasItemType(OrePrefixes.springSmall)) {
+ GT_ModHandler.addCraftingRecipe(tMaterial.get(OrePrefixes.springSmall, 1), new Object[] {" s ","fPx",'P',tMaterial.get(OrePrefixes.stick, 1)});
+ GT_Values.RA.addBenderRecipe(tMaterial.get(OrePrefixes.stick, 1), GT_Utility.getIntegratedCircuit(1), tMaterial.get(OrePrefixes.springSmall, 2), (int) Math.max(tMaterial.getStats().getMass(), 1L), 16);
+ }
+ }
+ Materials tUHV = Materials.Longasssuperconductornameforuhvwire;
+ GT_Values.RA.addForgeHammerRecipe(GT_OreDictUnificator.get(OrePrefixes.stick, tUHV, 2), GT_OreDictUnificator.get(OrePrefixes.stickLong, tUHV, 1), (int) Math.max(tUHV.getMass(), 1L), 16);
+ }
}
generated by cgit (git 2.46.0) at 2025-03-06 23:10:16 +0000