aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorshedaniel <daniel@shedaniel.me>2020-09-10 00:16:03 +0800
committershedaniel <daniel@shedaniel.me>2020-09-10 00:16:03 +0800
commit87825fc51483fc0f735e5e4e3a435c2862e0495a (patch)
tree49e0ab24f19f2a11a8e71f1803a12d36fd708b9d
parent2f4d41f746188fefaa537277e658ccbed74ce003 (diff)
downloadRoughlyEnoughItems-87825fc51483fc0f735e5e4e3a435c2862e0495a.tar.gz
RoughlyEnoughItems-87825fc51483fc0f735e5e4e3a435c2862e0495a.tar.bz2
RoughlyEnoughItems-87825fc51483fc0f735e5e4e3a435c2862e0495a.zip
Fix ingredients incorrectly placed
Signed-off-by: shedaniel <daniel@shedaniel.me>
-rw-r--r--RoughlyEnoughItems-api/src/main/java/me/shedaniel/rei/api/EntryStack.java9
-rw-r--r--gradle.properties2
2 files changed, 7 insertions, 4 deletions
diff --git a/RoughlyEnoughItems-api/src/main/java/me/shedaniel/rei/api/EntryStack.java b/RoughlyEnoughItems-api/src/main/java/me/shedaniel/rei/api/EntryStack.java
index 98ef1533e..bb1ec1fda 100644
--- a/RoughlyEnoughItems-api/src/main/java/me/shedaniel/rei/api/EntryStack.java
+++ b/RoughlyEnoughItems-api/src/main/java/me/shedaniel/rei/api/EntryStack.java
@@ -133,10 +133,13 @@ public interface EntryStack extends TextRepresentable {
if (ingredient.isEmpty()) return Collections.emptyList();
return Collections.singletonList(ofIngredient(ingredient));
}
+ boolean emptyFlag = true;
List<List<EntryStack>> result = new ArrayList<>(ingredients.size());
- for (Ingredient ingredient : ingredients) {
- if (!ingredient.isEmpty())
- result.add(ofIngredient(ingredient));
+ for (int i = ingredients.size() - 1; i >= 0; i--) {
+ Ingredient ingredient = ingredients.get(i);
+ if (emptyFlag && ingredient.isEmpty()) continue;
+ result.add(0, ofIngredient(ingredient));
+ emptyFlag = false;
}
return ImmutableList.copyOf(result);
}
diff --git a/gradle.properties b/gradle.properties
index 857a6d031..65f2199d0 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,5 +1,5 @@
org.gradle.jvmargs=-Xmx3G
-mod_version=5.4.0
+mod_version=5.4.1
supported_version=1.16.2
minecraft_version=1.16.2-rc1
yarn_version=1.16.2-rc1+build.4+legacy.20w09a+build.8