From bcef0b6c1e151fc46ba3641cb29060c0a4c6ecb7 Mon Sep 17 00:00:00 2001 From: shedaniel Date: Tue, 25 Nov 2025 15:51:07 +0800 Subject: Update to 1.21.9 --- .../client/categories/DefaultInformationCategory.java | 13 +++++++------ .../categories/beacon/DefaultBeaconBaseCategory.java | 13 +++++++------ .../categories/beacon/DefaultBeaconPaymentCategory.java | 13 +++++++------ .../rei/plugin/client/categories/tag/TagTreeWidget.java | 14 ++++++++------ .../plugin/client/categories/tag/ValueTagNodeWidget.java | 10 ++++++---- .../rei/plugin/client/favorites/GameModeFavoriteEntry.java | 7 ++++--- .../rei/plugin/client/favorites/TimeFavoriteEntry.java | 7 ++++--- .../rei/plugin/client/favorites/WeatherFavoriteEntry.java | 7 ++++--- 8 files changed, 47 insertions(+), 37 deletions(-) (limited to 'default-plugin/src') diff --git a/default-plugin/src/main/java/me/shedaniel/rei/plugin/client/categories/DefaultInformationCategory.java b/default-plugin/src/main/java/me/shedaniel/rei/plugin/client/categories/DefaultInformationCategory.java index 78bc3e856..6ba0fc92a 100644 --- a/default-plugin/src/main/java/me/shedaniel/rei/plugin/client/categories/DefaultInformationCategory.java +++ b/default-plugin/src/main/java/me/shedaniel/rei/plugin/client/categories/DefaultInformationCategory.java @@ -44,6 +44,7 @@ import net.fabricmc.api.Environment; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiGraphics; import net.minecraft.client.gui.components.events.GuiEventListener; +import net.minecraft.client.input.MouseButtonEvent; import net.minecraft.client.renderer.RenderPipelines; import net.minecraft.network.chat.Component; import net.minecraft.network.chat.FormattedText; @@ -154,17 +155,17 @@ public class DefaultInformationCategory implements DisplayCategory extends WidgetWithBounds { } @Override - public boolean mouseClicked(double mouseX, double mouseY, int button) { - return super.mouseClicked(mouseX, mouseY, button); + public boolean mouseClicked(MouseButtonEvent event, boolean doubleClick) { + return super.mouseClicked(event, doubleClick); } @Override - public boolean mouseReleased(double mouseX, double mouseY, int button) { + public boolean mouseReleased(MouseButtonEvent event) { for (GuiEventListener element : children()) - if (element.mouseReleased(mouseX, mouseY, button)) + if (element.mouseReleased(event)) return true; return false; } @Override - public boolean keyPressed(int keyCode, int scanCode, int modifiers) { + public boolean keyPressed(KeyEvent event) { for (GuiEventListener element : children()) - if (element.keyPressed(keyCode, scanCode, modifiers)) + if (element.keyPressed(event)) return true; return false; } diff --git a/default-plugin/src/main/java/me/shedaniel/rei/plugin/client/categories/tag/ValueTagNodeWidget.java b/default-plugin/src/main/java/me/shedaniel/rei/plugin/client/categories/tag/ValueTagNodeWidget.java index d5537063c..5a486e319 100644 --- a/default-plugin/src/main/java/me/shedaniel/rei/plugin/client/categories/tag/ValueTagNodeWidget.java +++ b/default-plugin/src/main/java/me/shedaniel/rei/plugin/client/categories/tag/ValueTagNodeWidget.java @@ -32,6 +32,8 @@ import me.shedaniel.rei.api.common.entry.EntryStack; import me.shedaniel.rei.plugin.common.displays.tag.TagNode; import net.minecraft.client.gui.GuiGraphics; import net.minecraft.client.gui.components.events.GuiEventListener; +import net.minecraft.client.input.KeyEvent; +import net.minecraft.client.input.MouseButtonEvent; import net.minecraft.core.Holder; import net.minecraft.core.HolderSet; import org.joml.Matrix3x2f; @@ -103,17 +105,17 @@ public class ValueTagNodeWidget extends TagNodeWidget { } @Override - public boolean mouseReleased(double mouseX, double mouseY, int button) { + public boolean mouseReleased(MouseButtonEvent event) { for (GuiEventListener element : children()) - if (element.mouseReleased(mouseX, mouseY, button)) + if (element.mouseReleased(event)) return true; return false; } @Override - public boolean keyPressed(int keyCode, int scanCode, int modifiers) { + public boolean keyPressed(KeyEvent event) { for (GuiEventListener element : children()) - if (element.keyPressed(keyCode, scanCode, modifiers)) + if (element.keyPressed(event)) return true; return false; } diff --git a/default-plugin/src/main/java/me/shedaniel/rei/plugin/client/favorites/GameModeFavoriteEntry.java b/default-plugin/src/main/java/me/shedaniel/rei/plugin/client/favorites/GameModeFavoriteEntry.java index 161b3deda..29387a12b 100644 --- a/default-plugin/src/main/java/me/shedaniel/rei/plugin/client/favorites/GameModeFavoriteEntry.java +++ b/default-plugin/src/main/java/me/shedaniel/rei/plugin/client/favorites/GameModeFavoriteEntry.java @@ -41,6 +41,7 @@ import net.minecraft.client.Minecraft; import net.minecraft.client.gui.Font; import net.minecraft.client.gui.GuiGraphics; import net.minecraft.client.gui.components.events.GuiEventListener; +import net.minecraft.client.input.MouseButtonEvent; import net.minecraft.client.resources.sounds.SimpleSoundInstance; import net.minecraft.nbt.CompoundTag; import net.minecraft.network.chat.Component; @@ -143,8 +144,8 @@ public class GameModeFavoriteEntry extends FavoriteEntry { } @Override - public boolean doAction(int button) { - if (button == 0) { + public boolean doAction(MouseButtonEvent event) { + if (event.button() == 0) { GameType mode = gameMode; if (mode == null) { mode = GameType.byId(Minecraft.getInstance().gameMode.getPlayerMode().getId() + 1 % 4); @@ -274,7 +275,7 @@ public class GameModeFavoriteEntry extends FavoriteEntry { } @Override - public boolean mouseClicked(double mouseX, double mouseY, int button) { + public boolean mouseClicked(MouseButtonEvent event, boolean doubleClick) { Minecraft.getInstance().player.connection.sendCommand(StringUtils.removeStart(ConfigObject.getInstance().getGamemodeCommand().replaceAll("\\{gamemode}", gameMode.name().toLowerCase(Locale.ROOT)), "/")); minecraft.getSoundManager().play(SimpleSoundInstance.forUI(SoundEvents.UI_BUTTON_CLICK, 1.0F)); closeMenu(); diff --git a/default-plugin/src/main/java/me/shedaniel/rei/plugin/client/favorites/TimeFavoriteEntry.java b/default-plugin/src/main/java/me/shedaniel/rei/plugin/client/favorites/TimeFavoriteEntry.java index ef2fcdec6..905a4fdfb 100644 --- a/default-plugin/src/main/java/me/shedaniel/rei/plugin/client/favorites/TimeFavoriteEntry.java +++ b/default-plugin/src/main/java/me/shedaniel/rei/plugin/client/favorites/TimeFavoriteEntry.java @@ -39,6 +39,7 @@ import me.shedaniel.rei.api.common.util.CollectionUtils; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiGraphics; import net.minecraft.client.gui.components.events.GuiEventListener; +import net.minecraft.client.input.MouseButtonEvent; import net.minecraft.client.multiplayer.ClientLevel; import net.minecraft.client.renderer.RenderPipelines; import net.minecraft.client.resources.language.I18n; @@ -173,8 +174,8 @@ public class TimeFavoriteEntry extends FavoriteEntry { } @Override - public boolean doAction(int button) { - if (button == 0) { + public boolean doAction(MouseButtonEvent event) { + if (event.button() == 0) { Time time = this.time; if (time == null) { time = nextTime(); @@ -299,7 +300,7 @@ public class TimeFavoriteEntry extends FavoriteEntry { } @Override - public boolean mouseClicked(double mouseX, double mouseY, int button) { + public boolean mouseClicked(MouseButtonEvent event, boolean doubleClick) { Minecraft.getInstance().player.connection.sendCommand(StringUtils.removeStart(ConfigObject.getInstance().getTimeCommand().replaceAll("\\{time}", time.getPart().toLowerCase(Locale.ROOT)), "/")); minecraft.getSoundManager().play(SimpleSoundInstance.forUI(SoundEvents.UI_BUTTON_CLICK, 1.0F)); closeMenu(); diff --git a/default-plugin/src/main/java/me/shedaniel/rei/plugin/client/favorites/WeatherFavoriteEntry.java b/default-plugin/src/main/java/me/shedaniel/rei/plugin/client/favorites/WeatherFavoriteEntry.java index d20ea2939..72faac39d 100644 --- a/default-plugin/src/main/java/me/shedaniel/rei/plugin/client/favorites/WeatherFavoriteEntry.java +++ b/default-plugin/src/main/java/me/shedaniel/rei/plugin/client/favorites/WeatherFavoriteEntry.java @@ -39,6 +39,7 @@ import me.shedaniel.rei.api.common.util.CollectionUtils; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiGraphics; import net.minecraft.client.gui.components.events.GuiEventListener; +import net.minecraft.client.input.MouseButtonEvent; import net.minecraft.client.multiplayer.ClientLevel; import net.minecraft.client.renderer.RenderPipelines; import net.minecraft.client.resources.language.I18n; @@ -149,8 +150,8 @@ public class WeatherFavoriteEntry extends FavoriteEntry { } @Override - public boolean doAction(int button) { - if (button == 0) { + public boolean doAction(MouseButtonEvent event) { + if (event.button() == 0) { if (weather != null) { Minecraft.getInstance().player.connection.sendCommand(StringUtils.removeStart(ConfigObject.getInstance().getWeatherCommand().replaceAll("\\{weather}", weather.name().toLowerCase(Locale.ROOT)), "/")); Minecraft.getInstance().getSoundManager().play(SimpleSoundInstance.forUI(SoundEvents.UI_BUTTON_CLICK, 1.0F)); @@ -308,7 +309,7 @@ public class WeatherFavoriteEntry extends FavoriteEntry { } @Override - public boolean mouseClicked(double mouseX, double mouseY, int button) { + public boolean mouseClicked(MouseButtonEvent event, boolean doubleClick) { Minecraft.getInstance().player.connection.sendCommand(StringUtils.removeStart(ConfigObject.getInstance().getWeatherCommand().replaceAll("\\{weather}", weather.name().toLowerCase(Locale.ROOT)), "/")); minecraft.getSoundManager().play(SimpleSoundInstance.forUI(SoundEvents.UI_BUTTON_CLICK, 1.0F)); closeMenu(); -- cgit