diff --git a/dependencies.gradle b/dependencies.gradle index ea74e13b..601563d9 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -34,8 +34,8 @@ * For more details, see https://docs.gradle.org/8.0.1/userguide/java_library_plugin.html#sec:java_library_configurations_graph */ dependencies { - api('com.github.GTNewHorizons:NotEnoughItems:2.6.46-GTNH:dev') - api('com.github.GTNewHorizons:Applied-Energistics-2-Unofficial:rv3-beta-477-GTNH:dev') + api('com.github.GTNewHorizons:NotEnoughItems:2.6.51-GTNH:dev') + api('com.github.GTNewHorizons:Applied-Energistics-2-Unofficial:rv3-beta-502-GTNH:dev') api('curse.maven:cofh-core-69162:2388751') api('com.github.GTNewHorizons:waila:1.8.2:dev') @@ -43,22 +43,22 @@ dependencies { exclude group: 'com.github.GTNewHorizons', module: 'Applied-Energistics-2-Unofficial' } - compileOnly("com.github.GTNewHorizons:GTNHLib:0.5.20:dev") { transitive = false } + compileOnly("com.github.GTNewHorizons:GTNHLib:0.5.22:dev") { transitive = false } compileOnly('com.github.GTNewHorizons:Baubles-Expanded:2.0.3:dev') compileOnly('com.github.GTNewHorizons:ExtraCells2:2.5.35:dev') { transitive = false } - compileOnly('com.github.GTNewHorizons:ForestryMC:4.9.17:dev') + compileOnly('com.github.GTNewHorizons:ForestryMC:4.9.19:dev') compileOnly('com.github.GTNewHorizons:EnderIO:2.8.22:dev') - compileOnly('com.github.GTNewHorizons:GT5-Unofficial:5.09.50.70:dev') { + compileOnly('com.github.GTNewHorizons:GT5-Unofficial:5.09.51.10:dev') { exclude group: 'com.github.GTNewHorizons', module: 'AE2FluidCraft-Rework' exclude group: 'com.github.GTNewHorizons', module: 'Applied-Energistics-2-Unofficial' } compileOnly('thaumcraft:Thaumcraft:1.7.10-4.2.3.5:dev') compileOnly('com.gregoriust.gregtech:gregtech_1.7.10:6.14.23:dev') { transitive = false } - compileOnly('com.github.GTNewHorizons:OpenComputers:1.10.27-GTNH:dev') { transitive = false } + compileOnly('com.github.GTNewHorizons:OpenComputers:1.11.1-GTNH:dev') { transitive = false } compileOnly('com.github.GTNewHorizons:ThaumicEnergistics:1.6.27-GTNH:dev') { transitive = false } - compileOnly("com.github.GTNewHorizons:Hodgepodge:2.5.78:dev") { transitive = false } + compileOnly("com.github.GTNewHorizons:Hodgepodge:2.6.2:dev") { transitive = false } runtimeOnlyNonPublishable("com.github.GTNewHorizons:DuraDisplay:1.3.4:dev") - runtimeOnlyNonPublishable("com.github.GTNewHorizons:GTNHLib:0.5.20:dev") + runtimeOnlyNonPublishable("com.github.GTNewHorizons:GTNHLib:0.5.22:dev") } diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 2c352119..a4b76b95 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 09523c0e..e2847c82 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/settings.gradle b/settings.gradle index aa612ade..0147a994 100644 --- a/settings.gradle +++ b/settings.gradle @@ -17,7 +17,7 @@ pluginManagement { } plugins { - id 'com.gtnewhorizons.gtnhsettingsconvention' version '1.0.29' + id 'com.gtnewhorizons.gtnhsettingsconvention' version '1.0.30' } diff --git a/src/main/java/com/glodblock/github/client/gui/base/FCGuiEncodeTerminal.java b/src/main/java/com/glodblock/github/client/gui/base/FCGuiEncodeTerminal.java index 13cdac56..5bce694e 100644 --- a/src/main/java/com/glodblock/github/client/gui/base/FCGuiEncodeTerminal.java +++ b/src/main/java/com/glodblock/github/client/gui/base/FCGuiEncodeTerminal.java @@ -5,6 +5,7 @@ import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Slot; import org.lwjgl.input.Keyboard; +import org.lwjgl.input.Mouse; import org.lwjgl.opengl.GL11; import com.glodblock.github.FluidCraft; @@ -116,10 +117,11 @@ public abstract class FCGuiEncodeTerminal extends GuiItemMonitor { "PatternTerminal.Combine", this.combineDisableBtn == btn ? "1" : "0")); } else if (ModAndClassUtil.isDoubleButton && doubleBtn == btn) { + final int eventButton = Mouse.getEventButton(); FluidCraft.proxy.netHandler.sendToServer( new CPacketFluidPatternTermBtns( "PatternTerminal.Double", - Keyboard.isKeyDown(Keyboard.KEY_LSHIFT) ? "1" : "0")); + (Keyboard.isKeyDown(Keyboard.KEY_LSHIFT) ? "1" : "0") + (eventButton == 1 ? "1" : "0"))); } else if (ModAndClassUtil.isBeSubstitutionsButton && beSubstitutionsDisabledBtn == btn) { FluidCraft.proxy.netHandler .sendToServer(new CPacketFluidPatternTermBtns("PatternTerminal.beSubstitute", "1")); diff --git a/src/main/java/com/glodblock/github/client/gui/container/ContainerFluidPatternTerminal.java b/src/main/java/com/glodblock/github/client/gui/container/ContainerFluidPatternTerminal.java index 7dadc7e3..798624d2 100644 --- a/src/main/java/com/glodblock/github/client/gui/container/ContainerFluidPatternTerminal.java +++ b/src/main/java/com/glodblock/github/client/gui/container/ContainerFluidPatternTerminal.java @@ -153,9 +153,9 @@ public class ContainerFluidPatternTerminal extends FCContainerEncodeTerminal { } @Override - public void doubleStacks(boolean isShift) { + public void doubleStacks(boolean isShift, boolean divide) { if (!isCraftingMode()) { - super.doubleStacks(isShift); + super.doubleStacks(isShift, divide); } } } diff --git a/src/main/java/com/glodblock/github/client/gui/container/base/FCContainerEncodeTerminal.java b/src/main/java/com/glodblock/github/client/gui/container/base/FCContainerEncodeTerminal.java index 6f47be0d..8ab459ae 100644 --- a/src/main/java/com/glodblock/github/client/gui/container/base/FCContainerEncodeTerminal.java +++ b/src/main/java/com/glodblock/github/client/gui/container/base/FCContainerEncodeTerminal.java @@ -537,57 +537,82 @@ public abstract class FCContainerEncodeTerminal extends ContainerItemMonitor return false; } - static boolean canDouble(SlotFake[] slots, int mult) { - for (Slot s : slots) { - ItemStack st = s.getStack(); - if (st != null) { - if (st.getItem() instanceof ItemFluidPacket) { - long result = (long) ItemFluidPacket.getFluidAmount(st) * mult; - if (result > Integer.MAX_VALUE) { - return false; - } - } else { - long result = (long) s.getStack().stackSize * mult; - if (result > Integer.MAX_VALUE) { - return false; - } - } - } - } - return true; - } - - static void doubleStacksInternal(SlotFake[] slots, int mult) { - List enabledSlots = Arrays.stream(slots).filter(SlotFake::isEnabled).collect(Collectors.toList()); - for (final Slot s : enabledSlots) { - ItemStack st = s.getStack(); - if (st != null) { - if (st.getItem() instanceof ItemFluidPacket) { - ItemFluidPacket.setFluidAmount(st, ItemFluidPacket.getFluidAmount(st) * mult); - } else { - st.stackSize *= mult; - } - } - } - } - - public void doubleStacks(boolean isShift) { + public void doubleStacks(boolean isShift, boolean divide) { if (!isCraftingMode()) { - if (isShift) { - if (canDouble(this.craftingSlots, 8) && canDouble(this.outputSlots, 8)) { - doubleStacksInternal(this.craftingSlots, 8); - doubleStacksInternal(this.outputSlots, 8); - } - } else { - if (canDouble(this.craftingSlots, 2) && canDouble(this.outputSlots, 2)) { - doubleStacksInternal(this.craftingSlots, 2); - doubleStacksInternal(this.outputSlots, 2); - } + final int mult = (isShift ? 8 : 2) * (divide ? -1 : 1); + if (canMultiplyOrDivide(this.craftingSlots, mult) && canMultiplyOrDivide(this.outputSlots, mult)) { + multiplyOrDivideStacksInternal(this.craftingSlots, mult); + multiplyOrDivideStacksInternal(this.outputSlots, mult); } this.detectAndSendChanges(); } } + static boolean canMultiplyOrDivide(SlotFake[] slots, int mult) { + if (mult > 0) { + for (Slot s : slots) { + 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 = Math.abs(mult); + for (Slot s : slots) { + 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; + } + return false; + } + + static void multiplyOrDivideStacksInternal(SlotFake[] slots, int mult) { + List enabledSlots = Arrays.stream(slots).filter(SlotFake::isEnabled).collect(Collectors.toList()); + if (mult > 0) { + for (final Slot s : enabledSlots) { + ItemStack st = s.getStack(); + if (st != null) { + if (st.getItem() instanceof ItemFluidPacket) { + ItemFluidPacket.setFluidAmount(st, ItemFluidPacket.getFluidAmount(st) * mult); + } else { + st.stackSize *= mult; + } + } + } + } else if (mult < 0) { + mult = Math.abs(mult); + for (final Slot s : enabledSlots) { + ItemStack st = s.getStack(); + if (st != null) { + if (st.getItem() instanceof ItemFluidPacket) { + ItemFluidPacket.setFluidAmount(st, ItemFluidPacket.getFluidAmount(st) / mult); + } else { + st.stackSize /= mult; + } + } + } + } + } + @Override public void acceptPattern(IAEItemStack[] inputs, IAEItemStack[] outputs) { if (this.patternTerminal != null) { diff --git a/src/main/java/com/glodblock/github/common/parts/PartFluidStorageBus.java b/src/main/java/com/glodblock/github/common/parts/PartFluidStorageBus.java index bf133e92..01b8b4f5 100644 --- a/src/main/java/com/glodblock/github/common/parts/PartFluidStorageBus.java +++ b/src/main/java/com/glodblock/github/common/parts/PartFluidStorageBus.java @@ -46,6 +46,7 @@ import appeng.api.networking.ticking.TickRateModulation; import appeng.api.networking.ticking.TickingRequest; import appeng.api.parts.IPartCollisionHelper; import appeng.api.parts.IPartRenderHelper; +import appeng.api.parts.PartItemStack; import appeng.api.storage.ICellContainer; import appeng.api.storage.IExternalStorageHandler; import appeng.api.storage.IMEInventory; @@ -97,6 +98,27 @@ public class PartFluidStorageBus extends PartUpgradeable this.getConfigManager().registerSetting(Settings.STORAGE_FILTER, StorageFilter.EXTRACTABLE_ONLY); this.getConfigManager().registerSetting(Settings.STICKY_MODE, YesNo.NO); this.source = new MachineSource(this); + if (is.getTagCompound() != null) { + NBTTagCompound tag = is.getTagCompound(); + if (tag.hasKey("priority")) { + priority = tag.getInteger("priority"); + // if we don't do this, the tag will stick forever to the storage bus, as it's never cleaned up, + // even when the item is broken with a pickaxe + this.is.setTagCompound(null); + } + } + } + + @Override + public ItemStack getItemStack(final PartItemStack type) { + if (type == PartItemStack.Wrench) { + final NBTTagCompound tag = new NBTTagCompound(); + tag.setInteger("priority", priority); + final ItemStack copy = this.is.copy(); + copy.setTagCompound(tag); + return copy; + } + return super.getItemStack(type); } @Override diff --git a/src/main/java/com/glodblock/github/common/tile/TileFluidDiscretizer.java b/src/main/java/com/glodblock/github/common/tile/TileFluidDiscretizer.java index e2173a12..57500298 100644 --- a/src/main/java/com/glodblock/github/common/tile/TileFluidDiscretizer.java +++ b/src/main/java/com/glodblock/github/common/tile/TileFluidDiscretizer.java @@ -12,7 +12,6 @@ import com.glodblock.github.common.item.ItemFluidDrop; import appeng.api.AEApi; import appeng.api.config.Actionable; import appeng.api.networking.GridFlags; -import appeng.api.networking.crafting.ICraftingGrid; import appeng.api.networking.energy.IEnergyGrid; import appeng.api.networking.events.MENetworkCellArrayUpdate; import appeng.api.networking.events.MENetworkChannelsChanged; @@ -31,11 +30,9 @@ import appeng.api.storage.IMEMonitorHandlerReceiver; import appeng.api.storage.StorageChannel; import appeng.api.storage.data.IAEFluidStack; import appeng.api.storage.data.IAEItemStack; -import appeng.api.storage.data.IAEStack; import appeng.api.storage.data.IItemList; import appeng.helpers.IPriorityHost; import appeng.me.GridAccessException; -import appeng.me.cache.CraftingGridCache; import appeng.me.storage.MEInventoryHandler; import appeng.tile.grid.AENetworkTile; @@ -43,7 +40,6 @@ public class TileFluidDiscretizer extends AENetworkTile implements IPriorityHost private final BaseActionSource ownActionSource = new MachineSource(this); private final FluidDiscretizingInventory fluidDropInv = new FluidDiscretizingInventory(); - private final FluidCraftingInventory fluidCraftInv = new FluidCraftingInventory(); private boolean prevActiveState = false; public TileFluidDiscretizer() { @@ -60,12 +56,8 @@ public class TileFluidDiscretizer extends AENetworkTile implements IPriorityHost @Override @SuppressWarnings("rawtypes") public List getCellArray(StorageChannel channel) { - if (getProxy().isActive()) { - if (channel == StorageChannel.ITEMS) { - return Collections.singletonList(fluidDropInv.invHandler); - } else if (channel == StorageChannel.FLUIDS) { - return Collections.singletonList(fluidCraftInv.invHandler); - } + if (channel == StorageChannel.ITEMS && getProxy().isActive()) { + return Collections.singletonList(fluidDropInv.invHandler); } return Collections.emptyList(); } @@ -263,85 +255,4 @@ public class TileFluidDiscretizer extends AENetworkTile implements IPriorityHost // NO-OP } } - - private class FluidCraftingInventoryHandler extends MEInventoryHandler { - - public FluidCraftingInventoryHandler(IMEInventory i, StorageChannel channel) { - super(i, channel); - } - - @Override - public boolean isPrioritized(IAEFluidStack input) { - return true; - } - - @Override - public boolean canAccept(IAEFluidStack input) { - ICraftingGrid craftingGrid; - try { - craftingGrid = getProxy().getGrid().getCache(ICraftingGrid.class); - } catch (GridAccessException e) { - return false; - } - if (craftingGrid instanceof CraftingGridCache craftingGridCache) { - return craftingGridCache.canAccept(ItemFluidDrop.newAeStack(input)); - } - return false; - } - - @Override - public boolean isAutoCraftingInventory() { - return true; - } - } - - private class FluidCraftingInventory implements IMEInventory { - - private final MEInventoryHandler invHandler = new FluidCraftingInventoryHandler( - this, - getChannel()); - - FluidCraftingInventory() { - invHandler.setPriority(Integer.MAX_VALUE); - } - - @Override - @SuppressWarnings("rawtypes") - public IAEFluidStack injectItems(IAEFluidStack input, Actionable type, BaseActionSource src) { - ICraftingGrid craftingGrid; - try { - craftingGrid = getProxy().getGrid().getCache(ICraftingGrid.class); - } catch (GridAccessException e) { - return null; - } - if (craftingGrid instanceof CraftingGridCache) { - IAEStack remaining = ((CraftingGridCache) craftingGrid) - .injectItems(ItemFluidDrop.newAeStack(input), type, ownActionSource); - if (remaining instanceof IAEItemStack) { - return ItemFluidDrop.getAeFluidStack((IAEItemStack) remaining); - } - } - return null; - } - - @Override - public IAEFluidStack extractItems(IAEFluidStack request, Actionable mode, BaseActionSource src) { - return null; - } - - @Override - public IItemList getAvailableItems(IItemList out, int iteration) { - return out; - } - - @Override - public IAEFluidStack getAvailableItem(@Nonnull IAEFluidStack request, int iteration) { - return null; - } - - @Override - public StorageChannel getChannel() { - return StorageChannel.FLUIDS; - } - } } diff --git a/src/main/java/com/glodblock/github/network/CPacketFluidPatternTermBtns.java b/src/main/java/com/glodblock/github/network/CPacketFluidPatternTermBtns.java index 92138255..8af7d79d 100644 --- a/src/main/java/com/glodblock/github/network/CPacketFluidPatternTermBtns.java +++ b/src/main/java/com/glodblock/github/network/CPacketFluidPatternTermBtns.java @@ -77,23 +77,22 @@ public class CPacketFluidPatternTermBtns implements IMessage { case "PatternTerminal.Clear" -> cpt.clear(); case "PatternTerminal.Substitute" -> cpt.getPatternTerminal().setSubstitution(Value.equals("1")); case "PatternTerminal.Invert" -> cpt.getPatternTerminal().setInverted(Value.equals("1")); - case "PatternTerminal.Double" -> cpt.doubleStacks(Value.equals("1")); + case "PatternTerminal.Double" -> cpt.doubleStacks(Value.charAt(0) == '1', Value.charAt(1) == '1'); case "PatternTerminal.Combine" -> cpt.getPatternTerminal().setCombineMode(Value.equals("1")); case "PatternTerminal.beSubstitute" -> cpt.getPatternTerminal().setBeSubstitute(Value.equals("1")); - case "PatternTerminal.ActivePage" -> cpt.getPatternTerminal() - .setActivePage(Integer.parseInt(Value)); + case "PatternTerminal.ActivePage" -> + cpt.getPatternTerminal().setActivePage(Integer.parseInt(Value)); case "PatternTerminal.Prioritize" -> { switch (Value) { case "0", "1" -> cpt.getPatternTerminal().setPrioritization(Value.equals("1")); case "2" -> cpt.getPatternTerminal().sortCraftingItems(); } } - case "PatternTerminal.AutoFillerPattern" -> cpt.getPatternTerminal() - .setAutoFillPattern(Value.equals("1")); + case "PatternTerminal.AutoFillerPattern" -> + cpt.getPatternTerminal().setAutoFillPattern(Value.equals("1")); } cpt.getPatternTerminal().saveSettings(); - } else if (Name.startsWith("StorageBus.") && c instanceof ContainerFluidStorageBus) { - final ContainerFluidStorageBus ccw = (ContainerFluidStorageBus) c; + } else if (Name.startsWith("StorageBus.") && c instanceof ContainerFluidStorageBus ccw) { if (Name.equals("StorageBus.Action")) { if (Value.equals("Partition")) { ccw.partition(); diff --git a/src/main/resources/assets/ae2fc/textures/items/fluid_storage.infinity.png b/src/main/resources/assets/ae2fc/textures/items/fluid_storage.infinity.png index 654f88a4..9d2fe83e 100644 Binary files a/src/main/resources/assets/ae2fc/textures/items/fluid_storage.infinity.png and b/src/main/resources/assets/ae2fc/textures/items/fluid_storage.infinity.png differ diff --git a/src/main/resources/assets/ae2fc/textures/items/fluid_storage_default.infinity.png b/src/main/resources/assets/ae2fc/textures/items/fluid_storage_default.infinity.png new file mode 100644 index 00000000..654f88a4 Binary files /dev/null and b/src/main/resources/assets/ae2fc/textures/items/fluid_storage_default.infinity.png differ