diff options
| author | Connor-Colenso <52056774+Connor-Colenso@users.noreply.github.com> | 2023-01-30 18:19:51 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-01-30 19:19:51 +0100 |
| commit | df5f9d448647d5ccf9eb774a244319e54021ede0 (patch) | |
| tree | 925b8bff5a47abd4387c33463f966b0116501d59 /src/main/java/gregtech/api/util | |
| parent | e633f7af1f0a3996f6c69aaa8c5d9c4a15232fbe (diff) | |
| download | GT5-Unofficial-df5f9d448647d5ccf9eb774a244319e54021ede0.tar.gz GT5-Unofficial-df5f9d448647d5ccf9eb774a244319e54021ede0.tar.bz2 GT5-Unofficial-df5f9d448647d5ccf9eb774a244319e54021ede0.zip | |
General Fixes (#1702)
* Fix missing machine recipes due to load order.
* Fix missing compressor recipe
* Add new compressor recipe adder method
* Line
* Narrow crafting restrictions on pipes
* Crafting working, assembler not
* Nonuple working
* Spotless
* Both assembler recipes exist
* Pipe recipes finally working as they should.
* Spotless
* Working still
* T-2 materials
* Tier -> TierEU and a few corrections on recipes using full amps.
* Fix comment
* spotlessApply (#1703)
Co-authored-by: GitHub GTNH Actions <>
* Spotless
* Remove comment
* T-2
---------
Co-authored-by: GTNH-Colen <54497873+GTNH-Colen@users.noreply.github.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Diffstat (limited to 'src/main/java/gregtech/api/util')
| -rw-r--r-- | src/main/java/gregtech/api/util/GT_ModHandler.java | 9 | ||||
| -rw-r--r-- | src/main/java/gregtech/api/util/GT_RecipeRegistrator.java | 2 |
2 files changed, 9 insertions, 2 deletions
diff --git a/src/main/java/gregtech/api/util/GT_ModHandler.java b/src/main/java/gregtech/api/util/GT_ModHandler.java index 93e8137912..f7bfb13cb2 100644 --- a/src/main/java/gregtech/api/util/GT_ModHandler.java +++ b/src/main/java/gregtech/api/util/GT_ModHandler.java @@ -912,10 +912,17 @@ public class GT_ModHandler { * IC2-Compressor Recipe. Overloads old Recipes automatically */ public static boolean addCompressionRecipe(ItemStack aInput, ItemStack aOutput) { + return addCompressionRecipe(aInput, aOutput, 300, 2); + } + + /** + * IC2-Compressor Recipe. Overloads old Recipes automatically + */ + public static boolean addCompressionRecipe(ItemStack aInput, ItemStack aOutput, int duration, int EUPerTick) { aOutput = GT_OreDictUnificator.get(true, aOutput); if (aInput == null || aOutput == null || GT_Utility.areStacksEqual(aInput, aOutput, true)) return false; if (!GregTech_API.sRecipeFile.get(ConfigCategories.Machines.compression, aInput, true)) return false; - RA.addCompressorRecipe(aInput, aOutput, 300, 2); + RA.addCompressorRecipe(aInput, aOutput, duration, EUPerTick); return true; } diff --git a/src/main/java/gregtech/api/util/GT_RecipeRegistrator.java b/src/main/java/gregtech/api/util/GT_RecipeRegistrator.java index 8a28b686c5..a353eff44d 100644 --- a/src/main/java/gregtech/api/util/GT_RecipeRegistrator.java +++ b/src/main/java/gregtech/api/util/GT_RecipeRegistrator.java @@ -235,7 +235,7 @@ public class GT_RecipeRegistrator { || aMaterialAmount <= 0 || aMaterial.contains(SubTag.NO_SMELTING) || (aMaterialAmount > M && aMaterial.contains(SubTag.METAL)) - || (aMaterial.getProcessingMaterialTierEU() > Tier.IV)) return; + || (aMaterial.getProcessingMaterialTierEU() > TierEU.IV)) return; if (aMaterial == Materials.Naquadah || aMaterial == Materials.NaquadahEnriched) return; aMaterialAmount /= aStack.stackSize; |