aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/com
diff options
context:
space:
mode:
authorGlodBlock <60341015+GlodBlock@users.noreply.github.com>2021-09-05 15:39:10 +0800
committerGitHub <noreply@github.com>2021-09-05 15:39:10 +0800
commit75d448956cddf5503fefedc1746367c0e8036745 (patch)
tree3da6768cc1ef3aa140fab64855bef6b18e27bfff /src/main/java/com
parent5eacd3797fea13f30394b5ff68961c3419a496e6 (diff)
downloadGT5-Unofficial-75d448956cddf5503fefedc1746367c0e8036745.tar.gz
GT5-Unofficial-75d448956cddf5503fefedc1746367c0e8036745.tar.bz2
GT5-Unofficial-75d448956cddf5503fefedc1746367c0e8036745.zip
make it not ugly
Former-commit-id: cb5ef2c29ffc4966d3298b4522364c30165b5fce
Diffstat (limited to 'src/main/java/com')
-rw-r--r--src/main/java/com/github/bartimaeusnek/bartworks/system/material/GT_Enhancement/LuVTierEnhancer.java20
1 files changed, 11 insertions, 9 deletions
diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/system/material/GT_Enhancement/LuVTierEnhancer.java b/src/main/java/com/github/bartimaeusnek/bartworks/system/material/GT_Enhancement/LuVTierEnhancer.java
index bd2b9ef336..65c677dc55 100644
--- a/src/main/java/com/github/bartimaeusnek/bartworks/system/material/GT_Enhancement/LuVTierEnhancer.java
+++ b/src/main/java/com/github/bartimaeusnek/bartworks/system/material/GT_Enhancement/LuVTierEnhancer.java
@@ -178,7 +178,6 @@ public class LuVTierEnhancer implements Runnable {
Consumer<GT_Recipe> replace = gt_recipe ->
gt_recipe.mInputs = replaceArrayWith(
gt_recipe.mInputs,
- gt_recipe.mOutputs,
Materials.Osmiridium,
WerkstoffLoader.Ruridit
);
@@ -188,7 +187,6 @@ public class LuVTierEnhancer implements Runnable {
.forEach(recipe_assemblyLine ->
recipe_assemblyLine.mInputs = replaceArrayWith(
recipe_assemblyLine.mInputs,
- new ItemStack[]{recipe_assemblyLine.mOutput},
Materials.Osmiridium,
WerkstoffLoader.Ruridit
)
@@ -197,20 +195,24 @@ public class LuVTierEnhancer implements Runnable {
GT_Recipe.GT_Recipe_Map.sAssemblerRecipes.mRecipeList.stream()
.filter(gt_recipe ->
gt_recipe.mEUt < BW_Util.getTierVoltage(6) &&
- !BW_Util.checkStackAndPrefix(gt_recipe.mOutputs[0])
+ !BW_Util.checkStackAndPrefix(gt_recipe.mOutputs[0]) &&
+ !isOutputBlackListed(gt_recipe.mOutputs[0])
)
.forEach(replace);
GT_Recipe.GT_Recipe_Map.sAssemblylineVisualRecipes.mRecipeList.stream()
- .filter(gt_recipe -> gt_recipe.mEUt <= 6000)
+ .filter(gt_recipe -> gt_recipe.mEUt <= 6000 &&
+ !isOutputBlackListed(gt_recipe.mOutputs[0])
+ )
.forEach(replace);
}
- private static ItemStack[] replaceArrayWith(ItemStack[] stackArray, ItemStack[] outputArray, Materials source, Werkstoff target) {
- for (ItemStack output : outputArray) {
- if (output.isItemEqual(ItemList.Casing_MiningOsmiridium.get(1)))
- return stackArray;
- }
+ private static boolean isOutputBlackListed(ItemStack output) {
+ if (output.isItemEqual(ItemList.Casing_MiningOsmiridium.get(1))) return true;
+ return false;
+ }
+
+ private static ItemStack[] replaceArrayWith(ItemStack[] stackArray, Materials source, Werkstoff target) {
for (int i = 0; i < stackArray.length; i++) {
ItemStack stack = stackArray[i];
if (!BW_Util.checkStackAndPrefix(stack))