Fix #1863

Author: shedaniel

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

@@ -275,14 +275,16 @@ public void render(GuiGraphics graphics, int mouseX, int mouseY, float delta) {
 
         @Override
         public boolean mouseClicked(double mouseX, double mouseY, int button) {
+            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();
+            return true;
+        }
+        
+        @Override
+        public boolean containsMouse(double mouseX, double mouseY) {
             boolean disabled = this.minecraft.gameMode.getPlayerMode() == gameMode;
-            if (!disabled && rendering && mouseX >= x && mouseX <= x + width && mouseY >= y && mouseY <= y + 12) {
-                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();
-                return true;
-            }
-            return super.mouseClicked(mouseX, mouseY, button);
+            return rendering && mouseX >= x && mouseX <= x + width && mouseY >= y && mouseY <= y + 12 && !disabled;
         }
     }
 }

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

@@ -300,13 +300,15 @@ public void render(GuiGraphics graphics, int mouseX, int mouseY, float delta) {
 
         @Override
         public boolean mouseClicked(double mouseX, double mouseY, int button) {
-            if (rendering && mouseX >= x && mouseX <= x + width && mouseY >= y && mouseY <= y + 12) {
-                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();
-                return true;
-            }
-            return super.mouseClicked(mouseX, mouseY, button);
+            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();
+            return true;
+        }
+        
+        @Override
+        public boolean containsMouse(double mouseX, double mouseY) {
+            return rendering && mouseX >= x && mouseX <= x + width && mouseY >= y && mouseY <= y + 12;
         }
     }
 }

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

@@ -309,13 +309,15 @@ public void render(GuiGraphics graphics, int mouseX, int mouseY, float delta) {
 
         @Override
         public boolean mouseClicked(double mouseX, double mouseY, int button) {
-            if (rendering && mouseX >= x && mouseX <= x + width && mouseY >= y && mouseY <= y + 12) {
-                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();
-                return true;
-            }
-            return super.mouseClicked(mouseX, mouseY, button);
+            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();
+            return true;
+        }
+        
+        @Override
+        public boolean containsMouse(double mouseX, double mouseY) {
+            return rendering && mouseX >= x && mouseX <= x + width && mouseY >= y && mouseY <= y + 12;
         }
     }
 }

runtime/src/main/java/me/shedaniel/rei/impl/client/gui/widget/EntryWidget.java

@@ -561,8 +561,11 @@ public void tooltipProcessor(UnaryOperator<Tooltip> operator) {
 
     @Override
     public boolean mouseClicked(double mouseX, double mouseY, int button) {
-        if (containsMouse(mouseX, mouseY))
+        if (containsMouse(mouseX, mouseY)) {
             this.wasClicked = true;
+            return true;
+        }
+        
         return super.mouseClicked(mouseX, mouseY, button);
     }
 

runtime/src/main/java/me/shedaniel/rei/impl/client/gui/widget/favorites/history/DisplayEntry.java

@@ -234,9 +234,11 @@ public boolean mouseClicked(double mouseX, double mouseY, int button) {
                     return true;
                 }
             }
+            
+            return true;
         }
 
-        return super.mouseClicked(mouseX, mouseY, button);
+        return false;
     }
 
     @Override

runtime/src/main/java/me/shedaniel/rei/impl/client/gui/widget/favorites/panel/FadingFavoritesPanelButton.java

@@ -105,6 +105,7 @@ public List<? extends GuiEventListener> children() {
     public boolean mouseClicked(double mouseX, double mouseY, int button) {
         if (isVisible() && containsMouse(mouseX, mouseY)) {
             this.wasClicked = true;
+            return true;
         }
         return false;
     }