diff options
| author | Martin Robertz <dream-master@gmx.net> | 2022-11-26 23:11:52 +0100 |
|---|---|---|
| committer | Martin Robertz <dream-master@gmx.net> | 2022-11-26 23:11:52 +0100 |
| commit | 8412fbd8f169d335bfa2dde70974c0a254871584 (patch) | |
| tree | 12dd4a05ca2c5a898b830cfa4032a0beef6c857a | |
| parent | 32bd709fb42301bbd2604bb4a17cd648a2d91f9f (diff) | |
| download | GT5-Unofficial-8412fbd8f169d335bfa2dde70974c0a254871584.tar.gz GT5-Unofficial-8412fbd8f169d335bfa2dde70974c0a254871584.tar.bz2 GT5-Unofficial-8412fbd8f169d335bfa2dde70974c0a254871584.zip | |
update BS+SA
3 files changed, 6 insertions, 7 deletions
diff --git a/build.gradle b/build.gradle index 0953aeed5c..89350b8a35 100644 --- a/build.gradle +++ b/build.gradle @@ -1,4 +1,4 @@ -//version: 1668274302 +//version: 1669411416 /* DO NOT CHANGE THIS FILE! Also, you may replace this file at any time if there is an update available. @@ -338,10 +338,10 @@ dependencies { annotationProcessor('org.ow2.asm:asm-debug-all:5.0.3') annotationProcessor('com.google.guava:guava:24.1.1-jre') annotationProcessor('com.google.code.gson:gson:2.8.6') - annotationProcessor('org.spongepowered:mixin:0.8.5-GTNH:processor') + annotationProcessor('com.gtnewhorizon:gtnhmixins:2.1.1:processor') } if (usesMixins.toBoolean() || forceEnableMixins.toBoolean()) { - compile('com.gtnewhorizon:gtnhmixins:2.0.2') + compile('com.gtnewhorizon:gtnhmixins:2.1.1') } } diff --git a/src/main/java/gregtech/api/util/GT_Single_Recipe_Check_Processing_Array.java b/src/main/java/gregtech/api/util/GT_Single_Recipe_Check_Processing_Array.java index 68db933a4e..e15ae792a1 100644 --- a/src/main/java/gregtech/api/util/GT_Single_Recipe_Check_Processing_Array.java +++ b/src/main/java/gregtech/api/util/GT_Single_Recipe_Check_Processing_Array.java @@ -168,6 +168,7 @@ public class GT_Single_Recipe_Check_Processing_Array extends GT_Single_Recipe_Ch } return itemMap; } + static Map<Fluid, Integer> buildFluidMapDirect(FluidStack[] fluids) { Map<Fluid, Integer> fluidMap = new HashMap<>(); for (FluidStack fluidStack : fluids) { diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_ProcessingArray.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_ProcessingArray.java index 42640c832a..f36ba2853b 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_ProcessingArray.java +++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_ProcessingArray.java @@ -244,12 +244,10 @@ public class GT_MetaTileEntity_ProcessingArray } public boolean processRecipe(ItemStack[] tInputs, FluidStack[] tFluids, GT_Recipe.GT_Recipe_Map map) { - if (tInputs.length <= 0 && tFluids.length <= 0) - return false; + if (tInputs.length <= 0 && tFluids.length <= 0) return false; GT_Recipe tRecipe = map.findRecipe( getBaseMetaTileEntity(), mLastRecipe, false, gregtech.api.enums.GT_Values.V[tTier], tFluids, tInputs); - if (tRecipe == null) - return false; + if (tRecipe == null) return false; if (GT_Mod.gregtechproxy.mLowGravProcessing && tRecipe.mSpecialValue == -100 && !isValidForLowGravity(tRecipe, getBaseMetaTileEntity().getWorld().provider.dimensionId)) |