Merge branch 'master' of https://github.com/CottonMC/LibGui

5 files changed, 11 insertions, 11 deletions

diff --git a/README.md b/README.md
index 6bc03c7..b8c415d 100644
--- a/README.md
+++ b/README.md
@@ -8,7 +8,7 @@ GUI system. Controls can be hung on an itemslot grid or offset from it. Panel st
 and opacity can be customized, and everything can be extended.
 
 
-See the [Cotton wiki](https://cottonmc.github.io/Wiki/getting_started/SetupDeveloper.html) for setup
+See the [LibGui wiki](https://github.com/CottonMC/LibGui/wiki) for setup
 
 And for code examples:
 * [Client-Only Guis](https://github.com/CottonMC/LibGui/wiki/Client-Sided-Guis) 
diff --git a/build.gradle b/build.gradle
index fa05814..e8e41d8 100644
--- a/build.gradle
+++ b/build.gradle
@@ -13,7 +13,7 @@ buildscript {
 	
 	dependencies {
 		System.out.println(rootProject.name);
-		if (rootProject.name=="LibGUI") {
+		if (rootProject.name.equalsIgnoreCase("LibGUI")) {
 			System.out.println("Added libgui to classpath");
 			classpath 'fabric-loom:fabric-loom.gradle.plugin:0.2.5-SNAPSHOT'
 		}
diff --git a/gradle.properties b/gradle.properties
index fef99be..d568886 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -3,8 +3,8 @@ org.gradle.jvmargs=-Xmx1G
 
 # Fabric Properties
 	# check these on https://fabricmc.net/use
-	minecraft_version=19w42a
-	yarn_mappings=19w42a+build.1
+	minecraft_version=19w46b
+	yarn_mappings=19w46b+build.1
 	loader_version=0.6.3+build.167
 
 # Mod Properties
@@ -13,5 +13,5 @@ org.gradle.jvmargs=-Xmx1G
 	archives_base_name = LibGui
 
 # Dependencies
-	fabric_version=0.4.8+build.255-1.15
+	fabric_version=0.4.12+build.261-1.15
 	jankson_version=2.0.0+j1.2.0
diff --git a/src/main/java/io/github/cottonmc/cotton/gui/client/ScreenDrawing.java b/src/main/java/io/github/cottonmc/cotton/gui/client/ScreenDrawing.java
index 3377b2c..e2b5c77 100644
--- a/src/main/java/io/github/cottonmc/cotton/gui/client/ScreenDrawing.java
+++ b/src/main/java/io/github/cottonmc/cotton/gui/client/ScreenDrawing.java
@@ -32,12 +32,12 @@ public class ScreenDrawing {
 		float g = (color >> 8 & 255) / 255.0F;
 		float b = (color & 255) / 255.0F;
 		Tessellator tessellator = Tessellator.getInstance();
-		BufferBuilder buffer = tessellator.getBufferBuilder();
+		BufferBuilder buffer = tessellator.getBuffer();
 		RenderSystem.enableBlend();
 		//GlStateManager.disableTexture2D();
-		RenderSystem.blendFuncSeparate(GlStateManager.class_4535.SRC_ALPHA, GlStateManager.class_4534.ONE_MINUS_SRC_ALPHA, GlStateManager.class_4535.ONE, GlStateManager.class_4534.ZERO);
+		RenderSystem.blendFuncSeparate(GlStateManager.SourceFactor.SRC_ALPHA, GlStateManager.DestFactor.ONE_MINUS_SRC_ALPHA, GlStateManager.SourceFactor.ONE, GlStateManager.DestFactor.ZERO);
 		RenderSystem.color4f(r, g, b, 1.0f);
-		buffer.begin(GL11.GL_QUADS, VertexFormats.POSITION_UV); //I thought GL_QUADS was deprecated but okay, sure.
+		buffer.begin(GL11.GL_QUADS, VertexFormats.POSITION_TEXTURE); //I thought GL_QUADS was deprecated but okay, sure.
 		buffer.vertex(x,         y + height, 0).texture(u1, v2).next();
 		buffer.vertex(x + width, y + height, 0).texture(u2, v2).next();
 		buffer.vertex(x + width, y,          0).texture(u2, v1).next();
@@ -79,10 +79,10 @@ public class ScreenDrawing {
 		float g = (color >> 8 & 255) / 255.0F;
 		float b = (color & 255) / 255.0F;
 		Tessellator tessellator = Tessellator.getInstance();
-		BufferBuilder buffer = tessellator.getBufferBuilder();
+		BufferBuilder buffer = tessellator.getBuffer();
 		RenderSystem.enableBlend();
 		RenderSystem.disableTexture();
-		RenderSystem.blendFuncSeparate(GlStateManager.class_4535.SRC_ALPHA, GlStateManager.class_4534.ONE_MINUS_SRC_ALPHA, GlStateManager.class_4535.ONE, GlStateManager.class_4534.ZERO);
+		RenderSystem.blendFuncSeparate(GlStateManager.SourceFactor.SRC_ALPHA, GlStateManager.DestFactor.ONE_MINUS_SRC_ALPHA, GlStateManager.SourceFactor.ONE, GlStateManager.DestFactor.ZERO);
 		RenderSystem.color4f(r, g, b, a);
 		buffer.begin(GL11.GL_QUADS, VertexFormats.POSITION); //I thought GL_QUADS was deprecated but okay, sure.
 		buffer.vertex(left,         top + height, 0.0D).next();
diff --git a/src/main/java/io/github/cottonmc/cotton/gui/widget/WTextField.java b/src/main/java/io/github/cottonmc/cotton/gui/widget/WTextField.java
index cf7e444..12c6ae6 100644
--- a/src/main/java/io/github/cottonmc/cotton/gui/widget/WTextField.java
+++ b/src/main/java/io/github/cottonmc/cotton/gui/widget/WTextField.java
@@ -402,7 +402,7 @@ public class WTextField extends WWidget {
 	@Environment(EnvType.CLIENT)
 	private void invertedRect(int x, int y, int width, int height) {
 		Tessellator tessellator_1 = Tessellator.getInstance();
-		BufferBuilder bufferBuilder_1 = tessellator_1.getBufferBuilder();
+		BufferBuilder bufferBuilder_1 = tessellator_1.getBuffer();
 		RenderSystem.color4f(0.0F, 0.0F, 255.0F, 255.0F);
 		RenderSystem.disableTexture();
 		RenderSystem.enableColorLogicOp();