Obfuscate REI Internalsfeature/obfuscate

4 files changed, 12 insertions, 15 deletions

diff --git a/forge/build.gradle b/forge/build.gradle
index 37cf85e1f..b62ac7829 100644
--- a/forge/build.gradle
+++ b/forge/build.gradle
@@ -56,13 +56,6 @@ loom {
     }
 
     forge {
-        localMods {
-            jeiInternalsWorkaround {
-                add(project(":jei-compatibility-layer").sourceSets.main)
-                add(project(":jei-internals-workaround").sourceSets.main)
-            }
-        }
-
         mixinConfig "rei.mixins.json"
     }
 }
@@ -74,8 +67,6 @@ dependencies {
     modApi("me.shedaniel.cloth:cloth-config-forge:${cloth_config_version}")
     modApi("dev.architectury:architectury-forge:${architectury_version}")
 
-    runtimeClasspath(project(path: ":jei-internals-workaround", configuration: "namedElements")) { transitive false }
-
     depProjects.forEach {
         common(project(path: it, configuration: "namedElements")) { transitive false }
         shadowCommon(project(path: it, configuration: "transformProductionForge")) { transitive false }
diff --git a/forge/src/main/java/me/shedaniel/rei/impl/client/forge/CommandSenderImpl.java b/forge/src/main/java/me/shedaniel/rei/impl/client/forge/CommandSenderImpl.java
index 83253fc9c..44b7586fc 100644
--- a/forge/src/main/java/me/shedaniel/rei/impl/client/forge/CommandSenderImpl.java
+++ b/forge/src/main/java/me/shedaniel/rei/impl/client/forge/CommandSenderImpl.java
@@ -25,13 +25,15 @@ package me.shedaniel.rei.impl.client.forge;
 
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.player.LocalPlayer;
+import net.minecraft.obfuscate.DontObfuscate;
 import net.minecraftforge.fml.util.ObfuscationReflectionHelper;
 
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 
-public class CommandSenderImpl {
-    public static void sendCommand(String command) {
+public interface CommandSenderImpl {
+    @DontObfuscate
+    static void sendCommand(String command) {
         LocalPlayer player = Minecraft.getInstance().player;
         if (player == null) return;
         Method method = null;
diff --git a/forge/src/main/java/me/shedaniel/rei/impl/client/gui/credits/forge/CreditsScreenImpl.java b/forge/src/main/java/me/shedaniel/rei/impl/client/gui/credits/forge/CreditsScreenImpl.java
index ef53fe3b1..9265b21fa 100644
--- a/forge/src/main/java/me/shedaniel/rei/impl/client/gui/credits/forge/CreditsScreenImpl.java
+++ b/forge/src/main/java/me/shedaniel/rei/impl/client/gui/credits/forge/CreditsScreenImpl.java
@@ -24,11 +24,13 @@
 package me.shedaniel.rei.impl.client.gui.credits.forge;
 
 import me.shedaniel.rei.impl.client.gui.credits.CreditsScreen;
+import net.minecraft.obfuscate.DontObfuscate;
 import net.minecraft.util.Tuple;
 
 import java.util.List;
 
-public class CreditsScreenImpl {
-    public static void fillTranslators(Exception[] exception, List<Tuple<String, List<CreditsScreen.TranslatorEntry>>> translators) {
+public interface CreditsScreenImpl {
+    @DontObfuscate
+    static void fillTranslators(Exception[] exception, List<Tuple<String, List<CreditsScreen.TranslatorEntry>>> translators) {
     }
 }
diff --git a/forge/src/main/java/me/shedaniel/rei/plugin/common/displays/crafting/forge/DefaultCraftingDisplayImpl.java b/forge/src/main/java/me/shedaniel/rei/plugin/common/displays/crafting/forge/DefaultCraftingDisplayImpl.java
index 9f5faa713..d3d18639a 100644
--- a/forge/src/main/java/me/shedaniel/rei/plugin/common/displays/crafting/forge/DefaultCraftingDisplayImpl.java
+++ b/forge/src/main/java/me/shedaniel/rei/plugin/common/displays/crafting/forge/DefaultCraftingDisplayImpl.java
@@ -25,10 +25,12 @@ package me.shedaniel.rei.plugin.common.displays.crafting.forge;
 
 import me.shedaniel.rei.plugin.common.displays.crafting.CraftingRecipeSizeProvider;
 import me.shedaniel.rei.plugin.common.displays.crafting.DefaultCraftingDisplay;
+import net.minecraft.obfuscate.DontObfuscate;
 import net.minecraftforge.common.crafting.IShapedRecipe;
 
-public class DefaultCraftingDisplayImpl {
-    public static void registerPlatformSizeProvider() {
+public interface DefaultCraftingDisplayImpl {
+    @DontObfuscate
+    static void registerPlatformSizeProvider() {
         DefaultCraftingDisplay.registerSizeProvider(recipe -> {
             if (recipe instanceof IShapedRecipe) {
                 return new CraftingRecipeSizeProvider.Size(((IShapedRecipe<?>) recipe).getRecipeWidth(), ((IShapedRecipe<?>) recipe).getRecipeHeight());