diff options
108 files changed, 1979 insertions, 1998 deletions
diff --git a/build.gradle b/build.gradle index 1ed9970f4..21724777f 100755 --- a/build.gradle +++ b/build.gradle @@ -77,7 +77,7 @@ dependencies { compile "org.lwjgl:lwjgl-jemalloc:3.2.1" compileOnly "com.google.code.findbugs:jsr305:3.0.2" compileOnly 'org.jetbrains:annotations:15.0' - modRuntime("com.lettuce.fudge:notenoughcrashes:1.0.12+1.15") { + modRuntime("com.lettuce.fudge:notenoughcrashes:1.1.5+1.15.1") { transitive = false } } diff --git a/gradle.properties b/gradle.properties index 386277404..f8b3014fd 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,9 +1,9 @@ -mod_version=3.2.33 +mod_version=3.3.0 minecraft_version=1.15 yarn_version=1.15+build.1 fabricloader_version=0.7.2+build.174 cloth_events_version=1.1.0 -cloth_config_version=2.5.3 +cloth_config_version=2.6.5 modmenu_version=1.8.0+build.16 fabric_api=0.4.20+build.273-1.15 autoconfig1u=1.2.4 diff --git a/src/main/java/me/shedaniel/rei/REIModMenuEntryPoint.java b/src/main/java/me/shedaniel/rei/REIModMenuEntryPoint.java index ef7e9b160..5c04233d2 100644 --- a/src/main/java/me/shedaniel/rei/REIModMenuEntryPoint.java +++ b/src/main/java/me/shedaniel/rei/REIModMenuEntryPoint.java @@ -12,15 +12,15 @@ import net.minecraft.client.gui.screen.Screen; import java.util.function.Function; public class REIModMenuEntryPoint implements ModMenuApi { - + @Override public String getModId() { return "roughlyenoughitems"; } - + @Override public Function<Screen, ? extends Screen> getConfigScreenFactory() { return parent -> ConfigManager.getInstance().getConfigScreen(parent); } - + } diff --git a/src/main/java/me/shedaniel/rei/RoughlyEnoughItemsCore.java b/src/main/java/me/shedaniel/rei/RoughlyEnoughItemsCore.java index dad49fefc..100cd75bb 100644 --- a/src/main/java/me/shedaniel/rei/RoughlyEnoughItemsCore.java +++ b/src/main/java/me/shedaniel/rei/RoughlyEnoughItemsCore.java @@ -56,48 +56,43 @@ import java.util.concurrent.atomic.AtomicLong; @Internal public class RoughlyEnoughItemsCore implements ClientModInitializer { - - @Internal - public static final Logger LOGGER; - @SuppressWarnings("deprecation") - private static final RecipeHelper RECIPE_HELPER = new RecipeHelperImpl(); - @SuppressWarnings("deprecation") - private static final EntryRegistry ENTRY_REGISTRY = new EntryRegistryImpl(); - @SuppressWarnings("deprecation") - private static final DisplayHelper DISPLAY_HELPER = new DisplayHelperImpl(); + + @Inte |