From b65de8ed7fe045df451130e3c790613c4f002e2c Mon Sep 17 00:00:00 2001 From: Unknown Date: Sun, 18 Aug 2019 01:50:55 +0800 Subject: Bye Bye java.awt --- .../me/shedaniel/rei/api/BaseBoundsHandler.java | 2 +- .../me/shedaniel/rei/api/ButtonAreaSupplier.java | 2 +- .../java/me/shedaniel/rei/api/DisplayHelper.java | 2 +- .../java/me/shedaniel/rei/api/RecipeCategory.java | 2 +- .../java/me/shedaniel/rei/api/RecipeHelper.java | 2 +- .../shedaniel/rei/api/TransferRecipeCategory.java | 2 +- .../shedaniel/rei/gui/ContainerScreenOverlay.java | 8 ++++---- .../shedaniel/rei/gui/PreRecipeViewingScreen.java | 2 +- .../me/shedaniel/rei/gui/RecipeViewingScreen.java | 23 +++++++++++----------- .../rei/gui/VillagerRecipeViewingScreen.java | 11 ++++------- .../rei/gui/widget/AutoCraftingButtonWidget.java | 3 ++- .../me/shedaniel/rei/gui/widget/ButtonWidget.java | 3 ++- .../rei/gui/widget/CategoryBaseWidget.java | 2 +- .../rei/gui/widget/ClickableLabelWidget.java | 2 +- .../gui/widget/CraftableToggleButtonWidget.java | 2 +- .../rei/gui/widget/DetailedButtonWidget.java | 3 +-- .../shedaniel/rei/gui/widget/DraggableWidget.java | 8 ++++---- .../shedaniel/rei/gui/widget/EntryListWidget.java | 15 +++++++------- .../me/shedaniel/rei/gui/widget/LabelWidget.java | 2 +- .../me/shedaniel/rei/gui/widget/QueuedTooltip.java | 8 ++++---- .../shedaniel/rei/gui/widget/RecipeBaseWidget.java | 2 +- .../rei/gui/widget/RecipeChoosePageWidget.java | 5 +++-- .../shedaniel/rei/gui/widget/SlotBaseWidget.java | 3 +-- .../me/shedaniel/rei/gui/widget/SlotWidget.java | 6 +++--- .../me/shedaniel/rei/gui/widget/TabWidget.java | 4 ++-- .../shedaniel/rei/gui/widget/TextFieldWidget.java | 2 +- .../shedaniel/rei/gui/widget/WidgetWithBounds.java | 5 +++-- .../shedaniel/rei/impl/BaseBoundsHandlerImpl.java | 2 +- .../me/shedaniel/rei/impl/DisplayHelperImpl.java | 2 +- .../me/shedaniel/rei/impl/RecipeHelperImpl.java | 7 +++---- .../me/shedaniel/rei/plugin/DefaultPlugin.java | 5 ++--- .../plugin/DefaultPotionEffectExclusionZones.java | 2 +- .../plugin/DefaultRecipeBookExclusionZones.java | 2 +- .../plugin/blasting/DefaultBlastingCategory.java | 7 ++++--- .../rei/plugin/brewing/DefaultBrewingCategory.java | 5 +++-- .../plugin/campfire/DefaultCampfireCategory.java | 5 +++-- .../composting/DefaultCompostingCategory.java | 7 ++++--- .../plugin/crafting/DefaultCraftingCategory.java | 7 ++++--- .../plugin/smelting/DefaultSmeltingCategory.java | 7 ++++--- .../rei/plugin/smoking/DefaultSmokingCategory.java | 7 ++++--- .../stonecutting/DefaultStoneCuttingCategory.java | 5 +++-- .../plugin/stripping/DefaultStrippingCategory.java | 5 +++-- .../java/me/shedaniel/rei/server/RecipeFinder.java | 2 +- 43 files changed, 106 insertions(+), 102 deletions(-) (limited to 'src/main') diff --git a/src/main/java/me/shedaniel/rei/api/BaseBoundsHandler.java b/src/main/java/me/shedaniel/rei/api/BaseBoundsHandler.java index 3f2a3cd51..9bc6d1430 100644 --- a/src/main/java/me/shedaniel/rei/api/BaseBoundsHandler.java +++ b/src/main/java/me/shedaniel/rei/api/BaseBoundsHandler.java @@ -5,9 +5,9 @@ package me.shedaniel.rei.api; +import me.shedaniel.math.api.Rectangle; import net.minecraft.client.gui.screen.Screen; -import java.awt.*; import java.util.List; import java.util.function.Function; diff --git a/src/main/java/me/shedaniel/rei/api/ButtonAreaSupplier.java b/src/main/java/me/shedaniel/rei/api/ButtonAreaSupplier.java index 01cdff416..8ec5f3527 100644 --- a/src/main/java/me/shedaniel/rei/api/ButtonAreaSupplier.java +++ b/src/main/java/me/shedaniel/rei/api/ButtonAreaSupplier.java @@ -5,7 +5,7 @@ package me.shedaniel.rei.api; -import java.awt.*; +import me.shedaniel.math.api.Rectangle; public interface ButtonAreaSupplier { diff --git a/src/main/java/me/shedaniel/rei/api/DisplayHelper.java b/src/main/java/me/shedaniel/rei/api/DisplayHelper.java index 2d8fc5991..33cc985ba 100644 --- a/src/main/java/me/shedaniel/rei/api/DisplayHelper.java +++ b/src/main/java/me/shedaniel/rei/api/DisplayHelper.java @@ -5,10 +5,10 @@ package me.shedaniel.rei.api; +import me.shedaniel.math.api.Rectangle; import me.shedaniel.rei.RoughlyEnoughItemsCore; import net.minecraft.util.ActionResult; -import java.awt.*; import java.util.List; import static net.minecraft.util.ActionResult.PASS; diff --git a/src/main/java/me/shedaniel/rei/api/RecipeCategory.java b/src/main/java/me/shedaniel/rei/api/RecipeCategory.java index 2c27b632d..aadd126e1 100644 --- a/src/main/java/me/shedaniel/rei/api/RecipeCategory.java +++ b/src/main/java/me/shedaniel/rei/api/RecipeCategory.java @@ -5,6 +5,7 @@ package me.shedaniel.rei.api; +import me.shedaniel.math.api.Rectangle; import me.shedaniel.rei.gui.RecipeViewingScreen; import me.shedaniel.rei.gui.renderers.RecipeRenderer; import me.shedaniel.rei.gui.widget.CategoryBaseWidget; @@ -14,7 +15,6 @@ import me.shedaniel.rei.impl.ScreenHelper; import net.minecraft.client.gui.DrawableHelper; import net.minecraft.util.Identifier; -import java.awt.*; import java.util.Collections; import java.util.List; import java.util.function.Supplier; diff --git a/src/main/java/me/shedaniel/rei/api/RecipeHelper.java b/src/main/java/me/shedaniel/rei/api/RecipeHelper.java index b0a02f1ba..5d76eb70e 100644 --- a/src/main/java/me/shedaniel/rei/api/RecipeHelper.java +++ b/src/main/java/me/shedaniel/rei/api/RecipeHelper.java @@ -5,6 +5,7 @@ package me.shedaniel.rei.api; +import me.shedaniel.math.api.Rectangle; import me.shedaniel.rei.RoughlyEnoughItemsCore; import net.minecraft.client.gui.screen.ingame.AbstractContainerScreen; import net.minecraft.item.ItemStack; @@ -12,7 +13,6 @@ import net.minecraft.recipe.Recipe; import net.minecraft.recipe.RecipeManager; import net.minecraft.util.Identifier; -import java.awt.*; import java.util.List; import java.util.Map; import java.util.Optional; diff --git a/src/main/java/me/shedaniel/rei/api/TransferRecipeCategory.java b/src/main/java/me/shedaniel/rei/api/TransferRecipeCategory.java index 71ecc877f..093a9d365 100644 --- a/src/main/java/me/shedaniel/rei/api/TransferRecipeCategory.java +++ b/src/main/java/me/shedaniel/rei/api/TransferRecipeCategory.java @@ -6,9 +6,9 @@ package me.shedaniel.rei.api; import it.unimi.dsi.fastutil.ints.IntList; +import me.shedaniel.math.api.Rectangle; import me.shedaniel.rei.gui.widget.Widget; -import java.awt.*; import java.util.List; public interface TransferRecipeCategory extends RecipeCategory { diff --git a/src/main/java/me/shedaniel/rei/gui/ContainerScreenOverlay.java b/src/main/java/me/shedaniel/rei/gui/ContainerScreenOverlay.java index 2401083dd..4d7b513c5 100644 --- a/src/main/java/me/shedaniel/rei/gui/ContainerScreenOverlay.java +++ b/src/main/java/me/shedaniel/rei/gui/ContainerScreenOverlay.java @@ -7,7 +7,9 @@ package me.shedaniel.rei.gui; import com.google.common.collect.Lists; import com.mojang.blaze3d.platform.GlStateManager; -import me.shedaniel.cloth.api.ClientUtils; +import me.shedaniel.math.api.Point; +import me.shedaniel.math.api.Rectangle; +import me.shedaniel.math.impl.PointHelper; import me.shedaniel.rei.RoughlyEnoughItemsCore; import me.shedaniel.rei.api.ClientHelper; import me.shedaniel.rei.api.DisplayHelper; @@ -37,8 +39,6 @@ import net.minecraft.util.Identifier; import net.minecraft.util.math.MathHelper; import net.minecraft.world.GameMode; -import java.awt.*; -import java.util.List; import java.util.*; import java.util.stream.Collectors; @@ -478,7 +478,7 @@ public class ContainerScreenOverlay extends Widget { public boolean mouseScrolled(double i, double j, double amount) { if (!ScreenHelper.isOverlayVisible()) return false; - if (isInside(ClientUtils.getMouseLocation())) { + if (isInside(PointHelper.fromMouse())) { if (!RoughlyEnoughItemsCore.getConfigManager().getConfig().isEntryListWidgetScrolled()) { if (amount > 0 && buttonLeft.enabled) buttonLeft.onPressed(); diff --git a/src/main/java/me/shedaniel/rei/gui/PreRecipeViewingScreen.java b/src/main/java/me/shedaniel/rei/gui/PreRecipeViewingScreen.java index 6ffbaebd2..435920486 100644 --- a/src/main/java/me/shedaniel/rei/gui/PreRecipeViewingScreen.java +++ b/src/main/java/me/shedaniel/rei/gui/PreRecipeViewingScreen.java @@ -6,6 +6,7 @@ package me.shedaniel.rei.gui; import com.google.common.collect.Lists; +import me.shedaniel.math.api.Rectangle; import me.shedaniel.rei.RoughlyEnoughItemsCore; import me.shedaniel.rei.api.ClientHelper; import me.shedaniel.rei.api.RecipeCategory; @@ -27,7 +28,6 @@ import net.minecraft.text.TranslatableText; import net.minecraft.util.Formatting; import net.minecraft.util.Identifier; -import java.awt.*; import java.io.IOException; import java.util.Collections; import java.util.List; diff --git a/src/main/java/me/shedaniel/rei/gui/RecipeViewingScreen.java b/src/main/java/me/shedaniel/rei/gui/RecipeViewingScreen.java index 51162cf08..4cd8aa9c6 100644 --- a/src/main/java/me/shedaniel/rei/gui/RecipeViewingScreen.java +++ b/src/main/java/me/shedaniel/rei/gui/RecipeViewingScreen.java @@ -7,7 +7,8 @@ package me.shedaniel.rei.gui; import com.google.common.collect.Lists; import com.mojang.blaze3d.platform.GlStateManager; -import me.shedaniel.cloth.api.ClientUtils; +import me.shedaniel.math.api.Rectangle; +import me.shedaniel.math.impl.PointHelper; import me.shedaniel.rei.RoughlyEnoughItemsCore; import me.shedaniel.rei.api.*; import me.shedaniel.rei.gui.widget.*; @@ -27,8 +28,6 @@ import net.minecraft.util.Formatting; import net.minecraft.util.Identifier; import net.minecraft.util.math.MathHelper; -import java.awt.*; -import java.util.List; import java.util.*; import java.util.function.Supplier; @@ -143,7 +142,7 @@ public class RecipeViewingScreen extends Screen { } }); w.enabled = w2.enabled = categories.size() > TABS_PER_PAGE; - widgets.add(categoryBack = new ButtonWidget((int) bounds.getX() + 5, (int) bounds.getY() + 5, 12, 12, new TranslatableText("text.rei.left_arrow")) { + widgets.add(categoryBack = new ButtonWidget(bounds.getX() + 5, bounds.getY() + 5, 12, 12, new TranslatableText("text.rei.left_arrow")) { @Override public void onPressed() { int currentCategoryIndex = categories.indexOf(selectedCategory); @@ -161,7 +160,7 @@ public class RecipeViewingScreen extends Screen { return Optional.ofNullable(I18n.translate("text.rei.previous_category")); } }); - widgets.add(new ClickableLabelWidget((int) bounds.getCenterX(), (int) bounds.getY() + 7, "") { + widgets.add(new ClickableLabelWidget(bounds.getCenterX(), bounds.getY() + 7, "") { @Override public void render(int mouseX, int mouseY, float delta) { this.text = selectedCategory.getCategoryName(); @@ -179,7 +178,7 @@ public class RecipeViewingScreen extends Screen { ClientHelper.getInstance().executeViewAllRecipesKeyBind(); } }); - widgets.add(categoryNext = new ButtonWidget((int) bounds.getMaxX() - 17, (int) bounds.getY() + 5, 12, 12, new TranslatableText("text.rei.right_arrow")) { + widgets.add(categoryNext = new ButtonWidget(bounds.getMaxX() - 17, bounds.getY() + 5, 12, 12, new TranslatableText("text.rei.right_arrow")) { @Override public void onPressed() { int currentCategoryIndex = categories.indexOf(selectedCategory); @@ -200,7 +199,7 @@ public class RecipeViewingScreen extends Screen { categoryBack.enabled = categories.size() > 1; categoryNext.enabled = categories.size() > 1; - widgets.add(recipeBack = new ButtonWidget((int) bounds.getX() + 5, (int) bounds.getY() + 21, 12, 12, new TranslatableText("text.rei.left_arrow")) { + widgets.add(recipeBack = new ButtonWidget(bounds.getX() + 5, bounds.getY() + 21, 12, 12, new TranslatableText("text.rei.left_arrow")) { @Override public void onPressed() { page--; @@ -214,7 +213,7 @@ public class RecipeViewingScreen extends Screen { return Optional.ofNullable(I18n.translate("text.rei.previous_page")); } }); - widgets.add(new ClickableLabelWidget((int) bounds.getCenterX(), (int) bounds.getY() + 23, "", categoriesMap.get(selectedCategory).size() > getRecipesPerPageByHeight()) { + widgets.add(new ClickableLabelWidget(bounds.getCenterX(), bounds.getY() + 23, "", categoriesMap.get(selectedCategory).size() > getRecipesPerPageByHeight()) { @Override public void render(int mouseX, int mouseY, float delta) { this.text = String.format("%d/%d", page + 1, getTotalPages(selectedCategory)); @@ -233,7 +232,7 @@ public class RecipeViewingScreen extends Screen { RecipeViewingScreen.this.init(); } }); - widgets.add(recipeNext = new ButtonWidget((int) bounds.getMaxX() - 17, (int) bounds.getY() + 21, 12, 12, new TranslatableText("text.rei.right_arrow")) { + widgets.add(recipeNext = new ButtonWidget(bounds.getMaxX() - 17, bounds.getY() + 21, 12, 12, new TranslatableText("text.rei.right_arrow")) { @Override public void onPressed() { page++; @@ -277,7 +276,7 @@ public class RecipeViewingScreen extends Screen { int finalI = i; final Supplier displaySupplier = () -> currentDisplayed.get(finalI); int displayWidth = selectedCategory.getDisplayWidth(displaySupplier.get()); - final Rectangle displayBounds = new Rectangle((int) getBounds().getCenterX() - displayWidth / 2, getBounds().y + 40 + recipeHeight * i + 7 * i, displayWidth, recipeHeight); + final Rectangle displayBounds = new Rectangle(getBounds().getCenterX() - displayWidth / 2, getBounds().y + 40 + recipeHeight * i + 7 * i, displayWidth, recipeHeight); List setupDisplay = selectedCategory.setupDisplay(displaySupplier, displayBounds); this.widgets.addAll(setupDisplay); if (supplier.isPresent() && supplier.get().get(displayBounds) != null) @@ -439,13 +438,13 @@ public class RecipeViewingScreen extends Screen { for (Element listener : children()) if (listener.mouseScrolled(i, j, amount)) return true; - if (getBounds().contains(ClientUtils.getMouseLocation())) { + if (getBounds().contains(PointHelper.fromMouse())) { if (amount > 0 && recipeBack.enabled) recipeBack.onPressed(); else if (amount < 0 && recipeNext.enabled) recipeNext.onPressed(); } - if ((new Rectangle(bounds.x, bounds.y - 28, bounds.width, 28)).contains(ClientUtils.getMouseLocation())) { + if ((new Rectangle(bounds.x, bounds.y - 28, bounds.width, 28)).contains(PointHelper.fromMouse())) { if (amount > 0 && categoryBack.enabled) categoryBack.onPressed(); else if (amount < 0 && categoryNext.enabled) diff --git a/src/main/java/me/shedaniel/rei/gui/VillagerRecipeViewingScreen.java b/src/main/java/me/shedaniel/rei/gui/VillagerRecipeViewingScreen.java index 40bf80d91..8face20de 100644 --- a/src/main/java/me/shedaniel/rei/gui/VillagerRecipeViewingScreen.java +++ b/src/main/java/me/shedaniel/rei/gui/VillagerRecipeViewingScreen.java @@ -9,7 +9,9 @@ import com.google.common.collect.Lists; import com.google.common.collect.Maps; import com.mojang.blaze3d.platform.GlStateManager; import com.zeitheron.hammercore.client.utils.Scissors; -import me.shedaniel.cloth.api.ClientUtils; +import me.shedaniel.math.api.Point; +import me.shedaniel.math.api.Rectangle; +import me.shedaniel.math.impl.PointHelper; import me.shedaniel.rei.RoughlyEnoughItemsCore; import me.shedaniel.rei.api.*; import me.shedaniel.rei.gui.renderers.RecipeRenderer; @@ -31,7 +33,6 @@ import net.minecraft.text.TranslatableText; import net.minecraft.util.Formatting; import net.minecraft.util.math.MathHelper; -import java.awt.*; import java.util.Collections; import java.util.List; import java.util.Map; @@ -276,7 +277,7 @@ public class VillagerRecipeViewingScreen extends Screen { for (Element listener : children()) if (listener.mouseScrolled(double_1, double_2, double_3)) return true; - if (bounds.contains(ClientUtils.getMouseLocation())) { + if (bounds.contains(PointHelper.fromMouse())) { if (double_3 < 0 && categoryMap.get(categories.get(selectedCategoryIndex)).size() > 1) { selectedRecipeIndex++; if (selectedRecipeIndex >= categoryMap.get(categories.get(selectedCategoryIndex)).size()) @@ -395,10 +396,6 @@ public class VillagerRecipeViewingScreen extends Screen { return super.mouseDragged(mouseX, mouseY, int_1, double_3, double_4); } - private int getReal(int i) { - return (int) (i / ((double) minecraft.window.getScaledWidth() / (double) minecraft.window.getWidth())); - } - @Override public boolean keyPressed(int int_1, int int_2, int int_3) { if ((int_1 == 256 || this.minecraft.options.keyInventory.matchesKey(int_1, int_2)) && this.shouldCloseOnEsc()) { diff --git a/src/main/java/me/shedaniel/rei/gui/widget/AutoCraftingButtonWidget.java b/src/main/java/me/shedaniel/rei/gui/widget/AutoCraftingButtonWidget.java index d4d5e1b6c..d75f064ef 100644 --- a/src/main/java/me/shedaniel/rei/gui/widget/AutoCraftingButtonWidget.java +++ b/src/main/java/me/shedaniel/rei/gui/widget/AutoCraftingButtonWidget.java @@ -7,6 +7,8 @@ package me.shedaniel.rei.gui.widget; import com.mojang.blaze3d.platform.GlStateManager; import it.unimi.dsi.fastutil.ints.IntList; +import me.shedaniel.math.api.Point; +import me.shedaniel.math.api.Rectangle; import me.shedaniel.rei.api.*; import me.shedaniel.rei.impl.ScreenHelper; import net.minecraft.client.gui.screen.ingame.AbstractContainerScreen; @@ -15,7 +17,6 @@ import net.minecraft.util.Formatting; import net.minecraft.util.Identifier; import net.minecraft.util.math.MathHelper; -import java.awt.*; import java.util.List; import java.util.Optional; import java.util.function.Supplier; diff --git a/src/main/java/me/shedaniel/rei/gui/widget/ButtonWidget.java b/src/main/java/me/shedaniel/rei/gui/widget/ButtonWidget.java index 8fe88c894..7c15b67cd 100644 --- a/src/main/java/me/shedaniel/rei/gui/widget/ButtonWidget.java +++ b/src/main/java/me/shedaniel/rei/gui/widget/ButtonWidget.java @@ -6,6 +6,8 @@ package me.shedaniel.rei.gui.widget; import com.mojang.blaze3d.platform.GlStateManager; +import me.shedaniel.math.api.Point; +import me.shedaniel.math.api.Rectangle; import me.shedaniel.rei.impl.ScreenHelper; import net.minecraft.client.gui.Element; import net.minecraft.client.sound.PositionedSoundInstance; @@ -14,7 +16,6 @@ import net.minecraft.text.Text; import net.minecraft.util.Identifier; import net.minecraft.util.math.MathHelper; -import java.awt.*; import java.util.Collections; import java.util.List; import java.util.Optional; diff --git a/src/main/java/me/shedaniel/rei/gui/widget/CategoryBaseWidget.java b/src/main/java/me/shedaniel/rei/gui/widget/CategoryBaseWidget.java index ecf645a8b..0d1968d96 100644 --- a/src/main/java/me/shedaniel/rei/gui/widget/CategoryBaseWidget.java +++ b/src/main/java/me/shedaniel/rei/gui/widget/CategoryBaseWidget.java @@ -5,7 +5,7 @@ package me.shedaniel.rei.gui.widget; -import java.awt.*; +import me.shedaniel.math.api.Rectangle; public class CategoryBaseWidget extends RecipeBaseWidget { diff --git a/src/main/java/me/shedaniel/rei/gui/widget/ClickableLabelWidget.java b/src/main/java/me/shedaniel/rei/gui/widget/ClickableLabelWidget.java index 200bde750..447789b52 100644 --- a/src/main/java/me/shedaniel/rei/gui/widget/ClickableLabelWidget.java +++ b/src/main/java/me/shedaniel/rei/gui/widget/ClickableLabelWidget.java @@ -5,10 +5,10 @@ package me.shedaniel.rei.gui.widget; +import me.shedaniel.math.api.Point; import me.shedaniel.rei.impl.ScreenHelper; import net.minecraft.util.Formatting; -import java.awt.*; import java.util.Optional; public abstract class ClickableLabelWidget extends LabelWidget { diff --git a/src/main/java/me/shedaniel/rei/gui/widget/CraftableToggleButtonWidget.java b/src/main/java/me/shedaniel/rei/gui/widget/CraftableToggleButtonWidget.java index 767989d86..172b7e8e7 100644 --- a/src/main/java/me/shedaniel/rei/gui/widget/CraftableToggleButtonWidget.java +++ b/src/main/java/me/shedaniel/rei/gui/widget/CraftableToggleButtonWidget.java @@ -6,6 +6,7 @@ package me.shedaniel.rei.gui.widget; import com.mojang.blaze3d.platform.GlStateManager; +import me.shedaniel.math.api.Rectangle; import me.shedaniel.rei.RoughlyEnoughItemsCore; import net.minecraft.block.Blocks; import net.minecraft.client.MinecraftClient; @@ -15,7 +16,6 @@ import net.minecraft.client.resource.language.I18n; import net.minecraft.item.ItemStack; import net.minecraft.util.Identifier; -import java.awt.*; import java.util.Optional; public abstract class CraftableToggleButtonWidget extends ButtonWidget { diff --git a/src/main/java/me/shedaniel/rei/gui/widget/DetailedButtonWidget.java b/src/main/java/me/shedaniel/rei/gui/widget/DetailedButtonWidget.java index 12bd6b9e6..aa76d74c9 100644 --- a/src/main/java/me/shedaniel/rei/gui/widget/DetailedButtonWidget.java +++ b/src/main/java/me/shedaniel/rei/gui/widget/DetailedButtonWidget.java @@ -5,10 +5,9 @@ package me.shedaniel.rei.gui.widget; +import me.shedaniel.math.api.Rectangle; import net.minecraft.text.Text; -import java.awt.*; - public class DetailedButtonWidget extends ButtonWidget { private DetailedButtonWidget.PressAction pressAction; diff --git a/src/main/java/me/shedaniel/rei/gui/widget/DraggableWidget.java b/src/main/java/me/shedaniel/rei/gui/widget/DraggableWidget.java index 5c8e7657f..6c4d34b0f 100644 --- a/src/main/java/me/shedaniel/rei/gui/widget/DraggableWidget.java +++ b/src/main/java/me/shedaniel/rei/gui/widget/DraggableWidget.java @@ -5,13 +5,13 @@ package me.shedaniel.rei.gui.widget; -import me.shedaniel.cloth.api.ClientUtils; +import me.shedaniel.math.api.Point; +import me.shedaniel.math.api.Rectangle; +import me.shedaniel.math.impl.PointHelper; import net.minecraft.client.MinecraftClient; import net.minecraft.client.gui.Element; import net.minecraft.client.util.Window; -import java.awt.*; - public abstract class DraggableWidget extends WidgetWithBounds { public boolean dragged = false; @@ -40,7 +40,7 @@ public abstract class DraggableWidget extends WidgetWithBounds { @Override public boolean mouseDragged(double double_1, double double_2, int int_1, double double_3, double double_4) { - Point mouse = ClientUtils.getMouseLocation(); + Point mouse = PointHelper.fromMouse(); if (int_1 == 0) { if (!dragged) { if (getGrabBounds().contains(mouse)) { diff --git a/src/main/java/me/shedaniel/rei/gui/widget/EntryListWidget.java b/src/main/java/me/shedaniel/rei/gui/widget/EntryListWidget.java index 71760efd1..cc2d30887 100644 --- a/src/main/java/me/shedaniel/rei/gui/widget/EntryListWidget.java +++ b/src/main/java/me/shedaniel/rei/gui/widget/EntryListWidget.java @@ -8,8 +8,9 @@ package me.shedaniel.rei.gui.widget; import com.google.common.collect.Lists; import com.mojang.blaze3d.platform.GlStateManager; import com.zeitheron.hammercore.client.utils.Scissors; -import me.shedaniel.cloth.api.ClientUtils; import me.shedaniel.clothconfig2.api.RunSixtyTimesEverySec; +import me.shedaniel.math.api.Rectangle; +import me.shedaniel.math.impl.PointHelper; import me.shedaniel.rei.RoughlyEnoughItemsCore; import me.shedaniel.rei.api.*; import me.shedaniel.rei.gui.config.ItemCheatingMode; @@ -31,8 +32,6 @@ import net.minecraft.util.math.MathHelper; import net.minecraft.util.registry.Registry; import org.apache.commons.lang3.StringUtils; -import java.awt.*; -import java.util.List; import java.util.*; import java.util.concurrent.atomic.AtomicReference; import java.util.stream.Collectors; @@ -265,7 +264,7 @@ public class EntryListWidget extends Widget { Scissors.end(); GlStateManager.popMatrix(); ClientPlayerEntity player = minecraft.player; - if (rectangle.contains(ClientUtils.getMouseLocation()) && ClientHelper.getInstance().isCheating() && !player.inventory.getCursorStack().isEmpty() && RoughlyEnoughItemsCore.hasPermissionToUsePackets()) + if (rectangle.contains(PointHelper.fromMouse()) && ClientHelper.getInstance().isCheating() && !player.inventory.getCursorStack().isEmpty() && RoughlyEnoughItemsCore.hasPermissionToUsePackets()) ScreenHelper.getLastOverlay().addTooltip(QueuedTooltip.create(I18n.translate("text.rei.delete_items"))); } @@ -276,9 +275,9 @@ public class EntryListWidget extends Widget { calculateListSize(rectangle); if (currentDisplayed.isEmpty() || processSearchTerm) currentDisplayed = processSearchTerm(searchTerm, RoughlyEnoughItemsCore.getEntryRegistry().getEntryList(), new ArrayList<>(ScreenHelper.inventoryStacks)); - int startX = (int) rectangle.getCenterX() - width * 9; - int startY = (int) rectangle.getCenterY() - height * 9; - this.listArea = new Rectangle((int) startX, (int) startY, width * 18, height * 18); + int startX = rectangle.getCenterX() - width * 9; + int startY = rectangle.getCenterY() - height * 9; + this.listArea = new Rectangle(startX, startY, width * 18, height * 18); int fitSlotsPerPage = getTotalFitSlotsPerPage(startX, startY, listArea); int j = page * fitSlotsPerPage; if (RoughlyEnoughItemsCore.getConfigManager().getConfig().isEntryListWidgetScrolled()) { @@ -371,7 +370,7 @@ public class EntryListWidget extends Widget { @Override public boolean keyPressed(int int_1, int int_2, int int_3) { - if (rectangle.contains(ClientUtils.getMouseLocation())) + if (rectangle.contains(PointHelper.fromMouse())) for (Widget widget : widgets) if (widget.keyPressed(int_1, int_2, int_3)) return true; diff --git a/src/main/java/me/shedaniel/rei/gui/widget/LabelWidget.java b/src/main/java/me/shedaniel/rei/gui/widget/LabelWidget.java index 61c7b33ab..f7869cedf 100644 --- a/src/main/java/me/shedaniel/rei/gui/widget/LabelWidget.java +++ b/src/main/java/me/shedaniel/rei/gui/widget/LabelWidget.java @@ -5,9 +5,9 @@ package me.shedaniel.rei.gui.widget; +import me.shedaniel.math.api.Rectangle; import net.minecraft.client.gui.Element; -import java.awt.*; import java.util.Collections; import java.util.List; diff --git a/src/main/java/me/shedaniel/rei/gui/widget/QueuedTooltip.java b/src/main/java/me/shedaniel/rei/gui/widget/QueuedTooltip.java index 05019cd6e..5b61a4e66 100644 --- a/src/main/java/me/shedaniel/rei/gui/widget/QueuedTooltip.java +++ b/src/main/java/me/shedaniel/rei/gui/widget/QueuedTooltip.java @@ -7,9 +7,9 @@ package me.shedaniel.rei.gui.widget; import com.google.common.collect.Lists; -import me.shedaniel.cloth.api.ClientUtils; +import me.shedaniel.math.api.Point; +import me.shedaniel.math.impl.PointHelper; -import java.awt.*; import java.util.Collections; import java.util.List; import java.util.function.Consumer; @@ -34,11 +34,11 @@ public class QueuedTooltip { } public static QueuedTooltip create(List text) { - return QueuedTooltip.create(ClientUtils.getMouseLocation(), text); + return QueuedTooltip.create(PointHelper.fromMouse(), text); } public static QueuedTooltip create(String... text) { - return QueuedTooltip.create(ClientUtils.getMouseLocation(), text); + return QueuedTooltip.create(PointHelper.fromMouse(), text); } @Deprecated diff --git a/src/main/java/me/shedaniel/rei/gui/widget/RecipeBaseWidget.java b/src/main/java/me/shedaniel/rei/gui/widget/RecipeBaseWidget.java index 614fd59ff..ee3ae26a4 100644 --- a/src/main/java/me/shedaniel/rei/gui/widget/RecipeBaseWidget.java +++ b/src/main/java/me/shedaniel/rei/gui/widget/RecipeBaseWidget.java @@ -6,13 +6,13 @@ package me.shedaniel.rei.gui.widget; import com.mojang.blaze3d.platform.GlStateManager; +import me.shedaniel.math.api.Rectangle; import me.shedaniel.rei.RoughlyEnoughItemsCore; import me.shedaniel.rei.gui.config.RecipeScreenType; import me.shedaniel.rei.impl.ScreenHelper; import net.minecraft.client.render.GuiLighting; import net.minecraft.util.Identifier; -import java.awt.*; import java.util.Collections; import java.util.List; diff --git a/src/main/java/me/shedaniel/rei/gui/widget/RecipeChoosePageWidget.java b/src/main/java/me/shedaniel/rei/gui/widget/RecipeChoosePageWidget.java index 4e4ec7c30..b24837287 100644 --- a/src/main/java/me/shedaniel/rei/gui/widget/RecipeChoosePageWidget.java +++ b/src/main/java/me/shedaniel/rei/gui/widget/RecipeChoosePageWidget.java @@ -7,6 +7,8 @@ package me.shedaniel.rei.gui.widget; import com.google.common.collect.Lists; import com.mojang.blaze3d.platform.GlStateManager; +import me.shedaniel.math.api.Point; +import me.shedaniel.math.api.Rectangle; import me.shedaniel.rei.RoughlyEnoughItemsCore; import me.shedaniel.rei.api.ConfigManager; import me.shedaniel.rei.gui.RecipeViewingScreen; @@ -19,7 +21,6 @@ import net.minecraft.client.resource.language.I18n; import net.minecraft.client.util.Window; import net.minecraft.util.math.MathHelper; -import java.awt.*; import java.io.IOException; import java.util.Collections; import java.util.List; @@ -47,7 +48,7 @@ public class RecipeChoosePageWidget extends DraggableWidget { private static Point getPointFromConfig() { Window window = MinecraftClient.getInstance().window; ConfigObjectImpl.RelativePoint point = RoughlyEnoughItemsCore.getConfigManager().getConfig().getChoosePageDialogPoint(); - return new Point((int) point.getX(window.getScaledWidth()), (int) point.getY(window.getScaledHeight())); + return new Point(point.getX(window.getScaledWidth()), point.getY(window.getScaledHeight())); } @Override diff --git a/src/main/java/me/shedaniel/rei/gui/widget/SlotBaseWidget.java b/src/main/java/me/shedaniel/rei/gui/widget/SlotBaseWidget.java index 90ce4c61e..89e96d1b3 100644 --- a/src/main/java/me/shedaniel/rei/gui/widget/SlotBaseWidget.java +++ b/src/main/java/me/shedaniel/rei/gui/widget/SlotBaseWidget.java @@ -5,10 +5,9 @@ package me.shedaniel.rei.gui.widget; +import me.shedaniel.math.api.Rectangle; import me.shedaniel.rei.impl.ScreenHelper; -import java.awt.*; - public class SlotBaseWidget extends RecipeBaseWidget { public SlotBaseWidget(Rectangle bounds) { diff --git a/src/main/java/me/shedaniel/rei/gui/widget/SlotWidget.java b/src/main/java/me/shedaniel/rei/gui/widget/SlotWidget.java index 3d178508e..ececd10f9 100644 --- a/src/main/java/me/shedaniel/rei/gui/widget/SlotWidget.java +++ b/src/main/java/me/shedaniel/rei/gui/widget/SlotWidget.java @@ -7,7 +7,8 @@ package me.shedaniel.rei.gui.widget; import com.google.common.collect.Lists; import com.mojang.blaze3d.platform.GlStateManager; -import me.shedaniel.cloth.api.ClientUtils; +import me.shedaniel.math.api.Rectangle; +import me.shedaniel.math.impl.PointHelper; import me.shedaniel.rei.RoughlyEnoughItemsCore; import me.shedaniel.rei.api.ClientHelper; import me.shedaniel.rei.api.Renderer; @@ -21,7 +22,6 @@ import net.minecraft.util.Identifier; import net.minecraft.util.math.MathHelper; import net.minecraft.util.registry.Registry; -import java.awt.*; import java.util.Collections; import java.util.LinkedList; import java.util.List; @@ -253,7 +253,7 @@ public class SlotWidget extends WidgetWithBounds { public boolean keyPressed(int int_1, int int_2, int int_3) { if (!clickToMoreRecipes) return false; - if (isCurrentRendererItem() && getBounds().contains(ClientUtils.getMouseLocation())) + if (isCurrentRendererItem() && getBounds().contains(PointHelper.fromMouse())) if (ClientHelper.getInstance().getRecipeKeyBinding().matchesKey(int_1, int_2)) return ClientHelper.getInstance().executeRecipeKeyBind(getCurrentItemStack()); else if (ClientHelper.getInstance().getUsageKeyBinding().matchesKey(int_1, int_2)) diff --git a/src/main/java/me/shedaniel/rei/gui/widget/TabWidget.java b/src/main/java/me/shedaniel/rei/gui/widget/TabWidget.java index fe96d4d01..4c3b3d76f 100644 --- a/src/main/java/me/shedaniel/rei/gui/widget/TabWidget.java +++ b/src/main/java/me/shedaniel/rei/gui/widget/TabWidget.java @@ -6,6 +6,7 @@ package me.shedaniel.rei.gui.widget; import com.mojang.blaze3d.platform.GlStateManager; +import me.shedaniel.math.api.Rectangle; import me.shedaniel.rei.api.ClientHelper; import me.shedaniel.rei.api.RecipeCategory; import me.shedaniel.rei.api.Renderer; @@ -14,7 +15,6 @@ import net.minecraft.client.render.GuiLighting; import net.minecraft.util.Formatting; import net.minecraft.util.Identifier; -import java.awt.*; import java.util.Collections; import java.util.List; @@ -77,7 +77,7 @@ public class TabWidget extends WidgetWithBounds { minecraft.getTextureManager().bindTexture(ScreenHelper.isDarkModeEnabled() ? CHEST_GUI_TEXTURE_DARK : CHEST_GUI_TEXTURE); this.blit(bounds.x, bounds.y + 2, selected ? 28 : 0, 192, 28, (selected ? 30 : 27)); renderer.setBlitOffset(100); - renderer.render((int) bounds.getCenterX(), (int) bounds.getCenterY(), mouseX, mouseY, delta); + renderer.render(bounds.getCenterX(), bounds.getCenterY(), mouseX, mouseY, delta); if (containsMouse(mouseX, mouseY)) { drawTooltip(); } diff --git a/src/main/java/me/shedaniel/rei/gui/widget/TextFieldWidget.java b/src/main/java/me/shedaniel/rei/gui/widget/TextFieldWidget.java index e826532da..924dcb680 100644 --- a/src/main/java/me/shedaniel/rei/gui/widget/TextFieldWidget.java +++ b/src/main/java/me/shedaniel/rei/gui/widget/TextFieldWidget.java @@ -7,6 +7,7 @@ package me.shedaniel.rei.gui.widget; import com.google.common.base.Predicates; import com.mojang.blaze3d.platform.GlStateManager; +import me.shedaniel.math.api.Rectangle; import net.minecraft.SharedConstants; import net.minecraft.client.gui.screen.Screen; import net.minecraft.client.render.BufferBuilder; @@ -14,7 +15,6 @@ import net.minecraft.client.render.Tessellator; import net.minecraft.client.render.VertexFormats; import net.minecraft.util.math.MathHelper; -import java.awt.*; import java.util.Collections; import java.util.List; import java.util.function.BiFunction; diff --git a/src/main/java/me/shedaniel/rei/gui/widget/WidgetWithBounds.java b/src/main/java/me/shedaniel/rei/gui/widget/WidgetWithBounds.java index c1ed9fbbd..bf674ea71 100644 --- a/src/main/java/me/shedaniel/rei/gui/widget/WidgetWithBounds.java +++ b/src/main/java/me/shedaniel/rei/gui/widget/WidgetWithBounds.java @@ -5,11 +5,12 @@ package me.shedaniel.rei.gui.widget; -import java.awt.*; +import me.shedaniel.math.api.Point; +import me.shedaniel.math.api.Rectangle; public abstract class WidgetWithBounds extends Widget { - abstract public Shape getBounds(); + abstract public Rectangle getBounds(); public final boolean containsMouse(int mouseX, int mouseY) { return containsMouse((double) mouseX, (double) mouseY); diff --git a/src/main/java/me/shedaniel/rei/impl/BaseBoundsHandlerImpl.java b/src/main/java/me/shedaniel/rei/impl/BaseBoundsHandlerImpl.java index 0376de6f4..cd7b955ad 100644 --- a/src/main/java/me/shedaniel/rei/impl/BaseBoundsHandlerImpl.java +++ b/src/main/java/me/shedaniel/rei/impl/BaseBoundsHandlerImpl.java @@ -6,6 +6,7 @@ package me.shedaniel.rei.impl; import com.google.common.collect.Lists; +import me.shedaniel.math.api.Rectangle; import me.shedaniel.rei.RoughlyEnoughItemsCore; import me.shedaniel.rei.api.BaseBoundsHandler; import me.shedaniel.rei.api.DisplayHelper; @@ -14,7 +15,6 @@ import net.minecraft.client.gui.screen.Screen; import net.minecraft.util.ActionResult; import net.minecraft.util.Pair; -import java.awt.*; import java.util.Comparator; import java.util.List; import java.util.function.Function; diff --git a/src/main/java/me/shedaniel/rei/impl/DisplayHelperImpl.java b/src/main/java/me/shedaniel/rei/impl/DisplayHelperImpl.java index 23d6e503a..cf182ebf5 100644 --- a/src/main/java/me/shedaniel/rei/impl/DisplayHelperImpl.java +++ b/src/main/java/me/shedaniel/rei/impl/DisplayHelperImpl.java @@ -7,10 +7,10 @@ package me.shedaniel.rei.impl; import com.google.common.collect.Lists; import com.google.common.collect.Maps; +import me.shedaniel.math.api.Rectangle; import me.shedaniel.rei.api.BaseBoundsHandler; import me.shedaniel.rei.api.DisplayHelper; -import java.awt.*; import java.util.Comparator; import java.util.List; import java.util.Map; diff --git a/src/main/java/me/shedaniel/rei/impl/RecipeHelperImpl.java b/src/main/java/me/shedaniel/rei/impl/RecipeHelperImpl.java index 5f2b7dacc..42eaba8dd 100644 --- a/src/main/java/me/shedaniel/rei/impl/RecipeHelperImpl.java +++ b/src/main/java/me/shedaniel/rei/impl/RecipeHelperImpl.java @@ -7,6 +7,7 @@ package me.shedaniel.rei.impl; import com.google.common.collect.Lists; import com.google.common.collect.Maps; +import me.shedaniel.math.api.Rectangle; import me.shedaniel.rei.RoughlyEnoughItemsCore; import me.shedaniel.rei.api.*; import me.shedaniel.rei.api.plugins.REIPluginV0; @@ -20,8 +21,6 @@ import net.minecraft.recipe.RecipeManager; import net.minecraft.util.ActionResult; import net.minecraft.util.Identifier; -import java.awt.*; -import java.util.List; import java.util.*; import java.util.concurrent.atomic.AtomicInteger; import java.util.function.Function; @@ -198,7 +197,7 @@ public class RecipeHelperImpl implements RecipeHelper { @Override public Optional getSpeedCraftButtonArea(RecipeCategory category) { if (!speedCraftAreaSupplierMap.containsKey(category.getIdentifier())) - return Optional.ofNullable(bounds -> new Rectangle((int) bounds.getMaxX() - 16, (int) bounds.getMaxY() - 16, 10, 10)); + return Optional.ofNullable(bounds -> new Rectangle(bounds.getMaxX() - 16, bounds.getMaxY() - 16, 10, 10)); return Optional.ofNullable(speedCraftAreaSupplierMap.get(category.getIdentifier())); } @@ -214,7 +213,7 @@ public class RecipeHelperImpl implements RecipeHelper { @SuppressWarnings("deprecation") @Override public void registerDefaultSpeedCraftButtonArea(Identifier category) { - registerSpeedCraftButtonArea(category, bounds -> new Rectangle((int) bounds.getMaxX() - 16, (int) bounds.getMaxY() - 16, 10, 10)); + registerSpeedCraftButtonArea(category, bounds -> new Rectangle(bounds.getMaxX() - 16, bounds.getMaxY() - 16, 10, 10)); } @SuppressWarnings("deprecation") diff --git a/src/main/java/me/shedaniel/rei/plugin/DefaultPlugin.java b/src/main/java/me/shedaniel/rei/plugin/DefaultPlugin.java index f92e4f5fe..edf87f39d 100644 --- a/src/main/java/me/shedaniel/rei/plugin/DefaultPlugin.java +++ b/src/main/java/me/shedaniel/rei/plugin/DefaultPlugin.java @@ -7,6 +7,7 @@ package me.shedaniel.rei.plugin; import com.google.common.collect.Lists; import com.google.common.collect.Maps; +import me.shedaniel.math.api.Rectangle; import me.shedaniel.rei.RoughlyEnoughItemsCore; import me.shedaniel.rei.api.DisplayHelper; import me.shedaniel.rei.api.Entry; @@ -55,8 +56,6 @@ import net.minecraft.util.Identifier; import net.minecraft.util.math.MathHelper; import net.minecraft.util.registry.Registry; -import java.awt.*; -import java.util.List; import java.util.*; public class DefaultPlugin implements REIPluginV0 { @@ -303,7 +302,7 @@ public class DefaultPlugin implements REIPluginV0 { recipeHelper.registerWorkingStations(STONE_CUTTING, new ItemStack(Items.STONECUTTER)); recipeHelper.registerWorkingStations(COMPOSTING, new ItemStack(Items.COMPOSTER)); recipeHelper.registerSpeedCraftButtonArea(COMPOSTING, bounds -> null); - recipeHelper.registerSpeedCraftButtonArea(DefaultPlugin.CAMPFIRE, bounds -> new Rectangle((int) bounds.getMaxX() - 16, bounds.y + 6, 10, 10)); + recipeHelper.registerSpeedCraftButtonArea(DefaultPlugin.CAMPFIRE, bounds -> new Rectangle(bounds.getMaxX() - 16, bounds.y + 6, 10, 10)); recipeHelper.registerScreenClickArea(new Rectangle(88, 32, 28, 23), CraftingTableScreen.class, CRAFTING); recipeHelper.registerScreenClickArea(new Rectangle(137, 29, 10, 13), InventoryScreen.class, CRAFTING); recipeHelper.registerScreenClickArea(new Rectangle(97, 16, 14, 30), BrewingStandScreen.class, BREWING); diff --git a/src/main/java/me/shedaniel/rei/plugin/DefaultPotionEffectExclusionZones.java b/src/main/java/me/shedaniel/rei/plugin/DefaultPotionEffectExclusionZones.java index 261afcb3f..2498f6875 100644 --- a/src/main/java/me/shedaniel/rei/plugin/DefaultPotionEffectExclusionZones.java +++ b/src/main/java/me/shedaniel/rei/plugin/DefaultPotionEffectExclusionZones.java @@ -6,6 +6,7 @@ package me.shedaniel.rei.plugin; import com.google.common.collect.Ordering; +import me.shedaniel.math.api.Rectangle; import me.shedaniel.rei.impl.ScreenHelper; import me.shedaniel.rei.listeners.AbstractInventoryScreenHooks; import me.shedaniel.rei.listeners.ContainerScreenHooks; @@ -13,7 +14,6 @@ import net.minecraft.client.MinecraftClient; import net.minecraft.client.gui.screen.ingame.AbstractInventoryScreen; import net.minecraft.entity.effect.StatusEffectInstance; -import java.awt.*; import java.util.ArrayList; import java.util.Collection; import java.util.Collections; diff --git a/src/main/java/me/shedaniel/rei/plugin/DefaultRecipeBookExclusionZones.java b/src/main/java/me/shedaniel/rei/plugin/DefaultRecipeBookExclusionZones.java index 0dced04f3..150b82f16 100644 --- a/src/main/java/me/shedaniel/rei/plugin/DefaultRecipeBookExclusionZones.java +++ b/src/main/java/me/shedaniel/rei/plugin/DefaultRecipeBookExclusionZones.java @@ -6,6 +6,7 @@ package me.shedaniel.rei.plugin; import com.google.common.collect.Lists; +import me.shedaniel.math.api.Rectangle; import me.shedaniel.rei.impl.ScreenHelper; import me.shedaniel.rei.listeners.ContainerScreenHooks; import net.minecraft.client.MinecraftClient; @@ -13,7 +14,6 @@ import net.minecraft.client.gui.screen.recipebook.RecipeBookProvider; import net.minecraft.client.recipe.book.ClientRecipeBook; import net.minecraft.container.CraftingContainer; -import java.awt.*; import java.util.Collections; import java.util.List; import java.util.function.Function; diff --git a/src/main/java/me/shedaniel/rei/plugin/blasting/DefaultBlastingCategory.java b/src/main/java/me/shedaniel/rei/plugin/blasting/DefaultBlastingCategory.java index 3c228c468..3e7e8ae05 100644 --- a/src/main/java/me/shedaniel/rei/plugin/blasting/DefaultBlastingCategory.java +++ b/src/main/java/me/shedaniel/rei/plugin/blasting/DefaultBlastingCategory.java @@ -7,6 +7,8 @@ package me.shedaniel.rei.plugin.blasting; import com.mojang.blaze3d.platform.GlStateManager; import it.unimi.dsi.fastutil.ints.IntList; +import me.shedaniel.math.api.Point; +import me.shedaniel.math.api.Rectangle; import me.shedaniel.rei.api.Renderer; import me.shedaniel.rei.api.TransferRecipeCategory; import me.shedaniel.rei.gui.renderers.RecipeRenderer; @@ -24,7 +26,6 @@ import net.minecraft.util.Formatting; import net.minecraft.util.Identifier; import net.minecraft.util.math.MathHelper; -import java.awt.*; import java.util.Arrays; import java.util.Collections; import java.util.LinkedList; @@ -56,7 +57,7 @@ public class DefaultBlastingCategory implements TransferRecipeCategory setupDisplay(Supplier recipeDisplaySupplier, Rectangle bounds) { final DefaultBlastingDisplay recipeDisplay = recipeDisplaySupplier.get(); - Point startPoint = new Point((int) bounds.getCenterX() - 41, (int) bounds.getCenterY() - 27); + Point startPoint = new Point(bounds.getCenterX() - 41, bounds.getCenterY() - 27); List widgets = new LinkedList<>(Arrays.asList(new RecipeBaseWidget(bounds) { @Override public void render(int mouseX, int mouseY, float delta) { @@ -85,7 +86,7 @@ public class DefaultBlastingCategory implements TransferRecipeCategory widgets, Rectangle bounds, DefaultBlastingDisplay display, IntList redSlots) { - Point startPoint = new Point((int) bounds.getCenterX() - 41, (int) bounds.getCenterY() - 27); + Point startPoint = new Point(bounds.getCenterX() - 41, bounds.getCenterY() - 27); GlStateManager.translatef(0, 0, 400); if (redSlots.contains(0)) { DrawableHelper.fill(startPoint.x + 1, startPoint.y + 1, startPoint.x + 1 + 16, startPoint.y + 1 + 16, 0x30ff0000); diff --git a/src/main/java/me/shedaniel/rei/plugin/brewing/DefaultBrewingCategory.java b/src/main/java/me/shedaniel/rei/plugin/brewing/DefaultBrewingCategory.java index 6740c5a8b..706b2310f 100644 --- a/src/main/java/me/shedaniel/rei/plugin/brewing/DefaultBrewingCategory.java +++ b/src/main/java/me/shedaniel/rei/plugin/brewing/DefaultBrewingCategory.java @@ -6,6 +6,8 @@ package me.shedaniel.rei.plugin.brewing; import com.mojang.blaze3d.platform.GlStateManager; +import me.shedaniel.math.api.Point; +import me.shedaniel.math.api.Rectangle; import me.shedaniel.rei.api.RecipeCategory; import me.shedaniel.rei.api.Renderer; import me.shedaniel.rei.gui.widget.RecipeBaseWidget; @@ -22,7 +24,6 @@ import net.minecraft.util.Formatting; import net.minecraft.util.Identifier; import net.minecraft.util.math.MathHelper; -import java.awt.*; import java.util.Arrays; import java.util.Collections; import java.util.LinkedList; @@ -49,7 +50,7 @@ public class DefaultBrewingCategory implements RecipeCategory setupDisplay(Supplier recipeDisplaySupplier, Rectangle bounds) { final DefaultBrewingDisplay recipeDisplay = recipeDisplaySupplier.get(); - Point startPoint = new Point((int) bounds.getCenterX() - 52, (int) bounds.getCenterY() - 29); + Point startPoint = new Point(bounds.getCenterX() - 52, bounds.getCenterY() - 29); List widgets = new LinkedList<>(Arrays.asList(new RecipeBaseWidget(bounds) { @Override public void render(int mouseX, int mouseY, float delta) { diff --git a/src/main/java/me/shedaniel/rei/plugin/campfire/DefaultCampfireCategory.java b/src/main/java/me/shedaniel/rei/plugin/campfire/DefaultCampfireCategory.java index 2860989a1..df95334e5 100644 --- a/src/main/java/me/shedaniel/rei/plugin/campfire/DefaultCampfireCategory.java +++ b/src/main/java/me/shedaniel/rei/plugin/campfire/DefaultCampfireCategory.java @@ -6,6 +6,8 @@ package me.shedaniel.rei.plugin.campfire; import com.mojang.blaze3d.platform.GlStateManager; +import me.shedaniel.math.api.Point; +import me.shedaniel.math.api.Rectangle; import me.shedaniel.rei.api.RecipeCategory; import me.shedaniel.rei.api.Renderer; import me.shedaniel.rei.gui.widget.RecipeBaseWidget; @@ -21,7 +23,6 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.Identifier; import net.minecraft.util.math.MathHelper; -import java.awt.*; import java.util.Arrays; import java.util.LinkedList; import java.util.List; @@ -46,7 +47,7 @@ public class DefaultCampfireCategory implements RecipeCategory setupDisplay(Supplier recipeDisplaySupplier, Rectangle bounds) { - Point startPoint = new Point((int) bounds.getCenterX() - 41, (int) bounds.getCenterY() - 27); + Point startPoint = new Point(bounds.getCenterX() - 41, bounds.getCenterY() - 27); List widgets = new LinkedList<>(Arrays.asList(new RecipeBaseWidget(bounds) { @Override public void render(int mouseX, int mouseY, float delta) { diff --git a/src/main/java/me/shedaniel/rei/plugin/composting/DefaultCompostingCategory.java b/src/main/java/me/shedaniel/rei/plugin/composting/DefaultCompostingCategory.java index 318cde44b..b89e0e7cb 100644 --- a/src/main/java/me/shedaniel/rei/plugin/composting/DefaultCompostingCategory.java +++ b/src/main/java/me/shedaniel/rei/plugin/composting/DefaultCompostingCategory.java @@ -7,6 +7,8 @@ package me.shedaniel.rei.plugin.composting; import com.google.common.collect.Lists; import com.mojang.blaze3d.platform.GlStateManager; +import me.shedaniel.math.api.Point; +import me.shedaniel.math.api.Rectangle; import me.shedaniel.rei.api.RecipeCategory; import me.shedaniel.rei.api.Renderer; import me.shedaniel.rei.gui.renderers.RecipeRenderer; @@ -23,7 +25,6 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.Identifier; import net.minecraft.util.math.MathHelper; -import java.awt.*; import java.util.Arrays; import java.util.LinkedList; import java.util.List; @@ -78,7 +79,7 @@ public class DefaultCompostingCategory implements RecipeCategory i ? Renderer.fromItemStack(stacks.get(i).asItem().getStackForRender()) : Renderer.empty(), true, true, true) { + widgets.add(new SlotWidget(bounds.getCenterX() - 72 + x * 18, bounds.y + y * 18, stacks.size() > i ? Renderer.fromItemStack(stacks.get(i).asItem().getStackForRender()) : Renderer.empty(), true, true, true) { @Override protected List getExtraItemToolTips(ItemStack stack) { final List[] thing = new List[]{null}; @@ -93,7 +94,7 @@ public class DefaultCompostingCategory implements RecipeCategory setupDisplay(Supplier recipeDisplaySupplier, Rectangle bounds) { - Point startPoint = new Point((int) bounds.getCenterX() - 58, (int) bounds.getCenterY() - 27); + Point startPoint = new Point(bounds.getCenterX() - 58, bounds.getCenterY() - 27); List widgets = new LinkedList<>(Arrays.asList(new RecipeBaseWidget(bounds) { @Override public void render(int mouseX, int mouseY, float delta) { @@ -98,7 +99,7 @@ public class DefaultCraftingCategory implements TransferRecipeCategory widgets, Rectangle bounds, DefaultCraftingDisplay display, IntList redSlots) { - Point startPoint = new Point((int) bounds.getCenterX() - 58, (int) bounds.getCenterY() - 27); + Point startPoint = new Point(bounds.getCenterX() - 58, bounds.getCenterY() - 27); GlStateManager.translatef(0, 0, 400); for (Integer slot : redSlots) { int i = getSlotWithSize(display, slot); diff --git a/src/main/java/me/shedaniel/rei/plugin/smelting/DefaultSmeltingCategory.java b/src/main/java/me/shedaniel/rei/plugin/smelting/DefaultSmeltingCategory.java index 9f2c083f3..a85c660dc 100644 --- a/src/main/java/me/shedaniel/rei/plugin/smelting/DefaultSmeltingCategory.java +++ b/src/main/java/me/shedaniel/rei/plugin/smelting/DefaultSmeltingCategory.java @@ -7,6 +7,8 @@ package me.shedaniel.rei.plugin.smelting; import com.mojang.blaze3d.platform.GlStateManager; import it.unimi.dsi.fastutil.ints.IntList; +import me.shedaniel.math.api.Point; +import me.shedaniel.math.api.Rectangle; import me.shedaniel.rei.api.Renderer; import me.shedaniel.rei.api.TransferRecipeCategory; import me.shedaniel.rei.gui.renderers.RecipeRenderer; @@ -24,7 +26,6 @@ import net.minecraft.util.Formatting; import net.minecraft.util.Identifier; import net.minecraft.util.math.MathHelper; -import java.awt.*; import java.util.Arrays; import java.util.Collections; import java.util.LinkedList; @@ -55,7 +56,7 @@ public class DefaultSmeltingCategory implements TransferRecipeCategory setupDisplay(Supplier recipeDisplaySupplier, Rectangle bounds) { - Point startPoint = new Point((int) bounds.getCenterX() - 41, (int) bounds.getCenterY() - 27); + Point startPoint = new Point(bounds.getCenterX() - 41, bounds.getCenterY() - 27); List widgets = new LinkedList<>(Arrays.asList(new RecipeBaseWidget(bounds) { @Override public void render(int mouseX, int mouseY, float delta) { @@ -84,7 +85,7 @@ public class DefaultSmeltingCategory implements TransferRecipeCategory widgets, Rectangle bounds, DefaultSmeltingDisplay display, IntList redSlots) { - Point startPoint = new Point((int) bounds.getCenterX() - 41, (int) bounds.getCenterY() - 27); + Point startPoint = new Point(bounds.getCenterX() - 41, bounds.getCenterY() - 27); GlStateManager.translatef(0, 0, 400); if (redSlots.contains(0)) { DrawableHelper.fill(startPoint.x + 1, startPoint.y + 1, startPoint.x + 1 + 16, startPoint.y + 1 + 16, 0x30ff0000); diff --git a/src/main/java/me/shedaniel/rei/plugin/smoking/DefaultSmokingCategory.java b/src/main/java/me/shedaniel/rei/plugin/smoking/DefaultSmokingCategory.java index 62230f493..b4c526640 100644 --- a/src/main/java/me/shedaniel/rei/plugin/smoking/DefaultSmokingCategory.java +++ b/src/main/java/me/shedaniel/rei/plugin/smoking/DefaultSmokingCategory.java @@ -7,6 +7,8 @@ package me.shedaniel.rei.plugin.smoking; import com.mojang.blaze3d.platform.GlStateManager; import it.unimi.dsi.fastutil.ints.IntList; +import me.shedaniel.math.api.Point; +import me.shedaniel.math.api.Rectangle; import me.shedaniel.rei.api.Renderer; import me.shedaniel.rei.api.TransferRecipeCategory; import me.shedaniel.rei.gui.renderers.RecipeRenderer; @@ -24,7 +26,6 @@ import net.minecraft.util.Formatting; import net.minecraft.util.Identifier; import net.minecraft.util.math.MathHelper; -import java.awt.*; import java.util.Arrays; import java.util.Collections; import java.util.LinkedList; @@ -55,7 +56,7 @@ public class DefaultSmokingCategory implements TransferRecipeCategory setupDisplay(Supplier recipeDisplaySupplier, Rectangle bounds) { - Point startPoint = new Point((int) bounds.getCenterX() - 41, (int) bounds.getCenterY() - 27); + Point startPoint = new Point(bounds.getCenterX() - 41, bounds.getCenterY() - 27); List widgets = new LinkedList<>(Arrays.asList(new RecipeBaseWidget(bounds) { @Override public void render(int mouseX, int mouseY, float delta) { @@ -84,7 +85,7 @@ public class DefaultSmokingCategory implements TransferRecipeCategory widgets, Rectangle bounds, DefaultSmokingDisplay display, IntList redSlots) { - Point startPoint = new Point((int) bounds.getCenterX() - 41, (int) bounds.getCenterY() - 27); + Point startPoint = new Point(bounds.getCenterX() - 41, bounds.getCenterY() - 27); GlStateManager.translatef(0, 0, 400); if (redSlots.contains(0)) { DrawableHelper.fill(startPoint.x + 1, startPoint.y + 1, startPoint.x + 1 + 16, startPoint.y + 1 + 16, 0x30ff0000); diff --git a/src/main/java/me/shedaniel/rei/plugin/stonecutting/DefaultStoneCuttingCategory.java b/src/main/java/me/shedaniel/rei/plugin/stonecutting/DefaultStoneCuttingCategory.java index ccd8689fb..8a3c0aab0 100644 --- a/src/main/java/me/shedaniel/rei/plugin/stonecutting/DefaultStoneCuttingCategory.java +++ b/src/main/java/me/shedaniel/rei/plugin/stonecutting/DefaultStoneCuttingCategory.java @@ -6,6 +6,8 @@ package me.shedaniel.rei.plugin.stonecutting; import com.mojang.blaze3d.platform.GlStateManager; +import me.shedaniel.math.api.Point; +import me.shedaniel.math.api.Rectangle; import me.shedaniel.rei.api.RecipeCategory; import me.shedaniel.rei.api.Renderer; import me.shedaniel.rei.gui.widget.RecipeBaseWidget; @@ -19,7 +21,6 @@ import net.minecraft.client.resource.language.I18n; import net.minecraft.item.ItemStack; import net.minecraft.util.Identifier; -import java.awt.*; import java.util.Arrays; import java.util.LinkedList; import java.util.List; @@ -44,7 +45,7 @@ public class DefaultStoneCuttingCategory implements RecipeCategory setupDisplay(Supplier recipeDisplaySupplier, Rectangle bounds) { - Point startPoint = new Point((int) bounds.getCenterX() - 41, (int) bounds.getCenterY() - 13); + Point startPoint = new Point(bounds.getCenterX() - 41, bounds.getCenterY() - 13); List widgets = new LinkedList<>(Arrays.asList(new RecipeBaseWidget(bounds) { @Override public void render(int mouseX, int mouseY, float delta) { diff --git a/src/main/java/me/shedaniel/rei/plugin/stripping/DefaultStrippingCategory.java b/src/main/java/me/shedaniel/rei/plugin/stripping/DefaultStrippingCategory.java index d0bfc297c..44385f2a2 100644 --- a/src/main/java/me/shedaniel/rei/plugin/stripping/DefaultStrippingCategory.java +++ b/src/main/java/me/shedaniel/rei/plugin/stripping/DefaultStrippingCategory.java @@ -6,6 +6,8 @@ package me.shedaniel.rei.plugin.stripping; import com.mojang.blaze3d.platform.GlStateManager; +import me.shedaniel.math.api.Point; +import me.shedaniel.math.api.Rectangle; import me.shedaniel.rei.api.RecipeCategory; import me.shedaniel.rei.api.Renderer; import me.shedaniel.rei.gui.widget.RecipeBaseWidget; @@ -19,7 +21,6 @@ import net.minecraft.item.ItemStack; import net.minecraft.item.Items; import net.minecraft.util.Identifier; -import java.awt.*; import java.util.Arrays; import java.util.LinkedList; import java.util.List; @@ -44,7 +45,7 @@ public class DefaultStrippingCategory implements RecipeCategory setupDisplay(Supplier recipeDisplaySupplier, Rectangle bounds) { - Point startPoint = new Point((int) bounds.getCenterX() - 41, (int) bounds.getCenterY() - 13); + Point startPoint = new Point(bounds.getCenterX() - 41, bounds.getCenterY() - 13); List widgets = new LinkedList<>(Arrays.asList(new RecipeBaseWidget(bounds) { @Override public void render(int mouseX, int mouseY, float delta) { diff --git a/src/main/java/me/shedaniel/rei/server/RecipeFinder.java b/src/main/java/me/shedaniel/rei/server/RecipeFinder.java index d6a804f8b..501e02f5e 100644 --- a/src/main/java/me/shedaniel/rei/server/RecipeFinder.java +++ b/src/main/java/me/shedaniel/rei/server/RecipeFinder.java @@ -300,7 +300,7 @@ public class RecipeFinder { } } } - + @SuppressWarnings("deprecation") private int method_7415() { int int_1 = Integer.MAX_VALUE; -- cgit