dave/refinedstorage
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Don't send hash for grid stacks anymore, but unique id. Prevents collisions. The StackLists now stored an unique id per item/fluid entry.

Browse Source
This commit is contained in:
raoulvdberge
2019-10-09 13:13:49 +02:00
parent 209cbf421b
commit 68a568e10e
38 changed files with 606 additions and 472 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/main/java/com/raoulvdberge/refinedstorage/api/network/grid/handler/IFluidGridHandler.java
View File

@@ -1,11 +1,10 @@
package com.raoulvdberge.refinedstorage.api.network.grid.handler;
import com.raoulvdberge.refinedstorage.api.IRSAPI;
import net.minecraft.entity.player.ServerPlayerEntity;
import net.minecraft.item.ItemStack;
import net.minecraftforge.fluids.FluidStack;
import javax.annotation.Nullable;
import java.util.UUID;
/**
* Defines the behavior of fluid grids.
@@ -15,10 +14,10 @@ public interface IFluidGridHandler {
* Called when a player tries to extract a fluid from the grid.
*
* @param player the player that is attempting the extraction
* @param hash the hash of the fluid we're trying to extract, see {@link IRSAPI#getFluidStackHashCode(FluidStack)}
* @param id the id of the fluid we're trying to extract, this id is the id from {@link com.raoulvdberge.refinedstorage.api.util.StackListEntry}
* @param shift true if shift click was used, false otherwise
*/
void onExtract(ServerPlayerEntity player, int hash, boolean shift);
void onExtract(ServerPlayerEntity player, UUID id, boolean shift);
/**
* Called when a player tries to insert fluids in the grid.
@@ -50,18 +49,18 @@ public interface IFluidGridHandler {
* Called when a player requests the crafting preview window to be opened.
*
* @param player the player
* @param hash the item stack hash
* @param id the id of the fluid we're trying to extract, this id is the id from {@link com.raoulvdberge.refinedstorage.api.util.StackListEntry}
* @param quantity the amount of that item that we need a preview for
* @param noPreview true if the crafting preview window shouldn't be shown, false otherwise
*/
void onCraftingPreviewRequested(ServerPlayerEntity player, int hash, int quantity, boolean noPreview);
void onCraftingPreviewRequested(ServerPlayerEntity player, UUID id, int quantity, boolean noPreview);
/**
* Called when a player requested crafting for an item.
*
* @param player the player that is requesting the crafting
* @param hash the hash of the item to request a craft for
* @param id the id of the fluid we're trying to extract, this id is the id from {@link com.raoulvdberge.refinedstorage.api.util.StackListEntry}
* @param quantity the amount of the item that has to be crafted
*/
void onCraftingRequested(ServerPlayerEntity player, int hash, int quantity);
void onCraftingRequested(ServerPlayerEntity player, UUID id, int quantity);
}

13
src/main/java/com/raoulvdberge/refinedstorage/api/network/grid/handler/IItemGridHandler.java
View File

@@ -1,6 +1,5 @@
package com.raoulvdberge.refinedstorage.api.network.grid.handler;
import com.raoulvdberge.refinedstorage.api.IRSAPI;
import net.minecraft.entity.player.ServerPlayerEntity;
import net.minecraft.item.ItemStack;
@@ -19,10 +18,10 @@ public interface IItemGridHandler {
* Called when a player tries to extract an item from the grid.
*
* @param player the player that is attempting the extraction
* @param hash the hash of the item we're trying to extract, see {@link IRSAPI#getItemStackHashCode(ItemStack)}
* @param id the id of the item we're trying to extract, this id is the id from {@link com.raoulvdberge.refinedstorage.api.util.StackListEntry}
* @param flags how we are extracting, see the flags in {@link IItemGridHandler}
*/
void onExtract(ServerPlayerEntity player, int hash, int flags);
void onExtract(ServerPlayerEntity player, UUID id, int flags);
/**
* Called when a player tries to insert an item in the grid.
@@ -55,20 +54,20 @@ public interface IItemGridHandler {
* Called when a player requests the crafting preview window to be opened.
*
* @param player the player
* @param hash the item stack hash
* @param id the id of the item we're trying to extract, this id is the id from {@link com.raoulvdberge.refinedstorage.api.util.StackListEntry}
* @param quantity the amount of that item that we need a preview for
* @param noPreview true if the crafting preview window shouldn't be shown, false otherwise
*/
void onCraftingPreviewRequested(ServerPlayerEntity player, int hash, int quantity, boolean noPreview);
void onCraftingPreviewRequested(ServerPlayerEntity player, UUID id, int quantity, boolean noPreview);
/**
* Called when a player requested crafting for an item.
*
* @param player the player that is requesting the crafting
* @param hash the hash of the item to request a craft for
* @param id the id of the item we're trying to extract, this id is the id from {@link com.raoulvdberge.refinedstorage.api.util.StackListEntry}
* @param quantity the amount of the item that has to be crafted
*/
void onCraftingRequested(ServerPlayerEntity player, int hash, int quantity);
void onCraftingRequested(ServerPlayerEntity player, UUID id, int quantity);
/**
* Called when a player wants to cancel a crafting task.

12
src/main/java/com/raoulvdberge/refinedstorage/api/storage/IStorageCacheListener.java
View File

@@ -1,8 +1,7 @@
package com.raoulvdberge.refinedstorage.api.storage;
import org.apache.commons.lang3.tuple.Pair;
import com.raoulvdberge.refinedstorage.api.util.StackListResult;
import javax.annotation.Nonnull;
import java.util.List;
/**
@@ -24,15 +23,14 @@ public interface IStorageCacheListener<T> {
/**
* Called when the storage cache changes.
*
* @param stack the stack
* @param size the size, negative if the amount decreases
* @param delta the delta
*/
void onChanged(@Nonnull T stack, int size);
void onChanged(StackListResult<T> delta);
/**
* Called when the storage cache changes.
*
* @param stacks a list of stacks that are changed, with the size changed (negative if the amount decreases)
* @param deltas a list of deltas
*/
void onChangedBulk(@Nonnull List<Pair<T, Integer>> stacks);
void onChangedBulk(List<StackListResult<T>> deltas);
}

23
src/main/java/com/raoulvdberge/refinedstorage/api/util/IStackList.java
View File

@@ -3,6 +3,7 @@ package com.raoulvdberge.refinedstorage.api.util;
import javax.annotation.Nonnull;
import javax.annotation.Nullable;
import java.util.Collection;
import java.util.UUID;
/**
* A stack list.
@@ -13,32 +14,36 @@ public interface IStackList<T> {
*
* @param stack the stack
* @param size the size to add
* @return the result
*/
void add(@Nonnull T stack, int size);
StackListResult<T> add(@Nonnull T stack, int size);
/**
* Adds a stack to the list, will merge it with another stack if it already exists in the list.
*
* @param stack the stack
* @return the result
*/
void add(@Nonnull T stack);
StackListResult<T> add(@Nonnull T stack);
/**
* Decrements the count of that stack in the list.
*
* @param stack the stack
* @param size the size to remove
* @return true if the remove was successful for the full amount, false otherwise
* @return the result, or null if the stack wasn't present
*/
boolean remove(@Nonnull T stack, int size);
@Nullable
StackListResult<T> remove(@Nonnull T stack, int size);
/**
* Decrements the count of that stack in the list.
*
* @param stack the stack
* @return true if the remove was successful for the full amount, false otherwise
* @return the result, or null if the stack wasn't present
*/
boolean remove(@Nonnull T stack);
@Nullable
StackListResult<T> remove(@Nonnull T stack);
/**
* Returns a stack.
@@ -64,11 +69,11 @@ public interface IStackList<T> {
/**
* Returns a stack.
*
* @param hash the hash of the stack to search for
* @param id the id of the entry to search for
* @return the stack, or null if no stack was found
*/
@Nullable
T get(int hash);
T get(UUID id);
/**
* Clears the list.
@@ -84,7 +89,7 @@ public interface IStackList<T> {
* @return a collection of stacks in this list
*/
@Nonnull
Collection<T> getStacks();
Collection<StackListEntry<T>> getStacks();
/**
* @return a new copy of this list, with the stacks in it copied as well

41
src/main/java/com/raoulvdberge/refinedstorage/api/util/StackListEntry.java Normal file
View File

@@ -0,0 +1,41 @@
package com.raoulvdberge.refinedstorage.api.util;
import java.util.UUID;
/**
* Represents a stack in a stack list.
*
* @param <T> the stack type
*/
public class StackListEntry<T> {
private UUID id;
private T stack;
public StackListEntry(T stack) {
this.stack = stack;
this.id = UUID.randomUUID();
}
public StackListEntry(UUID id, T stack) {
this.id = id;
this.stack = stack;
}
/**
* The unique id of the entry.
* This id is NOT persisted, nor does it hold any relation to the contained stack.
* It is randomly generated.
*
* @return the id
*/
public UUID getId() {
return id;
}
/**
* @return the stack
*/
public T getStack() {
return stack;
}
}

27
src/main/java/com/raoulvdberge/refinedstorage/api/util/StackListResult.java Normal file
View File

@@ -0,0 +1,27 @@
package com.raoulvdberge.refinedstorage.api.util;
import java.util.UUID;
public class StackListResult<T> {
private T stack;
private UUID id;
private int change;
public StackListResult(T stack, UUID id, int change) {
this.stack = stack;
this.id = id;
this.change = change;
}
public T getStack() {
return stack;
}
public UUID getId() {
return id;
}
public int getChange() {
return change;
}
}

10
src/main/java/com/raoulvdberge/refinedstorage/apiimpl/API.java
View File

@@ -38,9 +38,9 @@ import com.raoulvdberge.refinedstorage.apiimpl.network.readerwriter.ReaderWriter
import com.raoulvdberge.refinedstorage.apiimpl.network.readerwriter.ReaderWriterHandlerRegistry;
import com.raoulvdberge.refinedstorage.apiimpl.storage.disk.*;
import com.raoulvdberge.refinedstorage.apiimpl.util.Comparer;
import com.raoulvdberge.refinedstorage.apiimpl.util.FluidStackList;
import com.raoulvdberge.refinedstorage.apiimpl.util.ItemStackList;
import com.raoulvdberge.refinedstorage.apiimpl.util.QuantityFormatter;
import com.raoulvdberge.refinedstorage.apiimpl.util.StackListFluid;
import com.raoulvdberge.refinedstorage.apiimpl.util.StackListItem;
import com.raoulvdberge.refinedstorage.capability.NetworkNodeProxyCapability;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.CompoundNBT;
@@ -154,13 +154,13 @@ public class API implements IRSAPI {
@Nonnull
@Override
public IStackList<ItemStack> createItemStackList() {
return new StackListItem();
return new ItemStackList();
}
@Override
@Nonnull
public IStackList<FluidStack> createFluidStackList() {
return new StackListFluid();
return new FluidStackList();
}
@Override
@@ -264,6 +264,7 @@ public class API implements IRSAPI {
}
}
// TODO: Remove eventually
@Override
public int getItemStackHashCode(ItemStack stack) {
int result = stack.getItem().hashCode();
@@ -304,6 +305,7 @@ public class API implements IRSAPI {
return result;
}
// TODO: Remove eventually
@Override
public int getFluidStackHashCode(FluidStack stack) {
int result = stack.getFluid().hashCode();

143
src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/task/CraftingTask.java
View File

@@ -13,6 +13,7 @@ import com.raoulvdberge.refinedstorage.api.storage.disk.IStorageDisk;
import com.raoulvdberge.refinedstorage.api.util.Action;
import com.raoulvdberge.refinedstorage.api.util.IComparer;
import com.raoulvdberge.refinedstorage.api.util.IStackList;
import com.raoulvdberge.refinedstorage.api.util.StackListEntry;
import com.raoulvdberge.refinedstorage.apiimpl.API;
import com.raoulvdberge.refinedstorage.apiimpl.autocrafting.craftingmonitor.CraftingMonitorElementError;
import com.raoulvdberge.refinedstorage.apiimpl.autocrafting.craftingmonitor.CraftingMonitorElementFluidRender;
@@ -180,8 +181,8 @@ public class CraftingTask implements ICraftingTask {
static ListNBT writeItemStackList(IStackList<ItemStack> stacks) {
ListNBT list = new ListNBT();
for (ItemStack stack : stacks.getStacks()) {
list.add(StackUtils.serializeStackToNbt(stack));
for (StackListEntry<ItemStack> entry : stacks.getStacks()) {
list.add(StackUtils.serializeStackToNbt(entry.getStack()));
}
return list;
@@ -206,8 +207,8 @@ public class CraftingTask implements ICraftingTask {
static ListNBT writeFluidStackList(IStackList<FluidStack> stacks) {
ListNBT list = new ListNBT();
for (FluidStack stack : stacks.getStacks()) {
list.add(stack.writeToNBT(new CompoundNBT()));
for (StackListEntry<FluidStack> entry : stacks.getStacks()) {
list.add(entry.getStack().writeToNBT(new CompoundNBT()));
}
return list;
@@ -542,11 +543,11 @@ public class CraftingTask implements ICraftingTask {
if (!toExtractInitial.isEmpty()) {
List<ItemStack> toRemove = new ArrayList<>();
for (ItemStack toExtract : toExtractInitial.getStacks()) {
ItemStack result = network.extractItem(toExtract, toExtract.getCount(), Action.PERFORM);
for (StackListEntry<ItemStack> toExtract : toExtractInitial.getStacks()) {
ItemStack result = network.extractItem(toExtract.getStack(), toExtract.getStack().getCount(), Action.PERFORM);
if (result != null) {
internalStorage.insert(toExtract, result.getCount(), Action.PERFORM);
internalStorage.insert(toExtract.getStack(), result.getCount(), Action.PERFORM);
toRemove.add(result);
}
@@ -564,11 +565,11 @@ public class CraftingTask implements ICraftingTask {
if (!toExtractInitialFluids.isEmpty()) {
List<FluidStack> toRemove = new ArrayList<>();
for (FluidStack toExtract : toExtractInitialFluids.getStacks()) {
FluidStack result = network.extractFluid(toExtract, toExtract.getAmount(), Action.PERFORM);
for (StackListEntry<FluidStack> toExtract : toExtractInitialFluids.getStacks()) {
FluidStack result = network.extractFluid(toExtract.getStack(), toExtract.getStack().getAmount(), Action.PERFORM);
if (result != null) {
internalFluidStorage.insert(toExtract, result.getAmount(), Action.PERFORM);
internalFluidStorage.insert(toExtract.getStack(), result.getAmount(), Action.PERFORM);
toRemove.add(result);
}
@@ -607,10 +608,10 @@ public class CraftingTask implements ICraftingTask {
boolean hasAll = true;
for (ItemStack need : c.getToExtract().getStacks()) {
ItemStack result = this.internalStorage.extract(need, need.getCount(), DEFAULT_EXTRACT_FLAGS, Action.SIMULATE);
for (StackListEntry<ItemStack> need : c.getToExtract().getStacks()) {
ItemStack result = this.internalStorage.extract(need.getStack(), need.getStack().getCount(), DEFAULT_EXTRACT_FLAGS, Action.SIMULATE);
if (result == null || result.getCount() != need.getCount()) {
if (result == null || result.getCount() != need.getStack().getCount()) {
hasAll = false;
break;
@@ -618,10 +619,10 @@ public class CraftingTask implements ICraftingTask {
}
if (hasAll) {
for (ItemStack need : c.getToExtract().getStacks()) {
ItemStack result = this.internalStorage.extract(need, need.getCount(), DEFAULT_EXTRACT_FLAGS, Action.PERFORM);
for (StackListEntry<ItemStack> need : c.getToExtract().getStacks()) {
ItemStack result = this.internalStorage.extract(need.getStack(), need.getStack().getCount(), DEFAULT_EXTRACT_FLAGS, Action.PERFORM);
if (result == null || result.getCount() != need.getCount()) {
if (result == null || result.getCount() != need.getStack().getCount()) {
throw new IllegalStateException("Extractor check lied");
}
}
@@ -694,13 +695,13 @@ public class CraftingTask implements ICraftingTask {
} else {
boolean hasAll = true;
for (ItemStack need : p.getItemsToPut().getStacks()) {
for (StackListEntry<ItemStack> need : p.getItemsToPut().getStacks()) {
if (p.getPattern().getContainer().getConnectedInventory() == null) {
p.setState(ProcessingState.MACHINE_NONE);
} else {
ItemStack result = this.internalStorage.extract(need, need.getCount(), DEFAULT_EXTRACT_FLAGS, Action.SIMULATE);
ItemStack result = this.internalStorage.extract(need.getStack(), need.getStack().getCount(), DEFAULT_EXTRACT_FLAGS, Action.SIMULATE);
if (result == null || result.getCount() != need.getCount()) {
if (result == null || result.getCount() != need.getStack().getCount()) {
hasAll = false;
break;
@@ -714,13 +715,13 @@ public class CraftingTask implements ICraftingTask {
p.setState(ProcessingState.MACHINE_DOES_NOT_ACCEPT);
}
for (FluidStack need : p.getFluidsToPut().getStacks()) {
for (StackListEntry<FluidStack> need : p.getFluidsToPut().getStacks()) {
if (p.getPattern().getContainer().getConnectedFluidInventory() == null) {
p.setState(ProcessingState.MACHINE_NONE);
} else {
FluidStack result = this.internalFluidStorage.extract(need, need.getAmount(), IComparer.COMPARE_NBT, Action.SIMULATE);
FluidStack result = this.internalFluidStorage.extract(need.getStack(), need.getStack().getAmount(), IComparer.COMPARE_NBT, Action.SIMULATE);
if (result == null || result.getAmount() != need.getAmount()) {
if (result == null || result.getAmount() != need.getStack().getAmount()) {
hasAll = false;
break;
@@ -735,12 +736,12 @@ public class CraftingTask implements ICraftingTask {
}
if (p.getState() == ProcessingState.READY && hasAll) {
Deque<ItemStack> toInsert = new ArrayDeque<>();
Deque<StackListEntry<ItemStack>> toInsert = new ArrayDeque<>();
for (ItemStack need : p.getItemsToPut().getStacks()) {
ItemStack result = this.internalStorage.extract(need, need.getCount(), DEFAULT_EXTRACT_FLAGS, Action.PERFORM);
if (result == null || result.getCount() != need.getCount()) {
throw new IllegalStateException("The internal crafting inventory reported that " + need + " was available but we got " + result);
for (StackListEntry<ItemStack> need : p.getItemsToPut().getStacks()) {
ItemStack result = this.internalStorage.extract(need.getStack(), need.getStack().getCount(), DEFAULT_EXTRACT_FLAGS, Action.PERFORM);
if (result == null || result.getCount() != need.getStack().getCount()) {
throw new IllegalStateException("The internal crafting inventory reported that " + need.getStack() + " was available but we got " + result);
}
toInsert.add(need);
@@ -750,9 +751,9 @@ public class CraftingTask implements ICraftingTask {
LOGGER.warn(p.getPattern().getContainer().getConnectedInventory() + " unexpectedly didn't accept items, the remainder has been voided!");
}
for (FluidStack need : p.getFluidsToPut().getStacks()) {
FluidStack result = this.internalFluidStorage.extract(need, need.getAmount(), IComparer.COMPARE_NBT, Action.PERFORM);
if (result == null || result.getAmount() != need.getAmount()) {
for (StackListEntry<FluidStack> need : p.getFluidsToPut().getStacks()) {
FluidStack result = this.internalFluidStorage.extract(need.getStack(), need.getStack().getAmount(), IComparer.COMPARE_NBT, Action.PERFORM);
if (result == null || result.getAmount() != need.getStack().getAmount()) {
throw new IllegalStateException("The internal crafting inventory reported that " + need + " was available but we got " + result);
}
@@ -777,12 +778,14 @@ public class CraftingTask implements ICraftingTask {
}
}
private static boolean insertIntoInventory(@Nullable IItemHandler dest, Deque<ItemStack> stacks, Action action) {
private static boolean insertIntoInventory(@Nullable IItemHandler dest, Deque<StackListEntry<ItemStack>> stacks, Action action) {
if (dest == null) {
return false;
}
ItemStack current = stacks.poll();
StackListEntry<ItemStack> currentEntry = stacks.poll();
ItemStack current = currentEntry != null ? currentEntry.getStack() : null;
List<Integer> availableSlots = IntStream.range(0, dest.getSlots()).boxed().collect(Collectors.toList());
@@ -803,7 +806,9 @@ public class CraftingTask implements ICraftingTask {
}
if (remainder.isEmpty()) { // If we inserted successfully, get a next stack.
current = stacks.poll();
currentEntry = stacks.poll();
current = currentEntry != null ? currentEntry.getStack() : null;
} else if (current.getCount() == remainder.getCount()) { // If we didn't insert anything over ALL these slots, stop here.
break;
} else { // If we didn't insert all, continue with other slots and use our remainder.
@@ -1047,8 +1052,8 @@ public class CraftingTask implements ICraftingTask {
elements.add(new CraftingMonitorElementItemRender(stack, stack.getCount(), 0, 0, 0, 0));
}
for (ItemStack missing : this.missing.getStacks()) {
elements.add(new CraftingMonitorElementItemRender(missing, 0, missing.getCount(), 0, 0, 0));
for (StackListEntry<ItemStack> missing : this.missing.getStacks()) {
elements.add(new CraftingMonitorElementItemRender(missing.getStack(), 0, missing.getStack().getCount(), 0, 0, 0));
}
for (Crafting crafting : this.crafting) {
@@ -1063,12 +1068,12 @@ public class CraftingTask implements ICraftingTask {
}
if (processing.getState() == ProcessingState.EXTRACTED_ALL) {
for (ItemStack put : processing.getItemsToPut().getStacks()) {
elements.add(new CraftingMonitorElementItemRender(put, 0, 0, put.getCount(), 0, 0));
for (StackListEntry<ItemStack> put : processing.getItemsToPut().getStacks()) {
elements.add(new CraftingMonitorElementItemRender(put.getStack(), 0, 0, put.getStack().getCount(), 0, 0));
}
} else if (processing.getState() == ProcessingState.READY || processing.getState() == ProcessingState.MACHINE_DOES_NOT_ACCEPT || processing.getState() == ProcessingState.MACHINE_NONE || processing.getState() == ProcessingState.LOCKED) {
for (ItemStack receive : processing.getItemsToReceive().getStacks()) {
ICraftingMonitorElement element = new CraftingMonitorElementItemRender(receive, 0, 0, 0, receive.getCount(), 0);
for (StackListEntry<ItemStack> receive : processing.getItemsToReceive().getStacks()) {
ICraftingMonitorElement element = new CraftingMonitorElementItemRender(receive.getStack(), 0, 0, 0, receive.getStack().getCount(), 0);
if (processing.getState() == ProcessingState.MACHINE_DOES_NOT_ACCEPT) {
element = new CraftingMonitorElementError(element, "gui.refinedstorage:crafting_monitor.machine_does_not_accept_item");
@@ -1089,8 +1094,8 @@ public class CraftingTask implements ICraftingTask {
elements.add(new CraftingMonitorElementFluidRender(stack, stack.getAmount(), 0, 0, 0, 0));
}
for (FluidStack missing : this.missingFluids.getStacks()) {
elements.add(new CraftingMonitorElementFluidRender(missing, 0, missing.getAmount(), 0, 0, 0));
for (StackListEntry<FluidStack> missing : this.missingFluids.getStacks()) {
elements.add(new CraftingMonitorElementFluidRender(missing.getStack(), 0, missing.getStack().getAmount(), 0, 0, 0));
}
for (Processing processing : this.processing) {
@@ -1099,12 +1104,12 @@ public class CraftingTask implements ICraftingTask {
}
if (processing.getState() == ProcessingState.EXTRACTED_ALL) {
for (FluidStack put : processing.getFluidsToPut().getStacks()) {
elements.add(new CraftingMonitorElementFluidRender(put, 0, 0, put.getAmount(), 0, 0));
for (StackListEntry<FluidStack> put : processing.getFluidsToPut().getStacks()) {
elements.add(new CraftingMonitorElementFluidRender(put.getStack(), 0, 0, put.getStack().getAmount(), 0, 0));
}
} else if (processing.getState() == ProcessingState.READY || processing.getState() == ProcessingState.MACHINE_DOES_NOT_ACCEPT || processing.getState() == ProcessingState.MACHINE_NONE) {
for (FluidStack receive : processing.getFluidsToReceive().getStacks()) {
ICraftingMonitorElement element = new CraftingMonitorElementFluidRender(receive, 0, 0, 0, receive.getAmount(), 0);
for (StackListEntry<FluidStack> receive : processing.getFluidsToReceive().getStacks()) {
ICraftingMonitorElement element = new CraftingMonitorElementFluidRender(receive.getStack(), 0, 0, 0, receive.getStack().getAmount(), 0);
if (processing.getState() == ProcessingState.MACHINE_DOES_NOT_ACCEPT) {
element = new CraftingMonitorElementError(element, "gui.refinedstorage:crafting_monitor.machine_does_not_accept_fluid");
@@ -1127,88 +1132,88 @@ public class CraftingTask implements ICraftingTask {
Map<Integer, CraftingPreviewElementItemStack> map = new LinkedHashMap<>();
Map<Integer, CraftingPreviewElementFluidStack> mapFluids = new LinkedHashMap<>();
for (ItemStack stack : toCraft.getStacks()) {
int hash = API.instance().getItemStackHashCode(stack);
for (StackListEntry<ItemStack> stack : toCraft.getStacks()) {
int hash = API.instance().getItemStackHashCode(stack.getStack());
CraftingPreviewElementItemStack previewStack = map.get(hash);
if (previewStack == null) {
previewStack = new CraftingPreviewElementItemStack(stack);
previewStack = new CraftingPreviewElementItemStack(stack.getStack());
}
previewStack.addToCraft(stack.getCount());
previewStack.addToCraft(stack.getStack().getCount());
map.put(hash, previewStack);
}
for (FluidStack stack : toCraftFluids.getStacks()) {
int hash = API.instance().getFluidStackHashCode(stack);
for (StackListEntry<FluidStack> stack : toCraftFluids.getStacks()) {
int hash = API.instance().getFluidStackHashCode(stack.getStack());
CraftingPreviewElementFluidStack previewStack = mapFluids.get(hash);
if (previewStack == null) {
previewStack = new CraftingPreviewElementFluidStack(stack);
previewStack = new CraftingPreviewElementFluidStack(stack.getStack());
}
previewStack.addToCraft(stack.getAmount());
previewStack.addToCraft(stack.getStack().getAmount());
mapFluids.put(hash, previewStack);
}
for (ItemStack stack : missing.getStacks()) {
int hash = API.instance().getItemStackHashCode(stack);
for (StackListEntry<ItemStack> stack : missing.getStacks()) {
int hash = API.instance().getItemStackHashCode(stack.getStack());
CraftingPreviewElementItemStack previewStack = map.get(hash);
if (previewStack == null) {
previewStack = new CraftingPreviewElementItemStack(stack);
previewStack = new CraftingPreviewElementItemStack(stack.getStack());
}
previewStack.setMissing(true);
previewStack.addToCraft(stack.getCount());
previewStack.addToCraft(stack.getStack().getCount());
map.put(hash, previewStack);
}
for (FluidStack stack : missingFluids.getStacks()) {
int hash = API.instance().getFluidStackHashCode(stack);
for (StackListEntry<FluidStack> stack : missingFluids.getStacks()) {
int hash = API.instance().getFluidStackHashCode(stack.getStack());
CraftingPreviewElementFluidStack previewStack = mapFluids.get(hash);
if (previewStack == null) {
previewStack = new CraftingPreviewElementFluidStack(stack);
previewStack = new CraftingPreviewElementFluidStack(stack.getStack());
}
previewStack.setMissing(true);
previewStack.addToCraft(stack.getAmount());
previewStack.addToCraft(stack.getStack().getAmount());
mapFluids.put(hash, previewStack);
}
for (ItemStack stack : toTake.getStacks()) {
int hash = API.instance().getItemStackHashCode(stack);
for (StackListEntry<ItemStack> stack : toTake.getStacks()) {
int hash = API.instance().getItemStackHashCode(stack.getStack());
CraftingPreviewElementItemStack previewStack = map.get(hash);
if (previewStack == null) {
previewStack = new CraftingPreviewElementItemStack(stack);
previewStack = new CraftingPreviewElementItemStack(stack.getStack());
}
previewStack.addAvailable(stack.getCount());
previewStack.addAvailable(stack.getStack().getCount());
map.put(hash, previewStack);
}
for (FluidStack stack : toTakeFluids.getStacks()) {
int hash = API.instance().getFluidStackHashCode(stack);
for (StackListEntry<FluidStack> stack : toTakeFluids.getStacks()) {
int hash = API.instance().getFluidStackHashCode(stack.getStack());
CraftingPreviewElementFluidStack previewStack = mapFluids.get(hash);
if (previewStack == null) {
previewStack = new CraftingPreviewElementFluidStack(stack);
previewStack = new CraftingPreviewElementFluidStack(stack.getStack());
}
previewStack.addAvailable(stack.getAmount());
previewStack.addAvailable(stack.getStack().getAmount());
mapFluids.put(hash, previewStack);
}

13
src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/grid/handler/FluidGridHandler.java
View File

@@ -21,6 +21,7 @@ import net.minecraftforge.fluids.capability.IFluidHandler;
import org.apache.commons.lang3.tuple.Pair;
import javax.annotation.Nullable;
import java.util.UUID;
public class FluidGridHandler implements IFluidGridHandler {
private INetwork network;
@@ -30,8 +31,8 @@ public class FluidGridHandler implements IFluidGridHandler {
}
@Override
public void onExtract(ServerPlayerEntity player, int hash, boolean shift) {
FluidStack stack = network.getFluidStorageCache().getList().get(hash);
public void onExtract(ServerPlayerEntity player, UUID id, boolean shift) {
FluidStack stack = network.getFluidStorageCache().getList().get(id);
if (stack == null || stack.getAmount() < FluidAttributes.BUCKET_VOLUME || !network.getSecurityManager().hasPermission(Permission.EXTRACT, player)) {
return;
@@ -111,7 +112,7 @@ public class FluidGridHandler implements IFluidGridHandler {
}
@Override
public void onCraftingPreviewRequested(ServerPlayerEntity player, int hash, int quantity, boolean noPreview) {
public void onCraftingPreviewRequested(ServerPlayerEntity player, UUID id, int quantity, boolean noPreview) {
if (!network.getSecurityManager().hasPermission(Permission.AUTOCRAFTING, player)) {
return;
}
@@ -124,7 +125,7 @@ public class FluidGridHandler implements IFluidGridHandler {
}
}
FluidStack stack = cache.get(hash);
FluidStack stack = cache.get(id);
if (stack != null) {
Thread calculationThread = new Thread(() -> {
@@ -151,7 +152,7 @@ public class FluidGridHandler implements IFluidGridHandler {
}
@Override
public void onCraftingRequested(ServerPlayerEntity player, int hash, int quantity) {
public void onCraftingRequested(ServerPlayerEntity player, UUID id, int quantity) {
if (quantity <= 0 || !network.getSecurityManager().hasPermission(Permission.AUTOCRAFTING, player)) {
return;
}
@@ -160,7 +161,7 @@ public class FluidGridHandler implements IFluidGridHandler {
for (ICraftingPattern pattern : network.getCraftingManager().getPatterns()) {
for (FluidStack output : pattern.getFluidOutputs()) {
if (API.instance().getFluidStackHashCode(output) == hash) {
if (/* TODO API.instance().getFluidStackHashCode(output) == hash*/false) {
stack = output;
break;

9
src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/grid/handler/FluidGridHandlerPortable.java
View File

@@ -17,6 +17,7 @@ import net.minecraftforge.fluids.capability.IFluidHandler;
import org.apache.commons.lang3.tuple.Pair;
import javax.annotation.Nullable;
import java.util.UUID;
public class FluidGridHandlerPortable implements IFluidGridHandler {
private IPortableGrid portableGrid;
@@ -26,8 +27,8 @@ public class FluidGridHandlerPortable implements IFluidGridHandler {
}
@Override
public void onExtract(ServerPlayerEntity player, int hash, boolean shift) {
FluidStack stack = portableGrid.getFluidCache().getList().get(hash);
public void onExtract(ServerPlayerEntity player, UUID id, boolean shift) {
FluidStack stack = portableGrid.getFluidCache().getList().get(id);
if (stack == null || stack.getAmount() < FluidAttributes.BUCKET_VOLUME) {
return;
@@ -99,12 +100,12 @@ public class FluidGridHandlerPortable implements IFluidGridHandler {
}
@Override
public void onCraftingPreviewRequested(ServerPlayerEntity player, int hash, int quantity, boolean noPreview) {
public void onCraftingPreviewRequested(ServerPlayerEntity player, UUID id, int quantity, boolean noPreview) {
// NO OP
}
@Override
public void onCraftingRequested(ServerPlayerEntity player, int hash, int quantity) {
public void onCraftingRequested(ServerPlayerEntity player, UUID id, int quantity) {
// NO OP
}
}

12
src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/grid/handler/ItemGridHandler.java
View File

@@ -29,8 +29,8 @@ public class ItemGridHandler implements IItemGridHandler {
}
@Override
public void onExtract(ServerPlayerEntity player, int hash, int flags) {
ItemStack item = network.getItemStorageCache().getList().get(hash);
public void onExtract(ServerPlayerEntity player, UUID id, int flags) {
ItemStack item = network.getItemStorageCache().getList().get(id);
if (item == null || !network.getSecurityManager().hasPermission(Permission.EXTRACT, player)) {
return;
@@ -157,7 +157,7 @@ public class ItemGridHandler implements IItemGridHandler {
}
@Override
public void onCraftingPreviewRequested(ServerPlayerEntity player, int hash, int quantity, boolean noPreview) {
public void onCraftingPreviewRequested(ServerPlayerEntity player, UUID id, int quantity, boolean noPreview) {
if (!network.getSecurityManager().hasPermission(Permission.AUTOCRAFTING, player)) {
return;
}
@@ -170,7 +170,7 @@ public class ItemGridHandler implements IItemGridHandler {
}
}
ItemStack stack = cache.get(hash);
ItemStack stack = cache.get(id);
if (stack != null) {
Thread calculationThread = new Thread(() -> {
@@ -197,7 +197,7 @@ public class ItemGridHandler implements IItemGridHandler {
}
@Override
public void onCraftingRequested(ServerPlayerEntity player, int hash, int quantity) {
public void onCraftingRequested(ServerPlayerEntity player, UUID id, int quantity) {
if (quantity <= 0 || !network.getSecurityManager().hasPermission(Permission.AUTOCRAFTING, player)) {
return;
}
@@ -206,7 +206,7 @@ public class ItemGridHandler implements IItemGridHandler {
for (ICraftingPattern pattern : network.getCraftingManager().getPatterns()) {
for (ItemStack output : pattern.getOutputs()) {
if (API.instance().getItemStackHashCode(output) == hash) {
if (/* TODO API.instance().getItemStackHashCode(output) == hash*/false) {
stack = output;
break;

8
src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/grid/handler/ItemGridHandlerPortable.java
View File

@@ -28,12 +28,12 @@ public class ItemGridHandlerPortable implements IItemGridHandler {
}
@Override
public void onExtract(ServerPlayerEntity player, int hash, int flags) {
public void onExtract(ServerPlayerEntity player, UUID id, int flags) {
if (portableGrid.getStorage() == null || !grid.isActive()) {
return;
}
ItemStack item = portableGrid.getItemCache().getList().get(hash);
ItemStack item = portableGrid.getItemCache().getList().get(id);
if (item == null) {
return;
@@ -157,12 +157,12 @@ public class ItemGridHandlerPortable implements IItemGridHandler {
}
@Override
public void onCraftingPreviewRequested(ServerPlayerEntity player, int hash, int quantity, boolean noPreview) {
public void onCraftingPreviewRequested(ServerPlayerEntity player, UUID id, int quantity, boolean noPreview) {
// NO OP
}
@Override
public void onCraftingRequested(ServerPlayerEntity player, int hash, int quantity) {
public void onCraftingRequested(ServerPlayerEntity player, UUID id, int quantity) {
// NO OP
}

4
src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNodeDetector.java
View File

@@ -77,7 +77,7 @@ public class NetworkNodeDetector extends NetworkNode implements IComparable, ITy
powered = isPowered(stack == null ? null : stack.getCount());
} else {
powered = isPowered(network.getItemStorageCache().getList().getStacks().stream().map(ItemStack::getCount).mapToInt(Number::intValue).sum());
powered = isPowered(network.getItemStorageCache().getList().getStacks().stream().map(e -> e.getStack().getCount()).mapToInt(Number::intValue).sum());
}
} else if (type == IType.FLUIDS) {
FluidStack slot = fluidFilters.getFluid(0);
@@ -87,7 +87,7 @@ public class NetworkNodeDetector extends NetworkNode implements IComparable, ITy
powered = isPowered(stack == null ? null : stack.getAmount());
} else {
powered = isPowered(network.getFluidStorageCache().getList().getStacks().stream().map(FluidStack::getAmount).mapToInt(Number::intValue).sum());
powered = isPowered(network.getFluidStorageCache().getList().getStacks().stream().map(e -> e.getStack().getAmount()).mapToInt(Number::intValue).sum());
}
}
}

6
src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/diskmanipulator/NetworkNodeDiskManipulator.java
View File

@@ -6,6 +6,7 @@ import com.raoulvdberge.refinedstorage.api.storage.disk.IStorageDisk;
import com.raoulvdberge.refinedstorage.api.storage.disk.IStorageDiskContainerContext;
import com.raoulvdberge.refinedstorage.api.util.Action;
import com.raoulvdberge.refinedstorage.api.util.IComparer;
import com.raoulvdberge.refinedstorage.api.util.StackListEntry;
import com.raoulvdberge.refinedstorage.apiimpl.network.node.NetworkNode;
import com.raoulvdberge.refinedstorage.apiimpl.network.node.diskdrive.DiskDriveNetworkNode;
import com.raoulvdberge.refinedstorage.inventory.fluid.FluidInventory;
@@ -34,6 +35,7 @@ import net.minecraftforge.items.wrapper.CombinedInvWrapper;
import java.util.ArrayList;
import java.util.List;
import java.util.stream.Collectors;
public class NetworkNodeDiskManipulator extends NetworkNode implements IComparable, IWhitelistBlacklist, IType, IStorageDiskContainerContext {
public static final String ID = "disk_manipulator";
@@ -232,7 +234,7 @@ public class NetworkNodeDiskManipulator extends NetworkNode implements IComparab
if (itemFilters.isEmpty()) {
ItemStack toExtract = null;
ArrayList<ItemStack> networkItems = new ArrayList<>(network.getItemStorageCache().getList().getStacks());
List<ItemStack> networkItems = network.getItemStorageCache().getList().getStacks().stream().map(StackListEntry::getStack).collect(Collectors.toList());
int j = 0;
@@ -331,7 +333,7 @@ public class NetworkNodeDiskManipulator extends NetworkNode implements IComparab
if (fluidFilters.isEmpty()) {
FluidStack toExtract = null;
ArrayList<FluidStack> networkFluids = new ArrayList<>(network.getFluidStorageCache().getList().getStacks());
List<FluidStack> networkFluids = network.getFluidStorageCache().getList().getStacks().stream().map(StackListEntry::getStack).collect(Collectors.toList());
int j = 0;

20
src/main/java/com/raoulvdberge/refinedstorage/apiimpl/storage/StorageCacheFluid.java
View File

@@ -3,9 +3,9 @@ package com.raoulvdberge.refinedstorage.apiimpl.storage;
import com.raoulvdberge.refinedstorage.api.network.INetwork;
import com.raoulvdberge.refinedstorage.api.storage.*;
import com.raoulvdberge.refinedstorage.api.util.IStackList;
import com.raoulvdberge.refinedstorage.api.util.StackListResult;
import com.raoulvdberge.refinedstorage.apiimpl.API;
import net.minecraftforge.fluids.FluidStack;
import org.apache.commons.lang3.tuple.Pair;
import javax.annotation.Nonnull;
import java.util.ArrayList;
@@ -21,7 +21,7 @@ public class StorageCacheFluid implements IStorageCache<FluidStack> {
private CopyOnWriteArrayList<IStorage<FluidStack>> storages = new CopyOnWriteArrayList<>();
private IStackList<FluidStack> list = API.instance().createFluidStackList();
private List<IStorageCacheListener<FluidStack>> listeners = new LinkedList<>();
private List<Pair<FluidStack, Integer>> batchedChanges = new ArrayList<>();
private List<StackListResult<FluidStack>> batchedChanges = new ArrayList<>();
public StorageCacheFluid(INetwork network) {
this.network = network;
@@ -54,24 +54,26 @@ public class StorageCacheFluid implements IStorageCache<FluidStack> {
@Override
public void add(@Nonnull FluidStack stack, int size, boolean rebuilding, boolean batched) {
list.add(stack, size);
StackListResult<FluidStack> result = list.add(stack, size);
if (!rebuilding) {
if (!batched) {
listeners.forEach(l -> l.onChanged(stack, size));
listeners.forEach(l -> l.onChanged(result));
} else {
batchedChanges.add(Pair.of(stack.copy(), size));
batchedChanges.add(result);
}
}
}
@Override
public void remove(@Nonnull FluidStack stack, int size, boolean batched) {
if (list.remove(stack, size)) {
StackListResult<FluidStack> result = list.remove(stack, size);
if (result != null) {
if (!batched) {
listeners.forEach(l -> l.onChanged(stack, -size));
listeners.forEach(l -> l.onChanged(result));
} else {
batchedChanges.add(Pair.of(stack.copy(), -size));
batchedChanges.add(result);
}
}
}
@@ -79,7 +81,7 @@ public class StorageCacheFluid implements IStorageCache<FluidStack> {
@Override
public void flush() {
if (!batchedChanges.isEmpty()) {
batchedChanges.forEach(c -> listeners.forEach(l -> l.onChanged(c.getKey(), c.getValue())));
batchedChanges.forEach(change -> listeners.forEach(l -> l.onChanged(change)));
batchedChanges.clear();
}
}

11
src/main/java/com/raoulvdberge/refinedstorage/apiimpl/storage/StorageCacheFluidPortable.java
View File

@@ -4,6 +4,7 @@ import com.raoulvdberge.refinedstorage.api.storage.IStorage;
import com.raoulvdberge.refinedstorage.api.storage.IStorageCache;
import com.raoulvdberge.refinedstorage.api.storage.IStorageCacheListener;
import com.raoulvdberge.refinedstorage.api.util.IStackList;
import com.raoulvdberge.refinedstorage.api.util.StackListResult;
import com.raoulvdberge.refinedstorage.apiimpl.API;
import com.raoulvdberge.refinedstorage.tile.grid.portable.IPortableGrid;
import net.minecraftforge.fluids.FluidStack;
@@ -35,17 +36,19 @@ public class StorageCacheFluidPortable implements IStorageCache<FluidStack> {
@Override
public void add(@Nonnull FluidStack stack, int size, boolean rebuilding, boolean batched) {
list.add(stack, size);
StackListResult<FluidStack> result = list.add(stack, size);
if (!rebuilding) {
listeners.forEach(l -> l.onChanged(stack, size));
listeners.forEach(l -> l.onChanged(result));
}
}
@Override
public void remove(@Nonnull FluidStack stack, int size, boolean batched) {
if (list.remove(stack, size)) {
listeners.forEach(l -> l.onChanged(stack, -size));
StackListResult<FluidStack> result = list.remove(stack, size);
if (result != null) {
listeners.forEach(l -> l.onChanged(result));
}
}

20
src/main/java/com/raoulvdberge/refinedstorage/apiimpl/storage/StorageCacheItem.java
View File

@@ -3,9 +3,9 @@ package com.raoulvdberge.refinedstorage.apiimpl.storage;
import com.raoulvdberge.refinedstorage.api.network.INetwork;
import com.raoulvdberge.refinedstorage.api.storage.*;
import com.raoulvdberge.refinedstorage.api.util.IStackList;
import com.raoulvdberge.refinedstorage.api.util.StackListResult;
import com.raoulvdberge.refinedstorage.apiimpl.API;
import net.minecraft.item.ItemStack;
import org.apache.commons.lang3.tuple.Pair;
import javax.annotation.Nonnull;
import java.util.ArrayList;
@@ -21,7 +21,7 @@ public class StorageCacheItem implements IStorageCache<ItemStack> {
private CopyOnWriteArrayList<IStorage<ItemStack>> storages = new CopyOnWriteArrayList<>();
private IStackList<ItemStack> list = API.instance().createItemStackList();
private List<IStorageCacheListener<ItemStack>> listeners = new LinkedList<>();
private List<Pair<ItemStack, Integer>> batchedChanges = new ArrayList<>();
private List<StackListResult<ItemStack>> batchedChanges = new ArrayList<>();
public StorageCacheItem(INetwork network) {
this.network = network;
@@ -56,24 +56,26 @@ public class StorageCacheItem implements IStorageCache<ItemStack> {
@Override
public void add(@Nonnull ItemStack stack, int size, boolean rebuilding, boolean batched) {
list.add(stack, size);
StackListResult<ItemStack> result = list.add(stack, size);
if (!rebuilding) {
if (!batched) {
listeners.forEach(l -> l.onChanged(stack, size));
listeners.forEach(l -> l.onChanged(result));
} else {
batchedChanges.add(Pair.of(stack.copy(), size));
batchedChanges.add(result);
}
}
}
@Override
public void remove(@Nonnull ItemStack stack, int size, boolean batched) {
if (list.remove(stack, size)) {
StackListResult<ItemStack> result = list.remove(stack, size);
if (result != null) {
if (!batched) {
listeners.forEach(l -> l.onChanged(stack, -size));
listeners.forEach(l -> l.onChanged(result));
} else {
batchedChanges.add(Pair.of(stack.copy(), -size));
batchedChanges.add(result);
}
}
}
@@ -84,7 +86,7 @@ public class StorageCacheItem implements IStorageCache<ItemStack> {
if (batchedChanges.size() > 1) {
listeners.forEach(l -> l.onChangedBulk(batchedChanges));
} else {
batchedChanges.forEach(c -> listeners.forEach(l -> l.onChanged(c.getKey(), c.getValue())));
batchedChanges.forEach(change -> listeners.forEach(l -> l.onChanged(change)));
}
batchedChanges.clear();

11
src/main/java/com/raoulvdberge/refinedstorage/apiimpl/storage/StorageCacheItemPortable.java
View File

@@ -4,6 +4,7 @@ import com.raoulvdberge.refinedstorage.api.storage.IStorage;
import com.raoulvdberge.refinedstorage.api.storage.IStorageCache;
import com.raoulvdberge.refinedstorage.api.storage.IStorageCacheListener;
import com.raoulvdberge.refinedstorage.api.util.IStackList;
import com.raoulvdberge.refinedstorage.api.util.StackListResult;
import com.raoulvdberge.refinedstorage.apiimpl.API;
import com.raoulvdberge.refinedstorage.tile.grid.portable.IPortableGrid;
import net.minecraft.item.ItemStack;
@@ -35,17 +36,19 @@ public class StorageCacheItemPortable implements IStorageCache<ItemStack> {
@Override
public void add(@Nonnull ItemStack stack, int size, boolean rebuilding, boolean batched) {
list.add(stack, size);
StackListResult<ItemStack> result = list.add(stack, size);
if (!rebuilding) {
listeners.forEach(l -> l.onChanged(stack, size));
listeners.forEach(l -> l.onChanged(result));
}
}
@Override
public void remove(@Nonnull ItemStack stack, int size, boolean batched) {
if (list.remove(stack, size)) {
listeners.forEach(l -> l.onChanged(stack, -size));
StackListResult<ItemStack> result = list.remove(stack, size);
if (result != null) {
listeners.forEach(l -> l.onChanged(result));
}
}

12
src/main/java/com/raoulvdberge/refinedstorage/apiimpl/storage/StorageCacheListenerGridFluid.java
View File

@@ -2,11 +2,10 @@ package com.raoulvdberge.refinedstorage.apiimpl.storage;
import com.raoulvdberge.refinedstorage.api.network.INetwork;
import com.raoulvdberge.refinedstorage.api.storage.IStorageCacheListener;
import com.raoulvdberge.refinedstorage.api.util.StackListResult;
import net.minecraft.entity.player.ServerPlayerEntity;
import net.minecraftforge.fluids.FluidStack;
import org.apache.commons.lang3.tuple.Pair;
import javax.annotation.Nonnull;
import java.util.List;
public class StorageCacheListenerGridFluid implements IStorageCacheListener<FluidStack> {
@@ -29,14 +28,17 @@ public class StorageCacheListenerGridFluid implements IStorageCacheListener<Flui
}
@Override
public void onChanged(@Nonnull FluidStack stack, int size) {
// TODO RS.INSTANCE.network.sendTo(new MessageGridFluidDelta(network, network.getFluidStorageTracker(), stack, size), player);
public void onChanged(StackListResult<FluidStack> delta) {
// TODO: RS.INSTANCE.network.sendTo(new MessageGridFluidUpdate(network, network.getSecurityManager().hasPermission(Permission.AUTOCRAFTING, player)), player);
}
@Override
public void onChangedBulk(@Nonnull List<Pair<FluidStack, Integer>> stacks) {
public void onChangedBulk(List<StackListResult<FluidStack>> storageCacheDeltas) {
/* TODO
for (Pair<FluidStack, Integer> stack : stacks) {
onChanged(stack.getLeft(), stack.getRight());
}
*/
}
}

13
src/main/java/com/raoulvdberge/refinedstorage/apiimpl/storage/StorageCacheListenerGridItem.java
View File

@@ -4,13 +4,12 @@ import com.raoulvdberge.refinedstorage.RS;
import com.raoulvdberge.refinedstorage.api.network.INetwork;
import com.raoulvdberge.refinedstorage.api.network.security.Permission;
import com.raoulvdberge.refinedstorage.api.storage.IStorageCacheListener;
import com.raoulvdberge.refinedstorage.api.util.StackListResult;
import com.raoulvdberge.refinedstorage.network.grid.GridItemDeltaMessage;
import com.raoulvdberge.refinedstorage.network.grid.GridItemUpdateMessage;
import net.minecraft.entity.player.ServerPlayerEntity;
import net.minecraft.item.ItemStack;
import org.apache.commons.lang3.tuple.Pair;
import javax.annotation.Nonnull;
import java.util.ArrayList;
import java.util.List;
@@ -34,16 +33,16 @@ public class StorageCacheListenerGridItem implements IStorageCacheListener<ItemS
}
@Override
public void onChanged(@Nonnull ItemStack stack, int size) {
List<Pair<ItemStack, Integer>> deltas = new ArrayList<>();
public void onChanged(StackListResult<ItemStack> delta) {
List<StackListResult<ItemStack>> deltas = new ArrayList<>();
deltas.add(Pair.of(stack, size));
deltas.add(delta);
onChangedBulk(deltas);
}
@Override
public void onChangedBulk(@Nonnull List<Pair<ItemStack, Integer>> stacks) {
RS.NETWORK_HANDLER.sendTo(player, new GridItemDeltaMessage(network, stacks));
public void onChangedBulk(List<StackListResult<ItemStack>> deltas) {
RS.NETWORK_HANDLER.sendTo(player, new GridItemDeltaMessage(network, deltas));
}
}

7
src/main/java/com/raoulvdberge/refinedstorage/apiimpl/storage/StorageCacheListenerGridPortable.java
View File

@@ -1,12 +1,11 @@
package com.raoulvdberge.refinedstorage.apiimpl.storage;
import com.raoulvdberge.refinedstorage.api.storage.IStorageCacheListener;
import com.raoulvdberge.refinedstorage.api.util.StackListResult;
import com.raoulvdberge.refinedstorage.tile.grid.portable.IPortableGrid;
import net.minecraft.entity.player.ServerPlayerEntity;
import net.minecraft.item.ItemStack;
import org.apache.commons.lang3.tuple.Pair;
import javax.annotation.Nonnull;
import java.util.List;
public class StorageCacheListenerGridPortable implements IStorageCacheListener<ItemStack> {
@@ -42,12 +41,12 @@ public class StorageCacheListenerGridPortable implements IStorageCacheListener<I
}
@Override
public void onChanged(@Nonnull ItemStack stack, int size) {
public void onChanged(StackListResult<ItemStack> delta) {
// TODO RS.INSTANCE.network.sendTo(new MessageGridItemDelta(null, portableGrid.getItemStorageTracker(), stack, size), player);
}
@Override
public void onChangedBulk(@Nonnull List<Pair<ItemStack, Integer>> stacks) {
public void onChangedBulk(List<StackListResult<ItemStack>> storageCacheDeltas) {
// TODO RS.INSTANCE.network.sendTo(new MessageGridItemDelta(null, portableGrid.getItemStorageTracker(), stacks), player);
}
}

11
src/main/java/com/raoulvdberge/refinedstorage/apiimpl/storage/StorageCacheListenerGridPortableFluid.java
View File

@@ -1,12 +1,11 @@
package com.raoulvdberge.refinedstorage.apiimpl.storage;
import com.raoulvdberge.refinedstorage.api.storage.IStorageCacheListener;
import com.raoulvdberge.refinedstorage.api.util.StackListResult;
import com.raoulvdberge.refinedstorage.tile.grid.portable.IPortableGrid;
import net.minecraft.entity.player.ServerPlayerEntity;
import net.minecraftforge.fluids.FluidStack;
import org.apache.commons.lang3.tuple.Pair;
import javax.annotation.Nonnull;
import java.util.List;
public class StorageCacheListenerGridPortableFluid implements IStorageCacheListener<FluidStack> {
@@ -47,14 +46,18 @@ public class StorageCacheListenerGridPortableFluid implements IStorageCacheListe
}
@Override
public void onChanged(@Nonnull FluidStack stack, int size) {
public void onChanged(StackListResult<FluidStack> delta) {
// TODO RS.INSTANCE.network.sendTo(new MessageGridFluidDelta(null, portableGrid.getFluidStorageTracker(), stack, size), player);
}
@Override
public void onChangedBulk(@Nonnull List<Pair<FluidStack, Integer>> stacks) {
public void onChangedBulk(List<StackListResult<FluidStack>> storageCacheDeltas) {
/* TODO
for (Pair<FluidStack, Integer> stack : stacks) {
onChanged(stack.getLeft(), stack.getRight());
}
*/
}
}

133
src/main/java/com/raoulvdberge/refinedstorage/apiimpl/util/FluidStackList.java Normal file
View File

@@ -0,0 +1,133 @@
package com.raoulvdberge.refinedstorage.apiimpl.util;
import com.google.common.collect.ArrayListMultimap;
import com.raoulvdberge.refinedstorage.api.util.IStackList;
import com.raoulvdberge.refinedstorage.api.util.StackListEntry;
import com.raoulvdberge.refinedstorage.api.util.StackListResult;
import com.raoulvdberge.refinedstorage.apiimpl.API;
import net.minecraft.fluid.Fluid;
import net.minecraftforge.fluids.FluidStack;
import javax.annotation.Nonnull;
import javax.annotation.Nullable;
import java.util.Collection;
import java.util.HashMap;
import java.util.Map;
import java.util.UUID;
public class FluidStackList implements IStackList<FluidStack> {
private final ArrayListMultimap<Fluid, StackListEntry<FluidStack>> stacks = ArrayListMultimap.create();
private final Map<UUID, FluidStack> index = new HashMap<>();
@Override
public StackListResult<FluidStack> add(@Nonnull FluidStack stack, int size) {
if (size < 0) {
throw new IllegalArgumentException("Cannot accept empty stack");
}
for (StackListEntry<FluidStack> entry : stacks.get(stack.getFluid())) {
FluidStack otherStack = entry.getStack();
if (stack.isFluidEqual(otherStack)) {
if ((long) otherStack.getAmount() + (long) size > Integer.MAX_VALUE) {
otherStack.setAmount(Integer.MAX_VALUE);
} else {
otherStack.grow(size);
}
return new StackListResult<>(otherStack, entry.getId(), size);
}
}
FluidStack newStack = stack.copy();
newStack.setAmount(size);
StackListEntry<FluidStack> newEntry = new StackListEntry<>(newStack);
stacks.put(newStack.getFluid(), newEntry);
index.put(newEntry.getId(), newEntry.getStack());
return new StackListResult<>(newStack, newEntry.getId(), size);
}
@Override
public StackListResult<FluidStack> add(@Nonnull FluidStack stack) {
return add(stack, stack.getAmount());
}
@Override
public StackListResult<FluidStack> remove(@Nonnull FluidStack stack, int size) {
for (StackListEntry<FluidStack> entry : stacks.get(stack.getFluid())) {
FluidStack otherStack = entry.getStack();
if (stack.isFluidEqual(otherStack)) {
if (otherStack.getAmount() - size <= 0) {
stacks.remove(otherStack.getFluid(), entry);
index.remove(entry.getId());
return new StackListResult<>(otherStack, entry.getId(), -otherStack.getAmount());
} else {
otherStack.shrink(size);
return new StackListResult<>(otherStack, entry.getId(), -size);
}
}
}
return null;
}
@Override
public StackListResult<FluidStack> remove(@Nonnull FluidStack stack) {
return remove(stack, stack.getAmount());
}
@Override
@Nullable
public FluidStack get(@Nonnull FluidStack stack, int flags) {
for (StackListEntry<FluidStack> entry : stacks.get(stack.getFluid())) {
FluidStack otherStack = entry.getStack();
if (API.instance().getComparer().isEqual(otherStack, stack, flags)) {
return otherStack;
}
}
return null;
}
@Override
@Nullable
public FluidStack get(UUID id) {
return index.get(id);
}
@Override
public void clear() {
stacks.clear();
}
@Override
public boolean isEmpty() {
return stacks.isEmpty();
}
@Nonnull
@Override
public Collection<StackListEntry<FluidStack>> getStacks() {
return stacks.values();
}
@Override
@Nonnull
public IStackList<FluidStack> copy() {
FluidStackList list = new FluidStackList();
for (StackListEntry<FluidStack> entry : stacks.values()) {
list.stacks.put(entry.getStack().getFluid(), new StackListEntry<>(entry.getId(), entry.getStack().copy()));
list.index.put(entry.getId(), entry.getStack());
}
return list;
}
}

131
src/main/java/com/raoulvdberge/refinedstorage/apiimpl/util/ItemStackList.java Normal file
View File

@@ -0,0 +1,131 @@
package com.raoulvdberge.refinedstorage.apiimpl.util;
import com.google.common.collect.ArrayListMultimap;
import com.raoulvdberge.refinedstorage.api.util.IStackList;
import com.raoulvdberge.refinedstorage.api.util.StackListEntry;
import com.raoulvdberge.refinedstorage.api.util.StackListResult;
import com.raoulvdberge.refinedstorage.apiimpl.API;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraftforge.items.ItemHandlerHelper;
import javax.annotation.Nonnull;
import javax.annotation.Nullable;
import java.util.Collection;
import java.util.HashMap;
import java.util.Map;
import java.util.UUID;
public class ItemStackList implements IStackList<ItemStack> {
private final ArrayListMultimap<Item, StackListEntry<ItemStack>> stacks = ArrayListMultimap.create();
private final Map<UUID, ItemStack> index = new HashMap<>();
@Override
public StackListResult<ItemStack> add(@Nonnull ItemStack stack, int size) {
if (stack.isEmpty() || size <= 0) {
throw new IllegalArgumentException("Cannot accept empty stack");
}
for (StackListEntry<ItemStack> entry : stacks.get(stack.getItem())) {
ItemStack otherStack = entry.getStack();
if (API.instance().getComparer().isEqualNoQuantity(otherStack, stack)) {
if ((long) otherStack.getCount() + (long) size > Integer.MAX_VALUE) {
otherStack.setCount(Integer.MAX_VALUE);
} else {
otherStack.grow(size);
}
return new StackListResult<>(otherStack, entry.getId(), size);
}
}
StackListEntry<ItemStack> newEntry = new StackListEntry<>(ItemHandlerHelper.copyStackWithSize(stack, size));
stacks.put(stack.getItem(), newEntry);
index.put(newEntry.getId(), newEntry.getStack());
return new StackListResult<>(newEntry.getStack(), newEntry.getId(), size);
}
@Override
public StackListResult<ItemStack> add(@Nonnull ItemStack stack) {
return add(stack, stack.getCount());
}
@Override
public StackListResult<ItemStack> remove(@Nonnull ItemStack stack, int size) {
for (StackListEntry<ItemStack> entry : stacks.get(stack.getItem())) {
ItemStack otherStack = entry.getStack();
if (API.instance().getComparer().isEqualNoQuantity(otherStack, stack)) {
if (otherStack.getCount() - size <= 0) {
stacks.remove(otherStack.getItem(), entry);
index.remove(entry.getId());
return new StackListResult<>(otherStack, entry.getId(), -otherStack.getCount());
} else {
otherStack.shrink(size);
return new StackListResult<>(otherStack, entry.getId(), -size);
}
}
}
return null;
}
@Override
public StackListResult<ItemStack> remove(@Nonnull ItemStack stack) {
return remove(stack, stack.getCount());
}
@Override
@Nullable
public ItemStack get(@Nonnull ItemStack stack, int flags) {
for (StackListEntry<ItemStack> entry : stacks.get(stack.getItem())) {
ItemStack otherStack = entry.getStack();
if (API.instance().getComparer().isEqual(otherStack, stack, flags)) {
return otherStack;
}
}
return null;
}
@Override
@Nullable
public ItemStack get(UUID id) {
return index.get(id);
}
@Override
public void clear() {
stacks.clear();
}
@Override
public boolean isEmpty() {
return stacks.isEmpty();
}
@Nonnull
@Override
public Collection<StackListEntry<ItemStack>> getStacks() {
return stacks.values();
}
@Override
@Nonnull
public IStackList<ItemStack> copy() {
ItemStackList list = new ItemStackList();
for (StackListEntry<ItemStack> entry : stacks.values()) {
list.stacks.put(entry.getStack().getItem(), new StackListEntry<>(entry.getId(), entry.getStack().copy()));
list.index.put(entry.getId(), entry.getStack());
}
return list;
}
}

119
src/main/java/com/raoulvdberge/refinedstorage/apiimpl/util/StackListFluid.java
View File

@@ -1,119 +0,0 @@
package com.raoulvdberge.refinedstorage.apiimpl.util;
import com.google.common.collect.ArrayListMultimap;
import com.raoulvdberge.refinedstorage.api.util.IStackList;
import com.raoulvdberge.refinedstorage.apiimpl.API;
import net.minecraft.fluid.Fluid;
import net.minecraftforge.fluids.FluidStack;
import javax.annotation.Nonnull;
import javax.annotation.Nullable;
import java.util.Collection;
public class StackListFluid implements IStackList<FluidStack> {
private ArrayListMultimap<Fluid, FluidStack> stacks = ArrayListMultimap.create();
@Override
public void add(@Nonnull FluidStack stack, int size) {
if (size < 0) {
throw new IllegalArgumentException("Cannot accept empty stack");
}
for (FluidStack otherStack : stacks.get(stack.getFluid())) {
if (stack.isFluidEqual(otherStack)) {
if ((long) otherStack.getAmount() + (long) size > Integer.MAX_VALUE) {
otherStack.setAmount(Integer.MAX_VALUE);
} else {
otherStack.grow(size);
}
return;
}
}
FluidStack newStack = stack.copy();
newStack.setAmount(size);
stacks.put(stack.getFluid(), newStack);
}
@Override
public void add(@Nonnull FluidStack stack) {
add(stack, stack.getAmount());
}
@Override
public boolean remove(@Nonnull FluidStack stack, int size) {
for (FluidStack otherStack : stacks.get(stack.getFluid())) {
if (stack.isFluidEqual(otherStack)) {
otherStack.shrink(size);
boolean success = otherStack.getAmount() >= 0;
if (otherStack.getAmount() <= 0) {
stacks.remove(otherStack.getFluid(), otherStack);
}
return success;
}
}
return false;
}
@Override
public boolean remove(@Nonnull FluidStack stack) {
return remove(stack, stack.getAmount());
}
@Override
@Nullable
public FluidStack get(@Nonnull FluidStack stack, int flags) {
for (FluidStack otherStack : stacks.get(stack.getFluid())) {
if (API.instance().getComparer().isEqual(otherStack, stack, flags)) {
return otherStack;
}
}
return null;
}
@Override
@Nullable
public FluidStack get(int hash) {
for (FluidStack stack : this.stacks.values()) {
if (API.instance().getFluidStackHashCode(stack) == hash) {
return stack;
}
}
return null;
}
@Override
public void clear() {
stacks.clear();
}
@Override
public boolean isEmpty() {
return stacks.isEmpty();
}
@Nonnull
@Override
public Collection<FluidStack> getStacks() {
return stacks.values();
}
@Override
@Nonnull
public IStackList<FluidStack> copy() {
StackListFluid list = new StackListFluid();
for (FluidStack stack : stacks.values()) {
list.stacks.put(stack.getFluid(), stack.copy());
}
return list;
}
}

118
src/main/java/com/raoulvdberge/refinedstorage/apiimpl/util/StackListItem.java
View File

@@ -1,118 +0,0 @@
package com.raoulvdberge.refinedstorage.apiimpl.util;
import com.google.common.collect.ArrayListMultimap;
import com.raoulvdberge.refinedstorage.api.util.IStackList;
import com.raoulvdberge.refinedstorage.apiimpl.API;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraftforge.items.ItemHandlerHelper;
import javax.annotation.Nonnull;
import javax.annotation.Nullable;
import java.util.Collection;
public class StackListItem implements IStackList<ItemStack> {
private ArrayListMultimap<Item, ItemStack> stacks = ArrayListMultimap.create();
@Override
public void add(@Nonnull ItemStack stack, int size) {
if (stack.isEmpty() || size <= 0) {
throw new IllegalArgumentException("Cannot accept empty stack");
}
for (ItemStack otherStack : stacks.get(stack.getItem())) {
if (API.instance().getComparer().isEqualNoQuantity(otherStack, stack)) {
if ((long) otherStack.getCount() + (long) size > Integer.MAX_VALUE) {
otherStack.setCount(Integer.MAX_VALUE);
} else {
otherStack.grow(size);
}
return;
}
}
stacks.put(stack.getItem(), ItemHandlerHelper.copyStackWithSize(stack, size));
}
@Override
public void add(@Nonnull ItemStack stack) {
add(stack, stack.getCount());
}
@Override
public boolean remove(@Nonnull ItemStack stack, int size) {
for (ItemStack otherStack : stacks.get(stack.getItem())) {
if (API.instance().getComparer().isEqualNoQuantity(otherStack, stack)) {
boolean success = otherStack.getCount() - size >= 0;
if (otherStack.getCount() - size <= 0) {
stacks.remove(otherStack.getItem(), otherStack);
} else {
otherStack.shrink(size);
}
return success;
}
}
return false;
}
@Override
public boolean remove(@Nonnull ItemStack stack) {
return remove(stack, stack.getCount());
}
@Override
@Nullable
public ItemStack get(@Nonnull ItemStack stack, int flags) {
for (ItemStack otherStack : stacks.get(stack.getItem())) {
if (API.instance().getComparer().isEqual(otherStack, stack, flags)) {
return otherStack;
}
}
return null;
}
@Override
@Nullable
public ItemStack get(int hash) {
for (ItemStack stack : this.stacks.values()) {
if (API.instance().getItemStackHashCode(stack) == hash) {
return stack;
}
}
return null;
}
@Override
public void clear() {
stacks.clear();
}
@Override
public boolean isEmpty() {
return stacks.isEmpty();
}
@Nonnull
@Override
public Collection<ItemStack> getStacks() {
return stacks.values();
}
@Override
@Nonnull
public IStackList<ItemStack> copy() {
StackListItem list = new StackListItem();
for (ItemStack stack : stacks.values()) {
list.stacks.put(stack.getItem(), stack.copy());
}
return list;
}
}

27
src/main/java/com/raoulvdberge/refinedstorage/network/grid/GridItemDeltaMessage.java
View File

@@ -1,6 +1,7 @@
package com.raoulvdberge.refinedstorage.network.grid;
import com.raoulvdberge.refinedstorage.api.network.INetwork;
import com.raoulvdberge.refinedstorage.api.util.StackListResult;
import com.raoulvdberge.refinedstorage.screen.BaseScreen;
import com.raoulvdberge.refinedstorage.screen.grid.GridScreen;
import com.raoulvdberge.refinedstorage.screen.grid.stack.IGridStack;
@@ -18,44 +19,46 @@ import java.util.function.Supplier;
public class GridItemDeltaMessage {
@Nullable
private INetwork network;
private List<Pair<ItemStack, Integer>> deltas;
private List<StackListResult<ItemStack>> deltas;
private List<Pair<IGridStack, Integer>> gridStacks;
private List<Pair<IGridStack, Integer>> clientDeltas;
public GridItemDeltaMessage(INetwork network, List<Pair<ItemStack, Integer>> deltas) {
public GridItemDeltaMessage(INetwork network, List<StackListResult<ItemStack>> deltas) {
this.network = network;
this.deltas = deltas;
}
public GridItemDeltaMessage(List<Pair<IGridStack, Integer>> gridStacks) {
this.gridStacks = gridStacks;
public GridItemDeltaMessage(List<Pair<IGridStack, Integer>> clientDeltas) {
this.clientDeltas = clientDeltas;
}
public static GridItemDeltaMessage decode(PacketBuffer buf) {
int size = buf.readInt();
List<Pair<IGridStack, Integer>> gridStacks = new LinkedList<>();
List<Pair<IGridStack, Integer>> clientDeltas = new LinkedList<>();
for (int i = 0; i < size; ++i) {
gridStacks.add(Pair.of(StackUtils.readItemGridStack(buf), buf.readInt()));
int delta = buf.readInt();
clientDeltas.add(Pair.of(StackUtils.readItemGridStack(buf), delta));
}
return new GridItemDeltaMessage(gridStacks);
return new GridItemDeltaMessage(clientDeltas);
}
public static void encode(GridItemDeltaMessage message, PacketBuffer buf) {
buf.writeInt(message.deltas.size());
for (Pair<ItemStack, Integer> delta : message.deltas) {
StackUtils.writeItemGridStack(buf, delta.getLeft(), message.network, false, message.network.getItemStorageTracker().get(delta.getLeft()));
for (StackListResult<ItemStack> delta : message.deltas) {
buf.writeInt(delta.getChange());
buf.writeInt(delta.getRight());
StackUtils.writeItemGridStack(buf, delta.getStack(), delta.getId(), message.network, false, message.network.getItemStorageTracker().get(delta.getStack()));
}
}
public static void handle(GridItemDeltaMessage message, Supplier<NetworkEvent.Context> ctx) {
BaseScreen.executeLater(GridScreen.class, grid -> {
message.gridStacks.forEach(p -> grid.getView().postChange(p.getLeft(), p.getRight()));
message.clientDeltas.forEach(p -> grid.getView().postChange(p.getLeft(), p.getRight()));
grid.getView().sort();
});

13
src/main/java/com/raoulvdberge/refinedstorage/network/grid/GridItemPullMessage.java
View File

@@ -7,23 +7,24 @@ import net.minecraft.inventory.container.Container;
import net.minecraft.network.PacketBuffer;
import net.minecraftforge.fml.network.NetworkEvent;
import java.util.UUID;
import java.util.function.Supplier;
public class GridItemPullMessage {
private int hash;
private UUID id;
private int flags;
public GridItemPullMessage(int hash, int flags) {
this.hash = hash;
public GridItemPullMessage(UUID id, int flags) {
this.id = id;
this.flags = flags;
}
public static GridItemPullMessage decode(PacketBuffer buf) {
return new GridItemPullMessage(buf.readInt(), buf.readInt());
return new GridItemPullMessage(buf.readUniqueId(), buf.readInt());
}
public static void encode(GridItemPullMessage message, PacketBuffer buf) {
buf.writeInt(message.hash);
buf.writeUniqueId(message.id);
buf.writeInt(message.flags);
}
@@ -38,7 +39,7 @@ public class GridItemPullMessage {
IGrid grid = ((GridContainer) container).getGrid();
if (grid.getItemHandler() != null) {
grid.getItemHandler().onExtract(player, message.hash, message.flags);
grid.getItemHandler().onExtract(player, message.id, message.flags);
}
}
}

7
src/main/java/com/raoulvdberge/refinedstorage/network/grid/GridItemUpdateMessage.java
View File

@@ -2,6 +2,7 @@ package com.raoulvdberge.refinedstorage.network.grid;
import com.raoulvdberge.refinedstorage.api.autocrafting.ICraftingPattern;
import com.raoulvdberge.refinedstorage.api.network.INetwork;
import com.raoulvdberge.refinedstorage.api.util.StackListEntry;
import com.raoulvdberge.refinedstorage.screen.BaseScreen;
import com.raoulvdberge.refinedstorage.screen.grid.GridScreen;
import com.raoulvdberge.refinedstorage.screen.grid.stack.IGridStack;
@@ -56,13 +57,13 @@ public class GridItemUpdateMessage {
buf.writeInt(size);
for (ItemStack stack : message.network.getItemStorageCache().getList().getStacks()) {
StackUtils.writeItemGridStack(buf, stack, message.network, false, message.network.getItemStorageTracker().get(stack));
for (StackListEntry<ItemStack> stack : message.network.getItemStorageCache().getList().getStacks()) {
StackUtils.writeItemGridStack(buf, stack.getStack(), stack.getId(), message.network, false, message.network.getItemStorageTracker().get(stack.getStack()));
}
for (ICraftingPattern pattern : message.network.getCraftingManager().getPatterns()) {
for (ItemStack output : pattern.getOutputs()) {
StackUtils.writeItemGridStack(buf, output, message.network, true, message.network.getItemStorageTracker().get(output));
// TODO StackUtils.writeItemGridStack(buf, output, message.network, true, message.network.getItemStorageTracker().get(output));
}
}
}

2
src/main/java/com/raoulvdberge/refinedstorage/screen/grid/GridScreen.java
View File

@@ -478,7 +478,7 @@ public class GridScreen extends BaseScreen<GridContainer> implements IScreenInfo
flags |= IItemGridHandler.EXTRACT_SINGLE;
}
RS.NETWORK_HANDLER.sendToServer(new GridItemPullMessage(stack.getHash(), flags));
RS.NETWORK_HANDLER.sendToServer(new GridItemPullMessage(stack.getId(), flags));
}
}

19
src/main/java/com/raoulvdberge/refinedstorage/screen/grid/sorting/IdGridSorter.java
View File

@@ -4,6 +4,8 @@ import com.raoulvdberge.refinedstorage.api.network.grid.IGrid;
import com.raoulvdberge.refinedstorage.screen.grid.stack.IGridStack;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.util.registry.Registry;
import net.minecraftforge.fluids.FluidStack;
public class IdGridSorter implements IGridSorter {
@Override
@@ -13,19 +15,22 @@ public class IdGridSorter implements IGridSorter {
@Override
public int compare(IGridStack left, IGridStack right, SortingDirection sortingDirection) {
int x = left.getHash();
int y = right.getHash();
int leftId = 0;
int rightId = 0;
if (left.getIngredient() instanceof ItemStack && right.getIngredient() instanceof ItemStack) {
x = Item.getIdFromItem(((ItemStack) left.getIngredient()).getItem());
y = Item.getIdFromItem(((ItemStack) right.getIngredient()).getItem());
leftId = Item.getIdFromItem(((ItemStack) left.getIngredient()).getItem());
rightId = Item.getIdFromItem(((ItemStack) right.getIngredient()).getItem());
} else if (left.getIngredient() instanceof FluidStack && right.getIngredient() instanceof FluidStack) {
leftId = Registry.FLUID.getId(((FluidStack) left.getIngredient()).getFluid());
rightId = Registry.FLUID.getId(((FluidStack) right.getIngredient()).getFluid());
}
if (x != y) {
if (leftId != rightId) {
if (sortingDirection == SortingDirection.DESCENDING) {
return Integer.compare(x, y);
return Integer.compare(leftId, rightId);
} else if (sortingDirection == SortingDirection.ASCENDING) {
return Integer.compare(y, x);
return Integer.compare(rightId, leftId);
}
}

11
src/main/java/com/raoulvdberge/refinedstorage/screen/grid/stack/FluidGridStack.java
View File

@@ -8,9 +8,10 @@ import net.minecraft.client.resources.I18n;
import net.minecraftforge.fluids.FluidStack;
import javax.annotation.Nullable;
import java.util.UUID;
public class FluidGridStack implements IGridStack {
private int hash;
private UUID id;
private FluidStack stack;
@Nullable
private IStorageTracker.IStorageTrackerEntry entry;
@@ -19,8 +20,8 @@ public class FluidGridStack implements IGridStack {
private String modId;
private String modName;
public FluidGridStack(int hash, FluidStack stack, @Nullable IStorageTracker.IStorageTrackerEntry entry, boolean craftable, boolean displayCraftText) {
this.hash = hash;
public FluidGridStack(UUID id, FluidStack stack, @Nullable IStorageTracker.IStorageTrackerEntry entry, boolean craftable, boolean displayCraftText) {
this.id = id;
this.stack = stack;
this.entry = entry;
this.craftable = craftable;
@@ -47,8 +48,8 @@ public class FluidGridStack implements IGridStack {
}
@Override
public int getHash() {
return hash;
public UUID getId() {
return id;
}
@Override

3
src/main/java/com/raoulvdberge/refinedstorage/screen/grid/stack/IGridStack.java
View File

@@ -4,9 +4,10 @@ import com.raoulvdberge.refinedstorage.api.storage.IStorageTracker;
import com.raoulvdberge.refinedstorage.screen.BaseScreen;
import javax.annotation.Nullable;
import java.util.UUID;
public interface IGridStack {
int getHash();
UUID getId();
String getName();

11
src/main/java/com/raoulvdberge/refinedstorage/screen/grid/stack/ItemGridStack.java
View File

@@ -8,10 +8,11 @@ import net.minecraft.client.resources.I18n;
import net.minecraft.item.ItemStack;
import javax.annotation.Nullable;
import java.util.UUID;
import java.util.stream.Collectors;
public class ItemGridStack implements IGridStack {
private int hash;
private UUID id;
private ItemStack stack;
private String cachedName;
private boolean craftable;
@@ -27,8 +28,8 @@ public class ItemGridStack implements IGridStack {
this.stack = stack;
}
public ItemGridStack(int hash, ItemStack stack, boolean craftable, boolean displayCraftText, IStorageTracker.IStorageTrackerEntry entry) {
this.hash = hash;
public ItemGridStack(UUID id, ItemStack stack, boolean craftable, boolean displayCraftText, IStorageTracker.IStorageTrackerEntry entry) {
this.id = id;
this.stack = stack;
this.craftable = craftable;
this.displayCraftText = displayCraftText;
@@ -70,8 +71,8 @@ public class ItemGridStack implements IGridStack {
}
@Override
public int getHash() {
return hash;
public UUID getId() {
return id;
}
@Override

2
src/main/java/com/raoulvdberge/refinedstorage/screen/grid/view/BaseGridView.java
View File

@@ -18,7 +18,7 @@ public abstract class BaseGridView implements IGridView {
private List<IGridSorter> sorters;
private List<IGridStack> stacks = new ArrayList<>();
protected Map<Integer, IGridStack> map = new HashMap<>();
protected Map<UUID, IGridStack> map = new HashMap<>();
public BaseGridView(GridScreen screen, IGridSorter defaultSorter, List<IGridSorter> sorters) {
this.screen = screen;

10
src/main/java/com/raoulvdberge/refinedstorage/screen/grid/view/FluidGridView.java
View File

@@ -18,11 +18,11 @@ public class FluidGridView extends BaseGridView {
for (IGridStack stack : stacks) {
// Don't let a craftable stack override a normal stack
if (stack.doesDisplayCraftText() && map.containsKey(stack.getHash())) {
if (stack.doesDisplayCraftText() && map.containsKey(stack.getId())) {
continue;
}
map.put(stack.getHash(), stack);
map.put(stack.getId(), stack);
}
}
@@ -32,18 +32,18 @@ public class FluidGridView extends BaseGridView {
return;
}
FluidGridStack existing = (FluidGridStack) map.get(stack.getHash());
FluidGridStack existing = (FluidGridStack) map.get(stack.getId());
if (existing == null) {
((FluidGridStack) stack).getStack().setAmount(delta);
map.put(stack.getHash(), stack);
map.put(stack.getId(), stack);
} else {
if (existing.getStack().getAmount() + delta <= 0) {
if (existing.isCraftable()) {
existing.setDisplayCraftText(true);
} else {
map.remove(existing.getHash());
map.remove(existing.getId());
}
} else {
if (existing.doesDisplayCraftText()) {

10
src/main/java/com/raoulvdberge/refinedstorage/screen/grid/view/ItemGridView.java
View File

@@ -18,11 +18,11 @@ public class ItemGridView extends BaseGridView {
for (IGridStack stack : stacks) {
// Don't let a craftable stack override a normal stack
if (stack.doesDisplayCraftText() && map.containsKey(stack.getHash())) {
if (stack.doesDisplayCraftText() && map.containsKey(stack.getId())) {
continue;
}
map.put(stack.getHash(), stack);
map.put(stack.getId(), stack);
}
}
@@ -32,18 +32,18 @@ public class ItemGridView extends BaseGridView {
return;
}
ItemGridStack existing = (ItemGridStack) map.get(stack.getHash());
ItemGridStack existing = (ItemGridStack) map.get(stack.getId());
if (existing == null) {
((ItemGridStack) stack).getStack().setCount(delta);
map.put(stack.getHash(), stack);
map.put(stack.getId(), stack);
} else {
if (existing.getStack().getCount() + delta <= 0) {
if (existing.isCraftable()) {
existing.setDisplayCraftText(true);
} else {
map.remove(existing.getHash());
map.remove(existing.getId());
}
} else {
if (existing.doesDisplayCraftText()) {

17
src/main/java/com/raoulvdberge/refinedstorage/util/StackUtils.java
View File

@@ -30,6 +30,7 @@ import org.apache.commons.lang3.tuple.Pair;
import javax.annotation.Nonnull;
import javax.annotation.Nullable;
import java.util.UUID;
import java.util.function.Function;
public final class StackUtils {
@@ -76,10 +77,10 @@ public final class StackUtils {
}
}
public static void writeItemGridStack(PacketBuffer buf, ItemStack stack, @Nullable INetwork network, boolean displayCraftText, @Nullable IStorageTracker.IStorageTrackerEntry entry) {
public static void writeItemGridStack(PacketBuffer buf, ItemStack stack, UUID id, @Nullable INetwork network, boolean displayCraftText, @Nullable IStorageTracker.IStorageTrackerEntry entry) {
writeItemStack(buf, stack);
buf.writeInt(API.instance().getItemStackHashCode(stack));
buf.writeUniqueId(id);
if (network != null) {
buf.writeBoolean(network.getCraftingManager().getPattern(stack) != null);
@@ -101,7 +102,7 @@ public final class StackUtils {
public static ItemGridStack readItemGridStack(PacketBuffer buf) {
ItemStack stack = readItemStack(buf);
int hash = buf.readInt();
UUID id = buf.readUniqueId();
boolean craftable = buf.readBoolean();
boolean displayCraftText = buf.readBoolean();
@@ -110,13 +111,13 @@ public final class StackUtils {
entry = new StorageTrackerEntry(buf.readLong(), buf.readString());
}
return new ItemGridStack(hash, stack, craftable, displayCraftText, entry);
return new ItemGridStack(id, stack, craftable, displayCraftText, entry);
}
public static void writeFluidGridStack(PacketBuffer buf, FluidStack stack, @Nullable INetwork network, boolean displayCraftText, @Nullable IStorageTracker.IStorageTrackerEntry entry) {
public static void writeFluidGridStack(PacketBuffer buf, FluidStack stack, UUID id, @Nullable INetwork network, boolean displayCraftText, @Nullable IStorageTracker.IStorageTrackerEntry entry) {
stack.writeToPacket(buf);
buf.writeInt(API.instance().getFluidStackHashCode(stack));
buf.writeUniqueId(id);
if (network != null) {
buf.writeBoolean(network.getCraftingManager().getPattern(stack) != null);
@@ -138,7 +139,7 @@ public final class StackUtils {
public static FluidGridStack readFluidGridStack(PacketBuffer buf) {
FluidStack stack = FluidStack.readFromPacket(buf);
int hash = buf.readInt();
UUID id = buf.readUniqueId();
boolean craftable = buf.readBoolean();
boolean displayCraftText = buf.readBoolean();
@@ -147,7 +148,7 @@ public final class StackUtils {
entry = new StorageTrackerEntry(buf.readLong(), buf.readString());
}
return new FluidGridStack(hash, stack, entry, craftable, displayCraftText);
return new FluidGridStack(id, stack, entry, craftable, displayCraftText);
}
public static ItemStack nullToEmpty(@Nullable ItemStack stack) {