aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gregtech/loaders
diff options
context:
space:
mode:
authormiozune <miozune@gmail.com>2022-10-25 23:06:03 +0900
committerGitHub <noreply@github.com>2022-10-25 16:06:03 +0200
commit380a03e60158aae15da3ab85cb61291888aae151 (patch)
tree1e9479f36273ebe21b8c8653abd9dc3cf11b0704 /src/main/java/gregtech/loaders
parentd1d6c620c123c5001fb5b9670686f567991aafb5 (diff)
downloadGT5-Unofficial-380a03e60158aae15da3ab85cb61291888aae151.tar.gz
GT5-Unofficial-380a03e60158aae15da3ab85cb61291888aae151.tar.bz2
GT5-Unofficial-380a03e60158aae15da3ab85cb61291888aae151.zip
Recipe fixes 2022/10/25 (#1489)
Diffstat (limited to 'src/main/java/gregtech/loaders')
-rw-r--r--src/main/java/gregtech/loaders/oreprocessing/ProcessingBlock.java2
-rw-r--r--src/main/java/gregtech/loaders/oreprocessing/ProcessingStone.java1
-rw-r--r--src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java13
3 files changed, 11 insertions, 5 deletions
diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingBlock.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingBlock.java
index cba48f95bd..86630cbe08 100644
--- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingBlock.java
+++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingBlock.java
@@ -15,7 +15,7 @@ public class ProcessingBlock implements gregtech.api.interfaces.IOreRecipeRegist
@Override
public void registerOre(
OrePrefixes aPrefix, Materials aMaterial, String aOreDictName, String aModName, ItemStack aStack) {
- if (aMaterial != Materials.Clay) {
+ if (aMaterial != Materials.Clay && aMaterial != Materials.Basalt) {
GT_Values.RA.addCutterRecipe(
GT_Utility.copyAmount(1L, aStack),
aMaterial == MaterialsBotania.Livingrock
diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingStone.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingStone.java
index 6d9c177f11..fcd604ef3b 100644
--- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingStone.java
+++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingStone.java
@@ -167,6 +167,7 @@ public class ProcessingStone implements IOreRecipeRegistrator {
case "Basalt":
GT_Values.RA.addCutterRecipe(
GT_Utility.copyAmount(1L, aStack),
+ GT_Utility.getIntegratedCircuit(3),
GT_OreDictUnificator.get(OrePrefixes.plate, aMaterial, 1L),
null,
200,
diff --git a/src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java b/src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java
index 32aa0f36ac..53d00fa6e6 100644
--- a/src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java
+++ b/src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java
@@ -11342,6 +11342,7 @@ public class GT_MachineRecipeLoader implements Runnable {
MaterialsKevlar.Acetaldehyde.getGas(1000),
Materials.CarbonMonoxide.getGas(1000),
GT_OreDictUnificator.get(OrePrefixes.dust, MaterialsKevlar.Pentaerythritol, 21L),
+ Materials.Empty.getCells(4),
600,
480);
// 2CH2O + C2H2 =SiO2,CuO,Bi2O3= C4H6O2
@@ -11397,6 +11398,7 @@ public class GT_MachineRecipeLoader implements Runnable {
new FluidStack(FluidRegistry.getFluid("formaldehyde"), 4000),
Materials.CarbonMonoxide.getGas(1000),
GT_OreDictUnificator.get(OrePrefixes.dust, MaterialsKevlar.Pentaerythritol, 21L),
+ Materials.Empty.getCells(1),
600,
480);
// CaC2 + 2H2O = Ca(OH)2 + C2H2
@@ -11872,7 +11874,7 @@ public class GT_MachineRecipeLoader implements Runnable {
GT_Values.NF,
GT_Values.NF,
GT_OreDictUnificator.get(OrePrefixes.cell, MaterialsKevlar.SulfurDichloride, 8L),
- ItemList.Cell_Empty.get(16),
+ ItemList.Cell_Empty.get(8),
800,
30);
GT_Values.RA.addChemicalRecipeForBasicMachineOnly(
@@ -14929,7 +14931,7 @@ public class GT_MachineRecipeLoader implements Runnable {
Materials.CarbonDioxide.getGas(1000),
Materials.Methanol.getFluid(1000),
Materials.Water.getCells(1),
- Materials.Empty.getCells(3),
+ Materials.Empty.getCells(5),
120,
96);
GT_Values.RA.addChemicalRecipe(
@@ -15701,6 +15703,7 @@ public class GT_MachineRecipeLoader implements Runnable {
Materials.Cumene.getFluid(1000),
Materials.Acetone.getFluid(1000),
Materials.Phenol.getCells(1),
+ Materials.Empty.getCells(1),
160);
GT_Values.RA.addChemicalRecipe(
Materials.Cumene.getCells(1),
@@ -15715,6 +15718,7 @@ public class GT_MachineRecipeLoader implements Runnable {
Materials.Cumene.getFluid(1000),
Materials.Phenol.getFluid(1000),
Materials.Acetone.getCells(1),
+ Materials.Empty.getCells(1),
160);
GT_Values.RA.addMultiblockChemicalRecipe(
new ItemStack[] {GT_Utility.getIntegratedCircuit(24)},
@@ -19361,6 +19365,7 @@ public class GT_MachineRecipeLoader implements Runnable {
Materials.Benzene.getFluid(1000),
Materials.Hydrogen.getGas(4000),
Materials.Dimethylbenzene.getCells(1),
+ Materials.Empty.getCells(1),
4000,
120);
GT_Values.RA.addChemicalRecipe(
@@ -19395,7 +19400,7 @@ public class GT_MachineRecipeLoader implements Runnable {
Materials.Dimethylbenzene.getFluid(1000),
Materials.Water.getFluid(2000),
Materials.PhthalicAcid.getCells(1),
- ItemList.Cell_Empty.get(1L),
+ ItemList.Cell_Empty.get(5L),
100,
1920);
@@ -19413,7 +19418,7 @@ public class GT_MachineRecipeLoader implements Runnable {
Materials.Dimethylbenzene.getFluid(9000),
Materials.Water.getFluid(18000),
Materials.PhthalicAcid.getCells(9),
- ItemList.Cell_Empty.get(9L),
+ ItemList.Cell_Empty.get(45L),
900,
1920);