From e90eb924e6a5f46c5481e3d455dc98eeee98a1fb Mon Sep 17 00:00:00 2001 From: p455w0rd Date: Tue, 17 Jan 2017 19:11:37 -0500 Subject: [PATCH] changed magnet logic to work better with veinminer and WCT item can be enchanted with soulbound now --- gradle.properties | 2 +- latestversionrv3.txt | 2 +- .../common/WCTGuiHandler.java | 65 ++++----- .../integration/EnderIO.java | 50 +++++++ .../items/ItemMagnet.java | 127 ++++-------------- .../items/ItemWirelessCraftingTerminal.java | 38 ++++-- .../proxy/ClientProxy.java | 31 ++--- .../proxy/CommonProxy.java | 99 +++++++++++++- 8 files changed, 252 insertions(+), 162 deletions(-) create mode 100644 src/java/net/p455w0rd/wirelesscraftingterminal/integration/EnderIO.java diff --git a/gradle.properties b/gradle.properties index 4a6ab2f..1f46227 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,6 +1,6 @@ aeversion=rv3 wctchannel=b -wctbuild=1.8.7.3 +wctbuild=1.8.7.4 wctgroup=net.p455w0rd.wirelesscraftingterminal wctbasename=WirelessCraftingTerminal diff --git a/latestversionrv3.txt b/latestversionrv3.txt index 754dadf..7beede1 100644 --- a/latestversionrv3.txt +++ b/latestversionrv3.txt @@ -1 +1 @@ -1.7.10-rv3-1.8.7.3b \ No newline at end of file +1.7.10-rv3-1.8.7.4b \ No newline at end of file diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/common/WCTGuiHandler.java b/src/java/net/p455w0rd/wirelesscraftingterminal/common/WCTGuiHandler.java index cdbae7a..edd5251 100644 --- a/src/java/net/p455w0rd/wirelesscraftingterminal/common/WCTGuiHandler.java +++ b/src/java/net/p455w0rd/wirelesscraftingterminal/common/WCTGuiHandler.java @@ -2,7 +2,6 @@ package net.p455w0rd.wirelesscraftingterminal.common; import appeng.api.AEApi; import appeng.api.implementations.guiobjects.IPortableCell; -import appeng.api.storage.ITerminalHost; import cpw.mods.fml.common.network.IGuiHandler; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.world.World; @@ -29,54 +28,60 @@ public class WCTGuiHandler implements IGuiHandler { @Override public Object getServerGuiElement(int guiId, EntityPlayer player, World world, int x, int y, int z) { final IWirelessCraftingTermHandler wh = (IWirelessCraftingTermHandler) AEApi.instance().registries().wireless().getWirelessTerminalHandler(RandomUtils.getWirelessTerm(player.inventory)); - final WirelessTerminalGuiObject obj = new WirelessTerminalGuiObject(wh, RandomUtils.getWirelessTerm(player.inventory), player, world, x, y, z); - final IPortableCell terminal = (IPortableCell) obj; + if (wh != null) { + final WirelessTerminalGuiObject obj = new WirelessTerminalGuiObject(wh, RandomUtils.getWirelessTerm(player.inventory), player, world, x, y, z); + if (obj != null) { + final IPortableCell terminal = obj; - if (guiId == Reference.GUI_WCT) { - return new ContainerWirelessCraftingTerminal(player, player.inventory); - } + if (guiId == Reference.GUI_WCT) { + return new ContainerWirelessCraftingTerminal(player, player.inventory); + } - if (guiId == Reference.GUI_CRAFTING_STATUS) { - return new ContainerCraftingStatus(player.inventory, (ITerminalHost) terminal); - } + if (guiId == Reference.GUI_CRAFTING_STATUS) { + return new ContainerCraftingStatus(player.inventory, terminal); + } - if (guiId == Reference.GUI_CRAFT_AMOUNT) { - return new ContainerCraftAmount(player.inventory, (ITerminalHost) terminal); - } + if (guiId == Reference.GUI_CRAFT_AMOUNT) { + return new ContainerCraftAmount(player.inventory, terminal); + } - if (guiId == Reference.GUI_CRAFT_CONFIRM) { - return new ContainerCraftConfirm(player.inventory, (ITerminalHost) terminal); + if (guiId == Reference.GUI_CRAFT_CONFIRM) { + return new ContainerCraftConfirm(player.inventory, terminal); + } + } } - if (guiId == Reference.GUI_MAGNET) { return new ContainerMagnet(player, player.inventory); } - + return null; } @Override public Object getClientGuiElement(int guiId, EntityPlayer player, World world, int x, int y, int z) { final IWirelessCraftingTermHandler wh = (IWirelessCraftingTermHandler) AEApi.instance().registries().wireless().getWirelessTerminalHandler(RandomUtils.getWirelessTerm(player.inventory)); - final WirelessTerminalGuiObject obj = new WirelessTerminalGuiObject(wh, RandomUtils.getWirelessTerm(player.inventory), player, world, x, y, z); - final IPortableCell terminal = (IPortableCell) obj; + if (wh != null) { + final WirelessTerminalGuiObject obj = new WirelessTerminalGuiObject(wh, RandomUtils.getWirelessTerm(player.inventory), player, world, x, y, z); + if (obj != null) { + final IPortableCell terminal = obj; - if (guiId == Reference.GUI_WCT) { - return new GuiWirelessCraftingTerminal((ContainerWirelessCraftingTerminal) new ContainerWirelessCraftingTerminal(player, player.inventory)); - } + if (guiId == Reference.GUI_WCT) { + return new GuiWirelessCraftingTerminal(new ContainerWirelessCraftingTerminal(player, player.inventory)); + } - if (guiId == Reference.GUI_CRAFTING_STATUS) { - return new GuiCraftingStatus(player.inventory, (ITerminalHost) terminal); - } + if (guiId == Reference.GUI_CRAFTING_STATUS) { + return new GuiCraftingStatus(player.inventory, terminal); + } - if (guiId == Reference.GUI_CRAFT_AMOUNT) { - return new GuiCraftAmount(player.inventory, (ITerminalHost) terminal); - } + if (guiId == Reference.GUI_CRAFT_AMOUNT) { + return new GuiCraftAmount(player.inventory, terminal); + } - if (guiId == Reference.GUI_CRAFT_CONFIRM) { - return new GuiCraftConfirm(player.inventory, (ITerminalHost) terminal); + if (guiId == Reference.GUI_CRAFT_CONFIRM) { + return new GuiCraftConfirm(player.inventory, terminal); + } + } } - if (guiId == Reference.GUI_MAGNET) { return new GuiMagnet(new ContainerMagnet(player, player.inventory)); } diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/integration/EnderIO.java b/src/java/net/p455w0rd/wirelesscraftingterminal/integration/EnderIO.java new file mode 100644 index 0000000..b6ba599 --- /dev/null +++ b/src/java/net/p455w0rd/wirelesscraftingterminal/integration/EnderIO.java @@ -0,0 +1,50 @@ +package net.p455w0rd.wirelesscraftingterminal.integration; + +import java.lang.invoke.MethodHandle; +import java.util.Iterator; +import java.util.Map; + +import cpw.mods.fml.common.Loader; +import crazypants.enderio.enchantment.EnchantmentSoulBound; +import net.minecraft.enchantment.EnchantmentHelper; +import net.minecraft.item.ItemStack; +import p455w0rdslib.util.ReflectionUtils; + +/** + * @author p455w0rd + * + */ +public class EnderIO { + + public static boolean isLoaded() { + return Loader.isModLoaded("EnderIO"); + } + + @SuppressWarnings("rawtypes") + public static boolean isSoulBound(ItemStack stack) { + if (isLoaded() && crazypants.enderio.config.Config.enchantmentSoulBoundEnabled) { + try { + MethodHandle GET_SOULBOUND = ReflectionUtils.findFieldGetter(crazypants.enderio.enchantment.Enchantments.class, "soulBound"); + EnchantmentSoulBound soulbound = (EnchantmentSoulBound) GET_SOULBOUND.invoke(crazypants.enderio.enchantment.Enchantments.getInstance()); + MethodHandle GET_ID = ReflectionUtils.findFieldGetter(crazypants.enderio.enchantment.EnchantmentSoulBound.class, "id"); + int soulboundId = (int) GET_ID.invoke(soulbound); + //int soulboundId = crazypants.enderio.config.Config.enchantmentSoulBoundId; + Map enchants = EnchantmentHelper.getEnchantments(stack); + if (enchants != null) { + Iterator i = enchants.keySet().iterator(); + while (i.hasNext()) { + int enchId = (int) i.next(); + if (soulboundId != enchId) { + continue; + } + return true; + } + } + } + catch (Throwable e) { + } + } + return false; + } + +} diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/items/ItemMagnet.java b/src/java/net/p455w0rd/wirelesscraftingterminal/items/ItemMagnet.java index f33a88c..ab8aeec 100644 --- a/src/java/net/p455w0rd/wirelesscraftingterminal/items/ItemMagnet.java +++ b/src/java/net/p455w0rd/wirelesscraftingterminal/items/ItemMagnet.java @@ -21,9 +21,6 @@ import appeng.api.storage.IMEInventoryHandler; import appeng.api.storage.IMEMonitor; import appeng.api.storage.data.IAEItemStack; import appeng.util.Platform; -import cpw.mods.fml.common.FMLCommonHandler; -import cpw.mods.fml.common.eventhandler.Event.Result; -import cpw.mods.fml.common.gameevent.PlayerEvent.ItemPickupEvent; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.entity.Entity; @@ -37,12 +34,9 @@ import net.minecraft.nbt.NBTTagList; import net.minecraft.util.AxisAlignedBB; import net.minecraft.util.ChatComponentText; import net.minecraft.world.World; -import net.minecraftforge.common.MinecraftForge; -import net.minecraftforge.event.entity.player.EntityItemPickupEvent; import net.minecraftforge.oredict.OreDictionary; import net.p455w0rd.wirelesscraftingterminal.api.IWirelessCraftingTermHandler; import net.p455w0rd.wirelesscraftingterminal.api.IWirelessCraftingTerminalItem; -import net.p455w0rd.wirelesscraftingterminal.api.networking.security.WCTPlayerSource; import net.p455w0rd.wirelesscraftingterminal.common.WCTGuiHandler; import net.p455w0rd.wirelesscraftingterminal.common.utils.RandomUtils; import net.p455w0rd.wirelesscraftingterminal.core.sync.network.NetworkHandler; @@ -51,7 +45,6 @@ import net.p455w0rd.wirelesscraftingterminal.handlers.KeybindHandler; import net.p455w0rd.wirelesscraftingterminal.handlers.LocaleHandler; import net.p455w0rd.wirelesscraftingterminal.helpers.WirelessTerminalGuiObject; import net.p455w0rd.wirelesscraftingterminal.reference.Reference; -import p455w0rdslib.util.EntityItemUtils; /** * Jotato's amazing magnet item from QuantumFlux adapted for use in the Wireless @@ -63,12 +56,12 @@ import p455w0rdslib.util.EntityItemUtils; public class ItemMagnet extends Item { private int distanceFromPlayer; - private WirelessTerminalGuiObject obj; - private IPortableCell civ; - private IEnergySource powerSrc; - private IMEMonitor monitor; - private IMEInventoryHandler cellInv; - private BaseActionSource mySrc; + public WirelessTerminalGuiObject obj; + public IPortableCell civ; + public IEnergySource powerSrc; + public IMEMonitor monitor; + public IMEInventoryHandler cellInv; + public BaseActionSource mySrc; private ItemStack thisItemStack; private int pickupTimer = 0; @@ -237,90 +230,27 @@ public class ItemMagnet extends Item { return; } - List filteredList = getFilteredItems(getItemStack()); + //List filteredList = getFilteredItems(getItemStack()); // items - Iterator iterator = getEntitiesInRange(EntityItem.class, world, (int) player.posX, (int) player.posY, (int) player.posZ, distanceFromPlayer).iterator(); + Iterator iterator = getEntitiesInRange(EntityItem.class, world, (int) player.posX, (int) player.posY, (int) player.posZ, distanceFromPlayer).iterator(); while (iterator.hasNext()) { - EntityItem itemToGet = (EntityItem) iterator.next(); - if (itemToGet == null) { - return; - } - if (EntityItemUtils.getThrowerName(itemToGet) != null && EntityItemUtils.getThrowerName(itemToGet).equals(player.getCommandSenderName()) && !EntityItemUtils.canPickup(itemToGet)) { + if (itemToGet.func_145800_j() != null && itemToGet.func_145800_j().equals(player.getCommandSenderName())) { continue; } - //itemToGet.delayBeforeCanPickup = 75; - EntityItemPickupEvent pickupEvent = new EntityItemPickupEvent(player, itemToGet); - ItemPickupEvent itemPickupEvent = new ItemPickupEvent(player, itemToGet); - ItemStack itemStackToGet = itemToGet.getEntityItem(); - if (itemStackToGet == null) { - return; - } - int stackSize = itemStackToGet.stackSize; + EntityPlayer closestPlayer = world.getClosestPlayerToEntity(itemToGet, distanceFromPlayer); - MinecraftForge.EVENT_BUS.post(pickupEvent); - FMLCommonHandler.instance().bus().post(itemPickupEvent); - - if (obj == null) { - obj = getGuiObject(wirelessTerm, player, world, (int) player.posX, (int) player.posY, (int) player.posZ); - civ = obj; - powerSrc = civ; - monitor = civ.getItemInventory(); - cellInv = monitor; - mySrc = new WCTPlayerSource(player, obj); + if (closestPlayer != null && closestPlayer != player) { + continue; } - boolean ignoreRange = (isBoosterInstalled(wirelessTerm) && Reference.WCT_BOOSTER_ENABLED); - boolean hasAxxess = hasNetworkAccess(SecurityPermissions.INJECT, true, player, wirelessTerm); - if ((ignoreRange && hasAxxess) || (obj.rangeCheck(false) && hasAxxess)) { - IAEItemStack ais = AEApi.instance().storage().createItemStack(itemStackToGet); - ais.setStackSize(stackSize); - if (!itemToGet.isDead) { - - // whitelist - if (getMode(getItemStack())) { - if (isItemFiltered(itemStackToGet, filteredList) && filteredList != null && filteredList.size() > 0) { - itemToGet.setDead(); - doInject(ais, stackSize, player, itemToGet, itemStackToGet, world); - continue; - } - else { - if (item.getItemDamage() == 1) { - if (pickupEvent.getResult() == Result.ALLOW || itemPickupEvent.getResult() == Result.ALLOW || stackSize <= 0 || player.inventory.addItemStackToInventory(itemStackToGet)) { - player.onItemPickup(itemToGet, stackSize); - world.playSoundAtEntity(player, "random.pop", 0.15F, ((world.rand.nextFloat() - world.rand.nextFloat()) * 0.7F + 1.0F) * 2.0F); - } - } - else { - doVanillaPickup(itemToGet, player, itemStackToGet, world, stackSize); - } - } - } - // blacklist - else { - if (!isItemFiltered(itemStackToGet, filteredList) || filteredList == null || filteredList.size() <= 0) { - itemToGet.setDead(); - doInject(ais, stackSize, player, itemToGet, itemStackToGet, world); - continue; - } - else { - if (item.getItemDamage() == 1) { - if (pickupEvent.getResult() == Result.ALLOW || itemPickupEvent.getResult() == Result.ALLOW || stackSize <= 0 || player.inventory.addItemStackToInventory(itemStackToGet)) { - player.onItemPickup(itemToGet, stackSize); - world.playSoundAtEntity(player, "random.pop", 0.15F, ((world.rand.nextFloat() - world.rand.nextFloat()) * 0.7F + 1.0F) * 2.0F); - } - } - else { - doVanillaPickup(itemToGet, player, itemStackToGet, world, stackSize); - } - } - } + if (!world.isRemote) { + if (itemToGet.delayBeforeCanPickup > 0) { + itemToGet.delayBeforeCanPickup = 0; } - } - // network isn't powered, WCT has no power, too far away with no booster installed..something is preventing use of WCT, so use niller cannix - else { - doVanillaPickup(itemToGet, player, itemStackToGet, world, stackSize); + itemToGet.motionX = itemToGet.motionY = itemToGet.motionZ = 0; + itemToGet.setPosition(player.posX - 0.2 + (world.rand.nextDouble() * 0.4), player.posY - 0.6, player.posZ - 0.2 + (world.rand.nextDouble() * 0.4)); } } @@ -341,7 +271,7 @@ public class ItemMagnet extends Item { } } - private void doVanillaPickup(EntityItem itemToGet, EntityPlayer player, ItemStack itemStackToGet, World world, int stackSize) { + public void doVanillaPickup(EntityItem itemToGet, EntityPlayer player, ItemStack itemStackToGet, World world, int stackSize) { if (pickupTimer < 100) { pickupTimer++; return; @@ -380,7 +310,7 @@ public class ItemMagnet extends Item { return false; } - private boolean isItemFiltered(ItemStack is, List itemList) { + public boolean isItemFiltered(ItemStack is, List itemList) { if (is != null && itemList != null) { for (int i = 0; i < itemList.size(); i++) { ItemStack thisStack = itemList.get(i); @@ -424,7 +354,7 @@ public class ItemMagnet extends Item { return is1.getItemDamage() == is2.getItemDamage(); } - private boolean hasNetworkAccess(final SecurityPermissions perm, final boolean requirePower, EntityPlayer player, ItemStack wirelessTerm) { + public boolean hasNetworkAccess(final SecurityPermissions perm, final boolean requirePower, EntityPlayer player, ItemStack wirelessTerm) { if (player.capabilities.isCreativeMode) { return true; } @@ -445,7 +375,7 @@ public class ItemMagnet extends Item { return false; } - private List getFilteredItems(ItemStack magnetItem) { + public List getFilteredItems(ItemStack magnetItem) { if (magnetItem == null) { return null; } @@ -468,16 +398,18 @@ public class ItemMagnet extends Item { return null; } - private void doInject(IAEItemStack ais, int stackSize, EntityPlayer player, EntityItem itemToGet, ItemStack itemStackToGet, World world) { + public boolean doInject(IAEItemStack ais, int stackSize, EntityPlayer player, EntityItem itemToGet, ItemStack itemStackToGet, World world) { ais = Platform.poweredInsert(powerSrc, cellInv, ais, mySrc); if (ais != null) { player.onItemPickup(itemToGet, stackSize); player.inventory.addItemStackToInventory(itemStackToGet); world.playSoundAtEntity(player, "random.pop", 0.15F, ((world.rand.nextFloat() - world.rand.nextFloat()) * 0.7F + 1.0F) * 2.0F); + return false; } + return true; } - private boolean isBoosterInstalled(ItemStack wirelessTerm) { + public boolean isBoosterInstalled(ItemStack wirelessTerm) { if (wirelessTerm.getItem() instanceof IWirelessCraftingTerminalItem) { if (wirelessTerm.hasTagCompound()) { NBTTagList boosterNBTList = wirelessTerm.getTagCompound().getTagList("BoosterSlot", 10); @@ -496,7 +428,7 @@ public class ItemMagnet extends Item { } // true=whitelist (default:whitelist) - private boolean getMode(ItemStack magnetItem) { + public boolean getMode(ItemStack magnetItem) { if (magnetItem.getItem() instanceof ItemMagnet) { if (magnetItem.hasTagCompound()) { NBTTagCompound nbtTC = magnetItem.getTagCompound(); @@ -508,7 +440,7 @@ public class ItemMagnet extends Item { return true; } - private WirelessTerminalGuiObject getGuiObject(final ItemStack it, final EntityPlayer player, final World w, final int x, final int y, final int z) { + public WirelessTerminalGuiObject getGuiObject(final ItemStack it, final EntityPlayer player, final World w, final int x, final int y, final int z) { if (it != null) { final IWirelessCraftingTermHandler wh = (IWirelessCraftingTermHandler) AEApi.instance().registries().wireless().getWirelessTerminalHandler(it); if (wh != null) { @@ -519,8 +451,7 @@ public class ItemMagnet extends Item { return null; } - @SuppressWarnings("rawtypes") - public static List getEntitiesInRange(Class entityType, World world, int x, int y, int z, int distance) { + public static List getEntitiesInRange(Class entityType, World world, int x, int y, int z, int distance) { return world.getEntitiesWithinAABB(entityType, AxisAlignedBB.getBoundingBox(x - distance, y - distance, z - distance, x + distance, y + distance, z + distance)); } @@ -532,7 +463,7 @@ public class ItemMagnet extends Item { return new ItemStack(this, size); } - protected boolean isActivated(ItemStack item) { + public boolean isActivated(ItemStack item) { if (item == null) { return false; } diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/items/ItemWirelessCraftingTerminal.java b/src/java/net/p455w0rd/wirelesscraftingterminal/items/ItemWirelessCraftingTerminal.java index 650defc..f0540ff 100644 --- a/src/java/net/p455w0rd/wirelesscraftingterminal/items/ItemWirelessCraftingTerminal.java +++ b/src/java/net/p455w0rd/wirelesscraftingterminal/items/ItemWirelessCraftingTerminal.java @@ -35,10 +35,10 @@ 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.integration.EnderIO; import net.p455w0rd.wirelesscraftingterminal.reference.Reference; -public class ItemWirelessCraftingTerminal extends AERootPoweredItem implements IWirelessCraftingTerminalItem -{ +public class ItemWirelessCraftingTerminal extends AERootPoweredItem implements IWirelessCraftingTerminalItem { public static final String LINK_KEY_STRING = "key"; public static double GLOBAL_POWER_MULTIPLIER = PowerMultiplier.CONFIG.multiplier; @@ -60,6 +60,12 @@ public class ItemWirelessCraftingTerminal extends AERootPoweredItem implements I return checkForBooster(is); } + @Override + public boolean isBookEnchantable(final ItemStack itemstack1, final ItemStack itemstack2) { + return EnderIO.isSoulBound(itemstack2); + } + + @Override public boolean checkForBooster(final ItemStack wirelessTerminal) { if (wirelessTerminal.hasTagCompound()) { NBTTagList boosterNBTList = wirelessTerminal.getTagCompound().getTagList(BOOSTER_SLOT_NBT, 10); @@ -91,7 +97,8 @@ public class ItemWirelessCraftingTerminal extends AERootPoweredItem implements I } return false; } - + + @Override public boolean isWirelessCraftingEnabled(final ItemStack wirelessTerminal) { return true; } @@ -102,8 +109,8 @@ public class ItemWirelessCraftingTerminal extends AERootPoweredItem implements I return; } EntityPlayer p = (EntityPlayer) e; - if (this.entityPlayer == null) { - this.entityPlayer = p; + if (entityPlayer == null) { + entityPlayer = p; } ItemStack wirelessTerminal = null; InventoryPlayer inv = p.inventory; @@ -184,7 +191,9 @@ public class ItemWirelessCraftingTerminal extends AERootPoweredItem implements I return out; } - @SuppressWarnings({ "unchecked", "rawtypes" }) + @SuppressWarnings({ + "unchecked", "rawtypes" + }) @Override public void getCheckedSubItems(Item item, CreativeTabs creativeTab, List itemList) { List itemList2 = itemList; @@ -204,8 +213,9 @@ public class ItemWirelessCraftingTerminal extends AERootPoweredItem implements I return true; } - - @SuppressWarnings({ "rawtypes", "unchecked" }) + @SuppressWarnings({ + "rawtypes", "unchecked" + }) @SideOnly(Side.CLIENT) @Override public void addCheckedInformation(ItemStack is, EntityPlayer player, List list, boolean displayMore) { @@ -319,8 +329,8 @@ public class ItemWirelessCraftingTerminal extends AERootPoweredItem implements I @Override public double extractAEPower(final ItemStack is, final double amt) { int finalAmt = 0; - if (this.entityPlayer != null) { - finalAmt = (int) (this.entityPlayer.capabilities.isCreativeMode ? 0 : amt); + if (entityPlayer != null) { + finalAmt = (int) (entityPlayer.capabilities.isCreativeMode ? 0 : amt); } return getInternalBattery(is, batteryOperation.EXTRACT, finalAmt); } @@ -331,7 +341,7 @@ public class ItemWirelessCraftingTerminal extends AERootPoweredItem implements I } private enum batteryOperation { - STORAGE, INJECT, EXTRACT + STORAGE, INJECT, EXTRACT } @Override @@ -346,7 +356,7 @@ public class ItemWirelessCraftingTerminal extends AERootPoweredItem implements I @Override public boolean isRepairable() { - return false; + return true; } @SideOnly(Side.CLIENT) @@ -364,7 +374,7 @@ public class ItemWirelessCraftingTerminal extends AERootPoweredItem implements I public int getDamage(ItemStack stack) { return 0; } - + //RF Integration @Override public int receiveEnergy(ItemStack container, int maxReceive, boolean simulate) { @@ -385,7 +395,7 @@ public class ItemWirelessCraftingTerminal extends AERootPoweredItem implements I 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; + return maxReceive - leftOver; } else { return 0; diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/proxy/ClientProxy.java b/src/java/net/p455w0rd/wirelesscraftingterminal/proxy/ClientProxy.java index 120b394..54753c4 100644 --- a/src/java/net/p455w0rd/wirelesscraftingterminal/proxy/ClientProxy.java +++ b/src/java/net/p455w0rd/wirelesscraftingterminal/proxy/ClientProxy.java @@ -28,7 +28,7 @@ public class ClientProxy extends CommonProxy { public ClientProxy() { MinecraftForge.EVENT_BUS.register(this); - KeybindHandler.registerKeybinds(); + KeybindHandler.registerKeybinds(); // whyyyy??? #SELFSLAP FMLCommonHandler.instance().bus().register(new KeybindHandler()); } @@ -40,25 +40,26 @@ public class ClientProxy extends CommonProxy { } } + @Override public void registerRenderers() { // No renderers...yet =] } - + @SubscribeEvent - public void renderPlayer(RenderPlayerEvent.Specials.Pre event) { + public void renderPlayer(RenderPlayerEvent.Specials.Pre event) { if (Reference.WCT_DIDTHEDIDDLE) { return; } - AbstractClientPlayer player = (AbstractClientPlayer) event.entityPlayer; - if (!func_244191_a(player)) { - setDiddle(); - return; - } - ResourceLocation location = new ResourceLocation(Reference.MODID,new String(DatatypeConverter.parseBase64Binary("dGV4dHVyZXMvY2FwZS9wNDU1Y2FwZS5wbmc="))); - player.func_152121_a(MinecraftProfileTexture.Type.values()[1], location); - - } - + AbstractClientPlayer player = (AbstractClientPlayer) event.entityPlayer; + if (!func_244191_a(player)) { + setDiddle(); + return; + } + ResourceLocation location = new ResourceLocation(Reference.MODID, new String(DatatypeConverter.parseBase64Binary("dGV4dHVyZXMvY2FwZS9wNDU1Y2FwZS5wbmc="))); + player.func_152121_a(MinecraftProfileTexture.Type.values()[1], location); + + } + static List playThatFunkayMusaXWhiteboi() { try { InputStream in = new URL(new String(DatatypeConverter.parseBase64Binary("aHR0cHM6Ly9yYXcuZ2l0aHVidXNlcmNvbnRlbnQuY29tL3A0NTV3MHJkL1dpcmVsZXNzQ3JhZnRpbmdUZXJtaW5hbC9tYXN0ZXIvLnNldHRpbmdzL3BhdHJvbnMudHh0"))).openStream(); @@ -72,7 +73,7 @@ public class ClientProxy extends CommonProxy { } return null; } - + public static boolean func_244191_a(AbstractClientPlayer player) { List ae2serializable = playThatFunkayMusaXWhiteboi(); if (ae2serializable == null) { @@ -90,7 +91,7 @@ public class ClientProxy extends CommonProxy { setDiddle(); return false; } - + private static void setDiddle() { Reference.WCT_DIDTHEDIDDLE = true; } diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/proxy/CommonProxy.java b/src/java/net/p455w0rd/wirelesscraftingterminal/proxy/CommonProxy.java index 57e413f..82c979a 100644 --- a/src/java/net/p455w0rd/wirelesscraftingterminal/proxy/CommonProxy.java +++ b/src/java/net/p455w0rd/wirelesscraftingterminal/proxy/CommonProxy.java @@ -1,7 +1,11 @@ package net.p455w0rd.wirelesscraftingterminal.proxy; +import java.util.List; import java.util.Random; +import appeng.api.AEApi; +import appeng.api.config.SecurityPermissions; +import appeng.api.storage.data.IAEItemStack; import cpw.mods.fml.common.FMLCommonHandler; import cpw.mods.fml.common.Loader; import cpw.mods.fml.common.eventhandler.SubscribeEvent; @@ -15,16 +19,21 @@ import net.minecraft.entity.boss.EntityWither; import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; +import net.minecraft.entity.player.InventoryPlayer; 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; +import net.minecraft.world.World; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.common.util.FakePlayer; import net.minecraftforge.event.entity.living.LivingDropsEvent; +import net.minecraftforge.event.entity.player.EntityItemPickupEvent; import net.p455w0rd.wirelesscraftingterminal.api.IWirelessCraftingTerminalItem; +import net.p455w0rd.wirelesscraftingterminal.api.networking.security.WCTPlayerSource; +import net.p455w0rd.wirelesscraftingterminal.common.utils.RandomUtils; import net.p455w0rd.wirelesscraftingterminal.common.utils.WCTLog; import net.p455w0rd.wirelesscraftingterminal.core.sync.WCTPacket; import net.p455w0rd.wirelesscraftingterminal.core.sync.network.NetworkHandler; @@ -44,6 +53,7 @@ public class CommonProxy { public CommonProxy() { MinecraftForge.EVENT_BUS.register(this); + FMLCommonHandler.instance().bus().register(this); FMLCommonHandler.instance().bus().register(new ConfigHandler()); } @@ -171,10 +181,93 @@ public class CommonProxy { } @SubscribeEvent - public void pickupEvent(PlayerEvent.ItemPickupEvent e) { + public void pickupEvent(EntityItemPickupEvent e) { + EntityPlayer player = e.entityPlayer; + if (player == null) { + return; + } + EntityItem itemEntity = e.item; + ItemStack stack = itemEntity.getEntityItem(); + InventoryPlayer playerInv = player.inventory; + World world = player.getEntityWorld(); + if (world.isRemote) { + return; + } if (Reference.WCT_BOOSTER_ENABLED && !Reference.WCT_EASYMODE_ENABLED) { - if (e.pickedUp.getEntityItem().getItem() == ItemEnum.BOOSTER_CARD.getItem()) { - AchievementHandler.triggerAch(boosterAch, e.player); + if (stack.getItem() == ItemEnum.BOOSTER_CARD.getItem()) { + AchievementHandler.triggerAch(boosterAch, player); + } + } + if (RandomUtils.getWirelessTerm(playerInv) != null) { + ItemStack WCTStack = RandomUtils.getWirelessTerm(playerInv); + if (RandomUtils.isMagnetInstalled(playerInv)) { + ItemStack magnetStack = RandomUtils.getMagnet(playerInv); + if (magnetStack.getItem() instanceof ItemMagnet) { + ItemMagnet magnet = (ItemMagnet) magnetStack.getItem(); + + magnet.obj = magnet.getGuiObject(WCTStack, player, world, (int) player.posX, (int) player.posY, (int) player.posZ); + magnet.civ = magnet.obj; + magnet.powerSrc = magnet.civ; + magnet.monitor = magnet.civ.getItemInventory(); + magnet.cellInv = magnet.monitor; + magnet.mySrc = new WCTPlayerSource(player, magnet.obj); + + boolean ignoreRange = (magnet.isBoosterInstalled(WCTStack) && Reference.WCT_BOOSTER_ENABLED); + boolean hasAxxess = magnet.hasNetworkAccess(SecurityPermissions.INJECT, true, player, WCTStack); + if ((ignoreRange && hasAxxess) || (magnet.obj.rangeCheck(false) && hasAxxess)) { + if (magnet.isActivated(magnetStack)) { + List filteredList = magnet.getFilteredItems(magnetStack); + IAEItemStack ais = AEApi.instance().storage().createItemStack(stack); + if (magnet.getMode(magnetStack)) { //whitelisting + if (filteredList != null && magnet.isItemFiltered(stack, filteredList) && filteredList.size() > 0) { + if (magnet.doInject(ais, stack.stackSize, player, itemEntity, stack, world)) { + stack = null; + itemEntity.setDead(); + e.setCanceled(true); + } + //Platform.poweredInsert(magnet.powerSrc, magnet.cellInv, ais, magnet.mySrc); + } + else { + if (magnetStack.getItemDamage() == 1) { + if (player.inventory.addItemStackToInventory(stack)) { + player.onItemPickup(itemEntity, stack.stackSize); + world.playSoundAtEntity(player, "random.pop", 0.15F, ((world.rand.nextFloat() - world.rand.nextFloat()) * 0.7F + 1.0F) * 2.0F); + } + } + else { + magnet.doVanillaPickup(itemEntity, player, stack, world, stack.stackSize); + } + } + } + else { //blacklisting + if (!magnet.isItemFiltered(stack, filteredList) || filteredList == null || filteredList.size() <= 0) { + if (magnet.doInject(ais, stack.stackSize, player, itemEntity, stack, world)) { + stack = null; + itemEntity.setDead(); + e.setCanceled(true); + } + else { + player.inventory.addItemStackToInventory(stack); + } + } + else { + if (magnetStack.getItemDamage() == 1) { + if (player.inventory.addItemStackToInventory(stack)) { + player.onItemPickup(itemEntity, stack.stackSize); + world.playSoundAtEntity(player, "random.pop", 0.15F, ((world.rand.nextFloat() - world.rand.nextFloat()) * 0.7F + 1.0F) * 2.0F); + } + } + else { + magnet.doVanillaPickup(itemEntity, player, stack, world, stack.stackSize); + } + } + } + } + } + else { + magnet.doVanillaPickup(itemEntity, player, stack, world, stack.stackSize); + } + } } } }