From c853dbc30d115f80e8ea08e4e64af2bcf806fc67 Mon Sep 17 00:00:00 2001 From: lordIcocain <62835225+lordIcocain@users.noreply.github.com> Date: Fri, 24 Jan 2025 01:26:37 +0200 Subject: [PATCH 1/2] Allow exotic cells use upgrade cards (#264) --- .../github/common/item/ItemFluidVoidStorageCell.java | 2 +- src/main/java/com/glodblock/github/proxy/CommonProxy.java | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/glodblock/github/common/item/ItemFluidVoidStorageCell.java b/src/main/java/com/glodblock/github/common/item/ItemFluidVoidStorageCell.java index 92719798..1e2d7720 100644 --- a/src/main/java/com/glodblock/github/common/item/ItemFluidVoidStorageCell.java +++ b/src/main/java/com/glodblock/github/common/item/ItemFluidVoidStorageCell.java @@ -111,7 +111,7 @@ public class ItemFluidVoidStorageCell extends AEBaseItem @Override public IInventory getUpgradesInventory(ItemStack is) { - return new CellUpgrades(is, 0); + return new CellUpgrades(is, 5); } @Override diff --git a/src/main/java/com/glodblock/github/proxy/CommonProxy.java b/src/main/java/com/glodblock/github/proxy/CommonProxy.java index d727a01c..f26d32e2 100644 --- a/src/main/java/com/glodblock/github/proxy/CommonProxy.java +++ b/src/main/java/com/glodblock/github/proxy/CommonProxy.java @@ -67,6 +67,7 @@ public class CommonProxy { Upgrades.INVERTER.registerItem(new ItemStack(ItemAndBlockHolder.FLUID_STORAGE_BUS), 1); Upgrades.STICKY.registerItem(new ItemStack(ItemAndBlockHolder.FLUID_STORAGE_BUS), 1); + Upgrades.STICKY.registerItem(new ItemStack(ItemAndBlockHolder.FLUID_VOID_CELL), 1); Upgrades.STICKY.registerItem(new ItemStack(ItemAndBlockHolder.CELL1K), 1); Upgrades.STICKY.registerItem(new ItemStack(ItemAndBlockHolder.CELL4K), 1); Upgrades.STICKY.registerItem(new ItemStack(ItemAndBlockHolder.CELL16K), 1); @@ -75,6 +76,8 @@ public class CommonProxy { Upgrades.STICKY.registerItem(new ItemStack(ItemAndBlockHolder.CELL1024K), 1); Upgrades.STICKY.registerItem(new ItemStack(ItemAndBlockHolder.CELL4096K), 1); Upgrades.STICKY.registerItem(new ItemStack(ItemAndBlockHolder.CELL16384K), 1); + Upgrades.STICKY.registerItem(new ItemStack(ItemAndBlockHolder.QUANTUM_CELL), 1); + Upgrades.STICKY.registerItem(new ItemStack(ItemAndBlockHolder.SINGULARITY_CELL), 1); Upgrades.VOID_OVERFLOW.registerItem(new ItemStack(ItemAndBlockHolder.CELL1K), 1); Upgrades.VOID_OVERFLOW.registerItem(new ItemStack(ItemAndBlockHolder.CELL4K), 1); @@ -84,6 +87,7 @@ public class CommonProxy { Upgrades.VOID_OVERFLOW.registerItem(new ItemStack(ItemAndBlockHolder.CELL1024K), 1); Upgrades.VOID_OVERFLOW.registerItem(new ItemStack(ItemAndBlockHolder.CELL4096K), 1); Upgrades.VOID_OVERFLOW.registerItem(new ItemStack(ItemAndBlockHolder.CELL16384K), 1); + Upgrades.VOID_OVERFLOW.registerItem(new ItemStack(ItemAndBlockHolder.QUANTUM_CELL), 1); Upgrades.STICKY.registerItem(new ItemStack(ItemAndBlockHolder.CELL1KM), 1); Upgrades.STICKY.registerItem(new ItemStack(ItemAndBlockHolder.CELL4KM), 1); @@ -93,6 +97,7 @@ public class CommonProxy { Upgrades.STICKY.registerItem(new ItemStack(ItemAndBlockHolder.CELL1024KM), 1); Upgrades.STICKY.registerItem(new ItemStack(ItemAndBlockHolder.CELL4096KM), 1); Upgrades.STICKY.registerItem(new ItemStack(ItemAndBlockHolder.CELL16384KM), 1); + Upgrades.STICKY.registerItem(new ItemStack(ItemAndBlockHolder.ARTIFICIAL_UNIVERSE_CELL), 1); Upgrades.VOID_OVERFLOW.registerItem(new ItemStack(ItemAndBlockHolder.CELL1KM), 1); Upgrades.VOID_OVERFLOW.registerItem(new ItemStack(ItemAndBlockHolder.CELL4KM), 1); From 3ff53243dab62684800a727b7e9eec335d8becdd Mon Sep 17 00:00:00 2001 From: Martin Robertz Date: Fri, 24 Jan 2025 21:16:57 +0100 Subject: [PATCH 2/2] update --- dependencies.gradle | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/dependencies.gradle b/dependencies.gradle index 3804822c..065be4eb 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -34,22 +34,22 @@ * 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.7.22-GTNH:dev') - api('com.github.GTNewHorizons:Applied-Energistics-2-Unofficial:rv3-beta-523-GTNH:dev') + api('com.github.GTNewHorizons:NotEnoughItems:2.7.25-GTNH:dev') + api('com.github.GTNewHorizons:Applied-Energistics-2-Unofficial:rv3-beta-527-GTNH:dev') api('curse.maven:cofh-core-69162:2388751') api('com.github.GTNewHorizons:waila:1.8.2:dev') - api("com.github.GTNewHorizons:GTNHLib:0.6.2:dev") + api("com.github.GTNewHorizons:GTNHLib:0.6.3:dev") implementation("com.github.GTNewHorizons:WirelessCraftingTerminal:1.11.7:dev") { exclude group: 'com.github.GTNewHorizons', module: 'Applied-Energistics-2-Unofficial' } - compileOnly("com.github.GTNewHorizons:GTNHLib:0.6.2:dev") { transitive = false } + compileOnly("com.github.GTNewHorizons:GTNHLib:0.6.3: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.10.1:dev') compileOnly('com.github.GTNewHorizons:EnderIO:2.9.2:dev') - compileOnly('com.github.GTNewHorizons:GT5-Unofficial:5.09.51.79:dev') { + compileOnly('com.github.GTNewHorizons:GT5-Unofficial:5.09.51.93:dev') { exclude group: 'com.github.GTNewHorizons', module: 'AE2FluidCraft-Rework' exclude group: 'com.github.GTNewHorizons', module: 'Applied-Energistics-2-Unofficial' } @@ -57,9 +57,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.4-GTNH:dev') { transitive = false } - compileOnly('com.github.GTNewHorizons:ThaumicEnergistics:1.7.4-GTNH:dev') { transitive = false } - compileOnly("com.github.GTNewHorizons:Hodgepodge:2.6.16:dev") { transitive = false } + compileOnly('com.github.GTNewHorizons:ThaumicEnergistics:1.7.5-GTNH:dev') { transitive = false } + compileOnly("com.github.GTNewHorizons:Hodgepodge:2.6.20:dev") { transitive = false } runtimeOnlyNonPublishable("com.github.GTNewHorizons:DuraDisplay:1.3.4:dev") - runtimeOnlyNonPublishable("com.github.GTNewHorizons:GTNHLib:0.6.2:dev") + runtimeOnlyNonPublishable("com.github.GTNewHorizons:GTNHLib:0.6.3:dev") }