4.0.13

Signed-off-by: shedaniel <daniel@shedaniel.me>

6 files changed, 25 insertions, 18 deletions

diff --git a/src/main/java/me/shedaniel/rei/impl/widgets/BurningFireWidget.java b/src/main/java/me/shedaniel/rei/impl/widgets/BurningFireWidget.java
index 7933cffb8..da24f0d3e 100644
--- a/src/main/java/me/shedaniel/rei/impl/widgets/BurningFireWidget.java
+++ b/src/main/java/me/shedaniel/rei/impl/widgets/BurningFireWidget.java
@@ -57,7 +57,8 @@ public class BurningFireWidget extends BurningFire {
     }
     
     @Override
-    public @NotNull Rectangle getBounds() {
+    @NotNull
+    public Rectangle getBounds() {
         return bounds;
     }
     
diff --git a/src/main/java/me/shedaniel/rei/impl/widgets/DrawableWidget.java b/src/main/java/me/shedaniel/rei/impl/widgets/DrawableWidget.java
index daac4cb34..104ec00a8 100644
--- a/src/main/java/me/shedaniel/rei/impl/widgets/DrawableWidget.java
+++ b/src/main/java/me/shedaniel/rei/impl/widgets/DrawableWidget.java
@@ -26,14 +26,16 @@ package me.shedaniel.rei.impl.widgets;
 import me.shedaniel.rei.api.DrawableConsumer;
 import me.shedaniel.rei.gui.widget.Widget;
 import net.minecraft.client.gui.Element;
+import org.jetbrains.annotations.NotNull;
 
 import java.util.Collections;
 import java.util.List;
 
 public final class DrawableWidget extends Widget {
+    @NotNull
     private DrawableConsumer drawable;
     
-    public DrawableWidget(DrawableConsumer drawable) {
+    public DrawableWidget(@NotNull DrawableConsumer drawable) {
         this.drawable = drawable;
     }
     
diff --git a/src/main/java/me/shedaniel/rei/impl/widgets/FillRectangleDrawableConsumer.java b/src/main/java/me/shedaniel/rei/impl/widgets/FillRectangleDrawableConsumer.java
index 012620340..a3384d246 100644
--- a/src/main/java/me/shedaniel/rei/impl/widgets/FillRectangleDrawableConsumer.java
+++ b/src/main/java/me/shedaniel/rei/impl/widgets/FillRectangleDrawableConsumer.java
@@ -30,18 +30,20 @@ import net.minecraft.client.gui.DrawableHelper;
 import net.minecraft.client.render.BufferBuilder;
 import net.minecraft.client.render.Tessellator;
 import net.minecraft.client.render.VertexFormats;
+import org.jetbrains.annotations.NotNull;
 
 public class FillRectangleDrawableConsumer implements DrawableConsumer {
+    @NotNull
     private Rectangle rectangle;
     private int color;
     
-    public FillRectangleDrawableConsumer(Rectangle rectangle, int color) {
+    public FillRectangleDrawableConsumer(@NotNull Rectangle rectangle, int color) {
         this.rectangle = rectangle;
         this.color = color;
     }
     
     @Override
-    public void render(DrawableHelper helper, int mouseX, int mouseY, float delta) {
+    public void render(@NotNull DrawableHelper helper, int mouseX, int mouseY, float delta) {
         float a = (color >> 24 & 255) / 255.0F;
         float r = (color >> 16 & 255) / 255.0F;
         float g = (color >> 8 & 255) / 255.0F;
diff --git a/src/main/java/me/shedaniel/rei/impl/widgets/LabelWidget.java b/src/main/java/me/shedaniel/rei/impl/widgets/LabelWidget.java
index 8e97cf196..e6f19aee1 100644
--- a/src/main/java/me/shedaniel/rei/impl/widgets/LabelWidget.java
+++ b/src/main/java/me/shedaniel/rei/impl/widgets/LabelWidget.java
@@ -27,8 +27,8 @@ import me.shedaniel.math.Point;
 import me.shedaniel.math.api.Rectangle;
 import me.shedaniel.rei.api.REIHelper;
 import me.shedaniel.rei.api.widgets.Label;
+import me.shedaniel.rei.api.widgets.Tooltip;
 import me.shedaniel.rei.api.widgets.Widgets;
-import me.shedaniel.rei.gui.widget.QueuedTooltip;
 import net.minecraft.client.gui.Element;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
@@ -48,14 +48,14 @@ public final class LabelWidget extends Label {
     private boolean focusable = true;
     private int color = REIHelper.getInstance().isDarkThemeEnabled() ? 0xFFBBBBBB : -1;
     private int hoveredColor = REIHelper.getInstance().isDarkThemeEnabled() ? -1 : 0xFF66FFCC;
-    private Point point;
+    @NotNull private Point point;
     @Nullable private Function<Label, @Nullable String> tooltip;
     @Nullable private Consumer<Label> onClick;
     @Nullable private Consumer<Label> onRender;
     @NotNull private String text;
     
-    public LabelWidget(Point point, @NotNull String text) {
-        this.point = point;
+    public LabelWidget(@NotNull Point point, @NotNull String text) {
+        Objects.requireNonNull(this.point = point);
         Objects.requireNonNull(this.text = text);
     }
     
@@ -219,9 +219,9 @@ public final class LabelWidget extends Label {
             String tooltip = getTooltip();
             if (tooltip != null) {
                 if (!focused && containsMouse(mouseX, mouseY))
-                    QueuedTooltip.create(tooltip.split("\n")).queue();
+                    Tooltip.create(tooltip.split("\n")).queue();
                 else if (focused)
-                    QueuedTooltip.create(point, tooltip.split("\n")).queue();
+                    Tooltip.create(point, tooltip.split("\n")).queue();
             }
         }
     }
diff --git a/src/main/java/me/shedaniel/rei/impl/widgets/PanelWidget.java b/src/main/java/me/shedaniel/rei/impl/widgets/PanelWidget.java
index ade913478..5cf1ad13a 100644
--- a/src/main/java/me/shedaniel/rei/impl/widgets/PanelWidget.java
+++ b/src/main/java/me/shedaniel/rei/impl/widgets/PanelWidget.java
@@ -44,7 +44,7 @@ public final class PanelWidget extends Panel {
     private static final Identifier CHEST_GUI_TEXTURE_DARK = new Identifier("roughlyenoughitems", "textures/gui/recipecontainer_dark.png");
     
     private static final PanelWidget TEMP = new PanelWidget(new Rectangle());
-    private Rectangle bounds;
+    private me.shedaniel.math.api.Rectangle bounds;
     private int color = -1;
     private int innerColor = REIHelper.getInstance().isDarkThemeEnabled() ? -13750738 : -3750202;
     private int xTextureOffset = 0;
@@ -56,12 +56,12 @@ public final class PanelWidget extends Panel {
         return ConfigObject.getInstance().getRecipeScreenType() != RecipeScreenType.VILLAGER;
     }
     
-    public PanelWidget(Rectangle bounds) {
-        this.bounds = bounds;
+    public PanelWidget(@NotNull Rectangle bounds) {
+        this.bounds = new me.shedaniel.math.api.Rectangle(bounds);
     }
     
-    public static void render(Rectangle bounds, int color) {
-        TEMP.bounds = bounds;
+    public static void render(@NotNull Rectangle bounds, int color) {
+        TEMP.bounds.setBounds(bounds);
         TEMP.color = color;
         TEMP.render(0, 0, 0);
     }
@@ -118,7 +118,7 @@ public final class PanelWidget extends Panel {
     
     @Override
     public me.shedaniel.math.api.Rectangle getBounds() {
-        return new me.shedaniel.math.api.Rectangle(bounds);
+        return bounds;
     }
     
     @Override
diff --git a/src/main/java/me/shedaniel/rei/impl/widgets/TexturedDrawableConsumer.java b/src/main/java/me/shedaniel/rei/impl/widgets/TexturedDrawableConsumer.java
index 9ceddcfee..7578a9d0b 100644
--- a/src/main/java/me/shedaniel/rei/impl/widgets/TexturedDrawableConsumer.java
+++ b/src/main/java/me/shedaniel/rei/impl/widgets/TexturedDrawableConsumer.java
@@ -30,15 +30,17 @@ import net.minecraft.client.render.BufferBuilder;
 import net.minecraft.client.render.Tessellator;
 import net.minecraft.client.render.VertexFormats;
 import net.minecraft.util.Identifier;
+import org.jetbrains.annotations.NotNull;
 import org.lwjgl.opengl.GL11;
 
 public class TexturedDrawableConsumer implements DrawableConsumer {
     
+    @NotNull
     private Identifier identifier;
     private int x, y, width, height, uWidth, vHeight, textureWidth, textureHeight;
     private float u, v;
     
-    public TexturedDrawableConsumer(Identifier identifier, int x, int y, int width, int height, float u, float v, int uWidth, int vHeight, int textureWidth, int textureHeight) {
+    public TexturedDrawableConsumer(@NotNull Identifier identifier, int x, int y, int width, int height, float u, float v, int uWidth, int vHeight, int textureWidth, int textureHeight) {
         this.identifier = identifier;
         this.x = x;
         this.y = y;
@@ -53,7 +55,7 @@ public class TexturedDrawableConsumer implements DrawableConsumer {
     }
     
     @Override
-    public void render(DrawableHelper helper, int mouseX, int mouseY, float delta) {
+    public void render(@NotNull DrawableHelper helper, int mouseX, int mouseY, float delta) {
         MinecraftClient.getInstance().getTextureManager().bindTexture(identifier);
         innerBlit(x, x + width, y, y + height, helper.getZOffset(), uWidth, vHeight, u, v, textureWidth, textureHeight);
     }