Update to 19w08a2.3.0.52

6 files changed, 15 insertions, 17 deletions

diff --git a/src/main/java/me/shedaniel/rei/mixin/MixinBrewingRecipeRegistry.java b/src/main/java/me/shedaniel/rei/mixin/MixinBrewingRecipeRegistry.java
index 097ec1c98..5c3e10461 100644
--- a/src/main/java/me/shedaniel/rei/mixin/MixinBrewingRecipeRegistry.java
+++ b/src/main/java/me/shedaniel/rei/mixin/MixinBrewingRecipeRegistry.java
@@ -26,13 +26,13 @@ public class MixinBrewingRecipeRegistry {
     private static final List<Potion> REGISTERED_POTION_TYPES = Lists.newArrayList();
     private static final List<Ingredient> SELF_POTION_TYPES = Lists.newArrayList();
     
-    @Inject(method = "method_8080", at = @At("RETURN"))
+    @Inject(method = "registerPotionType", at = @At("RETURN"))
     private static void method_8080(Item item_1, CallbackInfo ci) {
         if (item_1 instanceof PotionItem)
             SELF_POTION_TYPES.add(Ingredient.ofItems(new ItemProvider[]{item_1}));
     }
     
-    @Inject(method = "method_8071", at = @At("RETURN"))
+    @Inject(method = "registerItemRecipe", at = @At("RETURN"))
     private static void method_8071(Item item_1, Item item_2, Item item_3, CallbackInfo ci) {
         if (item_1 instanceof PotionItem && item_3 instanceof PotionItem)
             SELF_ITEM_RECIPES.add(new BrewingRecipe(item_1, Ingredient.ofItems(new ItemProvider[]{item_2}), item_3));
@@ -41,15 +41,15 @@ public class MixinBrewingRecipeRegistry {
     @Inject(method = "registerPotionRecipe", at = @At("RETURN"))
     private static void registerPotionRecipe(Potion potion_1, Item item_1, Potion potion_2, CallbackInfo ci) {
         if (!REGISTERED_POTION_TYPES.contains(potion_1))
-            registerPotionType(potion_1);
+            rei_registerPotionType(potion_1);
         if (!REGISTERED_POTION_TYPES.contains(potion_2))
-            registerPotionType(potion_2);
+            rei_registerPotionType(potion_2);
         SELF_POTION_TYPES.stream().map(Ingredient::getStackArray).forEach(itemStacks -> Arrays.stream(itemStacks).forEach(stack -> {
             DefaultPlugin.registerBrewingDisplay(new DefaultBrewingDisplay(PotionUtil.setPotion(stack.copy(), potion_1), Ingredient.ofItems(new ItemProvider[]{item_1}), PotionUtil.setPotion(stack.copy(), potion_2)));
         }));
     }
     
-    private static void registerPotionType(Potion potion) {
+    private static void rei_registerPotionType(Potion potion) {
         REGISTERED_POTION_TYPES.add(potion);
         SELF_ITEM_RECIPES.forEach(recipe -> {
             DefaultPlugin.registerBrewingDisplay(new DefaultBrewingDisplay(PotionUtil.setPotion(recipe.input.getDefaultStack(), potion), recipe.ingredient, PotionUtil.setPotion(recipe.output.getDefaultStack(), potion)));
diff --git a/src/main/java/me/shedaniel/rei/mixin/MixinContainerScreen.java b/src/main/java/me/shedaniel/rei/mixin/MixinContainerScreen.java
index 7b25314d0..a677192c3 100644
--- a/src/main/java/me/shedaniel/rei/mixin/MixinContainerScreen.java
+++ b/src/main/java/me/shedaniel/rei/mixin/MixinContainerScreen.java
@@ -7,7 +7,6 @@ import me.shedaniel.rei.listeners.IMixinContainerScreen;
 import me.shedaniel.rei.listeners.IMixinTabGetter;
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.gui.ContainerScreen;
-import net.minecraft.client.gui.GuiEventListener;
 import net.minecraft.client.gui.Screen;
 import net.minecraft.client.gui.ingame.CreativePlayerInventoryScreen;
 import net.minecraft.container.Slot;
@@ -62,11 +61,11 @@ public class MixinContainerScreen extends Screen implements IMixinContainerScree
         this.listeners.add(GuiHelper.getLastOverlay(true));
     }
     
-    @Inject(method = "draw(IIF)V", at = @At("RETURN"))
+    @Inject(method = "method_18326(IIF)V", at = @At("RETURN"))
     public void draw(int int_1, int int_2, float float_1, CallbackInfo info) {
         if (MinecraftClient.getInstance().currentScreen instanceof CreativePlayerInventoryScreen) {
             IMixinTabGetter tabGetter = (IMixinTabGetter) MinecraftClient.getInstance().currentScreen;
-            if (tabGetter.getSelectedTab() != ItemGroup.INVENTORY.getId())
+            if (tabGetter.rei_getSelectedTab() != ItemGroup.INVENTORY.getIndex())
                 return;
         }
         GuiHelper.getLastOverlay().drawOverlay(int_1, int_2, float_1);
@@ -86,9 +85,8 @@ public class MixinContainerScreen extends Screen implements IMixinContainerScree
     public boolean mouseScrolled(double double_1) {
         ContainerScreenOverlay overlay = GuiHelper.getLastOverlay();
         if (GuiHelper.isOverlayVisible() && overlay.getRectangle().contains(ClientHelper.getMouseLocation()))
-            for(GuiEventListener entry : this.getEntries())
-                if (entry.mouseScrolled(double_1))
-                    return true;
+            if (overlay.mouseScrolled(double_1))
+                return true;
         return super.mouseScrolled(double_1);
     }
     
diff --git a/src/main/java/me/shedaniel/rei/mixin/MixinCraftingTableScreen.java b/src/main/java/me/shedaniel/rei/mixin/MixinCraftingTableScreen.java
index cf0b92c0a..0b711dc2d 100644
--- a/src/main/java/me/shedaniel/rei/mixin/MixinCraftingTableScreen.java
+++ b/src/main/java/me/shedaniel/rei/mixin/MixinCraftingTableScreen.java
@@ -33,7 +33,7 @@ public abstract class MixinCraftingTableScreen extends ContainerScreen {
     @Inject(method = "mouseClicked", at = @At("HEAD"), cancellable = true)
     public void mouseClicked(double mouseX, double mouseY, int button, CallbackInfoReturnable<Boolean> ci) {
         if (recipeBookGui.mouseClicked(mouseX, mouseY, button)) {
-            focusOn(recipeBookGui);
+            method_1967(recipeBookGui);
             ci.setReturnValue(true);
             ci.cancel();
         }
diff --git a/src/main/java/me/shedaniel/rei/mixin/MixinCreativePlayerInventoryScreen.java b/src/main/java/me/shedaniel/rei/mixin/MixinCreativePlayerInventoryScreen.java
index 0c60a17ae..7d2facb8f 100644
--- a/src/main/java/me/shedaniel/rei/mixin/MixinCreativePlayerInventoryScreen.java
+++ b/src/main/java/me/shedaniel/rei/mixin/MixinCreativePlayerInventoryScreen.java
@@ -28,7 +28,7 @@ public abstract class MixinCreativePlayerInventoryScreen extends AbstractPlayerI
     protected abstract boolean doRenderScrollBar();
     
     @Override
-    public int getSelectedTab() {
+    public int rei_getSelectedTab() {
         return selectedTab;
     }
     
@@ -43,7 +43,7 @@ public abstract class MixinCreativePlayerInventoryScreen extends AbstractPlayerI
     
     @Inject(method = "keyPressed", at = @At("HEAD"), cancellable = true)
     public void keyPressed(int int_1, int int_2, int int_3, CallbackInfoReturnable<Boolean> ci) {
-        if (selectedTab == ItemGroup.INVENTORY.getId())
+        if (selectedTab == ItemGroup.INVENTORY.getIndex())
             if (super.keyPressed(int_1, int_2, int_3)) {
                 ci.setReturnValue(true);
                 ci.cancel();
@@ -52,7 +52,7 @@ public abstract class MixinCreativePlayerInventoryScreen extends AbstractPlayerI
     
     @Inject(method = "charTyped", at = @At("HEAD"), cancellable = true)
     public void charTyped(char char_1, int int_1, CallbackInfoReturnable<Boolean> ci) {
-        if (!this.field_2888 && selectedTab == ItemGroup.INVENTORY.getId())
+        if (!this.field_2888 && selectedTab == ItemGroup.INVENTORY.getIndex())
             if (super.charTyped(char_1, int_1)) {
                 ci.setReturnValue(true);
                 ci.cancel();
diff --git a/src/main/java/me/shedaniel/rei/mixin/MixinPlayerInventoryScreen.java b/src/main/java/me/shedaniel/rei/mixin/MixinPlayerInventoryScreen.java
index 7071d3d82..ca7439c27 100644
--- a/src/main/java/me/shedaniel/rei/mixin/MixinPlayerInventoryScreen.java
+++ b/src/main/java/me/shedaniel/rei/mixin/MixinPlayerInventoryScreen.java
@@ -34,7 +34,7 @@ public abstract class MixinPlayerInventoryScreen extends AbstractPlayerInventory
     @Inject(method = "mouseClicked", at = @At("HEAD"), cancellable = true)
     public void mouseClicked(double mouseX, double mouseY, int button, CallbackInfoReturnable<Boolean> ci) {
         if (recipeBook.mouseClicked(mouseX, mouseY, button)) {
-            focusOn(recipeBook);
+            method_1967(recipeBook);
             ci.setReturnValue(true);
             ci.cancel();
         }
diff --git a/src/main/java/me/shedaniel/rei/mixin/MixinRecipeBookGui.java b/src/main/java/me/shedaniel/rei/mixin/MixinRecipeBookGui.java
index cbd370ab8..a4a129c1a 100644
--- a/src/main/java/me/shedaniel/rei/mixin/MixinRecipeBookGui.java
+++ b/src/main/java/me/shedaniel/rei/mixin/MixinRecipeBookGui.java
@@ -15,7 +15,7 @@ public class MixinRecipeBookGui implements IMixinRecipeBookGui {
     protected RecipeBookGhostSlots ghostSlots;
     
     @Override
-    public RecipeBookGhostSlots getGhostSlots() {
+    public RecipeBookGhostSlots rei_getGhostSlots() {
         return ghostSlots;
     }