diff --git a/src/main/java/tconstruct/TConstruct.java b/src/main/java/tconstruct/TConstruct.java index c09fa182..0cbd56aa 100644 --- a/src/main/java/tconstruct/TConstruct.java +++ b/src/main/java/tconstruct/TConstruct.java @@ -36,7 +36,6 @@ import tconstruct.worldgen.village.*; @Mod(modid = "TConstruct", name = "TConstruct", version = "${version}", dependencies = "required-after:Forge@[9.11,);required-after:Mantle;after:ForgeMultipart;after:MineFactoryReloaded;after:NotEnoughItems;after:Waila;after:ThermalExpansion") -@NetworkMod(serverSideRequired = false, clientSideRequired = true, channels = { "TConstruct" }, packetHandler = tconstruct.util.network.TPacketHandler.class) public class TConstruct { /** The value of one ingot in millibuckets */ @@ -145,7 +144,7 @@ public class TConstruct } DimensionBlacklist.getBadBimensions(); - GameRegistry.registerWorldGenerator(new SlimeIslandGen(TRepo.slimePool.blockID, 0)); + GameRegistry.registerWorldGenerator(new SlimeIslandGen(TRepo.slimePool, 0)); PluginController.getController().init(); diff --git a/src/main/java/tconstruct/blocks/BlockLandmine.java b/src/main/java/tconstruct/blocks/BlockLandmine.java index a8e13fc8..c2657343 100644 --- a/src/main/java/tconstruct/blocks/BlockLandmine.java +++ b/src/main/java/tconstruct/blocks/BlockLandmine.java @@ -24,12 +24,14 @@ import net.minecraft.util.MathHelper; import net.minecraft.world.Explosion; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; +import net.minecraftforge.common.util.ForgeDirection; import tconstruct.TConstruct; import tconstruct.blocks.logic.LandmineExplodeLogic; import tconstruct.blocks.logic.TileEntityLandmine; import tconstruct.client.block.RenderLandmine; import tconstruct.common.TProxyCommon; import tconstruct.util.landmine.Helper; +import static net.minecraftforge.common.util.ForgeDirection.*; /** * diff --git a/src/main/java/tconstruct/blocks/GlassPane.java b/src/main/java/tconstruct/blocks/GlassPane.java index ca7ab07d..98fa93ea 100644 --- a/src/main/java/tconstruct/blocks/GlassPane.java +++ b/src/main/java/tconstruct/blocks/GlassPane.java @@ -10,7 +10,7 @@ public class GlassPane extends PaneBase public GlassPane(int id) { super(id, Material.glass, "glass/", blockTextures); - this.setHardness(0.3F); + this.func_149711_c(0.3F); this.setStepSound(soundGlassFootstep); this.setUnlocalizedName("tconstruct.glasspane"); this.setCreativeTab(TConstructRegistry.blockTab); diff --git a/src/main/java/tconstruct/blocks/GlassPaneStained.java b/src/main/java/tconstruct/blocks/GlassPaneStained.java index 548bf389..455dc11c 100644 --- a/src/main/java/tconstruct/blocks/GlassPaneStained.java +++ b/src/main/java/tconstruct/blocks/GlassPaneStained.java @@ -10,7 +10,8 @@ public class GlassPaneStained extends PaneBase public GlassPaneStained(int id) { super(id, Material.glass, "glass/", assembleBlockTextures()); - this.setHardness(0.3F); + //TODO setHardness + this.func_149711_c(0.3F); this.setStepSound(soundGlassFootstep); this.setUnlocalizedName("tconstruct.glasspanestained"); this.setCreativeTab(TConstructRegistry.blockTab); diff --git a/src/main/java/tconstruct/blocks/MultiBrickFancy.java b/src/main/java/tconstruct/blocks/MultiBrickFancy.java index 5d4f2676..d9b9532b 100644 --- a/src/main/java/tconstruct/blocks/MultiBrickFancy.java +++ b/src/main/java/tconstruct/blocks/MultiBrickFancy.java @@ -22,29 +22,29 @@ public class MultiBrickFancy extends TConstructBlock { super(material.rock, 3f, blockTextures); } - + //TODO func_149712_f @Override - public float getBlockHardness (World world, int x, int y, int z) + public float func_149712_f (World world, int x, int y, int z) { int meta = world.getBlockMetadata(x, y, z); switch (meta) { case 0: - return Blocks.obsidian.getBlockHardness(world, x, y, z); + return Blocks.obsidian.func_149712_f(world, x, y, z); case 1: - return Blocks.sandstone.getBlockHardness(world, x, y, z); + return Blocks.sandstone.func_149712_f(world, x, y, z); case 2: - return Blocks.netherrack.getBlockHardness(world, x, y, z); + return Blocks.netherrack.func_149712_f(world, x, y, z); case 4: - return Blocks.iron_block.getBlockHardness(world, x, y, z); + return Blocks.iron_block.func_149712_f(world, x, y, z); case 5: - return Blocks.gold_block.getBlockHardness(world, x, y, z); + return Blocks.gold_block.func_149712_f(world, x, y, z); case 6: - return Blocks.lapis_block.getBlockHardness(world, x, y, z); + return Blocks.lapis_block.func_149712_f(world, x, y, z); case 7: - return Blocks.diamond_block.getBlockHardness(world, x, y, z); + return Blocks.diamond_block.func_149712_f(world, x, y, z); case 8: - return Blocks.redstone_block.getBlockHardness(world, x, y, z); + return Blocks.redstone_block.func_149712_f(world, x, y, z); case 9: return 1.0F; case 10: @@ -52,13 +52,13 @@ public class MultiBrickFancy extends TConstructBlock case 11: return 1.5F; case 12: - return Blocks.end_stone.getBlockHardness(world, x, y, z); + return Blocks.end_stone.func_149712_f(world, x, y, z); case 13: - return Blocks.obsidian.getBlockHardness(world, x, y, z); + return Blocks.obsidian.func_149712_f(world, x, y, z); case 3: case 14: case 15: - return Blocks.stone.getBlockHardness(world, x, y, z); + return Blocks.stone.func_149712_f(world, x, y, z); default: return blockHardness; } diff --git a/src/main/java/tconstruct/blocks/SoilBlock.java b/src/main/java/tconstruct/blocks/SoilBlock.java index 7dc09700..570214e7 100644 --- a/src/main/java/tconstruct/blocks/SoilBlock.java +++ b/src/main/java/tconstruct/blocks/SoilBlock.java @@ -5,6 +5,7 @@ import net.minecraft.block.material.Material; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.EnumCreatureAttribute; +import net.minecraft.init.Blocks; import net.minecraft.potion.Potion; import net.minecraft.potion.PotionEffect; import net.minecraft.util.AxisAlignedBB; @@ -60,13 +61,13 @@ public class SoilBlock extends TConstructBlock { int meta = world.getBlockMetadata(x, y, z); if (meta == 5) - return Block.dirt.blockHardness; + return Blocks.dirt.blockHardness; return this.blockHardness; } public AxisAlignedBB getCollisionBoundingBoxFromPool (World world, int x, int y, int z) { - return Block.slowSand.getCollisionBoundingBoxFromPool(world, x, y, z); + return Blocks.soul_sand.getCollisionBoundingBoxFromPool(world, x, y, z); } /*public void setBlockBoundsBasedOnState(IBlockAccess world, int x, int y, int z) diff --git a/src/main/java/tconstruct/blocks/logic/FrypanLogic.java b/src/main/java/tconstruct/blocks/logic/FrypanLogic.java index cbd12324..840645e8 100644 --- a/src/main/java/tconstruct/blocks/logic/FrypanLogic.java +++ b/src/main/java/tconstruct/blocks/logic/FrypanLogic.java @@ -5,6 +5,8 @@ import mantle.blocks.iface.IActiveLogic; import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.entity.player.InventoryPlayer; +import net.minecraft.init.Blocks; +import net.minecraft.init.Items; import net.minecraft.inventory.Container; import net.minecraft.item.Item; import net.minecraft.item.ItemBlock; @@ -237,7 +239,7 @@ public class FrypanLogic extends EquipLogic implements IActiveLogic return 150; } - if (block == Block.wood) + if (block == Blocks.log) { return 2400; } @@ -253,15 +255,15 @@ public class FrypanLogic extends EquipLogic implements IActiveLogic return 200; if (item instanceof ItemHoe && ((ItemHoe) item).getMaterialName().equals("WOOD")) return 200; - if (itemID == Item.stick.itemID) + if (itemID == Items.stick.itemID) return 100; - if (itemID == Item.coal.itemID) + if (itemID == Items.coal.itemID) return 800; - if (itemID == Item.bucketLava.itemID) + if (itemID == Items.lava_bucket.itemID) return 20000; - if (itemID == Block.sapling.blockID) + if (itemID == Blocks.sapling.blockID) return 100; - if (itemID == Item.blazeRod.itemID) + if (itemID == Items.blaze_rod.itemID) return 2400; return GameRegistry.getFuelValue(stack); } diff --git a/src/main/java/tconstruct/blocks/logic/FurnaceLogic.java b/src/main/java/tconstruct/blocks/logic/FurnaceLogic.java index 0c42b698..26be2769 100644 --- a/src/main/java/tconstruct/blocks/logic/FurnaceLogic.java +++ b/src/main/java/tconstruct/blocks/logic/FurnaceLogic.java @@ -4,6 +4,8 @@ import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.InventoryPlayer; +import net.minecraft.init.Blocks; +import net.minecraft.init.Items; import net.minecraft.inventory.Container; import net.minecraft.item.Item; import net.minecraft.item.ItemBlock; @@ -211,12 +213,12 @@ public class FurnaceLogic extends InventoryLogic implements IActiveLogic, IFacin { Block block = Block.blocksList[i]; - if (block == Block.woodSingleSlab) + if (block == Blocks.wooden_slab) { return 150; } - if (block == Block.wood) + if (block == Blocks.log) { return 1200; } @@ -226,7 +228,7 @@ public class FurnaceLogic extends InventoryLogic implements IActiveLogic, IFacin return 300; } - if (block == Block.coalBlock) + if (block == Blocks.coal_block) { return 16000; } @@ -238,15 +240,15 @@ public class FurnaceLogic extends InventoryLogic implements IActiveLogic, IFacin return 200; if (item instanceof ItemHoe && ((ItemHoe) item).getMaterialName().equals("WOOD")) return 200; - if (i == Item.stick.itemID) + if (i == Items.stick.itemID) return 100; - if (i == Item.coal.itemID) + if (i == Items.coal.itemID) return 1600; - if (i == Item.bucketLava.itemID) + if (i == Items.bucketLava.itemID) return 20000; - if (i == Block.sapling.blockID) + if (i == Blocks.sapling.blockID) return 100; - if (i == Item.blazeRod.itemID) + if (i == Items.blaze_rod.itemID) return 2400; return GameRegistry.getFuelValue(stack); } diff --git a/src/main/java/tconstruct/blocks/slime/SlimeGrass.java b/src/main/java/tconstruct/blocks/slime/SlimeGrass.java index 8190a227..c678056e 100644 --- a/src/main/java/tconstruct/blocks/slime/SlimeGrass.java +++ b/src/main/java/tconstruct/blocks/slime/SlimeGrass.java @@ -29,7 +29,7 @@ public class SlimeGrass extends MantleBlock public SlimeGrass() { super(Material.grass); - setHardness(0.6f); + func_149711_c(0.6f); this.setTickRandomly(true); this.setCreativeTab(TConstructRegistry.blockTab); } @@ -66,7 +66,7 @@ public class SlimeGrass extends MantleBlock if (side == 0) { - return meta % 2 == 1 ? Block.dirt.getIcon(0, 0) : icons[1]; + return meta % 2 == 1 ? Blocks.dirt.getIcon(0, 0) : icons[1]; } else if (side == 1) { diff --git a/src/main/java/tconstruct/blocks/slime/SlimeLeaves.java b/src/main/java/tconstruct/blocks/slime/SlimeLeaves.java index 4ac929d3..22fc4b0d 100644 --- a/src/main/java/tconstruct/blocks/slime/SlimeLeaves.java +++ b/src/main/java/tconstruct/blocks/slime/SlimeLeaves.java @@ -31,7 +31,7 @@ public class SlimeLeaves extends BlockLeaves super(); setCreativeTab(TConstructRegistry.blockTab); setLightOpacity(1); - this.setHardness(0.3f); + this.func_149711_c(0.3f); } @SideOnly(Side.CLIENT) diff --git a/src/main/java/tconstruct/blocks/slime/SlimeSapling.java b/src/main/java/tconstruct/blocks/slime/SlimeSapling.java index f38a7960..af80f41e 100644 --- a/src/main/java/tconstruct/blocks/slime/SlimeSapling.java +++ b/src/main/java/tconstruct/blocks/slime/SlimeSapling.java @@ -8,6 +8,7 @@ import net.minecraft.block.BlockSapling; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; import net.minecraft.util.IIcon; import net.minecraft.world.World; @@ -29,7 +30,7 @@ public class SlimeSapling extends BlockSapling super(); float f = 0.4F; setBlockBounds(0.5F - f, 0.0F, 0.5F - f, 0.5F + f, f * 2.0F, 0.5F + f); - this.setHardness(0.0F); + this.func_149711_c(0.0F); this.setStepSound(Block.soundGrassFootstep); this.setCreativeTab(TConstructRegistry.blockTab); } @@ -48,7 +49,7 @@ public class SlimeSapling extends BlockSapling public boolean canThisPlantGrowOnThisBlockID (int id) { - return id == Block.grass.blockID || id == Block.dirt.blockID || id == TRepo.slimeGrass.blockID || id == TRepo.craftedSoil.blockID; + return id == Blocks.grass.blockID || id == Blocks.dirt.blockID || id == TRepo.slimeGrass.blockID || id == TRepo.craftedSoil.blockID; } public void updateTick (World world, int x, int y, int z, Random random) diff --git a/src/main/java/tconstruct/blocks/traps/BarricadeBlock.java b/src/main/java/tconstruct/blocks/traps/BarricadeBlock.java index a53fd54e..7afc4c36 100644 --- a/src/main/java/tconstruct/blocks/traps/BarricadeBlock.java +++ b/src/main/java/tconstruct/blocks/traps/BarricadeBlock.java @@ -26,7 +26,7 @@ public class BarricadeBlock extends MantleBlock super(Material.wood); this.modelBlock = model; this.modelMeta = meta; - setHardness(4.0F); + func_149711_c(4.0F); this.setCreativeTab(TConstructRegistry.blockTab); } diff --git a/src/main/java/tconstruct/blocks/traps/Punji.java b/src/main/java/tconstruct/blocks/traps/Punji.java index e7768801..6cf92e13 100644 --- a/src/main/java/tconstruct/blocks/traps/Punji.java +++ b/src/main/java/tconstruct/blocks/traps/Punji.java @@ -30,7 +30,7 @@ public class Punji extends MantleBlock this.setBlockBounds(0.125f, 0, 0.125f, 0.875f, 0.375f, 0.875f); this.setStepSound(Block.soundGrassFootstep); this.setCreativeTab(TConstructRegistry.blockTab); - this.setHardness(3.0f); + this.func_149711_c(3.0f); } @Override diff --git a/src/main/java/tconstruct/client/block/BlockSkinRenderHelper.java b/src/main/java/tconstruct/client/block/BlockSkinRenderHelper.java index 45d518cd..599ace13 100644 --- a/src/main/java/tconstruct/client/block/BlockSkinRenderHelper.java +++ b/src/main/java/tconstruct/client/block/BlockSkinRenderHelper.java @@ -5,6 +5,7 @@ import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.EntityRenderer; import net.minecraft.client.renderer.RenderBlocks; import net.minecraft.client.renderer.Tessellator; +import net.minecraft.init.Blocks; import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; @@ -851,7 +852,7 @@ public class BlockSkinRenderHelper public static boolean renderLiquidBlock (IIcon stillIcon, IIcon flowingIcon, int x, int y, int z, RenderBlocks renderer, IBlockAccess world) { - Block block = Block.stone; + Block block = Blocks.stone; int var5 = block.colorMultiplier(world, x, y, z); float var6 = (float) (var5 >> 16 & 255) / 255.0F; float var7 = (float) (var5 >> 8 & 255) / 255.0F; @@ -874,7 +875,7 @@ public class BlockSkinRenderHelper static boolean renderFakeBlockWithAmbientOcclusion (IIcon stillIcon, IIcon flowingIcon, int xPos, int yPos, int zPos, float colorRed, float colorGreen, float colorBlue, RenderBlocks render, IBlockAccess world) { - Block block = Block.stone; + Block block = Blocks.stone; render.enableAO = true; boolean flag = false; float f3 = 0.0F; @@ -1592,7 +1593,7 @@ public class BlockSkinRenderHelper static boolean renderFakeBlockWithColorMultiplier (IIcon stillIcon, IIcon flowingIcon, int xPos, int yPos, int zPos, float colorRed, float colorGreen, float colorBlue, RenderBlocks render, IBlockAccess world) { - Block block = Block.stone; + Block block = Blocks.stone; render.enableAO = false; Tessellator tessellator = Tessellator.instance; boolean flag = false; diff --git a/src/main/java/tconstruct/client/block/RenderLiquid.java b/src/main/java/tconstruct/client/block/RenderLiquid.java index 78ec2f83..e255027b 100644 --- a/src/main/java/tconstruct/client/block/RenderLiquid.java +++ b/src/main/java/tconstruct/client/block/RenderLiquid.java @@ -5,6 +5,7 @@ import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.EntityRenderer; import net.minecraft.client.renderer.RenderBlocks; import net.minecraft.client.renderer.Tessellator; +import net.minecraft.init.Blocks; import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; @@ -844,7 +845,7 @@ public class RenderLiquid public static boolean renderFakeBlock (IIcon texture, int x, int y, int z, RenderBlocks renderer, IBlockAccess world) { - Block block = Block.stone; + Block block = Blocks.stone; int var5 = block.colorMultiplier(world, x, y, z); float var6 = (var5 >> 16 & 0xFF) / 255.0F; float var7 = (var5 >> 8 & 0xFF) / 255.0F; @@ -866,7 +867,7 @@ public class RenderLiquid static boolean renderFakeBlockWithAmbientOcclusion (IIcon texture, int xPos, int yPos, int zPos, float colorRed, float colorGreen, float colorBlue, RenderBlocks render, IBlockAccess world) { - Block block = Block.stone; + Block block = Blocks.stone; render.enableAO = true; boolean flag = false; float f3 = 0.0F; @@ -1576,7 +1577,7 @@ public class RenderLiquid static boolean renderFakeBlockWithColorMultiplier (IIcon texture, int xPos, int yPos, int zPos, float colorRed, float colorGreen, float colorBlue, RenderBlocks render, IBlockAccess world) { - Block block = Block.stone; + Block block = Blocks.stone; render.enableAO = false; Tessellator tessellator = Tessellator.instance; boolean flag = false; diff --git a/src/main/java/tconstruct/common/TContent.java b/src/main/java/tconstruct/common/TContent.java index 6ee7173a..f8038a4c 100644 --- a/src/main/java/tconstruct/common/TContent.java +++ b/src/main/java/tconstruct/common/TContent.java @@ -1,6 +1,8 @@ package tconstruct.common; import mantle.items.abstracts.CraftingItem; +import net.minecraft.init.Blocks; +import net.minecraft.init.Items; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import tconstruct.library.armor.EnumArmorPart; @@ -111,9 +113,9 @@ public class TContent implements IFuelHandler TRepo.meatBlock = new MeatBlock(PHConstruct.meatBlock).setUnlocalizedName("tconstruct.meatblock"); TRepo.glueBlock = new GlueBlock(PHConstruct.glueBlock).setUnlocalizedName("GlueBlock").setCreativeTab(TConstructRegistry.blockTab); - TRepo.woolSlab1 = new SlabBase(PHConstruct.woolSlab1, Material.cloth, Block.cloth, 0, 8).setUnlocalizedName("cloth"); + TRepo.woolSlab1 = new SlabBase(PHConstruct.woolSlab1, Material.cloth, Blocks.wool, 0, 8).setUnlocalizedName("cloth"); TRepo.woolSlab1.setStepSound(Block.soundClothFootstep).setCreativeTab(CreativeTabs.tabDecorations); - TRepo.woolSlab2 = new SlabBase(PHConstruct.woolSlab2, Material.cloth, Block.cloth, 8, 8).setUnlocalizedName("cloth"); + TRepo.woolSlab2 = new SlabBase(PHConstruct.woolSlab2, Material.cloth, Blocks.wool, 8, 8).setUnlocalizedName("cloth"); TRepo.woolSlab2.setStepSound(Block.soundClothFootstep).setCreativeTab(CreativeTabs.tabDecorations); //Smeltery @@ -134,10 +136,10 @@ public class TContent implements IFuelHandler TRepo.landmine = new BlockLandmine(PHConstruct.landmine).setHardness(0.5F).setResistance(0F).setStepSound(Block.soundMetalFootstep).setCreativeTab(CreativeTabs.tabRedstone) .setUnlocalizedName("landmine"); TRepo.punji = new Punji(PHConstruct.punji).setUnlocalizedName("trap.punji"); - TRepo.barricadeOak = new BarricadeBlock(PHConstruct.barricadeOak, Block.wood, 0).setUnlocalizedName("trap.barricade.oak"); - TRepo.barricadeSpruce = new BarricadeBlock(PHConstruct.barricadeSpruce, Block.wood, 1).setUnlocalizedName("trap.barricade.spruce"); - TRepo.barricadeBirch = new BarricadeBlock(PHConstruct.barricadeBirch, Block.wood, 2).setUnlocalizedName("trap.barricade.birch"); - TRepo.barricadeJungle = new BarricadeBlock(PHConstruct.barricadeJungle, Block.wood, 3).setUnlocalizedName("trap.barricade.jungle"); + TRepo.barricadeOak = new BarricadeBlock(PHConstruct.barricadeOak, Blocks.log, 0).setUnlocalizedName("trap.barricade.oak"); + TRepo.barricadeSpruce = new BarricadeBlock(PHConstruct.barricadeSpruce, Blocks.log, 1).setUnlocalizedName("trap.barricade.spruce"); + TRepo.barricadeBirch = new BarricadeBlock(PHConstruct.barricadeBirch, Blocks.log, 2).setUnlocalizedName("trap.barricade.birch"); + TRepo.barricadeJungle = new BarricadeBlock(PHConstruct.barricadeJungle, Blocks.log, 3).setUnlocalizedName("trap.barricade.jungle"); TRepo.slimeExplosive = new SlimeExplosive(PHConstruct.slimeExplosive).setHardness(0.0F).setStepSound(Block.soundGrassFootstep).setUnlocalizedName("explosive.slime"); TRepo.dryingRack = new DryingRack(PHConstruct.dryingRack).setUnlocalizedName("Armor.DryingRack"); @@ -151,7 +153,7 @@ public class TContent implements IFuelHandler TRepo.moltenIron = new TConstructFluid(PHConstruct.moltenIron, TRepo.moltenIronFluid, Material.lava, "liquid_iron").setUnlocalizedName("fluid.molten.iron"); GameRegistry.registerBlock(TRepo.moltenIron, "fluid.molten.iron"); TRepo.moltenIronFluid.setBlockID(TRepo.moltenIron).setLuminosity(12).setDensity(3000).setViscosity(6000).setTemperature(1300); - FluidContainerRegistry.registerFluidContainer(new FluidContainerData(new FluidStack(TRepo.moltenIronFluid, 1000), new ItemStack(TRepo.buckets, 1, 0), new ItemStack(Item.bucketEmpty))); + FluidContainerRegistry.registerFluidContainer(new FluidContainerData(new FluidStack(TRepo.moltenIronFluid, 1000), new ItemStack(TRepo.buckets, 1, 0), new ItemStack(Items.bucket))); TRepo.moltenGoldFluid = new Fluid("gold.molten"); if (!FluidRegistry.registerFluid(TRepo.moltenGoldFluid)) @@ -159,7 +161,7 @@ public class TContent implements IFuelHandler TRepo.moltenGold = new TConstructFluid(PHConstruct.moltenGold, TRepo.moltenGoldFluid, Material.lava, "liquid_gold").setUnlocalizedName("fluid.molten.gold"); GameRegistry.registerBlock(TRepo.moltenGold, "fluid.molten.gold"); TRepo.moltenGoldFluid.setBlockID(TRepo.moltenGold).setLuminosity(12).setDensity(3000).setViscosity(6000).setTemperature(1300); - FluidContainerRegistry.registerFluidContainer(new FluidContainerData(new FluidStack(TRepo.moltenGoldFluid, 1000), new ItemStack(TRepo.buckets, 1, 1), new ItemStack(Item.bucketEmpty))); + FluidContainerRegistry.registerFluidContainer(new FluidContainerData(new FluidStack(TRepo.moltenGoldFluid, 1000), new ItemStack(TRepo.buckets, 1, 1), new ItemStack(Items.bucket))); TRepo.moltenCopperFluid = new Fluid("copper.molten"); if (!FluidRegistry.registerFluid(TRepo.moltenCopperFluid)) @@ -167,7 +169,7 @@ public class TContent implements IFuelHandler TRepo.moltenCopper = new TConstructFluid(PHConstruct.moltenCopper, TRepo.moltenCopperFluid, Material.lava, "liquid_copper").setUnlocalizedName("fluid.molten.copper"); GameRegistry.registerBlock(TRepo.moltenCopper, "fluid.molten.copper"); TRepo.moltenCopperFluid.setBlockID(TRepo.moltenCopper).setLuminosity(12).setDensity(3000).setViscosity(6000).setTemperature(1300); - FluidContainerRegistry.registerFluidContainer(new FluidContainerData(new FluidStack(TRepo.moltenCopperFluid, 1000), new ItemStack(TRepo.buckets, 1, 2), new ItemStack(Item.bucketEmpty))); + FluidContainerRegistry.registerFluidContainer(new FluidContainerData(new FluidStack(TRepo.moltenCopperFluid, 1000), new ItemStack(TRepo.buckets, 1, 2), new ItemStack(Items.bucket))); TRepo.moltenTinFluid = new Fluid("tin.molten"); if (!FluidRegistry.registerFluid(TRepo.moltenTinFluid)) diff --git a/src/main/java/tconstruct/common/TRecipes.java b/src/main/java/tconstruct/common/TRecipes.java index 9e49185c..b1d69200 100644 --- a/src/main/java/tconstruct/common/TRecipes.java +++ b/src/main/java/tconstruct/common/TRecipes.java @@ -345,7 +345,7 @@ public class TRecipes tableCasting.addCastingRecipe(new ItemStack(TRepo.strangeFood, 1, 1), new FluidStack(TRepo.bloodFluid, 160), null, 50); //Buckets - ItemStack bucket = new ItemStack(Items.bucketEmpty); + ItemStack bucket = new ItemStack(Items.bucket); for (int sc = 0; sc < 24; sc++) { @@ -433,8 +433,8 @@ public class TRecipes FurnaceRecipes.smelting().addSmelting(TRepo.oreBerries, 4, new ItemStack(TRepo.materials, 1, 22), 0.2f); //FurnaceRecipes.smelting().addSmelting(TRepo.oreBerries, 5, new ItemStack(TRepo.materials, 1, 23), 0.2f); - FurnaceRecipes.smelting().addSmelting(TRepo.oreGravel, 0, new ItemStack(Items.ingotIron), 0.2f); - FurnaceRecipes.smelting().addSmelting(TRepo.oreGravel, 1, new ItemStack(Items.ingotGold), 0.2f); + FurnaceRecipes.smelting().addSmelting(TRepo.oreGravel, 0, new ItemStack(Items.iron_ingot), 0.2f); + FurnaceRecipes.smelting().addSmelting(TRepo.oreGravel, 1, new ItemStack(Items.gold_ingot), 0.2f); FurnaceRecipes.smelting().addSmelting(TRepo.oreGravel, 2, new ItemStack(TRepo.materials, 1, 9), 0.2f); FurnaceRecipes.smelting().addSmelting(TRepo.oreGravel, 3, new ItemStack(TRepo.materials, 1, 10), 0.2f); FurnaceRecipes.smelting().addSmelting(TRepo.oreGravel, 4, new ItemStack(TRepo.materials, 1, 12), 0.2f); @@ -497,8 +497,8 @@ public class TRecipes // Mossball Recipe GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(TRepo.materials, 1, 6), patBlock, '#', "stoneMossy")); // LavaCrystal Recipes -Auto-smelt - GameRegistry.addRecipe(new ItemStack(TRepo.materials, 1, 7), "xcx", "cbc", "xcx", 'b', Items.lava_bucket, 'c', Items.fireballCharge, 'x', Items.blaze_rod); - GameRegistry.addRecipe(new ItemStack(TRepo.materials, 1, 7), "xcx", "cbc", "xcx", 'b', Items.lava_bucket, 'x', Items.fireballCharge, 'c', Items.blaze_rod); + GameRegistry.addRecipe(new ItemStack(TRepo.materials, 1, 7), "xcx", "cbc", "xcx", 'b', Items.lava_bucket, 'c', Items.fire_charge, 'x', Items.blaze_rod); + GameRegistry.addRecipe(new ItemStack(TRepo.materials, 1, 7), "xcx", "cbc", "xcx", 'b', Items.lava_bucket, 'x', Items.fire_charge, 'c', Items.blaze_rod); // Slimy sand Recipes GameRegistry.addShapelessRecipe(new ItemStack(TRepo.craftedSoil, 1, 0), Items.slime_ball, Items.slime_ball, Items.slime_ball, Items.slime_ball, Blocks.sand, Blocks.dirt); GameRegistry.addShapelessRecipe(new ItemStack(TRepo.craftedSoil, 1, 2), TRepo.strangeFood, TRepo.strangeFood, TRepo.strangeFood, TRepo.strangeFood, Blocks.sand, Blocks.dirt); @@ -544,7 +544,7 @@ public class TRecipes GameRegistry.addRecipe(new ItemStack(TRepo.materials, 9, 15), "m", 'm', new ItemStack(TRepo.metalBlock, 1, 8)); //Alumite GameRegistry.addRecipe(new ItemStack(TRepo.materials, 9, 16), "m", 'm', new ItemStack(TRepo.metalBlock, 1, 9)); //Steel - GameRegistry.addRecipe(new ItemStack(Items.ingotIron), patBlock, '#', new ItemStack(TRepo.materials, 1, 19)); //Iron + GameRegistry.addRecipe(new ItemStack(Items.iron_ingot), patBlock, '#', new ItemStack(TRepo.materials, 1, 19)); //Iron GameRegistry.addRecipe(new ItemStack(TRepo.materials, 1, 9), patBlock, '#', new ItemStack(TRepo.materials, 1, 20)); //Copper GameRegistry.addRecipe(new ItemStack(TRepo.materials, 1, 10), patBlock, '#', new ItemStack(TRepo.materials, 1, 21)); //Tin GameRegistry.addRecipe(new ItemStack(TRepo.materials, 1, 11), patBlock, '#', new ItemStack(TRepo.materials, 1, 22)); //Aluminum @@ -557,7 +557,7 @@ public class TRecipes GameRegistry.addRecipe(new ItemStack(TRepo.materials, 1, 15), patBlock, '#', new ItemStack(TRepo.materials, 1, 32)); //Alumite GameRegistry.addRecipe(new ItemStack(TRepo.materials, 1, 16), patBlock, '#', new ItemStack(TRepo.materials, 1, 33)); //Steel - GameRegistry.addRecipe(new ItemStack(TRepo.materials, 9, 19), "m", 'm', new ItemStack(Items.ingotIron)); //Iron + GameRegistry.addRecipe(new ItemStack(TRepo.materials, 9, 19), "m", 'm', new ItemStack(Items.iron_ingot)); //Iron GameRegistry.addRecipe(new ItemStack(TRepo.materials, 9, 20), "m", 'm', new ItemStack(TRepo.materials, 1, 9)); //Copper GameRegistry.addRecipe(new ItemStack(TRepo.materials, 9, 21), "m", 'm', new ItemStack(TRepo.materials, 1, 10)); //Tin GameRegistry.addRecipe(new ItemStack(TRepo.materials, 9, 22), "m", 'm', new ItemStack(TRepo.materials, 1, 11)); //Aluminum @@ -578,7 +578,7 @@ public class TRecipes for (int i = 0; i < 16; i++) { color = dyeTypes[15 - i]; - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(Block.cloth, 8, i), patSurround, 'm', color, '#', new ItemStack(Block.cloth, 1, Short.MAX_VALUE))); + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(Blocks.wool, 8, i), patSurround, 'm', color, '#', new ItemStack(Blocks.wool, 1, Short.MAX_VALUE))); GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(TRepo.stainedGlassClear, 8, i), patSurround, 'm', color, '#', TRepo.clearGlass)); GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(TRepo.stainedGlassClear, 1, i), color, TRepo.clearGlass)); GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(TRepo.stainedGlassClear, 8, i), patSurround, 'm', color, '#', new ItemStack(TRepo.stainedGlassClear, 1, Short.MAX_VALUE))); @@ -636,7 +636,7 @@ public class TRecipes // Clock Recipe - Vanilla alternativ GameRegistry.addRecipe(new ItemStack(Items.pocketSundial), " i ", "iri", " i ", 'i', aluBrass, 'r', new ItemStack(Items.redstone)); // Gold Pressure Plate - Vanilla alternativ - GameRegistry.addRecipe(new ItemStack(Block.pressurePlateGold), "ii", 'i', aluBrass); + GameRegistry.addRecipe(new ItemStack(Blocks.pressurePlateGold), "ii", 'i', aluBrass); //Accessories GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(TRepo.heartCanister, 1, 0), "##", "##", '#', "ingotAluminum")); GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(TRepo.heartCanister, 1, 0), "##", "##", '#', "ingotAluminium")); @@ -662,7 +662,7 @@ public class TRecipes 'p', Blocks.stone_pressure_plate)); //Ultra hardcore recipes - GameRegistry.addRecipe(new ItemStack(TRepo.goldHead), patSurround, '#', new ItemStack(Items.ingotGold), 'm', new ItemStack(Items.skull, 1, 3)); + GameRegistry.addRecipe(new ItemStack(TRepo.goldHead), patSurround, '#', new ItemStack(Items.gold_ingot), 'm', new ItemStack(Items.skull, 1, 3)); // Slab Smeltery Components Recipes for (int i = 0; i < 7; i++) @@ -681,18 +681,18 @@ public class TRecipes // Wool Slab Recipes for (int sc = 0; sc <= 7; sc++) { - GameRegistry.addRecipe(new ItemStack(TRepo.woolSlab1, 6, sc), "www", 'w', new ItemStack(Block.cloth, 1, sc)); - GameRegistry.addRecipe(new ItemStack(TRepo.woolSlab2, 6, sc), "www", 'w', new ItemStack(Block.cloth, 1, sc + 8)); + GameRegistry.addRecipe(new ItemStack(TRepo.woolSlab1, 6, sc), "www", 'w', new ItemStack(Blocks.wool, 1, sc)); + GameRegistry.addRecipe(new ItemStack(TRepo.woolSlab2, 6, sc), "www", 'w', new ItemStack(Blocks.wool, 1, sc + 8)); - GameRegistry.addShapelessRecipe(new ItemStack(Block.cloth, 1, sc), new ItemStack(TRepo.woolSlab1, 1, sc), new ItemStack(TRepo.woolSlab1, 1, sc)); - GameRegistry.addShapelessRecipe(new ItemStack(Block.cloth, 1, sc + 8), new ItemStack(TRepo.woolSlab2, 1, sc), new ItemStack(TRepo.woolSlab2, 1, sc)); + GameRegistry.addShapelessRecipe(new ItemStack(Blocks.wool, 1, sc), new ItemStack(TRepo.woolSlab1, 1, sc), new ItemStack(TRepo.woolSlab1, 1, sc)); + GameRegistry.addShapelessRecipe(new ItemStack(Blocks.wool, 1, sc + 8), new ItemStack(TRepo.woolSlab2, 1, sc), new ItemStack(TRepo.woolSlab2, 1, sc)); } - GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(Block.cloth, 1, 0), "slabCloth", "slabCloth")); + GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(Blocks.wool, 1, 0), "slabCloth", "slabCloth")); //Trap Recipes - GameRegistry.addRecipe(new ItemStack(TRepo.punji, 5, 0), "b b", " b ", "b b", 'b', new ItemStack(Items.reed)); - GameRegistry.addRecipe(new ItemStack(TRepo.barricadeSpruce, 1, 0), "b", "b", 'b', new ItemStack(Block.wood, 1, 1)); - GameRegistry.addRecipe(new ItemStack(TRepo.barricadeBirch, 1, 0), "b", "b", 'b', new ItemStack(Block.wood, 1, 2)); - GameRegistry.addRecipe(new ItemStack(TRepo.barricadeJungle, 1, 0), "b", "b", 'b', new ItemStack(Block.wood, 1, 3)); + GameRegistry.addRecipe(new ItemStack(TRepo.punji, 5, 0), "b b", " b ", "b b", 'b', new ItemStack(Items.reeds)); + GameRegistry.addRecipe(new ItemStack(TRepo.barricadeSpruce, 1, 0), "b", "b", 'b', new ItemStack(Blocks.log, 1, 1)); + GameRegistry.addRecipe(new ItemStack(TRepo.barricadeBirch, 1, 0), "b", "b", 'b', new ItemStack(Blocks.log, 1, 2)); + GameRegistry.addRecipe(new ItemStack(TRepo.barricadeJungle, 1, 0), "b", "b", 'b', new ItemStack(Blocks.log, 1, 3)); GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(TRepo.barricadeOak, 1, 0), "b", "b", 'b', "logWood")); // Advanced WorkBench Recipes GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(TRepo.craftingStationWood, 1, 0), "b", 'b', "crafterWood")); @@ -716,12 +716,12 @@ public class TRecipes //Slime Recipes GameRegistry.addRecipe(new ItemStack(TRepo.slimeGel, 1, 0), "##", "##", '#', TRepo.strangeFood); GameRegistry.addRecipe(new ItemStack(TRepo.strangeFood, 4, 0), "#", '#', new ItemStack(TRepo.slimeGel, 1, 0)); - GameRegistry.addRecipe(new ItemStack(TRepo.slimeGel, 1, 1), "##", "##", '#', Item.slimeBall); - GameRegistry.addRecipe(new ItemStack(Items.slimeBall, 4, 0), "#", '#', new ItemStack(TRepo.slimeGel, 1, 1)); + GameRegistry.addRecipe(new ItemStack(TRepo.slimeGel, 1, 1), "##", "##", '#', Items.slime_ball); + GameRegistry.addRecipe(new ItemStack(Items.slime_ball, 4, 0), "#", '#', new ItemStack(TRepo.slimeGel, 1, 1)); //slimeExplosive - GameRegistry.addShapelessRecipe(new ItemStack(TRepo.slimeExplosive, 1, 0), Item.slimeBall, Block.tnt); - GameRegistry.addShapelessRecipe(new ItemStack(TRepo.slimeExplosive, 1, 2), TRepo.strangeFood, Block.tnt); - GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(TRepo.slimeExplosive, 1, 0), "slimeball", Block.tnt)); + GameRegistry.addShapelessRecipe(new ItemStack(TRepo.slimeExplosive, 1, 0), Items.slime_ball, Blocks.tnt); + GameRegistry.addShapelessRecipe(new ItemStack(TRepo.slimeExplosive, 1, 2), TRepo.strangeFood, Blocks.tnt); + GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(TRepo.slimeExplosive, 1, 0), "slimeball", Blocks.tnt)); GameRegistry.addShapelessRecipe(new ItemStack(TRepo.slimeChannel, 1, 0), new ItemStack(TRepo.slimeGel, 1, Short.MAX_VALUE), new ItemStack(Items.redstone)); GameRegistry.addShapelessRecipe(new ItemStack(TRepo.bloodChannel, 1, 0), new ItemStack(TRepo.strangeFood, 1, 1), new ItemStack(TRepo.strangeFood, 1, 1), @@ -895,18 +895,18 @@ public class TRecipes BlockDispenser.dispenseBehaviorRegistry.putObject(TRepo.arrow, new TDispenserBehaviorArrow()); //Vanilla stuff - OreDictionary.registerOre("slimeball", new ItemStack(Items.slimeBall)); + OreDictionary.registerOre("slimeball", new ItemStack(Items.slime_ball)); OreDictionary.registerOre("slimeball", new ItemStack(TRepo.strangeFood, 1, 0)); OreDictionary.registerOre("slimeball", new ItemStack(TRepo.strangeFood, 1, 1)); OreDictionary.registerOre("slimeball", new ItemStack(TRepo.materials, 1, 36)); OreDictionary.registerOre("glass", new ItemStack(TRepo.clearGlass)); - OreDictionary.registerOre("glass", new ItemStack(Block.glass)); - RecipeRemover.removeShapedRecipe(new ItemStack(Block.pistonStickyBase)); - RecipeRemover.removeShapedRecipe(new ItemStack(Items.magmaCream)); - RecipeRemover.removeShapedRecipe(new ItemStack(Items.leash)); - GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(Block.pistonStickyBase), "slimeball", Block.pistonBase)); - GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(Items.magmaCream), "slimeball", Item.blazePowder)); - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(Items.leash, 2), "ss ", "sS ", " s", 's', Item.silk, 'S', "slimeball")); + OreDictionary.registerOre("glass", new ItemStack(Blocks.glass)); + RecipeRemover.removeShapedRecipe(new ItemStack(Blocks.sticky_piston)); + RecipeRemover.removeShapedRecipe(new ItemStack(Items.magma_cream)); + RecipeRemover.removeShapedRecipe(new ItemStack(Items.lead)); + GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(Blocks.sticky_piston), "slimeball", Blocks.piston)); + GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(Items.magma_cream), "slimeball", Items.blaze_powder)); + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(Items.lead, 2), "ss ", "sS ", " s", 's', Items.string, 'S', "slimeball")); } private static void ensureOreIsRegistered (String oreName, ItemStack is) @@ -1045,9 +1045,9 @@ public class TRecipes LiquidCasting tableCasting = TConstructRegistry.instance.getTableCasting(); for (ItemStack ore : OreDictionary.getOres("ingot" + ft.toString())) { - tableCasting.addCastingRecipe(pattern, new FluidStack(TRepo.moltenAlubrassFluid, TConstruct.ingotLiquidValue), new ItemStack(ore, 1, ore.getItemDamage()), false, 50); - tableCasting.addCastingRecipe(pattern, new FluidStack(TRepo.moltenGoldFluid, TConstruct.oreLiquidValue), new ItemStack(ore, 1, ore.getItemDamage()), false, 50); - tableCasting.addCastingRecipe(new ItemStack(ore, 1, ore.getItemDamage()), new FluidStack(ft.fluid, TConstruct.ingotLiquidValue), pattern, 80); + tableCasting.addCastingRecipe(pattern, new FluidStack(TRepo.moltenAlubrassFluid, TConstruct.ingotLiquidValue), new ItemStack(ore.getItem(), 1, ore.getItemDamage()), false, 50); + tableCasting.addCastingRecipe(pattern, new FluidStack(TRepo.moltenGoldFluid, TConstruct.oreLiquidValue), new ItemStack(ore.getItem(), 1, ore.getItemDamage()), false, 50); + tableCasting.addCastingRecipe(new ItemStack(ore.getItem(), 1, ore.getItemDamage()), new FluidStack(ft.fluid, TConstruct.ingotLiquidValue), pattern, 80); } } @@ -1071,10 +1071,10 @@ public class TRecipes basinCasting.addCastingRecipe(new ItemStack(TRepo.metalBlock, 1, 9), new FluidStack(TRepo.moltenSteelFluid, TConstruct.blockLiquidValue), null, true, 100); //steel basinCasting.addCastingRecipe(new ItemStack(TRepo.clearGlass, 1, 0), new FluidStack(TRepo.moltenGlassFluid, FluidContainerRegistry.BUCKET_VOLUME), null, true, 100); //glass basinCasting.addCastingRecipe(new ItemStack(TRepo.smeltery, 1, 4), new FluidStack(TRepo.moltenStoneFluid, TConstruct.ingotLiquidValue), null, true, 100); //seared stone - basinCasting.addCastingRecipe(new ItemStack(TRepo.smeltery, 1, 5), new FluidStack(TRepo.moltenStoneFluid, TConstruct.chunkLiquidValue), new ItemStack(Block.cobblestone), true, 100); + basinCasting.addCastingRecipe(new ItemStack(TRepo.smeltery, 1, 5), new FluidStack(TRepo.moltenStoneFluid, TConstruct.chunkLiquidValue), new ItemStack(Blocks.cobblestone), true, 100); basinCasting.addCastingRecipe(new ItemStack(Blocks.emerald_block), new FluidStack(TRepo.moltenEmeraldFluid, 640 * 9), null, true, 100); //emerald - basinCasting.addCastingRecipe(new ItemStack(TRepo.speedBlock, 1, 0), new FluidStack(TRepo.moltenTinFluid, TConstruct.nuggetLiquidValue), new ItemStack(Block.gravel), true, 100); //brownstone - basinCasting.addCastingRecipe(new ItemStack(Blocks.end_stone), new FluidStack(TRepo.moltenEnderFluid, TConstruct.chunkLiquidValue), new ItemStack(Block.obsidian), true, 100); //endstone + basinCasting.addCastingRecipe(new ItemStack(TRepo.speedBlock, 1, 0), new FluidStack(TRepo.moltenTinFluid, TConstruct.nuggetLiquidValue), new ItemStack(Blocks.gravel), true, 100); //brownstone + basinCasting.addCastingRecipe(new ItemStack(Blocks.end_stone), new FluidStack(TRepo.moltenEnderFluid, TConstruct.chunkLiquidValue), new ItemStack(Blocks.obsidian), true, 100); //endstone basinCasting.addCastingRecipe(new ItemStack(TRepo.metalBlock, 1, 10), new FluidStack(TRepo.moltenEnderFluid, 1000), null, true, 100); //ender basinCasting.addCastingRecipe(new ItemStack(TRepo.glueBlock), new FluidStack(TRepo.glueFluid, TConstruct.blockLiquidValue), null, true, 100); //glue @@ -1134,41 +1134,41 @@ public class TRecipes Smeltery.addMelting(FluidType.Gold, new ItemStack(TRepo.blankPattern, 4, 2), -50, TConstruct.ingotLiquidValue * 2); Smeltery.addMelting(FluidType.Glue, new ItemStack(TRepo.materials, 1, 36), 0, TConstruct.ingotLiquidValue); - Smeltery.addMelting(FluidType.Ender, new ItemStack(Items.enderPearl, 4), 0, 250); + Smeltery.addMelting(FluidType.Ender, new ItemStack(Items.ender_pearl, 4), 0, 250); Smeltery.addMelting(TRepo.metalBlock, 10, 50, new FluidStack(TRepo.moltenEnderFluid, 1000)); Smeltery.addMelting(FluidType.Water, new ItemStack(Items.snowball, 1, 0), 0, 125); - Smeltery.addMelting(FluidType.Iron, new ItemStack(Items.flintAndSteel, 1, 0), 0, TConstruct.ingotLiquidValue); + Smeltery.addMelting(FluidType.Iron, new ItemStack(Items.flint_and_steel, 1, 0), 0, TConstruct.ingotLiquidValue); Smeltery.addMelting(FluidType.Iron, new ItemStack(Items.compass, 1, 0), 0, TConstruct.ingotLiquidValue * 4); - Smeltery.addMelting(FluidType.Iron, new ItemStack(Items.bucketEmpty), 0, TConstruct.ingotLiquidValue * 3); - Smeltery.addMelting(FluidType.Iron, new ItemStack(Items.minecartEmpty), 0, TConstruct.ingotLiquidValue * 5); - Smeltery.addMelting(FluidType.Iron, new ItemStack(Items.minecartCrate), 0, TConstruct.ingotLiquidValue * 5); - Smeltery.addMelting(FluidType.Iron, new ItemStack(Items.minecartPowered), 0, TConstruct.ingotLiquidValue * 5); - Smeltery.addMelting(FluidType.Iron, new ItemStack(Items.minecartHopper), 50, TConstruct.ingotLiquidValue * 10); - Smeltery.addMelting(FluidType.Iron, new ItemStack(Items.doorIron), 0, TConstruct.ingotLiquidValue * 6); + Smeltery.addMelting(FluidType.Iron, new ItemStack(Items.bucket), 0, TConstruct.ingotLiquidValue * 3); + Smeltery.addMelting(FluidType.Iron, new ItemStack(Items.minecart), 0, TConstruct.ingotLiquidValue * 5); + Smeltery.addMelting(FluidType.Iron, new ItemStack(Items.chest_minecart), 0, TConstruct.ingotLiquidValue * 5); + Smeltery.addMelting(FluidType.Iron, new ItemStack(Items.powered_minecart), 0, TConstruct.ingotLiquidValue * 5); + Smeltery.addMelting(FluidType.Iron, new ItemStack(Items.hopper_minecart), 50, TConstruct.ingotLiquidValue * 10); + Smeltery.addMelting(FluidType.Iron, new ItemStack(Items.iron_door), 0, TConstruct.ingotLiquidValue * 6); Smeltery.addMelting(FluidType.Iron, new ItemStack(Items.cauldron), 0, TConstruct.ingotLiquidValue * 7); Smeltery.addMelting(FluidType.Iron, new ItemStack(Items.shears), 0, TConstruct.ingotLiquidValue * 2); Smeltery.addMelting(FluidType.Emerald, new ItemStack(Items.emerald), -50, 640); //Blocks melt as themselves! //Ore - Smeltery.addMelting(Block.oreIron, 0, 600, new FluidStack(TRepo.moltenIronFluid, TConstruct.ingotLiquidValue * 2)); - Smeltery.addMelting(Block.oreGold, 0, 400, new FluidStack(TRepo.moltenGoldFluid, TConstruct.ingotLiquidValue * 2)); + Smeltery.addMelting(Blocks.iron_ore, 0, 600, new FluidStack(TRepo.moltenIronFluid, TConstruct.ingotLiquidValue * 2)); + Smeltery.addMelting(Blocks.gold_ore, 0, 400, new FluidStack(TRepo.moltenGoldFluid, TConstruct.ingotLiquidValue * 2)); Smeltery.addMelting(TRepo.oreGravel, 0, 600, new FluidStack(TRepo.moltenIronFluid, TConstruct.ingotLiquidValue * 2)); Smeltery.addMelting(TRepo.oreGravel, 1, 400, new FluidStack(TRepo.moltenGoldFluid, TConstruct.ingotLiquidValue * 2)); //Blocks - Smeltery.addMelting(Block.blockIron, 0, 600, new FluidStack(TRepo.moltenIronFluid, TConstruct.ingotLiquidValue * 9)); - Smeltery.addMelting(Block.blockGold, 0, 400, new FluidStack(TRepo.moltenGoldFluid, TConstruct.ingotLiquidValue * 9)); - Smeltery.addMelting(Block.obsidian, 0, 800, new FluidStack(TRepo.moltenObsidianFluid, TConstruct.ingotLiquidValue * 2)); - Smeltery.addMelting(Block.ice, 0, 75, new FluidStack(FluidRegistry.getFluid("water"), 1000)); - Smeltery.addMelting(Block.blockSnow, 0, 75, new FluidStack(FluidRegistry.getFluid("water"), 500)); - Smeltery.addMelting(Block.snow, 0, 75, new FluidStack(FluidRegistry.getFluid("water"), 250)); - Smeltery.addMelting(Block.sand, 0, 625, new FluidStack(TRepo.moltenGlassFluid, FluidContainerRegistry.BUCKET_VOLUME)); - Smeltery.addMelting(Block.glass, 0, 625, new FluidStack(TRepo.moltenGlassFluid, FluidContainerRegistry.BUCKET_VOLUME)); - Smeltery.addMelting(Block.thinGlass, 0, 625, new FluidStack(TRepo.moltenGlassFluid, 250)); - Smeltery.addMelting(Block.stone, 0, 800, new FluidStack(TRepo.moltenStoneFluid, TConstruct.ingotLiquidValue / 18)); - Smeltery.addMelting(Block.cobblestone, 0, 800, new FluidStack(TRepo.moltenStoneFluid, TConstruct.ingotLiquidValue / 18)); - Smeltery.addMelting(Block.blockEmerald, 0, 800, new FluidStack(TRepo.moltenEmeraldFluid, 640 * 9)); + Smeltery.addMelting(Blocks.iron_block, 0, 600, new FluidStack(TRepo.moltenIronFluid, TConstruct.ingotLiquidValue * 9)); + Smeltery.addMelting(Blocks.gold_block, 0, 400, new FluidStack(TRepo.moltenGoldFluid, TConstruct.ingotLiquidValue * 9)); + Smeltery.addMelting(Blocks.obsidian, 0, 800, new FluidStack(TRepo.moltenObsidianFluid, TConstruct.ingotLiquidValue * 2)); + Smeltery.addMelting(Blocks.ice, 0, 75, new FluidStack(FluidRegistry.getFluid("water"), 1000)); + Smeltery.addMelting(Blocks.snow, 0, 75, new FluidStack(FluidRegistry.getFluid("water"), 500)); + Smeltery.addMelting(Blocks.snow_layer, 0, 75, new FluidStack(FluidRegistry.getFluid("water"), 250)); + Smeltery.addMelting(Blocks.sand, 0, 625, new FluidStack(TRepo.moltenGlassFluid, FluidContainerRegistry.BUCKET_VOLUME)); + Smeltery.addMelting(Blocks.glass, 0, 625, new FluidStack(TRepo.moltenGlassFluid, FluidContainerRegistry.BUCKET_VOLUME)); + Smeltery.addMelting(Blocks.glass_pane, 0, 625, new FluidStack(TRepo.moltenGlassFluid, 250)); + Smeltery.addMelting(Blocks.stone, 0, 800, new FluidStack(TRepo.moltenStoneFluid, TConstruct.ingotLiquidValue / 18)); + Smeltery.addMelting(Blocks.cobblestone, 0, 800, new FluidStack(TRepo.moltenStoneFluid, TConstruct.ingotLiquidValue / 18)); + Smeltery.addMelting(Blocks.emerald_block, 0, 800, new FluidStack(TRepo.moltenEmeraldFluid, 640 * 9)); Smeltery.addMelting(TRepo.glueBlock, 0, 250, new FluidStack(TRepo.glueFluid, TConstruct.blockLiquidValue)); Smeltery.addMelting(TRepo.craftedSoil, 1, 600, new FluidStack(TRepo.moltenStoneFluid, TConstruct.ingotLiquidValue / 4)); @@ -1190,51 +1190,51 @@ public class TRecipes Smeltery.addMelting(TRepo.multiBrickFancy, 0, 800, new FluidStack(TRepo.moltenObsidianFluid, TConstruct.ingotLiquidValue * 2)); //Vanilla blocks - Smeltery.addMelting(FluidType.Iron, new ItemStack(Block.fenceIron), 0, TConstruct.ingotLiquidValue * 6 / 16); - Smeltery.addMelting(FluidType.Iron, new ItemStack(Block.pressurePlateIron), 0, TConstruct.oreLiquidValue); - Smeltery.addMelting(FluidType.Gold, new ItemStack(Block.pressurePlateGold, 4), 0, TConstruct.oreLiquidValue); - Smeltery.addMelting(FluidType.Iron, new ItemStack(Block.rail), 0, TConstruct.ingotLiquidValue * 6 / 16); - Smeltery.addMelting(FluidType.Gold, new ItemStack(Block.railPowered), 0, TConstruct.ingotLiquidValue); - Smeltery.addMelting(FluidType.Iron, new ItemStack(Block.railDetector), 0, TConstruct.ingotLiquidValue); - Smeltery.addMelting(FluidType.Iron, new ItemStack(Block.railActivator), 0, TConstruct.ingotLiquidValue); - Smeltery.addMelting(FluidType.Obsidian, new ItemStack(Block.enchantmentTable), 0, TConstruct.ingotLiquidValue * 4); - Smeltery.addMelting(FluidType.Iron, new ItemStack(Block.cauldron), 0, TConstruct.ingotLiquidValue * 7); - Smeltery.addMelting(FluidType.Iron, new ItemStack(Block.anvil, 1, 0), 200, TConstruct.ingotLiquidValue * 31); - Smeltery.addMelting(FluidType.Iron, new ItemStack(Block.anvil, 1, 1), 200, TConstruct.ingotLiquidValue * 31); - Smeltery.addMelting(FluidType.Iron, new ItemStack(Block.anvil, 1, 2), 200, TConstruct.ingotLiquidValue * 31); - Smeltery.addMelting(FluidType.Iron, new ItemStack(Block.hopperBlock), 0, TConstruct.ingotLiquidValue * 5); + Smeltery.addMelting(FluidType.Iron, new ItemStack(Blocks.iron_bars), 0, TConstruct.ingotLiquidValue * 6 / 16); + Smeltery.addMelting(FluidType.Iron, new ItemStack(Blocks.iron_pressure_plate), 0, TConstruct.oreLiquidValue); + Smeltery.addMelting(FluidType.Gold, new ItemStack(Blocks.pressurePlateGold, 4), 0, TConstruct.oreLiquidValue); + Smeltery.addMelting(FluidType.Iron, new ItemStack(Blocks.rail), 0, TConstruct.ingotLiquidValue * 6 / 16); + Smeltery.addMelting(FluidType.Gold, new ItemStack(Blocks.rail_powered), 0, TConstruct.ingotLiquidValue); + Smeltery.addMelting(FluidType.Iron, new ItemStack(Blocks.railDetector), 0, TConstruct.ingotLiquidValue); + Smeltery.addMelting(FluidType.Iron, new ItemStack(Blocks.railActivator), 0, TConstruct.ingotLiquidValue); + Smeltery.addMelting(FluidType.Obsidian, new ItemStack(Blocks.enchanting_table), 0, TConstruct.ingotLiquidValue * 4); + Smeltery.addMelting(FluidType.Iron, new ItemStack(Blocks.cauldron), 0, TConstruct.ingotLiquidValue * 7); + Smeltery.addMelting(FluidType.Iron, new ItemStack(Blocks.anvil, 1, 0), 200, TConstruct.ingotLiquidValue * 31); + Smeltery.addMelting(FluidType.Iron, new ItemStack(Blocks.anvil, 1, 1), 200, TConstruct.ingotLiquidValue * 31); + Smeltery.addMelting(FluidType.Iron, new ItemStack(Blocks.anvil, 1, 2), 200, TConstruct.ingotLiquidValue * 31); + Smeltery.addMelting(FluidType.Iron, new ItemStack(Blocks.hopper), 0, TConstruct.ingotLiquidValue * 5); //Vanilla Armor - Smeltery.addMelting(FluidType.Iron, new ItemStack(Items.helmetIron, 1, 0), 50, TConstruct.ingotLiquidValue * 5); - Smeltery.addMelting(FluidType.Iron, new ItemStack(Items.plateIron, 1, 0), 50, TConstruct.ingotLiquidValue * 8); - Smeltery.addMelting(FluidType.Iron, new ItemStack(Items.legsIron, 1, 0), 50, TConstruct.ingotLiquidValue * 7); - Smeltery.addMelting(FluidType.Iron, new ItemStack(Items.bootsIron, 1, 0), 50, TConstruct.ingotLiquidValue * 4); + Smeltery.addMelting(FluidType.Iron, new ItemStack(Items.iron_helmet, 1, 0), 50, TConstruct.ingotLiquidValue * 5); + Smeltery.addMelting(FluidType.Iron, new ItemStack(Items.iron_chestplate, 1, 0), 50, TConstruct.ingotLiquidValue * 8); + Smeltery.addMelting(FluidType.Iron, new ItemStack(Items.iron_leggings, 1, 0), 50, TConstruct.ingotLiquidValue * 7); + Smeltery.addMelting(FluidType.Iron, new ItemStack(Items.iron_boots, 1, 0), 50, TConstruct.ingotLiquidValue * 4); - Smeltery.addMelting(FluidType.Gold, new ItemStack(Items.helmetGold, 1, 0), 50, TConstruct.ingotLiquidValue * 5); - Smeltery.addMelting(FluidType.Gold, new ItemStack(Items.plateGold, 1, 0), 50, TConstruct.ingotLiquidValue * 8); - Smeltery.addMelting(FluidType.Gold, new ItemStack(Items.legsGold, 1, 0), 50, TConstruct.ingotLiquidValue * 7); - Smeltery.addMelting(FluidType.Gold, new ItemStack(Items.bootsGold, 1, 0), 50, TConstruct.ingotLiquidValue * 4); + Smeltery.addMelting(FluidType.Gold, new ItemStack(Items.golden_helmet, 1, 0), 50, TConstruct.ingotLiquidValue * 5); + Smeltery.addMelting(FluidType.Gold, new ItemStack(Items.golden_chestplate, 1, 0), 50, TConstruct.ingotLiquidValue * 8); + Smeltery.addMelting(FluidType.Gold, new ItemStack(Items.golden_leggings, 1, 0), 50, TConstruct.ingotLiquidValue * 7); + Smeltery.addMelting(FluidType.Gold, new ItemStack(Items.golden_boots, 1, 0), 50, TConstruct.ingotLiquidValue * 4); - Smeltery.addMelting(FluidType.Steel, new ItemStack(Items.helmetChain, 1, 0), 25, TConstruct.ingotLiquidValue); - Smeltery.addMelting(FluidType.Steel, new ItemStack(Items.plateChain, 1, 0), 50, TConstruct.oreLiquidValue); - Smeltery.addMelting(FluidType.Steel, new ItemStack(Items.legsChain, 1, 0), 50, TConstruct.oreLiquidValue); - Smeltery.addMelting(FluidType.Steel, new ItemStack(Items.bootsChain, 1, 0), 25, TConstruct.ingotLiquidValue); + Smeltery.addMelting(FluidType.Steel, new ItemStack(Items.chainmail_helmet, 1, 0), 25, TConstruct.ingotLiquidValue); + Smeltery.addMelting(FluidType.Steel, new ItemStack(Items.chainmail_chestplate, 1, 0), 50, TConstruct.oreLiquidValue); + Smeltery.addMelting(FluidType.Steel, new ItemStack(Items.chainmail_leggings, 1, 0), 50, TConstruct.oreLiquidValue); + Smeltery.addMelting(FluidType.Steel, new ItemStack(Items.chainmail_boots, 1, 0), 25, TConstruct.ingotLiquidValue); - Smeltery.addMelting(FluidType.Iron, new ItemStack(Items.horseArmorIron, 1), 100, TConstruct.ingotLiquidValue * 8); - Smeltery.addMelting(FluidType.Gold, new ItemStack(Items.horseArmorGold, 1), 100, TConstruct.ingotLiquidValue * 8); + Smeltery.addMelting(FluidType.Iron, new ItemStack(Items.iron_horse_armor, 1), 100, TConstruct.ingotLiquidValue * 8); + Smeltery.addMelting(FluidType.Gold, new ItemStack(Items.golden_horse_armor, 1), 100, TConstruct.ingotLiquidValue * 8); //Vanilla tools - Smeltery.addMelting(FluidType.Iron, new ItemStack(Items.hoeIron, 1, 0), 0, TConstruct.oreLiquidValue); - Smeltery.addMelting(FluidType.Iron, new ItemStack(Items.swordIron, 1, 0), 0, TConstruct.oreLiquidValue); - Smeltery.addMelting(FluidType.Iron, new ItemStack(Items.shovelIron, 1, 0), 0, TConstruct.ingotLiquidValue); - Smeltery.addMelting(FluidType.Iron, new ItemStack(Items.pickaxeIron, 1, 0), 0, TConstruct.ingotLiquidValue * 3); - Smeltery.addMelting(FluidType.Iron, new ItemStack(Items.axeIron, 1, 0), 0, TConstruct.ingotLiquidValue * 3); + Smeltery.addMelting(FluidType.Iron, new ItemStack(Items.iron_hoe, 1, 0), 0, TConstruct.oreLiquidValue); + Smeltery.addMelting(FluidType.Iron, new ItemStack(Items.iron_sword, 1, 0), 0, TConstruct.oreLiquidValue); + Smeltery.addMelting(FluidType.Iron, new ItemStack(Items.iron_shovel, 1, 0), 0, TConstruct.ingotLiquidValue); + Smeltery.addMelting(FluidType.Iron, new ItemStack(Items.iron_pickaxe, 1, 0), 0, TConstruct.ingotLiquidValue * 3); + Smeltery.addMelting(FluidType.Iron, new ItemStack(Items.iron_axe, 1, 0), 0, TConstruct.ingotLiquidValue * 3); - Smeltery.addMelting(FluidType.Gold, new ItemStack(Items.hoeGold, 1, 0), 0, TConstruct.oreLiquidValue); - Smeltery.addMelting(FluidType.Gold, new ItemStack(Items.swordGold, 1, 0), 0, TConstruct.oreLiquidValue); - Smeltery.addMelting(FluidType.Gold, new ItemStack(Items.shovelGold, 1, 0), 0, TConstruct.ingotLiquidValue); - Smeltery.addMelting(FluidType.Gold, new ItemStack(Items.pickaxeGold, 1, 0), 0, TConstruct.ingotLiquidValue * 3); - Smeltery.addMelting(FluidType.Gold, new ItemStack(Items.axeGold, 1, 0), 0, TConstruct.ingotLiquidValue * 3); + Smeltery.addMelting(FluidType.Gold, new ItemStack(Items.golden_hoe, 1, 0), 0, TConstruct.oreLiquidValue); + Smeltery.addMelting(FluidType.Gold, new ItemStack(Items.golden_sword, 1, 0), 0, TConstruct.oreLiquidValue); + Smeltery.addMelting(FluidType.Gold, new ItemStack(Items.golden_shovel, 1, 0), 0, TConstruct.ingotLiquidValue); + Smeltery.addMelting(FluidType.Gold, new ItemStack(Items.golden_pickaxe, 1, 0), 0, TConstruct.ingotLiquidValue * 3); + Smeltery.addMelting(FluidType.Gold, new ItemStack(Items.golden_axe, 1, 0), 0, TConstruct.ingotLiquidValue * 3); } public void modIntegration () diff --git a/src/main/java/tconstruct/entity/CartEntity.java b/src/main/java/tconstruct/entity/CartEntity.java index af9aca41..73f5d66a 100644 --- a/src/main/java/tconstruct/entity/CartEntity.java +++ b/src/main/java/tconstruct/entity/CartEntity.java @@ -9,6 +9,7 @@ import net.minecraft.entity.EntityLiving; import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.monster.EntityIronGolem; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.init.Items; import net.minecraft.inventory.IInventory; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; @@ -972,7 +973,7 @@ public class CartEntity extends Entity implements IInventory, IEntityAdditionalS { ItemStack var2 = player.inventory.getCurrentItem(); - if (var2 != null && var2.itemID == Item.coal.itemID) + if (var2 != null && var2.itemID == Items.coal.itemID) { if (--var2.stackSize == 0) { diff --git a/src/main/java/tconstruct/items/tools/Battleaxe.java b/src/main/java/tconstruct/items/tools/Battleaxe.java index 43066a0e..f2e2bc46 100644 --- a/src/main/java/tconstruct/items/tools/Battleaxe.java +++ b/src/main/java/tconstruct/items/tools/Battleaxe.java @@ -25,9 +25,9 @@ import cpw.mods.fml.relauncher.SideOnly; public class Battleaxe extends HarvestTool { - public Battleaxe(int itemID) + public Battleaxe() { - super(itemID, 4); + super(4); this.setUnlocalizedName("InfiTool.Battleaxe"); } diff --git a/src/main/java/tconstruct/items/tools/BowBase.java b/src/main/java/tconstruct/items/tools/BowBase.java index c0b4d835..b509433d 100644 --- a/src/main/java/tconstruct/items/tools/BowBase.java +++ b/src/main/java/tconstruct/items/tools/BowBase.java @@ -215,7 +215,7 @@ public abstract class BowBase extends ToolCore return event.result; } - if (player.capabilities.isCreativeMode || player.inventory.hasItem(Item.arrow.itemID) || player.inventory.hasItem(TRepo.arrow.itemID)) + if (player.capabilities.isCreativeMode || player.inventory.hasItemStack(new ItemStack(Items.arrow)) || player.inventory.hasItemStack(new ItemStack(TRepo.arrow))) { player.setItemInUse(stack, this.getMaxItemUseDuration(stack)); } diff --git a/src/main/java/tconstruct/library/TConstructRegistry.java b/src/main/java/tconstruct/library/TConstructRegistry.java index b610c385..331dc878 100644 --- a/src/main/java/tconstruct/library/TConstructRegistry.java +++ b/src/main/java/tconstruct/library/TConstructRegistry.java @@ -535,21 +535,21 @@ public class TConstructRegistry interchangableBlockMapping[Blocks.lavaMoving] = Block.lavaStill; drawbridgeState[Blocks.sand] = 1; drawbridgeState[Blocks.gravel] = 1; - drawbridgeState[Blocks.oreGold] = 1; - drawbridgeState[Blocks.oreIron] = 1; - drawbridgeState[Blocks.oreCoal] = 1; + drawbridgeState[Blocks.gold_ore] = 1; + drawbridgeState[Blocks.iron_ore] = 1; + drawbridgeState[Blocks.coal_ore] = 1; drawbridgeState[Blocks.sponge] = 1; - drawbridgeState[Blocks.oreLapis] = 1; - drawbridgeState[Blocks.blockLapis] = 1; + drawbridgeState[Blocks.lapis_ore] = 1; + drawbridgeState[Blocks.lapis_block] = 1; drawbridgeState[Blocks.dispenser] = 3; drawbridgeState[Blocks.music] = 1; drawbridgeState[Blocks.bed] = 2; drawbridgeState[Blocks.railPowered] = 4; drawbridgeState[Blocks.railDetector] = 4; - drawbridgeState[Blocks.pistonStickyBase] = 3; + drawbridgeState[Blocks.sticky_piston] = 3; drawbridgeState[Blocks.web] = 1; - drawbridgeState[Blocks.pistonBase] = 3; - drawbridgeState[Blocks.pistonExtension] = 2; + drawbridgeState[Blocks.piston] = 3; + drawbridgeState[Blocks.piston_extension] = 2; drawbridgeState[Blocks.plantYellow] = 1; drawbridgeState[Blocks.plantRed] = 1; drawbridgeState[Blocks.mushroomBrown] = 1; @@ -558,8 +558,8 @@ public class TConstructRegistry drawbridgeState[Blocks.iron_block] = 1; drawbridgeState[Blocks.brick_block] = 1; drawbridgeState[Blocks.tnt] = 1; - drawbridgeState[Blocks.bookShelf] = 1; - drawbridgeState[Blocks.cobblestoneMossy] = 1; + drawbridgeState[Blocks.bookshelf] = 1; + drawbridgeState[Blocks.mossy_cobblestone] = 1; drawbridgeState[Blocks.obsidian] = 1; drawbridgeState[Blocks.torchWood] = 1; drawbridgeState[Blocks.fire] = 1; diff --git a/src/main/java/tconstruct/library/tools/AbilityHelper.java b/src/main/java/tconstruct/library/tools/AbilityHelper.java index b2e0abca..3bd12e2f 100644 --- a/src/main/java/tconstruct/library/tools/AbilityHelper.java +++ b/src/main/java/tconstruct/library/tools/AbilityHelper.java @@ -17,6 +17,7 @@ import net.minecraft.entity.monster.IMob; import net.minecraft.entity.passive.EntityWolf; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; +import net.minecraft.init.Blocks; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; @@ -497,13 +498,13 @@ public class AbilityHelper int bID = world.getBlockId(x, y, z); int bIDabove = world.getBlockId(x, y + 1, z); - if ((side == 0 || bIDabove != 0 || bID != Block.grass.blockID) && bID != Block.dirt.blockID) + if ((side == 0 || bIDabove != 0 || bID != Blocks.grass.blockID) && bID != Blocks.dirt.blockID) { return false; } else { - Block block = Block.tilledField; + Block block = Blocks.tilledField; world.playSoundEffect((double) ((float) x + 0.5F), (double) ((float) y + 0.5F), (double) ((float) z + 0.5F), block.stepSound.getStepSound(), (block.stepSound.getVolume() + 1.0F) / 2.0F, block.stepSound.getPitch() * 0.8F); diff --git a/src/main/java/tconstruct/modifiers/tools/ModPotion.java b/src/main/java/tconstruct/modifiers/tools/ModPotion.java index 3dc888fa..e5be6869 100644 --- a/src/main/java/tconstruct/modifiers/tools/ModPotion.java +++ b/src/main/java/tconstruct/modifiers/tools/ModPotion.java @@ -11,7 +11,7 @@ public class ModPotion extends ToolMod public ModPotion(ItemStack[] items, int effect, String dataKey) { - super(new ItemStack[] { new ItemStack(Items.potion, 1, Short.MAX_VALUE) }, 0, ""); + super(new ItemStack[] { new ItemStack(Items.potionitem, 1, Short.MAX_VALUE) }, 0, ""); } protected boolean canModify (ItemStack tool, ItemStack[] input) diff --git a/src/main/java/tconstruct/util/TDispenserBehaviorArrow.java b/src/main/java/tconstruct/util/TDispenserBehaviorArrow.java index c8e2575a..9b6c0dc5 100644 --- a/src/main/java/tconstruct/util/TDispenserBehaviorArrow.java +++ b/src/main/java/tconstruct/util/TDispenserBehaviorArrow.java @@ -15,8 +15,10 @@ public class TDispenserBehaviorArrow extends BehaviorDefaultDispenseItem public ItemStack dispenseStack (IBlockSource dispenser, ItemStack stack) { World world = dispenser.getWorld(); - IPosition iposition = BlockDispenser.getIPositionFromBlockSource(dispenser); - EnumFacing enumfacing = BlockDispenser.getFacing(dispenser.getBlockMetadata()); + //TODO getIPositionFromBlockSource + IPosition iposition = BlockDispenser.func_149939_a(dispenser); + //TODO getFacing + EnumFacing enumfacing = BlockDispenser.func_149937_b(dispenser.getBlockMetadata()); ItemStack arrowItem = stack.splitStack(1); diff --git a/src/main/java/tconstruct/util/TDispenserBehaviorSpawnEgg.java b/src/main/java/tconstruct/util/TDispenserBehaviorSpawnEgg.java index 2b19db29..de2eed61 100644 --- a/src/main/java/tconstruct/util/TDispenserBehaviorSpawnEgg.java +++ b/src/main/java/tconstruct/util/TDispenserBehaviorSpawnEgg.java @@ -15,7 +15,7 @@ public class TDispenserBehaviorSpawnEgg extends BehaviorDefaultDispenseItem */ public ItemStack dispenseStack (IBlockSource par1IBlockSource, ItemStack par2ItemStack) { - EnumFacing enumfacing = BlockDispenser.getFacing(par1IBlockSource.getBlockMetadata()); + EnumFacing enumfacing = BlockDispenser.func_149937_b(par1IBlockSource.getBlockMetadata()); double d0 = par1IBlockSource.getX() + (double) enumfacing.getFrontOffsetX(); double d1 = (double) ((float) par1IBlockSource.getYInt() + 0.2F); double d2 = par1IBlockSource.getZ() + (double) enumfacing.getFrontOffsetZ(); diff --git a/src/main/java/tconstruct/util/TEventHandler.java b/src/main/java/tconstruct/util/TEventHandler.java index 988220cf..e430bb43 100644 --- a/src/main/java/tconstruct/util/TEventHandler.java +++ b/src/main/java/tconstruct/util/TEventHandler.java @@ -6,6 +6,7 @@ import net.minecraftforge.event.entity.living.LivingEvent.LivingUpdateEvent; import java.util.Random; import cpw.mods.fml.common.eventhandler.Event.Result; +import cpw.mods.fml.common.eventhandler.Event; import cpw.mods.fml.common.eventhandler.SubscribeEvent; import net.minecraft.block.Block; import net.minecraft.entity.Entity; @@ -32,6 +33,7 @@ import net.minecraft.item.crafting.FurnaceRecipes; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.potion.Potion; import net.minecraft.potion.PotionEffect; +import net.minecraft.util.MovingObjectPosition.MovingObjectType; import net.minecraft.world.GameRules; import net.minecraft.world.World; import net.minecraftforge.event.entity.living.LivingDeathEvent; @@ -549,7 +551,7 @@ public class TEventHandler @SubscribeEvent public void bucketFill (FillBucketEvent evt) { - if (evt.current.getItem() == Items.bucket && evt.target.typeOfHit == EnumMovingObjectType.TILE) + if (evt.current.getItem() == Items.bucket && evt.target.typeOfHit == MovingObjectType.TILE) { int hitX = evt.target.blockX; int hitY = evt.target.blockY; diff --git a/src/main/java/tconstruct/worldgen/OreberryBushGen.java b/src/main/java/tconstruct/worldgen/OreberryBushGen.java index 3b75f43a..a912f620 100644 --- a/src/main/java/tconstruct/worldgen/OreberryBushGen.java +++ b/src/main/java/tconstruct/worldgen/OreberryBushGen.java @@ -3,6 +3,7 @@ package tconstruct.worldgen; import java.util.Random; import net.minecraft.block.Block; +import net.minecraft.init.Blocks; import net.minecraft.world.World; import net.minecraft.world.gen.feature.WorldGenerator; @@ -15,7 +16,7 @@ public class OreberryBushGen extends WorldGenerator public OreberryBushGen(Block block, int meta, int chance) { - this(block.blockID, meta, chance, Block.stone.blockID, Block.grass.blockID, Block.dirt.blockID, Block.waterStill.blockID, Block.sand.blockID, Block.gravel.blockID, Block.snow.blockID); + this(meta, chance, Blocks.stone, Blocks.grass, Blocks.dirt, Blocks.water, Blocks.sand, Blocks.gravel, Blocks.snow); } public OreberryBushGen(int blockID, int meta, int chance, int... target) @@ -93,14 +94,14 @@ public class OreberryBushGen extends WorldGenerator Block block = Block.blocksList[world.getBlockId(x, y, z)]; if (block == null || (block != Block.endPortalFrame && !Block.opaqueCubeLookup[world.getBlockId(x, y, z)])) - world.setBlock(x, y, z, this.blockID, metadata, 2); + world.setBlock(x, y, z, this, metadata, 2); else { for (int iter = 0; iter < replaceBlocks.length; iter++) { if (block.isGenMineableReplaceable(world, x, y, z, replaceBlocks[iter])) { - world.setBlock(x, y, z, this.blockID, metadata, 2); + world.setBlock(x, y, z, this, metadata, 2); break; } } diff --git a/src/main/java/tconstruct/worldgen/SlimeIslandGen.java b/src/main/java/tconstruct/worldgen/SlimeIslandGen.java index 050239cb..bc7c61b4 100644 --- a/src/main/java/tconstruct/worldgen/SlimeIslandGen.java +++ b/src/main/java/tconstruct/worldgen/SlimeIslandGen.java @@ -18,17 +18,17 @@ import cpw.mods.fml.common.IWorldGenerator; public class SlimeIslandGen extends WorldGenerator implements IWorldGenerator { - private int liquidBlock; + private Block liquidBlock; private int gelMeta; int randomness = 2; Random random = new Random(); - int baseID = TRepo.craftedSoil.blockID;//Block.dirt.blockID; - int topID = TRepo.slimeGrass.blockID; + Block base = TRepo.craftedSoil;//Block.dirt.blockID; + Block top = TRepo.slimeGrass; SlimeTreeGen trees = new SlimeTreeGen(false, 5, 4, 1, 0); - public SlimeIslandGen(int id, int meta) + public SlimeIslandGen(Block slimePool, int meta) { - this.liquidBlock = id; + this.liquidBlock = slimePool; this.gelMeta = meta; } @@ -66,7 +66,7 @@ public class SlimeIslandGen extends WorldGenerator implements IWorldGenerator for (int y = 0; y <= height; y++) { if (ellipse.contains(x, z)) - world.setBlock(x + xChunk, y + yCenter, z + zChunk, baseID, 5, 0); + world.setBlock(x + xChunk, y + yCenter, z + zChunk, base, 5, 0); } } } @@ -82,8 +82,8 @@ public class SlimeIslandGen extends WorldGenerator implements IWorldGenerator int xPos = x + xChunk; int yPos = y + yCenter + height; int zPos = z + zChunk; - if (world.getBlockId(xPos - 1, yPos + 1, zPos) == baseID && world.getBlockId(xPos + 1, yPos + 1, zPos) == baseID && world.getBlockId(xPos, yPos + 1, zPos - 1) == baseID - && world.getBlockId(xPos - 1, yPos + 1, zPos + 1) == baseID && random.nextInt(100) > randomness) + if (world.getBlock(xPos - 1, yPos + 1, zPos) == base && world.getBlock(xPos + 1, yPos + 1, zPos) == base && world.getBlock(xPos, yPos + 1, zPos - 1) == base + && world.getBlock(xPos - 1, yPos + 1, zPos + 1) == base && random.nextInt(100) > randomness) { ; } @@ -107,8 +107,8 @@ public class SlimeIslandGen extends WorldGenerator implements IWorldGenerator int xPos = x + xChunk; int yPos = y + yCenter + initialHeight - height + 1; int zPos = z + zChunk; - if (world.getBlockId(xPos - 1, yPos - 1, zPos) == baseID && world.getBlockId(xPos + 1, yPos - 1, zPos) == baseID && world.getBlockId(xPos, yPos - 1, zPos - 1) == baseID - && world.getBlockId(xPos - 1, yPos - 1, zPos + 1) == baseID) + if (world.getBlock(xPos - 1, yPos - 1, zPos) == base && world.getBlock(xPos + 1, yPos - 1, zPos) == base && world.getBlock(xPos, yPos - 1, zPos - 1) == base + && world.getBlock(xPos - 1, yPos - 1, zPos + 1) == base) { ; } @@ -130,11 +130,11 @@ public class SlimeIslandGen extends WorldGenerator implements IWorldGenerator int xPos = x + xChunk; int yPos = y + yCenter + initialHeight - height; int zPos = z + zChunk; - if (world.getBlockId(xPos, yPos, zPos) == baseID) + if (world.getBlock(xPos, yPos, zPos) == base) { - Block block = Block.blocksList[world.getBlockId(xPos, yPos + 1, zPos)]; + Block block = Block.blocksList[world.getBlock(xPos, yPos + 1, zPos)]; if (block == null || block.isAirBlock(world, xPos, yPos + 1, zPos)) - world.setBlock(xPos, yPos, zPos, topID, 0, 0); + world.setBlock(xPos, yPos, zPos, top, 0, 0); } } } @@ -232,7 +232,7 @@ public class SlimeIslandGen extends WorldGenerator implements IWorldGenerator return false; } - if (yPos < 4 && !var12.isSolid() && world.getBlockId(x + xPos, y + yPos, z + zPos) != this.liquidBlock) + if (yPos < 4 && !var12.isSolid() && world.getBlock(x + xPos, y + yPos, z + zPos) != this.liquidBlock) { return false; } @@ -261,10 +261,10 @@ public class SlimeIslandGen extends WorldGenerator implements IWorldGenerator { for (yPos = 4; yPos < 8; ++yPos) { - if (validLocations[(xPos * 16 + zPos) * 8 + yPos] && world.getBlockId(x + xPos, y + yPos - 1, z + zPos) == baseID + if (validLocations[(xPos * 16 + zPos) * 8 + yPos] && world.getBlock(x + xPos, y + yPos - 1, z + zPos) == base && world.getSavedLightValue(EnumSkyBlock.Sky, x + xPos, y + yPos, z + zPos) > 0) { - world.setBlock(x + xPos, y + yPos - 1, z + zPos, topID, 0, 0); + world.setBlock(x + xPos, y + yPos - 1, z + zPos, top, 0, 0); } } } @@ -287,7 +287,7 @@ public class SlimeIslandGen extends WorldGenerator implements IWorldGenerator if (var33 && (yPos < 4 || rand.nextInt(2) != 0) && world.getBlockMaterial(x + xPos, y + yPos, z + zPos).isSolid() && world.getBlockMaterial(x + xPos, y + yPos + 1, z + zPos) != Material.water) { - world.setBlock(x + xPos, y + yPos, z + zPos, TRepo.slimeGel.blockID, gelMeta, 2); + world.setBlock(x + xPos, y + yPos, z + zPos, TRepo.slimeGel, gelMeta, 2); } } } diff --git a/src/main/java/tconstruct/worldgen/SurfaceOreGen.java b/src/main/java/tconstruct/worldgen/SurfaceOreGen.java index de64e4ab..431aa881 100644 --- a/src/main/java/tconstruct/worldgen/SurfaceOreGen.java +++ b/src/main/java/tconstruct/worldgen/SurfaceOreGen.java @@ -3,8 +3,8 @@ package tconstruct.worldgen; import java.util.Random; import tconstruct.util.config.PHConstruct; - import net.minecraft.block.Block; +import net.minecraft.init.Blocks; import net.minecraft.util.MathHelper; import net.minecraft.world.World; import net.minecraft.world.gen.feature.WorldGenerator; @@ -22,7 +22,7 @@ public class SurfaceOreGen extends WorldGenerator public SurfaceOreGen(int id, int meta, int number, boolean changeSize) { - this(id, meta, number, changeSize, Block.stone.blockID, Block.grass.blockID, Block.dirt.blockID, Block.waterStill.blockID, Block.sand.blockID, Block.gravel.blockID, Block.snow.blockID); + this(id, meta, number, changeSize, Blocks.stone, (Block) Blocks.grass, Blocks.dirt, Blocks.water, Blocks.sand, Blocks.gravel, Blocks.snow); } public SurfaceOreGen(int id, int meta, int number, boolean changeSize, int... target) @@ -38,7 +38,7 @@ public class SurfaceOreGen extends WorldGenerator { int returnHeight = -1; int blockID = world.getBlockId(x, y - 1, z); - if (!Block.opaqueCubeLookup[world.getBlockId(x, y, z)] && (blockID == Block.dirt.blockID || blockID == Block.grass.blockID)) + if (!Block.opaqueCubeLookup[world.getBlockId(x, y, z)] && (blockID == Blocks.dirt.blockID || blockID == Blocks.grass.blockID)) { return y; } @@ -50,7 +50,7 @@ public class SurfaceOreGen extends WorldGenerator break; } int bID = world.getBlockId(x, height, z); - if (bID == Block.dirt.blockID || bID == Block.grass.blockID) + if (bID == Blocks.dirt.blockID || bID == Blocks.grass.blockID) { if (!Block.opaqueCubeLookup[world.getBlockId(x, height + 1, z)]) { diff --git a/src/main/java/tconstruct/worldgen/TerrainGenEventHandler.java b/src/main/java/tconstruct/worldgen/TerrainGenEventHandler.java index 2c987540..337e8e8f 100644 --- a/src/main/java/tconstruct/worldgen/TerrainGenEventHandler.java +++ b/src/main/java/tconstruct/worldgen/TerrainGenEventHandler.java @@ -8,27 +8,27 @@ import java.util.Random; import tconstruct.common.TRepo; import tconstruct.util.config.PHConstruct; - import net.minecraft.world.World; import net.minecraft.world.biome.BiomeGenBase; -import net.minecraftforge.event.ForgeSubscribe; import net.minecraftforge.event.terraingen.DecorateBiomeEvent.Decorate; import com.google.common.collect.ImmutableCollection; import com.google.common.collect.ImmutableList; +import cpw.mods.fml.common.eventhandler.SubscribeEvent; + public class TerrainGenEventHandler { - private final SurfaceOreGen ironSurface = new SurfaceOreGen(TRepo.oreGravel.blockID, 0, 12, true); - private final SurfaceOreGen goldSurface = new SurfaceOreGen(TRepo.oreGravel.blockID, 1, 20, true); - private final SurfaceOreGen copperSurface = new SurfaceOreGen(TRepo.oreGravel.blockID, 2, 12, true); - private final SurfaceOreGen tinSurface = new SurfaceOreGen(TRepo.oreGravel.blockID, 3, 12, true); - private final SurfaceOreGen aluminumSurface = new SurfaceOreGen(TRepo.oreGravel.blockID, 4, 12, true); - private final SurfaceOreGen cobaltSurface = new SurfaceOreGen(TRepo.oreGravel.blockID, 5, 30, true); + private final SurfaceOreGen ironSurface = new SurfaceOreGen(TRepo.oreGravel, 0, 12, true); + private final SurfaceOreGen goldSurface = new SurfaceOreGen(TRepo.oreGravel, 1, 20, true); + private final SurfaceOreGen copperSurface = new SurfaceOreGen(TRepo.oreGravel, 2, 12, true); + private final SurfaceOreGen tinSurface = new SurfaceOreGen(TRepo.oreGravel, 3, 12, true); + private final SurfaceOreGen aluminumSurface = new SurfaceOreGen(TRepo.oreGravel, 4, 12, true); + private final SurfaceOreGen cobaltSurface = new SurfaceOreGen(TRepo.oreGravel, 5, 30, true); private static ImmutableCollection EXTRA_ORE_BIOMES = ImmutableList.of(extremeHills, extremeHillsEdge); - @ForgeSubscribe + @SubscribeEvent public void onDecorateEvent (Decorate e) { // Trigger just before sand pass one--which comes just after vanilla ore generation. diff --git a/src/main/java/tconstruct/worldgen/village/ComponentToolWorkshop.java b/src/main/java/tconstruct/worldgen/village/ComponentToolWorkshop.java index 579ea5d3..0f8fac15 100644 --- a/src/main/java/tconstruct/worldgen/village/ComponentToolWorkshop.java +++ b/src/main/java/tconstruct/worldgen/village/ComponentToolWorkshop.java @@ -61,12 +61,12 @@ public class ComponentToolWorkshop extends MapGenVillage * maxZ, int placeBlockId, int replaceBlockId, boolean alwaysreplace) */ - this.fillWithBlocks(world, sbb, 0, 0, 0, 6, 0, 6, Blocks.cobblestone.blockID, Blocks.cobblestone.blockID, false); //Base - this.fillWithBlocks(world, sbb, 0, 5, 0, 6, 5, 6, Blocks.fence.blockID, Blocks.fence.blockID, false); - this.fillWithBlocks(world, sbb, 1, 0, 1, 5, 0, 5, Blocks.planks.blockID, Blocks.planks.blockID, false); - this.fillWithBlocks(world, sbb, 2, 0, 2, 4, 0, 4, Blocks.wool.blockID, Blocks.cloth.blockID, false); + this.fillWithBlocks(world, sbb, 0, 0, 0, 6, 0, 6, Blocks.cobblestone, Blocks.cobblestone, false); //Base + this.fillWithBlocks(world, sbb, 0, 5, 0, 6, 5, 6, Blocks.fence, Blocks.fence, false); + this.fillWithBlocks(world, sbb, 1, 0, 1, 5, 0, 5, Blocks.planks, Blocks.planks, false); + this.fillWithBlocks(world, sbb, 2, 0, 2, 4, 0, 4, Blocks.wool, Blocks.wool, false); - //this.fillWithBlocks(world, sbb, 0, 5, 0, 6, 5, 6, Block.wood.blockID, Block.wood.blockID, false); + //this.fillWithBlocks(world, sbb, 0, 5, 0, 6, 5, 6, Blocks.log, Blocks.log, false); this.fillWithBlocks(world, sbb, 0, 1, 0, 0, 4, 0, Blocks.log, Blocks.log, false); //Edges this.fillWithBlocks(world, sbb, 0, 1, 6, 0, 4, 6, Blocks.log, Blocks.log, false); @@ -83,10 +83,10 @@ public class ComponentToolWorkshop extends MapGenVillage this.fillWithBlocks(world, sbb, 6, 3, 1, 6, 3, 5, Blocks.planks, Blocks.planks, false); this.fillWithBlocks(world, sbb, 1, 3, 6, 5, 3, 6, Blocks.planks, Blocks.planks, false); - this.fillWithBlocks(world, sbb, 0, 4, 1, 0, 4, 5, Block.wood.blockID, Block.wood.blockID, false); - this.fillWithBlocks(world, sbb, 1, 4, 0, 5, 4, 0, Block.wood.blockID, Block.wood.blockID, false); - this.fillWithBlocks(world, sbb, 6, 4, 1, 6, 4, 5, Block.wood.blockID, Block.wood.blockID, false); - this.fillWithBlocks(world, sbb, 1, 4, 6, 5, 4, 6, Block.wood.blockID, Block.wood.blockID, false); + this.fillWithBlocks(world, sbb, 0, 4, 1, 0, 4, 5, Blocks.log, Blocks.log, false); + this.fillWithBlocks(world, sbb, 1, 4, 0, 5, 4, 0, Blocks.log, Blocks.log, false); + this.fillWithBlocks(world, sbb, 6, 4, 1, 6, 4, 5, Blocks.log, Blocks.log, false); + this.fillWithBlocks(world, sbb, 1, 4, 6, 5, 4, 6, Blocks.log, Blocks.log, false); this.fillWithBlocks(world, sbb, 1, 1, 1, 5, 5, 5, 0, 0, false); this.fillWithBlocks(world, sbb, 1, 4, 1, 5, 4, 5, Blocks.planks, Blocks.planks, false); @@ -94,7 +94,7 @@ public class ComponentToolWorkshop extends MapGenVillage //world, blockID, metadata, x, y, z, bounds this.placeBlockAtCurrentPosition(world, Blocks.glass_pane, 0, 1, 2, 0, sbb);//Glass and door this.placeBlockAtCurrentPosition(world, Blocks.planks, 0, 2, 2, 0, sbb); - this.placeDoorAtCurrentPosition(world, sbb, random, 3, 1, 0, this.getMetadataWithOffset(Block.doorWood.blockID, 1)); + this.placeDoorAtCurrentPosition(world, sbb, random, 3, 1, 0, this.getMetadataWithOffset(Blocks.wooden_door, 1)); this.placeBlockAtCurrentPosition(world, Blocks.planks, 0, 4, 2, 0, sbb); this.placeBlockAtCurrentPosition(world, Blocks.glass_pane, 0, 5, 2, 0, sbb); @@ -122,18 +122,18 @@ public class ComponentToolWorkshop extends MapGenVillage this.placeBlockAtCurrentPosition(world, Blocks.ladder, i, 3, 3, 5, sbb); this.placeBlockAtCurrentPosition(world, Blocks.ladder, i, 3, 4, 5, sbb); - this.placeBlockAtCurrentPosition(world, TRepo.toolStationWood.blockID, 0, 1, 1, 1, sbb); //Inside + this.placeBlockAtCurrentPosition(world, TRepo.toolStationWood, 0, 1, 1, 1, sbb); //Inside this.generateStructurePatternChestContents(world, sbb, random, 1, 1, 2, TRepo.tinkerHousePatterns.getItems(random), TRepo.tinkerHousePatterns.getCount(random)); - //this.placeBlockAtCurrentPosition(world, TRepo.toolStationWood.blockID, 5, 1, 1, 2, sbb); - this.placeBlockAtCurrentPosition(world, TRepo.toolStationWood.blockID, 1, 1, 1, 3, sbb); + //this.placeBlockAtCurrentPosition(world, TRepo.toolStationWood, 5, 1, 1, 2, sbb); + this.placeBlockAtCurrentPosition(world, TRepo.toolStationWood, 1, 1, 1, 3, sbb); this.generateStructureCraftingStationContents(world, sbb, random, 1, 1, 4, TRepo.tinkerHouseChest.getItems(random), TRepo.tinkerHouseChest.getCount(random)); - // this.placeBlockAtCurrentPosition(world, TRepo.craftingStationWood.blockID, 0, 1, 1, 4, sbb); - this.placeBlockAtCurrentPosition(world, TRepo.toolStationWood.blockID, 10, 1, 1, 5, sbb); + // this.placeBlockAtCurrentPosition(world, TRepo.craftingStationWood, 0, 1, 1, 4, sbb); + this.placeBlockAtCurrentPosition(world, TRepo.toolStationWood, 10, 1, 1, 5, sbb); //ChestGenHooks info = ChestGenHooks.getInfo("TinkerHouse"); this.generateStructureChestContents(world, sbb, random, 4, 1, 5, TRepo.tinkerHouseChest.getItems(random), TRepo.tinkerHouseChest.getCount(random)); - //this.placeBlockAtCurrentPosition(world, Block.chest.blockID, i, 4, 1, 5, sbb); + //this.placeBlockAtCurrentPosition(world, Block.chest, i, 4, 1, 5, sbb); i = this.getMetadataWithOffset(Blocks.piston, 3); this.placeBlockAtCurrentPosition(world, Blocks.piston, i, 5, 1, 5, sbb); @@ -157,9 +157,9 @@ public class ComponentToolWorkshop extends MapGenVillage int posY = this.getYWithOffset(y); int posZ = this.getZWithOffset(x, z); - if (par2StructureBoundingBox.isVecInside(posX, posY, posZ) && world.getBlockId(posX, posY, posZ) != Block.chest.blockID) + if (par2StructureBoundingBox.isVecInside(posX, posY, posZ) && world.getBlockId(posX, posY, posZ) != Blocks.chest.blockID) { - world.setBlock(posX, posY, posZ, TRepo.craftingStationWood.blockID, 5, 2); + world.setBlock(posX, posY, posZ, TRepo.craftingStationWood, 5, 2); CraftingStationLogic logic = (CraftingStationLogic) world.getBlockTileEntity(posX, posY, posZ); if (logic != null) @@ -183,7 +183,7 @@ public class ComponentToolWorkshop extends MapGenVillage if (par2StructureBoundingBox.isVecInside(posX, posY, posZ) && world.getBlockId(posX, posY, posZ) != Blocks.chest.blockID) { - world.setBlock(posX, posY, posZ, TRepo.toolStationWood.blockID, 5, 2); + world.setBlock(posX, posY, posZ, TRepo.toolStationWood, 5, 2); PatternChestLogic logic = (PatternChestLogic) world.getBlockTileEntity(posX, posY, posZ); if (logic != null)