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

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

View file

@ -1,20 +1,16 @@
package techreborn.items;
import me.modmuss50.jsonDestroyer.api.ITexturedItem;
import net.minecraft.client.resources.model.ModelResourceLocation;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack;
import reborncore.api.IItemTexture;
import techreborn.lib.ModInfo;
public abstract class ItemTextureBase extends ItemTR implements IItemTexture {
@Override
public String getModID() {
return ModInfo.MOD_ID;
}
public abstract class ItemTextureBase extends ItemTR implements ITexturedItem {
@Override
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;
import me.modmuss50.jsonDestroyer.api.ITexturedItem;
import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.entity.Entity;
import net.minecraft.item.Item;
@ -8,17 +9,15 @@ import net.minecraft.item.ItemArmor;
import net.minecraft.item.ItemStack;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
import reborncore.api.IItemTexture;
import reborncore.api.TextureRegistry;
import reborncore.RebornCore;
import techreborn.api.power.IEnergyItemInfo;
import techreborn.client.TechRebornCreativeTab;
import techreborn.config.ConfigTechReborn;
import techreborn.lib.ModInfo;
import techreborn.powerSystem.PoweredItem;
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 tier = ConfigTechReborn.LapotronPackTier;
@ -29,7 +28,7 @@ public class ItemLapotronPack extends ItemArmor implements IEnergyItemInfo, IIte
setCreativeTab(TechRebornCreativeTab.instance);
setUnlocalizedName("techreborn.lapotronpack");
setMaxStackSize(1);
TextureRegistry.registerItem(this);
RebornCore.jsonDestroyer.registerObject(this);
}
@ -99,8 +98,4 @@ public class ItemLapotronPack extends ItemArmor implements IEnergyItemInfo, IIte
return 1;
}
@Override
public String getModID() {
return ModInfo.MOD_ID;
}
}

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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