aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gregtech/loaders
diff options
context:
space:
mode:
authorMary <33456283+FourIsTheNumber@users.noreply.github.com>2024-10-04 06:23:57 -0400
committerGitHub <noreply@github.com>2024-10-04 10:23:57 +0000
commit0634659830defc74ca5ce822e95e5c0babc54d91 (patch)
tree81d1cf7f3a8251023a704c55a0fbb527e9252dbe /src/main/java/gregtech/loaders
parentbb2f79ff04f86568eba657726fa4dcc828130dd0 (diff)
downloadGT5-Unofficial-0634659830defc74ca5ce822e95e5c0babc54d91.tar.gz
GT5-Unofficial-0634659830defc74ca5ce822e95e5c0babc54d91.tar.bz2
GT5-Unofficial-0634659830defc74ca5ce822e95e5c0babc54d91.zip
Remove collisions (#3324)
Co-authored-by: Martin Robertz <dream-master@gmx.net>
Diffstat (limited to 'src/main/java/gregtech/loaders')
-rw-r--r--src/main/java/gregtech/loaders/materials/MaterialsInit1.java10
-rw-r--r--src/main/java/gregtech/loaders/oreprocessing/ProcessingBlock.java5
-rw-r--r--src/main/java/gregtech/loaders/oreprocessing/ProcessingCrushedOre.java7
-rw-r--r--src/main/java/gregtech/loaders/oreprocessing/ProcessingDirty.java19
-rw-r--r--src/main/java/gregtech/loaders/oreprocessing/ProcessingGem.java6
-rw-r--r--src/main/java/gregtech/loaders/oreprocessing/ProcessingLog.java19
-rw-r--r--src/main/java/gregtech/loaders/oreprocessing/ProcessingOre.java2
-rw-r--r--src/main/java/gregtech/loaders/oreprocessing/ProcessingShaping.java4
-rw-r--r--src/main/java/gregtech/loaders/postload/recipes/BreweryRecipes.java33
-rw-r--r--src/main/java/gregtech/loaders/postload/recipes/CentrifugeRecipes.java7
-rw-r--r--src/main/java/gregtech/loaders/postload/recipes/ChemicalRecipes.java179
-rw-r--r--src/main/java/gregtech/loaders/postload/recipes/CompressorRecipes.java12
-rw-r--r--src/main/java/gregtech/loaders/postload/recipes/DistilleryRecipes.java16
-rw-r--r--src/main/java/gregtech/loaders/postload/recipes/FermenterRecipes.java14
14 files changed, 146 insertions, 187 deletions
diff --git a/src/main/java/gregtech/loaders/materials/MaterialsInit1.java b/src/main/java/gregtech/loaders/materials/MaterialsInit1.java
index 7ab2655b0c..1ddd6f2907 100644
--- a/src/main/java/gregtech/loaders/materials/MaterialsInit1.java
+++ b/src/main/java/gregtech/loaders/materials/MaterialsInit1.java
@@ -507,7 +507,7 @@ public class MaterialsInit1 {
Materials.Andradite = new Materials( 821, TextureSet.SET_ROUGH , 1.0F, 0, 1, 1 |8 , 150, 120, 0, 0, "Andradite" , "Andradite" , 0, 0, -1, 0, false, false, 3, 1, 1, Dyes.dyeYellow , 1, Arrays.asList(new MaterialStack(Calcium, 3), new MaterialStack(Iron, 2), new MaterialStack(Silicon, 3), new MaterialStack(Oxygen, 12)));
Materials.AnnealedCopper = new Materials( 345, TextureSet.SET_SHINY , 1.0F, 0, 2, 1|2 |128 , 255, 120, 20, 0, "AnnealedCopper" , "Annealed Copper" , 0, 0, -1, 0, false, false, 3, 1, 1, Dyes.dyeOrange , 2, Collections.singletonList(new MaterialStack(Copper, 1)));
Materials.Asbestos = new Materials( 946, TextureSet.SET_DULL , 1.0F, 0, 1, 1 |8 , 230, 230, 230, 0, "Asbestos" , "Asbestos" , 0, 0, -1, 0, false, false, 1, 1, 1, Dyes.dyeWhite , 1, Arrays.asList(new MaterialStack(Magnesium, 3), new MaterialStack(Silicon, 2), new MaterialStack(Hydrogen, 4), new MaterialStack(Oxygen, 9))); // Mg3Si2O5(OH)4
- Materials.Ash = new Materials( 815, TextureSet.SET_DULL , 1.0F, 0, 1, 1 , 150, 150, 150, 0, "Ash" , "Ashes" , 0, 0, -1, 0, false, false, 1, 1, 1, Dyes.dyeLightGray , 2, Collections.singletonList(new MaterialStack(Carbon, 1)), Collections.singletonList(new TCAspects.TC_AspectStack(TCAspects.PERDITIO, 1)));
+ Materials.Ash = new Materials( 815, TextureSet.SET_DULL , 1.0F, 0, 1, 1 , 150, 150, 150, 0, "Ash" , "Ashes" , 0, 0, -1, 0, false, false, 1, 1, 1, Dyes.dyeLightGray , 0, Collections.singletonList(new MaterialStack(Carbon, 1)), Collections.singletonList(new TCAspects.TC_AspectStack(TCAspects.PERDITIO, 1)));
Materials.BandedIron = new Materials( 917, TextureSet.SET_DULL , 1.0F, 0, 2, 1 |8 , 145, 90, 90, 0, "BandedIron" , "Banded Iron" , 0, 0, -1, 0, false, false, 1, 1, 1, Dyes.dyeBrown , 1, Arrays.asList(new MaterialStack(Iron, 2), new MaterialStack(Oxygen, 3)));
Materials.BatteryAlloy = new Materials( 315, TextureSet.SET_DULL , 1.0F, 0, 1, 1|2 , 156, 124, 160, 0, "BatteryAlloy" , "Battery Alloy" , 0, 0, -1, 0, false, false, 1, 1, 1, Dyes.dyePurple , 2, Arrays.asList(new MaterialStack(Lead, 4), new MaterialStack(Antimony, 1)));
Materials.BlueTopaz = new Materials( 513, TextureSet.SET_GEM_HORIZONTAL , 7.0F, 256, 3, 1 |4|8 |64 , 0, 0, 255, 127, "BlueTopaz" , "Blue Topaz" , 0, 0, -1, 0, false, true, 3, 1, 1, Dyes.dyeBlue , 0, Arrays.asList(new MaterialStack(Aluminium, 2), new MaterialStack(Silicon, 1), new MaterialStack(Fluorine, 2), new MaterialStack(Hydrogen, 2), new MaterialStack(Oxygen, 6)), Arrays.asList(new TCAspects.TC_AspectStack(TCAspects.LUCRUM, 6), new TCAspects.TC_AspectStack(TCAspects.VITREUS, 4)));
@@ -530,7 +530,7 @@ public class MaterialsInit1 {
Materials.Cooperite = new Materials( 828, TextureSet.SET_METALLIC , 1.0F, 0, 1, 1 |8 , 255, 255, 200, 0, "Cooperite" , "Sheldonite" , 0, 0, -1, 0, false, false, 5, 1, 1, Dyes.dyeYellow , 2, Arrays.asList(new MaterialStack(Platinum, 3), new MaterialStack(Nickel, 1), new MaterialStack(Sulfur, 1), new MaterialStack(Palladium, 1)));
Materials.Cupronickel = new Materials( 310, TextureSet.SET_METALLIC , 6.0F, 64, 1, 1|2 |64 , 227, 150, 128, 0, "Cupronickel" , "Cupronickel" , 0, 0, -1, 0, false, false, 1, 1, 1, Dyes.dyeOrange , 2, Arrays.asList(new MaterialStack(Copper, 1), new MaterialStack(Nickel, 1)));
Materials.DarkAsh = new Materials( 816, TextureSet.SET_DULL , 1.0F, 0, 1, 1 , 50, 50, 50, 0, "DarkAsh" , "Dark Ashes" , 0, 0, -1, 0, false, false, 1, 2, 1, Dyes.dyeGray , 1, Collections.singletonList(new MaterialStack(Carbon, 1)), Arrays.asList(new TCAspects.TC_AspectStack(TCAspects.IGNIS, 1), new TCAspects.TC_AspectStack(TCAspects.PERDITIO, 1)));
- Materials.DeepIron = new Materials( 829, TextureSet.SET_METALLIC , 6.0F, 384, 2, 1|2 |8 |64 , 150, 140, 140, 0, "DeepIron" , "Deep Iron" , 0, 0, 7500, 7500, true, false, 3, 1, 1, Dyes.dyePink , 2, Collections.singletonList(new MaterialStack(Iron, 1)), Arrays.asList(new TCAspects.TC_AspectStack(TCAspects.METALLUM, 2), new TCAspects.TC_AspectStack(TCAspects.MAGNETO, 1))).disableAutoGeneratedBlastFurnaceRecipes().disableAutoGeneratedVacuumFreezerRecipe();
+ Materials.DeepIron = new Materials( 829, TextureSet.SET_METALLIC , 6.0F, 384, 2, 1|2 |8 |64 , 150, 140, 140, 0, "DeepIron" , "Deep Iron" , 0, 0, 7500, 7500, true, false, 3, 1, 1, Dyes.dyePink , 0, Collections.singletonList(new MaterialStack(Iron, 1)), Arrays.asList(new TCAspects.TC_AspectStack(TCAspects.METALLUM, 2), new TCAspects.TC_AspectStack(TCAspects.MAGNETO, 1))).disableAutoGeneratedBlastFurnaceRecipes().disableAutoGeneratedVacuumFreezerRecipe();
Materials.Diamond = new Materials( 500, TextureSet.SET_DIAMOND , 8.0F, 1280, 4, 1 |4|8 |64|128 , 200, 255, 255, 127, "Diamond" , "Diamond" , 0, 0, -1, 0, false, true, 5, 64, 1, Dyes.dyeWhite , 1, Collections.singletonList(new MaterialStack(Carbon, 1)), Arrays.asList(new TCAspects.TC_AspectStack(TCAspects.VITREUS, 3), new TCAspects.TC_AspectStack(TCAspects.LUCRUM, 4)));
Materials.Electrum = new Materials( 303, TextureSet.SET_SHINY , 12.0F, 64, 2, 1|2 |8 |64|128 , 255, 255, 100, 0, "Electrum" , "Electrum" , 0, 0, -1, 0, false, false, 4, 1, 1, Dyes.dyeYellow , 2, Arrays.asList(new MaterialStack(Silver, 1), new MaterialStack(Gold, 1)));
Materials.Emerald = new Materials( 501, TextureSet.SET_EMERALD , 7.0F, 256, 4, 1 |4|8 |64 , 80, 255, 80, 127, "Emerald" , "Emerald" , 0, 0, -1, 0, false, true, 5, 1, 1, Dyes.dyeGreen , 0, Arrays.asList(new MaterialStack(Beryllium, 3), new MaterialStack(Aluminium, 2), new MaterialStack(Silicon, 6), new MaterialStack(Oxygen, 18)), Arrays.asList(new TCAspects.TC_AspectStack(TCAspects.VITREUS, 3), new TCAspects.TC_AspectStack(TCAspects.LUCRUM, 5)));
@@ -710,7 +710,7 @@ public class MaterialsInit1 {
Materials.GalliumArsenide = new Materials( 980, TextureSet.SET_DULL , 1.0F, 0, 1, 1|2 , 160, 160, 160, 0, "GalliumArsenide" , "Gallium Arsenide" , 0, 0, -1, 1200, true, false, 1, 1, 1, Dyes.dyeGray , 2, Arrays.asList(new MaterialStack(Arsenic, 1), new MaterialStack(Gallium, 1)));
Materials.IndiumGalliumPhosphide = new Materials( 981, TextureSet.SET_DULL , 1.0F, 0, 1, 1|2 , 160, 140, 190, 0, "IndiumGalliumPhosphide" , "Indium Gallium Phosphide" , 0, 0, -1, 0, false, false, 1, 1, 1, Dyes.dyeLightGray , 2, Arrays.asList(new MaterialStack(Indium, 1), new MaterialStack(Gallium, 1), new MaterialStack(Phosphorus, 1)));
Materials.Spessartine = new Materials( 838, TextureSet.SET_DULL , 1.0F, 0, 2, 1 |8 , 255, 100, 100, 0, "Spessartine" , "Spessartine" , 0, 0, -1, 0, false, false, 3, 1, 1, Dyes.dyeRed , 0, Arrays.asList(new MaterialStack(Aluminium, 2), new MaterialStack(Manganese, 3), new MaterialStack(Silicon, 3), new MaterialStack(Oxygen, 12)));
- Materials.Sphalerite = new Materials( 839, TextureSet.SET_DULL , 1.0F, 0, 1, 1 |8 , 255, 255, 255, 0, "Sphalerite" , "Sphalerite" , 0, 0, -1, 0, false, false, 2, 1, 1, Dyes.dyeYellow , 1, Arrays.asList(new MaterialStack(Zinc, 1), new MaterialStack(Sulfur, 1)));
+ Materials.Sphalerite = new Materials( 839, TextureSet.SET_DULL , 1.0F, 0, 1, 1 |8 , 255, 255, 255, 0, "Sphalerite" , "Sphalerite" , 0, 0, -1, 0, false, false, 2, 1, 1, Dyes.dyeYellow , 0, Arrays.asList(new MaterialStack(Zinc, 1), new MaterialStack(Sulfur, 1)));
Materials.StainlessSteel = new Materials( 306, TextureSet.SET_SHINY , 7.0F, 480, 4, 1|2 |64|128 , 200, 200, 220, 0, "StainlessSteel" , "Stainless Steel" , 0, 0, -1, 1700, true, false, 1, 1, 1, Dyes.dyeWhite , 1, Arrays.asList(new MaterialStack(Iron, 6), new MaterialStack(Chrome, 1), new MaterialStack(Manganese, 1), new MaterialStack(Nickel, 1))).disableAutoGeneratedBlastFurnaceRecipes();
Materials.Steel = new Materials( 305, TextureSet.SET_METALLIC , 6.0F, 512, 3, 1|2 |64|128 , 128, 128, 128, 0, "Steel" , "Steel" , 0, 0, 1811, 1000, true, false, 4, 51, 50, Dyes.dyeGray , 1, Arrays.asList(new MaterialStack(Iron, 50), new MaterialStack(Carbon, 1)), Arrays.asList(new TCAspects.TC_AspectStack(TCAspects.METALLUM, 2), new TCAspects.TC_AspectStack(TCAspects.ORDO, 1)));
Materials.Stibnite = new Materials( 945, TextureSet.SET_METALLIC , 1.0F, 0, 2, 1 |8 , 70, 70, 70, 0, "Stibnite" , "Stibnite" , 0, 0, -1, 0, false, false, 1, 1, 1, Dyes.dyeWhite , 2, Arrays.asList(new MaterialStack(Antimony, 2), new MaterialStack(Sulfur, 3)));
@@ -791,7 +791,7 @@ public class MaterialsInit1 {
Materials.BasalticMineralSand = new Materials( 935, TextureSet.SET_SAND , 1.0F, 0, 1, 1 |8 , 40, 50, 40, 0, "BasalticMineralSand" , "Basaltic Mineral Sand" , 0, 0, -1, 0, false, false, 1, 1, 1, Dyes.dyeBlack , 2, Arrays.asList(new MaterialStack(Magnetite, 1), new MaterialStack(Basalt, 1)), Arrays.asList(new TCAspects.TC_AspectStack(TCAspects.METALLUM, 2), new TCAspects.TC_AspectStack(TCAspects.MAGNETO, 1)));
Materials.GraniticMineralSand = new Materials( 936, TextureSet.SET_SAND , 1.0F, 0, 1, 1 |8 , 40, 60, 60, 0, "GraniticMineralSand" , "Granitic Mineral Sand" , 0, 0, -1, 0, false, false, 1, 1, 1, Dyes.dyeBlack , 2, Arrays.asList(new MaterialStack(Magnetite, 1), new MaterialStack(GraniteBlack, 1)), Arrays.asList(new TCAspects.TC_AspectStack(TCAspects.METALLUM, 2), new TCAspects.TC_AspectStack(TCAspects.MAGNETO, 1)));
Materials.GarnetSand = new Materials( 938, TextureSet.SET_SAND , 1.0F, 0, 1, 1 |8 , 200, 100, 0, 0, "GarnetSand" , "Garnet Sand" , 0, 0, -1, 0, false, false, 1, 1, 1, Dyes.dyeOrange , 2, Arrays.asList(new MaterialStack(GarnetRed, 1), new MaterialStack(GarnetYellow, 1)));
- Materials.QuartzSand = new Materials( 939, TextureSet.SET_SAND , 1.0F, 0, 1, 1 |8 , 194, 178, 128, 0, "QuartzSand" , "Quartz Sand" , 0, 0, -1, 0, false, false, 1, 1, 1, Dyes.dyeWhite , 2, Arrays.asList(new MaterialStack(CertusQuartz, 1), new MaterialStack(Quartzite, 1)));
+ Materials.QuartzSand = new Materials( 939, TextureSet.SET_SAND , 1.0F, 0, 1, 1 |8 , 194, 178, 128, 0, "QuartzSand" , "Quartz Sand" , 0, 0, -1, 0, false, false, 1, 1, 1, Dyes.dyeWhite , 0, Arrays.asList(new MaterialStack(CertusQuartz, 1), new MaterialStack(Quartzite, 1)));
Materials.Bastnasite = new Materials( 905, TextureSet.SET_FINE , 1.0F, 0, 2, 1 |8 , 200, 110, 45, 0, "Bastnasite" , "Bastnasite" , 0, 0, -1, 0, false, false, 1, 1, 1, Dyes._NULL , 1, Arrays.asList(new MaterialStack(Cerium, 1), new MaterialStack(Carbon, 1), new MaterialStack(Fluorine, 1), new MaterialStack(Oxygen, 3))); // (Ce, La, Y)CO3F
Materials.Pentlandite = new Materials( 909, TextureSet.SET_DULL , 1.0F, 0, 2, 1 |8 , 165, 150, 5, 0, "Pentlandite" , "Pentlandite" , 0, 0, -1, 0, false, false, 1, 1, 1, Dyes._NULL , 1, Arrays.asList(new MaterialStack(Nickel, 9), new MaterialStack(Sulfur, 8))); // (Fe,Ni)9S8
Materials.Spodumene = new Materials( 920, TextureSet.SET_DULL , 1.0F, 0, 2, 1 |8 , 190, 170, 170, 0, "Spodumene" , "Spodumene" , 0, 0, -1, 0, false, false, 1, 1, 1, Dyes._NULL , 0, Arrays.asList(new MaterialStack(Lithium, 1), new MaterialStack(Aluminium, 1), new MaterialStack(Silicon, 2), new MaterialStack(Oxygen, 6))); // LiAl(SiO3)2
@@ -1026,7 +1026,7 @@ public class MaterialsInit1 {
0,
6203,
0,
- true,
+ false,
false,
1,
1,
diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingBlock.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingBlock.java
index 29516ad0a5..555341aa45 100644
--- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingBlock.java
+++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingBlock.java
@@ -30,7 +30,7 @@ public class ProcessingBlock implements gregtech.api.interfaces.IOreRecipeRegist
public void registerOre(OrePrefixes aPrefix, Materials aMaterial, String aOreDictName, String aModName,
ItemStack aStack) {
- if (aMaterial == Materials.Ichorium) {
+ if (aMaterial == Materials.Ichorium || aMaterial == Materials.NetherQuartz) {
return;
}
@@ -159,9 +159,6 @@ public class ProcessingBlock implements gregtech.api.interfaces.IOreRecipeRegist
.duration(5 * SECONDS)
.eut(24)
.addTo(hammerRecipes);
- }
-
- if (tStack2 != null && aMaterial != Materials.NetherQuartz) {
if (tStack3 != null)
GTModHandler.addShapelessCraftingRecipe(tStack3, new Object[] { OrePrefixes.block.get(aMaterial) });
GTModHandler.addShapelessCraftingRecipe(tStack2, new Object[] { OrePrefixes.block.get(aMaterial) });
diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingCrushedOre.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingCrushedOre.java
index debf059884..2566d0ceec 100644
--- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingCrushedOre.java
+++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingCrushedOre.java
@@ -75,9 +75,10 @@ public class ProcessingCrushedOre implements gregtech.api.interfaces.IOreRecipeR
break;
}
- // Blacklist materials which are handled by Werkstoff loader
- if (aMaterial == Materials.Salt || aMaterial == Materials.RockSalt || aMaterial == Materials.Spodumene)
- return;
+ // Blacklist materials which are handled by Werkstoff loader and coal, which has an override
+ if (aMaterial == Materials.Salt || aMaterial == Materials.RockSalt
+ || aMaterial == Materials.Spodumene
+ || aMaterial == Materials.Coal) return;
switch (aMaterial.mName) {
case "Tanzanite", "Sapphire", "Olivine", "GreenSapphire", "Opal", "Amethyst", "Emerald", "Ruby", "Amber", "Diamond", "FoolsRuby", "BlueTopaz", "GarnetRed", "Topaz", "Jasper", "GarnetYellow" -> GTValues.RA
diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingDirty.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingDirty.java
index 22a0964f34..1fc6cc15e7 100644
--- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingDirty.java
+++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingDirty.java
@@ -27,6 +27,9 @@ public class ProcessingDirty implements gregtech.api.interfaces.IOreRecipeRegist
OrePrefixes.dirtyGravel.add(this);
}
+ private boolean didPersulfate = false;
+ private boolean didMercury = false;
+
@Override
public void registerOre(OrePrefixes aPrefix, Materials aMaterial, String aOreDictName, String aModName,
net.minecraft.item.ItemStack aStack) {
@@ -110,18 +113,22 @@ public class ProcessingDirty implements gregtech.api.interfaces.IOreRecipeRegist
.eut(48)
.addTo(thermalCentrifugeRecipes);
+ didPersulfate = false;
+ didMercury = false;
+
addChemicalBathRecipes(aMaterial, aMaterial, aStack, aPrefix);
for (Materials tMaterial : aMaterial.mOreByProducts) {
addChemicalBathRecipes(aMaterial, tMaterial, aStack, aPrefix);
}
+
}
private void addChemicalBathRecipes(Materials material, Materials byproduct, ItemStack stack, OrePrefixes prefix) {
OrePrefixes chemicalBathPrefix = prefix == OrePrefixes.crushed ? OrePrefixes.crushedPurified
: OrePrefixes.dustPure;
- if (byproduct.contains(SubTag.WASHING_MERCURY)) {
+ if (byproduct.contains(SubTag.WASHING_MERCURY) && !didMercury) {
GTValues.RA.stdBuilder()
.itemInputs(GTUtility.copyAmount(1, stack))
.itemOutputs(
@@ -133,8 +140,10 @@ public class ProcessingDirty implements gregtech.api.interfaces.IOreRecipeRegist
.duration(40 * SECONDS)
.eut(8)
.addTo(chemicalBathRecipes);
+
+ didMercury = true;
}
- if (byproduct.contains(SubTag.WASHING_MERCURY_99_PERCENT)) {
+ if (byproduct.contains(SubTag.WASHING_MERCURY_99_PERCENT) && !didMercury) {
GTValues.RA.stdBuilder()
.itemInputs(GTUtility.copyAmount(1, stack))
.itemOutputs(
@@ -146,8 +155,10 @@ public class ProcessingDirty implements gregtech.api.interfaces.IOreRecipeRegist
.duration(40 * SECONDS)
.eut(8)
.addTo(chemicalBathRecipes);
+
+ didMercury = true;
}
- if (byproduct.contains(SubTag.WASHING_SODIUMPERSULFATE)) {
+ if (byproduct.contains(SubTag.WASHING_SODIUMPERSULFATE) && !didPersulfate) {
GTValues.RA.stdBuilder()
.itemInputs(GTUtility.copyAmount(1, stack))
.itemOutputs(
@@ -159,6 +170,8 @@ public class ProcessingDirty implements gregtech.api.interfaces.IOreRecipeRegist
.duration(40 * SECONDS)
.eut(8)
.addTo(chemicalBathRecipes);
+
+ didPersulfate = true;
}
}
}
diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingGem.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingGem.java
index ce92e38f7c..9a403c4b1d 100644
--- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingGem.java
+++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingGem.java
@@ -49,8 +49,10 @@ public class ProcessingGem implements gregtech.api.interfaces.IOreRecipeRegistra
boolean aSpecialRecipeReq = aMaterial.contains(SubTag.MORTAR_GRINDABLE);
boolean aFuelPower = aMaterial.mFuelPower > 0;
- // Blacklist materials which are handled by Werkstoff loader
- if (aMaterial == Materials.Salt || aMaterial == Materials.RockSalt || aMaterial == Materials.Spodumene) return;
+ // Blacklist materials which are handled by Werkstoff loader and nether quartz due to its 4:1 ratio
+ if (aMaterial == Materials.Salt || aMaterial == Materials.RockSalt
+ || aMaterial == Materials.Spodumene
+ || aMaterial == Materials.NetherQuartz) return;
switch (aPrefix) {
case gem -> {
diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingLog.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingLog.java
index 5bf1212faa..e6946c804a 100644
--- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingLog.java
+++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingLog.java
@@ -145,15 +145,6 @@ public class ProcessingLog implements gregtech.api.interfaces.IOreRecipeRegistra
GTValues.RA.stdBuilder()
.itemInputs(new ItemStack(aStack.getItem(), 1, i))
.itemOutputs(
- GTUtility.copyOrNull(tPlanks),
- GTOreDictUnificator.get(OrePrefixes.dust, Materials.Wood, 1L))
- .fluidInputs(Materials.Lubricant.getFluid(1L))
- .duration(10 * SECONDS)
- .eut(8)
- .addTo(cutterRecipes);
- GTValues.RA.stdBuilder()
- .itemInputs(new ItemStack(aStack.getItem(), 1, i))
- .itemOutputs(
GTUtility.copyAmount(
GTMod.gregtechproxy.mNerfedWoodPlank ? tStack.stackSize : tStack.stackSize * 5 / 4,
tStack),
@@ -209,16 +200,6 @@ public class ProcessingLog implements gregtech.api.interfaces.IOreRecipeRegistra
if (tStack != null) {
ItemStack tPlanks = GTUtility.copyOrNull(tStack);
if (tPlanks != null) {
- tPlanks.stackSize = (tPlanks.stackSize * 3 / 2);
- GTValues.RA.stdBuilder()
- .itemInputs(GTUtility.copyAmount(1, aStack))
- .itemOutputs(
- GTUtility.copyOrNull(tPlanks),
- GTOreDictUnificator.get(OrePrefixes.dust, Materials.Wood, 1L))
- .fluidInputs(Materials.Lubricant.getFluid(1L))
- .duration(10 * SECONDS)
- .eut(8)
- .addTo(cutterRecipes);
GTValues.RA.stdBuilder()
.itemInputs(GTUtility.copyAmount(1, aStack))
.itemOutputs(
diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingOre.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingOre.java
index 9823582212..b66bee9764 100644
--- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingOre.java
+++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingOre.java
@@ -205,7 +205,7 @@ public class ProcessingOre implements gregtech.api.interfaces.IOreRecipeRegistra
Math.max(1, aMultiplier * aMaterial.mSmeltingMultiplier / 2)));
}
- if (tCrushed != null) {
+ if (tCrushed != null && aMaterial != Materials.Knightmetal) {
GTValues.RA.stdBuilder()
.itemInputs(aOreStack)
.itemOutputs(GTUtility.copy(GTUtility.copyAmount(tCrushed.stackSize, tGem), tCrushed))
diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingShaping.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingShaping.java
index 9f90cdbfff..0f4b3d28b6 100644
--- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingShaping.java
+++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingShaping.java
@@ -147,7 +147,9 @@ public class ProcessingShaping implements gregtech.api.interfaces.IOreRecipeRegi
.addTo(extruderRecipes);
}
- if (!(aMaterial == Materials.AnnealedCopper || aMaterial == Materials.WroughtIron)) {
+ if (!(aMaterial == Materials.AnnealedCopper || aMaterial == Materials.WroughtIron)
+ && !(aMaterial.contains(SubTag.NO_SMELTING))
+ && aPrefix == OrePrefixes.ingot) {
if (aMaterial.mStandardMoltenFluid != null) {
if (GTOreDictUnificator.get(OrePrefixes.ring, aMaterial, 1L) != null) {
GTValues.RA.stdBuilder()
diff --git a/src/main/java/gregtech/loaders/postload/recipes/BreweryRecipes.java b/src/main/java/gregtech/loaders/postload/recipes/BreweryRecipes.java
index 178034b176..d3d85fd3f1 100644
--- a/src/main/java/gregtech/loaders/postload/recipes/BreweryRecipes.java
+++ b/src/main/java/gregtech/loaders/postload/recipes/BreweryRecipes.java
@@ -97,6 +97,23 @@ public class BreweryRecipes implements Runnable {
if (IndustrialCraft2.isModLoaded()) {
waterArray = new Fluid[] { FluidRegistry.WATER, GTModHandler.getDistilledWater(1L)
.getFluid() };
+
+ GTValues.RA.stdBuilder()
+ .itemInputs(new ItemStack(Blocks.red_mushroom, 1, 0))
+ .fluidInputs(new FluidStack(GTModHandler.getDistilledWater(1), 750))
+ .fluidOutputs(getFluidStack("potion.poison", 750))
+ .duration(6 * SECONDS + 8 * TICKS)
+ .eut(4)
+ .addTo(brewingRecipes);
+
+ GTValues.RA.stdBuilder()
+ .itemInputs(new ItemStack(Items.reeds, 1, 0))
+ .fluidInputs(new FluidStack(GTModHandler.getDistilledWater(1), 750))
+ .fluidOutputs(getFluidStack("potion.reedwater", 750))
+ .duration(6 * SECONDS + 8 * TICKS)
+ .eut(4)
+ .addTo(brewingRecipes);
+
} else {
waterArray = new Fluid[] { FluidRegistry.WATER };
}
@@ -230,14 +247,6 @@ public class BreweryRecipes implements Runnable {
.addTo(brewingRecipes);
GTValues.RA.stdBuilder()
- .itemInputs(new ItemStack(Blocks.red_mushroom, 1, 0))
- .fluidInputs(new FluidStack(tFluid, 750))
- .fluidOutputs(getFluidStack("potion.poison", 750))
- .duration(6 * SECONDS + 8 * TICKS)
- .eut(4)
- .addTo(brewingRecipes);
-
- GTValues.RA.stdBuilder()
.itemInputs(new ItemStack(Items.fish, 1, 3))
.fluidInputs(new FluidStack(tFluid, 750))
.fluidOutputs(getFluidStack("potion.poison.strong", 750))
@@ -254,14 +263,6 @@ public class BreweryRecipes implements Runnable {
.addTo(brewingRecipes);
GTValues.RA.stdBuilder()
- .itemInputs(new ItemStack(Items.reeds, 1, 0))
- .fluidInputs(new FluidStack(tFluid, 750))
- .fluidOutputs(getFluidStack("potion.reedwater", 750))
- .duration(6 * SECONDS + 8 * TICKS)
- .eut(4)
- .addTo(brewingRecipes);
-
- GTValues.RA.stdBuilder()
.itemInputs(new ItemStack(Items.apple, 1, 0))
.fluidInputs(new FluidStack(tFluid, 750))
.fluidOutputs(getFluidStack("potion.applejuice", 750))
diff --git a/src/main/java/gregtech/loaders/postload/recipes/CentrifugeRecipes.java b/src/main/java/gregtech/loaders/postload/recipes/CentrifugeRecipes.java
index e16ad553fb..e8b349f203 100644
--- a/src/main/java/gregtech/loaders/postload/recipes/CentrifugeRecipes.java
+++ b/src/main/java/gregtech/loaders/postload/recipes/CentrifugeRecipes.java
@@ -338,13 +338,6 @@ public class CentrifugeRecipes implements Runnable {
.addTo(centrifugeRecipes);
GTValues.RA.stdBuilder()
- .itemInputs(GTOreDictUnificator.get(OrePrefixes.log, Materials.Wood, 1), GTUtility.getIntegratedCircuit(1))
- .fluidOutputs(Materials.Methane.getGas(60))
- .duration(10 * SECONDS)
- .eut(20)
- .addTo(centrifugeRecipes);
-
- GTValues.RA.stdBuilder()
.itemInputs(new ItemStack(Blocks.sand, 1, 1))
.itemOutputs(
GTOreDictUnificator.get(OrePrefixes.dust, Materials.Iron, 1),
diff --git a/src/main/java/gregtech/loaders/postload/recipes/ChemicalRecipes.java b/src/main/java/gregtech/loaders/postload/recipes/ChemicalRecipes.java
index 792a77d7c7..60fba5404a 100644
--- a/src/main/java/gregtech/loaders/postload/recipes/ChemicalRecipes.java
+++ b/src/main/java/gregtech/loaders/postload/recipes/ChemicalRecipes.java
@@ -953,7 +953,7 @@ public class ChemicalRecipes implements Runnable {
.fluidOutputs(Materials.HydrochloricAcid.getFluid(3000))
.duration(15 * SECONDS)
.eut(30)
- .addTo(UniversalChemical);
+ .addTo(chemicalReactorRecipes);
// 4HSiCl3 = 3SiCl4 + SiH4
@@ -1028,7 +1028,7 @@ public class ChemicalRecipes implements Runnable {
.fluidOutputs(Materials.DilutedSulfuricAcid.getFluid(750))
.duration(3 * SECONDS)
.eut(TierEU.RECIPE_LV)
- .addTo(UniversalChemical);
+ .addTo(chemicalReactorRecipes);
// Ni + 4CO = Ni(CO)4
@@ -1050,7 +1050,7 @@ public class ChemicalRecipes implements Runnable {
.fluidOutputs(MaterialsKevlar.NickelTetracarbonyl.getFluid(1000))
.duration(20 * SECONDS)
.eut(TierEU.RECIPE_EV)
- .addTo(UniversalChemical);
+ .addTo(chemicalReactorRecipes);
GTValues.RA.stdBuilder()
.itemInputs(GTOreDictUnificator.get(OrePrefixes.dust, Materials.Nickel, 1), ItemList.Cell_Empty.get(1))
@@ -1058,7 +1058,7 @@ public class ChemicalRecipes implements Runnable {
.fluidInputs(Materials.CarbonMonoxide.getGas(4000))
.duration(20 * SECONDS)
.eut(TierEU.RECIPE_EV)
- .addTo(UniversalChemical);
+ .addTo(chemicalReactorRecipes);
// C2H4O + H2O = C2H6O2
@@ -1084,7 +1084,7 @@ public class ChemicalRecipes implements Runnable {
.fluidOutputs(MaterialsKevlar.Acetaldehyde.getGas(1000))
.duration(10 * SECONDS)
.eut(TierEU.RECIPE_MV)
- .addTo(UniversalChemical);
+ .addTo(chemicalReactorRecipes);
GTValues.RA.stdBuilder()
.itemInputs(
@@ -1133,7 +1133,7 @@ public class ChemicalRecipes implements Runnable {
.fluidInputs(Materials.Oxygen.getGas(1000))
.duration(5 * SECONDS)
.eut(30)
- .addTo(UniversalChemical);
+ .addTo(chemicalReactorRecipes);
// 2Bi + 3O = Bi2O3
@@ -1156,7 +1156,7 @@ public class ChemicalRecipes implements Runnable {
.fluidInputs(Materials.Oxygen.getGas(6000))
.duration(10 * SECONDS)
.eut(TierEU.RECIPE_MV)
- .addTo(UniversalChemical);
+ .addTo(chemicalReactorRecipes);
// C4H6O2 + CNH5 = C5H9NO + H2O
@@ -1363,7 +1363,7 @@ public class ChemicalRecipes implements Runnable {
.fluidOutputs(Materials.MethylAcetate.getFluid(1000))
.duration(12 * SECONDS)
.eut(TierEU.RECIPE_LV)
- .addTo(UniversalChemical);
+ .addTo(chemicalReactorRecipes);
GTValues.RA.stdBuilder()
.itemInputs(Materials.AceticAcid.getCells(1), GTUtility.getIntegratedCircuit(2))
@@ -1381,7 +1381,7 @@ public class ChemicalRecipes implements Runnable {
.fluidOutputs(Materials.MethylAcetate.getFluid(1000))
.duration(12 * SECONDS)
.eut(TierEU.RECIPE_LV)
- .addTo(UniversalChemical);
+ .addTo(chemicalReactorRecipes);
GTValues.RA.stdBuilder()
.itemInputs(Materials.AceticAcid.getCells(1), GTUtility.getIntegratedCircuit(11))
@@ -1605,7 +1605,7 @@ public class ChemicalRecipes implements Runnable {
.fluidOutputs(Materials.Methanol.getFluid(1000))
.duration(6 * SECONDS)
.eut(96)
- .addTo(UniversalChemical);
+ .addTo(chemicalReactorRecipes);
GTValues.RA.stdBuilder()
.itemInputs(Materials.CarbonMonoxide.getCells(1), GTUtility.getIntegratedCircuit(11))
@@ -1641,7 +1641,7 @@ public class ChemicalRecipes implements Runnable {
.fluidOutputs(Materials.Methanol.getFluid(1000))
.duration(6 * SECONDS)
.eut(96)
- .addTo(UniversalChemical);
+ .addTo(chemicalReactorRecipes);
GTValues.RA.stdBuilder()
.itemInputs(Materials.CarbonDioxide.getCells(1), GTUtility.getIntegratedCircuit(2))
@@ -1659,7 +1659,7 @@ public class ChemicalRecipes implements Runnable {
.fluidOutputs(Materials.Methanol.getFluid(1000))
.duration(6 * SECONDS)
.eut(96)
- .addTo(UniversalChemical);
+ .addTo(chemicalReactorRecipes);
GTValues.RA.stdBuilder()
.itemInputs(Materials.CarbonDioxide.getCells(1), GTUtility.getIntegratedCircuit(12))
@@ -1695,7 +1695,7 @@ public class ChemicalRecipes implements Runnable {
.fluidOutputs(Materials.AceticAcid.getFluid(1000))
.duration(15 * SECONDS)
.eut(TierEU.RECIPE_LV)
- .addTo(UniversalChemical);
+ .addTo(chemicalReactorRecipes);
GTValues.RA.stdBuilder()
.itemInputs(Materials.Methanol.getCells(1), GTUtility.getIntegratedCircuit(11))
@@ -1716,7 +1716,7 @@ public class ChemicalRecipes implements Runnable {
// CH2CH2 + 2O = CH3COOH
GTValues.RA.stdBuilder()
- .itemInputs(Materials.Ethylene.getCells(1), GTUtility.getIntegratedCircuit(9))
+ .itemInputs(Materials.Ethylene.getCells(1), GTUtility.getIntegratedCircuit(8))
.itemOutputs(Materials.Empty.getCells(1))
.fluidInputs(Materials.Oxygen.getGas(2000))
.fluidOutputs(Materials.AceticAcid.getFluid(1000))
@@ -1725,13 +1725,13 @@ public class ChemicalRecipes implements Runnable {
.addTo(UniversalChemical);
GTValues.RA.stdBuilder()
- .itemInputs(Materials.Oxygen.getCells(2), GTUtility.getIntegratedCircuit(9))
+ .itemInputs(Materials.Oxygen.getCells(2), GTUtility.getIntegratedCircuit(8))
.itemOutputs(Materials.Empty.getCells(2))
.fluidInputs(Materials.Ethylene.getGas(1000))
.fluidOutputs(Materials.AceticAcid.getFluid(1000))
.duration(5 * SECONDS)
.eut(TierEU.RECIPE_LV)
- .addTo(UniversalChemical);
+ .addTo(chemicalReactorRecipes);
GTValues.RA.stdBuilder()
.itemInputs(Materials.Ethylene.getCells(1), GTUtility.getIntegratedCircuit(19))
@@ -1752,13 +1752,24 @@ public class ChemicalRecipes implements Runnable {
// O + C2H4O2 + C2H4 = C4H6O2 + H2O
GTValues.RA.stdBuilder()
+ .itemInputs(GTUtility.getIntegratedCircuit(4))
+ .fluidInputs(
+ Materials.Oxygen.getGas(1000),
+ Materials.Ethylene.getGas(1000),
+ Materials.AceticAcid.getFluid(1000))
+ .fluidOutputs(Materials.VinylAcetate.getFluid(1000), Materials.Water.getFluid(1000))
+ .duration(9 * SECONDS)
+ .eut(TierEU.RECIPE_LV)
+ .addTo(multiblockChemicalReactorRecipes);
+
+ GTValues.RA.stdBuilder()
.itemInputs(Materials.Ethylene.getCells(1), Materials.AceticAcid.getCells(1))
.itemOutputs(Materials.Water.getCells(1), Materials.Empty.getCells(1))
.fluidInputs(Materials.Oxygen.getGas(1000))
.fluidOutputs(Materials.VinylAcetate.getFluid(1000))
.duration(9 * SECONDS)
.eut(TierEU.RECIPE_LV)
- .addTo(UniversalChemical);
+ .addTo(chemicalReactorRecipes);
GTValues.RA.stdBuilder()
.itemInputs(Materials.AceticAcid.getCells(1), Materials.Oxygen.getCells(1))
@@ -1767,7 +1778,7 @@ public class ChemicalRecipes implements Runnable {
.fluidOutputs(Materials.VinylAcetate.getFluid(1000))
.duration(9 * SECONDS)
.eut(TierEU.RECIPE_LV)
- .addTo(UniversalChemical);
+ .addTo(chemicalReactorRecipes);
GTValues.RA.stdBuilder()
.itemInputs(Materials.Oxygen.getCells(1), Materials.Ethylene.getCells(1))
@@ -1776,7 +1787,7 @@ public class ChemicalRecipes implements Runnable {
.fluidOutputs(Materials.VinylAcetate.getFluid(1000))
.duration(9 * SECONDS)
.eut(TierEU.RECIPE_LV)
- .addTo(UniversalChemical);
+ .addTo(chemicalReactorRecipes);
// Ethanol -> Ethylene (Intended loss for Sulfuric Acid)
@@ -1796,7 +1807,7 @@ public class ChemicalRecipes implements Runnable {
.fluidOutputs(Materials.DilutedSulfuricAcid.getFluid(1000))
.duration(60 * SECONDS)
.eut(TierEU.RECIPE_MV)
- .addTo(UniversalChemical);
+ .addTo(chemicalReactorRecipes);
GTValues.RA.stdBuilder()
.itemInputs(Materials.Ethanol.getCells(1), GTUtility.getIntegratedCircuit(11))
@@ -1845,7 +1856,7 @@ public class ChemicalRecipes implements Runnable {
.fluidOutputs(Materials.HydrochloricAcid.getFluid(1000))
.duration(3 * SECONDS)
.eut(8)
- .addTo(UniversalChemical);
+ .addTo(chemicalReactorRecipes);
GTValues.RA.stdBuilder()
.itemInputs(Materials.Chlorine.getCells(1), GTUtility.getIntegratedCircuit(11))
@@ -1881,7 +1892,7 @@ public class ChemicalRecipes implements Runnable {
.fluidOutputs(Materials.AllylChloride.getFluid(1000))
.duration(8 * SECONDS)
.eut(TierEU.RECIPE_LV)
- .addTo(UniversalChemical);
+ .addTo(chemicalReactorRecipes);
GTValues.RA.stdBuilder()
.itemInputs(Materials.Chlorine.getCells(2), GTUtility.getIntegratedCircuit(11))
@@ -1919,7 +1930,7 @@ public class ChemicalRecipes implements Runnable {
.fluidOutputs(Materials.HypochlorousAcid.getFluid(1000))
.duration(6 * SECONDS)
.eut(TierEU.RECIPE_LV)
- .addTo(UniversalChemical);
+ .addTo(chemicalReactorRecipes);
GTValues.RA.stdBuilder()
.itemInputs(Materials.Chlorine.getCells(2), GTUtility.getIntegratedCircuit(11))
@@ -1957,7 +1968,7 @@ public class ChemicalRecipes implements Runnable {
.fluidOutputs(Materials.Epichlorohydrin.getFluid(1000))
.duration(24 * SECONDS)
.eut(TierEU.RECIPE_LV)
- .addTo(UniversalChemical);
+ .addTo(chemicalReactorRecipes);
GTValues.RA.stdBuilder()
.itemInputs(Materials.HydrochloricAcid.getCells(1), Materials.Empty.getCells(1))
@@ -1975,7 +1986,7 @@ public class ChemicalRecipes implements Runnable {
.fluidOutputs(Materials.Epichlorohydrin.getFluid(1000))
.duration(24 * SECONDS)
.eut(TierEU.RECIPE_LV)
- .addTo(UniversalChemical);
+ .addTo(chemicalReactorRecipes);
GTValues.RA.stdBuilder()
.itemInputs(Materials.HydrochloricAcid.getCells(1), GTUtility.getIntegratedCircuit(11))
@@ -2002,7 +2013,7 @@ public class ChemicalRecipes implements Runnable {
.fluidOutputs(Materials.Epichlorohydrin.getFluid(1000))
.duration(24 * SECONDS)
.eut(TierEU.RECIPE_LV)
- .addTo(UniversalChemical);
+ .addTo(chemicalReactorRecipes);
GTValues.RA.stdBuilder()
.itemInputs(Materials.Glycerol.getCells(1), GTUtility.getIntegratedCircuit(2))
@@ -2011,7 +2022,7 @@ public class ChemicalRecipes implements Runnable {
.fluidOutputs(Materials.Epichlorohydrin.getFluid(1000))
.duration(24 * SECONDS)
.eut(TierEU.RECIPE_LV)
- .addTo(UniversalChemical);
+ .addTo(chemicalReactorRecipes);
GTValues.RA.stdBuilder()
.itemInputs(Materials.HydrochloricAcid.getCells(1), GTUtility.getIntegratedCircuit(12))
@@ -2057,7 +2068,7 @@ public class ChemicalRecipes implements Runnable {
.fluidOutputs(Materials.Acetone.getFluid(1000))
.duration(8 * SECONDS)
.eut(TierEU.RECIPE_LV)
- .addTo(UniversalChemical);
+ .addTo(chemicalReactorRecipes);
GTValues.RA.stdBuilder()
.itemInputs(Materials.Cumene.getCells(1), GTUtility.getIntegratedCircuit(11))
@@ -2106,7 +2117,7 @@ public class ChemicalRecipes implements Runnable {
.fluidOutputs(Materials.Chloromethane.getGas(1000))
.duration(8 * SECONDS)
.eut(TierEU.RECIPE_LV)
- .addTo(UniversalChemical);
+ .addTo(chemicalReactorRecipes);
GTValues.RA.stdBuilder()
.itemInputs(Materials.Methanol.getCells(1), GTUtility.getIntegratedCircuit(11))
@@ -2142,7 +2153,7 @@ public class ChemicalRecipes implements Runnable {
.fluidOutputs(Materials.Chloromethane.getGas(1000))
.duration(8 * SECONDS)
.eut(TierEU.RECIPE_LV)
- .addTo(UniversalChemical);
+ .addTo(chemicalReactorRecipes);
GTValues.RA.stdBuilder()
.itemInputs(Materials.Methanol.getCells(1), GTUtility.getIntegratedCircuit(12))
@@ -2176,7 +2187,7 @@ public class ChemicalRecipes implements Runnable {
.fluidOutputs(Materials.Chloromethane.getGas(1000))
.duration(4 * SECONDS)
.eut(TierEU.RECIPE_LV)
- .addTo(UniversalChemical);
+ .addTo(chemicalReactorRecipes);
GTValues.RA.stdBuilder()
.itemInputs(Materials.Chlorine.getCells(2), GTUtility.getIntegratedCircuit(11))
@@ -2243,7 +2254,7 @@ public class ChemicalRecipes implements Runnable {
.fluidOutputs(Materials.HydrofluoricAcid.getFluid(1000))
.duration(3 * SECONDS)
.eut(8)
- .addTo(UniversalChemical);
+ .addTo(chemicalReactorRecipes);
GTValues.RA.stdBuilder()
.itemInputs(Materials.Fluorine.getCells(1), GTUtility.getIntegratedCircuit(11))
@@ -2269,7 +2280,7 @@ public class ChemicalRecipes implements Runnable {
.fluidOutputs(Materials.Tetrafluoroethylene.getGas(1000))
.duration(24 * SECONDS)
.eut(TierEU.RECIPE_MV)
- .addTo(UniversalChemical);
+ .addTo(chemicalReactorRecipes);
GTValues.RA.stdBuilder()
.itemInputs(Materials.Chloroform.getCells(2), Materials.Empty.getCells(4))
@@ -2278,7 +2289,7 @@ public class ChemicalRecipes implements Runnable {
.fluidOutputs(Materials.Tetrafluoroethylene.getGas(1000))
.duration(24 * SECONDS)
.eut(TierEU.RECIPE_MV)
- .addTo(UniversalChemical);
+ .addTo(chemicalReactorRecipes);
GTValues.RA.stdBuilder()
.itemInputs(Materials.HydrofluoricAcid.getCells(4), Materials.Empty.getCells(2))
@@ -2287,7 +2298,7 @@ public class ChemicalRecipes implements Runnable {
.fluidOutputs(Materials.Tetrafluoroethylene.getGas(1000))
.duration(24 * SECONDS)
.eut(TierEU.RECIPE_MV)
- .addTo(UniversalChemical);
+ .addTo(chemicalReactorRecipes);
GTValues.RA.stdBuilder()
.itemInputs(Materials.HydrofluoricAcid.getCells(4), GTUtility.getIntegratedCircuit(11))
@@ -2333,7 +2344,7 @@ public class ChemicalRecipes implements Runnable {
.fluidOutputs(Materials.DilutedHydrochloricAcid.getFluid(1000))
.duration(12 * SECONDS)
.eut(96)
- .addTo(UniversalChemical);
+ .addTo(chemicalReactorRecipes);
GTValues.RA.stdBuilder()
.itemInputs(Materials.Dimethyldichlorosilane.getCells(1), GTUtility.getIntegratedCircuit(11))
@@ -2409,7 +2420,7 @@ public class ChemicalRecipes implements Runnable {
.fluidOutputs(Materials.DilutedSulfuricAcid.getFluid(1000))
.duration(5 * SECONDS)
.eut(TierEU.RECIPE_HV)
- .addTo(UniversalChemical);
+ .addTo(chemicalReactorRecipes);
GTValues.RA.stdBuilder()
.itemInputs(Materials.NitrationMixture.getCells(2), GTUtility.getIntegratedCircuit(11))
@@ -2459,7 +2470,7 @@ public class ChemicalRecipes implements Runnable {
.fluidOutputs(Materials.Water.getFluid(2000))
.duration(5 * SECONDS)
.eut(TierEU.RECIPE_EV)
- .addTo(UniversalChemical);
+ .addTo(chemicalReactorRecipes);
GTValues.RA.stdBuilder()
.itemInputs(Materials.Dimethylbenzene.getCells(9), Materials.Potassiumdichromate.getDust(1))
@@ -2477,7 +2488,7 @@ public class ChemicalRecipes implements Runnable {
.fluidOutputs(Materials.Water.getFluid(18000))
.duration(45 * SECONDS)
.eut(TierEU.RECIPE_EV)
- .addTo(UniversalChemical);
+ .addTo(chemicalReactorRecipes);
// These following recipes are broken in element term.
// But they are kept in gamewise, too much existed setup will be broken.
@@ -2517,7 +2528,7 @@ public class ChemicalRecipes implements Runnable {
.fluidOutputs(Materials.DilutedSulfuricAcid.getFluid(1000))
.duration(5 * SECONDS)
.eut(TierEU.RECIPE_IV)
- .addTo(UniversalChemical);
+ .addTo(chemicalReactorRecipes);
GTValues.RA.stdBuilder()
.itemInputs(Materials.SulfuricAcid.getCells(1), Materials.Phenol.getCells(2))
@@ -2526,7 +2537,7 @@ public class ChemicalRecipes implements Runnable {
.fluidOutputs(Materials.DilutedSulfuricAcid.getFluid(1000))
.duration(5 * SECONDS)
.eut(TierEU.RECIPE_IV)
- .addTo(UniversalChemical);
+ .addTo(chemicalReactorRecipes);
// Diaminobenzidin
@@ -2632,7 +2643,7 @@ public class ChemicalRecipes implements Runnable {
.fluidOutputs(Materials.Chloramine.getFluid(1000))
.duration(8 * SECONDS)
.eut(TierEU.RECIPE_LV)
- .addTo(UniversalChemical);
+ .addTo(chemicalReactorRecipes);
GTValues.RA.stdBuilder()
.itemInputs(Materials.Ammonia.getCells(1), GTUtility.getIntegratedCircuit(11))
@@ -2668,7 +2679,7 @@ public class ChemicalRecipes implements Runnable {
.fluidOutputs(Materials.Chloramine.getFluid(1000))
.duration(8 * SECONDS)
.eut(TierEU.RECIPE_LV)
- .addTo(UniversalChemical);
+ .addTo(chemicalReactorRecipes);
GTValues.RA.stdBuilder()
.itemInputs(Materials.Ammonia.getCells(1), GTUtility.getIntegratedCircuit(12))
@@ -2702,7 +2713,7 @@ public class ChemicalRecipes implements Runnable {
.fluidOutputs(Materials.DinitrogenTetroxide.getGas(1000))
.duration(32 * SECONDS)
.eut(TierEU.RECIPE_LV)
- .addTo(UniversalChemical);
+ .addTo(chemicalReactorRecipes);
GTValues.RA.stdBuilder()
.itemInputs(Materials.NitrogenDioxide.getCells(2), GTUtility.getIntegratedCircuit(12))
@@ -2729,7 +2740,7 @@ public class ChemicalRecipes implements Runnable {
.fluidOutputs(Materials.Water.getFluid(6000))
.duration(16 * SECONDS)
.eut(TierEU.RECIPE_LV)
- .addTo(UniversalChemical);
+ .addTo(chemicalReactorRecipes);
GTValues.RA.stdBuilder()
.itemInputs(Materials.Oxygen.getCells(10), GTUtility.getIntegratedCircuit(11))
@@ -2754,7 +2765,7 @@ public class ChemicalRecipes implements Runnable {
.fluidInputs(Materials.Ammonia.getGas(4000))
.duration(16 * SECONDS)
.eut(TierEU.RECIPE_LV)
- .addTo(UniversalChemical);
+ .addTo(chemicalReactorRecipes);
GTValues.RA.stdBuilder()
.itemInputs(Materials.Oxygen.getCells(10), GTUtility.getIntegratedCircuit(12))
@@ -2783,7 +2794,7 @@ public class ChemicalRecipes implements Runnable {
.fluidOutputs(Materials.NitrogenDioxide.getGas(1000))
.duration(8 * SECONDS)
.eut(TierEU.RECIPE_LV)
- .addTo(UniversalChemical);
+ .addTo(chemicalReactorRecipes);
GTValues.RA.stdBuilder()
.itemInputs(Materials.NitricOxide.getCells(1), GTUtility.getIntegratedCircuit(11))
@@ -2819,7 +2830,7 @@ public class ChemicalRecipes implements Runnable {
.fluidOutputs(Materials.NitricAcid.getFluid(2000))
.duration(12 * SECONDS)
.eut(TierEU.RECIPE_LV)
- .addTo(UniversalChemical);
+ .addTo(chemicalReactorRecipes);
GTValues.RA.stdBuilder()
.itemInputs(Materials.NitrogenDioxide.getCells(3), GTUtility.getIntegratedCircuit(11))
@@ -2868,7 +2879,7 @@ public class ChemicalRecipes implements Runnable {
.fluidOutputs(Materials.SulfurDioxide.getGas(1000))
.duration(6 * SECONDS)
.eut(TierEU.RECIPE_LV)
- .addTo(UniversalChemical);
+ .addTo(chemicalReactorRecipes);
GTValues.RA.stdBuilder()
.itemInputs(Materials.HydricSulfide.getCells(1), GTUtility.getIntegratedCircuit(11))
@@ -2904,7 +2915,7 @@ public class ChemicalRecipes implements Runnable {
.fluidOutputs(Materials.SulfurDioxide.getGas(1000))
.duration(6 * SECONDS)
.eut(TierEU.RECIPE_LV)
- .addTo(UniversalChemical);
+ .addTo(chemicalReactorRecipes);
GTValues.RA.stdBuilder()
.itemInputs(Materials.HydricSulfide.getCells(1), GTUtility.getIntegratedCircuit(12))
@@ -2940,7 +2951,7 @@ public class ChemicalRecipes implements Runnable {
.fluidOutputs(Materials.Water.getFluid(2000))
.duration(6 * SECONDS)
.eut(TierEU.RECIPE_LV)
- .addTo(UniversalChemical);
+ .addTo(chemicalReactorRecipes);
GTValues.RA.stdBuilder()
.itemInputs(Materials.SulfurDioxide.getCells(1), GTUtility.getIntegratedCircuit(2))
@@ -2956,7 +2967,7 @@ public class ChemicalRecipes implements Runnable {
.fluidInputs(Materials.SulfurDioxide.getGas(1000))
.duration(6 * SECONDS)
.eut(TierEU.RECIPE_LV)
- .addTo(UniversalChemical);
+ .addTo(chemicalReactorRecipes);
// SO2 + O = SO3
@@ -2976,7 +2987,7 @@ public class ChemicalRecipes implements Runnable {
.fluidOutputs(Materials.SulfurTrioxide.getGas(1000))
.duration(10 * SECONDS)
.eut(TierEU.RECIPE_LV)
- .addTo(UniversalChemical);
+ .addTo(chemicalReactorRecipes);
GTValues.RA.stdBuilder()
.itemInputs(Materials.Oxygen.getCells(1), GTUtility.getIntegratedCircuit(11))
@@ -3012,7 +3023,7 @@ public class ChemicalRecipes implements Runnable {
.fluidOutputs(Materials.SulfuricAcid.getFluid(1000))
.duration(16 * SECONDS)
.eut(8)
- .addTo(UniversalChemical);
+ .addTo(chemicalReactorRecipes);
GTValues.RA.stdBuilder()
.itemInputs(Materials.Water.getCells(1), GTUtility.getIntegratedCircuit(11))
@@ -3048,7 +3059,7 @@ public class ChemicalRecipes implements Runnable {
.fluidOutputs(Materials.VinylChloride.getGas(1000))
.duration(8 * SECONDS)
.eut(TierEU.RECIPE_LV)
- .addTo(UniversalChemical);
+ .addTo(chemicalReactorRecipes);
GTValues.RA.stdBuilder()
.itemInputs(Materials.Chlorine.getCells(2), GTUtility.getIntegratedCircuit(11))
@@ -3086,7 +3097,7 @@ public class ChemicalRecipes implements Runnable {
.fluidOutputs(Materials.DilutedSulfuricAcid.getFluid(1000))
.duration(8 * SECONDS)
.eut(TierEU.RECIPE_MV)
- .addTo(UniversalChemical);
+ .addTo(chemicalReactorRecipes);
GTValues.RA.stdBuilder()
.itemInputs(Materials.AceticAcid.getCells(1), GTUtility.getIntegratedCircuit(11))
@@ -3134,7 +3145,7 @@ public class ChemicalRecipes implements Runnable {
.fluidOutputs(Materials.Water.getFluid(9000))
.duration(24 * SECONDS)
.eut(TierEU.RECIPE_MV)
- .addTo(UniversalChemical);
+ .addTo(chemicalReactorRecipes);
GTValues.RA.stdBuilder()
.itemInputs(Materials.NitricAcid.getCells(8), GTUtility.getIntegratedCircuit(2))
@@ -3142,7 +3153,7 @@ public class ChemicalRecipes implements Runnable {
.fluidInputs(Materials.Ethenone.getGas(1000))
.duration(24 * SECONDS)
.eut(TierEU.RECIPE_MV)
- .addTo(UniversalChemical);
+ .addTo(chemicalReactorRecipes);
GTValues.RA.stdBuilder()
.itemInputs(Materials.NitricAcid.getCells(8), GTUtility.getIntegratedCircuit(12))
@@ -3160,7 +3171,7 @@ public class ChemicalRecipes implements Runnable {
.fluidOutputs(Materials.Tetranitromethane.getFluid(2000))
.duration(24 * SECONDS)
.eut(TierEU.RECIPE_MV)
- .addTo(UniversalChemical);
+ .addTo(chemicalReactorRecipes);
GTValues.RA.stdBuilder()
.itemInputs(Materials.Ethenone.getCells(1), Materials.NitricAcid.getCells(8))
@@ -3168,7 +3179,7 @@ public class ChemicalRecipes implements Runnable {
.fluidOutputs(Materials.Tetranitromethane.getFluid(2000))
.duration(24 * SECONDS)
.eut(TierEU.RECIPE_MV)
- .addTo(UniversalChemical);
+ .addTo(chemicalReactorRecipes);
// C3H6 + C2H4 = C5H8 + 2H
@@ -3188,7 +3199,7 @@ public class ChemicalRecipes implements Runnable {
.fluidOutputs(Materials.Isoprene.getFluid(1000))
.duration(6 * SECONDS)
.eut(TierEU.RECIPE_LV)
- .addTo(UniversalChemical);
+ .addTo(chemicalReactorRecipes);
GTValues.RA.stdBuilder()
.itemInputs(Materials.Propene.getCells(1), GTUtility.getIntegratedCircuit(1))
@@ -3197,7 +3208,7 @@ public class ChemicalRecipes implements Runnable {
.fluidOutputs(Materials.Hydrogen.getGas(2000))
.duration(6 * SECONDS)
.eut(TierEU.RECIPE_LV)
- .addTo(UniversalChemical);
+ .addTo(chemicalReactorRecipes);
GTValues.RA.stdBuilder()
.itemInputs(Materials.Ethylene.getCells(1), GTUtility.getIntegratedCircuit(1))
@@ -3206,7 +3217,7 @@ public class ChemicalRecipes implements Runnable {
.fluidOutputs(Materials.Hydrogen.getGas(2000))
.duration(6 * SECONDS)
.eut(TierEU.RECIPE_LV)
- .addTo(UniversalChemical);
+ .addTo(chemicalReactorRecipes);
GTValues.RA.stdBuilder()
.itemInputs(Materials.Empty.getCells(1), GTUtility.getIntegratedCircuit(5))
@@ -3223,7 +3234,7 @@ public class ChemicalRecipes implements Runnable {
.fluidOutputs(Materials.Isoprene.getFluid(1000))
.duration(6 * SECONDS)
.eut(TierEU.RECIPE_LV)
- .addTo(UniversalChemical);
+ .addTo(chemicalReactorRecipes);
GTValues.RA.stdBuilder()
.itemInputs(Materials.Empty.getCells(1), GTUtility.getIntegratedCircuit(15))
@@ -3264,7 +3275,7 @@ public class ChemicalRecipes implements Runnable {
.fluidInputs(Materials.Air.getGas(14000))
.duration(56 * SECONDS)
.eut(TierEU.RECIPE_LV)
- .addTo(UniversalChemical);
+ .addTo(chemicalReactorRecipes);
GTValues.RA.stdBuilder()
.itemInputs(Materials.Isoprene.getCells(2), GTUtility.getIntegratedCircuit(1))
@@ -3272,7 +3283,7 @@ public class ChemicalRecipes implements Runnable {
.fluidInputs(Materials.Oxygen.getGas(14000))
.duration(1 * MINUTES + 52 * SECONDS)
.eut(TierEU.RECIPE_LV)
- .addTo(UniversalChemical);
+ .addTo(chemicalReactorRecipes);
GTValues.RA.stdBuilder()
.itemInputs(Materials.Benzene.getCells(1), GTUtility.getIntegratedCircuit(1))
@@ -3290,7 +3301,7 @@ public class ChemicalRecipes implements Runnable {
.fluidOutputs(Materials.Hydrogen.getGas(2000))
.duration(6 * SECONDS)
.eut(TierEU.RECIPE_LV)
- .addTo(UniversalChemical);
+ .addTo(chemicalReactorRecipes);
GTValues.RA.stdBuilder()
.itemInputs(Materials.RawStyreneButadieneRubber.getDust(9), Materials.Sulfur.getDust(1))
@@ -3317,7 +3328,7 @@ public class ChemicalRecipes implements Runnable {
.fluidOutputs(Materials.HydrochloricAcid.getFluid(2000))
.duration(12 * SECONDS)
.eut(TierEU.RECIPE_LV)
- .addTo(UniversalChemical);
+ .addTo(chemicalReactorRecipes);
GTValues.RA.stdBuilder()
.itemInputs(Materials.Chlorine.getCells(4), GTUtility.getIntegratedCircuit(12))
@@ -3386,7 +3397,7 @@ public class ChemicalRecipes implements Runnable {
.fluidOutputs(Materials.Glycerol.getFluid(1000))
.duration(30 * SECONDS)
.eut(TierEU.RECIPE_LV)
- .addTo(UniversalChemical);
+ .addTo(chemicalReactorRecipes);
GTValues.RA.stdBuilder()
.itemInputs(Materials.SodiumHydroxide.getDustTiny(1), Materials.Methanol.getCells(1))
@@ -3404,7 +3415,7 @@ public class ChemicalRecipes implements Runnable {
.fluidOutputs(Materials.Glycerol.getFluid(1000))
.duration(30 * SECONDS)
.eut(TierEU.RECIPE_LV)
- .addTo(UniversalChemical);
+ .addTo(chemicalReactorRecipes);
GTValues.RA.stdBuilder()
.itemInputs(Materials.SodiumHydroxide.getDustTiny(1), Materials.Ethanol.getCells(1))
@@ -3422,7 +3433,7 @@ public class ChemicalRecipes implements Runnable {
.fluidOutputs(Materials.Glycerol.getFluid(1000))
.duration(30 * SECONDS)
.eut(TierEU.RECIPE_LV)
- .addTo(UniversalChemical);
+ .addTo(chemicalReactorRecipes);
GTValues.RA.stdBuilder()
.itemInputs(Materials.SodiumHydroxide.getDustTiny(1), Materials.Ethanol.getCells(1))
@@ -3440,7 +3451,7 @@ public class ChemicalRecipes implements Runnable {
.fluidOutputs(Materials.Glycerol.getFluid(1000))
.duration(30 * SECONDS)
.eut(TierEU.RECIPE_LV)
- .addTo(UniversalChemical);
+ .addTo(chemicalReactorRecipes);
GTValues.RA.stdBuilder()
.itemInputs(Materials.SodiumHydroxide.getDust(1), Materials.Methanol.getCells(9))
@@ -3458,7 +3469,7 @@ public class ChemicalRecipes implements Runnable {
.fluidOutputs(Materials.Glycerol.getFluid(9000))
.duration(4 * MINUTES + 30 * SECONDS)
.eut(TierEU.RECIPE_LV)
- .addTo(UniversalChemical);
+ .addTo(chemicalReactorRecipes);
GTValues.RA.stdBuilder()
.itemInputs(Materials.SodiumHydroxide.getDust(1), Materials.Methanol.getCells(9))
@@ -3476,7 +3487,7 @@ public class ChemicalRecipes implements Runnable {
.fluidOutputs(Materials.Glycerol.getFluid(9000))
.duration(4 * MINUTES + 30 * SECONDS)
.eut(TierEU.RECIPE_LV)
- .addTo(UniversalChemical);
+ .addTo(chemicalReactorRecipes);
GTValues.RA.stdBuilder()
.itemInputs(Materials.SodiumHydroxide.getDust(1), Materials.Ethanol.getCells(9))
@@ -3494,7 +3505,7 @@ public class ChemicalRecipes implements Runnable {
.fluidOutputs(Materials.Glycerol.getFluid(9000))
.duration(4 * MINUTES + 30 * SECONDS)
.eut(TierEU.RECIPE_LV)
- .addTo(UniversalChemical);
+ .addTo(chemicalReactorRecipes);
GTValues.RA.stdBuilder()
.itemInputs(Materials.SodiumHydroxide.getDust(1), Materials.Ethanol.getCells(9))
@@ -3512,7 +3523,7 @@ public class ChemicalRecipes implements Runnable {
.fluidOutputs(Materials.Glycerol.getFluid(9000))
.duration(4 * MINUTES + 30 * SECONDS)
.eut(TierEU.RECIPE_LV)
- .addTo(UniversalChemical);
+ .addTo(chemicalReactorRecipes);
// C3H8O3 + 3HNO3 =H2SO4= C3H5N3O9 + 3H2O
@@ -3532,7 +3543,7 @@ public class ChemicalRecipes implements Runnable {
.fluidOutputs(Materials.DilutedSulfuricAcid.getFluid(3000))
.duration(9 * SECONDS)
.eut(TierEU.RECIPE_LV)
- .addTo(UniversalChemical);
+ .addTo(chemicalReactorRecipes);
GTValues.RA.stdBuilder()
.itemInputs(Materials.NitrationMixture.getCells(6), GTUtility.getIntegratedCircuit(11))
@@ -3597,7 +3608,7 @@ public class ChemicalRecipes implements Runnable {
.fluidOutputs(Materials.HydrochloricAcid.getFluid(1000))
.duration(12 * SECONDS)
.eut(TierEU.RECIPE_LV)
- .addTo(UniversalChemical);
+ .addTo(chemicalReactorRecipes);
GTValues.RA.stdBuilder()
.itemInputs(Materials.Chlorine.getCells(2), GTUtility.getIntegratedCircuit(11))
@@ -3626,7 +3637,7 @@ public class ChemicalRecipes implements Runnable {
.fluidOutputs(Materials.Phenol.getFluid(1000))
.duration(12 * SECONDS)
.eut(TierEU.RECIPE_LV)
- .addTo(UniversalChemical);
+ .addTo(chemicalReactorRecipes);
GTValues.RA.stdBuilder()
.itemInputs(Materials.Water.getCells(1), GTUtility.getIntegratedCircuit(11))
@@ -3644,7 +3655,7 @@ public class ChemicalRecipes implements Runnable {
.fluidOutputs(Materials.DilutedHydrochloricAcid.getFluid(1000))
.duration(12 * SECONDS)
.eut(TierEU.RECIPE_LV)
- .addTo(UniversalChemical);
+ .addTo(chemicalReactorRecipes);
// C6H5Cl + NaOH = C6H6O + NaCl
@@ -3768,7 +3779,7 @@ public class ChemicalRecipes implements Runnable {
.fluidOutputs(Materials.CarbonMonoxide.getGas(1000))
.duration(30 * SECONDS)
.eut(TierEU.RECIPE_HV)
- .addTo(UniversalChemical);
+ .addTo(chemicalReactorRecipes);
// CaC2 + 2H2O = Ca(OH)2 + C2H2
@@ -3816,7 +3827,7 @@ public class ChemicalRecipes implements Runnable {
.addTo(UniversalChemical);
GTValues.RA.stdBuilder()
- .itemInputs(aBasicMaterialCell, GTUtility.getIntegratedCircuit(1))
+ .itemInputs(aBasicMaterialCell, GTUtility.getIntegratedCircuit(9))
.itemOutputs(Materials.Empty.getCells(1))
.fluidInputs(Materials.Air.getGas(14000))
.fluidOutputs(new FluidStack(aPolymer, 1000))
@@ -3825,7 +3836,7 @@ public class ChemicalRecipes implements Runnable {
.addTo(UniversalChemical);
GTValues.RA.stdBuilder()
- .itemInputs(aBasicMaterialCell, GTUtility.getIntegratedCircuit(1))
+ .itemInputs(aBasicMaterialCell, GTUtility.getIntegratedCircuit(9))
.itemOutputs(Materials.Empty.getCells(1))
.fluidInputs(Materials.Oxygen.getGas(7000))
.fluidOutputs(new FluidStack(aPolymer, 1500))
@@ -5243,7 +5254,7 @@ public class ChemicalRecipes implements Runnable {
.addTo(multiblockChemicalReactorRecipes);
GTValues.RA.stdBuilder()
- .itemInputs(GTUtility.getIntegratedCircuit(24))
+ .itemInputs(GTUtility.getIntegratedCircuit(21))
.fluidInputs(
Materials.Hydrogen.getGas(3000),
Materials.Nitrogen.getGas(1000),
diff --git a/src/main/java/gregtech/loaders/postload/recipes/CompressorRecipes.java b/src/main/java/gregtech/loaders/postload/recipes/CompressorRecipes.java
index 391cf6e576..774def6456 100644
--- a/src/main/java/gregtech/loaders/postload/recipes/CompressorRecipes.java
+++ b/src/main/java/gregtech/loaders/postload/recipes/CompressorRecipes.java
@@ -1,7 +1,6 @@
package gregtech.loaders.postload.recipes;
import static gregtech.api.enums.Mods.AppliedEnergistics2;
-import static gregtech.api.enums.Mods.Railcraft;
import static gregtech.api.recipe.RecipeMaps.compressorRecipes;
import static gregtech.api.util.GTModHandler.getModItem;
import static gregtech.api.util.GTRecipeBuilder.HOURS;
@@ -23,8 +22,6 @@ import gregtech.api.enums.TierEU;
import gregtech.api.recipe.metadata.CompressionTierKey;
import gregtech.api.util.GTModHandler;
import gregtech.api.util.GTOreDictUnificator;
-import mods.railcraft.common.blocks.aesthetics.cube.EnumCube;
-import mods.railcraft.common.items.RailcraftToolItems;
public class CompressorRecipes implements Runnable {
@@ -317,14 +314,5 @@ public class CompressorRecipes implements Runnable {
.duration(15 * SECONDS)
.eut(2)
.addTo(compressorRecipes);
-
- if (Railcraft.isModLoaded()) {
- GTValues.RA.stdBuilder()
- .itemInputs(RailcraftToolItems.getCoalCoke(9))
- .itemOutputs(EnumCube.COKE_BLOCK.getItem())
- .duration(15 * SECONDS)
- .eut(2)
- .addTo(compressorRecipes);
- }
}
}
diff --git a/src/main/java/gregtech/loaders/postload/recipes/DistilleryRecipes.java b/src/main/java/gregtech/loaders/postload/recipes/DistilleryRecipes.java
index e22cf2ef7e..4f12d8d198 100644
--- a/src/main/java/gregtech/loaders/postload/recipes/DistilleryRecipes.java
+++ b/src/main/java/gregtech/loaders/postload/recipes/DistilleryRecipes.java
@@ -89,14 +89,6 @@ public class DistilleryRecipes implements Runnable {
.addTo(distilleryRecipes);
GTValues.RA.stdBuilder()
- .itemInputs(GTUtility.getIntegratedCircuit(1))
- .fluidInputs(Materials.Biomass.getFluid(40L))
- .fluidOutputs(Materials.Ethanol.getFluid(12L))
- .duration(16 * TICKS)
- .eut(24)
- .addTo(distilleryRecipes);
-
- GTValues.RA.stdBuilder()
.itemInputs(GTUtility.getIntegratedCircuit(5))
.fluidInputs(Materials.Biomass.getFluid(40L))
.fluidOutputs(Materials.Water.getFluid(12L))
@@ -278,14 +270,6 @@ public class DistilleryRecipes implements Runnable {
GTValues.RA.stdBuilder()
.itemInputs(GTUtility.getIntegratedCircuit(5))
- .fluidInputs(Materials.WoodTar.getFluid(200))
- .fluidOutputs(Materials.Dimethylbenzene.getFluid(30))
- .duration(5 * SECONDS)
- .eut(TierEU.RECIPE_MV)
- .addTo(distilleryRecipes);
-
- GTValues.RA.stdBuilder()
- .itemInputs(GTUtility.getIntegratedCircuit(5))
.fluidInputs(Materials.CharcoalByproducts.getGas(200))
.fluidOutputs(Materials.Dimethylbenzene.getFluid(20))
.duration(5 * SECONDS)
diff --git a/src/main/java/gregtech/loaders/postload/recipes/FermenterRecipes.java b/src/main/java/gregtech/loaders/postload/recipes/FermenterRecipes.java
index b3605375bd..b314044bdb 100644
--- a/src/main/java/gregtech/loaders/postload/recipes/FermenterRecipes.java
+++ b/src/main/java/gregtech/loaders/postload/recipes/FermenterRecipes.java
@@ -137,20 +137,6 @@ public class FermenterRecipes implements Runnable {
.addTo(fermentingRecipes);
GTValues.RA.stdBuilder()
- .fluidInputs(getFluidStack("potion.rum", 75))
- .fluidOutputs(getFluidStack("potion.vinegar", 50))
- .duration(1 * MINUTES + 42 * SECONDS + 8 * TICKS)
- .eut(2)
- .addTo(fermentingRecipes);
-
- GTValues.RA.stdBuilder()
- .fluidInputs(getFluidStack("potion.wine", 75))
- .fluidOutputs(getFluidStack("potion.vinegar", 50))
- .duration(1 * MINUTES + 42 * SECONDS + 8 * TICKS)
- .eut(2)
- .addTo(fermentingRecipes);
-
- GTValues.RA.stdBuilder()
.fluidInputs(getFluidStack("potion.awkward", 50))
.fluidOutputs(getFluidStack("potion.weakness", 25))
.duration(51 * SECONDS + 4 * TICKS)