Adapt to Wiremill Configuration Circuit support (#78)

GTNewHorizons · Sep 9, 2022 · 9237907 · 9237907
1 parent bfe2135
commit 9237907
Show file tree

Hide file tree

Showing 2 changed files with 82 additions and 7 deletions.
diff --git a/dependencies.gradle b/dependencies.gradle
@@ -2,7 +2,7 @@
 
 dependencies {
 
-	compile('com.github.GTNewHorizons:GT5-Unofficial:5.09.41.09:dev')
+	compile('com.github.GTNewHorizons:GT5-Unofficial:5.09.41.34:dev')
 	compile('com.github.GTNewHorizons:StructureLib:1.1.4:dev')
 	compile('com.github.GTNewHorizons:bartworks:0.5.75:dev')
 	compile('com.github.GTNewHorizons:NotEnoughItems:2.2.28-GTNH:dev')

diff --git a/src/main/java/goodgenerator/util/CrackRecipeAdder.java b/src/main/java/goodgenerator/util/CrackRecipeAdder.java
@@ -449,19 +449,94 @@ public static void registerWire(int ID, Werkstoff material, int aAmperage, int a
         }
         GT_Values.RA.addWiremillRecipe(
                 material.get(OrePrefixes.ingot, 1),
+                GT_Utility.getIntegratedCircuit(1),
                 material.get(OrePrefixes.wireGt01, 2),
-                (int) material.getStats().getMass() * 4,
-                90);
+                100,
+                4);
+        GT_Values.RA.addWiremillRecipe(
+                material.get(OrePrefixes.ingot, 1),
+                GT_Utility.getIntegratedCircuit(2),
+                material.get(OrePrefixes.wireGt02, 1),
+                150,
+                4);
+        GT_Values.RA.addWiremillRecipe(
+                material.get(OrePrefixes.ingot, 2),
+                GT_Utility.getIntegratedCircuit(4),
+                material.get(OrePrefixes.wireGt04, 1),
+                200,
+                4);
+        GT_Values.RA.addWiremillRecipe(
+                material.get(OrePrefixes.ingot, 4),
+                GT_Utility.getIntegratedCircuit(8),
+                material.get(OrePrefixes.wireGt08, 1),
+                250,
+                4);
+        GT_Values.RA.addWiremillRecipe(
+                material.get(OrePrefixes.ingot, 6),
+                GT_Utility.getIntegratedCircuit(12),
+                material.get(OrePrefixes.wireGt12, 1),
+                300,
+                4);
+        GT_Values.RA.addWiremillRecipe(
+                material.get(OrePrefixes.ingot, 8),
+                GT_Utility.getIntegratedCircuit(16),
+                material.get(OrePrefixes.wireGt16, 1),
+                350,
+                4);
         GT_Values.RA.addWiremillRecipe(
                 material.get(OrePrefixes.stick, 1),
+                GT_Utility.getIntegratedCircuit(1),
                 material.get(OrePrefixes.wireGt01, 1),
-                (int) material.getStats().getMass(),
-                90);
+                50,
+                4);
+        GT_Values.RA.addWiremillRecipe(
+                material.get(OrePrefixes.stick, 2),
+                GT_Utility.getIntegratedCircuit(2),
+                material.get(OrePrefixes.wireGt02, 1),
+                100,
+                4);
+        GT_Values.RA.addWiremillRecipe(
+                material.get(OrePrefixes.stick, 4),
+                GT_Utility.getIntegratedCircuit(4),
+                material.get(OrePrefixes.wireGt04, 1),
+                150,
+                4);
+        GT_Values.RA.addWiremillRecipe(
+                material.get(OrePrefixes.stick, 8),
+                GT_Utility.getIntegratedCircuit(8),
+                material.get(OrePrefixes.wireGt08, 1),
+                200,
+                4);
+        GT_Values.RA.addWiremillRecipe(
+                material.get(OrePrefixes.stick, 12),
+                GT_Utility.getIntegratedCircuit(12),
+                material.get(OrePrefixes.wireGt12, 1),
+                250,
+                4);
+        GT_Values.RA.addWiremillRecipe(
+                material.get(OrePrefixes.stick, 16),
+                GT_Utility.getIntegratedCircuit(16),
+                material.get(OrePrefixes.wireGt16, 1),
+                300,
+                4);
+        GT_Values.RA.addWiremillRecipe(
+                material.get(OrePrefixes.ingot, 1),
+                GT_Utility.getIntegratedCircuit(3),
+                material.get(OrePrefixes.wireFine, 8),
+                100,
+                4);
+        GT_Values.RA.addWiremillRecipe(
+                material.get(OrePrefixes.stick, 1),
+                GT_Utility.getIntegratedCircuit(3),
+                material.get(OrePrefixes.wireFine, 4),
+                50,
+                4);
         GT_Values.RA.addWiremillRecipe(
                 material.get(OrePrefixes.wireGt01, 1),
+                GT_Utility.getIntegratedCircuit(1),
                 material.get(OrePrefixes.wireFine, 4),
-                (int) material.getStats().getMass() * 4,
-                7);
+                200,
+                8);
         GT_Values.RA.addExtruderRecipe(
                 material.get(OrePrefixes.ingot, 1),
                 ItemList.Shape_Extruder_Wire.get(0),