From 3d36881a3e52ffd38faf0aa22ac6a977bceae3b8 Mon Sep 17 00:00:00 2001 From: P3pp3rF1y Date: Thu, 27 Jul 2023 12:53:27 +0200 Subject: [PATCH] =?UTF-8?q?fix:=20=F0=9F=90=9B=20Fix=20storage=20tier=20up?= =?UTF-8?q?grade=20recipes=20JEI=20integration=20to=20not=20crash=20when?= =?UTF-8?q?=20additional=20alternatives=20to=20upgrade=20materials=20exist?= =?UTF-8?q?=20and=20by=20extension=20stop=20this=20from=20breaking=20the?= =?UTF-8?q?=20whole=20Storage=20JEI=20integration?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- build.gradle | 1 - gradle.properties | 2 +- .../compat/jei/TierUpgradeRecipesMaker.java | 14 ++++++-------- 3 files changed, 7 insertions(+), 10 deletions(-) diff --git a/build.gradle b/build.gradle index 6d0a04c44..00f929cb6 100644 --- a/build.gradle +++ b/build.gradle @@ -113,7 +113,6 @@ dependencies { compileOnly fg.deobf("curse.maven:rubidium-574856:${rubidium_cf_file_id}") compileOnly fg.deobf("curse.maven:jade-324717:${jade_cf_file_id}") - //runtimeOnly fg.deobf("curse.maven:rubidium-574856:${rubidium_cf_file_id}") /* compileOnly fg.deobf("curse.maven:quark-243121:${quark_cf_file_id}") compileOnly fg.deobf("curse.maven:autoreglib-250363:${autoreglib_cf_file_id}") diff --git a/gradle.properties b/gradle.properties index 6ca11bdb2..adee55f09 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,6 +1,6 @@ minecraft_version=1.20.1 forge_version=47.0.16 -mod_version=0.8.43 +mod_version=0.8.44 jei_mc_version=1.20.1-forge jei_version=15.1.0.19 rubidium_cf_file_id=4573226 diff --git a/src/main/java/net/p3pp3rf1y/sophisticatedstorage/compat/jei/TierUpgradeRecipesMaker.java b/src/main/java/net/p3pp3rf1y/sophisticatedstorage/compat/jei/TierUpgradeRecipesMaker.java index d3eab31dc..a15ee583c 100644 --- a/src/main/java/net/p3pp3rf1y/sophisticatedstorage/compat/jei/TierUpgradeRecipesMaker.java +++ b/src/main/java/net/p3pp3rf1y/sophisticatedstorage/compat/jei/TierUpgradeRecipesMaker.java @@ -60,14 +60,12 @@ public boolean stillValid(Player playerIn) { int i = 0; for (Ingredient ingredient : ingredients) { ItemStack[] ingredientItems = ingredient.getItems(); - if (ingredientItems.length == 1) { - if (storageItem.getItem() == ingredientItems[0].getItem()) { - ingredientsCopy.add(i, Ingredient.of(storageItem)); - craftinginventory.setItem(i, storageItem.copy()); - } else { - ingredientsCopy.add(i, ingredient); - craftinginventory.setItem(i, ingredientItems[0]); - } + if (ingredientItems.length == 1 && storageItem.getItem() == ingredientItems[0].getItem()) { + ingredientsCopy.add(i, Ingredient.of(storageItem)); + craftinginventory.setItem(i, storageItem.copy()); + } else { + ingredientsCopy.add(i, ingredient); + craftinginventory.setItem(i, ingredientItems[0]); } i++; }