Adjust to AE2 api changes (#83)

Demiu · Dream-Master · web-flow · commit d37e77eac417 · 2024-08-04T19:53:47.000+07:00
* Adjust to AE2 api changes * update (cherry picked from commit 00b9c4f) --------- Co-authored-by: Dream Master <dream-master@gmx.net>
diff --git a/src/main/scala/extracells/integration/mekanism/HandlerMekanismGasTank.scala b/src/main/scala/extracells/integration/mekanism/HandlerMekanismGasTank.scala
@@ -84,7 +84,8 @@ object HandlerMekanismGasTank extends IExternalGasStorageHandler {
     }
 
     override def getAvailableItems(
-        itemList: IItemList[IAEFluidStack]
+        itemList: IItemList[IAEFluidStack],
+        iteration: Int
     ): IItemList[IAEFluidStack] = {
       val gas = tank.getGas
       if (gas != null)
diff --git a/src/main/scala/extracells/inventory/AdvancedCellInventory.java b/src/main/scala/extracells/inventory/AdvancedCellInventory.java
@@ -18,6 +18,7 @@
 import appeng.api.storage.*;
 import appeng.api.storage.data.IAEItemStack;
 import appeng.api.storage.data.IItemList;
+import appeng.util.IterationCounter;
 import appeng.util.Platform;
 import appeng.util.item.AEItemStack;
 import extracells.api.IStorageCellAdvanced;
@@ -135,7 +136,8 @@ private static boolean isBlackListed(final IAEItemStack input) {
     }
 
     private boolean isEmpty(final IMEInventory<IAEItemStack> meInventory) {
-        return meInventory.getAvailableItems(AEApi.instance().storage().createItemList()).isEmpty();
+        return meInventory.getAvailableItems(AEApi.instance().storage().createItemList(), IterationCounter.fetchNewId())
+                .isEmpty();
     }
 
     @Override
@@ -365,7 +367,7 @@ private void loadCellItems() {
     }
 
     @Override
-    public IItemList<IAEItemStack> getAvailableItems(final IItemList<IAEItemStack> out) {
+    public IItemList<IAEItemStack> getAvailableItems(final IItemList<IAEItemStack> out, int iteration) {
         for (final IAEItemStack i : this.getCellItems()) {
             out.add(i);
         }
diff --git a/src/main/scala/extracells/inventory/HandlerItemStorageFluid.java b/src/main/scala/extracells/inventory/HandlerItemStorageFluid.java
@@ -108,7 +108,7 @@ public AccessRestriction getAccess() {
     }
 
     @Override
-    public IItemList<IAEFluidStack> getAvailableItems(IItemList<IAEFluidStack> out) {
+    public IItemList<IAEFluidStack> getAvailableItems(IItemList<IAEFluidStack> out, int iteration) {
         for (FluidStack fluidStack : this.fluidStacks)
             if (fluidStack != null) out.add(AEApi.instance().storage().createFluidStack(fluidStack));
         return out;
diff --git a/src/main/scala/extracells/inventory/HandlerItemStorageGas.java b/src/main/scala/extracells/inventory/HandlerItemStorageGas.java
@@ -109,7 +109,7 @@ public AccessRestriction getAccess() {
     }
 
     @Override
-    public IItemList<IAEFluidStack> getAvailableItems(IItemList<IAEFluidStack> out) {
+    public IItemList<IAEFluidStack> getAvailableItems(IItemList<IAEFluidStack> out, int iteration) {
         for (FluidStack fluidStack : this.fluidStacks)
             if (fluidStack != null) out.add(AEApi.instance().storage().createFluidStack(fluidStack));
         return out;
diff --git a/src/main/scala/extracells/inventory/HandlerPartStorageFluid.java b/src/main/scala/extracells/inventory/HandlerPartStorageFluid.java
@@ -125,7 +125,7 @@ public AccessRestriction getAccess() {
     }
 
     @Override
-    public IItemList<IAEFluidStack> getAvailableItems(IItemList<IAEFluidStack> out) {
+    public IItemList<IAEFluidStack> getAvailableItems(IItemList<IAEFluidStack> out, int iteration) {
         if (!this.node.isActive()
                 || !(this.access == AccessRestriction.READ || this.access == AccessRestriction.READ_WRITE))
             return out;
@@ -148,7 +148,8 @@ public IItemList<IAEFluidStack> getAvailableItems(IItemList<IAEFluidStack> out)
                     StorageChannel.FLUIDS,
                     new MachineSource(this.node));
             if (inventory == null) return out;
-            IItemList<IAEFluidStack> list = inventory.getAvailableItems(AEApi.instance().storage().createFluidList());
+            IItemList<IAEFluidStack> list = inventory
+                    .getAvailableItems(AEApi.instance().storage().createFluidList(), iteration);
             for (IAEFluidStack stack : list) {
                 out.add(stack);
             }
diff --git a/src/main/scala/extracells/inventory/HandlerPartStorageGas.java b/src/main/scala/extracells/inventory/HandlerPartStorageGas.java
@@ -66,15 +66,16 @@ public AccessRestriction getAccess() {
     }
 
     @Override
-    public IItemList<IAEFluidStack> getAvailableItems(IItemList<IAEFluidStack> out) {
+    public IItemList<IAEFluidStack> getAvailableItems(IItemList<IAEFluidStack> out, int iteration) {
         if (!this.node.isActive()
                 || !(this.access == AccessRestriction.READ || this.access == AccessRestriction.READ_WRITE))
             return out;
         if (externalHandler != null) {
             IMEInventory<IAEFluidStack> inventory = externalHandler
                     .getInventory(this.tile, this.node.getSide().getOpposite(), new MachineSource(this.node));
             if (inventory == null) return out;
-            IItemList<IAEFluidStack> list = inventory.getAvailableItems(AEApi.instance().storage().createFluidList());
+            IItemList<IAEFluidStack> list = inventory
+                    .getAvailableItems(AEApi.instance().storage().createFluidList(), iteration);
             for (IAEFluidStack stack : list) {
                 out.add(stack);
             }
diff --git a/src/main/scala/extracells/inventory/MEAdvancedInventoryHandler.java b/src/main/scala/extracells/inventory/MEAdvancedInventoryHandler.java
@@ -83,12 +83,12 @@ public T extractItems(final T request, final Actionable type, final BaseActionSo
     }
 
     @Override
-    public IItemList<T> getAvailableItems(final IItemList<T> out) {
+    public IItemList<T> getAvailableItems(final IItemList<T> out, int iteration) {
         if (!this.hasReadAccess) {
             return out;
         }
 
-        return this.internal.getAvailableItems(out);
+        return this.internal.getAvailableItems(out, iteration);
     }
 
     @Override
diff --git a/src/main/scala/extracells/inventory/MEPassThrough.java b/src/main/scala/extracells/inventory/MEPassThrough.java
@@ -48,8 +48,8 @@ public T extractItems(final T request, final Actionable type, final BaseActionSo
     }
 
     @Override
-    public IItemList<T> getAvailableItems(final IItemList out) {
-        return this.internal.getAvailableItems(out);
+    public IItemList<T> getAvailableItems(final IItemList out, int iteration) {
+        return this.internal.getAvailableItems(out, iteration);
     }
 
     @Override
diff --git a/src/main/scala/extracells/inventory/MEVoidInventoryHandler.java b/src/main/scala/extracells/inventory/MEVoidInventoryHandler.java
@@ -83,12 +83,12 @@ public T extractItems(final T request, final Actionable type, final BaseActionSo
     }
 
     @Override
-    public IItemList<T> getAvailableItems(final IItemList<T> out) {
+    public IItemList<T> getAvailableItems(final IItemList<T> out, int iteration) {
         if (!this.hasReadAccess) {
             return out;
         }
 
-        return this.internal.getAvailableItems(out);
+        return this.internal.getAvailableItems(out, iteration);
     }
 
     @Override
diff --git a/src/main/scala/extracells/inventory/VoidCellInventory.java b/src/main/scala/extracells/inventory/VoidCellInventory.java
@@ -18,6 +18,7 @@
 import appeng.api.storage.*;
 import appeng.api.storage.data.IAEItemStack;
 import appeng.api.storage.data.IItemList;
+import appeng.util.IterationCounter;
 import appeng.util.Platform;
 import appeng.util.item.AEItemStack;
 import extracells.api.IStorageCellVoid;
@@ -135,7 +136,8 @@ private static boolean isBlackListed(final IAEItemStack input) {
     }
 
     private boolean isEmpty(final IMEInventory<IAEItemStack> meInventory) {
-        return meInventory.getAvailableItems(AEApi.instance().storage().createItemList()).isEmpty();
+        return meInventory.getAvailableItems(AEApi.instance().storage().createItemList(), IterationCounter.fetchNewId())
+                .isEmpty();
     }
 
     @Override
@@ -368,7 +370,7 @@ private void loadCellItems() {
     }
 
     @Override
-    public IItemList<IAEItemStack> getAvailableItems(final IItemList<IAEItemStack> out) {
+    public IItemList<IAEItemStack> getAvailableItems(final IItemList<IAEItemStack> out, int iteration) {
         for (final IAEItemStack i : this.getCellItems()) {
             out.add(i);
         }
diff --git a/src/main/scala/extracells/item/ItemStoragePhysical.java b/src/main/scala/extracells/item/ItemStoragePhysical.java
@@ -28,6 +28,7 @@
 import appeng.api.storage.*;
 import appeng.api.storage.data.IAEItemStack;
 import appeng.api.storage.data.IItemList;
+import appeng.util.IterationCounter;
 import appeng.util.Platform;
 import cofh.api.energy.IEnergyContainerItem;
 import cpw.mods.fml.common.Optional;
@@ -192,7 +193,7 @@ public String getItemStackDisplayName(ItemStack stack) {
             try {
                 IItemList list = AEApi.instance().registries().cell()
                         .getCellInventory(stack, null, StorageChannel.ITEMS)
-                        .getAvailableItems(AEApi.instance().storage().createItemList());
+                        .getAvailableItems(AEApi.instance().storage().createItemList(), IterationCounter.fetchNewId());
                 if (list.isEmpty()) return super.getItemStackDisplayName(stack) + " - "
                         + StatCollector.translateToLocal("extracells.tooltip.empty1");
                 IAEItemStack s = (IAEItemStack) list.getFirstItem();
@@ -316,7 +317,7 @@ public boolean onItemUse(ItemStack itemstack, EntityPlayer player, World world,
             ForgeDirection face = ForgeDirection.getOrientation(side);
             IItemList list = AEApi.instance().registries().cell()
                     .getCellInventory(itemstack, null, StorageChannel.ITEMS)
-                    .getAvailableItems(AEApi.instance().storage().createItemList());
+                    .getAvailableItems(AEApi.instance().storage().createItemList(), IterationCounter.fetchNewId());
             if (list.isEmpty()) return false;
             IAEItemStack storageStack = (IAEItemStack) list.getFirstItem();
             if (world.getBlock(x + face.offsetX, y + face.offsetY, z + face.offsetZ) == Blocks.air
diff --git a/src/main/scala/extracells/part/PartFluidStorage.java b/src/main/scala/extracells/part/PartFluidStorage.java
@@ -35,6 +35,7 @@
 import appeng.client.texture.CableBusTextures;
 import appeng.helpers.IPriorityHost;
 import appeng.items.parts.ItemMultiPart;
+import appeng.util.IterationCounter;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 import extracells.container.ContainerBusFluidStorage;
@@ -308,15 +309,17 @@ public void writeToNBT(NBTTagCompound data) {
     private void updateNeighborFluids() {
         fluidList.clear();
         if (access == AccessRestriction.READ || access == AccessRestriction.READ_WRITE) {
-            for (IAEFluidStack stack : handler.getAvailableItems(AEApi.instance().storage().createFluidList())) {
+            for (IAEFluidStack stack : handler
+                    .getAvailableItems(AEApi.instance().storage().createFluidList(), IterationCounter.fetchNewId())) {
                 fluidList.put(stack, stack.getStackSize());
             }
         }
     }
 
     private boolean wasChanged() {
         HashMap<IAEFluidStack, Long> fluids = new HashMap<IAEFluidStack, Long>();
-        for (IAEFluidStack stack : handler.getAvailableItems(AEApi.instance().storage().createFluidList())) {
+        for (IAEFluidStack stack : handler
+                .getAvailableItems(AEApi.instance().storage().createFluidList(), IterationCounter.fetchNewId())) {
             fluids.put(stack, stack.getStackSize());
         }
         return !fluids.equals(fluidList);
diff --git a/src/main/scala/extracells/tileentity/TileEntityCraftingStorage.java b/src/main/scala/extracells/tileentity/TileEntityCraftingStorage.java
@@ -13,7 +13,7 @@ public class TileEntityCraftingStorage extends TileCraftingStorageTile {
 
     @Override
     protected ItemStack getItemFromTile(final Object obj) {
-        final int storage = ((TileCraftingTile) obj).getStorageBytes() / KILO_SCALAR;
+        final int storage = (int) ((TileCraftingTile) obj).getStorageBytes() / KILO_SCALAR;
 
         switch (storage) {
             case 256:
@@ -29,7 +29,7 @@ protected ItemStack getItemFromTile(final Object obj) {
     }
 
     @Override
-    public int getStorageBytes() {
+    public long getStorageBytes() {
         if (this.worldObj == null || this.notLoaded()) return 0;
 
         switch (this.blockMetadata & 3) {
diff --git a/src/main/scala/extracells/util/EmptyMeItemMonitor.java b/src/main/scala/extracells/util/EmptyMeItemMonitor.java
@@ -32,7 +32,7 @@ public AccessRestriction getAccess() {
     }
 
     @Override
-    public IItemList<IAEItemStack> getAvailableItems(IItemList out) {
+    public IItemList<IAEItemStack> getAvailableItems(IItemList out, int iteration) {
         return out;
     }
 

Original file line number	Diff line number	Diff line change
`@@ -84,7 +84,8 @@ object HandlerMekanismGasTank extends IExternalGasStorageHandler {`
`84`	`84`	`}`
`85`	`85`
`86`	`86`	`override def getAvailableItems(`
`87`		`- itemList: IItemList[IAEFluidStack]`
	`87`	`+ itemList: IItemList[IAEFluidStack],`
	`88`	`+ iteration: Int`
`88`	`89`	`): IItemList[IAEFluidStack] = {`
`89`	`90`	`val gas = tank.getGas`
`90`	`91`	`if (gas != null)`
Original file line number	Diff line number	Diff line change
`@@ -18,6 +18,7 @@`
`18`	`18`	`import appeng.api.storage.*;`
`19`	`19`	`import appeng.api.storage.data.IAEItemStack;`
`20`	`20`	`import appeng.api.storage.data.IItemList;`
	`21`	`+import appeng.util.IterationCounter;`
`21`	`22`	`import appeng.util.Platform;`
`22`	`23`	`import appeng.util.item.AEItemStack;`
`23`	`24`	`import extracells.api.IStorageCellAdvanced;`
`@@ -135,7 +136,8 @@ private static boolean isBlackListed(final IAEItemStack input) {`
`135`	`136`	`}`
`136`	`137`
`137`	`138`	`private boolean isEmpty(final IMEInventory<IAEItemStack> meInventory) {`
`138`		`- return meInventory.getAvailableItems(AEApi.instance().storage().createItemList()).isEmpty();`
	`139`	`+ return meInventory.getAvailableItems(AEApi.instance().storage().createItemList(), IterationCounter.fetchNewId())`
	`140`	`+ .isEmpty();`
`139`	`141`	`}`
`140`	`142`
`141`	`143`	`@Override`
`@@ -365,7 +367,7 @@ private void loadCellItems() {`
`365`	`367`	`}`
`366`	`368`
`367`	`369`	`@Override`
`368`		`- public IItemList<IAEItemStack> getAvailableItems(final IItemList<IAEItemStack> out) {`
	`370`	`+ public IItemList<IAEItemStack> getAvailableItems(final IItemList<IAEItemStack> out, int iteration) {`
`369`	`371`	`for (final IAEItemStack i : this.getCellItems()) {`
`370`	`372`	`out.add(i);`
`371`	`373`	`}`
Original file line number	Diff line number	Diff line change
`@@ -108,7 +108,7 @@ public AccessRestriction getAccess() {`
`108`	`108`	`}`
`109`	`109`
`110`	`110`	`@Override`
`111`		`- public IItemList<IAEFluidStack> getAvailableItems(IItemList<IAEFluidStack> out) {`
	`111`	`+ public IItemList<IAEFluidStack> getAvailableItems(IItemList<IAEFluidStack> out, int iteration) {`
`112`	`112`	`for (FluidStack fluidStack : this.fluidStacks)`
`113`	`113`	`if (fluidStack != null) out.add(AEApi.instance().storage().createFluidStack(fluidStack));`
`114`	`114`	`return out;`
Original file line number	Diff line number	Diff line change
`@@ -109,7 +109,7 @@ public AccessRestriction getAccess() {`
`109`	`109`	`}`
`110`	`110`
`111`	`111`	`@Override`
`112`		`- public IItemList<IAEFluidStack> getAvailableItems(IItemList<IAEFluidStack> out) {`
	`112`	`+ public IItemList<IAEFluidStack> getAvailableItems(IItemList<IAEFluidStack> out, int iteration) {`
`113`	`113`	`for (FluidStack fluidStack : this.fluidStacks)`
`114`	`114`	`if (fluidStack != null) out.add(AEApi.instance().storage().createFluidStack(fluidStack));`
`115`	`115`	`return out;`
Original file line number	Diff line number	Diff line change
`@@ -83,12 +83,12 @@ public T extractItems(final T request, final Actionable type, final BaseActionSo`
`83`	`83`	`}`
`84`	`84`
`85`	`85`	`@Override`
`86`		`- public IItemList<T> getAvailableItems(final IItemList<T> out) {`
	`86`	`+ public IItemList<T> getAvailableItems(final IItemList<T> out, int iteration) {`
`87`	`87`	`if (!this.hasReadAccess) {`
`88`	`88`	`return out;`
`89`	`89`	`}`
`90`	`90`
`91`		`- return this.internal.getAvailableItems(out);`
	`91`	`+ return this.internal.getAvailableItems(out, iteration);`
`92`	`92`	`}`
`93`	`93`
`94`	`94`	`@Override`
Original file line number	Diff line number	Diff line change
`@@ -48,8 +48,8 @@ public T extractItems(final T request, final Actionable type, final BaseActionSo`
`48`	`48`	`}`
`49`	`49`
`50`	`50`	`@Override`
`51`		`- public IItemList<T> getAvailableItems(final IItemList out) {`
`52`		`- return this.internal.getAvailableItems(out);`
	`51`	`+ public IItemList<T> getAvailableItems(final IItemList out, int iteration) {`
	`52`	`+ return this.internal.getAvailableItems(out, iteration);`
`53`	`53`	`}`
`54`	`54`
`55`	`55`	`@Override`
Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@ public AccessRestriction getAccess() {`
`32`	`32`	`}`
`33`	`33`
`34`	`34`	`@Override`
`35`		`- public IItemList<IAEItemStack> getAvailableItems(IItemList out) {`
	`35`	`+ public IItemList<IAEItemStack> getAvailableItems(IItemList out, int iteration) {`
`36`	`36`	`return out;`
`37`	`37`	`}`
`38`	`38`