Same as v2.3 in Fabricv2.3.0.17

2 files changed, 7 insertions, 16 deletions

diff --git a/src/main/java/me/shedaniel/rei/mixin/MixinGuiContainer.java b/src/main/java/me/shedaniel/rei/mixin/MixinGuiContainer.java
index 556e62871..f9eafbaac 100644
--- a/src/main/java/me/shedaniel/rei/mixin/MixinGuiContainer.java
+++ b/src/main/java/me/shedaniel/rei/mixin/MixinGuiContainer.java
@@ -37,36 +37,29 @@ public class MixinGuiContainer extends GuiScreen implements IMixinGuiContainer {
     private ItemStack draggedStack;
     
     @Override
-    public int getContainerLeft() {
+    public int rei_getContainerLeft() {
         return guiLeft;
     }
     
     @Override
-    public int getContainerTop() {
+    public int rei_getContainerTop() {
         return guiTop;
     }
     
     @Override
-    public int getContainerWidth() {
+    public int rei_etContainerWidth() {
         return xSize;
     }
     
     @Override
-    public int getContainerHeight() {
+    public int rei_getContainerHeight() {
         return ySize;
     }
     
-    @Override
-    public void setOverlay(ContainerGuiOverlay overlay) {
-        GuiHelper.setOverlay(overlay);
-    }
-    
     @Inject(method = "initGui()V", at = @At("RETURN"))
     protected void initGui(CallbackInfo info) {
         GuiHelper.setLastGuiContainer((GuiContainer) (Object) this);
-        GuiHelper.setLastMixinGuiContainer((IMixinGuiContainer) this);
-        GuiHelper.setOverlay(new ContainerGuiOverlay());
-        this.children.add(GuiHelper.getLastOverlay());
+        this.children.add(GuiHelper.getLastOverlay(true));
     }
     
     @Inject(method = "render(IIF)V", at = @At("RETURN"))
@@ -80,7 +73,7 @@ public class MixinGuiContainer extends GuiScreen implements IMixinGuiContainer {
     }
     
     @Override
-    public ItemStack getDraggedStack() {
+    public ItemStack rei_getDraggedStack() {
         return this.draggedStack;
     }
     
@@ -93,7 +86,7 @@ public class MixinGuiContainer extends GuiScreen implements IMixinGuiContainer {
     }
     
     @Override
-    public Slot getHoveredSlot() {
+    public Slot rei_getHoveredSlot() {
         return hoveredSlot;
     }
     
diff --git a/src/main/java/me/shedaniel/rei/mixin/MixinNetHandlerPlayClient.java b/src/main/java/me/shedaniel/rei/mixin/MixinNetHandlerPlayClient.java
index e96c2d318..ffb1c5677 100644
--- a/src/main/java/me/shedaniel/rei/mixin/MixinNetHandlerPlayClient.java
+++ b/src/main/java/me/shedaniel/rei/mixin/MixinNetHandlerPlayClient.java
@@ -1,7 +1,6 @@
 package me.shedaniel.rei.mixin;
 
 import me.shedaniel.rei.RoughlyEnoughItemsCore;
-import me.shedaniel.rei.RoughlyEnoughItemsPlugin;
 import net.minecraft.client.network.NetHandlerPlayClient;
 import net.minecraft.item.crafting.RecipeManager;
 import net.minecraft.network.play.server.SPacketUpdateRecipes;
@@ -21,7 +20,6 @@ public class MixinNetHandlerPlayClient {
     
     @Inject(method = "handleUpdateRecipes", at = @At("RETURN"))
     private void onUpdateRecipes(SPacketUpdateRecipes packetIn, CallbackInfo ci) {
-        RoughlyEnoughItemsPlugin.discoverPlugins();
         RoughlyEnoughItemsCore.getRecipeHelper().recipesLoaded(recipeManager);
     }