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() { private static void registerItems() {
register(ModItems.reBattery, "rebattery"); register(ModItems.reBattery, "battery/re_battery");
register(ModItems.lithiumBattery, "lithiumbattery"); register(ModItems.lithiumBattery, "battery/lithium_battery");
register(ModItems.energyCrystal, "energycrystal"); register(ModItems.energyCrystal, "battery/energy_crystal");
register(ModItems.lapotronCrystal, "lapotroncrystal"); register(ModItems.lapotronCrystal, "battery/lapotron_crystal");
register(ModItems.lapotronicOrb, "lapotronicorb"); register(ModItems.lapotronicOrb, "battery/lapotronic_orb");
register(ModItems.nanosaber, "nanosaber"); register(ModItems.nanosaber, "nanosaber");
register(ModItems.frequencyTransmitter, "frequencytransmitter"); register(ModItems.frequencyTransmitter, "frequencytransmitter");

View file

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

View file

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

View file

@ -0,0 +1,3 @@
{
"parent": "techreborn:item/techrebornitem"
}

View file

@ -0,0 +1,14 @@
{
"parent": "techreborn:item/battery/battery",
"textures": {
"layer0": "techreborn:items/battery/energy_crystal"
},
"overrides": [
{
"predicate": {
"techreborn:empty": 1
},
"model": "techreborn:item/battery/override/energy_crystal_empty"
}
]
}

View file

@ -0,0 +1,14 @@
{
"parent": "techreborn:item/battery/battery",
"textures": {
"layer0": "techreborn:items/battery/lapotron_crystal"
},
"overrides": [
{
"predicate": {
"techreborn:empty": 1
},
"model": "techreborn:item/battery/override/lapotron_crystal_empty"
}
]
}

View file

@ -0,0 +1,14 @@
{
"parent": "techreborn:item/battery/battery",
"textures": {
"layer0": "techreborn:items/battery/lapotronic_orb"
},
"overrides": [
{
"predicate": {
"techreborn:empty": 1
},
"model": "techreborn:item/battery/override/lapotronic_orb_empty"
}
]
}

View file

@ -0,0 +1,14 @@
{
"parent": "techreborn:item/battery/battery",
"textures": {
"layer0": "techreborn:items/battery/lithium_battery"
},
"overrides": [
{
"predicate": {
"techreborn:empty": 1
},
"model": "techreborn:item/battery/override/lithium_battery_empty"
}
]
}

View file

@ -0,0 +1,6 @@
{
"parent": "techreborn:item/battery/battery",
"textures": {
"layer0": "techreborn:items/battery/energy_crystal_empty"
}
}

View file

@ -0,0 +1,6 @@
{
"parent": "techreborn:item/battery/battery",
"textures": {
"layer0": "techreborn:items/battery/lapotron_crystal_empty"
}
}

View file

@ -0,0 +1,6 @@
{
"parent": "techreborn:item/battery/battery",
"textures": {
"layer0": "techreborn:items/battery/lapotronic_orb_empty"
}
}

View file

@ -0,0 +1,6 @@
{
"parent": "techreborn:item/battery/battery",
"textures": {
"layer0": "techreborn:items/battery/lithium_battery_empty"
}
}

View file

@ -0,0 +1,6 @@
{
"parent": "techreborn:item/battery/battery",
"textures": {
"layer0": "techreborn:items/battery/re_battery_empty"
}
}

View file

@ -0,0 +1,14 @@
{
"parent": "techreborn:item/battery/battery",
"textures": {
"layer0": "techreborn:items/battery/re_battery"
},
"overrides": [
{
"predicate": {
"techreborn:empty": 1
},
"model": "techreborn:item/battery/override/re_battery_empty"
}
]
}

View file

@ -1,14 +0,0 @@
{
"parent": "techreborn:item/techrebornItem",
"textures": {
"layer0": "techreborn:items/tool/energyCrystal"
},
"overrides": [
{
"predicate": {
"techreborn:empty": 1
},
"model": "techreborn:item/energyCrystalEmpty"
}
]
}

View file

@ -1,6 +0,0 @@
{
"parent": "techreborn:item/techrebornItem",
"textures": {
"layer0": "techreborn:items/tool/energyCrystalEmpty"
}
}

View file

@ -1,14 +0,0 @@
{
"parent": "techreborn:item/techrebornItem",
"textures": {
"layer0": "techreborn:items/tool/lapotronCrystal"
},
"overrides": [
{
"predicate": {
"techreborn:empty": 1
},
"model": "techreborn:item/lapotronCrystalEmpty"
}
]
}

View file

@ -1,6 +0,0 @@
{
"parent": "techreborn:item/techrebornItem",
"textures": {
"layer0": "techreborn:items/tool/lapotronCrystalEmpty"
}
}

View file

@ -1,14 +0,0 @@
{
"parent": "techreborn:item/techrebornItem",
"textures": {
"layer0": "techreborn:items/tool/lapotronEnergyOrb"
},
"overrides": [
{
"predicate": {
"techreborn:empty": 1
},
"model": "techreborn:item/lapotronicOrbEmpty"
}
]
}

View file

@ -1,6 +0,0 @@
{
"parent": "techreborn:item/techrebornItem",
"textures": {
"layer0": "techreborn:items/tool/lapotronEnergyOrbEmpty"
}
}

View file

@ -1,14 +0,0 @@
{
"parent": "techreborn:item/techrebornItem",
"textures": {
"layer0": "techreborn:items/tool/lithiumBattery"
},
"overrides": [
{
"predicate": {
"techreborn:empty": 1
},
"model": "techreborn:item/lithiumBatteryEmpty"
}
]
}

View file

@ -1,6 +0,0 @@
{
"parent": "techreborn:item/techrebornItem",
"textures": {
"layer0": "techreborn:items/tool/lithiumBatteryEmpty"
}
}

View file

@ -4,6 +4,12 @@
"layer0": "techreborn:items/tool/nanosaber_off" "layer0": "techreborn:items/tool/nanosaber_off"
}, },
"overrides": [ "overrides": [
{
"predicate": {
"techreborn:active": 0.5
},
"model": "techreborn:item/nanosaberActiveLow"
},
{ {
"predicate": { "predicate": {
"techreborn:active": 1 "techreborn:active": 1

View file

@ -1,6 +1,6 @@
{ {
"parent": "techreborn:item/techrebornItem", "parent": "techreborn:item/techrebornItem",
"textures": { "textures": {
"layer0": "techreborn:items/tool/reBatteryEmpty" "layer0": "techreborn:items/tool/nanosaber_low"
} }
} }

View file

@ -1,14 +0,0 @@
{
"parent": "techreborn:item/techrebornItem",
"textures": {
"layer0": "techreborn:items/tool/reBattery"
},
"overrides": [
{
"predicate": {
"techreborn:empty": 1
},
"model": "techreborn:item/reBatteryEmpty"
}
]
}

View file

@ -1,5 +1,5 @@
{ {
"parent": "techreborn:item/techrebornItem", "parent": "techreborn:item/tool/tool",
"textures": { "textures": {
"layer0": "techreborn:items/tool/advanced_chainsaw" "layer0": "techreborn:items/tool/advanced_chainsaw"
}, },

View file

@ -1,5 +1,5 @@
{ {
"parent": "techreborn:item/techrebornItem", "parent": "techreborn:item/tool/tool",
"textures": { "textures": {
"layer0": "techreborn:items/tool/advanced_drill" "layer0": "techreborn:items/tool/advanced_drill"
} }

View file

@ -1,5 +1,5 @@
{ {
"parent": "techreborn:item/techrebornItem", "parent": "techreborn:item/tool/tool",
"textures": { "textures": {
"layer0": "techreborn:items/tool/advanced_jackhammer" "layer0": "techreborn:items/tool/advanced_jackhammer"
} }

View file

@ -1,5 +1,5 @@
{ {
"parent": "techreborn:item/techrebornItem", "parent": "techreborn:item/tool/tool",
"textures": { "textures": {
"layer0": "techreborn:items/tool/diamond_chainsaw" "layer0": "techreborn:items/tool/diamond_chainsaw"
}, },

View file

@ -1,5 +1,5 @@
{ {
"parent": "techreborn:item/techrebornItem", "parent": "techreborn:item/tool/tool",
"textures": { "textures": {
"layer0": "techreborn:items/tool/diamond_drill" "layer0": "techreborn:items/tool/diamond_drill"
} }

View file

@ -1,5 +1,5 @@
{ {
"parent": "techreborn:item/techrebornItem", "parent": "techreborn:item/tool/tool",
"textures": { "textures": {
"layer0": "techreborn:items/tool/diamond_jackhammer" "layer0": "techreborn:items/tool/diamond_jackhammer"
} }

View file

@ -1,5 +1,5 @@
{ {
"parent": "techreborn:item/techrebornItem", "parent": "techreborn:item/tool/tool",
"textures": { "textures": {
"layer0": "techreborn:items/tool/advanced_chainsaw_animated" "layer0": "techreborn:items/tool/advanced_chainsaw_animated"
} }

View file

@ -1,5 +1,5 @@
{ {
"parent": "techreborn:item/techrebornItem", "parent": "techreborn:item/tool/tool",
"textures": { "textures": {
"layer0": "techreborn:items/tool/diamond_chainsaw_animated" "layer0": "techreborn:items/tool/diamond_chainsaw_animated"
} }

View file

@ -1,5 +1,5 @@
{ {
"parent": "techreborn:item/techrebornItem", "parent": "techreborn:item/tool/tool",
"textures": { "textures": {
"layer0": "techreborn:items/tool/steel_chainsaw_animated" "layer0": "techreborn:items/tool/steel_chainsaw_animated"
} }

View file

@ -1,5 +1,5 @@
{ {
"parent": "techreborn:item/techrebornItem", "parent": "techreborn:item/tool/tool",
"textures": { "textures": {
"layer0": "techreborn:items/tool/steel_chainsaw" "layer0": "techreborn:items/tool/steel_chainsaw"
}, },

View file

@ -1,5 +1,5 @@
{ {
"parent": "techreborn:item/techrebornItem", "parent": "techreborn:item/tool/tool",
"textures": { "textures": {
"layer0": "techreborn:items/tool/steel_drill" "layer0": "techreborn:items/tool/steel_drill"
} }

View file

@ -1,5 +1,5 @@
{ {
"parent": "techreborn:item/techrebornItem", "parent": "techreborn:item/tool/tool",
"textures": { "textures": {
"layer0": "techreborn:items/tool/steel_jackhammer" "layer0": "techreborn:items/tool/steel_jackhammer"
} }

View file

@ -0,0 +1,3 @@
{
"parent": "techreborn:item/techrebornitem"
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 690 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 665 B

View file

@ -0,0 +1,7 @@
{
"animation": {
"frametime": 3,
"interpolate": true,
"frames": []
}
}