fix bug

Author: Circulate233

accesstransformer.cfg

@@ -0,0 +1 @@
+public appeng.me.cache.EnergyGridCache$GridPowerStorage #GridPowerStorage

build.gradle

@@ -10,8 +10,9 @@ plugins {
     id 'java-library'
     id 'maven-publish'
     id 'org.jetbrains.gradle.plugin.idea-ext' version '1.1.9'
-    id 'com.gtnewhorizons.retrofuturagradle' version '1.4.1'
+    id 'com.gtnewhorizons.retrofuturagradle' version '2.0.2'
     id 'org.jetbrains.changelog' version '2.2.1'
+    id("net.minecraftforge.accesstransformers") version "5.0.3"
 }
 
 apply from: 'gradle/scripts/helpers.gradle'

dependencies.gradle

@@ -12,7 +12,11 @@ dependencies {
     compileOnly(rfg.deobf("curse.maven:RedstoneFlux-270789:2920436"))
     runtimeOnly(rfg.deobf("curse.maven:Cucumber-1.12.2-1.1.3-272335:2645867"))
     compileOnly(rfg.deobf("curse.maven:CodeChickenLib-1.12.2-3.2.4.1-universal-242818:2779848"))
-    implementation(rfg.deobf("curse.maven:ae2-extended-life-570458:6302098"))
+    implementation(rfg.deobf("curse.maven:ae2-extended-life-570458:6302098")) {
+        accessTransformers.configure(it) {
+            config = project.file('accesstransformer.cfg')
+        }
+    }
     compileOnly(rfg.deobf("curse.maven:ae2fluidcraft-rework-unofficial-1404390:7403081"))
     implementation(rfg.deobf("curse.maven:ae2-fluid-crafting-rework-623955:5504001"))
     compileOnly(rfg.deobf("curse.maven:baubles-227083:2518667"))

gradle/wrapper/gradle-wrapper.properties

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

repositories.gradle

@@ -64,4 +64,5 @@ repositories {
         name = "Zeitheron Maven"
         url = "https://maven.zeith.org"
     }
+    gradlePluginPortal()
 }

src/main/java/com/circulation/random_complement/common/interfaces/RCEnergyGridCache.java

@@ -0,0 +1,6 @@
+package com.circulation.random_complement.common.interfaces;
+
+public interface RCEnergyGridCache {
+
+    boolean r$hasCreativeEnergyCell();
+}

src/main/java/com/circulation/random_complement/common/interfaces/RCGrid.java

@@ -0,0 +1,6 @@
+package com.circulation.random_complement.common.interfaces;
+
+public interface RCGrid {
+
+    boolean r$hasCreativeEnergyCell();
+}

src/main/java/com/circulation/random_complement/mixin/ae2/AccessorGrid.java

@@ -4,50 +4,24 @@
 import appeng.api.config.PowerMultiplier;
 import appeng.api.networking.IGrid;
 import appeng.me.cache.EnergyGridCache;
-import appeng.tile.networking.TileCreativeEnergyCell;
 import com.circulation.random_complement.RCConfig;
-import com.circulation.random_complement.common.interfaces.RCGridPowerStorage;
+import com.circulation.random_complement.common.interfaces.RCEnergyGridCache;
+import com.circulation.random_complement.common.interfaces.RCGrid;
 import org.spongepowered.asm.mixin.Final;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
 import org.spongepowered.asm.mixin.Unique;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
-import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
 
-import java.lang.reflect.Field;
-
 @Mixin(value = EnergyGridCache.class, remap = false)
-public abstract class MixinEnergyGridCache {
-
-    @Unique
-    private static Field r$localStorage;
-
-    static {
-        try {
-            r$localStorage = EnergyGridCache.class.getDeclaredField("localStorage");
-        } catch (NoSuchFieldException ignored) {
-
-        }
-    }
+public abstract class MixinEnergyGridCache implements RCEnergyGridCache {
 
     @Shadow
     @Final
     private IGrid myGrid;
 
-    @Inject(method = "<init>", at = @At("TAIL"))
-    public void onInit(IGrid g, CallbackInfo ci) {
-        if (r$localStorage != null) {
-            try {
-                RCGridPowerStorage rg = (RCGridPowerStorage) r$localStorage.get(this);
-                rg.r$setGrid(g);
-            } catch (IllegalAccessException ignored) {
-
-            }
-        }
-    }
-
     @Inject(method = "isNetworkPowered", at = @At("HEAD"), cancellable = true)
     public void isNetworkPowered(CallbackInfoReturnable<Boolean> cir) {
         if (RCConfig.AE2.debugEnergy || r$hasCreativeEnergyCell()) {
@@ -56,9 +30,8 @@ public void isNetworkPowered(CallbackInfoReturnable<Boolean> cir) {
     }
 
     @Unique
-    private boolean r$hasCreativeEnergyCell() {
-        final var m = ((AccessorGrid) this.myGrid).r$getMachines().get(TileCreativeEnergyCell.class);
-        return m != null && !m.isEmpty();
+    public boolean r$hasCreativeEnergyCell() {
+        return ((RCGrid) this.myGrid).r$hasCreativeEnergyCell();
     }
 
     @Inject(method = "extractAEPower", at = @At("HEAD"), cancellable = true)

src/main/java/com/circulation/random_complement/mixin/ae2/MixinEnergyGridCache.java

@@ -0,0 +1,39 @@
+package com.circulation.random_complement.mixin.ae2;
+
+import appeng.me.Grid;
+import appeng.me.GridNode;
+import appeng.tile.networking.TileCreativeEnergyCell;
+import com.circulation.random_complement.common.interfaces.RCGrid;
+import it.unimi.dsi.fastutil.objects.ObjectOpenHashSet;
+import it.unimi.dsi.fastutil.objects.ObjectSet;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Unique;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
+
+@Mixin(value = Grid.class,remap = false)
+public class MixinGrid implements RCGrid {
+
+    @Unique
+    private ObjectSet<TileCreativeEnergyCell> rc$ce = new ObjectOpenHashSet<>();
+
+    @Inject(method = "add",at = @At("HEAD"))
+    public void add(GridNode gridNode, CallbackInfo ci) {
+        if (gridNode.getMachine() instanceof TileCreativeEnergyCell t) {
+            rc$ce.add(t);
+        }
+    }
+
+    @Inject(method = "remove",at = @At("HEAD"))
+    public void remove(GridNode gridNode, CallbackInfo ci) {
+        if (gridNode.getMachine() instanceof TileCreativeEnergyCell t) {
+            rc$ce.remove(t);
+        }
+    }
+
+    @Override
+    public boolean r$hasCreativeEnergyCell() {
+        return rc$ce.isEmpty();
+    }
+}