Update REi to 19w39a

6 files changed, 25 insertions, 24 deletions

diff --git a/build.gradle b/build.gradle
index 204048795..e0d273c5b 100755
--- a/build.gradle
+++ b/build.gradle
@@ -13,7 +13,7 @@ archivesBaseName = "RoughlyEnoughItems"
 group = "me.shedaniel"
 
 def ENV = System.getenv()
-version = (((String) project.mod_version).contains("unstable") ? (project.mod_version + "." + buildTime()) : project.mod_version) + "+" + (ENV.BUILD_NUMBER ? ("build." + ENV.BUILD_NUMBER) : "local")
+version = (((String) project.mod_version).contains("unstable") ? (project.mod_version + "." + buildTime()) : project.mod_version + "+" + (ENV.BUILD_NUMBER ? ("build." + ENV.BUILD_NUMBER) : "local"))
 
 def includeDep = true
 
diff --git a/gradle.properties b/gradle.properties
index c7f04e8ad..726b6b77c 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,10 +1,10 @@
 mod_version=3.1.5-unstable
-minecraft_version=19w38b
-yarn_version=19w38b+build.9
+minecraft_version=19w39a
+yarn_version=19w39a+build.2
 fabricloader_version=0.6.2+build.166
 jankson_version=1.1.0
-cloth_events_version=1.0.0-unstable.201909280702
-cloth_config_version=2.0.0-unstable.201909280635
+cloth_events_version=1.0.0-unstable.201909290743
+cloth_config_version=2.0.0-unstable.201909290713
 modmenu_version=1.7.13-unstable.19w38b+build.5
-fabric_api=0.3.3+build.235-1.15
+fabric_api=0.4.0+build.239-1.15
 
diff --git a/src/main/java/me/shedaniel/rei/gui/VillagerRecipeViewingScreen.java b/src/main/java/me/shedaniel/rei/gui/VillagerRecipeViewingScreen.java
index 41fb88c5d..11606bce0 100644
--- a/src/main/java/me/shedaniel/rei/gui/VillagerRecipeViewingScreen.java
+++ b/src/main/java/me/shedaniel/rei/gui/VillagerRecipeViewingScreen.java
@@ -7,10 +7,10 @@ package me.shedaniel.rei.gui;
 
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
+import com.mojang.blaze3d.systems.RenderSystem;
 import com.zeitheron.hammercore.client.utils.Scissors;
 import me.shedaniel.math.api.Point;
 import me.shedaniel.math.api.Rectangle;
-import com.mojang.blaze3d.systems.RenderSystem;
 import me.shedaniel.math.impl.PointHelper;
 import me.shedaniel.rei.RoughlyEnoughItemsCore;
 import me.shedaniel.rei.api.*;
@@ -375,10 +375,10 @@ public class VillagerRecipeViewingScreen extends Screen {
             RenderSystem.shadeModel(7425);
             buffer.begin(7, VertexFormats.POSITION_COLOR);
             float b = ScreenHelper.isDarkModeEnabled() ? 0.37f : 1f;
-            buffer.vertex(scrollbarPositionMinX, minY + scrollBarHeight, 1000D).color(b, b, b, scrollBarAlpha).next();
-            buffer.vertex(scrollbarPositionMaxX, minY + scrollBarHeight, 1000D).color(b, b, b, scrollBarAlpha).next();
-            buffer.vertex(scrollbarPositionMaxX, minY, 1000D).color(b, b, b, scrollBarAlpha).next();
-            buffer.vertex(scrollbarPositionMinX, minY, 1000D).color(b, b, b, scrollBarAlpha).next();
+            buffer.method_22912(scrollbarPositionMinX, minY + scrollBarHeight, 1000D).method_22915(b, b, b, scrollBarAlpha).next();
+            buffer.method_22912(scrollbarPositionMaxX, minY + scrollBarHeight, 1000D).method_22915(b, b, b, scrollBarAlpha).next();
+            buffer.method_22912(scrollbarPositionMaxX, minY, 1000D).method_22915(b, b, b, scrollBarAlpha).next();
+            buffer.method_22912(scrollbarPositionMinX, minY, 1000D).method_22915(b, b, b, scrollBarAlpha).next();
             tessellator.draw();
             RenderSystem.shadeModel(7424);
             RenderSystem.disableBlend();
diff --git a/src/main/java/me/shedaniel/rei/gui/renderers/FluidRenderer.java b/src/main/java/me/shedaniel/rei/gui/renderers/FluidRenderer.java
index 972545ec1..dea84cea9 100644
--- a/src/main/java/me/shedaniel/rei/gui/renderers/FluidRenderer.java
+++ b/src/main/java/me/shedaniel/rei/gui/renderers/FluidRenderer.java
@@ -70,10 +70,10 @@ public abstract class FluidRenderer extends Renderer {
             Tessellator tess = Tessellator.getInstance();
             BufferBuilder bb = tess.getBufferBuilder();
             bb.begin(7, VertexFormats.POSITION_UV_COLOR);
-            bb.vertex(x + 16, y, getBlitOffset()).texture(sprite.getMaxU(), sprite.getMinV()).color(r, g, b, a).next();
-            bb.vertex(x, y, getBlitOffset()).texture(sprite.getMinU(), sprite.getMinV()).color(r, g, b, a).next();
-            bb.vertex(x, y + 16, getBlitOffset()).texture(sprite.getMinU(), sprite.getMaxV()).color(r, g, b, a).next();
-            bb.vertex(x + 16, y + 16, getBlitOffset()).texture(sprite.getMaxU(), sprite.getMaxV()).color(r, g, b, a).next();
+            bb.method_22912(x + 16, y, getBlitOffset()).method_22913(sprite.getMaxU(), sprite.getMinV()).color(r, g, b, a).next();
+            bb.method_22912(x, y, getBlitOffset()).method_22913(sprite.getMinU(), sprite.getMinV()).color(r, g, b, a).next();
+            bb.method_22912(x, y + 16, getBlitOffset()).method_22913(sprite.getMinU(), sprite.getMaxV()).color(r, g, b, a).next();
+            bb.method_22912(x + 16, y + 16, getBlitOffset()).method_22913(sprite.getMaxU(), sprite.getMaxV()).color(r, g, b, a).next();
             tess.draw();
         }
         setBlitOffset(0);
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 30169ef6e..cbfdd9d10 100644
--- a/src/main/java/me/shedaniel/rei/gui/widget/EntryListWidget.java
+++ b/src/main/java/me/shedaniel/rei/gui/widget/EntryListWidget.java
@@ -321,10 +321,10 @@ public class EntryListWidget extends Widget {
                 RenderSystem.shadeModel(7425);
                 buffer.begin(7, VertexFormats.POSITION_COLOR);
                 float b = ScreenHelper.isDarkModeEnabled() ? 0.8f : 1f;
-                buffer.vertex(scrollbarPositionMinX, minY + scrollBarHeight, 1000D).color(b, b, b, scrollBarAlpha).next();
-                buffer.vertex(scrollbarPositionMaxX, minY + scrollBarHeight, 1000D).color(b, b, b, scrollBarAlpha).next();
-                buffer.vertex(scrollbarPositionMaxX, minY, 1000D).color(b, b, b, scrollBarAlpha).next();
-                buffer.vertex(scrollbarPositionMinX, minY, 1000D).color(b, b, b, scrollBarAlpha).next();
+                buffer.method_22912(scrollbarPositionMinX, minY + scrollBarHeight, 1000D).method_22915(b, b, b, scrollBarAlpha).next();
+                buffer.method_22912(scrollbarPositionMaxX, minY + scrollBarHeight, 1000D).method_22915(b, b, b, scrollBarAlpha).next();
+                buffer.method_22912(scrollbarPositionMaxX, minY, 1000D).method_22915(b, b, b, scrollBarAlpha).next();
+                buffer.method_22912(scrollbarPositionMinX, minY, 1000D).method_22915(b, b, b, scrollBarAlpha).next();
                 tessellator.draw();
                 RenderSystem.shadeModel(7424);
                 RenderSystem.disableBlend();
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 512aa776f..c726fb2bd 100644
--- a/src/main/java/me/shedaniel/rei/gui/widget/TextFieldWidget.java
+++ b/src/main/java/me/shedaniel/rei/gui/widget/TextFieldWidget.java
@@ -6,6 +6,7 @@
 package me.shedaniel.rei.gui.widget;
 
 import com.google.common.base.Predicates;
+import com.mojang.blaze3d.platform.GlStateManager;
 import com.mojang.blaze3d.systems.RenderSystem;
 import me.shedaniel.math.api.Rectangle;
 import net.minecraft.SharedConstants;
@@ -481,12 +482,12 @@ public class TextFieldWidget extends WidgetWithBounds implements Tickable {
         RenderSystem.color4f(0.0F, 0.0F, 255.0F, 255.0F);
         RenderSystem.disableTexture();
         RenderSystem.enableColorLogicOp();
-        RenderSystem.logicOp(5387);
+        RenderSystem.logicOp(GlStateManager.LogicOp.OR_REVERSE);
         bufferBuilder_1.begin(7, VertexFormats.POSITION);
-        bufferBuilder_1.vertex((double) int_1, (double) int_4, getBlitOffset() + 50d).next();
-        bufferBuilder_1.vertex((double) int_3, (double) int_4, getBlitOffset() + 50d).next();
-        bufferBuilder_1.vertex((double) int_3, (double) int_2, getBlitOffset() + 50d).next();
-        bufferBuilder_1.vertex((double) int_1, (double) int_2, getBlitOffset() + 50d).next();
+        bufferBuilder_1.method_22912((double) int_1, (double) int_4, getBlitOffset() + 50d).next();
+        bufferBuilder_1.method_22912((double) int_3, (double) int_4, getBlitOffset() + 50d).next();
+        bufferBuilder_1.method_22912((double) int_3, (double) int_2, getBlitOffset() + 50d).next();
+        bufferBuilder_1.method_22912((double) int_1, (double) int_2, getBlitOffset() + 50d).next();
         tessellator_1.draw();
         RenderSystem.disableColorLogicOp();
         RenderSystem.enableTexture();