Fixed unlocalized names for all blocks and items

This commit is contained in:
brandon3055 committed 2014-08-05 18:06:29 +10:00
1 parent 8f5e981789
commit 49a671a1b6
66 files changed
+514 -234

No files matched your search

@@ -35,7 +35,7 @@ public class DraconicEvolution {
public static final String networkChannelName = "DraconicEvolution";
public static ChannelHandler channelHandler = new ChannelHandler(References.MODID, networkChannelName);
//public static FMLEventChannel channel;
public static boolean debug = true;
public static boolean debug = false;
public DraconicEvolution()
{
@@ -0,0 +1,48 @@
package com.brandon3055.draconicevolution.common.blocks;
import com.brandon3055.draconicevolution.common.lib.References;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import net.minecraft.block.Block;
import net.minecraft.block.BlockContainer;
import net.minecraft.block.ITileEntityProvider;
import net.minecraft.block.material.Material;
import net.minecraft.client.renderer.texture.IIconRegister;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.world.World;
/**
* Created by Brandon on 5/08/2014.
*/
public class BlockContainerDE extends BlockDE implements ITileEntityProvider {
public BlockContainerDE(final Material material) {
super(material);
this.isBlockContainer = true;
}
public BlockContainerDE() {
super(Material.rock);
this.isBlockContainer = true;
}
@Override
public TileEntity createNewTileEntity(World p_149915_1_, int p_149915_2_) {
return null;
}
public void onBlockAdded(World world, int x, int y, int z){
super.onBlockAdded(world, x, y, z);
}
public void breakBlock(World world, int x, int y, int z, Block block, int meta){
super.breakBlock(world, x, y, z, block, meta);
world.removeTileEntity(x, y, z);
}
public boolean onBlockEventReceived(World world, int x, int y, int z, int p_149696_5_, int p_149696_6_){
super.onBlockEventReceived(world, x, y, z, p_149696_5_, p_149696_6_);
TileEntity tileentity = world.getTileEntity(x, y, z);
return tileentity != null ? tileentity.receiveClientEvent(p_149696_5_, p_149696_6_) : false;
}
}
@@ -7,27 +7,27 @@ import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import com.brandon3055.draconicevolution.common.lib.References;
public class DraconicEvolutionBlock extends Block {
public class BlockDE extends Block {
public DraconicEvolutionBlock(final Material material) {
public BlockDE(final Material material) {
super(material);
}
public DraconicEvolutionBlock() {
public BlockDE() {
super(Material.rock);
}
@Override
public String getUnlocalizedName()
{
return String.format("tile.%s", getUnwrappedUnlocalizedName(super.getUnlocalizedName()));
return String.format("tile.%s%s", References.MODID.toLowerCase() + ":", getUnwrappedUnlocalizedName(super.getUnlocalizedName()));
//return String.format("tile.%s", getUnwrappedUnlocalizedName(super.getUnlocalizedName()));
}
public String getUnwrappedUnlocalizedName(final String unlocalizedName)
{
return unlocalizedName.substring(unlocalizedName.indexOf(".") + 1);
}
@@ -32,7 +32,7 @@ import java.util.Random;
/**
* Created by Brandon on 5/07/2014.
*/
public class CustomSpawner extends Block{
public class CustomSpawner extends BlockDE{
public CustomSpawner()
{
super(Material.rock);
@@ -40,7 +40,7 @@ public class CustomSpawner extends Block{
this.setCreativeTab(DraconicEvolution.getCreativeTab(2));
this.setHardness(10F);
this.setHarvestLevel("pickaxe", 3);
GameRegistry.registerBlock(this, this.getUnlocalizedName());
ModBlocks.register(this);
}
@Override
@@ -11,7 +11,7 @@ import net.minecraft.client.renderer.texture.IIconRegister;
/**
* Created by Brandon on 25/07/2014.
*/
public class Draconium extends DraconicEvolutionBlock {
public class Draconium extends BlockDE {
public Draconium() {
super(Material.iron);
this.setHardness(10F);
@@ -17,7 +17,7 @@ import com.brandon3055.draconicevolution.common.lib.References;
import com.brandon3055.draconicevolution.common.lib.Strings;
import net.minecraft.world.IBlockAccess;
public class DraconiumOre extends DraconicEvolutionBlock {
public class DraconiumOre extends BlockDE {
public IIcon icon;
public IIcon iconEnd;
public IIcon iconNether;
@@ -28,7 +28,7 @@ public class DraconiumOre extends DraconicEvolutionBlock {
this.setCreativeTab(DraconicEvolution.getCreativeTab(2));
this.setHardness(5f);
this.setResistance(20.0f);
GameRegistry.registerBlock(this, this.getUnlocalizedName());
ModBlocks.register(this);
}
@Override
@@ -1,39 +1,42 @@
package com.brandon3055.draconicevolution.common.blocks;
import com.brandon3055.draconicevolution.common.blocks.machine.*;
import com.brandon3055.draconicevolution.common.blocks.multiblock.EnergyPylon;
import com.brandon3055.draconicevolution.common.blocks.multiblock.EnergyStorageCore;
import com.brandon3055.draconicevolution.common.blocks.multiblock.InvisibleMultiblock;
import net.minecraft.block.Block;
import com.brandon3055.draconicevolution.common.core.utills.Utills;
import cpw.mods.fml.common.registry.GameRegistry;
import com.brandon3055.draconicevolution.DraconicEvolution;
import com.brandon3055.draconicevolution.common.core.handler.ConfigHandler;
import net.minecraft.block.Block;
import net.minecraft.item.ItemBlock;
public class ModBlocks {
public static Block xRayBlock;
public static Block weatherController;
public static Block sunDial;
public static Block draconiumOre;
public static Block testBlock;
public static Block grinder;
public static Block potentiometer;
public static Block rainSensor;
public static Block particleGenerator;
public static Block playerDetector;
public static Block playerDetectorAdvanced;
public static Block energyInfuser;
public static Block customSpawner;
public static Block longRangeDislocator;
public static Block generator;
public static Block energyStorageCore;
public static Block draconium;
public static Block invisibleMultiblock;
public static Block energyPylon;
public static BlockDE xRayBlock;
public static BlockDE weatherController;
public static BlockDE sunDial;
public static BlockDE draconiumOre;
public static BlockDE testBlock;
public static BlockDE grinder;
public static BlockDE potentiometer;
public static BlockDE rainSensor;
public static BlockDE particleGenerator;
public static BlockDE playerDetector;
public static BlockDE playerDetectorAdvanced;
public static BlockDE energyInfuser;
public static BlockDE customSpawner;
public static BlockDE longRangeDislocator;
public static BlockDE generator;
public static BlockDE energyStorageCore;
public static BlockDE draconium;
public static BlockDE invisibleMultiblock;
public static BlockDE energyPylon;
public static void init()
{
if(ConfigHandler.disableXrayBlock < 2) xRayBlock = new XRayBlock();
weatherController = new BlockWeatherController();
if(ConfigHandler.disableSunDial < 2) sunDial = new BlockSunDial();
weatherController = new WeatherController();
if(ConfigHandler.disableSunDial < 2) sunDial = new SunDial();
draconiumOre = new DraconiumOre();
grinder = new Grinder();
potentiometer = new Potentiometer();
@@ -51,12 +54,30 @@ public class ModBlocks {
if(ConfigHandler.disable_LRD < 2) longRangeDislocator = new LongRangeDislocator();
if(DraconicEvolution.debug) testBlock = new TestBlock();
//testBlock = new TestBlock();
{
Block changer1 = new Utills.BlockChanger("tile.particleGenerator", particleGenerator);
Block changer2 = new Utills.BlockChanger("tile.customSpawner", customSpawner);
Block changer3 = new Utills.BlockChanger("tile.generator", generator);
Block changer4 = new Utills.BlockChanger("tile.playerDetectorAdvanced", playerDetectorAdvanced);
Block changer5 = new Utills.BlockChanger("tile.energyInfuser", energyInfuser);
Block changer6 = new Utills.BlockChanger("tile.draconiumOre", draconiumOre);
Block changer7 = new Utills.BlockChanger("tile.weatherController", weatherController);
Block changer8 = new Utills.BlockChanger("tile.longRangeDislocator", longRangeDislocator);
Block changer9 = new Utills.BlockChanger("tile.grinder", grinder);
}
}
public static void register(final DraconicEvolutionBlock block)
public static void register(BlockDE block)
{
GameRegistry.registerBlock(block, block.getUnwrappedUnlocalizedName(block.getUnlocalizedName()));
String name = block.getUnwrappedUnlocalizedName(block.getUnlocalizedName());
GameRegistry.registerBlock(block, name.substring(name.indexOf(":") + 1));
//GameRegistry.registerBlock(block, block.getUnwrappedUnlocalizedName(block.getUnlocalizedName()));
}
public static void registerWithItem(BlockDE block, Class<? extends ItemBlock> item)
{
String name = block.getUnwrappedUnlocalizedName(block.getUnlocalizedName());
GameRegistry.registerBlock(block, item, name.substring(name.indexOf(":") + 1));
}
}
@@ -25,7 +25,7 @@ import com.brandon3055.draconicevolution.common.lib.References;
import com.brandon3055.draconicevolution.common.lib.Strings;
import com.brandon3055.draconicevolution.common.tileentities.TileParticleGenerator;
public class ParticleGenerator extends Block
public class ParticleGenerator extends BlockDE
{
public static Block instance;
@@ -37,7 +37,7 @@ public class ParticleGenerator extends Block
this.setHardness(1f);
this.setResistance(200.0f);
this.setLightOpacity(0);
GameRegistry.registerBlock(this, this.getUnlocalizedName());
ModBlocks.register(this);
}
@Override
@@ -24,7 +24,7 @@ import com.brandon3055.draconicevolution.common.lib.References;
import com.brandon3055.draconicevolution.common.lib.Strings;
import com.brandon3055.draconicevolution.common.tileentities.TilePotentiometer;
public class Potentiometer extends DraconicEvolutionBlock
public class Potentiometer extends BlockDE
{
IIcon icons[] = new IIcon[16];
@@ -14,7 +14,7 @@ import com.brandon3055.draconicevolution.DraconicEvolution;
import com.brandon3055.draconicevolution.common.lib.References;
import com.brandon3055.draconicevolution.common.lib.Strings;
public class RainSensor extends DraconicEvolutionBlock
public class RainSensor extends BlockDE
{
IIcon icon_inactive;
IIcon icon_active;
@@ -14,14 +14,13 @@ import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.AxisAlignedBB;
import net.minecraft.util.IIcon;
import net.minecraft.util.MovingObjectPosition;
import net.minecraft.world.IBlockAccess;
import net.minecraft.world.World;
import com.brandon3055.draconicevolution.DraconicEvolution;
public class TestBlock extends DraconicEvolutionBlock {
public class TestBlock extends BlockDE {
protected TestBlock() {
super(Material.rock);
@@ -30,7 +29,7 @@ public class TestBlock extends DraconicEvolutionBlock {
this.setHardness(5f);
this.setResistance(200.0f);
//this.setBlockBounds(0.4f, 0f, 0.4f, 0.6f, 1f, 0.6f);
GameRegistry.registerBlock(this, TestItemBlock.class, this.getUnlocalizedName());
ModBlocks.registerWithItem(this, TestItemBlock.class);
}
@Override
@@ -18,7 +18,7 @@ import com.brandon3055.draconicevolution.common.core.handler.ParticleHandler;
import com.brandon3055.draconicevolution.common.items.ModItems;
import com.brandon3055.draconicevolution.common.lib.Strings;
public class XRayBlock extends DraconicEvolutionBlock {
public class XRayBlock extends BlockDE {
protected XRayBlock() {
super(Material.rock);
@@ -1,7 +1,9 @@
package com.brandon3055.draconicevolution.common.blocks;
package com.brandon3055.draconicevolution.common.blocks.machine;
import com.brandon3055.draconicevolution.DraconicEvolution;
import com.brandon3055.draconicevolution.client.interfaces.GuiHandler;
import com.brandon3055.draconicevolution.common.blocks.BlockContainerDE;
import com.brandon3055.draconicevolution.common.blocks.ModBlocks;
import com.brandon3055.draconicevolution.common.lib.References;
import com.brandon3055.draconicevolution.common.lib.Strings;
import com.brandon3055.draconicevolution.common.tileentities.TileEnergyInfuser;
@@ -21,7 +23,7 @@ import net.minecraft.world.World;
/**
* Created by Brandon on 27/06/2014.
*/
public class EnergyInfuser extends BlockContainer{
public class EnergyInfuser extends BlockContainerDE {
public EnergyInfuser() {
super(Material.iron);
this.setBlockName(Strings.energyInfuserName);
@@ -30,7 +32,7 @@ public class EnergyInfuser extends BlockContainer{
this.setHardness(1f);
this.setResistance(200.0f);
this.setBlockBounds(0f, 0f, 0f, 1f, 0.375f, 1f);
GameRegistry.registerBlock(this, this.getUnlocalizedName());
ModBlocks.register(this);
}
@Override
@@ -1,7 +1,9 @@
package com.brandon3055.draconicevolution.common.blocks;
package com.brandon3055.draconicevolution.common.blocks.machine;
import com.brandon3055.draconicevolution.DraconicEvolution;
import com.brandon3055.draconicevolution.client.interfaces.GuiHandler;
import com.brandon3055.draconicevolution.common.blocks.BlockContainerDE;
import com.brandon3055.draconicevolution.common.blocks.ModBlocks;
import com.brandon3055.draconicevolution.common.core.utills.LogHelper;
import com.brandon3055.draconicevolution.common.lib.References;
import com.brandon3055.draconicevolution.common.lib.Strings;
@@ -35,7 +37,7 @@ import java.util.Random;
/**
* Created by Brandon on 23/07/2014.
*/
public class Generator extends BlockContainer {
public class Generator extends BlockContainerDE {
public IIcon icon_front;
public IIcon icon_side;
@@ -44,14 +46,14 @@ public class Generator extends BlockContainer {
public IIcon icon_front_inactive;
public IIcon icon_top[] = new IIcon[4];
protected Generator() {
public Generator() {
super(Material.rock);
this.setBlockName(Strings.generatorName);
this.setCreativeTab(DraconicEvolution.getCreativeTab(2));
this.setStepSound(soundTypeStone);
this.setHardness(1f);
this.setResistance(2000.0f);
GameRegistry.registerBlock(this, this.getUnlocalizedName());
ModBlocks.register(this);
}
@@ -1,7 +1,9 @@
package com.brandon3055.draconicevolution.common.blocks;
package com.brandon3055.draconicevolution.common.blocks.machine;
import java.util.List;
import com.brandon3055.draconicevolution.common.blocks.BlockContainerDE;
import com.brandon3055.draconicevolution.common.blocks.ModBlocks;
import net.minecraft.block.Block;
import net.minecraft.block.BlockContainer;
import net.minecraft.block.material.Material;
@@ -28,7 +30,7 @@ import com.brandon3055.draconicevolution.common.lib.References;
import com.brandon3055.draconicevolution.common.lib.Strings;
import com.brandon3055.draconicevolution.common.tileentities.TileGrinder;
public class Grinder extends BlockContainer
public class Grinder extends BlockContainerDE
{
public IIcon icon_front;
public IIcon icon_side;
@@ -37,14 +39,14 @@ public class Grinder extends BlockContainer
public IIcon icon_front_inactive;
public IIcon icon_top[] = new IIcon[4];
protected Grinder() {
public Grinder() {
super(Material.rock);
this.setBlockName(Strings.grinderName);
this.setCreativeTab(DraconicEvolution.getCreativeTab(2));
this.setStepSound(soundTypeStone);
this.setHardness(1f);
this.setResistance(2000.0f);
GameRegistry.registerBlock(this, this.getUnlocalizedName());
ModBlocks.register(this);
}
@@ -1,11 +1,13 @@
package com.brandon3055.draconicevolution.common.blocks;
package com.brandon3055.draconicevolution.common.blocks.machine;
import com.brandon3055.draconicevolution.DraconicEvolution;
import com.brandon3055.draconicevolution.common.blocks.BlockDE;
import com.brandon3055.draconicevolution.common.blocks.LRDItemBlock;
import com.brandon3055.draconicevolution.common.blocks.ModBlocks;
import com.brandon3055.draconicevolution.common.core.handler.ConfigHandler;
import com.brandon3055.draconicevolution.common.core.utills.LogHelper;
import com.brandon3055.draconicevolution.common.lib.References;
import com.brandon3055.draconicevolution.common.lib.Strings;
import com.brandon3055.draconicevolution.common.tileentities.TileLRD;
import cpw.mods.fml.common.registry.GameRegistry;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
@@ -25,7 +27,7 @@ import java.util.Random;
/**
* Created by Brandon on 20/07/2014.
*/
public class LongRangeDislocator extends DraconicEvolutionBlock {
public class LongRangeDislocator extends BlockDE {
IIcon blockIconTop;
@@ -34,7 +36,7 @@ public class LongRangeDislocator extends DraconicEvolutionBlock {
this.setCreativeTab(DraconicEvolution.getCreativeTab(2));
this.setHardness(5f);
this.setResistance(20.0f);
GameRegistry.registerBlock(this, LRDItemBlock.class, this.getUnlocalizedName());
ModBlocks.registerWithItem(this, LRDItemBlock.class);
}
@Override
@@ -1,5 +1,7 @@
package com.brandon3055.draconicevolution.common.blocks;
package com.brandon3055.draconicevolution.common.blocks.machine;
import com.brandon3055.draconicevolution.common.blocks.BlockDE;
import com.brandon3055.draconicevolution.common.blocks.ModBlocks;
import net.minecraft.block.Block;
import net.minecraft.client.renderer.texture.IIconRegister;
import net.minecraft.entity.player.EntityPlayer;
@@ -15,14 +17,14 @@ import com.brandon3055.draconicevolution.common.lib.Strings;
import com.brandon3055.draconicevolution.common.tileentities.TilePlayerDetector;
import net.minecraftforge.common.util.ForgeDirection;
public class PlayerDetector extends DraconicEvolutionBlock
public class PlayerDetector extends BlockDE
{
IIcon side_inactive;
IIcon side_active;
IIcon top;
IIcon bottom;
protected PlayerDetector() {
public PlayerDetector() {
this.setBlockName(Strings.playerDetectorName);
this.setCreativeTab(DraconicEvolution.getCreativeTab(2));
this.setStepSound(soundTypeStone);
@@ -1,5 +1,7 @@
package com.brandon3055.draconicevolution.common.blocks;
package com.brandon3055.draconicevolution.common.blocks.machine;
import com.brandon3055.draconicevolution.common.blocks.BlockContainerDE;
import com.brandon3055.draconicevolution.common.blocks.ModBlocks;
import cpw.mods.fml.common.network.internal.FMLNetworkHandler;
import cpw.mods.fml.common.registry.GameRegistry;
import com.brandon3055.draconicevolution.client.interfaces.GuiHandler;
@@ -21,21 +23,21 @@ import net.minecraft.world.IBlockAccess;
import net.minecraft.world.World;
import net.minecraftforge.common.util.ForgeDirection;
public class PlayerDetectorAdvanced extends BlockContainer
public class PlayerDetectorAdvanced extends BlockContainerDE
{
IIcon side_inactive;
IIcon side_active;
IIcon top;
IIcon bottom;
protected PlayerDetectorAdvanced() {
public PlayerDetectorAdvanced() {
super(Material.iron);
this.setBlockName(Strings.playerDetectorAdvancedName);
this.setCreativeTab(DraconicEvolution.getCreativeTab(2));
this.setStepSound(soundTypeStone);
this.setHardness(1f);
this.setResistance(200.0f);
GameRegistry.registerBlock(this, this.getUnlocalizedName());
ModBlocks.register(this);
}
@Override
@@ -1,5 +1,7 @@
package com.brandon3055.draconicevolution.common.blocks;
package com.brandon3055.draconicevolution.common.blocks.machine;
import com.brandon3055.draconicevolution.common.blocks.BlockDE;
import com.brandon3055.draconicevolution.common.blocks.ModBlocks;
import net.minecraft.block.Block;
import net.minecraft.client.renderer.texture.IIconRegister;
import net.minecraft.entity.player.EntityPlayer;
@@ -14,14 +16,14 @@ import com.brandon3055.draconicevolution.common.lib.References;
import com.brandon3055.draconicevolution.common.lib.Strings;
import com.brandon3055.draconicevolution.common.tileentities.TileSunDial;
public class BlockSunDial extends DraconicEvolutionBlock {
public class SunDial extends BlockDE {
//@SideOnly(Side.CLIENT)
public IIcon icon_front;
public IIcon icon_front_active;
public IIcon icon_side;
public boolean blockState = true;
public BlockSunDial() {
public SunDial() {
this.setBlockName(Strings.blockSunDialName);
this.setCreativeTab(DraconicEvolution.getCreativeTab(2));
this.setStepSound(soundTypeStone);
@@ -1,7 +1,9 @@
package com.brandon3055.draconicevolution.common.blocks;
package com.brandon3055.draconicevolution.common.blocks.machine;
import java.util.List;
import com.brandon3055.draconicevolution.common.blocks.BlockContainerDE;
import com.brandon3055.draconicevolution.common.blocks.ModBlocks;
import net.minecraft.block.Block;
import net.minecraft.block.BlockContainer;
import net.minecraft.block.material.Material;
@@ -26,7 +28,7 @@ import com.brandon3055.draconicevolution.common.lib.References;
import com.brandon3055.draconicevolution.common.lib.Strings;
import com.brandon3055.draconicevolution.common.tileentities.TileWeatherController;
public class BlockWeatherController extends BlockContainer {
public class WeatherController extends BlockContainerDE {
public boolean blockState = true;
public IIcon icon_top;
@@ -38,14 +40,14 @@ public class BlockWeatherController extends BlockContainer {
public IIcon icon_side_sun_on;
public IIcon icon_side_sun_off;
public BlockWeatherController() {
public WeatherController() {
super(Material.rock);
this.setBlockName(Strings.blockWeatherControllerName);
this.setCreativeTab(DraconicEvolution.getCreativeTab(2));
this.setStepSound(soundTypeStone);
this.setHardness(1f);
this.setResistance(200.0f);
GameRegistry.registerBlock(this, this.getUnlocalizedName());
ModBlocks.register(this);
}
@Override
@@ -54,17 +56,6 @@ public class BlockWeatherController extends BlockContainer {
return true;
}
@Override
public String getUnlocalizedName()
{
return String.format("tile.%s", getUnwrappedUnlocalizedName(super.getUnlocalizedName()));
}
public String getUnwrappedUnlocalizedName(final String unlocalizedName)
{
return unlocalizedName.substring(unlocalizedName.indexOf(".") + 1);
}
@Override
@SideOnly(Side.CLIENT)
public void registerBlockIcons(final IIconRegister iconRegister)
@@ -146,11 +137,6 @@ public class BlockWeatherController extends BlockContainer {
return true;
}
public String getUnlocalizedWeatherControllerName()
{
return String.format("tile.%s%s", References.RESOURCESPREFIX, "weatherController/weatherController");
}
@Override
public TileEntity createNewTileEntity(World var1, int var2)
{
@@ -1,13 +1,12 @@
package com.brandon3055.draconicevolution.common.blocks.multiblock;
import com.brandon3055.draconicevolution.DraconicEvolution;
import com.brandon3055.draconicevolution.common.blocks.DraconicEvolutionBlock;
import com.brandon3055.draconicevolution.common.blocks.BlockDE;
import com.brandon3055.draconicevolution.common.blocks.ModBlocks;
import com.brandon3055.draconicevolution.common.core.utills.LogHelper;
import com.brandon3055.draconicevolution.common.lib.References;
import com.brandon3055.draconicevolution.common.lib.Strings;
import com.brandon3055.draconicevolution.common.tileentities.multiblocktiles.TileEnergyPylon;
import com.brandon3055.draconicevolution.common.tileentities.multiblocktiles.TileInvisibleMultiblock;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import net.minecraft.block.Block;
@@ -26,7 +25,7 @@ import net.minecraftforge.common.util.ForgeDirection;
/**
* Created by Brandon on 28/07/2014.
*/
public class EnergyPylon extends DraconicEvolutionBlock {
public class EnergyPylon extends BlockDE {
@SideOnly(Side.CLIENT)
public IIcon icon_active_face;
public IIcon icon_input;
@@ -1,14 +1,13 @@
package com.brandon3055.draconicevolution.common.blocks.multiblock;
import com.brandon3055.draconicevolution.DraconicEvolution;
import com.brandon3055.draconicevolution.common.blocks.DraconicEvolutionBlock;
import com.brandon3055.draconicevolution.common.blocks.BlockDE;
import com.brandon3055.draconicevolution.common.blocks.ModBlocks;
import com.brandon3055.draconicevolution.common.core.utills.LogHelper;
import com.brandon3055.draconicevolution.common.core.utills.Utills;
import com.brandon3055.draconicevolution.common.lib.References;
import com.brandon3055.draconicevolution.common.lib.Strings;
import com.brandon3055.draconicevolution.common.tileentities.multiblocktiles.TileEnergyStorageCore;
import com.brandon3055.draconicevolution.common.tileentities.multiblocktiles.TileInvisibleMultiblock;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import net.minecraft.block.Block;
@@ -25,7 +24,7 @@ import net.minecraftforge.common.util.ForgeDirection;
/**
* Created by Brandon on 25/07/2014.
*/
public class EnergyStorageCore extends DraconicEvolutionBlock {
public class EnergyStorageCore extends BlockDE {
public EnergyStorageCore() {
super(Material.iron);
@@ -1,14 +1,11 @@
package com.brandon3055.draconicevolution.common.blocks.multiblock;
import com.brandon3055.draconicevolution.DraconicEvolution;
import com.brandon3055.draconicevolution.common.blocks.DraconicEvolutionBlock;
import com.brandon3055.draconicevolution.common.blocks.Draconium;
import com.brandon3055.draconicevolution.common.blocks.BlockDE;
import com.brandon3055.draconicevolution.common.blocks.ModBlocks;
import com.brandon3055.draconicevolution.common.core.utills.LogHelper;
import com.brandon3055.draconicevolution.common.core.utills.Utills;
import com.brandon3055.draconicevolution.common.lib.References;
import com.brandon3055.draconicevolution.common.lib.Strings;
import com.brandon3055.draconicevolution.common.tileentities.TileParticleGenerator;
import com.brandon3055.draconicevolution.common.tileentities.multiblocktiles.TileEnergyPylon;
import com.brandon3055.draconicevolution.common.tileentities.multiblocktiles.TileEnergyStorageCore;
import com.brandon3055.draconicevolution.common.tileentities.multiblocktiles.TileInvisibleMultiblock;
@@ -23,16 +20,14 @@ import net.minecraft.item.Item;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.AxisAlignedBB;
import net.minecraft.util.ChatComponentText;
import net.minecraft.world.IBlockAccess;
import net.minecraft.world.World;
import net.minecraftforge.common.util.ForgeDirection;
import java.util.Random;
/**
* Created by Brandon on 25/07/2014.
*/
public class InvisibleMultiblock extends DraconicEvolutionBlock {
public class InvisibleMultiblock extends BlockDE {
public InvisibleMultiblock() {
super(Material.iron);
@@ -19,6 +19,7 @@ public class ConfigHandler {
public static int admin_dislocator_Max_Range;
public static int admin_dislocator_Detect_Range;
public static int disable_LRD;
public static boolean updateFix;
private static String[] defaultList = new String[] {"ExampleMob1", "ExampleMob2", "ExampleMob3 (these examples can be deleted)"};
@@ -36,6 +37,7 @@ public class ConfigHandler {
spawnerListType = config.get("Spawner", "listType", false, "Sets weather the spawner list is a white list or a black list (true = white list false = black list)").getBoolean(false);
spawnerList = config.getStringList("Spawn List", "Spawner", defaultList, "List of names that will be ether accepted or rejected by the spawner depending on the list type");
soulDropChance = config.get("Spawner", "soulDropChance", 1000, "Mobs have a 1 in this number chance to drop a soul", 1, Integer.MAX_VALUE).getInt(1000);
updateFix = config.get(Configuration.CATEGORY_GENERAL, "Update Fix", true, "Convert blocks from v0.9.2 to the v0.2.3+ format (set to false if you are not updating from v0.9.2 or earlier)").getBoolean(true);
//dislocator_Min_Range = config.get("Long Range Dislocator", "Admin Dislocator Min Range", 1000000).getInt(1000000);
//dislocator_Max_Range = config.get("Long Range Dislocator", "Admin Dislocator Max Range", 29000000).getInt(29000000);
@@ -1,5 +1,5 @@
package com.brandon3055.draconicevolution.common.core.handler;
public class FMLEventHandler {
public class FMLEventHandler {
}
@@ -1,22 +1,31 @@
package com.brandon3055.draconicevolution.common.core.handler;
import com.brandon3055.draconicevolution.common.blocks.ModBlocks;
import com.brandon3055.draconicevolution.common.core.utills.ItemNBTHelper;
import com.brandon3055.draconicevolution.common.core.utills.LogHelper;
import com.brandon3055.draconicevolution.common.core.utills.Utills;
import com.brandon3055.draconicevolution.common.items.ModItems;
import cpw.mods.fml.common.eventhandler.SubscribeEvent;
import net.minecraft.block.Block;
import net.minecraft.entity.Entity;
import net.minecraft.entity.EntityLivingBase;
import net.minecraft.entity.boss.IBossDisplayData;
import net.minecraft.entity.item.EntityItem;
import net.minecraft.entity.monster.IMob;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.init.Blocks;
import net.minecraft.item.ItemStack;
import net.minecraft.util.DamageSource;
import net.minecraft.world.World;
import net.minecraft.world.chunk.Chunk;
import net.minecraft.world.chunk.storage.ExtendedBlockStorage;
import net.minecraftforge.event.entity.living.LivingDeathEvent;
import net.minecraftforge.event.entity.living.LivingDropsEvent;
import net.minecraftforge.event.entity.living.LivingEvent.LivingUpdateEvent;
import net.minecraftforge.event.terraingen.PopulateChunkEvent;
import net.minecraftforge.event.world.ChunkEvent;
import sun.rmi.runtime.Log;
import java.util.ArrayList;
import java.util.List;
@@ -90,8 +99,7 @@ public class MinecraftForgeEventHandler {
}
}
private boolean isValidEntity(EntityLivingBase entity)
{
private boolean isValidEntity(EntityLivingBase entity){
if (entity instanceof IBossDisplayData) { return false; }
for (int i = 0; i < ConfigHandler.spawnerList.length; i++)
{
@@ -109,5 +117,41 @@ public class MinecraftForgeEventHandler {
return true;
}
}
@SubscribeEvent
public void ChunkEvent(ChunkEvent event) {
if (!ConfigHandler.updateFix) return;
Chunk chunk = event.getChunk();
for (ExtendedBlockStorage storage : chunk.getBlockStorageArray()) {
if (storage != null) {
for (int x = 0; x < 16; ++x) {
for (int y = 0; y < 16; ++y) {
for (int z = 0; z < 16; ++z) {
changeBlock(storage, x, y, z);
}
}
}
}
}
}
private boolean changeBlock(ExtendedBlockStorage storage, int x, int y, int z){
if (storage.getBlockByExtId(x, y, z).getUnlocalizedName().equals("tile.tile.particleGenerator")) return makeChange(storage, x, y, z, ModBlocks.particleGenerator);
else if (storage.getBlockByExtId(x, y, z).getUnlocalizedName().equals("tile.tile.customSpawner")) return makeChange(storage, x, y, z, ModBlocks.customSpawner);
else if (storage.getBlockByExtId(x, y, z).getUnlocalizedName().equals("tile.tile.generator")) return makeChange(storage, x, y, z, ModBlocks.generator);
else if (storage.getBlockByExtId(x, y, z).getUnlocalizedName().equals("tile.tile.playerDetectorAdvanced")) return makeChange(storage, x, y, z, ModBlocks.playerDetectorAdvanced);
else if (storage.getBlockByExtId(x, y, z).getUnlocalizedName().equals("tile.tile.energyInfuser")) return makeChange(storage, x, y, z, ModBlocks.energyInfuser);
else if (storage.getBlockByExtId(x, y, z).getUnlocalizedName().equals("tile.tile.draconiumOre")) return makeChange(storage, x, y, z, ModBlocks.draconiumOre);
else if (storage.getBlockByExtId(x, y, z).getUnlocalizedName().equals("tile.tile.weatherController")) return makeChange(storage, x, y, z, ModBlocks.weatherController);
else if (storage.getBlockByExtId(x, y, z).getUnlocalizedName().equals("tile.tile.longRangeDislocator")) return makeChange(storage, x, y, z, ModBlocks.longRangeDislocator);
else if (storage.getBlockByExtId(x, y, z).getUnlocalizedName().equals("tile.tile.grinder")) return makeChange(storage, x, y, z, ModBlocks.grinder);
return false;
}
private boolean makeChange(ExtendedBlockStorage storage, int x, int y, int z, Block block){
LogHelper.info("Changing block at [X:"+x+" Y:"+y+" Z:"+z+"] from "+storage.getBlockByExtId(x, y, z).getUnlocalizedName()+" to "+block.getUnlocalizedName());
storage.func_150818_a(x, y, z, block);
return true;
}
}
@@ -2,6 +2,7 @@ package com.brandon3055.draconicevolution.common.core.proxy;
import com.brandon3055.draconicevolution.common.core.handler.MinecraftForgeEventHandler;
import com.brandon3055.draconicevolution.common.core.network.*;
import com.brandon3055.draconicevolution.common.core.utills.Utills;
import com.brandon3055.draconicevolution.common.entity.EntityCustomDragon;
import com.brandon3055.draconicevolution.common.lib.References;
import com.brandon3055.draconicevolution.common.tileentities.*;
@@ -68,6 +69,7 @@ public class CommonProxy {
GameRegistry.registerTileEntity(TileEnergyStorageCore.class, "TileEnergyStorageCore");
GameRegistry.registerTileEntity(TileInvisibleMultiblock.class, "TileInvisibleMultiblock");
GameRegistry.registerTileEntity(TileEnergyPylon.class, "TileEnergyPylon");
GameRegistry.registerTileEntity(Utills.TileBlockChanger.class, "TileBlockChanger");
if(DraconicEvolution.debug)
GameRegistry.registerTileEntity(TileTestBlock.class, "TileTestBlock");
}
@@ -1,5 +1,10 @@
package com.brandon3055.draconicevolution.common.core.utills;
import com.brandon3055.draconicevolution.common.blocks.BlockDE;
import cpw.mods.fml.common.registry.GameRegistry;
import net.minecraft.block.Block;
import net.minecraft.block.material.Material;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.world.World;
@@ -21,4 +26,50 @@ public class Utills {
return String.valueOf(Math.round(value/10000000000D)/100D) + "T";
}
public static class BlockChanger extends Block{
private BlockDE block;
public BlockChanger(String name, BlockDE block) {
super(Material.rock);
this.setBlockName(name);
this.block = block;
GameRegistry.registerBlock(this, name);
}
@Override
public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer p_149727_5_, int p_149727_6_, float p_149727_7_, float p_149727_8_, float p_149727_9_) {
LogHelper.info(world.getBlock(x, y, z).getUnlocalizedName());
return false;
}
@Override
public boolean hasTileEntity(int metadata) {
return true;
}
@Override
public TileEntity createTileEntity(World world, int metadata) {
return new TileBlockChanger(block);
}
}
public static class TileBlockChanger extends TileEntity {
BlockDE block;
public TileBlockChanger(BlockDE block) {
this.block = block;
}
@Override
public void updateEntity() {
if (worldObj.isRemote) {
worldObj.removeTileEntity(xCoord, yCoord, zCoord);
return;
}
LogHelper.info("Changing block at [X:"+xCoord+" Y:"+yCoord+" Z:"+zCoord+"] from "+worldObj.getBlock(xCoord,yCoord,zCoord).getUnlocalizedName()+" to "+block.getUnlocalizedName());
worldObj.setBlock(xCoord, yCoord, zCoord, block);
worldObj.removeTileEntity(xCoord,yCoord,zCoord);
}
}
}
@@ -7,7 +7,7 @@ import com.brandon3055.draconicevolution.common.lib.Strings;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack;
public class DraconicCompound extends DraconicEvolutionItem {
public class DraconicCompound extends ItemDE {
public DraconicCompound() {
this.setUnlocalizedName(Strings.draconicCompoundName);
this.setCreativeTab(DraconicEvolution.getCreativeTab(2));
@@ -1,6 +1,5 @@
package com.brandon3055.draconicevolution.common.items;
import cofh.api.energy.EnergyStorage;
import com.brandon3055.draconicevolution.DraconicEvolution;
import com.brandon3055.draconicevolution.common.blocks.ModBlocks;
import com.brandon3055.draconicevolution.common.lib.Strings;
@@ -13,7 +12,7 @@ import net.minecraft.world.World;
import java.util.List;
public class DraconicCore extends DraconicEvolutionItem {
public class DraconicCore extends ItemDE {
public DraconicCore() {
this.setUnlocalizedName(Strings.draconicCoreName);
this.setCreativeTab(DraconicEvolution.getCreativeTab(2));
@@ -3,7 +3,7 @@ package com.brandon3055.draconicevolution.common.items;
import com.brandon3055.draconicevolution.DraconicEvolution;
import com.brandon3055.draconicevolution.common.lib.Strings;
public class DraconiumBlend extends DraconicEvolutionItem {
public class DraconiumBlend extends ItemDE {
public DraconiumBlend() {
this.setUnlocalizedName(Strings.draconiumBlendName);
this.setCreativeTab(DraconicEvolution.getCreativeTab(2));
@@ -3,7 +3,7 @@ package com.brandon3055.draconicevolution.common.items;
import com.brandon3055.draconicevolution.DraconicEvolution;
import com.brandon3055.draconicevolution.common.lib.Strings;
public class DraconiumDust extends DraconicEvolutionItem {
public class DraconiumDust extends ItemDE {
public DraconiumDust() {
this.setUnlocalizedName(Strings.draconiumDustName);
this.setCreativeTab(DraconicEvolution.getCreativeTab(2));
@@ -3,7 +3,7 @@ package com.brandon3055.draconicevolution.common.items;
import com.brandon3055.draconicevolution.DraconicEvolution;
import com.brandon3055.draconicevolution.common.lib.Strings;
public class DraconiumIngot extends DraconicEvolutionItem {
public class DraconiumIngot extends ItemDE {
public DraconiumIngot() {
this.setUnlocalizedName(Strings.draconiumIngotName);
this.setCreativeTab(DraconicEvolution.getCreativeTab(2));
@@ -3,7 +3,7 @@ package com.brandon3055.draconicevolution.common.items;
import com.brandon3055.draconicevolution.DraconicEvolution;
import com.brandon3055.draconicevolution.common.lib.Strings;
public class DragonHeart extends DraconicEvolutionItem {
public class DragonHeart extends ItemDE {
public DragonHeart() {
this.setUnlocalizedName(Strings.dragonHeartName);
this.setCreativeTab(DraconicEvolution.getCreativeTab(2));
@@ -3,7 +3,7 @@ package com.brandon3055.draconicevolution.common.items;
import com.brandon3055.draconicevolution.DraconicEvolution;
import com.brandon3055.draconicevolution.common.lib.Strings;
public class InfusedCompound extends DraconicEvolutionItem {
public class InfusedCompound extends ItemDE {
public InfusedCompound() {
this.setUnlocalizedName(Strings.infusedCompoundName);
this.setCreativeTab(DraconicEvolution.getCreativeTab(2));
@@ -8,22 +8,22 @@ import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import com.brandon3055.draconicevolution.common.lib.References;
public class DraconicEvolutionItem extends Item {
public class ItemDE extends Item {
public String getUnwrappedUnlocalizedName(final String unlocalizedName)
{
return unlocalizedName.substring(unlocalizedName.indexOf(".") + 1);
}
@Override
public String getUnlocalizedName()
{
return String.format("item.%s", getUnwrappedUnlocalizedName(super.getUnlocalizedName()));
public String getUnlocalizedName(){
//return String.format("item.%s", getUnwrappedUnlocalizedName(super.getUnlocalizedName()));
return String.format("item.%s%s", References.MODID.toLowerCase() + ":", getUnwrappedUnlocalizedName(super.getUnlocalizedName()));
}
@Override
public String getUnlocalizedName(final ItemStack itemStack)
{
return String.format("item.%s", getUnwrappedUnlocalizedName(super.getUnlocalizedName()));
public String getUnlocalizedName(final ItemStack itemStack){
//return String.format("item.%s", getUnwrappedUnlocalizedName(super.getUnlocalizedName()));
return getUnlocalizedName();
}
@Override
@@ -1,8 +1,6 @@
package com.brandon3055.draconicevolution.common.items;
import com.brandon3055.draconicevolution.DraconicEvolution;
import com.brandon3055.draconicevolution.common.core.utills.ItemNBTHelper;
import com.brandon3055.draconicevolution.common.core.utills.LogHelper;
import com.brandon3055.draconicevolution.common.lib.Strings;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
@@ -20,7 +18,7 @@ import java.util.List;
/**
* Created by Brandon on 7/07/2014.
*/
public class MobSoul extends DraconicEvolutionItem {
public class MobSoul extends ItemDE {
public MobSoul() {
this.setUnlocalizedName(Strings.MobSoulName);
ModItems.register(this);
@@ -49,20 +49,20 @@ public class ModItems {
public static Item wyvernLeggs;
public static Item wyvernBoots;
public static Item infusedCompound;
public static Item draconiumDust;
public static Item draconiumIngot;
public static Item draconiumBlend;
public static Item dragonHeart;
public static ItemDE infusedCompound;
public static ItemDE draconiumDust;
public static ItemDE draconiumIngot;
public static ItemDE draconiumBlend;
public static ItemDE dragonHeart;
public static Item draconicDistructionStaff;
public static Item draconicCompound;
public static Item tclogo;
public static Item draconicCore;
public static Item sunFocus;
public static Item mobSoul;
public static ItemDE draconicCompound;
public static ItemDE tclogo;
public static ItemDE draconicCore;
public static ItemDE sunFocus;
public static ItemDE mobSoul;
public static Item teleporterMKI;
public static Item teleporterMKII;
public static ItemDE teleporterMKI;
public static ItemDE teleporterMKII;
public static void init()
@@ -103,8 +103,10 @@ public class ModItems {
}
public static void register(final DraconicEvolutionItem item)
public static void register(final ItemDE item)
{
GameRegistry.registerItem(item, item.getUnwrappedUnlocalizedName(item.getUnlocalizedName()));
String name = item.getUnwrappedUnlocalizedName(item.getUnlocalizedName());
GameRegistry.registerItem(item, name.substring(name.indexOf(":") + 1));
//GameRegistry.registerItem(item, item.getUnwrappedUnlocalizedName(item.getUnlocalizedName()));
}
}
@@ -3,7 +3,7 @@ package com.brandon3055.draconicevolution.common.items;
import com.brandon3055.draconicevolution.DraconicEvolution;
import com.brandon3055.draconicevolution.common.lib.Strings;
public class SunFocus extends DraconicEvolutionItem {
public class SunFocus extends ItemDE {
public SunFocus() {
this.setUnlocalizedName(Strings.sunFocusName);
this.setCreativeTab(DraconicEvolution.getCreativeTab(2));
@@ -2,22 +2,20 @@ package com.brandon3055.draconicevolution.common.items;
import java.util.List;
import com.brandon3055.draconicevolution.DraconicEvolution;
import com.brandon3055.draconicevolution.common.entity.EntityCustomDragon;
import com.brandon3055.draconicevolution.common.items.tools.ToolHandler;
import com.brandon3055.draconicevolution.common.core.utills.LogHelper;
import com.brandon3055.draconicevolution.common.lib.References;
import net.minecraft.entity.Entity;
import net.minecraft.entity.effect.EntityLightningBolt;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.EnumAction;
import net.minecraft.item.ItemStack;
import net.minecraft.util.EnumChatFormatting;
import net.minecraft.util.MovingObjectPosition;
import net.minecraft.world.World;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import com.brandon3055.draconicevolution.common.lib.Strings;
public class Tclogo extends DraconicEvolutionItem {
public class Tclogo extends ItemDE {
public Tclogo() {
this.setUnlocalizedName(Strings.tclogoName);
//this.setCreativeTab(draconicevolution.getCreativeTab());
@@ -75,19 +73,11 @@ public class Tclogo extends DraconicEvolutionItem {
@Override
public ItemStack onItemRightClick(ItemStack stack, World world, EntityPlayer player)
{
String name = References.MODID.toLowerCase() + ":" + getUnwrappedUnlocalizedName(getUnlocalizedName());
name = name.substring(name.indexOf(":") + 1);
world.spawnEntityInWorld(new EntityLightningBolt(world, player.posX, player.posY, player.posZ + 5));
int xPos = (int) player.posX;
int yPos = (int) player.posY;
int zPos = (int) player.posZ;
for (int x = xPos - 5; x < xPos + 5; x++) {
for (int z = zPos - 5; z < zPos + 5; z++) {
if (!world.isRemote) world.markBlockForUpdate(x, yPos, z);
}
}
LogHelper.info(getUnlocalizedName());
return stack;
}
@@ -45,6 +45,17 @@ public class DraconicArmor extends ItemArmor implements ISpecialArmor{
GameRegistry.registerItem(this, name);
}
@Override
public String getUnlocalizedName(){
return String.format("item.%s%s", References.MODID.toLowerCase() + ":", super.getUnlocalizedName().substring(super.getUnlocalizedName().indexOf(".") + 1));
}
@Override
public String getUnlocalizedName(final ItemStack itemStack){
return getUnlocalizedName();
}
@Override
@SideOnly(Side.CLIENT)
public void registerIcons(IIconRegister iconRegister) {
@@ -44,6 +44,17 @@ public class WyvernArmor extends ItemArmor implements ISpecialArmor{
GameRegistry.registerItem(this, name);
}
@Override
public String getUnlocalizedName(){
return String.format("item.%s%s", References.MODID.toLowerCase() + ":", super.getUnlocalizedName().substring(super.getUnlocalizedName().indexOf(".") + 1));
}
@Override
public String getUnlocalizedName(final ItemStack itemStack){
return getUnlocalizedName();
}
@Override
@SideOnly(Side.CLIENT)
public void registerIcons(IIconRegister iconRegister) {
@@ -39,6 +39,17 @@ public class DraconicAxe extends ItemAxe implements IEnergyContainerItem{
GameRegistry.registerItem(this, Strings.draconicAxeName);
}
@Override
public String getUnlocalizedName(){
return String.format("item.%s%s", References.MODID.toLowerCase() + ":", super.getUnlocalizedName().substring(super.getUnlocalizedName().indexOf(".") + 1));
}
@Override
public String getUnlocalizedName(final ItemStack itemStack){
return getUnlocalizedName();
}
@Override
@SideOnly(Side.CLIENT)
public void registerIcons(final IIconRegister iconRegister) {
@@ -75,6 +75,17 @@ public class DraconicDistructionStaff extends ItemTool implements IEnergyContain
GameRegistry.registerItem(this, Strings.draconicDStaffName);
}
@Override
public String getUnlocalizedName(){
return String.format("item.%s%s", References.MODID.toLowerCase() + ":", super.getUnlocalizedName().substring(super.getUnlocalizedName().indexOf(".") + 1));
}
@Override
public String getUnlocalizedName(final ItemStack itemStack){
return getUnlocalizedName();
}
@Override
public boolean func_150897_b(Block block) {
return block == Blocks.obsidian ? toolMaterial.getHarvestLevel() == 3 : (block != Blocks.diamond_block && block != Blocks.diamond_ore ? (block != Blocks.emerald_ore && block != Blocks.emerald_block ? (block != Blocks.gold_block && block != Blocks.gold_ore ? (block != Blocks.iron_block && block != Blocks.iron_ore ? (block != Blocks.lapis_block && block != Blocks.lapis_ore ? (block != Blocks.redstone_ore && block != Blocks.lit_redstone_ore ? (block.getMaterial() == Material.rock ? true : (block.getMaterial() == Material.iron ? true : block.getMaterial() == Material.anvil)) : this.toolMaterial.getHarvestLevel() >= 2) : this.toolMaterial.getHarvestLevel() >= 1) : this.toolMaterial.getHarvestLevel() >= 1) : this.toolMaterial.getHarvestLevel() >= 2) : this.toolMaterial.getHarvestLevel() >= 2) : this.toolMaterial.getHarvestLevel() >= 2);
@@ -43,6 +43,17 @@ public class DraconicHoe extends ItemHoe implements IEnergyContainerItem{
GameRegistry.registerItem(this, Strings.draconicHoeName);
}
@Override
public String getUnlocalizedName(){
return String.format("item.%s%s", References.MODID.toLowerCase() + ":", super.getUnlocalizedName().substring(super.getUnlocalizedName().indexOf(".") + 1));
}
@Override
public String getUnlocalizedName(final ItemStack itemStack){
return getUnlocalizedName();
}
@Override
@SideOnly(Side.CLIENT)
public void registerIcons(final IIconRegister iconRegister) {
@@ -45,6 +45,17 @@ public class DraconicPickaxe extends ItemPickaxe implements IEnergyContainerItem
GameRegistry.registerItem(this, Strings.draconicPickaxeName);
}
@Override
public String getUnlocalizedName(){
return String.format("item.%s%s", References.MODID.toLowerCase() + ":", super.getUnlocalizedName().substring(super.getUnlocalizedName().indexOf(".") + 1));
}
@Override
public String getUnlocalizedName(final ItemStack itemStack){
return getUnlocalizedName();
}
@Override
@SideOnly(Side.CLIENT)
public void registerIcons(final IIconRegister iconRegister)
@@ -45,6 +45,17 @@ public class DraconicShovel extends ItemSpade implements IEnergyContainerItem{
GameRegistry.registerItem(this, Strings.draconicShovelName);
}
@Override
public String getUnlocalizedName(){
return String.format("item.%s%s", References.MODID.toLowerCase() + ":", super.getUnlocalizedName().substring(super.getUnlocalizedName().indexOf(".") + 1));
}
@Override
public String getUnlocalizedName(final ItemStack itemStack){
return getUnlocalizedName();
}
@Override
@SideOnly(Side.CLIENT)
public void registerIcons(final IIconRegister iconRegister)
@@ -1,5 +1,6 @@
package com.brandon3055.draconicevolution.common.items.tools;
import com.brandon3055.draconicevolution.common.items.ItemDE;
import net.minecraft.client.renderer.texture.IIconRegister;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.init.Items;
@@ -16,7 +17,7 @@ import com.brandon3055.draconicevolution.DraconicEvolution;
import com.brandon3055.draconicevolution.common.lib.References;
import com.brandon3055.draconicevolution.common.lib.Strings;
public class Reader extends Item
public class Reader extends ItemDE
{
public Reader() {
this.setUnlocalizedName(Strings.readerName);
@@ -2,6 +2,7 @@ package com.brandon3055.draconicevolution.common.items.tools;
import java.util.List;
import com.brandon3055.draconicevolution.common.items.ItemDE;
import net.minecraft.client.renderer.texture.IIconRegister;
import net.minecraft.entity.Entity;
import net.minecraft.entity.boss.IBossDisplayData;
@@ -27,7 +28,7 @@ import com.brandon3055.draconicevolution.common.items.ModItems;
import com.brandon3055.draconicevolution.common.lib.References;
import com.brandon3055.draconicevolution.common.lib.Strings;
public class TeleporterMKI extends Item
public class TeleporterMKI extends ItemDE
{
public TeleporterMKI() {
@@ -2,6 +2,7 @@ package com.brandon3055.draconicevolution.common.items.tools;
import java.util.List;
import com.brandon3055.draconicevolution.common.items.ItemDE;
import net.minecraft.client.renderer.texture.IIconRegister;
import net.minecraft.entity.Entity;
import net.minecraft.entity.boss.IBossDisplayData;
@@ -27,7 +28,7 @@ import com.brandon3055.draconicevolution.common.items.ModItems;
import com.brandon3055.draconicevolution.common.lib.References;
import com.brandon3055.draconicevolution.common.lib.Strings;
public class TeleporterMKII extends Item
public class TeleporterMKII extends ItemDE
{
public TeleporterMKII() {
@@ -44,6 +44,17 @@ public class WyvernPickaxe extends ItemPickaxe implements IEnergyContainerItem{
GameRegistry.registerItem(this, Strings.wyvernPickaxeName);
}
@Override
public String getUnlocalizedName(){
return String.format("item.%s%s", References.MODID.toLowerCase() + ":", super.getUnlocalizedName().substring(super.getUnlocalizedName().indexOf(".") + 1));
}
@Override
public String getUnlocalizedName(final ItemStack itemStack){
return getUnlocalizedName();
}
@Override
@SideOnly(Side.CLIENT)
public void registerIcons(final IIconRegister iconRegister)
@@ -44,6 +44,17 @@ public class WyvernShovel extends ItemSpade implements IEnergyContainerItem{
GameRegistry.registerItem(this, Strings.wyvernShovelName);
}
@Override
public String getUnlocalizedName(){
return String.format("item.%s%s", References.MODID.toLowerCase() + ":", super.getUnlocalizedName().substring(super.getUnlocalizedName().indexOf(".") + 1));
}
@Override
public String getUnlocalizedName(final ItemStack itemStack){
return getUnlocalizedName();
}
@Override
@SideOnly(Side.CLIENT)
public void registerIcons(final IIconRegister iconRegister)
@@ -40,6 +40,17 @@ public class DraconicBow extends ItemBow
GameRegistry.registerItem(this, Strings.draconicBowName);
}
@Override
public String getUnlocalizedName(){
return String.format("item.%s%s", References.MODID.toLowerCase() + ":", super.getUnlocalizedName().substring(super.getUnlocalizedName().indexOf(".") + 1));
}
@Override
public String getUnlocalizedName(final ItemStack itemStack){
return getUnlocalizedName();
}
/* ======================================== CUSTOMEBOW START =====================================*/
@Override
public ItemStack onItemRightClick(ItemStack stack, World world, EntityPlayer player)
@@ -113,26 +124,15 @@ public class DraconicBow extends ItemBow
@SideOnly(Side.CLIENT)
public void registerIcons(IIconRegister iconRegister)
{
this.itemIcon = iconRegister.registerIcon(getUnwrappedUnlocalizedName(getUnlocalizedName()) + "_standby");
this.itemIcon = iconRegister.registerIcon(References.RESOURCESPREFIX + "draconic_bow" + "_standby");
this.iconArray = new IIcon[bowPullIconNameArray.length];
for (int i = 0; i < this.iconArray.length; ++i)
{
this.iconArray[i] = iconRegister.registerIcon(getUnwrappedUnlocalizedName(getUnlocalizedName()) + "_" + bowPullIconNameArray[i]);
this.iconArray[i] = iconRegister.registerIcon(References.RESOURCESPREFIX + "draconic_bow" + "_" + bowPullIconNameArray[i]);
}
}
@Override
public String getUnlocalizedName()
{
return String.format("item.%s%s", References.RESOURCESPREFIX, getUnwrappedUnlocalizedName(super.getUnlocalizedName()));
}
public String getUnwrappedUnlocalizedName(final String unlocalizedName)
{
return unlocalizedName.substring(unlocalizedName.indexOf(".") + 1);
}
@Override
@SideOnly(Side.CLIENT)
public IIcon getIcon(ItemStack stack, int renderPass, EntityPlayer player, ItemStack usingItem, int useRemaining)
@@ -34,6 +34,17 @@ public class DraconicSword extends ItemSword implements IEnergyContainerItem{
GameRegistry.registerItem(this, Strings.draconicSwordName);
}
@Override
public String getUnlocalizedName(){
return String.format("item.%s%s", References.MODID.toLowerCase() + ":", super.getUnlocalizedName().substring(super.getUnlocalizedName().indexOf(".") + 1));
}
@Override
public String getUnlocalizedName(final ItemStack itemStack){
return getUnlocalizedName();
}
@Override
@SideOnly(Side.CLIENT)
public void registerIcons(final IIconRegister iconRegister)
@@ -39,6 +39,17 @@ public class WyvernBow extends ItemBow {
GameRegistry.registerItem(this, Strings.wyvernBowName);
}
@Override
public String getUnlocalizedName(){
return String.format("item.%s%s", References.MODID.toLowerCase() + ":", super.getUnlocalizedName().substring(super.getUnlocalizedName().indexOf(".") + 1));
}
@Override
public String getUnlocalizedName(final ItemStack itemStack){
return getUnlocalizedName();
}
/* ======================================== CUSTOMEBOW START =====================================*/
@Override
public ItemStack onItemRightClick(ItemStack stack, World world, EntityPlayer player)
@@ -99,25 +110,14 @@ public class WyvernBow extends ItemBow {
@SideOnly(Side.CLIENT)
public void registerIcons(IIconRegister iconRegister)
{
this.itemIcon = iconRegister.registerIcon(References.RESOURCESPREFIX + getUnwrappedUnlocalizedName(getUnlocalizedName()) + "_standby");
this.itemIcon = iconRegister.registerIcon(References.RESOURCESPREFIX + "wyvern_bow" + "_standby");
this.iconArray = new IIcon[bowPullIconNameArray.length];
for (int i = 0; i < this.iconArray.length; ++i) {
this.iconArray[i] = iconRegister.registerIcon(References.RESOURCESPREFIX + getUnwrappedUnlocalizedName(getUnlocalizedName()) + "_" + bowPullIconNameArray[i]);
this.iconArray[i] = iconRegister.registerIcon(References.RESOURCESPREFIX + "wyvern_bow" + "_" + bowPullIconNameArray[i]);
}
}
@Override
public String getUnlocalizedName()
{
return String.format("item.%s", getUnwrappedUnlocalizedName(super.getUnlocalizedName()));
}
public String getUnwrappedUnlocalizedName(final String unlocalizedName)
{
return unlocalizedName.substring(unlocalizedName.indexOf(".") + 1);
}
@Override
@SideOnly(Side.CLIENT)
public IIcon getIcon(ItemStack stack, int renderPass, EntityPlayer player, ItemStack usingItem, int useRemaining)
@@ -3,6 +3,7 @@ package com.brandon3055.draconicevolution.common.items.weapons;
import java.util.List;
import cofh.api.energy.IEnergyContainerItem;
import com.brandon3055.draconicevolution.common.core.utills.LogHelper;
import net.minecraft.client.renderer.texture.IIconRegister;
import net.minecraft.entity.Entity;
import net.minecraft.entity.EntityLivingBase;
@@ -36,6 +37,18 @@ public class WyvernSword extends ItemSword implements IEnergyContainerItem{
GameRegistry.registerItem(this, Strings.wyvernSwordName);
}
@Override
public String getUnlocalizedName(){
return String.format("item.%s%s", References.MODID.toLowerCase() + ":", super.getUnlocalizedName().substring(super.getUnlocalizedName().indexOf(".") + 1));
}
@Override
public String getUnlocalizedName(final ItemStack itemStack){
return getUnlocalizedName();
}
@Override
@SideOnly(Side.CLIENT)
public void registerIcons(final IIconRegister iconRegister)
@@ -629,6 +629,7 @@ public class TileEnergyStorageCore extends TileEntity {
break;
}
this.capacity = capacity;
if (energy > capacity) energy = capacity;
}
public void deactivateStabilizers(){
@@ -731,6 +732,7 @@ public class TileEnergyStorageCore extends TileEntity {
break;
}
this.capacity = capacity;
if (energy > capacity) energy = capacity;
super.readFromNBT(compound);
}