Renamed ModItems to TRItems. Sorted members inside it.

This commit is contained in:
drcrazy 2018-09-03 17:46:21 +03:00
parent 0443ad4a3a
commit a40635e75f
39 changed files with 299 additions and 275 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.ModItems;
import techreborn.init.TRItems;
import techreborn.utils.TechRebornCreativeTab;
/**
@ -177,14 +177,14 @@ public class DynamicCell extends Item {
public static ItemStack getCellWithFluid(Fluid fluid, int stackSize) {
Validate.notNull(fluid);
ItemStack stack = new ItemStack(ModItems.CELL);
ItemStack stack = new ItemStack(TRItems.CELL);
getFluidHandler(stack).fill(new FluidStack(fluid, CAPACITY), true);
stack.setCount(stackSize);
return stack;
}
public static ItemStack getEmptyCell(int amount) {
return new ItemStack(ModItems.CELL, amount);
return new ItemStack(TRItems.CELL, amount);
}
public static ItemStack getCellWithFluid(Fluid fluid) {
@ -238,14 +238,14 @@ public class DynamicCell extends Item {
cell = super.getContainer();
}
else {
cell = new ItemStack(ModItems.CELL, 1);
cell = new ItemStack(TRItems.CELL, 1);
}
return cell;
}
@Override
protected void setContainerToEmpty() {
container = new ItemStack(ModItems.CELL, 1);
container = new ItemStack(TRItems.CELL, 1);
}
}
}

View file

@ -41,7 +41,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.ModItems;
import techreborn.init.TRItems;
import techreborn.lib.MessageIDs;
import techreborn.utils.TechRebornCreativeTab;
@ -132,7 +132,7 @@ public class ItemFrequencyTransmitter extends ItemTR {
public static class StackInfoFreqTransmitter extends StackInfoElement {
public StackInfoFreqTransmitter() {
super(ModItems.FREQUENCY_TRANSMITTER);
super(TRItems.FREQUENCY_TRANSMITTER);
}
@Override

View file

@ -42,7 +42,7 @@ import reborncore.common.registration.impl.ConfigRegistry;
import reborncore.common.tile.TileLegacyMachineBase;
import reborncore.common.util.ItemNBTHelper;
import techreborn.Core;
import techreborn.init.ModItems;
import techreborn.init.TRItems;
import techreborn.lib.ModInfo;
import techreborn.utils.TechRebornCreativeTab;
@ -75,7 +75,7 @@ public class ItemUpgrades extends ItemTR implements IUpgrade {
public static ItemStack getUpgradeByName(String name, int count) {
for (int i = 0; i < types.length; i++) {
if (types[i].equalsIgnoreCase(name)) {
return new ItemStack(ModItems.UPGRADES, count, i);
return new ItemStack(TRItems.UPGRADES, count, i);
}
}
throw new InvalidParameterException("The upgrade " + name + " could not be found.");

View file

@ -22,7 +22,7 @@
* SOFTWARE.
*/
package techreborn.items.tools;
package techreborn.items.armor;
import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.entity.Entity;
@ -46,7 +46,7 @@ import reborncore.common.registration.impl.ConfigRegistry;
import reborncore.common.util.ItemUtils;
import techreborn.api.Reference;
import techreborn.config.ConfigTechReborn;
import techreborn.init.ModItems;
import techreborn.init.TRItems;
import techreborn.items.armor.ItemTRArmour;
import techreborn.lib.ModInfo;
import techreborn.utils.TechRebornCreativeTab;
@ -97,7 +97,7 @@ public class ItemCloakingDevice extends ItemTRArmour implements IEnergyItemInfo
if (!isInCreativeTab(par2CreativeTabs)) {
return;
}
ItemStack uncharged = new ItemStack(ModItems.CLOAKING_DEVICE);
ItemStack uncharged = new ItemStack(TRItems.CLOAKING_DEVICE);
// ItemStack charged = new ItemStack(ModItems.CLOAKING_DEVICE);
// ForgePowerItemManager capEnergy = (ForgePowerItemManager) charged.getCapability(CapabilityEnergy.ENERGY, null);
// capEnergy.setEnergyStored(capEnergy.getMaxEnergyStored());

View file

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

View file

@ -43,7 +43,7 @@ import reborncore.common.powerSystem.PowerSystem;
import reborncore.common.powerSystem.PoweredItemCapabilityProvider;
import reborncore.common.util.ItemUtils;
import techreborn.config.ConfigTechReborn;
import techreborn.init.ModItems;
import techreborn.init.TRItems;
import techreborn.utils.TechRebornCreativeTab;
import javax.annotation.Nullable;
@ -121,7 +121,7 @@ public class ItemLithiumBatpack extends ItemArmor implements IEnergyItemInfo {
if (!isInCreativeTab(par2CreativeTabs)) {
return;
}
ItemStack uncharged = new ItemStack(ModItems.LITHIUM_BATTERY_PACK);
ItemStack uncharged = new ItemStack(TRItems.LITHIUM_BATTERY_PACK);
// ItemStack charged = new ItemStack(ModItems.LITHIUM_BATTERY_PACK);
// 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.ModItems;
import techreborn.init.TRItems;
public class ItemEnergyCrystal extends ItemBattery {
@ -45,7 +45,7 @@ public class ItemEnergyCrystal extends ItemBattery {
if (!isInCreativeTab(par2CreativeTabs)) {
return;
}
ItemStack stack = new ItemStack(ModItems.ENERGY_CRYSTAL);
ItemStack stack = new ItemStack(TRItems.ENERGY_CRYSTAL);
// 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.ModItems;
import techreborn.init.TRItems;
public class ItemLapotronCrystal extends ItemBattery {
@ -45,7 +45,7 @@ public class ItemLapotronCrystal extends ItemBattery {
if (!isInCreativeTab(par2CreativeTabs)) {
return;
}
ItemStack stack = new ItemStack(ModItems.LAPOTRONIC_CRYSTAL);
ItemStack stack = new ItemStack(TRItems.LAPOTRONIC_CRYSTAL);
// 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.ModItems;
import techreborn.init.TRItems;
public class ItemLapotronicOrb extends ItemBattery {
@ -45,7 +45,7 @@ public class ItemLapotronicOrb extends ItemBattery {
if (!isInCreativeTab(par2CreativeTabs)) {
return;
}
ItemStack stack = new ItemStack(ModItems.LAPOTRONIC_ORB);
ItemStack stack = new ItemStack(TRItems.LAPOTRONIC_ORB);
// ItemStack charged = stack.copy();
// ForgePowerItemManager capEnergy = (ForgePowerItemManager) charged.getCapability(CapabilityEnergy.ENERGY, null);
// capEnergy.setEnergyStored(capEnergy.getMaxEnergyStored());

View file

@ -29,7 +29,7 @@ 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.ModItems;
import techreborn.init.TRItems;
public class ItemLithiumBattery extends ItemBattery {
@ -44,7 +44,7 @@ public class ItemLithiumBattery extends ItemBattery {
if (!isInCreativeTab(par2CreativeTabs)) {
return;
}
ItemStack stack = new ItemStack(ModItems.LITHIUM_BATTERY);
ItemStack stack = new ItemStack(TRItems.LITHIUM_BATTERY);
// ItemStack charged = stack.copy();
// ForgePowerItemManager capEnergy = (ForgePowerItemManager) charged.getCapability(CapabilityEnergy.ENERGY, null);
//capEnergy.setEnergyStored(capEnergy.getMaxEnergyStored());

View file

@ -29,7 +29,7 @@ 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.ModItems;
import techreborn.init.TRItems;
public class ItemReBattery extends ItemBattery {
@ -44,7 +44,7 @@ public class ItemReBattery extends ItemBattery {
if (!isInCreativeTab(par2CreativeTabs)) {
return;
}
ItemStack stack = new ItemStack(ModItems.RE_BATTERY);
ItemStack stack = new ItemStack(TRItems.RE_BATTERY);
// ItemStack charged = stack.copy();
//IEnergyStorage capEnergy = charged.getCapability(CapabilityEnergy.ENERGY, null);
//capEnergy.setEnergyStored(capEnergy.getMaxEnergyStored());

View file

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

View file

@ -40,7 +40,7 @@ import net.minecraftforge.energy.CapabilityEnergy;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
import techreborn.config.ConfigTechReborn;
import techreborn.init.ModItems;
import techreborn.init.TRItems;
import javax.annotation.Nullable;
import java.util.HashSet;
@ -150,7 +150,7 @@ public class ItemAdvancedDrill extends ItemDrill {
if (!isInCreativeTab(par2CreativeTabs)) {
return;
}
ItemStack stack = new ItemStack(ModItems.ADVANCED_DRILL);
ItemStack stack = new ItemStack(TRItems.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.ModItems;
import techreborn.init.TRItems;
public class ItemAdvancedJackhammer extends ItemJackhammer {
@ -49,7 +49,7 @@ public class ItemAdvancedJackhammer extends ItemJackhammer {
if (!isInCreativeTab(par2CreativeTabs)) {
return;
}
ItemStack stack = new ItemStack(ModItems.ADVANCED_JACKHAMMER);
ItemStack stack = new ItemStack(TRItems.ADVANCED_JACKHAMMER);
// 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.ModItems;
import techreborn.init.TRItems;
public class ItemDiamondChainsaw extends ItemChainsaw {
@ -49,7 +49,7 @@ public class ItemDiamondChainsaw extends ItemChainsaw {
if (!isInCreativeTab(par2CreativeTabs)) {
return;
}
ItemStack stack = new ItemStack(ModItems.DIAMOND_CHAINSAW);
ItemStack stack = new ItemStack(TRItems.DIAMOND_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.ModItems;
import techreborn.init.TRItems;
public class ItemDiamondDrill extends ItemDrill {
@ -49,7 +49,7 @@ public class ItemDiamondDrill extends ItemDrill {
if (!isInCreativeTab(par2CreativeTabs)) {
return;
}
ItemStack stack = new ItemStack(ModItems.DIAMOND_DRILL);
ItemStack stack = new ItemStack(TRItems.DIAMOND_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.ModItems;
import techreborn.init.TRItems;
public class ItemDiamondJackhammer extends ItemJackhammer {
@ -48,7 +48,7 @@ public class ItemDiamondJackhammer extends ItemJackhammer {
if (!isInCreativeTab(par2CreativeTabs)) {
return;
}
ItemStack stack = new ItemStack(ModItems.DIAMOND_JACKHAMMER);
ItemStack stack = new ItemStack(TRItems.DIAMOND_JACKHAMMER);
// ItemStack charged = stack.copy();
// ForgePowerItemManager capEnergy = (ForgePowerItemManager) charged.getCapability(CapabilityEnergy.ENERGY, null);
// capEnergy.setEnergyStored(capEnergy.getMaxEnergyStored());

View file

@ -35,7 +35,7 @@ import reborncore.api.power.IEnergyItemInfo;
import reborncore.common.powerSystem.PowerSystem;
import reborncore.common.powerSystem.PoweredItemCapabilityProvider;
import reborncore.common.util.ItemUtils;
import techreborn.init.ModItems;
import techreborn.init.TRItems;
import techreborn.items.ItemTR;
import techreborn.utils.TechRebornCreativeTab;
@ -82,7 +82,7 @@ public class ItemElectricTreetap extends ItemTR implements IEnergyItemInfo {
if (!isInCreativeTab(par2CreativeTabs)) {
return;
}
ItemStack uncharged = new ItemStack(ModItems.ELECTRIC_TREE_TAP);
ItemStack uncharged = new ItemStack(TRItems.ELECTRIC_TREE_TAP);
// ItemStack charged = new ItemStack(ModItems.ELECTRIC_TREE_TAP);
// ForgePowerItemManager capEnergy = (ForgePowerItemManager) charged.getCapability(CapabilityEnergy.ENERGY, null);
// capEnergy.setEnergyStored(capEnergy.getMaxEnergyStored());

View file

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

View file

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

View file

@ -46,7 +46,7 @@ import reborncore.common.powerSystem.PowerSystem;
import reborncore.common.powerSystem.PoweredItemCapabilityProvider;
import reborncore.common.util.ItemUtils;
import techreborn.config.ConfigTechReborn;
import techreborn.init.ModItems;
import techreborn.init.TRItems;
import techreborn.utils.TechRebornCreativeTab;
import javax.annotation.Nullable;
@ -146,7 +146,7 @@ public class ItemRockCutter extends ItemPickaxe implements IEnergyItemInfo {
if (!isInCreativeTab(par2CreativeTabs)) {
return;
}
ItemStack uncharged = new ItemStack(ModItems.ROCK_CUTTER);
ItemStack uncharged = new ItemStack(TRItems.ROCK_CUTTER);
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.ModItems;
import techreborn.init.TRItems;
public class ItemSteelChainsaw extends ItemChainsaw {
@ -48,7 +48,7 @@ public class ItemSteelChainsaw extends ItemChainsaw {
if (!isInCreativeTab(par2CreativeTabs)) {
return;
}
ItemStack stack = new ItemStack(ModItems.STEEL_CHAINSAW);
ItemStack stack = new ItemStack(TRItems.STEEL_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.ModItems;
import techreborn.init.TRItems;
public class ItemSteelDrill extends ItemDrill {
@ -48,7 +48,7 @@ public class ItemSteelDrill extends ItemDrill {
if (!isInCreativeTab(par2CreativeTabs)) {
return;
}
ItemStack stack = new ItemStack(ModItems.STEEL_DRILL);
ItemStack stack = new ItemStack(TRItems.STEEL_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.ModItems;
import techreborn.init.TRItems;
public class ItemSteelJackhammer extends ItemJackhammer {
@ -46,7 +46,7 @@ public class ItemSteelJackhammer extends ItemJackhammer {
if (!isInCreativeTab(par2CreativeTabs)) {
return;
}
ItemStack stack = new ItemStack(ModItems.STEEL_JACKHAMMER);
ItemStack stack = new ItemStack(TRItems.STEEL_JACKHAMMER);
// ItemStack charged = stack.copy();
// ForgePowerItemManager capEnergy = (ForgePowerItemManager) charged.getCapability(CapabilityEnergy.ENERGY, null);
// capEnergy.setEnergyStored(capEnergy.getMaxEnergyStored());