Squashed commit of the following:

commit 00d9c08c78680aba0310febfce5f42ccdb873eb6
Author: modmuss50 <modmuss50@gmail.com>
Date:   Fri Jan 22 13:38:27 2016 +0000

    Rename to fix spelling issue

commit cf780e5f6dc548b64da8e4e2f24f38377b692c5c
Author: modmuss50 <modmuss50@gmail.com>
Date:   Fri Jan 22 13:27:15 2016 +0000

    Update to new JSON-Destoryer version

commit ef3c8636242a54787d53cef9dda373818030d991
Author: modmuss50 <modmuss50@gmail.com>
Date:   Wed Jan 20 17:27:41 2016 +0000

    Update to new json destroyer
This commit is contained in:
modmuss50 2016-01-22 13:39:20 +00:00
parent 43768b9310
commit 7e7ad74203
21 changed files with 67 additions and 123 deletions

View file

@ -109,7 +109,7 @@ dependencies {
compile "com.github.azanor:baubles:1.1.2.0:deobf@jar" compile "com.github.azanor:baubles:1.1.2.0:deobf@jar"
compile name: "CraftTweaker", version: "1.8.8-3.0.0", classifier: "Dev" compile name: "CraftTweaker", version: "1.8.8-3.0.0", classifier: "Dev"
// shade 'IC2-Classic-API-STANDALONE:IC2-Classic-API-STANDALONE:1.1.0.19-5:api' // shade 'IC2-Classic-API-STANDALONE:IC2-Classic-API-STANDALONE:1.1.0.19-5:api'
deobfCompile 'RebornCore:RebornCore-1.8.9:1.3.1.+:universal' deobfCompile 'RebornCore:RebornCore-1.8.9:1.4.0.+:universal'
deobfCompile "mezz.jei:jei_1.8.9:2.14.0.67" deobfCompile "mezz.jei:jei_1.8.9:2.14.0.67"
testCompile 'junit:junit:4.12' testCompile 'junit:junit:4.12'

View file

@ -16,7 +16,7 @@ public class BlockFusionCoil extends BlockMachineBase {
private final String prefix = "techreborn:blocks/machine/"; private final String prefix = "techreborn:blocks/machine/";
@Override @Override
public String getTextureName(IBlockState blockState, EnumFacing facing) { public String getTextureNameFromState(IBlockState blockState, EnumFacing facing) {
return prefix + "fusion_coil"; return prefix + "fusion_coil";
} }
} }

View file

@ -15,7 +15,7 @@ public class BlockHighlyAdvancedMachine extends BlockMachineBase {
@Override @Override
public String getTextureName(IBlockState blockState, EnumFacing facing) { public String getTextureNameFromState(IBlockState blockState, EnumFacing facing) {
return prefix + "highlyadvancedmachine"; return prefix + "highlyadvancedmachine";
} }

View file

@ -1,5 +1,6 @@
package techreborn.blocks; package techreborn.blocks;
import me.modmuss50.jsonDestroyer.api.ITexturedBlock;
import net.minecraft.block.Block; import net.minecraft.block.Block;
import net.minecraft.block.BlockDynamicLiquid; import net.minecraft.block.BlockDynamicLiquid;
import net.minecraft.block.BlockStaticLiquid; import net.minecraft.block.BlockStaticLiquid;
@ -20,23 +21,17 @@ import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.tileentity.TileEntity; import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.BlockPos; import net.minecraft.util.BlockPos;
import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumFacing;
import net.minecraft.util.MathHelper;
import net.minecraft.world.IBlockAccess; import net.minecraft.world.IBlockAccess;
import net.minecraft.world.World; import net.minecraft.world.World;
import net.minecraftforge.fluids.*; import net.minecraftforge.fluids.*;
import reborncore.api.IBlockTextureProvider;
import reborncore.common.BaseBlock;
import reborncore.common.BaseTileBlock; import reborncore.common.BaseTileBlock;
import techreborn.client.TechRebornCreativeTab; import techreborn.client.TechRebornCreativeTab;
import techreborn.init.ModBlocks; import techreborn.init.ModBlocks;
import techreborn.tiles.TileMachineBase; import techreborn.tiles.TileMachineBase;
import java.util.ArrayList; import java.util.*;
import java.util.Iterator;
import java.util.List;
import java.util.Random;
public abstract class BlockMachineBase extends BaseTileBlock implements IBlockTextureProvider { public abstract class BlockMachineBase extends BaseTileBlock implements ITexturedBlock {
public static PropertyDirection FACING = PropertyDirection.create("facing", EnumFacing.Plane.HORIZONTAL); public static PropertyDirection FACING = PropertyDirection.create("facing", EnumFacing.Plane.HORIZONTAL);
public static PropertyBool ACTIVE = PropertyBool.create("active"); public static PropertyBool ACTIVE = PropertyBool.create("active");
@ -328,7 +323,7 @@ public abstract class BlockMachineBase extends BaseTileBlock implements IBlockTe
} }
@Override @Override
public String getTextureName(IBlockState blockState, EnumFacing facing) { public String getTextureNameFromState(IBlockState blockState, EnumFacing facing) {
if(this instanceof IRotationTexture){ if(this instanceof IRotationTexture){
IRotationTexture rotationTexture = (IRotationTexture) this; IRotationTexture rotationTexture = (IRotationTexture) this;
if(getFacing(blockState) == facing){ if(getFacing(blockState) == facing){
@ -395,7 +390,7 @@ public abstract class BlockMachineBase extends BaseTileBlock implements IBlockTe
} }
@Override @Override
public int amountOfVariants() { public int amountOfSates() {
return 8; //0-3 off nsew, 4-8 on nsew return 8; //0-3 off nsew, 4-8 on nsew
} }

View file

@ -1,5 +1,6 @@
package techreborn.blocks; package techreborn.blocks;
import me.modmuss50.jsonDestroyer.api.ITexturedBlock;
import net.minecraft.block.Block; import net.minecraft.block.Block;
import net.minecraft.block.material.Material; import net.minecraft.block.material.Material;
import net.minecraft.block.properties.PropertyInteger; import net.minecraft.block.properties.PropertyInteger;
@ -15,7 +16,6 @@ import net.minecraft.world.IBlockAccess;
import net.minecraft.world.World; import net.minecraft.world.World;
import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly; import net.minecraftforge.fml.relauncher.SideOnly;
import reborncore.api.IBlockTextureProvider;
import reborncore.common.multiblock.BlockMultiblockBase; import reborncore.common.multiblock.BlockMultiblockBase;
import techreborn.client.TechRebornCreativeTab; import techreborn.client.TechRebornCreativeTab;
import techreborn.tiles.TileMachineCasing; import techreborn.tiles.TileMachineCasing;
@ -23,7 +23,7 @@ import techreborn.tiles.TileMachineCasing;
import java.util.List; import java.util.List;
import java.util.Random; import java.util.Random;
public class BlockMachineCasing extends BlockMultiblockBase implements IBlockTextureProvider{ public class BlockMachineCasing extends BlockMultiblockBase implements ITexturedBlock {
public static final String[] types = new String[] public static final String[] types = new String[]
{"standard", "reinforced", "advanced"}; {"standard", "reinforced", "advanced"};
@ -100,12 +100,12 @@ public class BlockMachineCasing extends BlockMultiblockBase implements IBlockTex
} }
@Override @Override
public String getTextureName(IBlockState blockState, EnumFacing facing) { public String getTextureNameFromState(IBlockState blockState, EnumFacing facing) {
return "techreborn:blocks/machine/casing" + types[getMetaFromState(blockState)] + "_full"; return "techreborn:blocks/machine/casing" + types[getMetaFromState(blockState)] + "_full";
} }
@Override @Override
public int amountOfVariants() { public int amountOfSates() {
return types.length; return types.length;
} }

View file

@ -1,6 +1,6 @@
package techreborn.blocks; package techreborn.blocks;
import net.minecraft.block.Block; import me.modmuss50.jsonDestroyer.api.ITexturedBlock;
import net.minecraft.block.material.Material; import net.minecraft.block.material.Material;
import net.minecraft.block.properties.PropertyInteger; import net.minecraft.block.properties.PropertyInteger;
import net.minecraft.block.state.BlockState; import net.minecraft.block.state.BlockState;
@ -11,7 +11,6 @@ import net.minecraft.item.ItemStack;
import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumFacing;
import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly; import net.minecraftforge.fml.relauncher.SideOnly;
import reborncore.api.IBlockTextureProvider;
import reborncore.common.BaseBlock; import reborncore.common.BaseBlock;
import techreborn.client.TechRebornCreativeTab; import techreborn.client.TechRebornCreativeTab;
import techreborn.init.ModBlocks; import techreborn.init.ModBlocks;
@ -19,7 +18,7 @@ import techreborn.init.ModBlocks;
import java.security.InvalidParameterException; import java.security.InvalidParameterException;
import java.util.List; import java.util.List;
public class BlockMachineFrame extends BaseBlock implements IBlockTextureProvider { public class BlockMachineFrame extends BaseBlock implements ITexturedBlock {
public PropertyInteger METADATA; public PropertyInteger METADATA;
public static ItemStack getFrameByName(String name, int count) { public static ItemStack getFrameByName(String name, int count) {
@ -58,12 +57,12 @@ public class BlockMachineFrame extends BaseBlock implements IBlockTextureProvide
} }
@Override @Override
public String getTextureName(IBlockState blockState, EnumFacing facing) { public String getTextureNameFromState(IBlockState blockState, EnumFacing facing) {
return "techreborn:blocks/machine/" + types[getMetaFromState(blockState)] + "_machine_block"; return "techreborn:blocks/machine/" + types[getMetaFromState(blockState)] + "_machine_block";
} }
@Override @Override
public int amountOfVariants() { public int amountOfSates() {
return types.length; return types.length;
} }

View file

@ -1,6 +1,6 @@
package techreborn.blocks; package techreborn.blocks;
import net.minecraft.block.Block; import me.modmuss50.jsonDestroyer.api.ITexturedBlock;
import net.minecraft.block.material.Material; import net.minecraft.block.material.Material;
import net.minecraft.block.properties.PropertyInteger; import net.minecraft.block.properties.PropertyInteger;
import net.minecraft.block.state.BlockState; import net.minecraft.block.state.BlockState;
@ -17,7 +17,6 @@ import net.minecraft.world.IBlockAccess;
import net.minecraft.world.World; import net.minecraft.world.World;
import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly; import net.minecraftforge.fml.relauncher.SideOnly;
import reborncore.api.IBlockTextureProvider;
import reborncore.common.BaseBlock; import reborncore.common.BaseBlock;
import reborncore.common.util.OreDrop; import reborncore.common.util.OreDrop;
import reborncore.common.util.OreDropSet; import reborncore.common.util.OreDropSet;
@ -32,7 +31,7 @@ import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.Random; import java.util.Random;
public class BlockOre extends BaseBlock implements IBlockTextureProvider { public class BlockOre extends BaseBlock implements ITexturedBlock {
public static ItemStack getOreByName(String name, int count) { public static ItemStack getOreByName(String name, int count) {
for (int i = 0; i < types.length; i++) { for (int i = 0; i < types.length; i++) {
@ -163,12 +162,12 @@ public class BlockOre extends BaseBlock implements IBlockTextureProvider {
} }
@Override @Override
public String getTextureName(IBlockState blockState, EnumFacing facing) { public String getTextureNameFromState(IBlockState blockState, EnumFacing facing) {
return "techreborn:blocks/ore/ore" + types[getMetaFromState(blockState)]; return "techreborn:blocks/ore/ore" + types[getMetaFromState(blockState)];
} }
@Override @Override
public int amountOfVariants() { public int amountOfSates() {
return types.length; return types.length;
} }

View file

@ -1,6 +1,7 @@
package techreborn.blocks; package techreborn.blocks;
import me.modmuss50.jsonDestroyer.api.ITexturedBlock;
import net.minecraft.block.material.Material; import net.minecraft.block.material.Material;
import net.minecraft.block.properties.PropertyInteger; import net.minecraft.block.properties.PropertyInteger;
import net.minecraft.block.state.BlockState; import net.minecraft.block.state.BlockState;
@ -19,7 +20,6 @@ import net.minecraft.world.IBlockAccess;
import net.minecraft.world.World; import net.minecraft.world.World;
import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly; import net.minecraftforge.fml.relauncher.SideOnly;
import reborncore.api.IBlockTextureProvider;
import reborncore.common.BaseTileBlock; import reborncore.common.BaseTileBlock;
import techreborn.client.TechRebornCreativeTab; import techreborn.client.TechRebornCreativeTab;
import techreborn.tiles.TilePlayerDectector; import techreborn.tiles.TilePlayerDectector;
@ -27,7 +27,7 @@ import techreborn.tiles.TilePlayerDectector;
import java.util.List; import java.util.List;
import java.util.Random; import java.util.Random;
public class BlockPlayerDetector extends BaseTileBlock implements IBlockTextureProvider { public class BlockPlayerDetector extends BaseTileBlock implements ITexturedBlock {
public PropertyInteger METADATA; public PropertyInteger METADATA;
@ -123,12 +123,12 @@ public class BlockPlayerDetector extends BaseTileBlock implements IBlockTextureP
} }
@Override @Override
public String getTextureName(IBlockState blockState, EnumFacing facing) { public String getTextureNameFromState(IBlockState blockState, EnumFacing facing) {
return "techreborn:blocks/machine/player_detector_" + types[getMetaFromState(blockState)]; return "techreborn:blocks/machine/player_detector_" + types[getMetaFromState(blockState)];
} }
@Override @Override
public int amountOfVariants() { public int amountOfSates() {
return types.length; return types.length;
} }

View file

@ -1,6 +1,6 @@
package techreborn.blocks; package techreborn.blocks;
import net.minecraft.block.Block; import me.modmuss50.jsonDestroyer.api.ITexturedBlock;
import net.minecraft.block.material.Material; import net.minecraft.block.material.Material;
import net.minecraft.block.properties.PropertyInteger; import net.minecraft.block.properties.PropertyInteger;
import net.minecraft.block.state.BlockState; import net.minecraft.block.state.BlockState;
@ -11,7 +11,6 @@ import net.minecraft.item.ItemStack;
import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumFacing;
import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly; import net.minecraftforge.fml.relauncher.SideOnly;
import reborncore.api.IBlockTextureProvider;
import reborncore.common.BaseBlock; import reborncore.common.BaseBlock;
import techreborn.client.TechRebornCreativeTabMisc; import techreborn.client.TechRebornCreativeTabMisc;
import techreborn.init.ModBlocks; import techreborn.init.ModBlocks;
@ -19,7 +18,7 @@ import techreborn.init.ModBlocks;
import java.util.List; import java.util.List;
import java.util.Random; import java.util.Random;
public class BlockStorage extends BaseBlock implements IBlockTextureProvider { public class BlockStorage extends BaseBlock implements ITexturedBlock {
public static ItemStack getStorageBlockByName(String name, int count) { public static ItemStack getStorageBlockByName(String name, int count) {
for (int i = 0; i < types.length; i++) { for (int i = 0; i < types.length; i++) {
@ -68,12 +67,12 @@ public class BlockStorage extends BaseBlock implements IBlockTextureProvider {
return getMetaFromState(state); return getMetaFromState(state);
} }
@Override @Override
public String getTextureName(IBlockState blockState, EnumFacing facing) { public String getTextureNameFromState(IBlockState blockState, EnumFacing facing) {
return "techreborn:blocks/storage/" + types[getMetaFromState(blockState)] + "_block"; return "techreborn:blocks/storage/" + types[getMetaFromState(blockState)] + "_block";
} }
@Override @Override
public int amountOfVariants() { public int amountOfSates() {
return types.length; return types.length;
} }

View file

@ -1,6 +1,6 @@
package techreborn.blocks; package techreborn.blocks;
import net.minecraft.block.Block; import me.modmuss50.jsonDestroyer.api.ITexturedBlock;
import net.minecraft.block.material.Material; import net.minecraft.block.material.Material;
import net.minecraft.block.properties.PropertyInteger; import net.minecraft.block.properties.PropertyInteger;
import net.minecraft.block.state.BlockState; import net.minecraft.block.state.BlockState;
@ -11,7 +11,6 @@ import net.minecraft.item.ItemStack;
import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumFacing;
import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly; import net.minecraftforge.fml.relauncher.SideOnly;
import reborncore.api.IBlockTextureProvider;
import reborncore.common.BaseBlock; import reborncore.common.BaseBlock;
import techreborn.client.TechRebornCreativeTabMisc; import techreborn.client.TechRebornCreativeTabMisc;
import techreborn.init.ModBlocks; import techreborn.init.ModBlocks;
@ -20,7 +19,7 @@ import java.security.InvalidParameterException;
import java.util.List; import java.util.List;
import java.util.Random; import java.util.Random;
public class BlockStorage2 extends BaseBlock implements IBlockTextureProvider { public class BlockStorage2 extends BaseBlock implements ITexturedBlock {
public static ItemStack getStorageBlockByName(String name, int count) { public static ItemStack getStorageBlockByName(String name, int count) {
for (int i = 0; i < types.length; i++) { for (int i = 0; i < types.length; i++) {
@ -66,12 +65,12 @@ public class BlockStorage2 extends BaseBlock implements IBlockTextureProvider {
} }
@Override @Override
public String getTextureName(IBlockState blockState, EnumFacing facing) { public String getTextureNameFromState(IBlockState blockState, EnumFacing facing) {
return "techreborn:blocks/storage/" + types[getMetaFromState(blockState)] + "_block"; return "techreborn:blocks/storage/" + types[getMetaFromState(blockState)] + "_block";
} }
@Override @Override
public int amountOfVariants() { public int amountOfSates() {
return types.length; return types.length;
} }

View file

@ -6,14 +6,13 @@ import net.minecraft.world.IBlockAccess;
import net.minecraft.world.World; import net.minecraft.world.World;
import net.minecraftforge.fluids.BlockFluidClassic; import net.minecraftforge.fluids.BlockFluidClassic;
import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.Fluid;
import reborncore.api.TextureRegistry; import reborncore.RebornCore;
import techreborn.client.TechRebornCreativeTabMisc;
public class BlockFluidBase extends BlockFluidClassic { public class BlockFluidBase extends BlockFluidClassic {
public BlockFluidBase(Fluid fluid, Material material) { public BlockFluidBase(Fluid fluid, Material material) {
super(fluid, material); super(fluid, material);
TextureRegistry.registerFluid(this); RebornCore.jsonDestroyer.registerObject(this);
} }

View file

@ -1,10 +1,10 @@
package techreborn.blocks.fluid; package techreborn.blocks.fluid;
import me.modmuss50.jsonDestroyer.api.ITexturedFluid;
import net.minecraft.block.material.Material; import net.minecraft.block.material.Material;
import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.Fluid;
import reborncore.api.IFluidTextureProvider;
public class BlockFluidTechReborn extends BlockFluidBase implements IFluidTextureProvider { public class BlockFluidTechReborn extends BlockFluidBase implements ITexturedFluid {
String name; String name;

View file

@ -1,7 +1,7 @@
package techreborn.items; package techreborn.items;
import net.minecraft.item.Item; import net.minecraft.item.Item;
import reborncore.api.TextureRegistry; import reborncore.RebornCore;
import techreborn.client.TechRebornCreativeTab; import techreborn.client.TechRebornCreativeTab;
public class ItemTR extends Item { public class ItemTR extends Item {
@ -9,7 +9,7 @@ public class ItemTR extends Item {
public ItemTR() { public ItemTR() {
setNoRepair(); setNoRepair();
setCreativeTab(TechRebornCreativeTab.instance); setCreativeTab(TechRebornCreativeTab.instance);
TextureRegistry.registerItem(this); RebornCore.jsonDestroyer.registerObject(this);
} }
} }

View file

@ -1,20 +1,16 @@
package techreborn.items; package techreborn.items;
import me.modmuss50.jsonDestroyer.api.ITexturedItem;
import net.minecraft.client.resources.model.ModelResourceLocation; import net.minecraft.client.resources.model.ModelResourceLocation;
import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;
import reborncore.api.IItemTexture;
import techreborn.lib.ModInfo; import techreborn.lib.ModInfo;
public abstract class ItemTextureBase extends ItemTR implements IItemTexture { public abstract class ItemTextureBase extends ItemTR implements ITexturedItem {
@Override
public String getModID() {
return ModInfo.MOD_ID;
}
@Override @Override
public ModelResourceLocation getModel(ItemStack stack, EntityPlayer player, int useRemaining) { public ModelResourceLocation getModel(ItemStack stack, EntityPlayer player, int useRemaining) {
return new ModelResourceLocation(ModInfo.MOD_ID + ":" + stack.getItem().getUnlocalizedName(stack).substring(5), "inventory"); return new ModelResourceLocation(ModInfo.MOD_ID + ":" + getUnlocalizedName(stack).substring(5), "inventory");
} }
} }

View file

@ -1,6 +1,7 @@
package techreborn.items.armor; package techreborn.items.armor;
import me.modmuss50.jsonDestroyer.api.ITexturedItem;
import net.minecraft.creativetab.CreativeTabs; import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.entity.Entity; import net.minecraft.entity.Entity;
import net.minecraft.item.Item; import net.minecraft.item.Item;
@ -8,17 +9,15 @@ import net.minecraft.item.ItemArmor;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;
import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly; import net.minecraftforge.fml.relauncher.SideOnly;
import reborncore.api.IItemTexture; import reborncore.RebornCore;
import reborncore.api.TextureRegistry;
import techreborn.api.power.IEnergyItemInfo; import techreborn.api.power.IEnergyItemInfo;
import techreborn.client.TechRebornCreativeTab; import techreborn.client.TechRebornCreativeTab;
import techreborn.config.ConfigTechReborn; import techreborn.config.ConfigTechReborn;
import techreborn.lib.ModInfo;
import techreborn.powerSystem.PoweredItem; import techreborn.powerSystem.PoweredItem;
import java.util.List; import java.util.List;
public class ItemLapotronPack extends ItemArmor implements IEnergyItemInfo, IItemTexture { public class ItemLapotronPack extends ItemArmor implements IEnergyItemInfo, ITexturedItem {
public static final int maxCharge = ConfigTechReborn.LapotronPackCharge; public static final int maxCharge = ConfigTechReborn.LapotronPackCharge;
public static final int tier = ConfigTechReborn.LapotronPackTier; public static final int tier = ConfigTechReborn.LapotronPackTier;
@ -29,7 +28,7 @@ public class ItemLapotronPack extends ItemArmor implements IEnergyItemInfo, IIte
setCreativeTab(TechRebornCreativeTab.instance); setCreativeTab(TechRebornCreativeTab.instance);
setUnlocalizedName("techreborn.lapotronpack"); setUnlocalizedName("techreborn.lapotronpack");
setMaxStackSize(1); setMaxStackSize(1);
TextureRegistry.registerItem(this); RebornCore.jsonDestroyer.registerObject(this);
} }
@ -99,8 +98,4 @@ public class ItemLapotronPack extends ItemArmor implements IEnergyItemInfo, IIte
return 1; return 1;
} }
@Override
public String getModID() {
return ModInfo.MOD_ID;
}
} }

View file

@ -1,5 +1,6 @@
package techreborn.items.armor; package techreborn.items.armor;
import me.modmuss50.jsonDestroyer.api.ITexturedItem;
import net.minecraft.creativetab.CreativeTabs; import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.entity.Entity; import net.minecraft.entity.Entity;
import net.minecraft.item.Item; import net.minecraft.item.Item;
@ -7,17 +8,15 @@ import net.minecraft.item.ItemArmor;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;
import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly; import net.minecraftforge.fml.relauncher.SideOnly;
import reborncore.api.IItemTexture; import reborncore.RebornCore;
import reborncore.api.TextureRegistry;
import techreborn.api.power.IEnergyItemInfo; import techreborn.api.power.IEnergyItemInfo;
import techreborn.client.TechRebornCreativeTab; import techreborn.client.TechRebornCreativeTab;
import techreborn.config.ConfigTechReborn; import techreborn.config.ConfigTechReborn;
import techreborn.lib.ModInfo;
import techreborn.powerSystem.PoweredItem; import techreborn.powerSystem.PoweredItem;
import java.util.List; import java.util.List;
public class ItemLithiumBatpack extends ItemArmor implements IEnergyItemInfo, IItemTexture { public class ItemLithiumBatpack extends ItemArmor implements IEnergyItemInfo, ITexturedItem {
public static final int maxCharge = ConfigTechReborn.LithiumBatpackCharge; public static final int maxCharge = ConfigTechReborn.LithiumBatpackCharge;
public static final int tier = ConfigTechReborn.LithiumBatpackTier; public static final int tier = ConfigTechReborn.LithiumBatpackTier;
@ -28,7 +27,7 @@ public class ItemLithiumBatpack extends ItemArmor implements IEnergyItemInfo, II
setMaxStackSize(1); setMaxStackSize(1);
setUnlocalizedName("techreborn.lithiumbatpack"); setUnlocalizedName("techreborn.lithiumbatpack");
setCreativeTab(TechRebornCreativeTab.instance); setCreativeTab(TechRebornCreativeTab.instance);
TextureRegistry.registerItem(this); RebornCore.jsonDestroyer.registerObject(this);
} }
@ -98,8 +97,4 @@ public class ItemLithiumBatpack extends ItemArmor implements IEnergyItemInfo, II
return 1; return 1;
} }
@Override
public String getModID() {
return ModInfo.MOD_ID;
}
} }

View file

@ -1,5 +1,6 @@
package techreborn.items.tools; package techreborn.items.tools;
import me.modmuss50.jsonDestroyer.api.ITexturedItem;
import net.minecraft.block.Block; import net.minecraft.block.Block;
import net.minecraft.block.state.IBlockState; import net.minecraft.block.state.IBlockState;
import net.minecraft.creativetab.CreativeTabs; import net.minecraft.creativetab.CreativeTabs;
@ -14,18 +15,16 @@ import net.minecraft.util.EnumFacing;
import net.minecraft.world.World; import net.minecraft.world.World;
import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly; import net.minecraftforge.fml.relauncher.SideOnly;
import reborncore.api.IItemTexture; import reborncore.RebornCore;
import reborncore.api.TextureRegistry;
import reborncore.common.util.TorchHelper; import reborncore.common.util.TorchHelper;
import techreborn.api.power.IEnergyItemInfo; import techreborn.api.power.IEnergyItemInfo;
import techreborn.client.TechRebornCreativeTab; import techreborn.client.TechRebornCreativeTab;
import techreborn.config.ConfigTechReborn; import techreborn.config.ConfigTechReborn;
import techreborn.lib.ModInfo;
import techreborn.powerSystem.PoweredItem; import techreborn.powerSystem.PoweredItem;
import java.util.List; import java.util.List;
public class ItemAdvancedDrill extends ItemPickaxe implements IEnergyItemInfo, IItemTexture { public class ItemAdvancedDrill extends ItemPickaxe implements IEnergyItemInfo, ITexturedItem {
public static final int maxCharge = ConfigTechReborn.AdvancedDrillCharge; public static final int maxCharge = ConfigTechReborn.AdvancedDrillCharge;
public int cost = 250; public int cost = 250;
@ -39,7 +38,7 @@ public class ItemAdvancedDrill extends ItemPickaxe implements IEnergyItemInfo, I
setMaxStackSize(1); setMaxStackSize(1);
setMaxDamage(240); setMaxDamage(240);
setUnlocalizedName("techreborn.advancedDrill"); setUnlocalizedName("techreborn.advancedDrill");
TextureRegistry.registerItem(this); RebornCore.jsonDestroyer.registerObject(this);
} }
@Override @Override
@ -141,9 +140,4 @@ public class ItemAdvancedDrill extends ItemPickaxe implements IEnergyItemInfo, I
public int getMaxMeta() { public int getMaxMeta() {
return 1; return 1;
} }
@Override
public String getModID() {
return ModInfo.MOD_ID;
}
} }

View file

@ -1,17 +1,15 @@
package techreborn.items.tools; package techreborn.items.tools;
import me.modmuss50.jsonDestroyer.api.ITexturedItem;
import net.minecraft.block.Block; import net.minecraft.block.Block;
import net.minecraft.init.Items; import net.minecraft.init.Items;
import net.minecraft.item.Item; import net.minecraft.item.Item;
import net.minecraft.item.ItemBucket; import net.minecraft.item.ItemBucket;
import net.minecraftforge.fluids.FluidContainerRegistry; import reborncore.RebornCore;
import reborncore.api.IItemTexture;
import reborncore.api.TextureRegistry;
import reborncore.common.util.BucketHandler;
import techreborn.client.TechRebornCreativeTabMisc; import techreborn.client.TechRebornCreativeTabMisc;
import techreborn.lib.ModInfo; import techreborn.lib.ModInfo;
public class ItemFluidbucket extends ItemBucket implements IItemTexture { public class ItemFluidbucket extends ItemBucket implements ITexturedItem {
private String iconName; private String iconName;
public ItemFluidbucket(Block block) { public ItemFluidbucket(Block block) {
@ -19,7 +17,7 @@ public class ItemFluidbucket extends ItemBucket implements IItemTexture {
setContainerItem(Items.bucket); setContainerItem(Items.bucket);
setCreativeTab(TechRebornCreativeTabMisc.instance); setCreativeTab(TechRebornCreativeTabMisc.instance);
setUnlocalizedName("techreborn.fluidbucket"); setUnlocalizedName("techreborn.fluidbucket");
TextureRegistry.registerItem(this); RebornCore.jsonDestroyer.registerObject(this);
} }
@Override @Override
@ -37,10 +35,4 @@ public class ItemFluidbucket extends ItemBucket implements IItemTexture {
public int getMaxMeta() { public int getMaxMeta() {
return 1; return 1;
} }
@Override
public String getModID() {
return ModInfo.MOD_ID;
}
} }

View file

@ -1,12 +1,11 @@
package techreborn.items.tools; package techreborn.items.tools;
import me.modmuss50.jsonDestroyer.api.ITexturedItem;
import net.minecraft.item.Item; import net.minecraft.item.Item;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;
import reborncore.api.IItemTexture;
import techreborn.items.ItemTR; import techreborn.items.ItemTR;
import techreborn.lib.ModInfo;
public class ItemHammer extends ItemTR implements IItemTexture { public class ItemHammer extends ItemTR implements ITexturedItem {
private String iconName; private String iconName;
public ItemHammer(int MaxDamage) { public ItemHammer(int MaxDamage) {
@ -30,8 +29,6 @@ public class ItemHammer extends ItemTR implements IItemTexture {
// return false; // return false;
// } // }
@Override @Override
public ItemStack getContainerItem(ItemStack itemStack) { public ItemStack getContainerItem(ItemStack itemStack) {
ItemStack copiedStack = itemStack.copy(); ItemStack copiedStack = itemStack.copy();
@ -52,9 +49,5 @@ public class ItemHammer extends ItemTR implements IItemTexture {
return 1; return 1;
} }
@Override
public String getModID() {
return ModInfo.MOD_ID;
}
} }

View file

@ -1,5 +1,6 @@
package techreborn.items.tools; package techreborn.items.tools;
import me.modmuss50.jsonDestroyer.api.ITexturedItem;
import net.minecraft.block.Block; import net.minecraft.block.Block;
import net.minecraft.block.state.IBlockState; import net.minecraft.block.state.IBlockState;
import net.minecraft.creativetab.CreativeTabs; import net.minecraft.creativetab.CreativeTabs;
@ -15,18 +16,16 @@ import net.minecraft.util.EnumFacing;
import net.minecraft.world.World; import net.minecraft.world.World;
import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly; import net.minecraftforge.fml.relauncher.SideOnly;
import reborncore.api.IItemTexture; import reborncore.RebornCore;
import reborncore.api.TextureRegistry;
import reborncore.common.util.TorchHelper; import reborncore.common.util.TorchHelper;
import techreborn.api.power.IEnergyItemInfo; import techreborn.api.power.IEnergyItemInfo;
import techreborn.client.TechRebornCreativeTab; import techreborn.client.TechRebornCreativeTab;
import techreborn.config.ConfigTechReborn; import techreborn.config.ConfigTechReborn;
import techreborn.lib.ModInfo;
import techreborn.powerSystem.PoweredItem; import techreborn.powerSystem.PoweredItem;
import java.util.List; import java.util.List;
public class ItemOmniTool extends ItemPickaxe implements IEnergyItemInfo, IItemTexture { public class ItemOmniTool extends ItemPickaxe implements IEnergyItemInfo, ITexturedItem {
public static final int maxCharge = ConfigTechReborn.OmniToolCharge; public static final int maxCharge = ConfigTechReborn.OmniToolCharge;
public static final int tier = ConfigTechReborn.OmniToolTier; public static final int tier = ConfigTechReborn.OmniToolTier;
@ -40,7 +39,7 @@ public class ItemOmniTool extends ItemPickaxe implements IEnergyItemInfo, IItemT
setMaxStackSize(1); setMaxStackSize(1);
setMaxDamage(200); setMaxDamage(200);
setUnlocalizedName("techreborn.omniTool"); setUnlocalizedName("techreborn.omniTool");
TextureRegistry.registerItem(this); RebornCore.jsonDestroyer.registerObject(this);
} }
@Override @Override
@ -155,9 +154,4 @@ public class ItemOmniTool extends ItemPickaxe implements IEnergyItemInfo, IItemT
return 1; return 1;
} }
@Override
public String getModID() {
return ModInfo.MOD_ID;
}
} }

View file

@ -1,5 +1,6 @@
package techreborn.items.tools; package techreborn.items.tools;
import me.modmuss50.jsonDestroyer.api.ITexturedItem;
import net.minecraft.block.Block; import net.minecraft.block.Block;
import net.minecraft.creativetab.CreativeTabs; import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.enchantment.Enchantment; import net.minecraft.enchantment.Enchantment;
@ -11,18 +12,16 @@ import net.minecraft.item.ItemStack;
import net.minecraft.world.World; import net.minecraft.world.World;
import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly; import net.minecraftforge.fml.relauncher.SideOnly;
import reborncore.api.IItemTexture; import reborncore.RebornCore;
import reborncore.api.TextureRegistry;
import reborncore.common.util.Color; import reborncore.common.util.Color;
import techreborn.api.power.IEnergyItemInfo; import techreborn.api.power.IEnergyItemInfo;
import techreborn.client.TechRebornCreativeTab; import techreborn.client.TechRebornCreativeTab;
import techreborn.config.ConfigTechReborn; import techreborn.config.ConfigTechReborn;
import techreborn.lib.ModInfo;
import techreborn.powerSystem.PoweredItem; import techreborn.powerSystem.PoweredItem;
import java.util.List; import java.util.List;
public class ItemRockCutter extends ItemPickaxe implements IEnergyItemInfo, IItemTexture { public class ItemRockCutter extends ItemPickaxe implements IEnergyItemInfo, ITexturedItem {
public static final int maxCharge = ConfigTechReborn.RockCutterCharge; public static final int maxCharge = ConfigTechReborn.RockCutterCharge;
public int cost = 500; public int cost = 500;
@ -34,7 +33,7 @@ public class ItemRockCutter extends ItemPickaxe implements IEnergyItemInfo, IIte
setCreativeTab(TechRebornCreativeTab.instance); setCreativeTab(TechRebornCreativeTab.instance);
setMaxStackSize(1); setMaxStackSize(1);
efficiencyOnProperMaterial = 16F; efficiencyOnProperMaterial = 16F;
TextureRegistry.registerItem(this); RebornCore.jsonDestroyer.registerObject(this);
} }
@Override @Override
@ -146,8 +145,4 @@ public class ItemRockCutter extends ItemPickaxe implements IEnergyItemInfo, IIte
return 1; return 1;
} }
@Override
public String getModID() {
return ModInfo.MOD_ID;
}
} }