Refactor Point -> TooltipContext

4 files changed, 19 insertions, 19 deletions

diff --git a/default-plugin/src/main/java/me/shedaniel/rei/plugin/client/categories/DefaultFuelCategory.java b/default-plugin/src/main/java/me/shedaniel/rei/plugin/client/categories/DefaultFuelCategory.java
index 21355338b..9ed1f944e 100644
--- a/default-plugin/src/main/java/me/shedaniel/rei/plugin/client/categories/DefaultFuelCategory.java
+++ b/default-plugin/src/main/java/me/shedaniel/rei/plugin/client/categories/DefaultFuelCategory.java
@@ -29,10 +29,7 @@ import me.shedaniel.math.Point;
 import me.shedaniel.math.Rectangle;
 import me.shedaniel.rei.api.client.gui.DisplayRenderer;
 import me.shedaniel.rei.api.client.gui.Renderer;
-import me.shedaniel.rei.api.client.gui.widgets.Slot;
-import me.shedaniel.rei.api.client.gui.widgets.Tooltip;
-import me.shedaniel.rei.api.client.gui.widgets.Widget;
-import me.shedaniel.rei.api.client.gui.widgets.Widgets;
+import me.shedaniel.rei.api.client.gui.widgets.*;
 import me.shedaniel.rei.api.client.registry.display.DisplayCategory;
 import me.shedaniel.rei.api.common.category.CategoryIdentifier;
 import me.shedaniel.rei.api.common.util.EntryStacks;
@@ -99,9 +96,9 @@ public class DefaultFuelCategory implements DisplayCategory<DefaultFuelDisplay>
             
             @Nullable
             @Override
-            public Tooltip getTooltip(Point point) {
-                if (slot.containsMouse(point))
-                    return slot.getCurrentTooltip(point);
+            public Tooltip getTooltip(TooltipContext context) {
+                if (slot.containsMouse(context.getPoint()))
+                    return slot.getCurrentTooltip(context);
                 return null;
             }
             
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 b3cc253b2..ed3614f1d 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
@@ -37,6 +37,7 @@ import me.shedaniel.rei.api.client.favorites.FavoriteMenuEntry;
 import me.shedaniel.rei.api.client.gui.AbstractRenderer;
 import me.shedaniel.rei.api.client.gui.Renderer;
 import me.shedaniel.rei.api.client.gui.widgets.Tooltip;
+import me.shedaniel.rei.api.client.gui.widgets.TooltipContext;
 import me.shedaniel.rei.api.common.util.CollectionUtils;
 import net.minecraft.ChatFormatting;
 import net.minecraft.client.Minecraft;
@@ -78,8 +79,8 @@ public class GameModeFavoriteEntry extends FavoriteEntry {
             return new CompoundFavoriteRenderer(showcase, renderers, () -> Minecraft.getInstance().gameMode.getPlayerMode().getId()) {
                 @Override
                 @Nullable
-                public Tooltip getTooltip(Point mouse) {
-                    return Tooltip.create(mouse, Component.translatable("text.rei.gamemode_button.tooltip.dropdown"));
+                public Tooltip getTooltip(TooltipContext context) {
+                    return Tooltip.create(context.getPoint(), Component.translatable("text.rei.gamemode_button.tooltip.dropdown"));
                 }
                 
                 @Override
@@ -121,8 +122,8 @@ public class GameModeFavoriteEntry extends FavoriteEntry {
             
             @Override
             @Nullable
-            public Tooltip getTooltip(Point mouse) {
-                return Tooltip.create(mouse, Component.translatable("text.rei.gamemode_button.tooltip.entry", type.getLongDisplayName().getString()));
+            public Tooltip getTooltip(TooltipContext context) {
+                return Tooltip.create(context.getPoint(), Component.translatable("text.rei.gamemode_button.tooltip.entry", type.getLongDisplayName().getString()));
             }
             
             @Override
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 f8cabd35f..d03e88797 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
@@ -38,6 +38,7 @@ import me.shedaniel.rei.api.client.favorites.FavoriteMenuEntry;
 import me.shedaniel.rei.api.client.gui.AbstractRenderer;
 import me.shedaniel.rei.api.client.gui.Renderer;
 import me.shedaniel.rei.api.client.gui.widgets.Tooltip;
+import me.shedaniel.rei.api.client.gui.widgets.TooltipContext;
 import me.shedaniel.rei.api.common.util.CollectionUtils;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.components.events.GuiEventListener;
@@ -97,8 +98,8 @@ public class TimeFavoriteEntry extends FavoriteEntry {
             return new CompoundFavoriteRenderer(showcase, renderers, () -> nextTime().ordinal()) {
                 @Override
                 @Nullable
-                public Tooltip getTooltip(Point mouse) {
-                    return Tooltip.create(mouse, Component.translatable("text.rei.time_button.tooltip.dropdown"));
+                public Tooltip getTooltip(TooltipContext context) {
+                    return Tooltip.create(context.getPoint(), Component.translatable("text.rei.time_button.tooltip.dropdown"));
                 }
                 
                 @Override
@@ -155,8 +156,8 @@ public class TimeFavoriteEntry extends FavoriteEntry {
             
             @Override
             @Nullable
-            public Tooltip getTooltip(Point mouse) {
-                return Tooltip.create(mouse, Component.translatable("text.rei.time_button.tooltip.entry", Component.translatable("text.rei.time_button.name." + time.name().toLowerCase(Locale.ROOT))));
+            public Tooltip getTooltip(TooltipContext context) {
+                return Tooltip.create(context.getPoint(), Component.translatable("text.rei.time_button.tooltip.entry", Component.translatable("text.rei.time_button.name." + time.name().toLowerCase(Locale.ROOT))));
             }
             
             @Override
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 fd46efba7..fceb2a973 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
@@ -38,6 +38,7 @@ import me.shedaniel.rei.api.client.favorites.FavoriteMenuEntry;
 import me.shedaniel.rei.api.client.gui.AbstractRenderer;
 import me.shedaniel.rei.api.client.gui.Renderer;
 import me.shedaniel.rei.api.client.gui.widgets.Tooltip;
+import me.shedaniel.rei.api.client.gui.widgets.TooltipContext;
 import me.shedaniel.rei.api.common.util.CollectionUtils;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.components.events.GuiEventListener;
@@ -80,8 +81,8 @@ public class WeatherFavoriteEntry extends FavoriteEntry {
             return new CompoundFavoriteRenderer(showcase, renderers, () -> getCurrentWeather().getId()) {
                 @Override
                 @Nullable
-                public Tooltip getTooltip(Point mouse) {
-                    return Tooltip.create(mouse, Component.translatable("text.rei.weather_button.tooltip.dropdown"));
+                public Tooltip getTooltip(TooltipContext context) {
+                    return Tooltip.create(context.getPoint(), Component.translatable("text.rei.weather_button.tooltip.dropdown"));
                 }
                 
                 @Override
@@ -131,8 +132,8 @@ public class WeatherFavoriteEntry extends FavoriteEntry {
             
             @Override
             @Nullable
-            public Tooltip getTooltip(Point mouse) {
-                return Tooltip.create(mouse, Component.translatable("text.rei.weather_button.tooltip.entry", Component.translatable(weather.getTranslateKey())));
+            public Tooltip getTooltip(TooltipContext context) {
+                return Tooltip.create(context.getPoint(), Component.translatable("text.rei.weather_button.tooltip.entry", Component.translatable(weather.getTranslateKey())));
             }
             
             @Override