Skip to content

Commit

Permalink
Shockingly ugly code. Why? gtm, why?
Browse files Browse the repository at this point in the history
  • Loading branch information
@gateguardian523
gateguardian523 committed Jun 15, 2024
1 parent 6b86a42 commit 6906174
Show file tree
Hide file tree
Showing 5 changed files with 216 additions and 289 deletions.
4 changes: 4 additions & 0 deletions src/main/java/com/epimorphismmc/gregiceng/api/misc/IConfigurableAESlot.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,10 @@ public interface IConfigurableAESlot<T extends AEKey> {

void setConfig(@Nullable T what);

default boolean hasConfig() {
return getConfig() != null;
}

default long getAmount() {
return request(Long.MAX_VALUE, true);
}
Expand Down
25 changes: 0 additions & 25 deletions src/main/java/com/epimorphismmc/gregiceng/api/misc/SerializableFluidTransferList.java
View file

This file was deleted.

24 changes: 0 additions & 24 deletions src/main/java/com/epimorphismmc/gregiceng/api/misc/SerializableItemTransferList.java
View file

This file was deleted.

213 changes: 107 additions & 106 deletions ...epimorphismmc/gregiceng/common/machine/multiblock/part/appeng/StockingBusPartMachine.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
import com.epimorphismmc.gregiceng.api.machine.feature.multiblock.IMEStockingBus;
import com.epimorphismmc.gregiceng.api.misc.ConfigurableAESlot;
import com.epimorphismmc.gregiceng.api.misc.IConfigurableAESlotList;
import com.epimorphismmc.gregiceng.api.misc.SerializableItemTransferList;

import com.epimorphismmc.monomorphism.ae2.MEPartMachine;
import com.epimorphismmc.monomorphism.machine.fancyconfigurator.InventoryFancyConfigurator;
Expand Down Expand Up @@ -34,14 +33,11 @@
import com.gregtechceu.gtceu.common.item.IntCircuitBehaviour;

import com.lowdragmc.lowdraglib.misc.ItemStackTransfer;
import com.lowdragmc.lowdraglib.misc.ItemTransferList;
import com.lowdragmc.lowdraglib.side.item.IItemTransfer;
import com.lowdragmc.lowdraglib.syncdata.annotation.Persisted;
import com.lowdragmc.lowdraglib.syncdata.field.ManagedFieldHolder;

import net.minecraft.ChatFormatting;
import net.minecraft.MethodsReturnNonnullByDefault;
import net.minecraft.core.NonNullList;
import net.minecraft.nbt.CompoundTag;
import net.minecraft.network.chat.Component;
import net.minecraft.network.chat.Style;
Expand All @@ -52,12 +48,10 @@

import com.google.common.primitives.Ints;
import lombok.Getter;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;

import java.util.Arrays;
import java.util.List;
import java.util.Objects;
import java.util.Set;
import java.util.stream.Collectors;

Expand Down Expand Up @@ -186,34 +180,44 @@ protected class ExportOnlyAEItemList extends NotifiableRecipeHandlerTrait<Ingred
ExportOnlyAEItemList.class, NotifiableRecipeHandlerTrait.MANAGED_FIELD_HOLDER);

@Persisted
ItemTransferList inventory;
ExportOnlyAEItem[] inventory;

private IStackWatcher storageWatcher;
private final IStorageWatcherNode stackWatcherNode = new IStorageWatcherNode() {
@Override
public void updateWatcher(IStackWatcher newWatcher) {
storageWatcher = newWatcher;
configureWatchers();
}
private ItemStackTransfer itemTransfer;

@Override
public void onStackChange(AEKey what, long amount) {
notifyListeners();
}
};
private IStackWatcher storageWatcher;

public ExportOnlyAEItemList(MetaMachine holder, int slots) {
super(holder);
var transfers = new ExportOnlyAEItem[slots];
this.inventory = new ExportOnlyAEItem[slots];
for (int i = 0; i < slots; i++) {
transfers[i] = new ExportOnlyAEItem(null);
transfers[i].setOnContentsChanged(this::onChanged);
inventory[i] = new ExportOnlyAEItem(null);
inventory[i].setOnContentsChanged(this::onChanged);
}
this.inventory = new SerializableItemTransferList(transfers);

IStorageWatcherNode stackWatcherNode = new IStorageWatcherNode() {
@Override
public void updateWatcher(IStackWatcher newWatcher) {
storageWatcher = newWatcher;
configureWatchers();
}

@Override
public void onStackChange(AEKey what, long amount) {
notifyListeners();
}
};
getMainNode().addService(IStorageWatcherNode.class, stackWatcherNode);
}

private void configureWatchers() {
if (storageWatcher != null) {
storageWatcher.reset();
for (AEItemKey aeItemKey : getAEKeySet()) {
storageWatcher.add(aeItemKey);
}
}
}

@Override
public void onChanged() {
super.onChanged();
Expand All @@ -223,12 +227,12 @@ public void onChanged() {

@Override
public ExportOnlyAEItem getAESlot(int index) {
return (ExportOnlyAEItem) inventory.transfers[index];
return inventory[index];
}

@Override
public int getSlots() {
return inventory.getSlots();
return inventory.length;
}

@Override
Expand All @@ -249,51 +253,34 @@ public void clearConfig() {
}
}

public ItemStackTransfer getTransfer() {
if (this.itemTransfer == null) {
this.itemTransfer = new WrappedItemStackTransfer(inventory);
}
return itemTransfer;
}

@Override
public @Nullable List<Ingredient> handleRecipeInner(
IO io,
GTRecipe recipe,
List<Ingredient> left,
@Nullable String slotName,
boolean simulate) {
return handleIngredient(
io,
recipe,
left,
simulate,
getHandlerIO(),
new ItemStackTransfer(NonNullList.of(
ItemStack.EMPTY,
Arrays.stream(inventory.transfers)
.map(item -> item.getStackInSlot(0))
.toArray(ItemStack[]::new))) {

@NotNull @Override
public ItemStack extractItem(
int slot, int amount, boolean simulate, boolean notifyChanges) {
ItemStack extracted = super.extractItem(slot, amount, simulate, notifyChanges);
if (!extracted.isEmpty()) {
inventory.transfers[slot].extractItem(0, amount, simulate, notifyChanges);
}
return extracted;
}
});
return handleIngredient(io, recipe, left, simulate, getHandlerIO(), getTransfer());
}

@Override
public List<Object> getContents() {
return Arrays.stream(inventory.transfers)
.map(transfer -> transfer.getStackInSlot(0))
return Arrays.stream(inventory)
.map(ExportOnlyAEItem::getStack)
.filter(stack -> !stack.isEmpty())
.collect(Collectors.toUnmodifiableList());
}

@Override
public double getTotalContentAmount() {
return Arrays.stream(inventory.transfers)
.map(transfer -> transfer.getStackInSlot(0))
.mapToInt(ItemStack::getCount)
.sum();
return Arrays.stream(inventory).mapToInt(ExportOnlyAEItem::getCount).sum();
}

@Override
Expand All @@ -311,17 +298,68 @@ public ManagedFieldHolder getFieldHolder() {
return MANAGED_FIELD_HOLDER;
}

private void configureWatchers() {
if (storageWatcher != null) {
storageWatcher.reset();
for (AEItemKey aeItemKey : getAEKeySet()) {
storageWatcher.add(aeItemKey);
}
private static class WrappedItemStackTransfer extends ItemStackTransfer {

private final boolean isCopy;

private final ExportOnlyAEItem[] inventory;

public WrappedItemStackTransfer(ExportOnlyAEItem[] inventory) {
this(inventory, false);
}

public WrappedItemStackTransfer(ExportOnlyAEItem[] inventory, boolean isCopy) {
super();
this.inventory = inventory;
this.isCopy = isCopy;
}

@Override
public int getSlots() {
return inventory.length;
}

@Override
public ItemStack getStackInSlot(int slot) {
return inventory[slot].getStack();
}

@Override
public void setStackInSlot(int slot, ItemStack stack) {
// NO-OP
}

@Override
public ItemStack insertItem(
int slot, ItemStack stack, boolean simulate, boolean notifyChanges) {
return stack;
}

@Override
public ItemStack extractItem(int slot, int amount, boolean simulate, boolean notifyChanges) {
if (amount == 0) return ItemStack.EMPTY;
validateSlotIndex(slot);
return inventory[slot].extract(amount, isCopy || simulate);
}

@Override
public int getSlotLimit(int slot) {
return Integer.MAX_VALUE;
}

@Override
public boolean isItemValid(int slot, ItemStack stack) {
return false;
}

@Override
public ItemStackTransfer copy() {
return new WrappedItemStackTransfer(inventory, true);
}
}
}

protected class ExportOnlyAEItem extends ConfigurableAESlot<AEItemKey> implements IItemTransfer {
protected class ExportOnlyAEItem extends ConfigurableAESlot<AEItemKey> {

public ExportOnlyAEItem(@Nullable AEItemKey config) {
super(config);
Expand All @@ -347,69 +385,32 @@ public void setConfig(@Nullable AEItemKey config) {
this.onContentsChanged();
}

@Override
public void setStackInSlot(int slot, ItemStack stack) {
// NO-OP
}

@NotNull @Override
public ItemStack insertItem(
int slot, ItemStack stack, boolean simulate, boolean notifyChanges) {
return stack;
}

@Override
public int getSlots() {
return 1;
}

@NotNull @Override
public ItemStack getStackInSlot(int slot) {
int count = Ints.saturatedCast(getAmount());
if (config != null && count > 0) {
return config.toStack(count);
}
return ItemStack.EMPTY;
}

@NotNull @Override
public ItemStack extractItem(int slot, int amount, boolean simulate, boolean notifyChanges) {
public ItemStack extract(int amount, boolean simulate) {
int extracted = Ints.saturatedCast(request(amount, simulate));
if (config != null && extracted > 0) {
return config.toStack(extracted);
}
return ItemStack.EMPTY;
}

@Override
public int getSlotLimit(int slot) {
return Integer.MAX_VALUE;
public ItemStack getStack() {
int count = Ints.saturatedCast(getAmount());
if (config != null && count > 0) {
return config.toStack(count);
}
return ItemStack.EMPTY;
}

@Override
public boolean isItemValid(int slot, ItemStack stack) {
return false;
public int getCount() {
return Ints.saturatedCast(getAmount());
}

@Override
public void onContentsChanged() {
if (onContentsChanged != null) {
onContentsChanged.run();
}
}

@NotNull @Override
public Object createSnapshot() {
return Objects.requireNonNullElse(config, new Object());
}

@Override
public void restoreFromSnapshot(Object snapshot) {
if (snapshot instanceof AEItemKey key) {
this.config = key;
}
}

@Override
public CompoundTag serializeNBT() {
CompoundTag tag = new CompoundTag();
Expand Down
Loading

0 comments on commit 6906174

Please sign in to comment.