Prechádzať zdrojové kódy

Unstable Beta for 19w38a/b

Danielshe 5 rokov pred
rodič
commit
d50b907b06

+ 2 - 8
build.gradle

@@ -132,20 +132,14 @@ curseforge {
     if (apiKey != null)
         project {
             id = '319057'
-            releaseType = 'release'
-            addGameVersion '1.14'
-            addGameVersion '1.14.1'
-            addGameVersion '1.14.2'
-            addGameVersion '1.14.3'
-            addGameVersion '1.14.4'
-            addGameVersion '1.14-Snapshot'
+            releaseType = 'beta'
             addGameVersion '1.15-Snapshot'
             addGameVersion 'Java 8'
             relations {
                 requiredDependency 'fabric-api'
             }
             mainArtifact(file("${project.buildDir}/libs/${project.archivesBaseName}-${project.version}.jar")) {
-                displayName = "[Fabric 1.14.x, 19w34a - 19w37a] ClothConfig2-$project.version"
+                displayName = "[Fabric 1.14.x, 19w38a - 19w38b] ClothConfig2-$project.version"
             }
             addArtifact(file("${project.buildDir}/libs/${project.archivesBaseName}-${project.version}-sources.jar"))
             afterEvaluate {

+ 5 - 5
gradle.properties

@@ -1,6 +1,6 @@
-minecraft_version=1.14.4
-yarn_version=1.14.4+build.8
-fabric_loader_version=0.4.8+build.159
-fabric_version=0.3.0+build.207
-mod_version=1.2.1
+minecraft_version=19w38b
+yarn_version=19w38b+build.12
+fabric_loader_version=0.6.2+build.166
+fabric_version=0.3.4+build.238-1.15
+mod_version=2.0.0-unstable
 modmenu_version=1.7.6+build.115

+ 21 - 21
src/main/java/me/shedaniel/clothconfig2/gui/ClothConfigScreen.java

@@ -3,13 +3,13 @@ package me.shedaniel.clothconfig2.gui;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
 import com.google.common.util.concurrent.AtomicDouble;
+import com.mojang.blaze3d.systems.RenderSystem;
 import it.unimi.dsi.fastutil.booleans.BooleanConsumer;
 import me.shedaniel.clothconfig2.api.AbstractConfigEntry;
 import me.shedaniel.clothconfig2.api.AbstractConfigListEntry;
 import me.shedaniel.clothconfig2.api.QueuedTooltip;
 import me.shedaniel.clothconfig2.gui.widget.DynamicElementListWidget;
 import me.shedaniel.math.api.Rectangle;
-import me.shedaniel.math.compat.RenderHelper;
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.font.TextRenderer;
 import net.minecraft.client.gui.DrawableHelper;
@@ -239,11 +239,11 @@ public abstract class ClothConfigScreen extends Screen {
             @Override
             public void renderButton(int int_1, int int_2, float float_1) {
                 minecraft.getTextureManager().bindTexture(CONFIG_TEX);
-                RenderHelper.color4f(1.0F, 1.0F, 1.0F, this.alpha);
+                RenderSystem.color4f(1.0F, 1.0F, 1.0F, this.alpha);
                 int int_3 = this.getYImage(this.isHovered());
-                RenderHelper.enableBlend();
-                RenderHelper.blendFuncSeparate(770, 771, 0, 1);
-                RenderHelper.blendFunc(770, 771);
+                RenderSystem.enableBlend();
+                RenderSystem.blendFuncSeparate(770, 771, 0, 1);
+                RenderSystem.blendFunc(770, 771);
                 this.blit(x, y, 12, 18 * int_3, width, height);
             }
         });
@@ -264,11 +264,11 @@ public abstract class ClothConfigScreen extends Screen {
             @Override
             public void renderButton(int int_1, int int_2, float float_1) {
                 minecraft.getTextureManager().bindTexture(CONFIG_TEX);
-                RenderHelper.color4f(1.0F, 1.0F, 1.0F, this.alpha);
+                RenderSystem.color4f(1.0F, 1.0F, 1.0F, this.alpha);
                 int int_3 = this.getYImage(this.isHovered());
-                RenderHelper.enableBlend();
-                RenderHelper.blendFuncSeparate(770, 771, 0, 1);
-                RenderHelper.blendFunc(770, 771);
+                RenderSystem.enableBlend();
+                RenderSystem.blendFuncSeparate(770, 771, 0, 1);
+                RenderSystem.blendFunc(770, 771);
                 this.blit(x, y, 0, 18 * int_3, width, height);
             }
         });
@@ -357,7 +357,7 @@ public abstract class ClothConfigScreen extends Screen {
                         errors.add(((Optional<String>) entry.getConfigError()).get());
             if (errors.size() > 0) {
                 minecraft.getTextureManager().bindTexture(CONFIG_TEX);
-                RenderHelper.color4f(1.0F, 1.0F, 1.0F, 1.0F);
+                RenderSystem.color4f(1.0F, 1.0F, 1.0F, 1.0F);
                 blit(10, 10, 0, 54, 3, 11);
                 if (errors.size() == 1)
                     drawString(minecraft.textRenderer, "§c" + errors.get(0), 18, 12, -1);
@@ -366,7 +366,7 @@ public abstract class ClothConfigScreen extends Screen {
             }
         } else if (!isEditable()) {
             minecraft.getTextureManager().bindTexture(CONFIG_TEX);
-            RenderHelper.color4f(1.0F, 1.0F, 1.0F, 1.0F);
+            RenderSystem.color4f(1.0F, 1.0F, 1.0F, 1.0F);
             blit(10, 10, 0, 54, 3, 11);
             drawString(minecraft.textRenderer, "§c" + I18n.translate("text.cloth-config.not_editable"), 18, 12, -1);
         }
@@ -380,11 +380,11 @@ public abstract class ClothConfigScreen extends Screen {
     }
     
     private void drawShades() {
-        RenderHelper.enableBlend();
-        RenderHelper.blendFuncSeparate(770, 771, 0, 1);
-        RenderHelper.disableAlphaTest();
-        RenderHelper.shadeModel(7425);
-        RenderHelper.disableTexture();
+        RenderSystem.enableBlend();
+        RenderSystem.blendFuncSeparate(770, 771, 0, 1);
+        RenderSystem.disableAlphaTest();
+        RenderSystem.shadeModel(7425);
+        RenderSystem.disableTexture();
         Tessellator tessellator = Tessellator.getInstance();
         BufferBuilder buffer = tessellator.getBufferBuilder();
         buffer.begin(7, VertexFormats.POSITION_UV_COLOR);
@@ -399,17 +399,17 @@ public abstract class ClothConfigScreen extends Screen {
         buffer.vertex(tabsBounds.getMaxX() - 20, tabsBounds.getMaxY() - 4, 0.0D).texture(1.0D, 0.0D).color(0, 0, 0, 0).next();
         buffer.vertex(tabsBounds.getMinX() + 20, tabsBounds.getMaxY() - 4, 0.0D).texture(0.0D, 0.0D).color(0, 0, 0, 0).next();
         tessellator.draw();
-        RenderHelper.enableTexture();
-        RenderHelper.shadeModel(7424);
-        RenderHelper.enableAlphaTest();
-        RenderHelper.disableBlend();
+        RenderSystem.enableTexture();
+        RenderSystem.shadeModel(7424);
+        RenderSystem.enableAlphaTest();
+        RenderSystem.disableBlend();
     }
     
     protected void overlayBackground(Rectangle rect, int red, int green, int blue, int startAlpha, int endAlpha) {
         Tessellator tessellator = Tessellator.getInstance();
         BufferBuilder buffer = tessellator.getBufferBuilder();
         minecraft.getTextureManager().bindTexture(getBackgroundLocation());
-        RenderHelper.color4f(1.0F, 1.0F, 1.0F, 1.0F);
+        RenderSystem.color4f(1.0F, 1.0F, 1.0F, 1.0F);
         float f = 32.0F;
         buffer.begin(7, VertexFormats.POSITION_UV_COLOR);
         buffer.vertex(rect.getMinX(), rect.getMaxY(), 0.0D).texture(rect.getMinX() / 32.0D, rect.getMaxY() / 32.0D).color(red, green, blue, endAlpha).next();

+ 22 - 19
src/main/java/me/shedaniel/clothconfig2/gui/widget/DynamicEntryListWidget.java

@@ -1,7 +1,7 @@
 package me.shedaniel.clothconfig2.gui.widget;
 
 import com.google.common.collect.Lists;
-import me.shedaniel.math.compat.RenderHelper;
+import com.mojang.blaze3d.systems.RenderSystem;
 import net.fabricmc.api.EnvType;
 import net.fabricmc.api.Environment;
 import net.minecraft.client.MinecraftClient;
@@ -160,12 +160,12 @@ public abstract class DynamicEntryListWidget<E extends DynamicEntryListWidget.En
         this.drawBackground();
         int scrollbarPosition = this.getScrollbarPosition();
         int int_4 = scrollbarPosition + 6;
-        RenderHelper.disableLighting();
-        RenderHelper.disableFog();
+        RenderSystem.disableLighting();
+        RenderSystem.disableFog();
         Tessellator tessellator = Tessellator.getInstance();
         BufferBuilder buffer = tessellator.getBufferBuilder();
         this.client.getTextureManager().bindTexture(backgroundLocation);
-        RenderHelper.color4f(1.0F, 1.0F, 1.0F, 1.0F);
+        RenderSystem.color4f(1.0F, 1.0F, 1.0F, 1.0F);
         float float_2 = 32.0F;
         buffer.begin(7, VertexFormats.POSITION_UV_COLOR);
         buffer.vertex(this.left, this.bottom, 0.0D).texture(this.left / 32.0F, ((this.bottom + (int) this.getScroll()) / 32.0F)).color(32, 32, 32, 255).next();
@@ -179,14 +179,14 @@ public abstract class DynamicEntryListWidget<E extends DynamicEntryListWidget.En
             this.renderHeader(rowLeft, startY, tessellator);
         
         this.renderList(rowLeft, startY, mouseX, mouseY, delta);
-        RenderHelper.disableDepthTest();
+        RenderSystem.disableDepthTest();
         this.renderHoleBackground(0, this.top, 255, 255);
         this.renderHoleBackground(this.bottom, this.height, 255, 255);
-        RenderHelper.enableBlend();
-        RenderHelper.blendFuncSeparate(770, 771, 0, 1);
-        RenderHelper.disableAlphaTest();
-        RenderHelper.shadeModel(7425);
-        RenderHelper.disableTexture();
+        RenderSystem.enableBlend();
+        RenderSystem.blendFuncSeparate(770, 771, 0, 1);
+        RenderSystem.disableAlphaTest();
+        RenderSystem.shadeModel(7425);
+        RenderSystem.disableTexture();
         buffer.begin(7, VertexFormats.POSITION_UV_COLOR);
         buffer.vertex(this.left, this.top + 4, 0.0D).texture(0.0D, 1.0D).color(0, 0, 0, 0).next();
         buffer.vertex(this.right, this.top + 4, 0.0D).texture(1.0D, 1.0D).color(0, 0, 0, 0).next();
@@ -203,10 +203,10 @@ public abstract class DynamicEntryListWidget<E extends DynamicEntryListWidget.En
         renderScrollBar(tessellator, buffer, maxScroll, scrollbarPosition, int_4);
         
         this.renderDecorations(mouseX, mouseY);
-        RenderHelper.enableTexture();
-        RenderHelper.shadeModel(7424);
-        RenderHelper.enableAlphaTest();
-        RenderHelper.disableBlend();
+        RenderSystem.enableTexture();
+        RenderSystem.shadeModel(7424);
+        RenderSystem.enableAlphaTest();
+        RenderSystem.disableBlend();
     }
     
     protected void renderScrollBar(Tessellator tessellator, BufferBuilder buffer, int maxScroll, int scrollbarPositionMinX, int scrollbarPositionMaxX) {
@@ -386,23 +386,23 @@ public abstract class DynamicEntryListWidget<E extends DynamicEntryListWidget.En
             if (this.visible && this.isSelected(renderIndex)) {
                 itemMinX = this.left + this.width / 2 - itemWidth / 2;
                 itemMaxX = itemMinX + itemWidth;
-                RenderHelper.disableTexture();
+                RenderSystem.disableTexture();
                 float float_2 = this.isFocused() ? 1.0F : 0.5F;
-                RenderHelper.color4f(float_2, float_2, float_2, 1.0F);
+                RenderSystem.color4f(float_2, float_2, float_2, 1.0F);
                 buffer.begin(7, VertexFormats.POSITION);
                 buffer.vertex((double) itemMinX, (double) (itemY + itemHeight + 2), 0.0D).next();
                 buffer.vertex((double) itemMaxX, (double) (itemY + itemHeight + 2), 0.0D).next();
                 buffer.vertex((double) itemMaxX, (double) (itemY - 2), 0.0D).next();
                 buffer.vertex((double) itemMinX, (double) (itemY - 2), 0.0D).next();
                 tessellator.draw();
-                RenderHelper.color4f(0.0F, 0.0F, 0.0F, 1.0F);
+                RenderSystem.color4f(0.0F, 0.0F, 0.0F, 1.0F);
                 buffer.begin(7, VertexFormats.POSITION);
                 buffer.vertex((double) (itemMinX + 1), (double) (itemY + itemHeight + 1), 0.0D).next();
                 buffer.vertex((double) (itemMaxX - 1), (double) (itemY + itemHeight + 1), 0.0D).next();
                 buffer.vertex((double) (itemMaxX - 1), (double) (itemY - 1), 0.0D).next();
                 buffer.vertex((double) (itemMinX + 1), (double) (itemY - 1), 0.0D).next();
                 tessellator.draw();
-                RenderHelper.enableTexture();
+                RenderSystem.enableTexture();
             }
             
             int y = this.getRowTop(renderIndex);
@@ -432,7 +432,7 @@ public abstract class DynamicEntryListWidget<E extends DynamicEntryListWidget.En
         Tessellator tessellator_1 = Tessellator.getInstance();
         BufferBuilder bufferBuilder_1 = tessellator_1.getBufferBuilder();
         this.client.getTextureManager().bindTexture(backgroundLocation);
-        RenderHelper.color4f(1.0F, 1.0F, 1.0F, 1.0F);
+        RenderSystem.color4f(1.0F, 1.0F, 1.0F, 1.0F);
         float float_1 = 32.0F;
         bufferBuilder_1.begin(7, VertexFormats.POSITION_UV_COLOR);
         bufferBuilder_1.vertex((double) this.left, (double) int_2, 0.0D).texture(0.0D, (double) ((float) int_2 / 32.0F)).color(64, 64, 64, int_4).next();
@@ -456,6 +456,7 @@ public abstract class DynamicEntryListWidget<E extends DynamicEntryListWidget.En
         return boolean_1;
     }
     
+    @SuppressWarnings("deprecation")
     @Environment(EnvType.CLIENT)
     public abstract static class Entry<E extends Entry<E>> extends DrawableHelper implements Element {
         @Deprecated DynamicEntryListWidget<E> parent;
@@ -504,6 +505,7 @@ public abstract class DynamicEntryListWidget<E extends DynamicEntryListWidget.En
         }
         
         @Override
+        @SuppressWarnings("deprecation")
         public E set(int int_1, E itemListWidget$Item_1) {
             E itemListWidget$Item_2 = (E) this.items.set(int_1, itemListWidget$Item_1);
             itemListWidget$Item_1.parent = DynamicEntryListWidget.this;
@@ -511,6 +513,7 @@ public abstract class DynamicEntryListWidget<E extends DynamicEntryListWidget.En
         }
         
         @Override
+        @SuppressWarnings("deprecation")
         public void add(int int_1, E itemListWidget$Item_1) {
             this.items.add(int_1, itemListWidget$Item_1);
             itemListWidget$Item_1.parent = DynamicEntryListWidget.this;

+ 0 - 141
src/main/java/me/shedaniel/math/compat/RenderHelper.java

@@ -1,141 +0,0 @@
-/*
- * Roughly Enough Items by Danielshe.
- * Licensed under the MIT License.
- */
-
-package me.shedaniel.math.compat;
-
-import net.minecraft.util.crash.CrashException;
-import net.minecraft.util.crash.CrashReport;
-import net.minecraft.util.crash.CrashReportSection;
-
-/**
- * Blaze3D Wrapper for 1.14 - 19w37a
- */
-@Deprecated
-public class RenderHelper {
-    
-    static RenderSystem instance;
-    
-    static {
-        boolean is1_15 = false;
-        try {
-            Class.forName("com.mojang.blaze3d.systems.RenderSystem");
-            is1_15 = true;
-        } catch (ClassNotFoundException ignored) {
-        }
-        if (!is1_15)
-            try {
-                instance = (RenderSystem) Class.forName("me.shedaniel.math.compat.RenderSystem1_14").newInstance();
-            } catch (Exception e) {
-                e.printStackTrace();
-            }
-        try {
-            if (is1_15)
-                instance = new RenderSystemClassInvoker("com.mojang.blaze3d.systems.RenderSystem");
-            else instance = new RenderSystemClassInvoker("com.mojang.blaze3d.platform.GlStateManager");
-        } catch (Exception e) {
-            CrashReport crashReport = CrashReport.create(e, "Creating Blaze3D Classes Compat");
-            CrashReportSection section = crashReport.addElement("Found Render System");
-            boolean finalIs1_15 = is1_15;
-            section.add("Is 1.15", () -> finalIs1_15 + "");
-            throw new CrashException(crashReport);
-        }
-    }
-    
-    public static void color4f(float float_1, float float_2, float float_3, float float_4) {
-        instance.color4f(float_1, float_2, float_3, float_4);
-    }
-    
-    public static void enableBlend() {
-        instance.enableBlend();
-    }
-    
-    public static void disableTexture() {
-        instance.disableTexture();
-    }
-    
-    public static void enableTexture() {
-        instance.enableTexture();
-    }
-    
-    public static void enableColorLogicOp() {
-        instance.enableColorLogicOp();
-    }
-    
-    public static void disableColorLogicOp() {
-        instance.disableColorLogicOp();
-    }
-    
-    public static void disableRescaleNormal() {
-        instance.disableRescaleNormal();
-    }
-    
-    public static void logicOp(int int_1) {
-        instance.logicOp(int_1);
-    }
-    
-    public static void pushMatrix() {
-        instance.pushMatrix();
-    }
-    
-    public static void disableFog() {
-        instance.disableFog();
-    }
-    
-    public static void popMatrix() {
-        instance.popMatrix();
-    }
-    
-    public static void disableLighting() {
-        instance.disableLighting();
-    }
-    
-    public static void enableLighting() {
-        instance.enableLighting();
-    }
-    
-    public static void enableRescaleNormal() {
-        instance.enableRescaleNormal();
-    }
-    
-    public static void disableDepthTest() {
-        instance.disableDepthTest();
-    }
-    
-    public static void enableDepthTest() {
-        instance.enableDepthTest();
-    }
-    
-    public static void disableAlphaTest() {
-        instance.disableAlphaTest();
-    }
-    
-    public static void enableAlphaTest() {
-        instance.enableAlphaTest();
-    }
-    
-    public static void disableBlend() {
-        instance.disableBlend();
-    }
-    
-    public static void shadeModel(int i) {
-        instance.shadeModel(i);
-    }
-    
-    public static void colorMask(boolean boolean_1, boolean boolean_2, boolean boolean_3, boolean boolean_4) {
-        instance.colorMask(boolean_1, boolean_2, boolean_3, boolean_4);
-    }
-    
-    public static void translatef(float float_1, float float_2, float float_3) {
-        instance.translatef(float_1, float_2, float_3);
-    }
-    
-    public static void blendFuncSeparate(int int_1, int int_2, int int_3, int int_4) {
-        instance.blendFuncSeparate(int_1, int_2, int_3, int_4);
-    }
-    
-    public static void blendFunc(int int_1, int int_2) {
-        instance.blendFunc(int_1, int_2);
-    }
-}

+ 0 - 63
src/main/java/me/shedaniel/math/compat/RenderSystem.java

@@ -1,63 +0,0 @@
-/*
- * Roughly Enough Items by Danielshe.
- * Licensed under the MIT License.
- */
-
-package me.shedaniel.math.compat;
-
-public interface RenderSystem {
-    
-    default void invokeMethod(Class[] classes, Object[] objects) {
-        invokeMethod("color4f", classes, objects);
-    }
-    
-    void invokeMethod(String method, Class[] classes, Object[] objects);
-    
-    void color4f(float float_1, float float_2, float float_3, float float_4);
-    
-    void enableBlend();
-    
-    void disableTexture();
-    
-    void enableTexture();
-    
-    void enableColorLogicOp();
-    
-    void disableColorLogicOp();
-    
-    void disableRescaleNormal();
-    
-    void logicOp(int int_1);
-    
-    void pushMatrix();
-    
-    void disableFog();
-    
-    void popMatrix();
-    
-    void disableLighting();
-    
-    void enableLighting();
-    
-    void enableRescaleNormal();
-    
-    void disableDepthTest();
-    
-    void enableDepthTest();
-    
-    void disableAlphaTest();
-    
-    void enableAlphaTest();
-    
-    void disableBlend();
-    
-    void shadeModel(int i);
-    
-    void colorMask(boolean boolean_1, boolean boolean_2, boolean boolean_3, boolean boolean_4);
-    
-    void translatef(float float_1, float float_2, float float_3);
-    
-    void blendFuncSeparate(int int_1, int int_2, int int_3, int int_4);
-    
-    void blendFunc(int int_1, int int_2);
-}

+ 0 - 154
src/main/java/me/shedaniel/math/compat/RenderSystem1_14.java

@@ -1,154 +0,0 @@
-/*
- * Roughly Enough Items by Danielshe.
- * Licensed under the MIT License.
- */
-
-package me.shedaniel.math.compat;
-
-import com.mojang.blaze3d.platform.GlStateManager;
-
-import java.lang.reflect.Method;
-import java.util.HashMap;
-import java.util.Map;
-
-public class RenderSystem1_14 implements RenderSystem {
-    
-    private Map<String, Method> simpleMethods = new HashMap<>();
-    
-    private Method getSimpleMethod(String name, Class... classes) throws NoSuchMethodException {
-        if (simpleMethods.containsKey(name))
-            return simpleMethods.get(name);
-        Method method = GlStateManager.class.getDeclaredMethod(name, classes);
-        simpleMethods.put(name, method);
-        return simpleMethods.get(name);
-    }
-    
-    @Override
-    public void invokeMethod(String method, Class[] classes, Object[] objects) {
-        try {
-            getSimpleMethod(method, classes).invoke(null, objects);
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-    }
-    
-    @Override
-    public void color4f(float float_1, float float_2, float float_3, float float_4) {
-        GlStateManager.color4f(float_1, float_2, float_3, float_4);
-    }
-    
-    @Override
-    public void enableBlend() {
-        GlStateManager.enableBlend();
-    }
-    
-    @Override
-    public void disableTexture() {
-        GlStateManager.enableBlend();
-    }
-    
-    @Override
-    public void enableTexture() {
-        GlStateManager.enableBlend();
-    }
-    
-    @Override
-    public void enableColorLogicOp() {
-        GlStateManager.enableBlend();
-    }
-    
-    @Override
-    public void disableColorLogicOp() {
-        GlStateManager.enableBlend();
-    }
-    
-    @Override
-    public void disableRescaleNormal() {
-        GlStateManager.enableBlend();
-    }
-    
-    @Override
-    public void disableFog() {
-        GlStateManager.enableBlend();
-    }
-    
-    @Override
-    public void logicOp(int int_1) {
-        GlStateManager.enableBlend();
-    }
-    
-    @Override
-    public void pushMatrix() {
-        GlStateManager.enableBlend();
-    }
-    
-    @Override
-    public void popMatrix() {
-        GlStateManager.enableBlend();
-    }
-    
-    @Override
-    public void disableLighting() {
-        GlStateManager.enableBlend();
-    }
-    
-    @Override
-    public void enableLighting() {
-        GlStateManager.enableBlend();
-    }
-    
-    @Override
-    public void enableRescaleNormal() {
-        GlStateManager.enableBlend();
-    }
-    
-    @Override
-    public void disableDepthTest() {
-        GlStateManager.enableBlend();
-    }
-    
-    @Override
-    public void enableDepthTest() {
-        GlStateManager.enableBlend();
-    }
-    
-    @Override
-    public void disableAlphaTest() {
-        GlStateManager.enableBlend();
-    }
-    
-    @Override
-    public void enableAlphaTest() {
-        GlStateManager.enableBlend();
-    }
-    
-    @Override
-    public void disableBlend() {
-        GlStateManager.enableBlend();
-    }
-    
-    @Override
-    public void shadeModel(int i) {
-        GlStateManager.enableBlend();
-    }
-    
-    @Override
-    public void colorMask(boolean boolean_1, boolean boolean_2, boolean boolean_3, boolean boolean_4) {
-        GlStateManager.enableBlend();
-    }
-    
-    @Override
-    public void translatef(float float_1, float float_2, float float_3) {
-        GlStateManager.enableBlend();
-    }
-    
-    @Override
-    public void blendFuncSeparate(int int_1, int int_2, int int_3, int int_4) {
-        GlStateManager.enableBlend();
-    }
-    
-    @Override
-    public void blendFunc(int int_1, int int_2) {
-        GlStateManager.enableBlend();
-    }
-}

+ 0 - 258
src/main/java/me/shedaniel/math/compat/RenderSystemClassInvoker.java

@@ -1,258 +0,0 @@
-/*
- * Roughly Enough Items by Danielshe.
- * Licensed under the MIT License.
- */
-
-package me.shedaniel.math.compat;
-
-import java.lang.reflect.Method;
-import java.util.HashMap;
-import java.util.Map;
-
-public class RenderSystemClassInvoker implements RenderSystem {
-    public Class<?> renderSystemClass;
-    
-    private Map<String, Method> simpleMethods = new HashMap<>();
-    
-    public RenderSystemClassInvoker(String className) {
-        try {
-            this.renderSystemClass = Class.forName(className);
-        } catch (ClassNotFoundException e) {
-            e.printStackTrace();
-            System.exit(0);
-        }
-    }
-    
-    private Method getSimpleMethod(String name, Class... classes) throws NoSuchMethodException {
-        if (simpleMethods.containsKey(name))
-            return simpleMethods.get(name);
-        Method method = renderSystemClass.getDeclaredMethod(name, classes);
-        simpleMethods.put(name, method);
-        return simpleMethods.get(name);
-    }
-    
-    @Override
-    public void invokeMethod(String method, Class[] classes, Object[] objects) {
-        try {
-            getSimpleMethod(method, classes).invoke(null, objects);
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-    }
-    
-    @Override
-    public void color4f(float float_1, float float_2, float float_3, float float_4) {
-        try {
-            getSimpleMethod("color4f", float.class, float.class, float.class, float.class).invoke(null, float_1, float_2, float_3, float_4);
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-    }
-    
-    @Override
-    public void disableFog() {
-        try {
-            getSimpleMethod("disableFog").invoke(null);
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-    }
-    
-    @Override
-    public void enableBlend() {
-        try {
-            getSimpleMethod("enableBlend").invoke(null);
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-    }
-    
-    @Override
-    public void disableTexture() {
-        try {
-            getSimpleMethod("disableTexture").invoke(null);
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-    }
-    
-    @Override
-    public void enableTexture() {
-        try {
-            getSimpleMethod("enableTexture").invoke(null);
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-    }
-    
-    @Override
-    public void enableColorLogicOp() {
-        try {
-            getSimpleMethod("enableColorLogicOp").invoke(null);
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-    }
-    
-    @Override
-    public void disableColorLogicOp() {
-        try {
-            getSimpleMethod("disableColorLogicOp").invoke(null);
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-    }
-    
-    @Override
-    public void disableRescaleNormal() {
-        try {
-            getSimpleMethod("disableRescaleNormal").invoke(null);
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-    }
-    
-    @Override
-    public void logicOp(int int_1) {
-        try {
-            getSimpleMethod("logicOp", int.class).invoke(null, int_1);
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-    }
-    
-    @Override
-    public void pushMatrix() {
-        try {
-            getSimpleMethod("pushMatrix").invoke(null);
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-    }
-    
-    @Override
-    public void popMatrix() {
-        try {
-            getSimpleMethod("popMatrix").invoke(null);
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-    }
-    
-    @Override
-    public void disableLighting() {
-        try {
-            getSimpleMethod("disableLighting").invoke(null);
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-    }
-    
-    @Override
-    public void enableLighting() {
-        try {
-            getSimpleMethod("enableLighting").invoke(null);
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-    }
-    
-    @Override
-    public void enableRescaleNormal() {
-        try {
-            getSimpleMethod("enableRescaleNormal").invoke(null);
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-    }
-    
-    @Override
-    public void disableDepthTest() {
-        try {
-            getSimpleMethod("disableDepthTest").invoke(null);
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-    }
-    
-    @Override
-    public void enableDepthTest() {
-        try {
-            getSimpleMethod("enableDepthTest").invoke(null);
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-    }
-    
-    @Override
-    public void disableAlphaTest() {
-        try {
-            getSimpleMethod("disableAlphaTest").invoke(null);
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-    }
-    
-    @Override
-    public void enableAlphaTest() {
-        try {
-            getSimpleMethod("enableAlphaTest").invoke(null);
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-    }
-    
-    @Override
-    public void disableBlend() {
-        try {
-            getSimpleMethod("disableBlend").invoke(null);
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-    }
-    
-    @Override
-    public void shadeModel(int i) {
-        try {
-            getSimpleMethod("shadeModel", int.class).invoke(null, i);
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-    }
-    
-    @Override
-    public void colorMask(boolean boolean_1, boolean boolean_2, boolean boolean_3, boolean boolean_4) {
-        try {
-            getSimpleMethod("colorMask", boolean.class, boolean.class, boolean.class, boolean.class).invoke(null, boolean_1, boolean_2, boolean_3, boolean_4);
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-    }
-    
-    @Override
-    public void translatef(float float_1, float float_2, float float_3) {
-        try {
-            getSimpleMethod("translatef", float.class, float.class, float.class).invoke(null, float_1, float_2, float_3);
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-    }
-    
-    @Override
-    public void blendFuncSeparate(int int_1, int int_2, int int_3, int int_4) {
-        try {
-            getSimpleMethod("blendFuncSeparate", int.class, int.class, int.class, int.class).invoke(null, int_1, int_2, int_3, int_4);
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-    }
-    
-    @Override
-    public void blendFunc(int int_1, int int_2) {
-        try {
-            getSimpleMethod("blendFunc", int.class, int.class).invoke(null, int_1, int_2);
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-    }
-}