Merge remote-tracking branch 'origin/config-tag-lookup-allocations' into dev

.github/ISSUE_TEMPLATE/000-report-bug.yml

@@ -1,62 +0,0 @@
-name: Report Bug
-description: "Report a bug."
-body:
-  - type: markdown
-    attributes:
-      value: "A bug/crash report with sufficient information and logs to reproduce and track down."
-  - type: input
-    id: discord
-    attributes:
-      label: Your GTNH Discord Username
-      description: Leave empty if you don't have one, but this will make it harder to contact you if we need additional info.
-      placeholder: "Example: Fake#1234"
-  - type: input
-    id: version
-    attributes:
-      label: Mod Version
-      description: "What version of the Mod are you using?"
-      placeholder: "Example: 1.0.0"
-    validations:
-      required: true
-  - type: textarea
-    id: report
-    attributes:
-      label: Bug Report
-      description: "Relevant information, as well as relevant logs attached such as `logs/fml-client-latest.log."
-      placeholder: "Example: https://mclo.gs/ OR submit the file to github by dragging it to this textbox."
-    validations:
-      required: true
-  - type: dropdown
-    id: java
-    attributes:
-      label: Java Version
-      description: What Java version are you using? It's worth mentioning that if you play on Java9+ you should try update to latest minor release (e.g. prefer Java 17.0.6 over 17.0.2) of that version.
-      options:
-        - Java 8
-        - Java 9
-        - Java 11
-        - Java 17
-        - Java 19
-        - Java 20
-        - Java 21
-        - Other (Please Specify)
-    validations:
-      required: true
-  - type: textarea
-    id: modlist
-    attributes:
-      label: Mod List or GTNH Pack Version
-      description: "List of mods, ideally a minimal reproducible set (can be retrieved from latest.log).  If using GTNH please indicate pack version and any changed mods, not the entire modlist."
-      placeholder: "List of mods or GTNH Pack version goes here"
-    validations:
-      required: true
-  - type: checkboxes
-    id: final
-    attributes:
-      label: Final Checklist
-      description: Certify that you read things
-      options:
-        - label: "I have searched the issues and haven't found a similar issue."
-          required: true
-
-

.github/ISSUE_TEMPLATE/001-request-feature.yml

@@ -1,28 +0,0 @@
-name: Feature Request
-description: "Request a feature."
-body:
-  - type: markdown
-    attributes:
-      value: "Please use this form to request features. We ask you check if it was already requested though"
-  - type: input
-    id: discord
-    attributes:
-      label: Your GTNH Discord Username
-      description: Leave empty if you don't have one, but this will make it harder to contact you if we need additional info.
-      placeholder: "Example: Wumpus#1234"
-  - type: textarea
-    id: request
-    attributes:
-      label: Feature Request
-      description: "Relevant information, as well as relevant images"
-      placeholder: "Example: https://mclo.gs/ OR submit the file to github by dragging it to this textbox."
-    validations:
-      required: true
-  - type: checkboxes
-    id: final
-    attributes:
-      label: Final Checklist
-      description: Certify that you read things
-      options:
-        - label: "I have searched the issues and haven't found a similar issue."
-          required: true

gradle.properties

@@ -14,7 +14,7 @@ modId = CodeChickenCore
 modGroup = codechicken
 
 # Whether to use modGroup as the maven publishing group.
-# When false, com.github.GTNewHorizons is used.
+# Due to a history of using JitPack, the default is com.github.GTNewHorizons for all mods.
 useModGroupForPublishing = false
 
 # Updates your build.gradle and settings.gradle automatically whenever an update is available.
@@ -79,11 +79,6 @@ accessTransformersFile =
 # Provides setup for Mixins if enabled. If you don't know what mixins are: Keep it disabled!
 usesMixins = false
 
-# Set to a non-empty string to configure mixins in a separate source set under src/VALUE, instead of src/main.
-# This can speed up compile times thanks to not running the mixin annotation processor on all input sources.
-# Mixin classes will have access to "main" classes, but not the other way around.
-separateMixinSourceSet =
-
 # Adds some debug arguments like verbose output and class export.
 usesMixinDebug = false
 
@@ -116,15 +111,9 @@ minimizeShadowedDependencies = true
 # If disabled, won't rename the shadowed classes.
 relocateShadowedDependencies = true
 
-# Adds CurseMaven, Modrinth, and some more well-known 1.7.10 repositories.
+# Adds the GTNH maven, CurseMaven, Modrinth, and some more well-known 1.7.10 repositories.
 includeWellKnownRepositories = true
 
-# A list of repositories to exclude from the includeWellKnownRepositories setting. Should be a space separated
-# list of strings, with the acceptable keys being(case does not matter):
-# cursemaven
-# modrinth
-excludeWellKnownRepositories =
-
 # Change these to your Maven coordinates if you want to publish to a custom Maven repository instead of the default GTNH Maven.
 # Authenticate with the MAVEN_USER and MAVEN_PASSWORD environment variables.
 # If you need a more complex setup disable maven publishing here and add a publishing repository to addon.gradle.

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

gradlew

@@ -15,8 +15,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-# SPDX-License-Identifier: Apache-2.0
-#
 
 ##############################################################################
 #
@@ -86,7 +84,7 @@ done
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
 # Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
-APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit
+APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
@@ -205,7 +203,7 @@ fi
 DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 
 # Collect all arguments for the java command:
-#   * DEFAULT_JVM_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
 #     and any embedded shellness will be escaped.
 #   * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
 #     treated as '${Hostname}' itself on the command line.

gradlew.bat

@@ -13,8 +13,6 @@
 @rem See the License for the specific language governing permissions and
 @rem limitations under the License.
 @rem
-@rem SPDX-License-Identifier: Apache-2.0
-@rem
 
 @if "%DEBUG%"=="" @echo off
 @rem ##########################################################################

repositories.gradle

@@ -1,5 +1,4 @@
 // Add any additional repositiroes for your dependencies here
 
 repositories {
-    mavenLocal()
 }

settings.gradle

@@ -17,7 +17,7 @@ pluginManagement {
 }
 
 plugins {
-    id 'com.gtnewhorizons.gtnhsettingsconvention' version '1.0.38'
+    id 'com.gtnewhorizons.gtnhsettingsconvention' version '1.0.23'
 }
 
 

src/main/java/codechicken/core/ClassDiscoverer.java

@@ -1,13 +1,13 @@
 package codechicken.core;
 
 import java.io.File;
+import java.io.FileInputStream;
 import java.io.IOException;
 import java.util.ArrayList;
-import java.util.Enumeration;
 import java.util.HashSet;
 import java.util.List;
 import java.util.zip.ZipEntry;
-import java.util.zip.ZipFile;
+import java.util.zip.ZipInputStream;
 
 import net.minecraft.launchwrapper.Launch;
 
@@ -114,18 +114,21 @@ public class ClassDiscoverer {
     }
 
     private void readFromZipFile(File file) throws IOException {
-        try (ZipFile zipFile = new ZipFile(file)) {
-            Enumeration<? extends ZipEntry> zipEntries = zipFile.entries();
-            while (zipEntries.hasMoreElements()) {
-                ZipEntry zipentry = zipEntries.nextElement();
-                String fullname = zipentry.getName().replace('\\', '/');
-                int pos = fullname.lastIndexOf('/');
-                String name = pos == -1 ? fullname : fullname.substring(pos + 1);
-                if (!zipentry.isDirectory() && matcher.matches(name)) {
-                    checkAddClass(fullname);
-                }
+        FileInputStream fileinputstream = new FileInputStream(file);
+        ZipInputStream zipinputstream = new ZipInputStream(fileinputstream);
+        do {
+            ZipEntry zipentry = zipinputstream.getNextEntry();
+            if (zipentry == null) {
+                break;
             }
-        }
+            String fullname = zipentry.getName().replace('\\', '/');
+            int pos = fullname.lastIndexOf('/');
+            String name = pos == -1 ? fullname : fullname.substring(pos + 1);
+            if (!zipentry.isDirectory() && matcher.matches(name)) {
+                checkAddClass(fullname);
+            }
+        } while (true);
+        fileinputstream.close();
     }
 
     private void readFromDirectory(File directory, File basedirectory) {

src/main/java/codechicken/lib/asm/ClassConstantPoolParser.java

@@ -83,7 +83,7 @@ public class ClassConstantPoolParser {
                         if (strLen == bytes.length) {
                             for (int j = index + 3; j < index + 3 + strLen; j++) {
                                 if (basicClass[j] != bytes[j - (index + 3)]) {
-                                    continue label;
+                                    break label;
                                 }
                             }
                             return true;

src/main/java/codechicken/lib/asm/RedirectorTransformer.java

@@ -23,12 +23,11 @@ import org.objectweb.asm.tree.InsnList;
 import org.objectweb.asm.tree.InsnNode;
 import org.objectweb.asm.tree.MethodInsnNode;
 import org.objectweb.asm.tree.MethodNode;
+import org.objectweb.asm.util.ASMifier;
 import org.objectweb.asm.util.Textifier;
 import org.objectweb.asm.util.TraceClassVisitor;
 
-import codechicken.core.launch.CodeChickenCorePlugin;
-
-public class RedirectorTransformer implements IClassTransformer, Opcodes {
+public class RedirectorTransformer implements IClassTransformer {
 
     private static final boolean DUMP_CLASSES = Boolean.parseBoolean(System.getProperty("ccl.dumpClass", "false"));
     private static final String RenderStateClass = "codechicken/lib/render/CCRenderState";
@@ -59,12 +58,7 @@ public class RedirectorTransformer implements IClassTransformer, Opcodes {
                 "hasBrightness",
                 "brightness",
                 "side",
-                "lc",
-                "normalAttrib",
-                "colourAttrib",
-                "lightCoordAttrib",
-                "sideAttrib",
-                "lightingAttrib"
+                "lc"
 
         );
         Collections.addAll(redirectedSimpleMethods, "reset", "pullLightmap", "pushLightmap", "setDynamic", "draw");
@@ -96,63 +90,66 @@ public class RedirectorTransformer implements IClassTransformer, Opcodes {
         cr.accept(cn, 0);
         boolean changed = false;
 
-        // spotless:off
         for (MethodNode mn : cn.methods) {
             for (AbstractInsnNode node : mn.instructions.toArray()) {
                 if (node instanceof FieldInsnNode fNode) {
-                    if (node.getOpcode() == GETSTATIC && RenderStateClass.equals(fNode.owner) && redirectedFields.contains(fNode.name)) {
-                        mn.instructions.insertBefore(fNode,
-                            new MethodInsnNode(
-                                INVOKESTATIC,
-                                fNode.owner,
-                                "instance",
-                                "()Lcodechicken/lib/render/CCRenderState;",
-                                false));
-                        fNode.setOpcode(GETFIELD);
+                    if (node.getOpcode() == Opcodes.GETSTATIC && redirectedFields.contains(fNode.name)
+                            && fNode.owner.equals(RenderStateClass)) {
+                        mn.instructions.insertBefore(
+                                fNode,
+                                new MethodInsnNode(
+                                        Opcodes.INVOKESTATIC,
+                                        fNode.owner,
+                                        "instance",
+                                        "()Lcodechicken/lib/render/CCRenderState;"));
+                        fNode.setOpcode(Opcodes.GETFIELD);
                         changed = true;
-                    } else if (node.getOpcode() == PUTSTATIC && RenderStateClass.equals(fNode.owner) && redirectedFields.contains(fNode.name)) {
-                        InsnList list = new InsnList();
-                        list.add(new MethodInsnNode(
-                            INVOKESTATIC,
-                            fNode.owner,
-                            "instance",
-                            "()Lcodechicken/lib/render/CCRenderState;",
-                            false));
-                        list.add(new InsnNode(SWAP));
-                        mn.instructions.insertBefore(fNode, list);
-                        fNode.setOpcode(PUTFIELD);
-                        changed = true;
-                    }
+                    } else if (node.getOpcode() == Opcodes.PUTSTATIC
+                            && (redirectedFields.contains(fNode.name) && fNode.owner.equals(RenderStateClass))) {
+                                InsnList beforePut = new InsnList();
+                                beforePut.add(
+                                        new MethodInsnNode(
+                                                Opcodes.INVOKESTATIC,
+                                                fNode.owner,
+                                                "instance",
+                                                "()Lcodechicken/lib/render/CCRenderState;"));
+                                beforePut.add(new InsnNode(Opcodes.SWAP));
+                                mn.instructions.insertBefore(fNode, beforePut);
+                                fNode.setOpcode(Opcodes.PUTFIELD);
+                                changed = true;
+
+                            }
                 } else if (node instanceof MethodInsnNode mNode) {
-                    if (node.getOpcode() == INVOKESTATIC && RenderStateClass.equals(mNode.owner) && redirectedSimpleMethods.contains(mNode.name)) {
-                        mn.instructions.insertBefore(mNode,
-                            new MethodInsnNode(
-                                INVOKESTATIC,
-                                mNode.owner,
-                                "instance",
-                                "()Lcodechicken/lib/render/CCRenderState;",
-                                false));
-                        mNode.setOpcode(INVOKEVIRTUAL);
+                    if (node.getOpcode() == Opcodes.INVOKESTATIC && redirectedSimpleMethods.contains(mNode.name)
+                            && mNode.owner.equals(RenderStateClass)) {
+                        mn.instructions.insertBefore(
+                                mNode,
+                                new MethodInsnNode(
+                                        Opcodes.INVOKESTATIC,
+                                        mNode.owner,
+                                        "instance",
+                                        "()Lcodechicken/lib/render/CCRenderState;"));
+                        mNode.setOpcode(Opcodes.INVOKEVIRTUAL);
                         mNode.name = mNode.name + "Instance";
                         changed = true;
-                    } else if (node.getOpcode() == INVOKEVIRTUAL && RenderStateClass.equals(mNode.owner)
-                        && (redirectedSimpleMethods.contains(mNode.name) || redirectedMethods.contains(mNode.name))) {
-                        // Handle mods that updated to previously new API
-                        mNode.name = mNode.name + "Instance";
-                        changed = true;
-                    }
+                    } else if (node.getOpcode() == Opcodes.INVOKEVIRTUAL && mNode.owner.equals(RenderStateClass)
+                            && (redirectedSimpleMethods.contains(mNode.name)
+                                    || redirectedMethods.contains(mNode.name))) {
+                                        // Handle mods that updated to previously new API
+                                        mNode.name = mNode.name + "Instance";
+                                        changed = true;
+                                    }
                 }
             }
         }
-        // spotless:on
 
         if (changed) {
             ClassWriter cw = new ClassWriter(ClassWriter.COMPUTE_MAXS);
             cn.accept(cw);
             final byte[] bytes = cw.toByteArray();
             if (DUMP_CLASSES) {
-                saveTransformedClass(basicClass, transformedName + "_PRE");
-                saveTransformedClass(bytes, transformedName + "_POST");
+                saveTransformedClass(bytes, transformedName);
+                saveTransformedClass(basicClass, transformedName + "_original");
             }
             return bytes;
         }
@@ -161,9 +158,13 @@ public class RedirectorTransformer implements IClassTransformer, Opcodes {
 
     private File outputDir = null;
 
-    private void saveTransformedClass(final byte[] data, final String classname) {
+    private void saveTransformedClass(final byte[] data, final String transformedName) {
+        if (!DUMP_CLASSES) {
+            return;
+        }
+
         if (outputDir == null) {
-            outputDir = new File(Launch.minecraftHome, "ASM_CCL" + File.separatorChar + "REDIRECTOR");
+            outputDir = new File(Launch.minecraftHome, "ASM_REDIRECTOR");
             try {
                 FileUtils.deleteDirectory(outputDir);
             } catch (IOException ignored) {}
@@ -172,34 +173,40 @@ public class RedirectorTransformer implements IClassTransformer, Opcodes {
                 outputDir.mkdirs();
             }
         }
-        final String fileName = classname.replace('.', File.separatorChar);
+
+        final String fileName = transformedName.replace('.', File.separatorChar);
         final File classFile = new File(outputDir, fileName + ".class");
         final File bytecodeFile = new File(outputDir, fileName + "_BYTE.txt");
+        final File asmifiedFile = new File(outputDir, fileName + "_ASM.txt");
         final File outDir = classFile.getParentFile();
         if (!outDir.exists()) {
-            // noinspection ResultOfMethodCallIgnored
             outDir.mkdirs();
         }
         if (classFile.exists()) {
-            // noinspection ResultOfMethodCallIgnored
             classFile.delete();
         }
         try (final OutputStream output = Files.newOutputStream(classFile.toPath())) {
             output.write(data);
-            CodeChickenCorePlugin.logger.info("Saved class (byte[]) to " + classFile.toPath());
         } catch (IOException e) {
-            CodeChickenCorePlugin.logger.error("Could not save class (byte[]) " + classname);
+            e.printStackTrace();
         }
         if (bytecodeFile.exists()) {
-            // noinspection ResultOfMethodCallIgnored
             bytecodeFile.delete();
         }
         try (final OutputStream output = Files.newOutputStream(bytecodeFile.toPath())) {
             final ClassReader classReader = new ClassReader(data);
             classReader.accept(new TraceClassVisitor(null, new Textifier(), new PrintWriter(output)), 0);
-            CodeChickenCorePlugin.logger.info("Saved class (bytecode) to " + bytecodeFile.toPath());
         } catch (IOException e) {
-            CodeChickenCorePlugin.logger.error("Could not save class (bytecode) " + classname);
+            e.printStackTrace();
+        }
+        if (asmifiedFile.exists()) {
+            asmifiedFile.delete();
+        }
+        try (final OutputStream output = Files.newOutputStream(asmifiedFile.toPath())) {
+            final ClassReader classReader = new ClassReader(data);
+            classReader.accept(new TraceClassVisitor(null, new ASMifier(), new PrintWriter(output)), 0);
+        } catch (IOException e) {
+            e.printStackTrace();
         }
     }
 }

src/main/java/codechicken/lib/gui/GuiDraw.java

@@ -162,11 +162,6 @@ public class GuiDraw {
     }
 
     public static void drawMultilineTip(FontRenderer font, int x, int y, List<String> list) {
-        drawMultilineTip(font, x, y, list, 0xf0100010, 0xf0100010, 0x505000ff, 0x5028007F);
-    }
-
-    public static void drawMultilineTip(FontRenderer font, int x, int y, List<String> list, int bgStart, int bgEnd,
-            int borderStart, int borderEnd) {
         if (list.isEmpty()) return;
 
         GL11.glDisable(GL12.GL_RESCALE_NORMAL);
@@ -194,7 +189,7 @@ public class GuiDraw {
         y = (int) MathHelper.clip(y, 8, displaySize().height - 8 - h);
 
         gui.incZLevel(300);
-        drawTooltipBox(x - 4, y - 4, w + 7, h + 7, bgStart, bgEnd, borderStart, borderEnd);
+        drawTooltipBox(x - 4, y - 4, w + 7, h + 7);
         for (String s : list) {
             ITooltipLineHandler line = getTipLine(s);
             if (line != null) {
@@ -215,23 +210,18 @@ public class GuiDraw {
     }
 
     public static void drawTooltipBox(int x, int y, int w, int h) {
-        drawTooltipBox(x, y, w, h, 0xf0100010, 0xf0100010, 0x505000ff, 0x5028007F);
-    }
+        int bg = 0xf0100010;
+        drawGradientRect(x + 1, y, w - 1, 1, bg, bg);
+        drawGradientRect(x + 1, y + h, w - 1, 1, bg, bg);
+        drawGradientRect(x + 1, y + 1, w - 1, h - 1, bg, bg); // center
+        drawGradientRect(x, y + 1, 1, h - 1, bg, bg);
+        drawGradientRect(x + w, y + 1, 1, h - 1, bg, bg);
+        int grad1 = 0x505000ff;
+        int grad2 = 0x5028007F;
+        drawGradientRect(x + 1, y + 2, 1, h - 3, grad1, grad2);
+        drawGradientRect(x + w - 1, y + 2, 1, h - 3, grad1, grad2);
 
-    public static void drawTooltipBox(int x, int y, int w, int h, int bgStart, int bgEnd, int borderStart,
-            int borderEnd) {
-        // spotless:off
-        // draw background
-        drawGradientRect(x + 1, y,     w - 1, 1,     bgStart, bgStart); // top
-        drawGradientRect(x + 1, y + h, w - 1, 1,     bgEnd,   bgEnd); // bottom
-        drawGradientRect(x + 1, y + 1, w - 1, h - 1, bgStart, bgEnd); // center
-        drawGradientRect(x,     y + 1, 1,     h - 1, bgStart, bgEnd); // left
-        drawGradientRect(x + w, y + 1, 1,     h - 1, bgStart, bgEnd); // right
-        // draw inner border
-        drawGradientRect(x + 1,     y + 2, 1,  h - 3,    borderStart, borderEnd); // left
-        drawGradientRect(x + w - 1, y + 2, 1,  h - 3,    borderStart, borderEnd); // right
-        drawGradientRect(x + 1,     y + 1,     w - 1, 1, borderStart, borderStart); // top
-        drawGradientRect(x + 1,     y + h - 1, w - 1, 1, borderEnd,   borderEnd); // bottom
-        // spotless:on
+        drawGradientRect(x + 1, y + 1, w - 1, 1, grad1, grad1);
+        drawGradientRect(x + 1, y + h - 1, w - 1, 1, grad2, grad2);
     }
 }

src/main/java/codechicken/lib/lighting/LightModel.java

@@ -81,8 +81,8 @@ public class LightModel implements CCRenderState.IVertexOperation {
     public boolean load(CCRenderState state) {
         if (!state.computeLighting) return false;
 
-        state.pipeline.addDependency(CCRenderState.normalAttrib());
-        state.pipeline.addDependency(CCRenderState.colourAttrib());
+        state.pipeline.addDependency(CCRenderState.normalAttrib);
+        state.pipeline.addDependency(CCRenderState.colourAttrib);
         return true;
     }
 

src/main/java/codechicken/lib/lighting/PlanarLightMatrix.java

@@ -40,7 +40,7 @@ public class PlanarLightMatrix extends PlanarLightModel {
 
     @Override
     public boolean load(CCRenderState state) {
-        state.pipeline.addDependency(CCRenderState.sideAttrib());
+        state.pipeline.addDependency(CCRenderState.sideAttrib);
         return true;
     }
 

src/main/java/codechicken/lib/lighting/PlanarLightModel.java

@@ -20,8 +20,8 @@ public class PlanarLightModel implements CCRenderState.IVertexOperation {
     public boolean load(CCRenderState state) {
         if (!state.computeLighting) return false;
 
-        state.pipeline.addDependency(CCRenderState.sideAttrib());
-        state.pipeline.addDependency(CCRenderState.colourAttrib());
+        state.pipeline.addDependency(CCRenderState.sideAttrib);
+        state.pipeline.addDependency(CCRenderState.colourAttrib);
         return true;
     }
 

src/main/java/codechicken/lib/lighting/SimpleBrightnessModel.java

@@ -40,7 +40,7 @@ public class SimpleBrightnessModel implements CCRenderState.IVertexOperation {
 
     @Override
     public boolean load(CCRenderState state) {
-        state.pipeline.addDependency(CCRenderState.sideAttrib());
+        state.pipeline.addDependency(CCRenderState.sideAttrib);
         return true;
     }
 

src/main/java/codechicken/lib/render/BlockRenderer.java

@@ -20,12 +20,12 @@ public class BlockRenderer {
 
         @Override
         public <T> T getAttributes(CCRenderState.VertexAttribute<T> attr) {
-            return attr == CCRenderState.lightCoordAttrib() && lcComputed ? (T) lightCoords : null;
+            return attr == CCRenderState.lightCoordAttrib && lcComputed ? (T) lightCoords : null;
         }
 
         @Override
         public boolean hasAttribute(CCRenderState.VertexAttribute<?> attr) {
-            return attr == CCRenderState.sideAttrib() || attr == CCRenderState.lightCoordAttrib() && lcComputed;
+            return attr == CCRenderState.sideAttrib || attr == CCRenderState.lightCoordAttrib && lcComputed;
         }
 
         @Override
@@ -136,12 +136,12 @@ public class BlockRenderer {
 
         @Override
         public <T> T getAttributes(VertexAttribute<T> attr) {
-            return attr == CCRenderState.lightCoordAttrib() ? (T) lightCoords : null;
+            return attr == CCRenderState.lightCoordAttrib ? (T) lightCoords : null;
         }
 
         @Override
         public boolean hasAttribute(VertexAttribute<?> attr) {
-            return attr == CCRenderState.sideAttrib() || attr == CCRenderState.lightCoordAttrib();
+            return attr == CCRenderState.sideAttrib || attr == CCRenderState.lightCoordAttrib;
         }
 
         @Override
@@ -164,7 +164,7 @@ public class BlockRenderer {
 
     /**
      * Renders faces of a block-like model based on a sideMask. Eg for side 2, verts 8-11 will be rendered
-     *
+     * 
      * @param sideMask A mask of faces not to render
      */
     // public static void renderFaces(int sideMask) {
@@ -184,7 +184,7 @@ public class BlockRenderer {
 
     /**
      * Renders faces of a cuboid with texture coordinates mapped to match a standard minecraft block
-     *
+     * 
      * @param bounds   The bounding cuboid to render
      * @param sideMask A mask of faces not to render
      */

src/main/java/codechicken/lib/render/CCModel.java

@@ -68,7 +68,7 @@ public class CCModel implements CCRenderState.IVertexSource, Copyable<CCModel> {
     }
 
     public Vector3[] normals() {
-        return getAttributes(CCRenderState.normalAttrib());
+        return getAttributes(CCRenderState.normalAttrib);
     }
 
     @Override
@@ -102,7 +102,7 @@ public class CCModel implements CCRenderState.IVertexSource, Copyable<CCModel> {
 
     /**
      * Each pixel corresponds to one unit of position when generating the model
-     *
+     * 
      * @param i  Vertex index to start generating at
      * @param x1 The minX bound of the box
      * @param y1 The minY bound of the box
@@ -195,7 +195,7 @@ public class CCModel implements CCRenderState.IVertexSource, Copyable<CCModel> {
 
     /**
      * Generates a box, uv mapped to be the same as a minecraft block with the same bounds
-     *
+     * 
      * @param i      The vertex index to start generating at
      * @param bounds The bounds of the block, 0 to 1
      * @return The generated model. When rendering an icon will need to be supplied for the UV transformation.
@@ -222,7 +222,7 @@ public class CCModel implements CCRenderState.IVertexSource, Copyable<CCModel> {
 
     /**
      * Generates a box, uv mapped to be the same as a minecraft block with the same bounds
-     *
+     * 
      * @param i    The vertex index to start generating at
      * @param x1   minX
      * @param y1   minY
@@ -311,7 +311,7 @@ public class CCModel implements CCRenderState.IVertexSource, Copyable<CCModel> {
 
     /**
      * Computes the normals of all faces in the model. Uses the cross product of the vectors along 2 sides of the face
-     *
+     * 
      * @param start  The first vertex to generate normals for
      * @param length The number of vertices to generate normals for. Note this must be a multiple of 3 for triangles or
      *               4 for quads
@@ -321,7 +321,7 @@ public class CCModel implements CCRenderState.IVertexSource, Copyable<CCModel> {
         if (length % vp != 0 || start % vp != 0)
             throw new IllegalArgumentException("Cannot generate normals across polygons");
 
-        Vector3[] normals = getOrAllocate(CCRenderState.normalAttrib());
+        Vector3[] normals = getOrAllocate(CCRenderState.normalAttrib);
         for (int k = 0; k < length; k += vp) {
             int i = k + start;
             Vector3 diff1 = verts[i + 1].vec.copy().subtract(verts[i].vec);
@@ -336,14 +336,14 @@ public class CCModel implements CCRenderState.IVertexSource, Copyable<CCModel> {
     /**
      * Computes lighting using the normals add a light model If the model is rotated, the lighting will no longer be
      * valid
-     *
+     * 
      * @return The model
      */
     public CCModel computeLighting(LightModel light) {
         Vector3[] normals = normals();
-        int[] colours = getAttributes(CCRenderState.lightingAttrib());
+        int[] colours = getAttributes(CCRenderState.lightingAttrib);
         if (colours == null) {
-            colours = getOrAllocate(CCRenderState.lightingAttrib());
+            colours = getOrAllocate(CCRenderState.lightingAttrib);
             Arrays.fill(colours, -1);
         }
         for (int k = 0; k < verts.length; k++) colours[k] = light.apply(colours[k], normals[k]);
@@ -351,18 +351,18 @@ public class CCModel implements CCRenderState.IVertexSource, Copyable<CCModel> {
     }
 
     public CCModel setColour(int c) {
-        int[] colours = getOrAllocate(CCRenderState.colourAttrib());
+        int[] colours = getOrAllocate(CCRenderState.colourAttrib);
         Arrays.fill(colours, c);
         return this;
     }
 
     /**
      * Computes the minecraft lighting coordinates for use with a LightMatrix
-     *
+     * 
      * @return The model
      */
     public CCModel computeLightCoords() {
-        LC[] lcs = getOrAllocate(CCRenderState.lightCoordAttrib());
+        LC[] lcs = getOrAllocate(CCRenderState.lightCoordAttrib);
         Vector3[] normals = normals();
         for (int i = 0; i < verts.length; i++) lcs[i] = new LC().compute(verts[i].vec, normals[i]);
         return this;
@@ -370,7 +370,7 @@ public class CCModel implements CCRenderState.IVertexSource, Copyable<CCModel> {
 
     /**
      * Averages all normals at the same position to produce a smooth lighting effect.
-     *
+     * 
      * @return The model
      */
     public CCModel smoothNormals() {
@@ -461,7 +461,7 @@ public class CCModel implements CCRenderState.IVertexSource, Copyable<CCModel> {
 
     /**
      * Renders vertices start through start+length-1 of the model
-     *
+     * 
      * @param start The first vertex index to render
      * @param end   The vertex index to render until
      * @param ops   Operations to apply
@@ -520,7 +520,7 @@ public class CCModel implements CCRenderState.IVertexSource, Copyable<CCModel> {
 
     /**
      * Parses vertices, texture coords, normals and polygons from a WaveFront Obj file
-     *
+     * 
      * @param input       An input stream to a obj file
      * @param vertexMode  The vertex mode to create the model for (GL_TRIANGLES or GL_QUADS)
      * @param coordSystem The cooridnate system transformation to apply
@@ -624,7 +624,7 @@ public class CCModel implements CCRenderState.IVertexSource, Copyable<CCModel> {
 
     /**
      * Parses vertices, texture coords, normals and polygons from a WaveFront Obj file
-     *
+     * 
      * @param res The resource for the obj file
      * @return A map of group names to models
      */
@@ -634,7 +634,7 @@ public class CCModel implements CCRenderState.IVertexSource, Copyable<CCModel> {
 
     /**
      * Parses vertices, texture coords, normals and polygons from a WaveFront Obj file
-     *
+     * 
      * @param res         The resource for the obj file
      * @param coordSystem The cooridnate system transformation to apply
      * @return A map of group names to models
@@ -652,7 +652,7 @@ public class CCModel implements CCRenderState.IVertexSource, Copyable<CCModel> {
 
     /**
      * Parses vertices, texture coords, normals and polygons from a WaveFront Obj file
-     *
+     * 
      * @param res         The resource for the obj file
      * @param vertexMode  The vertex mode to create the model for (GL_TRIANGLES or GL_QUADS)
      * @param coordSystem The cooridnate system transformation to apply
@@ -678,7 +678,7 @@ public class CCModel implements CCRenderState.IVertexSource, Copyable<CCModel> {
 
         boolean hasNormals = polys.get(0)[2] > 0;
         CCModel model = CCModel.newModel(vertexMode, polys.size());
-        if (hasNormals) model.getOrAllocate(CCRenderState.normalAttrib());
+        if (hasNormals) model.getOrAllocate(CCRenderState.normalAttrib);
 
         for (int i = 0; i < polys.size(); i++) {
             int[] ai = polys.get(i);
@@ -807,7 +807,7 @@ public class CCModel implements CCRenderState.IVertexSource, Copyable<CCModel> {
 
     /**
      * Generate models rotated to the other 5 sides of the block
-     *
+     * 
      * @param models An array of 6 models
      * @param side   The side of this model
      * @param point  The rotation point
@@ -822,7 +822,7 @@ public class CCModel implements CCRenderState.IVertexSource, Copyable<CCModel> {
 
     /**
      * Generate models rotated to the other 3 horizontal of the block
-     *
+     * 
      * @param models An array of 4 models
      * @param side   The side of this model
      * @param point  The rotation point
@@ -841,7 +841,7 @@ public class CCModel implements CCRenderState.IVertexSource, Copyable<CCModel> {
 
     /**
      * Generates copies of faces with clockwise vertices
-     *
+     * 
      * @return The model
      */
     public static CCModel generateBackface(CCModel src, int srcpos, CCModel dst, int destpos, int length) {

src/main/java/codechicken/lib/render/CCModelLibrary.java

@@ -5,6 +5,7 @@ import static codechicken.lib.math.MathHelper.phi;
 import codechicken.lib.vec.Matrix4;
 import codechicken.lib.vec.Quat;
 import codechicken.lib.vec.Rotation;
+import codechicken.lib.vec.Scale;
 import codechicken.lib.vec.Vector3;
 
 public class CCModelLibrary {
@@ -81,12 +82,7 @@ public class CCModelLibrary {
         i++;
     }
 
-    @Deprecated
     public static Matrix4 getRenderMatrix(Vector3 position, Rotation rotation, double scale) {
-        return new Matrix4().translate(position).scale(scale).apply(rotation);
-    }
-
-    public static Matrix4 getRenderMatrix(double posX, double posY, double posZ, Rotation rotation, double scale) {
-        return new Matrix4().translate(posX, posY, posZ).scale(scale).apply(rotation);
+        return new Matrix4().translate(position).apply(new Scale(scale)).apply(rotation);
     }
 }

src/main/java/codechicken/lib/render/CCRenderState.java

@@ -169,27 +169,7 @@ public class CCRenderState {
         }
     }
 
-    public static VertexAttribute<Vector3[]> normalAttrib() {
-        return instances.get().normalAttrib;
-    }
-
-    public static VertexAttribute<int[]> colourAttrib() {
-        return instances.get().colourAttrib;
-    }
-
-    public static VertexAttribute<LC[]> lightCoordAttrib() {
-        return instances.get().lightCoordAttrib;
-    }
-
-    public static VertexAttribute<int[]> sideAttrib() {
-        return instances.get().sideAttrib;
-    }
-
-    public static VertexAttribute<int[]> lightingAttrib() {
-        return instances.get().lightingAttrib;
-    }
-
-    public VertexAttribute<Vector3[]> normalAttrib = new VertexAttribute<>() {
+    public static VertexAttribute<Vector3[]> normalAttrib = new VertexAttribute<>() {
 
         private Vector3[] normalRef;
 
@@ -217,7 +197,7 @@ public class CCRenderState {
             else state.setNormalInstance(Rotation.axes[state.side]);
         }
     };
-    public VertexAttribute<int[]> colourAttrib = new VertexAttribute<>() {
+    public static VertexAttribute<int[]> colourAttrib = new VertexAttribute<>() {
 
         private int[] colourRef;
 
@@ -239,7 +219,7 @@ public class CCRenderState {
             else state.setColourInstance(state.baseColour);
         }
     };
-    public VertexAttribute<int[]> lightingAttrib = new VertexAttribute<>() {
+    public static VertexAttribute<int[]> lightingAttrib = new VertexAttribute<>() {
 
         private int[] colourRef;
 
@@ -265,7 +245,7 @@ public class CCRenderState {
             state.setColourInstance(ColourRGBA.multiply(state.colour, colourRef[state.vertexIndex]));
         }
     };
-    public VertexAttribute<int[]> sideAttrib = new VertexAttribute<>() {
+    public static VertexAttribute<int[]> sideAttrib = new VertexAttribute<>() {
 
         private int[] sideRef;
 
@@ -292,7 +272,7 @@ public class CCRenderState {
     /**
      * Uses the position of the lightmatrix to compute LC if not provided
      */
-    public VertexAttribute<LC[]> lightCoordAttrib = new VertexAttribute<>() {
+    public static VertexAttribute<LC[]> lightCoordAttrib = new VertexAttribute<>() {
 
         private LC[] lcRef;
         private final Vector3 vec = new Vector3(); // for computation

src/main/java/codechicken/lib/render/RenderUtils.java

@@ -13,7 +13,6 @@ import net.minecraft.entity.item.EntityItem;
 import net.minecraft.item.ItemBlock;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.IIcon;
-import net.minecraft.util.MathHelper;
 import net.minecraftforge.client.IItemRenderer;
 import net.minecraftforge.client.MinecraftForgeClient;
 import net.minecraftforge.fluids.Fluid;
@@ -27,130 +26,87 @@ import codechicken.lib.vec.Vector3;
 
 public class RenderUtils {
 
-    static RenderItem uniformRenderItem;
+    static Vector3[] vectors = new Vector3[8];
+    static RenderItem uniformRenderItem = new RenderItem() {
+
+        public boolean shouldBob() {
+            return false;
+        }
+    };
     static EntityItem entityItem;
 
     static {
-        uniformRenderItem = new RenderItem() {
+        for (int i = 0; i < vectors.length; i++) vectors[i] = new Vector3();
 
-            public boolean shouldBob() {
-                return false;
-            }
-        };
         uniformRenderItem.setRenderManager(RenderManager.instance);
+
         entityItem = new EntityItem(null);
         entityItem.hoverStart = 0;
     }
 
-    @Deprecated
     public static void renderFluidQuad(Vector3 point1, Vector3 point2, Vector3 point3, Vector3 point4, IIcon icon,
             double res) {
-        // spotless:off
         renderFluidQuad(
-            point2.x, point2.y, point2.z,
-            point4.x - point1.x, point4.y - point1.y, point4.z - point1.z,
-            point1.x - point2.x, point1.y - point2.y, point1.z - point2.z,
-            icon, res);
+                point2,
+                vectors[0].set(point4).subtract(point1),
+                vectors[1].set(point1).subtract(point2),
+                icon,
+                res);
     }
 
     /**
      * Draws a tessellated quadrilateral bottom to top, left to right
-     *
+     * 
      * @param base The bottom left corner of the quad
      * @param wide The bottom of the quad
      * @param high The left side of the quad
      * @param res  Units per icon
      */
-    @Deprecated
     public static void renderFluidQuad(Vector3 base, Vector3 wide, Vector3 high, IIcon icon, double res) {
-        renderFluidQuad(
-            base.x, base.y, base.z,
-            wide.x, wide.y, wide.z,
-            wide.x, wide.y, wide.z,
-            icon, res);
-    }
+        Tessellator t = Tessellator.instance;
 
-    /**
-     * Draws a tessellated quadrilateral bottom to top, left to right
-     * <p>
-     * base : The bottom left corner of the quad
-     * <p>
-     * wide : The bottom of the quad
-     * <p>
-     * high : The left side of the quad
-     * <p>
-     * res :  Units per icon
-     */
-    public static void renderFluidQuad(
-        double baseX, double baseY, double baseZ,
-        double wideX, double wideY, double wideZ,
-        double highX, double highY, double highZ,
-        IIcon icon, double res) {
-
-        Tessellator tessellator = Tessellator.instance;
-
-        double u = icon.getMinU();
+        double u1 = icon.getMinU();
         double du = icon.getMaxU() - icon.getMinU();
-        double v = icon.getMinV();
+        double v2 = icon.getMaxV();
         double dv = icon.getMaxV() - icon.getMinV();
 
-        double wideLen = Math.sqrt(wideX * wideX + wideY * wideY + wideZ * wideZ);
-        double highLen = Math.sqrt(highX * highX + highY * highY + highZ * highZ);
+        double wlen = wide.mag();
+        double hlen = high.mag();
 
         double x = 0;
-        while (x < wideLen) {
-            double rx = wideLen - x;
+        while (x < wlen) {
+            double rx = wlen - x;
             if (rx > res) rx = res;
 
             double y = 0;
-            while (y < highLen) {
-                double ry = highLen - y;
+            while (y < hlen) {
+                double ry = hlen - y;
                 if (ry > res) ry = res;
 
-                final double mult1 = x / wideLen;
-                double dx1X = wideX * mult1;
-                double dx1Y = wideY * mult1;
-                double dx1Z = wideZ * mult1;
+                Vector3 dx1 = vectors[2].set(wide).multiply(x / wlen);
+                Vector3 dx2 = vectors[3].set(wide).multiply((x + rx) / wlen);
+                Vector3 dy1 = vectors[4].set(high).multiply(y / hlen);
+                Vector3 dy2 = vectors[5].set(high).multiply((y + ry) / hlen);
 
-                final double mult2 = (x + rx) / wideLen;
-                double dx2X = wideX * mult2;
-                double dx2Y = wideY * mult2;
-                double dx2Z = wideZ * mult2;
-
-                final double mult3 = y / highLen;
-                double dy1X = highX * mult3;
-                double dy1Y = highY * mult3;
-                double dy1Z = highZ * mult3;
-
-                final double mult4 = (y + ry) / highLen;
-                double dy2X = highX * mult4;
-                double dy2Y = highY * mult4;
-                double dy2Z = highZ * mult4;
-
-                tessellator.addVertexWithUV(
-                        baseX + dx1X + dy2X,
-                        baseY + dx1Y + dy2Y,
-                        baseZ + dx1Z + dy2Z,
-                        u,
-                        v + ry / res * dv);
-                tessellator.addVertexWithUV(
-                    baseX + dx1X + dy1X,
-                    baseY + dx1Y + dy1Y,
-                    baseZ + dx1Z + dy1Z,
-                        u,
-                        v);
-                tessellator.addVertexWithUV(
-                        baseX + dx2X + dy1X,
-                        baseY + dx2Y + dy1Y,
-                        baseZ + dx2Z + dy1Z,
-                        u + rx / res * du,
-                        v);
-                tessellator.addVertexWithUV(
-                        baseX + dx2X + dy2X,
-                        baseY + dx2Y + dy2Y,
-                        baseZ + dx2Z + dy2Z,
-                        u + rx / res * du,
-                        v + ry / res * dv);
+                t.addVertexWithUV(
+                        base.x + dx1.x + dy2.x,
+                        base.y + dx1.y + dy2.y,
+                        base.z + dx1.z + dy2.z,
+                        u1,
+                        v2 - ry / res * dv);
+                t.addVertexWithUV(base.x + dx1.x + dy1.x, base.y + dx1.y + dy1.y, base.z + dx1.z + dy1.z, u1, v2);
+                t.addVertexWithUV(
+                        base.x + dx2.x + dy1.x,
+                        base.y + dx2.y + dy1.y,
+                        base.z + dx2.z + dy1.z,
+                        u1 + rx / res * du,
+                        v2);
+                t.addVertexWithUV(
+                        base.x + dx2.x + dy2.x,
+                        base.y + dx2.y + dy2.y,
+                        base.z + dx2.z + dy2.z,
+                        u1 + rx / res * du,
+                        v2 - ry / res * dv);
 
                 y += ry;
             }
@@ -159,130 +115,132 @@ public class RenderUtils {
         }
     }
 
-    public static void translateToWorldCoords(Entity entity, float partialTicks) {
-        double interpPosX = entity.lastTickPosX + (entity.posX - entity.lastTickPosX) * partialTicks;
-        double interpPosY = entity.lastTickPosY + (entity.posY - entity.lastTickPosY) * partialTicks;
-        double interpPosZ = entity.lastTickPosZ + (entity.posZ - entity.lastTickPosZ) * partialTicks;
+    public static void translateToWorldCoords(Entity entity, float frame) {
+        double interpPosX = entity.lastTickPosX + (entity.posX - entity.lastTickPosX) * frame;
+        double interpPosY = entity.lastTickPosY + (entity.posY - entity.lastTickPosY) * frame;
+        double interpPosZ = entity.lastTickPosZ + (entity.posZ - entity.lastTickPosZ) * frame;
+
         GL11.glTranslated(-interpPosX, -interpPosY, -interpPosZ);
     }
 
     public static void drawCuboidOutline(Cuboid6 c) {
-        Tessellator tess = Tessellator.instance;
-        tess.startDrawing(3);
-        tess.addVertex(c.min.x, c.min.y, c.min.z);
-        tess.addVertex(c.max.x, c.min.y, c.min.z);
-        tess.addVertex(c.max.x, c.min.y, c.max.z);
-        tess.addVertex(c.min.x, c.min.y, c.max.z);
-        tess.addVertex(c.min.x, c.min.y, c.min.z);
-        tess.draw();
-        tess.startDrawing(3);
-        tess.addVertex(c.min.x, c.max.y, c.min.z);
-        tess.addVertex(c.max.x, c.max.y, c.min.z);
-        tess.addVertex(c.max.x, c.max.y, c.max.z);
-        tess.addVertex(c.min.x, c.max.y, c.max.z);
-        tess.addVertex(c.min.x, c.max.y, c.min.z);
-        tess.draw();
-        tess.startDrawing(1);
-        tess.addVertex(c.min.x, c.min.y, c.min.z);
-        tess.addVertex(c.min.x, c.max.y, c.min.z);
-        tess.addVertex(c.max.x, c.min.y, c.min.z);
-        tess.addVertex(c.max.x, c.max.y, c.min.z);
-        tess.addVertex(c.max.x, c.min.y, c.max.z);
-        tess.addVertex(c.max.x, c.max.y, c.max.z);
-        tess.addVertex(c.min.x, c.min.y, c.max.z);
-        tess.addVertex(c.min.x, c.max.y, c.max.z);
-        tess.draw();
+        Tessellator var2 = Tessellator.instance;
+        var2.startDrawing(3);
+        var2.addVertex(c.min.x, c.min.y, c.min.z);
+        var2.addVertex(c.max.x, c.min.y, c.min.z);
+        var2.addVertex(c.max.x, c.min.y, c.max.z);
+        var2.addVertex(c.min.x, c.min.y, c.max.z);
+        var2.addVertex(c.min.x, c.min.y, c.min.z);
+        var2.draw();
+        var2.startDrawing(3);
+        var2.addVertex(c.min.x, c.max.y, c.min.z);
+        var2.addVertex(c.max.x, c.max.y, c.min.z);
+        var2.addVertex(c.max.x, c.max.y, c.max.z);
+        var2.addVertex(c.min.x, c.max.y, c.max.z);
+        var2.addVertex(c.min.x, c.max.y, c.min.z);
+        var2.draw();
+        var2.startDrawing(1);
+        var2.addVertex(c.min.x, c.min.y, c.min.z);
+        var2.addVertex(c.min.x, c.max.y, c.min.z);
+        var2.addVertex(c.max.x, c.min.y, c.min.z);
+        var2.addVertex(c.max.x, c.max.y, c.min.z);
+        var2.addVertex(c.max.x, c.min.y, c.max.z);
+        var2.addVertex(c.max.x, c.max.y, c.max.z);
+        var2.addVertex(c.min.x, c.min.y, c.max.z);
+        var2.addVertex(c.min.x, c.max.y, c.max.z);
+        var2.draw();
     }
 
     public static void renderFluidCuboid(CCRenderState state, Cuboid6 bound, IIcon tex, double res) {
-        renderFluidCuboid(bound, tex, res);
+        renderFluidQuad( // bottom
+                new Vector3(bound.min.x, bound.min.y, bound.min.z),
+                new Vector3(bound.max.x, bound.min.y, bound.min.z),
+                new Vector3(bound.max.x, bound.min.y, bound.max.z),
+                new Vector3(bound.min.x, bound.min.y, bound.max.z),
+                tex,
+                res);
+        renderFluidQuad( // top
+                new Vector3(bound.min.x, bound.max.y, bound.min.z),
+                new Vector3(bound.min.x, bound.max.y, bound.max.z),
+                new Vector3(bound.max.x, bound.max.y, bound.max.z),
+                new Vector3(bound.max.x, bound.max.y, bound.min.z),
+                tex,
+                res);
+        renderFluidQuad( // -x
+                new Vector3(bound.min.x, bound.max.y, bound.min.z),
+                new Vector3(bound.min.x, bound.min.y, bound.min.z),
+                new Vector3(bound.min.x, bound.min.y, bound.max.z),
+                new Vector3(bound.min.x, bound.max.y, bound.max.z),
+                tex,
+                res);
+        renderFluidQuad( // +x
+                new Vector3(bound.max.x, bound.max.y, bound.max.z),
+                new Vector3(bound.max.x, bound.min.y, bound.max.z),
+                new Vector3(bound.max.x, bound.min.y, bound.min.z),
+                new Vector3(bound.max.x, bound.max.y, bound.min.z),
+                tex,
+                res);
+        renderFluidQuad( // -z
+                new Vector3(bound.max.x, bound.max.y, bound.min.z),
+                new Vector3(bound.max.x, bound.min.y, bound.min.z),
+                new Vector3(bound.min.x, bound.min.y, bound.min.z),
+                new Vector3(bound.min.x, bound.max.y, bound.min.z),
+                tex,
+                res);
+        renderFluidQuad( // +z
+                new Vector3(bound.min.x, bound.max.y, bound.max.z),
+                new Vector3(bound.min.x, bound.min.y, bound.max.z),
+                new Vector3(bound.max.x, bound.min.y, bound.max.z),
+                new Vector3(bound.max.x, bound.max.y, bound.max.z),
+                tex,
+                res);
     }
 
     public static void renderFluidCuboid(Cuboid6 bound, IIcon tex, double res) {
-        final double minX = bound.min.x;
-        final double minY = bound.min.y;
-        final double minZ = bound.min.z;
-        final double maxX = bound.max.x;
-        final double maxY = bound.max.y;
-        final double maxZ = bound.max.z;
-        renderFluidQuad( // bottom
-            minX, minY, minZ,
-            maxX - minX, 0, 0,
-            0, 0, maxZ - minZ,
-            tex, res);
-        renderFluidQuad( // top
-            minX, maxY, minZ,
-            0, 0, maxZ - minZ,
-            maxX - minX, 0, 0,
-            tex, res);
-        renderFluidQuad( // -x
-            minX, maxY, minZ,
-            0, minY - maxY, 0,
-            0, 0, maxZ - minZ,
-            tex, res);
-        renderFluidQuad( // +x
-            maxX, maxY, maxZ,
-            0, minY - maxY, 0,
-            0, 0, minZ - maxZ,
-            tex, res);
-        renderFluidQuad( // -z
-            maxX, maxY, minZ,
-            0, minY - maxY, 0,
-            minX - maxX, 0, 0,
-            tex, res);
-        renderFluidQuad( // +z
-            minX, maxY, maxZ,
-            0, minY - maxY, 0,
-            maxX - minX, 0, 0,
-            tex, res);
+        renderFluidCuboid(CCRenderState.instance(), bound, tex, res);
     }
-    // spotless:on
 
     public static void renderBlockOverlaySide(int x, int y, int z, int side, double tx1, double tx2, double ty1,
             double ty2) {
+        double[] points = new double[] { x - 0.009, x + 1.009, y - 0.009, y + 1.009, z - 0.009, z + 1.009 };
+
         Tessellator tessellator = Tessellator.instance;
-        final double minX = x - 0.009;
-        final double maxX = x + 1.009;
-        final double minY = y - 0.009;
-        final double maxY = y + 1.009;
-        final double minZ = z - 0.009;
-        final double maxZ = z + 1.009;
         switch (side) {
             case 0:
-                tessellator.addVertexWithUV(minX, minY, minZ, tx1, ty1);
-                tessellator.addVertexWithUV(maxX, minY, minZ, tx2, ty1);
-                tessellator.addVertexWithUV(maxX, minY, maxZ, tx2, ty2);
-                tessellator.addVertexWithUV(minX, minY, maxZ, tx1, ty2);
+                tessellator.addVertexWithUV(points[0], points[2], points[4], tx1, ty1);
+                tessellator.addVertexWithUV(points[1], points[2], points[4], tx2, ty1);
+                tessellator.addVertexWithUV(points[1], points[2], points[5], tx2, ty2);
+                tessellator.addVertexWithUV(points[0], points[2], points[5], tx1, ty2);
                 break;
             case 1:
-                tessellator.addVertexWithUV(maxX, maxY, minZ, tx2, ty1);
-                tessellator.addVertexWithUV(minX, maxY, minZ, tx1, ty1);
-                tessellator.addVertexWithUV(minX, maxY, maxZ, tx1, ty2);
-                tessellator.addVertexWithUV(maxX, maxY, maxZ, tx2, ty2);
+                tessellator.addVertexWithUV(points[1], points[3], points[4], tx2, ty1);
+                tessellator.addVertexWithUV(points[0], points[3], points[4], tx1, ty1);
+                tessellator.addVertexWithUV(points[0], points[3], points[5], tx1, ty2);
+                tessellator.addVertexWithUV(points[1], points[3], points[5], tx2, ty2);
                 break;
             case 2:
-                tessellator.addVertexWithUV(minX, maxY, minZ, tx2, ty1);
-                tessellator.addVertexWithUV(maxX, maxY, minZ, tx1, ty1);
-                tessellator.addVertexWithUV(maxX, minY, minZ, tx1, ty2);
-                tessellator.addVertexWithUV(minX, minY, minZ, tx2, ty2);
+                tessellator.addVertexWithUV(points[0], points[3], points[4], tx2, ty1);
+                tessellator.addVertexWithUV(points[1], points[3], points[4], tx1, ty1);
+                tessellator.addVertexWithUV(points[1], points[2], points[4], tx1, ty2);
+                tessellator.addVertexWithUV(points[0], points[2], points[4], tx2, ty2);
                 break;
             case 3:
-                tessellator.addVertexWithUV(maxX, maxY, maxZ, tx2, ty1);
-                tessellator.addVertexWithUV(minX, maxY, maxZ, tx1, ty1);
-                tessellator.addVertexWithUV(minX, minY, maxZ, tx1, ty2);
-                tessellator.addVertexWithUV(maxX, minY, maxZ, tx2, ty2);
+                tessellator.addVertexWithUV(points[1], points[3], points[5], tx2, ty1);
+                tessellator.addVertexWithUV(points[0], points[3], points[5], tx1, ty1);
+                tessellator.addVertexWithUV(points[0], points[2], points[5], tx1, ty2);
+                tessellator.addVertexWithUV(points[1], points[2], points[5], tx2, ty2);
                 break;
             case 4:
-                tessellator.addVertexWithUV(minX, maxY, maxZ, tx2, ty1);
-                tessellator.addVertexWithUV(minX, maxY, minZ, tx1, ty1);
-                tessellator.addVertexWithUV(minX, minY, minZ, tx1, ty2);
-                tessellator.addVertexWithUV(minX, minY, maxZ, tx2, ty2);
+                tessellator.addVertexWithUV(points[0], points[3], points[5], tx2, ty1);
+                tessellator.addVertexWithUV(points[0], points[3], points[4], tx1, ty1);
+                tessellator.addVertexWithUV(points[0], points[2], points[4], tx1, ty2);
+                tessellator.addVertexWithUV(points[0], points[2], points[5], tx2, ty2);
                 break;
             case 5:
-                tessellator.addVertexWithUV(maxX, maxY, minZ, tx2, ty1);
-                tessellator.addVertexWithUV(maxX, maxY, maxZ, tx1, ty1);
-                tessellator.addVertexWithUV(maxX, minY, maxZ, tx1, ty2);
-                tessellator.addVertexWithUV(maxX, minY, minZ, tx2, ty2);
+                tessellator.addVertexWithUV(points[1], points[3], points[4], tx2, ty1);
+                tessellator.addVertexWithUV(points[1], points[3], points[5], tx1, ty1);
+                tessellator.addVertexWithUV(points[1], points[2], points[5], tx1, ty2);
+                tessellator.addVertexWithUV(points[1], points[2], points[4], tx2, ty2);
                 break;
         }
     }
@@ -318,76 +276,66 @@ public class RenderUtils {
         GL11.glDisable(GL11.GL_BLEND);
     }
 
-    public static double fluidDensityToAlpha(double d) {
-        return Math.pow(d, 0.4);
+    public static double fluidDensityToAlpha(double density) {
+        return Math.pow(density, 0.4);
     }
 
     /**
      * Renders a fluid within a bounding box. If the fluid is a liquid it will render as a normal tank with height equal
-     * to fillRate/bound.height. If the fluid is a gas, it will render the full box with an alpha equal to fillRate.
+     * to density/bound.height. If the fluid is a gas, it will render the full box with an alpha equal to density.
      * Warning, bound will be mutated if the fluid is a liquid
-     *
-     * @param stack    The fluid to render.
-     * @param bound    The bounding box within which the fluid is contained.
-     * @param fillRate The volume of fluid / the capacity of the tank. This is a double between 0 and 1.
-     * @param res      The resolution to render at.
+     * 
+     * @param stack   The fluid to render.
+     * @param bound   The box within which the fluid is contained.
+     * @param density The volume of fluid / the capacity of the tank. For gases this determines the alpha, for liquids
+     *                this determines the height.
+     * @param res     The resolution to render at.
      */
-    public static void renderFluidCuboid(CCRenderState state, FluidStack stack, Cuboid6 bound, double fillRate,
+    public static void renderFluidCuboid(CCRenderState state, FluidStack stack, Cuboid6 bound, double density,
             double res) {
         if (!shouldRenderFluid(stack)) return;
 
-        fillRate = MathHelper.clamp_double(fillRate, 0d, 1d);
         int alpha = 255;
-        if (stack.getFluid().isGaseous()) {
-            alpha = (int) (fluidDensityToAlpha(fillRate) * 255);
-        } else {
-            bound.max.y = bound.min.y + (bound.max.y - bound.min.y) * fillRate;
-        }
+        if (stack.getFluid().isGaseous()) alpha = (int) (fluidDensityToAlpha(density) * 255);
+        else bound.max.y = bound.min.y + (bound.max.y - bound.min.y) * density;
 
         IIcon tex = prepareFluidRender(state, stack, alpha);
         state.startDrawingInstance();
-        renderFluidCuboid(bound, tex, res);
+        renderFluidCuboid(state, bound, tex, res);
         state.drawInstance();
         postFluidRender();
     }
 
-    /**
-     * Renders a fluid within a bounding box. If the fluid is a liquid it will render as a normal tank with height equal
-     * to fillRate/bound.height. If the fluid is a gas, it will render the full box with an alpha equal to fillRate.
-     * Warning, bound will be mutated if the fluid is a liquid
-     *
-     * @param stack    The fluid to render.
-     * @param bound    The bounding box within which the fluid is contained.
-     * @param fillRate The volume of fluid / the capacity of the tank. This is a double between 0 and 1.
-     * @param res      The resolution to render at.
-     */
-    public static void renderFluidCuboid(FluidStack stack, Cuboid6 bound, double fillRate, double res) {
-        renderFluidCuboid(CCRenderState.instance(), stack, bound, fillRate, res);
+    public static void renderFluidCuboid(FluidStack stack, Cuboid6 bound, double density, double res) {
+        renderFluidCuboid(CCRenderState.instance(), stack, bound, density, res);
     }
 
-    public static void renderFluidGauge(CCRenderState state, FluidStack stack, Rectangle4i rect, double fillRate,
+    public static void renderFluidGauge(CCRenderState state, FluidStack stack, Rectangle4i rect, double density,
             double res) {
         if (!shouldRenderFluid(stack)) return;
 
-        fillRate = MathHelper.clamp_double(fillRate, 0d, 1d);
         int alpha = 255;
-        if (stack.getFluid().isGaseous()) {
-            alpha = (int) (fluidDensityToAlpha(fillRate) * 255);
-        } else {
-            int height = (int) (rect.h * fillRate);
+        if (stack.getFluid().isGaseous()) alpha = (int) (fluidDensityToAlpha(density) * 255);
+        else {
+            int height = (int) (rect.h * density);
             rect.y += rect.h - height;
             rect.h = height;
         }
 
         IIcon tex = prepareFluidRender(state, stack, alpha);
         state.startDrawingInstance();
-        renderFluidQuad(rect.x, rect.y + rect.h, 0, rect.w, 0, 0, 0, -rect.h, 0, tex, res);
+        renderFluidQuad(
+                new Vector3(rect.x, rect.y + rect.h, 0),
+                new Vector3(rect.w, 0, 0),
+                new Vector3(0, -rect.h, 0),
+                tex,
+                res);
         state.drawInstance();
         postFluidRender();
     }
 
-    public static void renderFluidGauge(FluidStack stack, Rectangle4i rect, double fillRate, double res) {
-        renderFluidGauge(CCRenderState.instance(), stack, rect, fillRate, res);
+    public static void renderFluidGauge(FluidStack stack, Rectangle4i rect, double density, double res) {
+        renderFluidGauge(CCRenderState.instance(), stack, rect, density, res);
     }
 
     /**
@@ -399,7 +347,7 @@ public class RenderUtils {
 
     /**
      * Renders items and blocks in the world at 0,0,0 with transformations that size them appropriately
-     *
+     * 
      * @param spin The spin angle of the item around the y axis in degrees
      */
     public static void renderItemUniform(ItemStack item, double spin) {

src/main/java/codechicken/lib/vec/Matrix4.java

@@ -19,10 +19,7 @@ public class Matrix4 extends Transformation implements Copyable<Matrix4> {
             .asDoubleBuffer();
 
     // m<row><column>
-    public double m00, m01, m02, m03;
-    public double m10, m11, m12, m13;
-    public double m20, m21, m22, m23;
-    public double m30, m31, m32, m33;
+    public double m00, m01, m02, m03, m10, m11, m12, m13, m20, m21, m22, m23, m30, m31, m32, m33;
 
     public Matrix4() {
         m00 = m11 = m22 = m33 = 1;
@@ -68,15 +65,6 @@ public class Matrix4 extends Transformation implements Copyable<Matrix4> {
         return this;
     }
 
-    public Matrix4 translate(double x, double y, double z) {
-        m03 += m00 * x + m01 * y + m02 * z;
-        m13 += m10 * x + m11 * y + m12 * z;
-        m23 += m20 * x + m21 * y + m22 * z;
-        m33 += m30 * x + m31 * y + m32 * z;
-
-        return this;
-    }
-
     public Matrix4 scale(Vector3 vec) {
         m00 *= vec.x;
         m10 *= vec.x;
@@ -94,22 +82,6 @@ public class Matrix4 extends Transformation implements Copyable<Matrix4> {
         return this;
     }
 
-    public Matrix4 scale(double scale) {
-        m00 *= scale;
-        m10 *= scale;
-        m20 *= scale;
-        m30 *= scale;
-        m01 *= scale;
-        m11 *= scale;
-        m21 *= scale;
-        m31 *= scale;
-        m02 *= scale;
-        m12 *= scale;
-        m22 *= scale;
-        m32 *= scale;
-        return this;
-    }
-
     public Matrix4 rotate(double angle, Vector3 axis) {
         double c = Math.cos(angle);
         double s = Math.sin(angle);

src/main/java/codechicken/lib/vec/Transformation.java

@@ -14,14 +14,14 @@ public abstract class Transformation extends ITransformation<Vector3, Transforma
 
     /**
      * Applies this transformation to a normal (doesn't translate)
-     *
+     * 
      * @param normal The normal to transform
      */
     public abstract void applyN(Vector3 normal);
 
     /**
      * Applies this transformation to a matrix as a multiplication on the right hand side.
-     *
+     * 
      * @param mat The matrix to combine this transformation with
      */
     public abstract void apply(Matrix4 mat);
@@ -39,14 +39,14 @@ public abstract class Transformation extends ITransformation<Vector3, Transforma
 
     @Override
     public boolean load(CCRenderState state) {
-        state.pipeline.addRequirement(CCRenderState.normalAttrib().operationID());
+        state.pipeline.addRequirement(CCRenderState.normalAttrib.operationID());
         return !isRedundant();
     }
 
     @Override
     public void operate(CCRenderState state) {
         apply(state.vert.vec);
-        if (CCRenderState.normalAttrib().active) applyN(state.normal);
+        if (CCRenderState.normalAttrib.active) applyN(state.normal);
     }
 
     @Override

src/main/java/codechicken/lib/vec/Vector3.java

@@ -29,10 +29,10 @@ public class Vector3 implements Copyable<Vector3> {
 
     public Vector3() {}
 
-    public Vector3(double x, double y, double z) {
-        this.x = x;
-        this.y = y;
-        this.z = z;
+    public Vector3(double d, double d1, double d2) {
+        x = d;
+        y = d1;
+        z = d2;
     }
 
     public Vector3(Vector3 vec) {
@@ -398,7 +398,7 @@ public class Vector3 implements Copyable<Vector3> {
 
     /**
      * Equals method with tolerance
-     *
+     * 
      * @return true if this is equal to v within +-1E-5
      */
     public boolean equalsT(Vector3 v) {

src/main/java/codechicken/lib/world/WorldExtensionManager.java

@@ -79,25 +79,17 @@ public class WorldExtensionManager {
 
         @SubscribeEvent
         public void onChunkWatch(Watch event) {
-            WorldExtension[] extensions = worldMap.get(event.player.worldObj);
-
-            if (extensions != null) {
-                Chunk chunk = event.player.worldObj
-                        .getChunkFromChunkCoords(event.chunk.chunkXPos, event.chunk.chunkZPos);
-                for (WorldExtension extension : extensions) extension.watchChunk(chunk, event.player);
-            }
+            Chunk chunk = event.player.worldObj.getChunkFromChunkCoords(event.chunk.chunkXPos, event.chunk.chunkZPos);
+            for (WorldExtension extension : worldMap.get(event.player.worldObj))
+                extension.watchChunk(chunk, event.player);
         }
 
         @SubscribeEvent
         @SideOnly(Side.CLIENT)
         public void onChunkUnWatch(UnWatch event) {
-            WorldExtension[] extensions = worldMap.get(event.player.worldObj);
-
-            if (extensions != null) {
-                Chunk chunk = event.player.worldObj
-                        .getChunkFromChunkCoords(event.chunk.chunkXPos, event.chunk.chunkZPos);
-                for (WorldExtension extension : extensions) extension.unwatchChunk(chunk, event.player);
-            }
+            Chunk chunk = event.player.worldObj.getChunkFromChunkCoords(event.chunk.chunkXPos, event.chunk.chunkZPos);
+            for (WorldExtension extension : worldMap.get(event.player.worldObj))
+                extension.unwatchChunk(chunk, event.player);
         }
 
         @SubscribeEvent
@@ -118,7 +110,7 @@ public class WorldExtensionManager {
     }
 
     private static boolean initialised;
-    private static ArrayList<WorldExtensionInstantiator> extensionIntialisers = new ArrayList<>();
+    private static ArrayList<WorldExtensionInstantiator> extensionIntialisers = new ArrayList<WorldExtensionInstantiator>();
 
     public static void registerWorldExtension(WorldExtensionInstantiator init) {
         if (!initialised) init();
@@ -133,7 +125,7 @@ public class WorldExtensionManager {
         FMLCommonHandler.instance().bus().register(new WorldExtensionEventHandler());
     }
 
-    private static HashMap<World, WorldExtension[]> worldMap = new HashMap<>();
+    private static HashMap<World, WorldExtension[]> worldMap = new HashMap<World, WorldExtension[]>();
 
     private static void onWorldLoad(World world) {
         WorldExtension[] extensions = new WorldExtension[extensionIntialisers.size()];

src/main/java/codechicken/obfuscator/ObfuscationRun.java

@@ -4,15 +4,13 @@ import java.io.BufferedReader;
 import java.io.File;
 import java.io.FileReader;
 import java.io.PrintStream;
-import java.lang.reflect.Constructor;
-import java.lang.reflect.InvocationTargetException;
 import java.text.DecimalFormat;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
 
 import org.objectweb.asm.ClassVisitor;
-import org.objectweb.asm.commons.Remapper;
+import org.objectweb.asm.commons.RemappingClassAdapter;
 import org.objectweb.asm.tree.ClassNode;
 
 import com.google.common.base.Function;
@@ -183,40 +181,7 @@ public class ObfuscationRun implements ILogStreams {
 
     public void remap(ClassNode cnode, ClassVisitor cv) {
         cstMappper.transform(cnode);
-        cnode.accept(newRemapper(cv, obfMapper));
-    }
-
-    private static ClassVisitor newRemapper(ClassVisitor visitor, Remapper remapper) {
-        try {
-            return theConstructor.newInstance(visitor, remapper);
-        } catch (InstantiationException | IllegalAccessException | InvocationTargetException e) {
-            throw new RuntimeException(e);
-        }
-    }
-
-    private static final Constructor<? extends ClassVisitor> theConstructor;
-
-    static {
-        Class<? extends ClassVisitor> remapperClass;
-        try {
-            // noinspection unchecked
-            remapperClass = (Class<? extends ClassVisitor>) Class.forName("org.objectweb.asm.commons.ClassRemapper");
-        } catch (ClassNotFoundException e) {
-            try {
-                // noinspection unchecked
-                remapperClass = (Class<? extends ClassVisitor>) Class
-                        .forName("org.objectweb.asm.commons.RemappingClassAdapter");
-            } catch (ClassNotFoundException ex) {
-                RuntimeException err = new RuntimeException(ex);
-                err.addSuppressed(e);
-                throw err;
-            }
-        }
-        try {
-            theConstructor = remapperClass.getConstructor(ClassVisitor.class, Remapper.class);
-        } catch (NoSuchMethodException e) {
-            throw new RuntimeException(e);
-        }
+        cnode.accept(new RemappingClassAdapter(cv, obfMapper));
     }
 
     public static List<String> getParents(ClassNode cnode) {