add recipes for controllers + move to assline for hatches

htmlcsjs · htmlcsjs · commit cdbe38ebc5c5 · 2022-01-03T18:45:14.000Z
diff --git a/build.gradle b/build.gradle
@@ -34,10 +34,10 @@ repositories {
         url "https://minecraft.curseforge.com/api/maven"
     }
     maven {
-        url = "http://chickenbones.net/maven/"
+        url "http://chickenbones.net/maven/"
     }
     maven {
-        url = "http://dvs1.progwml6.com/files/maven/"
+        url ="http://dvs1.progwml6.com/files/maven/"
     }
     maven { // TOP
         name 'tterrag maven'
@@ -54,7 +54,7 @@ repositories {
 
 dependencies {
     deobfCompile("mezz.jei:jei_1.12.2:+")
-    deobfCompile("curse.maven:gregtechceu-557242:3585578")
+    provided(files("libs/gregtech-1.12.2-2.0.2-beta.jar"))
     deobfCompile("codechicken-lib-1-8:CodeChickenLib-1.12.2:3.2.3.358:universal")
     deobfCompile("codechicken:ChickenASM:1.12-1.0.2.9")
     deobfCompile("mcjty.theoneprobe:TheOneProbe-1.12:1.12-1.4.23-16")
diff --git a/libs/gregtech-1.12.2-2.0.2-beta.jar b/libs/gregtech-1.12.2-2.0.2-beta.jar
diff --git a/src/main/java/net/htmlcsjs/htmlTech/api/unification/materials/HTMaterials.java b/src/main/java/net/htmlcsjs/htmlTech/api/unification/materials/HTMaterials.java
@@ -46,6 +46,7 @@ public static void register() {
         Trinium.addFlags(GENERATE_FRAME);
         Titanium.addFlags(GENERATE_FOIL);
         Darmstadtium.addFlags(GENERATE_FOIL);
+        UraniumRhodiumDinaquadide.addFlags(GENERATE_SPRING);
     }
 
     public static void init() {
diff --git a/src/main/java/net/htmlcsjs/htmlTech/loaders/recipe/LaserEquipmentLoader.java b/src/main/java/net/htmlcsjs/htmlTech/loaders/recipe/LaserEquipmentLoader.java
@@ -3,21 +3,24 @@
 import gregtech.api.recipes.ingredients.IntCircuitIngredient;
 import gregtech.api.unification.material.MarkerMaterials;
 import gregtech.api.unification.stack.UnificationEntry;
+import gregtech.common.blocks.BlockMetalCasing;
 import gregtech.loaders.recipe.CraftingComponent;
 import net.htmlcsjs.htmlTech.common.HTConfig;
 import net.htmlcsjs.htmlTech.common.blocks.BlockHTCasing;
 import net.minecraft.item.ItemStack;
 
 import static gregtech.api.GTValues.*;
 import static gregtech.api.recipes.RecipeMaps.ASSEMBLER_RECIPES;
+import static gregtech.api.recipes.RecipeMaps.ASSEMBLY_LINE_RECIPES;
 import static gregtech.api.unification.material.Materials.*;
 import static gregtech.api.unification.ore.OrePrefix.*;
+import static gregtech.common.blocks.MetaBlocks.METAL_CASING;
+import static gregtech.common.items.MetaItems.*;
 import static gregtech.common.metatileentities.MetaTileEntities.HULL;
 import static net.htmlcsjs.htmlTech.api.HTValues.mteLength;
 import static net.htmlcsjs.htmlTech.common.blocks.HTMetaBlocks.HT_CASING;
 import static net.htmlcsjs.htmlTech.common.blocks.HTMetaBlocks.LASER_PIPES;
-import static net.htmlcsjs.htmlTech.common.metatileentity.HTMetaTileEntities.LASER_INPUT_HATCHES;
-import static net.htmlcsjs.htmlTech.common.metatileentity.HTMetaTileEntities.LASER_OUTPUT_HATCH;
+import static net.htmlcsjs.htmlTech.common.metatileentity.HTMetaTileEntities.*;
 
 public class LaserEquipmentLoader {
 
@@ -45,32 +48,71 @@ public static void init() {
 
         // Laser Collecting hatches
         for (int i = HTConfig.lasers.minLaserTier; i < mteLength; i++) {
-            ASSEMBLER_RECIPES.recipeBuilder()
+            ASSEMBLY_LINE_RECIPES.recipeBuilder()
                     .input(HULL[i])
                     .input(lens, Glass)
                     .inputs((ItemStack) CraftingComponent.SENSOR.getIngredient(i))
+                    .inputs((ItemStack) CraftingComponent.VOLTAGE_COIL.getIngredient(i))
                     .input(wireGtQuadruple, ((UnificationEntry) CraftingComponent.CABLE_QUAD.getIngredient(i)).material, 4)
                     .input(foil, ((UnificationEntry) CraftingComponent.PLATE.getIngredient(i)).material, 4)
                     .input(circuit, ((UnificationEntry) CraftingComponent.CIRCUIT.getIngredient(i)).material)
+                    .fluidInputs(SodiumPotassium.getFluid(1000))
                     .output(LASER_INPUT_HATCHES[i])
-                    .EUt((int) V[i - 1] / 2)
+                    .EUt(VA[i])
                     .duration(100)
                     .buildAndRegister();
         }
 
         // Laser Emitter hatch
-        ASSEMBLER_RECIPES.recipeBuilder()
+        ASSEMBLY_LINE_RECIPES.recipeBuilder()
                 .input(HULL[ZPM])
-                .input(circuit, MarkerMaterials.Tier.Ultimate)
+                .input(circuit, MarkerMaterials.Tier.Master)
                 .input(lens, Glass)
-                .input(wireFine, UraniumRhodiumDinaquadide, 4)
+                .input(wireFine, IndiumTinBariumTitaniumCuprate, 8)
                 .input(foil, Silver, 2)
+                .fluidInputs(SodiumPotassium.getFluid(1000))
                 .output(LASER_OUTPUT_HATCH)
-                .EUt((int) V[ZPM]/2)
+                .EUt(VA[ZPM])
                 .duration(100)
                 .buildAndRegister();
 
+        // Laser projector controller
+        ASSEMBLY_LINE_RECIPES.recipeBuilder()
+                .inputs(HT_CASING.getItemVariant(BlockHTCasing.CasingType.NAQ_ALLOY_CASING))
+                .input(wireFine, UraniumRhodiumDinaquadide, 64)
+                .input(ULTRA_HIGH_POWER_INTEGRATED_CIRCUIT, 64)
+                .input(EMITTER_ZPM, 2)
+                .input(plateDouble, Duranium)
+                .input(circuit, MarkerMaterials.Tier.Ultimate)
+                .input(circuit, MarkerMaterials.Tier.Ultimate)
+                .input(circuit, MarkerMaterials.Tier.Ultimate)
+                .input(circuit, MarkerMaterials.Tier.Ultimate)
+                .fluidInputs(SodiumPotassium.getFluid(1000))
+                .fluidInputs(SolderingAlloy.getFluid(L*7))
+                .output(LASER_PROJECTOR)
+                //.reserchItem(LASER_OUTPUT_HATCH)
+                .EUt(VA[ZPM])
+                .duration(800)
+                .buildAndRegister();
 
+        // Laser collector controller
+        ASSEMBLY_LINE_RECIPES.recipeBuilder()
+                .inputs(METAL_CASING.getItemVariant(BlockMetalCasing.MetalCasingType.HSSE_STURDY))
+                .input(spring, UraniumRhodiumDinaquadide, 64)
+                .input(ULTRA_HIGH_POWER_INTEGRATED_CIRCUIT, 64)
+                .input(SENSOR_ZPM, 2)
+                .input(plateDouble, Europium)
+                .input(circuit, MarkerMaterials.Tier.Ultimate)
+                .input(circuit, MarkerMaterials.Tier.Ultimate)
+                .input(circuit, MarkerMaterials.Tier.Ultimate)
+                .input(circuit, MarkerMaterials.Tier.Ultimate)
+                .fluidInputs(SodiumPotassium.getFluid(1000))
+                .fluidInputs(SolderingAlloy.getFluid(L*7))
+                .output(LASER_COLLECTOR)
+                //.reserchItem(LASER_INPUT_HATCHES[LuV])
+                .EUt(VA[ZPM])
+                .duration(800)
+                .buildAndRegister();
 
     }
 }
diff --git a/src/main/resources/assets/htmltech/lang/en_us.lang b/src/main/resources/assets/htmltech/lang/en_us.lang
@@ -28,7 +28,7 @@ htmltech.machine.laser_input_hatch.umv.name=UMV Laser Collecting Hatch
 htmltech.machine.laser_input_hatch.uxv.name=UXV Laser Collecting Hatch
 htmltech.machine.laser_input_hatch.max.name=MAX Laser Collecting Hatch
 
-tile.htmltech_casing.naq_alloy_casing.name=Resistant Naquadah Alloy
+tile.htmltech_casing.naq_alloy_casing.name=Resistant Naquadah Alloy Casing
 
 item.material.oreprefix.laser=%s Laser
 material.floppa=FlOPPa

Original file line number	Diff line number	Diff line change
`@@ -46,6 +46,7 @@ public static void register() {`
`46`	`46`	`Trinium.addFlags(GENERATE_FRAME);`
`47`	`47`	`Titanium.addFlags(GENERATE_FOIL);`
`48`	`48`	`Darmstadtium.addFlags(GENERATE_FOIL);`
	`49`	`+ UraniumRhodiumDinaquadide.addFlags(GENERATE_SPRING);`
`49`	`50`	`}`
`50`	`51`
`51`	`52`	`public static void init() {`