diff options
| author | Falkreon <falkreon@gmail.com> | 2019-11-17 16:26:55 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-11-17 16:26:55 -0600 |
| commit | 0275f202f49820256480de9ac8bf01f13c4e0550 (patch) | |
| tree | 5ea9ae9e2bce3f4be4547db04d0c55a771f5af2d /src/main/java | |
| parent | 6b40020b11fb6568c69699885f2836b552c40dc1 (diff) | |
| parent | 15bf3f7710c4ce9dd8f9216221baf06cf5858ef6 (diff) | |
| download | LibGui-0275f202f49820256480de9ac8bf01f13c4e0550.tar.gz LibGui-0275f202f49820256480de9ac8bf01f13c4e0550.tar.bz2 LibGui-0275f202f49820256480de9ac8bf01f13c4e0550.zip | |
Merge pull request #23 from Juuxel/19w46b-update
Update to 19w46b
Diffstat (limited to 'src/main/java')
| -rw-r--r-- | src/main/java/io/github/cottonmc/cotton/gui/client/ScreenDrawing.java | 10 | ||||
| -rw-r--r-- | src/main/java/io/github/cottonmc/cotton/gui/widget/WTextField.java | 2 |
2 files changed, 6 insertions, 6 deletions
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(); |