From a9c224824de42087c74ce94ad90c49952895a755 Mon Sep 17 00:00:00 2001 From: p455w0rd Date: Wed, 1 Jun 2016 17:03:05 -0400 Subject: [PATCH] address #61 --- README.md | 8 +++++++- gradle.properties | 2 +- latestversionrv2.txt | 2 +- latestversionrv3.txt | 2 +- .../api/IWirelessCraftingTerminalItem.java | 10 +++++++++- .../container/ContainerWirelessCraftingTerminal.java | 8 ++++---- .../handlers/KeybindHandler.java | 4 ++-- .../items/ItemWirelessCraftingTerminal.java | 6 +----- .../wirelesscraftingterminal/proxy/CommonProxy.java | 9 ++++++++- 9 files changed, 34 insertions(+), 17 deletions(-) diff --git a/README.md b/README.md index 3a8669c..eff7c8a 100644 --- a/README.md +++ b/README.md @@ -74,7 +74,13 @@ If you are only doing single file pull requests, GitHub supports using a quick w ## Wireless Crafting Terminal API -* There is an API =D Info coming soon +* The API is very simple + +To make your item a Wireless Crafting Terminal variant, register like normal with AE2 and implement +`net.p455w0rd.wirelesscraftingterminal.api.IWirelessCraftingTerminalItem` + +To open the WCT Gui from said item, use +`WCTApi.instance().interact().openWirelessCraftingTerminalGui(EntityPlayer player);` ## Wireless Crafting Terminal Localization diff --git a/gradle.properties b/gradle.properties index 69618a3..ddd9ce5 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,6 +1,6 @@ aeversion=rv3 wctchannel=b -wctbuild=1.8.6 +wctbuild=1.8.6.1 wctgroup=net.p455w0rd.wirelesscraftingterminal wctbasename=WirelessCraftingTerminal diff --git a/latestversionrv2.txt b/latestversionrv2.txt index 71154b2..220e06c 100644 --- a/latestversionrv2.txt +++ b/latestversionrv2.txt @@ -1 +1 @@ -1.7.10-rv2-1.8.6b \ No newline at end of file +1.7.10-rv2-1.8.6.1b \ No newline at end of file diff --git a/latestversionrv3.txt b/latestversionrv3.txt index 2472594..3bd0d26 100644 --- a/latestversionrv3.txt +++ b/latestversionrv3.txt @@ -1 +1 @@ -1.7.10-rv3-1.8.6b \ No newline at end of file +1.7.10-rv3-1.8.6.1b \ No newline at end of file diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/api/IWirelessCraftingTerminalItem.java b/src/java/net/p455w0rd/wirelesscraftingterminal/api/IWirelessCraftingTerminalItem.java index 00a6a6a..af2421d 100644 --- a/src/java/net/p455w0rd/wirelesscraftingterminal/api/IWirelessCraftingTerminalItem.java +++ b/src/java/net/p455w0rd/wirelesscraftingterminal/api/IWirelessCraftingTerminalItem.java @@ -1,5 +1,13 @@ package net.p455w0rd.wirelesscraftingterminal.api; -public interface IWirelessCraftingTerminalItem { +import appeng.api.implementations.items.IAEItemPowerStorage; +import appeng.core.features.IAEFeature; +import cofh.api.energy.IEnergyContainerItem; +import net.minecraft.item.ItemStack; +public interface IWirelessCraftingTerminalItem extends IWirelessCraftingTermHandler, IAEItemPowerStorage, IAEFeature, IEnergyContainerItem{ + + // checks if an Infinity Booster Caqrd is installed on the WCT + public boolean checkForBooster(final ItemStack wirelessTerminal); + } diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/common/container/ContainerWirelessCraftingTerminal.java b/src/java/net/p455w0rd/wirelesscraftingterminal/common/container/ContainerWirelessCraftingTerminal.java index f7a4966..4357ca3 100644 --- a/src/java/net/p455w0rd/wirelesscraftingterminal/common/container/ContainerWirelessCraftingTerminal.java +++ b/src/java/net/p455w0rd/wirelesscraftingterminal/common/container/ContainerWirelessCraftingTerminal.java @@ -71,11 +71,11 @@ import net.minecraft.nbt.NBTTagList; import net.minecraft.util.ChatComponentText; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; -import net.p455w0rd.wirelesscraftingterminal.items.ItemWirelessCraftingTerminal; import net.p455w0rd.wirelesscraftingterminal.items.ItemInfinityBooster; import net.p455w0rd.wirelesscraftingterminal.items.ItemMagnet; import net.p455w0rd.wirelesscraftingterminal.reference.Reference; import net.p455w0rd.wirelesscraftingterminal.api.IWirelessCraftingTermHandler; +import net.p455w0rd.wirelesscraftingterminal.api.IWirelessCraftingTerminalItem; import net.p455w0rd.wirelesscraftingterminal.api.networking.security.WCTIActionHost; import net.p455w0rd.wirelesscraftingterminal.api.networking.security.WCTPlayerSource; import net.p455w0rd.wirelesscraftingterminal.common.container.guisync.GuiSync; @@ -159,7 +159,7 @@ public class ContainerWirelessCraftingTerminal extends Container implements ICon private ContainerOpenContext openContext; private final AppEngInternalInventory output = new AppEngInternalInventory(this, 1); private final HashSet locked = new HashSet(); - private ItemWirelessCraftingTerminal thisItem; + private IWirelessCraftingTerminalItem thisItem; private IGridNode networkNode; private IMEInventoryHandler cellInv; @@ -181,7 +181,7 @@ public class ContainerWirelessCraftingTerminal extends Container implements ICon this.magnetInventory = new WCTInventoryMagnet(RandomUtils.getWirelessTerm(inventoryPlayer)); this.trashInventory = new WCTInventoryTrash(RandomUtils.getWirelessTerm(inventoryPlayer)); this.containerstack = RandomUtils.getWirelessTerm(inventoryPlayer); - this.thisItem = (ItemWirelessCraftingTerminal) this.containerstack.getItem(); + this.thisItem = (IWirelessCraftingTerminalItem) this.containerstack.getItem(); this.worldObj = player.worldObj; this.craftingGrid = new WCTInventoryCrafting(this, 3, 3, containerstack); this.inventoryPlayer = inventoryPlayer; @@ -195,7 +195,7 @@ public class ContainerWirelessCraftingTerminal extends Container implements ICon this.obj = getGuiObject(containerstack, player, worldObj, (int) player.posX, (int) player.posY, (int) player.posZ); this.civ = (IPortableCell) this.obj; //final IGridNode node = ((IGridNode) ((IGrid) this.obj.getTargetGrid()).getPivot()).getMachine().getGridNode(ForgeDirection.UNKNOWN); - final IGridNode node = this.obj.getActionableNode(); + final IGridNode node = this.obj.getActionableNode(true); this.networkNode = node; this.prepareSync(); diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/handlers/KeybindHandler.java b/src/java/net/p455w0rd/wirelesscraftingterminal/handlers/KeybindHandler.java index 2108b5c..18a577d 100644 --- a/src/java/net/p455w0rd/wirelesscraftingterminal/handlers/KeybindHandler.java +++ b/src/java/net/p455w0rd/wirelesscraftingterminal/handlers/KeybindHandler.java @@ -14,12 +14,12 @@ import net.minecraft.client.settings.KeyBinding; import net.minecraft.inventory.ContainerPlayer; import net.minecraft.item.ItemStack; import net.minecraft.util.ChatComponentText; +import net.p455w0rd.wirelesscraftingterminal.api.IWirelessCraftingTerminalItem; import net.p455w0rd.wirelesscraftingterminal.client.gui.GuiWirelessCraftingTerminal; import net.p455w0rd.wirelesscraftingterminal.common.utils.RandomUtils; import net.p455w0rd.wirelesscraftingterminal.core.sync.network.NetworkHandler; import net.p455w0rd.wirelesscraftingterminal.core.sync.packets.PacketOpenGui; import net.p455w0rd.wirelesscraftingterminal.core.sync.packets.PacketSetMagnet; -import net.p455w0rd.wirelesscraftingterminal.items.ItemWirelessCraftingTerminal; import net.p455w0rd.wirelesscraftingterminal.reference.Reference; @SideOnly(Side.CLIENT) @@ -50,7 +50,7 @@ public class KeybindHandler { if (is == null) { return; } - ItemWirelessCraftingTerminal wirelessTerm = (ItemWirelessCraftingTerminal) is.getItem(); + IWirelessCraftingTerminalItem wirelessTerm = (IWirelessCraftingTerminalItem) is.getItem(); if (wirelessTerm != null) { if (!FMLClientHandler.instance().isGUIOpen(GuiWirelessCraftingTerminal.class)) { NetworkHandler.instance.sendToServer(new PacketOpenGui(Reference.GUI_WCT)); diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/items/ItemWirelessCraftingTerminal.java b/src/java/net/p455w0rd/wirelesscraftingterminal/items/ItemWirelessCraftingTerminal.java index 15b7d95..b8307e2 100644 --- a/src/java/net/p455w0rd/wirelesscraftingterminal/items/ItemWirelessCraftingTerminal.java +++ b/src/java/net/p455w0rd/wirelesscraftingterminal/items/ItemWirelessCraftingTerminal.java @@ -13,14 +13,11 @@ import appeng.api.config.Settings; import appeng.api.config.SortDir; import appeng.api.config.SortOrder; import appeng.api.config.ViewItems; -import appeng.api.implementations.items.IAEItemPowerStorage; import appeng.api.util.IConfigManager; -import appeng.core.features.IAEFeature; import appeng.items.tools.powered.powersink.AERootPoweredItem; import appeng.util.ConfigManager; import appeng.util.IConfigManagerHost; import appeng.util.Platform; -import cofh.api.energy.IEnergyContainerItem; import cpw.mods.fml.common.FMLCommonHandler; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @@ -34,14 +31,13 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; import net.minecraft.util.StatCollector; import net.minecraft.world.World; -import net.p455w0rd.wirelesscraftingterminal.api.IWirelessCraftingTermHandler; import net.p455w0rd.wirelesscraftingterminal.api.IWirelessCraftingTerminalItem; import net.p455w0rd.wirelesscraftingterminal.api.WCTApi; import net.p455w0rd.wirelesscraftingterminal.common.utils.RandomUtils; import net.p455w0rd.wirelesscraftingterminal.handlers.LocaleHandler; import net.p455w0rd.wirelesscraftingterminal.reference.Reference; -public class ItemWirelessCraftingTerminal extends AERootPoweredItem implements IWirelessCraftingTermHandler, IAEItemPowerStorage, IAEFeature, IEnergyContainerItem, IWirelessCraftingTerminalItem +public class ItemWirelessCraftingTerminal extends AERootPoweredItem implements IWirelessCraftingTerminalItem { private static final String LINK_KEY_STRING = "key"; diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/proxy/CommonProxy.java b/src/java/net/p455w0rd/wirelesscraftingterminal/proxy/CommonProxy.java index 6851648..907d20f 100644 --- a/src/java/net/p455w0rd/wirelesscraftingterminal/proxy/CommonProxy.java +++ b/src/java/net/p455w0rd/wirelesscraftingterminal/proxy/CommonProxy.java @@ -16,6 +16,7 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; +import net.minecraft.launchwrapper.Launch; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; import net.minecraft.stats.Achievement; @@ -23,6 +24,7 @@ import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.common.util.FakePlayer; import net.minecraftforge.event.entity.living.LivingDropsEvent; import net.p455w0rd.wirelesscraftingterminal.api.IWirelessCraftingTerminalItem; +import net.p455w0rd.wirelesscraftingterminal.common.utils.WCTLog; import net.p455w0rd.wirelesscraftingterminal.core.sync.WCTPacket; import net.p455w0rd.wirelesscraftingterminal.core.sync.network.NetworkHandler; import net.p455w0rd.wirelesscraftingterminal.core.sync.packets.PacketConfigSync; @@ -135,7 +137,12 @@ public class CommonProxy { * AchievementHandler.addAchievementToPage(AchievementHandler. * boosterAch, true, e.player); } */ - new VersionCheckHandler(); + 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);