Merge remote-tracking branch 'Inphysible/p2pinterface-share-configandstorage-inventory' into dev

# Conflicts:
#	dependencies.gradle
This commit is contained in:
Martin Robertz committed 2025-06-29 13:38:50 +02:00
commit aef5b25b34
2 files changed
+7 -6

No files matched your search

+4 -4
View File
@@ -35,9 +35,9 @@
*/
dependencies {
api('com.github.GTNewHorizons:NotEnoughItems:2.7.59-GTNH:dev')
api('com.github.GTNewHorizons:Applied-Energistics-2-Unofficial:rv3-beta-646-GTNH-pre:dev')
api('com.github.GTNewHorizons:Applied-Energistics-2-Unofficial:rv3-beta-649-GTNH:dev')
api('curse.maven:cofh-core-69162:2388751')
api('com.github.GTNewHorizons:waila:1.8.8:dev')
api('com.github.GTNewHorizons:waila:1.8.10:dev')
api("com.github.GTNewHorizons:GTNHLib:0.6.32:dev")
implementation("com.github.GTNewHorizons:WirelessCraftingTerminal:1.12.6:dev") {
@@ -48,7 +48,7 @@ dependencies {
compileOnly('com.github.GTNewHorizons:ExtraCells2:2.5.35:dev') { transitive = false }
compileOnly('com.github.GTNewHorizons:ForestryMC:4.10.13:dev')
compileOnly('com.github.GTNewHorizons:EnderIO:2.9.18:dev')
compileOnly('com.github.GTNewHorizons:GT5-Unofficial:5.09.51.357:dev') {
compileOnly('com.github.GTNewHorizons:GT5-Unofficial:5.09.51.362:dev') {
exclude group: 'com.github.GTNewHorizons', module: 'AE2FluidCraft-Rework'
exclude group: 'com.github.GTNewHorizons', module: 'Applied-Energistics-2-Unofficial'
}
@@ -56,7 +56,7 @@ 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.16-GTNH:dev') { transitive = false }
compileOnly('com.github.GTNewHorizons:ThaumicEnergistics:1.7.7-GTNH:dev') { transitive = false }
compileOnly('com.github.GTNewHorizons:ThaumicEnergistics:1.7.8-GTNH:dev') { transitive = false }
compileOnly("com.github.GTNewHorizons:Hodgepodge:2.6.83:dev") { transitive = false }
runtimeOnlyNonPublishable("com.github.GTNewHorizons:DuraDisplay:1.3.4:dev")
@@ -248,7 +248,7 @@ public class PartFluidP2PInterface extends PartP2PTunnelStatic<PartFluidP2PInter
@Override
public boolean onPartActivate(final EntityPlayer player, final Vec3 pos) {
AppEngInternalInventory patterns = (AppEngInternalInventory) this.duality.getPatterns();
AppEngInternalInventory storageAppEng = this.duality.getStorage();
final boolean wasActive = getProxy().isActive();
if (!isOutput()) {
final ItemStack is = player.inventory.getCurrentItem();
@@ -271,7 +271,8 @@ public class PartFluidP2PInterface extends PartP2PTunnelStatic<PartFluidP2PInter
drops.add(patterns.getStackInSlot(i));
}
if (!duality.sharedInventory) {
if (!duality.sharedInventory && !wasActive) {
AppEngInternalInventory storageAppEng = this.duality.getStorage();
for (int i = 0; i < NUMBER_OF_STORAGE_SLOTS; i++) {
if (storageAppEng.getStackInSlot(i) == null) continue;
drops.add(storageAppEng.getStackInSlot(i));