1696 - find + replace pass

This commit is contained in:
modmuss50 2019-01-13 16:51:50 +00:00
parent 368e2d48df
commit b6312b124a
94 changed files with 418 additions and 419 deletions

View file

@ -68,12 +68,12 @@ public class DynamicCell extends Item {
//Clearing tag because ItemUtils.isItemEqual doesn't handle tags ForgeCaps and display
//And breaks ability to use in recipes
//TODO: Property ItemUtils.isItemEquals tags equality handling?
if (stack.hasTagCompound()) {
NBTTagCompound tag = stack.getTagCompound();
if (stack.hasTag()) {
NBTTagCompound tag = stack.getTag();
if (tag.getSize() != 1 || tag.hasKey("Fluid")) {
NBTTagCompound clearTag = new NBTTagCompound();
clearTag.setTag("Fluid", tag.getCompoundTag("Fluid"));
stack.setTagCompound(clearTag);
stack.setTag(clearTag);
}
}
}
@ -194,10 +194,10 @@ public class DynamicCell extends Item {
super(container, capacity);
//backwards compatibility
if (container.hasTagCompound() && container.getTagCompound().hasKey("FluidName")) {
FluidStack stack = FluidStack.loadFluidStackFromNBT(container.getTagCompound());
if (container.hasTag() && container.getTag().hasKey("FluidName")) {
FluidStack stack = FluidStack.loadFluidStackFromNBT(container.getTag());
if (stack != null) {
container.setTagCompound(new NBTTagCompound());
container.setTag(new NBTTagCompound());
fill(stack, true);
}
}
@ -231,7 +231,7 @@ public class DynamicCell extends Item {
@Override
public ItemStack getContainer() {
ItemStack cell;
if (container.hasTagCompound() && container.getTagCompound().hasKey(FLUID_NBT_KEY)) {
if (container.hasTag() && container.getTag().hasKey(FLUID_NBT_KEY)) {
cell = super.getContainer();
}
else {

View file

@ -57,10 +57,10 @@ public class ItemCells {
if(stack1.isEmpty() || stack2.isEmpty()){
return false;
}
if(stack1.getTagCompound() == null || stack2.getTagCompound() == null){
if(stack1.getTag() == null || stack2.getTag() == null){
return false;
}
return stack1.getTagCompound().equals(stack2.getTagCompound());
return stack1.getTag().equals(stack2.getTag());
}
}

View file

@ -37,9 +37,9 @@ import net.minecraft.util.math.BlockPos;
import net.minecraft.util.text.TextComponentString;
import net.minecraft.util.text.TextFormatting;
import net.minecraft.world.World;
import net.minecraftforge.api.distmarker.Dist;
import net.minecraftforge.api.distmarker.OnlyIn;
import net.minecraftforge.common.DimensionManager;
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.TRContent;
@ -54,13 +54,13 @@ public class ItemFrequencyTransmitter extends Item {
setMaxStackSize(1);
this.addPropertyOverride(new ResourceLocation("techreborn", "coords"), new IItemPropertyGetter() {
@Override
@SideOnly(Side.CLIENT)
@OnlyIn(Dist.CLIENT)
public float apply(ItemStack stack,
@Nullable
World worldIn,
@Nullable
EntityLivingBase entityIn) {
if (!stack.isEmpty() && stack.hasTagCompound() && stack.getTagCompound() != null && stack.getTagCompound().hasKey("x") && stack.getTagCompound().hasKey("y") && stack.getTagCompound().hasKey("z") && stack.getTagCompound().hasKey("dim")) {
if (!stack.isEmpty() && stack.hasTag() && stack.getTag() != null && stack.getTag().hasKey("x") && stack.getTag().hasKey("y") && stack.getTag().hasKey("z") && stack.getTag().hasKey("dim")) {
return 1.0F;
}
return 0.0F;
@ -72,11 +72,11 @@ public class ItemFrequencyTransmitter extends Item {
public EnumActionResult onItemUse(EntityPlayer player, World world, BlockPos pos,
EnumHand hand, EnumFacing facing, float hitX, float hitY, float hitZ) {
ItemStack stack = player.getHeldItem(hand);
stack.setTagCompound(new NBTTagCompound());
stack.getTagCompound().setInteger("x", pos.getX());
stack.getTagCompound().setInteger("y", pos.getY());
stack.getTagCompound().setInteger("z", pos.getZ());
stack.getTagCompound().setInteger("dim", world.provider.getDimension());
stack.setTag(new NBTTagCompound());
stack.getTag().setInt("x", pos.getX());
stack.getTag().setInt("y", pos.getY());
stack.getTag().setInt("z", pos.getZ());
stack.getTag().setInt("dim", world.provider.getDimension());
if (!world.isRemote) {
ChatUtils.sendNoSpamMessages(MessageIDs.freqTransmitterID, new TextComponentString(
@ -98,7 +98,7 @@ public class ItemFrequencyTransmitter extends Item {
EnumHand hand) {
ItemStack stack = player.getHeldItem(hand);
if (player.isSneaking()) {
stack.setTagCompound(null);
stack.setTag(null);
if (!world.isRemote) {
ChatUtils.sendNoSpamMessages(MessageIDs.freqTransmitterID, new TextComponentString(
TextFormatting.GRAY + I18n.format("techreborn.message.coordsHaveBeen") + " "
@ -109,16 +109,16 @@ public class ItemFrequencyTransmitter extends Item {
return new ActionResult<>(EnumActionResult.SUCCESS, stack);
}
@SideOnly(Side.CLIENT)
@OnlyIn(Dist.CLIENT)
@Override
public void addInformation(ItemStack stack,
@Nullable
World worldIn, List<String> tooltip, ITooltipFlag flagIn) {
if (stack.hasTagCompound() && stack.getTagCompound() != null && stack.getTagCompound().hasKey("x") && stack.getTagCompound().hasKey("y") && stack.getTagCompound().hasKey("z") && stack.getTagCompound().hasKey("dim")) {
int x = stack.getTagCompound().getInteger("x");
int y = stack.getTagCompound().getInteger("y");
int z = stack.getTagCompound().getInteger("z");
int dim = stack.getTagCompound().getInteger("dim");
if (stack.hasTag() && stack.getTag() != null && stack.getTag().hasKey("x") && stack.getTag().hasKey("y") && stack.getTag().hasKey("z") && stack.getTag().hasKey("dim")) {
int x = stack.getTag().getInt("x");
int y = stack.getTag().getInt("y");
int z = stack.getTag().getInt("z");
int dim = stack.getTag().getInt("dim");
tooltip.add(TextFormatting.GRAY + "X: " + TextFormatting.GOLD + x);
tooltip.add(TextFormatting.GRAY + "Y: " + TextFormatting.GOLD + y);
@ -141,11 +141,11 @@ public class ItemFrequencyTransmitter extends Item {
TextFormatting gold = TextFormatting.GOLD;
TextFormatting grey = TextFormatting.GRAY;
if (stack.getItem() instanceof ItemFrequencyTransmitter) {
if (stack.hasTagCompound() && stack.getTagCompound() != null && stack.getTagCompound().hasKey("x") && stack.getTagCompound().hasKey("y") && stack.getTagCompound().hasKey("z") && stack.getTagCompound().hasKey("dim")) {
int coordX = stack.getTagCompound().getInteger("x");
int coordY = stack.getTagCompound().getInteger("y");
int coordZ = stack.getTagCompound().getInteger("z");
int coordDim = stack.getTagCompound().getInteger("dim");
if (stack.hasTag() && stack.getTag() != null && stack.getTag().hasKey("x") && stack.getTag().hasKey("y") && stack.getTag().hasKey("z") && stack.getTag().hasKey("dim")) {
int coordX = stack.getTag().getInt("x");
int coordY = stack.getTag().getInt("y");
int coordZ = stack.getTag().getInt("z");
int coordDim = stack.getTag().getInt("dim");
text = grey + "X: " + gold + coordX + grey + " Y: " + gold + coordY + grey + " Z: " + gold + coordZ + grey + " Dim: " + gold + DimensionManager.getProviderType(coordDim).getName() + " (" + coordDim + ")";
} else {
text = grey + I18n.format("techreborn.message.noCoordsSet");

View file

@ -33,10 +33,10 @@ import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.util.NonNullList;
import net.minecraft.world.World;
import net.minecraftforge.api.distmarker.Dist;
import net.minecraftforge.api.distmarker.OnlyIn;
import net.minecraftforge.common.capabilities.ICapabilityProvider;
import net.minecraftforge.energy.IEnergyStorage;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
import reborncore.api.power.IEnergyItemInfo;
import reborncore.common.powerSystem.PowerSystem;
import reborncore.common.powerSystem.PoweredItemContainerProvider;
@ -66,7 +66,7 @@ public class ItemCloakingDevice extends ItemTRArmour implements IEnergyItemInfo
// Item
@Override
@SideOnly(Side.CLIENT)
@OnlyIn(Dist.CLIENT)
public String getArmorTexture(ItemStack stack, Entity entity, EntityEquipmentSlot slot, String type) {
return "techreborn:" + "textures/models/cloaking.png";
}
@ -84,7 +84,7 @@ public class ItemCloakingDevice extends ItemTRArmour implements IEnergyItemInfo
}
}
@SideOnly(Side.CLIENT)
@OnlyIn(Dist.CLIENT)
@Override
public void getSubItems(CreativeTabs par2CreativeTabs, NonNullList<ItemStack> itemList) {
if (!isInCreativeTab(par2CreativeTabs)) {

View file

@ -33,9 +33,9 @@ import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.util.NonNullList;
import net.minecraft.world.World;
import net.minecraftforge.api.distmarker.Dist;
import net.minecraftforge.api.distmarker.OnlyIn;
import net.minecraftforge.common.capabilities.ICapabilityProvider;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
import reborncore.api.power.IEnergyItemInfo;
import reborncore.common.powerSystem.PowerSystem;
import reborncore.common.powerSystem.PoweredItemContainerProvider;
@ -58,7 +58,7 @@ public class ItemLapotronicOrbpack extends ItemArmor implements IEnergyItemInfo
}
// Item
@SideOnly(Side.CLIENT)
@OnlyIn(Dist.CLIENT)
@Override
public void getSubItems(CreativeTabs par2CreativeTabs, NonNullList<ItemStack> itemList) {
if (!isInCreativeTab(par2CreativeTabs)) {
@ -101,7 +101,7 @@ public class ItemLapotronicOrbpack extends ItemArmor implements IEnergyItemInfo
}
@Override
@SideOnly(Side.CLIENT)
@OnlyIn(Dist.CLIENT)
public String getArmorTexture(ItemStack stack, Entity entity, EntityEquipmentSlot slot, String type) {
return "techreborn:" + "textures/models/lapotronpack.png";
}

View file

@ -33,9 +33,9 @@ import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.util.NonNullList;
import net.minecraft.world.World;
import net.minecraftforge.api.distmarker.Dist;
import net.minecraftforge.api.distmarker.OnlyIn;
import net.minecraftforge.common.capabilities.ICapabilityProvider;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
import reborncore.api.power.IEnergyItemInfo;
import reborncore.common.powerSystem.ExternalPowerSystems;
import reborncore.common.powerSystem.PowerSystem;
@ -102,12 +102,12 @@ public class ItemLithiumIonBatpack extends ItemArmor implements IEnergyItemInfo
}
@Override
@SideOnly(Side.CLIENT)
@OnlyIn(Dist.CLIENT)
public String getArmorTexture(ItemStack stack, Entity entity, EntityEquipmentSlot slot, String type) {
return "techreborn:" + "textures/models/lithiumbatpack.png";
}
@SideOnly(Side.CLIENT)
@OnlyIn(Dist.CLIENT)
@Override
public void getSubItems(CreativeTabs par2CreativeTabs, NonNullList<ItemStack> itemList) {
if (!isInCreativeTab(par2CreativeTabs)) {

View file

@ -31,9 +31,9 @@ import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.util.ResourceLocation;
import net.minecraft.world.World;
import net.minecraftforge.api.distmarker.Dist;
import net.minecraftforge.api.distmarker.OnlyIn;
import net.minecraftforge.common.capabilities.ICapabilityProvider;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
import reborncore.api.power.IEnergyItemInfo;
import reborncore.common.powerSystem.PowerSystem;
import reborncore.common.powerSystem.PoweredItemContainerProvider;
@ -55,7 +55,7 @@ public class ItemBattery extends Item implements IEnergyItemInfo {
this.maxTransfer = maxTransfer;
this.addPropertyOverride(new ResourceLocation("techreborn:empty"), new IItemPropertyGetter() {
@Override
@SideOnly(Side.CLIENT)
@OnlyIn(Dist.CLIENT)
public float apply(ItemStack stack, @Nullable World worldIn, @Nullable EntityLivingBase entityIn) {
if (!stack.isEmpty() && new ForgePowerItemManager(stack).getEnergyStored() == 0) {
return 1.0F;

View file

@ -27,8 +27,8 @@ package techreborn.items.battery;
import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.item.ItemStack;
import net.minecraft.util.NonNullList;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
import net.minecraftforge.api.distmarker.Dist;
import net.minecraftforge.api.distmarker.OnlyIn;
import reborncore.common.powerSystem.forge.ForgePowerItemManager;
import techreborn.config.ConfigTechReborn;
import techreborn.init.TRContent;
@ -40,7 +40,7 @@ public class ItemEnergyCrystal extends ItemBattery {
super(ConfigTechReborn.EnergyCrystalMaxCharge, 1_000);
}
@SideOnly(Side.CLIENT)
@OnlyIn(Dist.CLIENT)
@Override
public void getSubItems(CreativeTabs par2CreativeTabs, NonNullList<ItemStack> itemList) {
if (!isInCreativeTab(par2CreativeTabs)) {

View file

@ -27,8 +27,8 @@ package techreborn.items.battery;
import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.item.ItemStack;
import net.minecraft.util.NonNullList;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
import net.minecraftforge.api.distmarker.Dist;
import net.minecraftforge.api.distmarker.OnlyIn;
import reborncore.common.powerSystem.forge.ForgePowerItemManager;
import techreborn.config.ConfigTechReborn;
import techreborn.init.TRContent;
@ -40,7 +40,7 @@ public class ItemLapotronCrystal extends ItemBattery {
super(ConfigTechReborn.LapotronCrystalMaxCharge, 10_000);
}
@SideOnly(Side.CLIENT)
@OnlyIn(Dist.CLIENT)
@Override
public void getSubItems(CreativeTabs par2CreativeTabs, NonNullList<ItemStack> itemList) {
if (!isInCreativeTab(par2CreativeTabs)) {

View file

@ -27,8 +27,8 @@ package techreborn.items.battery;
import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.item.ItemStack;
import net.minecraft.util.NonNullList;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
import net.minecraftforge.api.distmarker.Dist;
import net.minecraftforge.api.distmarker.OnlyIn;
import reborncore.common.powerSystem.forge.ForgePowerItemManager;
import techreborn.config.ConfigTechReborn;
import techreborn.init.TRContent;
@ -40,7 +40,7 @@ public class ItemLapotronicOrb extends ItemBattery {
super(ConfigTechReborn.LapotronicOrbMaxCharge, 100_000);
}
@SideOnly(Side.CLIENT)
@OnlyIn(Dist.CLIENT)
@Override
public void getSubItems(CreativeTabs par2CreativeTabs, NonNullList<ItemStack> itemList) {
if (!isInCreativeTab(par2CreativeTabs)) {

View file

@ -27,8 +27,8 @@ package techreborn.items.battery;
import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.item.ItemStack;
import net.minecraft.util.NonNullList;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
import net.minecraftforge.api.distmarker.Dist;
import net.minecraftforge.api.distmarker.OnlyIn;
import reborncore.common.powerSystem.forge.ForgePowerItemManager;
import techreborn.init.TRContent;
@ -39,7 +39,7 @@ public class ItemLithiumIonBattery extends ItemBattery {
super(400_000, 1_000);
}
@SideOnly(Side.CLIENT)
@OnlyIn(Dist.CLIENT)
@Override
public void getSubItems(CreativeTabs par2CreativeTabs, NonNullList<ItemStack> itemList) {
if (!isInCreativeTab(par2CreativeTabs)) {

View file

@ -27,8 +27,8 @@ package techreborn.items.battery;
import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.item.ItemStack;
import net.minecraft.util.NonNullList;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
import net.minecraftforge.api.distmarker.Dist;
import net.minecraftforge.api.distmarker.OnlyIn;
import reborncore.common.powerSystem.forge.ForgePowerItemManager;
import techreborn.init.TRContent;
@ -39,7 +39,7 @@ public class ItemRedCellBattery extends ItemBattery {
super(40_000, 100);
}
@SideOnly(Side.CLIENT)
@OnlyIn(Dist.CLIENT)
@Override
public void getSubItems(CreativeTabs par2CreativeTabs, NonNullList<ItemStack> itemList) {
if (!isInCreativeTab(par2CreativeTabs)) {

View file

@ -36,9 +36,9 @@ import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.util.ResourceLocation;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.World;
import net.minecraftforge.api.distmarker.Dist;
import net.minecraftforge.api.distmarker.OnlyIn;
import net.minecraftforge.common.capabilities.ICapabilityProvider;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
import reborncore.api.power.IEnergyItemInfo;
import reborncore.common.powerSystem.ExternalPowerSystems;
import reborncore.common.powerSystem.PowerSystem;
@ -66,7 +66,7 @@ public class ItemChainsaw extends ItemAxe implements IEnergyItemInfo {
this.addPropertyOverride(new ResourceLocation("techreborn", "animated"), new IItemPropertyGetter() {
@Override
@SideOnly(Side.CLIENT)
@OnlyIn(Dist.CLIENT)
public float apply(ItemStack stack, @Nullable World worldIn, @Nullable EntityLivingBase entityIn) {
if (!stack.isEmpty() && new ForgePowerItemManager(stack).getEnergyStored() >= cost
&& entityIn != null && entityIn.getHeldItemMainhand().equals(stack)) {

View file

@ -30,8 +30,8 @@ import net.minecraft.item.ItemStack;
import net.minecraft.util.EnumFacing;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.World;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
import net.minecraftforge.api.distmarker.Dist;
import net.minecraftforge.api.distmarker.OnlyIn;
import reborncore.api.IToolHandler;
/**
@ -44,7 +44,7 @@ public class ItemWrench extends Item implements IToolHandler {
}
@Override
@SideOnly(Side.CLIENT)
@OnlyIn(Dist.CLIENT)
public boolean isFull3D() {
return true;
}

View file

@ -29,8 +29,8 @@ import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.init.Items;
import net.minecraft.item.ItemStack;
import net.minecraft.util.NonNullList;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
import net.minecraftforge.api.distmarker.Dist;
import net.minecraftforge.api.distmarker.OnlyIn;
import reborncore.common.powerSystem.forge.ForgePowerItemManager;
import techreborn.config.ConfigTechReborn;
import techreborn.init.TRContent;
@ -45,7 +45,7 @@ public class ItemAdvancedChainsaw extends ItemChainsaw {
this.transferLimit = 1000;
}
@SideOnly(Side.CLIENT)
@OnlyIn(Dist.CLIENT)
@Override
public void getSubItems(CreativeTabs par2CreativeTabs, NonNullList<ItemStack> itemList) {
if (!isInCreativeTab(par2CreativeTabs)) {

View file

@ -29,8 +29,8 @@ import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.init.Items;
import net.minecraft.item.ItemStack;
import net.minecraft.util.NonNullList;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
import net.minecraftforge.api.distmarker.Dist;
import net.minecraftforge.api.distmarker.OnlyIn;
import reborncore.common.powerSystem.forge.ForgePowerItemManager;
import techreborn.config.ConfigTechReborn;
import techreborn.init.TRContent;
@ -45,7 +45,7 @@ public class ItemAdvancedDrill extends ItemDrill {
this.transferLimit = 1000;
}
@SideOnly(Side.CLIENT)
@OnlyIn(Dist.CLIENT)
@Override
public void getSubItems(CreativeTabs par2CreativeTabs, NonNullList<ItemStack> itemList) {
if (!isInCreativeTab(par2CreativeTabs)) {

View file

@ -27,8 +27,8 @@ package techreborn.items.tool.advanced;
import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.item.ItemStack;
import net.minecraft.util.NonNullList;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
import net.minecraftforge.api.distmarker.Dist;
import net.minecraftforge.api.distmarker.OnlyIn;
import reborncore.common.powerSystem.forge.ForgePowerItemManager;
import techreborn.config.ConfigTechReborn;
import techreborn.init.TRContent;
@ -44,7 +44,7 @@ public class ItemAdvancedJackhammer extends ItemJackhammer {
this.transferLimit = 1000;
}
@SideOnly(Side.CLIENT)
@OnlyIn(Dist.CLIENT)
@Override
public void getSubItems(CreativeTabs par2CreativeTabs, NonNullList<ItemStack> itemList) {
if (!isInCreativeTab(par2CreativeTabs)) {

View file

@ -37,9 +37,9 @@ import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.util.NonNullList;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.World;
import net.minecraftforge.api.distmarker.Dist;
import net.minecraftforge.api.distmarker.OnlyIn;
import net.minecraftforge.common.capabilities.ICapabilityProvider;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
import reborncore.api.power.IEnergyItemInfo;
import reborncore.common.powerSystem.ExternalPowerSystems;
import reborncore.common.powerSystem.PowerSystem;
@ -143,7 +143,7 @@ public class ItemRockCutter extends ItemPickaxe implements IEnergyItemInfo {
return !(newStack.isItemEqual(oldStack));
}
@SideOnly(Side.CLIENT)
@OnlyIn(Dist.CLIENT)
@Override
public void getSubItems(CreativeTabs par2CreativeTabs, NonNullList<ItemStack> itemList) {
if (!isInCreativeTab(par2CreativeTabs)) {

View file

@ -29,8 +29,8 @@ import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.init.Items;
import net.minecraft.item.ItemStack;
import net.minecraft.util.NonNullList;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
import net.minecraftforge.api.distmarker.Dist;
import net.minecraftforge.api.distmarker.OnlyIn;
import reborncore.common.powerSystem.forge.ForgePowerItemManager;
import techreborn.config.ConfigTechReborn;
import techreborn.init.TRContent;
@ -43,7 +43,7 @@ public class ItemBasicChainsaw extends ItemChainsaw {
this.cost = 50;
}
@SideOnly(Side.CLIENT)
@OnlyIn(Dist.CLIENT)
@Override
public void getSubItems(
CreativeTabs par2CreativeTabs, NonNullList<ItemStack> itemList) {

View file

@ -29,8 +29,8 @@ import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.init.Items;
import net.minecraft.item.ItemStack;
import net.minecraft.util.NonNullList;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
import net.minecraftforge.api.distmarker.Dist;
import net.minecraftforge.api.distmarker.OnlyIn;
import reborncore.common.powerSystem.forge.ForgePowerItemManager;
import techreborn.config.ConfigTechReborn;
import techreborn.init.TRContent;
@ -43,7 +43,7 @@ public class ItemBasicDrill extends ItemDrill {
this.cost = 50;
}
@SideOnly(Side.CLIENT)
@OnlyIn(Dist.CLIENT)
@Override
public void getSubItems(
CreativeTabs par2CreativeTabs, NonNullList<ItemStack> itemList) {

View file

@ -27,8 +27,8 @@ package techreborn.items.tool.basic;
import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.item.ItemStack;
import net.minecraft.util.NonNullList;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
import net.minecraftforge.api.distmarker.Dist;
import net.minecraftforge.api.distmarker.OnlyIn;
import reborncore.common.powerSystem.forge.ForgePowerItemManager;
import techreborn.config.ConfigTechReborn;
import techreborn.init.TRContent;
@ -42,7 +42,7 @@ public class ItemBasicJackhammer extends ItemJackhammer {
this.efficiency = 12F;
}
@SideOnly(Side.CLIENT)
@OnlyIn(Dist.CLIENT)
@Override
public void getSubItems(CreativeTabs par2CreativeTabs, NonNullList<ItemStack> itemList) {
if (!isInCreativeTab(par2CreativeTabs)) {

View file

@ -36,9 +36,9 @@ import net.minecraft.util.EnumHand;
import net.minecraft.util.NonNullList;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.World;
import net.minecraftforge.api.distmarker.Dist;
import net.minecraftforge.api.distmarker.OnlyIn;
import net.minecraftforge.common.capabilities.ICapabilityProvider;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
import reborncore.api.power.IEnergyItemInfo;
import reborncore.common.powerSystem.ExternalPowerSystems;
import reborncore.common.powerSystem.PowerSystem;
@ -99,7 +99,7 @@ public class ItemElectricTreetap extends Item implements IEnergyItemInfo {
return new PoweredItemContainerProvider(stack);
}
@SideOnly(Side.CLIENT)
@OnlyIn(Dist.CLIENT)
@Override
public void getSubItems(CreativeTabs par2CreativeTabs, NonNullList<ItemStack> itemList) {
if (!isInCreativeTab(par2CreativeTabs)) {

View file

@ -33,8 +33,8 @@ import net.minecraft.item.ItemStack;
import net.minecraft.util.NonNullList;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.World;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
import net.minecraftforge.api.distmarker.Dist;
import net.minecraftforge.api.distmarker.OnlyIn;
import reborncore.common.powerSystem.ExternalPowerSystems;
import reborncore.common.powerSystem.forge.ForgePowerItemManager;
import techreborn.config.ConfigTechReborn;
@ -49,8 +49,8 @@ public class ItemIndustrialChainsaw extends ItemChainsaw {
this.cost = 250;
this.transferLimit = 1000;
}
@SideOnly(Side.CLIENT)
@OnlyIn(Dist.CLIENT)
@Override
public void getSubItems(CreativeTabs par2CreativeTabs, NonNullList<ItemStack> itemList) {
if (!isInCreativeTab(par2CreativeTabs)) {

View file

@ -36,8 +36,8 @@ import net.minecraft.util.NonNullList;
import net.minecraft.util.math.BlockPos;
import net.minecraft.util.math.RayTraceResult;
import net.minecraft.world.World;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
import net.minecraftforge.api.distmarker.Dist;
import net.minecraftforge.api.distmarker.OnlyIn;
import reborncore.common.powerSystem.ExternalPowerSystems;
import reborncore.common.powerSystem.forge.ForgePowerItemManager;
import techreborn.config.ConfigTechReborn;
@ -155,7 +155,7 @@ public class ItemIndustrialDrill extends ItemDrill {
}
// Item
@SideOnly(Side.CLIENT)
@OnlyIn(Dist.CLIENT)
@Override
public void getSubItems(CreativeTabs par2CreativeTabs, NonNullList<ItemStack> itemList) {
if (!isInCreativeTab(par2CreativeTabs)) {

View file

@ -27,8 +27,8 @@ package techreborn.items.tool.industrial;
import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.item.ItemStack;
import net.minecraft.util.NonNullList;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
import net.minecraftforge.api.distmarker.Dist;
import net.minecraftforge.api.distmarker.OnlyIn;
import reborncore.common.powerSystem.forge.ForgePowerItemManager;
import techreborn.config.ConfigTechReborn;
import techreborn.init.TRContent;
@ -44,7 +44,7 @@ public class ItemIndustrialJackhammer extends ItemJackhammer {
this.transferLimit = 1000;
}
@SideOnly(Side.CLIENT)
@OnlyIn(Dist.CLIENT)
@Override
public void getSubItems(
CreativeTabs par2CreativeTabs, NonNullList<ItemStack> itemList) {

View file

@ -43,9 +43,9 @@ import net.minecraft.util.*;
import net.minecraft.util.text.TextComponentString;
import net.minecraft.util.text.TextFormatting;
import net.minecraft.world.World;
import net.minecraftforge.api.distmarker.Dist;
import net.minecraftforge.api.distmarker.OnlyIn;
import net.minecraftforge.common.capabilities.ICapabilityProvider;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
import reborncore.api.power.IEnergyItemInfo;
import reborncore.common.powerSystem.ExternalPowerSystems;
import reborncore.common.powerSystem.PowerSystem;
@ -72,7 +72,7 @@ public class ItemNanosaber extends ItemSword implements IEnergyItemInfo {
setMaxStackSize(1);
this.addPropertyOverride(new ResourceLocation("techreborn:active"), new IItemPropertyGetter() {
@Override
@SideOnly(Side.CLIENT)
@OnlyIn(Dist.CLIENT)
public float apply(ItemStack stack,
@Nullable
World worldIn,
@ -132,10 +132,10 @@ public class ItemNanosaber extends ItemSword implements IEnergyItemInfo {
.format("techreborn.message.nanosaberActivate")));
} else {
if (!ItemUtils.isActive(stack)) {
if (stack.getTagCompound() == null) {
stack.setTagCompound(new NBTTagCompound());
if (stack.getTag() == null) {
stack.setTag(new NBTTagCompound());
}
stack.getTagCompound().setBoolean("isActive", true);
stack.getTag().setBoolean("isActive", true);
if (world.isRemote) {
ChatUtils.sendNoSpamMessages(MessageIDs.nanosaberID, new TextComponentString(
TextFormatting.GRAY + I18n.format("techreborn.message.setTo") + " "
@ -143,7 +143,7 @@ public class ItemNanosaber extends ItemSword implements IEnergyItemInfo {
.format("techreborn.message.nanosaberActive")));
}
} else {
stack.getTagCompound().setBoolean("isActive", false);
stack.getTag().setBoolean("isActive", false);
if (world.isRemote) {
ChatUtils.sendNoSpamMessages(MessageIDs.nanosaberID, new TextComponentString(
TextFormatting.GRAY + I18n.format("techreborn.message.setTo") + " "
@ -166,7 +166,7 @@ public class ItemNanosaber extends ItemSword implements IEnergyItemInfo {
+ TextFormatting.GOLD + I18n
.format("techreborn.message.nanosaberDeactivating")));
}
stack.getTagCompound().setBoolean("isActive", false);
stack.getTag().setBoolean("isActive", false);
}
}
@ -198,7 +198,7 @@ public class ItemNanosaber extends ItemSword implements IEnergyItemInfo {
return new PoweredItemContainerProvider(stack);
}
@SideOnly(Side.CLIENT)
@OnlyIn(Dist.CLIENT)
@Override
public void getSubItems(
CreativeTabs par2CreativeTabs, NonNullList<ItemStack> itemList) {
@ -206,18 +206,18 @@ public class ItemNanosaber extends ItemSword implements IEnergyItemInfo {
return;
}
ItemStack inactiveUncharged = new ItemStack(this);
inactiveUncharged.setTagCompound(new NBTTagCompound());
inactiveUncharged.getTagCompound().setBoolean("isActive", false);
inactiveUncharged.setTag(new NBTTagCompound());
inactiveUncharged.getTag().setBoolean("isActive", false);
ItemStack inactiveCharged = new ItemStack(TRContent.NANOSABER);
inactiveCharged.setTagCompound(new NBTTagCompound());
inactiveCharged.getTagCompound().setBoolean("isActive", false);
inactiveCharged.setTag(new NBTTagCompound());
inactiveCharged.getTag().setBoolean("isActive", false);
ForgePowerItemManager capEnergy = new ForgePowerItemManager(inactiveCharged);
capEnergy.setEnergyStored(capEnergy.getMaxEnergyStored());
ItemStack activeCharged = new ItemStack(TRContent.NANOSABER);
activeCharged.setTagCompound(new NBTTagCompound());
activeCharged.getTagCompound().setBoolean("isActive", true);
activeCharged.setTag(new NBTTagCompound());
activeCharged.getTag().setBoolean("isActive", true);
ForgePowerItemManager capEnergy2 = new ForgePowerItemManager(activeCharged);
capEnergy2.setEnergyStored(capEnergy2.getMaxEnergyStored());
@ -226,7 +226,7 @@ public class ItemNanosaber extends ItemSword implements IEnergyItemInfo {
itemList.add(activeCharged);
}
@SideOnly(Side.CLIENT)
@OnlyIn(Dist.CLIENT)
@Override
public void addInformation(ItemStack stack,
@Nullable

View file

@ -37,9 +37,9 @@ import net.minecraft.util.*;
import net.minecraft.util.math.BlockPos;
import net.minecraft.util.text.TextFormatting;
import net.minecraft.world.World;
import net.minecraftforge.api.distmarker.Dist;
import net.minecraftforge.api.distmarker.OnlyIn;
import net.minecraftforge.common.capabilities.ICapabilityProvider;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
import reborncore.api.power.IEnergyItemInfo;
import reborncore.common.powerSystem.ExternalPowerSystems;
import reborncore.common.powerSystem.PowerSystem;
@ -157,8 +157,8 @@ public class ItemOmniTool extends ItemPickaxe implements IEnergyItemInfo {
public ICapabilityProvider initCapabilities(ItemStack stack, @Nullable NBTTagCompound nbt) {
return new PoweredItemContainerProvider(stack);
}
@SideOnly(Side.CLIENT)
@OnlyIn(Dist.CLIENT)
@Override
public void getSubItems(
CreativeTabs par2CreativeTabs, NonNullList<ItemStack> itemList) {

View file

@ -26,8 +26,8 @@ package techreborn.items.tool.vanilla;
import net.minecraft.item.ItemHoe;
import net.minecraft.item.ItemStack;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
import net.minecraftforge.api.distmarker.Dist;
import net.minecraftforge.api.distmarker.OnlyIn;
import reborncore.common.util.ItemUtils;
public class ItemTRHoe extends ItemHoe {
@ -44,7 +44,7 @@ public class ItemTRHoe extends ItemHoe {
}
@Override
@SideOnly(Side.CLIENT)
@OnlyIn(Dist.CLIENT)
public boolean isFull3D() {
return true;
}