aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUnknown <shekwancheung0528@gmail.com>2019-08-18 00:37:18 +0800
committerUnknown <shekwancheung0528@gmail.com>2019-08-18 00:37:18 +0800
commit2000b84ad41de1b4729b153091699baad15d6237 (patch)
tree3b6777f5a28d657e2246200d4672612ac71b4a4f
parent06dd7b84849ab01417e6449b0adbb1c83e8c38e0 (diff)
downloadRoughlyEnoughItems-2000b84ad41de1b4729b153091699baad15d6237.tar.gz
RoughlyEnoughItems-2000b84ad41de1b4729b153091699baad15d6237.tar.bz2
RoughlyEnoughItems-2000b84ad41de1b4729b153091699baad15d6237.zip
Let's call this v3.0-pre
-rw-r--r--gradle.properties2
-rw-r--r--src/main/java/me/shedaniel/rei/impl/RecipeHelperImpl.java2
-rw-r--r--src/main/java/me/shedaniel/rei/plugin/DefaultAutoCraftingPlugin.java2
-rw-r--r--src/main/java/me/shedaniel/rei/plugin/DefaultPlugin.java2
-rw-r--r--src/main/java/me/shedaniel/rei/server/InputSlotCrafter.java1
-rw-r--r--src/main/java/me/shedaniel/rei/server/RecipeFinder.java4
6 files changed, 8 insertions, 5 deletions
diff --git a/gradle.properties b/gradle.properties
index 9865afaa6..98388e46c 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,4 +1,4 @@
-mod_version=2.11
+mod_version=3.0-pre
minecraft_version=1.14.3
yarn_version=1.14.3+build.1
fabricloader_version=0.4.8+build.155
diff --git a/src/main/java/me/shedaniel/rei/impl/RecipeHelperImpl.java b/src/main/java/me/shedaniel/rei/impl/RecipeHelperImpl.java
index 7ebe1cb93..5f2b7dacc 100644
--- a/src/main/java/me/shedaniel/rei/impl/RecipeHelperImpl.java
+++ b/src/main/java/me/shedaniel/rei/impl/RecipeHelperImpl.java
@@ -252,7 +252,7 @@ public class RecipeHelperImpl implements RecipeHelper {
if (plugin instanceof REIPluginV0) {
if (reiVersion instanceof SemanticVersion)
if (((REIPluginV0) plugin).getMinimumVersion().compareTo((SemanticVersion) reiVersion) > 0) {
- throw new IllegalStateException("Requires " + ((REIPluginV0) plugin).getMinimumVersion().getFriendlyString() + " REI version!");
+ throw new IllegalStateException("Requires " + ((REIPluginV0) plugin).getMinimumVersion().getFriendlyString() + " version of REI!");
}
((REIPluginV0) plugin).registerPluginCategories(this);
((REIPluginV0) plugin).registerRecipeDisplays(this);
diff --git a/src/main/java/me/shedaniel/rei/plugin/DefaultAutoCraftingPlugin.java b/src/main/java/me/shedaniel/rei/plugin/DefaultAutoCraftingPlugin.java
index 6fc5d3a88..bead236f2 100644
--- a/src/main/java/me/shedaniel/rei/plugin/DefaultAutoCraftingPlugin.java
+++ b/src/main/java/me/shedaniel/rei/plugin/DefaultAutoCraftingPlugin.java
@@ -24,7 +24,7 @@ public class DefaultAutoCraftingPlugin implements REIPluginV0 {
@Override
public SemanticVersion getMinimumVersion() throws VersionParsingException {
- return SemanticVersion.parse("2.11");
+ return SemanticVersion.parse("3.0-pre");
}
@Override
diff --git a/src/main/java/me/shedaniel/rei/plugin/DefaultPlugin.java b/src/main/java/me/shedaniel/rei/plugin/DefaultPlugin.java
index e0e4438c7..f92e4f5fe 100644
--- a/src/main/java/me/shedaniel/rei/plugin/DefaultPlugin.java
+++ b/src/main/java/me/shedaniel/rei/plugin/DefaultPlugin.java
@@ -90,7 +90,7 @@ public class DefaultPlugin implements REIPluginV0 {
@Override
public SemanticVersion getMinimumVersion() throws VersionParsingException {
- return SemanticVersion.parse("2.11");
+ return SemanticVersion.parse("3.0-pre");
}
@Override
diff --git a/src/main/java/me/shedaniel/rei/server/InputSlotCrafter.java b/src/main/java/me/shedaniel/rei/server/InputSlotCrafter.java
index 8f894aadb..97d08dd66 100644
--- a/src/main/java/me/shedaniel/rei/server/InputSlotCrafter.java
+++ b/src/main/java/me/shedaniel/rei/server/InputSlotCrafter.java
@@ -103,6 +103,7 @@ public class InputSlotCrafter<C extends Inventory> implements RecipeGridAligner<
}
}
+ @SuppressWarnings("deprecation")
protected void fillInputSlots(RecipeFinder recipeFinder, DefaultedList<Ingredient> ingredients, boolean boolean_1) {
// boolean boolean_2 = this.craftingContainer.matches(recipe_1);
boolean boolean_2 = true;
diff --git a/src/main/java/me/shedaniel/rei/server/RecipeFinder.java b/src/main/java/me/shedaniel/rei/server/RecipeFinder.java
index c8fe86611..d6a804f8b 100644
--- a/src/main/java/me/shedaniel/rei/server/RecipeFinder.java
+++ b/src/main/java/me/shedaniel/rei/server/RecipeFinder.java
@@ -124,6 +124,7 @@ public class RecipeFinder {
}
+ @SuppressWarnings("deprecation")
public boolean find(int int_1, @Nullable IntList intList_1) {
if (int_1 <= 0) {
return true;
@@ -299,7 +300,8 @@ public class RecipeFinder {
}
}
}
-
+
+ @SuppressWarnings("deprecation")
private int method_7415() {
int int_1 = Integer.MAX_VALUE;
Iterator var2 = this.ingredients.iterator();