Started work on fixing nanosaber
This commit is contained in:
parent
a719a1c563
commit
4c01fa8864
7 changed files with 156 additions and 108 deletions
|
@ -21,6 +21,7 @@ public class RegisterItemJsons
|
|||
register(ModItems.lithiumBattery, "lithiumBattery");
|
||||
register(ModItems.energyCrystal, "energyCrystal");
|
||||
register(ModItems.lapotronCrystal, "lapotronCrystal");
|
||||
register(ModItems.nanosaber, "nanosaber");
|
||||
}
|
||||
|
||||
private static void registerBlocks()
|
||||
|
|
|
@ -82,6 +82,7 @@ public class ConfigTechReborn
|
|||
|
||||
public static boolean FreqTransmitterChat;
|
||||
public static boolean FreqTransmitterTooltip;
|
||||
public static boolean NanosaberChat;
|
||||
// EU/T
|
||||
public static int CloakingDeviceEUTick;
|
||||
// Crafting
|
||||
|
@ -373,6 +374,10 @@ public class ConfigTechReborn
|
|||
.get(CATEGORY_FEATURES, "Frequency Transmitter tooltips", true, "Allow Frequency Transmitter to display tooltip info")
|
||||
.getBoolean(true);
|
||||
|
||||
NanosaberChat = config
|
||||
.get(CATEGORY_FEATURES, "Nanosaber Chat messages", true, "Allow Nanosaber chat messages")
|
||||
.getBoolean(true);
|
||||
|
||||
enableGemArmorAndTools = config.get(CATEGORY_FEATURES, "Gem tools and armor", true, "Should the gem tools and armor be added to the game").getBoolean(true);
|
||||
|
||||
// Crafting
|
||||
|
|
|
@ -1,187 +1,206 @@
|
|||
package techreborn.items.tools;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
import com.google.common.collect.HashMultimap;
|
||||
import com.google.common.collect.Multimap;
|
||||
import me.modmuss50.jsonDestroyer.api.IHandHeld;
|
||||
import me.modmuss50.jsonDestroyer.api.ITexturedItem;
|
||||
import net.minecraft.client.renderer.block.model.ModelResourceLocation;
|
||||
import net.minecraft.creativetab.CreativeTabs;
|
||||
import net.minecraft.entity.EntityLivingBase;
|
||||
import net.minecraft.entity.SharedMonsterAttributes;
|
||||
import net.minecraft.entity.ai.attributes.AttributeModifier;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.inventory.EntityEquipmentSlot;
|
||||
import net.minecraft.item.IItemPropertyGetter;
|
||||
import net.minecraft.item.Item;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.item.ItemSword;
|
||||
import net.minecraft.nbt.NBTTagCompound;
|
||||
import net.minecraft.util.ActionResult;
|
||||
import net.minecraft.util.EnumActionResult;
|
||||
import net.minecraft.util.EnumHand;
|
||||
import net.minecraft.util.ResourceLocation;
|
||||
import net.minecraft.util.text.TextComponentString;
|
||||
import net.minecraft.util.text.TextFormatting;
|
||||
import net.minecraft.util.text.translation.I18n;
|
||||
import net.minecraft.world.World;
|
||||
import net.minecraftforge.fml.relauncher.Side;
|
||||
import net.minecraftforge.fml.relauncher.SideOnly;
|
||||
import reborncore.RebornCore;
|
||||
import reborncore.api.power.IEnergyItemInfo;
|
||||
import reborncore.common.powerSystem.PoweredItem;
|
||||
import reborncore.common.util.ItemNBTHelper;
|
||||
import reborncore.common.util.ChatUtils;
|
||||
import techreborn.client.TechRebornCreativeTab;
|
||||
import techreborn.lib.ModInfo;
|
||||
import techreborn.config.ConfigTechReborn;
|
||||
import techreborn.init.ModItems;
|
||||
import techreborn.lib.MessageIDs;
|
||||
|
||||
import net.minecraft.item.Item.ToolMaterial;
|
||||
public class ItemNanosaber extends ItemSword implements IEnergyItemInfo, ITexturedItem, IHandHeld
|
||||
import javax.annotation.Nullable;
|
||||
import java.util.List;
|
||||
|
||||
public class ItemNanosaber extends ItemSword implements IEnergyItemInfo, IHandHeld
|
||||
{
|
||||
|
||||
public static int tier = 1;
|
||||
public int maxCharge = 1;
|
||||
public int cost = 250;
|
||||
public float unpoweredSpeed = 2.0F;
|
||||
public double transferLimit = 100;
|
||||
|
||||
public ItemNanosaber()
|
||||
{
|
||||
super(ToolMaterial.DIAMOND);
|
||||
setCreativeTab(TechRebornCreativeTab.instance);
|
||||
setMaxStackSize(1);
|
||||
setMaxDamage(240);
|
||||
setMaxDamage(1);
|
||||
setUnlocalizedName("techreborn.nanosaber");
|
||||
RebornCore.jsonDestroyer.registerObject(this);
|
||||
this.maxCharge = 1000;
|
||||
this.tier = 2;
|
||||
this.addPropertyOverride(new ResourceLocation("techreborn:active"), new IItemPropertyGetter()
|
||||
{
|
||||
@SideOnly(Side.CLIENT) public float apply(ItemStack stack, @Nullable World worldIn,
|
||||
@Nullable EntityLivingBase entityIn)
|
||||
{
|
||||
if (stack != null && stack.getTagCompound().getBoolean("isActive"))
|
||||
{
|
||||
return 1.0F;
|
||||
}
|
||||
return 0.0F;
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean hitEntity(ItemStack itemstack, EntityLivingBase entityliving, EntityLivingBase entityliving1)
|
||||
@Override public Multimap<String, AttributeModifier> getAttributeModifiers(EntityEquipmentSlot slot,
|
||||
ItemStack stack)
|
||||
{
|
||||
Multimap<String, AttributeModifier> multimap = HashMultimap.<String, AttributeModifier>create();
|
||||
int modifier = 0;
|
||||
if (stack.getTagCompound().getBoolean("isActive"))
|
||||
modifier = 9;
|
||||
|
||||
if (slot == EntityEquipmentSlot.MAINHAND)
|
||||
{
|
||||
multimap.put(SharedMonsterAttributes.ATTACK_DAMAGE.getAttributeUnlocalizedName(),
|
||||
new AttributeModifier(ATTACK_DAMAGE_MODIFIER, "Weapon modifier", (double) modifier, 0));
|
||||
multimap.put(SharedMonsterAttributes.ATTACK_SPEED.getAttributeUnlocalizedName(),
|
||||
new AttributeModifier(ATTACK_SPEED_MODIFIER, "Weapon modifier", -2.4000000953674316D, 0));
|
||||
}
|
||||
return multimap;
|
||||
}
|
||||
|
||||
@Override public boolean hitEntity(ItemStack itemstack, EntityLivingBase entityliving,
|
||||
EntityLivingBase entityliving1)
|
||||
{
|
||||
if (PoweredItem.canUseEnergy(cost, itemstack))
|
||||
{
|
||||
PoweredItem.useEnergy(cost, itemstack);
|
||||
return true;
|
||||
}
|
||||
|
||||
@Override
|
||||
public ActionResult<ItemStack> onItemRightClick(ItemStack stack, World worldIn, EntityPlayer player, EnumHand hand)
|
||||
} else
|
||||
{
|
||||
if (player.isSneaking())
|
||||
{
|
||||
changeMode(stack);
|
||||
}
|
||||
return new ActionResult<>(EnumActionResult.FAIL, stack);
|
||||
}
|
||||
|
||||
public void changeMode(ItemStack stack)
|
||||
{
|
||||
if (!ItemNBTHelper.verifyExistance(stack, "isActive"))
|
||||
{
|
||||
ItemNBTHelper.setBoolean(stack, "isActive", true);
|
||||
} else if (ItemNBTHelper.verifyExistance(stack, "isActive"))
|
||||
{
|
||||
stack.getTagCompound().removeTag("isActive");
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
public boolean isItemActive(ItemStack stack)
|
||||
{
|
||||
return !ItemNBTHelper.verifyExistance(stack, "isActive");
|
||||
}
|
||||
|
||||
// @SideOnly(Side.CLIENT)
|
||||
// @Override
|
||||
// public void addInformation(ItemStack stack, EntityPlayer player, List list, boolean par4)
|
||||
// {
|
||||
// if (ItemNBTHelper.verifyExistance(stack, "isActive"))
|
||||
// {
|
||||
// list.add("Active");
|
||||
// } else if (!ItemNBTHelper.verifyExistance(stack, "isActive"))
|
||||
// {
|
||||
// list.add("Not Active");
|
||||
// }
|
||||
// super.addInformation(stack, player, list, par4);
|
||||
// }
|
||||
|
||||
@Override
|
||||
public boolean isRepairable()
|
||||
@Override public boolean isRepairable()
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
||||
@Override
|
||||
public double getMaxPower(ItemStack stack)
|
||||
@Override public double getMaxPower(ItemStack stack)
|
||||
{
|
||||
return maxCharge;
|
||||
return 100000;
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean canAcceptEnergy(ItemStack stack)
|
||||
@Override public boolean canAcceptEnergy(ItemStack stack)
|
||||
{
|
||||
return true;
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean canProvideEnergy(ItemStack stack)
|
||||
@Override public boolean canProvideEnergy(ItemStack stack)
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
||||
@Override
|
||||
public double getMaxTransfer(ItemStack stack)
|
||||
@Override public double getMaxTransfer(ItemStack stack)
|
||||
{
|
||||
return transferLimit;
|
||||
return 512;
|
||||
}
|
||||
|
||||
@Override
|
||||
public int getStackTier(ItemStack stack)
|
||||
@Override public int getStackTier(ItemStack stack)
|
||||
{
|
||||
return tier;
|
||||
return 2;
|
||||
}
|
||||
|
||||
@SuppressWarnings({ "rawtypes", "unchecked" })
|
||||
@SideOnly(Side.CLIENT)
|
||||
public void getSubItems(Item item, CreativeTabs par2CreativeTabs, List itemList)
|
||||
@SuppressWarnings({ "rawtypes", "unchecked" }) @SideOnly(Side.CLIENT) public void getSubItems(Item item,
|
||||
CreativeTabs par2CreativeTabs, List itemList)
|
||||
{
|
||||
ItemStack itemStack = new ItemStack(this, 1);
|
||||
itemList.add(itemStack);
|
||||
ItemStack inactiveUncharged = new ItemStack(ModItems.nanosaber);
|
||||
inactiveUncharged.setTagCompound(new NBTTagCompound());
|
||||
inactiveUncharged.getTagCompound().setBoolean("isActive", false);
|
||||
PoweredItem.setEnergy(0, inactiveUncharged);
|
||||
|
||||
ItemStack charged = new ItemStack(this, 1);
|
||||
PoweredItem.setEnergy(getMaxPower(charged), charged);
|
||||
itemList.add(charged);
|
||||
ItemStack inactiveCharged = new ItemStack(ModItems.nanosaber);
|
||||
inactiveCharged.setTagCompound(new NBTTagCompound());
|
||||
inactiveCharged.getTagCompound().setBoolean("isActive", false);
|
||||
PoweredItem.setEnergy(getMaxPower(inactiveCharged), inactiveCharged);
|
||||
|
||||
ItemStack activeUncharged = new ItemStack(ModItems.nanosaber);
|
||||
activeUncharged.setTagCompound(new NBTTagCompound());
|
||||
activeUncharged.getTagCompound().setBoolean("isActive", true);
|
||||
PoweredItem.setEnergy(0, activeUncharged);
|
||||
|
||||
ItemStack activeCharged = new ItemStack(ModItems.nanosaber);
|
||||
activeCharged.setTagCompound(new NBTTagCompound());
|
||||
activeCharged.getTagCompound().setBoolean("isActive", true);
|
||||
PoweredItem.setEnergy(getMaxPower(activeCharged), activeCharged);
|
||||
|
||||
itemList.add(inactiveUncharged);
|
||||
itemList.add(inactiveCharged);
|
||||
itemList.add(activeUncharged);
|
||||
itemList.add(activeCharged);
|
||||
}
|
||||
|
||||
@Override
|
||||
public double getDurabilityForDisplay(ItemStack stack)
|
||||
public void addInformation(ItemStack stack, EntityPlayer player, List list, boolean par4)
|
||||
{
|
||||
if (stack.getTagCompound() == null || !stack.getTagCompound().getBoolean("isActive"))
|
||||
{
|
||||
list.add(TextFormatting.GRAY + I18n.translateToLocal("techreborn.message.nanosaberInactive"));
|
||||
} else
|
||||
{
|
||||
list.add(TextFormatting.GRAY + I18n.translateToLocal("techreborn.message.nanosaberActive"));
|
||||
}
|
||||
}
|
||||
|
||||
@Override public double getDurabilityForDisplay(ItemStack stack)
|
||||
{
|
||||
double charge = (PoweredItem.getEnergy(stack) / getMaxPower(stack));
|
||||
return 1 - charge;
|
||||
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean showDurabilityBar(ItemStack stack)
|
||||
@Override public boolean showDurabilityBar(ItemStack stack)
|
||||
{
|
||||
return true;
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getTextureName(int damage)
|
||||
@Override public ActionResult<ItemStack> onItemRightClick(ItemStack stack, World world, EntityPlayer player,
|
||||
EnumHand hand)
|
||||
{
|
||||
if (damage == 1)
|
||||
if (player.isSneaking())
|
||||
{
|
||||
return "techreborn:items/tool/nanosaber_on";
|
||||
}
|
||||
return "techreborn:items/tool/nanosaber_off";
|
||||
}
|
||||
|
||||
@Override
|
||||
public int getMaxMeta()
|
||||
if (stack.getTagCompound() == null || !stack.getTagCompound().getBoolean("isActive"))
|
||||
{
|
||||
return 2;
|
||||
}
|
||||
|
||||
@Override
|
||||
@SideOnly(Side.CLIENT)
|
||||
public ModelResourceLocation getModel(ItemStack stack, EntityPlayer player, int useRemaining)
|
||||
stack.setTagCompound(new NBTTagCompound());
|
||||
stack.getTagCompound().setBoolean("isActive", true);
|
||||
if (!world.isRemote && ConfigTechReborn.NanosaberChat)
|
||||
{
|
||||
return new ModelResourceLocation(ModInfo.MOD_ID + ":" + getUnlocalizedName(stack).substring(5), "inventory");
|
||||
ChatUtils.sendNoSpamMessages(MessageIDs.nanosaberID, new TextComponentString(
|
||||
TextFormatting.GRAY + I18n.translateToLocal("techreborn.message.setTo") + " "
|
||||
+ TextFormatting.GOLD + I18n
|
||||
.translateToLocal("techreborn.message.nanosaberActive")));
|
||||
}
|
||||
|
||||
@Override
|
||||
public void addInformation(ItemStack stack, EntityPlayer playerIn, List<String> tooltip, boolean advanced)
|
||||
} else
|
||||
{
|
||||
tooltip.add(TextFormatting.RED + "WIP Coming Soon");
|
||||
stack.getTagCompound().setBoolean("isActive", false);
|
||||
if (!world.isRemote && ConfigTechReborn.NanosaberChat)
|
||||
{
|
||||
ChatUtils.sendNoSpamMessages(MessageIDs.nanosaberID, new TextComponentString(
|
||||
TextFormatting.GRAY + I18n.translateToLocal("techreborn.message.setTo") + " "
|
||||
+ TextFormatting.GOLD + I18n
|
||||
.translateToLocal("techreborn.message.nanosaberInactive")));
|
||||
}
|
||||
}
|
||||
}
|
||||
return new ActionResult<>(EnumActionResult.SUCCESS, stack);
|
||||
}
|
||||
}
|
||||
|
|
|
@ -8,4 +8,5 @@ public class MessageIDs
|
|||
public static int freqTransmitterID = 0;
|
||||
public static int fluidPipeID = 1;
|
||||
public static int playerDetectorID = 2;
|
||||
public static int nanosaberID = 3;
|
||||
}
|
||||
|
|
|
@ -946,6 +946,8 @@ techreborn.message.detects=Detects
|
|||
techreborn.message.allPlayers=All Players
|
||||
techreborn.message.onlyOtherPlayers=Only Other Players
|
||||
techreborn.message.onlyYou=Only You
|
||||
techreborn.message.nanosaberActive=Active
|
||||
techreborn.message.nanosaberInactive=Inactive
|
||||
|
||||
#Cables
|
||||
Cable.copperCable.name=Copper Cable
|
||||
|
|
|
@ -0,0 +1,14 @@
|
|||
{
|
||||
"parent": "techreborn:item/techrebornItem",
|
||||
"textures": {
|
||||
"layer0": "techreborn:items/tool/nanosaber_off"
|
||||
},
|
||||
"overrides": [
|
||||
{
|
||||
"predicate": {
|
||||
"techreborn:active": 1
|
||||
},
|
||||
"model": "techreborn:item/nanosaberActive"
|
||||
}
|
||||
]
|
||||
}
|
|
@ -0,0 +1,6 @@
|
|||
{
|
||||
"parent": "techreborn:item/techrebornItem",
|
||||
"textures": {
|
||||
"layer0": "techreborn:items/tool/nanosaber_on"
|
||||
}
|
||||
}
|
Loading…
Add table
Reference in a new issue