This commit is contained in:
p455w0rd committed 2016-05-01 05:19:47 -04:00
1 parent c4e9d90118
commit b7bfc47d1f
13 files changed
+146 -35

No files matched your search

@@ -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" })
@@ -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;
}
@@ -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) {
@@ -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);
}
@@ -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;
}
@@ -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;
}
@@ -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);
@@ -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));
@@ -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;
}
}
}
@@ -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";
@@ -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();
}
}