Skip to content
This repository has been archived by the owner on Feb 1, 2022. It is now read-only.

Commit

Permalink
update MCP names
Browse files Browse the repository at this point in the history
  • Loading branch information
@progwml6
progwml6 committed Feb 5, 2014
1 parent 5e3e9ec commit a5fb42b
Show file tree
Hide file tree
Showing 3 changed files with 30 additions and 30 deletions.
4 changes: 2 additions & 2 deletions build.properties
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
minecraft_version=1.7.2
forge_version=10.12.0.993
mantle_version=2db77d
forge_version=10.12.0.1024
mantle_version=e2c89a
42 changes: 21 additions & 21 deletions src/main/java/paintedstone/PaintedStone.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,24 +34,24 @@ public void preInit (FMLPreInitializationEvent event)
MinecraftForge.EVENT_BUS.register(this);
TConstruct = Loader.isModLoaded("TConstruct");
tab = new TabPaintedStone("paintedstone");
//TODO Material.field_151576_e setName
coloredCobble = new PaintedStoneBlock(Material.field_151576_e, 2.0f, "stone_cobble", "stone.cobble").func_149663_c("paintedstone.cobble");
//TODO Material.rock setName
coloredCobble = new PaintedStoneBlock(Material.rock, 2.0f, "stone_cobble", "stone.cobble").setBlockName("paintedstone.cobble");
GameRegistry.registerBlock(coloredCobble, PaintedStoneItem.class, "paintedstone.cobble", "PaintedStone");
coloredStone = new PaintedStoneBlock( Material.field_151576_e, 1.5f, "stone_raw", "stone.raw", coloredCobble).func_149663_c("paintedstone.raw");
coloredStone = new PaintedStoneBlock( Material.rock, 1.5f, "stone_raw", "stone.raw", coloredCobble).setBlockName("paintedstone.raw");
GameRegistry.registerBlock(coloredStone, PaintedStoneItem.class, "paintedstone.raw", "PaintedStone");
coloredMossCobble = new PaintedStoneBlock(Material.field_151576_e, 2.0f, "stone_mosscobble", "stone.mosscobble").func_149663_c("paintedstone.mosscobble");
coloredMossCobble = new PaintedStoneBlock(Material.rock, 2.0f, "stone_mosscobble", "stone.mosscobble").setBlockName("paintedstone.mosscobble");
GameRegistry.registerBlock(coloredMossCobble, PaintedStoneItem.class, "paintedstone.mosscobble", "PaintedStone");
coloredStoneBrick = new PaintedStoneBlock(Material.field_151576_e, 1.5f, "stone_brick", "stone.brick").func_149663_c("paintedstone.brick");
coloredStoneBrick = new PaintedStoneBlock(Material.rock, 1.5f, "stone_brick", "stone.brick").setBlockName("paintedstone.brick");
GameRegistry.registerBlock(coloredStoneBrick, PaintedStoneItem.class, "paintedstone.brick", "PaintedStone");
coloredMossStoneBrick = new PaintedStoneBlock(Material.field_151576_e, 1.5f, "stone_mossbrick", "stone.mossbrick").func_149663_c("paintedstone.mossbrick");
coloredMossStoneBrick = new PaintedStoneBlock(Material.rock, 1.5f, "stone_mossbrick", "stone.mossbrick").setBlockName("paintedstone.mossbrick");
GameRegistry.registerBlock(coloredMossStoneBrick, PaintedStoneItem.class, "paintedstone.mossbrick", "PaintedStone");
coloredCrackedStoneBrick = new PaintedStoneBlock(Material.field_151576_e, 1.5f, "stone_crackedbrick", "stone.crackedbrick").func_149663_c("paintedstone.crackedbrick");
coloredCrackedStoneBrick = new PaintedStoneBlock(Material.rock, 1.5f, "stone_crackedbrick", "stone.crackedbrick").setBlockName("paintedstone.crackedbrick");
GameRegistry.registerBlock(coloredCrackedStoneBrick, PaintedStoneItem.class, "paintedstone.crackedbrick", "PaintedStone");
coloredStoneRoad = new PaintedStoneBlock(Material.field_151576_e, 1.5f, "stone_road", "stone.road").func_149663_c("paintedstone.road");
coloredStoneRoad = new PaintedStoneBlock(Material.rock, 1.5f, "stone_road", "stone.road").setBlockName("paintedstone.road");
GameRegistry.registerBlock(coloredStoneRoad, PaintedStoneItem.class, "paintedstone.road", "PaintedStone");
coloredStoneFancyBrick = new PaintedStoneBlock(Material.field_151576_e, 1.5f, "stone_fancy", "stone.fancy").func_149663_c("paintedstone.fancy");
coloredStoneFancyBrick = new PaintedStoneBlock(Material.rock, 1.5f, "stone_fancy", "stone.fancy").setBlockName("paintedstone.fancy");
GameRegistry.registerBlock(coloredStoneFancyBrick, PaintedStoneItem.class, "paintedstone.fancy", "PaintedStone");
coloredStoneSquareBrick = new PaintedStoneBlock(Material.field_151576_e, 1.5f, "stone_square", "stone.chiseled").func_149663_c("paintedstone.chiseled");
coloredStoneSquareBrick = new PaintedStoneBlock(Material.rock, 1.5f, "stone_square", "stone.chiseled").setBlockName("paintedstone.chiseled");
GameRegistry.registerBlock(coloredStoneSquareBrick, PaintedStoneItem.class, "paintedstone.chiseled", "PaintedStone");

for (int i = 0; i < 16; i++)
Expand Down Expand Up @@ -116,7 +116,7 @@ public void playerInteract (PlayerInteractEvent event)
Block block = Blocks.stone;
//TODO stepSound.getPlaceSound(), stepSound.getVolume(), stepSound.getPitch()
player.worldObj.playSoundEffect((double) ((float) event.x + 0.5F), (double) ((float) event.y + 0.5F), (double) ((float) event.z + 0.5F),
block.field_149762_H.func_150496_b(), (block.field_149762_H.func_150497_c() + 1.0F) / 2.0F, block.field_149762_H.func_150494_d() * 0.8F);
block.stepSound.func_150496_b(), (block.stepSound.getVolume() + 1.0F) / 2.0F, block.stepSound.getPitch() * 0.8F);
}
}
break;
Expand All @@ -138,36 +138,36 @@ public boolean colorStoneBlocks (World world, int x, int y, int z, int inputMeta
for (int zPos = -range; zPos <= range; zPos++)
{
//TODO getBlock()
Block block = world.func_147439_a(x + xPos, y + yPos, z + zPos);
Block block = world.getBlock(x + xPos, y + yPos, z + zPos);
if (block == Blocks.stone)
{
changed = true;
//TODO setBlock()
world.func_147465_d(x + xPos, y + yPos, z + zPos, coloredStone, inputMeta, 3);
world.setBlock(x + xPos, y + yPos, z + zPos, coloredStone, inputMeta, 3);
}
else if (block == Blocks.cobblestone)
{
changed = true;
world.func_147465_d(x + xPos, y + yPos, z + zPos, coloredCobble, inputMeta, 3);
world.setBlock(x + xPos, y + yPos, z + zPos, coloredCobble, inputMeta, 3);
}
else if (block == Blocks.mossy_cobblestone)
{
changed = true;
world.func_147465_d(x + xPos, y + yPos, z + zPos, coloredMossCobble, inputMeta, 3);
world.setBlock(x + xPos, y + yPos, z + zPos, coloredMossCobble, inputMeta, 3);
}
else if (block == Blocks.stonebrick)
{
changed = true;
int meta = world.getBlockMetadata(x + xPos, y + yPos, z + zPos);

if (meta == 0)
world.func_147465_d(x + xPos, y + yPos, z + zPos, coloredStoneBrick, inputMeta, 3);
world.setBlock(x + xPos, y + yPos, z + zPos, coloredStoneBrick, inputMeta, 3);
else if (meta == 1)
world.func_147465_d(x + xPos, y + yPos, z + zPos, coloredCrackedStoneBrick, inputMeta, 3);
world.setBlock(x + xPos, y + yPos, z + zPos, coloredCrackedStoneBrick, inputMeta, 3);
else if (meta == 2)
world.func_147465_d(x + xPos, y + yPos, z + zPos, coloredMossStoneBrick, inputMeta, 3);
world.setBlock(x + xPos, y + yPos, z + zPos, coloredMossStoneBrick, inputMeta, 3);
else if (meta == 3)
world.func_147465_d(x + xPos, y + yPos, z + zPos, coloredStoneSquareBrick, inputMeta, 3);
world.setBlock(x + xPos, y + yPos, z + zPos, coloredStoneSquareBrick, inputMeta, 3);

}
/*else if (TConstruct && block == TRepo.multiBrickFancy)
Expand All @@ -176,12 +176,12 @@ else if (meta == 3)
if (meta == 14)
{
changed = true;
world.func_147465_d(x + xPos, y + yPos, z + zPos, coloredStoneFancyBrick.blockID, inputMeta, 3);
world.setBlock(x + xPos, y + yPos, z + zPos, coloredStoneFancyBrick.blockID, inputMeta, 3);
}
else if (meta == 15)
{
changed = true;
world.func_147465_d(x + xPos, y + yPos, z + zPos, coloredStoneRoad.blockID, inputMeta, 3);
world.setBlock(x + xPos, y + yPos, z + zPos, coloredStoneRoad.blockID, inputMeta, 3);
}
}
//Road
Expand Down
14 changes: 7 additions & 7 deletions src/main/java/paintedstone/PaintedStoneBlock.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,11 +26,11 @@ public PaintedStoneBlock(Material material, float hardness, String texture, Stri
{
super(material);
//TODO setHardness()
this.func_149711_c(hardness);
this.setHardness(hardness);
this.textureName = texture;
this.localName = name;
//TODO setCreativeTab()
this.func_149647_a(PaintedStone.tab);
this.setCreativeTab(PaintedStone.tab);
this.dropBlock = this;
}

Expand All @@ -42,14 +42,14 @@ public PaintedStoneBlock(Material material, float hardness, String texture, Stri

//TODO getUnlocalizedName()
@Override
public String func_149739_a ()
public String getUnlocalizedName ()
{
return "tile." + localName;
}

//TODO damageDropped
@Override
public int func_149692_a (int meta)
public int damageDropped (int meta)
{
return meta;
}
Expand All @@ -62,7 +62,7 @@ public Block blockDropped (int par1, Random par2Random, int par3)
//TODO registerIcons
@Override
@SideOnly(Side.CLIENT)
public void func_149651_a (IIconRegister iconRegister)
public void registerBlockIcons (IIconRegister iconRegister)
{
this.icons = new IIcon[colorNames.length];

Expand All @@ -75,14 +75,14 @@ public void func_149651_a (IIconRegister iconRegister)
//TODO getIcon
@Override
@SideOnly(Side.CLIENT)
public IIcon func_149691_a (int side, int meta)
public IIcon getIcon (int side, int meta)
{
return meta < icons.length ? icons[meta] : icons[0];
}

//TODO getSubBlocks
@Override
public void func_149666_a (Item b, CreativeTabs tab, List list)
public void getSubBlocks (Item b, CreativeTabs tab, List list)
{
for (int iter = 0; iter < icons.length; iter++)
{
Expand Down

0 comments on commit a5fb42b

Please sign in to comment.