Some small tweaks to the cloaking device

This commit is contained in:
modmuss50 2015-08-14 00:28:28 +01:00
parent 65f0bb2175
commit 8c421d20dd
3 changed files with 58 additions and 37 deletions

View file

@ -114,7 +114,7 @@ public class Core {
IDSUManager.INSTANCE = new IDSUManager(); IDSUManager.INSTANCE = new IDSUManager();
MinecraftForge.EVENT_BUS.register(IDSUManager.INSTANCE); MinecraftForge.EVENT_BUS.register(IDSUManager.INSTANCE);
FMLCommonHandler.instance().bus().register(new MultiblockServerTickHandler()); FMLCommonHandler.instance().bus().register(new MultiblockServerTickHandler());
FMLCommonHandler.instance().bus().register(new TRTickHandler(TickEvent.Type.PLAYER, Side.SERVER, Phase.START)); FMLCommonHandler.instance().bus().register(new TRTickHandler());
packetPipeline.initalise(); packetPipeline.initalise();
LogHelper.info("Initialization Complete"); LogHelper.info("Initialization Complete");
} }

View file

@ -3,24 +3,24 @@ package techreborn.events;
import cpw.mods.fml.common.eventhandler.EventPriority; import cpw.mods.fml.common.eventhandler.EventPriority;
import cpw.mods.fml.common.eventhandler.SubscribeEvent; import cpw.mods.fml.common.eventhandler.SubscribeEvent;
import cpw.mods.fml.common.gameevent.TickEvent; import cpw.mods.fml.common.gameevent.TickEvent;
import cpw.mods.fml.relauncher.Side;
import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.Item; import net.minecraft.item.Item;
import net.minecraft.potion.Potion;
import techreborn.init.ModItems; import techreborn.init.ModItems;
public class TRTickHandler extends TickEvent { public class TRTickHandler {
public TRTickHandler(Type type, Side side, Phase phase) {
super(type, side, phase);
}
public Item previouslyWearing; public Item previouslyWearing;
@SubscribeEvent(priority = EventPriority.NORMAL, receiveCanceled = true) @SubscribeEvent(priority = EventPriority.NORMAL, receiveCanceled = true)
public void onPlayerTick(TickEvent.PlayerTickEvent e) { public void onPlayerTick(TickEvent.PlayerTickEvent e) {
EntityPlayer player = e.player; EntityPlayer player = e.player;
Item chestslot = player.getEquipmentInSlot(3) != null ? player.getEquipmentInSlot(3).getItem() : null; Item chestslot = player.getEquipmentInSlot(3) != null ? player.getEquipmentInSlot(3).getItem() : null;
if(previouslyWearing != chestslot && previouslyWearing == ModItems.cloakingDevice && player.isInvisible()) if (previouslyWearing != chestslot && previouslyWearing == ModItems.cloakingDevice && player.isInvisible() && !player.isPotionActive(Potion.invisibility)) {
player.setInvisible(false); player.setInvisible(false);
}
previouslyWearing = chestslot; previouslyWearing = chestslot;
} }

View file

@ -1,39 +1,44 @@
package techreborn.items.tools; package techreborn.items.tools;
import java.util.List;
import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly; import cpw.mods.fml.relauncher.SideOnly;
import ic2.api.item.ElectricItem; import ic2.api.item.ElectricItem;
import ic2.api.item.IElectricItem; import ic2.api.item.IElectricItem;
import ic2.core.item.ElectricItemManager;
import net.minecraft.creativetab.CreativeTabs; import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.entity.Entity; import net.minecraft.entity.Entity;
import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.Item; import net.minecraft.item.Item;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;
import net.minecraft.potion.Potion; import net.minecraft.potion.Potion;
import net.minecraft.potion.PotionEffect;
import net.minecraft.world.World; import net.minecraft.world.World;
import techreborn.Core;
import techreborn.config.ConfigTechReborn; import techreborn.config.ConfigTechReborn;
import techreborn.items.ItemTR; import techreborn.items.ItemTR;
import java.util.List;
public class ItemCloakingDevice extends ItemTR implements IElectricItem { public class ItemCloakingDevice extends ItemTR implements IElectricItem {
public static int Teir = ConfigTechReborn.CloakingDeviceTier; public static int Teir = ConfigTechReborn.CloakingDeviceTier;
public static int MaxCharge = ConfigTechReborn.CloakingDeviceCharge; public static int MaxCharge = ConfigTechReborn.CloakingDeviceCharge;
public static int Limit = 100; public static int Limit = 100;
public static boolean isActive; public static boolean isActive;
private int armorType = 1; private int armorType = 1;
public ItemCloakingDevice() { public ItemCloakingDevice() {
setUnlocalizedName("techreborn.cloakingdevice"); setUnlocalizedName("techreborn.cloakingdevice");
setMaxStackSize(1); setMaxStackSize(1);
} }
@Override @Override
public void onArmorTick(World world, EntityPlayer player, ItemStack itemStack) { public void onArmorTick(World world, EntityPlayer player, ItemStack itemStack) {
if (ElectricItem.manager != null) { if (ElectricItem.manager != null) {
if(ElectricItem.manager.use(itemStack, ConfigTechReborn.CloakingDeviceEUTick, player)) if (ElectricItem.manager.use(itemStack, ConfigTechReborn.CloakingDeviceEUTick, player)) {
player.setInvisible(true); player.setInvisible(true);
} else {
if (!player.isPotionActive(Potion.invisibility)) {
player.setInvisible(false);
}
}
} }
} }
@ -42,6 +47,7 @@ public class ItemCloakingDevice extends ItemTR implements IElectricItem {
return armorType == this.armorType; return armorType == this.armorType;
} }
@Override @Override
public boolean canProvideEnergy(ItemStack itemStack) { public boolean canProvideEnergy(ItemStack itemStack) {
return false; return false;
@ -60,6 +66,7 @@ public class ItemCloakingDevice extends ItemTR implements IElectricItem {
itemList.add(new ItemStack(this, 1, getMaxDamage())); itemList.add(new ItemStack(this, 1, getMaxDamage()));
} }
} }
@Override @Override
public double getDurabilityForDisplay(ItemStack stack) { public double getDurabilityForDisplay(ItemStack stack) {
if (ElectricItem.manager != null) { if (ElectricItem.manager != null) {
@ -68,14 +75,28 @@ public class ItemCloakingDevice extends ItemTR implements IElectricItem {
} }
return 1; return 1;
} }
public ItemStack onItemRightClick(ItemStack itemStack, World world, EntityPlayer player) {
ItemStack itemstack1 = player.getCurrentArmor(3);
if (itemstack1 == null) {
player.setCurrentItemOrArmor(3, itemStack.copy());
itemStack.stackSize = 0;
}
return itemStack;
}
@Override @Override
public int getDisplayDamage(ItemStack stack) { public int getDisplayDamage(ItemStack stack) {
return 0; return 0;
} }
@Override @Override
public boolean showDurabilityBar(ItemStack stack) { public boolean showDurabilityBar(ItemStack stack) {
return true; return true;
} }
@Override @Override
public Item getChargedItem(ItemStack itemStack) { public Item getChargedItem(ItemStack itemStack) {
return this; return this;