Remove old jsondestroyer things

This commit is contained in:
ProfessorProspector 2016-12-11 23:03:51 -08:00
parent a681fe4be6
commit 0273a619f1
10 changed files with 19 additions and 198 deletions

View file

@ -1,7 +1,5 @@
package techreborn.items.armor;
import me.modmuss50.jsonDestroyer.api.ITexturedItem;
import net.minecraft.client.renderer.block.model.ModelResourceLocation;
import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.entity.Entity;
import net.minecraft.entity.player.EntityPlayer;
@ -13,16 +11,14 @@ import net.minecraft.util.NonNullList;
import net.minecraft.world.World;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
import reborncore.RebornCore;
import reborncore.api.power.IEnergyItemInfo;
import reborncore.common.powerSystem.PowerSystem;
import reborncore.common.powerSystem.PoweredItem;
import techreborn.client.TechRebornCreativeTab;
import techreborn.config.ConfigTechReborn;
import techreborn.init.ModItems;
import techreborn.lib.ModInfo;
public class ItemLapotronPack extends ItemArmor implements IEnergyItemInfo, ITexturedItem {
public class ItemLapotronPack extends ItemArmor implements IEnergyItemInfo {
public static final int maxCharge = ConfigTechReborn.LapotronPackCharge;
public static final int tier = ConfigTechReborn.LapotronPackTier;
@ -33,7 +29,6 @@ public class ItemLapotronPack extends ItemArmor implements IEnergyItemInfo, ITex
setCreativeTab(TechRebornCreativeTab.instance);
setUnlocalizedName("techreborn.lapotronpack");
setMaxStackSize(1);
RebornCore.jsonDestroyer.registerObject(this);
}
@Override
@ -114,20 +109,4 @@ public class ItemLapotronPack extends ItemArmor implements IEnergyItemInfo, ITex
return true;
}
@Override
public String getTextureName(int damage) {
return "techreborn:items/tool/lapotronicPack";
}
@Override
public int getMaxMeta() {
return 1;
}
@Override
@SideOnly(Side.CLIENT)
public ModelResourceLocation getModel(ItemStack stack, EntityPlayer player, int useRemaining) {
return new ModelResourceLocation(ModInfo.MOD_ID + ":" + getUnlocalizedName(stack).substring(5), "inventory");
}
}

View file

@ -1,7 +1,5 @@
package techreborn.items.armor;
import me.modmuss50.jsonDestroyer.api.ITexturedItem;
import net.minecraft.client.renderer.block.model.ModelResourceLocation;
import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.entity.Entity;
import net.minecraft.entity.player.EntityPlayer;
@ -20,9 +18,8 @@ import reborncore.common.powerSystem.PoweredItem;
import techreborn.client.TechRebornCreativeTab;
import techreborn.config.ConfigTechReborn;
import techreborn.init.ModItems;
import techreborn.lib.ModInfo;
public class ItemLithiumBatpack extends ItemArmor implements IEnergyItemInfo, ITexturedItem {
public class ItemLithiumBatpack extends ItemArmor implements IEnergyItemInfo {
public static final int maxCharge = ConfigTechReborn.LithiumBatpackCharge;
public static final int tier = ConfigTechReborn.LithiumBatpackTier;
@ -114,20 +111,4 @@ public class ItemLithiumBatpack extends ItemArmor implements IEnergyItemInfo, IT
return true;
}
@Override
public String getTextureName(int damage) {
return "techreborn:items/tool/lithiumBatpack";
}
@Override
public int getMaxMeta() {
return 1;
}
@Override
@SideOnly(Side.CLIENT)
public ModelResourceLocation getModel(ItemStack stack, EntityPlayer player, int useRemaining) {
return new ModelResourceLocation(ModInfo.MOD_ID + ":" + getUnlocalizedName(stack).substring(5), "inventory");
}
}

View file

@ -16,9 +16,10 @@ import reborncore.common.powerSystem.PoweredItem;
import techreborn.client.TechRebornCreativeTab;
import techreborn.config.ConfigTechReborn;
import techreborn.init.ModItems;
import techreborn.items.ItemTRNoDestroy;
import techreborn.items.ItemTextureBase;
public class ItemCloakingDevice extends ItemTextureBase implements IEnergyItemInfo {
public class ItemCloakingDevice extends ItemTRNoDestroy implements IEnergyItemInfo {
public static int Teir = ConfigTechReborn.CloakingDeviceTier;
public static int MaxCharge = ConfigTechReborn.CloakingDeviceCharge;
public static int Limit = 100;
@ -105,14 +106,4 @@ public class ItemCloakingDevice extends ItemTextureBase implements IEnergyItemIn
public boolean showDurabilityBar(ItemStack stack) {
return true;
}
@Override
public String getTextureName(int damage) {
return "techreborn:items/tool/cloakingDevice";
}
@Override
public int getMaxMeta() {
return 1;
}
}

View file

@ -1,6 +1,5 @@
package techreborn.items.tools;
import me.modmuss50.jsonDestroyer.api.ITexturedItem;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.EnumActionResult;
@ -13,28 +12,18 @@ import net.minecraft.world.World;
import reborncore.api.power.IEnergyInterfaceTile;
import reborncore.common.powerSystem.PowerSystem;
import techreborn.client.TechRebornCreativeTabMisc;
import techreborn.items.ItemTextureBase;
import techreborn.items.ItemTRNoDestroy;
/**
* Created by Mark on 20/03/2016.
*/
public class ItemDebugTool extends ItemTextureBase implements ITexturedItem {
public class ItemDebugTool extends ItemTRNoDestroy {
public ItemDebugTool() {
setCreativeTab(TechRebornCreativeTabMisc.instance);
setUnlocalizedName("techreborn.debug");
}
@Override
public String getTextureName(int damage) {
return "techreborn:items/misc/debug";
}
@Override
public int getMaxMeta() {
return 1;
}
@Override
public EnumActionResult onItemUse(EntityPlayer playerIn, World worldIn, BlockPos pos,
EnumHand hand, EnumFacing facing, float hitX, float hitY, float hitZ) {

View file

@ -15,12 +15,13 @@ import reborncore.common.powerSystem.PowerSystem;
import reborncore.common.powerSystem.PoweredItem;
import techreborn.client.TechRebornCreativeTab;
import techreborn.init.ModItems;
import techreborn.items.ItemTRNoDestroy;
import techreborn.lib.ModInfo;
/**
* Created by modmuss50 on 05/11/2016.
*/
public class ItemElectricTreetap extends Item implements IEnergyItemInfo, ITexturedItem {
public class ItemElectricTreetap extends ItemTRNoDestroy implements IEnergyItemInfo {
public static final int maxCharge = 5120;
public static final int tier = 1;
@ -31,7 +32,6 @@ public class ItemElectricTreetap extends Item implements IEnergyItemInfo, ITextu
setUnlocalizedName("techreborn.electric_treetap");
setCreativeTab(TechRebornCreativeTab.instance);
setMaxStackSize(1);
RebornCore.jsonDestroyer.registerObject(this);
}
@Override
@ -89,22 +89,4 @@ public class ItemElectricTreetap extends Item implements IEnergyItemInfo, ITextu
public boolean showDurabilityBar(ItemStack stack) {
return true;
}
@Override
public String getTextureName(int damage) {
return "techreborn:items/tool/electricTreetap";
}
@Override
public int getMaxMeta() {
return 1;
}
@Override
@SideOnly(Side.CLIENT)
public ModelResourceLocation getModel(ItemStack stack, EntityPlayer player,
int useRemaining) {
return new ModelResourceLocation(ModInfo.MOD_ID + ":" + getUnlocalizedName(stack).substring(5), "inventory");
}
}

View file

@ -1,8 +1,6 @@
package techreborn.items.tools;
import me.modmuss50.jsonDestroyer.api.ITexturedItem;
import net.minecraft.block.state.IBlockState;
import net.minecraft.client.renderer.block.model.ModelResourceLocation;
import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.entity.EntityLivingBase;
import net.minecraft.entity.player.EntityPlayer;
@ -16,7 +14,6 @@ import net.minecraft.util.text.TextFormatting;
import net.minecraft.world.World;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
import reborncore.RebornCore;
import reborncore.api.power.IEnergyItemInfo;
import reborncore.common.powerSystem.PowerSystem;
import reborncore.common.powerSystem.PoweredItem;
@ -24,11 +21,10 @@ import reborncore.common.util.TorchHelper;
import techreborn.client.TechRebornCreativeTab;
import techreborn.config.ConfigTechReborn;
import techreborn.init.ModItems;
import techreborn.lib.ModInfo;
import java.util.List;
public class ItemOmniTool extends ItemPickaxe implements IEnergyItemInfo, ITexturedItem {
public class ItemOmniTool extends ItemPickaxe implements IEnergyItemInfo {
public static final int maxCharge = ConfigTechReborn.OmniToolCharge;
public static final int tier = ConfigTechReborn.OmniToolTier;
@ -42,7 +38,6 @@ public class ItemOmniTool extends ItemPickaxe implements IEnergyItemInfo, ITextu
setMaxStackSize(1);
setMaxDamage(200);
setUnlocalizedName("techreborn.omniTool");
RebornCore.jsonDestroyer.registerObject(this);
}
@Override
@ -127,7 +122,6 @@ public class ItemOmniTool extends ItemPickaxe implements IEnergyItemInfo, ITextu
return 2;
}
@SuppressWarnings({ "rawtypes", "unchecked" })
@SideOnly(Side.CLIENT)
public void getSubItems(Item item,
@ -152,22 +146,6 @@ public class ItemOmniTool extends ItemPickaxe implements IEnergyItemInfo, ITextu
return true;
}
@Override
public String getTextureName(int damage) {
return "techreborn:items/tool/omnitool";
}
@Override
public int getMaxMeta() {
return 1;
}
@Override
@SideOnly(Side.CLIENT)
public ModelResourceLocation getModel(ItemStack stack, EntityPlayer player, int useRemaining) {
return new ModelResourceLocation(ModInfo.MOD_ID + ":" + getUnlocalizedName(stack).substring(5), "inventory");
}
@Override
public void addInformation(ItemStack stack, EntityPlayer playerIn, List<String> tooltip, boolean advanced) {
tooltip.add(TextFormatting.RED + "WIP Coming Soon");

View file

@ -1,8 +1,6 @@
package techreborn.items.tools;
import me.modmuss50.jsonDestroyer.api.ITexturedItem;
import net.minecraft.block.state.IBlockState;
import net.minecraft.client.renderer.block.model.ModelResourceLocation;
import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.enchantment.Enchantment;
import net.minecraft.enchantment.EnchantmentHelper;
@ -18,19 +16,17 @@ import net.minecraft.util.math.BlockPos;
import net.minecraft.world.World;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
import reborncore.RebornCore;
import reborncore.api.power.IEnergyItemInfo;
import reborncore.common.powerSystem.PowerSystem;
import reborncore.common.powerSystem.PoweredItem;
import techreborn.client.TechRebornCreativeTab;
import techreborn.config.ConfigTechReborn;
import techreborn.init.ModItems;
import techreborn.lib.ModInfo;
import javax.annotation.Nullable;
import java.util.Random;
public class ItemRockCutter extends ItemPickaxe implements IEnergyItemInfo, ITexturedItem {
public class ItemRockCutter extends ItemPickaxe implements IEnergyItemInfo {
public static final int maxCharge = ConfigTechReborn.RockCutterCharge;
public static final int tier = ConfigTechReborn.RockCutterTier;
@ -42,7 +38,6 @@ public class ItemRockCutter extends ItemPickaxe implements IEnergyItemInfo, ITex
setCreativeTab(TechRebornCreativeTab.instance);
setMaxStackSize(1);
efficiencyOnProperMaterial = 16F;
RebornCore.jsonDestroyer.registerObject(this);
}
@Override
@ -125,8 +120,6 @@ public class ItemRockCutter extends ItemPickaxe implements IEnergyItemInfo, ITex
return 2;
}
@SuppressWarnings({ "rawtypes", "unchecked" })
@SideOnly(Side.CLIENT)
public void getSubItems(Item item,
@ -151,21 +144,4 @@ public class ItemRockCutter extends ItemPickaxe implements IEnergyItemInfo, ITex
return true;
}
@Override
public String getTextureName(int damage) {
return "techreborn:items/tool/rockcutter";
}
@Override
public int getMaxMeta() {
return 1;
}
@Override
@SideOnly(Side.CLIENT)
public ModelResourceLocation getModel(ItemStack stack, EntityPlayer player,
int useRemaining) {
return new ModelResourceLocation(ModInfo.MOD_ID + ":" + getUnlocalizedName(stack).substring(5), "inventory");
}
}

View file

@ -1,6 +1,5 @@
package techreborn.items.tools;
import me.modmuss50.jsonDestroyer.api.ITexturedItem;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack;
import net.minecraft.util.ActionResult;
@ -12,11 +11,11 @@ import net.minecraft.world.World;
import techreborn.Core;
import techreborn.client.GuiHandler;
import techreborn.client.TechRebornCreativeTab;
import techreborn.items.ItemTextureBase;
import techreborn.items.ItemTRNoDestroy;
import java.util.List;
public class ItemTechManual extends ItemTextureBase implements ITexturedItem {
public class ItemTechManual extends ItemTRNoDestroy {
public ItemTechManual() {
setCreativeTab(TechRebornCreativeTab.instance);
@ -32,16 +31,6 @@ public class ItemTechManual extends ItemTextureBase implements ITexturedItem {
return new ActionResult<>(EnumActionResult.SUCCESS, player.getHeldItem(hand));
}
@Override
public int getMaxMeta() {
return 1;
}
@Override
public String getTextureName(int damage) {
return "techreborn:items/tool/manual";
}
@Override
public void addInformation(ItemStack stack, EntityPlayer playerIn, List<String> tooltip, boolean advanced) {
tooltip.add(TextFormatting.RED + I18n.translateToLocal("tooltip.wip"));

View file

@ -1,23 +1,15 @@
package techreborn.items.tools;
import me.modmuss50.jsonDestroyer.api.ITexturedItem;
import net.minecraft.client.renderer.block.model.ModelResourceLocation;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
import reborncore.RebornCore;
import techreborn.client.TechRebornCreativeTab;
import techreborn.lib.ModInfo;
import techreborn.items.ItemTRNoDestroy;
public class ItemTreeTap extends Item implements ITexturedItem {
public class ItemTreeTap extends ItemTRNoDestroy {
public ItemTreeTap() {
setMaxStackSize(1);
setMaxDamage(20);
setUnlocalizedName("techreborn.treetap");
RebornCore.jsonDestroyer.registerObject(this);
setCreativeTab(TechRebornCreativeTab.instance);
}
@ -25,20 +17,4 @@ public class ItemTreeTap extends Item implements ITexturedItem {
public boolean showDurabilityBar(ItemStack stack) {
return stack.getMetadata() != 0;
}
@Override
public String getTextureName(int damage) {
return "techreborn:items/tool/treetap";
}
@Override
public int getMaxMeta() {
return 1;
}
@Override
@SideOnly(Side.CLIENT)
public ModelResourceLocation getModel(ItemStack stack, EntityPlayer player, int useRemaining) {
return new ModelResourceLocation(ModInfo.MOD_ID + ":" + getUnlocalizedName(stack).substring(5), "inventory");
}
}

View file

@ -1,10 +1,8 @@
package techreborn.items.tools;
import me.modmuss50.jsonDestroyer.api.ITexturedItem;
import net.minecraft.block.BlockDynamicLiquid;
import net.minecraft.block.BlockStaticLiquid;
import net.minecraft.block.state.IBlockState;
import net.minecraft.client.renderer.block.model.ModelResourceLocation;
import net.minecraft.entity.item.EntityItem;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.init.Blocks;
@ -31,8 +29,7 @@ import techreborn.blocks.storage.BlockEnergyStorage;
import techreborn.client.TechRebornCreativeTabMisc;
import techreborn.compat.CompatManager;
import techreborn.init.ModSounds;
import techreborn.items.ItemTR;
import techreborn.lib.ModInfo;
import techreborn.items.ItemTRNoDestroy;
import techreborn.utils.IC2WrenchHelper;
import java.util.ArrayList;
@ -42,7 +39,7 @@ import java.util.Random;
/**
* Created by modmuss50 on 26/02/2016.
*/
public class ItemWrench extends ItemTR implements ITexturedItem {
public class ItemWrench extends ItemTRNoDestroy {
public ItemWrench() {
setCreativeTab(TechRebornCreativeTabMisc.instance);
@ -78,11 +75,11 @@ public class ItemWrench extends ItemTR implements ITexturedItem {
}
}
IBlockState state = world.getBlockState(pos);
if(state.getBlock() instanceof BlockEnergyStorage){
if (state.getBlock() instanceof BlockEnergyStorage) {
EnumFacing facing = state.getValue(BlockEnergyStorage.FACING);
if(facing.getOpposite() == side){
if (facing.getOpposite() == side) {
facing = side;
} else {
} else {
facing = side.getOpposite();
}
world.setBlockState(pos, state.withProperty(BlockEnergyStorage.FACING, facing));
@ -181,23 +178,6 @@ public class ItemWrench extends ItemTR implements ITexturedItem {
}
}
@Override
public String getTextureName(int damage) {
return "techreborn:items/tool/wrench";
}
@Override
public int getMaxMeta() {
return 1;
}
@Override
@SideOnly(Side.CLIENT)
public ModelResourceLocation getModel(ItemStack stack, EntityPlayer player,
int useRemaining) {
return new ModelResourceLocation(ModInfo.MOD_ID + ":" + getUnlocalizedName(stack).substring(5), "inventory");
}
@SideOnly(Side.CLIENT)
public boolean isFull3D() {
return true;