From 8b1dff3f21d79c3f8c157cf44aaabd84947d7fff Mon Sep 17 00:00:00 2001 From: Alexdoru <57050655+Alexdoru@users.noreply.github.com> Date: Fri, 6 Dec 2024 19:30:11 +0100 Subject: [PATCH 1/7] Fix pattern dividing (#246) Co-authored-by: Martin Robertz --- .../client/gui/base/FCGuiEncodeTerminal.java | 4 +- .../ContainerFluidPatternTerminal.java | 4 +- .../base/FCContainerEncodeTerminal.java | 115 +++++++++++------- .../network/CPacketFluidPatternTermBtns.java | 13 +- 4 files changed, 81 insertions(+), 55 deletions(-) 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/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(); From 170bf2099ad29bf7037c37632889c6686b1620e1 Mon Sep 17 00:00:00 2001 From: Martin Robertz Date: Sat, 7 Dec 2024 20:14:47 +0100 Subject: [PATCH 2/7] update --- dependencies.gradle | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dependencies.gradle b/dependencies.gradle index f58734af..a7ed8154 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-478-GTNH:dev') api('curse.maven:cofh-core-69162:2388751') api('com.github.GTNewHorizons:waila:1.8.2:dev') @@ -43,12 +43,12 @@ 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.21: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.19:dev') compileOnly('com.github.GTNewHorizons:EnderIO:2.8.22:dev') - compileOnly('com.github.GTNewHorizons:GT5-Unofficial:5.09.50.74:dev') { + compileOnly('com.github.GTNewHorizons:GT5-Unofficial:5.09.50.100:dev') { exclude group: 'com.github.GTNewHorizons', module: 'AE2FluidCraft-Rework' exclude group: 'com.github.GTNewHorizons', module: 'Applied-Energistics-2-Unofficial' } @@ -57,8 +57,8 @@ dependencies { 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:ThaumicEnergistics:1.6.27-GTNH:dev') { transitive = false } - compileOnly("com.github.GTNewHorizons:Hodgepodge:2.5.79:dev") { transitive = false } + compileOnly("com.github.GTNewHorizons:Hodgepodge:2.5.82: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.21:dev") } From 02ee43b04e5d611688b4e5b1138e48b7ca28302f Mon Sep 17 00:00:00 2001 From: EnderProyects <45178400+EnderProyects@users.noreply.github.com> Date: Tue, 17 Dec 2024 16:45:17 +0100 Subject: [PATCH 3/7] Add new texture for infinite water cell (#251) --- .../textures/items/fluid_storage.infinity.png | Bin 636 -> 1015 bytes .../items/fluid_storage_default.infinity.png | Bin 0 -> 636 bytes 2 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 src/main/resources/assets/ae2fc/textures/items/fluid_storage_default.infinity.png 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 654f88a43b3781e1fada2f9b3312f1c659d76696..9d2fe83ed8c8006f7841aef37056718331aee162 100644 GIT binary patch literal 1015 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sBufiR<}hF1enLwjaOL`j6Nk5zJhu3lnFep0GlMQ#C5H3Nf< zeMLcHa&~HoLQ-maW}dD3``!E16*5z7)x%AF4SWlnQ!_F>s)|yBtNcQetFn_VQ`GJ4 zc)4sUtbiuurj{fsROII56ON0GHI_ zN%^HEwo0X?nJHFjiD{-uDJiD9Nr}cOx`u`+iMoj?#)i5n#>Oe;riK zGN53Bhi+;fFi6XRVW%@?1~)KDetNn%hFJJdo#gK^IZ@{L{_4`wh|c!7#m-FvB_BiN z%={~FOwX|>KnyBDk$D^Q;dwd#3x&HK~>4{;NjOYk5qG-WZ4w= z^mS^+#%;?NzrWS&e_h`B&o%q!%iC8pCDv7@Wzsq|d0|`5ytBC*o!>23eD2_vq*=38ZCw9U@j3hR z)7+n(9xnX;jk(P1>*8aP%?>IJU+2GOV0^zoe37@y=ci^F+3~zh(+c}a#iG9M`FaYdmer?-2Ba7pxfv1(G(H+ef~*HQdzcbHcQ#wd?Kysgrwz<^}jyq zNgn&LdV7cKvd>Hj_4Rp^HZuo5QM-Bh>0mw4~qguGt%Oy7f4>&bcWy8=9H4{ljOx z@Gn@gb^DXI`!{)RT;jd!xLsuGyYP2EHhC^oQPJe_R?%s(FDJ>%=V0Ju@A@lt zcGKHMpX)I&)V*K&@z>|$&YRm8?MT(i`+4A`T0P_CepBvUEvG=4mBG{1&t;ucLK6U| Csg#ib delta 612 zcmV-q0-OE!2mAz(BYy%zNklmFf_W#BuN42(EdD<*)E~^e%k<34ct!@nfKI0IDJt2d0)&5Yhtd zJM9>Yj=*~-#A_vSs{Sa^XQC;0kdGJ4cAEFhQ(bKxnRb|H#yLZ|HR3wUAv!T%!QACJ znsv>R=lDh0nZ&)~BGKP3BXJz-q)W}`NLUgi;C(f=toP`SxLm5H5-184NPkOXePf-2x3D6fB8gI| zL_xX$Ou?X5mEhs007(>Fzj+IR_d`fNO+s6&MQSC5U-XlwIM^toki;lp1C&X(dajO0((PyG5caV=4%yydh z%u`)$9hr8RXvR51xi#WC%ON^3U%}kvIhu9NlIQqE*_p(>;v&)CFC%dr>!eG~=SWx* zB;b8DwyganMsn}n%{tnf$R7;z|0EE82;VX73*n5X9ZwEL5dWg)mX6j literal 0 HcmV?d00001 From 71d820eacb739383e42111c2251ee54281229083 Mon Sep 17 00:00:00 2001 From: Martin Robertz Date: Tue, 17 Dec 2024 19:26:58 +0100 Subject: [PATCH 4/7] update --- dependencies.gradle | 12 ++++++------ gradle/wrapper/gradle-wrapper.jar | Bin 43504 -> 43583 bytes gradle/wrapper/gradle-wrapper.properties | 2 +- settings.gradle | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dependencies.gradle b/dependencies.gradle index a7ed8154..601563d9 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -35,7 +35,7 @@ */ dependencies { api('com.github.GTNewHorizons:NotEnoughItems:2.6.51-GTNH:dev') - api('com.github.GTNewHorizons:Applied-Energistics-2-Unofficial:rv3-beta-478-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.21: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.19:dev') compileOnly('com.github.GTNewHorizons:EnderIO:2.8.22:dev') - compileOnly('com.github.GTNewHorizons:GT5-Unofficial:5.09.50.100: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.82: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.21: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 2c3521197d7c4586c843d1d3e9090525f1898cde..a4b76b9530d66f5e68d973ea569d8e19de379189 100644 GIT binary patch delta 3990 zcmV;H4{7l5(*nQL0Kr1kzC=_KMxQY0|W5(lc#i zH*M1^P4B}|{x<+fkObwl)u#`$GxKKV&3pg*-y6R6txw)0qU|Clf9Uds3x{_-**c=7 z&*)~RHPM>Rw#Hi1R({;bX|7?J@w}DMF>dQQU2}9yj%iLjJ*KD6IEB2^n#gK7M~}6R zkH+)bc--JU^pV~7W=3{E*4|ZFpDpBa7;wh4_%;?XM-5ZgZNnVJ=vm!%a2CdQb?oTa z70>8rTb~M$5Tp!Se+4_OKWOB1LF+7gv~$$fGC95ToUM(I>vrd$>9|@h=O?eARj0MH zT4zo(M>`LWoYvE>pXvqG=d96D-4?VySz~=tPVNyD$XMshoTX(1ZLB5OU!I2OI{kb) zS8$B8Qm>wLT6diNnyJZC?yp{Kn67S{TCOt-!OonOK7$K)e-13U9GlnQXPAb&SJ0#3 z+vs~+4Qovv(%i8g$I#FCpCG^C4DdyQw3phJ(f#y*pvNDQCRZ~MvW<}fUs~PL=4??j zmhPyg<*I4RbTz|NHFE-DC7lf2=}-sGkE5e!RM%3ohM7_I^IF=?O{m*uUPH(V?gqyc(Rp?-Qu(3bBIL4Fz(v?=_Sh?LbK{nqZMD>#9D_hNhaV$0ef3@9V90|0u#|PUNTO>$F=qRhg1duaE z0`v~X3G{8RVT@kOa-pU+z8{JWyP6GF*u2e8eKr7a2t1fuqQy)@d|Qn(%YLZ62TWtoX@$nL}9?atE#Yw`rd(>cr0gY;dT9~^oL;u)zgHUvxc2I*b&ZkGM-iq=&(?kyO(3}=P! zRp=rErEyMT5UE9GjPHZ#T<`cnD)jyIL!8P{H@IU#`e8cAG5jMK zVyKw7--dAC;?-qEu*rMr$5@y535qZ6p(R#+fLA_)G~!wnT~~)|s`}&fA(s6xXN`9j zP#Fd3GBa#HeS{5&8p?%DKUyN^X9cYUc6vq}D_3xJ&d@=6j(6BZKPl?!k1?!`f3z&a zR4ZF60Mx7oBxLSxGuzA*Dy5n-d2K=+)6VMZh_0KetK|{e;E{8NJJ!)=_E~1uu=A=r zrn&gh)h*SFhsQJo!f+wKMIE;-EOaMSMB@aXRU(UcnJhZW^B^mgs|M9@5WF@s6B0p& zm#CTz)yiQCgURE{%hjxHcJ6G&>G9i`7MyftL!QQd5 z@RflRs?7)99?X`kHNt>W3l7YqscBpi*R2+fsgABor>KVOu(i(`03aytf2UA!&SC9v z!E}whj#^9~=XHMinFZ;6UOJjo=mmNaWkv~nC=qH9$s-8roGeyaW-E~SzZ3Gg>j zZ8}<320rg4=$`M0nxN!w(PtHUjeeU?MvYgWKZ6kkzABK;vMN0|U;X9abJleJA(xy<}5h5P(5 z{RzAFPvMnX2m0yH0Jn2Uo-p`daE|(O`YQiC#jB8;6bVIUf?SY(k$#C0`d6qT`>Xe0+0}Oj0=F&*D;PVe=Z<=0AGI<6$gYLwa#r` zm449x*fU;_+J>Mz!wa;T-wldoBB%&OEMJgtm#oaI60TSYCy7;+$5?q!zi5K`u66Wq zvg)Fx$s`V3Em{=OEY{3lmh_7|08ykS&U9w!kp@Ctuzqe1JFOGz6%i5}Kmm9>^=gih z?kRxqLA<3@e=}G4R_?phW{4DVr?`tPfyZSN@R=^;P;?!2bh~F1I|fB7P=V=9a6XU5 z<#0f>RS0O&rhc&nTRFOW7&QhevP0#>j0eq<1@D5yAlgMl5n&O9X|Vq}%RX}iNyRFF z7sX&u#6?E~bm~N|z&YikXC=I0E*8Z$v7PtWfjy)$e_Ez25fnR1Q=q1`;U!~U>|&YS zaOS8y!^ORmr2L4ik!IYR8@Dcx8MTC=(b4P6iE5CnrbI~7j7DmM8em$!da&D!6Xu)!vKPdLG z9f#)se|6=5yOCe)N6xDhPI!m81*dNe7u985zi%IVfOfJh69+#ag4ELzGne?o`eA`42K4T)h3S+s)5IT97%O>du- z0U54L8m4}rkRQ?QBfJ%DLssy^+a7Ajw;0&`NOTY4o;0-ivm9 zBz1C%nr_hQ)X)^QM6T1?=yeLkuG9Lf50(eH}`tFye;01&(p?8i+6h};VV-2B~qdxeC#=X z(JLlzy&fHkyi9Ksbcs~&r^%lh^2COldLz^H@X!s~mr9Dr6z!j+4?zkD@Ls7F8(t(f z9`U?P$Lmn*Y{K}aR4N&1N=?xtQ1%jqf1~pJyQ4SgBrEtR`j4lQuh7cqP49Em5cO=I zB(He2`iPN5M=Y0}h(IU$37ANTGx&|b-u1BYA*#dE(L-lptoOpo&th~E)_)y-`6kSH z3vvyVrcBwW^_XYReJ=JYd9OBQrzv;f2AQdZH#$Y{Y+Oa33M70XFI((fs;mB4e`<<{ ze4dv2B0V_?Ytsi>>g%qs*}oDGd5d(RNZ*6?7qNbdp7wP4T72=F&r?Ud#kZr8Ze5tB z_oNb7{G+(o2ajL$!69FW@jjPQ2a5C)m!MKKRirC$_VYIuVQCpf9rIms0GRDf)8AH${I`q^~5rjot@#3$2#zT2f`(N^P7Z;6(@EK$q*Jgif00I6*^ZGV+XB5uw*1R-@23yTw&WKD{s1;HTL;dO)%5i#`dc6b7;5@^{KU%N|A-$zsYw4)7LA{3`Zp>1 z-?K9_IE&z)dayUM)wd8K^29m-l$lFhi$zj0l!u~4;VGR6Y!?MAfBC^?QD53hy6VdD z@eUZIui}~L%#SmajaRq1J|#> z4m=o$vZ*34=ZWK2!QMNEcp2Lbc5N1q!lEDq(bz0b;WI9;e>l=CG9^n#ro`w>_0F$Q zfZ={2QyTkfByC&gy;x!r*NyXXbk=a%~~(#K?< zTke0HuF5{Q+~?@!KDXR|g+43$+;ab`^flS%miup_0OUTm=nIc%d5nLP)i308PIjl_YMF6cpQ__6&$n6it8K- z8PIjl_YMF6cpQ_!r)L8IivW`WdK8mBs6PXdjR2DYdK8nCs73=4j{uVadK8oNjwX|E wpAeHLsTu^*Y>Trk?aBtSQ(D-o$(D8Px^?ZI-PUB? z*1fv!{YdHme3Fc8%cR@*@zc5A_nq&2=R47Hp@$-JF4Fz*;SLw5}K^y>s-s;V!}b2i=5=M- zComP?ju>8Fe@=H@rlwe1l`J*6BTTo`9b$zjQ@HxrAhp0D#u?M~TxGC_!?ccCHCjt| zF*PgJf@kJB`|Ml}cmsyrAjO#Kjr^E5p29w+#>$C`Q|54BoDv$fQ9D?3n32P9LPMIzu?LjNqggOH=1@T{9bMn*u8(GI z!;MLTtFPHal^S>VcJdiYqX0VU|Rn@A}C1xOlxCribxes0~+n2 z6qDaIA2$?e`opx3_KW!rAgbpzU)gFdjAKXh|5w``#F0R|c)Y)Du0_Ihhz^S?k^pk% zP>9|pIDx)xHH^_~+aA=^$M!<8K~Hy(71nJGf6`HnjtS=4X4=Hk^O71oNia2V{HUCC zoN3RSBS?mZCLw;l4W4a+D8qc)XJS`pUJ5X-f^1ytxwr`@si$lAE?{4G|o; zO0l>`rr?;~c;{ZEFJ!!3=7=FdGJ?Q^xfNQh4A?i;IJ4}B+A?4olTK(fN++3CRBP97 ze~lG9h%oegkn)lpW-4F8o2`*WW0mZHwHez`ko@>U1_;EC_6ig|Drn@=DMV9YEUSCa zIf$kHei3(u#zm9I!Jf(4t`Vm1lltJ&lVHy(eIXE8sy9sUpmz%I_gA#8x^Zv8%w?r2 z{GdkX1SkzRIr>prRK@rqn9j2wG|rUvf6PJbbin=yy-TAXrguvzN8jL$hUrIXzr^s5 zVM?H4;eM-QeRFr06@ifV(ocvk?_)~N@1c2ien56UjWXid6W%6ievIh)>dk|rIs##^kY67ib8Kw%#-oVFaXG7$ERyA9(NSJUvWiOA5H(!{uOpcW zg&-?iqPhds%3%tFspHDqqr;A!e@B#iPQjHd=c>N1LoOEGRehVoPOdxJ>b6>yc#o#+ zl8s8!(|NMeqjsy@0x{8^j0d00SqRZjp{Kj)&4UHYGxG+z9b-)72I*&J70?+8e?p_@ z=>-(>l6z5vYlP~<2%DU02b!mA{7mS)NS_eLe=t)sm&+Pmk?asOEKlkPQ)EUvvfC=;4M&*|I!w}(@V_)eUKLA_t^%`o z0PM9LV|UKTLnk|?M3u!|f2S0?UqZsEIH9*NJS-8lzu;A6-rr-ot=dg9SASoluZUkFH$7X; zP=?kYX!K?JL-b~<#7wU;b;eS)O;@?h%sPPk{4xEBxb{!sm0AY|f9cNvx6>$3F!*0c z75H=dy8JvTyO8}g1w{$9T$p~5en}AeSLoCF>_RT9YPMpChUjl310o*$QocjbH& zbnwg#gssR#jDVN{uEi3n(PZ%PFZ|6J2 z5_rBf0-u>e4sFe0*Km49ATi7>Kn0f9!uc|rRMR1Dtt6m1LW8^>qFlo}h$@br=Rmpi z;mI&>OF64Be{dVeHI8utrh)v^wsZ0jii%x8UgZ8TC%K~@I(4E};GFW&(;WVov}3%H zH;IhRkfD^(vt^DjZz(MyHLZxv8}qzPc(%itBkBwf_fC~sDBgh<3XAv5cxxfF3<2U! z03Xe&z`is!JDHbe;mNmfkH+_LFE*I2^mdL@7(@9DfAcP6O04V-ko;Rpgp<%Cj5r8Z zd0`sXoIjV$j)--;jA6Zy^D5&5v$o^>e%>Q?9GLm{i~p^lAn!%ZtF$I~>39XVZxk0b zROh^Bk9cE0AJBLozZIEmy7xG(yHWGztvfnr0(2ro1%>zsGMS^EMu+S$r=_;9 zWwZkgf7Q7`H9sLf2Go^Xy6&h~a&%s2_T@_Csf19MntF$aVFiFkvE3_hUg(B@&Xw@YJ zpL$wNYf78=0c@!QU6_a$>CPiXT7QAGDM}7Z(0z#_ZA=fmLUj{2z7@Ypo71UDy8GHr z-&TLKf6a5WCf@Adle3VglBt4>Z>;xF}}-S~B7<(%B;Y z0QR55{z-buw>8ilNM3u6I+D$S%?)(p>=eBx-HpvZj{7c*_?K=d()*7q?93us}1dq%FAFYLsW8ZTQ_XZLh`P2*6(NgS}qGcfGXVWpwsp#Rs}IuKbk*`2}&) zI^Vsk6S&Q4@oYS?dJ`NwMVBs6f57+RxdqVub#PvMu?$=^OJy5xEl0<5SLsSRy%%a0 zi}Y#1-F3m;Ieh#Y12UgW?-R)|eX>ZuF-2cc!1>~NS|XSF-6In>zBoZg+ml!6%fk7U zw0LHcz8VQk(jOJ+Yu)|^|15ufl$KQd_1eUZZzj`aC%umU6F1&D5XVWce_wAe(qCSZ zpX-QF4e{EmEVN9~6%bR5U*UT{eMHfcUo`jw*u?4r2s_$`}U{?NjvEm(u&<>B|%mq$Q3weshxk z76<``8vh{+nX`@9CB6IE&z)I%IFjR^LH{s1p|eppv=x za(g_jLU|xjWMAn-V7th$f({|LG8zzIE0g?cyW;%Dmtv%C+0@xVxPE^ zyZzi9P%JAD6ynwHptuzP`Kox7*9h7XSMonCalv;Md0i9Vb-c*!f0ubfk?&T&T}AHh z4m8Bz{JllKcdNg?D^%a5MFQ;#1z|*}H^qHLzW)L}wp?2tY7RejtSh8<;Zw)QGJYUm z|MbTxyj*McKlStlT9I5XlSWtQGN&-LTr2XyNU+`490rg?LYLMRnz-@oKqT1hpCGqP zyRXt4=_Woj$%n5ee<3zhLF>5>`?m9a#xQH+Jk_+|RM8Vi;2*XbK- zEL6sCpaGPzP>k8f4Kh|##_imt#zJMB;ir|JrMPGW`rityK1vHXMLy18%qmMQAm4WZ zP)i30KR&5vs15)C+8dM66&$k~i|ZT;KR&5vs15)C+8dJ(sAmGPijyIz6_bsqKLSFH zlOd=TljEpH0>h4zA*dCTK&emy#FCRCs1=i^sZ9bFmXjf<6_X39E(XY)00000#N437 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' } From d85e09dda3b5aa2d382e2b8b1825d8aa2212b682 Mon Sep 17 00:00:00 2001 From: lordIcocain <62835225+lordIcocain@users.noreply.github.com> Date: Thu, 26 Dec 2024 20:11:43 +0200 Subject: [PATCH 5/7] Add Fluid Void Cell (#234) Co-authored-by: Martin Robertz --- .../common/item/ItemFluidVoidStorageCell.java | 136 ++++++++++++++++++ .../common/storage/FluidCellInventory.java | 3 + .../FluidVoidStorageCellInventory.java | 115 +++++++++++++++ .../github/loader/ItemAndBlockHolder.java | 2 + .../glodblock/github/loader/RecipeLoader.java | 15 ++ .../com/glodblock/github/util/NameConst.java | 2 + .../resources/assets/ae2fc/lang/en_US.lang | 2 + .../textures/items/fluid_storage.void.png | Bin 0 -> 548 bytes 8 files changed, 275 insertions(+) create mode 100644 src/main/java/com/glodblock/github/common/item/ItemFluidVoidStorageCell.java create mode 100644 src/main/java/com/glodblock/github/common/storage/FluidVoidStorageCellInventory.java create mode 100644 src/main/resources/assets/ae2fc/textures/items/fluid_storage.void.png diff --git a/src/main/java/com/glodblock/github/common/item/ItemFluidVoidStorageCell.java b/src/main/java/com/glodblock/github/common/item/ItemFluidVoidStorageCell.java new file mode 100644 index 00000000..92719798 --- /dev/null +++ b/src/main/java/com/glodblock/github/common/item/ItemFluidVoidStorageCell.java @@ -0,0 +1,136 @@ +package com.glodblock.github.common.item; + +import java.util.EnumSet; +import java.util.List; + +import net.minecraft.client.gui.GuiScreen; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.inventory.IInventory; +import net.minecraft.item.ItemStack; + +import com.glodblock.github.FluidCraft; +import com.glodblock.github.api.FluidCraftAPI; +import com.glodblock.github.common.storage.IFluidCellInventory; +import com.glodblock.github.common.storage.IFluidCellInventoryHandler; +import com.glodblock.github.common.storage.IStorageFluidCell; +import com.glodblock.github.common.tabs.FluidCraftingTabs; +import com.glodblock.github.loader.IRegister; +import com.glodblock.github.util.NameConst; + +import appeng.api.AEApi; +import appeng.api.config.FuzzyMode; +import appeng.api.storage.IMEInventoryHandler; +import appeng.api.storage.StorageChannel; +import appeng.api.storage.data.IAEFluidStack; +import appeng.core.features.AEFeature; +import appeng.core.localization.GuiText; +import appeng.items.AEBaseItem; +import appeng.items.contents.CellConfig; +import appeng.items.contents.CellUpgrades; +import appeng.util.Platform; +import cpw.mods.fml.common.registry.GameRegistry; + +public class ItemFluidVoidStorageCell extends AEBaseItem + implements IStorageFluidCell, IRegister { + + public ItemFluidVoidStorageCell() { + super(); + setUnlocalizedName(NameConst.ITEM_FLUID_VOID_CELL); + setTextureName(FluidCraft.resource(NameConst.ITEM_FLUID_VOID_CELL).toString()); + this.setFeature(EnumSet.of(AEFeature.StorageCells)); + this.setMaxStackSize(1); + } + + @Override + public ItemFluidVoidStorageCell register() { + GameRegistry.registerItem(this, NameConst.ITEM_FLUID_VOID_CELL, FluidCraft.MODID); + setCreativeTab(FluidCraftingTabs.INSTANCE); + return this; + } + + @Override + public void addCheckedInformation(final ItemStack stack, final EntityPlayer player, final List lines, + final boolean displayMoreInfo) { + final IMEInventoryHandler inventory = AEApi.instance().registries().cell() + .getCellInventory(stack, null, StorageChannel.FLUIDS); + if (inventory instanceof final IFluidCellInventoryHandler handler) { + lines.add(NameConst.i18n(NameConst.TT_ITEM_FLUID_VOID_CELL)); + lines.add(GuiText.VoidCellTooltip.getLocal()); + lines.add(0 + " " + GuiText.Of.getLocal() + " \u00A7k9999\u00A77 " + GuiText.BytesUsed.getLocal()); + final IFluidCellInventory inv = handler.getCellInv(); + if (GuiScreen.isShiftKeyDown()) { + lines.add(GuiText.Filter.getLocal() + ": "); + for (int i = 0; i < inv.getConfigInventory().getSizeInventory(); ++i) { + ItemStack s = inv.getConfigInventory().getStackInSlot(i); + if (s != null) lines.add(s.getDisplayName()); + } + } + } + } + + @Override + public long getBytes(ItemStack cellItem) { + return 0; + } + + @Override + public int getBytesPerType(ItemStack cellItem) { + return 0; + } + + @Override + public boolean isBlackListed(ItemStack cellItem, IAEFluidStack requestedAddition) { + return requestedAddition == null || requestedAddition.getFluid() == null + || FluidCraftAPI.instance().isBlacklistedInStorage(requestedAddition.getFluid().getClass()); + } + + @Override + public boolean storableInStorageCell() { + return true; + } + + @Override + public boolean isStorageCell(ItemStack i) { + return true; + } + + @Override + public double getIdleDrain(ItemStack is) { + return 0; + } + + @Override + public int getTotalTypes(ItemStack cellItem) { + return 0; + } + + @Override + public boolean isEditable(ItemStack is) { + return true; + } + + @Override + public IInventory getUpgradesInventory(ItemStack is) { + return new CellUpgrades(is, 0); + } + + @Override + public IInventory getConfigInventory(ItemStack is) { + return new CellConfig(is); + } + + @Override + public FuzzyMode getFuzzyMode(ItemStack is) { + final String fz = Platform.openNbtData(is).getString("FuzzyMode"); + try { + return FuzzyMode.valueOf(fz); + } catch (final Throwable t) { + return FuzzyMode.IGNORE_ALL; + } + } + + @Override + public void setFuzzyMode(ItemStack is, FuzzyMode fzMode) { + Platform.openNbtData(is).setString("FuzzyMode", fzMode.name()); + } +} diff --git a/src/main/java/com/glodblock/github/common/storage/FluidCellInventory.java b/src/main/java/com/glodblock/github/common/storage/FluidCellInventory.java index 893174d5..979b0237 100644 --- a/src/main/java/com/glodblock/github/common/storage/FluidCellInventory.java +++ b/src/main/java/com/glodblock/github/common/storage/FluidCellInventory.java @@ -13,6 +13,7 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraftforge.fluids.FluidStack; import com.glodblock.github.common.item.ItemBaseInfinityStorageCell; +import com.glodblock.github.common.item.ItemFluidVoidStorageCell; import com.glodblock.github.crossmod.extracells.storage.ProxyFluidCellInventory; import com.glodblock.github.crossmod.extracells.storage.ProxyFluidStorageCell; @@ -86,6 +87,8 @@ public class FluidCellInventory implements IFluidCellInventory { return new FluidCellInventoryHandler(new CreativeFluidCellInventory(o, container2)); } else if (o.getItem() instanceof ProxyFluidStorageCell) { return new FluidCellInventoryHandler(new ProxyFluidCellInventory(o, container2)); + } else if (o.getItem() instanceof ItemFluidVoidStorageCell) { + return new FluidCellInventoryHandler(new FluidVoidStorageCellInventory(o, container2)); } else { return new FluidCellInventoryHandler(new FluidCellInventory(o, container2)); } diff --git a/src/main/java/com/glodblock/github/common/storage/FluidVoidStorageCellInventory.java b/src/main/java/com/glodblock/github/common/storage/FluidVoidStorageCellInventory.java new file mode 100644 index 00000000..21fe409d --- /dev/null +++ b/src/main/java/com/glodblock/github/common/storage/FluidVoidStorageCellInventory.java @@ -0,0 +1,115 @@ +package com.glodblock.github.common.storage; + +import java.util.List; + +import javax.annotation.Nonnull; + +import net.minecraft.item.ItemStack; + +import appeng.api.config.Actionable; +import appeng.api.exceptions.AppEngException; +import appeng.api.networking.security.BaseActionSource; +import appeng.api.storage.ISaveProvider; +import appeng.api.storage.data.IAEFluidStack; +import appeng.api.storage.data.IItemList; + +public class FluidVoidStorageCellInventory extends FluidCellInventory { + + public FluidVoidStorageCellInventory(ItemStack o, ISaveProvider container) throws AppEngException { + super(o, container); + } + + @Override + public boolean canHoldNewFluid() { + return true; + } + + @Override + public long getTotalBytes() { + return 0; + } + + @Override + public long getFreeBytes() { + return 0; + } + + @Override + public long getUsedBytes() { + return 0; + } + + @Override + public long getTotalFluidTypes() { + return 63; + } + + @Override + public long getStoredFluidCount() { + return 0; + } + + @Override + public long getStoredFluidTypes() { + return 0; + } + + @Override + public long getRemainingFluidTypes() { + return 63; + } + + @Override + public long getRemainingFluidCount() { + return Long.MAX_VALUE; + } + + @Override + public int getUnusedFluidCount() { + return Integer.MAX_VALUE; + } + + @Override + public int getStatusForCell() { + return 1; + } + + @Override + protected void loadCellFluids() {} + + @Override + protected IItemList getCellFluids() { + return null; + } + + @Override + public IAEFluidStack injectItems(IAEFluidStack input, Actionable mode, BaseActionSource src) { + if (input == null || input.getStackSize() == 0) { + return null; + } + if (this.cellType.isBlackListed(this.cellItem, input)) { + return input; + } + 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 List getContents() { + return null; + } +} diff --git a/src/main/java/com/glodblock/github/loader/ItemAndBlockHolder.java b/src/main/java/com/glodblock/github/loader/ItemAndBlockHolder.java index 15f5cbd5..605107eb 100644 --- a/src/main/java/com/glodblock/github/loader/ItemAndBlockHolder.java +++ b/src/main/java/com/glodblock/github/loader/ItemAndBlockHolder.java @@ -29,6 +29,7 @@ import com.glodblock.github.common.item.ItemFluidLevelEmitter; import com.glodblock.github.common.item.ItemFluidPacket; import com.glodblock.github.common.item.ItemFluidStorageHousing; import com.glodblock.github.common.item.ItemFluidStorageMonitor; +import com.glodblock.github.common.item.ItemFluidVoidStorageCell; import com.glodblock.github.common.item.ItemInfinityWaterStorageCell; import com.glodblock.github.common.item.ItemMultiFluidStorageCell; import com.glodblock.github.common.item.ItemPartFluidInterface; @@ -140,6 +141,7 @@ public class ItemAndBlockHolder { 16384, 5, 600000D).register(); + public static ItemFluidVoidStorageCell FLUID_VOID_CELL = new ItemFluidVoidStorageCell().register(); public static ItemCreativeFluidStorageCell CREATIVE_CELL = new ItemCreativeFluidStorageCell().register(); public static ItemInfinityWaterStorageCell INFINITY_WATER_CELL = new ItemInfinityWaterStorageCell().register(); public static ItemBasicFluidStoragePart CELL_PART = new ItemBasicFluidStoragePart().register(); diff --git a/src/main/java/com/glodblock/github/loader/RecipeLoader.java b/src/main/java/com/glodblock/github/loader/RecipeLoader.java index 86dd882d..1f2a8417 100644 --- a/src/main/java/com/glodblock/github/loader/RecipeLoader.java +++ b/src/main/java/com/glodblock/github/loader/RecipeLoader.java @@ -37,6 +37,7 @@ import static com.glodblock.github.loader.ItemAndBlockHolder.FLUID_STORAGE_MONIT import static com.glodblock.github.loader.ItemAndBlockHolder.FLUID_TERM; import static com.glodblock.github.loader.ItemAndBlockHolder.FLUID_TERMINAL; import static com.glodblock.github.loader.ItemAndBlockHolder.FLUID_TERMINAL_EX; +import static com.glodblock.github.loader.ItemAndBlockHolder.FLUID_VOID_CELL; import static com.glodblock.github.loader.ItemAndBlockHolder.INFINITY_WATER_CELL; import static com.glodblock.github.loader.ItemAndBlockHolder.INTERFACE; import static com.glodblock.github.loader.ItemAndBlockHolder.LARGE_BUFFER; @@ -505,6 +506,20 @@ public class RecipeLoader implements Runnable { QUANTUM_CELL, 'M', AE2_MATTER_CONDENSER)); + GameRegistry.addRecipe( + new ShapedOreRecipe( + FLUID_VOID_CELL, + "ABA", + "BDB", + "CCC", + 'A', + AE2_QUARTZ_GLASS, + 'B', + "dustGlowstone", + 'C', + "gemDiamond", + 'D', + AE2_SINGULARITY)); for (FCBaseItemCell cell : cells) { if (cell.getHousing().getItemDamage() == 0) { GameRegistry.addRecipe( diff --git a/src/main/java/com/glodblock/github/util/NameConst.java b/src/main/java/com/glodblock/github/util/NameConst.java index 93852815..e6e46040 100644 --- a/src/main/java/com/glodblock/github/util/NameConst.java +++ b/src/main/java/com/glodblock/github/util/NameConst.java @@ -40,6 +40,7 @@ public class NameConst { public static final String ITEM_MULTI_FLUID_STORAGE = "multi_fluid_storage"; public static final String ITEM_QUANTUM_FLUID_STORAGE = ITEM_FLUID_STORAGE + ".quantum"; public static final String ITEM_SINGULARITY_FLUID_STORAGE = ITEM_FLUID_STORAGE + ".singularity"; + public static final String ITEM_FLUID_VOID_CELL = ITEM_FLUID_STORAGE + ".void"; public static final String ITEM_ARTIFICIAL_UNIVERSE_STORAGE = ITEM_FLUID_STORAGE + ".Universe"; public static final String ITEM_INFINITY_FLUID_STORAGE = ITEM_FLUID_STORAGE + ".infinity"; public static final String ITEM_INFINITY_WATER_FLUID_STORAGE = ITEM_INFINITY_FLUID_STORAGE + ".water"; @@ -103,6 +104,7 @@ public class NameConst { public static final String TT_ENERGY_CARD_DESC = TT_ENERGY_CARD + ".desc"; public static final String TT_QUANTUM_BRIDGE_CARD = TT_KEY + "quantum_bridge_card"; public static final String TT_QUANTUM_BRIDGE_CARD_DESC = TT_QUANTUM_BRIDGE_CARD + ".desc"; + public static final String TT_ITEM_FLUID_VOID_CELL = TT_KEY + ITEM_FLUID_VOID_CELL; public static final String WAILA_KEY = FluidCraft.MODID + ".waila."; public static final String WAILA_ENABLE = WAILA_KEY + "enable"; diff --git a/src/main/resources/assets/ae2fc/lang/en_US.lang b/src/main/resources/assets/ae2fc/lang/en_US.lang index 63433d1c..3df32655 100644 --- a/src/main/resources/assets/ae2fc/lang/en_US.lang +++ b/src/main/resources/assets/ae2fc/lang/en_US.lang @@ -46,6 +46,7 @@ item.multi_fluid_storage.4096.name=%s4096k%s ME Multi-Fluid Storage Cell item.multi_fluid_storage.16384.name=%s16384k%s ME Multi-Fluid Storage Cell item.fluid_storage.quantum.name=ME Fluid Quantum Storage Cell item.fluid_storage.singularity.name=ME Fluid Digital Singularity Storage Cell +item.fluid_storage.void.name=ME Fluid Void Cell item.fluid_storage.Universe.name=ME Fluid Artificial Universe Storage Cell item.fluid_storage.infinity.water.name=ME Fluid Infinity Water Storage Cell item.fluid_part.0.name=%s1k%s ME Fluid Storage Component @@ -114,6 +115,7 @@ ae2fc.tooltip.ultra_terminal=Right click + sneaking to switch mode. ae2fc.tooltip.ultra_terminal.tips=ToolTips: ae2fc.tooltip.ultra_terminal.tips.desc=1.You can put it to baubles slot and use hotkey to open.\n2.Interface mode hold §3Shift§7 toggle interface renamer button.\n3.When you are in the crafting plan screen.\nHold §3Shift§7 click cancel button will automatically add missing items to NEI bookmark. ae2fc.tooltip.infinity_fluid=§aInfinity§r +ae2fc.tooltip.fluid_storage.void=Where nothing is everything, and everything is nothing ae2fc.tooltip.quantum_bridge_card.desc=Allows wireless terminals to connect to a quantum bridge, allowing for unlimited range ae2fc.tooltip.energy_card.desc=Infinity Energy for the Wireless Terminal diff --git a/src/main/resources/assets/ae2fc/textures/items/fluid_storage.void.png b/src/main/resources/assets/ae2fc/textures/items/fluid_storage.void.png new file mode 100644 index 0000000000000000000000000000000000000000..d834c4ab4744b1c3be75a001da6001669d6a899a GIT binary patch literal 548 zcmV+<0^9wGP)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGqB>(^xB>_oNB=7(L0l7&;K~y+Tm6J;- zL{S*WzZtXh$U@4VY-S~knVoB6JTgp7G?G%ocuhv$%0`qVuUHuGvamo|c$8OJ+<7$F z2#dQ>Qe!BR&D8ukr+c}~82swH_nhy1|Npt?aVZ}5LM!S`7RcTI(OOaq(J8{?^q{e* z>VGE9#WnDC`4Bt^;_>7W-VQJ9g_VCZah2A?-|ff!;XUfCbui`{5jqR;ujwss!SUd+ zPA-k6r>qH*Tf)Q918f!>n~{e}FhSatAhwAZvGxN54Hu|ko5c#A#3vNw6?}-5Fyt5z zJPY#WIEt%Tj-zFd_6j>vlhaA7(^B{~O#3JMd{B)T5Gf&?KpL%vQWMj;hUK{dV{B@U z7O%$X=J1Bh`DQu$iLKN|(vC!Hm(w&nIU#3N2HP{sH0xfcjSDx8mXDHP6yy;ieU_da z*$!I0o~Ft96<+%Vwtn0JTm4J?-EDT@eCQm4L4ZC}kJHXmexcMgQ5P&$L0}*Nf1e*i zl|Avr3g1m!6%FXMIuW^z{4Q2do3Nc`!P*(`hySZsK`~Jb;>{d=qhy#MB`J-!pI<_> mu($bR?T@hEnT6bq0nr Date: Thu, 26 Dec 2024 12:13:41 -0600 Subject: [PATCH 6/7] update --- dependencies.gradle | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/dependencies.gradle b/dependencies.gradle index 601563d9..ffbac2b9 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.51-GTNH:dev') - api('com.github.GTNewHorizons:Applied-Energistics-2-Unofficial:rv3-beta-502-GTNH:dev') + api('com.github.GTNewHorizons:NotEnoughItems:2.7.4-GTNH:dev') + api('com.github.GTNewHorizons:Applied-Energistics-2-Unofficial:rv3-beta-507-GTNH:dev') api('curse.maven:cofh-core-69162:2388751') api('com.github.GTNewHorizons:waila:1.8.2:dev') @@ -43,12 +43,12 @@ dependencies { exclude group: 'com.github.GTNewHorizons', module: 'Applied-Energistics-2-Unofficial' } - compileOnly("com.github.GTNewHorizons:GTNHLib:0.5.22:dev") { transitive = false } + compileOnly("com.github.GTNewHorizons:GTNHLib:0.6.0: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.19:dev') - compileOnly('com.github.GTNewHorizons:EnderIO:2.8.22:dev') - compileOnly('com.github.GTNewHorizons:GT5-Unofficial:5.09.51.10:dev') { + compileOnly('com.github.GTNewHorizons:ForestryMC:4.10.0:dev') + compileOnly('com.github.GTNewHorizons:EnderIO:2.9.0:dev') + compileOnly('com.github.GTNewHorizons:GT5-Unofficial:5.09.51.29:dev') { exclude group: 'com.github.GTNewHorizons', module: 'AE2FluidCraft-Rework' exclude group: 'com.github.GTNewHorizons', module: 'Applied-Energistics-2-Unofficial' } @@ -56,9 +56,9 @@ dependencies { 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.11.1-GTNH:dev') { transitive = false } - compileOnly('com.github.GTNewHorizons:ThaumicEnergistics:1.6.27-GTNH:dev') { transitive = false } - compileOnly("com.github.GTNewHorizons:Hodgepodge:2.6.2:dev") { transitive = false } + compileOnly('com.github.GTNewHorizons:ThaumicEnergistics:1.7.0-GTNH:dev') { transitive = false } + compileOnly("com.github.GTNewHorizons:Hodgepodge:2.6.6:dev") { transitive = false } runtimeOnlyNonPublishable("com.github.GTNewHorizons:DuraDisplay:1.3.4:dev") - runtimeOnlyNonPublishable("com.github.GTNewHorizons:GTNHLib:0.5.22:dev") + runtimeOnlyNonPublishable("com.github.GTNewHorizons:GTNHLib:0.6.0:dev") } From e0aed44bcf9c456fe682e5b0bf18f0248b6dffe3 Mon Sep 17 00:00:00 2001 From: lordIcocain <62835225+lordIcocain@users.noreply.github.com> Date: Fri, 27 Dec 2024 00:11:02 +0200 Subject: [PATCH 7/7] Skip this side check if fluid conduit not connected. (#249) Co-authored-by: Martin Robertz --- .../FluidConvertingInventoryAdaptor.java | 32 ++++++++++++++----- 1 file changed, 24 insertions(+), 8 deletions(-) diff --git a/src/main/java/com/glodblock/github/inventory/FluidConvertingInventoryAdaptor.java b/src/main/java/com/glodblock/github/inventory/FluidConvertingInventoryAdaptor.java index 875b9b1d..f4500f45 100644 --- a/src/main/java/com/glodblock/github/inventory/FluidConvertingInventoryAdaptor.java +++ b/src/main/java/com/glodblock/github/inventory/FluidConvertingInventoryAdaptor.java @@ -44,7 +44,9 @@ import appeng.util.InventoryAdaptor; import appeng.util.inv.IInventoryDestination; import appeng.util.inv.ItemSlot; import cofh.api.transport.IItemDuct; +import crazypants.enderio.conduit.ConnectionMode; import crazypants.enderio.conduit.item.IItemConduit; +import crazypants.enderio.conduit.liquid.ILiquidConduit; import gregtech.api.interfaces.metatileentity.IMetaTileEntity; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; import gregtech.api.metatileentity.MetaPipeEntity; @@ -274,14 +276,19 @@ public class FluidConvertingInventoryAdaptor extends InventoryAdaptor { boolean anyValid = false; for (ForgeDirection dir : ForgeDirection.VALID_DIRECTIONS) { // Avoid sending stuff into itself me network - if (checkValidSide(this.posInterface.getOffSet(dir).getTileEntity(), dir) - && !isItemConduit(this.posInterface.getOffSet(dir).getTileEntity())) { - final int result = checkItemFluids(this.getSideFluid(dir), this.getSideItem(dir), dir.getOpposite()); - if (result == 1) { - return true; - } - if (result != 2) { - anyValid = true; + TileEntity te = this.posInterface.getOffSet(dir).getTileEntity(); + if (te != null && checkValidSide(te, dir)) { + if (!isConduit(te) || (!isItemConduit(te) && isFluidConduitConnected(te, dir))) { + final int result = checkItemFluids( + this.getSideFluid(dir), + this.getSideItem(dir), + dir.getOpposite()); + if (result == 1) { + return true; + } + if (result != 2) { + anyValid = true; + } } } } @@ -356,6 +363,15 @@ public class FluidConvertingInventoryAdaptor extends InventoryAdaptor { return false; } + private boolean isFluidConduitConnected(TileEntity te, ForgeDirection dir) { + try { + ILiquidConduit liquidConduit = (ILiquidConduit) eioTypeCheck.invoke(te, ILiquidConduit.class); + return liquidConduit.getConnectionMode(dir.getOpposite()) != ConnectionMode.DISABLED; + } catch (IllegalAccessException | InvocationTargetException e) { + return false; + } + } + private boolean isItemConduit(TileEntity te) { if (ModAndClassUtil.EIO && conduitClazz.isInstance(te)) { try {