diff options
| author | chochem <40274384+chochem@users.noreply.github.com> | 2023-05-19 18:49:29 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-05-19 19:49:29 +0200 |
| commit | 1722f9738b57db2958efd339a6bc490a643ac5c9 (patch) | |
| tree | 3a95cd7a2da14acf0306942c31a9a2c566a00daa /src/main/java/gregtech/loaders | |
| parent | aa6da9d306bc719d3cf7f0a98529dc00ed83dbfc (diff) | |
| download | GT5-Unofficial-1722f9738b57db2958efd339a6bc490a643ac5c9.tar.gz GT5-Unofficial-1722f9738b57db2958efd339a6bc490a643ac5c9.tar.bz2 GT5-Unofficial-1722f9738b57db2958efd339a6bc490a643ac5c9.zip | |
More recipe collision fixes (#2010)
* dont add the same recipe 300 times
* have custom vac freezer recipes in GT
* have custom vac freezer recipes in coremod
Diffstat (limited to 'src/main/java/gregtech/loaders')
| -rw-r--r-- | src/main/java/gregtech/loaders/oreprocessing/ProcessingStick.java | 11 | ||||
| -rw-r--r-- | src/main/java/gregtech/loaders/postload/recipes/AssemblerRecipes.java | 11 |
2 files changed, 11 insertions, 11 deletions
diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingStick.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingStick.java index f1e4fd0cea..b4ccc6f523 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingStick.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingStick.java @@ -1,6 +1,5 @@ package gregtech.loaders.oreprocessing; -import static gregtech.api.util.GT_Recipe.GT_Recipe_Map.sAssemblerRecipes; import static gregtech.api.util.GT_Recipe.GT_Recipe_Map.sBenderRecipes; import static gregtech.api.util.GT_Recipe.GT_Recipe_Map.sCutterRecipes; import static gregtech.api.util.GT_Recipe.GT_Recipe_Map.sHammerRecipes; @@ -143,15 +142,5 @@ public class ProcessingStick implements gregtech.api.interfaces.IOreRecipeRegist .addTo(sHammerRecipes); } } - GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Wood, 1), - GT_Utility.getIntegratedCircuit(2)) - .itemOutputs(ItemList.FR_Stick.get(1L)) - .fluidInputs(Materials.SeedOil.getFluid(50L)) - .noFluidOutputs() - .duration(16 * TICKS) - .eut(8) - .addTo(sAssemblerRecipes); } } diff --git a/src/main/java/gregtech/loaders/postload/recipes/AssemblerRecipes.java b/src/main/java/gregtech/loaders/postload/recipes/AssemblerRecipes.java index 9658a3c0dc..2cc059a964 100644 --- a/src/main/java/gregtech/loaders/postload/recipes/AssemblerRecipes.java +++ b/src/main/java/gregtech/loaders/postload/recipes/AssemblerRecipes.java @@ -41,6 +41,17 @@ public class AssemblerRecipes implements Runnable { GT_Values.RA.stdBuilder() .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Wood, 1), + GT_Utility.getIntegratedCircuit(2)) + .itemOutputs(ItemList.FR_Stick.get(1L)) + .fluidInputs(Materials.SeedOil.getFluid(50L)) + .noFluidOutputs() + .duration(16 * TICKS) + .eut(8) + .addTo(sAssemblerRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs( GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.BlackSteel, 1), GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Plastic, 1)) .itemOutputs(ItemList.Block_Plascrete.get(1)) |