From 0e2c9a88a47ce063a4d61c67af7b4075a335fa83 Mon Sep 17 00:00:00 2001 From: Ethryan <3237986+Ethryan@users.noreply.github.com> Date: Mon, 16 Jun 2025 19:51:22 +0200 Subject: [PATCH 1/5] Remove baubles code, since its loaded upstream --- .../items/ItemWirelessCraftingTerminal.java | 61 +------------------ 1 file changed, 1 insertion(+), 60 deletions(-) diff --git a/src/main/java/net/p455w0rd/wirelesscraftingterminal/items/ItemWirelessCraftingTerminal.java b/src/main/java/net/p455w0rd/wirelesscraftingterminal/items/ItemWirelessCraftingTerminal.java index 6775770..798026e 100644 --- a/src/main/java/net/p455w0rd/wirelesscraftingterminal/items/ItemWirelessCraftingTerminal.java +++ b/src/main/java/net/p455w0rd/wirelesscraftingterminal/items/ItemWirelessCraftingTerminal.java @@ -46,7 +46,7 @@ import cpw.mods.fml.relauncher.SideOnly; @Interface(iface = "baubles.api.IBauble", modid = "Baubles") public class ItemWirelessCraftingTerminal extends AERootPoweredItem - implements IWirelessCraftingTerminalItem, IWirelessTermHandler, IBauble { + implements IWirelessCraftingTerminalItem, IWirelessTermHandler, IBaubleE { public static final String LINK_KEY_STRING = "key"; public static double GLOBAL_POWER_MULTIPLIER = PowerMultiplier.CONFIG.multiplier; @@ -91,65 +91,6 @@ public class ItemWirelessCraftingTerminal extends AERootPoweredItem return false; } - /** - * This method return the type of bauble this is. Type is used to determine the slots it can go into. - * - * @param itemstack - */ - @Override - public BaubleType getBaubleType(ItemStack itemstack) { - return BaubleType.RING; - } - - /** - * This method is called once per tick if the bauble is being worn by a player - * - * @param itemstack - * @param player - */ - @Override - public void onWornTick(ItemStack itemstack, EntityLivingBase player) {} - - /** - * This method is called when the bauble is equipped by a player - * - * @param itemstack - * @param player - */ - @Override - public void onEquipped(ItemStack itemstack, EntityLivingBase player) {} - - /** - * This method is called when the bauble is unequipped by a player - * - * @param itemstack - * @param player - */ - @Override - public void onUnequipped(ItemStack itemstack, EntityLivingBase player) {} - - /** - * can this bauble be placed in a bauble slot - * - * @param itemstack - * @param player - */ - @Override - public boolean canEquip(ItemStack itemstack, EntityLivingBase player) { - return true; - } - - /** - * Can this bauble be removed from a bauble slot - * - * @param itemstack - * @param player - */ - @Override - public boolean canUnequip(ItemStack itemstack, EntityLivingBase player) { - return true; - } - private boolean isMagnetInstalled(final ItemStack wirelessTerminal) { if (wirelessTerminal.hasTagCompound()) { NBTTagList magnetNBTList = wirelessTerminal.getTagCompound().getTagList(MAGNET_SLOT_NBT, 10); From bb979c569a68c206f348618568e5ab24b73c764c Mon Sep 17 00:00:00 2001 From: Ethryan <3237986+Ethryan@users.noreply.github.com> Date: Mon, 16 Jun 2025 19:52:14 +0200 Subject: [PATCH 2/5] typo --- .../items/ItemWirelessCraftingTerminal.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/net/p455w0rd/wirelesscraftingterminal/items/ItemWirelessCraftingTerminal.java b/src/main/java/net/p455w0rd/wirelesscraftingterminal/items/ItemWirelessCraftingTerminal.java index 798026e..1ad4a89 100644 --- a/src/main/java/net/p455w0rd/wirelesscraftingterminal/items/ItemWirelessCraftingTerminal.java +++ b/src/main/java/net/p455w0rd/wirelesscraftingterminal/items/ItemWirelessCraftingTerminal.java @@ -46,7 +46,7 @@ import cpw.mods.fml.relauncher.SideOnly; @Interface(iface = "baubles.api.IBauble", modid = "Baubles") public class ItemWirelessCraftingTerminal extends AERootPoweredItem - implements IWirelessCraftingTerminalItem, IWirelessTermHandler, IBaubleE { + implements IWirelessCraftingTerminalItem, IWirelessTermHandler, IBauble { public static final String LINK_KEY_STRING = "key"; public static double GLOBAL_POWER_MULTIPLIER = PowerMultiplier.CONFIG.multiplier; From 3fcc50d1a1ee8dd091302f8f2c6b71ae1d8f77e9 Mon Sep 17 00:00:00 2001 From: Ethryan <3237986+Ethryan@users.noreply.github.com> Date: Mon, 16 Jun 2025 20:16:38 +0200 Subject: [PATCH 3/5] Update ItemWirelessCraftingTerminal.java --- .../items/ItemWirelessCraftingTerminal.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/main/java/net/p455w0rd/wirelesscraftingterminal/items/ItemWirelessCraftingTerminal.java b/src/main/java/net/p455w0rd/wirelesscraftingterminal/items/ItemWirelessCraftingTerminal.java index 1ad4a89..9aa2942 100644 --- a/src/main/java/net/p455w0rd/wirelesscraftingterminal/items/ItemWirelessCraftingTerminal.java +++ b/src/main/java/net/p455w0rd/wirelesscraftingterminal/items/ItemWirelessCraftingTerminal.java @@ -44,9 +44,8 @@ import cpw.mods.fml.common.Optional.Interface; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -@Interface(iface = "baubles.api.IBauble", modid = "Baubles") public class ItemWirelessCraftingTerminal extends AERootPoweredItem - implements IWirelessCraftingTerminalItem, IWirelessTermHandler, IBauble { + implements IWirelessCraftingTerminalItem, IWirelessTermHandler { public static final String LINK_KEY_STRING = "key"; public static double GLOBAL_POWER_MULTIPLIER = PowerMultiplier.CONFIG.multiplier; From b7518b4e47a87ed450c9b92b4a7626c8875a7be0 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 16 Jun 2025 20:21:00 +0200 Subject: [PATCH 4/5] Spotless apply for branch Ethryan-patch-1 for #41 (#42) --- .../items/ItemWirelessCraftingTerminal.java | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/main/java/net/p455w0rd/wirelesscraftingterminal/items/ItemWirelessCraftingTerminal.java b/src/main/java/net/p455w0rd/wirelesscraftingterminal/items/ItemWirelessCraftingTerminal.java index 9aa2942..eb373e9 100644 --- a/src/main/java/net/p455w0rd/wirelesscraftingterminal/items/ItemWirelessCraftingTerminal.java +++ b/src/main/java/net/p455w0rd/wirelesscraftingterminal/items/ItemWirelessCraftingTerminal.java @@ -4,7 +4,6 @@ import java.util.List; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.Entity; -import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.item.Item; @@ -37,10 +36,7 @@ import appeng.items.tools.powered.powersink.AERootPoweredItem; import appeng.util.ConfigManager; import appeng.util.IConfigManagerHost; import appeng.util.Platform; -import baubles.api.BaubleType; -import baubles.api.IBauble; import cpw.mods.fml.common.FMLCommonHandler; -import cpw.mods.fml.common.Optional.Interface; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; From c8fc27211ce8e5a85304137865865002f423e85d Mon Sep 17 00:00:00 2001 From: Ethryan <3237986+Ethryan@users.noreply.github.com> Date: Tue, 17 Jun 2025 10:31:54 +0200 Subject: [PATCH 5/5] Readd the slot code, since for some reason the Crafting Terminal doesn't extend the Wireless Terminal. --- .../items/ItemWirelessCraftingTerminal.java | 42 ++++++++++++++++++- 1 file changed, 41 insertions(+), 1 deletion(-) diff --git a/src/main/java/net/p455w0rd/wirelesscraftingterminal/items/ItemWirelessCraftingTerminal.java b/src/main/java/net/p455w0rd/wirelesscraftingterminal/items/ItemWirelessCraftingTerminal.java index eb373e9..5032361 100644 --- a/src/main/java/net/p455w0rd/wirelesscraftingterminal/items/ItemWirelessCraftingTerminal.java +++ b/src/main/java/net/p455w0rd/wirelesscraftingterminal/items/ItemWirelessCraftingTerminal.java @@ -2,8 +2,11 @@ package net.p455w0rd.wirelesscraftingterminal.items; import java.util.List; +import baubles.api.BaubleType; +import baubles.api.expanded.IBaubleExpanded; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.Entity; +import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.item.Item; @@ -23,6 +26,7 @@ import org.lwjgl.input.Keyboard; import com.google.common.base.Optional; +import appeng.core.AppEng; import appeng.api.config.AccessRestriction; import appeng.api.config.PowerMultiplier; import appeng.api.config.PowerUnits; @@ -40,8 +44,9 @@ import cpw.mods.fml.common.FMLCommonHandler; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +@cpw.mods.fml.common.Optional.Interface(iface = "baubles.api.expanded.IBaubleExpanded", modid = "Baubles|Expanded") public class ItemWirelessCraftingTerminal extends AERootPoweredItem - implements IWirelessCraftingTerminalItem, IWirelessTermHandler { + implements IWirelessCraftingTerminalItem, IWirelessTermHandler, IBaubleExpanded { public static final String LINK_KEY_STRING = "key"; public static double GLOBAL_POWER_MULTIPLIER = PowerMultiplier.CONFIG.multiplier; @@ -86,6 +91,41 @@ public class ItemWirelessCraftingTerminal extends AERootPoweredItem return false; } + @Override + public String[] getBaubleTypes(ItemStack itemstack) { + return new String[] { AppEng.BAUBLESLOT }; + } + + @Override + @cpw.mods.fml.common.Optional.Method(modid = "Baubles") + public BaubleType getBaubleType(ItemStack itemStack) { + return BaubleType.RING; + } + + @Override + @cpw.mods.fml.common.Optional.Method(modid = "Baubles") + public void onWornTick(ItemStack itemstack, EntityLivingBase player) { /**/ } + + @Override + @cpw.mods.fml.common.Optional.Method(modid = "Baubles") + public void onEquipped(ItemStack itemstack, EntityLivingBase player) { /**/ } + + @Override + @cpw.mods.fml.common.Optional.Method(modid = "Baubles") + public void onUnequipped(ItemStack itemstack, EntityLivingBase player) { /**/ } + + @Override + @cpw.mods.fml.common.Optional.Method(modid = "Baubles") + public boolean canEquip(ItemStack itemstack, EntityLivingBase player) { + return true; + } + + @Override + @cpw.mods.fml.common.Optional.Method(modid = "Baubles") + public boolean canUnequip(ItemStack itemstack, EntityLivingBase player) { + return true; + } + private boolean isMagnetInstalled(final ItemStack wirelessTerminal) { if (wirelessTerminal.hasTagCompound()) { NBTTagList magnetNBTList = wirelessTerminal.getTagCompound().getTagList(MAGNET_SLOT_NBT, 10);