change cells index (#56)

build.gradle

@@ -1,4 +1,4 @@
-//version: 1700844281
+//version: 1701530445
 /*
  DO NOT CHANGE THIS FILE!
  Also, you may replace this file at any time if there is an update available.
@@ -28,27 +28,12 @@ import java.util.concurrent.TimeUnit
 
 buildscript {
     repositories {
-        mavenCentral()
-
-        maven {
-            name 'forge'
-            url 'https://maven.minecraftforge.net'
-        }
         maven {
             // GTNH RetroFuturaGradle and ASM Fork
             name "GTNH Maven"
             url "http://jenkins.usrv.eu:8081/nexus/content/groups/public/"
             allowInsecureProtocol = true
         }
-        maven {
-            name 'sonatype'
-            url 'https://oss.sonatype.org/content/repositories/snapshots/'
-        }
-        maven {
-            name 'Scala CI dependencies'
-            url 'https://repo1.maven.org/maven2/'
-        }
-
         mavenLocal()
     }
 }
@@ -793,12 +778,12 @@ ext.java17PatchDependenciesCfg = configurations.create("java17PatchDependencies"
 }
 
 dependencies {
-    def lwjgl3ifyVersion = '1.5.1'
+    def lwjgl3ifyVersion = '1.5.7'
     if (modId != 'lwjgl3ify') {
         java17Dependencies("com.github.GTNewHorizons:lwjgl3ify:${lwjgl3ifyVersion}")
     }
     if (modId != 'hodgepodge') {
-        java17Dependencies('com.github.GTNewHorizons:Hodgepodge:2.3.17')
+        java17Dependencies('com.github.GTNewHorizons:Hodgepodge:2.3.35')
     }
 
     java17PatchDependencies("com.github.GTNewHorizons:lwjgl3ify:${lwjgl3ifyVersion}:forgePatches") {transitive = false}
@@ -1310,7 +1295,7 @@ def addCurseForgeRelation(String type, String name) {
 
 // Updating
 
-def buildscriptGradleVersion = "8.2.1"
+def buildscriptGradleVersion = "8.5"
 
 tasks.named('wrapper', Wrapper).configure {
     gradleVersion = buildscriptGradleVersion

gradle/wrapper/gradle-wrapper.properties

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

gradlew

@@ -130,10 +130,13 @@ location of your Java installation."
     fi
 else
     JAVACMD=java
-    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+    if ! command -v java >/dev/null 2>&1
+    then
+        die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
 
 Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
+    fi
 fi
 
 # Increase the maximum file descriptors if we can.

src/main/java/thaumicenergistics/common/items/ItemStorageComponent.java

@@ -60,7 +60,7 @@ public class ItemStorageComponent extends Item implements IStorageComponent {
             @SuppressWarnings("rawtypes") final List itemList) {
         for (EnumEssentiaStorageTypes type : EnumEssentiaStorageTypes.fromIndex) {
             // Skip the creative cell, it has no component
-            if (type.index >= 8) {
+            if (type.index == 4 || type.index > 8) {
                 continue;
             }
             itemList.add(type.getComponent(1));

src/main/java/thaumicenergistics/common/storage/EnumEssentiaStorageTypes.java

@@ -22,19 +22,19 @@ public enum EnumEssentiaStorageTypes {
             ThEStrings.Item_StorageComponent_16k),
     Type_64K(3, 1 << 16, 12, "64k", EnumRarity.rare, 2.0, ThEStrings.Item_EssentiaCell_64k,
             ThEStrings.Item_StorageComponent_64k),
-    Type_256K(4, 1 << 18, 24, "256k", EnumRarity.rare, 2.5, ThEStrings.Item_EssentiaCell_256k,
+    Type_Creative(4, 0, 63, "creative", EnumRarity.epic, 0.0, ThEStrings.Item_EssentiaCell_Creative, null),
+    Type_256K(5, 1 << 18, 24, "256k", EnumRarity.rare, 2.5, ThEStrings.Item_EssentiaCell_256k,
             ThEStrings.Item_StorageComponent_256k),
-    Type_1024K(5, 1 << 20, 36, "1024k", EnumRarity.rare, 3.0, ThEStrings.Item_EssentiaCell_1024k,
+    Type_1024K(6, 1 << 20, 36, "1024k", EnumRarity.rare, 3.0, ThEStrings.Item_EssentiaCell_1024k,
             ThEStrings.Item_StorageComponent_1024k),
-    Type_4096K(6, 1 << 22, 48, "4096k", EnumRarity.epic, 3.5, ThEStrings.Item_EssentiaCell_4096k,
+    Type_4096K(7, 1 << 22, 48, "4096k", EnumRarity.epic, 3.5, ThEStrings.Item_EssentiaCell_4096k,
             ThEStrings.Item_StorageComponent_4096k),
-    Type_16384K(7, 1 << 24, 60, "16384k", EnumRarity.epic, 4.0, ThEStrings.Item_EssentiaCell_16384k,
+    Type_16384K(8, 1 << 24, 60, "16384k", EnumRarity.epic, 4.0, ThEStrings.Item_EssentiaCell_16384k,
             ThEStrings.Item_StorageComponent_16384k),
-    Type_QUANTUM(8, Integer.MAX_VALUE / 16, 1, "quantum", EnumRarity.epic, 8.0, ThEStrings.Item_EssentiaCell_Quantum,
+    Type_QUANTUM(9, Integer.MAX_VALUE / 16, 1, "quantum", EnumRarity.epic, 8.0, ThEStrings.Item_EssentiaCell_Quantum,
             null),
-    Type_SINGULARITY(9, Long.MAX_VALUE / 4, 1, "singularity", EnumRarity.epic, 16.0,
-            ThEStrings.Item_EssentiaCell_Singularity, null),
-    Type_Creative(10, 0, 63, "creative", EnumRarity.epic, 0.0, ThEStrings.Item_EssentiaCell_Creative, null);
+    Type_SINGULARITY(10, Long.MAX_VALUE / 4, 1, "singularity", EnumRarity.epic, 16.0,
+            ThEStrings.Item_EssentiaCell_Singularity, null);
 
     /**
      * Array of values whose index matches the types index.