This commit is contained in:
p455w0rd committed 2016-05-01 14:00:10 -04:00
1 parent 2544ba7edf
commit b936d6da95
5 files changed
+55 -53

No files matched your search

@@ -5,11 +5,11 @@ import java.util.ArrayList;
import appeng.api.implementations.tiles.IWirelessAccessPoint;
import appeng.core.localization.PlayerMessages;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.entity.player.InventoryPlayer;
import net.minecraft.item.ItemStack;
import net.minecraftforge.common.util.FakePlayer;
import net.p455w0rd.wirelesscraftingterminal.api.IWCTInteractionHelper;
import net.p455w0rd.wirelesscraftingterminal.api.IWirelessCraftingTermHandler;
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.items.ItemWirelessCraftingTerminal;
@@ -23,39 +23,23 @@ public class WCTInteractionHelper implements IWCTInteractionHelper {
return;
}
InventoryPlayer inv = player.inventory;
int invSize = inv.getSizeInventory();
if (invSize <= 0) {
return;
}
// Get the first wireless terminal
// If one is held, it takes precidence
ItemStack wirelessTerminal = null;
for (int i = 0; i < invSize; ++i) {
ItemStack item = inv.getStackInSlot(i);
if (item == null) {
continue;
}
if (item.getItem() instanceof ItemWirelessCraftingTerminal) {
wirelessTerminal = item;
break;
}
}
if ((wirelessTerminal == null)) {
ItemStack is = RandomUtils.getWirelessTerm(player.inventory);
if (is == null) {
return;
}
IWirelessCraftingTermHandler terminalInterface = (IWirelessCraftingTermHandler) wirelessTerminal.getItem();
if (terminalInterface.getAECurrentPower(wirelessTerminal) <= 0) {
ItemWirelessCraftingTerminal wirelessTerminal = (ItemWirelessCraftingTerminal) is.getItem();
IWirelessCraftingTermHandler terminalInterface = (IWirelessCraftingTermHandler) wirelessTerminal;
if (terminalInterface.getAECurrentPower(is) <= 0) {
player.addChatMessage(PlayerMessages.DeviceNotPowered.get());
return;
}
if (!isTerminalLinked(terminalInterface, wirelessTerminal)) {
if (!isTerminalLinked(terminalInterface, is)) {
player.addChatMessage(PlayerMessages.DeviceNotLinked.get());
return;
}
String encKey = terminalInterface.getEncryptionKey(wirelessTerminal);
String encKey = terminalInterface.getEncryptionKey(is);
ArrayList<IWirelessAccessPoint> accessPoints = WirelessAELink.locateAPsInRangeOfPlayer(player, encKey);
if (accessPoints == null) {
player.addChatMessage(PlayerMessages.StationCanNotBeLocated.get());
@@ -19,6 +19,8 @@ import appeng.util.ConfigManager;
import appeng.util.IConfigManagerHost;
import appeng.util.Platform;
import cofh.api.energy.IEnergyContainerItem;
import cpw.mods.fml.client.FMLClientHandler;
import cpw.mods.fml.common.FMLCommonHandler;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import net.minecraft.creativetab.CreativeTabs;
@@ -32,14 +34,16 @@ 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.WCTApi;
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.handlers.LocaleHandler;
import net.p455w0rd.wirelesscraftingterminal.reference.Reference;
import net.p455w0rd.wirelesscraftingterminal.integration.IntegrationType;
import net.p455w0rd.wirelesscraftingterminal.transformer.annotations.Integration.Interface;
@Interface( iface = "cofh.api.energy.IEnergyContainerItem", iname = IntegrationType.RFItem )
@Interface(iface = "cofh.api.energy.IEnergyContainerItem", iname = IntegrationType.RFItem)
public class ItemWirelessCraftingTerminal extends AEBasePoweredItem implements IWirelessCraftingTermHandler, IEnergyContainerItem {
private static final String LINK_KEY_STRING = "key";
@@ -76,7 +80,7 @@ public class ItemWirelessCraftingTerminal extends AEBasePoweredItem implements I
}
return false;
}
private boolean isMagnetInstalled(final ItemStack wirelessTerminal) {
if (wirelessTerminal.hasTagCompound()) {
NBTTagList magnetNBTList = wirelessTerminal.getTagCompound().getTagList(MAGNET_SLOT_NBT, 10);
@@ -110,11 +114,19 @@ public class ItemWirelessCraftingTerminal extends AEBasePoweredItem implements I
@Override
public ItemStack onItemRightClick(final ItemStack itemStack, final World world, final EntityPlayer player) {
if (world.isRemote) {
return itemStack;
if (FMLCommonHandler.instance().getSide() == Side.CLIENT) {
// Open the gui
ItemStack is = RandomUtils.getWirelessTerm(player.inventory);
if (is == null) {
return itemStack;
}
ItemWirelessCraftingTerminal wirelessTerm = (ItemWirelessCraftingTerminal) is.getItem();
if (wirelessTerm != null) {
if (!FMLClientHandler.instance().isGUIOpen(GuiWirelessCraftingTerminal.class)) {
NetworkHandler.instance.sendToServer(new PacketOpenGui(Reference.GUI_WCT));
}
}
}
// Open the gui
WCTApi.instance().interact().openWirelessCraftingTerminalGui(player);
return itemStack;
}
@@ -234,12 +246,12 @@ public class ItemWirelessCraftingTerminal extends AEBasePoweredItem implements I
list.add(shift);
}
}
@SideOnly(Side.CLIENT)
private String color(String color) {
return RandomUtils.color(color);
}
@SideOnly(Side.CLIENT)
private static String getItemName(String item) {
return StatCollector.translateToLocal("item." + item + ".name");
@@ -329,12 +341,14 @@ public class ItemWirelessCraftingTerminal extends AEBasePoweredItem implements I
double max = PowerUnits.AE.convertTo(PowerUnits.RF, getAEMaxPower(container));
if (max - current >= maxReceive) {
return maxReceive;
} else {
}
else {
return (int) (max - current);
}
} else {
}
else {
double currentAEPower = getAECurrentPower(container);
if ((int)currentAEPower < Reference.WCT_MAX_POWER) {
if ((int) currentAEPower < Reference.WCT_MAX_POWER) {
int leftOver = (int) PowerUnits.AE.convertTo(PowerUnits.RF, injectAEPower(container, PowerUnits.RF.convertTo(PowerUnits.AE, maxReceive)));
return (int) maxReceive - leftOver;
}
@@ -352,10 +366,12 @@ public class ItemWirelessCraftingTerminal extends AEBasePoweredItem implements I
if (simulate) {
if (getEnergyStored(container) >= maxExtract) {
return maxExtract;
} else {
}
else {
return getEnergyStored(container);
}
} else {
}
else {
return (int) PowerUnits.AE.convertTo(PowerUnits.RF, extractAEPower(container, PowerUnits.RF.convertTo(PowerUnits.AE, maxExtract)));
}
}
@@ -171,16 +171,17 @@ public class CommonProxy {
@SubscribeEvent
public void onPlayerCraftingEvent(final PlayerEvent.ItemCraftedEvent event) {
boolean hasWCTAch = ((EntityPlayerMP) event.player).func_147099_x().hasAchievementUnlocked(AchievementHandler.wctAch);
if (event.player == null || event.player.isDead || event.player instanceof FakePlayer || event.crafting == null) {
return;
}
if (event.crafting.getItem() == ItemEnum.WIRELESS_CRAFTING_TERMINAL.getItem()) {
AchievementHandler.triggerAch(wctAch, event.player);
}
if (event.crafting.getItem() == ItemEnum.MAGNET_CARD.getItem() && hasWCTAch) {
AchievementHandler.triggerAch(magnetAch, event.player);
}
if (FMLCommonHandler.instance().getSide() == Side.SERVER) {
boolean hasWCTAch = ((EntityPlayerMP) event.player).func_147099_x().hasAchievementUnlocked(AchievementHandler.wctAch);
if (event.player == null || event.player.isDead || event.player instanceof FakePlayer || event.crafting == null) {
return;
}
if (event.crafting.getItem() == ItemEnum.WIRELESS_CRAFTING_TERMINAL.getItem()) {
AchievementHandler.triggerAch(wctAch, event.player);
}
if (event.crafting.getItem() == ItemEnum.MAGNET_CARD.getItem() && hasWCTAch) {
AchievementHandler.triggerAch(magnetAch, event.player);
}
/*
if (event.crafting.getItem() == ItemEnum.WIRELESS_CRAFTING_TERMINAL.getItem()) {
AchievementHandler.triggerAch(wctAch, event.player);
@@ -189,9 +190,10 @@ public class CommonProxy {
}
}
*/
if (Reference.WCT_BOOSTER_ENABLED && Reference.WCT_EASYMODE_ENABLED && hasWCTAch) {
if (event.crafting.getItem() == ItemEnum.BOOSTER_CARD.getItem()) {
AchievementHandler.triggerAch(boosterAch, event.player);
if (Reference.WCT_BOOSTER_ENABLED && Reference.WCT_EASYMODE_ENABLED && hasWCTAch) {
if (event.crafting.getItem() == ItemEnum.BOOSTER_CARD.getItem()) {
AchievementHandler.triggerAch(boosterAch, event.player);
}
}
}
}
@@ -2,7 +2,7 @@ package net.p455w0rd.wirelesscraftingterminal.reference;
public class Reference {
public static final String MODID = "ae2wct";
public static final String VERSION = "1.7.10-rv3-1.2b";
public static final String VERSION = "1.7.10-rv3-1.3b";
public static final String NAME = "AE2 Wireless Crafting Terminal";
public static final String SERVER_PROXY_CLASS = "net.p455w0rd.wirelesscraftingterminal.proxy.CommonProxy";
public static final String CLIENT_PROXY_CLASS = "net.p455w0rd.wirelesscraftingterminal.proxy.ClientProxy";