Skip to content

Commit

Permalink
Fix collisions (#1008)
Browse files Browse the repository at this point in the history
  • Loading branch information
@FourIsTheNumber
FourIsTheNumber committed Sep 21, 2024
1 parent 29f9da3 commit ce07c81
Show file tree
Hide file tree
Showing 8 changed files with 32 additions and 473 deletions.
114 changes: 27 additions & 87 deletions src/main/java/com/dreammaster/gthandler/recipes/CircuitAssemblerRecipes.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,33 @@ public void run() {
? FluidRegistry.getFluid("molten.mutatedlivingsolder")
: FluidRegistry.getFluid("molten.solderingalloy");

// Wetware Board

GTValues.RA.stdBuilder()
.itemInputs(
ItemList.Circuit_Board_Multifiberglass.get(16L),
ItemList.Circuit_Parts_PetriDish.get(1L),
ItemList.Electric_Pump_LuV.get(1L),
ItemList.Sensor_IV.get(1L),
GTOreDictUnificator.get(OrePrefixes.circuit, Materials.IV, 1L),
GTOreDictUnificator.get(OrePrefixes.foil, Materials.NiobiumTitanium, 16L))
.itemOutputs(ItemList.Circuit_Board_Wetware.get(16L))
.fluidInputs(Materials.GrowthMediumSterilized.getFluid(4000L)).requiresCleanRoom()
.duration(60 * SECONDS).eut(TierEU.RECIPE_LuV).addTo(circuitAssemblerRecipes);
// Bio Board

GTValues.RA.stdBuilder()
.itemInputs(
ItemList.Circuit_Board_Wetware.get(32L),
ItemList.Circuit_Parts_PetriDish.get(8L),
ItemList.Electric_Pump_UV.get(1L),
ItemList.Sensor_LuV.get(2L),
GTOreDictUnificator.get(OrePrefixes.circuit, Materials.UV, 1L),
GTOreDictUnificator.get(OrePrefixes.foil, Materials.Neutronium, 32L))
.itemOutputs(ItemList.Circuit_Board_Bio.get(32L))
.fluidInputs(Materials.BioMediumSterilized.getFluid(16000L)).requiresCleanRoom().duration(60 * SECONDS)
.eut(TierEU.RECIPE_UV).addTo(circuitAssemblerRecipes);

// Crystal Circuits

GTValues.RA.stdBuilder()
Expand Down Expand Up @@ -998,32 +1025,6 @@ public void solderingMaterials() {
GTOreDictUnificator.get(OrePrefixes.plate, Materials.NaquadahAlloy, 16))
.itemOutputs(ItemList.Energy_LapotronicOrb2.get(1L)).fluidInputs(tMat.getMolten(144L * tMultiplier))
.requiresCleanRoom().duration(51 * SECONDS + 4 * TICKS).eut(4096).addTo(circuitAssemblerRecipes);
// Wetware Board

GTValues.RA.stdBuilder()
.itemInputs(
ItemList.Circuit_Board_Multifiberglass.get(16L),
ItemList.Circuit_Parts_PetriDish.get(1L),
ItemList.Electric_Pump_LuV.get(1L),
ItemList.Sensor_IV.get(1L),
GTOreDictUnificator.get(OrePrefixes.circuit, Materials.IV, 1L),
GTOreDictUnificator.get(OrePrefixes.foil, Materials.NiobiumTitanium, 16L))
.itemOutputs(ItemList.Circuit_Board_Wetware.get(16L))
.fluidInputs(Materials.GrowthMediumSterilized.getFluid(4000L)).requiresCleanRoom()
.duration(60 * SECONDS).eut(TierEU.RECIPE_LuV).addTo(circuitAssemblerRecipes);
// Bio Board

GTValues.RA.stdBuilder()
.itemInputs(
ItemList.Circuit_Board_Wetware.get(32L),
ItemList.Circuit_Parts_PetriDish.get(8L),
ItemList.Electric_Pump_UV.get(1L),
ItemList.Sensor_LuV.get(2L),
GTOreDictUnificator.get(OrePrefixes.circuit, Materials.UV, 1L),
GTOreDictUnificator.get(OrePrefixes.foil, Materials.Neutronium, 32L))
.itemOutputs(ItemList.Circuit_Board_Bio.get(32L))
.fluidInputs(Materials.BioMediumSterilized.getFluid(16000L)).requiresCleanRoom()
.duration(60 * SECONDS).eut(TierEU.RECIPE_UV).addTo(circuitAssemblerRecipes);

// PCBs Steve Carts
if (StevesCarts2.isModLoaded()) {
Expand Down Expand Up @@ -1072,14 +1073,6 @@ public void solderingMaterials() {
.fluidInputs(tMat.getMolten(144L * tMultiplier / 2L)).duration(10 * SECONDS)
.eut(TierEU.RECIPE_LV).addTo(circuitAssemblerRecipes);

GTValues.RA.stdBuilder()
.itemInputs(
ItemList.Circuit_Parts_TransistorSMD.get(2L),
GTOreDictUnificator.get(OrePrefixes.circuit, Materials.HV, 1),
GTUtility.getIntegratedCircuit(1))
.itemOutputs(GTModHandler.getModItem(OpenComputers.ID, "item", 1L, 28))
.fluidInputs(tMat.getMolten(144L * tMultiplier / 2L)).duration(10 * SECONDS)
.eut(TierEU.RECIPE_LV).addTo(circuitAssemblerRecipes);
// anylyser

GTValues.RA.stdBuilder()
Expand All @@ -1093,16 +1086,6 @@ public void solderingMaterials() {
.fluidInputs(tMat.getMolten(144L * tMultiplier / 2L)).duration(15 * SECONDS)
.eut(TierEU.RECIPE_MV).addTo(circuitAssemblerRecipes);

GTValues.RA.stdBuilder()
.itemInputs(
ItemList.Tool_Scanner.get(1L),
GTModHandler.getModItem(OpenComputers.ID, "item", 2L, 25),
ItemList.Circuit_Parts_TransistorSMD.get(1L),
ItemList.Sensor_HV.get(1L),
GTUtility.getIntegratedCircuit(1))
.itemOutputs(GTModHandler.getModItem(OpenComputers.ID, "item", 1L, 0))
.fluidInputs(tMat.getMolten(144L * tMultiplier / 2L)).duration(15 * SECONDS)
.eut(TierEU.RECIPE_MV).addTo(circuitAssemblerRecipes);
// CPU 1

GTValues.RA.stdBuilder()
Expand Down Expand Up @@ -1228,16 +1211,6 @@ public void solderingMaterials() {
.fluidInputs(tMat.getMolten(144L * tMultiplier / 2L)).duration(10 * SECONDS)
.eut(TierEU.RECIPE_MV).addTo(circuitAssemblerRecipes);

GTValues.RA.stdBuilder()
.itemInputs(
ItemList.Circuit_Board_Plastic_Advanced.get(1L),
GTModHandler.getModItem(OpenComputers.ID, "item", 1L, 24),
ItemList.Circuit_Parts_TransistorSMD.get(6L),
GTOreDictUnificator.get(OrePrefixes.foil, Materials.Gold, 1),
GTUtility.getIntegratedCircuit(1))
.itemOutputs(GTModHandler.getModItem(OpenComputers.ID, "eeprom", 1L, 0))
.fluidInputs(tMat.getMolten(144L * tMultiplier / 2L)).duration(10 * SECONDS)
.eut(TierEU.RECIPE_MV).addTo(circuitAssemblerRecipes);
// RAM 1

GTValues.RA.stdBuilder()
Expand Down Expand Up @@ -1326,17 +1299,6 @@ public void solderingMaterials() {
.fluidInputs(tMat.getMolten(144L * tMultiplier / 2L)).duration(15 * SECONDS)
.eut(TierEU.RECIPE_MV).addTo(circuitAssemblerRecipes);

GTValues.RA.stdBuilder()
.itemInputs(
ItemList.Circuit_Board_Plastic_Advanced.get(1L),
GTOreDictUnificator.get(OrePrefixes.circuit, Materials.MV, 1),
ItemList.Circuit_Parts_TransistorSMD.get(4L),
GTOreDictUnificator.get(OrePrefixes.foil, Materials.Electrum, 4L),
GTUtility.getIntegratedCircuit(1))
.itemOutputs(GTModHandler.getModItem(OpenComputers.ID, "item", 1L, 24))
.fluidInputs(tMat.getMolten(144L * tMultiplier / 2L)).duration(15 * SECONDS)
.eut(TierEU.RECIPE_MV).addTo(circuitAssemblerRecipes);

GTValues.RA.stdBuilder()
.itemInputs(
ItemList.Circuit_Board_Plastic_Advanced.get(1L),
Expand All @@ -1360,17 +1322,6 @@ public void solderingMaterials() {
.fluidInputs(tMat.getMolten(144L * tMultiplier / 2L)).duration(15 * SECONDS).eut(256)
.addTo(circuitAssemblerRecipes);

GTValues.RA.stdBuilder()
.itemInputs(
ItemList.Circuit_Board_Epoxy_Advanced.get(1L),
GTOreDictUnificator.get(OrePrefixes.circuit, Materials.HV, 1),
ItemList.Circuit_Parts_TransistorSMD.get(8L),
GTOreDictUnificator.get(OrePrefixes.foil, Materials.Electrum, 8L),
GTUtility.getIntegratedCircuit(2))
.itemOutputs(GTModHandler.getModItem(OpenComputers.ID, "item", 1L, 25))
.fluidInputs(tMat.getMolten(144L * tMultiplier / 2L)).duration(15 * SECONDS).eut(256)
.addTo(circuitAssemblerRecipes);

GTValues.RA.stdBuilder()
.itemInputs(
ItemList.Circuit_Board_Epoxy_Advanced.get(1L),
Expand All @@ -1394,17 +1345,6 @@ public void solderingMaterials() {
.fluidInputs(tMat.getMolten(144L * tMultiplier / 2L)).duration(15 * SECONDS)
.eut(TierEU.RECIPE_HV).addTo(circuitAssemblerRecipes);

GTValues.RA.stdBuilder()
.itemInputs(
ItemList.Circuit_Board_Fiberglass_Advanced.get(1L),
GTOreDictUnificator.get(OrePrefixes.circuit, Materials.EV, 1),
ItemList.Circuit_Parts_TransistorSMD.get(16L),
GTOreDictUnificator.get(OrePrefixes.foil, Materials.Electrum, 16L),
GTUtility.getIntegratedCircuit(1))
.itemOutputs(GTModHandler.getModItem(OpenComputers.ID, "item", 1L, 26))
.fluidInputs(tMat.getMolten(144L * tMultiplier / 2L)).duration(15 * SECONDS)
.eut(TierEU.RECIPE_HV).addTo(circuitAssemblerRecipes);

GTValues.RA.stdBuilder()
.itemInputs(
ItemList.Circuit_Board_Fiberglass_Advanced.get(1L),
Expand Down
8 changes: 0 additions & 8 deletions src/main/java/com/dreammaster/scripts/ScriptBloodArsenal.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@
import static gregtech.api.recipe.RecipeMaps.centrifugeRecipes;
import static gregtech.api.recipe.RecipeMaps.cutterRecipes;
import static gregtech.api.recipe.RecipeMaps.latheRecipes;
import static gregtech.api.recipe.RecipeMaps.maceratorRecipes;
import static gregtech.api.util.GTModHandler.getModItem;
import static gregtech.api.util.GTRecipeBuilder.SECONDS;

Expand Down Expand Up @@ -725,12 +724,5 @@ public void loadRecipes() {
GTValues.RA.stdBuilder().itemInputs(getModItem(BloodArsenal.ID, "blood_infused_planks", 1, 0, missing))
.itemOutputs(getModItem(BloodArsenal.ID, "blood_infused_stick", 2, 0, missing)).duration(20).eut(8)
.addTo(latheRecipes);
GTValues.RA.stdBuilder().itemInputs(getModItem(BloodArsenal.ID, "blood_infused_iron", 1, 0, missing))
.itemOutputs(GTOreDictUnificator.get(OrePrefixes.dust, Materials.BloodInfusedIron, 1L))
.outputChances(10000).duration(15 * SECONDS).eut(2).addTo(maceratorRecipes);
GTValues.RA.stdBuilder().itemInputs(getModItem(BloodArsenal.ID, "blood_infused_iron_block", 1, 0, missing))
.itemOutputs(GTOreDictUnificator.get(OrePrefixes.dust, Materials.BloodInfusedIron, 9L))
.outputChances(10000).duration(15 * SECONDS).eut(2).addTo(maceratorRecipes);

}
}
60 changes: 2 additions & 58 deletions src/main/java/com/dreammaster/scripts/ScriptBuildCraft.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -549,64 +549,8 @@ public void loadRecipes() {
GTValues.RA.stdBuilder()
.itemInputs(
getModItem(Forestry.ID, "factory2", 1, 2, missing),
GTOreDictUnificator.get(OrePrefixes.gearGtSmall, Materials.Iron, 1L),
getModItem(IndustrialCraft2.ID, "itemCasing", 2, 4, missing),
ItemList.Electric_Motor_LV.get(1L))
.itemOutputs(getModItem(BuildCraftFactory.ID, "autoWorkbenchBlock", 1, 0, missing))
.duration(10 * SECONDS).eut(30).addTo(assemblerRecipes);
GTValues.RA.stdBuilder()
.itemInputs(
getModItem(Forestry.ID, "factory2", 1, 2, missing),
GTOreDictUnificator.get(OrePrefixes.gearGtSmall, Materials.WroughtIron, 1),
getModItem(IndustrialCraft2.ID, "itemCasing", 2, 4, missing),
ItemList.Electric_Motor_LV.get(1L))
.itemOutputs(getModItem(BuildCraftFactory.ID, "autoWorkbenchBlock", 1, 0, missing))
.duration(10 * SECONDS).eut(30).addTo(assemblerRecipes);
GTValues.RA.stdBuilder()
.itemInputs(
getModItem(Forestry.ID, "factory2", 1, 2, missing),
GTOreDictUnificator.get(OrePrefixes.gearGtSmall, Materials.Iron, 1L),
ItemList.IC2_Item_Casing_Iron.get(2L),
ItemList.Electric_Motor_LV.get(1L))
.itemOutputs(getModItem(BuildCraftFactory.ID, "autoWorkbenchBlock", 1, 0, missing))
.duration(10 * SECONDS).eut(30).addTo(assemblerRecipes);
GTValues.RA.stdBuilder()
.itemInputs(
getModItem(Forestry.ID, "factory2", 1, 2, missing),
GTOreDictUnificator.get(OrePrefixes.gearGtSmall, Materials.WroughtIron, 1),
ItemList.IC2_Item_Casing_Iron.get(2L),
ItemList.Electric_Motor_LV.get(1L))
.itemOutputs(getModItem(BuildCraftFactory.ID, "autoWorkbenchBlock", 1, 0, missing))
.duration(10 * SECONDS).eut(30).addTo(assemblerRecipes);
GTValues.RA.stdBuilder()
.itemInputs(
getModItem(Forestry.ID, "factory2", 1, 2, missing),
GTOreDictUnificator.get(OrePrefixes.gearGtSmall, Materials.Iron, 1L),
GTOreDictUnificator.get(OrePrefixes.itemCasing, Materials.WroughtIron, 2),
ItemList.Electric_Motor_LV.get(1L))
.itemOutputs(getModItem(BuildCraftFactory.ID, "autoWorkbenchBlock", 1, 0, missing))
.duration(10 * SECONDS).eut(30).addTo(assemblerRecipes);
GTValues.RA.stdBuilder()
.itemInputs(
getModItem(Forestry.ID, "factory2", 1, 2, missing),
GTOreDictUnificator.get(OrePrefixes.gearGtSmall, Materials.WroughtIron, 1),
GTOreDictUnificator.get(OrePrefixes.itemCasing, Materials.WroughtIron, 2),
ItemList.Electric_Motor_LV.get(1L))
.itemOutputs(getModItem(BuildCraftFactory.ID, "autoWorkbenchBlock", 1, 0, missing))
.duration(10 * SECONDS).eut(30).addTo(assemblerRecipes);
GTValues.RA.stdBuilder()
.itemInputs(
getModItem(Forestry.ID, "factory2", 1, 2, missing),
GTOreDictUnificator.get(OrePrefixes.gearGtSmall, Materials.Iron, 1L),
GTOreDictUnificator.get(OrePrefixes.itemCasing, Materials.PigIron, 2),
ItemList.Electric_Motor_LV.get(1L))
.itemOutputs(getModItem(BuildCraftFactory.ID, "autoWorkbenchBlock", 1, 0, missing))
.duration(10 * SECONDS).eut(30).addTo(assemblerRecipes);
GTValues.RA.stdBuilder()
.itemInputs(
getModItem(Forestry.ID, "factory2", 1, 2, missing),
GTOreDictUnificator.get(OrePrefixes.gearGtSmall, Materials.WroughtIron, 1),
GTOreDictUnificator.get(OrePrefixes.itemCasing, Materials.PigIron, 2),
GTOreDictUnificator.get(OrePrefixes.gearGtSmall, Materials.Iron, 1),
GTOreDictUnificator.get(OrePrefixes.itemCasing, Materials.Iron, 2),
ItemList.Electric_Motor_LV.get(1L))
.itemOutputs(getModItem(BuildCraftFactory.ID, "autoWorkbenchBlock", 1, 0, missing))
.duration(10 * SECONDS).eut(30).addTo(assemblerRecipes);
Expand Down
Loading

0 comments on commit ce07c81

Please sign in to comment.