Done with models for items. Except cell (
This commit is contained in:
parent
f9c484090f
commit
0feec0612c
44 changed files with 175 additions and 169 deletions
|
@ -67,7 +67,7 @@ public class ItemCloakingDevice extends ItemTRArmour implements IEnergyItemInfo
|
|||
@Override
|
||||
@OnlyIn(Dist.CLIENT)
|
||||
public String getArmorTexture(ItemStack stack, Entity entity, EntityEquipmentSlot slot, String type) {
|
||||
return "techreborn:" + "textures/models/cloaking.png";
|
||||
return "techreborn:" + "textures/models/armor/cloaking.png";
|
||||
}
|
||||
|
||||
@Override
|
||||
|
|
|
@ -37,8 +37,11 @@ import net.minecraftforge.common.capabilities.ICapabilityProvider;
|
|||
import reborncore.api.power.IEnergyItemInfo;
|
||||
import reborncore.common.powerSystem.PowerSystem;
|
||||
import reborncore.common.powerSystem.PoweredItemContainerProvider;
|
||||
import reborncore.common.powerSystem.forge.ForgePowerItemManager;
|
||||
import reborncore.common.util.ItemUtils;
|
||||
import techreborn.TechReborn;
|
||||
import techreborn.config.ConfigTechReborn;
|
||||
import techreborn.init.TRContent;
|
||||
|
||||
import javax.annotation.Nullable;
|
||||
|
||||
|
@ -49,15 +52,21 @@ public class ItemLapotronicOrbpack extends ItemArmor implements IEnergyItemInfo
|
|||
public int transferLimit = 100_000;
|
||||
|
||||
public ItemLapotronicOrbpack() {
|
||||
super(ArmorMaterial.DIAMOND, EntityEquipmentSlot.CHEST, new Item.Properties().maxStackSize(1));
|
||||
super(ArmorMaterial.DIAMOND, EntityEquipmentSlot.CHEST, new Item.Properties().group(TechReborn.ITEMGROUP).maxStackSize(1));
|
||||
}
|
||||
|
||||
// Item
|
||||
@Override
|
||||
public void fillItemGroup(ItemGroup group, NonNullList<ItemStack> items) {
|
||||
if (this.isInGroup(group)) {
|
||||
items.add(new ItemStack(this));
|
||||
if (!isInGroup(group)) {
|
||||
return;
|
||||
}
|
||||
ItemStack uncharged = new ItemStack(TRContent.LAPOTRONIC_ORBPACK);
|
||||
ItemStack charged = new ItemStack(TRContent.LAPOTRONIC_ORBPACK);
|
||||
ForgePowerItemManager capEnergy = new ForgePowerItemManager(charged);
|
||||
capEnergy.setEnergyStored(capEnergy.getMaxEnergyStored());
|
||||
items.add(uncharged);
|
||||
items.add(charged);
|
||||
}
|
||||
|
||||
@Override
|
||||
|
@ -94,7 +103,7 @@ public class ItemLapotronicOrbpack extends ItemArmor implements IEnergyItemInfo
|
|||
@Override
|
||||
@OnlyIn(Dist.CLIENT)
|
||||
public String getArmorTexture(ItemStack stack, Entity entity, EntityEquipmentSlot slot, String type) {
|
||||
return "techreborn:" + "textures/models/lapotronpack.png";
|
||||
return "techreborn:" + "textures/models/armor/lapotronpack.png";
|
||||
}
|
||||
|
||||
// IEnergyItemInfo
|
||||
|
|
|
@ -59,7 +59,7 @@ public class ItemIndustrialChainsaw extends ItemChainsaw {
|
|||
if (!isInGroup(par2ItemGroup)) {
|
||||
return;
|
||||
}
|
||||
ItemStack stack = new ItemStack(TRContent.ADVANCED_CHAINSAW);
|
||||
ItemStack stack = new ItemStack(TRContent.INDUSTRIAL_CHAINSAW);
|
||||
ItemStack charged = stack.copy();
|
||||
ForgePowerItemManager capEnergy = new ForgePowerItemManager(charged);
|
||||
capEnergy.setEnergyStored(capEnergy.getMaxEnergyStored());
|
||||
|
|
|
@ -162,7 +162,7 @@ public class ItemIndustrialDrill extends ItemDrill {
|
|||
if (!isInGroup(par2ItemGroup)) {
|
||||
return;
|
||||
}
|
||||
ItemStack stack = new ItemStack(TRContent.ADVANCED_DRILL);
|
||||
ItemStack stack = new ItemStack(TRContent.INDUSTRIAL_DRILL);
|
||||
ItemStack charged = stack.copy();
|
||||
ForgePowerItemManager capEnergy = new ForgePowerItemManager(charged);
|
||||
capEnergy.setEnergyStored(capEnergy.getMaxEnergyStored());
|
||||
|
|
|
@ -52,7 +52,7 @@ public class ItemIndustrialJackhammer extends ItemJackhammer {
|
|||
if (!isInGroup(par2ItemGroup)) {
|
||||
return;
|
||||
}
|
||||
ItemStack stack = new ItemStack(TRContent.ADVANCED_JACKHAMMER);
|
||||
ItemStack stack = new ItemStack(TRContent.INDUSTRIAL_JACKHAMMER);
|
||||
ItemStack charged = stack.copy();
|
||||
ForgePowerItemManager capEnergy = new ForgePowerItemManager(charged);
|
||||
capEnergy.setEnergyStored(capEnergy.getMaxEnergyStored());
|
||||
|
|
|
@ -1,14 +1,14 @@
|
|||
{
|
||||
"parent": "techreborn:item/tool/tool",
|
||||
"textures": {
|
||||
"layer0": "techreborn:items/tool/advanced_chainsaw"
|
||||
},
|
||||
"overrides": [
|
||||
{
|
||||
"predicate": {
|
||||
"techreborn:animated": 1
|
||||
},
|
||||
"model": "techreborn:item/tool/override/advanced_chainsaw_animated"
|
||||
}
|
||||
]
|
||||
{
|
||||
"parent": "minecraft:item/handheld",
|
||||
"textures": {
|
||||
"layer0": "techreborn:item/tool/advanced_chainsaw"
|
||||
},
|
||||
"overrides": [
|
||||
{
|
||||
"predicate": {
|
||||
"techreborn:animated": 1
|
||||
},
|
||||
"model": "techreborn:item/tool/override/advanced_chainsaw_animated"
|
||||
}
|
||||
]
|
||||
}
|
|
@ -0,0 +1,6 @@
|
|||
{
|
||||
"parent": "minecraft:item/handheld",
|
||||
"textures": {
|
||||
"layer0": "techreborn:item/tool/advanced_drill"
|
||||
}
|
||||
}
|
|
@ -0,0 +1,6 @@
|
|||
{
|
||||
"parent": "minecraft:item/handheld",
|
||||
"textures": {
|
||||
"layer0": "techreborn:item/tool/advanced_jackhammer"
|
||||
}
|
||||
}
|
|
@ -1,6 +0,0 @@
|
|||
{
|
||||
"parent": "techreborn:item/techrebornItem",
|
||||
"textures": {
|
||||
"layer0": "techreborn:items/armor/cloaking_device"
|
||||
}
|
||||
}
|
|
@ -1,6 +0,0 @@
|
|||
{
|
||||
"parent": "techreborn:item/techrebornItem",
|
||||
"textures": {
|
||||
"layer0": "techreborn:items/armor/lapotronic_orbpack"
|
||||
}
|
||||
}
|
|
@ -1,14 +1,14 @@
|
|||
{
|
||||
"parent": "techreborn:item/tool/tool",
|
||||
"textures": {
|
||||
"layer0": "techreborn:items/tool/basic_chainsaw"
|
||||
},
|
||||
"overrides": [
|
||||
{
|
||||
"predicate": {
|
||||
"techreborn:animated": 1
|
||||
},
|
||||
"model": "techreborn:item/tool/override/basic_chainsaw_animated"
|
||||
}
|
||||
]
|
||||
{
|
||||
"parent": "minecraft:item/handheld",
|
||||
"textures": {
|
||||
"layer0": "techreborn:item/tool/basic_chainsaw"
|
||||
},
|
||||
"overrides": [
|
||||
{
|
||||
"predicate": {
|
||||
"techreborn:animated": 1
|
||||
},
|
||||
"model": "techreborn:item/tool/override/basic_chainsaw_animated"
|
||||
}
|
||||
]
|
||||
}
|
|
@ -0,0 +1,6 @@
|
|||
{
|
||||
"parent": "minecraft:item/handheld",
|
||||
"textures": {
|
||||
"layer0": "techreborn:item/tool/basic_drill"
|
||||
}
|
||||
}
|
|
@ -0,0 +1,6 @@
|
|||
{
|
||||
"parent": "minecraft:item/handheld",
|
||||
"textures": {
|
||||
"layer0": "techreborn:item/tool/basic_jackhammer"
|
||||
}
|
||||
}
|
|
@ -0,0 +1,6 @@
|
|||
{
|
||||
"parent": "minecraft:item/generated",
|
||||
"textures": {
|
||||
"layer0": "techreborn:item/armor/cloaking_device"
|
||||
}
|
||||
}
|
|
@ -0,0 +1,6 @@
|
|||
{
|
||||
"parent": "minecraft:item/handheld",
|
||||
"textures": {
|
||||
"layer0": "techreborn:item/tool/electric_treetap"
|
||||
}
|
||||
}
|
|
@ -1,14 +1,14 @@
|
|||
{
|
||||
"parent": "techreborn:item/techrebornItem",
|
||||
"textures": {
|
||||
"layer0": "techreborn:items/tool/frequency_transmitter"
|
||||
},
|
||||
"overrides": [
|
||||
{
|
||||
"predicate": {
|
||||
"techreborn:coords": 1
|
||||
},
|
||||
"model": "techreborn:item/misc/frequency_transmitter_coords"
|
||||
}
|
||||
]
|
||||
{
|
||||
"parent": "minecraft:item/generated",
|
||||
"textures": {
|
||||
"layer0": "techreborn:item/tool/frequency_transmitter"
|
||||
},
|
||||
"overrides": [
|
||||
{
|
||||
"predicate": {
|
||||
"techreborn:coords": 1
|
||||
},
|
||||
"model": "techreborn:item/misc/frequency_transmitter_coords"
|
||||
}
|
||||
]
|
||||
}
|
|
@ -1,14 +1,14 @@
|
|||
{
|
||||
"parent": "techreborn:item/tool/tool",
|
||||
"textures": {
|
||||
"layer0": "techreborn:items/tool/industrial_chainsaw"
|
||||
},
|
||||
"overrides": [
|
||||
{
|
||||
"predicate": {
|
||||
"techreborn:animated": 1
|
||||
},
|
||||
"model": "techreborn:item/tool/override/industrial_chainsaw_animated"
|
||||
}
|
||||
]
|
||||
{
|
||||
"parent": "minecraft:item/handheld",
|
||||
"textures": {
|
||||
"layer0": "techreborn:item/tool/industrial_chainsaw"
|
||||
},
|
||||
"overrides": [
|
||||
{
|
||||
"predicate": {
|
||||
"techreborn:animated": 1
|
||||
},
|
||||
"model": "techreborn:item/tool/override/industrial_chainsaw_animated"
|
||||
}
|
||||
]
|
||||
}
|
|
@ -0,0 +1,6 @@
|
|||
{
|
||||
"parent": "minecraft:item/handheld",
|
||||
"textures": {
|
||||
"layer0": "techreborn:item/tool/industrial_drill"
|
||||
}
|
||||
}
|
|
@ -0,0 +1,6 @@
|
|||
{
|
||||
"parent": "minecraft:item/handheld",
|
||||
"textures": {
|
||||
"layer0": "techreborn:item/tool/industrial_jackhammer"
|
||||
}
|
||||
}
|
|
@ -0,0 +1,6 @@
|
|||
{
|
||||
"parent": "minecraft:item/generated",
|
||||
"textures": {
|
||||
"layer0": "techreborn:item/armor/lapotronic_orbpack"
|
||||
}
|
||||
}
|
|
@ -0,0 +1,6 @@
|
|||
{
|
||||
"parent": "minecraft:item/generated",
|
||||
"textures": {
|
||||
"layer0": "techreborn:item/misc/manual"
|
||||
}
|
||||
}
|
|
@ -1,6 +1,6 @@
|
|||
{
|
||||
"parent": "techreborn:item/techrebornItem",
|
||||
"parent": "minecraft:item/generated",
|
||||
"textures": {
|
||||
"layer0": "techreborn:items/tool/frequency_transmitter_coords"
|
||||
"layer0": "techreborn:item/tool/frequency_transmitter_coords"
|
||||
}
|
||||
}
|
|
@ -1,6 +0,0 @@
|
|||
{
|
||||
"parent": "techreborn:item/techrebornItem",
|
||||
"textures": {
|
||||
"layer0": "techreborn:items/misc/manual"
|
||||
}
|
||||
}
|
|
@ -0,0 +1,20 @@
|
|||
{
|
||||
"parent": "minecraft:item/handheld",
|
||||
"textures": {
|
||||
"layer0": "techreborn:item/tool/nanosaber_off"
|
||||
},
|
||||
"overrides": [
|
||||
{
|
||||
"predicate": {
|
||||
"techreborn:active": 0.5
|
||||
},
|
||||
"model": "techreborn:item/tool/override/nanosaber_active_low"
|
||||
},
|
||||
{
|
||||
"predicate": {
|
||||
"techreborn:active": 1
|
||||
},
|
||||
"model": "techreborn:item/tool/override/nanosaber_active"
|
||||
}
|
||||
]
|
||||
}
|
|
@ -0,0 +1,6 @@
|
|||
{
|
||||
"parent": "minecraft:item/handheld",
|
||||
"textures": {
|
||||
"layer0": "techreborn:item/tool/rock_cutter"
|
||||
}
|
||||
}
|
|
@ -1,6 +0,0 @@
|
|||
{
|
||||
"parent": "techreborn:item/tool/tool",
|
||||
"textures": {
|
||||
"layer0": "techreborn:items/tool/advanced_drill"
|
||||
}
|
||||
}
|
|
@ -1,6 +0,0 @@
|
|||
{
|
||||
"parent": "techreborn:item/tool/tool",
|
||||
"textures": {
|
||||
"layer0": "techreborn:items/tool/advanced_jackhammer"
|
||||
}
|
||||
}
|
|
@ -1,6 +0,0 @@
|
|||
{
|
||||
"parent": "techreborn:item/tool/tool",
|
||||
"textures": {
|
||||
"layer0": "techreborn:items/tool/basic_drill"
|
||||
}
|
||||
}
|
|
@ -1,6 +0,0 @@
|
|||
{
|
||||
"parent": "techreborn:item/tool/tool",
|
||||
"textures": {
|
||||
"layer0": "techreborn:items/tool/basic_jackhammer"
|
||||
}
|
||||
}
|
|
@ -1,6 +0,0 @@
|
|||
{
|
||||
"parent": "techreborn:item/tool/tool",
|
||||
"textures": {
|
||||
"layer0": "techreborn:items/tool/electric_treetap"
|
||||
}
|
||||
}
|
|
@ -1,6 +0,0 @@
|
|||
{
|
||||
"parent": "techreborn:item/tool/tool",
|
||||
"textures": {
|
||||
"layer0": "techreborn:items/tool/industrial_drill"
|
||||
}
|
||||
}
|
|
@ -1,6 +0,0 @@
|
|||
{
|
||||
"parent": "techreborn:item/tool/tool",
|
||||
"textures": {
|
||||
"layer0": "techreborn:items/tool/industrial_jackhammer"
|
||||
}
|
||||
}
|
|
@ -1,20 +0,0 @@
|
|||
{
|
||||
"parent": "techreborn:item/tool/tool",
|
||||
"textures": {
|
||||
"layer0": "techreborn:items/tool/nanosaber_off"
|
||||
},
|
||||
"overrides": [
|
||||
{
|
||||
"predicate": {
|
||||
"techreborn:active": 0.5
|
||||
},
|
||||
"model": "techreborn:item/tool/nanosaber_active_low"
|
||||
},
|
||||
{
|
||||
"predicate": {
|
||||
"techreborn:active": 1
|
||||
},
|
||||
"model": "techreborn:item/tool/nanosaber_active"
|
||||
}
|
||||
]
|
||||
}
|
|
@ -1,6 +0,0 @@
|
|||
{
|
||||
"parent": "techreborn:item/tool/tool",
|
||||
"textures": {
|
||||
"layer0": "techreborn:items/tool/nanosaber_on"
|
||||
}
|
||||
}
|
|
@ -1,6 +0,0 @@
|
|||
{
|
||||
"parent": "techreborn:item/tool/tool",
|
||||
"textures": {
|
||||
"layer0": "techreborn:items/tool/nanosaber_low"
|
||||
}
|
||||
}
|
|
@ -1,6 +1,6 @@
|
|||
{
|
||||
"parent": "techreborn:item/tool/tool",
|
||||
"parent": "minecraft:item/handheld",
|
||||
"textures": {
|
||||
"layer0": "techreborn:items/tool/advanced_chainsaw_animated"
|
||||
"layer0": "techreborn:item/tool/advanced_chainsaw_animated"
|
||||
}
|
||||
}
|
|
@ -1,6 +1,6 @@
|
|||
{
|
||||
"parent": "techreborn:item/tool/tool",
|
||||
"parent": "minecraft:item/handheld",
|
||||
"textures": {
|
||||
"layer0": "techreborn:items/tool/basic_chainsaw_animated"
|
||||
"layer0": "techreborn:item/tool/basic_chainsaw_animated"
|
||||
}
|
||||
}
|
|
@ -1,6 +1,6 @@
|
|||
{
|
||||
"parent": "techreborn:item/tool/tool",
|
||||
"parent": "minecraft:item/handheld",
|
||||
"textures": {
|
||||
"layer0": "techreborn:items/tool/industrial_chainsaw_animated"
|
||||
"layer0": "techreborn:item/tool/industrial_chainsaw_animated"
|
||||
}
|
||||
}
|
|
@ -0,0 +1,6 @@
|
|||
{
|
||||
"parent": "minecraft:item/handheld",
|
||||
"textures": {
|
||||
"layer0": "techreborn:item/tool/nanosaber_on"
|
||||
}
|
||||
}
|
|
@ -0,0 +1,6 @@
|
|||
{
|
||||
"parent": "minecraft:item/handheld",
|
||||
"textures": {
|
||||
"layer0": "techreborn:item/tool/nanosaber_low"
|
||||
}
|
||||
}
|
|
@ -1,6 +0,0 @@
|
|||
{
|
||||
"parent": "techreborn:item/tool/tool",
|
||||
"textures": {
|
||||
"layer0": "techreborn:items/tool/rock_cutter"
|
||||
}
|
||||
}
|
|
@ -1,3 +0,0 @@
|
|||
{
|
||||
"parent": "item/handheld"
|
||||
}
|
Before Width: | Height: | Size: 266 B After Width: | Height: | Size: 266 B |
Before Width: | Height: | Size: 624 B After Width: | Height: | Size: 624 B |
Loading…
Reference in a new issue