Auto update mappings

This commit is contained in:
modmuss50 2016-05-06 22:13:24 +01:00
parent 595c9575b1
commit 4095a0b52d
79 changed files with 704 additions and 644 deletions

View file

@ -39,9 +39,9 @@ public class BlockFusionControlComputer extends BlockMachineBase implements IAdv
}
@Override
public void onEntityCollidedWithBlock(World worldIn, BlockPos pos, Entity entityIn)
public void onEntityWalk(World worldIn, BlockPos pos, Entity entityIn)
{
super.onEntityCollidedWithBlock(worldIn, pos, entityIn);
super.onEntityWalk(worldIn, pos, entityIn);
if (worldIn.getTileEntity(pos) instanceof TileEntityFusionController)
{
if (((TileEntityFusionController) worldIn.getTileEntity(pos)).crafingTickTime != 0

View file

@ -10,7 +10,7 @@ public class BlockIronFence extends BlockFence
public BlockIronFence()
{
super(Material.iron, BlockPlanks.EnumType.OAK.getMapColor());
super(Material.IRON, BlockPlanks.EnumType.OAK.getMapColor());
setUnlocalizedName("techreborn.ironfence");
setCreativeTab(TechRebornCreativeTabMisc.instance);
setHardness(2.0F);

View file

@ -30,7 +30,7 @@ public class BlockNuke extends BaseBlock implements ITexturedBlock
public BlockNuke()
{
super(Material.tnt);
super(Material.TNT);
setUnlocalizedName("techreborn.nuke");
setCreativeTab(TechRebornCreativeTabMisc.instance);
RebornCore.jsonDestroyer.registerObject(this);

View file

@ -133,7 +133,7 @@ public class BlockOre extends BaseBlock implements ITexturedBlock, IOreNameProvi
{
OreDrop cinnabar = new OreDrop(ItemDusts.getDustByName("cinnabar"),
ConfigTechReborn.FortuneSecondaryOreMultiplierPerLevel);
OreDrop redstone = new OreDrop(new ItemStack(Items.redstone), 0.25);
OreDrop redstone = new OreDrop(new ItemStack(Items.REDSTONE), 0.25);
OreDropSet set = new OreDropSet(cinnabar, redstone);
return set.drop(fortune, random);
}

View file

@ -35,7 +35,7 @@ public class BlockRubberLog extends Block implements ITexturedBlock
public BlockRubberLog()
{
super(Material.wood);
super(Material.WOOD);
setUnlocalizedName("techreborn.rubberlog");
setCreativeTab(TechRebornCreativeTabMisc.instance);
this.setHardness(2.0F);

View file

@ -16,7 +16,7 @@ public class BlockRubberPlank extends Block implements ITexturedBlock
public BlockRubberPlank()
{
super(Material.wood);
super(Material.WOOD);
RebornCore.jsonDestroyer.registerObject(this);
setUnlocalizedName("techreborn.rubberplank");
setCreativeTab(TechRebornCreativeTabMisc.instance);

View file

@ -26,7 +26,7 @@ public class BlockSolarPanel extends BaseTileBlock implements ITexturedBlock
public BlockSolarPanel()
{
super(Material.iron);
super(Material.IRON);
setUnlocalizedName("techreborn.solarpanel");
setCreativeTab(TechRebornCreativeTab.instance);
this.setDefaultState(this.getDefaultState().withProperty(ACTIVE, false));

View file

@ -21,7 +21,7 @@ public class BlockWaterMill extends BaseTileBlock implements ITexturedBlock
public BlockWaterMill()
{
super(Material.iron);
super(Material.IRON);
setUnlocalizedName("techreborn.watermill");
setCreativeTab(TechRebornCreativeTab.instance);
setHardness(2.0F);

View file

@ -21,7 +21,7 @@ public class BlockWindMill extends BaseTileBlock implements ITexturedBlock
public BlockWindMill()
{
super(Material.iron);
super(Material.IRON);
setUnlocalizedName("techreborn.windmill");
setCreativeTab(TechRebornCreativeTab.instance);
setHardness(2.0F);

View file

@ -45,7 +45,7 @@ public abstract class BlockEnergyStorage extends BaseTileBlock implements IRotat
public BlockEnergyStorage(String name, int guiID)
{
super(Material.rock);
super(Material.ROCK);
setHardness(2f);
setUnlocalizedName("techreborn." + name.toLowerCase());
setCreativeTab(TechRebornCreativeTab.instance);

View file

@ -40,7 +40,7 @@ public abstract class BlockTransformer extends BaseTileBlock implements IRotatio
public BlockTransformer(String name)
{
super(Material.rock);
super(Material.ROCK);
setHardness(2f);
setUnlocalizedName("techreborn." + name.toLowerCase());
setCreativeTab(TechRebornCreativeTab.instance);