Moved items into content

This commit is contained in:
drcrazy 2018-09-24 14:28:58 +03:00
parent bf7f7ba871
commit 9f9595f955
40 changed files with 519 additions and 582 deletions

View file

@ -48,7 +48,7 @@ import net.minecraftforge.fluids.capability.templates.FluidHandlerItemStack;
import org.apache.commons.lang3.Validate;
import reborncore.common.util.StringUtils;
import techreborn.events.TRRecipeHandler;
import techreborn.init.TRItems;
import techreborn.init.TRContent;
/**
* Created by modmuss50 on 17/05/2016.
@ -174,14 +174,14 @@ public class DynamicCell extends Item {
public static ItemStack getCellWithFluid(Fluid fluid, int stackSize) {
Validate.notNull(fluid);
ItemStack stack = new ItemStack(TRItems.CELL);
ItemStack stack = new ItemStack(TRContent.CELL);
getFluidHandler(stack).fill(new FluidStack(fluid, CAPACITY), true);
stack.setCount(stackSize);
return stack;
}
public static ItemStack getEmptyCell(int amount) {
return new ItemStack(TRItems.CELL, amount);
return new ItemStack(TRContent.CELL, amount);
}
public static ItemStack getCellWithFluid(Fluid fluid) {
@ -235,14 +235,14 @@ public class DynamicCell extends Item {
cell = super.getContainer();
}
else {
cell = new ItemStack(TRItems.CELL, 1);
cell = new ItemStack(TRContent.CELL, 1);
}
return cell;
}
@Override
protected void setContainerToEmpty() {
container = new ItemStack(TRItems.CELL, 1);
container = new ItemStack(TRContent.CELL, 1);
}
}
}

View file

@ -42,7 +42,7 @@ import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
import reborncore.client.hud.StackInfoElement;
import reborncore.common.util.ChatUtils;
import techreborn.init.TRItems;
import techreborn.init.TRContent;
import techreborn.utils.MessageIDs;
import javax.annotation.Nullable;
@ -132,7 +132,7 @@ public class ItemFrequencyTransmitter extends Item {
public static class StackInfoFreqTransmitter extends StackInfoElement {
public StackInfoFreqTransmitter() {
super(TRItems.FREQUENCY_TRANSMITTER);
super(TRContent.FREQUENCY_TRANSMITTER);
}
@Override

View file

@ -46,8 +46,6 @@ import reborncore.common.util.ItemUtils;
import techreborn.TechReborn;
import techreborn.api.Reference;
import techreborn.config.ConfigTechReborn;
import techreborn.init.TRItems;
import javax.annotation.Nullable;
@RebornRegister(modID = TechReborn.MOD_ID)
@ -90,7 +88,7 @@ public class ItemCloakingDevice extends ItemTRArmour implements IEnergyItemInfo
if (!isInCreativeTab(par2CreativeTabs)) {
return;
}
ItemStack uncharged = new ItemStack(TRItems.CLOAKING_DEVICE);
ItemStack uncharged = new ItemStack(this);
// ItemStack charged = new ItemStack(ModItems.CLOAKING_DEVICE);
// ForgePowerItemManager capEnergy = (ForgePowerItemManager) charged.getCapability(CapabilityEnergy.ENERGY, null);
// capEnergy.setEnergyStored(capEnergy.getMaxEnergyStored());

View file

@ -41,8 +41,6 @@ import reborncore.common.powerSystem.PowerSystem;
import reborncore.common.powerSystem.PoweredItemCapabilityProvider;
import reborncore.common.util.ItemUtils;
import techreborn.config.ConfigTechReborn;
import techreborn.init.TRItems;
import javax.annotation.Nullable;
public class ItemLapotronicOrbpack extends ItemArmor implements IEnergyItemInfo {
@ -63,7 +61,7 @@ public class ItemLapotronicOrbpack extends ItemArmor implements IEnergyItemInfo
if (!isInCreativeTab(par2CreativeTabs)) {
return;
}
ItemStack uncharged = new ItemStack(TRItems.LAPOTRONIC_ORBPACK);
ItemStack uncharged = new ItemStack(this);
// ItemStack charged = new ItemStack(ModItems.LAPOTRONIC_ORBPACK);
// ForgePowerItemManager capEnergy = (ForgePowerItemManager) charged.getCapability(CapabilityEnergy.ENERGY, null);
// capEnergy.setEnergyStored(capEnergy.getMaxEnergyStored());

View file

@ -43,8 +43,6 @@ import reborncore.common.powerSystem.PowerSystem;
import reborncore.common.powerSystem.PoweredItemCapabilityProvider;
import reborncore.common.util.ItemUtils;
import techreborn.config.ConfigTechReborn;
import techreborn.init.TRItems;
import javax.annotation.Nullable;
public class ItemLithiumIonBatpack extends ItemArmor implements IEnergyItemInfo {
@ -120,7 +118,7 @@ public class ItemLithiumIonBatpack extends ItemArmor implements IEnergyItemInfo
if (!isInCreativeTab(par2CreativeTabs)) {
return;
}
ItemStack uncharged = new ItemStack(TRItems.LITHIUM_ION_BATPACK);
ItemStack uncharged = new ItemStack(this);
// ItemStack charged = new ItemStack(ModItems.LITHIUM_ION_BATPACK);
// ForgePowerItemManager capEnergy = (ForgePowerItemManager) charged.getCapability(CapabilityEnergy.ENERGY, null);
// capEnergy.setEnergyStored(capEnergy.getMaxEnergyStored());

View file

@ -30,7 +30,7 @@ import net.minecraft.util.NonNullList;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
import techreborn.config.ConfigTechReborn;
import techreborn.init.TRItems;
import techreborn.init.TRContent;
public class ItemEnergyCrystal extends ItemBattery {
@ -45,7 +45,7 @@ public class ItemEnergyCrystal extends ItemBattery {
if (!isInCreativeTab(par2CreativeTabs)) {
return;
}
ItemStack stack = new ItemStack(TRItems.ENERGY_CRYSTAL);
ItemStack stack = new ItemStack(TRContent.ENERGY_CRYSTAL);
// ItemStack charged = stack.copy();
// ForgePowerItemManager capEnergy = (ForgePowerItemManager) charged.getCapability(CapabilityEnergy.ENERGY, null);
// capEnergy.setEnergyStored(capEnergy.getMaxEnergyStored());

View file

@ -30,7 +30,6 @@ import net.minecraft.util.NonNullList;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
import techreborn.config.ConfigTechReborn;
import techreborn.init.TRItems;
public class ItemLapotronCrystal extends ItemBattery {
@ -45,7 +44,7 @@ public class ItemLapotronCrystal extends ItemBattery {
if (!isInCreativeTab(par2CreativeTabs)) {
return;
}
ItemStack stack = new ItemStack(TRItems.LAPOTRON_CRYSTAL);
ItemStack stack = new ItemStack(this);
// ItemStack charged = stack.copy();
// ForgePowerItemManager capEnergy = (ForgePowerItemManager) charged.getCapability(CapabilityEnergy.ENERGY, null);
// capEnergy.setEnergyStored(capEnergy.getMaxEnergyStored());

View file

@ -30,7 +30,6 @@ import net.minecraft.util.NonNullList;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
import techreborn.config.ConfigTechReborn;
import techreborn.init.TRItems;
public class ItemLapotronicOrb extends ItemBattery {
@ -45,7 +44,7 @@ public class ItemLapotronicOrb extends ItemBattery {
if (!isInCreativeTab(par2CreativeTabs)) {
return;
}
ItemStack stack = new ItemStack(TRItems.LAPOTRONIC_ORB);
ItemStack stack = new ItemStack(this);
// ItemStack charged = stack.copy();
// ForgePowerItemManager capEnergy = (ForgePowerItemManager) charged.getCapability(CapabilityEnergy.ENERGY, null);
// capEnergy.setEnergyStored(capEnergy.getMaxEnergyStored());

View file

@ -29,7 +29,6 @@ import net.minecraft.item.ItemStack;
import net.minecraft.util.NonNullList;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
import techreborn.init.TRItems;
public class ItemLithiumIonBattery extends ItemBattery {
@ -44,7 +43,7 @@ public class ItemLithiumIonBattery extends ItemBattery {
if (!isInCreativeTab(par2CreativeTabs)) {
return;
}
ItemStack stack = new ItemStack(TRItems.LITHIUM_ION_BATTERY);
ItemStack stack = new ItemStack(this);
// ItemStack charged = stack.copy();
// ForgePowerItemManager capEnergy = (ForgePowerItemManager) charged.getCapability(CapabilityEnergy.ENERGY, null);
//capEnergy.setEnergyStored(capEnergy.getMaxEnergyStored());

View file

@ -29,7 +29,6 @@ import net.minecraft.item.ItemStack;
import net.minecraft.util.NonNullList;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
import techreborn.init.TRItems;
public class ItemRedCellBattery extends ItemBattery {
@ -44,7 +43,7 @@ public class ItemRedCellBattery extends ItemBattery {
if (!isInCreativeTab(par2CreativeTabs)) {
return;
}
ItemStack stack = new ItemStack(TRItems.RED_CELL_BATTERY);
ItemStack stack = new ItemStack(this);
// ItemStack charged = stack.copy();
//IEnergyStorage capEnergy = charged.getCapability(CapabilityEnergy.ENERGY, null);
//capEnergy.setEnergyStored(capEnergy.getMaxEnergyStored());

View file

@ -32,7 +32,7 @@ import net.minecraft.util.NonNullList;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
import techreborn.config.ConfigTechReborn;
import techreborn.init.TRItems;
import techreborn.init.TRContent;
import techreborn.items.tool.ItemChainsaw;
public class ItemAdvancedChainsaw extends ItemChainsaw {
@ -50,7 +50,7 @@ public class ItemAdvancedChainsaw extends ItemChainsaw {
if (!isInCreativeTab(par2CreativeTabs)) {
return;
}
ItemStack stack = new ItemStack(TRItems.ADVANCED_CHAINSAW);
ItemStack stack = new ItemStack(TRContent.ADVANCED_CHAINSAW);
// ItemStack charged = stack.copy();
// ForgePowerItemManager capEnergy = (ForgePowerItemManager) charged.getCapability(CapabilityEnergy.ENERGY, null);
// capEnergy.setEnergyStored(capEnergy.getMaxEnergyStored());

View file

@ -32,7 +32,7 @@ import net.minecraft.util.NonNullList;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
import techreborn.config.ConfigTechReborn;
import techreborn.init.TRItems;
import techreborn.init.TRContent;
import techreborn.items.tool.ItemDrill;
public class ItemAdvancedDrill extends ItemDrill {
@ -50,7 +50,7 @@ public class ItemAdvancedDrill extends ItemDrill {
if (!isInCreativeTab(par2CreativeTabs)) {
return;
}
ItemStack stack = new ItemStack(TRItems.ADVANCED_DRILL);
ItemStack stack = new ItemStack(TRContent.ADVANCED_DRILL);
// ItemStack charged = stack.copy();
// ForgePowerItemManager capEnergy = (ForgePowerItemManager) charged.getCapability(CapabilityEnergy.ENERGY, null);
// capEnergy.setEnergyStored(capEnergy.getMaxEnergyStored());

View file

@ -30,7 +30,7 @@ import net.minecraft.util.NonNullList;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
import techreborn.config.ConfigTechReborn;
import techreborn.init.TRItems;
import techreborn.init.TRContent;
import techreborn.items.tool.ItemJackhammer;
public class ItemAdvancedJackhammer extends ItemJackhammer {
@ -49,7 +49,7 @@ public class ItemAdvancedJackhammer extends ItemJackhammer {
if (!isInCreativeTab(par2CreativeTabs)) {
return;
}
ItemStack stack = new ItemStack(TRItems.ADVANCED_JACKHAMMER);
ItemStack stack = new ItemStack(TRContent.ADVANCED_JACKHAMMER);
// ItemStack charged = stack.copy();
// ForgePowerItemManager capEnergy = (ForgePowerItemManager) charged.getCapability(CapabilityEnergy.ENERGY, null);
// capEnergy.setEnergyStored(capEnergy.getMaxEnergyStored());

View file

@ -46,8 +46,6 @@ import reborncore.common.powerSystem.PowerSystem;
import reborncore.common.powerSystem.PoweredItemCapabilityProvider;
import reborncore.common.util.ItemUtils;
import techreborn.config.ConfigTechReborn;
import techreborn.init.TRItems;
import javax.annotation.Nullable;
import java.util.Random;
@ -145,7 +143,7 @@ public class ItemRockCutter extends ItemPickaxe implements IEnergyItemInfo {
if (!isInCreativeTab(par2CreativeTabs)) {
return;
}
ItemStack uncharged = new ItemStack(TRItems.ROCK_CUTTER);
ItemStack uncharged = new ItemStack(this);
uncharged.addEnchantment(Enchantments.SILK_TOUCH, 1);
// ItemStack charged = new ItemStack(ModItems.ROCK_CUTTER);
// charged.addEnchantment(Enchantments.SILK_TOUCH, 1);

View file

@ -32,7 +32,7 @@ import net.minecraft.util.NonNullList;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
import techreborn.config.ConfigTechReborn;
import techreborn.init.TRItems;
import techreborn.init.TRContent;
import techreborn.items.tool.ItemChainsaw;
public class ItemBasicChainsaw extends ItemChainsaw {
@ -49,7 +49,7 @@ public class ItemBasicChainsaw extends ItemChainsaw {
if (!isInCreativeTab(par2CreativeTabs)) {
return;
}
ItemStack stack = new ItemStack(TRItems.BASIC_CHAINSAW);
ItemStack stack = new ItemStack(TRContent.BASIC_CHAINSAW);
// ItemStack charged = stack.copy();
// ForgePowerItemManager capEnergy = (ForgePowerItemManager) charged.getCapability(CapabilityEnergy.ENERGY, null);
// capEnergy.setEnergyStored(capEnergy.getMaxEnergyStored());

View file

@ -32,7 +32,6 @@ import net.minecraft.util.NonNullList;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
import techreborn.config.ConfigTechReborn;
import techreborn.init.TRItems;
import techreborn.items.tool.ItemDrill;
public class ItemBasicDrill extends ItemDrill {
@ -49,7 +48,7 @@ public class ItemBasicDrill extends ItemDrill {
if (!isInCreativeTab(par2CreativeTabs)) {
return;
}
ItemStack stack = new ItemStack(TRItems.BASIC_DRILL);
ItemStack stack = new ItemStack(this);
// ItemStack charged = stack.copy();
// ForgePowerItemManager capEnergy = (ForgePowerItemManager) charged.getCapability(CapabilityEnergy.ENERGY, null);
// capEnergy.setEnergyStored(capEnergy.getMaxEnergyStored());

View file

@ -30,7 +30,7 @@ import net.minecraft.util.NonNullList;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
import techreborn.config.ConfigTechReborn;
import techreborn.init.TRItems;
import techreborn.init.TRContent;
import techreborn.items.tool.ItemJackhammer;
public class ItemBasicJackhammer extends ItemJackhammer {
@ -47,7 +47,7 @@ public class ItemBasicJackhammer extends ItemJackhammer {
if (!isInCreativeTab(par2CreativeTabs)) {
return;
}
ItemStack stack = new ItemStack(TRItems.BASIC_JACKHAMMER);
ItemStack stack = new ItemStack(TRContent.BASIC_JACKHAMMER);
// ItemStack charged = stack.copy();
// ForgePowerItemManager capEnergy = (ForgePowerItemManager) charged.getCapability(CapabilityEnergy.ENERGY, null);
// capEnergy.setEnergyStored(capEnergy.getMaxEnergyStored());

View file

@ -36,8 +36,6 @@ import reborncore.api.power.IEnergyItemInfo;
import reborncore.common.powerSystem.PowerSystem;
import reborncore.common.powerSystem.PoweredItemCapabilityProvider;
import reborncore.common.util.ItemUtils;
import techreborn.init.TRItems;
import javax.annotation.Nullable;
/**
@ -79,7 +77,7 @@ public class ItemElectricTreetap extends Item implements IEnergyItemInfo {
if (!isInCreativeTab(par2CreativeTabs)) {
return;
}
ItemStack uncharged = new ItemStack(TRItems.ELECTRIC_TREE_TAP);
ItemStack uncharged = new ItemStack(this);
// ItemStack charged = new ItemStack(ModItems.ELECTRIC_TREE_TAP);
// ForgePowerItemManager capEnergy = (ForgePowerItemManager) charged.getCapability(CapabilityEnergy.ENERGY, null);
// capEnergy.setEnergyStored(capEnergy.getMaxEnergyStored());

View file

@ -38,7 +38,6 @@ import net.minecraftforge.energy.IEnergyStorage;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
import techreborn.config.ConfigTechReborn;
import techreborn.init.TRItems;
import techreborn.items.tool.ItemChainsaw;
public class ItemIndustrialChainsaw extends ItemChainsaw {
@ -56,7 +55,7 @@ public class ItemIndustrialChainsaw extends ItemChainsaw {
if (!isInCreativeTab(par2CreativeTabs)) {
return;
}
ItemStack stack = new ItemStack(TRItems.INDUSTRIAL_CHAINSAW);
ItemStack stack = new ItemStack(this);
// ItemStack charged = stack.copy();
// ForgePowerItemManager capEnergy = (ForgePowerItemManager) charged.getCapability(CapabilityEnergy.ENERGY, null);
// capEnergy.setEnergyStored(capEnergy.getMaxEnergyStored());

View file

@ -40,7 +40,6 @@ import net.minecraftforge.energy.CapabilityEnergy;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
import techreborn.config.ConfigTechReborn;
import techreborn.init.TRItems;
import techreborn.items.tool.ItemDrill;
import javax.annotation.Nullable;
@ -155,7 +154,7 @@ public class ItemIndustrialDrill extends ItemDrill {
if (!isInCreativeTab(par2CreativeTabs)) {
return;
}
ItemStack stack = new ItemStack(TRItems.INDUSTRIAL_DRILL);
ItemStack stack = new ItemStack(this);
// ItemStack charged = stack.copy();
// ForgePowerItemManager capEnergy = (ForgePowerItemManager) charged.getCapability(CapabilityEnergy.ENERGY, null);
// capEnergy.setEnergyStored(capEnergy.getMaxEnergyStored());

View file

@ -30,7 +30,6 @@ import net.minecraft.util.NonNullList;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
import techreborn.config.ConfigTechReborn;
import techreborn.init.TRItems;
import techreborn.items.tool.ItemJackhammer;
public class ItemIndustrialJackhammer extends ItemJackhammer {
@ -50,7 +49,7 @@ public class ItemIndustrialJackhammer extends ItemJackhammer {
if (!isInCreativeTab(par2CreativeTabs)) {
return;
}
ItemStack stack = new ItemStack(TRItems.INDUSTRIAL_JACKHAMMER);
ItemStack stack = new ItemStack(this);
// ItemStack charged = stack.copy();
// ForgePowerItemManager capEnergy = (ForgePowerItemManager) charged.getCapability(CapabilityEnergy.ENERGY, null);
// capEnergy.setEnergyStored(capEnergy.getMaxEnergyStored());

View file

@ -54,7 +54,6 @@ import reborncore.common.powerSystem.PoweredItemCapabilityProvider;
import reborncore.common.util.ChatUtils;
import reborncore.common.util.ItemUtils;
import techreborn.config.ConfigTechReborn;
import techreborn.init.TRItems;
import techreborn.utils.MessageIDs;
import javax.annotation.Nullable;
@ -203,7 +202,7 @@ public class ItemNanosaber extends ItemSword implements IEnergyItemInfo {
if (!isInCreativeTab(par2CreativeTabs)) {
return;
}
ItemStack inactiveUncharged = new ItemStack(TRItems.NANOSABER);
ItemStack inactiveUncharged = new ItemStack(this);
inactiveUncharged.setTagCompound(new NBTTagCompound());
inactiveUncharged.getTagCompound().setBoolean("isActive", false);

View file

@ -48,8 +48,6 @@ import reborncore.common.powerSystem.PoweredItemCapabilityProvider;
import reborncore.common.util.ItemUtils;
import reborncore.common.util.TorchHelper;
import techreborn.config.ConfigTechReborn;
import techreborn.init.TRItems;
import javax.annotation.Nullable;
import java.util.List;
@ -159,7 +157,7 @@ public class ItemOmniTool extends ItemPickaxe implements IEnergyItemInfo {
if (!isInCreativeTab(par2CreativeTabs)) {
return;
}
ItemStack uncharged = new ItemStack(TRItems.OMNI_TOOL);
ItemStack uncharged = new ItemStack(this);
// ItemStack charged = new ItemStack(ModItems.OMNI_TOOL);
// ForgePowerItemManager capEnergy = (ForgePowerItemManager) charged.getCapability(CapabilityEnergy.ENERGY, null);
// capEnergy.setEnergyStored(capEnergy.getMaxEnergyStored());