3.3.12

97 files changed, 382 insertions, 373 deletions

diff --git a/build.gradle b/build.gradle
index 9da29a730..eb023410c 100755
--- a/build.gradle
+++ b/build.gradle
@@ -88,8 +88,7 @@ dependencies {
         transitive = false
     }
     compile "org.lwjgl:lwjgl-jemalloc:3.2.1"
-    compileOnly "com.google.code.findbugs:jsr305:3.0.2"
-    compileOnly 'org.jetbrains:annotations:15.0'
+    compileOnly 'org.jetbrains:annotations:18.0.0'
     modRuntime("com.lettuce.fudge:notenoughcrashes:1.1.5+1.15.1") {
         transitive = false
     }
diff --git a/gradle.properties b/gradle.properties
index 6ea4adce3..9234a2220 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,4 +1,4 @@
-mod_version=3.3.11
+mod_version=3.3.12
 minecraft_version=1.15.1
 yarn_version=1.15.1+build.1
 fabricloader_version=0.7.2+build.174
diff --git a/src/main/java/me/shedaniel/rei/RoughlyEnoughItemsCore.java b/src/main/java/me/shedaniel/rei/RoughlyEnoughItemsCore.java
index 100cd75bb..fa05ffdc2 100644
--- a/src/main/java/me/shedaniel/rei/RoughlyEnoughItemsCore.java
+++ b/src/main/java/me/shedaniel/rei/RoughlyEnoughItemsCore.java
@@ -9,7 +9,6 @@ import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
 import me.shedaniel.cloth.hooks.ClothClientHooks;
 import me.shedaniel.rei.api.*;
-import me.shedaniel.rei.api.annotations.Internal;
 import me.shedaniel.rei.api.plugins.REIPluginV0;
 import me.shedaniel.rei.gui.ContainerScreenOverlay;
 import me.shedaniel.rei.impl.*;
@@ -44,6 +43,7 @@ import net.minecraft.util.ActionResult;
 import net.minecraft.util.Identifier;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
+import org.jetbrains.annotations.ApiStatus;
 
 import java.util.LinkedList;
 import java.util.List;
@@ -54,37 +54,33 @@ import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 import java.util.concurrent.atomic.AtomicLong;
 
-@Internal
+@ApiStatus.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();
+    @ApiStatus.Internal public static final Logger LOGGER = LogManager.getFormatterLogger("REI");
+    private static final RecipeHelper RECIPE_HELPER = new RecipeHelperImpl();
+    private static final EntryRegistry ENTRY_REGISTRY = new EntryRegistryImpl();
+    private static final DisplayHelper DISPLAY_HELPER = new DisplayHelperImpl();
     private static final Map<Identifier, REIPluginEntry> plugins = Maps.newHashMap();
     private static final ExecutorService SYNC_RECIPES = Executors.newSingleThreadScheduledExecutor(r -> new Thread(r, "REI-SyncRecipes"));
     private static ConfigManager configManager;
     
-    static {
-        LOGGER = LogManager.getFormatterLogger("REI");
-    }
-    
-    @Deprecated
+    @ApiStatus.Internal
     public static RecipeHelper getRecipeHelper() {
         return RECIPE_HELPER;
     }
     
-    @Deprecated
+    @ApiStatus.Internal
     public static ConfigManager getConfigManager() {
         return configManager;
     }
     
-    @Deprecated
+    @ApiStatus.Internal
     public static EntryRegistry getEntryRegistry() {
         return ENTRY_REGISTRY;
     }
     
-    @Deprecated
+    @ApiStatus.Internal
     public static DisplayHelper getDisplayHelper() {
         return DISPLAY_HELPER;
     }
@@ -135,8 +131,7 @@ public class RoughlyEnoughItemsCore implements ClientModInitializer {
         return ClientSidePacketRegistry.INSTANCE.canServerReceive(RoughlyEnoughItemsNetwork.CREATE_ITEMS_PACKET) && ClientSidePacketRegistry.INSTANCE.canServerReceive(RoughlyEnoughItemsNetwork.DELETE_ITEMS_PACKET);
     }
     
-    @Internal
-    @Deprecated
+    @ApiStatus.Internal
     public static void syncRecipes(AtomicLong lastSync) {
         if (lastSync != null) {
             if (lastSync.get() > 0 && System.currentTimeMillis() - lastSync.get() <= 5000) {
@@ -153,7 +148,6 @@ public class RoughlyEnoughItemsCore implements ClientModInitializer {
         }
     }
     
-    @SuppressWarnings("deprecation")
     @Override
     public void onInitializeClient() {
         configManager = new ConfigManagerImpl();
@@ -161,7 +155,8 @@ public class RoughlyEnoughItemsCore implements ClientModInitializer {
         registerClothEvents();
         discoverPluginEntries();
         for (ModContainer modContainer : FabricLoader.getInstance().getAllMods()) {
-            if (modContainer.getMetadata().containsCustomValue("roughlyenoughitems:plugins"))
+            //noinspection deprecation
+            if (modContainer.getMetadata().containsCustomElement("roughlyenoughitems:plugins"))
                 RoughlyEnoughItemsCore.LOGGER.error("[REI] REI plugin from " + modContainer.getMetadata().getId() + " is not loaded because it is too old!");
         }
         
@@ -201,7 +196,6 @@ public class RoughlyEnoughItemsCore implements ClientModInitializer {
         });
     }
     
-    @SuppressWarnings("deprecation")
     private void discoverPluginEntries() {
         for (REIPluginEntry reiP