Remove TemporaryPortingUtils.

refinedmods · Sep 25, 2020 · 288fa96 · 288fa96
1 parent 243bc5e
commit 288fa96
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 202 deletions.
diff --git a/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/grid/GridTab.java b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/grid/GridTab.java
@@ -5,12 +5,12 @@
 import com.refinedmods.refinedstorage.api.network.grid.IGridTab;
 import com.refinedmods.refinedstorage.api.render.IElementDrawer;
 import com.refinedmods.refinedstorage.api.util.IFilter;
-import com.refinedmods.refinedstorage.util.TemporaryPortingUtils;
 import net.minecraft.client.gui.FontRenderer;
 import net.minecraft.client.renderer.RenderHelper;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.text.StringTextComponent;
 import net.minecraftforge.fluids.FluidStack;
+import net.minecraftforge.fml.client.gui.GuiUtils;
 
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
@@ -40,7 +40,7 @@ public List<IFilter> getFilters() {
     @Override
     public void drawTooltip(MatrixStack matrixStack, int x, int y, int screenWidth, int screenHeight, FontRenderer fontRenderer) {
         if (!name.trim().equals("")) {
-            TemporaryPortingUtils.drawHoveringText(matrixStack, Collections.singletonList(new StringTextComponent(name)), x, y, screenWidth, screenHeight, -1, fontRenderer);
+            GuiUtils.drawHoveringText(matrixStack, Collections.singletonList(new StringTextComponent(name)), x, y, screenWidth, screenHeight, -1, fontRenderer);
         }
     }
 

diff --git a/src/main/java/com/refinedmods/refinedstorage/integration/jei/RecipeTransferGridError.java b/src/main/java/com/refinedmods/refinedstorage/integration/jei/RecipeTransferGridError.java
@@ -1,7 +1,6 @@
 package com.refinedmods.refinedstorage.integration.jei;
 
 import com.mojang.blaze3d.matrix.MatrixStack;
-import com.refinedmods.refinedstorage.util.TemporaryPortingUtils;
 import mezz.jei.api.gui.IRecipeLayout;
 import mezz.jei.api.recipe.transfer.IRecipeTransferError;
 import net.minecraft.client.Minecraft;
@@ -10,6 +9,7 @@
 import net.minecraft.util.text.ITextComponent;
 import net.minecraft.util.text.TextFormatting;
 import net.minecraft.util.text.TranslationTextComponent;
+import net.minecraftforge.fml.client.gui.GuiUtils;
 
 import java.awt.*;
 import java.util.ArrayList;
@@ -33,7 +33,7 @@ public Type getType() {
     public void showError(MatrixStack stack, int mouseX, int mouseY, IRecipeLayout recipeLayout, int recipeX, int recipeY) {
         List<ITextComponent> message = drawIngredientHighlights(stack, tracker, recipeX, recipeY);
         Screen currentScreen = Minecraft.getInstance().currentScreen;
-        TemporaryPortingUtils.drawHoveringText(ItemStack.EMPTY, stack, message, mouseX, mouseY, currentScreen.width, currentScreen.height, 150, Minecraft.getInstance().fontRenderer);
+        GuiUtils.drawHoveringText(ItemStack.EMPTY, stack, message, mouseX, mouseY, currentScreen.width, currentScreen.height, 150, Minecraft.getInstance().fontRenderer);
     }
 
     private List<ITextComponent> drawIngredientHighlights(MatrixStack stack, IngredientTracker tracker, int recipeX, int recipeY) {

diff --git a/src/main/java/com/refinedmods/refinedstorage/screen/BaseScreen.java b/src/main/java/com/refinedmods/refinedstorage/screen/BaseScreen.java
@@ -13,7 +13,6 @@
 import com.refinedmods.refinedstorage.screen.widget.CheckboxWidget;
 import com.refinedmods.refinedstorage.screen.widget.sidebutton.SideButton;
 import com.refinedmods.refinedstorage.util.RenderUtils;
-import com.refinedmods.refinedstorage.util.TemporaryPortingUtils;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.screen.inventory.ContainerScreen;
 import net.minecraft.client.gui.widget.Widget;
@@ -31,6 +30,7 @@
 import net.minecraft.util.text.StringTextComponent;
 import net.minecraft.util.text.TranslationTextComponent;
 import net.minecraftforge.fluids.FluidStack;
+import net.minecraftforge.fml.client.gui.GuiUtils;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.lwjgl.opengl.GL11;
@@ -334,7 +334,7 @@ public void renderTooltip(MatrixStack matrixStack, @Nonnull ItemStack stack, int
     }
 
     public void renderTooltip(MatrixStack matrixStack, @Nonnull ItemStack stack, int x, int y, List<ITextComponent> lines) {
-        TemporaryPortingUtils.drawHoveringText(stack, matrixStack, lines, x, y, width, height, -1, font);
+        GuiUtils.drawHoveringText(stack, matrixStack, lines, x, y, width, height, -1, font);
     }
 
     protected void onPreInit() {

diff --git a/src/main/java/com/refinedmods/refinedstorage/util/TemporaryPortingUtils.java b/src/main/java/com/refinedmods/refinedstorage/util/TemporaryPortingUtils.java