From 37fc3c22eb9b04977f30a2219b8f1b8ae6e9e196 Mon Sep 17 00:00:00 2001 From: repo_alt Date: Thu, 5 Nov 2020 21:48:08 +0300 Subject: [PATCH 1/5] Added baubles support --- build.gradle | 8 +- .../common/utils/RandomUtils.java | 17 ++++ .../items/ItemWirelessCraftingTerminal.java | 70 ++++++++++++++- .../proxy/CommonProxy.java | 86 ++++++++++++------- 4 files changed, 144 insertions(+), 37 deletions(-) diff --git a/build.gradle b/build.gradle index 060727d..4de2c61 100644 --- a/build.gradle +++ b/build.gradle @@ -66,8 +66,10 @@ repositories { name 'tterrag Repo' url "http://maven.tterrag.com" } - maven { // AE2 - name 'ae2 repo' + maven { + url = "http://gregtech.overminddl1.com/" + } + maven { url "http://downloads.gtnewhorizons.com/Mods_for_Jenkins/" } } @@ -81,7 +83,9 @@ dependencies { } compile "codechicken:NotEnoughItems:1.7.10-1.0.5.120:dev" compile "codechicken:CodeChickenCore:1.7.10-1.0.7.47:dev" + compile "codechicken:CodeChickenLib:1.7.10-1.1.3.140:dev" compile "com.enderio.core:EnderCore:1.7.10-0.1.0.25_beta:dev" + compile "com.azanor.baubles:Baubles:1.7.10-1.0.1.10:deobf" } sourceSets { diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/common/utils/RandomUtils.java b/src/java/net/p455w0rd/wirelesscraftingterminal/common/utils/RandomUtils.java index f5251de..32ca874 100644 --- a/src/java/net/p455w0rd/wirelesscraftingterminal/common/utils/RandomUtils.java +++ b/src/java/net/p455w0rd/wirelesscraftingterminal/common/utils/RandomUtils.java @@ -1,8 +1,10 @@ package net.p455w0rd.wirelesscraftingterminal.common.utils; +import baubles.api.BaublesApi; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.entity.player.InventoryPlayer; +import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; @@ -58,6 +60,21 @@ public class RandomUtils { break; } } + IInventory handler = BaublesApi.getBaubles(playerInv.player); + if (handler != null) + { + invSize = handler.getSizeInventory(); + for (int i = 0; i < invSize; ++i) { + ItemStack item = handler.getStackInSlot(i); + if (item == null) { + continue; + } + if (item.getItem() instanceof IWirelessCraftingTerminalItem) { + wirelessTerm = item; + break; + } + } + } return wirelessTerm; } diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/items/ItemWirelessCraftingTerminal.java b/src/java/net/p455w0rd/wirelesscraftingterminal/items/ItemWirelessCraftingTerminal.java index f0540ff..0c64d21 100644 --- a/src/java/net/p455w0rd/wirelesscraftingterminal/items/ItemWirelessCraftingTerminal.java +++ b/src/java/net/p455w0rd/wirelesscraftingterminal/items/ItemWirelessCraftingTerminal.java @@ -18,11 +18,14 @@ 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.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; 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; @@ -38,7 +41,7 @@ import net.p455w0rd.wirelesscraftingterminal.handlers.LocaleHandler; import net.p455w0rd.wirelesscraftingterminal.integration.EnderIO; import net.p455w0rd.wirelesscraftingterminal.reference.Reference; -public class ItemWirelessCraftingTerminal extends AERootPoweredItem implements IWirelessCraftingTerminalItem { +public class ItemWirelessCraftingTerminal extends AERootPoweredItem implements IWirelessCraftingTerminalItem, IBauble { public static final String LINK_KEY_STRING = "key"; public static double GLOBAL_POWER_MULTIPLIER = PowerMultiplier.CONFIG.multiplier; @@ -82,7 +85,70 @@ public class ItemWirelessCraftingTerminal extends AERootPoweredItem implements I return false; } - private boolean isMagnetInstalled(final ItemStack wirelessTerminal) { + /** + * 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); if (magnetNBTList != null) { diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/proxy/CommonProxy.java b/src/java/net/p455w0rd/wirelesscraftingterminal/proxy/CommonProxy.java index 2635c0f..a45f0a0 100644 --- a/src/java/net/p455w0rd/wirelesscraftingterminal/proxy/CommonProxy.java +++ b/src/java/net/p455w0rd/wirelesscraftingterminal/proxy/CommonProxy.java @@ -6,6 +6,7 @@ import java.util.Random; import appeng.api.AEApi; import appeng.api.config.SecurityPermissions; import appeng.api.storage.data.IAEItemStack; +import baubles.api.BaublesApi; import cpw.mods.fml.common.FMLCommonHandler; import cpw.mods.fml.common.Loader; import cpw.mods.fml.common.eventhandler.SubscribeEvent; @@ -82,39 +83,55 @@ public class CommonProxy { else { playerInv = player.inventory; } - int invSize = playerInv.getSizeInventory(); - if (invSize <= 0) { - return; - } - for (int i = 0; i < invSize; ++i) { - ItemStack item = playerInv.getStackInSlot(i); - if (item == null) { - continue; - } - if (item.getItem() instanceof IWirelessCraftingTerminalItem) { - wirelessTerm = item; - } - if (wirelessTerm == null) { - continue; - } - if (wirelessTerm.hasTagCompound()) { - NBTTagCompound nbtTC = wirelessTerm.getTagCompound(); - NBTTagList tagList = nbtTC.getTagList("MagnetSlot", 10); - if (tagList != null) { - NBTTagCompound magCompound = tagList.getCompoundTagAt(0); - if (magCompound != null) { - ItemStack magnetItem = ItemStack.loadItemStackFromNBT(magCompound); - if (magnetItem != null) { - ((ItemMagnet) magnetItem.getItem()).setItemStack(magnetItem); - if (magnetItem.getItem() instanceof ItemMagnet) { - ((ItemMagnet) magnetItem.getItem()).doMagnet(magnetItem, e.player.worldObj, e.player, wirelessTerm); - continue; - } - } - } - } - } - } + IInventory handler = BaublesApi.getBaubles(player); + if (handler != null) + { + for (int i = 0; i < handler.getSizeInventory(); ++i) { + ItemStack item = handler.getStackInSlot(i); + if (item == null) { + continue; + } + if (item.getItem() instanceof IWirelessCraftingTerminalItem) { + wirelessTerm = item; + break; + } + } + } + if (wirelessTerm == null) { + int invSize = playerInv.getSizeInventory(); + if (invSize <= 0) { + return; + } + for (int i = 0; i < invSize; ++i) { + ItemStack item = playerInv.getStackInSlot(i); + if (item == null) { + continue; + } + if (item.getItem() instanceof IWirelessCraftingTerminalItem) { + wirelessTerm = item; + break; + } + } + } + if (wirelessTerm == null) { + return; + } + if (wirelessTerm.hasTagCompound()) { + NBTTagCompound nbtTC = wirelessTerm.getTagCompound(); + NBTTagList tagList = nbtTC.getTagList("MagnetSlot", 10); + if (tagList != null) { + NBTTagCompound magCompound = tagList.getCompoundTagAt(0); + if (magCompound != null) { + ItemStack magnetItem = ItemStack.loadItemStackFromNBT(magCompound); + if (magnetItem != null) { + ((ItemMagnet) magnetItem.getItem()).setItemStack(magnetItem); + if (magnetItem.getItem() instanceof ItemMagnet) { + ((ItemMagnet) magnetItem.getItem()).doMagnet(magnetItem, e.player.worldObj, e.player, wirelessTerm); + } + } + } + } + } } @SubscribeEvent @@ -148,12 +165,15 @@ public class CommonProxy { * AchievementHandler.addAchievementToPage(AchievementHandler. * boosterAch, true, e.player); } */ + + /* NH fork definitely does not need version checking if ((Boolean) Launch.blackboard.get("fml.deobfuscatedEnvironment")) { WCTLog.info("Dev environment detected, skipping version check"); } else { new VersionCheckHandler(); } + */ } else { final PacketConfigSync p = new PacketConfigSync(Reference.WCT_MAX_POWER, Reference.WCT_EASYMODE_ENABLED, Reference.WCT_BOOSTER_ENABLED, Reference.WCT_BOOSTER_DROPCHANCE, Reference.WCT_MINETWEAKER_OVERRIDE); From b16d5f8e62c52494e02a129765f389236bc82d46 Mon Sep 17 00:00:00 2001 From: repo_alt Date: Thu, 5 Nov 2020 21:50:19 +0300 Subject: [PATCH 2/5] Version bump --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 279a642..a684d4a 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,6 +1,6 @@ aeversion=rv3 wctchannel= -wctbuild=1.8.7.4-bigbass-1 +wctbuild=1.8.7.4-GTNH-2 wctgroup=net.p455w0rd.wirelesscraftingterminal wctbasename=WirelessCraftingTerminal From 60b17db02f18407c6180588e3d520eb048524db9 Mon Sep 17 00:00:00 2001 From: repo_alt Date: Thu, 5 Nov 2020 21:53:49 +0300 Subject: [PATCH 3/5] version bumped after merge conflict --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index df023c4..36a515a 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,6 +1,6 @@ aeversion=rv3 wctchannel= -wctbuild=1.8.7.5 +wctbuild=1.8.7.6 wctgroup=net.p455w0rd.wirelesscraftingterminal wctbasename=WirelessCraftingTerminal From de05046f38de404d5de09cf869c8d96ef2d4bde9 Mon Sep 17 00:00:00 2001 From: repo_alt Date: Fri, 1 Jan 2021 17:59:49 +0300 Subject: [PATCH 4/5] Wireless crafting terminal crash game when placed inside own crafting grid https://github.com/GTNewHorizons/GT-New-Horizons-Modpack/issues/6296 --- gradle.properties | 2 +- .../client/gui/GuiWirelessCraftingTerminal.java | 9 +++++++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/gradle.properties b/gradle.properties index 36a515a..c14d765 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,6 +1,6 @@ aeversion=rv3 wctchannel= -wctbuild=1.8.7.6 +wctbuild=1.8.7.7-GTNH wctgroup=net.p455w0rd.wirelesscraftingterminal wctbasename=WirelessCraftingTerminal diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/client/gui/GuiWirelessCraftingTerminal.java b/src/java/net/p455w0rd/wirelesscraftingterminal/client/gui/GuiWirelessCraftingTerminal.java index 8637113..5b24417 100644 --- a/src/java/net/p455w0rd/wirelesscraftingterminal/client/gui/GuiWirelessCraftingTerminal.java +++ b/src/java/net/p455w0rd/wirelesscraftingterminal/client/gui/GuiWirelessCraftingTerminal.java @@ -53,6 +53,8 @@ import net.minecraft.inventory.Container; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; + +import net.p455w0rd.wirelesscraftingterminal.api.WCTApi; import net.p455w0rd.wirelesscraftingterminal.client.gui.widgets.GuiScrollbar; import net.p455w0rd.wirelesscraftingterminal.client.gui.widgets.GuiTabButton; import net.p455w0rd.wirelesscraftingterminal.client.gui.widgets.GuiTrashButton; @@ -922,9 +924,12 @@ public class GuiWirelessCraftingTerminal extends GuiContainer implements ISortSo final List slots = this.getInventorySlots(); for (final Slot s : slots) { if (s.getSlotIndex() == j && s.inventory == ((ContainerWirelessCraftingTerminal) this.inventorySlots).getPlayerInv()) { - if (!s.canTakeStack(((ContainerWirelessCraftingTerminal) this.inventorySlots).getPlayerInv().player)) { + if (s.getStack() != null && s.getStack().getItem() == WCTApi.instance().items().WirelessCraftingTerminal.getItem()) + return false; + if (!s.canTakeStack(((ContainerWirelessCraftingTerminal) this.inventorySlots).getPlayerInv().player)) return false; - } + else + break; } } From d0b2c6a11854299176ccb9eb574d220cb2b9d61d Mon Sep 17 00:00:00 2001 From: repo_alt Date: Mon, 12 Jul 2021 20:15:10 +0300 Subject: [PATCH 5/5] Extended tooltip added to the crafting CPU GUI https://github.com/GTNewHorizons/GT-New-Horizons-Modpack/issues/8187 --- gradle.properties | 2 +- .../client/gui/GuiCraftConfirm.java | 1 + .../client/gui/GuiCraftingCPU.java | 1 + .../client/gui/WCTBaseGui.java | 16 ++++++++++++++++ 4 files changed, 19 insertions(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index c14d765..2f36058 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,6 +1,6 @@ aeversion=rv3 wctchannel= -wctbuild=1.8.7.7-GTNH +wctbuild=1.8.7.8-GTNH wctgroup=net.p455w0rd.wirelesscraftingterminal wctbasename=WirelessCraftingTerminal diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/client/gui/GuiCraftConfirm.java b/src/java/net/p455w0rd/wirelesscraftingterminal/client/gui/GuiCraftConfirm.java index 3a0766f..384f67f 100644 --- a/src/java/net/p455w0rd/wirelesscraftingterminal/client/gui/GuiCraftConfirm.java +++ b/src/java/net/p455w0rd/wirelesscraftingterminal/client/gui/GuiCraftConfirm.java @@ -311,6 +311,7 @@ public class GuiCraftConfirm extends WCTBaseGui { dspToolTip = Platform.getItemDisplayName(is); if (lineList.size() > 0) { + addItemTooltip(is, lineList); dspToolTip = dspToolTip + '\n' + Joiner.on("\n").join(lineList); } diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/client/gui/GuiCraftingCPU.java b/src/java/net/p455w0rd/wirelesscraftingterminal/client/gui/GuiCraftingCPU.java index 2a9f2cf..2681716 100644 --- a/src/java/net/p455w0rd/wirelesscraftingterminal/client/gui/GuiCraftingCPU.java +++ b/src/java/net/p455w0rd/wirelesscraftingterminal/client/gui/GuiCraftingCPU.java @@ -293,6 +293,7 @@ public class GuiCraftingCPU extends WCTBaseGui implements ISortSource if( lineList.size() > 0 ) { + addItemTooltip(is, lineList); dspToolTip = dspToolTip + '\n' + Joiner.on( "\n" ).join( lineList ); } diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/client/gui/WCTBaseGui.java b/src/java/net/p455w0rd/wirelesscraftingterminal/client/gui/WCTBaseGui.java index e57e612..a98767a 100644 --- a/src/java/net/p455w0rd/wirelesscraftingterminal/client/gui/WCTBaseGui.java +++ b/src/java/net/p455w0rd/wirelesscraftingterminal/client/gui/WCTBaseGui.java @@ -21,6 +21,7 @@ import com.google.common.base.Stopwatch; import appeng.api.storage.data.IAEItemStack; import appeng.client.gui.widgets.ITooltip; import appeng.container.slot.SlotRestrictedInput; +import appeng.core.localization.GuiText; import appeng.helpers.InventoryAction; import cpw.mods.fml.common.Loader; import cpw.mods.fml.common.ObfuscationReflectionHelper; @@ -771,4 +772,19 @@ public abstract class WCTBaseGui extends GuiContainer { public static final synchronized void setSwitchingGuis(final boolean switchingGuis) { WCTBaseGui.switchingGuis = switchingGuis; } + protected void addItemTooltip(ItemStack is, List lineList) + { + if (isShiftKeyDown()) + { + List l = is.getTooltip(this.mc.thePlayer, this.mc.gameSettings.advancedItemTooltips); + if (!l.isEmpty()) + l.remove(0); + lineList.addAll(l); + } + else + { + // TODO: update AE2 on maven and dependency in build gradle + // lineList.add(GuiText.HoldShiftForTooltip.getLocal()); + } + } }