Merge remote-tracking branch 'lordIcocain/Super_Multiply_Super_Divide' into dev

This commit is contained in:
Martin Robertz committed 2024-12-30 20:58:17 +01:00
commit ec02446519
5 files changed
+30 -29

No files matched your search

@@ -549,29 +549,33 @@ public abstract class FCContainerEncodeTerminal extends ContainerItemMonitor
static boolean canMultiplyOrDivide(SlotFake[] slots, int mult) {
if (mult > 0) {
for (Slot s : slots) {
if (s.getStack() != null) {
if (s.getStack().getItem() instanceof ItemFluidPacket) {
long result = (long) ItemFluidPacket.getFluidAmount(s.getStack()) * mult;
if (result > Integer.MAX_VALUE) {
return false;
}
} else {
long val = (long) s.getStack().stackSize * mult;
if (val > Integer.MAX_VALUE) return false;
}
ItemStack st = s.getStack();
if (st == null) continue;
final long count;
if (st.getItem() instanceof ItemFluidPacket) {
count = ItemFluidPacket.getFluidAmount(st);
} else {
count = s.getStack().stackSize;
}
long result = count * mult;
if (result > Integer.MAX_VALUE) {
return false;
}
}
return true;
} else if (mult < 0) {
mult = -mult;
mult = Math.abs(mult);
for (Slot s : slots) {
if (s.getStack() != null) { // Although % is a very inefficient algorithm, it is not a performance issue
// here. :>
if (s.getStack().getItem() instanceof ItemFluidPacket) {
if (ItemFluidPacket.getFluidAmount(s.getStack()) % mult != 0) return false;
} else {
if (s.getStack().stackSize % mult != 0) return false;
}
ItemStack st = s.getStack();
if (st == null) continue;
final int count;
if (st.getItem() instanceof ItemFluidPacket) {
count = ItemFluidPacket.getFluidAmount(st);
} else {
count = s.getStack().stackSize;
}
if (count % mult != 0) {
return false;
}
}
return true;
@@ -594,7 +598,7 @@ public abstract class FCContainerEncodeTerminal extends ContainerItemMonitor
}
}
} else if (mult < 0) {
mult = -mult;
mult = Math.abs(mult);
for (final Slot s : enabledSlots) {
ItemStack st = s.getStack();
if (st != null) {
@@ -32,7 +32,9 @@ public class ItemBiggerAppEngInventory extends BiggerAppEngInventory {
boolean isCraft = Platform.openNbtData(is).getBoolean("craftingMode");
boolean isCraftingTerm = Platform.openNbtData(is).getString("mode_main")
.equals(GuiType.WIRELESS_CRAFTING_TERMINAL.toString());
if (!isCraftingTerm && isCraft) {
boolean isExPattern = Platform.openNbtData(is).getString("mode_main")
.equals(GuiType.WIRELESS_FLUID_PATTERN_TERMINAL_EX.toString());
if (!isCraftingTerm && !isExPattern && isCraft) {
for (int x = 0; x < this.getSizeInventory(); x++) {
final ItemStack is = this.getStackInSlot(x);
if (is != null) {
@@ -81,8 +81,6 @@ public class ChannelLoader implements Runnable {
Side.SERVER);
netHandler
.registerMessage(new CPacketPatternMultiSet.Handler(), CPacketPatternMultiSet.class, id++, Side.SERVER);
netHandler
.registerMessage(new CPacketPatternMultiSet.Handler(), CPacketPatternMultiSet.class, id++, Side.CLIENT);
}
public static void sendPacketToAllPlayers(Packet packet, World world) {
@@ -26,10 +26,6 @@ public class CPacketPatternMultiSet implements IMessage {
private static GuiType guiType;
private static int multi;
public CPacketPatternMultiSet(GuiType guiType) {
this(guiType, 0);
}
public CPacketPatternMultiSet(GuiType guiType, int multi) {
CPacketPatternMultiSet.guiType = guiType;
CPacketPatternMultiSet.multi = multi;
@@ -32,7 +32,8 @@ public class CPacketTransferRecipe implements IMessage {
private List<OrderStack<?>> inputs;
private List<OrderStack<?>> outputs;
private boolean isCraft;
private static final int MAX_INDEX = 32;
private static final int MAX_INDEX = 81;
private static final int MAX_SLOTS_INDEX = 32;
private boolean shift;
public CPacketTransferRecipe() {}
@@ -79,11 +80,11 @@ public class CPacketTransferRecipe implements IMessage {
NBTTagCompound nbt_o = nbt_m.getCompoundTag("o");
for (int i = 0; i < MAX_INDEX; i++) {
OrderStack<?> tmp = OrderStack.readFromNBT(nbt_i, null, i);
if (tmp != null) inputs.add(tmp);
if (tmp != null && inputs.size() < MAX_SLOTS_INDEX) inputs.add(tmp);
}
for (int i = 0; i < MAX_INDEX; i++) {
OrderStack<?> tmp = OrderStack.readFromNBT(nbt_o, null, i);
if (tmp != null) outputs.add(tmp);
if (tmp != null && inputs.size() < MAX_SLOTS_INDEX) outputs.add(tmp);
}
}