Merge branch 'master' of https://github.com/SkyblockerMod/Skyblocker into beeper-creams

# Conflicts:
#	src/main/java/de/hysky/skyblocker/SkyblockerMod.java
#	src/main/java/de/hysky/skyblocker/skyblock/dungeon/CreeperBeams.java

Pull updates from upstream and NOT get a heart attack

1 files changed, 0 insertions, 18 deletions

diff --git a/src/main/java/me/xmrvizzy/skyblocker/mixin/InventoryScreenMixin.java b/src/main/java/me/xmrvizzy/skyblocker/mixin/InventoryScreenMixin.java
deleted file mode 100644
index 596fa1f9..00000000
--- a/src/main/java/me/xmrvizzy/skyblocker/mixin/InventoryScreenMixin.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package me.xmrvizzy.skyblocker.mixin;
-
-import com.llamalad7.mixinextras.injector.ModifyExpressionValue;
-import me.xmrvizzy.skyblocker.config.SkyblockerConfigManager;
-import me.xmrvizzy.skyblocker.skyblock.itemlist.ItemListWidget;
-import me.xmrvizzy.skyblocker.utils.Utils;
-import net.minecraft.client.gui.screen.ingame.InventoryScreen;
-import net.minecraft.client.gui.screen.recipebook.RecipeBookWidget;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.injection.At;
-
-@Mixin(InventoryScreen.class)
-public abstract class InventoryScreenMixin {
-    @ModifyExpressionValue(method = "<init>", at = @At(value = "NEW", target = "net/minecraft/client/gui/screen/recipebook/RecipeBookWidget"))
-    private RecipeBookWidget skyblocker$replaceRecipeBook(RecipeBookWidget original) {
-        return SkyblockerConfigManager.get().general.itemList.enableItemList && Utils.isOnSkyblock() ? new ItemListWidget() : original;
-    }
-}