From 51229e972baf2be523d6015d04cb44abfb413090 Mon Sep 17 00:00:00 2001 From: firenoo <49818773+firenoo@users.noreply.github.com> Date: Fri, 14 Jul 2023 12:08:20 -0700 Subject: [PATCH] Untangle Baubles hard dependency and skip on unmapped items/blocks (#137) * Untangle Baubles hard dependency and skip on unmapped items/blocks Have forge issue the standard "Missing items" screen when updating, so players are warned before joining the world. Previously we consumed all missing mapping by mistake. Remove the hard dependency on baubles by adding Optional.Interface * spotlessApply (#138) Co-authored-by: GitHub GTNH Actions <> * Update dependencies and fix wrong gui channel --------- Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> --- dependencies.gradle | 4 ++-- .../github/client/gui/container/ContainerDualInterface.java | 2 +- .../github/common/item/ItemWirelessUltraTerminal.java | 2 ++ .../com/glodblock/github/crossmod/extracells/EC2Replacer.java | 2 -- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dependencies.gradle b/dependencies.gradle index 32556ecf..d58f6aa0 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -2,10 +2,10 @@ dependencies { api('com.github.GTNewHorizons:NotEnoughItems:2.3.50-GTNH:dev') - api('com.github.GTNewHorizons:Applied-Energistics-2-Unofficial:rv3-beta-215-GTNH:dev') + api('com.github.GTNewHorizons:Applied-Energistics-2-Unofficial:rv3-beta-234-GTNH:dev') api('curse.maven:cofh-core-69162:2388751') api('com.github.GTNewHorizons:waila:1.6.0:dev') - api('com.github.GTNewHorizons:Baubles:1.0.1.16:dev') + compileOnly('com.github.GTNewHorizons:Baubles:1.0.1.16:dev') compileOnly('com.github.GTNewHorizons:ExtraCells2:2.5.34:dev') { transitive = false } compileOnly("com.github.GTNewHorizons:WirelessCraftingTerminal:1.9.0:dev") diff --git a/src/main/java/com/glodblock/github/client/gui/container/ContainerDualInterface.java b/src/main/java/com/glodblock/github/client/gui/container/ContainerDualInterface.java index aa16502e..21151255 100644 --- a/src/main/java/com/glodblock/github/client/gui/container/ContainerDualInterface.java +++ b/src/main/java/com/glodblock/github/client/gui/container/ContainerDualInterface.java @@ -13,7 +13,7 @@ import appeng.helpers.IInterfaceHost; public class ContainerDualInterface extends ContainerInterface { - @GuiSync(10) + @GuiSync(11) public SidelessMode sidelessMode; private final boolean isTile; diff --git a/src/main/java/com/glodblock/github/common/item/ItemWirelessUltraTerminal.java b/src/main/java/com/glodblock/github/common/item/ItemWirelessUltraTerminal.java index 57e83305..133f628f 100644 --- a/src/main/java/com/glodblock/github/common/item/ItemWirelessUltraTerminal.java +++ b/src/main/java/com/glodblock/github/common/item/ItemWirelessUltraTerminal.java @@ -36,10 +36,12 @@ import appeng.core.localization.PlayerMessages; import appeng.util.Platform; import baubles.api.BaubleType; import baubles.api.IBauble; +import cpw.mods.fml.common.Optional; import cpw.mods.fml.common.registry.GameRegistry; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +@Optional.Interface(iface = "baubles.api.IBauble", modid = "Baubles") public class ItemWirelessUltraTerminal extends ItemBaseWirelessTerminal implements IBauble, IRegister { diff --git a/src/main/java/com/glodblock/github/crossmod/extracells/EC2Replacer.java b/src/main/java/com/glodblock/github/crossmod/extracells/EC2Replacer.java index 1d8dea89..a93898c9 100644 --- a/src/main/java/com/glodblock/github/crossmod/extracells/EC2Replacer.java +++ b/src/main/java/com/glodblock/github/crossmod/extracells/EC2Replacer.java @@ -24,8 +24,6 @@ public class EC2Replacer { if (m.type == GameRegistry.Type.ITEM && ItemReplacements.registry.containsKey(m.name)) { Item toRemap = ItemReplacements.registry.get(m.name); m.remap(toRemap); - } else { - m.warn(); } } }