From a6eb7091f9603697af12d3b2897ca4815e9516e2 Mon Sep 17 00:00:00 2001 From: Firenoo <49818773+firenoo@users.noreply.github.com> Date: Thu, 13 Jul 2023 08:04:33 -0700 Subject: [PATCH] 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 --- dependencies.gradle | 2 +- .../glodblock/github/common/item/ItemWirelessUltraTerminal.java | 2 ++ .../com/glodblock/github/crossmod/extracells/EC2Replacer.java | 2 -- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dependencies.gradle b/dependencies.gradle index 32556ecf..b6604be7 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -5,7 +5,7 @@ dependencies { api('com.github.GTNewHorizons:Applied-Energistics-2-Unofficial:rv3-beta-215-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/common/item/ItemWirelessUltraTerminal.java b/src/main/java/com/glodblock/github/common/item/ItemWirelessUltraTerminal.java index 57e83305..8eb48277 100644 --- a/src/main/java/com/glodblock/github/common/item/ItemWirelessUltraTerminal.java +++ b/src/main/java/com/glodblock/github/common/item/ItemWirelessUltraTerminal.java @@ -7,6 +7,7 @@ import java.util.Arrays; import java.util.EnumSet; import java.util.List; +import cpw.mods.fml.common.Optional; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; @@ -40,6 +41,7 @@ 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(); } } }