Minor Shader/ShaderProgram and GLObject changes

Author: ZeroMemes

src/main/java/me/zero/client/api/util/render/gl/GLObject.java

@@ -54,7 +54,7 @@ public final boolean gen() {
      *
      * @return Whether or not the operation was a success
      */
-    public final boolean delete() {
+    public boolean delete() {
         if (!isGen())
             return false;
 

src/main/java/me/zero/client/api/util/render/gl/ShaderProgram.java

@@ -52,7 +52,7 @@ public final class ShaderProgram extends GLObject {
     @Override
     protected final int nativeGen() {
         int id = adapter.createProgram();
-        shaders.forEach(shader -> adapter.attachObject(id, shader.id()));
+        shaders.forEach(shader -> adapter.attachShader(id, shader.id()));
 
         try {
             adapter.linkProgram(id);
@@ -67,10 +67,18 @@ protected final int nativeGen() {
         return id;
     }
 
+    @Override
+    public boolean delete() {
+        shaders.forEach(shader -> {
+            adapter.detachShader(this.id(), shader.id());
+            shader.delete();
+        });
+        return super.delete();
+    }
+
     @Override
     protected final void nativeDelete() {
         adapter.deleteProgram(id());
-        shaders.forEach(GLObject::delete);
     }
 
     /**

src/main/java/me/zero/client/api/util/render/gl/shader/adapter/ARBShaderAdapter.java

@@ -78,12 +78,12 @@ public void compileShader(int shader) {
     }
 
     @Override
-    public void attachObject(int program, int shader) {
+    public void attachShader(int program, int shader) {
         glAttachObjectARB(program, shader);
     }
 
     @Override
-    public void detachObject(int program, int shader) {
+    public void detachShader(int program, int shader) {
         glDetachObjectARB(program, shader);
     }
 

src/main/java/me/zero/client/api/util/render/gl/shader/adapter/GL20ShaderAdapter.java

@@ -76,12 +76,12 @@ public void compileShader(int shader) {
     }
 
     @Override
-    public void attachObject(int program, int shader) {
+    public void attachShader(int program, int shader) {
         glAttachShader(program, shader);
     }
 
     @Override
-    public void detachObject(int program, int shader) {
+    public void detachShader(int program, int shader) {
         glDetachShader(program, shader);
     }
 

src/main/java/me/zero/client/api/util/render/gl/shader/adapter/ShaderAdapter.java

@@ -82,15 +82,15 @@ public interface ShaderAdapter {
      * @param program The shader program id
      * @param shader The shader object id
      */
-    void attachObject(int program, int shader);
+    void attachShader(int program, int shader);
 
     /**
      * Detaches a shader object from a shader program
      *
      * @param program The shader program id
      * @param shader The shader object id
      */
-    void detachObject(int program, int shader);
+    void detachShader(int program, int shader);
 
     /**
      * Prepares the specified shader program for usage