aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gtPlusPlus/core
diff options
context:
space:
mode:
Diffstat (limited to 'src/main/java/gtPlusPlus/core')
-rw-r--r--src/main/java/gtPlusPlus/core/item/chemistry/CoalTar.java7
-rw-r--r--src/main/java/gtPlusPlus/core/recipe/RecipesGregTech.java28
2 files changed, 4 insertions, 31 deletions
diff --git a/src/main/java/gtPlusPlus/core/item/chemistry/CoalTar.java b/src/main/java/gtPlusPlus/core/item/chemistry/CoalTar.java
index 87e5a7b22f..ac745f5ae6 100644
--- a/src/main/java/gtPlusPlus/core/item/chemistry/CoalTar.java
+++ b/src/main/java/gtPlusPlus/core/item/chemistry/CoalTar.java
@@ -1,5 +1,6 @@
package gtPlusPlus.core.item.chemistry;
+import static gregtech.api.recipe.RecipeMaps.chemicalReactorRecipes;
import static gregtech.api.recipe.RecipeMaps.distillationTowerRecipes;
import static gregtech.api.recipe.RecipeMaps.distilleryRecipes;
import static gregtech.api.recipe.RecipeMaps.pyrolyseRecipes;
@@ -86,7 +87,7 @@ public class CoalTar extends ItemPackage {
public static void recipeCreateEthylbenzene() {
// C2H4 + C6H6 = C8H10
GTValues.RA.stdBuilder()
- .itemInputs(ItemUtils.getItemStackOfAmountFromOreDict("cellEthylene", 2), GTUtility.getIntegratedCircuit(1))
+ .itemInputs(ItemUtils.getItemStackOfAmountFromOreDict("cellEthylene", 2), GTUtility.getIntegratedCircuit(3))
.itemOutputs(ItemUtils.getItemStackOfAmountFromOreDict("cellEmpty", 2))
.fluidInputs(FluidUtils.getFluidStack("benzene", 2000))
.fluidOutputs(FluidUtils.getFluidStack("fluid.ethylbenzene", 2000))
@@ -95,13 +96,13 @@ public class CoalTar extends ItemPackage {
.addTo(UniversalChemical);
GTValues.RA.stdBuilder()
- .itemInputs(ItemUtils.getItemStackOfAmountFromOreDict("cellBenzene", 2), GTUtility.getIntegratedCircuit(1))
+ .itemInputs(ItemUtils.getItemStackOfAmountFromOreDict("cellBenzene", 2), GTUtility.getIntegratedCircuit(3))
.itemOutputs(ItemUtils.getItemStackOfAmountFromOreDict("cellEmpty", 2))
.fluidInputs(FluidUtils.getFluidStack("ethylene", 2000))
.fluidOutputs(FluidUtils.getFluidStack("fluid.ethylbenzene", 2000))
.duration(15 * SECONDS)
.eut(TierEU.RECIPE_LV)
- .addTo(UniversalChemical);
+ .addTo(chemicalReactorRecipes);
}
public static void recipeCoalToCoalTar() {
diff --git a/src/main/java/gtPlusPlus/core/recipe/RecipesGregTech.java b/src/main/java/gtPlusPlus/core/recipe/RecipesGregTech.java
index bf587a137f..4e8071829e 100644
--- a/src/main/java/gtPlusPlus/core/recipe/RecipesGregTech.java
+++ b/src/main/java/gtPlusPlus/core/recipe/RecipesGregTech.java
@@ -10,7 +10,6 @@ import static gregtech.api.recipe.RecipeMaps.blastFurnaceRecipes;
import static gregtech.api.recipe.RecipeMaps.brewingRecipes;
import static gregtech.api.recipe.RecipeMaps.centrifugeRecipes;
import static gregtech.api.recipe.RecipeMaps.compressorRecipes;
-import static gregtech.api.recipe.RecipeMaps.cutterRecipes;
import static gregtech.api.recipe.RecipeMaps.distillationTowerRecipes;
import static gregtech.api.recipe.RecipeMaps.distilleryRecipes;
import static gregtech.api.recipe.RecipeMaps.electrolyzerRecipes;
@@ -110,7 +109,6 @@ public class RecipesGregTech {
cyclotronRecipes();
blastSmelterRecipes();
extruderRecipes();
- cuttingSawRecipes();
breweryRecipes();
laserEngraverRecipes();
assemblyLineRecipes();
@@ -679,15 +677,6 @@ public class RecipesGregTech {
.addTo(brewingRecipes);
}
- private static void cuttingSawRecipes() {
- RA.stdBuilder()
- .itemInputs(ItemUtils.getItemStackOfAmountFromOreDict("blockMeatRaw", 1))
- .itemOutputs(ItemUtils.getItemStackOfAmountFromOreDict("plateMeatRaw", 9))
- .duration(16 * TICKS)
- .eut(TierEU.RECIPE_ULV)
- .addTo(cutterRecipes);
- }
-
private static void electrolyzerRecipes() {
RA.stdBuilder()
.itemInputs(ItemUtils.getSimpleStack(ModItems.dustDecayedRadium226, 1))
@@ -985,17 +974,6 @@ public class RecipesGregTech {
.duration(1 * SECONDS + 10 * TICKS)
.eut(TierEU.RECIPE_LV)
.addTo(multiblockChemicalReactorRecipes);
-
- // Short-cut Styrene
- // C6H6 + C2H4 = C8H8 + 2H
- RA.stdBuilder()
- .itemInputs(GTUtility.getIntegratedCircuit(24))
- .itemOutputs()
- .fluidInputs(Materials.Ethylene.getGas(500L), Materials.Benzene.getFluid(500L))
- .fluidOutputs(Materials.Styrene.getFluid(500L), Materials.Hydrogen.getGas(1000))
- .duration(12 * SECONDS)
- .eut(TierEU.RECIPE_MV)
- .addTo(multiblockChemicalReactorRecipes);
}
private static void assemblerRecipes() {
@@ -1550,12 +1528,6 @@ public class RecipesGregTech {
.duration(15 * SECONDS)
.eut(2)
.addTo(compressorRecipes);
- RA.stdBuilder()
- .itemInputs(GTOreDictUnificator.get(OrePrefixes.dust, Materials.MeatRaw, 9L))
- .itemOutputs(GTOreDictUnificator.get(OrePrefixes.block, Materials.MeatRaw, 1L))
- .duration(15 * SECONDS)
- .eut(2)
- .addTo(compressorRecipes);
RA.stdBuilder()
.itemInputs(ItemList.FusionComputer_UV.get(9))