Updated to latest mappings

10 files changed, 37 insertions, 39 deletions

diff --git a/build.gradle b/build.gradle
index 8b2055aec..e0ad214b6 100755
--- a/build.gradle
+++ b/build.gradle
@@ -8,9 +8,9 @@ targetCompatibility = 1.8
 archivesBaseName = "RoughlyEnoughItems"
 version = "2.3.0.51"
 
-def minecraftVersion = "19w06a"
-def yarnVersion = "19w06a.5"
-def fabricVersion = "0.2.0.92"
+def minecraftVersion = "19w07a"
+def yarnVersion = "19w07a.13"
+def fabricVersion = "0.2.1.96"
 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.5.106"
+    modCompile "net.fabricmc:fabric-loader:0.3.6.107"
 
     // 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/config/ConfigEntry.java b/src/main/java/me/shedaniel/rei/gui/config/ConfigEntry.java
index 95fd5d987..ac993282e 100644
--- a/src/main/java/me/shedaniel/rei/gui/config/ConfigEntry.java
+++ b/src/main/java/me/shedaniel/rei/gui/config/ConfigEntry.java
@@ -4,7 +4,6 @@ import me.shedaniel.rei.client.ClientHelper;
 import me.shedaniel.rei.gui.widget.ButtonWidget;
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.audio.PositionedSoundInstance;
-import net.minecraft.client.font.FontRenderer;
 import net.minecraft.client.gui.widget.EntryListWidget;
 import net.minecraft.client.util.Window;
 import net.minecraft.sound.SoundEvents;
@@ -14,7 +13,6 @@ import java.awt.*;
 
 public class ConfigEntry extends EntryListWidget.Entry<ConfigEntry> {
     
-    private static final FontRenderer FONT_RENDERER = MinecraftClient.getInstance().fontRenderer;
     private TextComponent nameComponent;
     private ConfigEntryButtonProvider buttonProvider;
     private ButtonWidget buttonWidget;
@@ -42,12 +40,12 @@ public class ConfigEntry extends EntryListWidget.Entry<ConfigEntry> {
     public void draw(int entryWidth, int height, int i3, int i4, boolean isSelected, float delta) {
         Window window = MinecraftClient.getInstance().window;
         Point mouse = ClientHelper.getMouseLocation();
-        if (MinecraftClient.getInstance().fontRenderer.isRightToLeft()) {
-            MinecraftClient.getInstance().fontRenderer.drawWithShadow(nameComponent.getFormattedText(), window.getScaledWidth() - FONT_RENDERER.getStringWidth(nameComponent.getFormattedText()) - 40, getY() + 5, 16777215);
+        if (MinecraftClient.getInstance().textRenderer.isRightToLeft()) {
+            MinecraftClient.getInstance().textRenderer.drawWithShadow(nameComponent.getFormattedText(), window.getScaledWidth() - MinecraftClient.getInstance().textRenderer.getStringWidth(nameComponent.getFormattedText()) - 40, getY() + 5, 16777215);
             this.buttonWidget.text = buttonProvider.getText();
             this.buttonWidget.getBounds().setLocation(10, getY() + 2);
         } else {
-            MinecraftClient.getInstance().fontRenderer.drawWithShadow(nameComponent.getFormattedText(), 10.0F, getY() + 5, 16777215);
+            MinecraftClient.getInstance().textRenderer.drawWithShadow(nameComponent.getFormattedText(), 10.0F, getY() + 5, 16777215);
             this.buttonWidget.text = buttonProvider.getText();
             this.buttonWidget.getBounds().setLocation(window.getScaledWidth() - 190, getY() + 2);
         }
diff --git a/src/main/java/me/shedaniel/rei/gui/credits/CreditsEntry.java b/src/main/java/me/shedaniel/rei/gui/credits/CreditsEntry.java
index 65f7a3fd5..2ff11e701 100644
--- a/src/main/java/me/shedaniel/rei/gui/credits/CreditsEntry.java
+++ b/src/main/java/me/shedaniel/rei/gui/credits/CreditsEntry.java
@@ -16,7 +16,7 @@ public class CreditsEntry extends EntryListWidget.Entry<CreditsEntry> {
     public void draw(int entryWidth, int height, int i3, int i4, boolean isSelected, float delta) {
         int x = getX();
         int y = getY();
-        MinecraftClient.getInstance().fontRenderer.drawWithShadow(textComponent.getFormattedText(), x + 5, y + 5, -1);
+        MinecraftClient.getInstance().textRenderer.drawWithShadow(textComponent.getFormattedText(), x + 5, y + 5, -1);
     }
     
 }
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 62eda708d..d1a2465d6 100644
--- a/src/main/java/me/shedaniel/rei/gui/widget/ButtonWidget.java
+++ b/src/main/java/me/shedaniel/rei/gui/widget/ButtonWidget.java
@@ -3,7 +3,7 @@ package me.shedaniel.rei.gui.widget;
 import com.mojang.blaze3d.platform.GlStateManager;
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.audio.PositionedSoundInstance;
-import net.minecraft.client.font.FontRenderer;
+import net.minecraft.client.font.TextRenderer;
 import net.minecraft.client.gui.Drawable;
 import net.minecraft.sound.SoundEvents;
 import net.minecraft.text.TextComponent;
@@ -67,9 +67,9 @@ public abstract class ButtonWidget extends Drawable implements IWidget {
     public void draw(int mouseX, int mouseY, float partialTicks) {
         if (this.visible) {
             int x = bounds.x, y = bounds.y, width = bounds.width, height = bounds.height;
-            MinecraftClient minecraftClient_1 = MinecraftClient.getInstance();
-            FontRenderer fontRenderer_1 = minecraftClient_1.fontRenderer;
-            minecraftClient_1.getTextureManager().bindTexture(WIDGET_TEX);
+            MinecraftClient client = MinecraftClient.getInstance();
+            TextRenderer textRenderer = client.textRenderer;
+            client.getTextureManager().bindTexture(WIDGET_TEX);
             GlStateManager.color4f(1.0F, 1.0F, 1.0F, 1.0F);
             this.hovered = bounds.contains(mouseX, mouseY);
             int textureOffset = this.getTextureId(this.hovered);
@@ -98,7 +98,7 @@ public abstract class ButtonWidget extends Drawable implements IWidget {
                 colour = 16777120;
             }
             
-            this.drawStringCentered(fontRenderer_1, this.text, x + width / 2, y + (height - 8) / 2, colour);
+            this.drawStringCentered(textRenderer, this.text, x + width / 2, y + (height - 8) / 2, colour);
         }
     }
     
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 b747559d4..9061e5559 100644
--- a/src/main/java/me/shedaniel/rei/gui/widget/ItemSlotWidget.java
+++ b/src/main/java/me/shedaniel/rei/gui/widget/ItemSlotWidget.java
@@ -80,7 +80,7 @@ public class ItemSlotWidget extends Drawable implements HighlightableWidget {
             ItemRenderer itemRenderer = MinecraftClient.getInstance().getItemRenderer();
             itemRenderer.zOffset = 200.0F;
             itemRenderer.renderGuiItem(itemStack, x, y);
-            itemRenderer.renderGuiItemOverlay(MinecraftClient.getInstance().fontRenderer, itemStack, x, y, getItemCountOverlay(itemStack));
+            itemRenderer.renderGuiItemOverlay(MinecraftClient.getInstance().textRenderer, itemStack, x, y, getItemCountOverlay(itemStack));
             itemRenderer.zOffset = 0.0F;
         }
         if (!itemStack.isEmpty() && isHighlighted(mouseX, mouseY) && showToolTips)
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 034b41d67..ee529eb9d 100644
--- a/src/main/java/me/shedaniel/rei/gui/widget/LabelWidget.java
+++ b/src/main/java/me/shedaniel/rei/gui/widget/LabelWidget.java
@@ -25,7 +25,7 @@ public class LabelWidget extends Drawable implements IWidget {
     
     @Override
     public void draw(int mouseX, int mouseY, float partialTicks) {
-        drawStringCentered(MinecraftClient.getInstance().fontRenderer, text, x, y, -1);
+        drawStringCentered(MinecraftClient.getInstance().textRenderer, text, x, y, -1);
     }
     
 }
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 9a8e8796e..cdf66f661 100644
--- a/src/main/java/me/shedaniel/rei/gui/widget/TabWidget.java
+++ b/src/main/java/me/shedaniel/rei/gui/widget/TabWidget.java
@@ -80,7 +80,7 @@ public class TabWidget extends Drawable implements HighlightableWidget {
             this.itemRenderer.zOffset = 100.0F;
             GuiLighting.enableForItems();
             this.itemRenderer.renderGuiItem(getItemStack(), l, i1);
-            this.itemRenderer.renderGuiItemOverlay(MinecraftClient.getInstance().fontRenderer, getItemStack(), l, i1);
+            this.itemRenderer.renderGuiItemOverlay(MinecraftClient.getInstance().textRenderer, getItemStack(), l, i1);
             GlStateManager.disableLighting();
             this.itemRenderer.zOffset = 0.0F;
             this.zOffset = 0.0F;
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 fe5bc39c1..1dc8f7567 100644
--- a/src/main/java/me/shedaniel/rei/gui/widget/TextFieldWidget.java
+++ b/src/main/java/me/shedaniel/rei/gui/widget/TextFieldWidget.java
@@ -4,7 +4,7 @@ import com.google.common.base.Predicates;
 import com.mojang.blaze3d.platform.GlStateManager;
 import net.minecraft.SharedConstants;
 import net.minecraft.client.MinecraftClient;
-import net.minecraft.client.font.FontRenderer;
+import net.minecraft.client.font.TextRenderer;
 import net.minecraft.client.gui.Drawable;
 import net.minecraft.client.gui.Screen;
 import net.minecraft.client.render.BufferBuilder;
@@ -21,7 +21,7 @@ import java.util.function.Predicate;
 
 public class TextFieldWidget extends Drawable implements IWidget {
     
-    private final FontRenderer fontRenderer;
+    private final TextRenderer textRenderer;
     private int width;
     private int height;
     private int x;
@@ -62,7 +62,7 @@ public class TextFieldWidget extends Drawable implements IWidget {
         this.field_2099 = (string_1, integer_1) -> {
             return string_1;
         };
-        this.fontRenderer = MinecraftClient.getInstance().fontRenderer;
+        this.textRenderer = MinecraftClient.getInstance().textRenderer;
         this.x = x;
         this.y = y;
         this.width = width;
@@ -373,8 +373,8 @@ public class TextFieldWidget extends Drawable implements IWidget {
                     int_2 -= 4;
                 }
                 
-                String string_1 = this.fontRenderer.method_1714(this.text.substring(this.field_2103), this.method_1859());
-                this.method_1883(this.fontRenderer.method_1714(string_1, int_2).length() + this.field_2103);
+                String string_1 = this.textRenderer.trimToWidth(this.text.substring(this.field_2103), this.method_1859());
+                this.method_1883(this.textRenderer.trimToWidth(string_1, int_2).length() + this.field_2103);
                 return true;
             } else {
                 return false;
@@ -392,7 +392,7 @@ public class TextFieldWidget extends Drawable implements IWidget {
             int int_3 = this.editable ? this.field_2100 : this.field_2098;
             int int_4 = this.cursorMax - this.field_2103;
             int int_5 = this.cursorMin - this.field_2103;
-            String string_1 = this.fontRenderer.method_1714(this.text.substring(this.field_2103), this.method_1859());
+            String string_1 = this.textRenderer.trimToWidth(this.text.substring(this.field_2103), this.method_1859());
             boolean boolean_1 = int_4 >= 0 && int_4 <= string_1.length();
             boolean boolean_2 = this.focused && this.focusedTicks / 6 % 2 == 0 && boolean_1;
             int int_6 = this.hasBorder ? this.x + 4 : this.x;
@@ -404,7 +404,7 @@ public class TextFieldWidget extends Drawable implements IWidget {
             
             if (!string_1.isEmpty()) {
                 String string_2 = boolean_1 ? string_1.substring(0, int_4) : string_1;
-                int_8 = this.fontRenderer.drawWithShadow((String) this.field_2099.apply(string_2, this.field_2103), (float) int_6, (float) int_7, int_3);
+                int_8 = this.textRenderer.drawWithShadow((String) this.field_2099.apply(string_2, this.field_2103), (float) int_6, (float) int_7, int_3);
             }
             
             boolean boolean_3 = this.cursorMax < this.text.length() || this.text.length() >= this.getMaxLength();
@@ -417,11 +417,11 @@ public class TextFieldWidget extends Drawable implements IWidget {
             }
             
             if (!string_1.isEmpty() && boolean_1 && int_4 < string_1.length()) {
-                this.fontRenderer.drawWithShadow((String) this.field_2099.apply(string_1.substring(int_4), this.cursorMax), (float) int_8, (float) int_7, int_3);
+                this.textRenderer.drawWithShadow((String) this.field_2099.apply(string_1.substring(int_4), this.cursorMax), (float) int_8, (float) int_7, int_3);
             }
             
             if (!boolean_3 && this.suggestion != null) {
-                this.fontRenderer.drawWithShadow(this.suggestion, (float) (int_9 - 1), (float) int_7, -8355712);
+                this.textRenderer.drawWithShadow(this.suggestion, (float) (int_9 - 1), (float) int_7, -8355712);
             }
             
             int var10002;
@@ -431,19 +431,19 @@ public class TextFieldWidget extends Drawable implements IWidget {
                     int var10001 = int_7 - 1;
                     var10002 = int_9 + 1;
                     var10003 = int_7 + 1;
-                    this.fontRenderer.getClass();
+                    this.textRenderer.getClass();
                     Drawable.drawRect(int_9, var10001, var10002, var10003 + 9, -3092272);
                 } else {
-                    this.fontRenderer.drawWithShadow("_", (float) int_9, (float) int_7, int_3);
+                    this.textRenderer.drawWithShadow("_", (float) int_9, (float) int_7, int_3);
                 }
             }
             
             if (int_5 != int_4) {
-                int int_10 = int_6 + this.fontRenderer.getStringWidth(string_1.substring(0, int_5));
+                int int_10 = int_6 + this.textRenderer.getStringWidth(string_1.substring(0, int_5));
                 var10002 = int_7 - 1;
                 var10003 = int_10 - 1;
                 int var10004 = int_7 + 1;
-                this.fontRenderer.getClass();
+                this.textRenderer.getClass();
                 this.method_1886(int_9, var10002, var10003, var10004 + 9);
             }
             
@@ -555,16 +555,16 @@ public class TextFieldWidget extends Drawable implements IWidget {
     public void method_1884(int int_1) {
         int int_2 = this.text.length();
         this.cursorMin = MathHelper.clamp(int_1, 0, int_2);
-        if (this.fontRenderer != null) {
+        if (this.textRenderer != null) {
             if (this.field_2103 > int_2) {
                 this.field_2103 = int_2;
             }
             
             int int_3 = this.method_1859();
-            String string_1 = this.fontRenderer.method_1714(this.text.substring(this.field_2103), int_3);
+            String string_1 = this.textRenderer.trimToWidth(this.text.substring(this.field_2103), int_3);
             int int_4 = string_1.length() + this.field_2103;
             if (this.cursorMin == this.field_2103) {
-                this.field_2103 -= this.fontRenderer.method_1711(this.text, int_3, true).length();
+                this.field_2103 -= this.textRenderer.trimToWidth(this.text, int_3, true).length();
             }
             
             if (this.cursorMin > int_4) {
@@ -595,7 +595,7 @@ public class TextFieldWidget extends Drawable implements IWidget {
     }
     
     public int method_1889(int int_1) {
-        return int_1 > this.text.length() ? this.x : this.x + this.fontRenderer.getStringWidth(this.text.substring(0, int_1));
+        return int_1 > this.text.length() ? this.x : this.x + this.textRenderer.getStringWidth(this.text.substring(0, int_1));
     }
     
     public void setX(int int_1) {
diff --git a/src/main/java/me/shedaniel/rei/mixin/MixinClientPlayNetworkHandler.java b/src/main/java/me/shedaniel/rei/mixin/MixinClientPlayNetworkHandler.java
index 660029d8c..4660d6a51 100644
--- a/src/main/java/me/shedaniel/rei/mixin/MixinClientPlayNetworkHandler.java
+++ b/src/main/java/me/shedaniel/rei/mixin/MixinClientPlayNetworkHandler.java
@@ -2,7 +2,7 @@ package me.shedaniel.rei.mixin;
 
 import me.shedaniel.rei.RoughlyEnoughItemsCore;
 import net.minecraft.client.network.ClientPlayNetworkHandler;
-import net.minecraft.client.network.packet.SynchronizeRecipesClientPacket;
+import net.minecraft.client.network.packet.SynchronizeRecipesS2CPacket;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
@@ -12,7 +12,7 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 public class MixinClientPlayNetworkHandler {
     
     @Inject(method = "onSynchronizeRecipes", at = @At("RETURN"))
-    private void onUpdateRecipes(SynchronizeRecipesClientPacket packetIn, CallbackInfo ci) {
+    private void onUpdateRecipes(SynchronizeRecipesS2CPacket packetIn, CallbackInfo ci) {
         RoughlyEnoughItemsCore.getRecipeHelper().recipesLoaded(((ClientPlayNetworkHandler) ((Object) this)).getRecipeManager());
     }
     
diff --git a/src/main/java/me/shedaniel/rei/plugin/DefaultCampfireCategory.java b/src/main/java/me/shedaniel/rei/plugin/DefaultCampfireCategory.java
index db681d863..fb87875bd 100644
--- a/src/main/java/me/shedaniel/rei/plugin/DefaultCampfireCategory.java
+++ b/src/main/java/me/shedaniel/rei/plugin/DefaultCampfireCategory.java
@@ -54,8 +54,8 @@ public class DefaultCampfireCategory implements IRecipeCategory<DefaultCampfireD
                 int width = MathHelper.ceil((System.currentTimeMillis() / 250 % 24d) / 1f);
                 drawTexturedRect(startPoint.x + 24, startPoint.y + 18, 82, 91, width, 17);
                 String text = I18n.translate("category.rei.campfire.time", MathHelper.floor(recipeDisplaySupplier.get().getCookTime() / 20d));
-                int length = MinecraftClient.getInstance().fontRenderer.getStringWidth(text);
-                MinecraftClient.getInstance().fontRenderer.draw(text, bounds.x + bounds.width - length - 5, startPoint.y + 54 - 8, 4210752);
+                int length = MinecraftClient.getInstance().textRenderer.getStringWidth(text);
+                MinecraftClient.getInstance().textRenderer.draw(text, bounds.x + bounds.width - length - 5, startPoint.y + 54 - 8, 4210752);
             }
         }));
         widgets.add(new ItemSlotWidget(startPoint.x + 1, startPoint.y + 11, recipeDisplaySupplier.get().getInput().get(0), true, true, true));