From c5791690f6b8fb4270d6406924fdc1f6b0b39d12 Mon Sep 17 00:00:00 2001 From: Meduris Date: Sat, 2 Jul 2022 22:16:49 +0200 Subject: [PATCH] update class names to official mappings --- .../skate702/craftingkeys/CraftingKeys.java | 12 +++++++++-- .../skate702/craftingkeys/config/Config.java | 4 ++-- .../craftingkeys/manager/AnvilManager.java | 6 +++--- .../craftingkeys/manager/BrewingManager.java | 6 +++--- .../manager/ContainerManager.java | 20 +++++++++---------- .../craftingkeys/manager/CraftingManager.java | 6 +++--- .../manager/DispenserManager.java | 6 +++--- .../manager/EnchantmentManager.java | 6 +++--- .../craftingkeys/manager/FurnaceManager.java | 6 +++--- .../manager/InventoryManager.java | 6 +++--- .../craftingkeys/manager/VillagerManager.java | 6 +++--- .../proxies/CraftingKeysProxy.java | 10 +++++----- .../skate702/craftingkeys/util/InputUtil.java | 10 +++++----- .../craftingkeys/util/LanguageLocalizer.java | 2 +- .../de/skate702/craftingkeys/util/Util.java | 6 +++--- 15 files changed, 60 insertions(+), 52 deletions(-) diff --git a/src/main/java/de/skate702/craftingkeys/CraftingKeys.java b/src/main/java/de/skate702/craftingkeys/CraftingKeys.java index b6583dd..2180f6a 100644 --- a/src/main/java/de/skate702/craftingkeys/CraftingKeys.java +++ b/src/main/java/de/skate702/craftingkeys/CraftingKeys.java @@ -1,8 +1,8 @@ package de.skate702.craftingkeys; -import net.minecraft.client.gui.screen.EnchantmentScreen; -import net.minecraft.client.gui.screen.Screen; +import net.minecraft.client.gui.screens.inventory.EnchantmentScreen; +import net.minecraft.client.gui.screens.Screen; import net.minecraft.client.gui.screen.inventory.*; import net.minecraftforge.event.TickEvent; import net.minecraftforge.eventbus.api.SubscribeEvent; @@ -16,6 +16,14 @@ import de.skate702.craftingkeys.util.Util; import net.minecraftforge.common.MinecraftForge; import org.apache.commons.lang3.tuple.Pair; +import net.minecraft.client.gui.screens.inventory.AnvilScreen; +import net.minecraft.client.gui.screens.inventory.BrewingStandScreen; +import net.minecraft.client.gui.screens.inventory.CraftingScreen; +import net.minecraft.client.gui.screens.inventory.DispenserScreen; +import net.minecraft.client.gui.screens.inventory.FurnaceScreen; +import net.minecraft.client.gui.screens.inventory.InventoryScreen; +import net.minecraft.client.gui.screens.inventory.MerchantScreen; + /** * The Main Class of the Mod with the important onTick-Method. Some Methods are * based on the open-source Inventory Tweaks. Big Thanks for that! diff --git a/src/main/java/de/skate702/craftingkeys/config/Config.java b/src/main/java/de/skate702/craftingkeys/config/Config.java index 0bbeba4..2460eaf 100644 --- a/src/main/java/de/skate702/craftingkeys/config/Config.java +++ b/src/main/java/de/skate702/craftingkeys/config/Config.java @@ -2,7 +2,7 @@ package de.skate702.craftingkeys.config; import net.minecraft.client.Minecraft; -import net.minecraft.client.util.InputMappings; +import com.mojang.blaze3d.platform.InputConstants; import java.awt.event.KeyEvent; @@ -27,7 +27,7 @@ public class Config { private static final int keyDrop = KeyEvent.VK_SPACE; public static boolean isKeyDown(int keyCode) { - return InputMappings.isKeyDown(Minecraft.getInstance().getWindow().getWindow(), keyCode); + return InputConstants.isKeyDown(Minecraft.getInstance().getWindow().getWindow(), keyCode); } public static boolean isKeyTopLeftPressed() { diff --git a/src/main/java/de/skate702/craftingkeys/manager/AnvilManager.java b/src/main/java/de/skate702/craftingkeys/manager/AnvilManager.java index c6e84cd..16c41e3 100644 --- a/src/main/java/de/skate702/craftingkeys/manager/AnvilManager.java +++ b/src/main/java/de/skate702/craftingkeys/manager/AnvilManager.java @@ -1,7 +1,7 @@ package de.skate702.craftingkeys.manager; import de.skate702.craftingkeys.util.Logger; -import net.minecraft.inventory.container.Container; +import net.minecraft.world.inventory.AbstractContainerMenu; /** * Manages a Anvil GUI Inventory. @@ -14,7 +14,7 @@ public class AnvilManager extends ContainerManager { * * @param container The container from a crafting GUI */ - private AnvilManager(Container container) { + private AnvilManager(AbstractContainerMenu container) { super(container); } @@ -24,7 +24,7 @@ public class AnvilManager extends ContainerManager { * @param container A container from a GUI * @return manager-singleton */ - public static AnvilManager getInstance(Container container) { + public static AnvilManager getInstance(AbstractContainerMenu container) { if (instance == null) { instance = new AnvilManager(container); } else { diff --git a/src/main/java/de/skate702/craftingkeys/manager/BrewingManager.java b/src/main/java/de/skate702/craftingkeys/manager/BrewingManager.java index 62e1766..3520daa 100644 --- a/src/main/java/de/skate702/craftingkeys/manager/BrewingManager.java +++ b/src/main/java/de/skate702/craftingkeys/manager/BrewingManager.java @@ -1,7 +1,7 @@ package de.skate702.craftingkeys.manager; import de.skate702.craftingkeys.util.Logger; -import net.minecraft.inventory.container.Container; +import net.minecraft.world.inventory.AbstractContainerMenu; /** * Manages a Brewing Stand GUI Inventory. @@ -15,7 +15,7 @@ public class BrewingManager extends ContainerManager { * * @param container The container from a crafting GUI */ - private BrewingManager(Container container) { + private BrewingManager(AbstractContainerMenu container) { super(container); } @@ -25,7 +25,7 @@ public class BrewingManager extends ContainerManager { * @param container A container from a GUI * @return manager-singleton */ - public static BrewingManager getInstance(Container container) { + public static BrewingManager getInstance(AbstractContainerMenu container) { if (instance == null) { instance = new BrewingManager(container); } else { diff --git a/src/main/java/de/skate702/craftingkeys/manager/ContainerManager.java b/src/main/java/de/skate702/craftingkeys/manager/ContainerManager.java index 1939ffe..ac80cc5 100644 --- a/src/main/java/de/skate702/craftingkeys/manager/ContainerManager.java +++ b/src/main/java/de/skate702/craftingkeys/manager/ContainerManager.java @@ -5,13 +5,13 @@ import de.skate702.craftingkeys.config.Config; import de.skate702.craftingkeys.util.InputUtil; import de.skate702.craftingkeys.util.Logger; import de.skate702.craftingkeys.util.Util; -import net.minecraft.block.Blocks; -import net.minecraft.client.gui.screen.inventory.InventoryScreen; -import net.minecraft.client.settings.KeyBinding; -import net.minecraft.inventory.container.Container; -import net.minecraft.inventory.container.Slot; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; +import net.minecraft.world.level.block.Blocks; +import net.minecraft.client.gui.screens.inventory.InventoryScreen; +import net.minecraft.client.KeyMapping; +import net.minecraft.world.inventory.AbstractContainerMenu; +import net.minecraft.world.inventory.Slot; +import net.minecraft.world.item.Item; +import net.minecraft.world.item.ItemStack; /** * Provides all needed methods to handle and manage a gui inventory. Does also provide frames for own implementations. @@ -21,14 +21,14 @@ public abstract class ContainerManager { /** * The Container to work with. */ - Container container; + AbstractContainerMenu container; /** * Creates a new ContainerManager with the given container. * * @param container The container to work with */ - ContainerManager(Container container) { + ContainerManager(AbstractContainerMenu container) { this.container = container; } @@ -166,7 +166,7 @@ public abstract class ContainerManager { } int inputdelta; - KeyBinding[] hotbar = Util.client.options.keyHotbarSlots; + KeyMapping[] hotbar = Util.client.options.keyHotbarSlots; if (Config.isKeyDown(hotbar[0].getKey().getValue())) { inputdelta = 1; diff --git a/src/main/java/de/skate702/craftingkeys/manager/CraftingManager.java b/src/main/java/de/skate702/craftingkeys/manager/CraftingManager.java index a1edad4..dcf0fb0 100644 --- a/src/main/java/de/skate702/craftingkeys/manager/CraftingManager.java +++ b/src/main/java/de/skate702/craftingkeys/manager/CraftingManager.java @@ -1,7 +1,7 @@ package de.skate702.craftingkeys.manager; import de.skate702.craftingkeys.util.Logger; -import net.minecraft.inventory.container.Container; +import net.minecraft.world.inventory.AbstractContainerMenu; /** * Manages a Crafting GUI Inventory. @@ -15,7 +15,7 @@ public class CraftingManager extends ContainerManager { * * @param container The container from a crafting GUI */ - private CraftingManager(Container container) { + private CraftingManager(AbstractContainerMenu container) { super(container); } @@ -25,7 +25,7 @@ public class CraftingManager extends ContainerManager { * @param container A container from a GUI * @return manager-singleton */ - public static CraftingManager getInstance(Container container) { + public static CraftingManager getInstance(AbstractContainerMenu container) { if (instance == null) { instance = new CraftingManager(container); } else { diff --git a/src/main/java/de/skate702/craftingkeys/manager/DispenserManager.java b/src/main/java/de/skate702/craftingkeys/manager/DispenserManager.java index 28f8d50..d1da463 100644 --- a/src/main/java/de/skate702/craftingkeys/manager/DispenserManager.java +++ b/src/main/java/de/skate702/craftingkeys/manager/DispenserManager.java @@ -1,7 +1,7 @@ package de.skate702.craftingkeys.manager; import de.skate702.craftingkeys.util.Logger; -import net.minecraft.inventory.container.Container; +import net.minecraft.world.inventory.AbstractContainerMenu; /** * Manages a Dispenser GUI Inventory. @@ -15,7 +15,7 @@ public class DispenserManager extends ContainerManager { * * @param container The container from a crafting GUI */ - private DispenserManager(Container container) { + private DispenserManager(AbstractContainerMenu container) { super(container); } @@ -25,7 +25,7 @@ public class DispenserManager extends ContainerManager { * @param container A container from a GUI * @return manager-singleton */ - public static DispenserManager getInstance(Container container) { + public static DispenserManager getInstance(AbstractContainerMenu container) { if (instance == null) { instance = new DispenserManager(container); } else { diff --git a/src/main/java/de/skate702/craftingkeys/manager/EnchantmentManager.java b/src/main/java/de/skate702/craftingkeys/manager/EnchantmentManager.java index ed80fc8..3b86630 100644 --- a/src/main/java/de/skate702/craftingkeys/manager/EnchantmentManager.java +++ b/src/main/java/de/skate702/craftingkeys/manager/EnchantmentManager.java @@ -1,7 +1,7 @@ package de.skate702.craftingkeys.manager; import de.skate702.craftingkeys.util.Logger; -import net.minecraft.inventory.container.Container; +import net.minecraft.world.inventory.AbstractContainerMenu; /** * Manages a Enchantment Table GUI Inventory. @@ -15,7 +15,7 @@ public class EnchantmentManager extends ContainerManager { * * @param container The container from a crafting GUI */ - private EnchantmentManager(Container container) { + private EnchantmentManager(AbstractContainerMenu container) { super(container); } @@ -25,7 +25,7 @@ public class EnchantmentManager extends ContainerManager { * @param container A container from a GUI * @return manager-singleton */ - public static EnchantmentManager getInstance(Container container) { + public static EnchantmentManager getInstance(AbstractContainerMenu container) { if (instance == null) { instance = new EnchantmentManager(container); } else { diff --git a/src/main/java/de/skate702/craftingkeys/manager/FurnaceManager.java b/src/main/java/de/skate702/craftingkeys/manager/FurnaceManager.java index 76d37b3..d4e537d 100644 --- a/src/main/java/de/skate702/craftingkeys/manager/FurnaceManager.java +++ b/src/main/java/de/skate702/craftingkeys/manager/FurnaceManager.java @@ -1,7 +1,7 @@ package de.skate702.craftingkeys.manager; import de.skate702.craftingkeys.util.Logger; -import net.minecraft.inventory.container.Container; +import net.minecraft.world.inventory.AbstractContainerMenu; /** * Manages a Furnace GUI Inventory. @@ -15,7 +15,7 @@ public class FurnaceManager extends ContainerManager { * * @param container The container from a crafting GUI */ - private FurnaceManager(Container container) { + private FurnaceManager(AbstractContainerMenu container) { super(container); } @@ -25,7 +25,7 @@ public class FurnaceManager extends ContainerManager { * @param container A container from a GUI * @return manager-singleton */ - public static FurnaceManager getInstance(Container container) { + public static FurnaceManager getInstance(AbstractContainerMenu container) { if (instance == null) { instance = new FurnaceManager(container); } else { diff --git a/src/main/java/de/skate702/craftingkeys/manager/InventoryManager.java b/src/main/java/de/skate702/craftingkeys/manager/InventoryManager.java index c18a2e8..b670f6d 100644 --- a/src/main/java/de/skate702/craftingkeys/manager/InventoryManager.java +++ b/src/main/java/de/skate702/craftingkeys/manager/InventoryManager.java @@ -1,7 +1,7 @@ package de.skate702.craftingkeys.manager; import de.skate702.craftingkeys.util.Logger; -import net.minecraft.inventory.container.Container; +import net.minecraft.world.inventory.AbstractContainerMenu; /** * Manages a Inventory GUI Inventory. @@ -15,7 +15,7 @@ public class InventoryManager extends ContainerManager { * * @param container The container from a crafting GUI */ - private InventoryManager(Container container) { + private InventoryManager(AbstractContainerMenu container) { super(container); } @@ -25,7 +25,7 @@ public class InventoryManager extends ContainerManager { * @param container A container from a GUI * @return manager-singleton */ - public static InventoryManager getInstance(Container container) { + public static InventoryManager getInstance(AbstractContainerMenu container) { if (instance == null) { instance = new InventoryManager(container); } else { diff --git a/src/main/java/de/skate702/craftingkeys/manager/VillagerManager.java b/src/main/java/de/skate702/craftingkeys/manager/VillagerManager.java index d1b0bd7..583f475 100644 --- a/src/main/java/de/skate702/craftingkeys/manager/VillagerManager.java +++ b/src/main/java/de/skate702/craftingkeys/manager/VillagerManager.java @@ -2,7 +2,7 @@ package de.skate702.craftingkeys.manager; import de.skate702.craftingkeys.util.Logger; -import net.minecraft.inventory.container.Container; +import net.minecraft.world.inventory.AbstractContainerMenu; /** * Manages a Villager GUI Inventory. @@ -16,7 +16,7 @@ public class VillagerManager extends ContainerManager { * * @param container The container from a crafting GUI */ - private VillagerManager(Container container) { + private VillagerManager(AbstractContainerMenu container) { super(container); } @@ -26,7 +26,7 @@ public class VillagerManager extends ContainerManager { * @param container A container from a GUI * @return manager-singleton */ - public static VillagerManager getInstance(Container container) { + public static VillagerManager getInstance(AbstractContainerMenu container) { if (instance == null) { instance = new VillagerManager(container); } else { diff --git a/src/main/java/de/skate702/craftingkeys/proxies/CraftingKeysProxy.java b/src/main/java/de/skate702/craftingkeys/proxies/CraftingKeysProxy.java index 0b41413..7642b46 100644 --- a/src/main/java/de/skate702/craftingkeys/proxies/CraftingKeysProxy.java +++ b/src/main/java/de/skate702/craftingkeys/proxies/CraftingKeysProxy.java @@ -1,8 +1,8 @@ package de.skate702.craftingkeys.proxies; -import net.minecraft.client.multiplayer.PlayerController; -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.inventory.container.ClickType; +import net.minecraft.client.multiplayer.MultiPlayerGameMode; +import net.minecraft.world.entity.player.Player; +import net.minecraft.world.inventory.ClickType; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; @@ -24,8 +24,8 @@ public class CraftingKeysProxy { * @param player The current player (from Client) */ @OnlyIn(Dist.CLIENT) - public void sendSlotClick(PlayerController controller, int windowId, int slot, int rightClick, @SuppressWarnings("SameParameterValue") int action, - PlayerEntity player) { + public void sendSlotClick(MultiPlayerGameMode controller, int windowId, int slot, int rightClick, @SuppressWarnings("SameParameterValue") int action, + Player player) { controller.handleInventoryMouseClick(windowId, slot, rightClick, ClickType.PICKUP, player); } diff --git a/src/main/java/de/skate702/craftingkeys/util/InputUtil.java b/src/main/java/de/skate702/craftingkeys/util/InputUtil.java index f0b9bcb..b70131c 100644 --- a/src/main/java/de/skate702/craftingkeys/util/InputUtil.java +++ b/src/main/java/de/skate702/craftingkeys/util/InputUtil.java @@ -1,8 +1,8 @@ package de.skate702.craftingkeys.util; -import net.minecraft.client.gui.screen.Screen; -import net.minecraft.client.gui.screen.inventory.ContainerScreen; -import net.minecraft.inventory.container.Slot; +import net.minecraft.client.gui.screens.Screen; +import net.minecraft.client.gui.screens.inventory.AbstractContainerScreen; +import net.minecraft.world.inventory.Slot; /** * This class provides methods to interact with the Mouse and key input. @@ -27,8 +27,8 @@ public class InputUtil { * @return Returns the slot (or null) */ public static Slot getSlotAtMousePosition(Screen screen) { - if (screen instanceof ContainerScreen) { - return ((ContainerScreen) screen).getSlotUnderMouse(); + if (screen instanceof AbstractContainerScreen) { + return ((AbstractContainerScreen) screen).getSlotUnderMouse(); } else { Logger.debug("getSlotAtMousePosition(gui)", "guiContainer == null"); return null; diff --git a/src/main/java/de/skate702/craftingkeys/util/LanguageLocalizer.java b/src/main/java/de/skate702/craftingkeys/util/LanguageLocalizer.java index 39dac2c..3c0cc91 100644 --- a/src/main/java/de/skate702/craftingkeys/util/LanguageLocalizer.java +++ b/src/main/java/de/skate702/craftingkeys/util/LanguageLocalizer.java @@ -1,6 +1,6 @@ package de.skate702.craftingkeys.util; -import net.minecraft.client.resources.I18n; +import net.minecraft.client.resources.language.I18n; public class LanguageLocalizer { /** diff --git a/src/main/java/de/skate702/craftingkeys/util/Util.java b/src/main/java/de/skate702/craftingkeys/util/Util.java index 8c63f49..a56a717 100644 --- a/src/main/java/de/skate702/craftingkeys/util/Util.java +++ b/src/main/java/de/skate702/craftingkeys/util/Util.java @@ -1,9 +1,9 @@ package de.skate702.craftingkeys.util; -import net.minecraft.util.text.TranslationTextComponent; +import net.minecraft.network.chat.TranslatableComponent; import net.minecraft.client.Minecraft; -import net.minecraft.item.ItemStack; +import net.minecraft.world.item.ItemStack; /** * Provides basic utility methods. For input methods, look at InputUtil. @@ -64,7 +64,7 @@ public class Util { * @param lang_key key from lang-file */ public static void printMessage(String lang_key) { - String translated = new TranslationTextComponent(lang_key).getContents(); + String translated = new TranslatableComponent(lang_key).getContents(); client.player.chat(translated); }