cache frequent enum.values() calls (#59)

dependencies.gradle

@@ -1,14 +1,14 @@
 // Add your dependencies here
 
 dependencies {
-    api('com.github.GTNewHorizons:ForestryMC:4.11.2:dev')
+    api('com.github.GTNewHorizons:ForestryMC:4.11.7:dev')
 
-    compileOnly('com.github.GTNewHorizons:BloodMagic:1.8.5:dev')
-    compileOnly('com.github.GTNewHorizons:ThaumicHorizons:1.8.4:dev')
-    compileOnly('com.github.GTNewHorizons:Baubles-Expanded:2.2.2-GTNH:dev') {transitive = false}
-    compileOnly('com.github.GTNewHorizons:Botania:1.13.4-GTNH:api') {transitive = false}
+    compileOnly('com.github.GTNewHorizons:BloodMagic:1.8.12:dev')
+    compileOnly('com.github.GTNewHorizons:ThaumicHorizons:1.8.11:dev')
+    compileOnly('com.github.GTNewHorizons:Baubles-Expanded:2.2.9-GTNH:dev') {transitive = false}
+    compileOnly('com.github.GTNewHorizons:Botania:1.13.15-GTNH:api') {transitive = false}
     compileOnly('thaumcraft:Thaumcraft:1.7.10-4.2.3.5:dev') {transitive = false}
-    compileOnly('com.github.GTNewHorizons:GT5-Unofficial:5.09.52.97:dev')
-    compileOnly('com.github.GTNewHorizons:ThaumicEnergistics:1.7.14-GTNH:dev')
+    compileOnly('com.github.GTNewHorizons:GT5-Unofficial:5.09.52.331:dev')
+    compileOnly('com.github.GTNewHorizons:ThaumicEnergistics:1.7.31-GTNH:dev')
 }
 

gradle.properties

@@ -39,10 +39,34 @@ remoteMappings = https\://raw.githubusercontent.com/MinecraftForge/FML/1.7.10/co
 # `./gradlew runClient --username=AnotherPlayer`, or configuring this command in your IDE.
 developmentEnvironmentUserName = Developer
 
-# Enables using modern Java syntax (up to version 17) via Jabel, while still targeting JVM 8.
-# See https://github.com/bsideup/jabel for details on how this works.
+# Enables modern Java syntax support. Valid values:
+# - false: No modern syntax, Java 8 only
+# - jabel: Jabel syntax-only support, compiles to J8 bytecode
+# - jvmDowngrader: Full modern Java via JVM Downgrader (syntax + stdlib APIs)
+# - modern: Native modern Java bytecode, no downgrading
 enableModernJavaSyntax = false
 
+# If set, ignores the above setting and compiles with the given toolchain. This may cause unexpected issues,
+# and should *not* be used in most situations. -1 disables this.
+# forceToolchainVersion = -1
+
+# Target JVM version for JVM Downgrader bytecode downgrading.
+# Only used when enableModernJavaSyntax = jvmDowngrader
+# downgradeTargetVersion = 8
+
+# Comma-separated list of Java versions for multi-release jar support (JVM Downgrader only).
+# Classes will be available in META-INF/versions/N/ for each version N in this list.
+# Default: "21,25" (J25+ gets native classes, J21-24 gets partial downgrade, J8-20 gets full downgrade).
+# jvmDowngraderMultiReleaseVersions = 21,25
+
+# Specifies how JVM Downgrader API stubs are provided. Options:
+# - shade: Shade minimized stubs into the jar
+# - gtnhlib: GTNHLib provides stubs at runtime (adds version constraint)
+# - external: Another dependency provides stubs (no constraint, no warning)
+# - (empty): Warning reminding you to configure stubs
+# Note: 'shade' option requires you to verify license compliance, see: https://github.com/unimined/JvmDowngrader/blob/main/LICENSE.md
+# jvmDowngraderStubsProvider =
+
 # Enables injecting missing generics into the decompiled source code for a better coding experience.
 # Turns most publicly visible List, Map, etc. into proper List<E>, Map<K, V> types.
 enableGenericInjection = false
@@ -209,3 +233,6 @@ customArchiveBaseName = magicbees
 # This is meant to be set in $HOME/.gradle/gradle.properties.
 # ideaCheckSpotlessOnBuild = true
 
+# Non-GTNH properties
+org.gradle.configuration-cache = true
+org.gradle.parallel = true

gradle/gradle-daemon-jvm.properties

@@ -0,0 +1,12 @@
+#This file is generated by updateDaemonJvm
+toolchainUrl.FREE_BSD.AARCH64=https\://api.foojay.io/disco/v3.0/ids/df211d3c3eefdc408b462041881bc575/redirect
+toolchainUrl.FREE_BSD.X86_64=https\://api.foojay.io/disco/v3.0/ids/b41931cf1e70bc8e08d7dd19c343ef00/redirect
+toolchainUrl.LINUX.AARCH64=https\://api.foojay.io/disco/v3.0/ids/df211d3c3eefdc408b462041881bc575/redirect
+toolchainUrl.LINUX.X86_64=https\://api.foojay.io/disco/v3.0/ids/b41931cf1e70bc8e08d7dd19c343ef00/redirect
+toolchainUrl.MAC_OS.AARCH64=https\://api.foojay.io/disco/v3.0/ids/3426ffcaa54c3f62406beb1f1ab8b179/redirect
+toolchainUrl.MAC_OS.X86_64=https\://api.foojay.io/disco/v3.0/ids/d6690dfd71c4c91e08577437b5b2beb0/redirect
+toolchainUrl.UNIX.AARCH64=https\://api.foojay.io/disco/v3.0/ids/df211d3c3eefdc408b462041881bc575/redirect
+toolchainUrl.UNIX.X86_64=https\://api.foojay.io/disco/v3.0/ids/b41931cf1e70bc8e08d7dd19c343ef00/redirect
+toolchainUrl.WINDOWS.AARCH64=https\://api.foojay.io/disco/v3.0/ids/3cd7045fca9a72cd9bc7d14a385e594c/redirect
+toolchainUrl.WINDOWS.X86_64=https\://api.foojay.io/disco/v3.0/ids/0ef34dd9312b12d61ba1b8e66126d140/redirect
+toolchainVersion=25

gradle/wrapper/gradle-wrapper.properties

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

gradlew

@@ -1,7 +1,7 @@
 #!/bin/sh
 
 #
-# Copyright © 2015-2021 the original authors.
+# Copyright © 2015 the original authors.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -114,7 +114,6 @@ case "$( uname )" in                #(
   NONSTOP* )        nonstop=true ;;
 esac
 
-CLASSPATH="\\\"\\\""
 
 
 # Determine the Java command to use to start the JVM.
@@ -172,7 +171,6 @@ fi
 # For Cygwin or MSYS, switch paths to Windows format before running java
 if "$cygwin" || "$msys" ; then
     APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
-    CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )
 
     JAVACMD=$( cygpath --unix "$JAVACMD" )
 
@@ -212,7 +210,6 @@ DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 
 set -- \
         "-Dorg.gradle.appname=$APP_BASE_NAME" \
-        -classpath "$CLASSPATH" \
         -jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \
         "$@"
 

gradlew.bat

@@ -70,11 +70,10 @@ goto fail
 :execute
 @rem Setup the command line
 
-set CLASSPATH=
 
 
 @rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %*
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %*
 
 :end
 @rem End local scope for the variables with windows NT shell

settings.gradle

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

src/main/java/magicbees/item/ItemCapsule.java

@@ -38,7 +38,7 @@ public class ItemCapsule extends Item {
     public String getItemStackDisplayName(ItemStack itemStack) {
         return String.format(
                 this.capsuleType.getLocalizedName(),
-                FluidType.values()[itemStack.getItemDamage()].getDisplayName());
+                FluidType.VALUES[itemStack.getItemDamage()].getDisplayName());
     }
 
     public ItemStack getCapsuleForLiquid(FluidType l) {
@@ -49,7 +49,7 @@ public class ItemCapsule extends Item {
     @Override
     @SideOnly(Side.CLIENT)
     public void getSubItems(Item item, CreativeTabs tab, List itemList) {
-        for (FluidType l : FluidType.values()) {
+        for (FluidType l : FluidType.VALUES) {
             if (l.available) {
                 itemList.add(new ItemStack(this, 1, l.ordinal()));
             }
@@ -68,7 +68,7 @@ public class ItemCapsule extends Item {
                 CommonProxy.DOMAIN + ":capsule"
                         + this.capsuleType.getName().substring(0, 1).toUpperCase()
                         + this.capsuleType.getName().substring(1));
-        for (FluidType t : FluidType.values()) {
+        for (FluidType t : FluidType.VALUES) {
             if (t != FluidType.EMPTY) {
                 t.liquidIcon = iconRegister.registerIcon(CommonProxy.DOMAIN + ":liquids/" + t.liquidID);
             }
@@ -80,7 +80,7 @@ public class ItemCapsule extends Item {
     public IIcon getIconFromDamageForRenderPass(int metadata, int pass) {
         IIcon i = this.itemIcon;
         if (metadata != 0 && pass == 0) {
-            i = FluidType.values()[metadata % FluidType.values().length].liquidIcon;
+            i = FluidType.VALUES[metadata % FluidType.VALUES.length].liquidIcon;
         }
         return i;
     }

src/main/java/magicbees/item/ItemComb.java

@@ -38,7 +38,7 @@ public class ItemComb extends Item {
     @Override
     @SideOnly(Side.CLIENT)
     public void getSubItems(Item item, CreativeTabs tabs, List list) {
-        for (CombType type : CombType.values()) {
+        for (CombType type : CombType.VALUES) {
             if (type.showInList || Config.forestryDebugEnabled) {
                 list.add(this.getStackForType(type));
             }
@@ -73,11 +73,11 @@ public class ItemComb extends Item {
     @Override
     @SideOnly(Side.CLIENT)
     public int getColorFromItemStack(ItemStack stack, int pass) {
-        int meta = Math.max(0, Math.min(CombType.values().length - 1, stack.getItemDamage()));
-        int colour = CombType.values()[meta].getColours()[0];
+        int meta = Math.max(0, Math.min(CombType.VALUES.length - 1, stack.getItemDamage()));
+        int colour = CombType.VALUES[meta].getColours()[0];
 
         if (pass >= 1) {
-            colour = CombType.values()[meta].getColours()[1];
+            colour = CombType.VALUES[meta].getColours()[1];
         }
 
         return colour;
@@ -85,12 +85,12 @@ public class ItemComb extends Item {
 
     @Override
     public String getItemStackDisplayName(ItemStack stack) {
-        return CombType.values()[stack.getItemDamage()].getName();
+        return CombType.VALUES[stack.getItemDamage()].getName();
     }
 
     @Override
     public int getDamage(ItemStack stack) {
-        if (CombType.values().length < super.getDamage(stack)) {
+        if (CombType.VALUES.length < super.getDamage(stack)) {
             stack.setItemDamage(0);
         }
         return super.getDamage(stack);

src/main/java/magicbees/item/ItemMiscResources.java

@@ -17,7 +17,7 @@ import magicbees.main.utils.TabMagicBees;
 
 public class ItemMiscResources extends Item {
 
-    private IIcon[] icons = new IIcon[ResourceType.values().length];
+    private final IIcon[] icons = new IIcon[ResourceType.VALUES.length];
 
     public ItemMiscResources() {
         super();
@@ -39,7 +39,7 @@ public class ItemMiscResources extends Item {
     @SideOnly(Side.CLIENT)
     @SuppressWarnings({ "unchecked", "rawtypes" })
     public void getSubItems(Item item, CreativeTabs tabs, List list) {
-        for (ResourceType type : ResourceType.values()) {
+        for (ResourceType type : ResourceType.VALUES) {
             if (type.showInList) {
                 list.add(this.getStackForType(type));
             }
@@ -48,9 +48,8 @@ public class ItemMiscResources extends Item {
 
     @SideOnly(Side.CLIENT)
     public void registerIcons(IIconRegister par1IconRegister) {
-        for (int i = 0; i < ResourceType.values().length; i++) {
-            this.icons[i] = par1IconRegister
-                    .registerIcon(CommonProxy.DOMAIN + ":" + ResourceType.values()[i].getName());
+        for (int i = 0; i < ResourceType.VALUES.length; i++) {
+            this.icons[i] = par1IconRegister.registerIcon(CommonProxy.DOMAIN + ":" + ResourceType.VALUES[i].getName());
         }
     }
 
@@ -62,6 +61,6 @@ public class ItemMiscResources extends Item {
 
     @Override
     public String getItemStackDisplayName(ItemStack stack) {
-        return ResourceType.values()[stack.getItemDamage()].getLocalizedName();
+        return ResourceType.VALUES[stack.getItemDamage()].getLocalizedName();
     }
 }

src/main/java/magicbees/item/ItemPollen.java

@@ -37,7 +37,7 @@ public class ItemPollen extends Item {
     @SideOnly(Side.CLIENT)
     @SuppressWarnings({ "unchecked", "rawtypes" })
     public void getSubItems(Item item, CreativeTabs tabs, List list) {
-        for (PollenType type : PollenType.values()) {
+        for (PollenType type : PollenType.VALUES) {
             list.add(this.getStackForType(type));
         }
     }
@@ -70,11 +70,11 @@ public class ItemPollen extends Item {
     @Override
     @SideOnly(Side.CLIENT)
     public int getColorFromItemStack(ItemStack stack, int pass) {
-        int meta = Math.max(0, Math.min(PollenType.values().length - 1, stack.getItemDamage()));
-        int colour = PollenType.values()[meta].colour[0];
+        int meta = Math.max(0, Math.min(PollenType.VALUES.length - 1, stack.getItemDamage()));
+        int colour = PollenType.VALUES[meta].colourA;
 
         if (pass >= 1) {
-            colour = PollenType.values()[meta].colour[1];
+            colour = PollenType.VALUES[meta].colourB;
         }
 
         return colour;
@@ -82,6 +82,6 @@ public class ItemPollen extends Item {
 
     @Override
     public String getItemStackDisplayName(ItemStack stack) {
-        return PollenType.values()[stack.getItemDamage()].getName();
+        return PollenType.VALUES[stack.getItemDamage()].getName();
     }
 }

src/main/java/magicbees/item/types/CombType.java

@@ -39,7 +39,11 @@ public enum CombType {
     TE_LUX("TElux", false),
     TE_ENDEARING("TEendearing", false),;
 
-    private static int[][] colours = new int[][] { { 0xFF9859, 0xFFC58E }, { 0xcc3333, 0x1E160E },
+    /**
+     * Cached values() array for frequent read-only operations, the array should NOT be mutated.
+     */
+    public static final CombType[] VALUES = values();
+    private static final int[][] colours = new int[][] { { 0xFF9859, 0xFFC58E }, { 0xcc3333, 0x1E160E },
             { 0x9872FF, 0x2D2D2D }, { 0x3EE0D8, 0x3A3820 }, { 0xE5425D, 0x323291 }, { 0xBCA664, 0x35332E },
             { 0x7F7171, 0x876D53 }, { 0xB7ACB7, 0x636363 }, { 0x0092e9, 0x618fff }, { 0x2F9381, 0x773C31 },
             { 0xB191D8, 0x35443B }, { 0xffff7e, 0x606308 }, { 0xff3C01, 0x5B0D10 }, { 0x0090ff, 0x102F6B },
@@ -47,10 +51,11 @@ public enum CombType {
             { 0x28D328, 0x333004 }, { 0xDDDDFF, 0x9D9DB5 }, { 0x555577, 0x2D2D56 }, { 0xCC8604, 0x41046F },
             { 0xCCCC04, 0x41046F }, { 0xCC002C, 0x6B0118 }, { 0x454545, 0x0F0F0F }, { 0xF5F3A4, 0xC9C87D },
             { 0x12E3D9, 0x069E97 }, };
+    private final String name;
+    public boolean showInList;
 
-    private CombType(String pName, boolean show) {
+    CombType(String pName, boolean show) {
         this.name = pName;
-
         this.showInList = show;
     }
 
@@ -58,9 +63,6 @@ public enum CombType {
         this.showInList = false;
     }
 
-    private String name;
-    public boolean showInList;
-
     public String getName() {
         return LocalizationManager.getLocalizedString("comb." + this.name);
     }

src/main/java/magicbees/item/types/FluidType.java

@@ -48,12 +48,16 @@ public enum FluidType {
     MANA("mana"),
     COAL("coal"),;
 
-    public String liquidID;
+    /**
+     * Cached values() array for frequent read-only operations, the array should NOT be mutated.
+     */
+    public static final FluidType[] VALUES = values();
+    public final String liquidID;
     public int iconIdx;
     public boolean available = false;
     public IIcon liquidIcon;
 
-    private FluidType(String l) {
+    FluidType(String l) {
         this.liquidID = l;
     }
 

src/main/java/magicbees/item/types/PollenType.java

@@ -5,17 +5,22 @@ import magicbees.main.utils.LocalizationManager;
 public enum PollenType {
 
     UNUSUAL("unusual", 0xD8417B, 0xA03059),
-    PHASED("phased", 0x4974B4, 0x456BA5),;
+    PHASED("phased", 0x4974B4, 0x456BA5);
 
-    private PollenType(String pName, int colourA, int colourB) {
+    /**
+     * Cached values() array for frequent read-only operations, the array should NOT be mutated.
+     */
+    public static final PollenType[] VALUES = values();
+    private final String name;
+    public final int colourA;
+    public final int colourB;
+
+    PollenType(String pName, int colourA, int colourB) {
         this.name = pName;
-        this.colour[0] = colourA;
-        this.colour[1] = colourB;
+        this.colourA = colourA;
+        this.colourB = colourB;
     }
 
-    private String name;
-    public int[] colour = new int[2];
-
     public String getName() {
         return LocalizationManager.getLocalizedString("pollen." + this.name);
     }

src/main/java/magicbees/item/types/ResourceType.java

@@ -32,16 +32,20 @@ public enum ResourceType {
     // Dummy items for Thaumanomicon research icons.
     // These won't ever actually exist in-game, and so they can be moved around.
     RESEARCH_STARTNODE("startNode", false),
-    RESEARCH_BEEINFUSION("beeInfusion", false),;
+    RESEARCH_BEEINFUSION("beeInfusion", false);
 
-    private ResourceType(String n, boolean show) {
+    /**
+     * Cached values() array for frequent read-only operations, the array should NOT be mutated.
+     */
+    public static final ResourceType[] VALUES = values();
+    private final String name;
+    public boolean showInList;
+
+    ResourceType(String n, boolean show) {
         this.name = n;
         this.showInList = show;
     }
 
-    private String name;
-    public boolean showInList;
-
     public void setHidden() {
         this.showInList = false;
     }

src/main/java/magicbees/main/utils/CraftingManager.java

@@ -822,7 +822,7 @@ public class CraftingManager {
         ItemStack filled;
         FluidStack liquid = null;
 
-        for (FluidType fluidType : FluidType.values()) {
+        for (FluidType fluidType : FluidType.VALUES) {
             switch (fluidType) {
                 case EMPTY:
                     liquid = null;