upstream/AE2FluidCraft-Rework
1
0 Fork 0
mirror of https://github.com/GTNewHorizons/AE2FluidCraft-Rework.git synced 2026-11-15 09:34:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into fluid_void_cell

Browse Source
This commit is contained in:
Martin Robertz authored and GitHub committed 2024-11-07 23:51:29 +01:00
2 parents 6e64864af5 12ebe0b55a
commit 3f83676487
2 files changed
+11 -12
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

dependencies.gradle
+7 -7
View File
@@ -34,19 +34,19 @@
* 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.42-GTNH:dev')
api('com.github.GTNewHorizons:Applied-Energistics-2-Unofficial:rv3-beta-469-GTNH:dev')
api('com.github.GTNewHorizons:NotEnoughItems:2.6.44-GTNH:dev')
api('com.github.GTNewHorizons:Applied-Energistics-2-Unofficial:rv3-beta-471-GTNH:dev')
api('curse.maven:cofh-core-69162:2388751')
api('com.github.GTNewHorizons:waila:1.8.1:dev')
implementation("com.github.GTNewHorizons:WirelessCraftingTerminal:1.11.7:dev")
compileOnly("com.github.GTNewHorizons:GTNHLib:0.5.15:dev") { transitive = false }
compileOnly("com.github.GTNewHorizons:GTNHLib:0.5.18: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.16:dev')
compileOnly('com.github.GTNewHorizons:EnderIO:2.8.18:dev')
compileOnly('com.github.GTNewHorizons:GT5-Unofficial:5.09.50.46:dev') {
compileOnly('com.github.GTNewHorizons:EnderIO:2.8.20:dev')
compileOnly('com.github.GTNewHorizons:GT5-Unofficial:5.09.50.54:dev') {
exclude group: 'com.github.GTNewHorizons', module: 'AE2FluidCraft-Rework'
}
@@ -54,8 +54,8 @@ dependencies {
compileOnly('com.gregoriust.gregtech:gregtech_1.7.10:6.14.23:dev') { transitive = false }
compileOnly('com.github.GTNewHorizons:OpenComputers:1.10.26-GTNH:dev') { transitive = false }
compileOnly('com.github.GTNewHorizons:ThaumicEnergistics:1.6.26-GTNH:dev') { transitive = false }
compileOnly("com.github.GTNewHorizons:Hodgepodge:2.5.73:dev") { transitive = false }
compileOnly("com.github.GTNewHorizons:Hodgepodge:2.5.74:dev") { transitive = false }
runtimeOnlyNonPublishable("com.github.GTNewHorizons:DuraDisplay:1.3.4:dev")
runtimeOnlyNonPublishable("com.github.GTNewHorizons:GTNHLib:0.5.15:dev")
runtimeOnlyNonPublishable("com.github.GTNewHorizons:GTNHLib:0.5.18:dev")
}
src/main/java/com/glodblock/github/inventory/FluidConvertingInventoryAdaptor.java
+4 -5
View File
@@ -31,9 +31,7 @@ import com.glodblock.github.util.Util;
import appeng.api.config.FuzzyMode;
import appeng.api.config.InsertionMode;
import appeng.api.config.Settings;
import appeng.api.config.Upgrades;
import appeng.api.config.YesNo;
import appeng.api.parts.IPart;
import appeng.helpers.DualityInterface;
import appeng.helpers.IInterfaceHost;
@@ -101,9 +99,10 @@ public class FluidConvertingInventoryAdaptor extends InventoryAdaptor {
|| Util.getPart(inter, face.getOpposite()) instanceof PartFluidExportBus
|| Util.getPart(inter, face.getOpposite()) instanceof PartFluidP2PInterface))
return InventoryAdaptor.getAdaptor(capProvider, face);
if (InventoryAdaptor.getAdaptor(capProvider, face) == null) {
if (InventoryAdaptor.getAdaptor(capProvider, face) == null
&& !(ModAndClassUtil.EIO && capProvider instanceof IItemDuct)) {
if (capProvider instanceof IFluidHandler tank) {
if (!(tank.getTankInfo(face).length > 0)) return null;
if (tank.getTankInfo(face) == null || !(tank.getTankInfo(face).length > 0)) return null;
} else {
return null;
}
@@ -112,7 +111,7 @@ public class FluidConvertingInventoryAdaptor extends InventoryAdaptor {
IFluidHandler fluid = capProvider instanceof IFluidHandler ? (IFluidHandler) capProvider : null;
boolean onmi = false;
if (inter instanceof TileInterface in) {
if (in.getConfigManager().getSetting(Settings.BLOCK) == YesNo.NO) onmi = in.getTargets().size() > 1;
onmi = in.getTargets().size() > 1;
}
return new FluidConvertingInventoryAdaptor(capProvider, item, fluid, face, new BlockPos(inter), onmi);
}