diff options
Diffstat (limited to 'src')
5 files changed, 16 insertions, 6 deletions
diff --git a/src/main/java/gregtech/api/enums/Materials.java b/src/main/java/gregtech/api/enums/Materials.java index 1ac1e67144..719cd18278 100644 --- a/src/main/java/gregtech/api/enums/Materials.java +++ b/src/main/java/gregtech/api/enums/Materials.java @@ -701,7 +701,7 @@ public class Materials implements IColorModulationContainer, ISubTagContainer { public static Materials RedAlloy = new Materials( 308, TextureSet.SET_DULL , 1.0F, 0, 0, 1|2 , 200, 0, 0, 0, "RedAlloy" , "Red Alloy" , 0, 0, 500, 0, false, false, 3, 5, 1, Dyes.dyeRed , 2, Arrays.asList(new MaterialStack(Copper, 1), new MaterialStack(Redstone, 4)), Collections.singletonList(new TC_AspectStack(TC_Aspects.MACHINA, 3))); public static Materials CobaltBrass = new Materials( 343, TextureSet.SET_METALLIC , 8.0F, 256, 2, 1|2 |64|128 , 180, 180, 160, 0, "CobaltBrass" , "Cobalt Brass" , 0, 0, -1, 0, false, false, 3, 1, 1, Dyes.dyeOrange , 2, Arrays.asList(new MaterialStack(Brass, 7), new MaterialStack(Aluminium, 1), new MaterialStack(Cobalt, 1))); public static Materials TricalciumPhosphate = new Materials( 534, TextureSet.SET_FLINT , 1.0F, 0, 2, 1|4|8|16 , 255, 255, 0, 0, "TricalciumPhosphate" , "Tricalcium Phosphate" , 0, 0, -1, 0, false, false, 3, 1, 1, Dyes.dyeYellow , 2, Arrays.asList(new MaterialStack(Calcium, 3), new MaterialStack(Phosphate, 2))); - public static Materials Basalt = new Materials( 844, TextureSet.SET_ROUGH , 1.0F, 64, 1, 1 |64|128 , 30, 20, 20, 0, "Basalt" , "Basalt" , 0, 0, -1, 0, false, false, 2, 1, 1, Dyes.dyeBlack , 2, Arrays.asList(new MaterialStack(Olivine, 1), new MaterialStack(Calcite, 3), new MaterialStack(Flint, 8), new MaterialStack(DarkAsh, 4)), Collections.singletonList(new TC_AspectStack(TC_Aspects.TENEBRAE, 1))); + public static Materials Basalt = new Materials( 844, TextureSet.SET_ROUGH , 1.0F, 64, 1, 1 |64|128 , 30, 20, 20, 0, "Basalt" , "Basalt" , 0, 0, -1, 0, false, false, 2, 1, 1, Dyes.dyeBlack , 2, Arrays.asList(new MaterialStack(Olivine, 1), new MaterialStack(Calcite, 3), new MaterialStack(Flint, 8), new MaterialStack(DarkAsh, 4)), Collections.singletonList(new TC_AspectStack(TC_Aspects.TENEBRAE, 1))).disableAutoGeneratedRecycleRecipes(); public static Materials GarnetRed = new Materials( 527, TextureSet.SET_RUBY , 7.0F, 128, 2, 1 |4|8 |64 , 200, 80, 80, 127, "GarnetRed" , "Red Garnet" , 0, 0, -1, 0, false, true, 4, 1, 1, Dyes.dyeRed , 2, Arrays.asList(new MaterialStack(Pyrope, 3), new MaterialStack(Almandine, 5), new MaterialStack(Spessartine, 8)), Collections.singletonList(new TC_AspectStack(TC_Aspects.VITREUS, 3))); public static Materials GarnetYellow = new Materials( 528, TextureSet.SET_RUBY , 7.0F, 128, 2, 1 |4|8 |64 , 200, 200, 80, 127, "GarnetYellow" , "Yellow Garnet" , 0, 0, -1, 0, false, true, 4, 1, 1, Dyes.dyeYellow , 2, Arrays.asList(new MaterialStack(Andradite, 5), new MaterialStack(Grossular, 8), new MaterialStack(Uvarovite, 3)), Collections.singletonList(new TC_AspectStack(TC_Aspects.VITREUS, 3))); public static Materials Marble = new Materials( 845, TextureSet.SET_FINE , 1.0F, 16, 1, 1 |64|128 , 200, 200, 200, 0, "Marble" , "Marble" , 0, 0, -1, 0, false, false, 1, 1, 1, Dyes.dyeWhite , 2, Arrays.asList(new MaterialStack(Magnesium, 1), new MaterialStack(Calcite, 7)), Collections.singletonList(new TC_AspectStack(TC_Aspects.PERFODIO, 1))); diff --git a/src/main/java/gregtech/common/GT_RecipeAdder.java b/src/main/java/gregtech/common/GT_RecipeAdder.java index 01327b881f..2d9cae7c0d 100644 --- a/src/main/java/gregtech/common/GT_RecipeAdder.java +++ b/src/main/java/gregtech/common/GT_RecipeAdder.java @@ -20,6 +20,7 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.Comparator; import java.util.List; +import java.util.Objects; import mods.railcraft.common.blocks.aesthetics.cube.EnumCube; import mods.railcraft.common.items.RailcraftToolItems; import net.minecraft.init.Blocks; @@ -998,6 +999,9 @@ public class GT_RecipeAdder implements IGT_RecipeAdder { if ((aInputs == null) || (aOutputs == null) || aInputs.length == 0 || aOutputs.length == 0) { return false; } + if (Arrays.stream(aOutputs).noneMatch(Objects::nonNull)) { + return false; + } if ((aDuration = GregTech_API.sRecipeFile.get("cutting", aInputs[0], aDuration)) <= 0) { return false; } 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); |