More jsons!

This commit is contained in:
ProfessorProspector 2016-12-09 22:50:26 -08:00
parent 20193b562a
commit 89ffb5d047
52 changed files with 148 additions and 114 deletions

View file

@ -14,11 +14,11 @@ public class RegisterItemJsons {
}
private static void registerItems() {
register(ModItems.reBattery, "rebattery");
register(ModItems.lithiumBattery, "lithiumbattery");
register(ModItems.energyCrystal, "energycrystal");
register(ModItems.lapotronCrystal, "lapotroncrystal");
register(ModItems.lapotronicOrb, "lapotronicorb");
register(ModItems.reBattery, "battery/re_battery");
register(ModItems.lithiumBattery, "battery/lithium_battery");
register(ModItems.energyCrystal, "battery/energy_crystal");
register(ModItems.lapotronCrystal, "battery/lapotron_crystal");
register(ModItems.lapotronicOrb, "battery/lapotronic_orb");
register(ModItems.nanosaber, "nanosaber");
register(ModItems.frequencyTransmitter, "frequencytransmitter");

View file

@ -3,6 +3,7 @@ package techreborn.items.tools;
import net.minecraft.block.state.IBlockState;
import net.minecraft.enchantment.EnchantmentHelper;
import net.minecraft.entity.EntityLivingBase;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.init.Enchantments;
import net.minecraft.item.IItemPropertyGetter;
import net.minecraft.item.ItemAxe;
@ -27,6 +28,7 @@ public class ItemChainsaw extends ItemAxe implements IEnergyItemInfo {
public int cost = 250;
public float unpoweredSpeed = 2.0F;
public double transferLimit = 100;
public boolean isBreaking = false;
public ItemChainsaw(ToolMaterial material, String unlocalizedName, int energyCapacity, int tier,
float unpoweredSpeed) {
@ -46,7 +48,7 @@ public class ItemChainsaw extends ItemAxe implements IEnergyItemInfo {
World worldIn,
@Nullable
EntityLivingBase entityIn) {
if (stack != ItemStack.EMPTY && PoweredItem.canUseEnergy(cost, stack) && entityIn != null && entityIn.getHeldItemMainhand().isItemEqual(stack)) {
if (stack != ItemStack.EMPTY && PoweredItem.canUseEnergy(cost, stack) && entityIn != null && entityIn.getHeldItemMainhand().equals(stack)) {
return 1.0F;
}
return 0.0F;
@ -94,6 +96,12 @@ public class ItemChainsaw extends ItemAxe implements IEnergyItemInfo {
return false;
}
@Override
public boolean onBlockStartBreak(ItemStack itemstack, BlockPos pos, EntityPlayer player) {
return super.onBlockStartBreak(itemstack, pos, player);
}
@Override
public double getMaxTransfer(ItemStack stack) {
return transferLimit;

View file

@ -41,7 +41,6 @@ public class ItemNanosaber extends ItemSword implements IEnergyItemInfo {
setNoRepair();
setCreativeTab(TechRebornCreativeTab.instance);
setMaxStackSize(1);
setMaxDamage(1);
setUnlocalizedName("techreborn.nanosaber");
this.addPropertyOverride(new ResourceLocation("techreborn:active"), new IItemPropertyGetter() {
@SideOnly(Side.CLIENT)
@ -51,6 +50,8 @@ public class ItemNanosaber extends ItemSword implements IEnergyItemInfo {
@Nullable
EntityLivingBase entityIn) {
if (stack != ItemStack.EMPTY && stack.hasTagCompound() && stack.getTagCompound().hasKey("isActive") && stack.getTagCompound().getBoolean("isActive")) {
if (PoweredItem.getMaxPower(stack) - PoweredItem.getEnergy(stack) >= 0.9 * PoweredItem.getMaxPower(stack))
return 0.5F;
return 1.0F;
}
return 0.0F;