From 34dc6c423bb945e7d9c2e755e3fe72833e341ad4 Mon Sep 17 00:00:00 2001 From: lc_1337 Date: Wed, 8 Oct 2025 16:45:27 +0300 Subject: [PATCH] save --- .../gui/container/ContainerFluidMonitor.java | 5 +++-- .../gui/container/ContainerItemMonitor.java | 5 +++-- .../gui/container/base/FCContainerMonitor.java | 2 +- .../common/parts/PartFluidLevelEmitter.java | 2 +- .../github/common/tile/TileFluidAutoFiller.java | 7 ++++--- .../github/common/tile/TileFluidDiscretizer.java | 12 +++++++----- .../github/inventory/MEMonitorIFluidHandler.java | 16 ++++++++-------- 7 files changed, 27 insertions(+), 22 deletions(-) diff --git a/src/main/java/com/glodblock/github/client/gui/container/ContainerFluidMonitor.java b/src/main/java/com/glodblock/github/client/gui/container/ContainerFluidMonitor.java index 16b7f782..1f604f1b 100644 --- a/src/main/java/com/glodblock/github/client/gui/container/ContainerFluidMonitor.java +++ b/src/main/java/com/glodblock/github/client/gui/container/ContainerFluidMonitor.java @@ -4,6 +4,7 @@ import java.util.ArrayList; import java.util.HashMap; import java.util.List; +import appeng.api.storage.data.IAEStack; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.entity.player.InventoryPlayer; @@ -165,9 +166,9 @@ public class ContainerFluidMonitor extends FCContainerMonitor { } @Override - public void postChange(IBaseMonitor monitor, Iterable change, + public void postChange(IBaseMonitor monitor, Iterable> change, BaseActionSource actionSource) { - for (final IAEFluidStack is : change) { + for (final IAEFluidStack is : (Iterable) change) { this.fluids.add(is); } } diff --git a/src/main/java/com/glodblock/github/client/gui/container/ContainerItemMonitor.java b/src/main/java/com/glodblock/github/client/gui/container/ContainerItemMonitor.java index a3d69a5c..e5cdb371 100644 --- a/src/main/java/com/glodblock/github/client/gui/container/ContainerItemMonitor.java +++ b/src/main/java/com/glodblock/github/client/gui/container/ContainerItemMonitor.java @@ -3,6 +3,7 @@ package com.glodblock.github.client.gui.container; import java.util.ArrayList; import java.util.List; +import appeng.api.storage.data.IAEStack; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.entity.player.InventoryPlayer; @@ -138,9 +139,9 @@ public class ContainerItemMonitor extends FCContainerMonitor { } @Override - public void postChange(final IBaseMonitor monitor, final Iterable change, + public void postChange(final IBaseMonitor monitor, final Iterable> change, final BaseActionSource source) { - for (final IAEItemStack is : change) { + for (final IAEItemStack is : (Iterable) change) { this.items.add(is); } } diff --git a/src/main/java/com/glodblock/github/client/gui/container/base/FCContainerMonitor.java b/src/main/java/com/glodblock/github/client/gui/container/base/FCContainerMonitor.java index bb50853f..4683d44e 100644 --- a/src/main/java/com/glodblock/github/client/gui/container/base/FCContainerMonitor.java +++ b/src/main/java/com/glodblock/github/client/gui/container/base/FCContainerMonitor.java @@ -55,7 +55,7 @@ import appeng.util.IConfigManagerHost; import appeng.util.Platform; public abstract class FCContainerMonitor> extends FCBaseContainer - implements IConfigManagerHost, IConfigurableObject, IMEMonitorHandlerReceiver, IPinsHandler { + implements IConfigManagerHost, IConfigurableObject, IMEMonitorHandlerReceiver, IPinsHandler { protected final SlotRestrictedInput[] cellView = new SlotRestrictedInput[5]; protected final IConfigManager clientCM; diff --git a/src/main/java/com/glodblock/github/common/parts/PartFluidLevelEmitter.java b/src/main/java/com/glodblock/github/common/parts/PartFluidLevelEmitter.java index f78761eb..baa09df6 100644 --- a/src/main/java/com/glodblock/github/common/parts/PartFluidLevelEmitter.java +++ b/src/main/java/com/glodblock/github/common/parts/PartFluidLevelEmitter.java @@ -272,7 +272,7 @@ public class PartFluidLevelEmitter extends PartUpgradeable implements IStackWatc } @Override - public void postChange(final IBaseMonitor monitor, final Iterable change, + public void postChange(final IBaseMonitor monitor, final Iterable> change, final BaseActionSource actionSource) { if (canDoWork()) { if (delayedUpdatesQueued) { diff --git a/src/main/java/com/glodblock/github/common/tile/TileFluidAutoFiller.java b/src/main/java/com/glodblock/github/common/tile/TileFluidAutoFiller.java index 48422567..eb7e3568 100644 --- a/src/main/java/com/glodblock/github/common/tile/TileFluidAutoFiller.java +++ b/src/main/java/com/glodblock/github/common/tile/TileFluidAutoFiller.java @@ -5,6 +5,7 @@ import static com.glodblock.github.loader.RecipeLoader.BUCKET; import javax.annotation.Nonnull; +import appeng.api.storage.data.IAEStack; import net.minecraft.inventory.IInventory; import net.minecraft.inventory.InventoryCrafting; import net.minecraft.item.Item; @@ -59,7 +60,7 @@ import appeng.util.item.AEItemStack; import cpw.mods.fml.common.registry.GameRegistry; public class TileFluidAutoFiller extends AENetworkInvTile - implements ICraftingProvider, IMEMonitorHandlerReceiver, IGridTickable { + implements ICraftingProvider, IMEMonitorHandlerReceiver, IGridTickable { private final AppEngInternalInventory inventory = new AppEngInternalInventory(this, 1); private final BaseActionSource source = new MachineSource(this); @@ -214,11 +215,11 @@ public class TileFluidAutoFiller extends AENetworkInvTile } @Override - public void postChange(IBaseMonitor monitor, Iterable change, + public void postChange(IBaseMonitor monitor, Iterable> change, BaseActionSource source) { if (this.getProxy().isActive() && this.getStorageGrid() != null) { boolean hasChanged = false; - for (IAEFluidStack tmp : change) { + for (IAEFluidStack tmp : (Iterable) change) { if (this.fluids.findPrecise(tmp) == null) { hasChanged = true; this.fluids.add(tmp); diff --git a/src/main/java/com/glodblock/github/common/tile/TileFluidDiscretizer.java b/src/main/java/com/glodblock/github/common/tile/TileFluidDiscretizer.java index f7cd3fa4..f39fbb6a 100644 --- a/src/main/java/com/glodblock/github/common/tile/TileFluidDiscretizer.java +++ b/src/main/java/com/glodblock/github/common/tile/TileFluidDiscretizer.java @@ -6,6 +6,7 @@ import java.util.List; import javax.annotation.Nonnull; +import appeng.api.storage.data.IAEStack; import com.glodblock.github.api.FluidCraftAPI; import com.glodblock.github.common.item.ItemFluidDrop; @@ -35,6 +36,7 @@ import appeng.helpers.IPriorityHost; import appeng.me.GridAccessException; import appeng.me.storage.MEInventoryHandler; import appeng.tile.grid.AENetworkTile; +import net.minecraftforge.fluids.FluidStack; public class TileFluidDiscretizer extends AENetworkTile implements IPriorityHost, ICellContainer { @@ -129,7 +131,7 @@ public class TileFluidDiscretizer extends AENetworkTile implements IPriorityHost } private class FluidDiscretizingInventory - implements IMEInventory, IMEMonitorHandlerReceiver { + implements IMEInventory, IMEMonitorHandlerReceiver { private final MEInventoryHandler invHandler = new MEInventoryHandler<>(this, getChannel()); private IItemList itemCache = null; @@ -231,15 +233,15 @@ public class TileFluidDiscretizer extends AENetworkTile implements IPriorityHost } @Override - public void postChange(IBaseMonitor monitor, Iterable change, + public void postChange(IBaseMonitor monitor, Iterable> change, BaseActionSource actionSource) { itemCache = null; try { List mappedChanges = new ArrayList<>(); - for (IAEFluidStack fluidStack : change) { - IAEItemStack itemStack = ItemFluidDrop.newAeStack(fluidStack); + for (IAEStack fluidStack : change) { + IAEItemStack itemStack = ItemFluidDrop.newAeStack((FluidStack) fluidStack); if (itemStack != null - && !FluidCraftAPI.instance().isBlacklistedInDisplay(fluidStack.getFluid().getClass())) { + && !FluidCraftAPI.instance().isBlacklistedInDisplay(((IAEFluidStack) fluidStack).getFluid().getClass())) { mappedChanges.add(itemStack); } } diff --git a/src/main/java/com/glodblock/github/inventory/MEMonitorIFluidHandler.java b/src/main/java/com/glodblock/github/inventory/MEMonitorIFluidHandler.java index e77e099b..f7b709ad 100644 --- a/src/main/java/com/glodblock/github/inventory/MEMonitorIFluidHandler.java +++ b/src/main/java/com/glodblock/github/inventory/MEMonitorIFluidHandler.java @@ -7,6 +7,7 @@ import java.util.Map; import javax.annotation.Nonnull; +import appeng.api.storage.data.IAEStack; import net.minecraft.event.ClickEvent; import net.minecraft.event.HoverEvent; import net.minecraft.server.MinecraftServer; @@ -39,7 +40,7 @@ public class MEMonitorIFluidHandler implements IMEMonitor { private final IFluidHandler handler; private final ForgeDirection side; private IItemList cache = AEApi.instance().storage().createFluidList(); - private final HashMap, Object> listeners = new HashMap<>(); + private final HashMap listeners = new HashMap<>(); private BaseActionSource mySource; private StorageFilter mode; @@ -55,11 +56,11 @@ public class MEMonitorIFluidHandler implements IMEMonitor { this.side = ForgeDirection.UNKNOWN; } - public void addListener(IMEMonitorHandlerReceiver l, Object verificationToken) { + public void addListener(IMEMonitorHandlerReceiver l, Object verificationToken) { this.listeners.put(l, verificationToken); } - public void removeListener(IMEMonitorHandlerReceiver l) { + public void removeListener(IMEMonitorHandlerReceiver l) { this.listeners.remove(l); } @@ -181,14 +182,13 @@ public class MEMonitorIFluidHandler implements IMEMonitor { return TickRateModulation.SLOWER; } - private void postDifference(Iterable a) { + private void postDifference(Iterable a) { if (a != null) { - Iterator, Object>> i = this.listeners.entrySet() - .iterator(); + Iterator> i = this.listeners.entrySet().iterator(); while (i.hasNext()) { - Map.Entry, Object> l = i.next(); - IMEMonitorHandlerReceiver key = l.getKey(); + Map.Entry l = i.next(); + IMEMonitorHandlerReceiver key = l.getKey(); if (key.isValid(l.getValue())) { key.postChange(this, a, this.getActionSource()); } else {