Skip to content

Commit bcef0b6

Browse files
shedanielshedaniel
committed
Update to 1.21.9
1 parent 4af1ca2 commit bcef0b6

File tree

97 files changed

+800
-747
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

97 files changed

+800
-747
lines changed

‎api/src/main/java/me/shedaniel/rei/api/client/entry/region/RegionEntry.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828
import me.shedaniel.rei.api.client.gui.drag.component.DraggableComponent;
2929
import me.shedaniel.rei.api.client.gui.widgets.Slot;
3030
import me.shedaniel.rei.api.common.entry.EntryStack;
31+
import net.minecraft.client.input.MouseButtonEvent;
3132
import org.jetbrains.annotations.ApiStatus;
3233
import org.jetbrains.annotations.Nullable;
3334

@@ -56,7 +57,7 @@ default Optional<Supplier<Collection<FavoriteMenuEntry>>> getMenuEntries() {
5657

5758
UUID getUuid();
5859

59-
default boolean doAction(int button) {
60+
default boolean doAction(MouseButtonEvent event) {
6061
return false;
6162
}
6263

‎api/src/main/java/me/shedaniel/rei/api/client/favorites/FavoriteEntry.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@
3333
import me.shedaniel.rei.impl.ClientInternals;
3434
import net.fabricmc.api.EnvType;
3535
import net.fabricmc.api.Environment;
36+
import net.minecraft.client.input.MouseButtonEvent;
3637
import net.minecraft.nbt.CompoundTag;
3738
import net.minecraft.resources.ResourceLocation;
3839
import org.jetbrains.annotations.ApiStatus;
@@ -100,7 +101,7 @@ public UUID getUuid() {
100101
public abstract Renderer getRenderer(boolean showcase);
101102

102103
@Override
103-
public abstract boolean doAction(int button);
104+
public abstract boolean doAction(MouseButtonEvent event);
104105

105106
@Override
106107
public Optional<Supplier<Collection<FavoriteMenuEntry>>> getMenuEntries() {

‎api/src/main/java/me/shedaniel/rei/api/client/gui/widgets/DelegateWidget.java‎

Lines changed: 13 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,9 @@
2626
import me.shedaniel.math.Rectangle;
2727
import net.minecraft.client.gui.GuiGraphics;
2828
import net.minecraft.client.gui.components.events.GuiEventListener;
29+
import net.minecraft.client.input.CharacterEvent;
30+
import net.minecraft.client.input.KeyEvent;
31+
import net.minecraft.client.input.MouseButtonEvent;
2932
import org.jetbrains.annotations.Nullable;
3033

3134
import java.util.Collections;
@@ -90,29 +93,29 @@ public boolean mouseScrolled(double mouseX, double mouseY, double amountX, doubl
9093
}
9194

9295
@Override
93-
public boolean keyPressed(int keyCode, int scanCode, int modifiers) {
94-
return delegate().keyPressed(keyCode, scanCode, modifiers);
96+
public boolean keyPressed(KeyEvent event) {
97+
return delegate().keyPressed(event);
9598
}
9699

97100
@Override
98-
public boolean keyReleased(int keyCode, int scanCode, int modifiers) {
99-
return delegate().keyReleased(keyCode, scanCode, modifiers);
101+
public boolean keyReleased(KeyEvent event) {
102+
return delegate().keyReleased(event);
100103
}
101104

102105
@Override
103-
public boolean charTyped(char character, int modifiers) {
104-
return delegate().charTyped(character, modifiers);
106+
public boolean charTyped(CharacterEvent event) {
107+
return delegate().charTyped(event);
105108
}
106109

107110
@Override
108-
public boolean mouseDragged(double mouseX, double mouseY, int button, double deltaX, double deltaY) {
109-
return delegate().mouseDragged(mouseX, mouseY, button, deltaX, deltaY);
111+
public boolean mouseDragged(MouseButtonEvent event, double deltaX, double deltaY) {
112+
return delegate().mouseDragged(event, deltaX, deltaY);
110113
}
111114

112115
@Override
113-
public boolean mouseReleased(double mouseX, double mouseY, int button) {
116+
public boolean mouseReleased(MouseButtonEvent event) {
114117
this.setDragging(false);
115-
return delegate().mouseReleased(mouseX, mouseY, button);
118+
return delegate().mouseReleased(event);
116119
}
117120

118121
@Override

‎build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
plugins {
22
id("architectury-plugin") version("3.4-SNAPSHOT")
3-
id("dev.architectury.loom") version("1.10-SNAPSHOT") apply false
3+
id("dev.architectury.loom") version("1.11-SNAPSHOT") apply false
44
id("org.cadixdev.licenser") version("0.6.1")
55
id("me.shedaniel.unified-publishing") version("0.1.+")
66
id("maven-publish")

‎default-plugin/src/main/java/me/shedaniel/rei/plugin/client/categories/DefaultInformationCategory.java‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@
4444
import net.minecraft.client.Minecraft;
4545
import net.minecraft.client.gui.GuiGraphics;
4646
import net.minecraft.client.gui.components.events.GuiEventListener;
47+
import net.minecraft.client.input.MouseButtonEvent;
4748
import net.minecraft.client.renderer.RenderPipelines;
4849
import net.minecraft.network.chat.Component;
4950
import net.minecraft.network.chat.FormattedText;
@@ -154,17 +155,17 @@ public boolean mouseScrolled(double mouseX, double mouseY, double amountX, doubl
154155
}
155156

156157
@Override
157-
public boolean mouseClicked(double mouseX, double mouseY, int button) {
158-
if (scrolling.updateDraggingState(mouseX, mouseY, button))
158+
public boolean mouseClicked(MouseButtonEvent event, boolean doubleClick) {
159+
if (scrolling.updateDraggingState(event.x(), event.y(), event.button()))
159160
return true;
160-
return super.mouseClicked(mouseX, mouseY, button);
161+
return super.mouseClicked(event, doubleClick);
161162
}
162163

163164
@Override
164-
public boolean mouseDragged(double mouseX, double mouseY, int button, double deltaX, double deltaY) {
165-
if (scrolling.mouseDragged(mouseX, mouseY, button, deltaX, deltaY))
165+
public boolean mouseDragged(MouseButtonEvent event, double deltaX, double deltaY) {
166+
if (scrolling.mouseDragged(event.x(), event.y(), event.button(), deltaX, deltaY))
166167
return true;
167-
return super.mouseDragged(mouseX, mouseY, button, deltaX, deltaY);
168+
return super.mouseDragged(event, deltaX, deltaY);
168169
}
169170

170171
@Override

‎default-plugin/src/main/java/me/shedaniel/rei/plugin/client/categories/beacon/DefaultBeaconBaseCategory.java‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@
4141
import net.minecraft.client.Minecraft;
4242
import net.minecraft.client.gui.GuiGraphics;
4343
import net.minecraft.client.gui.components.events.GuiEventListener;
44+
import net.minecraft.client.input.MouseButtonEvent;
4445
import net.minecraft.network.chat.Component;
4546
import net.minecraft.util.Mth;
4647
import net.minecraft.world.level.block.Blocks;
@@ -136,17 +137,17 @@ public Rectangle getBounds() {
136137
}
137138

138139
@Override
139-
public boolean mouseClicked(double mouseX, double mouseY, int button) {
140-
if (scrolling.updateDraggingState(mouseX, mouseY, button))
140+
public boolean mouseClicked(MouseButtonEvent event, boolean doubleClick) {
141+
if (scrolling.updateDraggingState(event.x(), event.y(), event.button()))
141142
return true;
142-
return super.mouseClicked(mouseX, mouseY, button);
143+
return super.mouseClicked(event, doubleClick);
143144
}
144145

145146
@Override
146-
public boolean mouseDragged(double mouseX, double mouseY, int button, double deltaX, double deltaY) {
147-
if (scrolling.mouseDragged(mouseX, mouseY, button, deltaX, deltaY))
147+
public boolean mouseDragged(MouseButtonEvent event, double deltaX, double deltaY) {
148+
if (scrolling.mouseDragged(event.x(), event.y(), event.button(), deltaX, deltaY))
148149
return true;
149-
return super.mouseDragged(mouseX, mouseY, button, deltaX, deltaY);
150+
return super.mouseDragged(event, deltaX, deltaY);
150151
}
151152

152153
@Override

‎default-plugin/src/main/java/me/shedaniel/rei/plugin/client/categories/beacon/DefaultBeaconPaymentCategory.java‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@
4141
import net.minecraft.client.Minecraft;
4242
import net.minecraft.client.gui.GuiGraphics;
4343
import net.minecraft.client.gui.components.events.GuiEventListener;
44+
import net.minecraft.client.input.MouseButtonEvent;
4445
import net.minecraft.network.chat.Component;
4546
import net.minecraft.util.Mth;
4647
import net.minecraft.world.level.block.Blocks;
@@ -136,17 +137,17 @@ public Rectangle getBounds() {
136137
}
137138

138139
@Override
139-
public boolean mouseClicked(double mouseX, double mouseY, int button) {
140-
if (scrolling.updateDraggingState(mouseX, mouseY, button))
140+
public boolean mouseClicked(MouseButtonEvent event, boolean doubleClick) {
141+
if (scrolling.updateDraggingState(event.x(), event.y(), event.button()))
141142
return true;
142-
return super.mouseClicked(mouseX, mouseY, button);
143+
return super.mouseClicked(event, doubleClick);
143144
}
144145

145146
@Override
146-
public boolean mouseDragged(double mouseX, double mouseY, int button, double deltaX, double deltaY) {
147-
if (scrolling.mouseDragged(mouseX, mouseY, button, deltaX, deltaY))
147+
public boolean mouseDragged(MouseButtonEvent event, double deltaX, double deltaY) {
148+
if (scrolling.mouseDragged(event.x(), event.y(), event.button(), deltaX, deltaY))
148149
return true;
149-
return super.mouseDragged(mouseX, mouseY, button, deltaX, deltaY);
150+
return super.mouseDragged(event, deltaX, deltaY);
150151
}
151152

152153
@Override

‎default-plugin/src/main/java/me/shedaniel/rei/plugin/client/categories/tag/TagTreeWidget.java‎

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,8 @@
3030
import me.shedaniel.rei.plugin.common.displays.tag.TagNode;
3131
import net.minecraft.client.gui.GuiGraphics;
3232
import net.minecraft.client.gui.components.events.GuiEventListener;
33+
import net.minecraft.client.input.KeyEvent;
34+
import net.minecraft.client.input.MouseButtonEvent;
3335
import net.minecraft.core.Holder;
3436

3537
import java.util.ArrayList;
@@ -104,22 +106,22 @@ public List<? extends GuiEventListener> children() {
104106
}
105107

106108
@Override
107-
public boolean mouseClicked(double mouseX, double mouseY, int button) {
108-
return super.mouseClicked(mouseX, mouseY, button);
109+
public boolean mouseClicked(MouseButtonEvent event, boolean doubleClick) {
110+
return super.mouseClicked(event, doubleClick);
109111
}
110112

111113
@Override
112-
public boolean mouseReleased(double mouseX, double mouseY, int button) {
114+
public boolean mouseReleased(MouseButtonEvent event) {
113115
for (GuiEventListener element : children())
114-
if (element.mouseReleased(mouseX, mouseY, button))
116+
if (element.mouseReleased(event))
115117
return true;
116118
return false;
117119
}
118120

119121
@Override
120-
public boolean keyPressed(int keyCode, int scanCode, int modifiers) {
122+
public boolean keyPressed(KeyEvent event) {
121123
for (GuiEventListener element : children())
122-
if (element.keyPressed(keyCode, scanCode, modifiers))
124+
if (element.keyPressed(event))
123125
return true;
124126
return false;
125127
}

‎default-plugin/src/main/java/me/shedaniel/rei/plugin/client/categories/tag/ValueTagNodeWidget.java‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,8 @@
3232
import me.shedaniel.rei.plugin.common.displays.tag.TagNode;
3333
import net.minecraft.client.gui.GuiGraphics;
3434
import net.minecraft.client.gui.components.events.GuiEventListener;
35+
import net.minecraft.client.input.KeyEvent;
36+
import net.minecraft.client.input.MouseButtonEvent;
3537
import net.minecraft.core.Holder;
3638
import net.minecraft.core.HolderSet;
3739
import org.joml.Matrix3x2f;
@@ -103,17 +105,17 @@ public List<? extends GuiEventListener> children() {
103105
}
104106

105107
@Override
106-
public boolean mouseReleased(double mouseX, double mouseY, int button) {
108+
public boolean mouseReleased(MouseButtonEvent event) {
107109
for (GuiEventListener element : children())
108-
if (element.mouseReleased(mouseX, mouseY, button))
110+
if (element.mouseReleased(event))
109111
return true;
110112
return false;
111113
}
112114

113115
@Override
114-
public boolean keyPressed(int keyCode, int scanCode, int modifiers) {
116+
public boolean keyPressed(KeyEvent event) {
115117
for (GuiEventListener element : children())
116-
if (element.keyPressed(keyCode, scanCode, modifiers))
118+
if (element.keyPressed(event))
117119
return true;
118120
return false;
119121
}

‎default-plugin/src/main/java/me/shedaniel/rei/plugin/client/favorites/GameModeFavoriteEntry.java‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@
4141
import net.minecraft.client.gui.Font;
4242
import net.minecraft.client.gui.GuiGraphics;
4343
import net.minecraft.client.gui.components.events.GuiEventListener;
44+
import net.minecraft.client.input.MouseButtonEvent;
4445
import net.minecraft.client.resources.sounds.SimpleSoundInstance;
4546
import net.minecraft.nbt.CompoundTag;
4647
import net.minecraft.network.chat.Component;
@@ -143,8 +144,8 @@ public int hashCode() {
143144
}
144145

145146
@Override
146-
public boolean doAction(int button) {
147-
if (button == 0) {
147+
public boolean doAction(MouseButtonEvent event) {
148+
if (event.button() == 0) {
148149
GameType mode = gameMode;
149150
if (mode == null) {
150151
mode = GameType.byId(Minecraft.getInstance().gameMode.getPlayerMode().getId() + 1 % 4);
@@ -274,7 +275,7 @@ public void render(GuiGraphics graphics, int mouseX, int mouseY, float delta) {
274275
}
275276

276277
@Override
277-
public boolean mouseClicked(double mouseX, double mouseY, int button) {
278+
public boolean mouseClicked(MouseButtonEvent event, boolean doubleClick) {
278279
Minecraft.getInstance().player.connection.sendCommand(StringUtils.removeStart(ConfigObject.getInstance().getGamemodeCommand().replaceAll("\\{gamemode}", gameMode.name().toLowerCase(Locale.ROOT)), "/"));
279280
minecraft.getSoundManager().play(SimpleSoundInstance.forUI(SoundEvents.UI_BUTTON_CLICK, 1.0F));
280281
closeMenu();

0 commit comments

Comments
 (0)