This commit is contained in:
lc_1337 committed 2025-10-09 16:12:43 +03:00
1 parent 34dc6c423b
commit 078073e5ce
21 files changed
+96 -138

No files matched your search

@@ -884,7 +884,7 @@ public abstract class FCGuiMonitor<T extends IAEStack<T>> extends FCBaseMEGui
}
@Override
public void setAEPins(IAEItemStack[] pins) {
public void setAEPins(IAEStack<?>[] pins) {
if (repo instanceof ItemRepo) repo.setAEPins(pins);
}
@@ -4,7 +4,6 @@ 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;
@@ -37,6 +36,7 @@ import appeng.api.networking.storage.IBaseMonitor;
import appeng.api.networking.storage.IStorageGrid;
import appeng.api.storage.ITerminalHost;
import appeng.api.storage.data.IAEFluidStack;
import appeng.api.storage.data.IAEStack;
import appeng.api.storage.data.IItemList;
import appeng.container.slot.SlotPlayerHotBar;
import appeng.container.slot.SlotPlayerInv;
@@ -166,10 +166,9 @@ public class ContainerFluidMonitor extends FCContainerMonitor<IAEFluidStack> {
}
@Override
public void postChange(IBaseMonitor monitor, Iterable<IAEStack<?>> change,
BaseActionSource actionSource) {
for (final IAEFluidStack is : (Iterable<? extends IAEFluidStack>) change) {
this.fluids.add(is);
public void postChange(IBaseMonitor monitor, Iterable<IAEStack<?>> change, BaseActionSource actionSource) {
for (final IAEStack<?> is : change) {
this.fluids.add((IAEFluidStack) is);
}
}
@@ -3,7 +3,6 @@ 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;
@@ -25,6 +24,7 @@ import appeng.api.networking.storage.IBaseMonitor;
import appeng.api.networking.storage.IStorageGrid;
import appeng.api.storage.ITerminalHost;
import appeng.api.storage.data.IAEItemStack;
import appeng.api.storage.data.IAEStack;
import appeng.api.storage.data.IItemList;
import appeng.container.slot.SlotRestrictedInput;
import appeng.me.helpers.ChannelPowerSrc;
@@ -141,8 +141,8 @@ public class ContainerItemMonitor extends FCContainerMonitor<IAEItemStack> {
@Override
public void postChange(final IBaseMonitor monitor, final Iterable<IAEStack<?>> change,
final BaseActionSource source) {
for (final IAEItemStack is : (Iterable<? extends IAEItemStack>) change) {
this.items.add(is);
for (final IAEStack<?> is : change) {
this.items.add((IAEItemStack) is);
}
}
@@ -38,7 +38,6 @@ import appeng.api.storage.IMEMonitorHandlerReceiver;
import appeng.api.storage.ITerminalHost;
import appeng.api.storage.ITerminalPins;
import appeng.api.storage.StorageChannel;
import appeng.api.storage.data.IAEItemStack;
import appeng.api.storage.data.IAEStack;
import appeng.api.util.IConfigManager;
import appeng.api.util.IConfigurableObject;
@@ -170,7 +169,7 @@ public abstract class FCContainerMonitor<T extends IAEStack<T>> extends FCBaseCo
final ICraftingGrid cc = itp.getGrid().getCache(ICraftingGrid.class);
final ImmutableList<ICraftingCPU> cpuList = cc.getCpus().asList();
List<IAEItemStack> craftedItems = new ArrayList<>();
List<IAEStack<?>> craftedItems = new ArrayList<>();
// fetch the first available crafting output
for (int i = 0; i < cpuList.size(); i++) {
@@ -193,7 +192,7 @@ public abstract class FCContainerMonitor<T extends IAEStack<T>> extends FCBaseCo
}
@Override
public void setPin(ItemStack is, int idx) {
public void setPin(IAEStack<?> is, int idx) {
if (pinsHandler == null || !(host instanceof ITerminalPins itp)) return;
if (is == null) {
@@ -215,7 +214,7 @@ public abstract class FCContainerMonitor<T extends IAEStack<T>> extends FCBaseCo
}
@Override
public ItemStack getPin(int idx) {
public IAEStack<?> getPin(int idx) {
if (pinsHandler == null) return null;
return pinsHandler.getPin(idx);
}
@@ -1,8 +1,5 @@
package com.glodblock.github.client.me;
import java.util.ArrayList;
import java.util.HashSet;
import java.util.Set;
import java.util.regex.Pattern;
import net.minecraftforge.fluids.Fluid;
@@ -13,7 +10,6 @@ import com.glodblock.github.util.FluidSorters;
import appeng.api.config.SearchBoxMode;
import appeng.api.config.Settings;
import appeng.api.config.SortOrder;
import appeng.api.config.ViewItems;
import appeng.api.storage.data.IAEItemStack;
import appeng.client.gui.widgets.IScrollSource;
@@ -31,29 +27,12 @@ public class EssentiaRepo extends FluidRepo {
public void updateView() {
if (this.paused) {
// Update existing view with new data
for (int i = 0; i < this.view.size(); i++) {
IAEItemStack entry = this.view.get(i);
IAEItemStack serverEntry = this.list.findPrecise(entry);
if (serverEntry == null) {
entry.setStackSize(0);
} else {
this.view.set(i, serverEntry);
}
}
for (int i = 0; i < this.view.size(); i++) {}
// Append newly added item stacks to the end of the view
Set<IAEItemStack> viewSet = new HashSet<>(this.view);
ArrayList<IAEItemStack> entriesToAdd = new ArrayList<>();
for (IAEItemStack serverEntry : this.list) {
if (!viewSet.contains(serverEntry)) {
entriesToAdd.add(serverEntry);
}
}
addEntriesToView(entriesToAdd);
} else {
this.view.clear();
this.view.ensureCapacity(this.list.size());
addEntriesToView(this.list);
}
// Do not sort if paused
@@ -64,23 +43,11 @@ public class EssentiaRepo extends FluidRepo {
FluidSorters.setDirection((appeng.api.config.SortDir) SortDir);
FluidSorters.init();
if (SortBy == SortOrder.MOD) {
this.view.sort(FluidSorters.CONFIG_BASED_SORT_BY_MOD);
} else if (SortBy == SortOrder.AMOUNT) {
this.view.sort(FluidSorters.CONFIG_BASED_SORT_BY_SIZE);
} else if (SortBy == SortOrder.INVTWEAKS) {
this.view.sort(FluidSorters.CONFIG_BASED_SORT_BY_INV_TWEAKS);
} else {
this.view.sort(FluidSorters.CONFIG_BASED_SORT_BY_NAME);
}
}
// Update the display
this.dsp.clear();
this.dsp.ensureCapacity(this.list.size());
for (final IAEItemStack is : this.view) {
this.dsp.add(is.getItemStack());
}
}
private void addEntriesToView(Iterable<IAEItemStack> entries) {
@@ -30,9 +30,9 @@ import com.glodblock.github.util.Util;
import appeng.api.AEApi;
import appeng.api.config.SearchBoxMode;
import appeng.api.config.Settings;
import appeng.api.config.SortOrder;
import appeng.api.config.ViewItems;
import appeng.api.storage.data.IAEItemStack;
import appeng.api.storage.data.IAEStack;
import appeng.api.storage.data.IDisplayRepo;
import appeng.api.storage.data.IItemList;
import appeng.client.gui.widgets.IScrollSource;
@@ -44,9 +44,9 @@ import cpw.mods.fml.relauncher.ReflectionHelper;
public class FluidRepo implements IDisplayRepo {
protected final IItemList<IAEItemStack> list = AEApi.instance().storage().createItemList();
protected final ArrayList<IAEItemStack> view = new ArrayList<>();
protected final ArrayList<ItemStack> dsp = new ArrayList<>();
protected final IItemList<IAEStack<?>> list = AEApi.instance().storage().createAEStackList();
protected final ArrayList<IAEStack<?>> view = new ArrayList<>();
protected final ArrayList<IAEStack<?>> dsp = new ArrayList<>();
protected final IScrollSource src;
protected final ISortSource sortSrc;
@@ -70,22 +70,23 @@ public class FluidRepo implements IDisplayRepo {
if (idx >= this.view.size()) {
return null;
}
return this.view.get(idx);
return this.view.get(idx) instanceof IAEItemStack ais ? ais : null;
}
@Override
public ItemStack getItem(int idx) {
idx += this.src.getCurrentScroll() * this.rowSize;
if (idx >= this.dsp.size()) {
return null;
}
return this.dsp.get(idx);
IAEStack<?> stack = getReferenceStack(idx);
return stack instanceof IAEItemStack ais ? ais.getItemStack() : null;
}
@Override
public void postUpdate(final IAEItemStack is) {
final IAEItemStack st = this.list.findPrecise(is);
public void postUpdate(IAEItemStack stack) {
this.postUpdate((IAEStack<?>) stack);
}
@Override
public void postUpdate(final IAEStack<?> is) {
final IAEStack st = this.list.findPrecise(is);
if (st != null) {
st.reset();
st.add(is);
@@ -106,28 +107,21 @@ public class FluidRepo implements IDisplayRepo {
if (this.paused) {
// Update existing view with new data
for (int i = 0; i < this.view.size(); i++) {
IAEItemStack entry = this.view.get(i);
IAEItemStack serverEntry = this.list.findPrecise(entry);
if (serverEntry == null) {
entry.setStackSize(0);
} else {
this.view.set(i, serverEntry);
}
IAEStack<?> entry = this.view.get(i);
IAEStack<?> serverEntry = this.list.findPrecise(entry);
}
// Append newly added item stacks to the end of the view
Set<IAEItemStack> viewSet = new HashSet<>(this.view);
ArrayList<IAEItemStack> entriesToAdd = new ArrayList<>();
for (IAEItemStack serverEntry : this.list) {
Set<IAEStack<?>> viewSet = new HashSet<>(this.view);
ArrayList<IAEStack<?>> entriesToAdd = new ArrayList<>();
for (IAEStack<?> serverEntry : this.list) {
if (!viewSet.contains(serverEntry)) {
entriesToAdd.add(serverEntry);
}
}
addEntriesToView(entriesToAdd);
} else {
this.view.clear();
this.view.ensureCapacity(this.list.size());
addEntriesToView(this.list);
}
// Do not sort if paused
@@ -138,22 +132,21 @@ public class FluidRepo implements IDisplayRepo {
FluidSorters.setDirection((appeng.api.config.SortDir) SortDir);
FluidSorters.init();
if (SortBy == SortOrder.MOD) {
this.view.sort(FluidSorters.CONFIG_BASED_SORT_BY_MOD);
} else if (SortBy == SortOrder.AMOUNT) {
this.view.sort(FluidSorters.CONFIG_BASED_SORT_BY_SIZE);
} else if (SortBy == SortOrder.INVTWEAKS) {
this.view.sort(FluidSorters.CONFIG_BASED_SORT_BY_INV_TWEAKS);
} else {
this.view.sort(FluidSorters.CONFIG_BASED_SORT_BY_NAME);
}
}
this.dsp.clear();
this.dsp.ensureCapacity(this.list.size());
for (final IAEItemStack is : this.view) {
this.dsp.add(is.getItemStack());
}
@Override
public IAEStack<?> getReferenceStack(int idx) {
idx += this.src.getCurrentScroll() * this.rowSize;
if (idx >= this.view.size()) {
return null;
}
return this.view.get(idx);
}
private void addEntriesToView(Iterable<IAEItemStack> entries) {