diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/client/gui/GuiCraftAmount.java b/src/java/net/p455w0rd/wirelesscraftingterminal/client/gui/GuiCraftAmount.java index 6d4e372..ecc2e78 100644 --- a/src/java/net/p455w0rd/wirelesscraftingterminal/client/gui/GuiCraftAmount.java +++ b/src/java/net/p455w0rd/wirelesscraftingterminal/client/gui/GuiCraftAmount.java @@ -13,11 +13,12 @@ import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.item.ItemStack; import net.p455w0rd.wirelesscraftingterminal.client.gui.widgets.GuiTabButton; import net.p455w0rd.wirelesscraftingterminal.common.container.ContainerCraftAmount; -import net.p455w0rd.wirelesscraftingterminal.common.utils.RandomUtils; import net.p455w0rd.wirelesscraftingterminal.core.sync.network.NetworkHandler; import net.p455w0rd.wirelesscraftingterminal.core.sync.packets.PacketCraftRequest; import net.p455w0rd.wirelesscraftingterminal.core.sync.packets.PacketSwitchGuis; import net.p455w0rd.wirelesscraftingterminal.helpers.WirelessTerminalGuiObject; +import net.p455w0rd.wirelesscraftingterminal.items.ItemEnum; +import net.p455w0rd.wirelesscraftingterminal.items.ItemWirelessCraftingTerminal; import net.p455w0rd.wirelesscraftingterminal.reference.Reference; public class GuiCraftAmount extends WCTBaseGui { @@ -42,7 +43,9 @@ public class GuiCraftAmount extends WCTBaseGui { @Reflected public GuiCraftAmount(final InventoryPlayer inventoryPlayer, final ITerminalHost te) { super(new ContainerCraftAmount(inventoryPlayer, te)); - myIcon = RandomUtils.getWirelessTerm(inventoryPlayer); + ItemStack is = new ItemStack(ItemEnum.WIRELESS_CRAFTING_TERMINAL.getItem()); + ((ItemWirelessCraftingTerminal) is.getItem()).injectAEPower(is, 6400001); + myIcon = is; } @SuppressWarnings({ "unchecked", "unused" }) diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/client/gui/GuiCraftingStatus.java b/src/java/net/p455w0rd/wirelesscraftingterminal/client/gui/GuiCraftingStatus.java index cc7f0bf..7c5e473 100644 --- a/src/java/net/p455w0rd/wirelesscraftingterminal/client/gui/GuiCraftingStatus.java +++ b/src/java/net/p455w0rd/wirelesscraftingterminal/client/gui/GuiCraftingStatus.java @@ -9,12 +9,13 @@ import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.item.ItemStack; import net.p455w0rd.wirelesscraftingterminal.client.gui.widgets.GuiTabButton; import net.p455w0rd.wirelesscraftingterminal.common.container.ContainerCraftingStatus; -import net.p455w0rd.wirelesscraftingterminal.common.utils.RandomUtils; import net.p455w0rd.wirelesscraftingterminal.common.utils.WCTLog; import net.p455w0rd.wirelesscraftingterminal.core.sync.network.NetworkHandler; import net.p455w0rd.wirelesscraftingterminal.core.sync.packets.PacketSwitchGuis; import net.p455w0rd.wirelesscraftingterminal.core.sync.packets.PacketValueConfig; import net.p455w0rd.wirelesscraftingterminal.helpers.WirelessTerminalGuiObject; +import net.p455w0rd.wirelesscraftingterminal.items.ItemEnum; +import net.p455w0rd.wirelesscraftingterminal.items.ItemWirelessCraftingTerminal; import net.p455w0rd.wirelesscraftingterminal.reference.Reference; import appeng.api.AEApi; import appeng.api.definitions.IDefinitions; @@ -50,7 +51,9 @@ public class GuiCraftingStatus extends GuiCraftingCPU this.myIcon = wirelessTerminalStack; } - this.myIcon = RandomUtils.getWirelessTerm(inventoryPlayer); + ItemStack is = new ItemStack(ItemEnum.WIRELESS_CRAFTING_TERMINAL.getItem()); + ((ItemWirelessCraftingTerminal) is.getItem()).injectAEPower(is, 6400001); + myIcon = is; this.originalGui = Reference.GUI_WCT; } diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/client/gui/GuiWirelessCraftingTerminal.java b/src/java/net/p455w0rd/wirelesscraftingterminal/client/gui/GuiWirelessCraftingTerminal.java index 463b608..e4ea714 100644 --- a/src/java/net/p455w0rd/wirelesscraftingterminal/client/gui/GuiWirelessCraftingTerminal.java +++ b/src/java/net/p455w0rd/wirelesscraftingterminal/client/gui/GuiWirelessCraftingTerminal.java @@ -874,7 +874,9 @@ public class GuiWirelessCraftingTerminal extends GuiContainer implements ISortSo super.onGuiClosed(); this.subGui = true; // in case the gui is reopened later ( i'm looking at you NEI ) Keyboard.enableRepeatEvents(false); - memoryText = this.searchField.getText(); + if (this.searchField.getText() != null) { + memoryText = this.searchField.getText(); + } } protected Slot getSlot(final int mouseX, final int mouseY) { diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/common/WirelessCraftingTerminal.java b/src/java/net/p455w0rd/wirelesscraftingterminal/common/WirelessCraftingTerminal.java index 095b97a..b9c9dde 100644 --- a/src/java/net/p455w0rd/wirelesscraftingterminal/common/WirelessCraftingTerminal.java +++ b/src/java/net/p455w0rd/wirelesscraftingterminal/common/WirelessCraftingTerminal.java @@ -27,7 +27,7 @@ import net.p455w0rd.wirelesscraftingterminal.items.ItemEnum; + net.minecraftforge.common.ForgeVersion.minorVersion + '.' // minorVersion + net.minecraftforge.common.ForgeVersion.revisionVersion + '.' // revisionVersion + net.minecraftforge.common.ForgeVersion.buildVersion + ",);" - + "required-after:appliedenergistics2@[rv3-beta-1,);") + + "required-after:appliedenergistics2@[rv3-beta-1,);after:NotEnoughItems;") public class WirelessCraftingTerminal { @@ -53,7 +53,6 @@ public class WirelessCraftingTerminal { ConfigHandler.init(new File(event.getModConfigurationDirectory(), Reference.CONFIG_FILE)); FMLCommonHandler.instance().bus().register(proxy); AEApi.instance().registries().wireless().registerWirelessHandler((IWirelessTermHandler) ItemEnum.WIRELESS_CRAFTING_TERMINAL.getItem()); - AchievementHandler.init(); WCTLog.endSection("PreInit", stopwatch); } @@ -63,6 +62,7 @@ public class WirelessCraftingTerminal { WirelessCraftingTerminal.WCTState = LoaderState.INITIALIZATION; RecipeHandler.addRecipes(true); IntegrationRegistry.INSTANCE.init(); + AchievementHandler.init(); WCTLog.endSection("Init", stopwatch); } diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/common/container/ContainerWirelessCraftingTerminal.java b/src/java/net/p455w0rd/wirelesscraftingterminal/common/container/ContainerWirelessCraftingTerminal.java index d6d1b56..7aaed39 100644 --- a/src/java/net/p455w0rd/wirelesscraftingterminal/common/container/ContainerWirelessCraftingTerminal.java +++ b/src/java/net/p455w0rd/wirelesscraftingterminal/common/container/ContainerWirelessCraftingTerminal.java @@ -748,7 +748,12 @@ public class ContainerWirelessCraftingTerminal extends Container implements ICon // drain 1 ae t this.ticks++; if (this.ticks > 10) { - this.civ.extractAEPower(this.getPowerMultiplier() * this.ticks, Actionable.MODULATE, PowerMultiplier.CONFIG); + if (!isBoosterInstalled() || !Reference.WCT_BOOSTER_ENABLED) { + this.civ.extractAEPower(this.getPowerMultiplier() * this.ticks, Actionable.MODULATE, PowerMultiplier.CONFIG); + } + else { + this.civ.extractAEPower((int)(0.5 * this.ticks), Actionable.MODULATE, PowerMultiplier.CONFIG); + } this.ticks = 0; } diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/common/utils/RandomUtils.java b/src/java/net/p455w0rd/wirelesscraftingterminal/common/utils/RandomUtils.java index 0810e5b..a0aa5db 100644 --- a/src/java/net/p455w0rd/wirelesscraftingterminal/common/utils/RandomUtils.java +++ b/src/java/net/p455w0rd/wirelesscraftingterminal/common/utils/RandomUtils.java @@ -7,7 +7,6 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; import net.minecraft.util.EnumChatFormatting; -import net.p455w0rd.wirelesscraftingterminal.items.ItemEnum; import net.p455w0rd.wirelesscraftingterminal.items.ItemMagnet; import net.p455w0rd.wirelesscraftingterminal.items.ItemWirelessCraftingTerminal; @@ -58,21 +57,8 @@ public class RandomUtils { wirelessTerm = item; break; } - if (wirelessTerm == null) { - continue; - } - } - if (wirelessTerm == null) { - if (playerInv.player.getHeldItem() != null) { - return playerInv.player.getHeldItem(); - } - else { - return ItemEnum.WIRELESS_CRAFTING_TERMINAL.getStack(); - } - } - else { - return wirelessTerm; } + return wirelessTerm; } public static ItemStack getMagnet(InventoryPlayer playerInv) { @@ -109,9 +95,6 @@ public class RandomUtils { magnetItem = item; break; } - if (magnetItem == null) { - continue; - } } return magnetItem; } diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/handlers/AchievementHandler.java b/src/java/net/p455w0rd/wirelesscraftingterminal/handlers/AchievementHandler.java index 4c6507d..3883600 100644 --- a/src/java/net/p455w0rd/wirelesscraftingterminal/handlers/AchievementHandler.java +++ b/src/java/net/p455w0rd/wirelesscraftingterminal/handlers/AchievementHandler.java @@ -4,6 +4,7 @@ import cpw.mods.fml.common.FMLCommonHandler; import cpw.mods.fml.relauncher.Side; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; +import net.minecraft.item.ItemStack; import net.minecraft.stats.Achievement; import net.minecraft.stats.AchievementList; import net.minecraftforge.common.AchievementPage; @@ -13,7 +14,7 @@ import net.p455w0rd.wirelesscraftingterminal.items.ItemInfinityBooster; public class AchievementHandler { private static ItemInfinityBooster booster = (ItemInfinityBooster) ItemEnum.BOOSTER_ICON.getItem(); - public static final Achievement wctAch = new Achievement("achievement.wctAchievement", "wctAchievement", 0, 0, ItemEnum.WIRELESS_CRAFTING_TERMINAL.getStack(), (Achievement) null); + public static final Achievement wctAch = new Achievement("achievement.wctAchievement", "wctAchievement", 0, 0, new ItemStack(ItemEnum.WIRELESS_CRAFTING_TERMINAL.getItem(), 1), (Achievement) null); public static final Achievement boosterAch = new Achievement("achievment.boosterAchievement", "boosterAchievement", 0, 2, booster.hasEffect(true), wctAch); public static final Achievement magnetAch = new Achievement("achievement.magnetAchievement", "magnetAchievement", 2, 0, ItemEnum.MAGNET_CARD.getItem(), wctAch); private static final AchievementPage achPage = new AchievementPage("Wireless Crafting Term", wctAch, boosterAch, magnetAch); diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/handlers/KeybindHandler.java b/src/java/net/p455w0rd/wirelesscraftingterminal/handlers/KeybindHandler.java index edba898..c6ced06 100644 --- a/src/java/net/p455w0rd/wirelesscraftingterminal/handlers/KeybindHandler.java +++ b/src/java/net/p455w0rd/wirelesscraftingterminal/handlers/KeybindHandler.java @@ -46,14 +46,26 @@ public class KeybindHandler { } if (p.openContainer != null && p.openContainer instanceof ContainerPlayer) { if (openTerminal.isPressed()) { - if (!FMLClientHandler.instance().isGUIOpen(GuiWirelessCraftingTerminal.class)) { - NetworkHandler.instance.sendToServer(new PacketOpenGui(Reference.GUI_WCT)); + ItemStack is = RandomUtils.getWirelessTerm(p.inventory); + if (is == null) { + return; + } + ItemWirelessCraftingTerminal wirelessTerm = (ItemWirelessCraftingTerminal) is.getItem(); + if (wirelessTerm != null) { + if (!FMLClientHandler.instance().isGUIOpen(GuiWirelessCraftingTerminal.class)) { + NetworkHandler.instance.sendToServer(new PacketOpenGui(Reference.GUI_WCT)); + } } } else if (openMagnetFilter.isPressed()) { - ItemWirelessCraftingTerminal wirelessTerm = (ItemWirelessCraftingTerminal) RandomUtils.getWirelessTerm(p.inventory).getItem(); - //ensure player has a Wireless Crafting Terminal (with Magnet Card Installed) or Magnet Card in their inventory - if (wirelessTerm != null && wirelessTerm instanceof ItemWirelessCraftingTerminal) { + ItemStack is = RandomUtils.getWirelessTerm(p.inventory); + if (is == null) { + return; + } + ItemWirelessCraftingTerminal wirelessTerm = (ItemWirelessCraftingTerminal) is.getItem(); + // ensure player has a Wireless Crafting Terminal (with Magnet + // Card Installed) or Magnet Card in their inventory + if (wirelessTerm != null) { ItemStack magnetItem = RandomUtils.getMagnet(p.inventory); if (magnetItem != null && magnetItem.getItem() instanceof ItemMagnet) { NetworkHandler.instance.sendToServer(new PacketOpenGui(Reference.GUI_MAGNET)); diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/items/ItemWirelessCraftingTerminal.java b/src/java/net/p455w0rd/wirelesscraftingterminal/items/ItemWirelessCraftingTerminal.java index 455aa03..9859cd6 100644 --- a/src/java/net/p455w0rd/wirelesscraftingterminal/items/ItemWirelessCraftingTerminal.java +++ b/src/java/net/p455w0rd/wirelesscraftingterminal/items/ItemWirelessCraftingTerminal.java @@ -36,7 +36,10 @@ 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; +import net.p455w0rd.wirelesscraftingterminal.integration.IntegrationType; +import net.p455w0rd.wirelesscraftingterminal.transformer.annotations.Integration.Interface; +@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"; @@ -330,7 +333,14 @@ public class ItemWirelessCraftingTerminal extends AEBasePoweredItem implements I return (int) (max - current); } } else { - return (int) PowerUnits.AE.convertTo(PowerUnits.RF, injectAEPower(container, PowerUnits.RF.convertTo(PowerUnits.AE, maxReceive))); + double currentAEPower = getAECurrentPower(container); + 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; + } + else { + return 0; + } } } diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/reference/Reference.java b/src/java/net/p455w0rd/wirelesscraftingterminal/reference/Reference.java index ff75bef..2fe7436 100644 --- a/src/java/net/p455w0rd/wirelesscraftingterminal/reference/Reference.java +++ b/src/java/net/p455w0rd/wirelesscraftingterminal/reference/Reference.java @@ -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-1.0b"; + public static final String VERSION = "1.7.10-rv3-1.2b"; 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"; diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/transformer/annotations/Integration.java b/src/java/net/p455w0rd/wirelesscraftingterminal/transformer/annotations/Integration.java new file mode 100644 index 0000000..695a29d --- /dev/null +++ b/src/java/net/p455w0rd/wirelesscraftingterminal/transformer/annotations/Integration.java @@ -0,0 +1,34 @@ +package net.p455w0rd.wirelesscraftingterminal.transformer.annotations; + +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; +import net.p455w0rd.wirelesscraftingterminal.integration.IntegrationType; + + +public @interface Integration +{ + @Retention( RetentionPolicy.RUNTIME ) + @Target( ElementType.TYPE ) + @interface InterfaceList + { + Interface[] value(); + } + + @Retention( RetentionPolicy.RUNTIME ) + @Target( ElementType.TYPE ) + @interface Interface + { + String iface(); + + IntegrationType iname(); + } + + @Retention( RetentionPolicy.RUNTIME ) + @Target( ElementType.METHOD ) + @interface Method + { + IntegrationType iname(); + } +} diff --git a/src/resources/assets/ae2wct/lang/de_DE.lang b/src/resources/assets/ae2wct/lang/de_DE.lang new file mode 100644 index 0000000..b96cad7 --- /dev/null +++ b/src/resources/assets/ae2wct/lang/de_DE.lang @@ -0,0 +1,58 @@ +//**************************// +//WIRELESS CRAFTING TEMRINAL// +//**************************// + +//Items +item.wirelessCraftingTerminal.name=Drahtlose Fertigungskonsole +item.infinityBoosterCard.name=Unendliche Drahtlosverstärkerkarte +item.magnetCard.name=Magnetkarte +itemGroup.ae2wct=§9AE2 Wireless Crafting Terminal + +//Tooltips +gui.tooltips.ae2wct.PressShift=Infos via Shiftklick +gui.tooltips.ae2wct.OnlyWorks=Funktioniert nur im Slot der drahtlosen Fertigungskonsole +gui.tooltips.ae2wct.TitleDesc=Beschreibung +gui.tooltips.ae2wct.InfinityBoosterDesc=Ermöglicht es, eine verbundene AE2 Drahtlosfertigungskonsole über Dimensionen hinweg in jeder Distanz zu nutzen. +gui.tooltips.ae2wct.MagnetDesc=Eine Magnetkarte, die automagisch Items in das AE-Netzwerk insertiert +gui.tooltips.ae2wct.MagnetDesc2=Rechtsklick, um den Filter zu setzen +gui.tooltips.ae2wct.LinkStatus=Verbindungsstatus +gui.tooltips.ae2wct.Installed=Installiert +gui.tooltips.ae2wct.NotInstalled=Nicht installiert +gui.tooltips.ae2wct.Active=Aktiv +gui.tooltips.ae2wct.Inactive=Inaktiv +gui.tooltips.ae2wct.Status=Status +gui.tooltips.ae2wct.EmptyTrash=Lösche Müll +gui.tooltips.ae2wct.EmptyTrashDesc=Leere den Müll-Slot +gui.tooltips.ae2wct.MagnetFilterTitle=Magnetfilter +gui.tooltips.ae2wct.FilterMode=Filter-Modus +gui.tooltips.ae2wct.Whitelisting=Erlauben +gui.tooltips.ae2wct.Blacklisting=Verbieten +gui.tooltips.ae2wct.MagnetActiveDesc1=Zusätzliche Items im Inventar platzieren +gui.tooltips.ae2wct.MagnetActiveDesc2=Zusätzliche Items auf dem Boden liegen lassen +//Labels +gui.labels.ae2wct.WirelessTermLabel=Drahtloskonsole + +//Config Descriptions +config.ae2wct.MaxPowerDesc=In der Drahtloskonsole maximal speicherbare Energie in AE +config.ae2wct.InfinityBoosterCfgDesc=Erlaube das unendliche Drahtlosverstärkerupgrade +config.ae2wct.EasyModeDesc=Aktiviere den "Einfachen Modus" (Einfachere Rezepte + Rezept für unendlichen Drahtlosverstärker) + +//Achievements +achievement.wctAchievement=Digitales Fertigen über WLAN +achievement.wctAchievement.desc=Fertige eine drahtlose Fertigungskonsole +achievement.boosterAchievement=Interdimensionales Fertigen +achievement.boosterAchievement.desc=Erwerbe eine unendliche Drahtlosverstärkerkarte +achievement.magnetAchievement=Digitales Staubsaugen! +achievement.magnetAchievement.desc=Fertige eine Magnetkarte + +//Chat Messages +chatmessages.ae2wct.NoNetworkPower=Netzwerk hat keine Energie! +chatmessages.ae2wct.MagnetMode1=Magnetkarte deaktiviert +chatmessages.ae2wct.MagnetMode2=Magnetkarte aktiviert - Items, die nicht im AE-Netzwerk gespeichert sind, werden im Inventar platziert +chatmessages.ae2wct.MagnetMode3=Magnetkarte aktiviert - Items, die nicht im AE-Netzwerk gespeichert sind, werden auf dem Boden liegen gelassen + +//Keybindings +key.OpenTerminal=Öffne drahtlose Fertigungskonsole +key.OpenMagnetFilter=Öffne Magnetkartenfilter-GUI +key.SwitchMagnetMode=Aktiviere/Deaktiviere Magnetkarte +key.categories.ae2wct=Wireless Crafting Terminal diff --git a/src/resources/mcmod.info b/src/resources/mcmod.info index 815e04b..a55f7ae 100644 --- a/src/resources/mcmod.info +++ b/src/resources/mcmod.info @@ -3,7 +3,7 @@ "modid": "ae2wct", "name": "AE2 Wireless Crafting Terminal", "description": "Adds a wireless version of the AE2 Crafting Terminal", - "version": "1.7.10-1.0b", + "version": "1.7.10-rv3-1.2b", "mcversion": "1.7.10", "url": "http://p455w0rd.net/", "updateUrl": "",