Skip to content

Commit

Permalink
Remove lots of colliding recipes (#947)
Browse files Browse the repository at this point in the history 
* remove duplicate pams fluid extraction

* remove duplicate sand recipes

* remove duplicate soldering alloy recipe

* remove duplicate obsidian alloy smelting

* remove another duplicate sand recipe

* remove and fix colliding mixed metal recipes

* remove duplicate recipes from transistors

* remove duplicate computronics recipe from placement in loop

* remove doubled recipe

* fix sand
  • Loading branch information
@chochem
chochem authored Aug 25, 2024
1 parent 76e6deb commit 255e3cc
Show file tree
Hide file tree
Showing 6 changed files with 32 additions and 267 deletions.
15 changes: 4 additions & 11 deletions src/main/java/com/dreammaster/gthandler/recipes/AlloySmelterRecipes.java
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
package com.dreammaster.gthandler.recipes;

import static com.dreammaster.scripts.IScriptLoader.wildcard;
import static gregtech.api.enums.Mods.EnderIO;
import static gregtech.api.enums.Mods.IndustrialCraft2;
import static gregtech.api.enums.Mods.TinkerConstruct;
import static gregtech.api.recipe.RecipeMaps.alloySmelterRecipes;
import static gregtech.api.util.GT_RecipeBuilder.SECONDS;
import static gregtech.api.util.GT_RecipeBuilder.TICKS;

import net.minecraft.init.Blocks;
import net.minecraft.init.Items;
Expand Down Expand Up @@ -147,23 +147,16 @@ public void run() {
.itemOutputs(ItemList.Circuit_Parts_Glass_Tube.get(1L)).duration(6 * SECONDS).eut(16)
.addTo(alloySmelterRecipes);

GT_Values.RA.stdBuilder().itemInputs(new ItemStack(Blocks.obsidian, 1, 0), ItemList.Shape_Mold_Ingot.get(0L))
.itemOutputs(GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Obsidian, 2L))
.duration(6 * SECONDS + 10 * TICKS).eut(3).addTo(alloySmelterRecipes);

GT_Values.RA.stdBuilder()
.itemInputs(
GT_ModHandler.getModItem(IndustrialCraft2.ID, "itemPartIridium", 2L),
ItemList.Shape_Mold_Casing.get(0))
.itemOutputs(com.dreammaster.item.ItemList.IridiumAlloyItemCasing.getIS().splitStack(3))
.duration(60 * SECONDS).eut(256).addTo(alloySmelterRecipes);

// recipes for everything that uses sand
for (int i = 0; i < OreDictionary.getOres("sand").size(); ++i) {
GT_Values.RA.stdBuilder().itemInputs(OreDictionary.getOres("sand").get(i), new ItemStack(Items.clay_ball))
.itemOutputs(com.dreammaster.item.ItemList.CokeOvenBrick.getIS().splitStack(2))
.duration(10 * SECONDS).eut(8).addTo(alloySmelterRecipes);
}
GT_Values.RA.stdBuilder().itemInputs(new ItemStack(Blocks.sand, 1, wildcard), new ItemStack(Items.clay_ball))
.itemOutputs(com.dreammaster.item.ItemList.CokeOvenBrick.getIS().splitStack(2)).duration(10 * SECONDS)
.eut(8).addTo(alloySmelterRecipes);

if (EnderIO.isModLoaded()) {
// EnderIO Fused Quartz and Glass
Expand Down
134 changes: 19 additions & 115 deletions src/main/java/com/dreammaster/gthandler/recipes/AssemblerRecipes.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6901,33 +6901,6 @@ private void makeMixedMetalIngotRecipes() {
.itemOutputs(GT_ModHandler.getModItem(IndustrialCraft2.ID, "itemIngot", 1L, 4)).duration(5 * SECONDS)
.eut(TierEU.RECIPE_LV).addTo(assemblerRecipes);

GT_Values.RA.stdBuilder()
.itemInputs(
GT_Utility.getIntegratedCircuit(3),
GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Nickel, 1),
GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Bronze, 1),
GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Zinc, 1))
.itemOutputs(GT_ModHandler.getModItem(IndustrialCraft2.ID, "itemIngot", 1L, 4)).duration(5 * SECONDS)
.eut(TierEU.RECIPE_LV).addTo(assemblerRecipes);

GT_Values.RA.stdBuilder()
.itemInputs(
GT_Utility.getIntegratedCircuit(3),
GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Nickel, 1),
GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Bronze, 1),
GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Tin, 1))
.itemOutputs(GT_ModHandler.getModItem(IndustrialCraft2.ID, "itemIngot", 1L, 4)).duration(5 * SECONDS)
.eut(TierEU.RECIPE_LV).addTo(assemblerRecipes);

GT_Values.RA.stdBuilder()
.itemInputs(
GT_Utility.getIntegratedCircuit(3),
GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Nickel, 1),
GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Bronze, 1),
GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Aluminium, 1))
.itemOutputs(GT_ModHandler.getModItem(IndustrialCraft2.ID, "itemIngot", 1L, 4)).duration(5 * SECONDS)
.eut(TierEU.RECIPE_LV).addTo(assemblerRecipes);

GT_Values.RA.stdBuilder()
.itemInputs(
GT_Utility.getIntegratedCircuit(3),
Expand Down Expand Up @@ -7464,7 +7437,7 @@ private void makeMixedMetalIngotRecipes() {
GT_Utility.getIntegratedCircuit(3),
GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Naquadah, 1),
GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Iridium, 1),
GT_OreDictUnificator.get(OrePrefixes.plate, Materials.HSSE, 1))
GT_OreDictUnificator.get(OrePrefixes.plate, Materials.HSSS, 1))
.itemOutputs(GT_ModHandler.getModItem(IndustrialCraft2.ID, "itemIngot", 26L, 4)).duration(5 * SECONDS)
.eut(TierEU.RECIPE_LV).addTo(assemblerRecipes);

Expand All @@ -7491,7 +7464,7 @@ private void makeMixedMetalIngotRecipes() {
GT_Utility.getIntegratedCircuit(3),
GT_OreDictUnificator.get(OrePrefixes.plate, Materials.NaquadahAlloy, 1),
GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Osmiridium, 1),
GT_OreDictUnificator.get(OrePrefixes.plate, Materials.HSSE, 1))
GT_OreDictUnificator.get(OrePrefixes.plate, Materials.HSSS, 1))
.itemOutputs(GT_ModHandler.getModItem(IndustrialCraft2.ID, "itemIngot", 32L, 4)).duration(5 * SECONDS)
.eut(TierEU.RECIPE_LV).addTo(assemblerRecipes);

Expand Down Expand Up @@ -9100,6 +9073,23 @@ private void makeNEIPlanetRecipes() {
.duration(15 * SECONDS).eut(TierEU.RECIPE_UMV).addTo(assemblerRecipes);
}
}
if (Computronics.isModLoaded()) {
// Audio Cable
GT_Values.RA.stdBuilder()
.itemInputs(
GT_OreDictUnificator.get(OrePrefixes.wireGt02, Materials.Silver, 1),
GT_OreDictUnificator.get(OrePrefixes.plateDouble, Materials.Paper, 1))
.fluidInputs(Materials.Bismuth.getMolten(GT_Values.L))
.itemOutputs(GT_ModHandler.getModItem(Computronics.ID, "computronics.audioCable", 1L))
.duration(3 * SECONDS + 4 * TICKS).eut(TierEU.RECIPE_LV).addTo(assemblerRecipes);
GT_Values.RA.stdBuilder()
.itemInputs(
GT_OreDictUnificator.get(OrePrefixes.wireGt02, Materials.Silver, 1),
GT_OreDictUnificator.get(OrePrefixes.plateDouble, Materials.Paper, 1))
.fluidInputs(Materials.Lead.getMolten(GT_Values.L))
.itemOutputs(GT_ModHandler.getModItem(Computronics.ID, "computronics.audioCable", 1L))
.duration(3 * SECONDS + 4 * TICKS).eut(TierEU.RECIPE_LV).addTo(assemblerRecipes);
}
}

private void makeSolderingAlloyRecipes() {
Expand Down Expand Up @@ -9270,17 +9260,6 @@ private void makeSolderingAlloyRecipes() {
.itemOutputs(GT_ModHandler.getModItem(OpenComputers.ID, "screen1", 1L, 0))
.fluidInputs(tMat.getMolten(144L * tMultiplier / 2L)).duration(12 * SECONDS).eut(64)
.addTo(assemblerRecipes);

GT_Values.RA.stdBuilder()
.itemInputs(
ItemList.Casing_MV.get(1L),
ItemList.Cover_Screen.get(1L),
GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.MV, 2L),
ItemList.Circuit_Parts_TransistorSMD.get(1L),
GT_Utility.getIntegratedCircuit(1))
.itemOutputs(GT_ModHandler.getModItem(OpenComputers.ID, "screen1", 1L, 0))
.fluidInputs(tMat.getMolten(144L * tMultiplier / 2L)).duration(12 * SECONDS).eut(64)
.addTo(assemblerRecipes);
// display t2

GT_Values.RA.stdBuilder()
Expand All @@ -9293,17 +9272,6 @@ private void makeSolderingAlloyRecipes() {
.itemOutputs(GT_ModHandler.getModItem(OpenComputers.ID, "screen2", 1L, 0))
.fluidInputs(tMat.getMolten(144L * tMultiplier / 2L)).duration(12 * SECONDS)
.eut(TierEU.RECIPE_MV).addTo(assemblerRecipes);

GT_Values.RA.stdBuilder()
.itemInputs(
ItemList.Casing_HV.get(1L),
GT_ModHandler.getModItem(OpenComputers.ID, "screen1", 1L, 0),
GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.HV, 2L),
ItemList.Circuit_Parts_TransistorSMD.get(2L),
GT_Utility.getIntegratedCircuit(1))
.itemOutputs(GT_ModHandler.getModItem(OpenComputers.ID, "screen2", 1L, 0))
.fluidInputs(tMat.getMolten(144L * tMultiplier / 2L)).duration(12 * SECONDS)
.eut(TierEU.RECIPE_MV).addTo(assemblerRecipes);
// display t3

GT_Values.RA.stdBuilder()
Expand All @@ -9317,17 +9285,6 @@ private void makeSolderingAlloyRecipes() {
.fluidInputs(tMat.getMolten(288L * tMultiplier / 2L)).duration(12 * SECONDS).eut(256)
.addTo(assemblerRecipes);

GT_Values.RA.stdBuilder()
.itemInputs(
ItemList.Casing_EV.get(1L),
GT_ModHandler.getModItem(OpenComputers.ID, "screen2", 1L, 0),
GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.EV, 2L),
ItemList.Circuit_Parts_TransistorSMD.get(4L),
GT_Utility.getIntegratedCircuit(1))
.itemOutputs(GT_ModHandler.getModItem(OpenComputers.ID, "screen3", 1L, 0))
.fluidInputs(tMat.getMolten(288L * tMultiplier / 2L)).duration(12 * SECONDS).eut(256)
.addTo(assemblerRecipes);

GT_Values.RA.stdBuilder()
.itemInputs(
ItemList.Casing_EV.get(1L),
Expand Down Expand Up @@ -9389,18 +9346,6 @@ private void makeSolderingAlloyRecipes() {
.itemOutputs(GT_ModHandler.getModItem(OpenComputers.ID, "item", 1L, 63))
.fluidInputs(tMat.getMolten(144L * tMultiplier / 2L)).duration(12 * SECONDS + 10 * TICKS)
.eut(TierEU.RECIPE_MV).addTo(assemblerRecipes);

GT_Values.RA.stdBuilder()
.itemInputs(
ItemList.Circuit_Board_Plastic_Advanced.get(1L),
GT_OreDictUnificator.get(OrePrefixes.itemCasing, Materials.Aluminium, 2L),
GT_ModHandler.getModItem(OpenComputers.ID, "capacitor", 1L, 0),
ItemList.Circuit_Parts_TransistorSMD.get(1L),
GT_OreDictUnificator.get(OrePrefixes.bolt, Materials.RedAlloy, 4L),
GT_Utility.getIntegratedCircuit(1))
.itemOutputs(GT_ModHandler.getModItem(OpenComputers.ID, "item", 1L, 63))
.fluidInputs(tMat.getMolten(144L * tMultiplier / 2L)).duration(12 * SECONDS + 10 * TICKS)
.eut(TierEU.RECIPE_MV).addTo(assemblerRecipes);
// battery upgrade 2

GT_Values.RA.stdBuilder()
Expand All @@ -9414,18 +9359,6 @@ private void makeSolderingAlloyRecipes() {
.itemOutputs(GT_ModHandler.getModItem(OpenComputers.ID, "item", 1L, 64))
.fluidInputs(tMat.getMolten(144L * tMultiplier / 2L)).duration(12 * SECONDS + 10 * TICKS)
.eut(256).addTo(assemblerRecipes);

GT_Values.RA.stdBuilder()
.itemInputs(
ItemList.Circuit_Board_Epoxy_Advanced.get(1L),
GT_OreDictUnificator.get(OrePrefixes.itemCasing, Materials.Titanium, 2L),
GT_ModHandler.getModItem(OpenComputers.ID, "capacitor", 2L, 0),
ItemList.Circuit_Parts_TransistorSMD.get(2L),
GT_OreDictUnificator.get(OrePrefixes.bolt, Materials.Silver, 8L),
GT_Utility.getIntegratedCircuit(1))
.itemOutputs(GT_ModHandler.getModItem(OpenComputers.ID, "item", 1L, 64))
.fluidInputs(tMat.getMolten(144L * tMultiplier / 2L)).duration(12 * SECONDS + 10 * TICKS)
.eut(256).addTo(assemblerRecipes);
// battery upgrade 3

GT_Values.RA.stdBuilder()
Expand All @@ -9440,18 +9373,6 @@ private void makeSolderingAlloyRecipes() {
.fluidInputs(tMat.getMolten(144L * tMultiplier / 2L)).duration(12 * SECONDS + 10 * TICKS)
.eut(TierEU.RECIPE_HV).addTo(assemblerRecipes);

GT_Values.RA.stdBuilder()
.itemInputs(
ItemList.Circuit_Board_Fiberglass_Advanced.get(1L),
GT_OreDictUnificator.get(OrePrefixes.itemCasing, Materials.TungstenSteel, 2L),
GT_ModHandler.getModItem(OpenComputers.ID, "capacitor", 4L, 0),
ItemList.Circuit_Parts_TransistorSMD.get(4L),
GT_OreDictUnificator.get(OrePrefixes.bolt, Materials.Electrum, 16L),
GT_Utility.getIntegratedCircuit(1))
.itemOutputs(GT_ModHandler.getModItem(OpenComputers.ID, "item", 1L, 65))
.fluidInputs(tMat.getMolten(144L * tMultiplier / 2L)).duration(12 * SECONDS + 10 * TICKS)
.eut(TierEU.RECIPE_HV).addTo(assemblerRecipes);

GT_Values.RA.stdBuilder()
.itemInputs(
ItemList.Circuit_Board_Fiberglass_Advanced.get(1L),
Expand Down Expand Up @@ -10079,23 +10000,6 @@ private void makeSolderingAlloyRecipes() {
.itemOutputs(GT_ModHandler.getModItem(Computronics.ID, "computronics.dockingUpgrade", 1L, 0))
.fluidInputs(tMat.getMolten(144L * tMultiplier / 2L)).duration(12 * SECONDS + 10 * TICKS)
.eut(TierEU.RECIPE_HV).addTo(assemblerRecipes);

// Audio Cable
GT_Values.RA.stdBuilder()
.itemInputs(
GT_OreDictUnificator.get(OrePrefixes.wireGt02, Materials.Silver, 1),
GT_OreDictUnificator.get(OrePrefixes.plateDouble, Materials.Paper, 1))
.fluidInputs(Materials.Bismuth.getMolten(GT_Values.L))
.itemOutputs(GT_ModHandler.getModItem(Computronics.ID, "computronics.audioCable", 1L))
.duration(3 * SECONDS + 4 * TICKS).eut(TierEU.RECIPE_LV).addTo(assemblerRecipes);
GT_Values.RA.stdBuilder()
.itemInputs(
GT_OreDictUnificator.get(OrePrefixes.wireGt02, Materials.Silver, 1),
GT_OreDictUnificator.get(OrePrefixes.plateDouble, Materials.Paper, 1))
.fluidInputs(Materials.Lead.getMolten(GT_Values.L))
.itemOutputs(GT_ModHandler.getModItem(Computronics.ID, "computronics.audioCable", 1L))
.duration(3 * SECONDS + 4 * TICKS).eut(TierEU.RECIPE_LV).addTo(assemblerRecipes);

}
}
}
Expand Down
6 changes: 0 additions & 6 deletions src/main/java/com/dreammaster/gthandler/recipes/BendingMachineRecipes.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -62,12 +62,6 @@ public void run() {
.itemOutputs(GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.Lapis, 1L))
.duration(3 * MINUTES).eut(TierEU.RECIPE_MV * 3 / 4).addTo(benderRecipes);

GT_Values.RA.stdBuilder()
.itemInputs(
GT_OreDictUnificator.get(OrePrefixes.stickLong, Materials.Plastic, 1L),
GT_Utility.getIntegratedCircuit(1))
.itemOutputs(GT_OreDictUnificator.get(OrePrefixes.spring, Materials.Plastic, 1L)).duration(10 * SECONDS)
.eut(TierEU.RECIPE_LV / 2).addTo(benderRecipes);
GT_Values.RA.stdBuilder()
.itemInputs(
GT_OreDictUnificator.get(OrePrefixes.stickLong, Materials.Plastic, 1L),
Expand Down
Loading

0 comments on commit 255e3cc

Please sign in to comment.