From d81f94b8d7ed64ddb02ef9ed399f57b13d242b30 Mon Sep 17 00:00:00 2001 From: AnodeCathode Date: Fri, 11 Sep 2015 16:35:05 -0600 Subject: [PATCH] Updates for 79.23 renamed method names --- .../decorations/Blocks/BlockAlabaster.java | 4 +- .../Blocks/BlockCustomLantern.java | 2 +- .../decorations/Blocks/BlockMudBrickRaw.java | 2 +- .../decorations/Blocks/BlockMudBricks.java | 2 +- .../aleksey/decorations/Core/FluidList.java | 8 +- .../aleksey/decorations/Core/ItemList.java | 208 +++++++++--------- .../Core/Player/PlayerTracker.java | 2 +- src/com/aleksey/decorations/Core/Recipes.java | 46 ++-- .../aleksey/decorations/DecorationsMod.java | 2 +- .../decorations/Handlers/CraftingHandler.java | 2 +- .../aleksey/decorations/Items/ItemBrush.java | 2 +- .../decorations/Items/ItemGypsumPowder.java | 2 +- .../decorations/Items/ItemLanternCore.java | 2 +- .../decorations/Items/ItemLiquidDye.java | 2 +- .../decorations/Items/ItemPlaster.java | 2 +- 15 files changed, 144 insertions(+), 144 deletions(-) diff --git a/src/com/aleksey/decorations/Blocks/BlockAlabaster.java b/src/com/aleksey/decorations/Blocks/BlockAlabaster.java index ec1c9f3..51f27bc 100644 --- a/src/com/aleksey/decorations/Blocks/BlockAlabaster.java +++ b/src/com/aleksey/decorations/Blocks/BlockAlabaster.java @@ -16,12 +16,12 @@ public BlockAlabaster() super(Material.rock); this.setHardness(12f); this.setResistance(10.0f); - this.setCreativeTab(TFCTabs.TFCBuilding); + this.setCreativeTab(TFCTabs.TFC_BUILDING); this.names = new String[16]; for(int i = 0; i < this.names.length; i++) { - String dyeName = ItemDyeCustom.dyeColorNames[FluidList.LiquidDyes[i].TFCDyeIndex]; + String dyeName = ItemDyeCustom.DYE_COLOR_NAMES[FluidList.LiquidDyes[i].TFCDyeIndex]; this.names[i] = "Alabaster" + dyeName.substring(0, 1).toUpperCase() + dyeName.substring(1); } diff --git a/src/com/aleksey/decorations/Blocks/BlockCustomLantern.java b/src/com/aleksey/decorations/Blocks/BlockCustomLantern.java index 8e53d02..b442ef5 100644 --- a/src/com/aleksey/decorations/Blocks/BlockCustomLantern.java +++ b/src/com/aleksey/decorations/Blocks/BlockCustomLantern.java @@ -38,7 +38,7 @@ public BlockCustomLantern(LanternInfo info) setBlockBounds(0.25F, 0.125F, 0.25F, 0.75F, 0.75F, 0.75F); setLightLevel((float)_info.LightLevel / 15.0F); setStepSound(Block.soundTypeMetal); - setCreativeTab(TFCTabs.TFCMisc); + setCreativeTab(TFCTabs.TFC_MISC); } @Override diff --git a/src/com/aleksey/decorations/Blocks/BlockMudBrickRaw.java b/src/com/aleksey/decorations/Blocks/BlockMudBrickRaw.java index 424512c..565ac6a 100644 --- a/src/com/aleksey/decorations/Blocks/BlockMudBrickRaw.java +++ b/src/com/aleksey/decorations/Blocks/BlockMudBrickRaw.java @@ -46,7 +46,7 @@ public BlockMudBrickRaw(int stoneIndex) this.setHardness(0.3f); this.setResistance(10.0f); - this.setCreativeTab(TFCTabs.TFCMaterials); + this.setCreativeTab(TFCTabs.TFC_MATERIALS); this.setBlockBounds((float)RenderMudBrickRaw.VoxelSizeScaled, 0, (float)RenderMudBrickRaw.VoxelSizeScaled, 1 - (float)RenderMudBrickRaw.VoxelSizeScaled, 8 * (float)RenderMudBrickRaw.VoxelSizeScaled, 1 - (float)RenderMudBrickRaw.VoxelSizeScaled); _stoneIndex = stoneIndex; diff --git a/src/com/aleksey/decorations/Blocks/BlockMudBricks.java b/src/com/aleksey/decorations/Blocks/BlockMudBricks.java index 9e41967..908c1ed 100644 --- a/src/com/aleksey/decorations/Blocks/BlockMudBricks.java +++ b/src/com/aleksey/decorations/Blocks/BlockMudBricks.java @@ -25,7 +25,7 @@ public BlockMudBricks(int startIndex) this.setHardness(3f); this.setResistance(10.0f); this.setHarvestLevel("pickaxe", 0); - this.setCreativeTab(TFCTabs.TFCBuilding); + this.setCreativeTab(TFCTabs.TFC_BUILDING); _startIndex = startIndex; diff --git a/src/com/aleksey/decorations/Core/FluidList.java b/src/com/aleksey/decorations/Core/FluidList.java index 51f6bd9..0a9e273 100644 --- a/src/com/aleksey/decorations/Core/FluidList.java +++ b/src/com/aleksey/decorations/Core/FluidList.java @@ -37,7 +37,7 @@ public static void register() FluidRegistry.registerFluid(Plaster); - LiquidDyes = new DyeFluid[ItemDyeCustom.dyeColorNames.length]; + LiquidDyes = new DyeFluid[ItemDyeCustom.DYE_COLOR_NAMES.length]; for(int i = 0; i < LiquidDyes.length; i++) { @@ -50,7 +50,7 @@ else if(i == LiquidDyes.length - 1) else dyeIndex = i; - String fluidName = "liquid_dye." + ItemDyeCustom.dyeColorNames[dyeIndex]; + String fluidName = "liquid_dye." + ItemDyeCustom.DYE_COLOR_NAMES[dyeIndex]; int color = Constants.DyeColors[dyeIndex]; DyeFluid fluid = new DyeFluid(fluidName, dyeIndex); @@ -79,9 +79,9 @@ public static void registerFluidContainers() } } - FluidContainerRegistry.registerFluidContainer(new FluidStack(Plaster, 1000), new ItemStack(ItemList.Plaster), new ItemStack(TFCItems.WoodenBucketEmpty)); + FluidContainerRegistry.registerFluidContainer(new FluidStack(Plaster, 1000), new ItemStack(ItemList.Plaster), new ItemStack(TFCItems.woodenBucketEmpty)); for(int i = 0; i < LiquidDyes.length; i++) - FluidContainerRegistry.registerFluidContainer(new FluidStack(LiquidDyes[i], 1000), new ItemStack(ItemList.LiquidDye, 1, i), new ItemStack(TFCItems.WoodenBucketEmpty)); + FluidContainerRegistry.registerFluidContainer(new FluidStack(LiquidDyes[i], 1000), new ItemStack(ItemList.LiquidDye, 1, i), new ItemStack(TFCItems.woodenBucketEmpty)); } } diff --git a/src/com/aleksey/decorations/Core/ItemList.java b/src/com/aleksey/decorations/Core/ItemList.java index f9395ce..d95d047 100644 --- a/src/com/aleksey/decorations/Core/ItemList.java +++ b/src/com/aleksey/decorations/Core/ItemList.java @@ -29,19 +29,19 @@ public static void setup() throws ExistingSubstitutionException { if(DecorationsMod.isGemsEnabled) { - TFCItems.GemRuby = new ItemCustomGem(TFCItems.GemRuby).setUnlocalizedName(TFCItems.GemRuby.getUnlocalizedName().substring(5)); - TFCItems.GemSapphire = new ItemCustomGem(TFCItems.GemSapphire).setUnlocalizedName(TFCItems.GemSapphire.getUnlocalizedName().substring(5)); - TFCItems.GemEmerald = new ItemCustomGem(TFCItems.GemEmerald).setUnlocalizedName(TFCItems.GemEmerald.getUnlocalizedName().substring(5)); - TFCItems.GemTopaz = new ItemCustomGem(TFCItems.GemTopaz).setUnlocalizedName(TFCItems.GemTopaz.getUnlocalizedName().substring(5)); - TFCItems.GemTourmaline = new ItemCustomGem(TFCItems.GemTourmaline).setUnlocalizedName(TFCItems.GemTourmaline.getUnlocalizedName().substring(5)); - TFCItems.GemJade = new ItemCustomGem(TFCItems.GemJade).setUnlocalizedName(TFCItems.GemJade.getUnlocalizedName().substring(5)); - TFCItems.GemBeryl = new ItemCustomGem(TFCItems.GemBeryl).setUnlocalizedName(TFCItems.GemBeryl.getUnlocalizedName().substring(5)); - TFCItems.GemAgate = new ItemCustomGem(TFCItems.GemAgate).setUnlocalizedName(TFCItems.GemAgate.getUnlocalizedName().substring(5)); - TFCItems.GemOpal = new ItemCustomGem(TFCItems.GemOpal).setUnlocalizedName(TFCItems.GemOpal.getUnlocalizedName().substring(5)); - TFCItems.GemGarnet = new ItemCustomGem(TFCItems.GemGarnet).setUnlocalizedName(TFCItems.GemGarnet.getUnlocalizedName().substring(5)); - TFCItems.GemJasper = new ItemCustomGem(TFCItems.GemJasper).setUnlocalizedName(TFCItems.GemJasper.getUnlocalizedName().substring(5)); - TFCItems.GemAmethyst = new ItemCustomGem(TFCItems.GemAmethyst).setUnlocalizedName(TFCItems.GemAmethyst.getUnlocalizedName().substring(5)); - TFCItems.GemDiamond = new ItemCustomGem(TFCItems.GemDiamond).setUnlocalizedName(TFCItems.GemDiamond.getUnlocalizedName().substring(5)); + TFCItems.gemRuby = new ItemCustomGem(TFCItems.gemRuby).setUnlocalizedName(TFCItems.gemRuby.getUnlocalizedName().substring(5)); + TFCItems.gemSapphire = new ItemCustomGem(TFCItems.gemSapphire).setUnlocalizedName(TFCItems.gemSapphire.getUnlocalizedName().substring(5)); + TFCItems.gemEmerald = new ItemCustomGem(TFCItems.gemEmerald).setUnlocalizedName(TFCItems.gemEmerald.getUnlocalizedName().substring(5)); + TFCItems.gemTopaz = new ItemCustomGem(TFCItems.gemTopaz).setUnlocalizedName(TFCItems.gemTopaz.getUnlocalizedName().substring(5)); + TFCItems.gemTourmaline = new ItemCustomGem(TFCItems.gemTourmaline).setUnlocalizedName(TFCItems.gemTourmaline.getUnlocalizedName().substring(5)); + TFCItems.gemJade = new ItemCustomGem(TFCItems.gemJade).setUnlocalizedName(TFCItems.gemJade.getUnlocalizedName().substring(5)); + TFCItems.gemBeryl = new ItemCustomGem(TFCItems.gemBeryl).setUnlocalizedName(TFCItems.gemBeryl.getUnlocalizedName().substring(5)); + TFCItems.gemAgate = new ItemCustomGem(TFCItems.gemAgate).setUnlocalizedName(TFCItems.gemAgate.getUnlocalizedName().substring(5)); + TFCItems.gemOpal = new ItemCustomGem(TFCItems.gemOpal).setUnlocalizedName(TFCItems.gemOpal.getUnlocalizedName().substring(5)); + TFCItems.gemGarnet = new ItemCustomGem(TFCItems.gemGarnet).setUnlocalizedName(TFCItems.gemGarnet.getUnlocalizedName().substring(5)); + TFCItems.gemJasper = new ItemCustomGem(TFCItems.gemJasper).setUnlocalizedName(TFCItems.gemJasper.getUnlocalizedName().substring(5)); + TFCItems.gemAmethyst = new ItemCustomGem(TFCItems.gemAmethyst).setUnlocalizedName(TFCItems.gemAmethyst.getUnlocalizedName().substring(5)); + TFCItems.gemDiamond = new ItemCustomGem(TFCItems.gemDiamond).setUnlocalizedName(TFCItems.gemDiamond.getUnlocalizedName().substring(5)); } if(DecorationsMod.isLanternsEnabled) @@ -68,19 +68,19 @@ private static void registerItems() throws ExistingSubstitutionException { if(DecorationsMod.isGemsEnabled) { - GameRegistry.addSubstitutionAlias("terrafirmacraft:" + TFCItems.GemRuby.getUnlocalizedName(), GameRegistry.Type.ITEM, TFCItems.GemRuby); - GameRegistry.addSubstitutionAlias("terrafirmacraft:" + TFCItems.GemSapphire.getUnlocalizedName(), GameRegistry.Type.ITEM, TFCItems.GemSapphire); - GameRegistry.addSubstitutionAlias("terrafirmacraft:" + TFCItems.GemEmerald.getUnlocalizedName(), GameRegistry.Type.ITEM, TFCItems.GemEmerald); - GameRegistry.addSubstitutionAlias("terrafirmacraft:" + TFCItems.GemTopaz.getUnlocalizedName(), GameRegistry.Type.ITEM, TFCItems.GemTopaz); - GameRegistry.addSubstitutionAlias("terrafirmacraft:" + TFCItems.GemTourmaline.getUnlocalizedName(), GameRegistry.Type.ITEM, TFCItems.GemTourmaline); - GameRegistry.addSubstitutionAlias("terrafirmacraft:" + TFCItems.GemJade.getUnlocalizedName(), GameRegistry.Type.ITEM, TFCItems.GemJade); - GameRegistry.addSubstitutionAlias("terrafirmacraft:" + TFCItems.GemBeryl.getUnlocalizedName(), GameRegistry.Type.ITEM, TFCItems.GemBeryl); - GameRegistry.addSubstitutionAlias("terrafirmacraft:" + TFCItems.GemAgate.getUnlocalizedName(), GameRegistry.Type.ITEM, TFCItems.GemAgate); - GameRegistry.addSubstitutionAlias("terrafirmacraft:" + TFCItems.GemOpal.getUnlocalizedName(), GameRegistry.Type.ITEM, TFCItems.GemOpal); - GameRegistry.addSubstitutionAlias("terrafirmacraft:" + TFCItems.GemGarnet.getUnlocalizedName(), GameRegistry.Type.ITEM, TFCItems.GemGarnet); - GameRegistry.addSubstitutionAlias("terrafirmacraft:" + TFCItems.GemJasper.getUnlocalizedName(), GameRegistry.Type.ITEM, TFCItems.GemJasper); - GameRegistry.addSubstitutionAlias("terrafirmacraft:" + TFCItems.GemAmethyst.getUnlocalizedName(), GameRegistry.Type.ITEM, TFCItems.GemAmethyst); - GameRegistry.addSubstitutionAlias("terrafirmacraft:" + TFCItems.GemDiamond.getUnlocalizedName(), GameRegistry.Type.ITEM, TFCItems.GemDiamond); + GameRegistry.addSubstitutionAlias("terrafirmacraft:" + TFCItems.gemRuby.getUnlocalizedName(), GameRegistry.Type.ITEM, TFCItems.gemRuby); + GameRegistry.addSubstitutionAlias("terrafirmacraft:" + TFCItems.gemSapphire.getUnlocalizedName(), GameRegistry.Type.ITEM, TFCItems.gemSapphire); + GameRegistry.addSubstitutionAlias("terrafirmacraft:" + TFCItems.gemEmerald.getUnlocalizedName(), GameRegistry.Type.ITEM, TFCItems.gemEmerald); + GameRegistry.addSubstitutionAlias("terrafirmacraft:" + TFCItems.gemTopaz.getUnlocalizedName(), GameRegistry.Type.ITEM, TFCItems.gemTopaz); + GameRegistry.addSubstitutionAlias("terrafirmacraft:" + TFCItems.gemTourmaline.getUnlocalizedName(), GameRegistry.Type.ITEM, TFCItems.gemTourmaline); + GameRegistry.addSubstitutionAlias("terrafirmacraft:" + TFCItems.gemJade.getUnlocalizedName(), GameRegistry.Type.ITEM, TFCItems.gemJade); + GameRegistry.addSubstitutionAlias("terrafirmacraft:" + TFCItems.gemBeryl.getUnlocalizedName(), GameRegistry.Type.ITEM, TFCItems.gemBeryl); + GameRegistry.addSubstitutionAlias("terrafirmacraft:" + TFCItems.gemAgate.getUnlocalizedName(), GameRegistry.Type.ITEM, TFCItems.gemAgate); + GameRegistry.addSubstitutionAlias("terrafirmacraft:" + TFCItems.gemOpal.getUnlocalizedName(), GameRegistry.Type.ITEM, TFCItems.gemOpal); + GameRegistry.addSubstitutionAlias("terrafirmacraft:" + TFCItems.gemGarnet.getUnlocalizedName(), GameRegistry.Type.ITEM, TFCItems.gemGarnet); + GameRegistry.addSubstitutionAlias("terrafirmacraft:" + TFCItems.gemJasper.getUnlocalizedName(), GameRegistry.Type.ITEM, TFCItems.gemJasper); + GameRegistry.addSubstitutionAlias("terrafirmacraft:" + TFCItems.gemAmethyst.getUnlocalizedName(), GameRegistry.Type.ITEM, TFCItems.gemAmethyst); + GameRegistry.addSubstitutionAlias("terrafirmacraft:" + TFCItems.gemDiamond.getUnlocalizedName(), GameRegistry.Type.ITEM, TFCItems.gemDiamond); } if(DecorationsMod.isLanternsEnabled) @@ -104,89 +104,89 @@ private static void registerOreDict() if(DecorationsMod.isGemsEnabled) { //Gems - OreDictionary.registerOre("gemChippedAgate", new ItemStack(TFCItems.GemAgate)); - OreDictionary.registerOre("gemChippedAmethyst", new ItemStack(TFCItems.GemAmethyst)); - OreDictionary.registerOre("gemChippedBeryl", new ItemStack(TFCItems.GemBeryl)); - OreDictionary.registerOre("gemChippedDiamond", new ItemStack(TFCItems.GemDiamond)); - OreDictionary.registerOre("gemChippedEmerald", new ItemStack(TFCItems.GemEmerald)); - OreDictionary.registerOre("gemChippedGarnet", new ItemStack(TFCItems.GemGarnet)); - OreDictionary.registerOre("gemChippedJade", new ItemStack(TFCItems.GemJade)); - OreDictionary.registerOre("gemChippedJasper", new ItemStack(TFCItems.GemJasper)); - OreDictionary.registerOre("gemChippedOpal", new ItemStack(TFCItems.GemOpal)); - OreDictionary.registerOre("gemChippedRuby", new ItemStack(TFCItems.GemRuby)); - OreDictionary.registerOre("gemChippedSapphire", new ItemStack(TFCItems.GemSapphire)); - OreDictionary.registerOre("gemChippedTopaz", new ItemStack(TFCItems.GemTopaz)); - OreDictionary.registerOre("gemChippedTourmaline", new ItemStack(TFCItems.GemTourmaline)); + OreDictionary.registerOre("gemChippedAgate", new ItemStack(TFCItems.gemAgate)); + OreDictionary.registerOre("gemChippedAmethyst", new ItemStack(TFCItems.gemAmethyst)); + OreDictionary.registerOre("gemChippedBeryl", new ItemStack(TFCItems.gemBeryl)); + OreDictionary.registerOre("gemChippedDiamond", new ItemStack(TFCItems.gemDiamond)); + OreDictionary.registerOre("gemChippedEmerald", new ItemStack(TFCItems.gemEmerald)); + OreDictionary.registerOre("gemChippedGarnet", new ItemStack(TFCItems.gemGarnet)); + OreDictionary.registerOre("gemChippedJade", new ItemStack(TFCItems.gemJade)); + OreDictionary.registerOre("gemChippedJasper", new ItemStack(TFCItems.gemJasper)); + OreDictionary.registerOre("gemChippedOpal", new ItemStack(TFCItems.gemOpal)); + OreDictionary.registerOre("gemChippedRuby", new ItemStack(TFCItems.gemRuby)); + OreDictionary.registerOre("gemChippedSapphire", new ItemStack(TFCItems.gemSapphire)); + OreDictionary.registerOre("gemChippedTopaz", new ItemStack(TFCItems.gemTopaz)); + OreDictionary.registerOre("gemChippedTourmaline", new ItemStack(TFCItems.gemTourmaline)); - OreDictionary.registerOre("gemChipped", new ItemStack(TFCItems.GemAgate)); - OreDictionary.registerOre("gemChipped", new ItemStack(TFCItems.GemAmethyst)); - OreDictionary.registerOre("gemChipped", new ItemStack(TFCItems.GemBeryl)); - OreDictionary.registerOre("gemChipped", new ItemStack(TFCItems.GemDiamond)); - OreDictionary.registerOre("gemChipped", new ItemStack(TFCItems.GemEmerald)); - OreDictionary.registerOre("gemChipped", new ItemStack(TFCItems.GemGarnet)); - OreDictionary.registerOre("gemChipped", new ItemStack(TFCItems.GemJade)); - OreDictionary.registerOre("gemChipped", new ItemStack(TFCItems.GemJasper)); - OreDictionary.registerOre("gemChipped", new ItemStack(TFCItems.GemOpal)); - OreDictionary.registerOre("gemChipped", new ItemStack(TFCItems.GemRuby)); - OreDictionary.registerOre("gemChipped", new ItemStack(TFCItems.GemSapphire)); - OreDictionary.registerOre("gemChipped", new ItemStack(TFCItems.GemTopaz)); - OreDictionary.registerOre("gemChipped", new ItemStack(TFCItems.GemTourmaline)); + OreDictionary.registerOre("gemChipped", new ItemStack(TFCItems.gemAgate)); + OreDictionary.registerOre("gemChipped", new ItemStack(TFCItems.gemAmethyst)); + OreDictionary.registerOre("gemChipped", new ItemStack(TFCItems.gemBeryl)); + OreDictionary.registerOre("gemChipped", new ItemStack(TFCItems.gemDiamond)); + OreDictionary.registerOre("gemChipped", new ItemStack(TFCItems.gemEmerald)); + OreDictionary.registerOre("gemChipped", new ItemStack(TFCItems.gemGarnet)); + OreDictionary.registerOre("gemChipped", new ItemStack(TFCItems.gemJade)); + OreDictionary.registerOre("gemChipped", new ItemStack(TFCItems.gemJasper)); + OreDictionary.registerOre("gemChipped", new ItemStack(TFCItems.gemOpal)); + OreDictionary.registerOre("gemChipped", new ItemStack(TFCItems.gemRuby)); + OreDictionary.registerOre("gemChipped", new ItemStack(TFCItems.gemSapphire)); + OreDictionary.registerOre("gemChipped", new ItemStack(TFCItems.gemTopaz)); + OreDictionary.registerOre("gemChipped", new ItemStack(TFCItems.gemTourmaline)); - OreDictionary.registerOre("gemFlawedAgate", new ItemStack(TFCItems.GemAgate, 1, 1)); - OreDictionary.registerOre("gemFlawedAmethyst", new ItemStack(TFCItems.GemAmethyst, 1, 1)); - OreDictionary.registerOre("gemFlawedBeryl", new ItemStack(TFCItems.GemBeryl, 1, 1)); - OreDictionary.registerOre("gemFlawedDiamond", new ItemStack(TFCItems.GemDiamond, 1, 1)); - OreDictionary.registerOre("gemFlawedEmerald", new ItemStack(TFCItems.GemEmerald, 1, 1)); - OreDictionary.registerOre("gemFlawedGarnet", new ItemStack(TFCItems.GemGarnet, 1, 1)); - OreDictionary.registerOre("gemFlawedJade", new ItemStack(TFCItems.GemJade, 1, 1)); - OreDictionary.registerOre("gemFlawedJasper", new ItemStack(TFCItems.GemJasper, 1, 1)); - OreDictionary.registerOre("gemFlawedOpal", new ItemStack(TFCItems.GemOpal, 1, 1)); - OreDictionary.registerOre("gemFlawedRuby", new ItemStack(TFCItems.GemRuby, 1, 1)); - OreDictionary.registerOre("gemFlawedSapphire", new ItemStack(TFCItems.GemSapphire, 1, 1)); - OreDictionary.registerOre("gemFlawedTopaz", new ItemStack(TFCItems.GemTopaz, 1, 1)); - OreDictionary.registerOre("gemFlawedTourmaline", new ItemStack(TFCItems.GemTourmaline, 1, 1)); + OreDictionary.registerOre("gemFlawedAgate", new ItemStack(TFCItems.gemAgate, 1, 1)); + OreDictionary.registerOre("gemFlawedAmethyst", new ItemStack(TFCItems.gemAmethyst, 1, 1)); + OreDictionary.registerOre("gemFlawedBeryl", new ItemStack(TFCItems.gemBeryl, 1, 1)); + OreDictionary.registerOre("gemFlawedDiamond", new ItemStack(TFCItems.gemDiamond, 1, 1)); + OreDictionary.registerOre("gemFlawedEmerald", new ItemStack(TFCItems.gemEmerald, 1, 1)); + OreDictionary.registerOre("gemFlawedGarnet", new ItemStack(TFCItems.gemGarnet, 1, 1)); + OreDictionary.registerOre("gemFlawedJade", new ItemStack(TFCItems.gemJade, 1, 1)); + OreDictionary.registerOre("gemFlawedJasper", new ItemStack(TFCItems.gemJasper, 1, 1)); + OreDictionary.registerOre("gemFlawedOpal", new ItemStack(TFCItems.gemOpal, 1, 1)); + OreDictionary.registerOre("gemFlawedRuby", new ItemStack(TFCItems.gemRuby, 1, 1)); + OreDictionary.registerOre("gemFlawedSapphire", new ItemStack(TFCItems.gemSapphire, 1, 1)); + OreDictionary.registerOre("gemFlawedTopaz", new ItemStack(TFCItems.gemTopaz, 1, 1)); + OreDictionary.registerOre("gemFlawedTourmaline", new ItemStack(TFCItems.gemTourmaline, 1, 1)); - OreDictionary.registerOre("gemAgate", new ItemStack(TFCItems.GemAgate, 1, 2)); - OreDictionary.registerOre("gemAmethyst", new ItemStack(TFCItems.GemAmethyst, 1, 2)); - OreDictionary.registerOre("gemBeryl", new ItemStack(TFCItems.GemBeryl, 1, 2)); - OreDictionary.registerOre("gemDiamond", new ItemStack(TFCItems.GemDiamond, 1, 2)); - OreDictionary.registerOre("gemEmerald", new ItemStack(TFCItems.GemEmerald, 1, 2)); - OreDictionary.registerOre("gemGarnet", new ItemStack(TFCItems.GemGarnet, 1, 2)); - OreDictionary.registerOre("gemJade", new ItemStack(TFCItems.GemJade, 1, 2)); - OreDictionary.registerOre("gemJasper", new ItemStack(TFCItems.GemJasper, 1, 2)); - OreDictionary.registerOre("gemOpal", new ItemStack(TFCItems.GemOpal, 1, 2)); - OreDictionary.registerOre("gemRuby", new ItemStack(TFCItems.GemRuby, 1, 2)); - OreDictionary.registerOre("gemSapphire", new ItemStack(TFCItems.GemSapphire, 1, 2)); - OreDictionary.registerOre("gemTopaz", new ItemStack(TFCItems.GemTopaz, 1, 2)); - OreDictionary.registerOre("gemTourmaline", new ItemStack(TFCItems.GemTourmaline, 1, 2)); + OreDictionary.registerOre("gemAgate", new ItemStack(TFCItems.gemAgate, 1, 2)); + OreDictionary.registerOre("gemAmethyst", new ItemStack(TFCItems.gemAmethyst, 1, 2)); + OreDictionary.registerOre("gemBeryl", new ItemStack(TFCItems.gemBeryl, 1, 2)); + OreDictionary.registerOre("gemDiamond", new ItemStack(TFCItems.gemDiamond, 1, 2)); + OreDictionary.registerOre("gemEmerald", new ItemStack(TFCItems.gemEmerald, 1, 2)); + OreDictionary.registerOre("gemGarnet", new ItemStack(TFCItems.gemGarnet, 1, 2)); + OreDictionary.registerOre("gemJade", new ItemStack(TFCItems.gemJade, 1, 2)); + OreDictionary.registerOre("gemJasper", new ItemStack(TFCItems.gemJasper, 1, 2)); + OreDictionary.registerOre("gemOpal", new ItemStack(TFCItems.gemOpal, 1, 2)); + OreDictionary.registerOre("gemRuby", new ItemStack(TFCItems.gemRuby, 1, 2)); + OreDictionary.registerOre("gemSapphire", new ItemStack(TFCItems.gemSapphire, 1, 2)); + OreDictionary.registerOre("gemTopaz", new ItemStack(TFCItems.gemTopaz, 1, 2)); + OreDictionary.registerOre("gemTourmaline", new ItemStack(TFCItems.gemTourmaline, 1, 2)); - OreDictionary.registerOre("gemFlawlessAgate", new ItemStack(TFCItems.GemAgate, 1, 3)); - OreDictionary.registerOre("gemFlawlessAmethyst", new ItemStack(TFCItems.GemAmethyst, 1, 3)); - OreDictionary.registerOre("gemFlawlessBeryl", new ItemStack(TFCItems.GemBeryl, 1, 3)); - OreDictionary.registerOre("gemFlawlessDiamond", new ItemStack(TFCItems.GemDiamond, 1, 3)); - OreDictionary.registerOre("gemFlawlessEmerald", new ItemStack(TFCItems.GemEmerald, 1, 3)); - OreDictionary.registerOre("gemFlawlessGarnet", new ItemStack(TFCItems.GemGarnet, 1, 3)); - OreDictionary.registerOre("gemFlawlessJade", new ItemStack(TFCItems.GemJade, 1, 3)); - OreDictionary.registerOre("gemFlawlessJasper", new ItemStack(TFCItems.GemJasper, 1, 3)); - OreDictionary.registerOre("gemFlawlessOpal", new ItemStack(TFCItems.GemOpal, 1, 3)); - OreDictionary.registerOre("gemFlawlessRuby", new ItemStack(TFCItems.GemRuby, 1, 3)); - OreDictionary.registerOre("gemFlawlessSapphire", new ItemStack(TFCItems.GemSapphire, 1, 3)); - OreDictionary.registerOre("gemFlawlessTopaz", new ItemStack(TFCItems.GemTopaz, 1, 3)); - OreDictionary.registerOre("gemFlawlessTourmaline", new ItemStack(TFCItems.GemTourmaline, 1, 3)); + OreDictionary.registerOre("gemFlawlessAgate", new ItemStack(TFCItems.gemAgate, 1, 3)); + OreDictionary.registerOre("gemFlawlessAmethyst", new ItemStack(TFCItems.gemAmethyst, 1, 3)); + OreDictionary.registerOre("gemFlawlessBeryl", new ItemStack(TFCItems.gemBeryl, 1, 3)); + OreDictionary.registerOre("gemFlawlessDiamond", new ItemStack(TFCItems.gemDiamond, 1, 3)); + OreDictionary.registerOre("gemFlawlessEmerald", new ItemStack(TFCItems.gemEmerald, 1, 3)); + OreDictionary.registerOre("gemFlawlessGarnet", new ItemStack(TFCItems.gemGarnet, 1, 3)); + OreDictionary.registerOre("gemFlawlessJade", new ItemStack(TFCItems.gemJade, 1, 3)); + OreDictionary.registerOre("gemFlawlessJasper", new ItemStack(TFCItems.gemJasper, 1, 3)); + OreDictionary.registerOre("gemFlawlessOpal", new ItemStack(TFCItems.gemOpal, 1, 3)); + OreDictionary.registerOre("gemFlawlessRuby", new ItemStack(TFCItems.gemRuby, 1, 3)); + OreDictionary.registerOre("gemFlawlessSapphire", new ItemStack(TFCItems.gemSapphire, 1, 3)); + OreDictionary.registerOre("gemFlawlessTopaz", new ItemStack(TFCItems.gemTopaz, 1, 3)); + OreDictionary.registerOre("gemFlawlessTourmaline", new ItemStack(TFCItems.gemTourmaline, 1, 3)); - OreDictionary.registerOre("gemExquisiteAgate", new ItemStack(TFCItems.GemAgate, 1, 4)); - OreDictionary.registerOre("gemExquisiteAmethyst", new ItemStack(TFCItems.GemAmethyst, 1, 4)); - OreDictionary.registerOre("gemExquisiteBeryl", new ItemStack(TFCItems.GemBeryl, 1, 4)); - OreDictionary.registerOre("gemExquisiteDiamond", new ItemStack(TFCItems.GemDiamond, 1, 4)); - OreDictionary.registerOre("gemExquisiteEmerald", new ItemStack(TFCItems.GemEmerald, 1, 4)); - OreDictionary.registerOre("gemExquisiteGarnet", new ItemStack(TFCItems.GemGarnet, 1, 4)); - OreDictionary.registerOre("gemExquisiteJade", new ItemStack(TFCItems.GemJade, 1, 4)); - OreDictionary.registerOre("gemExquisiteJasper", new ItemStack(TFCItems.GemJasper, 1, 4)); - OreDictionary.registerOre("gemExquisiteOpal", new ItemStack(TFCItems.GemOpal, 1, 4)); - OreDictionary.registerOre("gemExquisiteRuby", new ItemStack(TFCItems.GemRuby, 1, 4)); - OreDictionary.registerOre("gemExquisiteSapphire", new ItemStack(TFCItems.GemSapphire, 1, 4)); - OreDictionary.registerOre("gemExquisiteTopaz", new ItemStack(TFCItems.GemTopaz, 1, 4)); - OreDictionary.registerOre("gemExquisiteTourmaline", new ItemStack(TFCItems.GemTourmaline, 1, 4)); + OreDictionary.registerOre("gemExquisiteAgate", new ItemStack(TFCItems.gemAgate, 1, 4)); + OreDictionary.registerOre("gemExquisiteAmethyst", new ItemStack(TFCItems.gemAmethyst, 1, 4)); + OreDictionary.registerOre("gemExquisiteBeryl", new ItemStack(TFCItems.gemBeryl, 1, 4)); + OreDictionary.registerOre("gemExquisiteDiamond", new ItemStack(TFCItems.gemDiamond, 1, 4)); + OreDictionary.registerOre("gemExquisiteEmerald", new ItemStack(TFCItems.gemEmerald, 1, 4)); + OreDictionary.registerOre("gemExquisiteGarnet", new ItemStack(TFCItems.gemGarnet, 1, 4)); + OreDictionary.registerOre("gemExquisiteJade", new ItemStack(TFCItems.gemJade, 1, 4)); + OreDictionary.registerOre("gemExquisiteJasper", new ItemStack(TFCItems.gemJasper, 1, 4)); + OreDictionary.registerOre("gemExquisiteOpal", new ItemStack(TFCItems.gemOpal, 1, 4)); + OreDictionary.registerOre("gemExquisiteRuby", new ItemStack(TFCItems.gemRuby, 1, 4)); + OreDictionary.registerOre("gemExquisiteSapphire", new ItemStack(TFCItems.gemSapphire, 1, 4)); + OreDictionary.registerOre("gemExquisiteTopaz", new ItemStack(TFCItems.gemTopaz, 1, 4)); + OreDictionary.registerOre("gemExquisiteTourmaline", new ItemStack(TFCItems.gemTourmaline, 1, 4)); } } } diff --git a/src/com/aleksey/decorations/Core/Player/PlayerTracker.java b/src/com/aleksey/decorations/Core/Player/PlayerTracker.java index 1be56c5..ef910ef 100644 --- a/src/com/aleksey/decorations/Core/Player/PlayerTracker.java +++ b/src/com/aleksey/decorations/Core/Player/PlayerTracker.java @@ -20,7 +20,7 @@ public class PlayerTracker public void onPlayerLoggedIn(PlayerLoggedInEvent event) { AbstractPacket pkt = new InitClientWorldPacket(); - TerraFirmaCraft.packetPipeline.sendTo(pkt, (EntityPlayerMP) event.player); + TerraFirmaCraft.PACKET_PIPELINE.sendTo(pkt, (EntityPlayerMP) event.player); } @SubscribeEvent diff --git a/src/com/aleksey/decorations/Core/Recipes.java b/src/com/aleksey/decorations/Core/Recipes.java index 82d47fe..2e680ec 100644 --- a/src/com/aleksey/decorations/Core/Recipes.java +++ b/src/com/aleksey/decorations/Core/Recipes.java @@ -40,29 +40,29 @@ public static void registerRecipes() { if (TFCCrafting.diamondConversion == true) { - GameRegistry.addShapelessRecipe(new ItemStack(Items.diamond, 1), new Object[] {new ItemStack(TFCItems.GemDiamond,1,2)}); - GameRegistry.addShapelessRecipe(new ItemStack(Items.diamond, 2), new Object[] {new ItemStack(TFCItems.GemDiamond,1,3)}); - GameRegistry.addShapelessRecipe(new ItemStack(Items.diamond, 3), new Object[] {new ItemStack(TFCItems.GemDiamond,1,4)}); - GameRegistry.addShapelessRecipe(new ItemStack(TFCItems.GemDiamond,1,2), new Object[] {new ItemStack(Items.diamond)}); - GameRegistry.addShapelessRecipe(new ItemStack(TFCItems.GemDiamond,1,3), new Object[] {new ItemStack(Items.diamond), new ItemStack(Items.diamond)}); - GameRegistry.addShapelessRecipe(new ItemStack(TFCItems.GemDiamond,1,4), new Object[] {new ItemStack(Items.diamond), new ItemStack(Items.diamond), new ItemStack(Items.diamond)}); + GameRegistry.addShapelessRecipe(new ItemStack(Items.diamond, 1), new Object[] {new ItemStack(TFCItems.gemDiamond,1,2)}); + GameRegistry.addShapelessRecipe(new ItemStack(Items.diamond, 2), new Object[] {new ItemStack(TFCItems.gemDiamond,1,3)}); + GameRegistry.addShapelessRecipe(new ItemStack(Items.diamond, 3), new Object[] {new ItemStack(TFCItems.gemDiamond,1,4)}); + GameRegistry.addShapelessRecipe(new ItemStack(TFCItems.gemDiamond,1,2), new Object[] {new ItemStack(Items.diamond)}); + GameRegistry.addShapelessRecipe(new ItemStack(TFCItems.gemDiamond,1,3), new Object[] {new ItemStack(Items.diamond), new ItemStack(Items.diamond)}); + GameRegistry.addShapelessRecipe(new ItemStack(TFCItems.gemDiamond,1,4), new Object[] {new ItemStack(Items.diamond), new ItemStack(Items.diamond), new ItemStack(Items.diamond)}); } if (TFCCrafting.emeraldConversion == true) { - GameRegistry.addShapelessRecipe(new ItemStack(Items.emerald, 1), new Object[] {new ItemStack(TFCItems.GemEmerald,1,2)}); - GameRegistry.addShapelessRecipe(new ItemStack(Items.emerald, 2), new Object[] {new ItemStack(TFCItems.GemEmerald,1,3)}); - GameRegistry.addShapelessRecipe(new ItemStack(Items.emerald, 3), new Object[] {new ItemStack(TFCItems.GemEmerald,1,4)}); - GameRegistry.addShapelessRecipe(new ItemStack(TFCItems.GemEmerald,1,2), new Object[] {new ItemStack(Items.emerald)}); - GameRegistry.addShapelessRecipe(new ItemStack(TFCItems.GemEmerald,1,3), new Object[] {new ItemStack(Items.emerald), new ItemStack(Items.emerald)}); - GameRegistry.addShapelessRecipe(new ItemStack(TFCItems.GemEmerald,1,4), new Object[] {new ItemStack(Items.emerald), new ItemStack(Items.emerald), new ItemStack(Items.emerald)}); + GameRegistry.addShapelessRecipe(new ItemStack(Items.emerald, 1), new Object[] {new ItemStack(TFCItems.gemEmerald,1,2)}); + GameRegistry.addShapelessRecipe(new ItemStack(Items.emerald, 2), new Object[] {new ItemStack(TFCItems.gemEmerald,1,3)}); + GameRegistry.addShapelessRecipe(new ItemStack(Items.emerald, 3), new Object[] {new ItemStack(TFCItems.gemEmerald,1,4)}); + GameRegistry.addShapelessRecipe(new ItemStack(TFCItems.gemEmerald,1,2), new Object[] {new ItemStack(Items.emerald)}); + GameRegistry.addShapelessRecipe(new ItemStack(TFCItems.gemEmerald,1,3), new Object[] {new ItemStack(Items.emerald), new ItemStack(Items.emerald)}); + GameRegistry.addShapelessRecipe(new ItemStack(TFCItems.gemEmerald,1,4), new Object[] {new ItemStack(Items.emerald), new ItemStack(Items.emerald), new ItemStack(Items.emerald)}); } } //Gypsum Powder - GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(ItemList.Powder, 6, 0), new Object[] { new ItemStack(TFCItems.OreChunk, 1, 17), "itemHammer" })); + GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(ItemList.Powder, 6, 0), new Object[] { new ItemStack(TFCItems.oreChunk, 1, 17), "itemHammer" })); - GameRegistry.addRecipe(new ItemStack(ItemList.Brush), new Object[] { "w", "r", "t", Character.valueOf('w'), new ItemStack(TFCItems.Wool), Character.valueOf('r'), new ItemStack(TFCItems.Rope), Character.valueOf('t'), new ItemStack(TFCItems.Stick) }); + GameRegistry.addRecipe(new ItemStack(ItemList.Brush), new Object[] { "w", "r", "t", Character.valueOf('w'), new ItemStack(TFCItems.wool), Character.valueOf('r'), new ItemStack(TFCItems.rope), Character.valueOf('t'), new ItemStack(TFCItems.stick) }); registerMudBrickRecipes(); registerBarrelRecipes(); @@ -70,8 +70,8 @@ public static void registerRecipes() private static void registerLanternRecipes() { - ItemStack stick = new ItemStack(TFCItems.Stick, 1); - ItemStack yarn = new ItemStack(TFCItems.WoolYarn, 1); + ItemStack stick = new ItemStack(TFCItems.stick, 1); + ItemStack yarn = new ItemStack(TFCItems.woolYarn, 1); ItemStack glassPane = new ItemStack(Blocks.glass_pane, 1); for(int i = 0; i < Constants.Lanterns.length; i++) @@ -93,14 +93,14 @@ private static void registerMudBrickRecipes() { for(int i = 0; i < 16; i++) { - GameRegistry.addShapelessRecipe(new ItemStack(BlockList.MudBrickRaws[i], 1, 0), new Object[] { new ItemStack(TFCBlocks.Dirt, 1, i), new ItemStack(TFCItems.ClayBall, 1, 0), new ItemStack(TFCItems.Straw) }); - GameRegistry.addShapelessRecipe(new ItemStack(BlockList.MudBrickRaws[i], 1, 0), new Object[] { new ItemStack(TFCBlocks.Sand, 1, i), new ItemStack(TFCItems.ClayBall, 1, 0), new ItemStack(TFCItems.Straw) }); + GameRegistry.addShapelessRecipe(new ItemStack(BlockList.MudBrickRaws[i], 1, 0), new Object[] { new ItemStack(TFCBlocks.dirt, 1, i), new ItemStack(TFCItems.clayBall, 1, 0), new ItemStack(TFCItems.straw) }); + GameRegistry.addShapelessRecipe(new ItemStack(BlockList.MudBrickRaws[i], 1, 0), new Object[] { new ItemStack(TFCBlocks.sand, 1, i), new ItemStack(TFCItems.clayBall, 1, 0), new ItemStack(TFCItems.straw) }); } for(int i = 0; i < Global.STONE_ALL.length - 16; i++) { - GameRegistry.addShapelessRecipe(new ItemStack(BlockList.MudBrickRaws[16 + i], 1, 0), new Object[] { new ItemStack(TFCBlocks.Dirt2, 1, i), new ItemStack(TFCItems.ClayBall, 1, 0), new ItemStack(TFCItems.Straw) }); - GameRegistry.addShapelessRecipe(new ItemStack(BlockList.MudBrickRaws[16 + i], 1, 0), new Object[] { new ItemStack(TFCBlocks.Sand2, 1, i), new ItemStack(TFCItems.ClayBall, 1, 0), new ItemStack(TFCItems.Straw) }); + GameRegistry.addShapelessRecipe(new ItemStack(BlockList.MudBrickRaws[16 + i], 1, 0), new Object[] { new ItemStack(TFCBlocks.dirt2, 1, i), new ItemStack(TFCItems.clayBall, 1, 0), new ItemStack(TFCItems.straw) }); + GameRegistry.addShapelessRecipe(new ItemStack(BlockList.MudBrickRaws[16 + i], 1, 0), new Object[] { new ItemStack(TFCBlocks.sand2, 1, i), new ItemStack(TFCItems.clayBall, 1, 0), new ItemStack(TFCItems.straw) }); } for(int i = 0; i < 16; i++) @@ -113,15 +113,15 @@ private static void registerMudBrickRecipes() private static void registerBarrelRecipes() { BarrelManager.getInstance().addRecipe(new BarrelRecipe(new ItemStack(ItemList.Powder, 1, 0), new FluidStack(TFCFluids.FRESHWATER, 500), null, new FluidStack(FluidList.Plaster, 500), 0).setMinTechLevel(0).setSealedRecipe(false).setRemovesLiquid(false).setAllowAnyStack(false)); - BarrelManager.getInstance().addRecipe(new BarrelRecipe(new ItemStack(TFCBlocks.Sand, 1, 32767), new FluidStack(FluidList.Plaster, 100), new ItemStack(TFCItems.Mortar, 16), new FluidStack(FluidList.Plaster, 100)).setMinTechLevel(0)); - BarrelManager.getInstance().addRecipe(new BarrelRecipe(new ItemStack(TFCBlocks.Sand2, 1, 32767), new FluidStack(FluidList.Plaster, 100), new ItemStack(TFCItems.Mortar, 16), new FluidStack(FluidList.Plaster, 100)).setMinTechLevel(0)); + BarrelManager.getInstance().addRecipe(new BarrelRecipe(new ItemStack(TFCBlocks.sand, 1, 32767), new FluidStack(FluidList.Plaster, 100), new ItemStack(TFCItems.mortar, 16), new FluidStack(FluidList.Plaster, 100)).setMinTechLevel(0)); + BarrelManager.getInstance().addRecipe(new BarrelRecipe(new ItemStack(TFCBlocks.sand2, 1, 32767), new FluidStack(FluidList.Plaster, 100), new ItemStack(TFCItems.mortar, 16), new FluidStack(FluidList.Plaster, 100)).setMinTechLevel(0)); BarrelManager.getInstance().addRecipe(new BarrelPlasterRecipe(new ItemStack(ItemList.Powder, 1, 0), new FluidStack(FluidList.Plaster, 50), new ItemStack(BlockList.Alabaster, 1), new FluidStack(FluidList.Plaster, 50)).setMinTechLevel(0)); for(int i = 0; i < FluidList.LiquidDyes.length; i++) { DyeFluid dye = FluidList.LiquidDyes[i]; - BarrelManager.getInstance().addRecipe(new BarrelRecipe(new ItemStack(TFCItems.Dye, 1, dye.TFCDyeIndex), new FluidStack(TFCFluids.FRESHWATER, 400), null, new FluidStack(dye, 400), 0).setMinTechLevel(0).setSealedRecipe(false).setRemovesLiquid(false).setAllowAnyStack(false)); + BarrelManager.getInstance().addRecipe(new BarrelRecipe(new ItemStack(TFCItems.dye, 1, dye.TFCDyeIndex), new FluidStack(TFCFluids.FRESHWATER, 400), null, new FluidStack(dye, 400), 0).setMinTechLevel(0).setSealedRecipe(false).setRemovesLiquid(false).setAllowAnyStack(false)); } } diff --git a/src/com/aleksey/decorations/DecorationsMod.java b/src/com/aleksey/decorations/DecorationsMod.java index 0d0938c..42c887d 100644 --- a/src/com/aleksey/decorations/DecorationsMod.java +++ b/src/com/aleksey/decorations/DecorationsMod.java @@ -60,7 +60,7 @@ public void preInit(FMLPreInitializationEvent event) throws ExistingSubstitution @EventHandler public void initialize(FMLInitializationEvent event) { - TerraFirmaCraft.packetPipeline.registerPacket(InitClientWorldPacket.class); + TerraFirmaCraft.PACKET_PIPELINE.registerPacket(InitClientWorldPacket.class); FMLCommonHandler.instance().bus().register(new PlayerTracker()); diff --git a/src/com/aleksey/decorations/Handlers/CraftingHandler.java b/src/com/aleksey/decorations/Handlers/CraftingHandler.java index 6dfb36b..3dbfa2c 100644 --- a/src/com/aleksey/decorations/Handlers/CraftingHandler.java +++ b/src/com/aleksey/decorations/Handlers/CraftingHandler.java @@ -23,7 +23,7 @@ public void onCrafting(ItemCraftedEvent e) if(iinventory != null) { if(item == ItemList.Powder && isDmg == 0) - com.bioxx.tfc.Handlers.CraftingHandler.HandleItem(e.player, e.craftMatrix, Recipes.Hammers); + com.bioxx.tfc.Handlers.CraftingHandler.handleItem(e.player, e.craftMatrix, Recipes.hammers); } } } diff --git a/src/com/aleksey/decorations/Items/ItemBrush.java b/src/com/aleksey/decorations/Items/ItemBrush.java index dfbca3a..b883edc 100644 --- a/src/com/aleksey/decorations/Items/ItemBrush.java +++ b/src/com/aleksey/decorations/Items/ItemBrush.java @@ -32,7 +32,7 @@ public ItemBrush() super(); setMaxDamage(Constants.Brush_Capacity); - setCreativeTab(TFCTabs.TFCMisc); + setCreativeTab(TFCTabs.TFC_MISC); } @Override diff --git a/src/com/aleksey/decorations/Items/ItemGypsumPowder.java b/src/com/aleksey/decorations/Items/ItemGypsumPowder.java index 41c32ce..bfc221d 100644 --- a/src/com/aleksey/decorations/Items/ItemGypsumPowder.java +++ b/src/com/aleksey/decorations/Items/ItemGypsumPowder.java @@ -14,7 +14,7 @@ public ItemGypsumPowder() { super(); - setCreativeTab(TFCTabs.TFCMaterials); + setCreativeTab(TFCTabs.TFC_MATERIALS); } @Override diff --git a/src/com/aleksey/decorations/Items/ItemLanternCore.java b/src/com/aleksey/decorations/Items/ItemLanternCore.java index 7d4cad4..3108509 100644 --- a/src/com/aleksey/decorations/Items/ItemLanternCore.java +++ b/src/com/aleksey/decorations/Items/ItemLanternCore.java @@ -33,7 +33,7 @@ public ItemLanternCore(LanternInfo info) _info = info; setMaxDamage(0); - setCreativeTab(TFCTabs.TFCMisc); + setCreativeTab(TFCTabs.TFC_MISC); } @Override diff --git a/src/com/aleksey/decorations/Items/ItemLiquidDye.java b/src/com/aleksey/decorations/Items/ItemLiquidDye.java index 2484632..e4ed3ec 100644 --- a/src/com/aleksey/decorations/Items/ItemLiquidDye.java +++ b/src/com/aleksey/decorations/Items/ItemLiquidDye.java @@ -116,7 +116,7 @@ public ItemStack onItemRightClick(ItemStack is, World world, EntityPlayer player if (!world.canMineBlock(player, x, y, z)) return is; - return new ItemStack(TFCItems.WoodenBucketEmpty); + return new ItemStack(TFCItems.woodenBucketEmpty); } return is; diff --git a/src/com/aleksey/decorations/Items/ItemPlaster.java b/src/com/aleksey/decorations/Items/ItemPlaster.java index 21c6a02..7a8d3ca 100644 --- a/src/com/aleksey/decorations/Items/ItemPlaster.java +++ b/src/com/aleksey/decorations/Items/ItemPlaster.java @@ -85,7 +85,7 @@ public ItemStack onItemRightClick(ItemStack is, World world, EntityPlayer player if (!world.canMineBlock(player, x, y, z)) return is; - return new ItemStack(TFCItems.WoodenBucketEmpty); + return new ItemStack(TFCItems.woodenBucketEmpty); } return is;