Code cleanup

pedroksl · Sep 12, 2024 · 95178e1 · 95178e1
1 parent 623c5a4
commit 95178e1
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 45 deletions.
diff --git a/build.gradle b/build.gradle
@@ -107,18 +107,19 @@ repositories {
 }
 
 dependencies {
+    implementation "curse.maven:all-the-mods-10-925200:5711274"
     implementation "curse.maven:glodium-957920:5614731"
     implementation "curse.maven:applied-energistics-2-223794:5662490"
     implementation "curse.maven:ex-pattern-provider-892005:5637364"
-    jarJar(implementation "de.mari_023:ae2wtlib_api:19.1.0-alpha.1")
+    jarJar(implementation "de.mari_023:ae2wtlib_api:19.1.3-beta")
     compileOnly "curse.maven:emi-580555:5619579"
     implementation "curse.maven:applied-flux-965012:5614830"
     compileOnly "curse.maven:jade-324717:5427817"
     compileOnly "me.shedaniel:RoughlyEnoughItems-neoforge:16.0.729"
     implementation "curse.maven:mega-cells-622112:5662141"
     implementation "curse.maven:mekanism-268560:5680395"
     // runtime test
-    runtimeOnly "de.mari_023:ae2wtlib:19.1.0-alpha.1"
+    runtimeOnly "de.mari_023:ae2wtlib:19.1.3-beta"
     runtimeOnly "curse.maven:jade-324717:5427817"
     // setup Xei
     switch (use_Xei) {

diff --git a/gradle.properties b/gradle.properties
@@ -14,7 +14,7 @@ loader_version_range=[4,)
 mod_id=advanced_ae
 mod_name=Advanced AE
 mod_license=LGPL-3.0
-mod_version=0.4.3-1.21.1
+mod_version=0.4.4-1.21.1
 mod_group_id=net.pedroksl.advanced_ae
 mod_authors=Pedroksl
 mod_description=This mod aims to expand on the added capabilities of Extended AE.

diff --git a/src/main/java/net/pedroksl/advanced_ae/common/entities/ReactionChamberEntity.java b/src/main/java/net/pedroksl/advanced_ae/common/entities/ReactionChamberEntity.java
@@ -1,7 +1,6 @@
 package net.pedroksl.advanced_ae.common.entities;
 
 import java.util.*;
-import java.util.concurrent.atomic.AtomicBoolean;
 
 import org.jetbrains.annotations.Nullable;
 
@@ -289,27 +288,26 @@ public TickRateModulation tickingRequest(IGridNode iGridNode, int ticksSinceLast
 
         if (this.hasCraftWork()) {
             this.setWorking(true);
-            AtomicBoolean gridEnergy = new AtomicBoolean(false);
-            final int speedFactor =
-                    switch (this.upgrades.getInstalledUpgrades(AEItems.SPEED_CARD)) {
-                        default -> 2; // 116 ticks
-                        case 1 -> 3; // 83 ticks
-                        case 2 -> 5; // 56 ticks
-                        case 3 -> 10; // 36 ticks
-                        case 4 -> 50; // 20 ticks
-                    };
             getMainNode().ifPresent(grid -> {
                 IEnergyService eg = grid.getEnergyService();
                 IEnergySource src = this;
 
+                final int speedFactor =
+                        switch (this.upgrades.getInstalledUpgrades(AEItems.SPEED_CARD)) {
+                            default -> 2; // 116 ticks
+                            case 1 -> 3; // 83 ticks
+                            case 2 -> 5; // 56 ticks
+                            case 3 -> 10; // 36 ticks
+                            case 4 -> 50; // 20 ticks
+                        };
+
                 final int progressReq = MAX_PROCESSING_STEPS - this.getProcessingTime();
                 final float powerRatio = progressReq < speedFactor ? (float) progressReq / speedFactor : 1;
                 final int requiredTicks = Mth.ceil((float) MAX_PROCESSING_STEPS / speedFactor);
                 final int powerConsumption = Mth.floor(((float) getTask().getEnergy() / requiredTicks) * powerRatio);
                 final double powerThreshold = powerConsumption - 0.01;
                 double powerReq = this.extractAEPower(powerConsumption, Actionable.SIMULATE, PowerMultiplier.CONFIG);
 
-
                 if (powerReq <= powerThreshold) {
                     src = eg;
                     powerReq = eg.extractAEPower(powerConsumption, Actionable.SIMULATE, PowerMultiplier.CONFIG);
@@ -318,36 +316,17 @@ public TickRateModulation tickingRequest(IGridNode iGridNode, int ticksSinceLast
                 if (powerReq > powerThreshold) {
                     src.extractAEPower(powerConsumption, Actionable.MODULATE, PowerMultiplier.CONFIG);
                     this.setProcessingTime(this.getProcessingTime() + speedFactor);
-                } else if (powerReq != 0){
+                } else if (powerReq != 0) {
                     var factor = Mth.floor(speedFactor / (powerConsumption - powerReq));
                     if (factor > 1) {
-                        src.extractAEPower((double) (powerConsumption * factor) / speedFactor, Actionable.MODULATE,
+                        src.extractAEPower(
+                                (double) (powerConsumption * factor) / speedFactor,
+                                Actionable.MODULATE,
                                 PowerMultiplier.CONFIG);
                         this.setProcessingTime(this.getProcessingTime() + factor);
                     }
                 }
             });
-            if (!gridEnergy.get()) {
-                var storage = this.getEnergyStorage(null);
-
-                final int progressReq = MAX_PROCESSING_STEPS - this.getProcessingTime();
-                final float powerRatio = progressReq < speedFactor ? (float) progressReq / speedFactor : 1;
-                final int requiredTicks = Mth.ceil((float) MAX_PROCESSING_STEPS / speedFactor);
-                final int powerConsumption = Mth.floor(((float) getTask().getEnergy() / requiredTicks) * powerRatio);
-                final double powerThreshold = powerConsumption - 0.01;
-                double powerReq = storage.extractEnergy(powerConsumption, Actionable.SIMULATE.isSimulate());
-
-                if (powerReq > powerThreshold) {
-                    storage.extractEnergy(powerConsumption, Actionable.MODULATE.isSimulate());
-                    this.setProcessingTime(this.getProcessingTime() + speedFactor);
-                } else if (powerReq != 0) {
-                    var factor = Mth.floor(speedFactor / (powerConsumption - powerReq));
-                    if (factor > 1) {
-                        storage.extractEnergy(powerConsumption * factor / speedFactor, Actionable.MODULATE.isSimulate());
-                        this.setProcessingTime(this.getProcessingTime() + factor);
-                    }
-                }
-            }
 
             if (this.getProcessingTime() >= this.getMaxProcessingTime()) {
                 this.setProcessingTime(0);

diff --git a/src/main/java/net/pedroksl/advanced_ae/xmod/emi/EMIPlugin.java b/src/main/java/net/pedroksl/advanced_ae/xmod/emi/EMIPlugin.java
@@ -55,14 +55,11 @@ public static EmiIngredient stackOf(IngredientStack.Item stack) {
 
     public static EmiIngredient stackOf(IngredientStack.Fluid stack) {
         FluidIngredient ingredient = stack.getIngredient();
-        List<EmiIngredient> list = new ArrayList();
-        FluidStack[] var3 = ingredient.getStacks();
-        int var4 = var3.length;
-
-        for (int var5 = 0; var5 < var4; ++var5) {
-            FluidStack fluid = var3[var5];
-            list.add(EmiStack.of(fluid.getFluid(), stack.getAmount()));
-        }
+        List<EmiIngredient> list = new ArrayList<>();
+        FluidStack[] stacks = ingredient.getStacks();
+        for (FluidStack fluid : stacks) {
+		    list.add(EmiStack.of(fluid.getFluid(), stack.getAmount()));
+	    }
 
         return EmiIngredient.of(list, stack.getAmount());
     }