Merge pull request #177 from Anuken/erekir

Fixed StackOverflow on init
sk7725 · May 16, 2023 · 95def54 · 95def54
2 parents 87bf06e + 99a6b13
commit 95def54
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 104 deletions.
diff --git a/assets/mod.json b/assets/mod.json
@@ -4,9 +4,9 @@
   "author": "[royal]sk7725[]",
   "description": "My first Java mod, has the same amount of chaotic energy of sk7725/Commandblocks.",
   "subtitle": "Demo of Chaos Itself",
-  "version": "1.09",
+  "version": "1.1",
   "main": "betamindy.BetaMindy",
-  "minGameVersion": "138",
+  "minGameVersion": "144",
   "dependencies": [],
   "hidden": false
 }
diff --git a/build.gradle b/build.gradle
@@ -22,9 +22,8 @@ repositories{
 
 dependencies{
     annotationProcessor 'com.github.Anuken:jabel:0.8.0'
-    compileOnly "com.github.Anuken.Mindustry:core:v138"
-    compileOnly "com.github.Anuken.Arc:flabel:v138"
-    compileOnly "com.github.Anuken.Arc:arc-core:v138"
+    compileOnly "com.github.Anuken.MindustryJitpack:core:v144"
+    compileOnly "com.github.Anuken.Arc:arc-core:v144"
 }
 
 jar.archiveFileName.set("raw-$artifactFilename")

diff --git a/src/betamindy/BetaMindy.java b/src/betamindy/BetaMindy.java
@@ -132,11 +132,8 @@ public void init(){
 
             hints.load();
             mui.init();
-            UnitLib.init();
         });
 
-        Events.run(ServerLoadEvent.class, UnitLib::init);
-
         Events.run(WorldLoadEvent.class, () -> {
             if(!headless){
                 Useful.unlockCam();

diff --git a/src/betamindy/util/ScoreLib.java b/src/betamindy/util/ScoreLib.java
@@ -81,14 +81,12 @@ public float getScoreUnit(UnitType unit){
         float score = getScoreUnitWeapons(unit);
 
         score += (unit.health * 0.3f + unit.dpsEstimate * 0.2f) * unit.speed * Math.max(unit.mineTier, 1f) * Math.max(unit.abilities.size, 1);
-        score += getStacksCost(UnitLib.calcCost(unit));
+        score += getStacksCost(unit.getTotalRequirements());
 
         return score;
     }
 
     public void itemsLoad(){
-        UnitLib.init();
-
         Seq<Item> tmpItemArray = new Seq<>();
         Seq<Float> tmpItemScores = new Seq<>();
         Seq<Integer> tmpItemTypes = new Seq<>();

diff --git a/src/betamindy/util/UnitLib.java b/src/betamindy/util/UnitLib.java
diff --git a/src/betamindy/world/blocks/production/PayloadDeconstructor.java b/src/betamindy/world/blocks/production/PayloadDeconstructor.java
@@ -73,7 +73,7 @@ public ItemStack[] payloadCost(Payload pay){
             return ((BuildPayload)pay).block().requirements;
         }
         else if(pay instanceof UnitPayload){
-            return UnitLib.costs.get(((UnitPayload)pay).unit.type);
+            return ((UnitPayload)pay).unit.type.getTotalRequirements();
         }
         return defaultStack;
     }