diff options
10 files changed, 25 insertions, 27 deletions
diff --git a/build.gradle b/build.gradle index 581c715cc..03d7b9cd5 100755 --- a/build.gradle +++ b/build.gradle @@ -6,11 +6,11 @@ sourceCompatibility = 1.8 targetCompatibility = 1.8 archivesBaseName = "RoughlyEnoughItems" -version = "2.2.0.48" +version = "2.2.0.49" -def minecraftVersion = "19w04b" -def yarnVersion = "19w04b.5" -def fabricVersion = "0.1.5.83" +def minecraftVersion = "19w05a" +def yarnVersion = "19w05a.5" +def fabricVersion = "0.1.5.88" def pluginLoaderVersion = "1.14-1.0.6-8" minecraft { @@ -30,7 +30,7 @@ repositories { dependencies { minecraft "com.mojang:minecraft:${minecraftVersion}" mappings "net.fabricmc:yarn:${yarnVersion}" - modCompile "net.fabricmc:fabric-loader:0.3.4.104" + modCompile "net.fabricmc:fabric-loader:0.3.5.106" // Fabric API. This is technically optional, but you probably want it anyway. modCompile "net.fabricmc:fabric:${fabricVersion}" diff --git a/src/main/java/me/shedaniel/rei/gui/widget/ConfigWidget.java b/src/main/java/me/shedaniel/rei/gui/widget/ConfigWidget.java index 8637afd8a..c43d4c12e 100644 --- a/src/main/java/me/shedaniel/rei/gui/widget/ConfigWidget.java +++ b/src/main/java/me/shedaniel/rei/gui/widget/ConfigWidget.java @@ -117,7 +117,7 @@ public class ConfigWidget extends Screen { e.printStackTrace(); } } - + @Override public void draw(int mouseX, int mouseY, float partialTicks) { text = getTrueFalseText(RoughlyEnoughItemsCore.getConfigHelper().isMirrorItemPanel()); @@ -138,7 +138,7 @@ public class ConfigWidget extends Screen { e.printStackTrace(); } } - + @Override public void draw(int mouseX, int mouseY, float partialTicks) { text = getTrueFalseText(RoughlyEnoughItemsCore.getConfigHelper().checkUpdates()); 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 ceafcec56..9e11bcee3 100644 --- a/src/main/java/me/shedaniel/rei/gui/widget/CraftableToggleButtonWidget.java +++ b/src/main/java/me/shedaniel/rei/gui/widget/CraftableToggleButtonWidget.java @@ -36,7 +36,7 @@ public abstract class CraftableToggleButtonWidget extends ButtonWidget { GuiLighting.enableForItems(); this.itemRenderer.zOffset = 0.0F; - this.itemRenderer.renderItemAndGlowInGui(new ItemStack(Blocks.CRAFTING_TABLE), x + 2, y + 2); + this.itemRenderer.renderGuiItem(new ItemStack(Blocks.CRAFTING_TABLE), x + 2, y + 2); this.itemRenderer.zOffset = 0.0F; GuiLighting.disable(); MinecraftClient.getInstance().getTextureManager().bindTexture(CHEST_GUI_TEXTURE); diff --git a/src/main/java/me/shedaniel/rei/gui/widget/ItemListOverlay.java b/src/main/java/me/shedaniel/rei/gui/widget/ItemListOverlay.java index c20c9b89b..b0de4d5f1 100644 --- a/src/main/java/me/shedaniel/rei/gui/widget/ItemListOverlay.java +++ b/src/main/java/me/shedaniel/rei/gui/widget/ItemListOverlay.java @@ -5,12 +5,10 @@ import me.shedaniel.rei.RoughlyEnoughItemsCore; import me.shedaniel.rei.client.*; import net.minecraft.client.MinecraftClient; import net.minecraft.client.gui.Drawable; -import net.minecraft.client.item.TooltipOptions; import net.minecraft.client.network.ClientPlayerEntity; import net.minecraft.client.resource.language.I18n; import net.minecraft.item.ItemGroup; import net.minecraft.item.ItemStack; -import net.minecraft.text.TextComponent; import net.minecraft.util.math.MathHelper; import org.apache.commons.lang3.StringUtils; @@ -154,9 +152,9 @@ public class ItemListOverlay extends Drawable implements IWidget { private boolean filterItem(ItemStack itemStack, List<SearchArgument> arguments) { String mod = ClientHelper.getModFromItemStack(itemStack); - List<String> toolTipsList = getStackTooltip(itemStack); + List<String> toolTipsList = MinecraftClient.getInstance().currentScreen.getStackTooltip(itemStack); String toolTipsMixed = toolTipsList.stream().skip(1).collect(Collectors.joining()).toLowerCase(); - String allMixed = Stream.of(itemStack.getDisplayName().getString(), toolTipsMixed).collect(Collectors.joining()).toLowerCase(); + String allMixed = Stream.of(itemStack.getDisplayName().getFormattedText(), toolTipsMixed).collect(Collectors.joining()).toLowerCase(); for(SearchArgument searchArgument : arguments.stream().filter(searchArgument -> !searchArgument.isInclude()).collect(Collectors.toList())) { if (searchArgument.getArgumentType().equals(SearchArgument.ArgumentType.MOD)) if (mod.toLowerCase().contains(searchArgument.getText().toLowerCase())) @@ -182,11 +180,6 @@ public class ItemListOverlay extends Drawable implements IWidget { return true; } - private List<String> getStackTooltip(ItemStack itemStack) { - MinecraftClient client = MinecraftClient.getInstance(); - return itemStack.getTooltipText(client.player, client.options.advancedItemTooltips ? TooltipOptions.Instance.ADVANCED : TooltipOptions.Instance.NORMAL).stream().map(TextComponent::getFormattedText).collect(Collectors.toList()); - } - private void calculateListSize(Rectangle rect) { int xOffset = 0, yOffset = 0; this.width = 0; diff --git a/src/main/java/me/shedaniel/rei/gui/widget/ItemSlotWidget.java b/src/main/java/me/shedaniel/rei/gui/widget/ItemSlotWidget.java index b78951f7e..96682565b 100644 --- a/src/main/java/me/shedaniel/rei/gui/widget/ItemSlotWidget.java +++ b/src/main/java/me/shedaniel/rei/gui/widget/ItemSlotWidget.java @@ -65,8 +65,8 @@ public class ItemSlotWidget extends Drawable implements HighlightableWidget { GuiLighting.enableForItems(); ItemRenderer itemRenderer = MinecraftClient.getInstance().getItemRenderer(); itemRenderer.zOffset = 200.0F; - itemRenderer.renderItemAndGlowInGui(itemStack, x, y); - itemRenderer.renderItemOverlaysInGUIWithText(MinecraftClient.getInstance().fontRenderer, itemStack, x, y, getItemCountOverlay(itemStack)); + itemRenderer.renderGuiItem(itemStack, x, y); + itemRenderer.renderGuiItemOverlay(MinecraftClient.getInstance().fontRenderer, itemStack, x, y, getItemCountOverlay(itemStack)); itemRenderer.zOffset = 0.0F; if (isHighlighted(mouseX, mouseY) && showToolTips) drawToolTip(itemStack); @@ -82,8 +82,9 @@ public class ItemSlotWidget extends Drawable implements HighlightableWidget { MinecraftClient mc = MinecraftClient.getInstance(); List<String> toolTip = Lists.newArrayList(); try { - toolTip = GuiHelper.getLastOverlay().getStackTooltip(itemStack).stream().filter(s -> !s.equals(modString)).collect(Collectors.toList()); + toolTip = MinecraftClient.getInstance().currentScreen.getStackTooltip(itemStack).stream().filter(s -> !s.equals(modString)).collect(Collectors.toList()); } catch (Exception e) { + e.printStackTrace(); toolTip.add(itemStack.getDisplayName().getFormattedText()); } toolTip.addAll(getExtraToolTips(itemStack)); diff --git a/src/main/java/me/shedaniel/rei/gui/widget/SpeedCraftingButtonWidget.java b/src/main/java/me/shedaniel/rei/gui/widget/SpeedCraftingButtonWidget.java index a6dc0623e..0460857cb 100644 --- a/src/main/java/me/shedaniel/rei/gui/widget/SpeedCraftingButtonWidget.java +++ b/src/main/java/me/shedaniel/rei/gui/widget/SpeedCraftingButtonWidget.java @@ -1,13 +1,11 @@ package me.shedaniel.rei.gui.widget; -import me.shedaniel.rei.RoughlyEnoughItemsCore; import me.shedaniel.rei.api.IRecipeDisplay; import me.shedaniel.rei.api.SpeedCraftFunctional; import me.shedaniel.rei.client.ClientHelper; import me.shedaniel.rei.client.GuiHelper; import net.minecraft.client.MinecraftClient; import net.minecraft.client.resource.language.I18n; -import net.minecraft.item.ItemStack; import java.awt.*; import java.util.Arrays; 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 69dd361c9..9a8e8796e 100644 --- a/src/main/java/me/shedaniel/rei/gui/widget/TabWidget.java +++ b/src/main/java/me/shedaniel/rei/gui/widget/TabWidget.java @@ -79,8 +79,8 @@ public class TabWidget extends Drawable implements HighlightableWidget { this.zOffset = 100.0F; this.itemRenderer.zOffset = 100.0F; GuiLighting.enableForItems(); - this.itemRenderer.renderItemAndGlowInGui(getItemStack(), l, i1); - this.itemRenderer.renderItemOverlaysInGUI(MinecraftClient.getInstance().fontRenderer, getItemStack(), l, i1); + this.itemRenderer.renderGuiItem(getItemStack(), l, i1); + this.itemRenderer.renderGuiItemOverlay(MinecraftClient.getInstance().fontRenderer, getItemStack(), l, i1); GlStateManager.disableLighting(); this.itemRenderer.zOffset = 0.0F; this.zOffset = 0.0F; diff --git a/src/main/java/me/shedaniel/rei/update/UpdateChecker.java b/src/main/java/me/shedaniel/rei/update/UpdateChecker.java index 9c60d9e6b..d93773b84 100644 --- a/src/main/java/me/shedaniel/rei/update/UpdateChecker.java +++ b/src/main/java/me/shedaniel/rei/update/UpdateChecker.java @@ -127,7 +127,8 @@ public class UpdateChecker implements ClientModInitializer { } if (downloadedString != null && !downloadedString.equalsIgnoreCase("{}")) latestForGame = new Version(parseLatest(element, SharedConstants.getGameVersion().getName())); - else latestForGame = new Version("0.0.0"); + else + latestForGame = new Version("0.0.0"); } private InputStream downloadVersionString() { diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index 3aa594dcc..aada1920b 100755 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -12,7 +12,7 @@ "me.shedaniel.rei.client.ClientHelper" ], "requires": { - "fabric": "0.1.5.83" + "fabric": "0.1.5.88" }, "recommended": { "pluginloader": "1.0.6" diff --git a/version.json b/version.json index 73e83560b..be5423280 100644 --- a/version.json +++ b/version.json @@ -10,7 +10,7 @@ }, { "game": "19w05a", - "mod": "2.2.0.48" + "mod": "2.2.0.49" } ], "changelogs": { @@ -19,6 +19,11 @@ "version": "2.2.0.48", "text": "Added a version checker, an option to mirror the item panel and fixed interacting with REI when hidden.", "level": "light" + }, + { + "version": "2.2.0.49", + "text": "Fixed Crashing when rendering tooltips", + "level": "normal" } ] } |