From 6572cecccd8db9a4ec8d2171a5a4ae33ce40cba0 Mon Sep 17 00:00:00 2001 From: Progwml6 Date: Wed, 5 Feb 2014 19:45:49 -0500 Subject: [PATCH 1/2] Run repo through remapping script -- UNTESTED --- .../biomesoplenty/api/BOPBlockHelper.java | 2 +- .../java/biomesoplenty/api/BOPItemHelper.java | 2 +- .../client/gui/GuiScreenBiomeBook.java | 64 +- .../client/gui/StartupWarningGUI.java | 36 +- .../client/models/entities/ModelBird.java | 2 +- .../client/render/RenderUtils.java | 12 +- .../client/render/blocks/BambooRenderer.java | 26 +- .../client/render/blocks/FoliageRenderer.java | 54 +- .../client/render/blocks/GraveRenderer.java | 72 +- .../client/render/blocks/PlantsRenderer.java | 32 +- .../render/blocks/SmallBlockRenderer.java | 42 +- .../common/armor/ItemFlowerBand.java | 2 +- .../common/biomes/BiomeGenAlps.java | 6 +- .../common/biomes/BiomeGenArctic.java | 10 +- .../common/biomes/BiomeGenBambooForest.java | 18 +- .../common/biomes/BiomeGenBayou.java | 10 +- .../common/biomes/BiomeGenBog.java | 10 +- .../common/biomes/BiomeGenBorealForest.java | 10 +- .../common/biomes/BiomeGenBrushland.java | 6 +- .../common/biomes/BiomeGenCanyon.java | 10 +- .../common/biomes/BiomeGenChaparral.java | 8 +- .../biomes/BiomeGenCherryBlossomGrove.java | 10 +- .../biomes/BiomeGenConiferousForest.java | 6 +- .../biomes/BiomeGenConiferousForestSnow.java | 6 +- .../common/biomes/BiomeGenCrag.java | 6 +- .../common/biomes/BiomeGenDeadForest.java | 6 +- .../common/biomes/BiomeGenDeadSwamp.java | 10 +- .../biomes/BiomeGenDeciduousForest.java | 10 +- .../common/biomes/BiomeGenDunes.java | 6 +- .../common/biomes/BiomeGenFen.java | 10 +- .../common/biomes/BiomeGenFlowerField.java | 10 +- .../common/biomes/BiomeGenFrostForest.java | 10 +- .../common/biomes/BiomeGenGrassland.java | 10 +- .../common/biomes/BiomeGenGrove.java | 10 +- .../common/biomes/BiomeGenHeathland.java | 10 +- .../common/biomes/BiomeGenHighland.java | 6 +- .../common/biomes/BiomeGenJadeCliffs.java | 10 +- .../common/biomes/BiomeGenLavenderFields.java | 10 +- .../common/biomes/BiomeGenLushDesert.java | 14 +- .../common/biomes/BiomeGenLushSwamp.java | 6 +- .../common/biomes/BiomeGenMapleWoods.java | 6 +- .../common/biomes/BiomeGenMarsh.java | 6 +- .../common/biomes/BiomeGenMeadow.java | 8 +- .../common/biomes/BiomeGenMoor.java | 10 +- .../common/biomes/BiomeGenMountain.java | 6 +- .../common/biomes/BiomeGenMysticGrove.java | 6 +- .../common/biomes/BiomeGenOminousWoods.java | 6 +- .../common/biomes/BiomeGenOriginValley.java | 6 +- .../common/biomes/BiomeGenOutback.java | 6 +- .../common/biomes/BiomeGenPasture.java | 10 +- .../common/biomes/BiomeGenPrairie.java | 10 +- .../common/biomes/BiomeGenQuagmire.java | 10 +- .../common/biomes/BiomeGenRainforest.java | 10 +- .../common/biomes/BiomeGenRedwoodForest.java | 10 +- .../common/biomes/BiomeGenSacredSprings.java | 10 +- .../common/biomes/BiomeGenSeasonalForest.java | 10 +- .../common/biomes/BiomeGenShield.java | 6 +- .../common/biomes/BiomeGenShrubland.java | 6 +- .../common/biomes/BiomeGenSilkglades.java | 10 +- .../common/biomes/BiomeGenSludgepit.java | 10 +- .../common/biomes/BiomeGenSpruceWoods.java | 4 +- .../biomes/BiomeGenTemperateRainforest.java | 10 +- .../common/biomes/BiomeGenThicket.java | 6 +- .../common/biomes/BiomeGenTimber.java | 10 +- .../biomes/BiomeGenTropicalRainforest.java | 10 +- .../common/biomes/BiomeGenTropics.java | 6 +- .../common/biomes/BiomeGenTundra.java | 10 +- .../common/biomes/BiomeGenVolcano.java | 2 +- .../common/biomes/BiomeGenWasteland.java | 6 +- .../common/biomes/BiomeGenWetland.java | 10 +- .../common/biomes/BiomeGenWoodland.java | 6 +- .../BiomeGenPromisedLandForest.java | 2 +- .../BiomeGenPromisedLandPlains.java | 2 +- .../BiomeGenPromisedLandSwamp.java | 2 +- .../biomesoplenty/common/blocks/BlockAsh.java | 24 +- .../common/blocks/BlockBOPAppleLeaves.java | 72 +- .../blocks/BlockBOPColorizedLeaves.java | 62 +- .../blocks/BlockBOPColorizedSapling.java | 30 +- .../common/blocks/BlockBOPCoral.java | 50 +- .../common/blocks/BlockBOPFlower.java | 68 +- .../common/blocks/BlockBOPFlower2.java | 40 +- .../common/blocks/BlockBOPFoliage.java | 76 +- .../common/blocks/BlockBOPGems.java | 54 +- .../common/blocks/BlockBOPGeneric.java | 54 +- .../common/blocks/BlockBOPGrass.java | 90 +- .../common/blocks/BlockBOPLeaves.java | 66 +- .../common/blocks/BlockBOPLog.java | 28 +- .../common/blocks/BlockBOPMushroom.java | 34 +- .../blocks/BlockBOPPersimmonLeaves.java | 72 +- .../common/blocks/BlockBOPPetals.java | 26 +- .../common/blocks/BlockBOPPlank.java | 16 +- .../common/blocks/BlockBOPPlant.java | 72 +- .../common/blocks/BlockBOPRedRock.java | 22 +- .../common/blocks/BlockBOPSapling.java | 30 +- .../common/blocks/BlockBOPSkystone.java | 22 +- .../common/blocks/BlockBOPSlab.java | 42 +- .../common/blocks/BlockBOPStairs.java | 16 +- .../common/blocks/BlockBamboo.java | 58 +- .../common/blocks/BlockBones.java | 34 +- .../common/blocks/BlockCloud.java | 28 +- .../common/blocks/BlockFlesh.java | 30 +- .../common/blocks/BlockGrave.java | 34 +- .../common/blocks/BlockHive.java | 22 +- .../common/blocks/BlockHoney.java | 20 +- .../biomesoplenty/common/blocks/BlockIvy.java | 12 +- .../common/blocks/BlockLongGrass.java | 34 +- .../common/blocks/BlockMoss.java | 12 +- .../biomesoplenty/common/blocks/BlockMud.java | 24 +- .../common/blocks/BlockOriginGrass.java | 34 +- .../blocks/BlockOvergrownNetherrack.java | 18 +- .../common/blocks/BlockPromisedPortal.java | 24 +- .../common/blocks/BlockStoneFormations.java | 36 +- .../common/blocks/BlockTreeMoss.java | 12 +- .../common/blocks/BlockTurnip.java | 10 +- .../common/blocks/BlockWillow.java | 12 +- .../blocks/templates/BOPBlockWorldDecor.java | 22 +- .../biomesoplenty/common/core/BOPBiomes.java | 14 +- .../biomesoplenty/common/core/BOPBlocks.java | 164 +- .../biomesoplenty/common/core/BOPFluids.java | 6 +- .../biomesoplenty/common/core/BOPPotions.java | 2 +- .../common/core/BOPVanillaCompat.java | 8 +- .../common/entities/EntityFlyingCreature.java | 8 +- .../common/entities/EntityFlyingMob.java | 8 +- .../common/entities/EntityGlob.java | 8 +- .../common/entities/EntityRosester.java | 10 +- .../entities/ai/EntityAITemptArmor.java | 30 +- .../entities/projectiles/EntityDart.java | 10 +- .../gui/MainMenuEventHandler.java | 2 +- .../misc/BonemealEventHandler.java | 12 +- .../eventhandler/misc/BucketEventHandler.java | 4 +- .../eventhandler/misc/CapeEventHandler.java | 4 +- .../common/fluids/blocks/BlockHoneyFluid.java | 10 +- .../fluids/blocks/BlockPoisonFluid.java | 10 +- .../fluids/blocks/BlockSpringWaterFluid.java | 12 +- .../common/helpers/CreativeTabsBOP.java | 2 +- .../common/helpers/TeleporterPromised.java | 26 +- .../common/itemblocks/ItemBlockBones.java | 10 +- .../itemblocks/ItemBlockColorizedSapling.java | 2 +- .../common/itemblocks/ItemBlockCoral.java | 14 +- .../common/itemblocks/ItemBlockFlower.java | 2 +- .../common/itemblocks/ItemBlockFlower2.java | 2 +- .../common/itemblocks/ItemBlockFoliage.java | 6 +- .../common/itemblocks/ItemBlockGrave.java | 14 +- .../common/itemblocks/ItemBlockIvy.java | 2 +- .../common/itemblocks/ItemBlockMushroom.java | 2 +- .../common/itemblocks/ItemBlockPlant.java | 8 +- .../common/itemblocks/ItemBlockSapling.java | 2 +- .../common/itemblocks/ItemBlockSlab.java | 2 +- .../itemblocks/ItemBlockStoneFormations.java | 2 +- .../common/itemblocks/ItemBlockWillow.java | 2 +- .../common/items/ItemBOPAncientStaff.java | 8 +- .../common/items/ItemBOPBiomeEssence.java | 4 +- .../common/items/ItemBOPBucket.java | 4 +- .../common/items/ItemBOPFood.java | 2 +- .../common/items/ItemBOPMisc.java | 2 +- .../common/items/ItemBOPRecord.java | 8 +- .../common/items/ItemBOPScythe.java | 56 +- .../common/items/ItemBOPSeeds.java | 6 +- .../common/items/ItemBiomeBook.java | 4 +- .../common/items/ItemBiomeFinder.java | 32 +- .../biomesoplenty/common/items/ItemDart.java | 2 +- .../common/items/ItemDartBlower.java | 2 +- .../common/items/ItemEnderporter.java | 2 +- .../biomesoplenty/common/items/ItemGems.java | 2 +- .../common/items/ItemJarFilled.java | 8 +- .../common/network/PacketPipeline.java | 2 +- .../common/world/ChunkProviderBOPHell.java | 4 +- .../common/world/ChunkProviderPromised.java | 8 +- .../common/world/WorldChunkManagerBOP.java | 4 +- .../world/WorldChunkManagerBOPHell.java | 14 +- .../world/WorldChunkManagerPromised.java | 14 +- .../common/world/WorldProviderPromised.java | 2 +- .../common/world/WorldProviderSurfaceBOP.java | 6 +- .../world/decoration/BOPBiomeDecorator.java | 8 +- .../features/WorldGenBOPDoubleFlora.java | 10 +- .../world/features/WorldGenBOPFlora.java | 8 +- .../world/features/WorldGenBOPTallGrass.java | 6 +- .../world/features/WorldGenCobwebNest.java | 8 +- .../world/features/WorldGenGrassSplatter.java | 14 +- .../world/features/WorldGenLavaSpout.java | 20 +- .../common/world/features/WorldGenLog.java | 8 +- .../common/world/features/WorldGenMarsh.java | 184 +- .../common/world/features/WorldGenMoss.java | 6 +- .../features/WorldGenPromisedLandPortal.java | 1982 ++++++++--------- .../world/features/WorldGenRiverCane.java | 6 +- .../world/features/WorldGenRockpile.java | 20 +- .../world/features/WorldGenSplotches.java | 4 +- .../world/features/WorldGenWasteland.java | 152 +- .../world/features/WorldGenWasteland2.java | 224 +- .../world/features/WorldGenWasteland3.java | 40 +- .../world/features/WorldGenWasteland4.java | 14 +- .../world/features/WorldGenWaterReeds.java | 6 +- .../world/features/WorldGenWaterSpring.java | 4 +- .../world/features/WorldGenWaterside.java | 6 +- .../features/trees/WorldGenBOPBigTree.java | 20 +- .../features/trees/WorldGenBOPShrub.java | 10 +- .../features/trees/WorldGenBOPSwampTree.java | 30 +- .../features/trees/WorldGenBOPTaiga1.java | 12 +- .../features/trees/WorldGenBOPTaiga2.java | 12 +- .../features/trees/WorldGenBOPTaiga3.java | 36 +- .../world/features/trees/WorldGenBayou1.java | 70 +- .../world/features/trees/WorldGenBayou2.java | 54 +- .../world/features/trees/WorldGenBayou3.java | 50 +- .../world/features/trees/WorldGenBogBush.java | 8 +- .../features/trees/WorldGenBogTree1.java | 172 +- .../features/trees/WorldGenBogTree2.java | 140 +- .../world/features/trees/WorldGenBrush1.java | 50 +- .../world/features/trees/WorldGenBrush2.java | 42 +- .../features/trees/WorldGenBulbTree.java | 102 +- .../features/trees/WorldGenChaparral3.java | 10 +- .../world/features/trees/WorldGenCypress.java | 32 +- .../features/trees/WorldGenDeadTree1.java | 10 +- .../features/trees/WorldGenMiniShrub.java | 22 +- .../features/trees/WorldGenOriginalTree.java | 46 +- .../features/trees/WorldGenPalmTree1.java | 8 +- .../features/trees/WorldGenPineTree.java | 8 +- .../world/features/trees/WorldGenPoplar.java | 160 +- .../world/features/trees/WorldGenPoplar2.java | 170 +- .../features/trees/WorldGenPromisedTree.java | 14 +- .../features/trees/WorldGenPromisedTree2.java | 14 +- .../features/trees/WorldGenPromisedTree3.java | 38 +- .../trees/WorldGenPromisedWillowTree.java | 32 +- .../trees/WorldGenRainforestTree1.java | 62 +- .../features/trees/WorldGenRedwoodTree.java | 104 +- .../features/trees/WorldGenRedwoodTree2.java | 56 +- .../features/trees/WorldGenSacredOak.java | 8 +- .../features/trees/WorldGenTropicsShrub.java | 46 +- .../common/world/layer/GenLayerBiomeBOP.java | 8 +- .../world/layer/hell/BiomeLayerHell.java | 4 +- .../world/layer/hell/BiomeLayerHellZoom.java | 2 +- 230 files changed, 3699 insertions(+), 3699 deletions(-) diff --git a/src/main/java/biomesoplenty/api/BOPBlockHelper.java b/src/main/java/biomesoplenty/api/BOPBlockHelper.java index 9980dac0c..c1b8e4a4e 100644 --- a/src/main/java/biomesoplenty/api/BOPBlockHelper.java +++ b/src/main/java/biomesoplenty/api/BOPBlockHelper.java @@ -14,6 +14,6 @@ public class BOPBlockHelper public static String getUniqueName(Block block) { - return GameData.blockRegistry.func_148750_c(block); + return GameData.blockRegistry.getNameForObject(block); } } diff --git a/src/main/java/biomesoplenty/api/BOPItemHelper.java b/src/main/java/biomesoplenty/api/BOPItemHelper.java index 0037595bb..d9cd1fa25 100644 --- a/src/main/java/biomesoplenty/api/BOPItemHelper.java +++ b/src/main/java/biomesoplenty/api/BOPItemHelper.java @@ -24,6 +24,6 @@ public class BOPItemHelper public static String getUniqueName(Item item) { - return GameData.itemRegistry.func_148750_c(item); + return GameData.itemRegistry.getNameForObject(item); } } diff --git a/src/main/java/biomesoplenty/client/gui/GuiScreenBiomeBook.java b/src/main/java/biomesoplenty/client/gui/GuiScreenBiomeBook.java index ea7026b2d..d923a0c83 100644 --- a/src/main/java/biomesoplenty/client/gui/GuiScreenBiomeBook.java +++ b/src/main/java/biomesoplenty/client/gui/GuiScreenBiomeBook.java @@ -45,24 +45,24 @@ public class GuiScreenBiomeBook extends GuiScreenBook super.initGui(); //TODO: buttonList - this.field_146292_n.remove(2); - this.field_146292_n.remove(1); + this.buttonList.remove(2); + this.buttonList.remove(1); - int i = (this.field_146294_l - 192) / 2; + int i = (this.width - 192) / 2; byte b0 = 2; - this.field_146292_n.add(this.buttonNextPage = new GuiScreenBiomeBook.NextPageButton(1, i + 120, b0 + 154, true)); - this.field_146292_n.add(this.buttonPreviousPage = new GuiScreenBiomeBook.NextPageButton(2, i + 38, b0 + 154, false)); + this.buttonList.add(this.buttonNextPage = new GuiScreenBiomeBook.NextPageButton(1, i + 120, b0 + 154, true)); + this.buttonList.add(this.buttonPreviousPage = new GuiScreenBiomeBook.NextPageButton(2, i + 38, b0 + 154, false)); pageLinks.clear(); //TODO: fontRendererObj - this.pageLinks.add(new PageLink(3, i + 41 + (field_146289_q.getStringWidth("Contents") / 2) + 7, b0 + 154, 0x6189CE, "Contents", 1, 2, 0)); + this.pageLinks.add(new PageLink(3, i + 41 + (fontRendererObj.getStringWidth("Contents") / 2) + 7, b0 + 154, 0x6189CE, "Contents", 1, 2, 0)); addLinks(); for (PageLink link : pageLinks) { - this.field_146292_n.add(link); + this.buttonList.add(link); } updatePageButtons(); @@ -70,12 +70,12 @@ public class GuiScreenBiomeBook extends GuiScreenBook @Override //TODO: actionPerformed() - protected void func_146284_a(GuiButton button) + protected void actionPerformed(GuiButton button) { - super.func_146284_a(button); + super.actionPerformed(button); //TODO: enabled - if (button.field_146124_l) + if (button.enabled) { if (button instanceof PageLink) { @@ -100,7 +100,7 @@ public class GuiScreenBiomeBook extends GuiScreenBook public void drawTexturedModalRect(int x, int y, int u, int v, int width, int height) { //TODO: minecraft - if (isDrawing) this.field_146297_k.getTextureManager().bindTexture(biomeBookTexture); + if (isDrawing) this.mc.getTextureManager().bindTexture(biomeBookTexture); isDrawing = false; @@ -110,10 +110,10 @@ public class GuiScreenBiomeBook extends GuiScreenBook private void updatePageButtons() { int currentPage = getCurrentPage(); - int bookTotalPages = BOPReflectionHelper.getPrivateValue(GuiScreenBook.class, this, "field_146476_w", "field_146476_w"); + int bookTotalPages = BOPReflectionHelper.getPrivateValue(GuiScreenBook.class, this, "bookTotalPages", "bookTotalPages"); - this.buttonNextPage.field_146125_m = currentPage < bookTotalPages - 1; - this.buttonPreviousPage.field_146125_m = currentPage > 0; + this.buttonNextPage.visible = currentPage < bookTotalPages - 1; + this.buttonPreviousPage.visible = currentPage > 0; for (PageLink link : pageLinks) { @@ -123,13 +123,13 @@ public class GuiScreenBiomeBook extends GuiScreenBook public void addLinks() { - NBTTagList pages = BOPReflectionHelper.getPrivateValue(GuiScreenBook.class, this, "field_146483_y", "field_146483_y"); + NBTTagList pages = BOPReflectionHelper.getPrivateValue(GuiScreenBook.class, this, "bookPages", "bookPages"); Pattern pattern = Pattern.compile("(.+?)"); for (int pageNo = 0; pageNo < pages.tagCount(); pageNo++) { - String pageText = pages.func_150307_f(pageNo); + String pageText = pages.getStringTagAt(pageNo); String[] lineSplitText = pageText.split("(?<=[\\n])"); for (int line = 0; line < lineSplitText.length; line++) @@ -149,11 +149,11 @@ public class GuiScreenBiomeBook extends GuiScreenBook String originalLinkString = "" + originalLinkText + ""; - int i = (this.field_146294_l - 192) / 2; + int i = (this.width - 192) / 2; byte b0 = 2; //TODO: fontRendererObj - this.pageLinks.add(new PageLink(3 + pageLinks.size(), i + 34 + field_146289_q.getStringWidth(lineText.split(originalLinkString)[0]), b0 + 31 + (line * 9), 0x6189CE, linkText, pageNo, 0, linkedPage)); + this.pageLinks.add(new PageLink(3 + pageLinks.size(), i + 34 + fontRendererObj.getStringWidth(lineText.split(originalLinkString)[0]), b0 + 31 + (line * 9), 0x6189CE, linkText, pageNo, 0, linkedPage)); lineText = lineText.replace(originalLinkString , StringUtils.repeat(" ", linkText.length())); } @@ -165,17 +165,17 @@ public class GuiScreenBiomeBook extends GuiScreenBook pages.func_150304_a(pageNo, new NBTTagString(StringUtils.join(lineSplitText))); } - BOPReflectionHelper.setPrivateValue(GuiScreenBook.class, this, pages, "field_146483_y", "field_146483_y"); + BOPReflectionHelper.setPrivateValue(GuiScreenBook.class, this, pages, "bookPages", "bookPages"); } public int getCurrentPage() { - return BOPReflectionHelper.getPrivateValue(GuiScreenBook.class, this, "field_146484_x", "field_146484_x"); + return BOPReflectionHelper.getPrivateValue(GuiScreenBook.class, this, "currPage", "currPage"); } public void setCurrentPage(int pageNo) { - BOPReflectionHelper.setPrivateValue(GuiScreenBook.class, this, pageNo, "field_146484_x", "field_146484_x"); + BOPReflectionHelper.setPrivateValue(GuiScreenBook.class, this, pageNo, "currPage", "currPage"); } @SideOnly(Side.CLIENT) @@ -191,13 +191,13 @@ public class GuiScreenBiomeBook extends GuiScreenBook @Override //TODO: drawButton() - public void func_146112_a(Minecraft minecraft, int mouseX, int mouseY) + public void drawButton(Minecraft minecraft, int mouseX, int mouseY) { //TODO: drawButton - if (this.field_146125_m) + if (this.visible) { //TODO: xPosition yPosition xPosition width yPosition height - boolean isHovering = mouseX >= this.field_146128_h && mouseY >= this.field_146129_i && mouseX < this.field_146128_h + this.field_146120_f && mouseY < this.field_146129_i + this.field_146121_g; + boolean isHovering = mouseX >= this.xPosition && mouseY >= this.yPosition && mouseX < this.xPosition + this.width && mouseY < this.yPosition + this.height; GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); minecraft.getTextureManager().bindTexture(GuiScreenBiomeBook.biomeBookTexture); int k = 0; @@ -214,7 +214,7 @@ public class GuiScreenBiomeBook extends GuiScreenBook } //TODO: xPosition yPosition - this.drawTexturedModalRect(this.field_146128_h, this.field_146129_i, k, l, 23, 13); + this.drawTexturedModalRect(this.xPosition, this.yPosition, k, l, 23, 13); } } } @@ -231,7 +231,7 @@ public class GuiScreenBiomeBook extends GuiScreenBook public PageLink(int id, int xPosition, int yPosition, int colour, String text, int displayPage, int displayType, int pageNumber) { //TODO: fontRendererObj - super(id, xPosition, yPosition, field_146289_q.getStringWidth(text.replaceAll("\\P{InBasic_Latin}", "")), 12, ""); + super(id, xPosition, yPosition, fontRendererObj.getStringWidth(text.replaceAll("\\P{InBasic_Latin}", "")), 12, ""); this.colour = colour; this.text = text; @@ -248,27 +248,27 @@ public class GuiScreenBiomeBook extends GuiScreenBook (displayType == 2 && getCurrentPage() >= displayPage); //TODO: enabled - this.field_146124_l = display; + this.enabled = display; //TODO: drawButton - this.field_146125_m = display; + this.visible = display; } @Override //TODO: drawButton() - public void func_146112_a(Minecraft minecraft, int mouseX, int mouseY) + public void drawButton(Minecraft minecraft, int mouseX, int mouseY) { //TODO: drawButton - if (this.field_146125_m) + if (this.visible) { //TODO: xPosition yPosition xPosition width yPosition height - boolean isHovering = mouseX >= this.field_146128_h && mouseY >= this.field_146129_i && mouseX < this.field_146128_h + this.field_146120_f && mouseY < this.field_146129_i + this.field_146121_g; + boolean isHovering = mouseX >= this.xPosition && mouseY >= this.yPosition && mouseX < this.xPosition + this.width && mouseY < this.yPosition + this.height; GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); String moddedText = isHovering ? "" + EnumChatFormatting.UNDERLINE + text : text; //TODO: fontRendererObj xPosition yPosition - this.drawCenteredString(field_146289_q, moddedText, field_146128_h, field_146129_i, colour); + this.drawCenteredString(fontRendererObj, moddedText, xPosition, yPosition, colour); } } diff --git a/src/main/java/biomesoplenty/client/gui/StartupWarningGUI.java b/src/main/java/biomesoplenty/client/gui/StartupWarningGUI.java index b8732203e..2c681394b 100644 --- a/src/main/java/biomesoplenty/client/gui/StartupWarningGUI.java +++ b/src/main/java/biomesoplenty/client/gui/StartupWarningGUI.java @@ -42,29 +42,29 @@ public class StartupWarningGUI extends GuiScreen { Keyboard.enableRepeatEvents(true); //TODO: buttonList - this.field_146292_n.clear(); + this.buttonList.clear(); //TODO: buttonList - this.field_146292_n.add(new GuiButton(0, this.field_146294_l / 2 - 175, this.field_146295_m - 48, 350, 20, I18n.getStringParams("OK"))); + this.buttonList.add(new GuiButton(0, this.width / 2 - 175, this.height - 48, 350, 20, I18n.getStringParams("OK"))); //TODO: buttonList - this.field_146292_n.add(new GuiButton(1, this.field_146294_l / 2 - 175, this.field_146295_m - 24, 350, 20, I18n.getStringParams("Cancel"))); + this.buttonList.add(new GuiButton(1, this.width / 2 - 175, this.height - 24, 350, 20, I18n.getStringParams("Cancel"))); } @Override //TODO: onGuiClosed() - public void func_146281_b() + public void onGuiClosed() { Keyboard.enableRepeatEvents(false); } @Override //TODO: actionPerformed() - protected void func_146284_a(GuiButton button) + protected void actionPerformed(GuiButton button) { //TODO: enabled - if (button.field_146124_l) + if (button.enabled) { //TODO: id - if (button.field_146127_k == 0) + if (button.id == 0) { try { @@ -77,10 +77,10 @@ public class StartupWarningGUI extends GuiScreen } //TODO: displayGuiScreen() - this.field_146297_k.func_147108_a(this.parentGuiScreen); + this.mc.displayGuiScreen(this.parentGuiScreen); } //TODO: id - if (button.field_146127_k == 1) + if (button.id == 1) { System.exit(0); } @@ -91,23 +91,23 @@ public class StartupWarningGUI extends GuiScreen public void drawScreen(int x, int y, float renderPartialTicks) { //TODO: drawDefaultBackground() - this.func_146276_q_(); + this.drawDefaultBackground(); //TODO: fontRendererObj width - this.drawCenteredString(this.field_146289_q, "" + RED + "Biomes O' Plenty uses a custom worldtype for its biomes. When creating a world, it", this.field_146294_l / 2, 82, 0xFFFFFF); - this.drawCenteredString(this.field_146289_q, "" + RED + "may be enabled by clicking the 'World Type' button under 'More World Options'", this.field_146294_l / 2, 94, 0xFFFFFF); - this.drawCenteredString(this.field_146289_q, "" + RED + "until it displays 'Biomes O' Plenty'.", this.field_146294_l / 2, 106, 0xFFFFFF); + this.drawCenteredString(this.fontRendererObj, "" + RED + "Biomes O' Plenty uses a custom worldtype for its biomes. When creating a world, it", this.width / 2, 82, 0xFFFFFF); + this.drawCenteredString(this.fontRendererObj, "" + RED + "may be enabled by clicking the 'World Type' button under 'More World Options'", this.width / 2, 94, 0xFFFFFF); + this.drawCenteredString(this.fontRendererObj, "" + RED + "until it displays 'Biomes O' Plenty'.", this.width / 2, 106, 0xFFFFFF); - this.drawCenteredString(this.field_146289_q, "" + RED + "The worldtype can be used on servers by changing the 'level-type' in", this.field_146294_l / 2, 132, 0xFFFFFF); - this.drawCenteredString(this.field_146289_q, "" + RED + "sever.properties to 'BIOMESOP' (without quotes)", this.field_146294_l / 2, 144, 0xFFFFFF); + this.drawCenteredString(this.fontRendererObj, "" + RED + "The worldtype can be used on servers by changing the 'level-type' in", this.width / 2, 132, 0xFFFFFF); + this.drawCenteredString(this.fontRendererObj, "" + RED + "sever.properties to 'BIOMESOP' (without quotes)", this.width / 2, 144, 0xFFFFFF); - this.drawCenteredString(this.field_146289_q, "" + DARK_RED + "This message will only display once.", this.field_146294_l / 2, 168, 0xFFFFFF); + this.drawCenteredString(this.fontRendererObj, "" + DARK_RED + "This message will only display once.", this.width / 2, 168, 0xFFFFFF); - this.field_146297_k.getTextureManager().bindTexture(bopLogoTexture); + this.mc.getTextureManager().bindTexture(bopLogoTexture); GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); // width x, y, u, v, width, height - this.drawTexturedModalRect(this.field_146294_l / 2 - 168 / 2, 0, 0, 0, 168, 80); + this.drawTexturedModalRect(this.width / 2 - 168 / 2, 0, 0, 0, 168, 80); super.drawScreen(x, y, renderPartialTicks); diff --git a/src/main/java/biomesoplenty/client/models/entities/ModelBird.java b/src/main/java/biomesoplenty/client/models/entities/ModelBird.java index d7ee5bfc8..5c5234b6a 100644 --- a/src/main/java/biomesoplenty/client/models/entities/ModelBird.java +++ b/src/main/java/biomesoplenty/client/models/entities/ModelBird.java @@ -127,7 +127,7 @@ public class ModelBird extends ModelBase int z = MathHelper.floor_double(entity.posZ); //TODO: isAirBlock() - if (!(entity.posY <= entity.prevPosY && entity.worldObj.func_147437_c(x, y - 1, z))) + if (!(entity.posY <= entity.prevPosY && entity.worldObj.isAirBlock(x, y - 1, z))) { WingRight.rotateAngleZ = MathHelper.cos(f2 * 1.7F) * (float)Math.PI * 0.25F; WingLeft.rotateAngleZ = -WingRight.rotateAngleZ; diff --git a/src/main/java/biomesoplenty/client/render/RenderUtils.java b/src/main/java/biomesoplenty/client/render/RenderUtils.java index 83a9f9e33..318da3948 100644 --- a/src/main/java/biomesoplenty/client/render/RenderUtils.java +++ b/src/main/java/biomesoplenty/client/render/RenderUtils.java @@ -25,32 +25,32 @@ public class RenderUtils tessellator.startDrawingQuads(); tessellator.setNormal(0.0F, -1F, 0.0F); //TODO: renderFaceYNeg getIcon() - renderblocks.func_147768_a(block, 0.0D, 0.0D, 0.0D, block.func_149691_a(0, meta)); + renderblocks.renderFaceYNeg(block, 0.0D, 0.0D, 0.0D, block.getIcon(0, meta)); tessellator.draw(); tessellator.startDrawingQuads(); tessellator.setNormal(0.0F, 1.0F, 0.0F); //TODO: renderFaceYPos getIcon() - renderblocks.func_147806_b(block, 0.0D, 0.0D, 0.0D, block.func_149691_a(1, meta)); + renderblocks.renderFaceYPos(block, 0.0D, 0.0D, 0.0D, block.getIcon(1, meta)); tessellator.draw(); tessellator.startDrawingQuads(); tessellator.setNormal(0.0F, 0.0F, -1F); //TODO: renderFaceZNeg getIcon() - renderblocks.func_147761_c(block, 0.0D, 0.0D, 0.0D, block.func_149691_a(2, meta)); + renderblocks.renderFaceZNeg(block, 0.0D, 0.0D, 0.0D, block.getIcon(2, meta)); tessellator.draw(); tessellator.startDrawingQuads(); tessellator.setNormal(0.0F, 0.0F, 1.0F); //TODO: renderFaceZPos getIcon() - renderblocks.func_147734_d(block, 0.0D, 0.0D, 0.0D, block.func_149691_a(3, meta)); + renderblocks.renderFaceZPos(block, 0.0D, 0.0D, 0.0D, block.getIcon(3, meta)); tessellator.draw(); tessellator.startDrawingQuads(); tessellator.setNormal(-1F, 0.0F, 0.0F); //TODO: renderFaceXNeg getIcon() - renderblocks.func_147798_e(block, 0.0D, 0.0D, 0.0D, block.func_149691_a(4, meta)); + renderblocks.renderFaceXNeg(block, 0.0D, 0.0D, 0.0D, block.getIcon(4, meta)); tessellator.draw(); tessellator.startDrawingQuads(); tessellator.setNormal(1.0F, 0.0F, 0.0F); //TODO: renderFaceXPos getIcon() - renderblocks.func_147764_f(block, 0.0D, 0.0D, 0.0D, block.func_149691_a(5, meta)); + renderblocks.renderFaceXPos(block, 0.0D, 0.0D, 0.0D, block.getIcon(5, meta)); tessellator.draw(); GL11.glTranslatef(0.5F, 0.5F, 0.5F); } diff --git a/src/main/java/biomesoplenty/client/render/blocks/BambooRenderer.java b/src/main/java/biomesoplenty/client/render/blocks/BambooRenderer.java index 8b32a5109..aa8cd1365 100644 --- a/src/main/java/biomesoplenty/client/render/blocks/BambooRenderer.java +++ b/src/main/java/biomesoplenty/client/render/blocks/BambooRenderer.java @@ -19,10 +19,10 @@ public class BambooRenderer implements ISimpleBlockRenderingHandler public boolean renderWorldBlock(IBlockAccess world, int x, int y, int z, Block block, int modelId, RenderBlocks renderer) { //TODO: setBlockBounds - block.func_149676_a(0.0F, 0.0F, 0.0F, 1.0F, 1.0F, 1.0F); + block.setBlockBounds(0.0F, 0.0F, 0.0F, 1.0F, 1.0F, 1.0F); //TODO: colorMultiplier - int l = block.func_149720_d(world, x, y, z); + int l = block.colorMultiplier(world, x, y, z); float f = (float)(l >> 16 & 255) / 255.0F; float f1 = (float)(l >> 8 & 255) / 255.0F; float f2 = (float)(l & 255) / 255.0F; @@ -57,48 +57,48 @@ public class BambooRenderer implements ISimpleBlockRenderingHandler float f18 = f6 * f2; float pixel = 0.0625F; //TODO: getMixedBrightnessForBlock() - int m = block.func_149677_c(world, x, y, z); + int m = block.getMixedBrightnessForBlock(world, x, y, z); //Need to make public: renderAllFaces, renderMinY, renderMaxY //TODO: renderAllFaces shouldSideBeRendered() - if (renderer.field_147837_f || block.func_149646_a(world, x, y - 1, z, 0)) + if (renderer.renderAllFaces || block.shouldSideBeRendered(world, x, y - 1, z, 0)) { //TODO: renderMinY getMixedBrightnessForBlock() - tessellator.setBrightness(renderer.field_147855_j > 0.0D ? m : block.func_149677_c(world, x, y - 1, z)); + tessellator.setBrightness(renderer.renderMinY > 0.0D ? m : block.getMixedBrightnessForBlock(world, x, y - 1, z)); tessellator.setColorOpaque_F(r, g, b); //TODO: renderFaceYNeg getBlockIcon() - renderer.func_147768_a(block, (double)x, (double)y, (double)z, renderer.func_147793_a(block, world, x, y, z, 0)); + renderer.renderFaceYNeg(block, (double)x, (double)y, (double)z, renderer.getBlockIcon(block, world, x, y, z, 0)); } //TODO: renderAllFaces shouldSideBeRendered() - if (renderer.field_147837_f || block.func_149646_a(world, x, y + 1, z, 1)) + if (renderer.renderAllFaces || block.shouldSideBeRendered(world, x, y + 1, z, 1)) { //TODO: renderMaxY getMixedBrightnessForBlock() - tessellator.setBrightness(renderer.field_147857_k < 1.0D ? m : block.func_149677_c(world, x, y + 1, z)); + tessellator.setBrightness(renderer.renderMaxY < 1.0D ? m : block.getMixedBrightnessForBlock(world, x, y + 1, z)); tessellator.setColorOpaque_F(f8, f12, f16); //TODO: renderFaceYPos getBlockIcon() - renderer.func_147806_b(block, (double)x, (double)y, (double)z, renderer.func_147793_a(block, world, x, y, z, 1)); + renderer.renderFaceYPos(block, (double)x, (double)y, (double)z, renderer.getBlockIcon(block, world, x, y, z, 1)); } tessellator.setBrightness(m); tessellator.setColorOpaque_F(f9, f13, f17); tessellator.addTranslation(0.0F, 0.0F, pixel); //TODO: renderFaceZNeg getBlockIcon() - renderer.func_147761_c(block, (double)x, (double)y, (double)z + (pixel * 4), renderer.func_147793_a(block, world, x, y, z, 2)); + renderer.renderFaceZNeg(block, (double)x, (double)y, (double)z + (pixel * 4), renderer.getBlockIcon(block, world, x, y, z, 2)); tessellator.addTranslation(0.0F, 0.0F, -pixel); tessellator.addTranslation(0.0F, 0.0F, -pixel); //TODO: renderFaceZPos getBlockIcon() - renderer.func_147734_d(block, (double)x, (double)y, (double)z - (pixel * 4), renderer.func_147793_a(block, world, x, y, z, 3)); + renderer.renderFaceZPos(block, (double)x, (double)y, (double)z - (pixel * 4), renderer.getBlockIcon(block, world, x, y, z, 3)); tessellator.addTranslation(0.0F, 0.0F, pixel); tessellator.setColorOpaque_F(f10, f14, f18); tessellator.addTranslation(pixel, 0.0F, 0.0F); //TODO: renderFaceXNeg getBlockIcon() - renderer.func_147798_e(block, (double)x + (pixel * 4), (double)y, (double)z, renderer.func_147793_a(block, world, x, y, z, 4)); + renderer.renderFaceXNeg(block, (double)x + (pixel * 4), (double)y, (double)z, renderer.getBlockIcon(block, world, x, y, z, 4)); tessellator.addTranslation(-pixel, 0.0F, 0.0F); tessellator.addTranslation(-pixel, 0.0F, 0.0F); //TODO: renderFaceXPos getBlockIcon() - renderer.func_147764_f(block, (double)x - (pixel * 4), (double)y, (double)z, renderer.func_147793_a(block, world, x, y, z, 5)); + renderer.renderFaceXPos(block, (double)x - (pixel * 4), (double)y, (double)z, renderer.getBlockIcon(block, world, x, y, z, 5)); tessellator.addTranslation(pixel, 0.0F, 0.0F); diff --git a/src/main/java/biomesoplenty/client/render/blocks/FoliageRenderer.java b/src/main/java/biomesoplenty/client/render/blocks/FoliageRenderer.java index f57d3bd6e..304284a87 100644 --- a/src/main/java/biomesoplenty/client/render/blocks/FoliageRenderer.java +++ b/src/main/java/biomesoplenty/client/render/blocks/FoliageRenderer.java @@ -60,22 +60,22 @@ public class FoliageRenderer implements ISimpleBlockRenderingHandler { Tessellator tessellator = Tessellator.instance; //TODO: blockAccess - IBlockAccess world = renderer.field_147845_a; + IBlockAccess world = renderer.blockAccess; //TODO: getBlockIconFromSide() - IIcon icon = renderer.func_147777_a(block, 1); + IIcon icon = renderer.getBlockIconFromSide(block, 1); //Need to make public: overrideBlockTexture //TODO: hasOverrideBlockTexture() - if (renderer.func_147744_b()) + if (renderer.hasOverrideBlockTexture()) { //TODO: overrideBlockTexture - icon = renderer.field_147840_d; + icon = renderer.overrideBlockTexture; } float cf = 1.0F; //TODO: colorMUltiplier() - int cl = block.func_149720_d(world, x, y, z); + int cl = block.colorMultiplier(world, x, y, z); float c1 = (cl >> 16 & 255) / 255.0F; float c2 = (cl >> 8 & 255) / 255.0F; float c3 = (cl & 255) / 255.0F; @@ -101,7 +101,7 @@ public class FoliageRenderer implements ISimpleBlockRenderingHandler l = l * l * 42317861L + l * 11L; int i1 = (int)(l >> 16 & 3L); //TODO: getMixedBrightnessForBlock() - tessellator.setBrightness(block.func_149677_c(world, x, y, z)); + tessellator.setBrightness(block.getMixedBrightnessForBlock(world, x, y, z)); float f1 = (float)x + 0.5F; float f2 = (float)z + 0.5F; float f3 = (float)(i1 & 1) * 0.5F * (float)(1 - i1 / 2 % 2 * 2); @@ -121,20 +121,20 @@ public class FoliageRenderer implements ISimpleBlockRenderingHandler { Tessellator tessellator = Tessellator.instance; //TODO: blockAccess - IBlockAccess world = renderer.field_147845_a; + IBlockAccess world = renderer.blockAccess; //TODO: getBlockIconFromSideAndMetadata() - IIcon icon = renderer.func_147787_a(block, 1, 13); + IIcon icon = renderer.getBlockIconFromSideAndMetadata(block, 1, 13); //TODO: hasOverrideBlockTexture() - if (renderer.func_147744_b()) + if (renderer.hasOverrideBlockTexture()) { //TODO: overrideBlockTexture - icon = renderer.field_147840_d; + icon = renderer.overrideBlockTexture; } float cf = 1.0F; //TODO: colorMultiplier() - int cl = block.func_149720_d(world, x, y, z); + int cl = block.colorMultiplier(world, x, y, z); float c1 = (cl >> 16 & 255) / 255.0F; float c2 = (cl >> 8 & 255) / 255.0F; float c3 = (cl & 255) / 255.0F; @@ -160,7 +160,7 @@ public class FoliageRenderer implements ISimpleBlockRenderingHandler l = l * l * 42317861L + l * 11L; int i1 = (int)(l >> 16 & 3L); //TODO: getMixedBrightnessForBlock() - tessellator.setBrightness(block.func_149677_c(world, x, y, z)); + tessellator.setBrightness(block.getMixedBrightnessForBlock(world, x, y, z)); float f1 = (float)x + 0.5F; float f2 = (float)z + 0.5F; float f3 = (float)(i1 & 1) * 0.5F * (float)(1 - i1 / 2 % 2 * 2); @@ -180,13 +180,13 @@ public class FoliageRenderer implements ISimpleBlockRenderingHandler { Tessellator tessellator = Tessellator.instance; //TODO: blockAccess - IBlockAccess world = renderer.field_147845_a; + IBlockAccess world = renderer.blockAccess; //TODO: getMixedBrightnessForBlock() - tessellator.setBrightness(par1Block.func_149677_c(world, par2, par3, par4)); + tessellator.setBrightness(par1Block.getMixedBrightnessForBlock(world, par2, par3, par4)); float f = 1.0F; //TODO: colorMultiplier() - int l = par1Block.func_149720_d(world, par2, par3, par4); + int l = par1Block.colorMultiplier(world, par2, par3, par4); float f1 = (l >> 16 & 255) / 255.0F; float f2 = (l >> 8 & 255) / 255.0F; float f3 = (l & 255) / 255.0F; @@ -202,7 +202,7 @@ public class FoliageRenderer implements ISimpleBlockRenderingHandler } //TODO: getBlock() - if ((world.getBlockMetadata(par2, par3, par4) == 8 || world.getBlockMetadata(par2, par3, par4) == 9) && world.func_147439_a(par2, par3, par4) == BOPBlockHelper.get("foliage")) + if ((world.getBlockMetadata(par2, par3, par4) == 8 || world.getBlockMetadata(par2, par3, par4) == 9) && world.getBlock(par2, par3, par4) == BOPBlockHelper.get("foliage")) { tessellator.setColorOpaque_F(f, f, f); } @@ -231,25 +231,25 @@ public class FoliageRenderer implements ISimpleBlockRenderingHandler } //TODO: getBlock() - if (world.getBlockMetadata(par2, par3, par4) == 10 && world.func_147439_a(par2, par3, par4) == BOPBlockHelper.get("flowers")) + if (world.getBlockMetadata(par2, par3, par4) == 10 && world.getBlock(par2, par3, par4) == BOPBlockHelper.get("flowers")) { //TODO: drawCrossedSquares() getIcon() - renderer.func_147765_a(par1Block.func_149691_a(0, world.getBlockMetadata(par2, par3, par4)), d0, d1 - 1, d2, 1.0F); + renderer.drawCrossedSquares(par1Block.getIcon(0, world.getBlockMetadata(par2, par3, par4)), d0, d1 - 1, d2, 1.0F); } //TODO: getBlock() - else if (world.getBlockMetadata(par2, par3, par4) == 8 && world.func_147439_a(par2, par3, par4) == BOPBlockHelper.get("foliage")) + else if (world.getBlockMetadata(par2, par3, par4) == 8 && world.getBlock(par2, par3, par4) == BOPBlockHelper.get("foliage")) { renderBerryBush(d0, d1, d2, 1.0F, f1, f2, f3, renderer); } //TODO: getBlock() - else if (world.getBlockMetadata(par2, par3, par4) == 9 && world.func_147439_a(par2, par3, par4) == BOPBlockHelper.get("foliage")) + else if (world.getBlockMetadata(par2, par3, par4) == 9 && world.getBlock(par2, par3, par4) == BOPBlockHelper.get("foliage")) { renderShrub(d0, d1, d2, 1.0F, f1, f2, f3, renderer); } else { //TODO: drawCrossedSquares() getIcon() - renderer.func_147765_a(par1Block.func_149691_a(0, world.getBlockMetadata(par2, par3, par4)), d0, d1, d2, 1.0F); + renderer.drawCrossedSquares(par1Block.getIcon(0, world.getBlockMetadata(par2, par3, par4)), d0, d1, d2, 1.0F); } return true; @@ -259,29 +259,29 @@ public class FoliageRenderer implements ISimpleBlockRenderingHandler { Tessellator tessellator = Tessellator.instance; //TODO: getBlockIconFromSideAndMetadata() - IIcon berryBush = renderer.func_147787_a(BOPBlockHelper.get("foliage"), 0, 8); + IIcon berryBush = renderer.getBlockIconFromSideAndMetadata(BOPBlockHelper.get("foliage"), 0, 8); IIcon berryBushBerry = ((BlockBOPFoliage)BOPBlockHelper.get("foliage")).berryBushBerry; tessellator.setColorOpaque_F(par4 * par5, par4 * par6, par4 * par7); //TODO: drawCrossedSquares() - renderer.func_147765_a(berryBush, par1, par2, par3, par4); + renderer.drawCrossedSquares(berryBush, par1, par2, par3, par4); tessellator.setColorOpaque_F(par4, par4, par4); //TODO: drawCrossedSquares() - renderer.func_147765_a(berryBushBerry, par1, par2, par3, par4); + renderer.drawCrossedSquares(berryBushBerry, par1, par2, par3, par4); } private static void renderShrub(double par1, double par2, double par3, float par4, float par5, float par6, float par7, RenderBlocks renderer) { Tessellator tessellator = Tessellator.instance; //TODO: getBlockIconFromSideAndMetadata() - IIcon shrubLeaf = renderer.func_147787_a(BOPBlockHelper.get("foliage"), 0, 9); + IIcon shrubLeaf = renderer.getBlockIconFromSideAndMetadata(BOPBlockHelper.get("foliage"), 0, 9); IIcon shrubBranch = ((BlockBOPFoliage)BOPBlockHelper.get("foliage")).shrubBranch; tessellator.setColorOpaque_F(par4 * par5, par4 * par6, par4 * par7); //TODO: drawCrossedSquares() - renderer.func_147765_a(shrubLeaf, par1, par2, par3, par4); + renderer.drawCrossedSquares(shrubLeaf, par1, par2, par3, par4); tessellator.setColorOpaque_F(par4, par4, par4); //TODO: drawCrossedSquares() - renderer.func_147765_a(shrubBranch, par1, par2, par3, par4); + renderer.drawCrossedSquares(shrubBranch, par1, par2, par3, par4); } } diff --git a/src/main/java/biomesoplenty/client/render/blocks/GraveRenderer.java b/src/main/java/biomesoplenty/client/render/blocks/GraveRenderer.java index 5888a8fc2..241a13cac 100644 --- a/src/main/java/biomesoplenty/client/render/blocks/GraveRenderer.java +++ b/src/main/java/biomesoplenty/client/render/blocks/GraveRenderer.java @@ -20,116 +20,116 @@ public class GraveRenderer implements ISimpleBlockRenderingHandler { //Base //TODO: setRenderBounds - renderer.func_147782_a(pixel*5, 0, pixel*5, pixel*11, pixel*3, pixel*11); + renderer.setRenderBounds(pixel*5, 0, pixel*5, pixel*11, pixel*3, pixel*11); //TODO: renderStandardBlock - renderer.func_147784_q(block, x, y, z); + renderer.renderStandardBlock(block, x, y, z); //Base pole //TODO: setRenderBounds - renderer.func_147782_a(pixel*6, pixel*3, pixel*6, pixel*10, pixel*11, pixel*10); + renderer.setRenderBounds(pixel*6, pixel*3, pixel*6, pixel*10, pixel*11, pixel*10); //TODO: renderStandardBlock - renderer.func_147784_q(block, x, y, z); + renderer.renderStandardBlock(block, x, y, z); //Head horizontal bottom //TODO: setRenderBounds - renderer.func_147782_a(0, pixel*11, pixel*5, pixel*16, pixel*14, pixel*11); + renderer.setRenderBounds(0, pixel*11, pixel*5, pixel*16, pixel*14, pixel*11); //TODO: renderStandardBlock - renderer.func_147784_q(block, x, y, z); + renderer.renderStandardBlock(block, x, y, z); } else if (meta == 1) { //Head vertical side 0 //TODO: setRenderBounds - renderer.func_147782_a(pixel*13, pixel*-2, pixel*5, pixel*16, pixel*8, pixel*11); + renderer.setRenderBounds(pixel*13, pixel*-2, pixel*5, pixel*16, pixel*8, pixel*11); //TODO: renderStandardBlock - renderer.func_147784_q(block, x, y, z); + renderer.renderStandardBlock(block, x, y, z); //Head vertical side 1 //TODO: setRenderBounds - renderer.func_147782_a(0, pixel*-2, pixel*5, pixel*3, pixel*8, pixel*11); + renderer.setRenderBounds(0, pixel*-2, pixel*5, pixel*3, pixel*8, pixel*11); //TODO: renderStandardBlock - renderer.func_147784_q(block, x, y, z); + renderer.renderStandardBlock(block, x, y, z); //Cross vertical side 1 //TODO: setRenderBounds - renderer.func_147782_a(pixel*6, pixel*-3, pixel*7, pixel*10, pixel*14, pixel*9); + renderer.setRenderBounds(pixel*6, pixel*-3, pixel*7, pixel*10, pixel*14, pixel*9); //TODO: renderStandardBlock - renderer.func_147784_q(block, x, y, z); + renderer.renderStandardBlock(block, x, y, z); //Head horizontal middle 0 //TODO: setRenderBounds - renderer.func_147782_a(pixel*-4, pixel*1, pixel*7, pixel*6, pixel*5, pixel*9); + renderer.setRenderBounds(pixel*-4, pixel*1, pixel*7, pixel*6, pixel*5, pixel*9); //TODO: renderStandardBlock - renderer.func_147784_q(block, x, y, z); + renderer.renderStandardBlock(block, x, y, z); //Head horizontal middle 1 //TODO: setRenderBounds - renderer.func_147782_a(pixel*10, pixel*1, pixel*7, pixel*20, pixel*5, pixel*9); + renderer.setRenderBounds(pixel*10, pixel*1, pixel*7, pixel*20, pixel*5, pixel*9); //TODO: renderStandardBlock - renderer.func_147784_q(block, x, y, z); + renderer.renderStandardBlock(block, x, y, z); //Head horizontal top //TODO: setRenderBounds - renderer.func_147782_a(0, pixel*8, pixel*5, pixel*16, pixel*11, pixel*11); + renderer.setRenderBounds(0, pixel*8, pixel*5, pixel*16, pixel*11, pixel*11); //TODO: renderStandardBlock - renderer.func_147784_q(block, x, y, z); + renderer.renderStandardBlock(block, x, y, z); } else if (meta == 2) { //Base //TODO: setRenderBounds - renderer.func_147782_a(pixel*5, 0, pixel*5, pixel*11, pixel*3, pixel*11); + renderer.setRenderBounds(pixel*5, 0, pixel*5, pixel*11, pixel*3, pixel*11); //TODO: renderStandardBlock - renderer.func_147784_q(block, x, y, z); + renderer.renderStandardBlock(block, x, y, z); //Base pole //TODO: setRenderBounds - renderer.func_147782_a(pixel*6, pixel*3, pixel*6, pixel*10, pixel*11, pixel*10); + renderer.setRenderBounds(pixel*6, pixel*3, pixel*6, pixel*10, pixel*11, pixel*10); //TODO: renderStandardBlock - renderer.func_147784_q(block, x, y, z); + renderer.renderStandardBlock(block, x, y, z); //Head horizontal bottom //TODO: setRenderBounds - renderer.func_147782_a(pixel*5, pixel*11, 0, pixel*11, pixel*14, pixel*16); + renderer.setRenderBounds(pixel*5, pixel*11, 0, pixel*11, pixel*14, pixel*16); //TODO: renderStandardBlock - renderer.func_147784_q(block, x, y, z); + renderer.renderStandardBlock(block, x, y, z); } else if (meta == 3) { //Head vertical side 0 //TODO: setRenderBounds - renderer.func_147782_a(pixel*5, pixel*-2, pixel*13, pixel*11, pixel*8, pixel*16); + renderer.setRenderBounds(pixel*5, pixel*-2, pixel*13, pixel*11, pixel*8, pixel*16); //TODO: renderStandardBlock - renderer.func_147784_q(block, x, y, z); + renderer.renderStandardBlock(block, x, y, z); //Head vertical side 1 //TODO: setRenderBounds - renderer.func_147782_a(pixel*5, pixel*-2, 0, pixel*11, pixel*8, pixel*3); + renderer.setRenderBounds(pixel*5, pixel*-2, 0, pixel*11, pixel*8, pixel*3); //TODO: renderStandardBlock - renderer.func_147784_q(block, x, y, z); + renderer.renderStandardBlock(block, x, y, z); //Cross vertical side 1 //TODO: setRenderBounds - renderer.func_147782_a(pixel*7, pixel*-3, pixel*6, pixel*9, pixel*14, pixel*10); + renderer.setRenderBounds(pixel*7, pixel*-3, pixel*6, pixel*9, pixel*14, pixel*10); //TODO: renderStandardBlock - renderer.func_147784_q(block, x, y, z); + renderer.renderStandardBlock(block, x, y, z); //Head horizontal middle 0 //TODO: setRenderBounds - renderer.func_147782_a(pixel*7, pixel*1, pixel*-4, pixel*9, pixel*5, pixel*6); - renderer.func_147784_q(block, x, y, z); + renderer.setRenderBounds(pixel*7, pixel*1, pixel*-4, pixel*9, pixel*5, pixel*6); + renderer.renderStandardBlock(block, x, y, z); //Head horizontal middle 1 //TODO: setRenderBounds - renderer.func_147782_a(pixel*7, pixel*1, pixel*10, pixel*9, pixel*5, pixel*20); + renderer.setRenderBounds(pixel*7, pixel*1, pixel*10, pixel*9, pixel*5, pixel*20); //TODO: renderStandardBlock - renderer.func_147784_q(block, x, y, z); + renderer.renderStandardBlock(block, x, y, z); //Head horizontal top //TODO: setRenderBounds - renderer.func_147782_a(pixel*5, pixel*8, 0, pixel*11, pixel*11, pixel*16); + renderer.setRenderBounds(pixel*5, pixel*8, 0, pixel*11, pixel*11, pixel*16); //TODO: renderStandardBlock - renderer.func_147784_q(block, x, y, z); + renderer.renderStandardBlock(block, x, y, z); } } return true; diff --git a/src/main/java/biomesoplenty/client/render/blocks/PlantsRenderer.java b/src/main/java/biomesoplenty/client/render/blocks/PlantsRenderer.java index b736e544a..49aa92c2b 100644 --- a/src/main/java/biomesoplenty/client/render/blocks/PlantsRenderer.java +++ b/src/main/java/biomesoplenty/client/render/blocks/PlantsRenderer.java @@ -29,29 +29,29 @@ public class PlantsRenderer implements ISimpleBlockRenderingHandler return renderCrossedSquares(block, x, y, z, renderer, true); if (meta == 5) //TODO: renderCrossedSquares - return renderer.func_147746_l(block, x, y, z); + return renderer.renderCrossedSquares(block, x, y, z); if (meta == 6) return renderBlockCrops(block, x, y, z, renderer); if (meta == 7) //TODO: renderBlockCrops - return renderer.func_147796_n(block, x, y, z); + return renderer.renderBlockCrops(block, x, y, z); if (meta == 8) //TODO: renderBlockCrops - return renderer.func_147796_n(block, x, y, z); + return renderer.renderBlockCrops(block, x, y, z); if (meta == 9) //TODO: renderBlockCrops - return renderer.func_147796_n(block, x, y, z); + return renderer.renderBlockCrops(block, x, y, z); if (meta == 10) //TODO: renderBlockCrops - return renderer.func_147796_n(block, x, y, z); + return renderer.renderBlockCrops(block, x, y, z); if (meta == 11) //TODO: renderBlockCrops - return renderer.func_147796_n(block, x, y, z); + return renderer.renderBlockCrops(block, x, y, z); if (meta == 12) return renderCrossedSquares(block, x, y, z, renderer, true); if (meta == 13) //TODO: renderBlockCrops - return renderer.func_147796_n(block, x, y, z); + return renderer.renderBlockCrops(block, x, y, z); if (meta == 14) { return renderCrossedSquares(block, x, y, z, renderer, false); @@ -78,9 +78,9 @@ public class PlantsRenderer implements ISimpleBlockRenderingHandler { Tessellator tessellator = Tessellator.instance; //TODO: blockAccess - IBlockAccess world = renderer.field_147845_a; + IBlockAccess world = renderer.blockAccess; //TODO: getMixedBrightnessForBlock() - tessellator.setBrightness(block.func_149677_c(world, x, y, z)); + tessellator.setBrightness(block.getMixedBrightnessForBlock(world, x, y, z)); tessellator.setColorOpaque_F(1.0F, 1.0F, 1.0F); double d0 = x; @@ -94,7 +94,7 @@ public class PlantsRenderer implements ISimpleBlockRenderingHandler d2 += ((i1 >> 24 & 15L) / 15.0F - 0.5D) * 0.125D; //TODO: renderCropBlocksImpl() - renderer.func_147795_a(block, world.getBlockMetadata(x, y, z), d0, y - 0.0625F, d2); + renderer.renderBlockCropsImpl(block, world.getBlockMetadata(x, y, z), d0, y - 0.0625F, d2); return true; } @@ -102,12 +102,12 @@ public class PlantsRenderer implements ISimpleBlockRenderingHandler { Tessellator tessellator = Tessellator.instance; //TODO: blockAccess - IBlockAccess world = renderer.field_147845_a; + IBlockAccess world = renderer.blockAccess; //TODO: getMixedBrightnessForBlock() - tessellator.setBrightness(block.func_149677_c(world, x, y, z)); + tessellator.setBrightness(block.getMixedBrightnessForBlock(world, x, y, z)); float f = 1.0F; //TODO: colorMultiplier() - int l = block.func_149720_d(world, x, y, z); + int l = block.colorMultiplier(world, x, y, z); float f1 = (l >> 16 & 255) / 255.0F; float f2 = (l >> 8 & 255) / 255.0F; float f3 = (l & 255) / 255.0F; @@ -156,14 +156,14 @@ public class PlantsRenderer implements ISimpleBlockRenderingHandler if (meta == 14) { //TODO: drawCrossedSquares() - renderer.func_147765_a(block.func_149691_a(0, world.getBlockMetadata(x, y, z)), d0, d1, d2, 1.0F); + renderer.drawCrossedSquares(block.getIcon(0, world.getBlockMetadata(x, y, z)), d0, d1, d2, 1.0F); //TODO: drawCrossedSquares() - renderer.func_147765_a(((BlockBOPPlant)BOPBlockHelper.get("plants")).reedbottom, d0, d1 - 1, d2, 1.0F); + renderer.drawCrossedSquares(((BlockBOPPlant)BOPBlockHelper.get("plants")).reedbottom, d0, d1 - 1, d2, 1.0F); } else { //TODO: drawCrossedSquares() - renderer.func_147765_a(block.func_149691_a(0, world.getBlockMetadata(x, y, z)), d0, d1, d2, 1.0F); + renderer.drawCrossedSquares(block.getIcon(0, world.getBlockMetadata(x, y, z)), d0, d1, d2, 1.0F); } return true; } diff --git a/src/main/java/biomesoplenty/client/render/blocks/SmallBlockRenderer.java b/src/main/java/biomesoplenty/client/render/blocks/SmallBlockRenderer.java index 4f524915c..b77a1bf3c 100644 --- a/src/main/java/biomesoplenty/client/render/blocks/SmallBlockRenderer.java +++ b/src/main/java/biomesoplenty/client/render/blocks/SmallBlockRenderer.java @@ -20,51 +20,51 @@ public class SmallBlockRenderer implements ISimpleBlockRenderingHandler if (meta == 0) { //TODO: setRenderBounds - renderer.func_147782_a(0.374F, 0.0F, 0.374F, 0.626F, 1.0F, 0.626F); + renderer.setRenderBounds(0.374F, 0.0F, 0.374F, 0.626F, 1.0F, 0.626F); //TODO: renderStandardBlock - renderer.func_147784_q(block, x, y, z); + renderer.renderStandardBlock(block, x, y, z); } else if (meta == 1) { //TODO: setRenderBounds - renderer.func_147782_a(0.187F, 0.0F, 0.187F, 0.813F, 1.0F, 0.813F); + renderer.setRenderBounds(0.187F, 0.0F, 0.187F, 0.813F, 1.0F, 0.813F); //TODO: renderStandardBlock - renderer.func_147784_q(block, x, y, z); + renderer.renderStandardBlock(block, x, y, z); } else if (meta == 3) { //TODO: setRenderBounds - renderer.func_147782_a(0.374F, 0.374F, 0.0F, 0.626F, 0.626F, 1.0F); + renderer.setRenderBounds(0.374F, 0.374F, 0.0F, 0.626F, 0.626F, 1.0F); //TODO: renderStandardBlock - renderer.func_147784_q(block, x, y, z); + renderer.renderStandardBlock(block, x, y, z); } else if (meta == 4) { //TODO: setRenderBounds - renderer.func_147782_a(0.0F, 0.374F, 0.374F, 1.0F, 0.626F, 0.626F); + renderer.setRenderBounds(0.0F, 0.374F, 0.374F, 1.0F, 0.626F, 0.626F); //TODO: renderStandardBlock - renderer.func_147784_q(block, x, y, z); + renderer.renderStandardBlock(block, x, y, z); } else if (meta == 5) { //TODO: setRenderBounds - renderer.func_147782_a(0.187F, 0.187F, 0.0F, 0.813F, 0.813F, 1.0F); + renderer.setRenderBounds(0.187F, 0.187F, 0.0F, 0.813F, 0.813F, 1.0F); //TODO: renderStandardBlock - renderer.func_147784_q(block, x, y, z); + renderer.renderStandardBlock(block, x, y, z); } else if (meta == 6) { //TODO: setRenderBounds - renderer.func_147782_a(0.0F, 0.187F, 0.187F, 1.0F, 0.813F, 0.813F); + renderer.setRenderBounds(0.0F, 0.187F, 0.187F, 1.0F, 0.813F, 0.813F); //TODO: renderStandardBlock - renderer.func_147784_q(block, x, y, z); + renderer.renderStandardBlock(block, x, y, z); } else { //TODO: setRenderBounds - renderer.func_147782_a(0.0F, 0.0F, 0.0F, 1.0F, 1.0F, 1.0F); + renderer.setRenderBounds(0.0F, 0.0F, 0.0F, 1.0F, 1.0F, 1.0F); //TODO: renderStandardBlock - renderer.func_147784_q(block, x, y, z); + renderer.renderStandardBlock(block, x, y, z); } } return true; @@ -80,43 +80,43 @@ public class SmallBlockRenderer implements ISimpleBlockRenderingHandler if (metadata == 0) { //TODO: setRenderBounds - renderer.func_147782_a(0.374F, 0.0F, 0.374F, 0.626F, 1.0F, 0.626F); + renderer.setRenderBounds(0.374F, 0.0F, 0.374F, 0.626F, 1.0F, 0.626F); RenderUtils.renderStandardInvBlock(renderer, block, metadata); } else if (metadata == 1) { //TODO: setRenderBounds - renderer.func_147782_a(0.187F, 0.0F, 0.187F, 0.813F, 1.0F, 0.813F); + renderer.setRenderBounds(0.187F, 0.0F, 0.187F, 0.813F, 1.0F, 0.813F); RenderUtils.renderStandardInvBlock(renderer, block, metadata); } else if (metadata == 3) { //TODO: setRenderBounds - renderer.func_147782_a(0.374F, 0.374F, 0.0F, 0.626F, 0.626F, 1.0F); + renderer.setRenderBounds(0.374F, 0.374F, 0.0F, 0.626F, 0.626F, 1.0F); RenderUtils.renderStandardInvBlock(renderer, block, metadata); } else if (metadata == 4) { //TODO: setRenderBounds - renderer.func_147782_a(0.0F, 0.374F, 0.374F, 1.0F, 0.626F, 0.626F); + renderer.setRenderBounds(0.0F, 0.374F, 0.374F, 1.0F, 0.626F, 0.626F); RenderUtils.renderStandardInvBlock(renderer, block, metadata); } else if (metadata == 5) { //TODO: setRenderBounds - renderer.func_147782_a(0.187F, 0.187F, 0.0F, 0.813F, 0.813F, 1.0F); + renderer.setRenderBounds(0.187F, 0.187F, 0.0F, 0.813F, 0.813F, 1.0F); RenderUtils.renderStandardInvBlock(renderer, block, metadata); } else if (metadata == 6) { //TODO: setRenderBounds - renderer.func_147782_a(0.0F, 0.187F, 0.187F, 1.0F, 0.813F, 0.813F); + renderer.setRenderBounds(0.0F, 0.187F, 0.187F, 1.0F, 0.813F, 0.813F); RenderUtils.renderStandardInvBlock(renderer, block, metadata); } else { //TODO: setRenderBounds - renderer.func_147782_a(0.0F, 0.0F, 0.0F, 1.0F, 1.0F, 1.0F); + renderer.setRenderBounds(0.0F, 0.0F, 0.0F, 1.0F, 1.0F, 1.0F); RenderUtils.renderStandardInvBlock(renderer, block, metadata); } } diff --git a/src/main/java/biomesoplenty/common/armor/ItemFlowerBand.java b/src/main/java/biomesoplenty/common/armor/ItemFlowerBand.java index 3443df298..d08af0afa 100644 --- a/src/main/java/biomesoplenty/common/armor/ItemFlowerBand.java +++ b/src/main/java/biomesoplenty/common/armor/ItemFlowerBand.java @@ -32,7 +32,7 @@ public class ItemFlowerBand extends ItemArmor @Override //TODO: public void getSubItems(Item item, CreativeTabs creativeTabs, List list) - public void func_150895_a(Item item, CreativeTabs creativeTabs, List list) + public void getSubItems(Item item, CreativeTabs creativeTabs, List list) { for (int i = 0; i < flowerBandTypes.length; ++i) { diff --git a/src/main/java/biomesoplenty/common/biomes/BiomeGenAlps.java b/src/main/java/biomesoplenty/common/biomes/BiomeGenAlps.java index 4eff9be6d..718c15282 100644 --- a/src/main/java/biomesoplenty/common/biomes/BiomeGenAlps.java +++ b/src/main/java/biomesoplenty/common/biomes/BiomeGenAlps.java @@ -19,7 +19,7 @@ public class BiomeGenAlps extends BOPBiome super(id); //TODO: setHeight() - this.func_150570_a(biomeHeight); + this.setHeight(biomeHeight); //TODO: setColor() this.setColor(13421772); this.setTemperatureRainfall(0.0F, 0.5F); @@ -46,12 +46,12 @@ public class BiomeGenAlps extends BOPBiome int z = chunkZ + random.nextInt(16); //TODO: getBlock() - Block block = world.func_147439_a(x, y, z); + Block block = world.getBlock(x, y, z); if (block != null && block.isReplaceableOreGen(world, x, y, z, Blocks.stone)) { //TODO: setBlock() - world.func_147465_d(x, y, z, BOPBlockHelper.get("gemOre"), 8, 2); + world.setBlock(x, y, z, BOPBlockHelper.get("gemOre"), 8, 2); } } } diff --git a/src/main/java/biomesoplenty/common/biomes/BiomeGenArctic.java b/src/main/java/biomesoplenty/common/biomes/BiomeGenArctic.java index 4060533b3..421755336 100644 --- a/src/main/java/biomesoplenty/common/biomes/BiomeGenArctic.java +++ b/src/main/java/biomesoplenty/common/biomes/BiomeGenArctic.java @@ -18,7 +18,7 @@ public class BiomeGenArctic extends BOPBiome super(id); //TODO: setHeight() - this.func_150570_a(biomeHeight); + this.setHeight(biomeHeight); this.setEnableSnow(); //TODO: setColor() this.setColor(14540253); @@ -46,26 +46,26 @@ public class BiomeGenArctic extends BOPBiome int z = chunkZ + random.nextInt(16); //TODO: getBlock() - Block block = world.func_147439_a(x, y, z); + Block block = world.getBlock(x, y, z); if (block != null && block.isReplaceableOreGen(world, x, y, z, Blocks.stone)) { //TODO: setBlock() - world.func_147465_d(x, y, z, BOPBlockHelper.get("gemOre"), 8, 2); + world.setBlock(x, y, z, BOPBlockHelper.get("gemOre"), 8, 2); } } } @Override //TODO: getBiomeGrassColor() - public int func_150558_b(int x, int y, int z) + public int getBiomeGrassColor(int x, int y, int z) { return 11176526; } @Override //TODO: getBiomeFoliageColor() - public int func_150571_c(int x, int y, int z) + public int getBiomeFoliageColor(int x, int y, int z) { return 11903827; } diff --git a/src/main/java/biomesoplenty/common/biomes/BiomeGenBambooForest.java b/src/main/java/biomesoplenty/common/biomes/BiomeGenBambooForest.java index 5d3958074..4784a568f 100644 --- a/src/main/java/biomesoplenty/common/biomes/BiomeGenBambooForest.java +++ b/src/main/java/biomesoplenty/common/biomes/BiomeGenBambooForest.java @@ -22,7 +22,7 @@ public class BiomeGenBambooForest extends BOPBiome super(id); //TODO: setHeight() - this.func_150570_a(biomeHeight); + this.setHeight(biomeHeight); //TODO: setColor() this.setColor(10739795); this.setTemperatureRainfall(1.2F, 0.9F); @@ -51,22 +51,22 @@ public class BiomeGenBambooForest extends BOPBiome int z = chunkZ + random.nextInt(16); //TODO: getBlock() - Block block = world.func_147439_a(x, y, z); + Block block = world.getBlock(x, y, z); if (block != null && block.isReplaceableOreGen(world, x, y, z, Blocks.stone)) { //TODO: setBlock() - world.func_147465_d(x, y, z, BOPBlockHelper.get("gemOre"), 6, 2); + world.setBlock(x, y, z, BOPBlockHelper.get("gemOre"), 6, 2); } } } - public void func_150573_a(World p_150573_1_, Random p_150573_2_, Block[] p_150573_3_, byte[] p_150573_4_, int p_150573_5_, int p_150573_6_, double p_150573_7_) + public void genTerrainBlocks(World p_150573_1_, Random p_150573_2_, Block[] p_150573_3_, byte[] p_150573_4_, int p_150573_5_, int p_150573_6_, double p_150573_7_) { this.topBlock = Blocks.dirt; this.field_150604_aj = 2; - this.func_150560_b(p_150573_1_, p_150573_2_, p_150573_3_, p_150573_4_, p_150573_5_, p_150573_6_, p_150573_7_); + this.genBiomeTerrain(p_150573_1_, p_150573_2_, p_150573_3_, p_150573_4_, p_150573_5_, p_150573_6_, p_150573_7_); } @Override @@ -84,17 +84,17 @@ public class BiomeGenBambooForest extends BOPBiome @Override //TODO: getBiomeGrassColor() - public int func_150558_b(int p_150558_1_, int p_150558_2_, int p_150558_3_) + public int getBiomeGrassColor(int p_150558_1_, int p_150558_2_, int p_150558_3_) { - double d0 = field_150606_ad.func_151601_a((double)p_150558_1_ * 0.0225D, (double)p_150558_3_ * 0.0225D); + double d0 = plantNoise.func_151601_a((double)p_150558_1_ * 0.0225D, (double)p_150558_3_ * 0.0225D); return d0 < -0.7D ? 13949781 : (d0 < -0.3 ? 12311892 : 10739795); } @Override //TODO: getBiomeFoliageColor() - public int func_150571_c(int x, int y, int z) + public int getBiomeFoliageColor(int x, int y, int z) { - double d0 = field_150606_ad.func_151601_a((double)x * 0.0225D, (double)z * 0.0225D); + double d0 = plantNoise.func_151601_a((double)x * 0.0225D, (double)z * 0.0225D); return d0 < -0.7D ? 13949781 : (d0 < -0.3 ? 12311892 : 10739795); } diff --git a/src/main/java/biomesoplenty/common/biomes/BiomeGenBayou.java b/src/main/java/biomesoplenty/common/biomes/BiomeGenBayou.java index 4a38637c1..9f07dd092 100644 --- a/src/main/java/biomesoplenty/common/biomes/BiomeGenBayou.java +++ b/src/main/java/biomesoplenty/common/biomes/BiomeGenBayou.java @@ -27,7 +27,7 @@ public class BiomeGenBayou extends BOPBiome super(id); //TODO: setHeight() - this.func_150570_a(biomeHeight); + this.setHeight(biomeHeight); //TODO: setColor() this.setColor(9154411); this.setTemperatureRainfall(0.5F, 0.9F); @@ -91,12 +91,12 @@ public class BiomeGenBayou extends BOPBiome int z = chunkZ + random.nextInt(16); //TODO: getBlock() - Block block = world.func_147439_a(x, y, z); + Block block = world.getBlock(x, y, z); if (block != null && block.isReplaceableOreGen(world, x, y, z, Blocks.stone)) { //TODO: setBlock() - world.func_147465_d(x, y, z, BOPBlockHelper.get("gemOre"), 10, 2); + world.setBlock(x, y, z, BOPBlockHelper.get("gemOre"), 10, 2); } } @@ -112,14 +112,14 @@ public class BiomeGenBayou extends BOPBiome @Override //TODO: getBiomeGrassColor() - public int func_150558_b(int x, int y, int z) + public int getBiomeGrassColor(int x, int y, int z) { return 9154411; } @Override //TODO: getBiomeFoliageColor() - public int func_150571_c(int x, int y, int z) + public int getBiomeFoliageColor(int x, int y, int z) { return 11591816; } diff --git a/src/main/java/biomesoplenty/common/biomes/BiomeGenBog.java b/src/main/java/biomesoplenty/common/biomes/BiomeGenBog.java index bec108da6..d19a6eaf7 100644 --- a/src/main/java/biomesoplenty/common/biomes/BiomeGenBog.java +++ b/src/main/java/biomesoplenty/common/biomes/BiomeGenBog.java @@ -24,7 +24,7 @@ public class BiomeGenBog extends BOPBiome super(id); //TODO: setHeight() - this.func_150570_a(biomeHeight); + this.setHeight(biomeHeight); //TODO: setColor() this.setColor(14193503); this.setTemperatureRainfall(0.8F, 0.9F); @@ -66,12 +66,12 @@ public class BiomeGenBog extends BOPBiome int z = chunkZ + random.nextInt(16); //TODO: getBlock() - Block block = world.func_147439_a(x, y, z); + Block block = world.getBlock(x, y, z); if (block != null && block.isReplaceableOreGen(world, x, y, z, Blocks.stone)) { //TODO: setBlock() - world.func_147465_d(x, y, z, BOPBlockHelper.get("gemOre"), 6, 2); + world.setBlock(x, y, z, BOPBlockHelper.get("gemOre"), 6, 2); } } @@ -107,14 +107,14 @@ public class BiomeGenBog extends BOPBiome @Override //TODO: getBiomeGrassColor() - public int func_150558_b(int p_150558_1_, int p_150558_2_, int p_150558_3_) + public int getBiomeGrassColor(int p_150558_1_, int p_150558_2_, int p_150558_3_) { return 14193503; } @Override //TODO: getBiomeFoliageColor() - public int func_150571_c(int x, int y, int z) + public int getBiomeFoliageColor(int x, int y, int z) { return 14345593; } diff --git a/src/main/java/biomesoplenty/common/biomes/BiomeGenBorealForest.java b/src/main/java/biomesoplenty/common/biomes/BiomeGenBorealForest.java index 96929419d..43892c0cf 100644 --- a/src/main/java/biomesoplenty/common/biomes/BiomeGenBorealForest.java +++ b/src/main/java/biomesoplenty/common/biomes/BiomeGenBorealForest.java @@ -26,7 +26,7 @@ public class BiomeGenBorealForest extends BOPBiome super(id); //TODO: setHeight() - this.func_150570_a(biomeHeight); + this.setHeight(biomeHeight); //TODO: setColor() this.setColor(10467185); this.setTemperatureRainfall(0.6F, 0.7F); @@ -85,26 +85,26 @@ public class BiomeGenBorealForest extends BOPBiome int z = chunkZ + random.nextInt(16); //TODO: getBlock() - Block block = world.func_147439_a(x, y, z); + Block block = world.getBlock(x, y, z); if (block != null && block.isReplaceableOreGen(world, x, y, z, Blocks.stone)) { //TODO: setBlock() - world.func_147465_d(x, y, z, BOPBlockHelper.get("gemOre"), 0, 2); + world.setBlock(x, y, z, BOPBlockHelper.get("gemOre"), 0, 2); } } } @Override //TODO: getBiomeGrassColor() - public int func_150558_b(int p_150558_1_, int p_150558_2_, int p_150558_3_) + public int getBiomeGrassColor(int p_150558_1_, int p_150558_2_, int p_150558_3_) { return 10467185; } @Override //TODO: getBiomeFoliageColor() - public int func_150571_c(int x, int y, int z) + public int getBiomeFoliageColor(int x, int y, int z) { return 13225573; } diff --git a/src/main/java/biomesoplenty/common/biomes/BiomeGenBrushland.java b/src/main/java/biomesoplenty/common/biomes/BiomeGenBrushland.java index e3a6007bf..c557d34cc 100644 --- a/src/main/java/biomesoplenty/common/biomes/BiomeGenBrushland.java +++ b/src/main/java/biomesoplenty/common/biomes/BiomeGenBrushland.java @@ -22,7 +22,7 @@ public class BiomeGenBrushland extends BOPBiome super(id); //TODO: setHeight() - this.func_150570_a(biomeHeight); + this.setHeight(biomeHeight); //TODO: setColor() this.setColor(13222271); this.setTemperatureRainfall(2.0F, 0.05F); @@ -69,14 +69,14 @@ public class BiomeGenBrushland extends BOPBiome @Override //TODO: getBiomeGrassColor() - public int func_150558_b(int p_150558_1_, int p_150558_2_, int p_150558_3_) + public int getBiomeGrassColor(int p_150558_1_, int p_150558_2_, int p_150558_3_) { return 13222271; } @Override //TODO: getBiomeFoliageColor() - public int func_150571_c(int x, int y, int z) + public int getBiomeFoliageColor(int x, int y, int z) { return 11716223; } diff --git a/src/main/java/biomesoplenty/common/biomes/BiomeGenCanyon.java b/src/main/java/biomesoplenty/common/biomes/BiomeGenCanyon.java index f82e50520..2a464982c 100644 --- a/src/main/java/biomesoplenty/common/biomes/BiomeGenCanyon.java +++ b/src/main/java/biomesoplenty/common/biomes/BiomeGenCanyon.java @@ -24,7 +24,7 @@ public class BiomeGenCanyon extends BOPBiome super(id); //TODO: setHeight() - this.func_150570_a(biomeHeight); + this.setHeight(biomeHeight); //TODO: setColor() this.setColor(11836528); this.setTemperatureRainfall(0.8F, 0.4F); @@ -73,26 +73,26 @@ public class BiomeGenCanyon extends BOPBiome int z = chunkZ + random.nextInt(16); //TODO: getBlock() - Block block = world.func_147439_a(x, y, z); + Block block = world.getBlock(x, y, z); if (block != null && block.isReplaceableOreGen(world, x, y, z, Blocks.stone)) { //TODO: setBlock() - world.func_147465_d(x, y, z, BOPBlockHelper.get("gemOre"), 2, 2); + world.setBlock(x, y, z, BOPBlockHelper.get("gemOre"), 2, 2); } } } @Override //TODO: getBiomeFoliageColor() - public int func_150571_c(int x, int y, int z) + public int getBiomeFoliageColor(int x, int y, int z) { return 11123300; } @Override //TODO: getBiomeGrassColor() - public int func_150558_b(int p_150558_1_, int p_150558_2_, int p_150558_3_) + public int getBiomeGrassColor(int p_150558_1_, int p_150558_2_, int p_150558_3_) { return 11123300; diff --git a/src/main/java/biomesoplenty/common/biomes/BiomeGenChaparral.java b/src/main/java/biomesoplenty/common/biomes/BiomeGenChaparral.java index 58cfa5214..1c0fac3d3 100644 --- a/src/main/java/biomesoplenty/common/biomes/BiomeGenChaparral.java +++ b/src/main/java/biomesoplenty/common/biomes/BiomeGenChaparral.java @@ -27,7 +27,7 @@ public class BiomeGenChaparral extends BOPBiome super(id); //TODO: setHeight() - this.func_150570_a(biomeHeight); + this.setHeight(biomeHeight); //TODO: setColor() this.setColor(12638301); this.setTemperatureRainfall(0.8F, 0.4F); @@ -93,19 +93,19 @@ public class BiomeGenChaparral extends BOPBiome int z = chunkZ + random.nextInt(16); //TODO: getBlock() - Block block = world.func_147439_a(x, y, z); + Block block = world.getBlock(x, y, z); if (block != null && block.isReplaceableOreGen(world, x, y, z, Blocks.stone)) { //TODO: setBlock() - world.func_147465_d(x, y, z, BOPBlockHelper.get("gemOre"), 4, 2); + world.setBlock(x, y, z, BOPBlockHelper.get("gemOre"), 4, 2); } } } @Override //TODO: getBiomeGrassColor() - public int func_150558_b(int p_150558_1_, int p_150558_2_, int p_150558_3_) + public int getBiomeGrassColor(int p_150558_1_, int p_150558_2_, int p_150558_3_) { return 12638301; } diff --git a/src/main/java/biomesoplenty/common/biomes/BiomeGenCherryBlossomGrove.java b/src/main/java/biomesoplenty/common/biomes/BiomeGenCherryBlossomGrove.java index 3b814a7fc..7d70cda51 100644 --- a/src/main/java/biomesoplenty/common/biomes/BiomeGenCherryBlossomGrove.java +++ b/src/main/java/biomesoplenty/common/biomes/BiomeGenCherryBlossomGrove.java @@ -24,7 +24,7 @@ public class BiomeGenCherryBlossomGrove extends BOPBiome super(id); //TODO: setHeight() - this.func_150570_a(biomeHeight); + this.setHeight(biomeHeight); //TODO: setColor() this.setColor(16289679); this.setTemperatureRainfall(0.7F, 0.8F); @@ -84,26 +84,26 @@ public class BiomeGenCherryBlossomGrove extends BOPBiome int z = chunkZ + random.nextInt(16); //TODO: getBlock() - Block block = world.func_147439_a(x, y, z); + Block block = world.getBlock(x, y, z); if (block != null && block.isReplaceableOreGen(world, x, y, z, Blocks.stone)) { //TODO: setBlock() - world.func_147465_d(x, y, z, BOPBlockHelper.get("gemOre"), 6, 2); + world.setBlock(x, y, z, BOPBlockHelper.get("gemOre"), 6, 2); } } } @Override //TODO: getBiomeGrassColor() - public int func_150558_b(int x, int y, int z) + public int getBiomeGrassColor(int x, int y, int z) { return 10747818; } @Override //TODO: getBiomeFoliageColor() - public int func_150571_c(int x, int y, int z) + public int getBiomeFoliageColor(int x, int y, int z) { return 10747818; } diff --git a/src/main/java/biomesoplenty/common/biomes/BiomeGenConiferousForest.java b/src/main/java/biomesoplenty/common/biomes/BiomeGenConiferousForest.java index be891ecaa..f19234483 100644 --- a/src/main/java/biomesoplenty/common/biomes/BiomeGenConiferousForest.java +++ b/src/main/java/biomesoplenty/common/biomes/BiomeGenConiferousForest.java @@ -24,7 +24,7 @@ public class BiomeGenConiferousForest extends BOPBiome super(id); //TODO: setHeight() - this.func_150570_a(biomeHeight); + this.setHeight(biomeHeight); //TODO: setColor() this.setColor(5410656); this.setTemperatureRainfall(0.5F, 0.5F); @@ -84,12 +84,12 @@ public class BiomeGenConiferousForest extends BOPBiome int z = chunkZ + random.nextInt(16); //TODO: getBlock() - Block block = world.func_147439_a(x, y, z); + Block block = world.getBlock(x, y, z); if (block != null && block.isReplaceableOreGen(world, x, y, z, Blocks.stone)) { //TODO: setBlock() - world.func_147465_d(x, y, z, BOPBlockHelper.get("gemOre"), 0, 2); + world.setBlock(x, y, z, BOPBlockHelper.get("gemOre"), 0, 2); } } } diff --git a/src/main/java/biomesoplenty/common/biomes/BiomeGenConiferousForestSnow.java b/src/main/java/biomesoplenty/common/biomes/BiomeGenConiferousForestSnow.java index b42bdeccd..999441b9c 100644 --- a/src/main/java/biomesoplenty/common/biomes/BiomeGenConiferousForestSnow.java +++ b/src/main/java/biomesoplenty/common/biomes/BiomeGenConiferousForestSnow.java @@ -26,7 +26,7 @@ public class BiomeGenConiferousForestSnow extends BOPBiome super(id); //TODO: setHeight() - this.func_150570_a(biomeHeight); + this.setHeight(biomeHeight); //TODO: setColor() this.setColor(16777215); this.setTemperatureRainfall(0.0F, 0.5F); @@ -91,12 +91,12 @@ public class BiomeGenConiferousForestSnow extends BOPBiome int z = chunkZ + random.nextInt(16); //TODO: getBlock() - Block block = world.func_147439_a(x, y, z); + Block block = world.getBlock(x, y, z); if (block != null && block.isReplaceableOreGen(world, x, y, z, Blocks.stone)) { //TODO: setBlock() - world.func_147465_d(x, y, z, BOPBlockHelper.get("gemOre"), 8, 2); + world.setBlock(x, y, z, BOPBlockHelper.get("gemOre"), 8, 2); } } } diff --git a/src/main/java/biomesoplenty/common/biomes/BiomeGenCrag.java b/src/main/java/biomesoplenty/common/biomes/BiomeGenCrag.java index 04551b0b6..5a0ebde62 100644 --- a/src/main/java/biomesoplenty/common/biomes/BiomeGenCrag.java +++ b/src/main/java/biomesoplenty/common/biomes/BiomeGenCrag.java @@ -17,7 +17,7 @@ public class BiomeGenCrag extends BOPBiome super(id); //TODO: setHeight() - this.func_150570_a(biomeHeight); + this.setHeight(biomeHeight); //TODO: setColor() this.setColor(5209457); this.setTemperatureRainfall(2.0F, 0.0F); @@ -46,12 +46,12 @@ public class BiomeGenCrag extends BOPBiome int z = chunkZ + random.nextInt(16); //TODO: getBlock() - Block block = world.func_147439_a(x, y, z); + Block block = world.getBlock(x, y, z); if (block != null && block.isReplaceableOreGen(world, x, y, z, Blocks.stone)) { //TODO: setBlock() - world.func_147465_d(x, y, z, BOPBlockHelper.get("gemOre"), 12, 2); + world.setBlock(x, y, z, BOPBlockHelper.get("gemOre"), 12, 2); } } } diff --git a/src/main/java/biomesoplenty/common/biomes/BiomeGenDeadForest.java b/src/main/java/biomesoplenty/common/biomes/BiomeGenDeadForest.java index ef1e2badf..7f706191c 100644 --- a/src/main/java/biomesoplenty/common/biomes/BiomeGenDeadForest.java +++ b/src/main/java/biomesoplenty/common/biomes/BiomeGenDeadForest.java @@ -23,7 +23,7 @@ public class BiomeGenDeadForest extends BOPBiome super(id); //TODO: setHeight() - this.func_150570_a(biomeHeight); + this.setHeight(biomeHeight); //TODO: setColor() this.setColor(12362085); this.setTemperatureRainfall(0.2F, 0.8F); @@ -62,14 +62,14 @@ public class BiomeGenDeadForest extends BOPBiome @Override //TODO: getBiomeGrassColor() - public int func_150558_b(int p_150558_1_, int p_150558_2_, int p_150558_3_) + public int getBiomeGrassColor(int p_150558_1_, int p_150558_2_, int p_150558_3_) { return 12362085; } @Override //TODO: getBiomeFoliageColor() - public int func_150571_c(int x, int y, int z) + public int getBiomeFoliageColor(int x, int y, int z) { return 12362085; } diff --git a/src/main/java/biomesoplenty/common/biomes/BiomeGenDeadSwamp.java b/src/main/java/biomesoplenty/common/biomes/BiomeGenDeadSwamp.java index 12c4bf1f9..a8943d6fc 100644 --- a/src/main/java/biomesoplenty/common/biomes/BiomeGenDeadSwamp.java +++ b/src/main/java/biomesoplenty/common/biomes/BiomeGenDeadSwamp.java @@ -24,7 +24,7 @@ public class BiomeGenDeadSwamp extends BOPBiome super(id); //TODO: setHeight() - this.func_150570_a(biomeHeight); + this.setHeight(biomeHeight); //TODO: setColor() this.setColor(9154376); this.setTemperatureRainfall(0.8F, 0.9F); @@ -81,26 +81,26 @@ public class BiomeGenDeadSwamp extends BOPBiome int z = chunkZ + random.nextInt(16); //TODO: getBlock() - Block block = world.func_147439_a(x, y, z); + Block block = world.getBlock(x, y, z); if (block != null && block.isReplaceableOreGen(world, x, y, z, Blocks.stone)) { //TODO: setBlock() - world.func_147465_d(x, y, z, BOPBlockHelper.get("gemOre"), 10, 2); + world.setBlock(x, y, z, BOPBlockHelper.get("gemOre"), 10, 2); } } } @Override //TODO: getBiomeGrassColor() - public int func_150558_b(int p_150558_1_, int p_150558_2_, int p_150558_3_) + public int getBiomeGrassColor(int p_150558_1_, int p_150558_2_, int p_150558_3_) { return 6713420; } @Override //TODO: getBiomeFoliageColor() - public int func_150571_c(int x, int y, int z) + public int getBiomeFoliageColor(int x, int y, int z) { return 6713420; } diff --git a/src/main/java/biomesoplenty/common/biomes/BiomeGenDeciduousForest.java b/src/main/java/biomesoplenty/common/biomes/BiomeGenDeciduousForest.java index 096e74dec..fa266429f 100644 --- a/src/main/java/biomesoplenty/common/biomes/BiomeGenDeciduousForest.java +++ b/src/main/java/biomesoplenty/common/biomes/BiomeGenDeciduousForest.java @@ -22,7 +22,7 @@ public class BiomeGenDeciduousForest extends BOPBiome { super(id); - //this.func_150570_a(biomeHeight); Not set? + //this.setHeight(biomeHeight); Not set? //TODO: setColor() this.setColor(12695369); this.setTemperatureRainfall(0.7F, 0.8F); @@ -74,26 +74,26 @@ public class BiomeGenDeciduousForest extends BOPBiome int z = chunkZ + random.nextInt(16); //TODO: getBlock() - Block block = world.func_147439_a(x, y, z); + Block block = world.getBlock(x, y, z); if (block != null && block.isReplaceableOreGen(world, x, y, z, Blocks.stone)) { //TODO: setBlock() - world.func_147465_d(x, y, z, BOPBlockHelper.get("gemOre"), 0, 2); + world.setBlock(x, y, z, BOPBlockHelper.get("gemOre"), 0, 2); } } } @Override //TODO: getBiomeGrassColor() - public int func_150558_b(int p_150558_1_, int p_150558_2_, int p_150558_3_) + public int getBiomeGrassColor(int p_150558_1_, int p_150558_2_, int p_150558_3_) { return 12695369; } @Override //TODO: getBiomeFoliageColor() - public int func_150571_c(int x, int y, int z) + public int getBiomeFoliageColor(int x, int y, int z) { return 12896570; } diff --git a/src/main/java/biomesoplenty/common/biomes/BiomeGenDunes.java b/src/main/java/biomesoplenty/common/biomes/BiomeGenDunes.java index 9e9d86bb9..5903a919f 100644 --- a/src/main/java/biomesoplenty/common/biomes/BiomeGenDunes.java +++ b/src/main/java/biomesoplenty/common/biomes/BiomeGenDunes.java @@ -19,7 +19,7 @@ public class BiomeGenDunes extends BOPBiome super(id); //TODO: setHeight() - this.func_150570_a(biomeHeight); + this.setHeight(biomeHeight); //TODO: setColor() this.setColor(15064744); this.setDisableRain(); @@ -59,12 +59,12 @@ public class BiomeGenDunes extends BOPBiome int z = chunkZ + random.nextInt(16); //TODO: getBlock() - Block block = world.func_147439_a(x, y, z); + Block block = world.getBlock(x, y, z); if (block != null && block.isReplaceableOreGen(world, x, y, z, Blocks.stone)) { //TODO: setBlock() - world.func_147465_d(x, y, z, BOPBlockHelper.get("gemOre"), 2, 2); + world.setBlock(x, y, z, BOPBlockHelper.get("gemOre"), 2, 2); } } } diff --git a/src/main/java/biomesoplenty/common/biomes/BiomeGenFen.java b/src/main/java/biomesoplenty/common/biomes/BiomeGenFen.java index b1e3f1a21..816fc5bda 100644 --- a/src/main/java/biomesoplenty/common/biomes/BiomeGenFen.java +++ b/src/main/java/biomesoplenty/common/biomes/BiomeGenFen.java @@ -27,7 +27,7 @@ public class BiomeGenFen extends BOPBiome super(id); //TODO: setHeight() - this.func_150570_a(biomeHeight); + this.setHeight(biomeHeight); //TODO: setColor() this.setColor(12240001); this.setTemperatureRainfall(0.4F, 0.4F); @@ -101,12 +101,12 @@ public class BiomeGenFen extends BOPBiome int z = chunkZ + random.nextInt(16); //TODO: getBlock() - Block block = world.func_147439_a(x, y, z); + Block block = world.getBlock(x, y, z); if (block != null && block.isReplaceableOreGen(world, x, y, z, Blocks.stone)) { //TODO: setBlock() - world.func_147465_d(x, y, z, BOPBlockHelper.get("gemOre"), 10, 2); + world.setBlock(x, y, z, BOPBlockHelper.get("gemOre"), 10, 2); } } @@ -122,14 +122,14 @@ public class BiomeGenFen extends BOPBiome @Override //TODO: getBiomeGrassColor() - public int func_150558_b(int p_150558_1_, int p_150558_2_, int p_150558_3_) + public int getBiomeGrassColor(int p_150558_1_, int p_150558_2_, int p_150558_3_) { return 12240001; } @Override //TODO: getBiomeFoliageColor() - public int func_150571_c(int x, int y, int z) + public int getBiomeFoliageColor(int x, int y, int z) { return 13547897; } diff --git a/src/main/java/biomesoplenty/common/biomes/BiomeGenFlowerField.java b/src/main/java/biomesoplenty/common/biomes/BiomeGenFlowerField.java index edd9b481d..e5b47d807 100644 --- a/src/main/java/biomesoplenty/common/biomes/BiomeGenFlowerField.java +++ b/src/main/java/biomesoplenty/common/biomes/BiomeGenFlowerField.java @@ -20,7 +20,7 @@ public class BiomeGenFlowerField extends BOPBiome super(par1); //TODO: setHeight() - this.func_150570_a(biomeHeight); + this.setHeight(biomeHeight); //TODO: setColor() this.setColor(4044093); this.setTemperatureRainfall(0.6F, 0.7F); @@ -44,12 +44,12 @@ public class BiomeGenFlowerField extends BOPBiome int z = chunkZ + random.nextInt(16); //TODO: getBlock() - Block block = world.func_147439_a(x, y, z); + Block block = world.getBlock(x, y, z); if (block != null && block.isReplaceableOreGen(world, x, y, z, Blocks.stone)) { //TODO: setBlock() - world.func_147465_d(x, y, z, BOPBlockHelper.get("gemOre"), 4, 2); + world.setBlock(x, y, z, BOPBlockHelper.get("gemOre"), 4, 2); } } } @@ -62,14 +62,14 @@ public class BiomeGenFlowerField extends BOPBiome @Override //TODO: getBiomeGrassColor() - public int func_150558_b(int x, int y, int z) + public int getBiomeGrassColor(int x, int y, int z) { return 7390273; } @SideOnly(Side.CLIENT) //TODO: getBiomeFoliageColor() - public int func_150571_c(int x, int y, int z) + public int getBiomeFoliageColor(int x, int y, int z) { return 7390273; } diff --git a/src/main/java/biomesoplenty/common/biomes/BiomeGenFrostForest.java b/src/main/java/biomesoplenty/common/biomes/BiomeGenFrostForest.java index a49369507..192973ead 100644 --- a/src/main/java/biomesoplenty/common/biomes/BiomeGenFrostForest.java +++ b/src/main/java/biomesoplenty/common/biomes/BiomeGenFrostForest.java @@ -21,7 +21,7 @@ public class BiomeGenFrostForest extends BOPBiome super(id); //TODO: setHeight() - this.func_150570_a(biomeHeight); + this.setHeight(biomeHeight); //TODO: setColor() this.setColor(11261628); @@ -70,26 +70,26 @@ public class BiomeGenFrostForest extends BOPBiome int z = chunkZ + random.nextInt(16); //TODO: getBlock() - Block block = world.func_147439_a(x, y, z); + Block block = world.getBlock(x, y, z); if (block != null && block.isReplaceableOreGen(world, x, y, z, Blocks.stone)) { //TODO: setBlock() - world.func_147465_d(x, y, z, BOPBlockHelper.get("gemOre"), 8, 2); + world.setBlock(x, y, z, BOPBlockHelper.get("gemOre"), 8, 2); } } } @Override //TODO: getBiomeGrassColor() - public int func_150558_b(int x, int y, int z) + public int getBiomeGrassColor(int x, int y, int z) { return 11261628; } @Override //TODO: getBiomeFoliageColor() - public int func_150571_c(int x, int y, int z) + public int getBiomeFoliageColor(int x, int y, int z) { return 11261628; } diff --git a/src/main/java/biomesoplenty/common/biomes/BiomeGenGrassland.java b/src/main/java/biomesoplenty/common/biomes/BiomeGenGrassland.java index f2d0f6dc0..037df6f7c 100644 --- a/src/main/java/biomesoplenty/common/biomes/BiomeGenGrassland.java +++ b/src/main/java/biomesoplenty/common/biomes/BiomeGenGrassland.java @@ -24,7 +24,7 @@ public class BiomeGenGrassland extends BOPBiome super(id); //TODO: setHeight() - this.func_150570_a(biomeHeight); + this.setHeight(biomeHeight); //TODO: setColor() this.setColor(8379261); this.setTemperatureRainfall(0.7F, 0.7F); @@ -61,12 +61,12 @@ public class BiomeGenGrassland extends BOPBiome int z = chunkZ + random.nextInt(16); //TODO: getBlock() - Block block = world.func_147439_a(x, y, z); + Block block = world.getBlock(x, y, z); if (block != null && block.isReplaceableOreGen(world, x, y, z, Blocks.stone)) { //TODO: setBlock() - world.func_147465_d(x, y, z, BOPBlockHelper.get("gemOre"), 4, 2); + world.setBlock(x, y, z, BOPBlockHelper.get("gemOre"), 4, 2); } } } @@ -87,14 +87,14 @@ public class BiomeGenGrassland extends BOPBiome @Override //TODO: getBiomeGrassColor() - public int func_150558_b(int p_150558_1_, int p_150558_2_, int p_150558_3_) + public int getBiomeGrassColor(int p_150558_1_, int p_150558_2_, int p_150558_3_) { return 8379261; } @Override //TODO: getBiomeFoliageColor() - public int func_150571_c(int x, int y, int z) + public int getBiomeFoliageColor(int x, int y, int z) { return 8379261; } diff --git a/src/main/java/biomesoplenty/common/biomes/BiomeGenGrove.java b/src/main/java/biomesoplenty/common/biomes/BiomeGenGrove.java index 4557898f3..2a1a02c20 100644 --- a/src/main/java/biomesoplenty/common/biomes/BiomeGenGrove.java +++ b/src/main/java/biomesoplenty/common/biomes/BiomeGenGrove.java @@ -25,7 +25,7 @@ public class BiomeGenGrove extends BOPBiome super(id); //TODO: setHeight() - this.func_150570_a(biomeHeight); + this.setHeight(biomeHeight); //TODO: setColor() this.setColor(5341009); this.setTemperatureRainfall(0.4F, 0.8F); @@ -87,26 +87,26 @@ public class BiomeGenGrove extends BOPBiome int z = chunkZ + random.nextInt(16); //TODO: getBlock() - Block block = world.func_147439_a(x, y, z); + Block block = world.getBlock(x, y, z); if (block != null && block.isReplaceableOreGen(world, x, y, z, Blocks.stone)) { //TODO: setBlock() - world.func_147465_d(x, y, z, BOPBlockHelper.get("gemOre"), 0, 2); + world.setBlock(x, y, z, BOPBlockHelper.get("gemOre"), 0, 2); } } } @Override //TODO: getBiomeGrassColor() - public int func_150558_b(int p_150558_1_, int p_150558_2_, int p_150558_3_) + public int getBiomeGrassColor(int p_150558_1_, int p_150558_2_, int p_150558_3_) { return 5341009; } @Override //TODO: getBiomeFoliageColor() - public int func_150571_c(int x, int y, int z) + public int getBiomeFoliageColor(int x, int y, int z) { return 6396257; } diff --git a/src/main/java/biomesoplenty/common/biomes/BiomeGenHeathland.java b/src/main/java/biomesoplenty/common/biomes/BiomeGenHeathland.java index d3029e667..b82345d24 100644 --- a/src/main/java/biomesoplenty/common/biomes/BiomeGenHeathland.java +++ b/src/main/java/biomesoplenty/common/biomes/BiomeGenHeathland.java @@ -25,7 +25,7 @@ public class BiomeGenHeathland extends BOPBiome super(id); //TODO: setHeight() - this.func_150570_a(biomeHeight); + this.setHeight(biomeHeight); //TODO: setColor() this.setColor(13550967); this.setTemperatureRainfall(0.8F, 0.1F); @@ -88,26 +88,26 @@ public class BiomeGenHeathland extends BOPBiome int z = chunkZ + random.nextInt(16); //TODO: getBlock() - Block block = world.func_147439_a(x, y, z); + Block block = world.getBlock(x, y, z); if (block != null && block.isReplaceableOreGen(world, x, y, z, Blocks.stone)) { //TODO: setBlock() - world.func_147465_d(x, y, z, BOPBlockHelper.get("gemOre"), 4, 2); + world.setBlock(x, y, z, BOPBlockHelper.get("gemOre"), 4, 2); } } } @Override //TODO: getBiomeGrassColor() - public int func_150558_b(int p_150558_1_, int p_150558_2_, int p_150558_3_) + public int getBiomeGrassColor(int p_150558_1_, int p_150558_2_, int p_150558_3_) { return 13550967; } @Override //TODO: getBiomeFoliageColor() - public int func_150571_c(int x, int y, int z) + public int getBiomeFoliageColor(int x, int y, int z) { return 11454081; } diff --git a/src/main/java/biomesoplenty/common/biomes/BiomeGenHighland.java b/src/main/java/biomesoplenty/common/biomes/BiomeGenHighland.java index 249228e81..3115370ac 100644 --- a/src/main/java/biomesoplenty/common/biomes/BiomeGenHighland.java +++ b/src/main/java/biomesoplenty/common/biomes/BiomeGenHighland.java @@ -20,7 +20,7 @@ public class BiomeGenHighland extends BOPBiome super(id); //TODO: setHeight() - this.func_150570_a(biomeHeight); + this.setHeight(biomeHeight); //TODO: setColor() this.setColor(8170854); this.setTemperatureRainfall(0.5F, 0.5F); @@ -57,12 +57,12 @@ public class BiomeGenHighland extends BOPBiome int z = chunkZ + random.nextInt(16); //TODO: getBlock() - Block block = world.func_147439_a(x, y, z); + Block block = world.getBlock(x, y, z); if (block != null && block.isReplaceableOreGen(world, x, y, z, Blocks.stone)) { //TODO: setBlock() - world.func_147465_d(x, y, z, BOPBlockHelper.get("gemOre"), 0, 2); + world.setBlock(x, y, z, BOPBlockHelper.get("gemOre"), 0, 2); } } } diff --git a/src/main/java/biomesoplenty/common/biomes/BiomeGenJadeCliffs.java b/src/main/java/biomesoplenty/common/biomes/BiomeGenJadeCliffs.java index 9f47b0eca..2b6143eec 100644 --- a/src/main/java/biomesoplenty/common/biomes/BiomeGenJadeCliffs.java +++ b/src/main/java/biomesoplenty/common/biomes/BiomeGenJadeCliffs.java @@ -25,7 +25,7 @@ public class BiomeGenJadeCliffs extends BOPBiome super(id); //TODO: setHeight() - this.func_150570_a(biomeHeight); + this.setHeight(biomeHeight); //TODO: setColor() this.setColor(9096298); this.setTemperatureRainfall(0.5F, 0.1F); @@ -73,12 +73,12 @@ public class BiomeGenJadeCliffs extends BOPBiome int z = chunkZ + random.nextInt(16); //TODO: getBlock() - Block block = world.func_147439_a(x, y, z); + Block block = world.getBlock(x, y, z); if (block != null && block.isReplaceableOreGen(world, x, y, z, Blocks.stone)) { //TODO: setBlock() - world.func_147465_d(x, y, z, BOPBlockHelper.get("gemOre"), 0, 2); + world.setBlock(x, y, z, BOPBlockHelper.get("gemOre"), 0, 2); } } } @@ -92,14 +92,14 @@ public class BiomeGenJadeCliffs extends BOPBiome @Override //TODO: getBiomeGrassColor() - public int func_150558_b(int x, int y, int z) + public int getBiomeGrassColor(int x, int y, int z) { return 8168808; } @Override //TODO: getBiomeFoliageColor() - public int func_150571_c(int x, int y, int z) + public int getBiomeFoliageColor(int x, int y, int z) { return 9096298; } diff --git a/src/main/java/biomesoplenty/common/biomes/BiomeGenLavenderFields.java b/src/main/java/biomesoplenty/common/biomes/BiomeGenLavenderFields.java index 034217e8a..1648126cb 100644 --- a/src/main/java/biomesoplenty/common/biomes/BiomeGenLavenderFields.java +++ b/src/main/java/biomesoplenty/common/biomes/BiomeGenLavenderFields.java @@ -20,7 +20,7 @@ public class BiomeGenLavenderFields extends BOPBiome super(id); //TODO: setHeight() - this.func_150570_a(biomeHeight); + this.setHeight(biomeHeight); //TODO: setColor() this.setColor(11035852); this.setTemperatureRainfall(0.6F, 0.7F); @@ -47,14 +47,14 @@ public class BiomeGenLavenderFields extends BOPBiome @Override //TODO: getBiomeGrassColor() - public int func_150558_b(int x, int y, int z) + public int getBiomeGrassColor(int x, int y, int z) { return 10601325; } @Override //TODO: getBiomeFoliageColor() - public int func_150571_c(int x, int y, int z) + public int getBiomeFoliageColor(int x, int y, int z) { return 10601325; } @@ -72,12 +72,12 @@ public class BiomeGenLavenderFields extends BOPBiome int z = chunkZ + random.nextInt(16); //TODO: getBlock() - Block block = world.func_147439_a(x, y, z); + Block block = world.getBlock(x, y, z); if (block != null && block.isReplaceableOreGen(world, x, y, z, Blocks.stone)) { //TODO: setBlock() - world.func_147465_d(x, y, z, BOPBlockHelper.get("gemOre"), 4, 2); + world.setBlock(x, y, z, BOPBlockHelper.get("gemOre"), 4, 2); } } } diff --git a/src/main/java/biomesoplenty/common/biomes/BiomeGenLushDesert.java b/src/main/java/biomesoplenty/common/biomes/BiomeGenLushDesert.java index ee500e07c..101ac0aea 100644 --- a/src/main/java/biomesoplenty/common/biomes/BiomeGenLushDesert.java +++ b/src/main/java/biomesoplenty/common/biomes/BiomeGenLushDesert.java @@ -26,7 +26,7 @@ public class BiomeGenLushDesert extends BOPBiome super(id); //TODO: setHeight() - this.func_150570_a(biomeHeight); + this.setHeight(biomeHeight); //TODO: setColor() this.setColor(9087277); this.setTemperatureRainfall(1.0F, 0.3F); @@ -98,12 +98,12 @@ public class BiomeGenLushDesert extends BOPBiome int z = chunkZ + random.nextInt(16); //TODO: getBlock() - Block block = world.func_147439_a(x, y, z); + Block block = world.getBlock(x, y, z); if (block != null && block.isReplaceableOreGen(world, x, y, z, Blocks.stone)) { //TODO: setBlock() - world.func_147465_d(x, y, z, BOPBlockHelper.get("gemOre"), 2, 2); + world.setBlock(x, y, z, BOPBlockHelper.get("gemOre"), 2, 2); } } @@ -113,17 +113,17 @@ public class BiomeGenLushDesert extends BOPBiome int y = random.nextInt(53) + 75; int z = chunkZ + random.nextInt(16); - Block block= world.func_147439_a(x, y, z); + Block block= world.getBlock(x, y, z); if (block != null && (block.isReplaceableOreGen(world, x, y, z, Blocks.stone) || block == BOPBlockHelper.get("redRock"))) { //TODO: setBlock() - world.func_147465_d(x, y, z, Blocks.flowing_water, 0, 2); + world.setBlock(x, y, z, Blocks.flowing_water, 0, 2); } } } - public void func_150573_a(World p_150573_1_, Random p_150573_2_, Block[] p_150573_3_, byte[] p_150573_4_, int p_150573_5_, int p_150573_6_, double p_150573_7_) + public void genTerrainBlocks(World p_150573_1_, Random p_150573_2_, Block[] p_150573_3_, byte[] p_150573_4_, int p_150573_5_, int p_150573_6_, double p_150573_7_) { if (p_150573_7_ > 1.75D) @@ -139,6 +139,6 @@ public class BiomeGenLushDesert extends BOPBiome this.field_150604_aj = 0; } - this.func_150560_b(p_150573_1_, p_150573_2_, p_150573_3_, p_150573_4_, p_150573_5_, p_150573_6_, p_150573_7_); + this.genBiomeTerrain(p_150573_1_, p_150573_2_, p_150573_3_, p_150573_4_, p_150573_5_, p_150573_6_, p_150573_7_); } } diff --git a/src/main/java/biomesoplenty/common/biomes/BiomeGenLushSwamp.java b/src/main/java/biomesoplenty/common/biomes/BiomeGenLushSwamp.java index bd1843c38..dc1ead04a 100644 --- a/src/main/java/biomesoplenty/common/biomes/BiomeGenLushSwamp.java +++ b/src/main/java/biomesoplenty/common/biomes/BiomeGenLushSwamp.java @@ -23,7 +23,7 @@ public class BiomeGenLushSwamp extends BOPBiome super(id); //TODO: setHeight() - this.func_150570_a(biomeHeight); + this.setHeight(biomeHeight); //TODO: setColor() this.setColor(5746228); this.setTemperatureRainfall(0.7F, 1.0F); @@ -91,12 +91,12 @@ public class BiomeGenLushSwamp extends BOPBiome int z = chunkZ + random.nextInt(16); //TODO: getBlock() - Block block = world.func_147439_a(x, y, z); + Block block = world.getBlock(x, y, z); if (block != null && block.isReplaceableOreGen(world, x, y, z, Blocks.stone)) { //TODO: setBlock() - world.func_147465_d(x, y, z, BOPBlockHelper.get("gemOre"), 10, 2); + world.setBlock(x, y, z, BOPBlockHelper.get("gemOre"), 10, 2); } } } diff --git a/src/main/java/biomesoplenty/common/biomes/BiomeGenMapleWoods.java b/src/main/java/biomesoplenty/common/biomes/BiomeGenMapleWoods.java index 766fdc30e..97e1dd61c 100644 --- a/src/main/java/biomesoplenty/common/biomes/BiomeGenMapleWoods.java +++ b/src/main/java/biomesoplenty/common/biomes/BiomeGenMapleWoods.java @@ -23,7 +23,7 @@ public class BiomeGenMapleWoods extends BOPBiome super(id); //TODO: setHeight() - this.func_150570_a(biomeHeight); + this.setHeight(biomeHeight); //TODO: setColor() this.setColor(6988649); this.setTemperatureRainfall(0.2F, 0.8F); @@ -79,12 +79,12 @@ public class BiomeGenMapleWoods extends BOPBiome int z = chunkZ + random.nextInt(16); //TODO: getBlock() - Block block = world.func_147439_a(x, y, z); + Block block = world.getBlock(x, y, z); if (block != null && block.isReplaceableOreGen(world, x, y, z, Blocks.stone)) { //TODO: setBlock() - world.func_147465_d(x, y, z, BOPBlockHelper.get("gemOre"), 0, 2); + world.setBlock(x, y, z, BOPBlockHelper.get("gemOre"), 0, 2); } } } diff --git a/src/main/java/biomesoplenty/common/biomes/BiomeGenMarsh.java b/src/main/java/biomesoplenty/common/biomes/BiomeGenMarsh.java index cde0648c4..d1ae306bf 100644 --- a/src/main/java/biomesoplenty/common/biomes/BiomeGenMarsh.java +++ b/src/main/java/biomesoplenty/common/biomes/BiomeGenMarsh.java @@ -21,7 +21,7 @@ public class BiomeGenMarsh extends BOPBiome super(id); //TODO: setHeight() - this.func_150570_a(biomeHeight); + this.setHeight(biomeHeight); //TODO: setColor() this.setColor(6725742); this.setTemperatureRainfall(0.5F, 0.9F); @@ -72,12 +72,12 @@ public class BiomeGenMarsh extends BOPBiome int z = chunkZ + random.nextInt(16); //TODO: getBlock() - Block block = world.func_147439_a(x, y, z); + Block block = world.getBlock(x, y, z); if (block != null && block.isReplaceableOreGen(world, x, y, z, Blocks.stone)) { //TODO: setBlock() - world.func_147465_d(x, y, z, BOPBlockHelper.get("gemOre"), 12, 2); + world.setBlock(x, y, z, BOPBlockHelper.get("gemOre"), 12, 2); } } } diff --git a/src/main/java/biomesoplenty/common/biomes/BiomeGenMeadow.java b/src/main/java/biomesoplenty/common/biomes/BiomeGenMeadow.java index 3648f0b82..707c96daa 100644 --- a/src/main/java/biomesoplenty/common/biomes/BiomeGenMeadow.java +++ b/src/main/java/biomesoplenty/common/biomes/BiomeGenMeadow.java @@ -88,26 +88,26 @@ public class BiomeGenMeadow extends BOPBiome int z = chunkZ + random.nextInt(16); //TODO: getBlock() - Block block = world.func_147439_a(x, y, z); + Block block = world.getBlock(x, y, z); if (block != null && block.isReplaceableOreGen(world, x, y, z, Blocks.stone)) { //TODO: setBlock() - world.func_147465_d(x, y, z, BOPBlockHelper.get("gemOre"), 4, 2); + world.setBlock(x, y, z, BOPBlockHelper.get("gemOre"), 4, 2); } } } @Override //TODO: getBiomeGrassColor() - public int func_150558_b(int p_150558_1_, int p_150558_2_, int p_150558_3_) + public int getBiomeGrassColor(int p_150558_1_, int p_150558_2_, int p_150558_3_) { return 6533741; } @Override //TODO: getBiomeFoliageColor() - public int func_150571_c(int x, int y, int z) + public int getBiomeFoliageColor(int x, int y, int z) { return 6533741; } diff --git a/src/main/java/biomesoplenty/common/biomes/BiomeGenMoor.java b/src/main/java/biomesoplenty/common/biomes/BiomeGenMoor.java index f90597319..169cc9cc8 100644 --- a/src/main/java/biomesoplenty/common/biomes/BiomeGenMoor.java +++ b/src/main/java/biomesoplenty/common/biomes/BiomeGenMoor.java @@ -21,7 +21,7 @@ public class BiomeGenMoor extends BOPBiome super(id); //TODO: setHeight() - this.func_150570_a(biomeHeight); + this.setHeight(biomeHeight); //TODO: setColor() this.setColor(6394725); this.setTemperatureRainfall(0.5F, 1.0F); @@ -82,26 +82,26 @@ public class BiomeGenMoor extends BOPBiome int z = chunkZ + random.nextInt(16); //TODO: getBlock() - Block block = world.func_147439_a(x, y, z); + Block block = world.getBlock(x, y, z); if (block != null && block.isReplaceableOreGen(world, x, y, z, Blocks.stone)) { //TODO: setBlock() - world.func_147465_d(x, y, z, BOPBlockHelper.get("gemOre"), 0, 2); + world.setBlock(x, y, z, BOPBlockHelper.get("gemOre"), 0, 2); } } } @Override //TODO: getBiomeGrassColor() - public int func_150558_b(int p_150558_1_, int p_150558_2_, int p_150558_3_) + public int getBiomeGrassColor(int p_150558_1_, int p_150558_2_, int p_150558_3_) { return 6394725; } @Override //TODO: getBiomeFoliageColor() - public int func_150571_c(int x, int y, int z) + public int getBiomeFoliageColor(int x, int y, int z) { return 6394725; } diff --git a/src/main/java/biomesoplenty/common/biomes/BiomeGenMountain.java b/src/main/java/biomesoplenty/common/biomes/BiomeGenMountain.java index 33df1d372..27123035d 100644 --- a/src/main/java/biomesoplenty/common/biomes/BiomeGenMountain.java +++ b/src/main/java/biomesoplenty/common/biomes/BiomeGenMountain.java @@ -20,7 +20,7 @@ public class BiomeGenMountain extends BOPBiome super(id); //TODO: setHeight() - this.func_150570_a(biomeHeight); + this.setHeight(biomeHeight); //TODO: setColor() this.setColor(8430421); this.setTemperatureRainfall(0.5F, 0.1F); @@ -59,12 +59,12 @@ public class BiomeGenMountain extends BOPBiome int z = chunkZ + random.nextInt(16); //TODO: getBlock() - Block block = world.func_147439_a(x, y, z); + Block block = world.getBlock(x, y, z); if (block != null && block.isReplaceableOreGen(world, x, y, z, Blocks.stone)) { //TODO: setBlock() - world.func_147465_d(x, y, z, BOPBlockHelper.get("gemOre"), 0, 2); + world.setBlock(x, y, z, BOPBlockHelper.get("gemOre"), 0, 2); } } } diff --git a/src/main/java/biomesoplenty/common/biomes/BiomeGenMysticGrove.java b/src/main/java/biomesoplenty/common/biomes/BiomeGenMysticGrove.java index 2e2dba3f3..37109e5a9 100644 --- a/src/main/java/biomesoplenty/common/biomes/BiomeGenMysticGrove.java +++ b/src/main/java/biomesoplenty/common/biomes/BiomeGenMysticGrove.java @@ -23,7 +23,7 @@ public class BiomeGenMysticGrove extends BOPBiome super(id); //TODO: setHeight() - this.func_150570_a(biomeHeight); + this.setHeight(biomeHeight); this.setEnableSnow(); //TODO: setColor() this.setColor(6934491); @@ -93,14 +93,14 @@ public class BiomeGenMysticGrove extends BOPBiome @Override //TODO: getBiomeGrassColor() - public int func_150558_b(int p_150558_1_, int p_150558_2_, int p_150558_3_) + public int getBiomeGrassColor(int p_150558_1_, int p_150558_2_, int p_150558_3_) { return 6934491; } @Override //TODO: getBiomeFoliageColor() - public int func_150571_c(int x, int y, int z) + public int getBiomeFoliageColor(int x, int y, int z) { return 7397529; } diff --git a/src/main/java/biomesoplenty/common/biomes/BiomeGenOminousWoods.java b/src/main/java/biomesoplenty/common/biomes/BiomeGenOminousWoods.java index 46d6e05c5..83dc6f66f 100644 --- a/src/main/java/biomesoplenty/common/biomes/BiomeGenOminousWoods.java +++ b/src/main/java/biomesoplenty/common/biomes/BiomeGenOminousWoods.java @@ -25,7 +25,7 @@ public class BiomeGenOminousWoods extends BOPBiome super(id); //TODO: setHeight() - this.func_150570_a(biomeHeight); + this.setHeight(biomeHeight); //TODO: setColor() this.setColor(4145489); this.setTemperatureRainfall(0.8F, 0.9F); @@ -75,14 +75,14 @@ public class BiomeGenOminousWoods extends BOPBiome @Override //TODO: getBiomeGrassColor() - public int func_150558_b(int x, int y, int z) + public int getBiomeGrassColor(int x, int y, int z) { return 4145489; } @Override //TODO: getBiomeFoliageColor() - public int func_150571_c(int x, int y, int z) + public int getBiomeFoliageColor(int x, int y, int z) { return 4145489; } diff --git a/src/main/java/biomesoplenty/common/biomes/BiomeGenOriginValley.java b/src/main/java/biomesoplenty/common/biomes/BiomeGenOriginValley.java index a5e4aa2e9..ea4d850df 100644 --- a/src/main/java/biomesoplenty/common/biomes/BiomeGenOriginValley.java +++ b/src/main/java/biomesoplenty/common/biomes/BiomeGenOriginValley.java @@ -17,7 +17,7 @@ public class BiomeGenOriginValley extends BOPBiome super(id); //TODO: setHeight() - this.func_150570_a(biomeHeight); + this.setHeight(biomeHeight); //TODO: setColor() this.setColor(10341485); this.setTemperatureRainfall(0.7F, 0.8F); @@ -46,14 +46,14 @@ public class BiomeGenOriginValley extends BOPBiome @Override //TODO: getBiomeGrassColor() - public int func_150558_b(int p_150558_1_, int p_150558_2_, int p_150558_3_) + public int getBiomeGrassColor(int p_150558_1_, int p_150558_2_, int p_150558_3_) { return 10682207; } @Override //TODO: getBiomeFoliageColor() - public int func_150571_c(int x, int y, int z) + public int getBiomeFoliageColor(int x, int y, int z) { return 3866368; } diff --git a/src/main/java/biomesoplenty/common/biomes/BiomeGenOutback.java b/src/main/java/biomesoplenty/common/biomes/BiomeGenOutback.java index dd82b67d1..675cfc1ca 100644 --- a/src/main/java/biomesoplenty/common/biomes/BiomeGenOutback.java +++ b/src/main/java/biomesoplenty/common/biomes/BiomeGenOutback.java @@ -19,7 +19,7 @@ public class BiomeGenOutback extends BOPBiome super(id); //TODO: setHeight() - this.func_150570_a(biomeHeight); + this.setHeight(biomeHeight); //TODO: setColor() this.setColor(10843716); this.setTemperatureRainfall(0.8F, 0.05F); @@ -60,12 +60,12 @@ public class BiomeGenOutback extends BOPBiome int z = chunkZ + random.nextInt(16); //TODO: getBlock() - Block block = world.func_147439_a(x, y, z); + Block block = world.getBlock(x, y, z); if (block != null && block.isReplaceableOreGen(world, x, y, z, Blocks.stone)) { //TODO: setBlock() - world.func_147465_d(x, y, z, BOPBlockHelper.get("gemOre"), 2, 2); + world.setBlock(x, y, z, BOPBlockHelper.get("gemOre"), 2, 2); } } } diff --git a/src/main/java/biomesoplenty/common/biomes/BiomeGenPasture.java b/src/main/java/biomesoplenty/common/biomes/BiomeGenPasture.java index 27a3d443b..431b8a480 100644 --- a/src/main/java/biomesoplenty/common/biomes/BiomeGenPasture.java +++ b/src/main/java/biomesoplenty/common/biomes/BiomeGenPasture.java @@ -19,7 +19,7 @@ public class BiomeGenPasture extends BOPBiome super(id); //TODO: setHeight() - this.func_150570_a(biomeHeight); + this.setHeight(biomeHeight); //TODO: setColor() this.setColor(16176475); this.setTemperatureRainfall(0.8F, 0.4F); @@ -58,26 +58,26 @@ public class BiomeGenPasture extends BOPBiome int z = chunkZ + random.nextInt(16); //TODO: getBlock() - Block block = world.func_147439_a(x, y, z); + Block block = world.getBlock(x, y, z); if (block != null && block.isReplaceableOreGen(world, x, y, z, Blocks.stone)) { //TODO: setBlock() - world.func_147465_d(x, y, z, BOPBlockHelper.get("gemOre"), 4, 2); + world.setBlock(x, y, z, BOPBlockHelper.get("gemOre"), 4, 2); } } } @Override //TODO: getBiomeGrassColor() - public int func_150558_b(int x, int y, int z) + public int getBiomeGrassColor(int x, int y, int z) { return 13166666; } @Override //TODO: getBiomeFoliageColor() - public int func_150571_c(int x, int y, int z) + public int getBiomeFoliageColor(int x, int y, int z) { return 13166666; } diff --git a/src/main/java/biomesoplenty/common/biomes/BiomeGenPrairie.java b/src/main/java/biomesoplenty/common/biomes/BiomeGenPrairie.java index d281974ed..8fc3c8253 100644 --- a/src/main/java/biomesoplenty/common/biomes/BiomeGenPrairie.java +++ b/src/main/java/biomesoplenty/common/biomes/BiomeGenPrairie.java @@ -23,7 +23,7 @@ public class BiomeGenPrairie extends BOPBiome super(id); //TODO: setHeight() - this.func_150570_a(biomeHeight); + this.setHeight(biomeHeight); //TODO: setColor() this.setColor(13165952); this.setTemperatureRainfall(0.9F, 0.6F); @@ -85,26 +85,26 @@ public class BiomeGenPrairie extends BOPBiome int z = chunkZ + random.nextInt(16); //TODO: getBlock() - Block block = world.func_147439_a(x, y, z); + Block block = world.getBlock(x, y, z); if (block != null && block.isReplaceableOreGen(world, x, y, z, Blocks.stone)) { //TODO: setBlock() - world.func_147465_d(x, y, z, BOPBlockHelper.get("gemOre"), 4, 2); + world.setBlock(x, y, z, BOPBlockHelper.get("gemOre"), 4, 2); } } } @Override //TODO: getBiomeGrassColor() - public int func_150558_b(int p_150558_1_, int p_150558_2_, int p_150558_3_) + public int getBiomeGrassColor(int p_150558_1_, int p_150558_2_, int p_150558_3_) { return 13165952; } @Override //TODO: getBiomeFoliageColor() - public int func_150571_c(int x, int y, int z) + public int getBiomeFoliageColor(int x, int y, int z) { return 11395195; } diff --git a/src/main/java/biomesoplenty/common/biomes/BiomeGenQuagmire.java b/src/main/java/biomesoplenty/common/biomes/BiomeGenQuagmire.java index 5a75d1084..b829546d9 100644 --- a/src/main/java/biomesoplenty/common/biomes/BiomeGenQuagmire.java +++ b/src/main/java/biomesoplenty/common/biomes/BiomeGenQuagmire.java @@ -22,7 +22,7 @@ public class BiomeGenQuagmire extends BOPBiome super(id); //TODO: setHeight() - this.func_150570_a(biomeHeight); + this.setHeight(biomeHeight); //TODO: setColor() this.setColor(5257771); this.setTemperatureRainfall(0.8F, 0.9F); @@ -78,26 +78,26 @@ public class BiomeGenQuagmire extends BOPBiome int z = chunkZ + random.nextInt(16); //TODO: getBlock() - Block block = world.func_147439_a(x, y, z); + Block block = world.getBlock(x, y, z); if (block != null && block.isReplaceableOreGen(world, x, y, z, Blocks.stone)) { //TODO: setBlock() - world.func_147465_d(x, y, z, BOPBlockHelper.get("gemOre"), 10, 2); + world.setBlock(x, y, z, BOPBlockHelper.get("gemOre"), 10, 2); } } } @Override //TODO: getBiomeGrassColor() - public int func_150558_b(int p_150558_1_, int p_150558_2_, int p_150558_3_) + public int getBiomeGrassColor(int p_150558_1_, int p_150558_2_, int p_150558_3_) { return 10390377; } @Override //TODO: getBiomeFoliageColor() - public int func_150571_c(int x, int y, int z) + public int getBiomeFoliageColor(int x, int y, int z) { return 10390377; } diff --git a/src/main/java/biomesoplenty/common/biomes/BiomeGenRainforest.java b/src/main/java/biomesoplenty/common/biomes/BiomeGenRainforest.java index 3fc654603..d343682cc 100644 --- a/src/main/java/biomesoplenty/common/biomes/BiomeGenRainforest.java +++ b/src/main/java/biomesoplenty/common/biomes/BiomeGenRainforest.java @@ -25,7 +25,7 @@ public class BiomeGenRainforest extends BOPBiome super(id); //TODO: setHeight() - this.func_150570_a(biomeHeight); + this.setHeight(biomeHeight); //TODO: setColor() this.setColor(1368687); this.setTemperatureRainfall(2.0F, 2.0F); @@ -93,12 +93,12 @@ public class BiomeGenRainforest extends BOPBiome int z = chunkZ + random.nextInt(16); //TODO: getBlock() - Block block = world.func_147439_a(x, y, z); + Block block = world.getBlock(x, y, z); if (block != null && block.isReplaceableOreGen(world, x, y, z, Blocks.stone)) { //TODO: setBlock() - world.func_147465_d(x, y, z, BOPBlockHelper.get("gemOre"), 6, 2); + world.setBlock(x, y, z, BOPBlockHelper.get("gemOre"), 6, 2); } } } @@ -107,14 +107,14 @@ public class BiomeGenRainforest extends BOPBiome @Override //TODO: getBiomeGrassColor() - public int func_150558_b(int x, int y, int z) + public int getBiomeGrassColor(int x, int y, int z) { return 1759340; } @Override //TODO: getBiomeFoliageColor() - public int func_150571_c(int x, int y, int z) + public int getBiomeFoliageColor(int x, int y, int z) { return 1368687; } diff --git a/src/main/java/biomesoplenty/common/biomes/BiomeGenRedwoodForest.java b/src/main/java/biomesoplenty/common/biomes/BiomeGenRedwoodForest.java index 76e0edbba..3bdc94607 100644 --- a/src/main/java/biomesoplenty/common/biomes/BiomeGenRedwoodForest.java +++ b/src/main/java/biomesoplenty/common/biomes/BiomeGenRedwoodForest.java @@ -25,7 +25,7 @@ public class BiomeGenRedwoodForest extends BOPBiome super(id); //TODO: setHeight() - this.func_150570_a(biomeHeight); + this.setHeight(biomeHeight); //TODO: setColor() this.setColor(7187004); this.setTemperatureRainfall(0.8F, 0.4F); @@ -85,17 +85,17 @@ public class BiomeGenRedwoodForest extends BOPBiome int z = chunkZ + random.nextInt(16); //TODO: getBlock() - Block block = world.func_147439_a(x, y, z); + Block block = world.getBlock(x, y, z); if (block != null && block.isReplaceableOreGen(world, x, y, z, Blocks.stone)) { //TODO: setBlock() - world.func_147465_d(x, y, z, BOPBlockHelper.get("gemOre"), 0, 2); + world.setBlock(x, y, z, BOPBlockHelper.get("gemOre"), 0, 2); } } } - public void func_150573_a(World p_150573_1_, Random p_150573_2_, Block[] p_150573_3_, byte[] p_150573_4_, int p_150573_5_, int p_150573_6_, double p_150573_7_) + public void genTerrainBlocks(World p_150573_1_, Random p_150573_2_, Block[] p_150573_3_, byte[] p_150573_4_, int p_150573_5_, int p_150573_6_, double p_150573_7_) { if (p_150573_7_ > 1.75D) @@ -109,6 +109,6 @@ public class BiomeGenRedwoodForest extends BOPBiome this.field_150604_aj = 2; } - this.func_150560_b(p_150573_1_, p_150573_2_, p_150573_3_, p_150573_4_, p_150573_5_, p_150573_6_, p_150573_7_); + this.genBiomeTerrain(p_150573_1_, p_150573_2_, p_150573_3_, p_150573_4_, p_150573_5_, p_150573_6_, p_150573_7_); } } diff --git a/src/main/java/biomesoplenty/common/biomes/BiomeGenSacredSprings.java b/src/main/java/biomesoplenty/common/biomes/BiomeGenSacredSprings.java index d87bc4d43..b0ccc4777 100644 --- a/src/main/java/biomesoplenty/common/biomes/BiomeGenSacredSprings.java +++ b/src/main/java/biomesoplenty/common/biomes/BiomeGenSacredSprings.java @@ -26,7 +26,7 @@ public class BiomeGenSacredSprings extends BOPBiome super(id); //TODO: setHeight() - this.func_150570_a(biomeHeight); + this.setHeight(biomeHeight); this.setColor(39259); this.spawnableMonsterList.add(new BiomeGenBase.SpawnListEntry(EntityJungleSpider.class, 12, 6, 6)); @@ -65,17 +65,17 @@ public class BiomeGenSacredSprings extends BOPBiome @Override //TODO: getBiomeGrassColor() - public int func_150558_b(int p_150558_1_, int p_150558_2_, int p_150558_3_) + public int getBiomeGrassColor(int p_150558_1_, int p_150558_2_, int p_150558_3_) { - double d0 = field_150606_ad.func_151601_a((double)p_150558_1_ * 0.0225D, (double)p_150558_3_ * 0.0225D); + double d0 = plantNoise.func_151601_a((double)p_150558_1_ * 0.0225D, (double)p_150558_3_ * 0.0225D); return d0 < -0.1D ? 39285 : 39259; } @SideOnly(Side.CLIENT) //TODO: getBiomeFoliageColor() - public int func_150571_c(int x, int y, int z) + public int getBiomeFoliageColor(int x, int y, int z) { - double d0 = field_150606_ad.func_151601_a((double)x * 0.0225D, (double)z* 0.0225D); + double d0 = plantNoise.func_151601_a((double)x * 0.0225D, (double)z* 0.0225D); return d0 < -0.1D ? 39285 : 39259; } } diff --git a/src/main/java/biomesoplenty/common/biomes/BiomeGenSeasonalForest.java b/src/main/java/biomesoplenty/common/biomes/BiomeGenSeasonalForest.java index 3250a5a3d..514b493c1 100644 --- a/src/main/java/biomesoplenty/common/biomes/BiomeGenSeasonalForest.java +++ b/src/main/java/biomesoplenty/common/biomes/BiomeGenSeasonalForest.java @@ -23,7 +23,7 @@ public class BiomeGenSeasonalForest extends BOPBiome super(id); //TODO: setHeight() - this.func_150570_a(biomeHeight); + this.setHeight(biomeHeight); //TODO: setColor() this.setColor(12502092); this.setTemperatureRainfall(0.7F, 0.8F); @@ -79,26 +79,26 @@ public class BiomeGenSeasonalForest extends BOPBiome int z = chunkZ + random.nextInt(16); //TODO: getBlock() - Block block = world.func_147439_a(x, y, z); + Block block = world.getBlock(x, y, z); if (block != null && block.isReplaceableOreGen(world, x, y, z, Blocks.stone)) { //TODO: setBlock() - world.func_147465_d(x, y, z, BOPBlockHelper.get("gemOre"), 0, 2); + world.setBlock(x, y, z, BOPBlockHelper.get("gemOre"), 0, 2); } } } @Override //TODO: getBiomeFoliageColor() - public int func_150571_c(int x, int y, int z) + public int getBiomeFoliageColor(int x, int y, int z) { return 11781186; } @Override //TODO: getBiomeGrassColor() - public int func_150558_b(int p_150558_1_, int p_150558_2_, int p_150558_3_) + public int getBiomeGrassColor(int p_150558_1_, int p_150558_2_, int p_150558_3_) { return 12502092; // return 12502595; diff --git a/src/main/java/biomesoplenty/common/biomes/BiomeGenShield.java b/src/main/java/biomesoplenty/common/biomes/BiomeGenShield.java index 9e2501429..edf3be0b2 100644 --- a/src/main/java/biomesoplenty/common/biomes/BiomeGenShield.java +++ b/src/main/java/biomesoplenty/common/biomes/BiomeGenShield.java @@ -23,7 +23,7 @@ public class BiomeGenShield extends BOPBiome super(id); //TODO: setHeight() - this.func_150570_a(biomeHeight); + this.setHeight(biomeHeight); //TODO: setColor() this.setColor(6586168); this.setTemperatureRainfall(0.5F, 0.8F); @@ -78,14 +78,14 @@ public class BiomeGenShield extends BOPBiome @Override //TODO: getBiomeGrassColor() - public int func_150558_b(int x, int y, int z) + public int getBiomeGrassColor(int x, int y, int z) { return 6586168; } @Override //TODO: getBiomeFoliageColor() - public int func_150571_c(int x, int y, int z) + public int getBiomeFoliageColor(int x, int y, int z) { return 7902787; } diff --git a/src/main/java/biomesoplenty/common/biomes/BiomeGenShrubland.java b/src/main/java/biomesoplenty/common/biomes/BiomeGenShrubland.java index aec028650..7b6c63217 100644 --- a/src/main/java/biomesoplenty/common/biomes/BiomeGenShrubland.java +++ b/src/main/java/biomesoplenty/common/biomes/BiomeGenShrubland.java @@ -23,7 +23,7 @@ public class BiomeGenShrubland extends BOPBiome super(id); //TODO: setHeight() - this.func_150570_a(biomeHeight); + this.setHeight(biomeHeight); //TODO: setColor() this.setColor(8168286); this.setTemperatureRainfall(0.6F, 0.05F); @@ -77,12 +77,12 @@ public class BiomeGenShrubland extends BOPBiome int z = chunkZ + random.nextInt(16); //TODO: getBlock() - Block block = world.func_147439_a(x, y, z); + Block block = world.getBlock(x, y, z); if (block != null && block.isReplaceableOreGen(world, x, y, z, Blocks.stone)) { //TODO: setBlock() - world.func_147465_d(x, y, z, BOPBlockHelper.get("gemOre"), 4, 2); + world.setBlock(x, y, z, BOPBlockHelper.get("gemOre"), 4, 2); } } } diff --git a/src/main/java/biomesoplenty/common/biomes/BiomeGenSilkglades.java b/src/main/java/biomesoplenty/common/biomes/BiomeGenSilkglades.java index 852b468b8..f96c8a95b 100644 --- a/src/main/java/biomesoplenty/common/biomes/BiomeGenSilkglades.java +++ b/src/main/java/biomesoplenty/common/biomes/BiomeGenSilkglades.java @@ -24,7 +24,7 @@ public class BiomeGenSilkglades extends BOPBiome super(id); //TODO: setHeight() - this.func_150570_a(biomeHeight); + this.setHeight(biomeHeight); //TODO: setColor() this.setColor(13420973); this.setTemperatureRainfall(0.5F, 0.9F); @@ -87,26 +87,26 @@ public class BiomeGenSilkglades extends BOPBiome int z = chunkZ + random.nextInt(16); //TODO: getBlock() - Block block = world.func_147439_a(x, y, z); + Block block = world.getBlock(x, y, z); if (block != null && block.isReplaceableOreGen(world, x, y, z, Blocks.stone)) { //TODO: setBlock() - world.func_147465_d(x, y, z, BOPBlockHelper.get("gemOre"), 10, 2); + world.setBlock(x, y, z, BOPBlockHelper.get("gemOre"), 10, 2); } } } @Override //TODO: getBiomeGrassColor() - public int func_150558_b(int x, int y, int z) + public int getBiomeGrassColor(int x, int y, int z) { return 13420973; } @Override //TODO: getBiomeFoliageColor() - public int func_150571_c(int x, int y, int z) + public int getBiomeFoliageColor(int x, int y, int z) { return 14146486; } diff --git a/src/main/java/biomesoplenty/common/biomes/BiomeGenSludgepit.java b/src/main/java/biomesoplenty/common/biomes/BiomeGenSludgepit.java index d0b90bf14..f53360533 100644 --- a/src/main/java/biomesoplenty/common/biomes/BiomeGenSludgepit.java +++ b/src/main/java/biomesoplenty/common/biomes/BiomeGenSludgepit.java @@ -24,7 +24,7 @@ public class BiomeGenSludgepit extends BOPBiome super(id); //TODO: setHeight() - this.func_150570_a(biomeHeight); + this.setHeight(biomeHeight); //TODO: setColor() this.setColor(7627817); this.setTemperatureRainfall(0.8F, 0.9F); @@ -85,26 +85,26 @@ public class BiomeGenSludgepit extends BOPBiome int z = chunkZ + random.nextInt(16); //TODO: getBlock() - Block block = world.func_147439_a(x, y, z); + Block block = world.getBlock(x, y, z); if (block != null && block.isReplaceableOreGen(world, x, y, z, Blocks.stone)) { //TODO: setBlock() - world.func_147465_d(x, y, z, BOPBlockHelper.get("gemOre"), 10, 2); + world.setBlock(x, y, z, BOPBlockHelper.get("gemOre"), 10, 2); } } } @Override //TODO: getBiomeGrassColor() - public int func_150558_b(int x, int y, int z) + public int getBiomeGrassColor(int x, int y, int z) { return 7627817; } @Override //TODO: getBiomeFoliageColor() - public int func_150571_c(int x, int y, int z) + public int getBiomeFoliageColor(int x, int y, int z) { return 9539892; } diff --git a/src/main/java/biomesoplenty/common/biomes/BiomeGenSpruceWoods.java b/src/main/java/biomesoplenty/common/biomes/BiomeGenSpruceWoods.java index 5663c1dc8..3b7f48cc2 100644 --- a/src/main/java/biomesoplenty/common/biomes/BiomeGenSpruceWoods.java +++ b/src/main/java/biomesoplenty/common/biomes/BiomeGenSpruceWoods.java @@ -83,12 +83,12 @@ public class BiomeGenSpruceWoods extends BOPBiome int z = chunkZ + random.nextInt(16); //TODO: getBlock() - Block block = world.func_147439_a(x, y, z); + Block block = world.getBlock(x, y, z); if (block != null && block.isReplaceableOreGen(world, x, y, z, Blocks.stone)) { //TODO: setBlock() - world.func_147465_d(x, y, z, BOPBlockHelper.get("gemOre"), 0, 2); + world.setBlock(x, y, z, BOPBlockHelper.get("gemOre"), 0, 2); } } } diff --git a/src/main/java/biomesoplenty/common/biomes/BiomeGenTemperateRainforest.java b/src/main/java/biomesoplenty/common/biomes/BiomeGenTemperateRainforest.java index 6dbb1093d..fc2008ad0 100644 --- a/src/main/java/biomesoplenty/common/biomes/BiomeGenTemperateRainforest.java +++ b/src/main/java/biomesoplenty/common/biomes/BiomeGenTemperateRainforest.java @@ -27,7 +27,7 @@ public class BiomeGenTemperateRainforest extends BOPBiome super(id); //TODO: setHeight() - this.func_150570_a(biomeHeight); + this.setHeight(biomeHeight); //TODO: setColor() this.setColor(12311907); this.setTemperatureRainfall(0.7F, 0.8F); @@ -85,12 +85,12 @@ public class BiomeGenTemperateRainforest extends BOPBiome int z = chunkZ + random.nextInt(16); //TODO: getBlock() - Block block = world.func_147439_a(x, y, z); + Block block = world.getBlock(x, y, z); if (block != null && block.isReplaceableOreGen(world, x, y, z, Blocks.stone)) { //TODO: setBlock() - world.func_147465_d(x, y, z, BOPBlockHelper.get("gemOre"), 0, 2); + world.setBlock(x, y, z, BOPBlockHelper.get("gemOre"), 0, 2); } } @@ -106,14 +106,14 @@ public class BiomeGenTemperateRainforest extends BOPBiome @Override //TODO: getBiomeGrassColor() - public int func_150558_b(int x, int y, int z) + public int getBiomeGrassColor(int x, int y, int z) { return 11981671; } @Override //TODO: getBiomeFoliageColor() - public int func_150571_c(int x, int y, int z) + public int getBiomeFoliageColor(int x, int y, int z) { return 12311907; } diff --git a/src/main/java/biomesoplenty/common/biomes/BiomeGenThicket.java b/src/main/java/biomesoplenty/common/biomes/BiomeGenThicket.java index 43fe218b8..882d7011f 100644 --- a/src/main/java/biomesoplenty/common/biomes/BiomeGenThicket.java +++ b/src/main/java/biomesoplenty/common/biomes/BiomeGenThicket.java @@ -20,7 +20,7 @@ public class BiomeGenThicket extends BOPBiome super(id); //TODO: setHeight() - this.func_150570_a(biomeHeight); + this.setHeight(biomeHeight); //TODO: setColor() this.setColor(7248193); this.setTemperatureRainfall(0.6F, 0.2F); @@ -58,14 +58,14 @@ public class BiomeGenThicket extends BOPBiome @Override //TODO: getBiomeGrassColor() - public int func_150558_b(int p_150558_1_, int p_150558_2_, int p_150558_3_) + public int getBiomeGrassColor(int p_150558_1_, int p_150558_2_, int p_150558_3_) { return 11049591; } @Override //TODO: getBiomeFoliageColor() - public int func_150571_c(int x, int y, int z) + public int getBiomeFoliageColor(int x, int y, int z) { return 10854765; } diff --git a/src/main/java/biomesoplenty/common/biomes/BiomeGenTimber.java b/src/main/java/biomesoplenty/common/biomes/BiomeGenTimber.java index 0693a5c14..15cb78621 100644 --- a/src/main/java/biomesoplenty/common/biomes/BiomeGenTimber.java +++ b/src/main/java/biomesoplenty/common/biomes/BiomeGenTimber.java @@ -23,7 +23,7 @@ public class BiomeGenTimber extends BOPBiome super(id); //TODO: setHeight() - this.func_150570_a(biomeHeight); + this.setHeight(biomeHeight); //TODO: setColor() this.setColor(10923366); this.setTemperatureRainfall(0.7F, 0.8F); @@ -74,26 +74,26 @@ public class BiomeGenTimber extends BOPBiome int z = chunkZ + random.nextInt(16); //TODO: getBlock() - Block block = world.func_147439_a(x, y, z); + Block block = world.getBlock(x, y, z); if (block != null && block.isReplaceableOreGen(world, x, y, z, Blocks.stone)) { //TODO: setBlock() - world.func_147465_d(x, y, z, BOPBlockHelper.get("gemOre"), 0, 2); + world.setBlock(x, y, z, BOPBlockHelper.get("gemOre"), 0, 2); } } } @Override //TODO: getBiomeGrassColor() - public int func_150558_b(int p_150558_1_, int p_150558_2_, int p_150558_3_) + public int getBiomeGrassColor(int p_150558_1_, int p_150558_2_, int p_150558_3_) { return 10923366; } @Override //TODO: getBiomeFoliageColor() - public int func_150571_c(int x, int y, int z) + public int getBiomeFoliageColor(int x, int y, int z) { return 11049817; } diff --git a/src/main/java/biomesoplenty/common/biomes/BiomeGenTropicalRainforest.java b/src/main/java/biomesoplenty/common/biomes/BiomeGenTropicalRainforest.java index fdbf92b68..5a8d7710c 100644 --- a/src/main/java/biomesoplenty/common/biomes/BiomeGenTropicalRainforest.java +++ b/src/main/java/biomesoplenty/common/biomes/BiomeGenTropicalRainforest.java @@ -27,7 +27,7 @@ public class BiomeGenTropicalRainforest extends BOPBiome super(id); //TODO: setHeight() - this.func_150570_a(biomeHeight); + this.setHeight(biomeHeight); //TODO: setColor() this.setColor(8970560); this.setTemperatureRainfall(1.2F, 0.9F); @@ -96,19 +96,19 @@ public class BiomeGenTropicalRainforest extends BOPBiome int z = chunkZ + random.nextInt(16); //TODO: getBlock() - Block block = world.func_147439_a(x, y, z); + Block block = world.getBlock(x, y, z); if (block != null && block.isReplaceableOreGen(world, x, y, z, Blocks.stone)) { //TODO: setBlock() - world.func_147465_d(x, y, z, BOPBlockHelper.get("gemOre"), 6, 2); + world.setBlock(x, y, z, BOPBlockHelper.get("gemOre"), 6, 2); } } } @Override //TODO: getBiomeGrassColor() - public int func_150558_b(int p_150558_1_, int p_150558_2_, int p_150558_3_) + public int getBiomeGrassColor(int p_150558_1_, int p_150558_2_, int p_150558_3_) { return 11002176; } @@ -116,7 +116,7 @@ public class BiomeGenTropicalRainforest extends BOPBiome @Override //TODO: getBiomeFoliageColor() - public int func_150571_c(int x, int y, int z) + public int getBiomeFoliageColor(int x, int y, int z) { return 8970560; } diff --git a/src/main/java/biomesoplenty/common/biomes/BiomeGenTropics.java b/src/main/java/biomesoplenty/common/biomes/BiomeGenTropics.java index 8e6d03068..69e602ac3 100644 --- a/src/main/java/biomesoplenty/common/biomes/BiomeGenTropics.java +++ b/src/main/java/biomesoplenty/common/biomes/BiomeGenTropics.java @@ -27,7 +27,7 @@ public class BiomeGenTropics extends BOPBiome super(id); //TODO: setHeight() - this.func_150570_a(biomeHeight); + this.setHeight(biomeHeight); //TODO: setColor() this.setColor(2211330); this.setTemperatureRainfall(2.0F, 2.0F); @@ -97,12 +97,12 @@ public class BiomeGenTropics extends BOPBiome int z = chunkZ + random.nextInt(16); //TODO: getBlock() - Block block = world.func_147439_a(x, y, z); + Block block = world.getBlock(x, y, z); if (block != null && block.isReplaceableOreGen(world, x, y, z, Blocks.stone)) { //TODO: setBlock() - world.func_147465_d(x, y, z, BOPBlockHelper.get("gemOre"), 6, 2); + world.setBlock(x, y, z, BOPBlockHelper.get("gemOre"), 6, 2); } } } diff --git a/src/main/java/biomesoplenty/common/biomes/BiomeGenTundra.java b/src/main/java/biomesoplenty/common/biomes/BiomeGenTundra.java index 9c0f17ee5..954ea5f78 100644 --- a/src/main/java/biomesoplenty/common/biomes/BiomeGenTundra.java +++ b/src/main/java/biomesoplenty/common/biomes/BiomeGenTundra.java @@ -22,7 +22,7 @@ public class BiomeGenTundra extends BOPBiome super(id); //TODO: setHeight() - this.func_150570_a(biomeHeight); + this.setHeight(biomeHeight); //TODO: setColor() this.setColor(11371606); this.setTemperatureRainfall(0.2F, 0.8F); @@ -84,26 +84,26 @@ public class BiomeGenTundra extends BOPBiome int z = chunkZ + random.nextInt(16); //TODO: getBlock() - Block block = world.func_147439_a(x, y, z); + Block block = world.getBlock(x, y, z); if (block != null && block.isReplaceableOreGen(world, x, y, z, Blocks.stone)) { //TODO: setBlock() - world.func_147465_d(x, y, z, BOPBlockHelper.get("gemOre"), 8, 2); + world.setBlock(x, y, z, BOPBlockHelper.get("gemOre"), 8, 2); } } } @Override //TODO: getBiomeGrassColor() - public int func_150558_b(int p_150558_1_, int p_150558_2_, int p_150558_3_) + public int getBiomeGrassColor(int p_150558_1_, int p_150558_2_, int p_150558_3_) { return 11371606; } @Override //TODO: getBiomeFoliageColor() - public int func_150571_c(int x, int y, int z) + public int getBiomeFoliageColor(int x, int y, int z) { return 12543566; } diff --git a/src/main/java/biomesoplenty/common/biomes/BiomeGenVolcano.java b/src/main/java/biomesoplenty/common/biomes/BiomeGenVolcano.java index f3491ec66..f1ee051c3 100644 --- a/src/main/java/biomesoplenty/common/biomes/BiomeGenVolcano.java +++ b/src/main/java/biomesoplenty/common/biomes/BiomeGenVolcano.java @@ -12,7 +12,7 @@ public class BiomeGenVolcano extends BOPBiome super(id); //TODO: setHeight() - this.func_150570_a(biomeHeight); + this.setHeight(biomeHeight); this.setDisableRain(); //TODO: setColor() this.setColor(6645093); diff --git a/src/main/java/biomesoplenty/common/biomes/BiomeGenWasteland.java b/src/main/java/biomesoplenty/common/biomes/BiomeGenWasteland.java index 628691e61..38875793f 100644 --- a/src/main/java/biomesoplenty/common/biomes/BiomeGenWasteland.java +++ b/src/main/java/biomesoplenty/common/biomes/BiomeGenWasteland.java @@ -20,7 +20,7 @@ public class BiomeGenWasteland extends BOPBiome super(id); //TODO: setHeight() - this.func_150570_a(biomeHeight); + this.setHeight(biomeHeight); this.setDisableRain(); //TODO: setColor() this.setColor(5919808); @@ -63,14 +63,14 @@ public class BiomeGenWasteland extends BOPBiome @Override //TODO: getBiomeGrassColor() - public int func_150558_b(int p_150558_1_, int p_150558_2_, int p_150558_3_) + public int getBiomeGrassColor(int p_150558_1_, int p_150558_2_, int p_150558_3_) { return 10330232; } @Override //TODO: getBiomeFoliageColor() - public int func_150571_c(int x, int y, int z) + public int getBiomeFoliageColor(int x, int y, int z) { return 10067541; } diff --git a/src/main/java/biomesoplenty/common/biomes/BiomeGenWetland.java b/src/main/java/biomesoplenty/common/biomes/BiomeGenWetland.java index ba8909326..03ada70dc 100644 --- a/src/main/java/biomesoplenty/common/biomes/BiomeGenWetland.java +++ b/src/main/java/biomesoplenty/common/biomes/BiomeGenWetland.java @@ -26,7 +26,7 @@ public class BiomeGenWetland extends BOPBiome super(id); //TODO: setHeight() - this.func_150570_a(biomeHeight); + this.setHeight(biomeHeight); //TODO: setColor() this.setColor(5215831); this.setTemperatureRainfall(0.8F, 0.9F); @@ -110,12 +110,12 @@ public class BiomeGenWetland extends BOPBiome int z = chunkZ + random.nextInt(16); //TODO: getBlock() - Block block = world.func_147439_a(x, y, z); + Block block = world.getBlock(x, y, z); if (block != null && block.isReplaceableOreGen(world, x, y, z, Blocks.stone)) { //TODO: setBlock() - world.func_147465_d(x, y, z, BOPBlockHelper.get("gemOre"), 10, 2); + world.setBlock(x, y, z, BOPBlockHelper.get("gemOre"), 10, 2); } } @@ -131,14 +131,14 @@ public class BiomeGenWetland extends BOPBiome @Override //TODO: getBiomeGrassColor() - public int func_150558_b(int x, int y, int z) + public int getBiomeGrassColor(int x, int y, int z) { return 5935967; } @Override //TODO: getBiomeFoliageColor() - public int func_150571_c(int x, int y, int z) + public int getBiomeFoliageColor(int x, int y, int z) { return 5215831; } diff --git a/src/main/java/biomesoplenty/common/biomes/BiomeGenWoodland.java b/src/main/java/biomesoplenty/common/biomes/BiomeGenWoodland.java index 69d2e570b..4686a3c0b 100644 --- a/src/main/java/biomesoplenty/common/biomes/BiomeGenWoodland.java +++ b/src/main/java/biomesoplenty/common/biomes/BiomeGenWoodland.java @@ -22,7 +22,7 @@ public class BiomeGenWoodland extends BOPBiome super(id); //TODO: setHeight() - this.func_150570_a(biomeHeight); + this.setHeight(biomeHeight); //TODO: setColor() this.setColor(8694061); this.setTemperatureRainfall(1.7F, 0.2F); @@ -82,12 +82,12 @@ public class BiomeGenWoodland extends BOPBiome int z = chunkZ + random.nextInt(16); //TODO: getBlock() - Block block = world.func_147439_a(x, y, z); + Block block = world.getBlock(x, y, z); if (block != null && block.isReplaceableOreGen(world, x, y, z, Blocks.stone)) { //TODO: setBlock() - world.func_147465_d(x, y, z, BOPBlockHelper.get("gemOre"), 0, 2); + world.setBlock(x, y, z, BOPBlockHelper.get("gemOre"), 0, 2); } } } diff --git a/src/main/java/biomesoplenty/common/biomes/promisedland/BiomeGenPromisedLandForest.java b/src/main/java/biomesoplenty/common/biomes/promisedland/BiomeGenPromisedLandForest.java index 414e616f5..92fac4921 100644 --- a/src/main/java/biomesoplenty/common/biomes/promisedland/BiomeGenPromisedLandForest.java +++ b/src/main/java/biomesoplenty/common/biomes/promisedland/BiomeGenPromisedLandForest.java @@ -85,7 +85,7 @@ public class BiomeGenPromisedLandForest extends BOPBiome //implements IWCFog @Override //TODO: getBiomeGrassColor() - public int func_150558_b(int x, int y, int z) + public int getBiomeGrassColor(int x, int y, int z) { return 7925125; } diff --git a/src/main/java/biomesoplenty/common/biomes/promisedland/BiomeGenPromisedLandPlains.java b/src/main/java/biomesoplenty/common/biomes/promisedland/BiomeGenPromisedLandPlains.java index c2683a0b6..0325738a5 100644 --- a/src/main/java/biomesoplenty/common/biomes/promisedland/BiomeGenPromisedLandPlains.java +++ b/src/main/java/biomesoplenty/common/biomes/promisedland/BiomeGenPromisedLandPlains.java @@ -68,7 +68,7 @@ public class BiomeGenPromisedLandPlains extends BOPBiome //implements IWCFog @Override //TODO: getBiomeGrassColor() - public int func_150558_b(int x, int y, int z) + public int getBiomeGrassColor(int x, int y, int z) { return 7925125; } diff --git a/src/main/java/biomesoplenty/common/biomes/promisedland/BiomeGenPromisedLandSwamp.java b/src/main/java/biomesoplenty/common/biomes/promisedland/BiomeGenPromisedLandSwamp.java index 05662c78f..ca273410d 100644 --- a/src/main/java/biomesoplenty/common/biomes/promisedland/BiomeGenPromisedLandSwamp.java +++ b/src/main/java/biomesoplenty/common/biomes/promisedland/BiomeGenPromisedLandSwamp.java @@ -83,7 +83,7 @@ public class BiomeGenPromisedLandSwamp extends BOPBiome //implements IWCFog @Override //TODO: getBiomeGrassColor() - public int func_150558_b(int x, int y, int z) + public int getBiomeGrassColor(int x, int y, int z) { return 7925125; } diff --git a/src/main/java/biomesoplenty/common/blocks/BlockAsh.java b/src/main/java/biomesoplenty/common/blocks/BlockAsh.java index 7a4b13b82..628fd7148 100644 --- a/src/main/java/biomesoplenty/common/blocks/BlockAsh.java +++ b/src/main/java/biomesoplenty/common/blocks/BlockAsh.java @@ -20,30 +20,30 @@ public class BlockAsh extends Block public BlockAsh() { //TODO: Material.sand - super(Material.field_151595_p); + super(Material.sand); //TODO: this.setHardness - this.func_149711_c(0.4F); + this.setHardness(0.4F); this.setHarvestLevel("shovel", 0); //TODO setStepSound(Block.soundSandFootstep) - this.func_149672_a(Block.field_149776_m); + this.setStepSound(Block.soundTypeSand); //TODO: this.setCreativeTab() - this.func_149647_a(BiomesOPlenty.tabBiomesOPlenty); + this.setCreativeTab(BiomesOPlenty.tabBiomesOPlenty); } @Override //TODO: registerIcons() - public void func_149651_a(IIconRegister iconRegister) + public void registerBlockIcons(IIconRegister iconRegister) { //TODO: blockIcon - this.field_149761_L = iconRegister.registerIcon("biomesoplenty:ashblock"); + this.blockIcon = iconRegister.registerIcon("biomesoplenty:ashblock"); } @Override //TODO: getCollisionBoundingBoxFromPool - public AxisAlignedBB func_149668_a(World world, int x, int y, int z) + public AxisAlignedBB getCollisionBoundingBoxFromPool(World world, int x, int y, int z) { float yOffset = 0.125F; return AxisAlignedBB.getAABBPool().getAABB(x, y, z, x + 1, y + 1 - yOffset, z + 1); @@ -51,9 +51,9 @@ public class BlockAsh extends Block @Override //TODO: randomDisplayTick() - public void func_149734_b(World world, int x, int y, int z, Random random) + public void randomDisplayTick(World world, int x, int y, int z, Random random) { - super.func_149734_b(world, x, y, z, random); + super.randomDisplayTick(world, x, y, z, random); if (random.nextInt(2) == 0) { @@ -74,7 +74,7 @@ public class BlockAsh extends Block @Override //TODO: onEntityCollidedWithBlock() - public void func_149670_a(World world, int x, int y, int z, Entity entity) + public void onEntityCollidedWithBlock(World world, int x, int y, int z, Entity entity) { if (entity instanceof EntityPlayer) { @@ -92,14 +92,14 @@ public class BlockAsh extends Block //@Override //TODO: getItemDropped() - public Item func_149650_a(int metadata, Random random, int fortune) + public Item getItemDropped(int metadata, Random random, int fortune) { return BOPItemHelper.get("misc"); } @Override //TODO damageDropped() - public int func_149692_a(int meta) + public int damageDropped(int meta) { return 1; } diff --git a/src/main/java/biomesoplenty/common/blocks/BlockBOPAppleLeaves.java b/src/main/java/biomesoplenty/common/blocks/BlockBOPAppleLeaves.java index 63d89d713..bca3506cc 100644 --- a/src/main/java/biomesoplenty/common/blocks/BlockBOPAppleLeaves.java +++ b/src/main/java/biomesoplenty/common/blocks/BlockBOPAppleLeaves.java @@ -35,24 +35,24 @@ public class BlockBOPAppleLeaves extends BlockLeavesBase implements IShearable public BlockBOPAppleLeaves() { //TODO: Material.leaves - super(Material.field_151584_j, false); + super(Material.leaves, false); //TODO: setTickRandomly() - this.func_149675_a(true); + this.setTickRandomly(true); //TODO: this.setHardness - this.func_149711_c(0.2F); + this.setHardness(0.2F); //TODO setStepSound(Block.soundGrassFootstep) - this.func_149672_a(Block.field_149779_h); + this.setStepSound(Block.soundTypeGrass); //TODO: setLightOpacity() - this.func_149713_g(1); + this.setLightOpacity(1); //TODO: this.setCreativeTab() - this.func_149647_a(BiomesOPlenty.tabBiomesOPlenty); + this.setCreativeTab(BiomesOPlenty.tabBiomesOPlenty); } @Override //TODO: registerIcons() - public void func_149651_a(IIconRegister iconRegister) + public void registerBlockIcons(IIconRegister iconRegister) { textures = new IIcon[3][4]; if(Loader.isModLoaded("BetterGrassAndLeavesMod")) @@ -83,33 +83,33 @@ public class BlockBOPAppleLeaves extends BlockLeavesBase implements IShearable @Override //TODO: getIcon() - public IIcon func_149691_a(int side, int meta) + public IIcon getIcon(int side, int meta) { //TODO: isOpaqueCube() - return textures[(!func_149662_c() ? 0 : 1)][meta & 3]; + return textures[(!isOpaqueCube() ? 0 : 1)][meta & 3]; } @Override //TODO: isOpaqueCube() - public boolean func_149662_c() + public boolean isOpaqueCube() { //TODO: isOpaqueCube() - return Blocks.leaves.func_149662_c(); + return Blocks.leaves.isOpaqueCube(); } @Override //TODO: getSubBlocks() - public void func_149666_a(Item block, CreativeTabs creativeTabs, List list) + public void getSubBlocks(Item block, CreativeTabs creativeTabs, List list) { list.add(new ItemStack(block, 1, 0)); } @Override //TODO: randomDisplayTick() - public void func_149734_b(World world, int x, int y, int z, Random random) + public void randomDisplayTick(World world, int x, int y, int z, Random random) { //TODO: doesBlockHaveSolidTopSurface - if (world.canLightningStrikeAt(x, y + 1, z) && !World.func_147466_a(world, x, y - 1, z) && random.nextInt(15) == 1) + if (world.canLightningStrikeAt(x, y + 1, z) && !World.doesBlockHaveSolidTopSurface(world, x, y - 1, z) && random.nextInt(15) == 1) { double d0 = x + random.nextFloat(); double d1 = y - 0.05D; @@ -118,12 +118,12 @@ public class BlockBOPAppleLeaves extends BlockLeavesBase implements IShearable } //TODO: randomDisplayTick() - super.func_149734_b(world, x, y, z, random); + super.randomDisplayTick(world, x, y, z, random); } @Override //TODO: breakBlock() - public void func_149749_a(World world, int x, int y, int z, Block par5, int par6) + public void breakBlock(World world, int x, int y, int z, Block par5, int par6) { byte radius = 1; int bounds = radius + 1; @@ -137,7 +137,7 @@ public class BlockBOPAppleLeaves extends BlockLeavesBase implements IShearable for (int k = -radius; k <= radius; ++k) { //TODO: getBlock() - Block block = world.func_147439_a(x + i, y + j, z + k); + Block block = world.getBlock(x + i, y + j, z + k); if (block.isLeaves(world, x, y, z)) { @@ -151,7 +151,7 @@ public class BlockBOPAppleLeaves extends BlockLeavesBase implements IShearable @Override //TODO: updateTick() - public void func_149674_a(World world, int x, int y, int z, Random random) + public void updateTick(World world, int x, int y, int z, Random random) { if (world.isRemote) return; @@ -162,7 +162,7 @@ public class BlockBOPAppleLeaves extends BlockLeavesBase implements IShearable if ((meta & 3) < 3) { //TODO: setBlock() - world.func_147465_d(x, y, z, this, ++meta, 3); + world.setBlock(x, y, z, this, ++meta, 3); } if ((meta & 8) != 0/* && (meta & 4) == 0*/) @@ -193,7 +193,7 @@ public class BlockBOPAppleLeaves extends BlockLeavesBase implements IShearable for (j2 = -b0; j2 <= b0; ++j2) { //TODO: world.getBlock() - Block block = world.func_147439_a(x + l1, y + i2, z + j2); + Block block = world.getBlock(x + l1, y + i2, z + j2); if (block != null && block.canSustainLeaves(world, x + l1, y + i2, z + j2)) { @@ -273,21 +273,21 @@ public class BlockBOPAppleLeaves extends BlockLeavesBase implements IShearable private void removeLeaves(World world, int x, int y, int z) { //TODO: dropBlockAsItem - this.func_149697_b(world, x, y, z, world.getBlockMetadata(x, y, z), 0); + this.dropBlockAsItem(world, x, y, z, world.getBlockMetadata(x, y, z), 0); //TODO: setBlockToAir - world.func_147468_f(x, y, z); + world.setBlockToAir(x, y, z); } @Override //TODO: onBlockActivated - public boolean func_149727_a(World world, int x, int y, int z, EntityPlayer player, int side, float hitVecX, float hitVecY, float hitVecZ) + public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer player, int side, float hitVecX, float hitVecY, float hitVecZ) { int meta = world.getBlockMetadata(x, y, z); if ((meta & 3) == 3) { //TODO: setBlock - world.func_147465_d(x, y, z, this, meta - 3, 3); + world.setBlock(x, y, z, this, meta - 3, 3); EntityItem entityitem = new EntityItem(world, x, y, z, new ItemStack(Items.apple, 1, 0)); @@ -304,28 +304,28 @@ public class BlockBOPAppleLeaves extends BlockLeavesBase implements IShearable @Override //TODO: getItemDropped() - public Item func_149650_a(int metadata, Random random, int fortune) + public Item getItemDropped(int metadata, Random random, int fortune) { - return Item.func_150898_a(BOPBlockHelper.get("saplings")); + return Item.getItemFromBlock(BOPBlockHelper.get("saplings")); } @Override //TODO damageDropped() - public int func_149692_a(int meta) + public int damageDropped(int meta) { return 0; } @Override //TODO: quantityDropped() - public int func_149745_a(Random random) + public int quantityDropped(Random random) { return random.nextInt(20) == 0 ? 1 : 0; } @Override //TODO: dropBlockAsItemWithChance() - public void func_149690_a(World world, int x, int y, int z, int metadata, float chance, int fortune) + public void dropBlockAsItemWithChance(World world, int x, int y, int z, int metadata, float chance, int fortune) { if (world.isRemote) return; @@ -333,19 +333,19 @@ public class BlockBOPAppleLeaves extends BlockLeavesBase implements IShearable if (world.rand.nextInt(20) == 0) { //TODO: getItemDropped() - Item item = this.func_149650_a(metadata, world.rand, fortune); + Item item = this.getItemDropped(metadata, world.rand, fortune); //TODO:dropBlockAsItem_do damageDropped() - this.func_149642_a(world, x, y, z, new ItemStack(item, 1, this.func_149692_a(metadata))); + this.dropBlockAsItem(world, x, y, z, new ItemStack(item, 1, this.damageDropped(metadata))); } //TODO: dropBlockAsItem_do - if ((metadata & 3) == 3) this.func_149642_a(world, x, y, z, new ItemStack(Items.apple, 1, 0)); + if ((metadata & 3) == 3) this.dropBlockAsItem(world, x, y, z, new ItemStack(Items.apple, 1, 0)); //TODO: dropBlockAsItem_do - else if ((metadata & 3) == 2 && world.rand.nextInt(16) == 0) this.func_149642_a(world, x, y, z, new ItemStack(Items.apple, 1, 0)); + else if ((metadata & 3) == 2 && world.rand.nextInt(16) == 0) this.dropBlockAsItem(world, x, y, z, new ItemStack(Items.apple, 1, 0)); //TODO: dropBlockAsItem_do - else if ((metadata & 3) == 1 && world.rand.nextInt(48) == 0) this.func_149642_a(world, x, y, z, new ItemStack(Items.apple, 1, 0)); + else if ((metadata & 3) == 1 && world.rand.nextInt(48) == 0) this.dropBlockAsItem(world, x, y, z, new ItemStack(Items.apple, 1, 0)); //TODO: dropBlockAsItem_do - else if ((metadata & 3) == 0 && world.rand.nextInt(80) == 0) this.func_149642_a(world, x, y, z, new ItemStack(Items.apple, 1, 0)); + else if ((metadata & 3) == 0 && world.rand.nextInt(80) == 0) this.dropBlockAsItem(world, x, y, z, new ItemStack(Items.apple, 1, 0)); } @Override @@ -364,7 +364,7 @@ public class BlockBOPAppleLeaves extends BlockLeavesBase implements IShearable @Override //TODO shouldSideBeRendered - public boolean func_149646_a(IBlockAccess world, int x, int y, int z, int side) + public boolean shouldSideBeRendered(IBlockAccess world, int x, int y, int z, int side) { return true; } diff --git a/src/main/java/biomesoplenty/common/blocks/BlockBOPColorizedLeaves.java b/src/main/java/biomesoplenty/common/blocks/BlockBOPColorizedLeaves.java index 6023280e0..07753fd1f 100644 --- a/src/main/java/biomesoplenty/common/blocks/BlockBOPColorizedLeaves.java +++ b/src/main/java/biomesoplenty/common/blocks/BlockBOPColorizedLeaves.java @@ -47,26 +47,26 @@ public class BlockBOPColorizedLeaves extends BlockLeavesBase implements IShearab public BlockBOPColorizedLeaves(ColourizedLeafCategory cat) { //TODO: Material.leaves - super(Material.field_151584_j, false); + super(Material.leaves, false); this.category = cat; //TODO: setTickRandomly() - this.func_149675_a(true); + this.setTickRandomly(true); //TODO: this.setHardness - this.func_149711_c(0.2F); + this.setHardness(0.2F); //TODO setStepSound(Block.soundGrassFootstep) - this.func_149672_a(Block.field_149779_h); + this.setStepSound(Block.soundTypeGrass); //TODO: setLightOpacity() - this.func_149713_g(1); + this.setLightOpacity(1); //TODO: this.setCreativeTab() - this.func_149647_a(BiomesOPlenty.tabBiomesOPlenty); + this.setCreativeTab(BiomesOPlenty.tabBiomesOPlenty); } @Override //TODO: registerIcons() - public void func_149651_a(IIconRegister iconRegister) + public void registerBlockIcons(IIconRegister iconRegister) { textures = new IIcon[3][leaves.length]; @@ -103,7 +103,7 @@ public class BlockBOPColorizedLeaves extends BlockLeavesBase implements IShearab @Override //TODO: getBlockColor() - public int func_149635_D() + public int getBlockColor() { double temperature = 0.5D; double humidity = 1.0D; @@ -112,7 +112,7 @@ public class BlockBOPColorizedLeaves extends BlockLeavesBase implements IShearab @Override //TODO: getRenderColor() - public int func_149741_i(int par1) + public int getRenderColor(int par1) { switch (par1) { @@ -123,7 +123,7 @@ public class BlockBOPColorizedLeaves extends BlockLeavesBase implements IShearab @Override //TODO: colorMultiplier() - public int func_149720_d(IBlockAccess world, int x, int y, int z) + public int colorMultiplier(IBlockAccess world, int x, int y, int z) { int var6 = 0; int var7 = 0; @@ -134,7 +134,7 @@ public class BlockBOPColorizedLeaves extends BlockLeavesBase implements IShearab for (int var10 = -1; var10 <= 1; ++var10) { //TODO: getBiomeFoliageColor() - int var11 = world.getBiomeGenForCoords(x + var10, z + var9).func_150571_c(x + var10, y, z + var9); + int var11 = world.getBiomeGenForCoords(x + var10, z + var9).getBiomeFoliageColor(x + var10, y, z + var9); var6 += (var11 & 16711680) >> 16; var7 += (var11 & 65280) >> 8; var8 += var11 & 255; @@ -146,24 +146,24 @@ public class BlockBOPColorizedLeaves extends BlockLeavesBase implements IShearab @Override //TODO: getIcon() - public IIcon func_149691_a(int side, int metadata) + public IIcon getIcon(int side, int metadata) { int type = getTypeFromMeta(metadata) + (category.ordinal() * 4); //TODO: isOpaqueCube() - return textures[(!func_149662_c() ? 0 : 1)][type >= leaves.length ? 0 : type]; + return textures[(!isOpaqueCube() ? 0 : 1)][type >= leaves.length ? 0 : type]; } @Override //TODO: isOpaqueCube() - public boolean func_149662_c() + public boolean isOpaqueCube() { //TODO: isOpaqueCube() - return Blocks.leaves.func_149662_c(); + return Blocks.leaves.isOpaqueCube(); } @Override //TODO: getSubBlocks() - public void func_149666_a(Item block, CreativeTabs creativeTabs, List list) + public void getSubBlocks(Item block, CreativeTabs creativeTabs, List list) { for (int i = 0; i < 4; ++i) { @@ -176,10 +176,10 @@ public class BlockBOPColorizedLeaves extends BlockLeavesBase implements IShearab @Override //TODO: randomDisplayTick() - public void func_149734_b(World world, int x, int y, int z, Random random) + public void randomDisplayTick(World world, int x, int y, int z, Random random) { //TODO: doesBlockHaveSolidTopSurface - if (world.canLightningStrikeAt(x, y + 1, z) && !World.func_147466_a(world, x, y - 1, z) && random.nextInt(15) == 1) + if (world.canLightningStrikeAt(x, y + 1, z) && !World.doesBlockHaveSolidTopSurface(world, x, y - 1, z) && random.nextInt(15) == 1) { double d0 = x + random.nextFloat(); double d1 = y - 0.05D; @@ -188,12 +188,12 @@ public class BlockBOPColorizedLeaves extends BlockLeavesBase implements IShearab } //TODO: randomDisplayTick() - super.func_149734_b(world, x, y, z, random); + super.randomDisplayTick(world, x, y, z, random); } @Override //TODO: breakBlock() - public void func_149749_a(World world, int x, int y, int z, Block par5, int par6) + public void breakBlock(World world, int x, int y, int z, Block par5, int par6) { byte radius = 1; int bounds = radius + 1; @@ -207,7 +207,7 @@ public class BlockBOPColorizedLeaves extends BlockLeavesBase implements IShearab for (int k = -radius; k <= radius; ++k) { //TODO: getBlock() - Block block = world.func_147439_a(x + i, y + j, z + k); + Block block = world.getBlock(x + i, y + j, z + k); if (block.isLeaves(world, x, y, z)) { @@ -221,7 +221,7 @@ public class BlockBOPColorizedLeaves extends BlockLeavesBase implements IShearab @Override //TODO: updateTick() - public void func_149674_a(World world, int x, int y, int z, Random random) + public void updateTick(World world, int x, int y, int z, Random random) { if (world.isRemote) return; @@ -256,7 +256,7 @@ public class BlockBOPColorizedLeaves extends BlockLeavesBase implements IShearab for (j2 = -b0; j2 <= b0; ++j2) { //TODO: world.getBlock() - Block block = world.func_147439_a(x + l1, y + i2, z + j2); + Block block = world.getBlock(x + l1, y + i2, z + j2); if (block != null && block.canSustainLeaves(world, x + l1, y + i2, z + j2)) { @@ -336,36 +336,36 @@ public class BlockBOPColorizedLeaves extends BlockLeavesBase implements IShearab private void removeLeaves(World world, int x, int y, int z) { //TODO: dropBlockAsItem - this.func_149697_b(world, x, y, z, world.getBlockMetadata(x, y, z), 0); + this.dropBlockAsItem(world, x, y, z, world.getBlockMetadata(x, y, z), 0); //TODO: setBlockToAir - world.func_147468_f(x, y, z); + world.setBlockToAir(x, y, z); } @Override //TODO: getItemDropped() - public Item func_149650_a(int metadata, Random random, int fortune) + public Item getItemDropped(int metadata, Random random, int fortune) { //TODO: getItemFromBlock() - return Item.func_150898_a(BOPBlockHelper.get("colorizedSaplings")); + return Item.getItemFromBlock(BOPBlockHelper.get("colorizedSaplings")); } @Override //TODO damageDropped() - public int func_149692_a(int meta) + public int damageDropped(int meta) { return getTypeFromMeta(meta) + category.ordinal() * 4; } @Override //TODO: getDamageValue() - public int func_149643_k(World world, int x, int y, int z) + public int getDamageValue(World world, int x, int y, int z) { return getTypeFromMeta(world.getBlockMetadata(x, y, z)); } @Override //TODO: quantityDropped() - public int func_149745_a(Random random) + public int quantityDropped(Random random) { return random.nextInt(20) == 0 ? 1 : 0; } @@ -401,7 +401,7 @@ public class BlockBOPColorizedLeaves extends BlockLeavesBase implements IShearab @Override //TODO shouldSideBeRendered - public boolean func_149646_a(IBlockAccess world, int x, int y, int z, int side) + public boolean shouldSideBeRendered(IBlockAccess world, int x, int y, int z, int side) { return true; } diff --git a/src/main/java/biomesoplenty/common/blocks/BlockBOPColorizedSapling.java b/src/main/java/biomesoplenty/common/blocks/BlockBOPColorizedSapling.java index 1c31815ef..2429445c7 100644 --- a/src/main/java/biomesoplenty/common/blocks/BlockBOPColorizedSapling.java +++ b/src/main/java/biomesoplenty/common/blocks/BlockBOPColorizedSapling.java @@ -33,18 +33,18 @@ public class BlockBOPColorizedSapling extends BlockSapling public BlockBOPColorizedSapling() { //TODO: this.setHardness - this.func_149711_c(0.0F); + this.setHardness(0.0F); //TODO setStepSound(Block.soundGrassFootstep) - this.func_149672_a(Block.field_149779_h); + this.setStepSound(Block.soundTypeGrass); //TODO: this.setCreativeTab() - this.func_149647_a(BiomesOPlenty.tabBiomesOPlenty); + this.setCreativeTab(BiomesOPlenty.tabBiomesOPlenty); } @Override //TODO: registerIcons() - public void func_149651_a(IIconRegister iconRegister) + public void registerBlockIcons(IIconRegister iconRegister) { textures = new IIcon[saplings.length]; @@ -56,7 +56,7 @@ public class BlockBOPColorizedSapling extends BlockSapling @Override //TODO: getIcon() - public IIcon func_149691_a(int side, int meta) + public IIcon getIcon(int side, int meta) { if (meta < 0 || meta >= saplings.length) { @@ -68,7 +68,7 @@ public class BlockBOPColorizedSapling extends BlockSapling @Override //TODO: getSubBlocks() - public void func_149666_a(Item block, CreativeTabs creativeTabs, List list) + public void getSubBlocks(Item block, CreativeTabs creativeTabs, List list) { for (int i = 0; i < saplings.length; ++i) { list.add(new ItemStack(block, 1, i)); @@ -77,10 +77,10 @@ public class BlockBOPColorizedSapling extends BlockSapling @Override //TODO: canPlaceBlockOnSide - public boolean func_149707_d(World world, int x, int y, int z, int side) + public boolean canPlaceBlockOnSide(World world, int x, int y, int z, int side) { //TODO: getBlock() - Block block = world.func_147439_a(x, y - 1, z); + Block block = world.getBlock(x, y - 1, z); int meta = world.getBlockMetadata(x, y - 1, z); switch (meta) @@ -95,10 +95,10 @@ public class BlockBOPColorizedSapling extends BlockSapling @Override //TODO: canBlockStay() - public boolean func_149718_j(World world, int x, int y, int z) + public boolean canBlockStay(World world, int x, int y, int z) { //TODO: getBlock() - Block soil = world.func_147439_a(x, y - 1, z); + Block soil = world.getBlock(x, y - 1, z); if (world.getBlockMetadata(x, y, z) != 1) return (world.getFullBlockLightValue(x, y, z) >= 8 || world.canBlockSeeTheSky(x, y, z)) && @@ -110,7 +110,7 @@ public class BlockBOPColorizedSapling extends BlockSapling @Override //TODO: updateTick() - public void func_149674_a(World world, int x, int y, int z, Random random) + public void updateTick(World world, int x, int y, int z, Random random) { if (!world.isRemote) { @@ -171,26 +171,26 @@ public class BlockBOPColorizedSapling extends BlockSapling if (obj != null) { //TODO: setBlockToAir() - world.func_147468_f(x, y, z); + world.setBlockToAir(x, y, z); if (!((WorldGenerator)obj).generate(world, random, x, y, z)) { //TODO: setBlock() - world.func_147465_d(x, y, z, this, meta, 2); + world.setBlock(x, y, z, this, meta, 2); } } } @Override //TODO damageDropped() - public int func_149692_a(int meta) + public int damageDropped(int meta) { return meta & TYPES; } @Override //TODO: getDamageValue() - public int func_149643_k(World world, int x, int y, int z) + public int getDamageValue(World world, int x, int y, int z) { return world.getBlockMetadata(x, y, z) & TYPES; } diff --git a/src/main/java/biomesoplenty/common/blocks/BlockBOPCoral.java b/src/main/java/biomesoplenty/common/blocks/BlockBOPCoral.java index 4c0946ba3..6ead05203 100644 --- a/src/main/java/biomesoplenty/common/blocks/BlockBOPCoral.java +++ b/src/main/java/biomesoplenty/common/blocks/BlockBOPCoral.java @@ -26,28 +26,28 @@ public class BlockBOPCoral extends BOPBlockWorldDecor public BlockBOPCoral() { //TODO: Material.water - super(Material.field_151586_h); + super(Material.water); //TODO: this.setHardness - this.func_149711_c(0.0F); + this.setHardness(0.0F); //TODO setStepSound(Block.soundGrassFootstep) - this.func_149672_a(Block.field_149779_h); + this.setStepSound(Block.soundTypeGrass); //TODO: setTickRandomly() - this.func_149675_a(true); + this.setTickRandomly(true); float f = 0.4F; //TODO: setBlockBounds - this.func_149676_a(0.5F - f, 0.0F, 0.5F - f, 0.5F + f, 0.8F, 0.5F + f); + this.setBlockBounds(0.5F - f, 0.0F, 0.5F - f, 0.5F + f, 0.8F, 0.5F + f); //TODO: this.setCreativeTab() - this.func_149647_a(BiomesOPlenty.tabBiomesOPlenty); + this.setCreativeTab(BiomesOPlenty.tabBiomesOPlenty); } @Override //TODO: registerIcons() - public void func_149651_a(IIconRegister iconRegister) + public void registerBlockIcons(IIconRegister iconRegister) { textures = new IIcon[coral.length]; @@ -58,7 +58,7 @@ public class BlockBOPCoral extends BOPBlockWorldDecor @Override //TODO: getIcon() - public IIcon func_149691_a(int side, int meta) + public IIcon getIcon(int side, int meta) { if (meta < 0 || meta >= textures.length) { @@ -70,7 +70,7 @@ public class BlockBOPCoral extends BOPBlockWorldDecor @Override //TODO getRenderType() - public int func_149645_b() + public int getRenderType() { return 1; } @@ -78,7 +78,7 @@ public class BlockBOPCoral extends BOPBlockWorldDecor @Override @SideOnly(Side.CLIENT) //TODO: getSubBlocks() - public void func_149666_a(Item block, CreativeTabs creativeTabs, List list) + public void getSubBlocks(Item block, CreativeTabs creativeTabs, List list) { for (int i = 0; i < coral.length; ++i) { @@ -92,7 +92,7 @@ public class BlockBOPCoral extends BOPBlockWorldDecor public boolean isValidPosition(World world, int x, int y, int z, int metadata) { //TODO: getBlock() - Block block = world.func_147439_a(x, y - 1, z); + Block block = world.getBlock(x, y - 1, z); switch (metadata) { @@ -109,22 +109,22 @@ public class BlockBOPCoral extends BOPBlockWorldDecor @Override //TODO: onNeighborBlockChange() - public void func_149695_a(World world, int x, int y, int z, Block neighborBlock) + public void onNeighborBlockChange(World world, int x, int y, int z, Block neighborBlock) { //TODO: onNeighborBlockChange() - super.func_149695_a(world, x, y, z, neighborBlock); + super.onNeighborBlockChange(world, x, y, z, neighborBlock); //TODO: getBlock() - if (world.getBlockMetadata(x, y, z) == 0 && world.func_147439_a(x, y + 1, z) != this) + if (world.getBlockMetadata(x, y, z) == 0 && world.getBlock(x, y + 1, z) != this) { world.setBlockMetadataWithNotify(x, y, z, 3, 2); } //TODO: getBlock() - if (world.getBlockMetadata(x, y, z) == 1 && world.func_147439_a(x, y + 1, z) != this) + if (world.getBlockMetadata(x, y, z) == 1 && world.getBlock(x, y + 1, z) != this) { //TODO: getBlock() - if (world.func_147439_a(x, y - 1, z) == this) + if (world.getBlock(x, y - 1, z) == this) { world.setBlockMetadataWithNotify(x, y, z, 2, 2); } @@ -133,30 +133,30 @@ public class BlockBOPCoral extends BOPBlockWorldDecor if (world.getBlockMetadata(x, y, z) == 0 || world.getBlockMetadata(x, y, z) == 1 || world.getBlockMetadata(x, y, z) == 2) { //TODO: getBlock() - for (int i = 1; world.func_147439_a(x, y + i, z) == this; i++) + for (int i = 1; world.getBlock(x, y + i, z) == this; i++) { //TODO: canBlockStay() - if (!this.func_149718_j(world, x, y + i, z)) + if (!this.canBlockStay(world, x, y + i, z)) { //TODO: dropBlockAsItem() - this.func_149697_b(world, x, y + i, z, world.getBlockMetadata(x, y + i, z), 0); + this.dropBlockAsItem(world, x, y + i, z, world.getBlockMetadata(x, y + i, z), 0); //TODO: setBlock() - world.func_147465_d(x, y + i, z, Blocks.water, 0, 2); + world.setBlock(x, y + i, z, Blocks.water, 0, 2); } } } //TODO: getBlock() - if (world.func_147439_a(x, y, z) != this) + if (world.getBlock(x, y, z) != this) { //TODO: setBlock() - world.func_147465_d(x, y, z, Blocks.water, 0, 2); + world.setBlock(x, y, z, Blocks.water, 0, 2); } } @Override //TODO damageDropped() - public int func_149692_a(int meta) + public int damageDropped(int meta) { if (meta < 3) { @@ -184,7 +184,7 @@ public class BlockBOPCoral extends BOPBlockWorldDecor @Override //TODO: getDamageValue() - public int func_149643_k(World world, int x, int y, int z) + public int getDamageValue(World world, int x, int y, int z) { int meta = world.getBlockMetadata(x, y, z); @@ -198,7 +198,7 @@ public class BlockBOPCoral extends BOPBlockWorldDecor @Override //TODO: isBlockReplaceable - public boolean func_149742_c(World world, int x, int y, int z) + public boolean canPlaceBlockAt(World world, int x, int y, int z) { if (world.getBlockMetadata(x, y, z) == 10) return true; diff --git a/src/main/java/biomesoplenty/common/blocks/BlockBOPFlower.java b/src/main/java/biomesoplenty/common/blocks/BlockBOPFlower.java index a0b18e90e..85a7c6759 100644 --- a/src/main/java/biomesoplenty/common/blocks/BlockBOPFlower.java +++ b/src/main/java/biomesoplenty/common/blocks/BlockBOPFlower.java @@ -38,28 +38,28 @@ public class BlockBOPFlower extends BOPBlockWorldDecor public BlockBOPFlower() { //TODO: Material.plants - super(Material.field_151585_k); + super(Material.plants); //TODO: this.setHardness - this.func_149711_c(0.0F); + this.setHardness(0.0F); //TODO setStepSound(Block.soundGrassFootstep) - this.func_149672_a(Block.field_149779_h); + this.setStepSound(Block.soundTypeGrass); //TODO: setTickRandomly() - this.func_149675_a(true); + this.setTickRandomly(true); float var4 = 0.2F; //TODO: setBlockBounds - this.func_149676_a(0.5F - var4, 0.0F, 0.5F - var4, 0.5F + var4, var4 * 3.0F, 0.5F + var4); + this.setBlockBounds(0.5F - var4, 0.0F, 0.5F - var4, 0.5F + var4, var4 * 3.0F, 0.5F + var4); //TODO: this.setCreativeTab() - this.func_149647_a(BiomesOPlenty.tabBiomesOPlenty); + this.setCreativeTab(BiomesOPlenty.tabBiomesOPlenty); } @Override //TODO: registerIcons() - public void func_149651_a(IIconRegister iconRegister) + public void registerBlockIcons(IIconRegister iconRegister) { textures = new IIcon[plants.length]; @@ -70,7 +70,7 @@ public class BlockBOPFlower extends BOPBlockWorldDecor @Override //TODO: getIcon() - public IIcon func_149691_a(int side, int meta) + public IIcon getIcon(int side, int meta) { if (meta < 0 || meta >= textures.length) { meta = 0; @@ -81,7 +81,7 @@ public class BlockBOPFlower extends BOPBlockWorldDecor @Override //TODO getRenderType() - public int func_149645_b() + public int getRenderType() { return RenderUtils.foliageModel; } @@ -100,7 +100,7 @@ public class BlockBOPFlower extends BOPBlockWorldDecor @Override //TODO: setBlockBoundsBasedOnState() - public void func_149719_a(IBlockAccess world, int x, int y, int z) + public void setBlockBoundsBasedOnState(IBlockAccess world, int x, int y, int z) { int meta = world.getBlockMetadata(x, y, z); @@ -108,49 +108,49 @@ public class BlockBOPFlower extends BOPBlockWorldDecor { case 0: //TODO: setBlockBounds - this.func_149676_a(0.0F, 0.0F, 0.0F, 1.0F, 0.015625F, 1.0F); + this.setBlockBounds(0.0F, 0.0F, 0.0F, 1.0F, 0.015625F, 1.0F); break; case 5: //TODO: setBlockBounds - this.func_149676_a(0.3F, 0.0F, 0.3F, 0.7F, 0.8F, 0.7F); + this.setBlockBounds(0.3F, 0.0F, 0.3F, 0.7F, 0.8F, 0.7F); break; case 6: //TODO: setBlockBounds - this.func_149676_a(0.3F, 0.0F, 0.3F, 0.7F, 0.6F, 0.7F); + this.setBlockBounds(0.3F, 0.0F, 0.3F, 0.7F, 0.6F, 0.7F); break; case 9: //TODO: setBlockBounds - this.func_149676_a(0.3F, 0.0F, 0.3F, 0.7F, 0.5F, 0.7F); + this.setBlockBounds(0.3F, 0.0F, 0.3F, 0.7F, 0.5F, 0.7F); break; case 10: //TODO: setBlockBounds - this.func_149676_a(0.0F, 0.0F, 0.0F, 0.0F, 0.0F, 0.0F); + this.setBlockBounds(0.0F, 0.0F, 0.0F, 0.0F, 0.0F, 0.0F); break; case 11: //TODO: setBlockBounds - this.func_149676_a(0.3F, 0.0F, 0.3F, 0.7F, 0.4F, 0.7F); + this.setBlockBounds(0.3F, 0.0F, 0.3F, 0.7F, 0.4F, 0.7F); break; case 15: //TODO: setBlockBounds - this.func_149676_a(0.3F, 0.0F, 0.3F, 0.7F, 0.6F, 0.7F); + this.setBlockBounds(0.3F, 0.0F, 0.3F, 0.7F, 0.6F, 0.7F); break; default: //TODO: setBlockBounds - this.func_149676_a(0.1F, 0.0F, 0.1F, 0.9F, 0.8F, 0.9F); + this.setBlockBounds(0.1F, 0.0F, 0.1F, 0.9F, 0.8F, 0.9F); break; } } @Override //TODO: onEntityCollidedWithBlock() - public void func_149670_a(World world, int x, int y, int z, Entity entity) + public void onEntityCollidedWithBlock(World world, int x, int y, int z, Entity entity) { int meta = world.getBlockMetadata(x, y, z); @@ -174,10 +174,10 @@ public class BlockBOPFlower extends BOPBlockWorldDecor @Override //TODO: randomDisplayTick() - public void func_149734_b(World world, int x, int y, int z, Random random) + public void randomDisplayTick(World world, int x, int y, int z, Random random) { //TODO: randomDisplayTick() - super.func_149734_b(world, x, y, z, random); + super.randomDisplayTick(world, x, y, z, random); int meta = world.getBlockMetadata(x, y, z); @@ -197,7 +197,7 @@ public class BlockBOPFlower extends BOPBlockWorldDecor @Override @SideOnly(Side.CLIENT) //TODO: getSubBlocks() - public void func_149666_a(Item block, CreativeTabs creativeTabs, List list) + public void getSubBlocks(Item block, CreativeTabs creativeTabs, List list) { for (int i = 0; i < plants.length; ++i) { @@ -212,7 +212,7 @@ public class BlockBOPFlower extends BOPBlockWorldDecor public boolean isValidPosition(World world, int x, int y, int z, int metadata) { //TODO: getBlock() - Block block = world.func_147439_a(x, y - 1, z); + Block block = world.getBlock(x, y - 1, z); switch (metadata) { @@ -237,28 +237,28 @@ public class BlockBOPFlower extends BOPBlockWorldDecor } @Override //TODO: onNeighborBlockChange() - public void func_149695_a(World world, int x, int y, int z, Block neighborBlock) + public void onNeighborBlockChange(World world, int x, int y, int z, Block neighborBlock) { //TODO: onNeighborBlockChange() - super.func_149695_a(world, x, y, z, neighborBlock); + super.onNeighborBlockChange(world, x, y, z, neighborBlock); //TODO: getBlock() - if (world.getBlockMetadata(x, y, z) == SUNFLOWERTOP && world.func_147439_a(x, y - 1, z) == this && world.getBlockMetadata(x, y - 1, z) != SUNFLOWERBOTTOM) + if (world.getBlockMetadata(x, y, z) == SUNFLOWERTOP && world.getBlock(x, y - 1, z) == this && world.getBlockMetadata(x, y - 1, z) != SUNFLOWERBOTTOM) { //TODO: setBlockToAir() - world.func_147468_f(x, y, z); + world.setBlockToAir(x, y, z); } //TODO: getBlock() - if (world.getBlockMetadata(x, y, z) == SUNFLOWERBOTTOM && world.func_147439_a(x, y + 1, z) != this) + if (world.getBlockMetadata(x, y, z) == SUNFLOWERBOTTOM && world.getBlock(x, y + 1, z) != this) { //TODO: setBlockToAir() - world.func_147468_f(x, y, z); + world.setBlockToAir(x, y, z); } } @Override //TODO: getDamageValue() - public int func_149643_k(World world, int x, int y, int z) + public int getDamageValue(World world, int x, int y, int z) { int meta = world.getBlockMetadata(x, y, z); if (meta == SUNFLOWERTOP) { @@ -269,7 +269,7 @@ public class BlockBOPFlower extends BOPBlockWorldDecor @Override //TODO damageDropped() - public int func_149692_a(int meta) + public int damageDropped(int meta) { if (meta == 14) return 13; else return meta; @@ -286,9 +286,9 @@ public class BlockBOPFlower extends BOPBlockWorldDecor @Override //TODO: harvestBlock() - public void func_149636_a(World world, EntityPlayer player, int x, int y, int z, int meta) + public void harvestBlock(World world, EntityPlayer player, int x, int y, int z, int meta) { - super.func_149636_a(world, player, x, y, z, meta); + super.harvestBlock(world, player, x, y, z, meta); ItemStack equippedItem = player.getCurrentEquippedItem(); @@ -319,7 +319,7 @@ public class BlockBOPFlower extends BOPBlockWorldDecor @Override //TODO: isBlockReplaceable - public boolean func_149742_c(World world, int x, int y, int z) + public boolean canPlaceBlockAt(World world, int x, int y, int z) { if (world.getBlockMetadata(x, y, z) == 10) return true; diff --git a/src/main/java/biomesoplenty/common/blocks/BlockBOPFlower2.java b/src/main/java/biomesoplenty/common/blocks/BlockBOPFlower2.java index 0fd555d6e..86e1659c6 100644 --- a/src/main/java/biomesoplenty/common/blocks/BlockBOPFlower2.java +++ b/src/main/java/biomesoplenty/common/blocks/BlockBOPFlower2.java @@ -31,27 +31,27 @@ public class BlockBOPFlower2 extends BOPBlockWorldDecor public BlockBOPFlower2() { //TODO: Material.plants - super(Material.field_151585_k); + super(Material.plants); //TODO: this.setHardness - this.func_149711_c(0.0F); + this.setHardness(0.0F); //TODO setStepSound(Block.soundGrassFootstep) - this.func_149672_a(Block.field_149779_h); + this.setStepSound(Block.soundTypeGrass); //TODO: setTickRandomly() - this.func_149675_a(true); + this.setTickRandomly(true); float var4 = 0.2F; //TODO: setBlockBounds - this.func_149676_a(0.5F - var4, 0.0F, 0.5F - var4, 0.5F + var4, var4 * 3.0F, 0.5F + var4); + this.setBlockBounds(0.5F - var4, 0.0F, 0.5F - var4, 0.5F + var4, var4 * 3.0F, 0.5F + var4); //TODO: this.setCreativeTab() - this.func_149647_a(BiomesOPlenty.tabBiomesOPlenty); + this.setCreativeTab(BiomesOPlenty.tabBiomesOPlenty); } @Override //TODO: registerIcons() - public void func_149651_a(IIconRegister iconRegister) + public void registerBlockIcons(IIconRegister iconRegister) { textures = new IIcon[plants2.length]; @@ -62,7 +62,7 @@ public class BlockBOPFlower2 extends BOPBlockWorldDecor @Override //TODO: getIcon() - public IIcon func_149691_a(int side, int meta) + public IIcon getIcon(int side, int meta) { if (meta < 0 || meta >= textures.length) { meta = 0; @@ -73,7 +73,7 @@ public class BlockBOPFlower2 extends BOPBlockWorldDecor @Override //TODO getRenderType() - public int func_149645_b() + public int getRenderType() { return 1; } @@ -90,7 +90,7 @@ public class BlockBOPFlower2 extends BOPBlockWorldDecor @Override //TODO: setBlockBoundsBasedOnState() - public void func_149719_a(IBlockAccess world, int x, int y, int z) + public void setBlockBoundsBasedOnState(IBlockAccess world, int x, int y, int z) { int meta = world.getBlockMetadata(x, y, z); @@ -98,14 +98,14 @@ public class BlockBOPFlower2 extends BOPBlockWorldDecor { default: //TODO: setBlockBounds - this.func_149676_a(0.1F, 0.0F, 0.1F, 0.9F, 0.8F, 0.9F); + this.setBlockBounds(0.1F, 0.0F, 0.1F, 0.9F, 0.8F, 0.9F); break; } } @Override //TODO: onEntityCollidedWithBlock() - public void func_149670_a(World world, int x, int y, int z, Entity entity) + public void onEntityCollidedWithBlock(World world, int x, int y, int z, Entity entity) { if (world.getBlockMetadata(x, y, z) == 2) { @@ -120,10 +120,10 @@ public class BlockBOPFlower2 extends BOPBlockWorldDecor @Override //TODO: harvestBlock() - public void func_149636_a(World world, EntityPlayer player, int x, int y, int z, int meta) + public void harvestBlock(World world, EntityPlayer player, int x, int y, int z, int meta) { //TODO: harvestBlock() - super.func_149636_a(world, player, x, y, z, meta); + super.harvestBlock(world, player, x, y, z, meta); ItemStack equippedItem = player.getCurrentEquippedItem(); @@ -148,10 +148,10 @@ public class BlockBOPFlower2 extends BOPBlockWorldDecor @Override //TODO: randomDisplayTick() - public void func_149734_b(World world, int x, int y, int z, Random random) + public void randomDisplayTick(World world, int x, int y, int z, Random random) { //TODO: randomDisplayTick() - super.func_149734_b(world, x, y, z, random); + super.randomDisplayTick(world, x, y, z, random); int meta = world.getBlockMetadata(x, y, z); @@ -171,7 +171,7 @@ public class BlockBOPFlower2 extends BOPBlockWorldDecor @Override @SideOnly(Side.CLIENT) //TODO: getSubBlocks() - public void func_149666_a(Item block, CreativeTabs creativeTabs, List list) + public void getSubBlocks(Item block, CreativeTabs creativeTabs, List list) { for (int i = 0; i < plants2.length; ++i) { @@ -183,7 +183,7 @@ public class BlockBOPFlower2 extends BOPBlockWorldDecor public boolean isValidPosition(World world, int x, int y, int z, int metadata) { //TODO: getBlock() - Block block = world.func_147439_a(x, y - 1, z); + Block block = world.getBlock(x, y - 1, z); switch (metadata) { @@ -200,7 +200,7 @@ public class BlockBOPFlower2 extends BOPBlockWorldDecor @Override //TODO: getDamageValue() - public int func_149643_k(World world, int x, int y, int z) + public int getDamageValue(World world, int x, int y, int z) { int meta = world.getBlockMetadata(x, y, z); @@ -209,7 +209,7 @@ public class BlockBOPFlower2 extends BOPBlockWorldDecor @Override //TODO damageDropped() - public int func_149692_a(int meta) + public int damageDropped(int meta) { return meta & 15; } diff --git a/src/main/java/biomesoplenty/common/blocks/BlockBOPFoliage.java b/src/main/java/biomesoplenty/common/blocks/BlockBOPFoliage.java index 23653222b..44153aa6f 100644 --- a/src/main/java/biomesoplenty/common/blocks/BlockBOPFoliage.java +++ b/src/main/java/biomesoplenty/common/blocks/BlockBOPFoliage.java @@ -53,21 +53,21 @@ public class BlockBOPFoliage extends BlockTallGrass implements IShearable float f = 0.4F; //TODO: this.setHardness - this.func_149711_c(0.0F); + this.setHardness(0.0F); //TODO setStepSound(Block.soundGrassFootstep) - this.func_149672_a(Block.field_149779_h); + this.setStepSound(Block.soundTypeGrass); //TODO: setBlockBounds - this.func_149676_a(0.5F - f, 0.0F, 0.5F - f, 0.5F + f, 0.8F, 0.5F + f); + this.setBlockBounds(0.5F - f, 0.0F, 0.5F - f, 0.5F + f, 0.8F, 0.5F + f); //TODO: this.setCreativeTab() - this.func_149647_a(BiomesOPlenty.tabBiomesOPlenty); + this.setCreativeTab(BiomesOPlenty.tabBiomesOPlenty); } @Override //TODO: registerIcons() - public void func_149651_a(IIconRegister iconRegister) + public void registerBlockIcons(IIconRegister iconRegister) { textures = new IIcon[foliageTypes.length]; @@ -81,7 +81,7 @@ public class BlockBOPFoliage extends BlockTallGrass implements IShearable @Override //TODO: getIcon() - public IIcon func_149691_a(int side, int meta) + public IIcon getIcon(int side, int meta) { if (meta >= textures.length) { meta = 0; @@ -92,7 +92,7 @@ public class BlockBOPFoliage extends BlockTallGrass implements IShearable @Override //TODO: getSubBlocks() - public void func_149666_a(Item block, CreativeTabs creativeTabs, List list) + public void getSubBlocks(Item block, CreativeTabs creativeTabs, List list) { for (int i = 0; i < foliageTypes.length; ++i) { @@ -157,7 +157,7 @@ public class BlockBOPFoliage extends BlockTallGrass implements IShearable public boolean isValidPosition(World world, int x, int y, int z, int metadata) { //TODO: getBlock() - Block block = world.func_147439_a(x, y - 1, z); + Block block = world.getBlock(x, y - 1, z); if (block == Blocks.air) return false; @@ -176,20 +176,20 @@ public class BlockBOPFoliage extends BlockTallGrass implements IShearable @Override //TODO: canReplace() - public boolean func_149705_a(World world, int x, int y, int z, int side, ItemStack itemStack) + public boolean canReplace(World world, int x, int y, int z, int side, ItemStack itemStack) { //TODO: getBlock() - if (world.func_147439_a(x, y - 1, z) == Blocks.air) return false; + if (world.getBlock(x, y - 1, z) == Blocks.air) return false; return (world.getFullBlockLightValue(x, y, z) >= 8 || world.canBlockSeeTheSky(x, y, z)) && this.isValidPosition(world, x, y, z, itemStack.getItemDamage()); } @Override //TODO: randomDisplayTick() - public void func_149734_b(World world, int x, int y, int z, Random random) + public void randomDisplayTick(World world, int x, int y, int z, Random random) { //TODO: randomDisplayTick() - super.func_149734_b(world, x, y, z, random); + super.randomDisplayTick(world, x, y, z, random); int meta = world.getBlockMetadata(x, y, z); int i = 5149489; @@ -209,10 +209,10 @@ public class BlockBOPFoliage extends BlockTallGrass implements IShearable @Override //TODO: updateTick() - public void func_149674_a(World world, int x, int y, int z, Random random) + public void updateTick(World world, int x, int y, int z, Random random) { //TODO: getBlock() - Block block = world.func_147439_a(x, y, z); + Block block = world.getBlock(x, y, z); this.dropIfCantStay(world, x, y, z, new ItemStack(block, 1, world.getBlockMetadata(x, y, z))); } @@ -220,48 +220,48 @@ public class BlockBOPFoliage extends BlockTallGrass implements IShearable public void dropIfCantStay(World world, int x, int y, int z, ItemStack stack) { //TODO: canReplace - if (!this.func_149705_a(world, x, y, z, 0, stack)) + if (!this.canReplace(world, x, y, z, 0, stack)) { //TODO: dropBlockAsItem() - this.func_149697_b(world, x, y, z, world.getBlockMetadata(x, y, z), 0); + this.dropBlockAsItem(world, x, y, z, world.getBlockMetadata(x, y, z), 0); //TODO: setBlockToAir() - world.func_147468_f(x, y, z); + world.setBlockToAir(x, y, z); } } @Override //TODO: onNeighborBlockChange() - public void func_149695_a(World world, int x, int y, int z, Block neighborBlock) + public void onNeighborBlockChange(World world, int x, int y, int z, Block neighborBlock) { //TODO: getBlock() - dropIfCantStay(world, x, y, z, new ItemStack(world.func_147439_a(x, y, z), 1, world.getBlockMetadata(x, y, z))); + dropIfCantStay(world, x, y, z, new ItemStack(world.getBlock(x, y, z), 1, world.getBlockMetadata(x, y, z))); int metadata = world.getBlockMetadata(x, y, z); if (world.getBlockMetadata(x, y, z) == GRASSBOTTOM) { //TODO: getBlock() - if (world.func_147439_a(x, y + 1, z) != this) + if (world.getBlock(x, y + 1, z) != this) { //TODO: setBlock() - world.func_147465_d(x, y, z, Blocks.tallgrass, 1, 2); + world.setBlock(x, y, z, Blocks.tallgrass, 1, 2); } //TODO: getBlock() else if (!this.isValidPosition(world, x, y, z, metadata)) { //TODO: dropBlockAsItem() - this.func_149697_b(world, x, y + 1, z, world.getBlockMetadata(x, y + 1, z), 0); + this.dropBlockAsItem(world, x, y + 1, z, world.getBlockMetadata(x, y + 1, z), 0); //TODO: setBlockToAir() - world.func_147468_f(x, y + 1, z); + world.setBlockToAir(x, y + 1, z); } } - super.func_149695_a(world, x, y, z, neighborBlock); + super.onNeighborBlockChange(world, x, y, z, neighborBlock); } @Override //TODO: onEntityCollidedWithBlock() - public void func_149670_a(World world, int x, int y, int z, Entity entity) + public void onEntityCollidedWithBlock(World world, int x, int y, int z, Entity entity) { int meta = world.getBlockMetadata(x, y, z); @@ -288,7 +288,7 @@ public class BlockBOPFoliage extends BlockTallGrass implements IShearable @Override //TODO: getBlockColor() - public int func_149635_D() + public int getBlockColor() { double var1 = 0.5D; double var3 = 1.0D; @@ -299,35 +299,35 @@ public class BlockBOPFoliage extends BlockTallGrass implements IShearable @Override @SideOnly(Side.CLIENT) //TODO: getRenderColor() - public int func_149741_i(int par1) + public int getRenderColor(int par1) { return ColorizerGrass.getGrassColor(0.5D, 1.0D); } @Override //TODO getRenderType() - public int func_149645_b() + public int getRenderType() { return RenderUtils.foliageModel; } @Override //TODO: colorMultiplier() - public int func_149720_d(IBlockAccess world, int x, int y, int z) + public int colorMultiplier(IBlockAccess world, int x, int y, int z) { if (world.getBlockMetadata(x, y, z) == 9) { //TODO: getBiomeFoliageColor() - return world.getBiomeGenForCoords(x, z).func_150571_c(x, y, z); + return world.getBiomeGenForCoords(x, z).getBiomeFoliageColor(x, y, z); } //TODO: getBiomeGrassColor() - return world.getBiomeGenForCoords(x, z).func_150558_b(x, y, z); + return world.getBiomeGenForCoords(x, z).getBiomeGrassColor(x, y, z); } @Override //TODO: getDamageValue() - public int func_149643_k(World world, int x, int y, int z) + public int getDamageValue(World world, int x, int y, int z) { int meta = world.getBlockMetadata(x, y, z); if (meta == GRASSTOP) { @@ -338,14 +338,14 @@ public class BlockBOPFoliage extends BlockTallGrass implements IShearable @Override //TODO: getItemDropped() - public Item func_149650_a(int metadata, Random random, int fortune) + public Item getItemDropped(int metadata, Random random, int fortune) { return null; } @Override //TODO: getSelectedBoundingBoxFromPool() - public AxisAlignedBB func_149633_g(World world, int x, int y, int z) + public AxisAlignedBB getSelectedBoundingBoxFromPool(World world, int x, int y, int z) { int meta = world.getBlockMetadata(x, y, z); @@ -370,7 +370,7 @@ public class BlockBOPFoliage extends BlockTallGrass implements IShearable @Override //TODO: setBlockBoundsBasedOnState() - public void func_149719_a(IBlockAccess world, int x, int y, int z) + public void setBlockBoundsBasedOnState(IBlockAccess world, int x, int y, int z) { int meta = world.getBlockMetadata(x, y, z); @@ -418,19 +418,19 @@ public class BlockBOPFoliage extends BlockTallGrass implements IShearable } //TODO: setBlockBounds() - this.func_149676_a(minX, minY, minZ, maxX, maxY, maxZ); + this.setBlockBounds(minX, minY, minZ, maxX, maxY, maxZ); } @Override //TODO: onBlockActivated - public boolean func_149727_a(World world, int x, int y, int z, EntityPlayer player, int side, float hitVecX, float hitVecY, float hitVecZ) + public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer player, int side, float hitVecX, float hitVecY, float hitVecZ) { int meta = world.getBlockMetadata(x, y, z); if (meta == 8) { //TODO: setBlock() - world.func_147465_d(x, y, z, this, 4, 3); + world.setBlock(x, y, z, this, 4, 3); EntityItem entityitem = new EntityItem(world, x, y, z, new ItemStack(BOPItemHelper.get("food"), 1, 0)); diff --git a/src/main/java/biomesoplenty/common/blocks/BlockBOPGems.java b/src/main/java/biomesoplenty/common/blocks/BlockBOPGems.java index ebae16b9d..babce6b09 100644 --- a/src/main/java/biomesoplenty/common/blocks/BlockBOPGems.java +++ b/src/main/java/biomesoplenty/common/blocks/BlockBOPGems.java @@ -23,8 +23,8 @@ public class BlockBOPGems extends Block public BlockBOPGems() { - //TODO: Material.rock - super(Material.field_151576_e); + //TODO: Material.rock + super(Material.rock); this.setHarvestLevel("pickaxe", 3, 0); @@ -33,16 +33,16 @@ public class BlockBOPGems extends Block this.setHarvestLevel("pickaxe", 2, i); } - //TODO setStepSound(Block.soundStoneFootstep) - this.func_149672_a(Block.field_149780_i); + //TODO setStepSound(Block.soundStoneFootstep) + this.setStepSound(Block.soundTypePiston); //TODO: this.setCreativeTab() - this.func_149647_a(BiomesOPlenty.tabBiomesOPlenty); + this.setCreativeTab(BiomesOPlenty.tabBiomesOPlenty); } @Override - //TODO: registerIcons() - public void func_149651_a(IIconRegister iconRegister) + //TODO: registerIcons() + public void registerBlockIcons(IIconRegister iconRegister) { textures = new IIcon[types.length]; @@ -52,8 +52,8 @@ public class BlockBOPGems extends Block } @Override - //TODO: getIcon() - public IIcon func_149691_a(int side, int meta) + //TODO: getIcon() + public IIcon getIcon(int side, int meta) { if (meta < 0 || meta >= textures.length) { meta = 0; @@ -64,14 +64,14 @@ public class BlockBOPGems extends Block @Override //TODO: getDamageValue() - public int func_149643_k(World world, int x, int y, int z) + public int getDamageValue(World world, int x, int y, int z) { return world.getBlockMetadata(x, y, z); } @Override - //TODO: getSubBlocks() - public void func_149666_a(Item block, CreativeTabs creativeTabs, List list) + //TODO: getSubBlocks() + public void getSubBlocks(Item block, CreativeTabs creativeTabs, List list) { for (int i = 0; i < types.length; ++i) { @@ -81,7 +81,7 @@ public class BlockBOPGems extends Block @Override //TODO: getBlockHardness() - public float func_149712_f(World world, int x, int y, int z) + public float getBlockHardness(World world, int x, int y, int z) { int meta = world.getBlockMetadata(x, y, z); @@ -97,16 +97,16 @@ public class BlockBOPGems extends Block } @Override - //TODO: getItemDropped() - public Item func_149650_a(int metadata, Random random, int fortune) + //TODO: getItemDropped() + public Item getItemDropped(int metadata, Random random, int fortune) { //TODO: getItemFromBlock() - return (metadata % 2 == 0) ? BOPItemHelper.get("gems") : Item.func_150898_a(this); + return (metadata % 2 == 0) ? BOPItemHelper.get("gems") : Item.getItemFromBlock(this); } @Override - //TODO damageDropped() - public int func_149692_a(int meta) + //TODO damageDropped() + public int damageDropped(int meta) { if (meta == 0) { @@ -172,15 +172,15 @@ public class BlockBOPGems extends Block public int quantityDropped(int meta, int fortune, Random random) { //TODO: quantityDroppedWithBonus() - return (meta % 2 == 0) ? func_149679_a(fortune, random) : 1; + return (meta % 2 == 0) ? quantityDroppedWithBonus(fortune, random) : 1; } @Override //TODO: quantityDroppedWithBonus() - public int func_149679_a(int bonus, Random random) + public int quantityDroppedWithBonus(int bonus, Random random) { //TODO: getItemForBlock() getItem() - if (bonus > 0 && Item.func_150898_a(this) != this.func_149650_a(0, random, bonus)) + if (bonus > 0 && Item.getItemFromBlock(this) != this.getItemDropped(0, random, bonus)) { int rnd = random.nextInt(bonus + 2) - 1; @@ -189,25 +189,25 @@ public class BlockBOPGems extends Block } //TODO: quantityDropped() - return this.func_149745_a(random) * (rnd + 1); + return this.quantityDropped(random) * (rnd + 1); } else - return this.func_149745_a(random); + return this.quantityDropped(random); } @Override //TODO: dropBlockAsItemWithChance() - public void func_149690_a(World world, int x, int y, int z, int metadata, float chance, int fortune) + public void dropBlockAsItemWithChance(World world, int x, int y, int z, int metadata, float chance, int fortune) { //TODO: dropBlockAsItemWithChance() - super.func_149690_a(world, x, y, z, metadata, chance, fortune); + super.dropBlockAsItemWithChance(world, x, y, z, metadata, chance, fortune); //TODO: getItemDropped() getItemFromBlock() - if (this.func_149650_a(metadata, world.rand, fortune) != Item.func_150898_a(this)) + if (this.getItemDropped(metadata, world.rand, fortune) != Item.getItemFromBlock(this)) { int var8 = MathHelper.getRandomIntegerInRange(world.rand, 3, 7); //TODO: dropXpOnBlockBreak() - this.func_149657_c(world, x, y, z, var8); + this.dropXpOnBlockBreak(world, x, y, z, var8); } } } diff --git a/src/main/java/biomesoplenty/common/blocks/BlockBOPGeneric.java b/src/main/java/biomesoplenty/common/blocks/BlockBOPGeneric.java index 4b8363e3e..1277c0c90 100644 --- a/src/main/java/biomesoplenty/common/blocks/BlockBOPGeneric.java +++ b/src/main/java/biomesoplenty/common/blocks/BlockBOPGeneric.java @@ -26,81 +26,81 @@ public class BlockBOPGeneric extends Block this.type = type; //TODO: this.setCreativeTab() - this.func_149647_a(BiomesOPlenty.tabBiomesOPlenty); + this.setCreativeTab(BiomesOPlenty.tabBiomesOPlenty); switch (type) { case ASH_STONE: //TODO: this.setHardness - this.func_149711_c(1.0F); + this.setHardness(1.0F); //TODO setStepSound(Block.soundStoneFootstep) - this.func_149672_a(Block.field_149780_i); + this.setStepSound(Block.soundTypePiston); break; case CRAG_ROCK: //TODO: this.setHardness - this.func_149711_c(1.0F); + this.setHardness(1.0F); //TODO setStepSound(Block.soundGravelFootstep) - this.func_149672_a(field_149767_g); + this.setStepSound(soundTypeGravel); break; case DRIED_DIRT: //TODO: this.setHardness - this.func_149711_c(0.1F); + this.setHardness(0.1F); this.setHarvestLevel("pickaxe", 0); //TODO setStepSound(Block.soundStoneFootstep) - this.func_149672_a(Block.field_149780_i); + this.setStepSound(Block.soundTypePiston); break; case HARD_DIRT: //TODO: this.setHardness - this.func_149711_c(0.9F); + this.setHardness(0.9F); //TODO setStepSound(Block.soundStoneFootstep) - this.func_149672_a(Block.field_149780_i); + this.setStepSound(Block.soundTypePiston); break; case HARD_ICE: //TODO: this.setHardness - this.func_149711_c(0.75F); + this.setHardness(0.75F); //TODO setStepSound(Block.soundStoneFootstep) - this.func_149672_a(Block.field_149780_i); + this.setStepSound(Block.soundTypePiston); break; case HARD_SAND: //TODO: this.setHardness - this.func_149711_c(0.7F); + this.setHardness(0.7F); this.setHarvestLevel("shovel", 0); //TODO setStepSound(Block.soundSandFootstep) - this.func_149672_a(Block.field_149776_m); + this.setStepSound(Block.soundTypeSand); break; case MUD_BRICK: //TODO: this.setHardness - this.func_149711_c(1.0F); + this.setHardness(1.0F); //TODO: this.setResistance - this.func_149752_b(2.0F); + this.setResistance(2.0F); //TODO setStepSound(Block.soundStoneFootstep) - this.func_149672_a(Block.field_149780_i); + this.setStepSound(Block.soundTypePiston); break; case HOLY_DIRT: //TODO: this.setHardness - this.func_149711_c(0.6F); + this.setHardness(0.6F); //TODO setStepSound(Block.soundGravelFootstep) - this.func_149672_a(field_149767_g); + this.setStepSound(soundTypeGravel); break; case CRYSTAL: //TODO: this.setHardness - this.func_149711_c(0.15F); + this.setHardness(0.15F); //TODO: this.setResistance - this.func_149752_b(5.0F); + this.setResistance(5.0F); //TODO: this.setLightValue - this.func_149715_a(1.0F); + this.setLightLevel(1.0F); //TODO setStepSound(Block.soundGravelFootstep) - this.func_149672_a(Block.field_149778_k); + this.setStepSound(Block.soundTypeGlass); break; default: @@ -110,7 +110,7 @@ public class BlockBOPGeneric extends Block @Override //TODO: registerIcons() - public void func_149651_a(IIconRegister iconRegister) + public void registerBlockIcons(IIconRegister iconRegister) { switch (type) { @@ -157,7 +157,7 @@ public class BlockBOPGeneric extends Block @Override //TODO: getItemDropped() - public Item func_149650_a(int metadata, Random random, int fortune) + public Item getItemDropped(int metadata, Random random, int fortune) { switch (type) { @@ -166,13 +166,13 @@ public class BlockBOPGeneric extends Block default: //TODO: getItemForBlock() - return Item.func_150898_a(this); + return Item.getItemFromBlock(this); } } @Override //TODO damageDropped() - public int func_149692_a(int meta) + public int damageDropped(int meta) { switch (type) { @@ -199,7 +199,7 @@ public class BlockBOPGeneric extends Block @Override //TODO: getIcon() - public IIcon func_149691_a(int side, int meta) + public IIcon getIcon(int side, int meta) { return texture; } diff --git a/src/main/java/biomesoplenty/common/blocks/BlockBOPGrass.java b/src/main/java/biomesoplenty/common/blocks/BlockBOPGrass.java index 0befd4f45..c38b2775a 100644 --- a/src/main/java/biomesoplenty/common/blocks/BlockBOPGrass.java +++ b/src/main/java/biomesoplenty/common/blocks/BlockBOPGrass.java @@ -26,46 +26,46 @@ public class BlockBOPGrass extends Block public BlockBOPGrass() { //TODO: Material.grass - super(Material.field_151577_b); + super(Material.grass); //TODO: this.setHardness - this.func_149711_c(0.6F); + this.setHardness(0.6F); this.setHarvestLevel("shovel", 0); - //TODO: setTickRandomly() - this.func_149675_a(true); - //TODO setStepSound(Block.soundGrassFootstep) - this.func_149672_a(Block.field_149779_h); + //TODO: setTickRandomly() + this.setTickRandomly(true); + //TODO setStepSound(Block.soundGrassFootstep) + this.setStepSound(Block.soundTypeGrass); //setLightValue(0.25F); //TODO: this.setCreativeTab() - this.func_149647_a(BiomesOPlenty.tabBiomesOPlenty); + this.setCreativeTab(BiomesOPlenty.tabBiomesOPlenty); } @Override - //TODO: registerIcons() - public void func_149651_a(IIconRegister iconRegister) - { + //TODO: registerIcons() + public void registerBlockIcons(IIconRegister iconRegister) + { this.icon[0][0] = iconRegister.registerIcon("biomesoplenty:holydirt"); - - this.icon[0][1] = iconRegister.registerIcon("biomesoplenty:holygrass_top"); - this.icon[0][2] = iconRegister.registerIcon("biomesoplenty:holygrass_side"); - this.icon[0][3] = iconRegister.registerIcon("biomesoplenty:holygrass_side"); - this.icon[0][4] = iconRegister.registerIcon("biomesoplenty:holygrass_side"); + + this.icon[0][1] = iconRegister.registerIcon("biomesoplenty:holygrass_top"); + this.icon[0][2] = iconRegister.registerIcon("biomesoplenty:holygrass_side"); + this.icon[0][3] = iconRegister.registerIcon("biomesoplenty:holygrass_side"); + this.icon[0][4] = iconRegister.registerIcon("biomesoplenty:holygrass_side"); this.icon[0][5] = iconRegister.registerIcon("biomesoplenty:holygrass_side"); - - this.icon[1][0] = iconRegister.registerIcon("biomesoplenty:smolderinggrass_bottom"); - this.icon[1][1] = iconRegister.registerIcon("biomesoplenty:smolderinggrass_top"); - this.icon[1][2] = iconRegister.registerIcon("biomesoplenty:smolderinggrass_side"); - this.icon[1][3] = iconRegister.registerIcon("biomesoplenty:smolderinggrass_side"); - this.icon[1][4] = iconRegister.registerIcon("biomesoplenty:smolderinggrass_side"); + + this.icon[1][0] = iconRegister.registerIcon("biomesoplenty:smolderinggrass_bottom"); + this.icon[1][1] = iconRegister.registerIcon("biomesoplenty:smolderinggrass_top"); + this.icon[1][2] = iconRegister.registerIcon("biomesoplenty:smolderinggrass_side"); + this.icon[1][3] = iconRegister.registerIcon("biomesoplenty:smolderinggrass_side"); + this.icon[1][4] = iconRegister.registerIcon("biomesoplenty:smolderinggrass_side"); this.icon[1][5] = iconRegister.registerIcon("biomesoplenty:smolderinggrass_side"); } @Override - //TODO: getIcon() - public IIcon func_149691_a(int side, int meta) + //TODO: getIcon() + public IIcon getIcon(int side, int meta) { if (meta < 0 || meta >= this.icon.length) meta = 1; if (side < 0 || side >= this.icon[meta].length) side = 1; @@ -74,8 +74,8 @@ public class BlockBOPGrass extends Block } @Override - //TODO: getSubBlocks() - public void func_149666_a(Item block, CreativeTabs creativeTabs, List list) + //TODO: getSubBlocks() + public void getSubBlocks(Item block, CreativeTabs creativeTabs, List list) { for (int i = 0; i < 2; ++i) { list.add(new ItemStack(block, 1, i)); @@ -83,8 +83,8 @@ public class BlockBOPGrass extends Block } @Override - //TODO damageDropped() - public int func_149692_a(int meta) + //TODO damageDropped() + public int damageDropped(int meta) { return meta; } @@ -106,7 +106,7 @@ public class BlockBOPGrass extends Block @Override //TODO: onBlockPlaced() - public int func_149660_a(World world, int x, int y, int z, int side, float hitX, float hitY, float hitZ, int meta) + public int onBlockPlaced(World world, int x, int y, int z, int side, float hitX, float hitY, float hitZ, int meta) { if (meta == 0) { @@ -127,7 +127,7 @@ public class BlockBOPGrass extends Block @Override //TODO: randomDisplayTick() - public void func_149734_b(World world, int x, int y, int z, Random random) + public void randomDisplayTick(World world, int x, int y, int z, Random random) { if (!world.isRemote) return; @@ -147,17 +147,17 @@ public class BlockBOPGrass extends Block } @Override - //TODO: updateTick() - public void func_149674_a(World world, int x, int y, int z, Random random) + //TODO: updateTick() + public void updateTick(World world, int x, int y, int z, Random random) { if (world.getBlockMetadata(x, y, z) == 0) { if (world.provider.isHellWorld) { //TODO: setBlock() - world.func_147465_d(x, y + 1, z, Blocks.fire, 0, 2); + world.setBlock(x, y + 1, z, Blocks.fire, 0, 2); //TODO: setBlock() - world.func_147465_d(x, y, z, this, 1, 2); + world.setBlock(x, y, z, this, 1, 2); } if (!world.isRemote) @@ -165,7 +165,7 @@ public class BlockBOPGrass extends Block if (world.getBlockLightValue(x, y + 1, z) < 4 && world.getBlockLightOpacity(x, y + 1, z) > 2) { //TODO: setBlock() - world.func_147465_d(x, y, z, BOPBlockHelper.get("holyDirt"), 0, 2); + world.setBlock(x, y, z, BOPBlockHelper.get("holyDirt"), 0, 2); } else if (world.getBlockLightValue(x, y + 1, z) >= 9) { @@ -175,13 +175,13 @@ public class BlockBOPGrass extends Block int rY = y + random.nextInt(5) - 3; int rZ = z + random.nextInt(3) - 1; //TODO: getBlock() - Block block = world.func_147439_a(rX, rY + 1, rZ); + Block block = world.getBlock(rX, rY + 1, rZ); //TODO: getBlock() - if (world.func_147439_a(rX, rY, rZ) == BOPBlockHelper.get("holyDirt") && world.getBlockLightValue(rX, rY + 1, rZ) >= 4 && world.getBlockLightOpacity(rX, rY + 1, rZ) <= 2) + if (world.getBlock(rX, rY, rZ) == BOPBlockHelper.get("holyDirt") && world.getBlockLightValue(rX, rY + 1, rZ) >= 4 && world.getBlockLightOpacity(rX, rY + 1, rZ) <= 2) { //TODO: setBlock() - world.func_147465_d(rX, rY, rZ, BOPBlockHelper.get("grass"), 0, 2); + world.setBlock(rX, rY, rZ, BOPBlockHelper.get("grass"), 0, 2); } } } @@ -190,8 +190,8 @@ public class BlockBOPGrass extends Block } @Override - //TODO: getCollisionBoundingBoxFromPool - public AxisAlignedBB func_149668_a(World world, int x, int y, int z) + //TODO: getCollisionBoundingBoxFromPool + public AxisAlignedBB getCollisionBoundingBoxFromPool(World world, int x, int y, int z) { if (world.getBlockMetadata(x, y, z) == 1) { @@ -200,12 +200,12 @@ public class BlockBOPGrass extends Block } //TODO: getCollisionBoundingBoxFromPool() - return super.func_149668_a(world, x, y, z); + return super.getCollisionBoundingBoxFromPool(world, x, y, z); } @Override - //TODO: onEntityCollidedWithBlock() - public void func_149670_a(World world, int x, int y, int z, Entity entity) + //TODO: onEntityCollidedWithBlock() + public void onEntityCollidedWithBlock(World world, int x, int y, int z, Entity entity) { if (world.getBlockMetadata(x, y, z) == 1) { entity.setFire(2); @@ -213,11 +213,11 @@ public class BlockBOPGrass extends Block } @Override - //TODO: getItemDropped() - public Item func_149650_a(int metadata, Random random, int fortune) + //TODO: getItemDropped() + public Item getItemDropped(int metadata, Random random, int fortune) { //TODO: getItemFromBlock() getItemFromBlock() - return metadata == 0 ? Item.func_150898_a(BOPBlockHelper.get("holyDirt")) : Item.func_150898_a(Blocks.dirt); + return metadata == 0 ? Item.getItemFromBlock(BOPBlockHelper.get("holyDirt")) : Item.getItemFromBlock(Blocks.dirt); } } diff --git a/src/main/java/biomesoplenty/common/blocks/BlockBOPLeaves.java b/src/main/java/biomesoplenty/common/blocks/BlockBOPLeaves.java index add085d5d..cfb5a6da5 100644 --- a/src/main/java/biomesoplenty/common/blocks/BlockBOPLeaves.java +++ b/src/main/java/biomesoplenty/common/blocks/BlockBOPLeaves.java @@ -65,28 +65,28 @@ public class BlockBOPLeaves extends BlockLeavesBase implements IShearable public BlockBOPLeaves(LeafCategory cat) { //TODO: Material.leaves - super(Material.field_151584_j, false); + super(Material.leaves, false); category = cat; //TODO: this.setHardness - this.func_149711_c(0.2F); + this.setHardness(0.2F); //TODO setStepSound(Block.soundGrassFootstep) - this.func_149672_a(Block.field_149779_h); + this.setStepSound(Block.soundTypeGrass); //TODO: setTickRandomly() - this.func_149675_a(true); + this.setTickRandomly(true); //TODO: setLightOpacity() - this.func_149713_g(1); + this.setLightOpacity(1); //TODO: this.setCreativeTab() - this.func_149647_a(BiomesOPlenty.tabBiomesOPlenty); + this.setCreativeTab(BiomesOPlenty.tabBiomesOPlenty); } @Override //TODO: registerIcons() - public void func_149651_a(IIconRegister iconRegister) + public void registerBlockIcons(IIconRegister iconRegister) { textures = new IIcon[3][leaves.length]; if(Loader.isModLoaded("BetterGrassAndLeavesMod")) @@ -124,24 +124,24 @@ public class BlockBOPLeaves extends BlockLeavesBase implements IShearable @Override //TODO: getIcon() - public IIcon func_149691_a(int side, int metadata) + public IIcon getIcon(int side, int metadata) { int type = getTypeFromMeta(metadata) + (category.ordinal() * 4); //TODO: isOpaqueCube() - return textures[(!func_149662_c() ? 0 : 1)][type >= leaves.length ? 0 : type]; + return textures[(!isOpaqueCube() ? 0 : 1)][type >= leaves.length ? 0 : type]; } @Override //TODO: isOpaqueCube() - public boolean func_149662_c() + public boolean isOpaqueCube() { //TODO: isOpaqueCube() - return Blocks.leaves.func_149662_c(); + return Blocks.leaves.isOpaqueCube(); } @Override //TODO: getSubBlocks() - public void func_149666_a(Item block, CreativeTabs creativeTabs, List list) + public void getSubBlocks(Item block, CreativeTabs creativeTabs, List list) { for (int i = 0; i < 4; ++i) { @@ -154,10 +154,10 @@ public class BlockBOPLeaves extends BlockLeavesBase implements IShearable @Override //TODO: randomDisplayTick() - public void func_149734_b(World world, int x, int y, int z, Random random) + public void randomDisplayTick(World world, int x, int y, int z, Random random) { //TODO: doesBlockHaveSolidTopSurface - if (world.canLightningStrikeAt(x, y + 1, z) && !World.func_147466_a(world, x, y - 1, z) && random.nextInt(15) == 1) + if (world.canLightningStrikeAt(x, y + 1, z) && !World.doesBlockHaveSolidTopSurface(world, x, y - 1, z) && random.nextInt(15) == 1) { double d0 = x + random.nextFloat(); double d1 = y - 0.05D; @@ -166,10 +166,10 @@ public class BlockBOPLeaves extends BlockLeavesBase implements IShearable } //TODO: getBlock() - if (world.func_147439_a(x, y, z) == BOPBlockHelper.get("leaves1") && isType(world.getBlockMetadata(x, y, z), 2)) + if (world.getBlock(x, y, z) == BOPBlockHelper.get("leaves1") && isType(world.getBlockMetadata(x, y, z), 2)) { //TODO: getBlock() - if (!(world.func_147439_a(x, y - 1, z) == BOPBlockHelper.get("leaves1") && isType(world.getBlockMetadata(x, y - 1, z), 2))) + if (!(world.getBlock(x, y - 1, z) == BOPBlockHelper.get("leaves1") && isType(world.getBlockMetadata(x, y - 1, z), 2))) { if (random.nextInt(5) == 0) { @@ -179,7 +179,7 @@ public class BlockBOPLeaves extends BlockLeavesBase implements IShearable } //TODO: randomDisplayTick() - super.func_149734_b(world, x, y, z, random); + super.randomDisplayTick(world, x, y, z, random); } public boolean isType(int metadata, int baseMeta) @@ -194,7 +194,7 @@ public class BlockBOPLeaves extends BlockLeavesBase implements IShearable @Override //TODO: breakBlock() - public void func_149749_a(World world, int x, int y, int z, Block par5, int par6) + public void breakBlock(World world, int x, int y, int z, Block par5, int par6) { byte radius = 1; int bounds = radius + 1; @@ -208,7 +208,7 @@ public class BlockBOPLeaves extends BlockLeavesBase implements IShearable for (int k = -radius; k <= radius; ++k) { //TODO: getBlock() - Block block = world.func_147439_a(x + i, y + j, z + k); + Block block = world.getBlock(x + i, y + j, z + k); if (block.isLeaves(world, x, y, z)) { @@ -222,7 +222,7 @@ public class BlockBOPLeaves extends BlockLeavesBase implements IShearable @Override //TODO: updateTick() - public void func_149674_a(World world, int x, int y, int z, Random random) + public void updateTick(World world, int x, int y, int z, Random random) { if (world.isRemote) return; @@ -257,7 +257,7 @@ public class BlockBOPLeaves extends BlockLeavesBase implements IShearable for (j2 = -b0; j2 <= b0; ++j2) { //TODO: world.getBlock() - Block block = world.func_147439_a(x + l1, y + i2, z + j2); + Block block = world.getBlock(x + l1, y + i2, z + j2); if (block != null && block.canSustainLeaves(world, x + l1, y + i2, z + j2)) { @@ -337,9 +337,9 @@ public class BlockBOPLeaves extends BlockLeavesBase implements IShearable private void removeLeaves(World world, int x, int y, int z) { //TODO: dropBlockAsItem - this.func_149697_b(world, x, y, z, world.getBlockMetadata(x, y, z), 0); + this.dropBlockAsItem(world, x, y, z, world.getBlockMetadata(x, y, z), 0); //TODO: setBlockToAir - world.func_147468_f(x, y, z); + world.setBlockToAir(x, y, z); } @Override @@ -390,15 +390,15 @@ public class BlockBOPLeaves extends BlockLeavesBase implements IShearable @Override //TODO: getItemDropped() - public Item func_149650_a(int metadata, Random random, int fortune) + public Item getItemDropped(int metadata, Random random, int fortune) { //TODO: getItemFromBlock() - return Item.func_150898_a(BOPBlockHelper.get("saplings")); + return Item.getItemFromBlock(BOPBlockHelper.get("saplings")); } @Override //TODO: dropBlockAsItemWithChance() - public void func_149690_a(World world, int x, int y, int z, int metadata, float chance, int fortune) + public void dropBlockAsItemWithChance(World world, int x, int y, int z, int metadata, float chance, int fortune) { if (world.isRemote) return; @@ -406,35 +406,35 @@ public class BlockBOPLeaves extends BlockLeavesBase implements IShearable if (world.rand.nextInt(20) == 0) { //TODO: getItemDropped() - Item item = this.func_149650_a(metadata, world.rand, fortune); + Item item = this.getItemDropped(metadata, world.rand, fortune); //TODO:dropBlockAsItem_do damageDropped() - this.func_149642_a(world, x, y, z, new ItemStack(item, 1, this.func_149692_a(metadata))); + this.dropBlockAsItem(world, x, y, z, new ItemStack(item, 1, this.damageDropped(metadata))); } if (((metadata & 3) == 0 || (metadata & 3) == 4 || (metadata & 3) == 7) && (world.rand.nextInt(50) == 0)) { //TODO:dropBlockAsItem_do - this.func_149642_a(world, x, y, z, new ItemStack(BOPItemHelper.get("food"), 1, 8)); + this.dropBlockAsItem(world, x, y, z, new ItemStack(BOPItemHelper.get("food"), 1, 8)); } } @Override //TODO damageDropped() - public int func_149692_a(int meta) + public int damageDropped(int meta) { return (getTypeFromMeta(meta) + category.ordinal() * 4) + 1; } @Override //TODO: getDamageValue() - public int func_149643_k(World world, int x, int y, int z) + public int getDamageValue(World world, int x, int y, int z) { return getTypeFromMeta(world.getBlockMetadata(x, y, z)); } @Override //TODO: quantityDropped() - public int func_149745_a(Random random) + public int quantityDropped(Random random) { return random.nextInt(20) == 0 ? 1 : 0; } @@ -470,7 +470,7 @@ public class BlockBOPLeaves extends BlockLeavesBase implements IShearable @Override //TODO shouldSideBeRendered - public boolean func_149646_a(IBlockAccess world, int x, int y, int z, int side) + public boolean shouldSideBeRendered(IBlockAccess world, int x, int y, int z, int side) { return true; } diff --git a/src/main/java/biomesoplenty/common/blocks/BlockBOPLog.java b/src/main/java/biomesoplenty/common/blocks/BlockBOPLog.java index 9db58fc5a..e544f92b5 100644 --- a/src/main/java/biomesoplenty/common/blocks/BlockBOPLog.java +++ b/src/main/java/biomesoplenty/common/blocks/BlockBOPLog.java @@ -55,26 +55,26 @@ public class BlockBOPLog extends Block public BlockBOPLog(LogCategory cat) { //TODO: Material.wood - super(Material.field_151575_d); + super(Material.wood); category = cat; //TODO: this.setHardness - this.func_149711_c(2.0F); + this.setHardness(2.0F); this.setHarvestLevel("axe", 0); //TODO: this.setResistance - this.func_149752_b(5.0F); + this.setResistance(5.0F); //TODO setStepSound(Block.soundWoodFootstep) - this.func_149672_a(Block.field_149766_f); + this.setStepSound(Block.soundTypeWood); //TODO: this.setCreativeTab() - this.func_149647_a(BiomesOPlenty.tabBiomesOPlenty); + this.setCreativeTab(BiomesOPlenty.tabBiomesOPlenty); } @Override //TODO: registerIcons() - public void func_149651_a(IIconRegister iconRegister) + public void registerBlockIcons(IIconRegister iconRegister) { textures = new IIcon[types.length]; logHearts = new IIcon[types.length]; @@ -94,7 +94,7 @@ public class BlockBOPLog extends Block @Override //TODO: getIcon() - public IIcon func_149691_a(int side, int meta) + public IIcon getIcon(int side, int meta) { int pos = meta & 12; @@ -106,7 +106,7 @@ public class BlockBOPLog extends Block @Override //TODO: getSubBlocks() - public void func_149666_a(Item block, CreativeTabs creativeTabs, List list) + public void getSubBlocks(Item block, CreativeTabs creativeTabs, List list) { for (int i = 0; i < 4; ++i) { list.add(new ItemStack(this, 1, i)); @@ -115,7 +115,7 @@ public class BlockBOPLog extends Block @Override //TODO: breakBlock() - public void func_149749_a(World world, int x, int y, int z, Block par5, int par6) + public void breakBlock(World world, int x, int y, int z, Block par5, int par6) { byte radius = 4; int bounds = radius + 1; @@ -129,7 +129,7 @@ public class BlockBOPLog extends Block for (int k = -radius; k <= radius; ++k) { //TODO: getBlock() - Block block = world.func_147439_a(x + i, y + j, z + k); + Block block = world.getBlock(x + i, y + j, z + k); if (block.isLeaves(world, x, y, z)) { @@ -143,7 +143,7 @@ public class BlockBOPLog extends Block @Override //TODO: onBlockPlaced() - public int func_149660_a(World world, int x, int y, int z, int side, float hitX, float hitY, float hitZ, int meta) + public int onBlockPlaced(World world, int x, int y, int z, int side, float hitX, float hitY, float hitZ, int meta) { int type = getTypeFromMeta(meta); byte orientation = 0; @@ -209,21 +209,21 @@ public class BlockBOPLog extends Block @Override //TODO: damageDropped() - public int func_149692_a(int meta) + public int damageDropped(int meta) { return getTypeFromMeta(meta); } @Override //TODO: createStackedBlock() - protected ItemStack func_149644_j(int meta) + protected ItemStack createStackedBlock(int meta) { return new ItemStack(this, 1, getTypeFromMeta(meta)); } @Override //TODO getRenderType() - public int func_149645_b() + public int getRenderType() { return 31; } diff --git a/src/main/java/biomesoplenty/common/blocks/BlockBOPMushroom.java b/src/main/java/biomesoplenty/common/blocks/BlockBOPMushroom.java index 83ac26f08..361754194 100644 --- a/src/main/java/biomesoplenty/common/blocks/BlockBOPMushroom.java +++ b/src/main/java/biomesoplenty/common/blocks/BlockBOPMushroom.java @@ -24,29 +24,29 @@ public class BlockBOPMushroom extends BlockBush public BlockBOPMushroom() { //TODO: Material.plants - super(Material.field_151585_k); + super(Material.plants); //TODO: this.setHardness - this.func_149711_c(0.0F); + this.setHardness(0.0F); //TODO setStepSound(Block.soundGrassFootstep) - this.func_149672_a(Block.field_149779_h); + this.setStepSound(Block.soundTypeGrass); //TODO: setTickRandomly() - this.func_149675_a(true); + this.setTickRandomly(true); float var4 = 0.2F; //TODO: setBlockBounds - this.func_149676_a(0.3F, 0.0F, 0.3F, 0.7F, 0.4F, 0.7F); + this.setBlockBounds(0.3F, 0.0F, 0.3F, 0.7F, 0.4F, 0.7F); //TODO: this.setCreativeTab() - this.func_149647_a(BiomesOPlenty.tabBiomesOPlenty); + this.setCreativeTab(BiomesOPlenty.tabBiomesOPlenty); } @Override //TODO: registerIcons() - public void func_149651_a(IIconRegister iconRegister) + public void registerBlockIcons(IIconRegister iconRegister) { textures = new IIcon[plants.length]; @@ -57,7 +57,7 @@ public class BlockBOPMushroom extends BlockBush @Override //TODO: getIcon() - public IIcon func_149691_a(int side, int meta) + public IIcon getIcon(int side, int meta) { if (meta < 0 || meta >= textures.length) { @@ -69,7 +69,7 @@ public class BlockBOPMushroom extends BlockBush @Override //TODO getRenderType() - public int func_149645_b() + public int getRenderType() { return 1; } @@ -86,7 +86,7 @@ public class BlockBOPMushroom extends BlockBush @Override //TODO: setBlockBoundsBasedOnState() - public void func_149719_a(IBlockAccess world, int x, int y, int z) + public void setBlockBoundsBasedOnState(IBlockAccess world, int x, int y, int z) { int meta = world.getBlockMetadata(x, y, z); @@ -94,19 +94,19 @@ public class BlockBOPMushroom extends BlockBush { case 0: //TODO: setBlockBounds - this.func_149676_a(0.3F, 0.0F, 0.3F, 0.7F, 0.4F, 0.7F); + this.setBlockBounds(0.3F, 0.0F, 0.3F, 0.7F, 0.4F, 0.7F); break; default: //TODO: setBlockBounds - this.func_149676_a(0.3F, 0.0F, 0.3F, 0.7F, 0.4F, 0.7F); + this.setBlockBounds(0.3F, 0.0F, 0.3F, 0.7F, 0.4F, 0.7F); break; } } @Override //TODO: getSubBlocks() - public void func_149666_a(Item block, CreativeTabs creativeTabs, List list) + public void getSubBlocks(Item block, CreativeTabs creativeTabs, List list) { for (int i = 0; i < plants.length; ++i) { @@ -117,7 +117,7 @@ public class BlockBOPMushroom extends BlockBush public boolean isValidPosition(World world, int x, int y, int z, int metadata) { //TODO: getBlock() - Block block = world.func_147439_a(x, y - 1, z); + Block block = world.getBlock(x, y - 1, z); switch (metadata) { @@ -140,21 +140,21 @@ public class BlockBOPMushroom extends BlockBush @Override //TODO: canPlaceBlockOnSide - public boolean func_149707_d(World world, int x, int y, int z, int side) + public boolean canPlaceBlockOnSide(World world, int x, int y, int z, int side) { return isValidPosition(world, x, y, z, -1); } @Override //TODO: canBlockStay() - public boolean func_149718_j(World world, int x, int y, int z) + public boolean canBlockStay(World world, int x, int y, int z) { return isValidPosition(world, x, y, z, -1); } @Override //TODO damageDropped() - public int func_149692_a(int meta) + public int damageDropped(int meta) { return meta & 15; } diff --git a/src/main/java/biomesoplenty/common/blocks/BlockBOPPersimmonLeaves.java b/src/main/java/biomesoplenty/common/blocks/BlockBOPPersimmonLeaves.java index 5de440d9f..273b98bef 100644 --- a/src/main/java/biomesoplenty/common/blocks/BlockBOPPersimmonLeaves.java +++ b/src/main/java/biomesoplenty/common/blocks/BlockBOPPersimmonLeaves.java @@ -36,24 +36,24 @@ public class BlockBOPPersimmonLeaves extends BlockLeavesBase implements IShearab public BlockBOPPersimmonLeaves() { //TODO: Material.leaves - super(Material.field_151584_j, false); + super(Material.leaves, false); //TODO: setTickRandomly() - this.func_149675_a(true); + this.setTickRandomly(true); //TODO: this.setHardness - this.func_149711_c(0.2F); + this.setHardness(0.2F); //TODO setStepSound(Block.soundGrassFootstep) - this.func_149672_a(Block.field_149779_h); + this.setStepSound(Block.soundTypeGrass); //TODO: setLightOpacity() - this.func_149713_g(1); + this.setLightOpacity(1); //TODO: this.setCreativeTab() - this.func_149647_a(BiomesOPlenty.tabBiomesOPlenty); + this.setCreativeTab(BiomesOPlenty.tabBiomesOPlenty); } @Override //TODO: registerIcons() - public void func_149651_a(IIconRegister iconRegister) + public void registerBlockIcons(IIconRegister iconRegister) { textures = new IIcon[3][4]; if(Loader.isModLoaded("BetterGrassAndLeavesMod")) @@ -84,33 +84,33 @@ public class BlockBOPPersimmonLeaves extends BlockLeavesBase implements IShearab @Override //TODO: getIcon() - public IIcon func_149691_a(int side, int meta) + public IIcon getIcon(int side, int meta) { //TODO: isOpaqueCube() - return textures[(!func_149662_c() ? 0 : 1)][meta & 3]; + return textures[(!isOpaqueCube() ? 0 : 1)][meta & 3]; } @Override //TODO: isOpaqueCube() - public boolean func_149662_c() + public boolean isOpaqueCube() { //TODO: isOpaqueCube() - return Blocks.leaves.func_149662_c(); + return Blocks.leaves.isOpaqueCube(); } @Override //TODO: getSubBlocks() - public void func_149666_a(Item block, CreativeTabs creativeTabs, List list) + public void getSubBlocks(Item block, CreativeTabs creativeTabs, List list) { list.add(new ItemStack(block, 1, 0)); } @Override //TODO: randomDisplayTick() - public void func_149734_b(World world, int x, int y, int z, Random random) + public void randomDisplayTick(World world, int x, int y, int z, Random random) { //TODO: doesBlockHaveSolidTopSurface - if (world.canLightningStrikeAt(x, y + 1, z) && !World.func_147466_a(world, x, y - 1, z) && random.nextInt(15) == 1) + if (world.canLightningStrikeAt(x, y + 1, z) && !World.doesBlockHaveSolidTopSurface(world, x, y - 1, z) && random.nextInt(15) == 1) { double d0 = x + random.nextFloat(); double d1 = y - 0.05D; @@ -119,12 +119,12 @@ public class BlockBOPPersimmonLeaves extends BlockLeavesBase implements IShearab } //TODO: randomDisplayTick() - super.func_149734_b(world, x, y, z, random); + super.randomDisplayTick(world, x, y, z, random); } @Override //TODO: breakBlock() - public void func_149749_a(World world, int x, int y, int z, Block par5, int par6) + public void breakBlock(World world, int x, int y, int z, Block par5, int par6) { byte radius = 1; int bounds = radius + 1; @@ -138,7 +138,7 @@ public class BlockBOPPersimmonLeaves extends BlockLeavesBase implements IShearab for (int k = -radius; k <= radius; ++k) { //TODO: getBlock() - Block block = world.func_147439_a(x + i, y + j, z + k); + Block block = world.getBlock(x + i, y + j, z + k); if (block.isLeaves(world, x, y, z)) { @@ -152,7 +152,7 @@ public class BlockBOPPersimmonLeaves extends BlockLeavesBase implements IShearab @Override //TODO: updateTick() - public void func_149674_a(World world, int x, int y, int z, Random random) + public void updateTick(World world, int x, int y, int z, Random random) { if (world.isRemote) return; @@ -163,7 +163,7 @@ public class BlockBOPPersimmonLeaves extends BlockLeavesBase implements IShearab if ((meta & 3) < 3) { //TODO: setBlock() - world.func_147465_d(x, y, z, this, ++meta, 3); + world.setBlock(x, y, z, this, ++meta, 3); } if ((meta & 8) != 0/* && (meta & 4) == 0*/) @@ -194,7 +194,7 @@ public class BlockBOPPersimmonLeaves extends BlockLeavesBase implements IShearab for (j2 = -b0; j2 <= b0; ++j2) { //TODO: world.getBlock() - Block block = world.func_147439_a(x + l1, y + i2, z + j2); + Block block = world.getBlock(x + l1, y + i2, z + j2); if (block != null && block.canSustainLeaves(world, x + l1, y + i2, z + j2)) { @@ -274,20 +274,20 @@ public class BlockBOPPersimmonLeaves extends BlockLeavesBase implements IShearab private void removeLeaves(World world, int x, int y, int z) { //TODO: dropBlockAsItem - this.func_149697_b(world, x, y, z, world.getBlockMetadata(x, y, z), 0); + this.dropBlockAsItem(world, x, y, z, world.getBlockMetadata(x, y, z), 0); //TODO: setBlockToAir - world.func_147468_f(x, y, z); + world.setBlockToAir(x, y, z); } @Override //TODO: onBlockActivated - public boolean func_149727_a(World world, int x, int y, int z, EntityPlayer player, int side, float hitVecX, float hitVecY, float hitVecZ) + public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer player, int side, float hitVecX, float hitVecY, float hitVecZ) { int meta = world.getBlockMetadata(x, y, z); if ((meta & 3) == 3) { //TODO: setBlock - world.func_147465_d(x, y, z, this, meta - 3, 3); + world.setBlock(x, y, z, this, meta - 3, 3); EntityItem entityitem = new EntityItem(world, x, y, z, new ItemStack(BOPItemHelper.get("food"), 1, 8)); if (!world.isRemote) @@ -304,28 +304,28 @@ public class BlockBOPPersimmonLeaves extends BlockLeavesBase implements IShearab @Override //TODO: getItemDropped() - public Item func_149650_a(int metadata, Random random, int fortune) + public Item getItemDropped(int metadata, Random random, int fortune) { - return Item.func_150898_a(BOPBlockHelper.get("saplings")); + return Item.getItemFromBlock(BOPBlockHelper.get("saplings")); } @Override //TODO damageDropped() - public int func_149692_a(int meta) + public int damageDropped(int meta) { return 15; } @Override //TODO: quantityDropped() - public int func_149745_a(Random random) + public int quantityDropped(Random random) { return random.nextInt(20) == 0 ? 1 : 0; } @Override //TODO: dropBlockAsItemWithChance() - public void func_149690_a(World world, int x, int y, int z, int metadata, float chance, int fortune) + public void dropBlockAsItemWithChance(World world, int x, int y, int z, int metadata, float chance, int fortune) { if (world.isRemote) return; @@ -333,19 +333,19 @@ public class BlockBOPPersimmonLeaves extends BlockLeavesBase implements IShearab if (world.rand.nextInt(20) == 0) { //TODO: getItemDropped() - Item item = this.func_149650_a(metadata, world.rand, fortune); + Item item = this.getItemDropped(metadata, world.rand, fortune); //TODO:dropBlockAsItem_do damageDropped() - this.func_149642_a(world, x, y, z, new ItemStack(item, 1, this.func_149692_a(metadata))); + this.dropBlockAsItem(world, x, y, z, new ItemStack(item, 1, this.damageDropped(metadata))); } //TODO: dropBlockAsItem_do - if ((metadata & 3) == 3) this.func_149642_a(world, x, y, z, new ItemStack(BOPItemHelper.get("food"), 1, 8)); + if ((metadata & 3) == 3) this.dropBlockAsItem(world, x, y, z, new ItemStack(BOPItemHelper.get("food"), 1, 8)); //TODO: dropBlockAsItem_do - else if ((metadata & 3) == 2 && world.rand.nextInt(8) == 0) this.func_149642_a(world, x, y, z, new ItemStack(BOPItemHelper.get("food"), 1, 8)); + else if ((metadata & 3) == 2 && world.rand.nextInt(8) == 0) this.dropBlockAsItem(world, x, y, z, new ItemStack(BOPItemHelper.get("food"), 1, 8)); //TODO: dropBlockAsItem_do - else if ((metadata & 3) == 1 && world.rand.nextInt(16) == 0) this.func_149642_a(world, x, y, z, new ItemStack(BOPItemHelper.get("food"), 1, 8)); + else if ((metadata & 3) == 1 && world.rand.nextInt(16) == 0) this.dropBlockAsItem(world, x, y, z, new ItemStack(BOPItemHelper.get("food"), 1, 8)); //TODO: dropBlockAsItem_do - else if ((metadata & 3) == 0 && world.rand.nextInt(32) == 0) this.func_149642_a(world, x, y, z, new ItemStack(BOPItemHelper.get("food"), 1, 8)); + else if ((metadata & 3) == 0 && world.rand.nextInt(32) == 0) this.dropBlockAsItem(world, x, y, z, new ItemStack(BOPItemHelper.get("food"), 1, 8)); } @Override @@ -364,7 +364,7 @@ public class BlockBOPPersimmonLeaves extends BlockLeavesBase implements IShearab @Override //TODO shouldSideBeRendered - public boolean func_149646_a(IBlockAccess world, int x, int y, int z, int side) + public boolean shouldSideBeRendered(IBlockAccess world, int x, int y, int z, int side) { return true; } diff --git a/src/main/java/biomesoplenty/common/blocks/BlockBOPPetals.java b/src/main/java/biomesoplenty/common/blocks/BlockBOPPetals.java index 678820756..8426f5b92 100644 --- a/src/main/java/biomesoplenty/common/blocks/BlockBOPPetals.java +++ b/src/main/java/biomesoplenty/common/blocks/BlockBOPPetals.java @@ -26,22 +26,22 @@ public class BlockBOPPetals extends BlockLeavesBase implements IShearable public BlockBOPPetals() { //TODO: Material.leaves - super(Material.field_151584_j, false); + super(Material.leaves, false); //TODO: setTickRandomly() - this.func_149675_a(true); + this.setTickRandomly(true); //TODO: this.setHardness - this.func_149711_c(0.2F); + this.setHardness(0.2F); //TODO setStepSound(Block.soundGrassFootstep) - this.func_149672_a(Block.field_149779_h); + this.setStepSound(Block.soundTypeGrass); //TODO: this.setCreativeTab() - this.func_149647_a(BiomesOPlenty.tabBiomesOPlenty); + this.setCreativeTab(BiomesOPlenty.tabBiomesOPlenty); } @Override //TODO: registerIcons() - public void func_149651_a(IIconRegister iconRegister) + public void registerBlockIcons(IIconRegister iconRegister) { textures = new IIcon[petals.length][2]; @@ -53,7 +53,7 @@ public class BlockBOPPetals extends BlockLeavesBase implements IShearable @Override //TODO: getIcon() - public IIcon func_149691_a(int side, int meta) + public IIcon getIcon(int side, int meta) { return textures[meta < 0 || meta >= textures.length ? 0 : meta][0]; } @@ -65,7 +65,7 @@ public class BlockBOPPetals extends BlockLeavesBase implements IShearable @Override //TODO: getSubBlocks() - public void func_149666_a(Item block, CreativeTabs creativeTabs, List list) + public void getSubBlocks(Item block, CreativeTabs creativeTabs, List list) { for (int i = 0; i < textures.length; ++i) { list.add(new ItemStack(block, 1, i)); @@ -74,26 +74,26 @@ public class BlockBOPPetals extends BlockLeavesBase implements IShearable @Override //TODO: getItemDropped() - public Item func_149650_a(int metadata, Random random, int fortune) + public Item getItemDropped(int metadata, Random random, int fortune) { if (metadata == 0) //TODO: getItemFromBlock() - return Item.func_150898_a(Blocks.red_flower); + return Item.getItemFromBlock(Blocks.red_flower); else //TODO: getItemFromBlock() - return Item.func_150898_a(Blocks.yellow_flower); + return Item.getItemFromBlock(Blocks.yellow_flower); } @Override //TODO damageDropped() - public int func_149692_a(int meta) + public int damageDropped(int meta) { return meta & 15; } @Override //TODO: quantityDropped() - public int func_149745_a(Random random) + public int quantityDropped(Random random) { return random.nextInt(20) == 0 ? 1 : 0; } diff --git a/src/main/java/biomesoplenty/common/blocks/BlockBOPPlank.java b/src/main/java/biomesoplenty/common/blocks/BlockBOPPlank.java index e5519031d..411290222 100644 --- a/src/main/java/biomesoplenty/common/blocks/BlockBOPPlank.java +++ b/src/main/java/biomesoplenty/common/blocks/BlockBOPPlank.java @@ -20,22 +20,22 @@ public class BlockBOPPlank extends Block public BlockBOPPlank() { //TODO: Material.wood - super(Material.field_151575_d); + super(Material.wood); //TODO: this.setHardness - this.func_149711_c(2.0F); + this.setHardness(2.0F); this.setHarvestLevel("axe", 0); //TODO setStepSound(Block.soundWoodFootstep) - this.func_149672_a(Block.field_149766_f); + this.setStepSound(Block.soundTypeWood); //TODO: this.setCreativeTab() - this.func_149647_a(BiomesOPlenty.tabBiomesOPlenty); + this.setCreativeTab(BiomesOPlenty.tabBiomesOPlenty); } @Override //TODO: registerIcons() - public void func_149651_a(IIconRegister iconRegister) + public void registerBlockIcons(IIconRegister iconRegister) { textures = new IIcon[woodTypes.length]; @@ -46,7 +46,7 @@ public class BlockBOPPlank extends Block @Override //TODO: getIcon() - public IIcon func_149691_a(int side, int meta) + public IIcon getIcon(int side, int meta) { if (meta < 0 || meta >= textures.length) { meta = 0; @@ -58,7 +58,7 @@ public class BlockBOPPlank extends Block @Override @SuppressWarnings({ "rawtypes", "unchecked" }) //TODO: getSubBlocks() - public void func_149666_a(Item block, CreativeTabs creativeTabs, List list) + public void getSubBlocks(Item block, CreativeTabs creativeTabs, List list) { for (int i = 0; i < woodTypes.length; ++i) { @@ -68,7 +68,7 @@ public class BlockBOPPlank extends Block @Override //TODO damageDropped() - public int func_149692_a(int meta) + public int damageDropped(int meta) { return meta; } diff --git a/src/main/java/biomesoplenty/common/blocks/BlockBOPPlant.java b/src/main/java/biomesoplenty/common/blocks/BlockBOPPlant.java index 3d787ff26..75376d26e 100644 --- a/src/main/java/biomesoplenty/common/blocks/BlockBOPPlant.java +++ b/src/main/java/biomesoplenty/common/blocks/BlockBOPPlant.java @@ -44,27 +44,27 @@ public class BlockBOPPlant extends BOPBlockWorldDecor implements IShearable public BlockBOPPlant() { //TODO: Material.plants - super(Material.field_151585_k); + super(Material.plants); //TODO: this.setHardness - this.func_149711_c(0.0F); + this.setHardness(0.0F); //TODO setStepSound(Block.soundGrassFootstep) - this.func_149672_a(Block.field_149779_h); + this.setStepSound(Block.soundTypeGrass); //TODO: setTickRandomly() - this.func_149675_a(true); + this.setTickRandomly(true); float var3 = 0.4F; //TODO: setBlockBounds - this.func_149676_a(0.5F - var3, 0.0F, 0.5F - var3, 0.5F + var3, 0.8F, 0.5F + var3); + this.setBlockBounds(0.5F - var3, 0.0F, 0.5F - var3, 0.5F + var3, 0.8F, 0.5F + var3); //TODO: this.setCreativeTab() - this.func_149647_a(BiomesOPlenty.tabBiomesOPlenty); + this.setCreativeTab(BiomesOPlenty.tabBiomesOPlenty); } @Override //TODO: registerIcons() - public void func_149651_a(IIconRegister iconRegister) + public void registerBlockIcons(IIconRegister iconRegister) { textures = new IIcon[plants.length]; @@ -77,7 +77,7 @@ public class BlockBOPPlant extends BOPBlockWorldDecor implements IShearable @Override //TODO: getIcon() - public IIcon func_149691_a(int side, int meta) + public IIcon getIcon(int side, int meta) { if (meta < 0 || meta >= textures.length) { meta = 0; @@ -88,14 +88,14 @@ public class BlockBOPPlant extends BOPBlockWorldDecor implements IShearable @Override //TODO getRenderType() - public int func_149645_b() + public int getRenderType() { return RenderUtils.plantsModel; } @Override //TODO: setBlockBoundsBasedOnState() - public void func_149719_a(IBlockAccess world, int x, int y, int z) + public void setBlockBoundsBasedOnState(IBlockAccess world, int x, int y, int z) { int meta = world.getBlockMetadata(x, y, z); @@ -104,19 +104,19 @@ public class BlockBOPPlant extends BOPBlockWorldDecor implements IShearable case 6: case 7: //TODO: setBlockBounds - this.func_149676_a(0.125F, 0.0F, 0.125F, 0.875F, 1.00F, 0.875F); + this.setBlockBounds(0.125F, 0.0F, 0.125F, 0.875F, 1.00F, 0.875F); break; default: //TODO: setBlockBounds - this.func_149676_a(0.1F, 0.0F, 0.1F, 0.9F, 0.8F, 0.9F); + this.setBlockBounds(0.1F, 0.0F, 0.1F, 0.9F, 0.8F, 0.9F); break; } } @Override //TODO: getSubBlocks() - public void func_149666_a(Item block, CreativeTabs creativeTabs, List list) + public void getSubBlocks(Item block, CreativeTabs creativeTabs, List list) { for (int i = 0; i < plants.length; ++i) { @@ -131,11 +131,11 @@ public class BlockBOPPlant extends BOPBlockWorldDecor implements IShearable public boolean isValidPosition(World world, int x, int y, int z, int metadata) { //TODO: getBlock() - Block block = world.func_147439_a(x, y - 1, z); + Block block = world.getBlock(x, y - 1, z); //TODO: getBlock() - Block root = world.func_147439_a(x, y + 1, z); + Block root = world.getBlock(x, y + 1, z); //TODO: getBlock() - Block reedwater = world.func_147439_a(x, y - 2, z); + Block reedwater = world.getBlock(x, y - 2, z); switch (metadata) { @@ -160,7 +160,7 @@ public class BlockBOPPlant extends BOPBlockWorldDecor implements IShearable case 7: // Cattail //TODO: getBlock() getMaterial() water getBlock() getMaterial() water getBlock() getMaterial() water getBlock() getMaterial() water - return block != Blocks.grass ? false : (world.func_147439_a(x - 1, y - 1, z).func_149688_o() == Material.field_151586_h ? true : (world.func_147439_a(x + 1, y - 1, z).func_149688_o() == Material.field_151586_h ? true : (world.func_147439_a(x, y - 1, z - 1).func_149688_o() == Material.field_151586_h ? true : world.func_147439_a(x, y - 1, z + 1).func_149688_o() == Material.field_151586_h))); + return block != Blocks.grass ? false : (world.getBlock(x - 1, y - 1, z).getMaterial() == Material.water ? true : (world.getBlock(x + 1, y - 1, z).getMaterial() == Material.water ? true : (world.getBlock(x, y - 1, z - 1).getMaterial() == Material.water ? true : world.getBlock(x, y - 1, z + 1).getMaterial() == Material.water))); case 8: // River Cane return block == this || block == Blocks.grass; @@ -170,7 +170,7 @@ public class BlockBOPPlant extends BOPBlockWorldDecor implements IShearable case 10: // High Cattail Bottom //TODO: getBlock() getMaterial() water getBlock() getMaterial() water getBlock() getMaterial() water getBlock() getMaterial() water - return block != Blocks.grass ? false : (world.func_147439_a(x - 1, y - 1, z).func_149688_o() == Material.field_151586_h ? true : (world.func_147439_a(x + 1, y - 1, z).func_149688_o() == Material.field_151586_h ? true : (world.func_147439_a(x, y - 1, z - 1).func_149688_o() == Material.field_151586_h ? true : world.func_147439_a(x, y - 1, z + 1).func_149688_o() == Material.field_151586_h))); + return block != Blocks.grass ? false : (world.getBlock(x - 1, y - 1, z).getMaterial() == Material.water ? true : (world.getBlock(x + 1, y - 1, z).getMaterial() == Material.water ? true : (world.getBlock(x, y - 1, z - 1).getMaterial() == Material.water ? true : world.getBlock(x, y - 1, z + 1).getMaterial() == Material.water))); case 12: // Tiny Cactus return block == Blocks.sand || block == Blocks.hardened_clay || block == Blocks.soul_sand; @@ -191,7 +191,7 @@ public class BlockBOPPlant extends BOPBlockWorldDecor implements IShearable @Override //TODO: canReplace() - public boolean func_149705_a(World world, int x, int y, int z, int side, ItemStack itemStack) + public boolean canReplace(World world, int x, int y, int z, int side, ItemStack itemStack) { int metadata = itemStack.getItemDamage(); @@ -203,39 +203,39 @@ public class BlockBOPPlant extends BOPBlockWorldDecor implements IShearable @Override //TODO: onNeighborBlockChange() - public void func_149695_a(World world, int x, int y, int z, Block neighborBlock) + public void onNeighborBlockChange(World world, int x, int y, int z, Block neighborBlock) { - super.func_149695_a(world, x, y, z, neighborBlock); + super.onNeighborBlockChange(world, x, y, z, neighborBlock); //TODO: getBlock() - if (world.getBlockMetadata(x, y, z) == CATTAILTOP && world.func_147439_a(x, y - 1, z) == this && world.getBlockMetadata(x, y - 1, z) != CATTAILBOTTOM) + if (world.getBlockMetadata(x, y, z) == CATTAILTOP && world.getBlock(x, y - 1, z) == this && world.getBlockMetadata(x, y - 1, z) != CATTAILBOTTOM) { //TODO: setBlockToAir() - world.func_147468_f(x, y, z); + world.setBlockToAir(x, y, z); } //TODO: getBlock() - else if (world.getBlockMetadata(x, y, z) == CATTAILBOTTOM && world.func_147439_a(x, y + 1, z) != this) + else if (world.getBlockMetadata(x, y, z) == CATTAILBOTTOM && world.getBlock(x, y + 1, z) != this) { //TODO: setBlockToAir() - world.func_147468_f(x, y, z); + world.setBlockToAir(x, y, z); } //TODO: getBlock() else if (world.getBlockMetadata(x, y, z) == 8) { //TODO: canReplace() - if (!this.func_149705_a(world, x, y, z, 0, new ItemStack(BOPBlockHelper.get("plants"), 1, 8))) + if (!this.canReplace(world, x, y, z, 0, new ItemStack(BOPBlockHelper.get("plants"), 1, 8))) { //TODO: dropBlockAsItem - this.func_149697_b(world, x, y, z, world.getBlockMetadata(x, y, z), 0); + this.dropBlockAsItem(world, x, y, z, world.getBlockMetadata(x, y, z), 0); //TODO: setBlockToAir() - world.func_147468_f(x, y, z); + world.setBlockToAir(x, y, z); } } } @Override //TODO: onEntityCollidedWithBlock() - public void func_149670_a(World world, int x, int y, int z, Entity entity) + public void onEntityCollidedWithBlock(World world, int x, int y, int z, Entity entity) { int meta = world.getBlockMetadata(x, y, z); if (meta == 5) @@ -294,7 +294,7 @@ public class BlockBOPPlant extends BOPBlockWorldDecor implements IShearable @Override //TODO: getDamageValue() - public int func_149643_k(World world, int x, int y, int z) + public int getDamageValue(World world, int x, int y, int z) { int meta = world.getBlockMetadata(x, y, z); if (meta == CATTAILTOP || meta == CATTAILBOTTOM) @@ -311,12 +311,12 @@ public class BlockBOPPlant extends BOPBlockWorldDecor implements IShearable @Override //TODO: getItemDropped() - public Item func_149650_a(int metadata, Random random, int fortune) + public Item getItemDropped(int metadata, Random random, int fortune) { if (metadata > 5 && metadata != 11) { //TODO: getItemFromBlock() - return Item.func_150898_a(this); + return Item.getItemFromBlock(this); } else if (metadata == 11) { @@ -330,7 +330,7 @@ public class BlockBOPPlant extends BOPBlockWorldDecor implements IShearable @Override //TODO damageDropped() - public int func_149692_a(int meta) + public int damageDropped(int meta) { if (meta == 9) { @@ -363,9 +363,9 @@ public class BlockBOPPlant extends BOPBlockWorldDecor implements IShearable @Override //TODO: harvestBlock() - public void func_149636_a(World world, EntityPlayer player, int x, int y, int z, int meta) + public void harvestBlock(World world, EntityPlayer player, int x, int y, int z, int meta) { - super.func_149636_a(world, player, x, y, z, meta); + super.harvestBlock(world, player, x, y, z, meta); if (meta == 13) { @@ -421,7 +421,7 @@ public class BlockBOPPlant extends BOPBlockWorldDecor implements IShearable @Override //TODO: isBlockReplaceable - public boolean func_149742_c(World world, int x, int y, int z) + public boolean canPlaceBlockAt(World world, int x, int y, int z) { int meta = world.getBlockMetadata(x, y, z); diff --git a/src/main/java/biomesoplenty/common/blocks/BlockBOPRedRock.java b/src/main/java/biomesoplenty/common/blocks/BlockBOPRedRock.java index 3aa4b4d20..3098fe23f 100644 --- a/src/main/java/biomesoplenty/common/blocks/BlockBOPRedRock.java +++ b/src/main/java/biomesoplenty/common/blocks/BlockBOPRedRock.java @@ -21,18 +21,18 @@ public class BlockBOPRedRock extends Block public BlockBOPRedRock() { //TODO: Material.rock - super(Material.field_151576_e); + super(Material.rock); //TODO setStepSound(Block.soundStoneFootstep) - this.func_149672_a(Block.field_149780_i); + this.setStepSound(Block.soundTypePiston); //TODO: this.setCreativeTab() - this.func_149647_a(BiomesOPlenty.tabBiomesOPlenty); + this.setCreativeTab(BiomesOPlenty.tabBiomesOPlenty); } @Override //TODO: registerIcons() - public void func_149651_a(IIconRegister iconRegister) + public void registerBlockIcons(IIconRegister iconRegister) { textures = new IIcon[types.length]; @@ -43,7 +43,7 @@ public class BlockBOPRedRock extends Block @Override //TODO: getIcon() - public IIcon func_149691_a(int side, int meta) + public IIcon getIcon(int side, int meta) { if (meta < 0 || meta >= textures.length) { @@ -55,14 +55,14 @@ public class BlockBOPRedRock extends Block @Override //TODO: getDamageValue() - public int func_149643_k(World world, int x, int y, int z) + public int getDamageValue(World world, int x, int y, int z) { return world.getBlockMetadata(x, y, z); } @Override //TODO: getSubBlocks() - public void func_149666_a(Item block, CreativeTabs creativeTabs, List list) + public void getSubBlocks(Item block, CreativeTabs creativeTabs, List list) { for (int i = 0; i < types.length; ++i) { @@ -72,18 +72,18 @@ public class BlockBOPRedRock extends Block @Override //TODO damageDropped() - public int func_149692_a(int meta) + public int damageDropped(int meta) { return meta == 0 ? 1 : meta; } @Override //TODO: getBlockHardness() - public float func_149712_f(World world, int x, int y, int z) + public float getBlockHardness(World world, int x, int y, int z) { int meta = world.getBlockMetadata(x, y, z); //TODO: blockHardness - float hardness = field_149782_v; + float hardness = blockHardness; switch (meta) { @@ -108,7 +108,7 @@ public class BlockBOPRedRock extends Block { int meta = world.getBlockMetadata(x, y, z); //TODO: blockResistance - float resistance = field_149781_w; + float resistance = blockResistance; switch (meta) { diff --git a/src/main/java/biomesoplenty/common/blocks/BlockBOPSapling.java b/src/main/java/biomesoplenty/common/blocks/BlockBOPSapling.java index 9950f5b63..1840e42fa 100644 --- a/src/main/java/biomesoplenty/common/blocks/BlockBOPSapling.java +++ b/src/main/java/biomesoplenty/common/blocks/BlockBOPSapling.java @@ -31,17 +31,17 @@ public class BlockBOPSapling extends BlockSapling public BlockBOPSapling() { //TODO: this.setHardness - this.func_149711_c(0.0F); + this.setHardness(0.0F); //TODO setStepSound(Block.soundGrassFootstep) - this.func_149672_a(Block.field_149779_h); + this.setStepSound(Block.soundTypeGrass); //TODO: this.setCreativeTab() - this.func_149647_a(BiomesOPlenty.tabBiomesOPlenty); + this.setCreativeTab(BiomesOPlenty.tabBiomesOPlenty); } @Override //TODO: registerIcons() - public void func_149651_a(IIconRegister iconRegister) + public void registerBlockIcons(IIconRegister iconRegister) { textures = new IIcon[saplings.length]; @@ -53,7 +53,7 @@ public class BlockBOPSapling extends BlockSapling @Override //TODO: getIcon() - public IIcon func_149691_a(int side, int meta) + public IIcon getIcon(int side, int meta) { if (meta < 0 || meta >= saplings.length) { meta = 0; @@ -64,7 +64,7 @@ public class BlockBOPSapling extends BlockSapling @Override //TODO: getSubBlocks() - public void func_149666_a(Item block, CreativeTabs creativeTabs, List list) + public void getSubBlocks(Item block, CreativeTabs creativeTabs, List list) { for (int i = 0; i < saplings.length; ++i) { @@ -75,7 +75,7 @@ public class BlockBOPSapling extends BlockSapling public boolean isValidPosition(World world, int x, int y, int z, int metadata) { //TODO: getBlock() - Block block = world.func_147439_a(x, y - 1, z); + Block block = world.getBlock(x, y - 1, z); switch (metadata) { @@ -89,17 +89,17 @@ public class BlockBOPSapling extends BlockSapling @Override //TODO: canPlaceBlockOnSide - public boolean func_149707_d(World world, int x, int y, int z, int side) + public boolean canPlaceBlockOnSide(World world, int x, int y, int z, int side) { return isValidPosition(world, x, y, z, -1); } @Override //TODO: canBlockStay() - public boolean func_149718_j(World world, int x, int y, int z) + public boolean canBlockStay(World world, int x, int y, int z) { //TODO: getBlock() - Block soil = world.func_147439_a(x, y - 1, z); + Block soil = world.getBlock(x, y - 1, z); if (world.getBlockMetadata(x, y, z) != 1) return (world.getFullBlockLightValue(x, y, z) >= 8 || world.canBlockSeeTheSky(x, y, z)) && @@ -111,7 +111,7 @@ public class BlockBOPSapling extends BlockSapling @Override //TODO: updateTick() - public void func_149674_a(World world, int x, int y, int z, Random random) + public void updateTick(World world, int x, int y, int z, Random random) { if (!world.isRemote) { @@ -214,26 +214,26 @@ public class BlockBOPSapling extends BlockSapling if (obj != null) { //TODO: setBlockToAir() - world.func_147468_f(x, y, z); + world.setBlockToAir(x, y, z); if (!((WorldGenerator)obj).generate(world, random, x, y, z)) { //TODO: setBlock() - world.func_147465_d(x, y, z, this, meta, 2); + world.setBlock(x, y, z, this, meta, 2); } } } @Override //TODO damageDropped() - public int func_149692_a(int meta) + public int damageDropped(int meta) { return meta & TYPES; } @Override //TODO: getDamageValue() - public int func_149643_k(World world, int x, int y, int z) + public int getDamageValue(World world, int x, int y, int z) { return world.getBlockMetadata(x, y, z) & TYPES; } diff --git a/src/main/java/biomesoplenty/common/blocks/BlockBOPSkystone.java b/src/main/java/biomesoplenty/common/blocks/BlockBOPSkystone.java index 16bc559e7..999b89c81 100644 --- a/src/main/java/biomesoplenty/common/blocks/BlockBOPSkystone.java +++ b/src/main/java/biomesoplenty/common/blocks/BlockBOPSkystone.java @@ -21,18 +21,18 @@ public class BlockBOPSkystone extends Block public BlockBOPSkystone() { //TODO: Material.rock - super(Material.field_151576_e); + super(Material.rock); //TODO setStepSound(Block.soundStoneFootstep) - this.func_149672_a(Block.field_149780_i); + this.setStepSound(Block.soundTypePiston); //TODO: this.setCreativeTab() - this.func_149647_a(BiomesOPlenty.tabBiomesOPlenty); + this.setCreativeTab(BiomesOPlenty.tabBiomesOPlenty); } @Override //TODO: registerIcons() - public void func_149651_a(IIconRegister iconRegister) + public void registerBlockIcons(IIconRegister iconRegister) { textures = new IIcon[types.length]; @@ -43,7 +43,7 @@ public class BlockBOPSkystone extends Block @Override //TODO: getIcon() - public IIcon func_149691_a(int side, int meta) + public IIcon getIcon(int side, int meta) { if (meta < 0 || meta >= textures.length) { meta = 0; @@ -54,7 +54,7 @@ public class BlockBOPSkystone extends Block @Override //TODO: getDamageValue() - public int func_149643_k(World world, int x, int y, int z) + public int getDamageValue(World world, int x, int y, int z) { return world.getBlockMetadata(x, y, z); } @@ -62,7 +62,7 @@ public class BlockBOPSkystone extends Block @Override @SuppressWarnings({ "rawtypes", "unchecked" }) //TODO: getSubBlocks() - public void func_149666_a(Item block, CreativeTabs creativeTabs, List list) + public void getSubBlocks(Item block, CreativeTabs creativeTabs, List list) { for (int i = 0; i < types.length; ++i) { @@ -72,7 +72,7 @@ public class BlockBOPSkystone extends Block @Override //TODO damageDropped() - public int func_149692_a(int meta) + public int damageDropped(int meta) { if (meta == 0) { @@ -88,11 +88,11 @@ public class BlockBOPSkystone extends Block @Override //TODO: getBlockHardness() - public float func_149712_f(World world, int x, int y, int z) + public float getBlockHardness(World world, int x, int y, int z) { int meta = world.getBlockMetadata(x, y, z); //TODO: blockHardness - float hardness = field_149782_v; + float hardness = blockHardness; switch (meta) { @@ -121,7 +121,7 @@ public class BlockBOPSkystone extends Block { int meta = world.getBlockMetadata(x, y, z); //TODO: blockResistance - float resistance = field_149781_w; + float resistance = blockResistance; switch (meta) { diff --git a/src/main/java/biomesoplenty/common/blocks/BlockBOPSlab.java b/src/main/java/biomesoplenty/common/blocks/BlockBOPSlab.java index 1724ef1a5..7b771c2aa 100644 --- a/src/main/java/biomesoplenty/common/blocks/BlockBOPSlab.java +++ b/src/main/java/biomesoplenty/common/blocks/BlockBOPSlab.java @@ -38,35 +38,35 @@ public class BlockBOPSlab extends BlockSlab category = cat; //TODO: Material.wood - if (material == Material.field_151575_d) + if (material == Material.wood) { //TODO: this.setHardness - this.func_149711_c(2.0F); + this.setHardness(2.0F); //TODO: this.setResistance - this.func_149752_b(5.0F); + this.setResistance(5.0F); //TODO setStepSound(Block.soundWoodFootstep) - this.func_149672_a(Block.field_149766_f); + this.setStepSound(Block.soundTypeWood); } //TODO: Material.rock - else if (material == Material.field_151576_e) + else if (material == Material.rock) { //TODO setStepSound(Block.soundStoneFootstep) - this.func_149672_a(Block.field_149780_i); + this.setStepSound(Block.soundTypePiston); } if (!isDoubleSlab) { //TODO: this.setCreativeTab() - this.func_149647_a(BiomesOPlenty.tabBiomesOPlenty); + this.setCreativeTab(BiomesOPlenty.tabBiomesOPlenty); } //TODO: useNeighborBrightness? - field_149783_u = true; + useNeighborBrightness = true; } @Override //TODO: registerIcons() - public void func_149651_a(IIconRegister iconRegister) + public void registerBlockIcons(IIconRegister iconRegister) { if (category == SlabCategory.STONE) { @@ -90,7 +90,7 @@ public class BlockBOPSlab extends BlockSlab @Override //TODO: getIcon() - public IIcon func_149691_a(int side, int meta) + public IIcon getIcon(int side, int meta) { if (category == SlabCategory.STONE) return textures[getTypeFromMeta(meta)]; @@ -101,7 +101,7 @@ public class BlockBOPSlab extends BlockSlab @Override @SuppressWarnings({ "rawtypes", "unchecked" }) //TODO: getSubBlocks() - public void func_149666_a(Item block, CreativeTabs creativeTabs, List list) + public void getSubBlocks(Item block, CreativeTabs creativeTabs, List list) { int max = 0; @@ -130,40 +130,40 @@ public class BlockBOPSlab extends BlockSlab @Override //TODO damageDropped() - public int func_149692_a(int meta) + public int damageDropped(int meta) { return meta & 7; } @Override //TODO: getItemDropped() - public Item func_149650_a(int metadata, Random random, int fortune) + public Item getItemDropped(int metadata, Random random, int fortune) { //TODO: isDoubleSlab if (field_150004_a) { if (this == BOPBlockHelper.get("woodenDoubleSlab1")) //TODO: getItemFromBlock() - return Item.func_150898_a(BOPBlockHelper.get("woodenSingleSlab1")); + return Item.getItemFromBlock(BOPBlockHelper.get("woodenSingleSlab1")); if (this == BOPBlockHelper.get("woodenDoubleSlab2")) //TODO: getItemFromBlock() - return Item.func_150898_a(BOPBlockHelper.get("woodenSingleSlab2")); + return Item.getItemFromBlock(BOPBlockHelper.get("woodenSingleSlab2")); else //TODO: getItemFromBlock() - return Item.func_150898_a(BOPBlockHelper.get("stoneSingleSlab")); + return Item.getItemFromBlock(BOPBlockHelper.get("stoneSingleSlab")); } else //TODO: getItemForBlock() - return Item.func_150898_a(this); + return Item.getItemFromBlock(this); } @Override //TODO: getBlockHardness() - public float func_149712_f(World world, int x, int y, int z) + public float getBlockHardness(World world, int x, int y, int z) { int meta = world.getBlockMetadata(x, y, z); //TODO: blockHardness - float hardness = field_149782_v; + float hardness = blockHardness; if (category == SlabCategory.STONE) { @@ -193,7 +193,7 @@ public class BlockBOPSlab extends BlockSlab { int meta = world.getBlockMetadata(x, y, z); //TODO: blockResistance - float resistance = field_149781_w; + float resistance = blockResistance; if (category == SlabCategory.STONE) { @@ -229,7 +229,7 @@ public class BlockBOPSlab extends BlockSlab @Override //TODO: createStackedBlock() - protected ItemStack func_149644_j(int meta) + protected ItemStack createStackedBlock(int meta) { return new ItemStack(this, 2, meta); } diff --git a/src/main/java/biomesoplenty/common/blocks/BlockBOPStairs.java b/src/main/java/biomesoplenty/common/blocks/BlockBOPStairs.java index 7b9dadc24..8f2a89c0c 100644 --- a/src/main/java/biomesoplenty/common/blocks/BlockBOPStairs.java +++ b/src/main/java/biomesoplenty/common/blocks/BlockBOPStairs.java @@ -41,29 +41,29 @@ public class BlockBOPStairs extends BlockStairs if (isWoodCategory(category.toString())) { //TODO: this.setHardness - this.func_149711_c(2.0F); + this.setHardness(2.0F); //TODO setStepSound(Block.soundWoodFootstep) - this.func_149672_a(Block.field_149766_f); + this.setStepSound(Block.soundTypeWood); } else { //TODO: this.setHardness - this.func_149711_c(3.0F); + this.setHardness(3.0F); //TODO setStepSound(Block.soundStoneFootstep) - this.func_149672_a(Block.field_149780_i); + this.setStepSound(Block.soundTypePiston); } //TODO: useNeighborBrightness? - field_149783_u = true; + useNeighborBrightness = true; //TODO: this.setCreativeTab() - this.func_149647_a(BiomesOPlenty.tabBiomesOPlenty); + this.setCreativeTab(BiomesOPlenty.tabBiomesOPlenty); } @Override //TODO: registerIcons() - public void func_149651_a(IIconRegister iconRegister) + public void registerBlockIcons(IIconRegister iconRegister) { if (isStoneCategory(category.toString())) { @@ -135,7 +135,7 @@ public class BlockBOPStairs extends BlockStairs @Override //TODO: getIcon() - public IIcon func_149691_a(int side, int meta) + public IIcon getIcon(int side, int meta) { int adjCat = category.ordinal(); diff --git a/src/main/java/biomesoplenty/common/blocks/BlockBamboo.java b/src/main/java/biomesoplenty/common/blocks/BlockBamboo.java index b8621d03e..48bae45a9 100644 --- a/src/main/java/biomesoplenty/common/blocks/BlockBamboo.java +++ b/src/main/java/biomesoplenty/common/blocks/BlockBamboo.java @@ -23,24 +23,24 @@ public class BlockBamboo extends Block public BlockBamboo() { //TODO: Material.plants - super(Material.field_151585_k); + super(Material.plants); //TODO: this.setHardness - this.func_149711_c(0.2F); + this.setHardness(0.2F); //TODO setStepSound(Block.soundWoodFootstep) - this.func_149672_a(Block.field_149766_f); + this.setStepSound(Block.soundTypeWood); //TODO: setTickRandomly() - this.func_149675_a(true); + this.setTickRandomly(true); //TODO: this.setCreativeTab() - this.func_149647_a(BiomesOPlenty.tabBiomesOPlenty); + this.setCreativeTab(BiomesOPlenty.tabBiomesOPlenty); } @Override //TODO: registerIcons() - public void func_149651_a(IIconRegister iconRegister) + public void registerBlockIcons(IIconRegister iconRegister) { bambooSide = iconRegister.registerIcon("biomesoplenty:bamboo"); bambooTop = iconRegister.registerIcon("biomesoplenty:bambootop"); @@ -48,7 +48,7 @@ public class BlockBamboo extends Block @Override //TODO: getIcon() - public IIcon func_149691_a(int side, int meta) + public IIcon getIcon(int side, int meta) { if (side > 1) return bambooSide; @@ -58,15 +58,15 @@ public class BlockBamboo extends Block @Override //TODO: updateTick() - public void func_149674_a(World world, int x, int y, int z, Random random) + public void updateTick(World world, int x, int y, int z, Random random) { //TODO: isAirBlock() - if (world.func_147437_c(x, y + 1, z)) + if (world.isAirBlock(x, y + 1, z)) { int var6; //TODO: getBlock() - for (var6 = 1; world.func_147439_a(x, y - var6, z) == this; ++var6) + for (var6 = 1; world.getBlock(x, y - var6, z) == this; ++var6) { ; } @@ -78,7 +78,7 @@ public class BlockBamboo extends Block if (var7 == 15) { //TODO: setBlock() - world.func_147465_d(x, y + 1, z, this, 0, 2); + world.setBlock(x, y + 1, z, this, 0, 2); world.setBlockMetadataWithNotify(x, y, z, 0, 2); } else @@ -91,7 +91,7 @@ public class BlockBamboo extends Block @Override //TODO: getSelectedBoundingBoxFromPool() - public AxisAlignedBB func_149633_g(World world, int x, int y, int z) + public AxisAlignedBB getSelectedBoundingBoxFromPool(World world, int x, int y, int z) { float pixel = 0.0625F; @@ -100,30 +100,30 @@ public class BlockBamboo extends Block @Override //TODO: addCollisionBoxesToList() - public void func_149743_a(World world, int x, int y, int z, AxisAlignedBB axisAlignedBB, List list, Entity entity) + public void addCollisionBoxesToList(World world, int x, int y, int z, AxisAlignedBB axisAlignedBB, List list, Entity entity) { float pixel = 0.0625F; //TODO: setBlockBounds - this.func_149676_a((pixel * 4), 0.0F, (pixel * 4), 1.0F - (pixel * 4), 1.0F, 1.0F - (pixel * 4)); - super.func_149743_a(world, x, y, z, axisAlignedBB, list, entity); + this.setBlockBounds((pixel * 4), 0.0F, (pixel * 4), 1.0F - (pixel * 4), 1.0F, 1.0F - (pixel * 4)); + super.addCollisionBoxesToList(world, x, y, z, axisAlignedBB, list, entity); //TODO: setBlockBoundsForItemRender() - this.func_149683_g(); + this.setBlockBoundsForItemRender(); } @Override //TODO: setBlockBoundsForItemRender() - public void func_149683_g() + public void setBlockBoundsForItemRender() { //TODO: setBlockBounds - this.func_149676_a(0.0F, 0.0F, 0.0F, 1.0F, 1.0F, 1.0F); + this.setBlockBounds(0.0F, 0.0F, 0.0F, 1.0F, 1.0F, 1.0F); } @Override //TODO: canPlaceBlockAt - public boolean func_149742_c(World world, int x, int y, int z) + public boolean canPlaceBlockAt(World world, int x, int y, int z) { //TODO: getBlock - Block block = world.func_147439_a(x, y - 1, z); + Block block = world.getBlock(x, y - 1, z); if (block == this) return true; @@ -135,7 +135,7 @@ public class BlockBamboo extends Block @Override //TODO: onNeighborBlockChange() - public void func_149695_a(World world, int x, int y, int z, Block neighborBlock) + public void onNeighborBlockChange(World world, int x, int y, int z, Block neighborBlock) { this.checkBlockCoordValid(world, x, y, z); } @@ -143,40 +143,40 @@ public class BlockBamboo extends Block public final void checkBlockCoordValid(World world, int x, int y, int z) { //TODO: canBlockStay() - if (!this.func_149718_j(world, x, y, z)) + if (!this.canBlockStay(world, x, y, z)) { //TODO: dropBlockAsItem() - this.func_149697_b(world, x, y, z, world.getBlockMetadata(x, y, z), 0); + this.dropBlockAsItem(world, x, y, z, world.getBlockMetadata(x, y, z), 0); //TODO: setBlockToAir - world.func_147468_f(x, y, z); + world.setBlockToAir(x, y, z); } } @Override //TODO: canBlockStay() - public boolean func_149718_j(World world, int x, int y, int z) + public boolean canBlockStay(World world, int x, int y, int z) { //TODO: canPlaceBlockAt - return this.func_149742_c(world, x, y, z); + return this.canPlaceBlockAt(world, x, y, z); } @Override //TODO: isOpaqueCube() - public boolean func_149662_c() + public boolean isOpaqueCube() { return false; } @Override //TODO: renderAsNormalBlock() - public boolean func_149686_d() + public boolean renderAsNormalBlock() { return false; } @Override //TODO getRenderType() - public int func_149645_b() + public int getRenderType() { return RenderUtils.bambooModel; } diff --git a/src/main/java/biomesoplenty/common/blocks/BlockBones.java b/src/main/java/biomesoplenty/common/blocks/BlockBones.java index 1f845fdbd..0804612f2 100644 --- a/src/main/java/biomesoplenty/common/blocks/BlockBones.java +++ b/src/main/java/biomesoplenty/common/blocks/BlockBones.java @@ -24,21 +24,21 @@ public class BlockBones extends Block public BlockBones() { //TODO: Material.rock - super(Material.field_151576_e); + super(Material.rock); //TODO: this.setHardness - this.func_149711_c(3.0F); + this.setHardness(3.0F); //TODO: this.setResistance - this.func_149752_b(5.0F); + this.setResistance(5.0F); //TODO: this.setCreativeTab() - this.func_149647_a(BiomesOPlenty.tabBiomesOPlenty); + this.setCreativeTab(BiomesOPlenty.tabBiomesOPlenty); } @Override //TODO: registerIcons() - public void func_149651_a(IIconRegister iconRegister) + public void registerBlockIcons(IIconRegister iconRegister) { textures = new IIcon[boneTypes.length]; @@ -50,7 +50,7 @@ public class BlockBones extends Block @Override //TODO: getIcon() - public IIcon func_149691_a(int side, int meta) + public IIcon getIcon(int side, int meta) { if (meta < 0 || meta >= textures.length) { meta = 0; @@ -65,7 +65,7 @@ public class BlockBones extends Block @Override //TODO: getCollisionBoundingBoxFromPool - public AxisAlignedBB func_149668_a(World world, int x, int y, int z) + public AxisAlignedBB getCollisionBoundingBoxFromPool(World world, int x, int y, int z) { int meta = world.getBlockMetadata(x, y, z); @@ -96,7 +96,7 @@ public class BlockBones extends Block @Override //TODO: getSelectedBoundingBoxFromPool() - public AxisAlignedBB func_149633_g(World world, int x, int y, int z) + public AxisAlignedBB getSelectedBoundingBoxFromPool(World world, int x, int y, int z) { int meta = world.getBlockMetadata(x, y, z); @@ -127,7 +127,7 @@ public class BlockBones extends Block @Override //TODO: setBlockBoundsBasedOnState() - public void func_149719_a(IBlockAccess world, int x, int y, int z) + public void setBlockBoundsBasedOnState(IBlockAccess world, int x, int y, int z) { int meta = world.getBlockMetadata(x, y, z); @@ -191,12 +191,12 @@ public class BlockBones extends Block } //TODO: this.setBlockBounds() - this.func_149676_a(minX, minY, minZ, maxX, maxY, maxZ); + this.setBlockBounds(minX, minY, minZ, maxX, maxY, maxZ); } @Override //TODO: getDamageValue() - public int func_149643_k(World world, int x, int y, int z) + public int getDamageValue(World world, int x, int y, int z) { int meta = world.getBlockMetadata(x, y, z); if (meta == 3 || meta == 4) { @@ -210,7 +210,7 @@ public class BlockBones extends Block @Override //TODO: getSubBlocks() - public void func_149666_a(Item block, CreativeTabs creativeTabs, List list) + public void getSubBlocks(Item block, CreativeTabs creativeTabs, List list) { for (int i = 0; i < boneTypes.length; ++i) { list.add(new ItemStack(block, 1, i)); @@ -219,35 +219,35 @@ public class BlockBones extends Block @Override //TODO: isOpaqueCube() - public boolean func_149662_c() + public boolean isOpaqueCube() { return false; } @Override //TODO: renderAsNormalBlock() - public boolean func_149686_d() + public boolean renderAsNormalBlock() { return false; } @Override //TODO getRenderType() - public int func_149645_b() + public int getRenderType() { return RenderUtils.bonesModel; } @Override //TODO shouldSideBeRendered - public boolean func_149646_a(IBlockAccess world, int x, int y, int z, int side) + public boolean shouldSideBeRendered(IBlockAccess world, int x, int y, int z, int side) { return true; } @Override //TODO damageDropped() - public int func_149692_a(int meta) + public int damageDropped(int meta) { if (meta == 3 || meta == 4) { diff --git a/src/main/java/biomesoplenty/common/blocks/BlockCloud.java b/src/main/java/biomesoplenty/common/blocks/BlockCloud.java index b96e91517..93b2633d1 100644 --- a/src/main/java/biomesoplenty/common/blocks/BlockCloud.java +++ b/src/main/java/biomesoplenty/common/blocks/BlockCloud.java @@ -18,33 +18,33 @@ public class BlockCloud extends Block public BlockCloud() { //TODO: Material.cloth - super(Material.field_151580_n); + super(Material.cloth); //TODO: this.setHardness - this.func_149711_c(0.1F); + this.setHardness(0.1F); //TODO setStepSound(Block.soundClothFootstep) - this.func_149672_a(Block.field_149775_l); + this.setStepSound(Block.soundTypeCloth); //TODO: setLightOpacity() - this.func_149713_g(3); + this.setLightOpacity(3); //TODO: this.setCreativeTab() - this.func_149647_a(BiomesOPlenty.tabBiomesOPlenty); + this.setCreativeTab(BiomesOPlenty.tabBiomesOPlenty); } @Override //TODO: registerIcons() - public void func_149651_a(IIconRegister iconRegister) + public void registerBlockIcons(IIconRegister iconRegister) { //TODO: blockIcon - this.field_149761_L = iconRegister.registerIcon("biomesoplenty:cloud"); + this.blockIcon = iconRegister.registerIcon("biomesoplenty:cloud"); } @Override //TODO: getCollisionBoundingBoxFromPool - public AxisAlignedBB func_149668_a(World world, int x, int y, int z) + public AxisAlignedBB getCollisionBoundingBoxFromPool(World world, int x, int y, int z) { float yOffset = 0.25F; return AxisAlignedBB.getAABBPool().getAABB(x, y, z, x + 1, y + 1 - yOffset, z + 1); @@ -52,7 +52,7 @@ public class BlockCloud extends Block @Override //TODO: onEntityCollidedWithBlock() - public void func_149670_a(World world, int x, int y, int z, Entity entity) + public void onEntityCollidedWithBlock(World world, int x, int y, int z, Entity entity) { entity.fallDistance = 0.0F; @@ -72,25 +72,25 @@ public class BlockCloud extends Block @Override //TODO: getRenderBlockPass() - public int func_149701_w() + public int getRenderBlockPass() { return 1; } @Override //TODO: isOpaqueCube() - public boolean func_149662_c() + public boolean isOpaqueCube() { return false; } @Override //TODO shouldSideBeRendered - public boolean func_149646_a(IBlockAccess world, int x, int y, int z, int side) + public boolean shouldSideBeRendered(IBlockAccess world, int x, int y, int z, int side) { //TODO: getBlock() - Block block = world.func_147439_a(x, y, z); + Block block = world.getBlock(x, y, z); //TODO: shouldSideBeRendered - return block == this ? false : super.func_149646_a(world, x, y, z, side); + return block == this ? false : super.shouldSideBeRendered(world, x, y, z, side); } } \ No newline at end of file diff --git a/src/main/java/biomesoplenty/common/blocks/BlockFlesh.java b/src/main/java/biomesoplenty/common/blocks/BlockFlesh.java index 319ac162d..b3ad73858 100644 --- a/src/main/java/biomesoplenty/common/blocks/BlockFlesh.java +++ b/src/main/java/biomesoplenty/common/blocks/BlockFlesh.java @@ -19,29 +19,29 @@ public class BlockFlesh extends Block public BlockFlesh() { //TODO: Material.sponge - super(Material.field_151583_m); + super(Material.sponge); //TODO: this.setHardness - this.func_149711_c(0.4F); + this.setHardness(0.4F); //TODO setStepSound(Block.soundGravelFootstep) - this.func_149672_a(Block.field_149767_g); + this.setStepSound(Block.soundTypeGravel); //TODO: this.setCreativeTab() - this.func_149647_a(BiomesOPlenty.tabBiomesOPlenty); + this.setCreativeTab(BiomesOPlenty.tabBiomesOPlenty); } @Override //TODO: registerIcons() - public void func_149651_a(IIconRegister iconRegister) + public void registerBlockIcons(IIconRegister iconRegister) { //TODO: blockIcon - this.field_149761_L = iconRegister.registerIcon("biomesoplenty:flesh"); + this.blockIcon = iconRegister.registerIcon("biomesoplenty:flesh"); } @Override //TODO: getCollisionBoundingBoxFromPool - public AxisAlignedBB func_149668_a(World world, int x, int y, int z) + public AxisAlignedBB getCollisionBoundingBoxFromPool(World world, int x, int y, int z) { float var5 = 0.125F; return AxisAlignedBB.getAABBPool().getAABB(x, y, z, x + 1, y + 1 - var5, z + 1); @@ -49,26 +49,26 @@ public class BlockFlesh extends Block @Override //TODO: randomDisplayTick() - public void func_149734_b(World world, int x, int y, int z, Random random) + public void randomDisplayTick(World world, int x, int y, int z, Random random) { - super.func_149734_b(world, x, y, z, random); + super.randomDisplayTick(world, x, y, z, random); if (random.nextInt(4) == 0) { //TODO: getIdFromBlock() - world.spawnParticle("blockcrack_" + String.valueOf(Block.func_149682_b(this)) + "_0", x + random.nextFloat(), y - 0.4F, z + random.nextFloat(), 0.0D, 0.0D, 0.0D); + world.spawnParticle("blockcrack_" + String.valueOf(Block.getIdFromBlock(this)) + "_0", x + random.nextFloat(), y - 0.4F, z + random.nextFloat(), 0.0D, 0.0D, 0.0D); } if (random.nextInt(12) == 0) { //TODO: getIdFromBlock() - world.spawnParticle("blockcrack_" + String.valueOf(Block.func_149682_b(this)) + "_0", x + random.nextFloat(), y + 1.0F, z + random.nextFloat(), 0.0D, 0.0D, 0.0D); + world.spawnParticle("blockcrack_" + String.valueOf(Block.getIdFromBlock(this)) + "_0", x + random.nextFloat(), y + 1.0F, z + random.nextFloat(), 0.0D, 0.0D, 0.0D); } } @Override //TODO: onEntityCollidedWithBlock() - public void func_149670_a(World world, int x, int y, int z, Entity entity) + public void onEntityCollidedWithBlock(World world, int x, int y, int z, Entity entity) { if (entity instanceof EntityPlayer) { @@ -86,21 +86,21 @@ public class BlockFlesh extends Block @Override //TODO: getItemDropped() - public Item func_149650_a(int metadata, Random random, int fortune) + public Item getItemDropped(int metadata, Random random, int fortune) { return BOPItemHelper.get("misc"); } @Override //TODO damageDropped() - public int func_149692_a(int meta) + public int damageDropped(int meta) { return 3; } @Override //TODO: getQuantityDropped() - public int func_149745_a(Random random) + public int quantityDropped(Random random) { return random.nextInt(5); } diff --git a/src/main/java/biomesoplenty/common/blocks/BlockGrave.java b/src/main/java/biomesoplenty/common/blocks/BlockGrave.java index 11a4d88c9..b9cb312ab 100644 --- a/src/main/java/biomesoplenty/common/blocks/BlockGrave.java +++ b/src/main/java/biomesoplenty/common/blocks/BlockGrave.java @@ -17,26 +17,26 @@ public class BlockGrave extends Block public BlockGrave() { //TODO: Material.rock - super(Material.field_151576_e); + super(Material.rock); //TODO: this.setHardness - this.func_149711_c(5f); + this.setHardness(5f); //TODO: this.setCreativeTab() - this.func_149647_a(BiomesOPlenty.tabBiomesOPlenty); + this.setCreativeTab(BiomesOPlenty.tabBiomesOPlenty); } @Override //TODO: registerIcons() - public void func_149651_a(IIconRegister iconRegister) + public void registerBlockIcons(IIconRegister iconRegister) { //TODO: blockIcon - this.field_149761_L = iconRegister.registerIcon("biomesoplenty:grave"); + this.blockIcon = iconRegister.registerIcon("biomesoplenty:grave"); } @Override //TODO: setBlockBoundsBasedOnState() - public void func_149719_a(IBlockAccess world, int x, int y, int z) + public void setBlockBoundsBasedOnState(IBlockAccess world, int x, int y, int z) { int meta = world.getBlockMetadata(x, y, z); @@ -44,36 +44,36 @@ public class BlockGrave extends Block { case 0: //TODO: setBlockBounds - this.func_149676_a(0.0F, 0.0F, 0.31F, 1.0F, 1.6875F, 0.69F); + this.setBlockBounds(0.0F, 0.0F, 0.31F, 1.0F, 1.6875F, 0.69F); break; case 1: //TODO: setBlockBounds - this.func_149676_a(0.0F, -1.0F, 0.31F, 1.0F, 0.6875F, 0.69F); + this.setBlockBounds(0.0F, -1.0F, 0.31F, 1.0F, 0.6875F, 0.69F); break; case 2: //TODO: setBlockBounds - this.func_149676_a(0.31F, 0.0F, 0.0F, 0.69F, 1.6875F, 1.0F); + this.setBlockBounds(0.31F, 0.0F, 0.0F, 0.69F, 1.6875F, 1.0F); break; case 3: //TODO: setBlockBounds - this.func_149676_a(0.31F, -1.0F, 0.0F, 0.69F, 0.6875F, 1.0F); + this.setBlockBounds(0.31F, -1.0F, 0.0F, 0.69F, 0.6875F, 1.0F); break; } } @Override //TODO: onNeighborBlockChange() - public void func_149695_a(World world, int x, int y, int z, Block neighborBlock) + public void onNeighborBlockChange(World world, int x, int y, int z, Block neighborBlock) { if (neighborBlock == this) { if (world.getBlockMetadata(x, y, z) == 0 || world.getBlockMetadata(x, y, z) == 2) { //TODO: getBlock() - if (world.func_147439_a(x, y + 1, z) != this) + if (world.getBlock(x, y + 1, z) != this) { //TODO: destroyBlock() world.func_147480_a(x, y, z, true); @@ -82,7 +82,7 @@ public class BlockGrave extends Block else { //TODO: getBlock() - if (world.func_147439_a(x, y - 1, z) != this) + if (world.getBlock(x, y - 1, z) != this) { //TODO: destroyBlock() world.func_147480_a(x, y, z, true); @@ -104,28 +104,28 @@ public class BlockGrave extends Block @Override //TODO: renderAsNormalBlock() - public boolean func_149686_d() + public boolean renderAsNormalBlock() { return false; } @Override //TODO: isOpaqueCube() - public boolean func_149662_c() + public boolean isOpaqueCube() { return false; } @Override //TODO getRenderType() - public int func_149645_b() + public int getRenderType() { return RenderUtils.graveModel; } @Override //TODO shouldSideBeRendered - public boolean func_149646_a(IBlockAccess world, int x, int y, int z, int side) + public boolean shouldSideBeRendered(IBlockAccess world, int x, int y, int z, int side) { return true; } diff --git a/src/main/java/biomesoplenty/common/blocks/BlockHive.java b/src/main/java/biomesoplenty/common/blocks/BlockHive.java index 01abd22b4..aaad9bced 100644 --- a/src/main/java/biomesoplenty/common/blocks/BlockHive.java +++ b/src/main/java/biomesoplenty/common/blocks/BlockHive.java @@ -23,21 +23,21 @@ public class BlockHive extends Block public BlockHive() { //TODO: Material.wood - super(Material.field_151575_d); + super(Material.wood); //TODO: this.setHardness - this.func_149711_c(0.5F); + this.setHardness(0.5F); //TODO setStepSound(Block.soundGrassFootstep) - this.func_149672_a(Block.field_149779_h); + this.setStepSound(Block.soundTypeGrass); //TODO: this.setCreativeTab() - this.func_149647_a(BiomesOPlenty.tabBiomesOPlenty); + this.setCreativeTab(BiomesOPlenty.tabBiomesOPlenty); } @Override //TODO: breakBlock() - public void func_149749_a(World world, int x, int y, int z, Block par5, int par6) + public void breakBlock(World world, int x, int y, int z, Block par5, int par6) { if (world.getBlockMetadata(x, y, z) == 2) { @@ -49,7 +49,7 @@ public class BlockHive extends Block @Override //TODO: registerIcons() - public void func_149651_a(IIconRegister iconRegister) + public void registerBlockIcons(IIconRegister iconRegister) { textures = new IIcon[hiveTypes.length]; @@ -61,7 +61,7 @@ public class BlockHive extends Block @Override //TODO: getIcon() - public IIcon func_149691_a(int side, int meta) + public IIcon getIcon(int side, int meta) { if (meta < 0 || meta >= hiveTypes.length) { @@ -73,7 +73,7 @@ public class BlockHive extends Block @Override //TODO: getSubBlocks() - public void func_149666_a(Item block, CreativeTabs creativeTabs, List list) + public void getSubBlocks(Item block, CreativeTabs creativeTabs, List list) { for (int i = 0; i < hiveTypes.length; ++i) { @@ -83,7 +83,7 @@ public class BlockHive extends Block @Override //TODO: getItemDropped() - public Item func_149650_a(int metadata, Random random, int fortune) + public Item getItemDropped(int metadata, Random random, int fortune) { if (metadata == 0) { @@ -96,12 +96,12 @@ public class BlockHive extends Block } //TODO: getItemFromBlock() - return Item.func_150898_a(this); + return Item.getItemFromBlock(this); } @Override //TODO damageDropped() - public int func_149692_a(int meta) + public int damageDropped(int meta) { if (meta == 0) { diff --git a/src/main/java/biomesoplenty/common/blocks/BlockHoney.java b/src/main/java/biomesoplenty/common/blocks/BlockHoney.java index dff3e5ac3..2baa0b692 100644 --- a/src/main/java/biomesoplenty/common/blocks/BlockHoney.java +++ b/src/main/java/biomesoplenty/common/blocks/BlockHoney.java @@ -11,43 +11,43 @@ public class BlockHoney extends Block public BlockHoney() { //TODO: Material.glass - super(Material.field_151592_s); + super(Material.glass); //TODO: this.setHardness - this.func_149711_c(0.5F); + this.setHardness(0.5F); //TODO setStepSound(Block.soundStoneFootstep) - this.func_149672_a(Block.field_149780_i); + this.setStepSound(Block.soundTypePiston); //TODO: this.setCreativeTab() - this.func_149647_a(BiomesOPlenty.tabBiomesOPlenty); + this.setCreativeTab(BiomesOPlenty.tabBiomesOPlenty); } @Override //TODO: registerIcons() - public void func_149651_a(IIconRegister iconRegister) + public void registerBlockIcons(IIconRegister iconRegister) { //TODO: blockIcon - this.field_149761_L = iconRegister.registerIcon("biomesoplenty:honeyblock"); + this.blockIcon = iconRegister.registerIcon("biomesoplenty:honeyblock"); } @Override //TODO: getRenderBlockPass() - public int func_149701_w() + public int getRenderBlockPass() { return 1; } @Override //TODO shouldSideBeRendered - public boolean func_149646_a(IBlockAccess world, int x, int y, int z, int side) + public boolean shouldSideBeRendered(IBlockAccess world, int x, int y, int z, int side) { - return super.func_149646_a(world, x, y, z, 1 - side); + return super.shouldSideBeRendered(world, x, y, z, 1 - side); } @Override //TODO: isOpaqueCube() - public boolean func_149662_c() + public boolean isOpaqueCube() { return false; } diff --git a/src/main/java/biomesoplenty/common/blocks/BlockIvy.java b/src/main/java/biomesoplenty/common/blocks/BlockIvy.java index ff56c87db..f81d807df 100644 --- a/src/main/java/biomesoplenty/common/blocks/BlockIvy.java +++ b/src/main/java/biomesoplenty/common/blocks/BlockIvy.java @@ -11,23 +11,23 @@ public class BlockIvy extends BlockVine implements IShearable public BlockIvy() { //TODO: this.setHardness - this.func_149711_c(0.2F); + this.setHardness(0.2F); //TODO setStepSound(Block.soundGrassFootstep) - this.func_149672_a(Block.field_149779_h); + this.setStepSound(Block.soundTypeGrass); //TODO: setTickRandomly() - this.func_149675_a(true); + this.setTickRandomly(true); //TODO: this.setCreativeTab() - this.func_149647_a(BiomesOPlenty.tabBiomesOPlenty); + this.setCreativeTab(BiomesOPlenty.tabBiomesOPlenty); } @Override //TODO: registerIcons() - public void func_149651_a(IIconRegister iconRegister) + public void registerBlockIcons(IIconRegister iconRegister) { //TODO: blockIcon - this.field_149761_L = iconRegister.registerIcon("biomesoplenty:ivy"); + this.blockIcon = iconRegister.registerIcon("biomesoplenty:ivy"); } } diff --git a/src/main/java/biomesoplenty/common/blocks/BlockLongGrass.java b/src/main/java/biomesoplenty/common/blocks/BlockLongGrass.java index d214aa061..d1b3cd586 100644 --- a/src/main/java/biomesoplenty/common/blocks/BlockLongGrass.java +++ b/src/main/java/biomesoplenty/common/blocks/BlockLongGrass.java @@ -22,25 +22,25 @@ public class BlockLongGrass extends Block public BlockLongGrass() { //TODO: Material.grass - super(Material.field_151577_b); + super(Material.grass); //TODO: this.setHardness - this.func_149711_c(0.6F); + this.setHardness(0.6F); this.setHarvestLevel("shovel", 0); //TODO setStepSound(Block.soundGrassFootstep) - this.func_149672_a(Block.field_149779_h); + this.setStepSound(Block.soundTypeGrass); //TODO: setTickRandomly() - this.func_149675_a(true); + this.setTickRandomly(true); //TODO: this.setCreativeTab() - this.func_149647_a(BiomesOPlenty.tabBiomesOPlenty); + this.setCreativeTab(BiomesOPlenty.tabBiomesOPlenty); } @Override //TODO: registerIcons() - public void func_149651_a(IIconRegister iconRegister) + public void registerBlockIcons(IIconRegister iconRegister) { this.icons[0] = iconRegister.registerIcon("biomesoplenty:longgrass3"); this.icons[1] = iconRegister.registerIcon("biomesoplenty:longgrass1"); @@ -52,7 +52,7 @@ public class BlockLongGrass extends Block @Override //TODO: getIcon() - public IIcon func_149691_a(int side, int meta) + public IIcon getIcon(int side, int meta) { if (side < 0 || side >= this.icons.length) side = 1; @@ -67,7 +67,7 @@ public class BlockLongGrass extends Block @Override //TODO: onBlockActivated() - public boolean func_149727_a(World world, int x, int y, int z, EntityPlayer player, int side, float hitVecX, float hitVecY, float hitVecZ) + public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer player, int side, float hitVecX, float hitVecY, float hitVecZ) { if (player.getCurrentEquippedItem() != null) { @@ -76,12 +76,12 @@ public class BlockLongGrass extends Block Block tilledField = Blocks.farmland; //TODO: stepSound.getPlaceSound() stepSound.getVolume() stepSound.getPitch() - world.playSoundEffect(x + 0.5F, y + 0.5F, z + 0.5F, tilledField.field_149762_H.func_150496_b(), (tilledField.field_149762_H.func_150497_c() + 1.0F) / 2.0F, tilledField.field_149762_H.func_150494_d() * 0.8F); + world.playSoundEffect(x + 0.5F, y + 0.5F, z + 0.5F, tilledField.stepSound.func_150496_b(), (tilledField.stepSound.getVolume() + 1.0F) / 2.0F, tilledField.stepSound.getPitch() * 0.8F); if (!world.isRemote) { //TODO: setBlock() - world.func_147465_d(x, y, z, tilledField, 0, 2); + world.setBlock(x, y, z, tilledField, 0, 2); } return true; @@ -99,14 +99,14 @@ public class BlockLongGrass extends Block @Override //TODO: updateTick() - public void func_149674_a(World world, int x, int y, int z, Random random) + public void updateTick(World world, int x, int y, int z, Random random) { if (!world.isRemote) { if (world.getBlockLightValue(x, y + 1, z) < 4 && world.getBlockLightOpacity(x, y + 1, z) > 2) { //TODO: setBlock() - world.func_147465_d(x, y, z, Blocks.dirt, 0, 2); + world.setBlock(x, y, z, Blocks.dirt, 0, 2); } else if (world.getBlockLightValue(x, y + 1, z) >= 9) { @@ -116,13 +116,13 @@ public class BlockLongGrass extends Block int rY = y + random.nextInt(5) - 3; int rZ = z + random.nextInt(3) - 1; //TODO: getBlock() - Block block = world.func_147439_a(rX, rY + 1, rZ); + Block block = world.getBlock(rX, rY + 1, rZ); //TODO: getBlock() - if (world.func_147439_a(rX, rY, rZ) == Blocks.dirt && world.getBlockLightValue(rX, rY + 1, rZ) >= 4 && world.getBlockLightOpacity(rX, rY + 1, rZ) <= 2) + if (world.getBlock(rX, rY, rZ) == Blocks.dirt && world.getBlockLightValue(rX, rY + 1, rZ) >= 4 && world.getBlockLightOpacity(rX, rY + 1, rZ) <= 2) { //TODO: setBlock() - world.func_147465_d(rX, rY, rZ, this, 0, 2); + world.setBlock(rX, rY, rZ, this, 0, 2); } } } @@ -131,9 +131,9 @@ public class BlockLongGrass extends Block @Override //TODO: getItemDropped() - public Item func_149650_a(int metadata, Random random, int fortune) + public Item getItemDropped(int metadata, Random random, int fortune) { //TODO: getItemDropped() - return Blocks.dirt.func_149650_a(0, random, fortune); + return Blocks.dirt.getItemDropped(0, random, fortune); } } diff --git a/src/main/java/biomesoplenty/common/blocks/BlockMoss.java b/src/main/java/biomesoplenty/common/blocks/BlockMoss.java index 3cc86a3c8..80a8aa607 100644 --- a/src/main/java/biomesoplenty/common/blocks/BlockMoss.java +++ b/src/main/java/biomesoplenty/common/blocks/BlockMoss.java @@ -19,23 +19,23 @@ public class BlockMoss extends BlockVine public BlockMoss() { //TODO: this.setHardness - this.func_149711_c(0.2F); + this.setHardness(0.2F); //TODO setStepSound(Block.soundGrassFootstep) - this.func_149672_a(Block.field_149779_h); + this.setStepSound(Block.soundTypeGrass); //TODO: setTickRandomly() - this.func_149675_a(true); + this.setTickRandomly(true); //TODO: this.setCreativeTab() - this.func_149647_a(BiomesOPlenty.tabBiomesOPlenty); + this.setCreativeTab(BiomesOPlenty.tabBiomesOPlenty); } @Override //TODO: registerIcons() - public void func_149651_a(IIconRegister iconRegister) + public void registerBlockIcons(IIconRegister iconRegister) { //TODO: blockIcon - this.field_149761_L = iconRegister.registerIcon("biomesoplenty:moss"); + this.blockIcon = iconRegister.registerIcon("biomesoplenty:moss"); } } diff --git a/src/main/java/biomesoplenty/common/blocks/BlockMud.java b/src/main/java/biomesoplenty/common/blocks/BlockMud.java index 3b423ffed..f5469a968 100644 --- a/src/main/java/biomesoplenty/common/blocks/BlockMud.java +++ b/src/main/java/biomesoplenty/common/blocks/BlockMud.java @@ -27,22 +27,22 @@ public class BlockMud extends Block public BlockMud() { //TODO: Material.sand - super(Material.field_151595_p); + super(Material.sand); //TODO: this.setHardness - this.func_149711_c(0.6F); + this.setHardness(0.6F); this.setHarvestLevel("shovel", 0); //TODO setStepSound(Block.soundSandFootstep) - this.func_149672_a(Block.field_149776_m); + this.setStepSound(Block.soundTypeSand); //TODO: this.setCreativeTab() - this.func_149647_a(BiomesOPlenty.tabBiomesOPlenty); + this.setCreativeTab(BiomesOPlenty.tabBiomesOPlenty); } @Override //TODO: registerIcons() - public void func_149651_a(IIconRegister iconRegister) + public void registerBlockIcons(IIconRegister iconRegister) { textures = new IIcon[types.length]; @@ -54,7 +54,7 @@ public class BlockMud extends Block @Override //TODO: getIcon() - public IIcon func_149691_a(int side, int meta) + public IIcon getIcon(int side, int meta) { if (meta < 0 || meta >= textures.length) { meta = 0; @@ -65,7 +65,7 @@ public class BlockMud extends Block @Override //TODO: getSubBlocks() - public void func_149666_a(Item block, CreativeTabs creativeTabs, List list) + public void getSubBlocks(Item block, CreativeTabs creativeTabs, List list) { for (int i = 0; i < types.length; ++i) { @@ -75,7 +75,7 @@ public class BlockMud extends Block @Override //TODO: getCollisionBoundingBoxFromPool - public AxisAlignedBB func_149668_a(World world, int x, int y, int z) + public AxisAlignedBB getCollisionBoundingBoxFromPool(World world, int x, int y, int z) { if (world.getBlockMetadata(x, y, z) == 0) { @@ -88,7 +88,7 @@ public class BlockMud extends Block @Override //TODO: onEntityCollidedWithBlock() - public void func_149670_a(World world, int x, int y, int z, Entity entity) + public void onEntityCollidedWithBlock(World world, int x, int y, int z, Entity entity) { if (world.getBlockMetadata(x, y, z) == 0) { @@ -113,18 +113,18 @@ public class BlockMud extends Block //@Override //TODO: getItemDropped() - public Item func_149650_a(int metadata, Random random, int fortune) + public Item getItemDropped(int metadata, Random random, int fortune) { if (metadata == 0) return BOPItemHelper.get("mudball"); else //TODO: getItemFromBlock() - return Item.func_150898_a(this); + return Item.getItemFromBlock(this); } @Override //TODO damageDropped() - public int func_149692_a(int meta) + public int damageDropped(int meta) { return meta; } diff --git a/src/main/java/biomesoplenty/common/blocks/BlockOriginGrass.java b/src/main/java/biomesoplenty/common/blocks/BlockOriginGrass.java index 10b8e0be8..8c056e408 100644 --- a/src/main/java/biomesoplenty/common/blocks/BlockOriginGrass.java +++ b/src/main/java/biomesoplenty/common/blocks/BlockOriginGrass.java @@ -22,25 +22,25 @@ public class BlockOriginGrass extends Block public BlockOriginGrass() { //TODO: Material.grass - super(Material.field_151577_b); + super(Material.grass); //TODO: this.setHardness - this.func_149711_c(0.6F); + this.setHardness(0.6F); this.setHarvestLevel("shovel", 0); //TODO setStepSound(Block.soundGrassFootstep) - this.func_149672_a(Block.field_149779_h); + this.setStepSound(Block.soundTypeGrass); //TODO: setTickRandomly() - this.func_149675_a(true); + this.setTickRandomly(true); //TODO: this.setCreativeTab() - this.func_149647_a(BiomesOPlenty.tabBiomesOPlenty); + this.setCreativeTab(BiomesOPlenty.tabBiomesOPlenty); } @Override //TODO: registerIcons() - public void func_149651_a(IIconRegister iconRegister) + public void registerBlockIcons(IIconRegister iconRegister) { this.icon[0] = iconRegister.registerIcon("biomesoplenty:origingrass3"); this.icon[1] = iconRegister.registerIcon("biomesoplenty:origingrass1"); @@ -52,7 +52,7 @@ public class BlockOriginGrass extends Block @Override //TODO: getIcon() - public IIcon func_149691_a(int side, int meta) + public IIcon getIcon(int side, int meta) { if (side < 0 || side >= this.icon.length) side = 1; @@ -68,7 +68,7 @@ public class BlockOriginGrass extends Block @Override //TODO: onBlockActivated() - public boolean func_149727_a(World world, int x, int y, int z, EntityPlayer player, int side, float hitVecX, float hitVecY, float hitVecZ) + public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer player, int side, float hitVecX, float hitVecY, float hitVecZ) { if (player.getCurrentEquippedItem() != null) { @@ -77,12 +77,12 @@ public class BlockOriginGrass extends Block Block tilledField = Blocks.farmland; //TODO: stepSound.getPlaceSound() stepSound.getVolume() stepSound.getPitch() - world.playSoundEffect(x + 0.5F, y + 0.5F, z + 0.5F, tilledField.field_149762_H.func_150496_b(), (tilledField.field_149762_H.func_150497_c() + 1.0F) / 2.0F, tilledField.field_149762_H.func_150494_d() * 0.8F); + world.playSoundEffect(x + 0.5F, y + 0.5F, z + 0.5F, tilledField.stepSound.func_150496_b(), (tilledField.stepSound.getVolume() + 1.0F) / 2.0F, tilledField.stepSound.getPitch() * 0.8F); if (!world.isRemote) { //TODO: setBlock() - world.func_147465_d(x, y, z, tilledField, 0, 2); + world.setBlock(x, y, z, tilledField, 0, 2); } return true; @@ -100,14 +100,14 @@ public class BlockOriginGrass extends Block @Override //TODO: updateTick() - public void func_149674_a(World world, int x, int y, int z, Random random) + public void updateTick(World world, int x, int y, int z, Random random) { if (!world.isRemote) { if (world.getBlockLightValue(x, y + 1, z) < 4 && world.getBlockLightOpacity(x, y + 1, z) > 2) { //TODO: setBlock() - world.func_147465_d(x, y, z, Blocks.dirt, 0, 2); + world.setBlock(x, y, z, Blocks.dirt, 0, 2); } else if (world.getBlockLightValue(x, y + 1, z) >= 9) { @@ -117,13 +117,13 @@ public class BlockOriginGrass extends Block int rY = y + random.nextInt(5) - 3; int rZ = z + random.nextInt(3) - 1; //TODO: getBlock() - Block block = world.func_147439_a(rX, rY + 1, rZ); + Block block = world.getBlock(rX, rY + 1, rZ); //TODO: getBlock() - if (world.func_147439_a(rX, rY, rZ) == Blocks.dirt && world.getBlockLightValue(rX, rY + 1, rZ) >= 4 && world.getBlockLightOpacity(rX, rY + 1, rZ) <= 2) + if (world.getBlock(rX, rY, rZ) == Blocks.dirt && world.getBlockLightValue(rX, rY + 1, rZ) >= 4 && world.getBlockLightOpacity(rX, rY + 1, rZ) <= 2) { //TODO: setBlock() - world.func_147465_d(rX, rY, rZ, this, 0, 2); + world.setBlock(rX, rY, rZ, this, 0, 2); } } } @@ -132,9 +132,9 @@ public class BlockOriginGrass extends Block @Override //TODO: getItemDropped() - public Item func_149650_a(int metadata, Random random, int fortune) + public Item getItemDropped(int metadata, Random random, int fortune) { //TODO: getItemDropped() - return Blocks.dirt.func_149650_a(0, random, fortune); + return Blocks.dirt.getItemDropped(0, random, fortune); } } diff --git a/src/main/java/biomesoplenty/common/blocks/BlockOvergrownNetherrack.java b/src/main/java/biomesoplenty/common/blocks/BlockOvergrownNetherrack.java index 4bc3f0b52..8f8ef7e33 100644 --- a/src/main/java/biomesoplenty/common/blocks/BlockOvergrownNetherrack.java +++ b/src/main/java/biomesoplenty/common/blocks/BlockOvergrownNetherrack.java @@ -20,24 +20,24 @@ public class BlockOvergrownNetherrack extends Block public BlockOvergrownNetherrack() { //TODO: Material.rock - super(Material.field_151576_e); + super(Material.rock); //TODO: this.setHardness - this.func_149711_c(0.4F); + this.setHardness(0.4F); //TODO setStepSound(Block.soundGrassFootstep) - this.func_149672_a(Block.field_149779_h); + this.setStepSound(Block.soundTypeGrass); //TODO: setTickRandomly() - this.func_149675_a(true); + this.setTickRandomly(true); //TODO: this.setCreativeTab() - this.func_149647_a(BiomesOPlenty.tabBiomesOPlenty); + this.setCreativeTab(BiomesOPlenty.tabBiomesOPlenty); } @Override //TODO: registerIcons() - public void func_149651_a(IIconRegister iconRegister) + public void registerBlockIcons(IIconRegister iconRegister) { this.icons[0] = iconRegister.registerIcon("biomesoplenty:overgrownnetherrack3"); this.icons[1] = iconRegister.registerIcon("biomesoplenty:overgrownnetherrack1"); @@ -49,7 +49,7 @@ public class BlockOvergrownNetherrack extends Block @Override //TODO: getIcon() - public IIcon func_149691_a(int side, int meta) + public IIcon getIcon(int side, int meta) { if (side < 0 || side >= this.icons.length) side = 1; @@ -64,8 +64,8 @@ public class BlockOvergrownNetherrack extends Block @Override //TODO: getItemDropped() - public Item func_149650_a(int metadata, Random random, int fortune) + public Item getItemDropped(int metadata, Random random, int fortune) { - return Blocks.netherrack.func_149650_a(0, random, fortune); + return Blocks.netherrack.getItemDropped(0, random, fortune); } } diff --git a/src/main/java/biomesoplenty/common/blocks/BlockPromisedPortal.java b/src/main/java/biomesoplenty/common/blocks/BlockPromisedPortal.java index f7273695d..0e8f17173 100644 --- a/src/main/java/biomesoplenty/common/blocks/BlockPromisedPortal.java +++ b/src/main/java/biomesoplenty/common/blocks/BlockPromisedPortal.java @@ -18,28 +18,28 @@ public class BlockPromisedPortal extends Block public BlockPromisedPortal() { //TODO: Material.portal - super(Material.field_151567_E); + super(Material.portal); //TODO: this.setUnbreakable() - this.func_149722_s(); + this.setBlockUnbreakable(); //TODO: this.setResistance - this.func_149752_b(6000000.0F); + this.setResistance(6000000.0F); //TODO: this.setLightValue - this.func_149715_a(1.0F); + this.setLightLevel(1.0F); } @Override //TODO: registerIcons() - public void func_149651_a(IIconRegister iconRegister) + public void registerBlockIcons(IIconRegister iconRegister) { //TODO: blockIcon - this.field_149761_L = iconRegister.registerIcon("biomesoplenty:portal"); + this.blockIcon = iconRegister.registerIcon("biomesoplenty:portal"); } @Override //TODO: getRenderBlockPass() - public int func_149701_w() + public int getRenderBlockPass() { return 1; } @@ -47,29 +47,29 @@ public class BlockPromisedPortal extends Block @Override @SideOnly(Side.CLIENT) //TODO shouldSideBeRendered - public boolean func_149646_a(IBlockAccess world, int x, int y, int z, int side) + public boolean shouldSideBeRendered(IBlockAccess world, int x, int y, int z, int side) { //TODO: shouldSideBeRendered() - return super.func_149646_a(world, x, y, z, 1 - side); + return super.shouldSideBeRendered(world, x, y, z, 1 - side); } @Override //TODO: getCollisionBoundingBoxFromPool - public AxisAlignedBB func_149668_a(World world, int x, int y, int z) + public AxisAlignedBB getCollisionBoundingBoxFromPool(World world, int x, int y, int z) { return null; } @Override //TODO: isOpaqueCube() - public boolean func_149662_c() + public boolean isOpaqueCube() { return false; } @Override //TODO: onEntityCollidedWithBlock() - public void func_149670_a(World world, int x, int y, int z, Entity entity) + public void onEntityCollidedWithBlock(World world, int x, int y, int z, Entity entity) { if (entity.ridingEntity == null && entity.riddenByEntity == null) { diff --git a/src/main/java/biomesoplenty/common/blocks/BlockStoneFormations.java b/src/main/java/biomesoplenty/common/blocks/BlockStoneFormations.java index 11e36a24a..c60789784 100644 --- a/src/main/java/biomesoplenty/common/blocks/BlockStoneFormations.java +++ b/src/main/java/biomesoplenty/common/blocks/BlockStoneFormations.java @@ -25,27 +25,27 @@ public class BlockStoneFormations extends BOPBlockWorldDecor public BlockStoneFormations() { //TODO: Material.vine - super(Material.field_151582_l); + super(Material.vine); //TODO: this.setHardness - this.func_149711_c(0.5F); + this.setHardness(0.5F); //TODO setStepSound(Block.soundStoneFootstep) - this.func_149672_a(Block.field_149780_i); + this.setStepSound(Block.soundTypePiston); //TODO: setTickRandomly() - this.func_149675_a(true); + this.setTickRandomly(true); float var4 = 0.2F; //TODO: setBlockBounds - this.func_149676_a(0.5F - var4, 0.0F, 0.5F - var4, 0.5F + var4, var4 * 3.0F, 0.5F + var4); + this.setBlockBounds(0.5F - var4, 0.0F, 0.5F - var4, 0.5F + var4, var4 * 3.0F, 0.5F + var4); //TODO: this.setCreativeTab() - this.func_149647_a(BiomesOPlenty.tabBiomesOPlenty); + this.setCreativeTab(BiomesOPlenty.tabBiomesOPlenty); } @Override //TODO: registerIcons() - public void func_149651_a(IIconRegister iconRegister) + public void registerBlockIcons(IIconRegister iconRegister) { textures = new IIcon[forms.length]; @@ -56,7 +56,7 @@ public class BlockStoneFormations extends BOPBlockWorldDecor @Override //TODO: getIcon() - public IIcon func_149691_a(int side, int meta) + public IIcon getIcon(int side, int meta) { if (meta < 0 || meta >= textures.length) { meta = 0; @@ -67,14 +67,14 @@ public class BlockStoneFormations extends BOPBlockWorldDecor @Override //TODO getRenderType() - public int func_149645_b() + public int getRenderType() { return 1; } @Override //TODO: setBlockBoundsBasedOnState() - public void func_149719_a(IBlockAccess world, int x, int y, int z) + public void setBlockBoundsBasedOnState(IBlockAccess world, int x, int y, int z) { int meta = world.getBlockMetadata(x, y, z); @@ -82,7 +82,7 @@ public class BlockStoneFormations extends BOPBlockWorldDecor { default: //TODO: setBlockBounds - this.func_149676_a(0.0F, 0.0F, 0.0F, 1.0F, 1.0F, 1.0F); + this.setBlockBounds(0.0F, 0.0F, 0.0F, 1.0F, 1.0F, 1.0F); break; } } @@ -90,7 +90,7 @@ public class BlockStoneFormations extends BOPBlockWorldDecor @Override @SideOnly(Side.CLIENT) //TODO: getSubBlocks() - public void func_149666_a(Item block, CreativeTabs creativeTabs, List list) + public void getSubBlocks(Item block, CreativeTabs creativeTabs, List list) { for (int i = 0; i < forms.length; ++i) { @@ -101,9 +101,9 @@ public class BlockStoneFormations extends BOPBlockWorldDecor public boolean isValidPosition(World world, int x, int y, int z, int metadata) { //TODO: getBlock() - Block blockBottom = world.func_147439_a(x, y - 1, z); + Block blockBottom = world.getBlock(x, y - 1, z); //TODO: getBlock() - Block blockTop = world.func_147439_a(x, y + 1, z); + Block blockTop = world.getBlock(x, y + 1, z); switch (metadata) { @@ -120,14 +120,14 @@ public class BlockStoneFormations extends BOPBlockWorldDecor @Override //TODO: canReplace() - public boolean func_149705_a(World world, int x, int y, int z, int side, ItemStack itemStack) + public boolean canReplace(World world, int x, int y, int z, int side, ItemStack itemStack) { return isValidPosition(world, x, y, z, itemStack.getItemDamage()); } @Override //TODO: getDamageValue() - public int func_149643_k(World world, int x, int y, int z) + public int getDamageValue(World world, int x, int y, int z) { int meta = world.getBlockMetadata(x, y, z); @@ -136,14 +136,14 @@ public class BlockStoneFormations extends BOPBlockWorldDecor @Override //TODO damageDropped() - public int func_149692_a(int meta) + public int damageDropped(int meta) { return meta & 15; } @Override //TODO: isBlockReplaceable - public boolean func_149742_c(World world, int x, int y, int z) + public boolean canPlaceBlockAt(World world, int x, int y, int z) { return true; } diff --git a/src/main/java/biomesoplenty/common/blocks/BlockTreeMoss.java b/src/main/java/biomesoplenty/common/blocks/BlockTreeMoss.java index d37bfc5c7..8edda7cc5 100644 --- a/src/main/java/biomesoplenty/common/blocks/BlockTreeMoss.java +++ b/src/main/java/biomesoplenty/common/blocks/BlockTreeMoss.java @@ -11,23 +11,23 @@ public class BlockTreeMoss extends BlockVine public BlockTreeMoss() { //TODO: this.setHardness - this.func_149711_c(0.2F); + this.setHardness(0.2F); //TODO setStepSound(Block.soundGrassFootstep) - this.func_149672_a(Block.field_149779_h); + this.setStepSound(Block.soundTypeGrass); //TODO: setTickRandomly() - this.func_149675_a(true); + this.setTickRandomly(true); //TODO: this.setCreativeTab() - this.func_149647_a(BiomesOPlenty.tabBiomesOPlenty); + this.setCreativeTab(BiomesOPlenty.tabBiomesOPlenty); } @Override //TODO: registerIcons() - public void func_149651_a(IIconRegister iconRegister) + public void registerBlockIcons(IIconRegister iconRegister) { //TODO: blockIcon - this.field_149761_L = iconRegister.registerIcon("biomesoplenty:treemoss"); + this.blockIcon = iconRegister.registerIcon("biomesoplenty:treemoss"); } } diff --git a/src/main/java/biomesoplenty/common/blocks/BlockTurnip.java b/src/main/java/biomesoplenty/common/blocks/BlockTurnip.java index cc958eb66..ef29c7b8d 100644 --- a/src/main/java/biomesoplenty/common/blocks/BlockTurnip.java +++ b/src/main/java/biomesoplenty/common/blocks/BlockTurnip.java @@ -21,12 +21,12 @@ public class BlockTurnip extends BlockCrops public BlockTurnip() { //TODO: setTextureName() - this.func_149658_d("turnip"); + this.setBlockTextureName("turnip"); } @Override //TODO: getIcon() - public IIcon func_149691_a(int side, int meta) + public IIcon getIcon(int side, int meta) { if (meta < 7) { @@ -59,21 +59,21 @@ public class BlockTurnip extends BlockCrops //@Override //TODO damageDropped() - public int func_149692_a(int meta) + public int damageDropped(int meta) { return meta == 7 ? 11 : 0; } @Override //TODO: registerIcons() - public void func_149651_a(IIconRegister iconRegister) + public void registerBlockIcons(IIconRegister iconRegister) { this.iconArray = new IIcon[4]; for (int i = 0; i < this.iconArray.length; ++i) { //TODO: getTextureName() - this.iconArray[i] = iconRegister.registerIcon("biomesoplenty:" + this.func_149641_N() + "_stage_" + i); + this.iconArray[i] = iconRegister.registerIcon("biomesoplenty:" + this.getTextureName() + "_stage_" + i); } } } diff --git a/src/main/java/biomesoplenty/common/blocks/BlockWillow.java b/src/main/java/biomesoplenty/common/blocks/BlockWillow.java index 6e0aae2b2..0ab6be763 100644 --- a/src/main/java/biomesoplenty/common/blocks/BlockWillow.java +++ b/src/main/java/biomesoplenty/common/blocks/BlockWillow.java @@ -11,23 +11,23 @@ public class BlockWillow extends BlockVine public BlockWillow() { //TODO: this.setHardness - this.func_149711_c(0.2F); + this.setHardness(0.2F); //TODO setStepSound(Block.soundGrassFootstep) - this.func_149672_a(Block.field_149779_h); + this.setStepSound(Block.soundTypeGrass); //TODO: setTickRandomly() - this.func_149675_a(true); + this.setTickRandomly(true); //TODO: this.setCreativeTab() - this.func_149647_a(BiomesOPlenty.tabBiomesOPlenty); + this.setCreativeTab(BiomesOPlenty.tabBiomesOPlenty); } @Override //TODO: registerIcons() - public void func_149651_a(IIconRegister iconRegister) + public void registerBlockIcons(IIconRegister iconRegister) { //TODO: blockIcon - this.field_149761_L = iconRegister.registerIcon("biomesoplenty:willow"); + this.blockIcon = iconRegister.registerIcon("biomesoplenty:willow"); } } diff --git a/src/main/java/biomesoplenty/common/blocks/templates/BOPBlockWorldDecor.java b/src/main/java/biomesoplenty/common/blocks/templates/BOPBlockWorldDecor.java index 98b19ba0f..e1139cea6 100644 --- a/src/main/java/biomesoplenty/common/blocks/templates/BOPBlockWorldDecor.java +++ b/src/main/java/biomesoplenty/common/blocks/templates/BOPBlockWorldDecor.java @@ -19,28 +19,28 @@ public abstract class BOPBlockWorldDecor extends BlockBush public boolean isValidPosition(World world, int x, int y, int z, int metadata) { //TODO: getBlock() - if (world.func_147439_a(x, y - 1, z) == Blocks.air) return false; + if (world.getBlock(x, y - 1, z) == Blocks.air) return false; //TODO: canPlaceBlockAt() - return func_149742_c(world, x, y, z); + return canPlaceBlockAt(world, x, y, z); } @Override //TODO: updateTick() - public void func_149674_a(World world, int x, int y, int z, Random random) + public void updateTick(World world, int x, int y, int z, Random random) { //TODO: getBlock() - Block block = world.func_147439_a(x, y, z); + Block block = world.getBlock(x, y, z); this.dropIfCantStay(world, x, y, z, new ItemStack(block, 1, world.getBlockMetadata(x, y, z))); } @Override //TODO: canReplace() - public boolean func_149705_a(World world, int x, int y, int z, int side, ItemStack itemStack) + public boolean canReplace(World world, int x, int y, int z, int side, ItemStack itemStack) { //TODO: getBlock() - if (world.func_147439_a(x, y - 1, z) == Blocks.air) return false; + if (world.getBlock(x, y - 1, z) == Blocks.air) return false; return isValidPosition(world, x, y, z, itemStack.getItemDamage()); } @@ -48,20 +48,20 @@ public abstract class BOPBlockWorldDecor extends BlockBush public void dropIfCantStay(World world, int x, int y, int z, ItemStack stack) { //TODO: canReplace - if (!this.func_149705_a(world, x, y, z, 0, stack)) + if (!this.canReplace(world, x, y, z, 0, stack)) { //TODO: dropBlockAsItem() - this.func_149697_b(world, x, y, z, world.getBlockMetadata(x, y, z), 0); + this.dropBlockAsItem(world, x, y, z, world.getBlockMetadata(x, y, z), 0); //TODO: setBlockToAir() - world.func_147468_f(x, y, z); + world.setBlockToAir(x, y, z); } } @Override //TODO: onNeighborBlockChange() - public void func_149695_a(World world, int x, int y, int z, Block neighborBlock) + public void onNeighborBlockChange(World world, int x, int y, int z, Block neighborBlock) { //TODO: getBlock() - dropIfCantStay(world, x, y, z, new ItemStack(world.func_147439_a(x, y, z), 1, world.getBlockMetadata(x, y, z))); + dropIfCantStay(world, x, y, z, new ItemStack(world.getBlock(x, y, z), 1, world.getBlockMetadata(x, y, z))); } } diff --git a/src/main/java/biomesoplenty/common/core/BOPBiomes.java b/src/main/java/biomesoplenty/common/core/BOPBiomes.java index 44a611baa..78f935cbd 100644 --- a/src/main/java/biomesoplenty/common/core/BOPBiomes.java +++ b/src/main/java/biomesoplenty/common/core/BOPBiomes.java @@ -95,15 +95,15 @@ public class BOPBiomes registerVanillaBiome(new BOPBiomeEntry(BiomeGenBase.desert, TemperatureType.HOT, 50)); registerVanillaBiome(new BOPBiomeEntry(BiomeGenBase.desert, TemperatureType.HOT, 50)); registerVanillaBiome(new BOPBiomeEntry(BiomeGenBase.desert, TemperatureType.HOT, 50)); - registerVanillaBiome(new BOPBiomeEntry(BiomeGenBase.field_150588_X, TemperatureType.HOT, 50)); - registerVanillaBiome(new BOPBiomeEntry(BiomeGenBase.field_150588_X, TemperatureType.HOT, 50)); + registerVanillaBiome(new BOPBiomeEntry(BiomeGenBase.savanna, TemperatureType.HOT, 50)); + registerVanillaBiome(new BOPBiomeEntry(BiomeGenBase.savanna, TemperatureType.HOT, 50)); registerVanillaBiome(new BOPBiomeEntry(BiomeGenBase.plains, TemperatureType.HOT, 50)); registerVanillaBiome(new BOPBiomeEntry(BiomeGenBase.forest, TemperatureType.WARM, 50)); - registerVanillaBiome(new BOPBiomeEntry(BiomeGenBase.field_150585_R, TemperatureType.WARM, 50)); + registerVanillaBiome(new BOPBiomeEntry(BiomeGenBase.roofedForest, TemperatureType.WARM, 50)); registerVanillaBiome(new BOPBiomeEntry(BiomeGenBase.extremeHills, TemperatureType.WARM, 50)); registerVanillaBiome(new BOPBiomeEntry(BiomeGenBase.plains, TemperatureType.WARM, 50)); - registerVanillaBiome(new BOPBiomeEntry(BiomeGenBase.field_150583_P, TemperatureType.WARM, 50)); + registerVanillaBiome(new BOPBiomeEntry(BiomeGenBase.birchForest, TemperatureType.WARM, 50)); registerVanillaBiome(new BOPBiomeEntry(BiomeGenBase.swampland, TemperatureType.WARM, 50)); registerVanillaBiome(new BOPBiomeEntry(BiomeGenBase.forest, TemperatureType.COOL, 50)); @@ -114,7 +114,7 @@ public class BOPBiomes registerVanillaBiome(new BOPBiomeEntry(BiomeGenBase.icePlains, TemperatureType.ICY, 50)); registerVanillaBiome(new BOPBiomeEntry(BiomeGenBase.icePlains, TemperatureType.ICY, 50)); registerVanillaBiome(new BOPBiomeEntry(BiomeGenBase.icePlains, TemperatureType.ICY, 50)); - registerVanillaBiome(new BOPBiomeEntry(BiomeGenBase.field_150584_S, TemperatureType.ICY, 50)); + registerVanillaBiome(new BOPBiomeEntry(BiomeGenBase.coldTaiga, TemperatureType.ICY, 50)); registerBiome(new BOPBiomeEntry(new BiomeGenAlps(BOPConfigurationIDs.alpsID).setBiomeName("Alps"), TemperatureType.ICY, 25)); registerBiome(new BOPBiomeEntry(new BiomeGenArctic(BOPConfigurationIDs.arcticID).setBiomeName("Arctic"), TemperatureType.ICY, 50)); @@ -189,9 +189,9 @@ public class BOPBiomes addSpawnBiome(BiomeGenBase.beach); //TODO: stoneBeach - addSpawnBiome(BiomeGenBase.field_150576_N); + addSpawnBiome(BiomeGenBase.stoneBeach); //TODO: coldBeach - addSpawnBiome(BiomeGenBase.field_150577_O); + addSpawnBiome(BiomeGenBase.coldBeach); } else { diff --git a/src/main/java/biomesoplenty/common/core/BOPBlocks.java b/src/main/java/biomesoplenty/common/core/BOPBlocks.java index 14c2b6977..defccb18f 100644 --- a/src/main/java/biomesoplenty/common/core/BOPBlocks.java +++ b/src/main/java/biomesoplenty/common/core/BOPBlocks.java @@ -104,133 +104,133 @@ public class BOPBlocks // Block declaration //TODO: setBlockName - registerBlock(new BlockMud().func_149663_c("mud"), ItemBlockMud.class); + registerBlock(new BlockMud().setBlockName("mud"), ItemBlockMud.class); //TODO: rock - registerBlock(new BlockBOPGeneric(Material.field_151576_e, BlockType.DRIED_DIRT).func_149663_c("driedDirt")); - registerBlock(new BlockBOPRedRock().func_149663_c("redRock"), ItemBlockRedRock.class); - registerBlock(new BlockAsh().func_149663_c("ash")); - registerBlock(new BlockFlesh().func_149663_c("flesh")); - registerBlock(new BlockBOPPlant().func_149663_c("plants"), ItemBlockPlant.class); - registerBlock(new BlockBOPFlower().func_149663_c("flowers"), ItemBlockFlower.class); - registerBlock(new BlockBOPFlower2().func_149663_c("flowers2"), ItemBlockFlower2.class); - registerBlock(new BlockStoneFormations().func_149663_c("stoneFormations"), ItemBlockStoneFormations.class); - registerBlock(new BlockBOPMushroom().func_149663_c("mushrooms"), ItemBlockMushroom.class); - registerBlock(new BlockBOPCoral().func_149663_c("coral"), ItemBlockCoral.class); - registerBlock(new BlockWillow().func_149663_c("willow"), ItemBlockWillow.class); - registerBlock(new BlockIvy().func_149663_c("ivy"), ItemBlockIvy.class); - registerBlock(new BlockBOPLeaves(LeafCategory.CAT1).func_149663_c("leaves1"), ItemBlockLeaves.class); - registerBlock(new BlockBOPLeaves(LeafCategory.CAT2).func_149663_c("leaves2"), ItemBlockLeaves.class); - registerBlock(new BlockBOPLeaves(LeafCategory.CAT3).func_149663_c("leaves3"), ItemBlockLeaves.class); - registerBlock(new BlockBOPLeaves(LeafCategory.CAT4).func_149663_c("leaves4"), ItemBlockLeaves.class); - registerBlock(new BlockBOPFoliage().func_149663_c("foliage"), ItemBlockFoliage.class); - registerBlock(new BlockTurnip().func_149663_c("turnip")); + registerBlock(new BlockBOPGeneric(Material.rock, BlockType.DRIED_DIRT).setBlockName("driedDirt")); + registerBlock(new BlockBOPRedRock().setBlockName("redRock"), ItemBlockRedRock.class); + registerBlock(new BlockAsh().setBlockName("ash")); + registerBlock(new BlockFlesh().setBlockName("flesh")); + registerBlock(new BlockBOPPlant().setBlockName("plants"), ItemBlockPlant.class); + registerBlock(new BlockBOPFlower().setBlockName("flowers"), ItemBlockFlower.class); + registerBlock(new BlockBOPFlower2().setBlockName("flowers2"), ItemBlockFlower2.class); + registerBlock(new BlockStoneFormations().setBlockName("stoneFormations"), ItemBlockStoneFormations.class); + registerBlock(new BlockBOPMushroom().setBlockName("mushrooms"), ItemBlockMushroom.class); + registerBlock(new BlockBOPCoral().setBlockName("coral"), ItemBlockCoral.class); + registerBlock(new BlockWillow().setBlockName("willow"), ItemBlockWillow.class); + registerBlock(new BlockIvy().setBlockName("ivy"), ItemBlockIvy.class); + registerBlock(new BlockBOPLeaves(LeafCategory.CAT1).setBlockName("leaves1"), ItemBlockLeaves.class); + registerBlock(new BlockBOPLeaves(LeafCategory.CAT2).setBlockName("leaves2"), ItemBlockLeaves.class); + registerBlock(new BlockBOPLeaves(LeafCategory.CAT3).setBlockName("leaves3"), ItemBlockLeaves.class); + registerBlock(new BlockBOPLeaves(LeafCategory.CAT4).setBlockName("leaves4"), ItemBlockLeaves.class); + registerBlock(new BlockBOPFoliage().setBlockName("foliage"), ItemBlockFoliage.class); + registerBlock(new BlockTurnip().setBlockName("turnip")); //TODO: rock - registerBlock(new BlockBOPGeneric(Material.field_151576_e, BlockType.ASH_STONE).func_149663_c("ashStone")); + registerBlock(new BlockBOPGeneric(Material.rock, BlockType.ASH_STONE).setBlockName("ashStone")); //TODO: rock - registerBlock(new BlockBOPGeneric(Material.field_151576_e, BlockType.HARD_ICE).func_149663_c("hardIce")); + registerBlock(new BlockBOPGeneric(Material.rock, BlockType.HARD_ICE).setBlockName("hardIce")); - registerBlock(new BlockBOPAppleLeaves().func_149663_c("appleLeaves"), ItemBlockAppleLeaves.class); - registerBlock(new BlockBOPPersimmonLeaves().func_149663_c("persimmonLeaves"), ItemBlockPersimmonLeaves.class); + registerBlock(new BlockBOPAppleLeaves().setBlockName("appleLeaves"), ItemBlockAppleLeaves.class); + registerBlock(new BlockBOPPersimmonLeaves().setBlockName("persimmonLeaves"), ItemBlockPersimmonLeaves.class); - registerBlock(new BlockBamboo().func_149663_c("bamboo"), ItemBlockBamboo.class); + registerBlock(new BlockBamboo().setBlockName("bamboo"), ItemBlockBamboo.class); //TODO: rock - registerBlock(new BlockBOPGeneric(Material.field_151576_e, BlockType.MUD_BRICK).func_149663_c("mudBricks")); + registerBlock(new BlockBOPGeneric(Material.rock, BlockType.MUD_BRICK).setBlockName("mudBricks")); - registerBlock(new BlockOriginGrass().func_149663_c("originGrass")); - registerBlock(new BlockLongGrass().func_149663_c("longGrass")); - registerBlock(new BlockOvergrownNetherrack().func_149663_c("overgrownNetherrack")); - registerBlock(new BlockBOPGrass().func_149663_c("grass")); + registerBlock(new BlockOriginGrass().setBlockName("originGrass")); + registerBlock(new BlockLongGrass().setBlockName("longGrass")); + registerBlock(new BlockOvergrownNetherrack().setBlockName("overgrownNetherrack")); + registerBlock(new BlockBOPGrass().setBlockName("grass")); - registerBlock(new BlockTreeMoss().func_149663_c("treeMoss")); + registerBlock(new BlockTreeMoss().setBlockName("treeMoss")); - registerBlock(new BlockBOPLog(LogCategory.CAT1).func_149663_c("logs1"), ItemBlockLog.class); - registerBlock(new BlockBOPLog(LogCategory.CAT2).func_149663_c("logs2"), ItemBlockLog.class); - registerBlock(new BlockBOPLog(LogCategory.CAT3).func_149663_c("logs3"), ItemBlockLog.class); - registerBlock(new BlockBOPLog(LogCategory.CAT4).func_149663_c("logs4"), ItemBlockLog.class); + registerBlock(new BlockBOPLog(LogCategory.CAT1).setBlockName("logs1"), ItemBlockLog.class); + registerBlock(new BlockBOPLog(LogCategory.CAT2).setBlockName("logs2"), ItemBlockLog.class); + registerBlock(new BlockBOPLog(LogCategory.CAT3).setBlockName("logs3"), ItemBlockLog.class); + registerBlock(new BlockBOPLog(LogCategory.CAT4).setBlockName("logs4"), ItemBlockLog.class); - registerBlock(new BlockBOPPetals().func_149663_c("petals"), ItemBlockPetals.class); + registerBlock(new BlockBOPPetals().setBlockName("petals"), ItemBlockPetals.class); - registerBlock(new BlockBOPSapling().func_149663_c("saplings"), ItemBlockSapling.class); - registerBlock(new BlockBOPColorizedSapling().func_149663_c("colorizedSaplings"), ItemBlockColorizedSapling.class); + registerBlock(new BlockBOPSapling().setBlockName("saplings"), ItemBlockSapling.class); + registerBlock(new BlockBOPColorizedSapling().setBlockName("colorizedSaplings"), ItemBlockColorizedSapling.class); //TODO: sand - registerBlock(new BlockBOPGeneric(Material.field_151595_p, BlockType.HARD_SAND).func_149663_c("hardSand")); + registerBlock(new BlockBOPGeneric(Material.sand, BlockType.HARD_SAND).setBlockName("hardSand")); //TODO: rock - registerBlock(new BlockBOPGeneric(Material.field_151576_e, BlockType.HARD_DIRT).func_149663_c("hardDirt")); + registerBlock(new BlockBOPGeneric(Material.rock, BlockType.HARD_DIRT).setBlockName("hardDirt")); //TODO: sand - registerBlock(new BlockBOPGeneric(Material.field_151595_p, BlockType.HOLY_DIRT).func_149663_c("holyDirt")); - registerBlock(new BlockBOPSkystone().func_149663_c("holyStone"), ItemBlockSkystone.class); + registerBlock(new BlockBOPGeneric(Material.sand, BlockType.HOLY_DIRT).setBlockName("holyDirt")); + registerBlock(new BlockBOPSkystone().setBlockName("holyStone"), ItemBlockSkystone.class); //TODO: glass - registerBlock(new BlockBOPGeneric(Material.field_151592_s, BlockType.CRYSTAL).func_149663_c("crystal")); - registerBlock(new BlockPromisedPortal().func_149663_c("promisedPortal")); + registerBlock(new BlockBOPGeneric(Material.glass, BlockType.CRYSTAL).setBlockName("crystal")); + registerBlock(new BlockPromisedPortal().setBlockName("promisedPortal")); - registerBlock(new BlockBOPGems().func_149663_c("gemOre"), ItemBlockGems.class); + registerBlock(new BlockBOPGems().setBlockName("gemOre"), ItemBlockGems.class); - registerBlock(new BlockMoss().func_149663_c("moss"), ItemBlockMoss.class); + registerBlock(new BlockMoss().setBlockName("moss"), ItemBlockMoss.class); //TODO: rock - registerBlock(new BlockBOPGeneric(Material.field_151576_e, BlockType.CRAG_ROCK).func_149663_c("cragRock")); + registerBlock(new BlockBOPGeneric(Material.rock, BlockType.CRAG_ROCK).setBlockName("cragRock")); - registerBlock(new BlockCloud().func_149663_c("cloud")); + registerBlock(new BlockCloud().setBlockName("cloud")); - registerBlock(new BlockHive().func_149663_c("hive"), ItemBlockHive.class); - registerBlock(new BlockHoney().func_149663_c("honeyBlock")); + registerBlock(new BlockHive().setBlockName("hive"), ItemBlockHive.class); + registerBlock(new BlockHoney().setBlockName("honeyBlock")); - registerBlock(new BlockBones().func_149663_c("bones"), ItemBlockBones.class); - registerBlock(new BlockGrave().func_149663_c("grave"), ItemBlockGrave.class); + registerBlock(new BlockBones().setBlockName("bones"), ItemBlockBones.class); + registerBlock(new BlockGrave().setBlockName("grave"), ItemBlockGrave.class); - registerBlock(new BlockBOPPlank().func_149663_c("planks"), ItemBlockPlank.class); + registerBlock(new BlockBOPPlank().setBlockName("planks"), ItemBlockPlank.class); //TODO: wood - BlockBOPSlab woodenSingleSlab1 = (BlockBOPSlab)new BlockBOPSlab(false, Material.field_151575_d, SlabCategory.WOOD1).func_149663_c("woodenSingleSlab1"); + BlockBOPSlab woodenSingleSlab1 = (BlockBOPSlab)new BlockBOPSlab(false, Material.wood, SlabCategory.WOOD1).setBlockName("woodenSingleSlab1"); //TODO: wood - BlockBOPSlab woodenDoubleSlab1 = (BlockBOPSlab)new BlockBOPSlab(true, Material.field_151575_d, SlabCategory.WOOD1).func_149663_c("woodenDoubleSlab1"); + BlockBOPSlab woodenDoubleSlab1 = (BlockBOPSlab)new BlockBOPSlab(true, Material.wood, SlabCategory.WOOD1).setBlockName("woodenDoubleSlab1"); registerBlock(woodenSingleSlab1, ItemBlockSlab.class, woodenSingleSlab1, woodenDoubleSlab1); registerBlock(woodenDoubleSlab1, ItemBlockSlab.class, woodenSingleSlab1, woodenDoubleSlab1); //TODO: wood - BlockBOPSlab woodenSingleSlab2 = (BlockBOPSlab)new BlockBOPSlab(false, Material.field_151575_d, SlabCategory.WOOD2).func_149663_c("woodenSingleSlab2"); + BlockBOPSlab woodenSingleSlab2 = (BlockBOPSlab)new BlockBOPSlab(false, Material.wood, SlabCategory.WOOD2).setBlockName("woodenSingleSlab2"); //TODO: wood - BlockBOPSlab woodenDoubleSlab2 = (BlockBOPSlab)new BlockBOPSlab(true, Material.field_151575_d, SlabCategory.WOOD2).func_149663_c("woodenDoubleSlab2"); + BlockBOPSlab woodenDoubleSlab2 = (BlockBOPSlab)new BlockBOPSlab(true, Material.wood, SlabCategory.WOOD2).setBlockName("woodenDoubleSlab2"); registerBlock(woodenSingleSlab2, ItemBlockSlab.class, woodenSingleSlab2, woodenDoubleSlab2); registerBlock(woodenDoubleSlab2, ItemBlockSlab.class, woodenSingleSlab2, woodenDoubleSlab2); //TODO: stone - BlockBOPSlab stoneSingleSlab = (BlockBOPSlab)new BlockBOPSlab(false, Material.field_151576_e, SlabCategory.STONE).func_149663_c("stoneSingleSlab"); + BlockBOPSlab stoneSingleSlab = (BlockBOPSlab)new BlockBOPSlab(false, Material.rock, SlabCategory.STONE).setBlockName("stoneSingleSlab"); //TODO: stone - BlockBOPSlab stoneDoubleSlab = (BlockBOPSlab)new BlockBOPSlab(true, Material.field_151576_e, SlabCategory.STONE).func_149663_c("stoneDoubleSlab"); + BlockBOPSlab stoneDoubleSlab = (BlockBOPSlab)new BlockBOPSlab(true, Material.rock, SlabCategory.STONE).setBlockName("stoneDoubleSlab"); registerBlock(stoneSingleSlab, ItemBlockSlab.class, stoneSingleSlab, stoneDoubleSlab); registerBlock(stoneDoubleSlab, ItemBlockSlab.class, stoneSingleSlab, stoneDoubleSlab); - registerBlock(new BlockBOPStairs(BOPBlockHelper.get("planks"), Category.SACREDOAK).func_149663_c("sacredoakStairs")); - registerBlock(new BlockBOPStairs(BOPBlockHelper.get("planks"), Category.CHERRY).func_149663_c("cherryStairs")); - registerBlock(new BlockBOPStairs(BOPBlockHelper.get("planks"), Category.DARK).func_149663_c("darkStairs")); - registerBlock(new BlockBOPStairs(BOPBlockHelper.get("planks"), Category.FIR).func_149663_c("firStairs")); - registerBlock(new BlockBOPStairs(BOPBlockHelper.get("planks"), Category.HOLY).func_149663_c("holyStairs")); - registerBlock(new BlockBOPStairs(BOPBlockHelper.get("planks"), Category.MAGIC).func_149663_c("magicStairs")); - registerBlock(new BlockBOPStairs(BOPBlockHelper.get("planks"), Category.MANGROVE).func_149663_c("mangroveStairs")); - registerBlock(new BlockBOPStairs(BOPBlockHelper.get("planks"), Category.PALM).func_149663_c("palmStairs")); - registerBlock(new BlockBOPStairs(BOPBlockHelper.get("planks"), Category.REDWOOD).func_149663_c("redwoodStairs")); - registerBlock(new BlockBOPStairs(BOPBlockHelper.get("planks"), Category.WILLOW).func_149663_c("willowStairs")); - registerBlock(new BlockBOPStairs(BOPBlockHelper.get("planks"), Category.PINE).func_149663_c("pineStairs")); - registerBlock(new BlockBOPStairs(BOPBlockHelper.get("planks"), Category.HELL_BARK).func_149663_c("hellBarkStairs")); - registerBlock(new BlockBOPStairs(BOPBlockHelper.get("planks"), Category.JACARANDA).func_149663_c("jacarandaStairs")); - registerBlock(new BlockBOPStairs(BOPBlockHelper.get("planks"), Category.MAHOGANY).func_149663_c("mahoganyStairs")); + registerBlock(new BlockBOPStairs(BOPBlockHelper.get("planks"), Category.SACREDOAK).setBlockName("sacredoakStairs")); + registerBlock(new BlockBOPStairs(BOPBlockHelper.get("planks"), Category.CHERRY).setBlockName("cherryStairs")); + registerBlock(new BlockBOPStairs(BOPBlockHelper.get("planks"), Category.DARK).setBlockName("darkStairs")); + registerBlock(new BlockBOPStairs(BOPBlockHelper.get("planks"), Category.FIR).setBlockName("firStairs")); + registerBlock(new BlockBOPStairs(BOPBlockHelper.get("planks"), Category.HOLY).setBlockName("holyStairs")); + registerBlock(new BlockBOPStairs(BOPBlockHelper.get("planks"), Category.MAGIC).setBlockName("magicStairs")); + registerBlock(new BlockBOPStairs(BOPBlockHelper.get("planks"), Category.MANGROVE).setBlockName("mangroveStairs")); + registerBlock(new BlockBOPStairs(BOPBlockHelper.get("planks"), Category.PALM).setBlockName("palmStairs")); + registerBlock(new BlockBOPStairs(BOPBlockHelper.get("planks"), Category.REDWOOD).setBlockName("redwoodStairs")); + registerBlock(new BlockBOPStairs(BOPBlockHelper.get("planks"), Category.WILLOW).setBlockName("willowStairs")); + registerBlock(new BlockBOPStairs(BOPBlockHelper.get("planks"), Category.PINE).setBlockName("pineStairs")); + registerBlock(new BlockBOPStairs(BOPBlockHelper.get("planks"), Category.HELL_BARK).setBlockName("hellBarkStairs")); + registerBlock(new BlockBOPStairs(BOPBlockHelper.get("planks"), Category.JACARANDA).setBlockName("jacarandaStairs")); + registerBlock(new BlockBOPStairs(BOPBlockHelper.get("planks"), Category.MAHOGANY).setBlockName("mahoganyStairs")); - registerBlock(new BlockBOPStairs(BOPBlockHelper.get("redRock"), Category.RED_COBBLE).func_149663_c("redCobbleStairs")); - registerBlock(new BlockBOPStairs(BOPBlockHelper.get("redRock"), Category.RED_BRICKS).func_149663_c("redBricksStairs")); + registerBlock(new BlockBOPStairs(BOPBlockHelper.get("redRock"), Category.RED_COBBLE).setBlockName("redCobbleStairs")); + registerBlock(new BlockBOPStairs(BOPBlockHelper.get("redRock"), Category.RED_BRICKS).setBlockName("redBricksStairs")); - registerBlock(new BlockBOPStairs(BOPBlockHelper.get("holyStone"), Category.HOLY_COBBLE).func_149663_c("holyCobbleStairs")); - registerBlock(new BlockBOPStairs(BOPBlockHelper.get("holyStone"), Category.HOLY_BRICKS).func_149663_c("holyBricksStairs")); - registerBlock(new BlockBOPStairs(BOPBlockHelper.get("redRock"), Category.MUD_BRICKS).func_149663_c("mudBricksStairs")); + registerBlock(new BlockBOPStairs(BOPBlockHelper.get("holyStone"), Category.HOLY_COBBLE).setBlockName("holyCobbleStairs")); + registerBlock(new BlockBOPStairs(BOPBlockHelper.get("holyStone"), Category.HOLY_BRICKS).setBlockName("holyBricksStairs")); + registerBlock(new BlockBOPStairs(BOPBlockHelper.get("redRock"), Category.MUD_BRICKS).setBlockName("mudBricksStairs")); - registerBlock(new BlockBOPColorizedLeaves(ColourizedLeafCategory.CAT1).func_149663_c("colorizedLeaves1"), ItemBlockColorizedLeaves.class); - registerBlock(new BlockBOPColorizedLeaves(ColourizedLeafCategory.CAT2).func_149663_c("colorizedLeaves2"), ItemBlockColorizedLeaves.class); + registerBlock(new BlockBOPColorizedLeaves(ColourizedLeafCategory.CAT1).setBlockName("colorizedLeaves1"), ItemBlockColorizedLeaves.class); + registerBlock(new BlockBOPColorizedLeaves(ColourizedLeafCategory.CAT2).setBlockName("colorizedLeaves2"), ItemBlockColorizedLeaves.class); } private static void setFireInfo() @@ -273,18 +273,18 @@ public class BOPBlocks public static void registerBlock(Block block) { //TODO: getUnlocalizedName() - GameRegistry.registerBlock(block, block.func_149739_a().replace("tile.", "")); + GameRegistry.registerBlock(block, block.getUnlocalizedName().replace("tile.", "")); } public static void registerBlock(Block block, Class itemBlockClass) { //TODO: getUnlocalizedName() - GameRegistry.registerBlock(block, itemBlockClass, block.func_149739_a().replace("tile.", "")); + GameRegistry.registerBlock(block, itemBlockClass, block.getUnlocalizedName().replace("tile.", "")); } public static void registerBlock(Block block, Class itemBlockClass, Object... constructorArgs) { //TODO: getUnlocalizedName() - GameRegistry.registerBlock(block, itemBlockClass, block.func_149739_a().replace("tile.", ""), null, constructorArgs); + GameRegistry.registerBlock(block, itemBlockClass, block.getUnlocalizedName().replace("tile.", ""), null, constructorArgs); } } diff --git a/src/main/java/biomesoplenty/common/core/BOPFluids.java b/src/main/java/biomesoplenty/common/core/BOPFluids.java index a68db959e..87ac4cced 100644 --- a/src/main/java/biomesoplenty/common/core/BOPFluids.java +++ b/src/main/java/biomesoplenty/common/core/BOPFluids.java @@ -33,9 +33,9 @@ public class BOPFluids private static void registerFluidBlocks() { //TODO: setBlockName - registerBlock(new BlockPoisonFluid().func_149663_c("poison")); - registerBlock(new BlockSpringWaterFluid().func_149663_c("springWater")); - registerBlock(new BlockHoneyFluid().func_149663_c("honey")); + registerBlock(new BlockPoisonFluid().setBlockName("poison")); + registerBlock(new BlockSpringWaterFluid().setBlockName("springWater")); + registerBlock(new BlockHoneyFluid().setBlockName("honey")); } private static void registerFluidItems() diff --git a/src/main/java/biomesoplenty/common/core/BOPPotions.java b/src/main/java/biomesoplenty/common/core/BOPPotions.java index 053e96de3..0dc376cb8 100644 --- a/src/main/java/biomesoplenty/common/core/BOPPotions.java +++ b/src/main/java/biomesoplenty/common/core/BOPPotions.java @@ -42,7 +42,7 @@ public class BOPPotions for (Field f : fields) { - if (f.getName().equals("potionTypes") || f.getName().equals("field_76425_a")) + if (f.getName().equals("potionTypes") || f.getName().equals("potionTypes")) { field = f; break; diff --git a/src/main/java/biomesoplenty/common/core/BOPVanillaCompat.java b/src/main/java/biomesoplenty/common/core/BOPVanillaCompat.java index a09c4a08b..d20ecc198 100644 --- a/src/main/java/biomesoplenty/common/core/BOPVanillaCompat.java +++ b/src/main/java/biomesoplenty/common/core/BOPVanillaCompat.java @@ -34,9 +34,9 @@ public class BOPVanillaCompat private static void registerDispenserBehaviours() { //TODO: dispenseBehaviourRegistry - BlockDispenser.field_149943_a.putObject(BOPItemHelper.get("mudball"), new DispenserBehaviourMudball()); + BlockDispenser.dispenseBehaviorRegistry.putObject(BOPItemHelper.get("mudball"), new DispenserBehaviourMudball()); //TODO: dispenseBehaviourRegistry - BlockDispenser.field_149943_a.putObject(BOPItemHelper.get("dart"), new DispenserBehaviourDart()); + BlockDispenser.dispenseBehaviorRegistry.putObject(BOPItemHelper.get("dart"), new DispenserBehaviourDart()); } private static void addDungeonLoot() @@ -70,7 +70,7 @@ public class BOPVanillaCompat bonusChest.addItem(new WeightedRandomChestContent(new ItemStack(BOPItemHelper.get("wadingBoots"), 1, 0), 1, 1, 5)); bonusChest.addItem(new WeightedRandomChestContent(new ItemStack(BOPItemHelper.get("flippers"), 1, 0), 1, 1, 5)); - for (BiomeGenBase biome : BiomeGenBase.func_150565_n()) + for (BiomeGenBase biome : BiomeGenBase.getBiomeGenArray()) { if (biome != null) { @@ -96,7 +96,7 @@ public class BOPVanillaCompat private static void addBonemealFlowers() { //TODO: getBiomeGenArray() - for (BiomeGenBase biome : BiomeGenBase.func_150565_n()) + for (BiomeGenBase biome : BiomeGenBase.getBiomeGenArray()) { if (biome != null) { diff --git a/src/main/java/biomesoplenty/common/entities/EntityFlyingCreature.java b/src/main/java/biomesoplenty/common/entities/EntityFlyingCreature.java index df1dfbda1..795970d7c 100644 --- a/src/main/java/biomesoplenty/common/entities/EntityFlyingCreature.java +++ b/src/main/java/biomesoplenty/common/entities/EntityFlyingCreature.java @@ -45,10 +45,10 @@ public class EntityFlyingCreature extends EntityAmbientCreature { f2 = 0.54600006F; //TODO: getBlock() - Block block = this.worldObj.func_147439_a(MathHelper.floor_double(this.posX), MathHelper.floor_double(this.boundingBox.minY) - 1, MathHelper.floor_double(this.posZ)); + Block block = this.worldObj.getBlock(MathHelper.floor_double(this.posX), MathHelper.floor_double(this.boundingBox.minY) - 1, MathHelper.floor_double(this.posZ)); //TODO: slipperiness - f2 = block.field_149765_K * 0.91F; + f2 = block.slipperiness * 0.91F; } float f3 = 0.16277136F / (f2 * f2 * f2); @@ -59,10 +59,10 @@ public class EntityFlyingCreature extends EntityAmbientCreature { f2 = 0.54600006F; //TODO: getBlock() - Block block = this.worldObj.func_147439_a(MathHelper.floor_double(this.posX), MathHelper.floor_double(this.boundingBox.minY) - 1, MathHelper.floor_double(this.posZ)); + Block block = this.worldObj.getBlock(MathHelper.floor_double(this.posX), MathHelper.floor_double(this.boundingBox.minY) - 1, MathHelper.floor_double(this.posZ)); //TODO: slipperiness - f2 = block.field_149765_K * 0.91F; + f2 = block.slipperiness * 0.91F; } this.moveEntity(this.motionX, this.motionY, this.motionZ); diff --git a/src/main/java/biomesoplenty/common/entities/EntityFlyingMob.java b/src/main/java/biomesoplenty/common/entities/EntityFlyingMob.java index 1f0f072f8..e72be5855 100644 --- a/src/main/java/biomesoplenty/common/entities/EntityFlyingMob.java +++ b/src/main/java/biomesoplenty/common/entities/EntityFlyingMob.java @@ -45,10 +45,10 @@ public class EntityFlyingMob extends EntityMob { f2 = 0.54600006F; //TODO: getBlock() - Block block = this.worldObj.func_147439_a(MathHelper.floor_double(this.posX), MathHelper.floor_double(this.boundingBox.minY) - 1, MathHelper.floor_double(this.posZ)); + Block block = this.worldObj.getBlock(MathHelper.floor_double(this.posX), MathHelper.floor_double(this.boundingBox.minY) - 1, MathHelper.floor_double(this.posZ)); //TODO: slipperiness - f2 = block.field_149765_K * 0.91F; + f2 = block.slipperiness * 0.91F; } float f3 = 0.16277136F / (f2 * f2 * f2); @@ -59,10 +59,10 @@ public class EntityFlyingMob extends EntityMob { f2 = 0.54600006F; //TODO: getBlock() - Block block = this.worldObj.func_147439_a(MathHelper.floor_double(this.posX), MathHelper.floor_double(this.boundingBox.minY) - 1, MathHelper.floor_double(this.posZ)); + Block block = this.worldObj.getBlock(MathHelper.floor_double(this.posX), MathHelper.floor_double(this.boundingBox.minY) - 1, MathHelper.floor_double(this.posZ)); //TODO: slipperiness - f2 = block.field_149765_K * 0.91F; + f2 = block.slipperiness * 0.91F; } this.moveEntity(this.motionX, this.motionY, this.motionZ); diff --git a/src/main/java/biomesoplenty/common/entities/EntityGlob.java b/src/main/java/biomesoplenty/common/entities/EntityGlob.java index 5ef980883..738f7acd2 100644 --- a/src/main/java/biomesoplenty/common/entities/EntityGlob.java +++ b/src/main/java/biomesoplenty/common/entities/EntityGlob.java @@ -120,7 +120,7 @@ public class EntityGlob extends EntityLiving implements IMob squishAmount = 1.0F; } - this.func_70808_l(); + this.alterSquishAmount(); if (worldObj.isRemote) { @@ -170,7 +170,7 @@ public class EntityGlob extends EntityLiving implements IMob } } - protected void func_70808_l() + protected void alterSquishAmount() { squishAmount *= 0.6F; } @@ -196,7 +196,7 @@ public class EntityGlob extends EntityLiving implements IMob { int i = this.getGlobSize(); - //func_110143_aJ() == getHealth + //getHealth() == getHealth if (!worldObj.isRemote && i > 1 && this.getHealth() <= 0) { int j = 2 + rand.nextInt(3); @@ -283,7 +283,7 @@ public class EntityGlob extends EntityLiving implements IMob //TODO: dropItem() - this.func_145779_a(Items.slime_ball, 1); + this.dropItem(Items.slime_ball, 1); } /** diff --git a/src/main/java/biomesoplenty/common/entities/EntityRosester.java b/src/main/java/biomesoplenty/common/entities/EntityRosester.java index 965d8aaf1..5274109a8 100644 --- a/src/main/java/biomesoplenty/common/entities/EntityRosester.java +++ b/src/main/java/biomesoplenty/common/entities/EntityRosester.java @@ -111,10 +111,10 @@ public class EntityRosester extends EntityChicken int l = MathHelper.floor_double(this.posZ + (double)((float)(i / 2 % 2 * 2 - 1) * 0.25F)); //TODO: isAirBlock() getFloatTemperature() canPlaceBlockAt() - if (!this.worldObj.isRemote && this.worldObj.func_147437_c(j, k, l) && this.worldObj.getBiomeGenForCoords(j, l).func_150564_a(j, k, l) > 0.3F && Blocks.red_flower.func_149742_c(this.worldObj, j, k, l) && this.worldObj.rand.nextInt(300) == 0) + if (!this.worldObj.isRemote && this.worldObj.isAirBlock(j, k, l) && this.worldObj.getBiomeGenForCoords(j, l).getFloatTemperature(j, k, l) > 0.3F && Blocks.red_flower.canPlaceBlockAt(this.worldObj, j, k, l) && this.worldObj.rand.nextInt(300) == 0) { //TODO: setBlock() - this.worldObj.func_147465_d(j, k, l, Blocks.red_flower, 0, 2); + this.worldObj.setBlock(j, k, l, Blocks.red_flower, 0, 2); } } } @@ -149,7 +149,7 @@ public class EntityRosester extends EntityChicken @Override //TODO: getDropItem() - protected Item func_146068_u() + protected Item getDropItem() { return Items.feather; } @@ -167,12 +167,12 @@ public class EntityRosester extends EntityChicken if (this.isBurning()) { //TODO: dropItem() - this.func_145779_a(Items.cooked_chicken, 1); + this.dropItem(Items.cooked_chicken, 1); } else { //TODO: dropItem() - this.func_145779_a(Items.chicken, 1); + this.dropItem(Items.chicken, 1); } } diff --git a/src/main/java/biomesoplenty/common/entities/ai/EntityAITemptArmor.java b/src/main/java/biomesoplenty/common/entities/ai/EntityAITemptArmor.java index d987e0d40..75fac8f85 100644 --- a/src/main/java/biomesoplenty/common/entities/ai/EntityAITemptArmor.java +++ b/src/main/java/biomesoplenty/common/entities/ai/EntityAITemptArmor.java @@ -11,9 +11,9 @@ public class EntityAITemptArmor extends EntityAIBase /** The entity using this AI that is tempted by the player. */ private EntityCreature temptedEntity; private float speedTowardsTarget; - private double field_75283_c; - private double field_75280_d; - private double field_75281_e; + private double targetX; + private double targetY; + private double targetZ; private double field_75278_f; private double field_75279_g; @@ -24,7 +24,7 @@ public class EntityAITemptArmor extends EntityAIBase * A counter that is decremented each time the shouldExecute method is called. The shouldExecute method will always * return false if delayTemptCounter is greater than 0. */ - private boolean field_75287_j; + private boolean isRunning; /** * This field saves the ID of the items that can be used to breed entities with this behaviour. @@ -69,7 +69,7 @@ public class EntityAITemptArmor extends EntityAIBase { if (temptedEntity.getDistanceSqToEntity(temptingPlayer) < 36.0D) { - if (temptingPlayer.getDistanceSq(field_75283_c, field_75280_d, field_75281_e) > 0.010000000000000002D) + if (temptingPlayer.getDistanceSq(targetX, targetY, targetZ) > 0.010000000000000002D) return false; if (Math.abs(temptingPlayer.rotationPitch - field_75278_f) > 5.0D || Math.abs(temptingPlayer.rotationYaw - field_75279_g) > 5.0D) @@ -77,9 +77,9 @@ public class EntityAITemptArmor extends EntityAIBase } else { - field_75283_c = temptingPlayer.posX; - field_75280_d = temptingPlayer.posY; - field_75281_e = temptingPlayer.posZ; + targetX = temptingPlayer.posX; + targetY = temptingPlayer.posY; + targetZ = temptingPlayer.posZ; } field_75278_f = temptingPlayer.rotationPitch; @@ -95,10 +95,10 @@ public class EntityAITemptArmor extends EntityAIBase @Override public void startExecuting() { - field_75283_c = temptingPlayer.posX; - field_75280_d = temptingPlayer.posY; - field_75281_e = temptingPlayer.posZ; - field_75287_j = true; + targetX = temptingPlayer.posX; + targetY = temptingPlayer.posY; + targetZ = temptingPlayer.posZ; + isRunning = true; field_75286_m = temptedEntity.getNavigator().getAvoidsWater(); temptedEntity.getNavigator().setAvoidsWater(false); } @@ -111,7 +111,7 @@ public class EntityAITemptArmor extends EntityAIBase { temptingPlayer = null; temptedEntity.getNavigator().clearPathEntity(); - field_75287_j = false; + isRunning = false; temptedEntity.getNavigator().setAvoidsWater(field_75286_m); } @@ -133,8 +133,8 @@ public class EntityAITemptArmor extends EntityAIBase } } - public boolean func_75277_f() + public boolean isRunning() { - return field_75287_j; + return isRunning; } } diff --git a/src/main/java/biomesoplenty/common/entities/projectiles/EntityDart.java b/src/main/java/biomesoplenty/common/entities/projectiles/EntityDart.java index 5625a19f3..74d050634 100644 --- a/src/main/java/biomesoplenty/common/entities/projectiles/EntityDart.java +++ b/src/main/java/biomesoplenty/common/entities/projectiles/EntityDart.java @@ -65,15 +65,15 @@ public class EntityDart extends EntityArrow } //TODO: worldObj.getBlock() - Block block = worldObj.func_147439_a(xTile, yTile, zTile); + Block block = worldObj.getBlock(xTile, yTile, zTile); //TODO: block.getMaterial() Material.air - if (block.func_149688_o() != Material.field_151579_a) + if (block.getMaterial() != Material.air) { //TODO: setBlockBoundsBasedOnState - block.func_149719_a(worldObj, xTile, yTile, zTile); + block.setBlockBoundsBasedOnState(worldObj, xTile, yTile, zTile); //TODO: getCollisionBoundingBoxFromPool() - AxisAlignedBB axisalignedbb = block.func_149668_a(worldObj, xTile, yTile, zTile); + AxisAlignedBB axisalignedbb = block.getCollisionBoundingBoxFromPool(worldObj, xTile, yTile, zTile); if (axisalignedbb != null && axisalignedbb.isVecInside(worldObj.getWorldVec3Pool().getVecFromPool(posX, posY, posZ))) { @@ -175,7 +175,7 @@ public class EntityDart extends EntityArrow if (shootingEntity != null && movingobjectposition.entityHit != shootingEntity && movingobjectposition.entityHit instanceof EntityPlayer && shootingEntity instanceof EntityPlayerMP) { //TODO: sendPacketToPlayer() - ((EntityPlayerMP)shootingEntity).playerNetServerHandler.func_147359_a(new S2BPacketChangeGameState(6, 0.0F)); + ((EntityPlayerMP)shootingEntity).playerNetServerHandler.sendPacket(new S2BPacketChangeGameState(6, 0.0F)); } } diff --git a/src/main/java/biomesoplenty/common/eventhandler/gui/MainMenuEventHandler.java b/src/main/java/biomesoplenty/common/eventhandler/gui/MainMenuEventHandler.java index 11ef933fc..e5441fce9 100755 --- a/src/main/java/biomesoplenty/common/eventhandler/gui/MainMenuEventHandler.java +++ b/src/main/java/biomesoplenty/common/eventhandler/gui/MainMenuEventHandler.java @@ -20,7 +20,7 @@ public class MainMenuEventHandler { GuiMainMenu mainMenu = (GuiMainMenu)event.gui; - BOPReflectionHelper.setPrivateFinalValue(GuiMainMenu.class, mainMenu, bopTitlePanoramaPaths, "titlePanoramaPaths", "field_73978_o"); + BOPReflectionHelper.setPrivateFinalValue(GuiMainMenu.class, mainMenu, bopTitlePanoramaPaths, "titlePanoramaPaths", "titlePanoramaPaths"); } } } diff --git a/src/main/java/biomesoplenty/common/eventhandler/misc/BonemealEventHandler.java b/src/main/java/biomesoplenty/common/eventhandler/misc/BonemealEventHandler.java index 5a48c430d..e3cbe3bd7 100644 --- a/src/main/java/biomesoplenty/common/eventhandler/misc/BonemealEventHandler.java +++ b/src/main/java/biomesoplenty/common/eventhandler/misc/BonemealEventHandler.java @@ -98,15 +98,15 @@ public class BonemealEventHandler case 7: if (event.world.rand.nextFloat() < 0.45D) { - world.func_147465_d(x, y, z, BOPBlockHelper.get("plants"), 10, 2); - world.func_147465_d(x, y + 1, z, BOPBlockHelper.get("plants"), 9, 2); + world.setBlock(x, y, z, BOPBlockHelper.get("plants"), 10, 2); + world.setBlock(x, y + 1, z, BOPBlockHelper.get("plants"), 9, 2); } break; case 12: if (world.rand.nextFloat() < 0.45D) { - world.func_147449_b(x, y, z, Blocks.cactus); + world.setBlock(x, y, z, Blocks.cactus); } break; } @@ -163,16 +163,16 @@ public class BonemealEventHandler z += event.world.rand.nextInt(3) - 1; } - if (event.world.func_147439_a(x, var14, z).isAir(world, x, var14, z)) + if (event.world.getBlock(x, var14, z).isAir(world, x, var14, z)) { - if (BOPBlockHelper.get("plants").func_149705_a(world, x, var14, z, 0, new ItemStack(BOPBlockHelper.get("plants"), 1, 4))) + if (BOPBlockHelper.get("plants").canReplace(world, x, var14, z, 0, new ItemStack(BOPBlockHelper.get("plants"), 1, 4))) { event.setResult(Result.ALLOW); if (!event.world.isRemote) { //TODO: setBlock() - event.world.func_147465_d(x, var14, z, BOPBlockHelper.get("plants"), 4, 2); + event.world.setBlock(x, var14, z, BOPBlockHelper.get("plants"), 4, 2); } } } diff --git a/src/main/java/biomesoplenty/common/eventhandler/misc/BucketEventHandler.java b/src/main/java/biomesoplenty/common/eventhandler/misc/BucketEventHandler.java index f5c6d078f..801e8ffe1 100644 --- a/src/main/java/biomesoplenty/common/eventhandler/misc/BucketEventHandler.java +++ b/src/main/java/biomesoplenty/common/eventhandler/misc/BucketEventHandler.java @@ -30,7 +30,7 @@ public class BucketEventHandler int z = event.target.blockZ; //TODO: getBlock() - Block block = world.func_147439_a(x, y, z); + Block block = world.getBlock(x, y, z); Fluid fluidBlockFluid = FluidRegistry.lookupFluidForBlock(block); @@ -42,7 +42,7 @@ public class BucketEventHandler { bopBucket.fill(bopBucketStack, new FluidStack(fluidBlockFluid, FluidContainerRegistry.BUCKET_VOLUME), true); - world.func_147468_f(x, y, z); + world.setBlockToAir(x, y, z); event.result = bopBucketStack; event.setResult(Result.ALLOW); diff --git a/src/main/java/biomesoplenty/common/eventhandler/misc/CapeEventHandler.java b/src/main/java/biomesoplenty/common/eventhandler/misc/CapeEventHandler.java index 090e3dce7..b937ccad6 100644 --- a/src/main/java/biomesoplenty/common/eventhandler/misc/CapeEventHandler.java +++ b/src/main/java/biomesoplenty/common/eventhandler/misc/CapeEventHandler.java @@ -65,7 +65,7 @@ public class CapeEventHandler capePlayers.add(abstractClientPlayer); - ReflectionHelper.setPrivateValue(ThreadDownloadImageData.class, abstractClientPlayer.getTextureCape(), false, new String[]{"textureUploaded", "field_110559_g"}); + ReflectionHelper.setPrivateValue(ThreadDownloadImageData.class, abstractClientPlayer.getTextureCape(), false, new String[]{"textureUploaded", "textureUploaded"}); new Thread(new CloakThread(abstractClientPlayer, cloakURL)).start(); event.renderCape = true; @@ -139,7 +139,7 @@ public class CapeEventHandler cape.getHeight(null), BufferedImage.TYPE_INT_ARGB); bo.getGraphics().drawImage(cape, 0, 0, null); - ReflectionHelper.setPrivateValue(ThreadDownloadImageData.class, abstractClientPlayer.getTextureCape(), bo, new String[] { "bufferedImage", "field_110560_d" }); + ReflectionHelper.setPrivateValue(ThreadDownloadImageData.class, abstractClientPlayer.getTextureCape(), bo, new String[] { "bufferedImage", "bufferedImage" }); } catch (MalformedURLException e) { diff --git a/src/main/java/biomesoplenty/common/fluids/blocks/BlockHoneyFluid.java b/src/main/java/biomesoplenty/common/fluids/blocks/BlockHoneyFluid.java index 329c96255..66d48460e 100644 --- a/src/main/java/biomesoplenty/common/fluids/blocks/BlockHoneyFluid.java +++ b/src/main/java/biomesoplenty/common/fluids/blocks/BlockHoneyFluid.java @@ -20,15 +20,15 @@ public class BlockHoneyFluid extends BlockFluidFinite public BlockHoneyFluid() { //TODO: water - super(FluidRegistry.getFluid("honey"), Material.field_151586_h); + super(FluidRegistry.getFluid("honey"), Material.water); //TODO: setLightOpacity() - this.func_149713_g(1); + this.setLightOpacity(1); } @Override //TODO: onEntityCollidedWithBlock() - public void func_149670_a(World world, int x, int y, int z, Entity entity) + public void onEntityCollidedWithBlock(World world, int x, int y, int z, Entity entity) { int meta = world.getBlockMetadata(x, y, z); @@ -40,7 +40,7 @@ public class BlockHoneyFluid extends BlockFluidFinite @Override //TODO: registerIcons() - public void func_149651_a(IIconRegister iconRegister) + public void registerBlockIcons(IIconRegister iconRegister) { honeyStillIcon = iconRegister.registerIcon("biomesoplenty:honey_still"); honeyFlowingIcon = iconRegister.registerIcon("biomesoplenty:honey_flowing"); @@ -48,7 +48,7 @@ public class BlockHoneyFluid extends BlockFluidFinite @Override //TODO: getIcon() - public IIcon func_149691_a(int side, int meta) + public IIcon getIcon(int side, int meta) { return side != 0 && side != 1 ? honeyFlowingIcon : honeyStillIcon; } diff --git a/src/main/java/biomesoplenty/common/fluids/blocks/BlockPoisonFluid.java b/src/main/java/biomesoplenty/common/fluids/blocks/BlockPoisonFluid.java index bb35d5fab..3af9e5e56 100644 --- a/src/main/java/biomesoplenty/common/fluids/blocks/BlockPoisonFluid.java +++ b/src/main/java/biomesoplenty/common/fluids/blocks/BlockPoisonFluid.java @@ -25,16 +25,16 @@ public class BlockPoisonFluid extends BlockFluidClassic public BlockPoisonFluid() { //TODO: water - super(FluidRegistry.getFluid("poison"), Material.field_151586_h); + super(FluidRegistry.getFluid("poison"), Material.water); this.quantaPerBlock = 4; //TODO: setLightOpacity() - this.func_149713_g(3); + this.setLightOpacity(3); } @Override //TODO: onEntityCollidedWithBlock() - public void func_149670_a(World world, int x, int y, int z, Entity entity) + public void onEntityCollidedWithBlock(World world, int x, int y, int z, Entity entity) { int meta = world.getBlockMetadata(x, y, z); @@ -47,7 +47,7 @@ public class BlockPoisonFluid extends BlockFluidClassic @Override //TODO: registerIcons() - public void func_149651_a(IIconRegister iconRegister) + public void registerBlockIcons(IIconRegister iconRegister) { liquidPoisonStillIcon = iconRegister.registerIcon("biomesoplenty:liquid_poison_still"); liquidPoisonFlowingIcon = iconRegister.registerIcon("biomesoplenty:liquid_poison_flowing"); @@ -55,7 +55,7 @@ public class BlockPoisonFluid extends BlockFluidClassic @Override //TODO: getIcon() - public IIcon func_149691_a(int side, int meta) + public IIcon getIcon(int side, int meta) { return side != 0 && side != 1 ? liquidPoisonFlowingIcon : liquidPoisonStillIcon; } diff --git a/src/main/java/biomesoplenty/common/fluids/blocks/BlockSpringWaterFluid.java b/src/main/java/biomesoplenty/common/fluids/blocks/BlockSpringWaterFluid.java index b32a1c85b..fd5371474 100644 --- a/src/main/java/biomesoplenty/common/fluids/blocks/BlockSpringWaterFluid.java +++ b/src/main/java/biomesoplenty/common/fluids/blocks/BlockSpringWaterFluid.java @@ -23,14 +23,14 @@ public class BlockSpringWaterFluid extends BlockFluidClassic public BlockSpringWaterFluid() { //TODO: water - super(FluidRegistry.getFluid("spring_water"), Material.field_151586_h); + super(FluidRegistry.getFluid("spring_water"), Material.water); } @Override //TODO: randomDisplayTick() - public void func_149734_b(World world, int x, int y, int z, Random random) + public void randomDisplayTick(World world, int x, int y, int z, Random random) { - super.func_149734_b(world, x, y, z, random); + super.randomDisplayTick(world, x, y, z, random); if (random.nextInt(1) == 0) { @@ -40,7 +40,7 @@ public class BlockSpringWaterFluid extends BlockFluidClassic @Override //TODO: onEntityCollidedWithBlock() - public void func_149670_a(World world, int x, int y, int z, Entity entity) + public void onEntityCollidedWithBlock(World world, int x, int y, int z, Entity entity) { int meta = world.getBlockMetadata(x, y, z); @@ -56,7 +56,7 @@ public class BlockSpringWaterFluid extends BlockFluidClassic @Override //TODO: registerIcons() - public void func_149651_a(IIconRegister iconRegister) + public void registerBlockIcons(IIconRegister iconRegister) { springWaterStillIcon = iconRegister.registerIcon("biomesoplenty:spring_water_still"); springWaterFlowingIcon = iconRegister.registerIcon("biomesoplenty:spring_water_flowing"); @@ -64,7 +64,7 @@ public class BlockSpringWaterFluid extends BlockFluidClassic @Override //TODO: getIcon() - public IIcon func_149691_a(int side, int meta) + public IIcon getIcon(int side, int meta) { return side != 0 && side != 1 ? springWaterFlowingIcon : springWaterStillIcon; } diff --git a/src/main/java/biomesoplenty/common/helpers/CreativeTabsBOP.java b/src/main/java/biomesoplenty/common/helpers/CreativeTabsBOP.java index 12ad9b071..aa11a1c8d 100644 --- a/src/main/java/biomesoplenty/common/helpers/CreativeTabsBOP.java +++ b/src/main/java/biomesoplenty/common/helpers/CreativeTabsBOP.java @@ -14,7 +14,7 @@ public class CreativeTabsBOP extends CreativeTabs @Override //TODO: public ItemStack getIconItemStack() - public ItemStack func_151244_d() + public ItemStack getIconItemStack() { return new ItemStack(BOPItemHelper.get("food"), 1, 7); } diff --git a/src/main/java/biomesoplenty/common/helpers/TeleporterPromised.java b/src/main/java/biomesoplenty/common/helpers/TeleporterPromised.java index db7b4f8fd..90c6d067e 100644 --- a/src/main/java/biomesoplenty/common/helpers/TeleporterPromised.java +++ b/src/main/java/biomesoplenty/common/helpers/TeleporterPromised.java @@ -18,9 +18,9 @@ import net.minecraft.world.WorldServer; public class TeleporterPromised extends Teleporter { private final WorldServer worldServerInstance; - private final LongHashMap field_85191_c = new LongHashMap(); + private final LongHashMap destinationCoordinateCache = new LongHashMap(); @SuppressWarnings("rawtypes") - private final List field_85190_d = new ArrayList(); + private final List destinationCoordinateKeys = new ArrayList(); private final boolean falling; public TeleporterPromised(WorldServer worldServer) @@ -71,9 +71,9 @@ public class TeleporterPromised extends Teleporter double var27; int var48; - if (field_85191_c.containsItem(var17)) + if (destinationCoordinateCache.containsItem(var17)) { - PortalPosition portalposition = (PortalPosition) field_85191_c.getValueByKey(var17); + PortalPosition portalposition = (PortalPosition) destinationCoordinateCache.getValueByKey(var17); var10 = 0.0D; i = portalposition.posX; j = 131; @@ -93,9 +93,9 @@ public class TeleporterPromised extends Teleporter for (int var26 = worldServerInstance.getActualHeight() - 1; var26 >= 0; --var26) { - if (worldServerInstance.func_147439_a(var48, var26, var23) == BOPBlockHelper.get("promisedPortal")) + if (worldServerInstance.getBlock(var48, var26, var23) == BOPBlockHelper.get("promisedPortal")) { - while (worldServerInstance.func_147439_a(var48, var26 - 1, var23) == BOPBlockHelper.get("promisedPortal")) + while (worldServerInstance.getBlock(var48, var26 - 1, var23) == BOPBlockHelper.get("promisedPortal")) { --var26; } @@ -120,8 +120,8 @@ public class TeleporterPromised extends Teleporter { if (var19) { - field_85191_c.add(var17, new PortalPosition(i, j, k, worldServerInstance.getTotalWorldTime())); - field_85190_d.add(Long.valueOf(var17)); + destinationCoordinateCache.add(var17, new PortalPosition(i, j, k, worldServerInstance.getTotalWorldTime())); + destinationCoordinateKeys.add(Long.valueOf(var17)); } double var49 = i + 0.5D; @@ -129,22 +129,22 @@ public class TeleporterPromised extends Teleporter var27 = k + 0.5D; int var50 = -1; - if (worldServerInstance.func_147439_a(i - 1, j, k) == BOPBlockHelper.get("promisedPortal")) + if (worldServerInstance.getBlock(i - 1, j, k) == BOPBlockHelper.get("promisedPortal")) { var50 = 2; } - if (worldServerInstance.func_147439_a(i + 1, j, k) == BOPBlockHelper.get("promisedPortal")) + if (worldServerInstance.getBlock(i + 1, j, k) == BOPBlockHelper.get("promisedPortal")) { var50 = 0; } - if (worldServerInstance.func_147439_a(i, j, k - 1) == BOPBlockHelper.get("promisedPortal")) + if (worldServerInstance.getBlock(i, j, k - 1) == BOPBlockHelper.get("promisedPortal")) { var50 = 3; } - if (worldServerInstance.func_147439_a(i, j, k + 1) == BOPBlockHelper.get("promisedPortal")) + if (worldServerInstance.getBlock(i, j, k + 1) == BOPBlockHelper.get("promisedPortal")) { var50 = 1; } @@ -250,6 +250,6 @@ public class TeleporterPromised extends Teleporter } boolean isAirBlock(World world, int x, int y, int z) { - return world.func_147439_a(x, y, z).isAir(world, x, y, z); + return world.getBlock(x, y, z).isAir(world, x, y, z); } } \ No newline at end of file diff --git a/src/main/java/biomesoplenty/common/itemblocks/ItemBlockBones.java b/src/main/java/biomesoplenty/common/itemblocks/ItemBlockBones.java index f54291bf5..6b52b0705 100644 --- a/src/main/java/biomesoplenty/common/itemblocks/ItemBlockBones.java +++ b/src/main/java/biomesoplenty/common/itemblocks/ItemBlockBones.java @@ -42,7 +42,7 @@ public class ItemBlockBones extends ItemBlock public boolean onItemUse(ItemStack itemstack, EntityPlayer player, World world, int x, int y, int z, int side, float hitVecX, float hitVecY, float hitVecZ) { //TODO: getBlock() - Block block = world.func_147439_a(x, y, z); + Block block = world.getBlock(x, y, z); if (block == Blocks.snow && (world.getBlockMetadata(x, y, z) & 7) < 1) { @@ -86,10 +86,10 @@ public class ItemBlockBones extends ItemBlock else if (!player.canPlayerEdit(x, y, z, side, itemstack)) return false; //TODO: getBlockMaterial() - else if (y == 255 && block.func_149688_o().isSolid()) + else if (y == 255 && block.getMaterial().isSolid()) return false; //TODO: canPlaceEntityOnSide()? - else if (world.func_147472_a(block, x, y, z, false, side, player, itemstack)) + else if (world.canPlaceEntityOnSide(block, x, y, z, false, side, player, itemstack)) { int j1 = this.getMetadata(itemstack.getItemDamage()); @@ -112,12 +112,12 @@ public class ItemBlockBones extends ItemBlock } //TODO: onBlockPlaced() - int k1 = block.func_149660_a(world, x, y, z, side, hitVecX, hitVecY, hitVecZ, j1); + int k1 = block.onBlockPlaced(world, x, y, z, side, hitVecX, hitVecY, hitVecZ, j1); if (placeBlockAt(itemstack, player, world, x, y, z, side, hitVecX, hitVecY, hitVecZ, k1)) { //TODO: linkedBlock stepSound.getPlaceSound() linkedBlock stepSound.getVolume() linkedBlock stepSound.getPitch() - world.playSoundEffect(x + 0.5F, y + 0.5F, z + 0.5F, field_150939_a.field_149762_H.func_150496_b(), (field_150939_a.field_149762_H.func_150497_c() + 1.0F) / 2.0F, field_150939_a.field_149762_H.func_150494_d() * 0.8F); + world.playSoundEffect(x + 0.5F, y + 0.5F, z + 0.5F, field_150939_a.stepSound.func_150496_b(), (field_150939_a.stepSound.getVolume() + 1.0F) / 2.0F, field_150939_a.stepSound.getPitch() * 0.8F); --itemstack.stackSize; } diff --git a/src/main/java/biomesoplenty/common/itemblocks/ItemBlockColorizedSapling.java b/src/main/java/biomesoplenty/common/itemblocks/ItemBlockColorizedSapling.java index 7b296267c..d0666a2b5 100644 --- a/src/main/java/biomesoplenty/common/itemblocks/ItemBlockColorizedSapling.java +++ b/src/main/java/biomesoplenty/common/itemblocks/ItemBlockColorizedSapling.java @@ -40,6 +40,6 @@ public class ItemBlockColorizedSapling extends ItemBlock public IIcon getIconFromDamage(int meta) { //TODO: block getIcon() - return field_150939_a.func_149691_a(0, meta); + return field_150939_a.getIcon(0, meta); } } diff --git a/src/main/java/biomesoplenty/common/itemblocks/ItemBlockCoral.java b/src/main/java/biomesoplenty/common/itemblocks/ItemBlockCoral.java index 1202b3d79..90b43dd7e 100644 --- a/src/main/java/biomesoplenty/common/itemblocks/ItemBlockCoral.java +++ b/src/main/java/biomesoplenty/common/itemblocks/ItemBlockCoral.java @@ -59,7 +59,7 @@ public class ItemBlockCoral extends ItemBlock return textures[0]; else //TODO: block getIcon() - return field_150939_a.func_149691_a(0, meta); + return field_150939_a.getIcon(0, meta); } @Override @@ -78,7 +78,7 @@ public class ItemBlockCoral extends ItemBlock public boolean onItemUse(ItemStack itemstack, EntityPlayer player, World world, int x, int y, int z, int side, float hitX, float hitY, float hitZ) { //TODO: getBlock() - Block block = world.func_147439_a(x, y, z); + Block block = world.getBlock(x, y, z); if (block == Blocks.snow && (world.getBlockMetadata(x, y, z) & 7) < 1) { @@ -122,13 +122,13 @@ public class ItemBlockCoral extends ItemBlock else if (!player.canPlayerEdit(x, y, z, side, itemstack)) return false; //TODO: getBlockMaterial() - else if (y == 255 && block.func_149688_o().isSolid()) + else if (y == 255 && block.getMaterial().isSolid()) return false; //TODO: canPlaceEntityOnSide()? - else if (world.func_147472_a(block, x, y, z, false, side, player, itemstack)) + else if (world.canPlaceEntityOnSide(block, x, y, z, false, side, player, itemstack)) { //TODO: getBlock() getBlock() - if (world.func_147439_a(x, y + 1, z) == Blocks.water) + if (world.getBlock(x, y + 1, z) == Blocks.water) { onItemUsePlaceBlock(itemstack, player, world, x, y, z, side, hitX, hitY, hitZ); @@ -146,12 +146,12 @@ public class ItemBlockCoral extends ItemBlock int j1 = this.getMetadata(itemstack.getItemDamage()); //TODO: onBlockPlaced() - int k1 = block.func_149660_a(world, x, y, z, side, hitVecX, hitVecY, hitVecZ, j1); + int k1 = block.onBlockPlaced(world, x, y, z, side, hitVecX, hitVecY, hitVecZ, j1); if (placeBlockAt(itemstack, player, world, x, y, z, side, hitVecX, hitVecY, hitVecZ, k1)) { //TODO: stepSound.getPlaceSound() stepSound.getVolume() stepSound.getPitch() - world.playSoundEffect(x + 0.5F, y + 0.5F, z + 0.5F, block.field_149762_H.func_150496_b(), (block.field_149762_H.func_150497_c() + 1.0F) / 2.0F, block.field_149762_H.func_150494_d() * 0.8F); + world.playSoundEffect(x + 0.5F, y + 0.5F, z + 0.5F, block.stepSound.func_150496_b(), (block.stepSound.getVolume() + 1.0F) / 2.0F, block.stepSound.getPitch() * 0.8F); --itemstack.stackSize; } } diff --git a/src/main/java/biomesoplenty/common/itemblocks/ItemBlockFlower.java b/src/main/java/biomesoplenty/common/itemblocks/ItemBlockFlower.java index 9b3afc397..e12453190 100644 --- a/src/main/java/biomesoplenty/common/itemblocks/ItemBlockFlower.java +++ b/src/main/java/biomesoplenty/common/itemblocks/ItemBlockFlower.java @@ -68,7 +68,7 @@ public class ItemBlockFlower extends ItemBlock return textures[0]; else //TODO: block getIcon() - return field_150939_a.func_149691_a(0, meta); + return field_150939_a.getIcon(0, meta); } @Override diff --git a/src/main/java/biomesoplenty/common/itemblocks/ItemBlockFlower2.java b/src/main/java/biomesoplenty/common/itemblocks/ItemBlockFlower2.java index dd9611abb..3538ddd83 100644 --- a/src/main/java/biomesoplenty/common/itemblocks/ItemBlockFlower2.java +++ b/src/main/java/biomesoplenty/common/itemblocks/ItemBlockFlower2.java @@ -42,7 +42,7 @@ public class ItemBlockFlower2 extends ItemBlock public IIcon getIconFromDamage(int meta) { //TODO: block getIcon() - return field_150939_a.func_149691_a(0, meta); + return field_150939_a.getIcon(0, meta); } @Override diff --git a/src/main/java/biomesoplenty/common/itemblocks/ItemBlockFoliage.java b/src/main/java/biomesoplenty/common/itemblocks/ItemBlockFoliage.java index 8faf18093..e6dab10f1 100644 --- a/src/main/java/biomesoplenty/common/itemblocks/ItemBlockFoliage.java +++ b/src/main/java/biomesoplenty/common/itemblocks/ItemBlockFoliage.java @@ -53,7 +53,7 @@ public class ItemBlockFoliage extends ItemColored return 16777215; else //TODO: getRenderColor() - return BOPBlockHelper.get("foliage").func_149741_i(itemStack.getItemDamage()); + return BOPBlockHelper.get("foliage").getRenderColor(itemStack.getItemDamage()); } @Override @@ -108,10 +108,10 @@ public class ItemBlockFoliage extends ItemColored return itemStack; //TODO: getBlock() getMaterial() water isAirBlock() - if (world.func_147439_a(i, j, k).func_149688_o() == Material.field_151586_h && world.getBlockMetadata(i, j, k) == 0 && world.func_147437_c(i, j + 1, k)) + if (world.getBlock(i, j, k).getMaterial() == Material.water && world.getBlockMetadata(i, j, k) == 0 && world.isAirBlock(i, j + 1, k)) { //TODO: setBlock() linkedBlock - world.func_147465_d(i, j + 1, k, field_150939_a, 0, 2); + world.setBlock(i, j + 1, k, field_150939_a, 0, 2); if (!player.capabilities.isCreativeMode) { diff --git a/src/main/java/biomesoplenty/common/itemblocks/ItemBlockGrave.java b/src/main/java/biomesoplenty/common/itemblocks/ItemBlockGrave.java index 0f93cf10a..2d48cef55 100644 --- a/src/main/java/biomesoplenty/common/itemblocks/ItemBlockGrave.java +++ b/src/main/java/biomesoplenty/common/itemblocks/ItemBlockGrave.java @@ -47,7 +47,7 @@ public class ItemBlockGrave extends ItemBlock public boolean onItemUse(ItemStack itemstack, EntityPlayer player, World world, int x, int y, int z, int side, float hitVecX, float hitVecY, float hitVecZ) { //TODO: getBlock() - Block block = world.func_147439_a(x, y, z); + Block block = world.getBlock(x, y, z); if (block == Blocks.snow && (world.getBlockMetadata(x, y, z) & 7) < 1) { @@ -91,10 +91,10 @@ public class ItemBlockGrave extends ItemBlock else if (!player.canPlayerEdit(x, y, z, side, itemstack)) return false; //TODO: getBlockMaterial() - else if (y == 255 && block.func_149688_o().isSolid()) + else if (y == 255 && block.getMaterial().isSolid()) return false; //TODO: canPlaceEntityOnSide()? - else if (world.func_147472_a(block, x, y, z, false, side, player, itemstack)) + else if (world.canPlaceEntityOnSide(block, x, y, z, false, side, player, itemstack)) { int o = ((MathHelper.floor_double((double)(player.rotationYaw * 4.0F / 360.0F) + 0.5D) & 3) + 2) % 4; int fO; @@ -117,17 +117,17 @@ public class ItemBlockGrave extends ItemBlock private boolean placeGrave(ItemStack itemstack, EntityPlayer player, Block block, World world, int x, int y, int z, int meta, int side, float hitVecX, float hitVecY, float hitVecZ) { //TODO: isAirBlock() - if (world.func_147437_c(x, y + 1, z)) + if (world.isAirBlock(x, y + 1, z)) { //TODO: onBlockPlaced() - int k1 = block.func_149660_a(world, x, y, z, side, hitVecX, hitVecY, hitVecZ, meta); + int k1 = block.onBlockPlaced(world, x, y, z, side, hitVecX, hitVecY, hitVecZ, meta); //TODO: onBlockPlaced() - int k2 = block.func_149660_a(world, x, y, z, side, hitVecX, hitVecY, hitVecZ, meta + 1); + int k2 = block.onBlockPlaced(world, x, y, z, side, hitVecX, hitVecY, hitVecZ, meta + 1); if (placeBlockAt(itemstack, player, world, x, y, z, side, hitVecX, hitVecY, hitVecZ, k1) && placeBlockAt(itemstack, player, world, x, y + 1, z, side, hitVecX, hitVecY, hitVecZ, k2)) { //TODO: linkedBlock stepSound.getPlaceSound() linkedBlock stepSound.getVolume() linkedBlock stepSound.getPitch() - world.playSoundEffect(x + 0.5F, y + 0.5F, z + 0.5F, field_150939_a.field_149762_H.func_150496_b(), (field_150939_a.field_149762_H.func_150497_c() + 1.0F) / 2.0F, field_150939_a.field_149762_H.func_150494_d() * 0.8F); + world.playSoundEffect(x + 0.5F, y + 0.5F, z + 0.5F, field_150939_a.stepSound.func_150496_b(), (field_150939_a.stepSound.getVolume() + 1.0F) / 2.0F, field_150939_a.stepSound.getPitch() * 0.8F); --itemstack.stackSize; } diff --git a/src/main/java/biomesoplenty/common/itemblocks/ItemBlockIvy.java b/src/main/java/biomesoplenty/common/itemblocks/ItemBlockIvy.java index d736d6985..01e6f3b48 100644 --- a/src/main/java/biomesoplenty/common/itemblocks/ItemBlockIvy.java +++ b/src/main/java/biomesoplenty/common/itemblocks/ItemBlockIvy.java @@ -32,7 +32,7 @@ public class ItemBlockIvy extends ItemColored public int getColorFromItemStack(ItemStack itemStack, int par2) { //TODO: getRenderColor() - return BOPBlockHelper.get("ivy").func_149741_i(itemStack.getItemDamage()); + return BOPBlockHelper.get("ivy").getRenderColor(itemStack.getItemDamage()); } @Override diff --git a/src/main/java/biomesoplenty/common/itemblocks/ItemBlockMushroom.java b/src/main/java/biomesoplenty/common/itemblocks/ItemBlockMushroom.java index 4cf7f9de0..cabbcd293 100644 --- a/src/main/java/biomesoplenty/common/itemblocks/ItemBlockMushroom.java +++ b/src/main/java/biomesoplenty/common/itemblocks/ItemBlockMushroom.java @@ -38,6 +38,6 @@ public class ItemBlockMushroom extends ItemBlock public IIcon getIconFromDamage(int meta) { //TODO: block getIcon() - return field_150939_a.func_149691_a(0, meta); + return field_150939_a.getIcon(0, meta); } } diff --git a/src/main/java/biomesoplenty/common/itemblocks/ItemBlockPlant.java b/src/main/java/biomesoplenty/common/itemblocks/ItemBlockPlant.java index f77029d70..b66092178 100644 --- a/src/main/java/biomesoplenty/common/itemblocks/ItemBlockPlant.java +++ b/src/main/java/biomesoplenty/common/itemblocks/ItemBlockPlant.java @@ -75,7 +75,7 @@ public class ItemBlockPlant extends ItemBlock return textures[5]; else //TODO: block getIcon() - return field_150939_a.func_149691_a(0, meta); + return field_150939_a.getIcon(0, meta); } @Override @@ -103,12 +103,12 @@ public class ItemBlockPlant extends ItemBlock return itemStack; //TODO: getBlock() getMaterial() water isAirBlock() - if (world.func_147439_a(i, j, k).func_149688_o() == Material.field_151586_h && world.getBlockMetadata(i, j, k) == 0 && world.func_147437_c(i, j + 1, k)) + if (world.getBlock(i, j, k).getMaterial() == Material.water && world.getBlockMetadata(i, j, k) == 0 && world.isAirBlock(i, j + 1, k)) { - if (world.func_147439_a(i, j - 1, k).func_149688_o() != Material.field_151586_h) + if (world.getBlock(i, j - 1, k).getMaterial() != Material.water) { //TODO: setBlock() linkedBlock - world.func_147465_d(i, j + 1, k, field_150939_a, 14, 2); + world.setBlock(i, j + 1, k, field_150939_a, 14, 2); if (!player.capabilities.isCreativeMode) { diff --git a/src/main/java/biomesoplenty/common/itemblocks/ItemBlockSapling.java b/src/main/java/biomesoplenty/common/itemblocks/ItemBlockSapling.java index f8f638889..85cdfb9f2 100644 --- a/src/main/java/biomesoplenty/common/itemblocks/ItemBlockSapling.java +++ b/src/main/java/biomesoplenty/common/itemblocks/ItemBlockSapling.java @@ -35,6 +35,6 @@ public class ItemBlockSapling extends ItemBlock public IIcon getIconFromDamage(int meta) { //TODO: linkedBlock getIcon - return field_150939_a.func_149691_a(0, meta); + return field_150939_a.getIcon(0, meta); } } diff --git a/src/main/java/biomesoplenty/common/itemblocks/ItemBlockSlab.java b/src/main/java/biomesoplenty/common/itemblocks/ItemBlockSlab.java index 4ff3bc6ba..dbb75cee9 100644 --- a/src/main/java/biomesoplenty/common/itemblocks/ItemBlockSlab.java +++ b/src/main/java/biomesoplenty/common/itemblocks/ItemBlockSlab.java @@ -25,7 +25,7 @@ public class ItemBlockSlab extends ItemSlab public String getUnlocalizedName(ItemStack itemStack) { //TODO: getBlockFromItem - BlockBOPSlab slab = (BlockBOPSlab)Block.func_149634_a(itemStack.getItem()); + BlockBOPSlab slab = (BlockBOPSlab)Block.getBlockFromItem(itemStack.getItem()); //TODO: getFullSlabName() return super.getUnlocalizedName() + "." + (new StringBuilder()).append(slab.func_150002_b(itemStack.getItemDamage())).toString(); diff --git a/src/main/java/biomesoplenty/common/itemblocks/ItemBlockStoneFormations.java b/src/main/java/biomesoplenty/common/itemblocks/ItemBlockStoneFormations.java index 8c6732c99..4ab8d1b1a 100644 --- a/src/main/java/biomesoplenty/common/itemblocks/ItemBlockStoneFormations.java +++ b/src/main/java/biomesoplenty/common/itemblocks/ItemBlockStoneFormations.java @@ -44,7 +44,7 @@ public class ItemBlockStoneFormations extends ItemBlock public IIcon getIconFromDamage(int meta) { //TODO: block getIcon() - return field_150939_a.func_149691_a(0, meta); + return field_150939_a.getIcon(0, meta); } @Override diff --git a/src/main/java/biomesoplenty/common/itemblocks/ItemBlockWillow.java b/src/main/java/biomesoplenty/common/itemblocks/ItemBlockWillow.java index cf947052c..1d348a7e3 100644 --- a/src/main/java/biomesoplenty/common/itemblocks/ItemBlockWillow.java +++ b/src/main/java/biomesoplenty/common/itemblocks/ItemBlockWillow.java @@ -31,7 +31,7 @@ public class ItemBlockWillow extends ItemColored public int getColorFromItemStack(ItemStack itemStack, int par2) { //TODO: getRenderColor() - return BOPBlockHelper.get("willow").func_149741_i(itemStack.getItemDamage()); + return BOPBlockHelper.get("willow").getRenderColor(itemStack.getItemDamage()); } @Override diff --git a/src/main/java/biomesoplenty/common/items/ItemBOPAncientStaff.java b/src/main/java/biomesoplenty/common/items/ItemBOPAncientStaff.java index efc05b744..4e92f1c39 100644 --- a/src/main/java/biomesoplenty/common/items/ItemBOPAncientStaff.java +++ b/src/main/java/biomesoplenty/common/items/ItemBOPAncientStaff.java @@ -81,7 +81,7 @@ public class ItemBOPAncientStaff extends Item @Override //TODO: public void getSubItems(Item item, CreativeTabs creativeTabs, List list) - public void func_150895_a(Item item, CreativeTabs creativeTabs, List list) + public void getSubItems(Item item, CreativeTabs creativeTabs, List list) { for (int meta = 0; meta < parts.length; ++meta) { @@ -105,7 +105,7 @@ public class ItemBOPAncientStaff extends Item for (int ix = -2; ix < 3; ix++) { for (int iz = -2; iz < 3; iz++) // is air block - if (!world.func_147439_a(i + ix, j + iy, k + iz).isAir(world, i + ix, j + iy, k + iz)) + if (!world.getBlock(i + ix, j + iy, k + iz).isAir(world, i + ix, j + iy, k + iz)) { isAir = false; } @@ -122,12 +122,12 @@ public class ItemBOPAncientStaff extends Item if (player.dimension == 0) { //send player chat - player.func_145747_a(new ChatComponentTranslation("phrase.bop.promisedPortalOverworld")); + player.addChatMessage(new ChatComponentTranslation("phrase.bop.promisedPortalOverworld")); } else { //send player chat - player.func_145747_a(new ChatComponentTranslation("phrase.bop.promisedPortalOther")); + player.addChatMessage(new ChatComponentTranslation("phrase.bop.promisedPortalOther")); } } diff --git a/src/main/java/biomesoplenty/common/items/ItemBOPBiomeEssence.java b/src/main/java/biomesoplenty/common/items/ItemBOPBiomeEssence.java index 3dff1add4..d66c980da 100644 --- a/src/main/java/biomesoplenty/common/items/ItemBOPBiomeEssence.java +++ b/src/main/java/biomesoplenty/common/items/ItemBOPBiomeEssence.java @@ -46,7 +46,7 @@ public class ItemBOPBiomeEssence extends Item { if (itemStack.getTagCompound().hasKey("biomeID")) { - BiomeGenBase biome = BiomeGenBase.func_150565_n()[itemStack.getTagCompound().getInteger("biomeID")]; + BiomeGenBase biome = BiomeGenBase.getBiomeGenArray()[itemStack.getTagCompound().getInteger("biomeID")]; if (biome != null) { @@ -64,7 +64,7 @@ public class ItemBOPBiomeEssence extends Item { if (itemStack.getTagCompound().hasKey("biomeID")) { - BiomeGenBase biome = BiomeGenBase.func_150565_n()[itemStack.getTagCompound().getInteger("biomeID")]; + BiomeGenBase biome = BiomeGenBase.getBiomeGenArray()[itemStack.getTagCompound().getInteger("biomeID")]; if (biome != null) { diff --git a/src/main/java/biomesoplenty/common/items/ItemBOPBucket.java b/src/main/java/biomesoplenty/common/items/ItemBOPBucket.java index fd88d9cde..f455c03ad 100644 --- a/src/main/java/biomesoplenty/common/items/ItemBOPBucket.java +++ b/src/main/java/biomesoplenty/common/items/ItemBOPBucket.java @@ -47,7 +47,7 @@ public class ItemBOPBucket extends ItemFluidContainer if (fluid == null || fluid.amount != capacity) { //TODO: getBlock() - Block block = world.func_147439_a(x, y, z); + Block block = world.getBlock(x, y, z); if (block instanceof BlockFluidBase) { @@ -72,7 +72,7 @@ public class ItemBOPBucket extends ItemFluidContainer if (block != null) { - world.func_147449_b(x, y, z, block); + world.setBlock(x, y, z, block); return new ItemStack(Items.bucket); } diff --git a/src/main/java/biomesoplenty/common/items/ItemBOPFood.java b/src/main/java/biomesoplenty/common/items/ItemBOPFood.java index e2b3d5047..cba3c39e4 100644 --- a/src/main/java/biomesoplenty/common/items/ItemBOPFood.java +++ b/src/main/java/biomesoplenty/common/items/ItemBOPFood.java @@ -241,7 +241,7 @@ public class ItemBOPFood extends ItemFood //@Override //TODO: public void getSubItems(Item item, CreativeTabs creativeTabs, List list) - public void func_150895_a(Item item, CreativeTabs creativeTabs, List list) + public void getSubItems(Item item, CreativeTabs creativeTabs, List list) { for (int i = 0; i < foodTypes.length; ++i) { diff --git a/src/main/java/biomesoplenty/common/items/ItemBOPMisc.java b/src/main/java/biomesoplenty/common/items/ItemBOPMisc.java index e4cce98a8..eb0e9ab80 100644 --- a/src/main/java/biomesoplenty/common/items/ItemBOPMisc.java +++ b/src/main/java/biomesoplenty/common/items/ItemBOPMisc.java @@ -72,7 +72,7 @@ public class ItemBOPMisc extends Item @Override //TODO: public void getSubItems(Item item, CreativeTabs creativeTabs, List list) - public void func_150895_a(Item item, CreativeTabs creativeTabs, List list) + public void getSubItems(Item item, CreativeTabs creativeTabs, List list) { for(int meta = 0; meta < items.length; ++meta) { diff --git a/src/main/java/biomesoplenty/common/items/ItemBOPRecord.java b/src/main/java/biomesoplenty/common/items/ItemBOPRecord.java index 65d867442..84b817b5d 100644 --- a/src/main/java/biomesoplenty/common/items/ItemBOPRecord.java +++ b/src/main/java/biomesoplenty/common/items/ItemBOPRecord.java @@ -45,7 +45,7 @@ public class ItemBOPRecord extends ItemRecord public boolean onItemUse(ItemStack itemStack, EntityPlayer player, World world, int x, int y, int z, int par7, float par8, float par9, float par10) { //TODO: world.getBlock() - if (world.func_147439_a(x, y, z) == Blocks.jukebox && world.getBlockMetadata(x, y, z) == 0) + if (world.getBlock(x, y, z) == Blocks.jukebox && world.getBlockMetadata(x, y, z) == 0) { if (world.isRemote) return true; @@ -54,7 +54,7 @@ public class ItemBOPRecord extends ItemRecord //TODO: .insertRecord() ((BlockJukebox)Blocks.jukebox).func_149926_b(world, x, y, z, itemStack); //TODO: Item.getIdFromItem() - world.playAuxSFXAtEntity((EntityPlayer)null, 1005, x, y, z, Item.func_150891_b(this)); + world.playAuxSFXAtEntity((EntityPlayer)null, 1005, x, y, z, Item.getIdFromItem(this)); --itemStack.stackSize; return true; } @@ -66,12 +66,12 @@ public class ItemBOPRecord extends ItemRecord @Override public void addInformation(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, List par3List, boolean par4) { - par3List.add(this.func_150927_i()); + par3List.add(this.getRecordNameLocal()); } @Override //TODO: getRecordTitle() - public String func_150927_i() + public String getRecordNameLocal() { return StatCollector.translateToLocal(this.getUnlocalizedName() + ".desc"); } diff --git a/src/main/java/biomesoplenty/common/items/ItemBOPScythe.java b/src/main/java/biomesoplenty/common/items/ItemBOPScythe.java index aeb0a4b75..526c035d6 100644 --- a/src/main/java/biomesoplenty/common/items/ItemBOPScythe.java +++ b/src/main/java/biomesoplenty/common/items/ItemBOPScythe.java @@ -32,7 +32,7 @@ public class ItemBOPScythe extends Item @Override //TODO: onBlockDestroyed()? - public boolean func_150894_a(ItemStack itemstack, World world, Block block, int x, int y, int z, EntityLivingBase entity) + public boolean onBlockDestroyed(ItemStack itemstack, World world, Block block, int x, int y, int z, EntityLivingBase entity) { int radius = 1; int height = 3; @@ -112,7 +112,7 @@ public class ItemBOPScythe extends Item for (int aZ = -radius; aZ <= radius; aZ++) { //TODO: getBlock() - Block block = world.func_147439_a(x + aX, y + aY, z + aZ); + Block block = world.getBlock(x + aX, y + aY, z + aZ); int meta = world.getBlockMetadata(x + aX, y + aY, z + aZ); if (block != null) @@ -148,38 +148,38 @@ public class ItemBOPScythe extends Item if (meta == 1) { //TODO: dropBlockAsItem() - block.func_149697_b(world, x + aX, y + aY, z + aZ, meta, 0); + block.dropBlockAsItem(world, x + aX, y + aY, z + aZ, meta, 0); //TODO: setBlockToAir() - world.func_147468_f(x + aX, y + aY, z + aZ); + world.setBlockToAir(x + aX, y + aY, z + aZ); } else if (meta == 2) { //TODO: dropBlockAsItem() - block.func_149697_b(world, x + aX, y + aY, z + aZ, meta, 0); + block.dropBlockAsItem(world, x + aX, y + aY, z + aZ, meta, 0); //TODO: setBlock() - world.func_147465_d(x + aX, y + aY, z + aZ, BOPBlockHelper.get("foliage"), 1, 2); + world.setBlock(x + aX, y + aY, z + aZ, BOPBlockHelper.get("foliage"), 1, 2); } else if (meta == 6) { //TODO: dropBlockAsItem() - block.func_149697_b(world, x + aX, y + aY, z + aZ, meta, 0); + block.dropBlockAsItem(world, x + aX, y + aY, z + aZ, meta, 0); //TODO: setBlockToAir() - world.func_147468_f(x + aX, y + aY, z + aZ); + world.setBlockToAir(x + aX, y + aY, z + aZ); } } else if (block == Blocks.tallgrass) { //TODO: dropBlockAsItem() - block.func_149697_b(world, x + aX, y + aY, z + aZ, meta, 0); + block.dropBlockAsItem(world, x + aX, y + aY, z + aZ, meta, 0); //TODO: setBlock() - world.func_147465_d(x + aX, y + aY, z + aZ, BOPBlockHelper.get("foliage"), 2, 2); + world.setBlock(x + aX, y + aY, z + aZ, BOPBlockHelper.get("foliage"), 2, 2); } else if (block != Blocks.waterlily && block instanceof BlockFlower) { //TODO: dropBlockAsItem() - block.func_149697_b(world, x + aX, y + aY, z + aZ, meta, 0); + block.dropBlockAsItem(world, x + aX, y + aY, z + aZ, meta, 0); //TODO: setBlockToAir() - world.func_147468_f(x + aX, y + aY, z + aZ); + world.setBlockToAir(x + aX, y + aY, z + aZ); } } } @@ -196,7 +196,7 @@ public class ItemBOPScythe extends Item for (int aZ = -radius; aZ <= radius; aZ++) { //TODO: getBlock() - Block block = world.func_147439_a(x + aX, y + aY, z + aZ); + Block block = world.getBlock(x + aX, y + aY, z + aZ); int meta = world.getBlockMetadata(x + aX, y + aY, z + aZ); if (block != null) @@ -230,9 +230,9 @@ public class ItemBOPScythe extends Item } //TODO: dropBlockAsItem() - block.func_149697_b(world, x + aX, y + aY, z + aZ, meta, 0); + block.dropBlockAsItem(world, x + aX, y + aY, z + aZ, meta, 0); //TODO: setBlockToAir() - world.func_147468_f(x + aX, y + aY, z + aZ); + world.setBlockToAir(x + aX, y + aY, z + aZ); } } } @@ -251,7 +251,7 @@ public class ItemBOPScythe extends Item if ((aX + aZ < radius * 2) && (-aX + aZ < radius * 2) && (aX + -aZ < radius * 2) && (-aX + -aZ < radius * 2)) { //TODO: getBlock() - Block block = world.func_147439_a(x + aX, y + aY, z + aZ); + Block block = world.getBlock(x + aX, y + aY, z + aZ); int meta = world.getBlockMetadata(x + aX, y + aY, z + aZ); if (block != null) @@ -287,38 +287,38 @@ public class ItemBOPScythe extends Item if (meta == 1) { //TODO: dropBlockAsItem() - block.func_149697_b(world, x + aX, y + aY, z + aZ, meta, 0); + block.dropBlockAsItem(world, x + aX, y + aY, z + aZ, meta, 0); //TODO: setBlockToAir() - world.func_147468_f(x + aX, y + aY, z + aZ); + world.setBlockToAir(x + aX, y + aY, z + aZ); } else if (meta == 2) { //TODO: dropBlockAsItem() - block.func_149697_b(world, x + aX, y + aY, z + aZ, meta, 0); + block.dropBlockAsItem(world, x + aX, y + aY, z + aZ, meta, 0); //TODO: setBlock() - world.func_147465_d(x + aX, y + aY, z + aZ, BOPBlockHelper.get("foliage"), 1, 2); + world.setBlock(x + aX, y + aY, z + aZ, BOPBlockHelper.get("foliage"), 1, 2); } else if (meta == 6) { //TODO: dropBlockAsItem() - block.func_149697_b(world, x + aX, y + aY, z + aZ, meta, 0); + block.dropBlockAsItem(world, x + aX, y + aY, z + aZ, meta, 0); //TODO: setBlockToAir() - world.func_147468_f(x + aX, y + aY, z + aZ); + world.setBlockToAir(x + aX, y + aY, z + aZ); } } else if (block == Blocks.tallgrass) { //TODO: dropBlockAsItem() - block.func_149697_b(world, x + aX, y + aY, z + aZ, meta, 0); + block.dropBlockAsItem(world, x + aX, y + aY, z + aZ, meta, 0); //TODO: setBlock() - world.func_147465_d(x + aX, y + aY, z + aZ, BOPBlockHelper.get("foliage"), 2, 2); + world.setBlock(x + aX, y + aY, z + aZ, BOPBlockHelper.get("foliage"), 2, 2); } else if (block != Blocks.waterlily && block instanceof BlockFlower) { //TODO: dropBlockAsItem() - block.func_149697_b(world, x + aX, y + aY, z + aZ, meta, 0); + block.dropBlockAsItem(world, x + aX, y + aY, z + aZ, meta, 0); //TODO: setBlockToAir() - world.func_147468_f(x + aX, y + aY, z + aZ); + world.setBlockToAir(x + aX, y + aY, z + aZ); } } } @@ -344,12 +344,12 @@ public class ItemBOPScythe extends Item public boolean getIsRepairable(ItemStack itemToRepair, ItemStack itemToRepairWith) { //TODO: getItemFromBlock - if (textureID == 0 && itemToRepairWith.getItem() == Item.func_150898_a(Blocks.planks)) + if (textureID == 0 && itemToRepairWith.getItem() == Item.getItemFromBlock(Blocks.planks)) { return true; } //TODO: getItemFromBlock - if (textureID == 1 && itemToRepairWith.getItem() == Item.func_150898_a(Blocks.cobblestone)) + if (textureID == 1 && itemToRepairWith.getItem() == Item.getItemFromBlock(Blocks.cobblestone)) { return true; } diff --git a/src/main/java/biomesoplenty/common/items/ItemBOPSeeds.java b/src/main/java/biomesoplenty/common/items/ItemBOPSeeds.java index 97f41b616..54041f692 100644 --- a/src/main/java/biomesoplenty/common/items/ItemBOPSeeds.java +++ b/src/main/java/biomesoplenty/common/items/ItemBOPSeeds.java @@ -42,13 +42,13 @@ public class ItemBOPSeeds extends Item implements IPlantable else if (player.canPlayerEdit(x, y, z, side, itemStack) && player.canPlayerEdit(x, y + 1, z, side, itemStack)) { //TODO: getBlock() - Block soil = world.func_147439_a(x, y, z); + Block soil = world.getBlock(x, y, z); //TODO: isAirBlock() - if (soil != null && soil.canSustainPlant(world, x, y, z, ForgeDirection.UP, this) && world.func_147437_c(x, y + 1, z)) + if (soil != null && soil.canSustainPlant(world, x, y, z, ForgeDirection.UP, this) && world.isAirBlock(x, y + 1, z)) { //TODO: setBlock() - world.func_147465_d(x, y + 1, z, this.blockType, 0, 2); + world.setBlock(x, y + 1, z, this.blockType, 0, 2); --itemStack.stackSize; return true; } diff --git a/src/main/java/biomesoplenty/common/items/ItemBiomeBook.java b/src/main/java/biomesoplenty/common/items/ItemBiomeBook.java index 9ae0a9a16..68ecfc390 100644 --- a/src/main/java/biomesoplenty/common/items/ItemBiomeBook.java +++ b/src/main/java/biomesoplenty/common/items/ItemBiomeBook.java @@ -35,7 +35,7 @@ public class ItemBiomeBook extends ItemEditableBook if (world.isRemote) { - Minecraft.getMinecraft().func_147108_a(new GuiScreenBiomeBook(player, itemStack)); + Minecraft.getMinecraft().displayGuiScreen(new GuiScreenBiomeBook(player, itemStack)); } return itemStack; @@ -43,7 +43,7 @@ public class ItemBiomeBook extends ItemEditableBook @Override //TODO: public void getSubItems(Item item, CreativeTabs creativeTabs, List list) - public void func_150895_a(Item item, CreativeTabs creativeTabs, List list) + public void getSubItems(Item item, CreativeTabs creativeTabs, List list) { ItemStack biomeBook = new ItemStack(item); diff --git a/src/main/java/biomesoplenty/common/items/ItemBiomeFinder.java b/src/main/java/biomesoplenty/common/items/ItemBiomeFinder.java index 3b60c710c..e86acf3f0 100644 --- a/src/main/java/biomesoplenty/common/items/ItemBiomeFinder.java +++ b/src/main/java/biomesoplenty/common/items/ItemBiomeFinder.java @@ -26,8 +26,8 @@ public class ItemBiomeFinder extends Item { public IIcon[] biomeRadarIcons = new IIcon[32]; - private double[] currentAngles = new double[BiomeGenBase.func_150565_n().length]; - private double[] angleDeltas = new double[BiomeGenBase.func_150565_n().length]; + private double[] currentAngles = new double[BiomeGenBase.getBiomeGenArray().length]; + private double[] angleDeltas = new double[BiomeGenBase.getBiomeGenArray().length]; public ItemBiomeFinder() { @@ -46,7 +46,7 @@ public class ItemBiomeFinder extends Item if (!world.isRemote && !itemStack.getTagCompound().getBoolean("foundBiome")) { //TODO: getBiomeGenArray() - BiomeGenBase biomeToFind = BiomeGenBase.func_150565_n()[biomeIDToFind]; + BiomeGenBase biomeToFind = BiomeGenBase.getBiomeGenArray()[biomeIDToFind]; if (biomeToFind != null) { @@ -63,9 +63,9 @@ public class ItemBiomeFinder extends Item { for (int z = -10; z <= 10; z++) { - ChunkPosition foundPosition = chunkManager.func_150795_a(playerX + (x * 512), playerZ + (z * 512), radius, Arrays.asList(biomeToFind), world.rand); + ChunkPosition foundPosition = chunkManager.findBiomePosition(playerX + (x * 512), playerZ + (z * 512), radius, Arrays.asList(biomeToFind), world.rand); - if (foundPosition != null && world.getBiomeGenForCoords(foundPosition.field_151329_a, foundPosition.field_151328_c) == biomeToFind) + if (foundPosition != null && world.getBiomeGenForCoords(foundPosition.chunkPosX, foundPosition.chunkPosZ) == biomeToFind) { finalFoundPosition1 = foundPosition; break; @@ -79,9 +79,9 @@ public class ItemBiomeFinder extends Item { for (int z = 10; z >= -10; z--) { - ChunkPosition foundPosition = chunkManager.func_150795_a(playerX + (x * 512), playerZ + (z * 512), radius, Arrays.asList(biomeToFind), world.rand); + ChunkPosition foundPosition = chunkManager.findBiomePosition(playerX + (x * 512), playerZ + (z * 512), radius, Arrays.asList(biomeToFind), world.rand); - if (foundPosition != null && world.getBiomeGenForCoords(foundPosition.field_151329_a, foundPosition.field_151328_c) == biomeToFind) + if (foundPosition != null && world.getBiomeGenForCoords(foundPosition.chunkPosX, foundPosition.chunkPosZ) == biomeToFind) { finalFoundPosition2 = foundPosition; break; @@ -95,11 +95,11 @@ public class ItemBiomeFinder extends Item if (finalFoundPosition1 != null && finalFoundPosition2 != null) { - int f1X = finalFoundPosition1.field_151329_a; - int f1Z = finalFoundPosition1.field_151328_c; + int f1X = finalFoundPosition1.chunkPosX; + int f1Z = finalFoundPosition1.chunkPosZ; - int f2X = finalFoundPosition2.field_151329_a; - int f2Z = finalFoundPosition2.field_151328_c; + int f2X = finalFoundPosition2.chunkPosX; + int f2Z = finalFoundPosition2.chunkPosZ; //System.out.println(f1X + " " + f1Z); //System.out.println(f2X + " " + f2Z); @@ -115,17 +115,17 @@ public class ItemBiomeFinder extends Item if (biomePosition != null) { - //System.out.println(biomePosition.field_151329_a + " " + biomePosition.field_151328_c); + //System.out.println(biomePosition.chunkPosX + " " + biomePosition.chunkPosZ); NBTTagCompound biomeCompound = new NBTTagCompound(); - biomeCompound.setInteger("x", biomePosition.field_151329_a); - biomeCompound.setInteger("z", biomePosition.field_151328_c); + biomeCompound.setInteger("x", biomePosition.chunkPosX); + biomeCompound.setInteger("z", biomePosition.chunkPosZ); itemStack.getTagCompound().setTag("biomePosition", biomeCompound); itemStack.getTagCompound().setBoolean("foundBiome", true); - BiomesOPlenty.packetPipeline.sendTo(new PacketBiomePosition(biomePosition.field_151329_a, biomePosition.field_151328_c, true), (EntityPlayerMP)player); + BiomesOPlenty.packetPipeline.sendTo(new PacketBiomePosition(biomePosition.chunkPosX, biomePosition.chunkPosZ, true), (EntityPlayerMP)player); } //System.out.println("Done looking"); @@ -181,7 +181,7 @@ public class ItemBiomeFinder extends Item { if (itemStack.getTagCompound().hasKey("biomeIDToFind")) { - BiomeGenBase biome = BiomeGenBase.func_150565_n()[itemStack.getTagCompound().getInteger("biomeIDToFind")]; + BiomeGenBase biome = BiomeGenBase.getBiomeGenArray()[itemStack.getTagCompound().getInteger("biomeIDToFind")]; if (biome != null) { diff --git a/src/main/java/biomesoplenty/common/items/ItemDart.java b/src/main/java/biomesoplenty/common/items/ItemDart.java index a312f5d88..3b3f705ac 100644 --- a/src/main/java/biomesoplenty/common/items/ItemDart.java +++ b/src/main/java/biomesoplenty/common/items/ItemDart.java @@ -25,7 +25,7 @@ public class ItemDart extends Item @Override //TODO: public void getSubItems(Item item, CreativeTabs creativeTabs, List list) - public void func_150895_a(Item item, CreativeTabs creativeTabs, List list) + public void getSubItems(Item item, CreativeTabs creativeTabs, List list) { for (int i = 0; i < dartTypes.length; ++i) { diff --git a/src/main/java/biomesoplenty/common/items/ItemDartBlower.java b/src/main/java/biomesoplenty/common/items/ItemDartBlower.java index f4b91a49d..390b04fc4 100644 --- a/src/main/java/biomesoplenty/common/items/ItemDartBlower.java +++ b/src/main/java/biomesoplenty/common/items/ItemDartBlower.java @@ -40,7 +40,7 @@ public class ItemDartBlower extends Item boolean flag = par3EntityPlayer.capabilities.isCreativeMode; //TODO: hasItem() - if (flag || par3EntityPlayer.inventory.func_146028_b(BOPItemHelper.get("dart"))) + if (flag || par3EntityPlayer.inventory.hasItem(BOPItemHelper.get("dart"))) { EntityDart entityDart = new EntityDart(world, par3EntityPlayer, 1.0F); diff --git a/src/main/java/biomesoplenty/common/items/ItemEnderporter.java b/src/main/java/biomesoplenty/common/items/ItemEnderporter.java index f49fd5853..f8dfa643b 100644 --- a/src/main/java/biomesoplenty/common/items/ItemEnderporter.java +++ b/src/main/java/biomesoplenty/common/items/ItemEnderporter.java @@ -50,7 +50,7 @@ public class ItemEnderporter extends Item { //TODO: addChatMessage()? //TODO: BUG Whole text isn't purple - player.func_146105_b(new ChatComponentText("\u00a75A mystical energy is preventing you from using this in the current world.")); + player.addChatComponentMessage(new ChatComponentText("\u00a75A mystical energy is preventing you from using this in the current world.")); } } diff --git a/src/main/java/biomesoplenty/common/items/ItemGems.java b/src/main/java/biomesoplenty/common/items/ItemGems.java index 0b38c34f6..22bb1a65e 100644 --- a/src/main/java/biomesoplenty/common/items/ItemGems.java +++ b/src/main/java/biomesoplenty/common/items/ItemGems.java @@ -58,7 +58,7 @@ public class ItemGems extends Item @Override //TODO: public void getSubItems(Item item, CreativeTabs creativeTabs, List list) - public void func_150895_a(Item item, CreativeTabs creativeTabs, List list) + public void getSubItems(Item item, CreativeTabs creativeTabs, List list) { for (int meta = 0; meta < gems.length; ++meta) { diff --git a/src/main/java/biomesoplenty/common/items/ItemJarFilled.java b/src/main/java/biomesoplenty/common/items/ItemJarFilled.java index 294ef94c1..7bed38458 100644 --- a/src/main/java/biomesoplenty/common/items/ItemJarFilled.java +++ b/src/main/java/biomesoplenty/common/items/ItemJarFilled.java @@ -73,7 +73,7 @@ public class ItemJarFilled extends Item @Override //TODO: public void getSubItems(Item item, CreativeTabs creativeTabs, List list) - public void func_150895_a(Item item, CreativeTabs creativeTabs, List list) + public void getSubItems(Item item, CreativeTabs creativeTabs, List list) { for (int meta = 0; meta < jars.length; ++meta) { @@ -89,14 +89,14 @@ public class ItemJarFilled extends Item if (entityPlayer.dimension == 0 || entityPlayer.dimension == BOPConfigurationIDs.promisedLandDimID) { //TODO: getBlock() - Block block = world.func_147439_a(x, y, z); + Block block = world.getBlock(x, y, z); x += Facing.offsetsXForSide[side]; y += Facing.offsetsYForSide[side]; z += Facing.offsetsZForSide[side]; double d0 = 0.0D; //TODO: getRenderType() - if (side == 1 && block != null && block.func_149645_b() == 11) + if (side == 1 && block != null && block.getRenderType() == 11) { d0 = 0.5D; } @@ -139,7 +139,7 @@ public class ItemJarFilled extends Item if (!world.isRemote) { //TODO: addChatMessage - entityPlayer.func_146105_b(new ChatComponentText("\u00a75Pixies cannot survive in this environment!")); + entityPlayer.addChatComponentMessage(new ChatComponentText("\u00a75Pixies cannot survive in this environment!")); } } } diff --git a/src/main/java/biomesoplenty/common/network/PacketPipeline.java b/src/main/java/biomesoplenty/common/network/PacketPipeline.java index c66d3c82d..aaa05de84 100644 --- a/src/main/java/biomesoplenty/common/network/PacketPipeline.java +++ b/src/main/java/biomesoplenty/common/network/PacketPipeline.java @@ -107,7 +107,7 @@ public class PacketPipeline extends MessageToMessageCodec 1.0F) { @@ -121,7 +121,7 @@ public class WorldChunkManagerBOPHell extends WorldChunkManager for (int var7 = 0; var7 < par4 * par5; ++var7) { - float var8 = BiomeGenBase.func_150565_n()[var6[var7]].temperature / 65536.0F; + float var8 = BiomeGenBase.getBiomeGenArray()[var6[var7]].temperature / 65536.0F; if (var8 > 1.0F) { @@ -151,7 +151,7 @@ public class WorldChunkManagerBOPHell extends WorldChunkManager for (int var7 = 0; var7 < par4 * par5; ++var7) { - par1ArrayOfBiomeGenBase[var7] = BiomeGenBase.func_150565_n()[var6[var7]]; + par1ArrayOfBiomeGenBase[var7] = BiomeGenBase.getBiomeGenArray()[var6[var7]]; } return par1ArrayOfBiomeGenBase; @@ -193,7 +193,7 @@ public class WorldChunkManagerBOPHell extends WorldChunkManager for (int var8 = 0; var8 < par4 * par5; ++var8) { - par1ArrayOfBiomeGenBase[var8] = BiomeGenBase.func_150565_n()[var7[var8]]; + par1ArrayOfBiomeGenBase[var8] = BiomeGenBase.getBiomeGenArray()[var7[var8]]; } return par1ArrayOfBiomeGenBase; @@ -218,7 +218,7 @@ public class WorldChunkManagerBOPHell extends WorldChunkManager for (int var12 = 0; var12 < var9 * var10; ++var12) { - BiomeGenBase var13 = BiomeGenBase.func_150565_n()[var11[var12]]; + BiomeGenBase var13 = BiomeGenBase.getBiomeGenArray()[var11[var12]]; if (!par4List.contains(var13)) return false; @@ -234,7 +234,7 @@ public class WorldChunkManagerBOPHell extends WorldChunkManager @Override @SuppressWarnings("rawtypes") //TODO: findBiomePosition - public ChunkPosition func_150795_a(int par1, int par2, int par3, List par4List, Random par5Random) + public ChunkPosition findBiomePosition(int par1, int par2, int par3, List par4List, Random par5Random) { IntCache.resetIntCache(); int var6 = par1 - par3 >> 2; @@ -251,7 +251,7 @@ public class WorldChunkManagerBOPHell extends WorldChunkManager { int var16 = var6 + var15 % var10 << 2; int var17 = var7 + var15 / var10 << 2; - BiomeGenBase var18 = BiomeGenBase.func_150565_n()[var12[var15]]; + BiomeGenBase var18 = BiomeGenBase.getBiomeGenArray()[var12[var15]]; if (par4List.contains(var18) && (var13 == null || par5Random.nextInt(var14 + 1) == 0)) { diff --git a/src/main/java/biomesoplenty/common/world/WorldChunkManagerPromised.java b/src/main/java/biomesoplenty/common/world/WorldChunkManagerPromised.java index c355a0433..21bbb0a9d 100644 --- a/src/main/java/biomesoplenty/common/world/WorldChunkManagerPromised.java +++ b/src/main/java/biomesoplenty/common/world/WorldChunkManagerPromised.java @@ -61,7 +61,7 @@ public class WorldChunkManagerPromised extends WorldChunkManager for (int var7 = 0; var7 < par4 * par5; ++var7) { - float var8 = BiomeGenBase.func_150565_n()[var6[var7]].getIntRainfall() / 65536.0F; + float var8 = BiomeGenBase.getBiomeGenArray()[var6[var7]].getIntRainfall() / 65536.0F; if (var8 > 1.0F) { @@ -102,7 +102,7 @@ public class WorldChunkManagerPromised extends WorldChunkManager for (int var7 = 0; var7 < par4 * par5; ++var7) { - float var8 = BiomeGenBase.func_150565_n()[var6[var7]].temperature / 65536.0F; + float var8 = BiomeGenBase.getBiomeGenArray()[var6[var7]].temperature / 65536.0F; if (var8 > 1.0F) { @@ -132,7 +132,7 @@ public class WorldChunkManagerPromised extends WorldChunkManager for (int var7 = 0; var7 < par4 * par5; ++var7) { - par1ArrayOfBiomeGenBase[var7] = BiomeGenBase.func_150565_n()[var6[var7]]; + par1ArrayOfBiomeGenBase[var7] = BiomeGenBase.getBiomeGenArray()[var6[var7]]; } return par1ArrayOfBiomeGenBase; @@ -174,7 +174,7 @@ public class WorldChunkManagerPromised extends WorldChunkManager for (int var8 = 0; var8 < par4 * par5; ++var8) { - par1ArrayOfBiomeGenBase[var8] = BiomeGenBase.func_150565_n()[var7[var8]]; + par1ArrayOfBiomeGenBase[var8] = BiomeGenBase.getBiomeGenArray()[var7[var8]]; } return par1ArrayOfBiomeGenBase; @@ -199,7 +199,7 @@ public class WorldChunkManagerPromised extends WorldChunkManager for (int var12 = 0; var12 < var9 * var10; ++var12) { - BiomeGenBase var13 = BiomeGenBase.func_150565_n()[var11[var12]]; + BiomeGenBase var13 = BiomeGenBase.getBiomeGenArray()[var11[var12]]; if (!par4List.contains(var13)) return false; @@ -215,7 +215,7 @@ public class WorldChunkManagerPromised extends WorldChunkManager @Override @SuppressWarnings("rawtypes") //TODO: findBiomePosition - public ChunkPosition func_150795_a(int par1, int par2, int par3, List par4List, Random par5Random) + public ChunkPosition findBiomePosition(int par1, int par2, int par3, List par4List, Random par5Random) { IntCache.resetIntCache(); int var6 = par1 - par3 >> 2; @@ -232,7 +232,7 @@ public class WorldChunkManagerPromised extends WorldChunkManager { int var16 = var6 + var15 % var10 << 2; int var17 = var7 + var15 / var10 << 2; - BiomeGenBase var18 = BiomeGenBase.func_150565_n()[var12[var15]]; + BiomeGenBase var18 = BiomeGenBase.getBiomeGenArray()[var12[var15]]; if (par4List.contains(var18) && (var13 == null || par5Random.nextInt(var14 + 1) == 0)) { diff --git a/src/main/java/biomesoplenty/common/world/WorldProviderPromised.java b/src/main/java/biomesoplenty/common/world/WorldProviderPromised.java index d8faef635..339e69281 100644 --- a/src/main/java/biomesoplenty/common/world/WorldProviderPromised.java +++ b/src/main/java/biomesoplenty/common/world/WorldProviderPromised.java @@ -105,7 +105,7 @@ public class WorldProviderPromised extends WorldProvider @Override public boolean canCoordinateBeSpawn(int par1, int par2) { - Block var3 = worldObj.func_147474_b(par1, par2); + Block var3 = worldObj.getTopBlock(par1, par2); return var3 == BOPBlockHelper.get("grass"); } diff --git a/src/main/java/biomesoplenty/common/world/WorldProviderSurfaceBOP.java b/src/main/java/biomesoplenty/common/world/WorldProviderSurfaceBOP.java index 54584d149..04082c86c 100644 --- a/src/main/java/biomesoplenty/common/world/WorldProviderSurfaceBOP.java +++ b/src/main/java/biomesoplenty/common/world/WorldProviderSurfaceBOP.java @@ -13,7 +13,7 @@ public class WorldProviderSurfaceBOP extends WorldProviderSurface { int y = getTopBlockCoord(this.worldObj, x, z); //TODO: getBlock() - Block topBlock = this.worldObj.func_147439_a(x, y, z); + Block topBlock = this.worldObj.getBlock(x, y, z); boolean flag = topBlock == Blocks.sand || topBlock == Blocks.stone || topBlock == Blocks.snow_layer && this.worldChunkMgr.getBiomesToSpawnIn().contains(this.worldObj.getBiomeGenForCoordsBody(x, z)); boolean isClear = true; @@ -23,7 +23,7 @@ public class WorldProviderSurfaceBOP extends WorldProviderSurface { for (int iz = -1; iz <= 1; iz++) { - if (this.worldObj.func_147439_a(x, y, z).func_149688_o() == Material.field_151586_h) + if (this.worldObj.getBlock(x, y, z).getMaterial() == Material.water) { isClear = false; break; @@ -39,7 +39,7 @@ public class WorldProviderSurfaceBOP extends WorldProviderSurface { int y; - for (y = 63; !world.func_147437_c(x, y + 1, z); ++y) + for (y = 63; !world.isAirBlock(x, y + 1, z); ++y) { ; } diff --git a/src/main/java/biomesoplenty/common/world/decoration/BOPBiomeDecorator.java b/src/main/java/biomesoplenty/common/world/decoration/BOPBiomeDecorator.java index 56a8a6fd1..6451643ed 100644 --- a/src/main/java/biomesoplenty/common/world/decoration/BOPBiomeDecorator.java +++ b/src/main/java/biomesoplenty/common/world/decoration/BOPBiomeDecorator.java @@ -18,7 +18,7 @@ import net.minecraftforge.event.terraingen.TerrainGen; public class BOPBiomeDecorator extends BiomeDecorator { @Override - public void func_150512_a(World world, Random random, BiomeGenBase biome, int chunk_X, int chunk_Z) + public void decorateChunk(World world, Random random, BiomeGenBase biome, int chunk_X, int chunk_Z) { if (this.currentWorld == null) { @@ -26,17 +26,17 @@ public class BOPBiomeDecorator extends BiomeDecorator this.randomGenerator = random; this.chunk_X = chunk_X; this.chunk_Z = chunk_Z; - this.func_150513_a(biome); + this.genDecorations(biome); this.currentWorld = null; this.randomGenerator = null; } } @Override - protected void func_150513_a(BiomeGenBase biome) + protected void genDecorations(BiomeGenBase biome) { doBOPDecoration(biome); - super.func_150513_a(biome); + super.genDecorations(biome); } public void doBOPDecoration(BiomeGenBase biome) diff --git a/src/main/java/biomesoplenty/common/world/features/WorldGenBOPDoubleFlora.java b/src/main/java/biomesoplenty/common/world/features/WorldGenBOPDoubleFlora.java index d9fbd7240..4b856b69f 100644 --- a/src/main/java/biomesoplenty/common/world/features/WorldGenBOPDoubleFlora.java +++ b/src/main/java/biomesoplenty/common/world/features/WorldGenBOPDoubleFlora.java @@ -63,23 +63,23 @@ public class WorldGenBOPDoubleFlora extends WorldGenBOPFlora int k1 = z + random.nextInt(8) - random.nextInt(8); //TODO: isAirBlock() - if (world.func_147437_c(i1, j1, k1) && (!world.provider.hasNoSky || j1 < 255)) + if (world.isAirBlock(i1, j1, k1) && (!world.provider.hasNoSky || j1 < 255)) { if (isVanilla) { - if (Blocks.double_plant.func_149742_c(world, i1, j1, k1)) + if (Blocks.double_plant.canPlaceBlockAt(world, i1, j1, k1)) { Blocks.double_plant.func_149889_c(world, i1, j1, k1, this.vanillaFloraMeta, 2); } } else { - if (bottomFlora != null && this.bottomFlora.func_149705_a(world, i1, j1, k1, 0, new ItemStack(bottomFlora, 1, bottomFloraMeta))) + if (bottomFlora != null && this.bottomFlora.canReplace(world, i1, j1, k1, 0, new ItemStack(bottomFlora, 1, bottomFloraMeta))) { //TODO: setBlock() - world.func_147465_d(i1, j1, k1, this.bottomFlora, this.bottomFloraMeta, 2); + world.setBlock(i1, j1, k1, this.bottomFlora, this.bottomFloraMeta, 2); //TODO: setBlock() - world.func_147465_d(i1, j1 + 1, k1, this.topFlora, this.topFloraMeta, 2); + world.setBlock(i1, j1 + 1, k1, this.topFlora, this.topFloraMeta, 2); } } } diff --git a/src/main/java/biomesoplenty/common/world/features/WorldGenBOPFlora.java b/src/main/java/biomesoplenty/common/world/features/WorldGenBOPFlora.java index f6065d256..a7f567870 100644 --- a/src/main/java/biomesoplenty/common/world/features/WorldGenBOPFlora.java +++ b/src/main/java/biomesoplenty/common/world/features/WorldGenBOPFlora.java @@ -44,12 +44,12 @@ public class WorldGenBOPFlora extends WorldGeneratorBOP int k1 = z + random.nextInt(8) - random.nextInt(8); //TODO: isAirBlock() - if (world.func_147437_c(i1, j1, k1) && (!world.provider.hasNoSky || j1 < 255) && - (flora == Blocks.web ? world.func_147439_a(i1, j1 + 1, k1) == BOPBlockHelper.get("leaves2") || world.func_147439_a(i1, j1 + 1, k1) == BOPBlockHelper.get("colorizedLeaves2") || world.func_147439_a(i1, j1 - 1, k1) == Blocks.grass : - this.flora.func_149705_a(world, i1, j1, k1, 0, new ItemStack(flora, 1, floraMeta)))) + if (world.isAirBlock(i1, j1, k1) && (!world.provider.hasNoSky || j1 < 255) && + (flora == Blocks.web ? world.getBlock(i1, j1 + 1, k1) == BOPBlockHelper.get("leaves2") || world.getBlock(i1, j1 + 1, k1) == BOPBlockHelper.get("colorizedLeaves2") || world.getBlock(i1, j1 - 1, k1) == Blocks.grass : + this.flora.canReplace(world, i1, j1, k1, 0, new ItemStack(flora, 1, floraMeta)))) { //TODO: setBlock() - world.func_147465_d(i1, j1, k1, this.flora, this.floraMeta, 2); + world.setBlock(i1, j1, k1, this.flora, this.floraMeta, 2); } } diff --git a/src/main/java/biomesoplenty/common/world/features/WorldGenBOPTallGrass.java b/src/main/java/biomesoplenty/common/world/features/WorldGenBOPTallGrass.java index a15150f5a..decf7b181 100644 --- a/src/main/java/biomesoplenty/common/world/features/WorldGenBOPTallGrass.java +++ b/src/main/java/biomesoplenty/common/world/features/WorldGenBOPTallGrass.java @@ -29,7 +29,7 @@ public class WorldGenBOPTallGrass extends WorldGeneratorBOP do { - block = world.func_147439_a(x, y, z); + block = world.getBlock(x, y, z); if (!(block.isLeaves(world, x, y, z) || block.isAir(world, x, y, z))) { break; @@ -44,9 +44,9 @@ public class WorldGenBOPTallGrass extends WorldGeneratorBOP int k1 = z + random.nextInt(8) - random.nextInt(8); //TODO: isAirBlock() canReplace() - if (world.func_147437_c(i1, j1, k1) && this.tallGrass.func_149705_a(world, i1, j1, k1, 0, new ItemStack(this.tallGrass, 1, this.tallGrassMetadata))) + if (world.isAirBlock(i1, j1, k1) && this.tallGrass.canReplace(world, i1, j1, k1, 0, new ItemStack(this.tallGrass, 1, this.tallGrassMetadata))) { - world.func_147465_d(i1, j1, k1, this.tallGrass, this.tallGrassMetadata, 2); + world.setBlock(i1, j1, k1, this.tallGrass, this.tallGrassMetadata, 2); } } diff --git a/src/main/java/biomesoplenty/common/world/features/WorldGenCobwebNest.java b/src/main/java/biomesoplenty/common/world/features/WorldGenCobwebNest.java index b46ac7823..27693c3e8 100644 --- a/src/main/java/biomesoplenty/common/world/features/WorldGenCobwebNest.java +++ b/src/main/java/biomesoplenty/common/world/features/WorldGenCobwebNest.java @@ -20,17 +20,17 @@ public class WorldGenCobwebNest extends WorldGeneratorBOP Block var15; //TODO: getBlock() - for (boolean var6 = false; ((var15 = par1World.func_147439_a(par3, par4, par5)) == Blocks.air || var15 == Blocks.web) && par4 > 0; --par4) + for (boolean var6 = false; ((var15 = par1World.getBlock(par3, par4, par5)) == Blocks.air || var15 == Blocks.web) && par4 > 0; --par4) { ; } - Block block = par1World.func_147439_a(par3, par4, par5); + Block block = par1World.getBlock(par3, par4, par5); if (block == Blocks.grass) { ++par4; - this.func_150516_a(par1World, par3, par4, par5, Blocks.web, 0); + this.setBlockAndNotifyAdequately(par1World, par3, par4, par5, Blocks.web, 0); int var999 = par2Random.nextInt(3); @@ -56,7 +56,7 @@ public class WorldGenCobwebNest extends WorldGeneratorBOP if (Math.abs(var12) != var10 || Math.abs(var14) != var10 || par2Random.nextInt(2) != 0) { - this.func_150516_a(par1World, var11, var8, var13, Blocks.web, 0); + this.setBlockAndNotifyAdequately(par1World, var11, var8, var13, Blocks.web, 0); } } } diff --git a/src/main/java/biomesoplenty/common/world/features/WorldGenGrassSplatter.java b/src/main/java/biomesoplenty/common/world/features/WorldGenGrassSplatter.java index c04d94b8a..75d383599 100644 --- a/src/main/java/biomesoplenty/common/world/features/WorldGenGrassSplatter.java +++ b/src/main/java/biomesoplenty/common/world/features/WorldGenGrassSplatter.java @@ -21,7 +21,7 @@ public class WorldGenGrassSplatter extends WorldGeneratorBOP do { - block = world.func_147439_a(x, y, z); + block = world.getBlock(x, y, z); if (!(block.isLeaves(world, x, y, z) || block.isAir(world, x, y, z))) { break; @@ -38,25 +38,25 @@ public class WorldGenGrassSplatter extends WorldGeneratorBOP int var999 = random.nextInt(5); //TODO: isAirBlock() - if (world.func_147437_c(randX, randY, randZ) && (world.func_147439_a(randX, randY - 1, randZ) == BOPBlockHelper.get("hardSand") || world.func_147439_a(randX, randY - 1, randZ) == Blocks.sand || world.func_147439_a(randX, randY - 1, randZ) == Blocks.stone)) + if (world.isAirBlock(randX, randY, randZ) && (world.getBlock(randX, randY - 1, randZ) == BOPBlockHelper.get("hardSand") || world.getBlock(randX, randY - 1, randZ) == Blocks.sand || world.getBlock(randX, randY - 1, randZ) == Blocks.stone)) { - world.func_147465_d(randX, randY - 1, randZ, Blocks.grass, 0, 2); + world.setBlock(randX, randY - 1, randZ, Blocks.grass, 0, 2); if (var999 == 0) { - world.func_147465_d(randX, randY, randZ, BOPBlockHelper.get("foliage"), 2, 2); + world.setBlock(randX, randY, randZ, BOPBlockHelper.get("foliage"), 2, 2); } else if (var999 == 1) { - world.func_147465_d(randX, randY, randZ, BOPBlockHelper.get("foliage"), 10, 2); + world.setBlock(randX, randY, randZ, BOPBlockHelper.get("foliage"), 10, 2); } else if (var999 == 2) { - world.func_147465_d(randX, randY, randZ, BOPBlockHelper.get("foliage"), 11, 2); + world.setBlock(randX, randY, randZ, BOPBlockHelper.get("foliage"), 11, 2); } else { - world.func_147465_d(randX, randY, randZ, BOPBlockHelper.get("foliage"), 2, 2); + world.setBlock(randX, randY, randZ, BOPBlockHelper.get("foliage"), 2, 2); } } } diff --git a/src/main/java/biomesoplenty/common/world/features/WorldGenLavaSpout.java b/src/main/java/biomesoplenty/common/world/features/WorldGenLavaSpout.java index 517dc72fc..61fc2b480 100644 --- a/src/main/java/biomesoplenty/common/world/features/WorldGenLavaSpout.java +++ b/src/main/java/biomesoplenty/common/world/features/WorldGenLavaSpout.java @@ -18,13 +18,13 @@ public class WorldGenLavaSpout extends WorldGeneratorBOP public boolean generate(World world, Random random, int x, int y, int z) { //TODO: isAirBlock() - while (world.func_147437_c(x, y, z) && y > 2) + while (world.isAirBlock(x, y, z) && y > 2) { --y; } //TODO: getBlock() - Block block = world.func_147439_a(x, y, z); + Block block = world.getBlock(x, y, z); if (block != BOPBlockHelper.get("ashStone")) { @@ -37,7 +37,7 @@ public class WorldGenLavaSpout extends WorldGeneratorBOP for (int var8 = -2; var8 <= 2; ++var8) { //TODO: isAirBlock() isAirBlock() - if (world.func_147437_c(x + var7, y - 1, z + var8) && world.func_147437_c(x + var7, y - 2, z + var8)) + if (world.isAirBlock(x + var7, y - 1, z + var8) && world.isAirBlock(x + var7, y - 2, z + var8)) { return false; } @@ -45,13 +45,13 @@ public class WorldGenLavaSpout extends WorldGeneratorBOP } //TODO: setBlock() - world.func_147449_b(x, y - 1, z, Blocks.flowing_lava); - world.func_147449_b(x, y, z, Blocks.flowing_lava); - world.func_147449_b(x, y + 1, z, Blocks.flowing_lava); - world.func_147449_b(x - 1, y + 1, z, Blocks.flowing_lava); - world.func_147449_b(x + 1, y + 1, z, Blocks.flowing_lava); - world.func_147449_b(x, y + 1, z - 1, Blocks.flowing_lava); - world.func_147449_b(x, y + 1, z + 1, Blocks.flowing_lava); + world.setBlock(x, y - 1, z, Blocks.flowing_lava); + world.setBlock(x, y, z, Blocks.flowing_lava); + world.setBlock(x, y + 1, z, Blocks.flowing_lava); + world.setBlock(x - 1, y + 1, z, Blocks.flowing_lava); + world.setBlock(x + 1, y + 1, z, Blocks.flowing_lava); + world.setBlock(x, y + 1, z - 1, Blocks.flowing_lava); + world.setBlock(x, y + 1, z + 1, Blocks.flowing_lava); return true; } } diff --git a/src/main/java/biomesoplenty/common/world/features/WorldGenLog.java b/src/main/java/biomesoplenty/common/world/features/WorldGenLog.java index 9c8833fea..de17176b7 100644 --- a/src/main/java/biomesoplenty/common/world/features/WorldGenLog.java +++ b/src/main/java/biomesoplenty/common/world/features/WorldGenLog.java @@ -17,7 +17,7 @@ public class WorldGenLog extends WorldGeneratorBOP public boolean generate(World world, Random random, int x, int y, int z) { //TODO: isAirBlock() - while (!world.func_147437_c(x, y, z) && y > 2) + while (!world.isAirBlock(x, y, z) && y > 2) { ++y; } @@ -35,7 +35,7 @@ public class WorldGenLog extends WorldGeneratorBOP else iz = i; //TODO: isAirBlock() getBlock() - if (!world.func_147437_c(x + ix, y, z + iz) || world.func_147439_a(x + ix, y - 1, z + iz) != Blocks.grass) + if (!world.isAirBlock(x + ix, y, z + iz) || world.getBlock(x + ix, y - 1, z + iz) != Blocks.grass) { isAllowed = false; break; @@ -46,8 +46,8 @@ public class WorldGenLog extends WorldGeneratorBOP { for (int i = 0; i < length; i++) { - if (direction == 0) world.func_147465_d(x + i, y, z, Blocks.log, 4, 2); - else world.func_147465_d(x, y, z + i, Blocks.log, 8, 2); + if (direction == 0) world.setBlock(x + i, y, z, Blocks.log, 4, 2); + else world.setBlock(x, y, z + i, Blocks.log, 8, 2); } return true; diff --git a/src/main/java/biomesoplenty/common/world/features/WorldGenMarsh.java b/src/main/java/biomesoplenty/common/world/features/WorldGenMarsh.java index a90941e11..113f9e57e 100644 --- a/src/main/java/biomesoplenty/common/world/features/WorldGenMarsh.java +++ b/src/main/java/biomesoplenty/common/world/features/WorldGenMarsh.java @@ -19,99 +19,99 @@ public class WorldGenMarsh extends WorldGenerator for (int var7 = z; y < 63; ++y) { //TODO: getBlock() - Block block = world.func_147439_a(x, y - 1, z); + Block block = world.getBlock(x, y - 1, z); if ((block == Blocks.water) && y < 256 - var6 - 1) { for (int var8 = 2; var8 <= 5; ++var8) { //TODO: setBlock() - world.func_147449_b(x, y, z, Blocks.grass); - world.func_147449_b(x - 1, y, z, Blocks.grass); - world.func_147449_b(x + 1, y, z, Blocks.grass); - world.func_147449_b(x, y, z - 1, Blocks.grass); - world.func_147449_b(x, y, z + 1, Blocks.grass); - world.func_147449_b(x, y - 1, z, Blocks.dirt); - world.func_147449_b(x, y - 2, z, Blocks.dirt); - world.func_147449_b(x, y - 3, z, Blocks.dirt); - world.func_147449_b(x, y - 4, z, Blocks.dirt); - world.func_147449_b(x, y - 5, z, Blocks.dirt); - world.func_147449_b(x, y - 6, z, Blocks.dirt); - world.func_147449_b(x, y - 7, z, Blocks.dirt); - world.func_147449_b(x, y - 8, z, Blocks.dirt); - world.func_147449_b(x, y - 9, z, Blocks.dirt); - world.func_147449_b(x, y - 10, z, Blocks.dirt); - world.func_147449_b(x, y - 11, z, Blocks.dirt); - world.func_147449_b(x, y - 12, z, Blocks.dirt); - world.func_147449_b(x, y - 13, z, Blocks.dirt); - world.func_147449_b(x, y - 14, z, Blocks.dirt); - world.func_147449_b(x, y - 15, z, Blocks.dirt); - world.func_147449_b(x, y - 16, z, Blocks.dirt); - world.func_147449_b(x, y - 17, z, Blocks.dirt); - world.func_147449_b(x - 1, y - 1, z, Blocks.dirt); - world.func_147449_b(x + 1, y - 1, z, Blocks.dirt); - world.func_147449_b(x, y - 1, z - 1, Blocks.dirt); - world.func_147449_b(x, y - 1, z + 1, Blocks.dirt); - world.func_147449_b(x - 1, y - 2, z, Blocks.dirt); - world.func_147449_b(x + 1, y - 2, z, Blocks.dirt); - world.func_147449_b(x, y - 2, z - 1, Blocks.dirt); - world.func_147449_b(x, y - 2, z + 1, Blocks.dirt); - world.func_147449_b(x - 1, y - 3, z, Blocks.dirt); - world.func_147449_b(x + 1, y - 3, z, Blocks.dirt); - world.func_147449_b(x, y - 3, z - 1, Blocks.dirt); - world.func_147449_b(x, y - 3, z + 1, Blocks.dirt); - world.func_147449_b(x - 1, y - 4, z, Blocks.dirt); - world.func_147449_b(x + 1, y - 4, z, Blocks.dirt); - world.func_147449_b(x, y - 4, z - 1, Blocks.dirt); - world.func_147449_b(x, y - 4, z + 1, Blocks.dirt); - world.func_147449_b(x - 1, y - 5, z, Blocks.dirt); - world.func_147449_b(x + 1, y - 5, z, Blocks.dirt); - world.func_147449_b(x, y - 5, z - 1, Blocks.dirt); - world.func_147449_b(x, y - 5, z + 1, Blocks.dirt); - world.func_147449_b(x - 1, y - 6, z, Blocks.dirt); - world.func_147449_b(x + 1, y - 6, z, Blocks.dirt); - world.func_147449_b(x, y - 6, z - 1, Blocks.dirt); - world.func_147449_b(x, y - 6, z + 1, Blocks.dirt); - world.func_147449_b(x - 1, y - 7, z, Blocks.dirt); - world.func_147449_b(x + 1, y - 7, z, Blocks.dirt); - world.func_147449_b(x, y - 7, z - 1, Blocks.dirt); - world.func_147449_b(x, y - 7, z + 1, Blocks.dirt); - world.func_147449_b(x - 1, y - 8, z, Blocks.dirt); - world.func_147449_b(x + 1, y - 8, z, Blocks.dirt); - world.func_147449_b(x, y - 8, z - 1, Blocks.dirt); - world.func_147449_b(x, y - 8, z + 1, Blocks.dirt); - world.func_147449_b(x - 1, y - 9, z, Blocks.dirt); - world.func_147449_b(x + 1, y - 9, z, Blocks.dirt); - world.func_147449_b(x, y - 9, z - 1, Blocks.dirt); - world.func_147449_b(x, y - 9, z + 1, Blocks.dirt); - world.func_147449_b(x - 1, y - 10, z, Blocks.dirt); - world.func_147449_b(x + 1, y - 10, z, Blocks.dirt); - world.func_147449_b(x, y - 10, z - 1, Blocks.dirt); - world.func_147449_b(x, y - 10, z + 1, Blocks.dirt); - world.func_147449_b(x - 1, y - 11, z, Blocks.dirt); - world.func_147449_b(x + 1, y - 11, z, Blocks.dirt); - world.func_147449_b(x, y - 11, z - 1, Blocks.dirt); - world.func_147449_b(x, y - 11, z + 1, Blocks.dirt); - world.func_147449_b(x - 1, y - 12, z, Blocks.dirt); - world.func_147449_b(x + 1, y - 12, z, Blocks.dirt); - world.func_147449_b(x, y - 12, z - 1, Blocks.dirt); - world.func_147449_b(x, y - 12, z + 1, Blocks.dirt); - world.func_147449_b(x - 1, y - 13, z, Blocks.dirt); - world.func_147449_b(x + 1, y - 13, z, Blocks.dirt); - world.func_147449_b(x, y - 13, z - 1, Blocks.dirt); - world.func_147449_b(x, y - 13, z + 1, Blocks.dirt); - world.func_147449_b(x - 1, y - 14, z, Blocks.dirt); - world.func_147449_b(x + 1, y - 14, z, Blocks.dirt); - world.func_147449_b(x, y - 14, z - 1, Blocks.dirt); - world.func_147449_b(x, y - 14, z + 1, Blocks.dirt); - world.func_147449_b(x - 1, y - 15, z, Blocks.dirt); - world.func_147449_b(x + 1, y - 15, z, Blocks.dirt); - world.func_147449_b(x, y - 15, z - 1, Blocks.dirt); - world.func_147449_b(x, y - 15, z + 1, Blocks.dirt); - world.func_147449_b(x - 1, y - 16, z, Blocks.dirt); - world.func_147449_b(x + 1, y - 16, z, Blocks.dirt); - world.func_147449_b(x, y - 16, z - 1, Blocks.dirt); - world.func_147449_b(x, y - 16, z + 1, Blocks.dirt); + world.setBlock(x, y, z, Blocks.grass); + world.setBlock(x - 1, y, z, Blocks.grass); + world.setBlock(x + 1, y, z, Blocks.grass); + world.setBlock(x, y, z - 1, Blocks.grass); + world.setBlock(x, y, z + 1, Blocks.grass); + world.setBlock(x, y - 1, z, Blocks.dirt); + world.setBlock(x, y - 2, z, Blocks.dirt); + world.setBlock(x, y - 3, z, Blocks.dirt); + world.setBlock(x, y - 4, z, Blocks.dirt); + world.setBlock(x, y - 5, z, Blocks.dirt); + world.setBlock(x, y - 6, z, Blocks.dirt); + world.setBlock(x, y - 7, z, Blocks.dirt); + world.setBlock(x, y - 8, z, Blocks.dirt); + world.setBlock(x, y - 9, z, Blocks.dirt); + world.setBlock(x, y - 10, z, Blocks.dirt); + world.setBlock(x, y - 11, z, Blocks.dirt); + world.setBlock(x, y - 12, z, Blocks.dirt); + world.setBlock(x, y - 13, z, Blocks.dirt); + world.setBlock(x, y - 14, z, Blocks.dirt); + world.setBlock(x, y - 15, z, Blocks.dirt); + world.setBlock(x, y - 16, z, Blocks.dirt); + world.setBlock(x, y - 17, z, Blocks.dirt); + world.setBlock(x - 1, y - 1, z, Blocks.dirt); + world.setBlock(x + 1, y - 1, z, Blocks.dirt); + world.setBlock(x, y - 1, z - 1, Blocks.dirt); + world.setBlock(x, y - 1, z + 1, Blocks.dirt); + world.setBlock(x - 1, y - 2, z, Blocks.dirt); + world.setBlock(x + 1, y - 2, z, Blocks.dirt); + world.setBlock(x, y - 2, z - 1, Blocks.dirt); + world.setBlock(x, y - 2, z + 1, Blocks.dirt); + world.setBlock(x - 1, y - 3, z, Blocks.dirt); + world.setBlock(x + 1, y - 3, z, Blocks.dirt); + world.setBlock(x, y - 3, z - 1, Blocks.dirt); + world.setBlock(x, y - 3, z + 1, Blocks.dirt); + world.setBlock(x - 1, y - 4, z, Blocks.dirt); + world.setBlock(x + 1, y - 4, z, Blocks.dirt); + world.setBlock(x, y - 4, z - 1, Blocks.dirt); + world.setBlock(x, y - 4, z + 1, Blocks.dirt); + world.setBlock(x - 1, y - 5, z, Blocks.dirt); + world.setBlock(x + 1, y - 5, z, Blocks.dirt); + world.setBlock(x, y - 5, z - 1, Blocks.dirt); + world.setBlock(x, y - 5, z + 1, Blocks.dirt); + world.setBlock(x - 1, y - 6, z, Blocks.dirt); + world.setBlock(x + 1, y - 6, z, Blocks.dirt); + world.setBlock(x, y - 6, z - 1, Blocks.dirt); + world.setBlock(x, y - 6, z + 1, Blocks.dirt); + world.setBlock(x - 1, y - 7, z, Blocks.dirt); + world.setBlock(x + 1, y - 7, z, Blocks.dirt); + world.setBlock(x, y - 7, z - 1, Blocks.dirt); + world.setBlock(x, y - 7, z + 1, Blocks.dirt); + world.setBlock(x - 1, y - 8, z, Blocks.dirt); + world.setBlock(x + 1, y - 8, z, Blocks.dirt); + world.setBlock(x, y - 8, z - 1, Blocks.dirt); + world.setBlock(x, y - 8, z + 1, Blocks.dirt); + world.setBlock(x - 1, y - 9, z, Blocks.dirt); + world.setBlock(x + 1, y - 9, z, Blocks.dirt); + world.setBlock(x, y - 9, z - 1, Blocks.dirt); + world.setBlock(x, y - 9, z + 1, Blocks.dirt); + world.setBlock(x - 1, y - 10, z, Blocks.dirt); + world.setBlock(x + 1, y - 10, z, Blocks.dirt); + world.setBlock(x, y - 10, z - 1, Blocks.dirt); + world.setBlock(x, y - 10, z + 1, Blocks.dirt); + world.setBlock(x - 1, y - 11, z, Blocks.dirt); + world.setBlock(x + 1, y - 11, z, Blocks.dirt); + world.setBlock(x, y - 11, z - 1, Blocks.dirt); + world.setBlock(x, y - 11, z + 1, Blocks.dirt); + world.setBlock(x - 1, y - 12, z, Blocks.dirt); + world.setBlock(x + 1, y - 12, z, Blocks.dirt); + world.setBlock(x, y - 12, z - 1, Blocks.dirt); + world.setBlock(x, y - 12, z + 1, Blocks.dirt); + world.setBlock(x - 1, y - 13, z, Blocks.dirt); + world.setBlock(x + 1, y - 13, z, Blocks.dirt); + world.setBlock(x, y - 13, z - 1, Blocks.dirt); + world.setBlock(x, y - 13, z + 1, Blocks.dirt); + world.setBlock(x - 1, y - 14, z, Blocks.dirt); + world.setBlock(x + 1, y - 14, z, Blocks.dirt); + world.setBlock(x, y - 14, z - 1, Blocks.dirt); + world.setBlock(x, y - 14, z + 1, Blocks.dirt); + world.setBlock(x - 1, y - 15, z, Blocks.dirt); + world.setBlock(x + 1, y - 15, z, Blocks.dirt); + world.setBlock(x, y - 15, z - 1, Blocks.dirt); + world.setBlock(x, y - 15, z + 1, Blocks.dirt); + world.setBlock(x - 1, y - 16, z, Blocks.dirt); + world.setBlock(x + 1, y - 16, z, Blocks.dirt); + world.setBlock(x, y - 16, z - 1, Blocks.dirt); + world.setBlock(x, y - 16, z + 1, Blocks.dirt); if (random.nextInt(3) == 0) { @@ -123,11 +123,11 @@ public class WorldGenMarsh extends WorldGenerator } else { - world.func_147465_d(x, y + 1, z, Blocks.tallgrass, 1, 2); - world.func_147465_d(x - 1, y + 1, z, Blocks.tallgrass, 1, 2); - world.func_147465_d(x + 1, y + 1, z, Blocks.tallgrass, 1, 2); - world.func_147465_d(x, y + 1, z - 1, Blocks.tallgrass, 1, 2); - world.func_147465_d(x, y + 1, z + 1, Blocks.tallgrass, 1, 2); + world.setBlock(x, y + 1, z, Blocks.tallgrass, 1, 2); + world.setBlock(x - 1, y + 1, z, Blocks.tallgrass, 1, 2); + world.setBlock(x + 1, y + 1, z, Blocks.tallgrass, 1, 2); + world.setBlock(x, y + 1, z - 1, Blocks.tallgrass, 1, 2); + world.setBlock(x, y + 1, z + 1, Blocks.tallgrass, 1, 2); } break; } diff --git a/src/main/java/biomesoplenty/common/world/features/WorldGenMoss.java b/src/main/java/biomesoplenty/common/world/features/WorldGenMoss.java index 28432baae..b2df012bd 100644 --- a/src/main/java/biomesoplenty/common/world/features/WorldGenMoss.java +++ b/src/main/java/biomesoplenty/common/world/features/WorldGenMoss.java @@ -22,19 +22,19 @@ public class WorldGenMoss extends WorldGeneratorBOP for (int var7 = z; y < 80; ++y) { //TODO: isAirBlock() - if (world.func_147437_c(x, y, z)) + if (world.isAirBlock(x, y, z)) { for (int var8 = 2; var8 <= 5; ++var8) { //TODO: canPlaceBlockOnSide() - if (BOPBlockHelper.get("moss").func_149707_d(world, x, y, z, var8)) + if (BOPBlockHelper.get("moss").canPlaceBlockOnSide(world, x, y, z, var8)) { int var999 = random.nextInt(4); if (var999 == 0) { //TODO: setBlock() - world.func_147465_d(x, y, z, BOPBlockHelper.get("moss"), 1 << Direction.facingToDirection[Facing.oppositeSide[var8]], 2); + world.setBlock(x, y, z, BOPBlockHelper.get("moss"), 1 << Direction.facingToDirection[Facing.oppositeSide[var8]], 2); } break; } diff --git a/src/main/java/biomesoplenty/common/world/features/WorldGenPromisedLandPortal.java b/src/main/java/biomesoplenty/common/world/features/WorldGenPromisedLandPortal.java index 6b2d857ae..0cd01eaf6 100644 --- a/src/main/java/biomesoplenty/common/world/features/WorldGenPromisedLandPortal.java +++ b/src/main/java/biomesoplenty/common/world/features/WorldGenPromisedLandPortal.java @@ -15,997 +15,997 @@ public class WorldGenPromisedLandPortal extends WorldGenerator { Block portal = BOPBlockHelper.get("promisedPortal"); Block ivy = BOPBlockHelper.get("ivy"); - world.func_147449_b(i + 1, j + 6, k + 8, Blocks.dirt); - world.func_147449_b(i + 1, j + 7, k + 6, Blocks.dirt); - world.func_147449_b(i + 1, j + 7, k + 7, Blocks.dirt); - world.func_147449_b(i + 1, j + 7, k + 8, Blocks.dirt); - world.func_147449_b(i + 1, j + 8, k + 6, Blocks.dirt); - world.func_147449_b(i + 1, j + 8, k + 7, Blocks.dirt); - world.func_147449_b(i + 1, j + 8, k + 8, Blocks.dirt); - world.func_147449_b(i + 1, j + 9, k + 6, Blocks.grass); - world.func_147449_b(i + 1, j + 9, k + 7, Blocks.grass); - world.func_147449_b(i + 1, j + 9, k + 8, Blocks.grass); - world.func_147449_b(i + 2, j + 3, k + 10, Blocks.dirt); - world.func_147449_b(i + 2, j + 4, k + 5, Blocks.dirt); - world.func_147449_b(i + 2, j + 4, k + 10, Blocks.dirt); - world.func_147449_b(i + 2, j + 5, k + 5, Blocks.dirt); - world.func_147449_b(i + 2, j + 5, k + 10, Blocks.dirt); - world.func_147449_b(i + 2, j + 6, k + 5, Blocks.dirt); - world.func_147449_b(i + 2, j + 6, k + 7, Blocks.dirt); - world.func_147449_b(i + 2, j + 6, k + 10, Blocks.dirt); - world.func_147449_b(i + 2, j + 7, k + 4, Blocks.dirt); - world.func_147449_b(i + 2, j + 7, k + 5, Blocks.dirt); - world.func_147449_b(i + 2, j + 7, k + 6, Blocks.dirt); - world.func_147449_b(i + 2, j + 7, k + 7, Blocks.dirt); - world.func_147449_b(i + 2, j + 7, k + 8, Blocks.dirt); - world.func_147449_b(i + 2, j + 7, k + 9, Blocks.dirt); - world.func_147449_b(i + 2, j + 7, k + 10, Blocks.dirt); - world.func_147449_b(i + 2, j + 8, k + 4, Blocks.dirt); - world.func_147449_b(i + 2, j + 8, k + 5, Blocks.dirt); - world.func_147449_b(i + 2, j + 8, k + 6, Blocks.dirt); - world.func_147449_b(i + 2, j + 8, k + 7, Blocks.dirt); - world.func_147449_b(i + 2, j + 8, k + 8, Blocks.dirt); - world.func_147449_b(i + 2, j + 8, k + 9, Blocks.dirt); - world.func_147449_b(i + 2, j + 8, k + 10, Blocks.dirt); - world.func_147449_b(i + 2, j + 9, k + 4, Blocks.grass); - world.func_147449_b(i + 2, j + 9, k + 5, Blocks.grass); - world.func_147449_b(i + 2, j + 9, k + 6, Blocks.grass); - world.func_147449_b(i + 2, j + 9, k + 7, Blocks.grass); - world.func_147449_b(i + 2, j + 9, k + 8, Blocks.grass); - world.func_147449_b(i + 2, j + 9, k + 9, Blocks.grass); - world.func_147449_b(i + 2, j + 9, k + 10, Blocks.grass); - world.func_147449_b(i + 3, j + 3, k + 7, Blocks.dirt); - world.func_147449_b(i + 3, j + 4, k + 7, Blocks.dirt); - world.func_147449_b(i + 3, j + 5, k + 7, Blocks.dirt); - world.func_147449_b(i + 3, j + 6, k + 3, Blocks.dirt); - world.func_147449_b(i + 3, j + 6, k + 5, Blocks.dirt); - world.func_147449_b(i + 3, j + 6, k + 6, Blocks.dirt); - world.func_147449_b(i + 3, j + 6, k + 7, Blocks.dirt); - world.func_147449_b(i + 3, j + 6, k + 8, Blocks.dirt); - world.func_147449_b(i + 3, j + 6, k + 9, Blocks.dirt); - world.func_147449_b(i + 3, j + 7, k + 3, Blocks.dirt); - world.func_147449_b(i + 3, j + 7, k + 4, Blocks.dirt); - world.func_147449_b(i + 3, j + 7, k + 5, Blocks.dirt); - world.func_147449_b(i + 3, j + 7, k + 6, Blocks.dirt); - world.func_147449_b(i + 3, j + 7, k + 7, Blocks.dirt); - world.func_147449_b(i + 3, j + 7, k + 8, Blocks.dirt); - world.func_147449_b(i + 3, j + 7, k + 9, Blocks.dirt); - world.func_147449_b(i + 3, j + 7, k + 10, Blocks.dirt); - world.func_147449_b(i + 3, j + 7, k + 11, Blocks.dirt); - world.func_147449_b(i + 3, j + 8, k + 3, Blocks.dirt); - world.func_147449_b(i + 3, j + 8, k + 4, Blocks.dirt); - world.func_147449_b(i + 3, j + 8, k + 5, Blocks.dirt); - world.func_147449_b(i + 3, j + 8, k + 6, Blocks.dirt); - world.func_147449_b(i + 3, j + 8, k + 7, Blocks.dirt); - world.func_147449_b(i + 3, j + 8, k + 8, Blocks.dirt); - world.func_147449_b(i + 3, j + 8, k + 9, Blocks.dirt); - world.func_147449_b(i + 3, j + 8, k + 10, Blocks.dirt); - world.func_147449_b(i + 3, j + 8, k + 11, Blocks.dirt); - world.func_147449_b(i + 3, j + 9, k + 3, Blocks.grass); - world.func_147449_b(i + 3, j + 9, k + 4, Blocks.dirt); - world.func_147449_b(i + 3, j + 9, k + 5, Blocks.grass); - world.func_147449_b(i + 3, j + 9, k + 6, Blocks.grass); - world.func_147449_b(i + 3, j + 9, k + 7, Blocks.grass); - world.func_147449_b(i + 3, j + 9, k + 8, Blocks.grass); - world.func_147449_b(i + 3, j + 9, k + 9, Blocks.grass); - world.func_147449_b(i + 3, j + 9, k + 10, Blocks.dirt); - world.func_147449_b(i + 3, j + 9, k + 11, Blocks.grass); - world.func_147449_b(i + 3, j + 10, k + 4, Blocks.log); - world.func_147465_d(i + 3, j + 10, k + 5, Blocks.stone_slab, 7, 2); - world.func_147465_d(i + 3, j + 10, k + 6, Blocks.stone_slab, 7, 2); - world.func_147465_d(i + 3, j + 10, k + 7, Blocks.stone_slab, 7, 2); - world.func_147465_d(i + 3, j + 10, k + 8, Blocks.stone_slab, 7, 2); - world.func_147465_d(i + 3, j + 10, k + 9, Blocks.stone_slab, 7, 2); - world.func_147449_b(i + 3, j + 10, k + 10, Blocks.log); - world.func_147465_d(i + 3, j + 11, k + 4, Blocks.leaves, 4, 2); - world.func_147465_d(i + 3, j + 11, k + 10, Blocks.leaves, 4, 2); - world.func_147465_d(i + 3, j + 12, k + 4, Blocks.leaves, 4, 2); - world.func_147465_d(i + 3, j + 12, k + 10, Blocks.leaves, 4, 2); - world.func_147465_d(i + 3, j + 14, k + 4, Blocks.quartz_stairs, 2, 2); - world.func_147449_b(i + 3, j + 14, k + 5, Blocks.quartz_stairs); - world.func_147449_b(i + 3, j + 14, k + 6, Blocks.quartz_stairs); - world.func_147449_b(i + 3, j + 14, k + 7, Blocks.quartz_stairs); - world.func_147449_b(i + 3, j + 14, k + 8, Blocks.quartz_stairs); - world.func_147449_b(i + 3, j + 14, k + 9, Blocks.quartz_stairs); - world.func_147465_d(i + 3, j + 14, k + 10, Blocks.quartz_stairs, 3, 2); - world.func_147449_b(i + 4, j + 5, k + 2, Blocks.dirt); - world.func_147449_b(i + 4, j + 5, k + 6, Blocks.dirt); - world.func_147449_b(i + 4, j + 5, k + 7, Blocks.dirt); - world.func_147449_b(i + 4, j + 5, k + 8, Blocks.dirt); - world.func_147449_b(i + 4, j + 6, k + 2, Blocks.dirt); - world.func_147449_b(i + 4, j + 6, k + 4, Blocks.dirt); - world.func_147449_b(i + 4, j + 6, k + 5, Blocks.dirt); - world.func_147449_b(i + 4, j + 6, k + 6, Blocks.dirt); - world.func_147449_b(i + 4, j + 6, k + 7, Blocks.dirt); - world.func_147449_b(i + 4, j + 6, k + 8, Blocks.dirt); - world.func_147449_b(i + 4, j + 6, k + 9, Blocks.dirt); - world.func_147449_b(i + 4, j + 6, k + 10, Blocks.dirt); - world.func_147449_b(i + 4, j + 6, k + 12, Blocks.dirt); - world.func_147449_b(i + 4, j + 7, k + 2, Blocks.dirt); - world.func_147449_b(i + 4, j + 7, k + 3, Blocks.dirt); - world.func_147449_b(i + 4, j + 7, k + 4, Blocks.dirt); - world.func_147449_b(i + 4, j + 7, k + 5, Blocks.dirt); - world.func_147449_b(i + 4, j + 7, k + 6, Blocks.dirt); - world.func_147449_b(i + 4, j + 7, k + 7, Blocks.dirt); - world.func_147449_b(i + 4, j + 7, k + 8, Blocks.dirt); - world.func_147449_b(i + 4, j + 7, k + 9, Blocks.dirt); - world.func_147449_b(i + 4, j + 7, k + 10, Blocks.dirt); - world.func_147449_b(i + 4, j + 7, k + 11, Blocks.dirt); - world.func_147449_b(i + 4, j + 7, k + 12, Blocks.dirt); - world.func_147449_b(i + 4, j + 8, k + 2, Blocks.dirt); - world.func_147449_b(i + 4, j + 8, k + 3, Blocks.dirt); - world.func_147449_b(i + 4, j + 8, k + 4, Blocks.dirt); - world.func_147449_b(i + 4, j + 8, k + 5, Blocks.dirt); - world.func_147449_b(i + 4, j + 8, k + 6, Blocks.dirt); - world.func_147449_b(i + 4, j + 8, k + 7, Blocks.dirt); - world.func_147449_b(i + 4, j + 8, k + 8, Blocks.dirt); - world.func_147449_b(i + 4, j + 8, k + 9, Blocks.dirt); - world.func_147449_b(i + 4, j + 8, k + 10, Blocks.dirt); - world.func_147449_b(i + 4, j + 8, k + 11, Blocks.dirt); - world.func_147449_b(i + 4, j + 8, k + 12, Blocks.dirt); - world.func_147449_b(i + 4, j + 9, k + 2, Blocks.grass); - world.func_147449_b(i + 4, j + 9, k + 3, Blocks.dirt); - world.func_147449_b(i + 4, j + 9, k + 4, Blocks.grass); - world.func_147449_b(i + 4, j + 9, k + 5, Blocks.dirt); - world.func_147449_b(i + 4, j + 9, k + 6, Blocks.dirt); - world.func_147449_b(i + 4, j + 9, k + 7, Blocks.dirt); - world.func_147449_b(i + 4, j + 9, k + 8, Blocks.dirt); - world.func_147449_b(i + 4, j + 9, k + 9, Blocks.dirt); - world.func_147449_b(i + 4, j + 9, k + 10, Blocks.grass); - world.func_147449_b(i + 4, j + 9, k + 11, Blocks.dirt); - world.func_147449_b(i + 4, j + 9, k + 12, Blocks.grass); - world.func_147449_b(i + 4, j + 10, k + 3, Blocks.log); - world.func_147465_d(i + 4, j + 10, k + 4, Blocks.stone_slab, 7, 2); - world.func_147465_d(i + 4, j + 10, k + 5, Blocks.quartz_block, 2, 2); - world.func_147449_b(i + 4, j + 10, k + 6, Blocks.quartz_block); - world.func_147449_b(i + 4, j + 10, k + 7, Blocks.quartz_block); - world.func_147449_b(i + 4, j + 10, k + 8, Blocks.quartz_block); - world.func_147465_d(i + 4, j + 10, k + 9, Blocks.quartz_block, 2, 2); - world.func_147465_d(i + 4, j + 10, k + 10, Blocks.stone_slab, 7, 2); - world.func_147449_b(i + 4, j + 10, k + 11, Blocks.log); - world.func_147465_d(i + 4, j + 11, k + 3, Blocks.leaves, 4, 2); - world.func_147465_d(i + 4, j + 11, k + 5, Blocks.quartz_block, 2, 2); - world.func_147465_d(i + 4, j + 11, k + 9, Blocks.quartz_block, 2, 2); - world.func_147465_d(i + 4, j + 11, k + 11, Blocks.leaves, 4, 2); - world.func_147465_d(i + 4, j + 12, k + 3, Blocks.leaves, 4, 2); - world.func_147465_d(i + 4, j + 12, k + 5, Blocks.quartz_block, 2, 2); - world.func_147465_d(i + 4, j + 12, k + 9, Blocks.quartz_block, 2, 2); - world.func_147465_d(i + 4, j + 12, k + 11, Blocks.leaves, 4, 2); - world.func_147465_d(i + 4, j + 13, k + 5, Blocks.quartz_block, 2, 2); - world.func_147465_d(i + 4, j + 13, k + 9, Blocks.quartz_block, 2, 2); - world.func_147449_b(i + 4, j + 14, k + 3, Blocks.quartz_stairs); - world.func_147449_b(i + 4, j + 14, k + 4, Blocks.quartz_stairs); - world.func_147449_b(i + 4, j + 14, k + 5, Blocks.quartz_block); - world.func_147449_b(i + 4, j + 14, k + 6, Blocks.quartz_block); - world.func_147449_b(i + 4, j + 14, k + 7, Blocks.quartz_block); - world.func_147449_b(i + 4, j + 14, k + 8, Blocks.quartz_block); - world.func_147449_b(i + 4, j + 14, k + 9, Blocks.quartz_block); - world.func_147465_d(i + 4, j + 14, k + 10, Blocks.quartz_stairs, 3, 2); - world.func_147449_b(i + 4, j + 14, k + 11, Blocks.quartz_stairs); - world.func_147449_b(i + 4, j + 15, k + 5, Blocks.quartz_stairs); - world.func_147449_b(i + 4, j + 15, k + 6, Blocks.quartz_stairs); - world.func_147449_b(i + 4, j + 15, k + 7, Blocks.quartz_stairs); - world.func_147449_b(i + 4, j + 15, k + 8, Blocks.quartz_stairs); - world.func_147449_b(i + 4, j + 15, k + 9, Blocks.quartz_stairs); - world.func_147449_b(i + 5, j + 2, k + 9, Blocks.dirt); - world.func_147449_b(i + 5, j + 3, k + 9, Blocks.dirt); - world.func_147449_b(i + 5, j + 4, k + 4, Blocks.dirt); - world.func_147449_b(i + 5, j + 4, k + 7, Blocks.dirt); - world.func_147449_b(i + 5, j + 4, k + 9, Blocks.dirt); - world.func_147449_b(i + 5, j + 4, k + 11, Blocks.dirt); - world.func_147449_b(i + 5, j + 5, k + 4, Blocks.dirt); - world.func_147449_b(i + 5, j + 5, k + 5, Blocks.dirt); - world.func_147449_b(i + 5, j + 5, k + 6, Blocks.dirt); - world.func_147449_b(i + 5, j + 5, k + 7, Blocks.dirt); - world.func_147449_b(i + 5, j + 5, k + 8, Blocks.dirt); - world.func_147449_b(i + 5, j + 5, k + 9, Blocks.dirt); - world.func_147449_b(i + 5, j + 5, k + 11, Blocks.dirt); - world.func_147449_b(i + 5, j + 6, k + 3, Blocks.dirt); - world.func_147449_b(i + 5, j + 6, k + 4, Blocks.dirt); - world.func_147449_b(i + 5, j + 6, k + 5, Blocks.dirt); - world.func_147449_b(i + 5, j + 6, k + 6, Blocks.dirt); - world.func_147449_b(i + 5, j + 6, k + 7, Blocks.dirt); - world.func_147449_b(i + 5, j + 6, k + 8, Blocks.dirt); - world.func_147449_b(i + 5, j + 6, k + 9, Blocks.dirt); - world.func_147449_b(i + 5, j + 6, k + 10, Blocks.dirt); - world.func_147449_b(i + 5, j + 6, k + 11, Blocks.dirt); - world.func_147449_b(i + 5, j + 7, k + 2, Blocks.dirt); - world.func_147449_b(i + 5, j + 7, k + 3, Blocks.dirt); - world.func_147449_b(i + 5, j + 7, k + 4, Blocks.dirt); - world.func_147449_b(i + 5, j + 7, k + 5, Blocks.dirt); - world.func_147449_b(i + 5, j + 7, k + 6, Blocks.dirt); - world.func_147449_b(i + 5, j + 7, k + 7, Blocks.dirt); - world.func_147449_b(i + 5, j + 7, k + 8, Blocks.dirt); - world.func_147449_b(i + 5, j + 7, k + 9, Blocks.dirt); - world.func_147449_b(i + 5, j + 7, k + 10, Blocks.dirt); - world.func_147449_b(i + 5, j + 7, k + 11, Blocks.dirt); - world.func_147449_b(i + 5, j + 7, k + 12, Blocks.dirt); - world.func_147449_b(i + 5, j + 8, k + 2, Blocks.dirt); - world.func_147449_b(i + 5, j + 8, k + 3, Blocks.dirt); - world.func_147449_b(i + 5, j + 8, k + 4, Blocks.dirt); - world.func_147449_b(i + 5, j + 8, k + 5, Blocks.dirt); - world.func_147449_b(i + 5, j + 8, k + 6, Blocks.quartz_block); - world.func_147449_b(i + 5, j + 8, k + 7, Blocks.quartz_block); - world.func_147449_b(i + 5, j + 8, k + 8, Blocks.quartz_block); - world.func_147449_b(i + 5, j + 8, k + 9, Blocks.dirt); - world.func_147449_b(i + 5, j + 8, k + 10, Blocks.dirt); - world.func_147449_b(i + 5, j + 8, k + 11, Blocks.dirt); - world.func_147449_b(i + 5, j + 8, k + 12, Blocks.dirt); - world.func_147449_b(i + 5, j + 9, k + 2, Blocks.grass); - world.func_147449_b(i + 5, j + 9, k + 3, Blocks.grass); - world.func_147449_b(i + 5, j + 9, k + 4, Blocks.dirt); - world.func_147449_b(i + 5, j + 9, k + 5, Blocks.dirt); - world.func_147449_b(i + 5, j + 9, k + 6, Blocks.quartz_block); - world.func_147449_b(i + 5, j + 9, k + 7, Blocks.quartz_block); - world.func_147449_b(i + 5, j + 9, k + 8, Blocks.quartz_block); - world.func_147449_b(i + 5, j + 9, k + 9, Blocks.dirt); - world.func_147449_b(i + 5, j + 9, k + 10, Blocks.dirt); - world.func_147449_b(i + 5, j + 9, k + 11, Blocks.grass); - world.func_147449_b(i + 5, j + 9, k + 12, Blocks.grass); - world.func_147465_d(i + 5, j + 10, k + 3, Blocks.stone_slab, 7, 2); - world.func_147465_d(i + 5, j + 10, k + 4, Blocks.quartz_block, 2, 2); - world.func_147449_b(i + 5, j + 10, k + 5, Blocks.quartz_block); - world.func_147465_d(i + 5, j + 10, k + 6, Blocks.quartz_stairs, 1, 2); - world.func_147465_d(i + 5, j + 10, k + 7, Blocks.quartz_stairs, 1, 2); - world.func_147465_d(i + 5, j + 10, k + 8, Blocks.quartz_stairs, 1, 2); - world.func_147449_b(i + 5, j + 10, k + 9, Blocks.quartz_block); - world.func_147465_d(i + 5, j + 10, k + 10, Blocks.quartz_block, 2, 2); - world.func_147465_d(i + 5, j + 10, k + 11, Blocks.stone_slab, 7, 2); - world.func_147465_d(i + 5, j + 11, k + 4, Blocks.quartz_block, 2, 2); - world.func_147465_d(i + 5, j + 11, k + 10, Blocks.quartz_block, 2, 2); - world.func_147465_d(i + 5, j + 12, k + 4, Blocks.quartz_block, 2, 2); - world.func_147465_d(i + 5, j + 12, k + 10, Blocks.quartz_block, 2, 2); - world.func_147465_d(i + 5, j + 13, k + 4, Blocks.quartz_block, 2, 2); - world.func_147465_d(i + 5, j + 13, k + 10, Blocks.quartz_block, 2, 2); - world.func_147465_d(i + 5, j + 14, k + 3, Blocks.quartz_stairs, 2, 2); - world.func_147449_b(i + 5, j + 14, k + 4, Blocks.quartz_block); - world.func_147449_b(i + 5, j + 14, k + 10, Blocks.quartz_block); - world.func_147465_d(i + 5, j + 14, k + 11, Blocks.quartz_stairs, 3, 2); - world.func_147465_d(i + 5, j + 15, k + 4, Blocks.quartz_stairs, 2, 2); - world.func_147449_b(i + 5, j + 15, k + 5, Blocks.quartz_block); - world.func_147449_b(i + 5, j + 15, k + 6, Blocks.quartz_block); - world.func_147449_b(i + 5, j + 15, k + 7, Blocks.quartz_block); - world.func_147449_b(i + 5, j + 15, k + 8, Blocks.quartz_block); - world.func_147449_b(i + 5, j + 15, k + 9, Blocks.quartz_block); - world.func_147465_d(i + 5, j + 15, k + 10, Blocks.quartz_stairs, 3, 2); - world.func_147449_b(i + 5, j + 16, k + 5, Blocks.quartz_block); - world.func_147449_b(i + 5, j + 16, k + 6, Blocks.quartz_block); - world.func_147449_b(i + 5, j + 16, k + 7, Blocks.quartz_block); - world.func_147449_b(i + 5, j + 16, k + 8, Blocks.quartz_block); - world.func_147449_b(i + 5, j + 16, k + 9, Blocks.quartz_block); - world.func_147465_d(i + 5, j + 17, k + 5, Blocks.quartz_stairs, 2, 2); - world.func_147449_b(i + 5, j + 17, k + 6, Blocks.quartz_stairs); - world.func_147449_b(i + 5, j + 17, k + 7, Blocks.quartz_stairs); - world.func_147449_b(i + 5, j + 17, k + 8, Blocks.quartz_stairs); - world.func_147449_b(i + 5, j + 17, k + 9, Blocks.quartz_stairs); - world.func_147449_b(i + 6, j + 3, k + 7, Blocks.dirt); - world.func_147449_b(i + 6, j + 4, k + 2, Blocks.dirt); - world.func_147449_b(i + 6, j + 4, k + 6, Blocks.dirt); - world.func_147449_b(i + 6, j + 4, k + 7, Blocks.dirt); - world.func_147449_b(i + 6, j + 4, k + 8, Blocks.dirt); - world.func_147449_b(i + 6, j + 5, k + 2, Blocks.dirt); - world.func_147449_b(i + 6, j + 5, k + 4, Blocks.dirt); - world.func_147449_b(i + 6, j + 5, k + 5, Blocks.dirt); - world.func_147449_b(i + 6, j + 5, k + 6, Blocks.dirt); - world.func_147449_b(i + 6, j + 5, k + 7, Blocks.dirt); - world.func_147449_b(i + 6, j + 5, k + 8, Blocks.dirt); - world.func_147449_b(i + 6, j + 5, k + 9, Blocks.dirt); - world.func_147449_b(i + 6, j + 5, k + 10, Blocks.dirt); - world.func_147449_b(i + 6, j + 5, k + 13, Blocks.dirt); - world.func_147449_b(i + 6, j + 6, k + 2, Blocks.dirt); - world.func_147449_b(i + 6, j + 6, k + 3, Blocks.dirt); - world.func_147449_b(i + 6, j + 6, k + 4, Blocks.dirt); - world.func_147449_b(i + 6, j + 6, k + 5, Blocks.dirt); - world.func_147449_b(i + 6, j + 6, k + 6, Blocks.dirt); - world.func_147449_b(i + 6, j + 6, k + 7, Blocks.dirt); - world.func_147449_b(i + 6, j + 6, k + 8, Blocks.dirt); - world.func_147449_b(i + 6, j + 6, k + 9, Blocks.dirt); - world.func_147449_b(i + 6, j + 6, k + 10, Blocks.dirt); - world.func_147449_b(i + 6, j + 6, k + 11, Blocks.dirt); - world.func_147449_b(i + 6, j + 6, k + 13, Blocks.dirt); - world.func_147449_b(i + 6, j + 7, k + 1, Blocks.dirt); - world.func_147449_b(i + 6, j + 7, k + 2, Blocks.dirt); - world.func_147449_b(i + 6, j + 7, k + 3, Blocks.dirt); - world.func_147449_b(i + 6, j + 7, k + 4, Blocks.dirt); - world.func_147449_b(i + 6, j + 7, k + 5, Blocks.dirt); - world.func_147449_b(i + 6, j + 7, k + 6, Blocks.quartz_block); - world.func_147449_b(i + 6, j + 7, k + 7, Blocks.quartz_block); - world.func_147449_b(i + 6, j + 7, k + 8, Blocks.quartz_block); - world.func_147449_b(i + 6, j + 7, k + 9, Blocks.dirt); - world.func_147449_b(i + 6, j + 7, k + 10, Blocks.dirt); - world.func_147449_b(i + 6, j + 7, k + 11, Blocks.dirt); - world.func_147449_b(i + 6, j + 7, k + 12, Blocks.dirt); - world.func_147449_b(i + 6, j + 7, k + 13, Blocks.dirt); - world.func_147449_b(i + 6, j + 8, k + 1, Blocks.dirt); - world.func_147449_b(i + 6, j + 8, k + 2, Blocks.dirt); - world.func_147449_b(i + 6, j + 8, k + 3, Blocks.dirt); - world.func_147449_b(i + 6, j + 8, k + 4, Blocks.dirt); - world.func_147449_b(i + 6, j + 8, k + 5, Blocks.quartz_block); - world.func_147449_b(i + 6, j + 8, k + 6, portal); - world.func_147449_b(i + 6, j + 8, k + 7, portal); - world.func_147449_b(i + 6, j + 8, k + 8, portal); - world.func_147449_b(i + 6, j + 8, k + 9, Blocks.quartz_block); - world.func_147449_b(i + 6, j + 8, k + 10, Blocks.dirt); - world.func_147449_b(i + 6, j + 8, k + 11, Blocks.dirt); - world.func_147449_b(i + 6, j + 8, k + 12, Blocks.dirt); - world.func_147449_b(i + 6, j + 8, k + 13, Blocks.dirt); - world.func_147449_b(i + 6, j + 9, k + 1, Blocks.grass); - world.func_147449_b(i + 6, j + 9, k + 2, Blocks.grass); - world.func_147449_b(i + 6, j + 9, k + 3, Blocks.grass); - world.func_147449_b(i + 6, j + 9, k + 4, Blocks.dirt); - world.func_147449_b(i + 6, j + 9, k + 5, Blocks.quartz_block); - world.func_147449_b(i + 6, j + 9, k + 9, Blocks.quartz_block); - world.func_147449_b(i + 6, j + 9, k + 10, Blocks.dirt); - world.func_147449_b(i + 6, j + 9, k + 11, Blocks.grass); - world.func_147449_b(i + 6, j + 9, k + 12, Blocks.grass); - world.func_147449_b(i + 6, j + 9, k + 13, Blocks.grass); - world.func_147465_d(i + 6, j + 10, k + 3, Blocks.stone_slab, 7, 2); - world.func_147449_b(i + 6, j + 10, k + 4, Blocks.quartz_block); - world.func_147465_d(i + 6, j + 10, k + 5, Blocks.quartz_stairs, 3, 2); - world.func_147465_d(i + 6, j + 10, k + 9, Blocks.quartz_stairs, 2, 2); - world.func_147449_b(i + 6, j + 10, k + 10, Blocks.quartz_block); - world.func_147465_d(i + 6, j + 10, k + 11, Blocks.stone_slab, 7, 2); - world.func_147465_d(i + 6, j + 14, k + 3, Blocks.quartz_stairs, 2, 2); - world.func_147449_b(i + 6, j + 14, k + 4, Blocks.quartz_block); - world.func_147449_b(i + 6, j + 14, k + 10, Blocks.quartz_block); - world.func_147465_d(i + 6, j + 14, k + 11, Blocks.quartz_stairs, 3, 2); - world.func_147465_d(i + 6, j + 15, k + 4, Blocks.quartz_stairs, 2, 2); - world.func_147449_b(i + 6, j + 15, k + 5, Blocks.quartz_block); - world.func_147449_b(i + 6, j + 15, k + 9, Blocks.quartz_block); - world.func_147465_d(i + 6, j + 15, k + 10, Blocks.quartz_stairs, 3, 2); - world.func_147449_b(i + 6, j + 16, k + 5, Blocks.quartz_block); - world.func_147449_b(i + 6, j + 16, k + 9, Blocks.quartz_block); - world.func_147465_d(i + 6, j + 17, k + 5, Blocks.quartz_stairs, 2, 2); - world.func_147449_b(i + 6, j + 17, k + 6, Blocks.quartz_block); - world.func_147449_b(i + 6, j + 17, k + 7, Blocks.quartz_block); - world.func_147449_b(i + 6, j + 17, k + 8, Blocks.quartz_block); - world.func_147465_d(i + 6, j + 17, k + 9, Blocks.quartz_stairs, 3, 2); - world.func_147449_b(i + 6, j + 18, k + 6, Blocks.quartz_block); - world.func_147449_b(i + 6, j + 18, k + 7, Blocks.quartz_block); - world.func_147449_b(i + 6, j + 18, k + 8, Blocks.quartz_block); - world.func_147449_b(i + 6, j + 19, k + 6, Blocks.quartz_block); - world.func_147449_b(i + 6, j + 19, k + 7, Blocks.quartz_block); - world.func_147449_b(i + 6, j + 19, k + 8, Blocks.quartz_block); - world.func_147449_b(i + 6, j + 20, k + 6, Blocks.quartz_stairs); - world.func_147449_b(i + 6, j + 20, k + 7, Blocks.quartz_stairs); - world.func_147465_d(i + 6, j + 20, k + 8, Blocks.quartz_stairs, 3, 2); - world.func_147449_b(i + 7, j + 1, k + 7, Blocks.dirt); - world.func_147449_b(i + 7, j + 2, k + 7, Blocks.dirt); - world.func_147449_b(i + 7, j + 3, k + 6, Blocks.dirt); - world.func_147449_b(i + 7, j + 3, k + 7, Blocks.dirt); - world.func_147449_b(i + 7, j + 3, k + 8, Blocks.dirt); - world.func_147449_b(i + 7, j + 3, k + 10, Blocks.dirt); - world.func_147449_b(i + 7, j + 4, k + 5, Blocks.dirt); - world.func_147449_b(i + 7, j + 4, k + 6, Blocks.dirt); - world.func_147449_b(i + 7, j + 4, k + 7, Blocks.dirt); - world.func_147449_b(i + 7, j + 4, k + 8, Blocks.dirt); - world.func_147449_b(i + 7, j + 4, k + 9, Blocks.dirt); - world.func_147449_b(i + 7, j + 4, k + 10, Blocks.dirt); - world.func_147449_b(i + 7, j + 5, k + 4, Blocks.dirt); - world.func_147449_b(i + 7, j + 5, k + 5, Blocks.dirt); - world.func_147449_b(i + 7, j + 5, k + 6, Blocks.dirt); - world.func_147449_b(i + 7, j + 5, k + 7, Blocks.dirt); - world.func_147449_b(i + 7, j + 5, k + 8, Blocks.dirt); - world.func_147449_b(i + 7, j + 5, k + 9, Blocks.dirt); - world.func_147449_b(i + 7, j + 5, k + 10, Blocks.dirt); - world.func_147449_b(i + 7, j + 6, k + 2, Blocks.dirt); - world.func_147449_b(i + 7, j + 6, k + 3, Blocks.dirt); - world.func_147449_b(i + 7, j + 6, k + 4, Blocks.dirt); - world.func_147449_b(i + 7, j + 6, k + 5, Blocks.dirt); - world.func_147449_b(i + 7, j + 6, k + 6, Blocks.dirt); - world.func_147449_b(i + 7, j + 6, k + 7, Blocks.dirt); - world.func_147449_b(i + 7, j + 6, k + 8, Blocks.dirt); - world.func_147449_b(i + 7, j + 6, k + 9, Blocks.dirt); - world.func_147449_b(i + 7, j + 6, k + 10, Blocks.dirt); - world.func_147449_b(i + 7, j + 6, k + 11, Blocks.dirt); - world.func_147449_b(i + 7, j + 6, k + 12, Blocks.dirt); - world.func_147449_b(i + 7, j + 7, k + 1, Blocks.dirt); - world.func_147449_b(i + 7, j + 7, k + 2, Blocks.dirt); - world.func_147449_b(i + 7, j + 7, k + 3, Blocks.dirt); - world.func_147449_b(i + 7, j + 7, k + 4, Blocks.dirt); - world.func_147449_b(i + 7, j + 7, k + 5, Blocks.dirt); - world.func_147449_b(i + 7, j + 7, k + 6, Blocks.quartz_block); - world.func_147449_b(i + 7, j + 7, k + 7, Blocks.quartz_block); - world.func_147449_b(i + 7, j + 7, k + 8, Blocks.quartz_block); - world.func_147449_b(i + 7, j + 7, k + 9, Blocks.dirt); - world.func_147449_b(i + 7, j + 7, k + 10, Blocks.dirt); - world.func_147449_b(i + 7, j + 7, k + 11, Blocks.dirt); - world.func_147449_b(i + 7, j + 7, k + 12, Blocks.dirt); - world.func_147449_b(i + 7, j + 7, k + 13, Blocks.dirt); - world.func_147449_b(i + 7, j + 8, k + 1, Blocks.dirt); - world.func_147449_b(i + 7, j + 8, k + 2, Blocks.dirt); - world.func_147449_b(i + 7, j + 8, k + 3, Blocks.dirt); - world.func_147449_b(i + 7, j + 8, k + 4, Blocks.dirt); - world.func_147449_b(i + 7, j + 8, k + 5, Blocks.quartz_block); - world.func_147449_b(i + 7, j + 8, k + 6, portal); - world.func_147449_b(i + 7, j + 8, k + 7, portal); - world.func_147449_b(i + 7, j + 8, k + 8, portal); - world.func_147449_b(i + 7, j + 8, k + 9, Blocks.quartz_block); - world.func_147449_b(i + 7, j + 8, k + 10, Blocks.dirt); - world.func_147449_b(i + 7, j + 8, k + 11, Blocks.dirt); - world.func_147449_b(i + 7, j + 8, k + 12, Blocks.dirt); - world.func_147449_b(i + 7, j + 8, k + 13, Blocks.dirt); - world.func_147449_b(i + 7, j + 9, k + 1, Blocks.grass); - world.func_147449_b(i + 7, j + 9, k + 2, Blocks.grass); - world.func_147449_b(i + 7, j + 9, k + 3, Blocks.grass); - world.func_147449_b(i + 7, j + 9, k + 4, Blocks.dirt); - world.func_147449_b(i + 7, j + 9, k + 5, Blocks.quartz_block); - world.func_147449_b(i + 7, j + 9, k + 9, Blocks.quartz_block); - world.func_147449_b(i + 7, j + 9, k + 10, Blocks.dirt); - world.func_147449_b(i + 7, j + 9, k + 11, Blocks.grass); - world.func_147449_b(i + 7, j + 9, k + 12, Blocks.grass); - world.func_147449_b(i + 7, j + 9, k + 13, Blocks.grass); - world.func_147465_d(i + 7, j + 10, k + 3, Blocks.stone_slab, 7, 2); - world.func_147449_b(i + 7, j + 10, k + 4, Blocks.quartz_block); - world.func_147465_d(i + 7, j + 10, k + 5, Blocks.quartz_stairs, 3, 2); - world.func_147465_d(i + 7, j + 10, k + 9, Blocks.quartz_stairs, 2, 2); - world.func_147449_b(i + 7, j + 10, k + 10, Blocks.quartz_block); - world.func_147465_d(i + 7, j + 10, k + 11, Blocks.stone_slab, 7, 2); - world.func_147465_d(i + 7, j + 14, k + 3, Blocks.quartz_stairs, 2, 2); - world.func_147449_b(i + 7, j + 14, k + 4, Blocks.quartz_block); - world.func_147449_b(i + 7, j + 14, k + 10, Blocks.quartz_block); - world.func_147465_d(i + 7, j + 14, k + 11, Blocks.quartz_stairs, 3, 2); - world.func_147465_d(i + 7, j + 15, k + 4, Blocks.quartz_stairs, 2, 2); - world.func_147449_b(i + 7, j + 15, k + 5, Blocks.quartz_block); - world.func_147449_b(i + 7, j + 15, k + 9, Blocks.quartz_block); - world.func_147465_d(i + 7, j + 15, k + 10, Blocks.quartz_stairs, 3, 2); - world.func_147449_b(i + 7, j + 16, k + 5, Blocks.quartz_block); - world.func_147449_b(i + 7, j + 16, k + 9, Blocks.quartz_block); - world.func_147465_d(i + 7, j + 17, k + 5, Blocks.quartz_stairs, 2, 2); - world.func_147449_b(i + 7, j + 17, k + 6, Blocks.quartz_block); - world.func_147449_b(i + 7, j + 17, k + 8, Blocks.quartz_block); - world.func_147465_d(i + 7, j + 17, k + 9, Blocks.quartz_stairs, 3, 2); - world.func_147449_b(i + 7, j + 18, k + 6, Blocks.quartz_block); - world.func_147449_b(i + 7, j + 18, k + 8, Blocks.quartz_block); - world.func_147449_b(i + 7, j + 19, k + 6, Blocks.quartz_block); - world.func_147449_b(i + 7, j + 19, k + 8, Blocks.quartz_block); - world.func_147465_d(i + 7, j + 20, k + 6, Blocks.quartz_stairs, 2, 2); - world.func_147449_b(i + 7, j + 20, k + 7, Blocks.quartz_block); - world.func_147465_d(i + 7, j + 20, k + 8, Blocks.quartz_stairs, 3, 2); - world.func_147449_b(i + 7, j + 21, k + 7, Blocks.quartz_block); - world.func_147449_b(i + 7, j + 22, k + 7, Blocks.quartz_block); - world.func_147449_b(i + 7, j + 23, k + 7, Blocks.quartz_block); - world.func_147449_b(i + 8, j + 3, k + 4, Blocks.dirt); - world.func_147449_b(i + 8, j + 3, k + 7, Blocks.dirt); - world.func_147449_b(i + 8, j + 4, k + 4, Blocks.dirt); - world.func_147449_b(i + 8, j + 4, k + 6, Blocks.dirt); - world.func_147449_b(i + 8, j + 4, k + 7, Blocks.dirt); - world.func_147449_b(i + 8, j + 4, k + 8, Blocks.dirt); - world.func_147449_b(i + 8, j + 5, k + 1, Blocks.dirt); - world.func_147449_b(i + 8, j + 5, k + 4, Blocks.dirt); - world.func_147449_b(i + 8, j + 5, k + 5, Blocks.dirt); - world.func_147449_b(i + 8, j + 5, k + 6, Blocks.dirt); - world.func_147449_b(i + 8, j + 5, k + 7, Blocks.dirt); - world.func_147449_b(i + 8, j + 5, k + 8, Blocks.dirt); - world.func_147449_b(i + 8, j + 5, k + 9, Blocks.dirt); - world.func_147449_b(i + 8, j + 5, k + 10, Blocks.dirt); - world.func_147449_b(i + 8, j + 6, k + 1, Blocks.dirt); - world.func_147449_b(i + 8, j + 6, k + 3, Blocks.dirt); - world.func_147449_b(i + 8, j + 6, k + 4, Blocks.dirt); - world.func_147449_b(i + 8, j + 6, k + 5, Blocks.dirt); - world.func_147449_b(i + 8, j + 6, k + 6, Blocks.dirt); - world.func_147449_b(i + 8, j + 6, k + 7, Blocks.dirt); - world.func_147449_b(i + 8, j + 6, k + 8, Blocks.dirt); - world.func_147449_b(i + 8, j + 6, k + 9, Blocks.dirt); - world.func_147449_b(i + 8, j + 6, k + 10, Blocks.dirt); - world.func_147449_b(i + 8, j + 6, k + 11, Blocks.dirt); - world.func_147449_b(i + 8, j + 7, k + 1, Blocks.dirt); - world.func_147449_b(i + 8, j + 7, k + 2, Blocks.dirt); - world.func_147449_b(i + 8, j + 7, k + 3, Blocks.dirt); - world.func_147449_b(i + 8, j + 7, k + 4, Blocks.dirt); - world.func_147449_b(i + 8, j + 7, k + 5, Blocks.dirt); - world.func_147449_b(i + 8, j + 7, k + 6, Blocks.quartz_block); - world.func_147449_b(i + 8, j + 7, k + 7, Blocks.quartz_block); - world.func_147449_b(i + 8, j + 7, k + 8, Blocks.quartz_block); - world.func_147449_b(i + 8, j + 7, k + 9, Blocks.dirt); - world.func_147449_b(i + 8, j + 7, k + 10, Blocks.dirt); - world.func_147449_b(i + 8, j + 7, k + 11, Blocks.dirt); - world.func_147449_b(i + 8, j + 7, k + 12, Blocks.dirt); - world.func_147449_b(i + 8, j + 7, k + 13, Blocks.dirt); - world.func_147449_b(i + 8, j + 8, k + 1, Blocks.dirt); - world.func_147449_b(i + 8, j + 8, k + 2, Blocks.dirt); - world.func_147449_b(i + 8, j + 8, k + 3, Blocks.dirt); - world.func_147449_b(i + 8, j + 8, k + 4, Blocks.dirt); - world.func_147449_b(i + 8, j + 8, k + 5, Blocks.quartz_block); - world.func_147449_b(i + 8, j + 8, k + 6, portal); - world.func_147449_b(i + 8, j + 8, k + 7, portal); - world.func_147449_b(i + 8, j + 8, k + 8, portal); - world.func_147449_b(i + 8, j + 8, k + 9, Blocks.quartz_block); - world.func_147449_b(i + 8, j + 8, k + 10, Blocks.dirt); - world.func_147449_b(i + 8, j + 8, k + 11, Blocks.dirt); - world.func_147449_b(i + 8, j + 8, k + 12, Blocks.dirt); - world.func_147449_b(i + 8, j + 8, k + 13, Blocks.dirt); - world.func_147449_b(i + 8, j + 9, k + 1, Blocks.grass); - world.func_147449_b(i + 8, j + 9, k + 2, Blocks.grass); - world.func_147449_b(i + 8, j + 9, k + 3, Blocks.grass); - world.func_147449_b(i + 8, j + 9, k + 4, Blocks.dirt); - world.func_147449_b(i + 8, j + 9, k + 5, Blocks.quartz_block); - world.func_147449_b(i + 8, j + 9, k + 9, Blocks.quartz_block); - world.func_147449_b(i + 8, j + 9, k + 10, Blocks.dirt); - world.func_147449_b(i + 8, j + 9, k + 11, Blocks.grass); - world.func_147449_b(i + 8, j + 9, k + 12, Blocks.grass); - world.func_147449_b(i + 8, j + 9, k + 13, Blocks.grass); - world.func_147465_d(i + 8, j + 10, k + 3, Blocks.stone_slab, 7, 2); - world.func_147449_b(i + 8, j + 10, k + 4, Blocks.quartz_block); - world.func_147465_d(i + 8, j + 10, k + 5, Blocks.quartz_stairs, 3, 2); - world.func_147465_d(i + 8, j + 10, k + 9, Blocks.quartz_stairs, 2, 2); - world.func_147449_b(i + 8, j + 10, k + 10, Blocks.quartz_block); - world.func_147465_d(i + 8, j + 10, k + 11, Blocks.stone_slab, 7, 2); - world.func_147465_d(i + 8, j + 14, k + 3, Blocks.quartz_stairs, 2, 2); - world.func_147449_b(i + 8, j + 14, k + 4, Blocks.quartz_block); - world.func_147449_b(i + 8, j + 14, k + 10, Blocks.quartz_block); - world.func_147465_d(i + 8, j + 14, k + 11, Blocks.quartz_stairs, 3, 2); - world.func_147465_d(i + 8, j + 15, k + 4, Blocks.quartz_stairs, 2, 2); - world.func_147449_b(i + 8, j + 15, k + 5, Blocks.quartz_block); - world.func_147449_b(i + 8, j + 15, k + 9, Blocks.quartz_block); - world.func_147465_d(i + 8, j + 15, k + 10, Blocks.quartz_stairs, 3, 2); - world.func_147449_b(i + 8, j + 16, k + 5, Blocks.quartz_block); - world.func_147449_b(i + 8, j + 16, k + 9, Blocks.quartz_block); - world.func_147465_d(i + 8, j + 17, k + 5, Blocks.quartz_stairs, 2, 2); - world.func_147449_b(i + 8, j + 17, k + 6, Blocks.quartz_block); - world.func_147449_b(i + 8, j + 17, k + 7, Blocks.quartz_block); - world.func_147449_b(i + 8, j + 17, k + 8, Blocks.quartz_block); - world.func_147465_d(i + 8, j + 17, k + 9, Blocks.quartz_stairs, 3, 2); - world.func_147449_b(i + 8, j + 18, k + 6, Blocks.quartz_block); - world.func_147449_b(i + 8, j + 18, k + 7, Blocks.quartz_block); - world.func_147449_b(i + 8, j + 18, k + 8, Blocks.quartz_block); - world.func_147449_b(i + 8, j + 19, k + 6, Blocks.quartz_block); - world.func_147449_b(i + 8, j + 19, k + 7, Blocks.quartz_block); - world.func_147449_b(i + 8, j + 19, k + 8, Blocks.quartz_block); - world.func_147465_d(i + 8, j + 20, k + 6, Blocks.quartz_stairs, 1, 2); - world.func_147465_d(i + 8, j + 20, k + 7, Blocks.quartz_stairs, 1, 2); - world.func_147465_d(i + 8, j + 20, k + 8, Blocks.quartz_stairs, 3, 2); - world.func_147449_b(i + 9, j + 4, k + 7, Blocks.dirt); - world.func_147449_b(i + 9, j + 5, k + 3, Blocks.dirt); - world.func_147449_b(i + 9, j + 5, k + 5, Blocks.dirt); - world.func_147449_b(i + 9, j + 5, k + 6, Blocks.dirt); - world.func_147449_b(i + 9, j + 5, k + 7, Blocks.dirt); - world.func_147449_b(i + 9, j + 5, k + 8, Blocks.dirt); - world.func_147449_b(i + 9, j + 5, k + 9, Blocks.dirt); - world.func_147449_b(i + 9, j + 5, k + 12, Blocks.dirt); - world.func_147449_b(i + 9, j + 6, k + 3, Blocks.dirt); - world.func_147449_b(i + 9, j + 6, k + 4, Blocks.dirt); - world.func_147449_b(i + 9, j + 6, k + 5, Blocks.dirt); - world.func_147449_b(i + 9, j + 6, k + 6, Blocks.dirt); - world.func_147449_b(i + 9, j + 6, k + 7, Blocks.dirt); - world.func_147449_b(i + 9, j + 6, k + 8, Blocks.dirt); - world.func_147449_b(i + 9, j + 6, k + 9, Blocks.dirt); - world.func_147449_b(i + 9, j + 6, k + 10, Blocks.dirt); - world.func_147449_b(i + 9, j + 6, k + 11, Blocks.dirt); - world.func_147449_b(i + 9, j + 6, k + 12, Blocks.dirt); - world.func_147449_b(i + 9, j + 7, k + 2, Blocks.dirt); - world.func_147449_b(i + 9, j + 7, k + 3, Blocks.dirt); - world.func_147449_b(i + 9, j + 7, k + 4, Blocks.dirt); - world.func_147449_b(i + 9, j + 7, k + 5, Blocks.dirt); - world.func_147449_b(i + 9, j + 7, k + 6, Blocks.dirt); - world.func_147449_b(i + 9, j + 7, k + 7, Blocks.dirt); - world.func_147449_b(i + 9, j + 7, k + 8, Blocks.dirt); - world.func_147449_b(i + 9, j + 7, k + 9, Blocks.dirt); - world.func_147449_b(i + 9, j + 7, k + 10, Blocks.dirt); - world.func_147449_b(i + 9, j + 7, k + 11, Blocks.dirt); - world.func_147449_b(i + 9, j + 7, k + 12, Blocks.dirt); - world.func_147449_b(i + 9, j + 8, k + 2, Blocks.dirt); - world.func_147449_b(i + 9, j + 8, k + 3, Blocks.dirt); - world.func_147449_b(i + 9, j + 8, k + 4, Blocks.dirt); - world.func_147449_b(i + 9, j + 8, k + 5, Blocks.dirt); - world.func_147449_b(i + 9, j + 8, k + 6, Blocks.quartz_block); - world.func_147449_b(i + 9, j + 8, k + 7, Blocks.quartz_block); - world.func_147449_b(i + 9, j + 8, k + 8, Blocks.quartz_block); - world.func_147449_b(i + 9, j + 8, k + 9, Blocks.dirt); - world.func_147449_b(i + 9, j + 8, k + 10, Blocks.dirt); - world.func_147449_b(i + 9, j + 8, k + 11, Blocks.dirt); - world.func_147449_b(i + 9, j + 8, k + 12, Blocks.dirt); - world.func_147449_b(i + 9, j + 9, k + 2, Blocks.grass); - world.func_147449_b(i + 9, j + 9, k + 3, Blocks.grass); - world.func_147449_b(i + 9, j + 9, k + 4, Blocks.dirt); - world.func_147449_b(i + 9, j + 9, k + 5, Blocks.dirt); - world.func_147449_b(i + 9, j + 9, k + 6, Blocks.quartz_block); - world.func_147449_b(i + 9, j + 9, k + 7, Blocks.quartz_block); - world.func_147449_b(i + 9, j + 9, k + 8, Blocks.quartz_block); - world.func_147449_b(i + 9, j + 9, k + 9, Blocks.dirt); - world.func_147449_b(i + 9, j + 9, k + 10, Blocks.dirt); - world.func_147449_b(i + 9, j + 9, k + 11, Blocks.grass); - world.func_147449_b(i + 9, j + 9, k + 12, Blocks.grass); - world.func_147465_d(i + 9, j + 10, k + 3, Blocks.stone_slab, 7, 2); - world.func_147465_d(i + 9, j + 10, k + 4, Blocks.quartz_block, 2, 2); - world.func_147449_b(i + 9, j + 10, k + 5, Blocks.quartz_block); - world.func_147449_b(i + 9, j + 10, k + 6, Blocks.quartz_stairs); - world.func_147449_b(i + 9, j + 10, k + 7, Blocks.quartz_stairs); - world.func_147449_b(i + 9, j + 10, k + 8, Blocks.quartz_stairs); - world.func_147449_b(i + 9, j + 10, k + 9, Blocks.quartz_block); - world.func_147465_d(i + 9, j + 10, k + 10, Blocks.quartz_block, 2, 2); - world.func_147465_d(i + 9, j + 10, k + 11, Blocks.stone_slab, 7, 2); - world.func_147465_d(i + 9, j + 11, k + 4, Blocks.quartz_block, 2, 2); - world.func_147465_d(i + 9, j + 11, k + 10, Blocks.quartz_block, 2, 2); - world.func_147465_d(i + 9, j + 12, k + 4, Blocks.quartz_block, 2, 2); - world.func_147465_d(i + 9, j + 12, k + 10, Blocks.quartz_block, 2, 2); - world.func_147465_d(i + 9, j + 13, k + 4, Blocks.quartz_block, 2, 2); - world.func_147465_d(i + 9, j + 13, k + 10, Blocks.quartz_block, 2, 2); - world.func_147465_d(i + 9, j + 14, k + 3, Blocks.quartz_stairs, 2, 2); - world.func_147449_b(i + 9, j + 14, k + 4, Blocks.quartz_block); - world.func_147449_b(i + 9, j + 14, k + 10, Blocks.quartz_block); - world.func_147465_d(i + 9, j + 14, k + 11, Blocks.quartz_stairs, 3, 2); - world.func_147465_d(i + 9, j + 15, k + 4, Blocks.quartz_stairs, 2, 2); - world.func_147449_b(i + 9, j + 15, k + 5, Blocks.quartz_block); - world.func_147449_b(i + 9, j + 15, k + 6, Blocks.quartz_block); - world.func_147449_b(i + 9, j + 15, k + 7, Blocks.quartz_block); - world.func_147449_b(i + 9, j + 15, k + 8, Blocks.quartz_block); - world.func_147449_b(i + 9, j + 15, k + 9, Blocks.quartz_block); - world.func_147465_d(i + 9, j + 15, k + 10, Blocks.quartz_stairs, 3, 2); - world.func_147449_b(i + 9, j + 16, k + 5, Blocks.quartz_block); - world.func_147449_b(i + 9, j + 16, k + 6, Blocks.quartz_block); - world.func_147449_b(i + 9, j + 16, k + 7, Blocks.quartz_block); - world.func_147449_b(i + 9, j + 16, k + 8, Blocks.quartz_block); - world.func_147449_b(i + 9, j + 16, k + 9, Blocks.quartz_block); - world.func_147465_d(i + 9, j + 17, k + 5, Blocks.quartz_stairs, 2, 2); - world.func_147465_d(i + 9, j + 17, k + 6, Blocks.quartz_stairs, 1, 2); - world.func_147465_d(i + 9, j + 17, k + 7, Blocks.quartz_stairs, 1, 2); - world.func_147465_d(i + 9, j + 17, k + 8, Blocks.quartz_stairs, 1, 2); - world.func_147465_d(i + 9, j + 17, k + 9, Blocks.quartz_stairs, 3, 2); - world.func_147449_b(i + 10, j + 4, k + 10, Blocks.dirt); - world.func_147449_b(i + 10, j + 5, k + 6, Blocks.dirt); - world.func_147449_b(i + 10, j + 5, k + 7, Blocks.dirt); - world.func_147449_b(i + 10, j + 5, k + 8, Blocks.dirt); - world.func_147449_b(i + 10, j + 5, k + 10, Blocks.dirt); - world.func_147449_b(i + 10, j + 6, k + 4, Blocks.dirt); - world.func_147449_b(i + 10, j + 6, k + 5, Blocks.dirt); - world.func_147449_b(i + 10, j + 6, k + 6, Blocks.dirt); - world.func_147449_b(i + 10, j + 6, k + 7, Blocks.dirt); - world.func_147449_b(i + 10, j + 6, k + 8, Blocks.dirt); - world.func_147449_b(i + 10, j + 6, k + 9, Blocks.dirt); - world.func_147449_b(i + 10, j + 6, k + 10, Blocks.dirt); - world.func_147449_b(i + 10, j + 7, k + 2, Blocks.dirt); - world.func_147449_b(i + 10, j + 7, k + 3, Blocks.dirt); - world.func_147449_b(i + 10, j + 7, k + 4, Blocks.dirt); - world.func_147449_b(i + 10, j + 7, k + 5, Blocks.dirt); - world.func_147449_b(i + 10, j + 7, k + 6, Blocks.dirt); - world.func_147449_b(i + 10, j + 7, k + 7, Blocks.dirt); - world.func_147449_b(i + 10, j + 7, k + 8, Blocks.dirt); - world.func_147449_b(i + 10, j + 7, k + 9, Blocks.dirt); - world.func_147449_b(i + 10, j + 7, k + 10, Blocks.dirt); - world.func_147449_b(i + 10, j + 7, k + 11, Blocks.dirt); - world.func_147449_b(i + 10, j + 7, k + 12, Blocks.dirt); - world.func_147449_b(i + 10, j + 8, k + 2, Blocks.dirt); - world.func_147449_b(i + 10, j + 8, k + 3, Blocks.dirt); - world.func_147449_b(i + 10, j + 8, k + 4, Blocks.dirt); - world.func_147449_b(i + 10, j + 8, k + 5, Blocks.dirt); - world.func_147449_b(i + 10, j + 8, k + 6, Blocks.dirt); - world.func_147449_b(i + 10, j + 8, k + 7, Blocks.dirt); - world.func_147449_b(i + 10, j + 8, k + 8, Blocks.dirt); - world.func_147449_b(i + 10, j + 8, k + 9, Blocks.dirt); - world.func_147449_b(i + 10, j + 8, k + 10, Blocks.dirt); - world.func_147449_b(i + 10, j + 8, k + 11, Blocks.dirt); - world.func_147449_b(i + 10, j + 8, k + 12, Blocks.dirt); - world.func_147449_b(i + 10, j + 9, k + 2, Blocks.grass); - world.func_147449_b(i + 10, j + 9, k + 3, Blocks.dirt); - world.func_147449_b(i + 10, j + 9, k + 4, Blocks.grass); - world.func_147449_b(i + 10, j + 9, k + 5, Blocks.dirt); - world.func_147449_b(i + 10, j + 9, k + 6, Blocks.dirt); - world.func_147449_b(i + 10, j + 9, k + 7, Blocks.dirt); - world.func_147449_b(i + 10, j + 9, k + 8, Blocks.dirt); - world.func_147449_b(i + 10, j + 9, k + 9, Blocks.dirt); - world.func_147449_b(i + 10, j + 9, k + 10, Blocks.grass); - world.func_147449_b(i + 10, j + 9, k + 11, Blocks.dirt); - world.func_147449_b(i + 10, j + 9, k + 12, Blocks.grass); - world.func_147449_b(i + 10, j + 10, k + 3, Blocks.log); - world.func_147465_d(i + 10, j + 10, k + 4, Blocks.stone_slab, 7, 2); - world.func_147465_d(i + 10, j + 10, k + 5, Blocks.quartz_block, 2, 2); - world.func_147449_b(i + 10, j + 10, k + 6, Blocks.quartz_block); - world.func_147449_b(i + 10, j + 10, k + 7, Blocks.quartz_block); - world.func_147449_b(i + 10, j + 10, k + 8, Blocks.quartz_block); - world.func_147465_d(i + 10, j + 10, k + 9, Blocks.quartz_block, 2, 2); - world.func_147465_d(i + 10, j + 10, k + 10, Blocks.stone_slab, 7, 2); - world.func_147449_b(i + 10, j + 10, k + 11, Blocks.log); - world.func_147465_d(i + 10, j + 11, k + 3, Blocks.leaves, 4, 2); - world.func_147465_d(i + 10, j + 11, k + 5, Blocks.quartz_block, 2, 2); - world.func_147465_d(i + 10, j + 11, k + 9, Blocks.quartz_block, 2, 2); - world.func_147465_d(i + 10, j + 11, k + 11, Blocks.leaves, 4, 2); - world.func_147465_d(i + 10, j + 12, k + 3, Blocks.leaves, 4, 2); - world.func_147465_d(i + 10, j + 12, k + 5, Blocks.quartz_block, 2, 2); - world.func_147465_d(i + 10, j + 12, k + 9, Blocks.quartz_block, 2, 2); - world.func_147465_d(i + 10, j + 12, k + 11, Blocks.leaves, 4, 2); - world.func_147465_d(i + 10, j + 13, k + 5, Blocks.quartz_block, 2, 2); - world.func_147465_d(i + 10, j + 13, k + 9, Blocks.quartz_block, 2, 2); - world.func_147465_d(i + 10, j + 14, k + 3, Blocks.quartz_stairs, 1, 2); - world.func_147465_d(i + 10, j + 14, k + 4, Blocks.quartz_stairs, 2, 2); - world.func_147449_b(i + 10, j + 14, k + 5, Blocks.quartz_block); - world.func_147449_b(i + 10, j + 14, k + 6, Blocks.quartz_block); - world.func_147449_b(i + 10, j + 14, k + 7, Blocks.quartz_block); - world.func_147449_b(i + 10, j + 14, k + 8, Blocks.quartz_block); - world.func_147449_b(i + 10, j + 14, k + 9, Blocks.quartz_block); - world.func_147465_d(i + 10, j + 14, k + 10, Blocks.quartz_stairs, 1, 2); - world.func_147465_d(i + 10, j + 14, k + 11, Blocks.quartz_stairs, 1, 2); - world.func_147465_d(i + 10, j + 15, k + 5, Blocks.quartz_stairs, 1, 2); - world.func_147465_d(i + 10, j + 15, k + 6, Blocks.quartz_stairs, 1, 2); - world.func_147465_d(i + 10, j + 15, k + 7, Blocks.quartz_stairs, 1, 2); - world.func_147465_d(i + 10, j + 15, k + 8, Blocks.quartz_stairs, 1, 2); - world.func_147465_d(i + 10, j + 15, k + 9, Blocks.quartz_stairs, 1, 2); - world.func_147449_b(i + 11, j + 3, k + 7, Blocks.dirt); - world.func_147449_b(i + 11, j + 4, k + 5, Blocks.dirt); - world.func_147449_b(i + 11, j + 4, k + 7, Blocks.dirt); - world.func_147449_b(i + 11, j + 5, k + 5, Blocks.dirt); - world.func_147449_b(i + 11, j + 5, k + 7, Blocks.dirt); - world.func_147449_b(i + 11, j + 6, k + 3, Blocks.dirt); - world.func_147449_b(i + 11, j + 6, k + 5, Blocks.dirt); - world.func_147449_b(i + 11, j + 6, k + 6, Blocks.dirt); - world.func_147449_b(i + 11, j + 6, k + 7, Blocks.dirt); - world.func_147449_b(i + 11, j + 6, k + 8, Blocks.dirt); - world.func_147449_b(i + 11, j + 6, k + 9, Blocks.dirt); - world.func_147449_b(i + 11, j + 6, k + 11, Blocks.dirt); - world.func_147449_b(i + 11, j + 7, k + 3, Blocks.dirt); - world.func_147449_b(i + 11, j + 7, k + 4, Blocks.dirt); - world.func_147449_b(i + 11, j + 7, k + 5, Blocks.dirt); - world.func_147449_b(i + 11, j + 7, k + 6, Blocks.dirt); - world.func_147449_b(i + 11, j + 7, k + 7, Blocks.dirt); - world.func_147449_b(i + 11, j + 7, k + 8, Blocks.dirt); - world.func_147449_b(i + 11, j + 7, k + 9, Blocks.dirt); - world.func_147449_b(i + 11, j + 7, k + 10, Blocks.dirt); - world.func_147449_b(i + 11, j + 7, k + 11, Blocks.dirt); - world.func_147449_b(i + 11, j + 8, k + 3, Blocks.dirt); - world.func_147449_b(i + 11, j + 8, k + 4, Blocks.dirt); - world.func_147449_b(i + 11, j + 8, k + 5, Blocks.dirt); - world.func_147449_b(i + 11, j + 8, k + 6, Blocks.dirt); - world.func_147449_b(i + 11, j + 8, k + 7, Blocks.dirt); - world.func_147449_b(i + 11, j + 8, k + 8, Blocks.dirt); - world.func_147449_b(i + 11, j + 8, k + 9, Blocks.dirt); - world.func_147449_b(i + 11, j + 8, k + 10, Blocks.dirt); - world.func_147449_b(i + 11, j + 8, k + 11, Blocks.dirt); - world.func_147449_b(i + 11, j + 9, k + 3, Blocks.grass); - world.func_147449_b(i + 11, j + 9, k + 4, Blocks.dirt); - world.func_147449_b(i + 11, j + 9, k + 5, Blocks.grass); - world.func_147449_b(i + 11, j + 9, k + 6, Blocks.grass); - world.func_147449_b(i + 11, j + 9, k + 7, Blocks.grass); - world.func_147449_b(i + 11, j + 9, k + 8, Blocks.grass); - world.func_147449_b(i + 11, j + 9, k + 9, Blocks.grass); - world.func_147449_b(i + 11, j + 9, k + 10, Blocks.dirt); - world.func_147449_b(i + 11, j + 9, k + 11, Blocks.grass); - world.func_147449_b(i + 11, j + 10, k + 4, Blocks.log); - world.func_147465_d(i + 11, j + 10, k + 5, Blocks.stone_slab, 7, 2); - world.func_147465_d(i + 11, j + 10, k + 6, Blocks.stone_slab, 7, 2); - world.func_147465_d(i + 11, j + 10, k + 7, Blocks.stone_slab, 7, 2); - world.func_147465_d(i + 11, j + 10, k + 8, Blocks.stone_slab, 7, 2); - world.func_147465_d(i + 11, j + 10, k + 9, Blocks.stone_slab, 7, 2); - world.func_147449_b(i + 11, j + 10, k + 10, Blocks.log); - world.func_147465_d(i + 11, j + 11, k + 4, Blocks.leaves, 4, 2); - world.func_147465_d(i + 11, j + 11, k + 10, Blocks.leaves, 4, 2); - world.func_147465_d(i + 11, j + 12, k + 4, Blocks.leaves, 4, 2); - world.func_147465_d(i + 11, j + 12, k + 10, Blocks.leaves, 4, 2); - world.func_147465_d(i + 11, j + 14, k + 4, Blocks.quartz_stairs, 2, 2); - world.func_147465_d(i + 11, j + 14, k + 5, Blocks.quartz_stairs, 1, 2); - world.func_147465_d(i + 11, j + 14, k + 6, Blocks.quartz_stairs, 1, 2); - world.func_147465_d(i + 11, j + 14, k + 7, Blocks.quartz_stairs, 1, 2); - world.func_147465_d(i + 11, j + 14, k + 8, Blocks.quartz_stairs, 1, 2); - world.func_147465_d(i + 11, j + 14, k + 9, Blocks.quartz_stairs, 1, 2); - world.func_147465_d(i + 11, j + 14, k + 10, Blocks.quartz_stairs, 3, 2); - world.func_147449_b(i + 12, j + 2, k + 9, Blocks.dirt); - world.func_147449_b(i + 12, j + 3, k + 9, Blocks.dirt); - world.func_147449_b(i + 12, j + 4, k + 9, Blocks.dirt); - world.func_147449_b(i + 12, j + 5, k + 9, Blocks.dirt); - world.func_147449_b(i + 12, j + 6, k + 6, Blocks.dirt); - world.func_147449_b(i + 12, j + 6, k + 7, Blocks.dirt); - world.func_147449_b(i + 12, j + 6, k + 9, Blocks.dirt); - world.func_147449_b(i + 12, j + 7, k + 4, Blocks.dirt); - world.func_147449_b(i + 12, j + 7, k + 5, Blocks.dirt); - world.func_147449_b(i + 12, j + 7, k + 6, Blocks.dirt); - world.func_147449_b(i + 12, j + 7, k + 7, Blocks.dirt); - world.func_147449_b(i + 12, j + 7, k + 8, Blocks.dirt); - world.func_147449_b(i + 12, j + 7, k + 9, Blocks.dirt); - world.func_147449_b(i + 12, j + 7, k + 10, Blocks.dirt); - world.func_147449_b(i + 12, j + 8, k + 4, Blocks.dirt); - world.func_147449_b(i + 12, j + 8, k + 5, Blocks.dirt); - world.func_147449_b(i + 12, j + 8, k + 6, Blocks.dirt); - world.func_147449_b(i + 12, j + 8, k + 7, Blocks.dirt); - world.func_147449_b(i + 12, j + 8, k + 8, Blocks.dirt); - world.func_147449_b(i + 12, j + 8, k + 9, Blocks.dirt); - world.func_147449_b(i + 12, j + 8, k + 10, Blocks.dirt); - world.func_147449_b(i + 12, j + 9, k + 4, Blocks.grass); - world.func_147449_b(i + 12, j + 9, k + 5, Blocks.grass); - world.func_147449_b(i + 12, j + 9, k + 6, Blocks.grass); - world.func_147449_b(i + 12, j + 9, k + 7, Blocks.grass); - world.func_147449_b(i + 12, j + 9, k + 8, Blocks.grass); - world.func_147449_b(i + 12, j + 9, k + 9, Blocks.grass); - world.func_147449_b(i + 12, j + 9, k + 10, Blocks.grass); - world.func_147449_b(i + 13, j + 5, k + 7, Blocks.dirt); - world.func_147449_b(i + 13, j + 6, k + 7, Blocks.dirt); - world.func_147449_b(i + 13, j + 7, k + 6, Blocks.dirt); - world.func_147449_b(i + 13, j + 7, k + 7, Blocks.dirt); - world.func_147449_b(i + 13, j + 7, k + 8, Blocks.dirt); - world.func_147449_b(i + 13, j + 8, k + 6, Blocks.dirt); - world.func_147449_b(i + 13, j + 8, k + 7, Blocks.dirt); - world.func_147449_b(i + 13, j + 8, k + 8, Blocks.dirt); - world.func_147449_b(i + 13, j + 9, k + 6, Blocks.grass); - world.func_147449_b(i + 13, j + 9, k + 7, Blocks.grass); - world.func_147449_b(i + 13, j + 9, k + 8, Blocks.grass); - world.func_147465_d(i + 0, j + 0, k + 8, ivy, 8, 2); - world.func_147465_d(i + 0, j + 1, k + 8, ivy, 8, 2); - world.func_147465_d(i + 0, j + 2, k + 8, ivy, 8, 2); - world.func_147465_d(i + 0, j + 3, k + 6, ivy, 8, 2); - world.func_147465_d(i + 0, j + 3, k + 8, ivy, 8, 2); - world.func_147465_d(i + 0, j + 4, k + 6, ivy, 8, 2); - world.func_147465_d(i + 0, j + 4, k + 8, ivy, 8, 2); - world.func_147465_d(i + 0, j + 5, k + 6, ivy, 8, 2); - world.func_147465_d(i + 0, j + 5, k + 7, ivy, 8, 2); - world.func_147465_d(i + 0, j + 5, k + 8, ivy, 8, 2); - world.func_147465_d(i + 0, j + 6, k + 6, ivy, 8, 2); - world.func_147465_d(i + 0, j + 6, k + 7, ivy, 8, 2); - world.func_147465_d(i + 0, j + 6, k + 8, ivy, 8, 2); - world.func_147465_d(i + 0, j + 7, k + 6, ivy, 8, 2); - world.func_147465_d(i + 0, j + 7, k + 7, ivy, 8, 2); - world.func_147465_d(i + 0, j + 7, k + 8, ivy, 8, 2); - world.func_147465_d(i + 0, j + 8, k + 6, ivy, 8, 2); - world.func_147465_d(i + 0, j + 8, k + 7, ivy, 8, 2); - world.func_147465_d(i + 0, j + 8, k + 8, ivy, 8, 2); - world.func_147465_d(i + 0, j + 9, k + 6, ivy, 8, 2); - world.func_147465_d(i + 0, j + 9, k + 7, ivy, 8, 2); - world.func_147465_d(i + 0, j + 9, k + 8, ivy, 8, 2); - world.func_147465_d(i + 1, j + 10, k + 6, Blocks.tallgrass, 2, 2); - world.func_147465_d(i + 1, j + 10, k + 7, Blocks.tallgrass, 2, 2); - world.func_147465_d(i + 1, j + 10, k + 8, Blocks.tallgrass, 2, 2); - world.func_147465_d(i + 2, j + 2, k + 3, ivy, 8, 2); - world.func_147465_d(i + 2, j + 2, k + 11, ivy, 8, 2); - world.func_147465_d(i + 2, j + 3, k + 3, ivy, 8, 2); - world.func_147465_d(i + 2, j + 3, k + 11, ivy, 8, 2); - world.func_147465_d(i + 2, j + 4, k + 3, ivy, 8, 2); - world.func_147465_d(i + 2, j + 4, k + 11, ivy, 8, 2); - world.func_147465_d(i + 2, j + 5, k + 3, ivy, 8, 2); - world.func_147465_d(i + 2, j + 5, k + 11, ivy, 8, 2); - world.func_147465_d(i + 2, j + 6, k + 3, ivy, 8, 2); - world.func_147465_d(i + 2, j + 6, k + 11, ivy, 8, 2); - world.func_147465_d(i + 2, j + 7, k + 3, ivy, 8, 2); - world.func_147465_d(i + 2, j + 7, k + 11, ivy, 8, 2); - world.func_147465_d(i + 2, j + 8, k + 3, ivy, 8, 2); - world.func_147465_d(i + 2, j + 8, k + 11, ivy, 8, 2); - world.func_147465_d(i + 2, j + 9, k + 3, ivy, 8, 2); - world.func_147465_d(i + 2, j + 9, k + 11, ivy, 8, 2); - world.func_147449_b(i + 2, j + 10, k + 4, Blocks.red_flower); - world.func_147465_d(i + 2, j + 10, k + 5, Blocks.tallgrass, 2, 2); - world.func_147465_d(i + 2, j + 10, k + 6, Blocks.tallgrass, 2, 2); - world.func_147465_d(i + 2, j + 10, k + 7, Blocks.tallgrass, 2, 2); - world.func_147465_d(i + 2, j + 10, k + 8, Blocks.tallgrass, 2, 2); - world.func_147465_d(i + 2, j + 10, k + 9, Blocks.tallgrass, 2, 2); - world.func_147449_b(i + 2, j + 10, k + 10, Blocks.red_flower); - world.func_147465_d(i + 3, j + 5, k + 2, ivy, 1, 2); - world.func_147465_d(i + 3, j + 5, k + 12, ivy, 4, 2); - world.func_147465_d(i + 3, j + 6, k + 2, ivy, 1, 2); - world.func_147465_d(i + 3, j + 6, k + 12, ivy, 4, 2); - world.func_147465_d(i + 3, j + 7, k + 2, ivy, 1, 2); - world.func_147465_d(i + 3, j + 7, k + 12, ivy, 4, 2); - world.func_147465_d(i + 3, j + 8, k + 2, ivy, 1, 2); - world.func_147465_d(i + 3, j + 8, k + 12, ivy, 4, 2); - world.func_147465_d(i + 3, j + 9, k + 2, ivy, 1, 2); - world.func_147465_d(i + 3, j + 9, k + 12, ivy, 4, 2); - world.func_147449_b(i + 3, j + 10, k + 3, Blocks.yellow_flower); - world.func_147449_b(i + 3, j + 10, k + 11, Blocks.yellow_flower); - world.func_147449_b(i + 4, j + 10, k + 2, Blocks.red_flower); - world.func_147449_b(i + 4, j + 10, k + 12, Blocks.red_flower); - world.func_147465_d(i + 5, j + 10, k + 2, Blocks.tallgrass, 2, 2); - world.func_147465_d(i + 5, j + 10, k + 12, Blocks.tallgrass, 2, 2); - world.func_147465_d(i + 6, j + 0, k + 14, ivy, 4, 2); - world.func_147465_d(i + 6, j + 1, k + 14, ivy, 4, 2); - world.func_147465_d(i + 6, j + 2, k + 14, ivy, 4, 2); - world.func_147465_d(i + 6, j + 3, k + 0, ivy, 1, 2); - world.func_147465_d(i + 6, j + 3, k + 14, ivy, 4, 2); - world.func_147465_d(i + 6, j + 4, k + 0, ivy, 1, 2); - world.func_147465_d(i + 6, j + 4, k + 14, ivy, 4, 2); - world.func_147465_d(i + 6, j + 5, k + 0, ivy, 1, 2); - world.func_147465_d(i + 6, j + 5, k + 14, ivy, 4, 2); - world.func_147465_d(i + 6, j + 6, k + 0, ivy, 1, 2); - world.func_147465_d(i + 6, j + 6, k + 14, ivy, 4, 2); - world.func_147465_d(i + 6, j + 7, k + 0, ivy, 1, 2); - world.func_147465_d(i + 6, j + 7, k + 14, ivy, 4, 2); - world.func_147465_d(i + 6, j + 8, k + 0, ivy, 1, 2); - world.func_147465_d(i + 6, j + 8, k + 14, ivy, 4, 2); - world.func_147465_d(i + 6, j + 9, k + 0, ivy, 1, 2); - world.func_147465_d(i + 6, j + 9, k + 14, ivy, 4, 2); - world.func_147465_d(i + 6, j + 10, k + 1, Blocks.tallgrass, 2, 2); - world.func_147465_d(i + 6, j + 10, k + 2, Blocks.tallgrass, 2, 2); - world.func_147465_d(i + 6, j + 10, k + 12, Blocks.tallgrass, 2, 2); - world.func_147465_d(i + 6, j + 10, k + 13, Blocks.tallgrass, 2, 2); - world.func_147465_d(i + 7, j + 1, k + 0, ivy, 1, 2); - world.func_147465_d(i + 7, j + 1, k + 14, ivy, 4, 2); - world.func_147465_d(i + 7, j + 2, k + 0, ivy, 1, 2); - world.func_147465_d(i + 7, j + 2, k + 14, ivy, 4, 2); - world.func_147465_d(i + 7, j + 3, k + 0, ivy, 1, 2); - world.func_147465_d(i + 7, j + 3, k + 14, ivy, 4, 2); - world.func_147465_d(i + 7, j + 4, k + 0, ivy, 1, 2); - world.func_147465_d(i + 7, j + 4, k + 14, ivy, 4, 2); - world.func_147465_d(i + 7, j + 5, k + 0, ivy, 1, 2); - world.func_147465_d(i + 7, j + 5, k + 14, ivy, 4, 2); - world.func_147465_d(i + 7, j + 6, k + 0, ivy, 1, 2); - world.func_147465_d(i + 7, j + 6, k + 14, ivy, 4, 2); - world.func_147465_d(i + 7, j + 7, k + 0, ivy, 1, 2); - world.func_147465_d(i + 7, j + 7, k + 14, ivy, 4, 2); - world.func_147465_d(i + 7, j + 8, k + 0, ivy, 1, 2); - world.func_147465_d(i + 7, j + 8, k + 14, ivy, 4, 2); - world.func_147465_d(i + 7, j + 9, k + 0, ivy, 1, 2); - world.func_147465_d(i + 7, j + 9, k + 14, ivy, 4, 2); - world.func_147465_d(i + 7, j + 10, k + 1, Blocks.tallgrass, 2, 2); - world.func_147465_d(i + 7, j + 10, k + 2, Blocks.tallgrass, 2, 2); - world.func_147465_d(i + 7, j + 10, k + 12, Blocks.tallgrass, 2, 2); - world.func_147465_d(i + 7, j + 10, k + 13, Blocks.tallgrass, 2, 2); - world.func_147465_d(i + 8, j + 3, k + 14, ivy, 4, 2); - world.func_147465_d(i + 8, j + 4, k + 0, ivy, 1, 2); - world.func_147465_d(i + 8, j + 4, k + 14, ivy, 4, 2); - world.func_147465_d(i + 8, j + 5, k + 0, ivy, 1, 2); - world.func_147465_d(i + 8, j + 5, k + 14, ivy, 4, 2); - world.func_147465_d(i + 8, j + 6, k + 0, ivy, 1, 2); - world.func_147465_d(i + 8, j + 6, k + 14, ivy, 4, 2); - world.func_147465_d(i + 8, j + 7, k + 0, ivy, 1, 2); - world.func_147465_d(i + 8, j + 7, k + 14, ivy, 4, 2); - world.func_147465_d(i + 8, j + 8, k + 0, ivy, 1, 2); - world.func_147465_d(i + 8, j + 8, k + 14, ivy, 4, 2); - world.func_147465_d(i + 8, j + 9, k + 0, ivy, 1, 2); - world.func_147465_d(i + 8, j + 9, k + 14, ivy, 4, 2); - world.func_147465_d(i + 8, j + 10, k + 1, Blocks.tallgrass, 2, 2); - world.func_147465_d(i + 8, j + 10, k + 2, Blocks.tallgrass, 2, 2); - world.func_147465_d(i + 8, j + 10, k + 12, Blocks.tallgrass, 2, 2); - world.func_147465_d(i + 8, j + 10, k + 13, Blocks.tallgrass, 2, 2); - world.func_147465_d(i + 9, j + 10, k + 2, Blocks.tallgrass, 2, 2); - world.func_147465_d(i + 9, j + 10, k + 12, Blocks.tallgrass, 2, 2); - world.func_147449_b(i + 10, j + 10, k + 2, Blocks.red_flower); - world.func_147449_b(i + 10, j + 10, k + 12, Blocks.red_flower); - world.func_147465_d(i + 11, j + 5, k + 2, ivy, 1, 2); - world.func_147465_d(i + 11, j + 5, k + 12, ivy, 4, 2); - world.func_147465_d(i + 11, j + 6, k + 2, ivy, 1, 2); - world.func_147465_d(i + 11, j + 6, k + 12, ivy, 4, 2); - world.func_147465_d(i + 11, j + 7, k + 2, ivy, 1, 2); - world.func_147465_d(i + 11, j + 7, k + 12, ivy, 4, 2); - world.func_147465_d(i + 11, j + 8, k + 2, ivy, 1, 2); - world.func_147465_d(i + 11, j + 8, k + 12, ivy, 4, 2); - world.func_147465_d(i + 11, j + 9, k + 2, ivy, 1, 2); - world.func_147465_d(i + 11, j + 9, k + 12, ivy, 4, 2); - world.func_147449_b(i + 11, j + 10, k + 3, Blocks.yellow_flower); - world.func_147449_b(i + 11, j + 10, k + 11, Blocks.yellow_flower); - world.func_147465_d(i + 12, j + 2, k + 3, ivy, 2, 2); - world.func_147465_d(i + 12, j + 2, k + 11, ivy, 2, 2); - world.func_147465_d(i + 12, j + 3, k + 3, ivy, 2, 2); - world.func_147465_d(i + 12, j + 3, k + 11, ivy, 2, 2); - world.func_147465_d(i + 12, j + 4, k + 3, ivy, 2, 2); - world.func_147465_d(i + 12, j + 4, k + 11, ivy, 2, 2); - world.func_147465_d(i + 12, j + 5, k + 3, ivy, 2, 2); - world.func_147465_d(i + 12, j + 5, k + 11, ivy, 2, 2); - world.func_147465_d(i + 12, j + 6, k + 3, ivy, 2, 2); - world.func_147465_d(i + 12, j + 6, k + 11, ivy, 2, 2); - world.func_147465_d(i + 12, j + 7, k + 3, ivy, 2, 2); - world.func_147465_d(i + 12, j + 7, k + 11, ivy, 2, 2); - world.func_147465_d(i + 12, j + 8, k + 3, ivy, 2, 2); - world.func_147465_d(i + 12, j + 8, k + 11, ivy, 2, 2); - world.func_147465_d(i + 12, j + 9, k + 3, ivy, 2, 2); - world.func_147465_d(i + 12, j + 9, k + 11, ivy, 2, 2); - world.func_147449_b(i + 12, j + 10, k + 4, Blocks.red_flower); - world.func_147465_d(i + 12, j + 10, k + 5, Blocks.tallgrass, 2, 2); - world.func_147465_d(i + 12, j + 10, k + 6, Blocks.tallgrass, 2, 2); - world.func_147465_d(i + 12, j + 10, k + 7, Blocks.tallgrass, 2, 2); - world.func_147465_d(i + 12, j + 10, k + 8, Blocks.tallgrass, 2, 2); - world.func_147465_d(i + 12, j + 10, k + 9, Blocks.tallgrass, 2, 2); - world.func_147449_b(i + 12, j + 10, k + 10, Blocks.red_flower); - world.func_147465_d(i + 13, j + 10, k + 6, Blocks.tallgrass, 2, 2); - world.func_147465_d(i + 13, j + 10, k + 7, Blocks.tallgrass, 2, 2); - world.func_147465_d(i + 13, j + 10, k + 8, Blocks.tallgrass, 2, 2); - world.func_147465_d(i + 14, j + 0, k + 7, ivy, 2, 2); - world.func_147465_d(i + 14, j + 1, k + 7, ivy, 2, 2); - world.func_147465_d(i + 14, j + 2, k + 7, ivy, 2, 2); - world.func_147465_d(i + 14, j + 2, k + 8, ivy, 2, 2); - world.func_147465_d(i + 14, j + 3, k + 7, ivy, 2, 2); - world.func_147465_d(i + 14, j + 3, k + 8, ivy, 2, 2); - world.func_147465_d(i + 14, j + 4, k + 6, ivy, 2, 2); - world.func_147465_d(i + 14, j + 4, k + 7, ivy, 2, 2); - world.func_147465_d(i + 14, j + 4, k + 8, ivy, 2, 2); - world.func_147465_d(i + 14, j + 5, k + 6, ivy, 2, 2); - world.func_147465_d(i + 14, j + 5, k + 7, ivy, 2, 2); - world.func_147465_d(i + 14, j + 5, k + 8, ivy, 2, 2); - world.func_147465_d(i + 14, j + 6, k + 6, ivy, 2, 2); - world.func_147465_d(i + 14, j + 6, k + 7, ivy, 2, 2); - world.func_147465_d(i + 14, j + 6, k + 8, ivy, 2, 2); - world.func_147465_d(i + 14, j + 7, k + 6, ivy, 2, 2); - world.func_147465_d(i + 14, j + 7, k + 7, ivy, 2, 2); - world.func_147465_d(i + 14, j + 7, k + 8, ivy, 2, 2); - world.func_147465_d(i + 14, j + 8, k + 6, ivy, 2, 2); - world.func_147465_d(i + 14, j + 8, k + 7, ivy, 2, 2); - world.func_147465_d(i + 14, j + 8, k + 8, ivy, 2, 2); - world.func_147465_d(i + 14, j + 9, k + 6, ivy, 2, 2); - world.func_147465_d(i + 14, j + 9, k + 7, ivy, 2, 2); - world.func_147465_d(i + 14, j + 9, k + 8, ivy, 2, 2); + world.setBlock(i + 1, j + 6, k + 8, Blocks.dirt); + world.setBlock(i + 1, j + 7, k + 6, Blocks.dirt); + world.setBlock(i + 1, j + 7, k + 7, Blocks.dirt); + world.setBlock(i + 1, j + 7, k + 8, Blocks.dirt); + world.setBlock(i + 1, j + 8, k + 6, Blocks.dirt); + world.setBlock(i + 1, j + 8, k + 7, Blocks.dirt); + world.setBlock(i + 1, j + 8, k + 8, Blocks.dirt); + world.setBlock(i + 1, j + 9, k + 6, Blocks.grass); + world.setBlock(i + 1, j + 9, k + 7, Blocks.grass); + world.setBlock(i + 1, j + 9, k + 8, Blocks.grass); + world.setBlock(i + 2, j + 3, k + 10, Blocks.dirt); + world.setBlock(i + 2, j + 4, k + 5, Blocks.dirt); + world.setBlock(i + 2, j + 4, k + 10, Blocks.dirt); + world.setBlock(i + 2, j + 5, k + 5, Blocks.dirt); + world.setBlock(i + 2, j + 5, k + 10, Blocks.dirt); + world.setBlock(i + 2, j + 6, k + 5, Blocks.dirt); + world.setBlock(i + 2, j + 6, k + 7, Blocks.dirt); + world.setBlock(i + 2, j + 6, k + 10, Blocks.dirt); + world.setBlock(i + 2, j + 7, k + 4, Blocks.dirt); + world.setBlock(i + 2, j + 7, k + 5, Blocks.dirt); + world.setBlock(i + 2, j + 7, k + 6, Blocks.dirt); + world.setBlock(i + 2, j + 7, k + 7, Blocks.dirt); + world.setBlock(i + 2, j + 7, k + 8, Blocks.dirt); + world.setBlock(i + 2, j + 7, k + 9, Blocks.dirt); + world.setBlock(i + 2, j + 7, k + 10, Blocks.dirt); + world.setBlock(i + 2, j + 8, k + 4, Blocks.dirt); + world.setBlock(i + 2, j + 8, k + 5, Blocks.dirt); + world.setBlock(i + 2, j + 8, k + 6, Blocks.dirt); + world.setBlock(i + 2, j + 8, k + 7, Blocks.dirt); + world.setBlock(i + 2, j + 8, k + 8, Blocks.dirt); + world.setBlock(i + 2, j + 8, k + 9, Blocks.dirt); + world.setBlock(i + 2, j + 8, k + 10, Blocks.dirt); + world.setBlock(i + 2, j + 9, k + 4, Blocks.grass); + world.setBlock(i + 2, j + 9, k + 5, Blocks.grass); + world.setBlock(i + 2, j + 9, k + 6, Blocks.grass); + world.setBlock(i + 2, j + 9, k + 7, Blocks.grass); + world.setBlock(i + 2, j + 9, k + 8, Blocks.grass); + world.setBlock(i + 2, j + 9, k + 9, Blocks.grass); + world.setBlock(i + 2, j + 9, k + 10, Blocks.grass); + world.setBlock(i + 3, j + 3, k + 7, Blocks.dirt); + world.setBlock(i + 3, j + 4, k + 7, Blocks.dirt); + world.setBlock(i + 3, j + 5, k + 7, Blocks.dirt); + world.setBlock(i + 3, j + 6, k + 3, Blocks.dirt); + world.setBlock(i + 3, j + 6, k + 5, Blocks.dirt); + world.setBlock(i + 3, j + 6, k + 6, Blocks.dirt); + world.setBlock(i + 3, j + 6, k + 7, Blocks.dirt); + world.setBlock(i + 3, j + 6, k + 8, Blocks.dirt); + world.setBlock(i + 3, j + 6, k + 9, Blocks.dirt); + world.setBlock(i + 3, j + 7, k + 3, Blocks.dirt); + world.setBlock(i + 3, j + 7, k + 4, Blocks.dirt); + world.setBlock(i + 3, j + 7, k + 5, Blocks.dirt); + world.setBlock(i + 3, j + 7, k + 6, Blocks.dirt); + world.setBlock(i + 3, j + 7, k + 7, Blocks.dirt); + world.setBlock(i + 3, j + 7, k + 8, Blocks.dirt); + world.setBlock(i + 3, j + 7, k + 9, Blocks.dirt); + world.setBlock(i + 3, j + 7, k + 10, Blocks.dirt); + world.setBlock(i + 3, j + 7, k + 11, Blocks.dirt); + world.setBlock(i + 3, j + 8, k + 3, Blocks.dirt); + world.setBlock(i + 3, j + 8, k + 4, Blocks.dirt); + world.setBlock(i + 3, j + 8, k + 5, Blocks.dirt); + world.setBlock(i + 3, j + 8, k + 6, Blocks.dirt); + world.setBlock(i + 3, j + 8, k + 7, Blocks.dirt); + world.setBlock(i + 3, j + 8, k + 8, Blocks.dirt); + world.setBlock(i + 3, j + 8, k + 9, Blocks.dirt); + world.setBlock(i + 3, j + 8, k + 10, Blocks.dirt); + world.setBlock(i + 3, j + 8, k + 11, Blocks.dirt); + world.setBlock(i + 3, j + 9, k + 3, Blocks.grass); + world.setBlock(i + 3, j + 9, k + 4, Blocks.dirt); + world.setBlock(i + 3, j + 9, k + 5, Blocks.grass); + world.setBlock(i + 3, j + 9, k + 6, Blocks.grass); + world.setBlock(i + 3, j + 9, k + 7, Blocks.grass); + world.setBlock(i + 3, j + 9, k + 8, Blocks.grass); + world.setBlock(i + 3, j + 9, k + 9, Blocks.grass); + world.setBlock(i + 3, j + 9, k + 10, Blocks.dirt); + world.setBlock(i + 3, j + 9, k + 11, Blocks.grass); + world.setBlock(i + 3, j + 10, k + 4, Blocks.log); + world.setBlock(i + 3, j + 10, k + 5, Blocks.stone_slab, 7, 2); + world.setBlock(i + 3, j + 10, k + 6, Blocks.stone_slab, 7, 2); + world.setBlock(i + 3, j + 10, k + 7, Blocks.stone_slab, 7, 2); + world.setBlock(i + 3, j + 10, k + 8, Blocks.stone_slab, 7, 2); + world.setBlock(i + 3, j + 10, k + 9, Blocks.stone_slab, 7, 2); + world.setBlock(i + 3, j + 10, k + 10, Blocks.log); + world.setBlock(i + 3, j + 11, k + 4, Blocks.leaves, 4, 2); + world.setBlock(i + 3, j + 11, k + 10, Blocks.leaves, 4, 2); + world.setBlock(i + 3, j + 12, k + 4, Blocks.leaves, 4, 2); + world.setBlock(i + 3, j + 12, k + 10, Blocks.leaves, 4, 2); + world.setBlock(i + 3, j + 14, k + 4, Blocks.quartz_stairs, 2, 2); + world.setBlock(i + 3, j + 14, k + 5, Blocks.quartz_stairs); + world.setBlock(i + 3, j + 14, k + 6, Blocks.quartz_stairs); + world.setBlock(i + 3, j + 14, k + 7, Blocks.quartz_stairs); + world.setBlock(i + 3, j + 14, k + 8, Blocks.quartz_stairs); + world.setBlock(i + 3, j + 14, k + 9, Blocks.quartz_stairs); + world.setBlock(i + 3, j + 14, k + 10, Blocks.quartz_stairs, 3, 2); + world.setBlock(i + 4, j + 5, k + 2, Blocks.dirt); + world.setBlock(i + 4, j + 5, k + 6, Blocks.dirt); + world.setBlock(i + 4, j + 5, k + 7, Blocks.dirt); + world.setBlock(i + 4, j + 5, k + 8, Blocks.dirt); + world.setBlock(i + 4, j + 6, k + 2, Blocks.dirt); + world.setBlock(i + 4, j + 6, k + 4, Blocks.dirt); + world.setBlock(i + 4, j + 6, k + 5, Blocks.dirt); + world.setBlock(i + 4, j + 6, k + 6, Blocks.dirt); + world.setBlock(i + 4, j + 6, k + 7, Blocks.dirt); + world.setBlock(i + 4, j + 6, k + 8, Blocks.dirt); + world.setBlock(i + 4, j + 6, k + 9, Blocks.dirt); + world.setBlock(i + 4, j + 6, k + 10, Blocks.dirt); + world.setBlock(i + 4, j + 6, k + 12, Blocks.dirt); + world.setBlock(i + 4, j + 7, k + 2, Blocks.dirt); + world.setBlock(i + 4, j + 7, k + 3, Blocks.dirt); + world.setBlock(i + 4, j + 7, k + 4, Blocks.dirt); + world.setBlock(i + 4, j + 7, k + 5, Blocks.dirt); + world.setBlock(i + 4, j + 7, k + 6, Blocks.dirt); + world.setBlock(i + 4, j + 7, k + 7, Blocks.dirt); + world.setBlock(i + 4, j + 7, k + 8, Blocks.dirt); + world.setBlock(i + 4, j + 7, k + 9, Blocks.dirt); + world.setBlock(i + 4, j + 7, k + 10, Blocks.dirt); + world.setBlock(i + 4, j + 7, k + 11, Blocks.dirt); + world.setBlock(i + 4, j + 7, k + 12, Blocks.dirt); + world.setBlock(i + 4, j + 8, k + 2, Blocks.dirt); + world.setBlock(i + 4, j + 8, k + 3, Blocks.dirt); + world.setBlock(i + 4, j + 8, k + 4, Blocks.dirt); + world.setBlock(i + 4, j + 8, k + 5, Blocks.dirt); + world.setBlock(i + 4, j + 8, k + 6, Blocks.dirt); + world.setBlock(i + 4, j + 8, k + 7, Blocks.dirt); + world.setBlock(i + 4, j + 8, k + 8, Blocks.dirt); + world.setBlock(i + 4, j + 8, k + 9, Blocks.dirt); + world.setBlock(i + 4, j + 8, k + 10, Blocks.dirt); + world.setBlock(i + 4, j + 8, k + 11, Blocks.dirt); + world.setBlock(i + 4, j + 8, k + 12, Blocks.dirt); + world.setBlock(i + 4, j + 9, k + 2, Blocks.grass); + world.setBlock(i + 4, j + 9, k + 3, Blocks.dirt); + world.setBlock(i + 4, j + 9, k + 4, Blocks.grass); + world.setBlock(i + 4, j + 9, k + 5, Blocks.dirt); + world.setBlock(i + 4, j + 9, k + 6, Blocks.dirt); + world.setBlock(i + 4, j + 9, k + 7, Blocks.dirt); + world.setBlock(i + 4, j + 9, k + 8, Blocks.dirt); + world.setBlock(i + 4, j + 9, k + 9, Blocks.dirt); + world.setBlock(i + 4, j + 9, k + 10, Blocks.grass); + world.setBlock(i + 4, j + 9, k + 11, Blocks.dirt); + world.setBlock(i + 4, j + 9, k + 12, Blocks.grass); + world.setBlock(i + 4, j + 10, k + 3, Blocks.log); + world.setBlock(i + 4, j + 10, k + 4, Blocks.stone_slab, 7, 2); + world.setBlock(i + 4, j + 10, k + 5, Blocks.quartz_block, 2, 2); + world.setBlock(i + 4, j + 10, k + 6, Blocks.quartz_block); + world.setBlock(i + 4, j + 10, k + 7, Blocks.quartz_block); + world.setBlock(i + 4, j + 10, k + 8, Blocks.quartz_block); + world.setBlock(i + 4, j + 10, k + 9, Blocks.quartz_block, 2, 2); + world.setBlock(i + 4, j + 10, k + 10, Blocks.stone_slab, 7, 2); + world.setBlock(i + 4, j + 10, k + 11, Blocks.log); + world.setBlock(i + 4, j + 11, k + 3, Blocks.leaves, 4, 2); + world.setBlock(i + 4, j + 11, k + 5, Blocks.quartz_block, 2, 2); + world.setBlock(i + 4, j + 11, k + 9, Blocks.quartz_block, 2, 2); + world.setBlock(i + 4, j + 11, k + 11, Blocks.leaves, 4, 2); + world.setBlock(i + 4, j + 12, k + 3, Blocks.leaves, 4, 2); + world.setBlock(i + 4, j + 12, k + 5, Blocks.quartz_block, 2, 2); + world.setBlock(i + 4, j + 12, k + 9, Blocks.quartz_block, 2, 2); + world.setBlock(i + 4, j + 12, k + 11, Blocks.leaves, 4, 2); + world.setBlock(i + 4, j + 13, k + 5, Blocks.quartz_block, 2, 2); + world.setBlock(i + 4, j + 13, k + 9, Blocks.quartz_block, 2, 2); + world.setBlock(i + 4, j + 14, k + 3, Blocks.quartz_stairs); + world.setBlock(i + 4, j + 14, k + 4, Blocks.quartz_stairs); + world.setBlock(i + 4, j + 14, k + 5, Blocks.quartz_block); + world.setBlock(i + 4, j + 14, k + 6, Blocks.quartz_block); + world.setBlock(i + 4, j + 14, k + 7, Blocks.quartz_block); + world.setBlock(i + 4, j + 14, k + 8, Blocks.quartz_block); + world.setBlock(i + 4, j + 14, k + 9, Blocks.quartz_block); + world.setBlock(i + 4, j + 14, k + 10, Blocks.quartz_stairs, 3, 2); + world.setBlock(i + 4, j + 14, k + 11, Blocks.quartz_stairs); + world.setBlock(i + 4, j + 15, k + 5, Blocks.quartz_stairs); + world.setBlock(i + 4, j + 15, k + 6, Blocks.quartz_stairs); + world.setBlock(i + 4, j + 15, k + 7, Blocks.quartz_stairs); + world.setBlock(i + 4, j + 15, k + 8, Blocks.quartz_stairs); + world.setBlock(i + 4, j + 15, k + 9, Blocks.quartz_stairs); + world.setBlock(i + 5, j + 2, k + 9, Blocks.dirt); + world.setBlock(i + 5, j + 3, k + 9, Blocks.dirt); + world.setBlock(i + 5, j + 4, k + 4, Blocks.dirt); + world.setBlock(i + 5, j + 4, k + 7, Blocks.dirt); + world.setBlock(i + 5, j + 4, k + 9, Blocks.dirt); + world.setBlock(i + 5, j + 4, k + 11, Blocks.dirt); + world.setBlock(i + 5, j + 5, k + 4, Blocks.dirt); + world.setBlock(i + 5, j + 5, k + 5, Blocks.dirt); + world.setBlock(i + 5, j + 5, k + 6, Blocks.dirt); + world.setBlock(i + 5, j + 5, k + 7, Blocks.dirt); + world.setBlock(i + 5, j + 5, k + 8, Blocks.dirt); + world.setBlock(i + 5, j + 5, k + 9, Blocks.dirt); + world.setBlock(i + 5, j + 5, k + 11, Blocks.dirt); + world.setBlock(i + 5, j + 6, k + 3, Blocks.dirt); + world.setBlock(i + 5, j + 6, k + 4, Blocks.dirt); + world.setBlock(i + 5, j + 6, k + 5, Blocks.dirt); + world.setBlock(i + 5, j + 6, k + 6, Blocks.dirt); + world.setBlock(i + 5, j + 6, k + 7, Blocks.dirt); + world.setBlock(i + 5, j + 6, k + 8, Blocks.dirt); + world.setBlock(i + 5, j + 6, k + 9, Blocks.dirt); + world.setBlock(i + 5, j + 6, k + 10, Blocks.dirt); + world.setBlock(i + 5, j + 6, k + 11, Blocks.dirt); + world.setBlock(i + 5, j + 7, k + 2, Blocks.dirt); + world.setBlock(i + 5, j + 7, k + 3, Blocks.dirt); + world.setBlock(i + 5, j + 7, k + 4, Blocks.dirt); + world.setBlock(i + 5, j + 7, k + 5, Blocks.dirt); + world.setBlock(i + 5, j + 7, k + 6, Blocks.dirt); + world.setBlock(i + 5, j + 7, k + 7, Blocks.dirt); + world.setBlock(i + 5, j + 7, k + 8, Blocks.dirt); + world.setBlock(i + 5, j + 7, k + 9, Blocks.dirt); + world.setBlock(i + 5, j + 7, k + 10, Blocks.dirt); + world.setBlock(i + 5, j + 7, k + 11, Blocks.dirt); + world.setBlock(i + 5, j + 7, k + 12, Blocks.dirt); + world.setBlock(i + 5, j + 8, k + 2, Blocks.dirt); + world.setBlock(i + 5, j + 8, k + 3, Blocks.dirt); + world.setBlock(i + 5, j + 8, k + 4, Blocks.dirt); + world.setBlock(i + 5, j + 8, k + 5, Blocks.dirt); + world.setBlock(i + 5, j + 8, k + 6, Blocks.quartz_block); + world.setBlock(i + 5, j + 8, k + 7, Blocks.quartz_block); + world.setBlock(i + 5, j + 8, k + 8, Blocks.quartz_block); + world.setBlock(i + 5, j + 8, k + 9, Blocks.dirt); + world.setBlock(i + 5, j + 8, k + 10, Blocks.dirt); + world.setBlock(i + 5, j + 8, k + 11, Blocks.dirt); + world.setBlock(i + 5, j + 8, k + 12, Blocks.dirt); + world.setBlock(i + 5, j + 9, k + 2, Blocks.grass); + world.setBlock(i + 5, j + 9, k + 3, Blocks.grass); + world.setBlock(i + 5, j + 9, k + 4, Blocks.dirt); + world.setBlock(i + 5, j + 9, k + 5, Blocks.dirt); + world.setBlock(i + 5, j + 9, k + 6, Blocks.quartz_block); + world.setBlock(i + 5, j + 9, k + 7, Blocks.quartz_block); + world.setBlock(i + 5, j + 9, k + 8, Blocks.quartz_block); + world.setBlock(i + 5, j + 9, k + 9, Blocks.dirt); + world.setBlock(i + 5, j + 9, k + 10, Blocks.dirt); + world.setBlock(i + 5, j + 9, k + 11, Blocks.grass); + world.setBlock(i + 5, j + 9, k + 12, Blocks.grass); + world.setBlock(i + 5, j + 10, k + 3, Blocks.stone_slab, 7, 2); + world.setBlock(i + 5, j + 10, k + 4, Blocks.quartz_block, 2, 2); + world.setBlock(i + 5, j + 10, k + 5, Blocks.quartz_block); + world.setBlock(i + 5, j + 10, k + 6, Blocks.quartz_stairs, 1, 2); + world.setBlock(i + 5, j + 10, k + 7, Blocks.quartz_stairs, 1, 2); + world.setBlock(i + 5, j + 10, k + 8, Blocks.quartz_stairs, 1, 2); + world.setBlock(i + 5, j + 10, k + 9, Blocks.quartz_block); + world.setBlock(i + 5, j + 10, k + 10, Blocks.quartz_block, 2, 2); + world.setBlock(i + 5, j + 10, k + 11, Blocks.stone_slab, 7, 2); + world.setBlock(i + 5, j + 11, k + 4, Blocks.quartz_block, 2, 2); + world.setBlock(i + 5, j + 11, k + 10, Blocks.quartz_block, 2, 2); + world.setBlock(i + 5, j + 12, k + 4, Blocks.quartz_block, 2, 2); + world.setBlock(i + 5, j + 12, k + 10, Blocks.quartz_block, 2, 2); + world.setBlock(i + 5, j + 13, k + 4, Blocks.quartz_block, 2, 2); + world.setBlock(i + 5, j + 13, k + 10, Blocks.quartz_block, 2, 2); + world.setBlock(i + 5, j + 14, k + 3, Blocks.quartz_stairs, 2, 2); + world.setBlock(i + 5, j + 14, k + 4, Blocks.quartz_block); + world.setBlock(i + 5, j + 14, k + 10, Blocks.quartz_block); + world.setBlock(i + 5, j + 14, k + 11, Blocks.quartz_stairs, 3, 2); + world.setBlock(i + 5, j + 15, k + 4, Blocks.quartz_stairs, 2, 2); + world.setBlock(i + 5, j + 15, k + 5, Blocks.quartz_block); + world.setBlock(i + 5, j + 15, k + 6, Blocks.quartz_block); + world.setBlock(i + 5, j + 15, k + 7, Blocks.quartz_block); + world.setBlock(i + 5, j + 15, k + 8, Blocks.quartz_block); + world.setBlock(i + 5, j + 15, k + 9, Blocks.quartz_block); + world.setBlock(i + 5, j + 15, k + 10, Blocks.quartz_stairs, 3, 2); + world.setBlock(i + 5, j + 16, k + 5, Blocks.quartz_block); + world.setBlock(i + 5, j + 16, k + 6, Blocks.quartz_block); + world.setBlock(i + 5, j + 16, k + 7, Blocks.quartz_block); + world.setBlock(i + 5, j + 16, k + 8, Blocks.quartz_block); + world.setBlock(i + 5, j + 16, k + 9, Blocks.quartz_block); + world.setBlock(i + 5, j + 17, k + 5, Blocks.quartz_stairs, 2, 2); + world.setBlock(i + 5, j + 17, k + 6, Blocks.quartz_stairs); + world.setBlock(i + 5, j + 17, k + 7, Blocks.quartz_stairs); + world.setBlock(i + 5, j + 17, k + 8, Blocks.quartz_stairs); + world.setBlock(i + 5, j + 17, k + 9, Blocks.quartz_stairs); + world.setBlock(i + 6, j + 3, k + 7, Blocks.dirt); + world.setBlock(i + 6, j + 4, k + 2, Blocks.dirt); + world.setBlock(i + 6, j + 4, k + 6, Blocks.dirt); + world.setBlock(i + 6, j + 4, k + 7, Blocks.dirt); + world.setBlock(i + 6, j + 4, k + 8, Blocks.dirt); + world.setBlock(i + 6, j + 5, k + 2, Blocks.dirt); + world.setBlock(i + 6, j + 5, k + 4, Blocks.dirt); + world.setBlock(i + 6, j + 5, k + 5, Blocks.dirt); + world.setBlock(i + 6, j + 5, k + 6, Blocks.dirt); + world.setBlock(i + 6, j + 5, k + 7, Blocks.dirt); + world.setBlock(i + 6, j + 5, k + 8, Blocks.dirt); + world.setBlock(i + 6, j + 5, k + 9, Blocks.dirt); + world.setBlock(i + 6, j + 5, k + 10, Blocks.dirt); + world.setBlock(i + 6, j + 5, k + 13, Blocks.dirt); + world.setBlock(i + 6, j + 6, k + 2, Blocks.dirt); + world.setBlock(i + 6, j + 6, k + 3, Blocks.dirt); + world.setBlock(i + 6, j + 6, k + 4, Blocks.dirt); + world.setBlock(i + 6, j + 6, k + 5, Blocks.dirt); + world.setBlock(i + 6, j + 6, k + 6, Blocks.dirt); + world.setBlock(i + 6, j + 6, k + 7, Blocks.dirt); + world.setBlock(i + 6, j + 6, k + 8, Blocks.dirt); + world.setBlock(i + 6, j + 6, k + 9, Blocks.dirt); + world.setBlock(i + 6, j + 6, k + 10, Blocks.dirt); + world.setBlock(i + 6, j + 6, k + 11, Blocks.dirt); + world.setBlock(i + 6, j + 6, k + 13, Blocks.dirt); + world.setBlock(i + 6, j + 7, k + 1, Blocks.dirt); + world.setBlock(i + 6, j + 7, k + 2, Blocks.dirt); + world.setBlock(i + 6, j + 7, k + 3, Blocks.dirt); + world.setBlock(i + 6, j + 7, k + 4, Blocks.dirt); + world.setBlock(i + 6, j + 7, k + 5, Blocks.dirt); + world.setBlock(i + 6, j + 7, k + 6, Blocks.quartz_block); + world.setBlock(i + 6, j + 7, k + 7, Blocks.quartz_block); + world.setBlock(i + 6, j + 7, k + 8, Blocks.quartz_block); + world.setBlock(i + 6, j + 7, k + 9, Blocks.dirt); + world.setBlock(i + 6, j + 7, k + 10, Blocks.dirt); + world.setBlock(i + 6, j + 7, k + 11, Blocks.dirt); + world.setBlock(i + 6, j + 7, k + 12, Blocks.dirt); + world.setBlock(i + 6, j + 7, k + 13, Blocks.dirt); + world.setBlock(i + 6, j + 8, k + 1, Blocks.dirt); + world.setBlock(i + 6, j + 8, k + 2, Blocks.dirt); + world.setBlock(i + 6, j + 8, k + 3, Blocks.dirt); + world.setBlock(i + 6, j + 8, k + 4, Blocks.dirt); + world.setBlock(i + 6, j + 8, k + 5, Blocks.quartz_block); + world.setBlock(i + 6, j + 8, k + 6, portal); + world.setBlock(i + 6, j + 8, k + 7, portal); + world.setBlock(i + 6, j + 8, k + 8, portal); + world.setBlock(i + 6, j + 8, k + 9, Blocks.quartz_block); + world.setBlock(i + 6, j + 8, k + 10, Blocks.dirt); + world.setBlock(i + 6, j + 8, k + 11, Blocks.dirt); + world.setBlock(i + 6, j + 8, k + 12, Blocks.dirt); + world.setBlock(i + 6, j + 8, k + 13, Blocks.dirt); + world.setBlock(i + 6, j + 9, k + 1, Blocks.grass); + world.setBlock(i + 6, j + 9, k + 2, Blocks.grass); + world.setBlock(i + 6, j + 9, k + 3, Blocks.grass); + world.setBlock(i + 6, j + 9, k + 4, Blocks.dirt); + world.setBlock(i + 6, j + 9, k + 5, Blocks.quartz_block); + world.setBlock(i + 6, j + 9, k + 9, Blocks.quartz_block); + world.setBlock(i + 6, j + 9, k + 10, Blocks.dirt); + world.setBlock(i + 6, j + 9, k + 11, Blocks.grass); + world.setBlock(i + 6, j + 9, k + 12, Blocks.grass); + world.setBlock(i + 6, j + 9, k + 13, Blocks.grass); + world.setBlock(i + 6, j + 10, k + 3, Blocks.stone_slab, 7, 2); + world.setBlock(i + 6, j + 10, k + 4, Blocks.quartz_block); + world.setBlock(i + 6, j + 10, k + 5, Blocks.quartz_stairs, 3, 2); + world.setBlock(i + 6, j + 10, k + 9, Blocks.quartz_stairs, 2, 2); + world.setBlock(i + 6, j + 10, k + 10, Blocks.quartz_block); + world.setBlock(i + 6, j + 10, k + 11, Blocks.stone_slab, 7, 2); + world.setBlock(i + 6, j + 14, k + 3, Blocks.quartz_stairs, 2, 2); + world.setBlock(i + 6, j + 14, k + 4, Blocks.quartz_block); + world.setBlock(i + 6, j + 14, k + 10, Blocks.quartz_block); + world.setBlock(i + 6, j + 14, k + 11, Blocks.quartz_stairs, 3, 2); + world.setBlock(i + 6, j + 15, k + 4, Blocks.quartz_stairs, 2, 2); + world.setBlock(i + 6, j + 15, k + 5, Blocks.quartz_block); + world.setBlock(i + 6, j + 15, k + 9, Blocks.quartz_block); + world.setBlock(i + 6, j + 15, k + 10, Blocks.quartz_stairs, 3, 2); + world.setBlock(i + 6, j + 16, k + 5, Blocks.quartz_block); + world.setBlock(i + 6, j + 16, k + 9, Blocks.quartz_block); + world.setBlock(i + 6, j + 17, k + 5, Blocks.quartz_stairs, 2, 2); + world.setBlock(i + 6, j + 17, k + 6, Blocks.quartz_block); + world.setBlock(i + 6, j + 17, k + 7, Blocks.quartz_block); + world.setBlock(i + 6, j + 17, k + 8, Blocks.quartz_block); + world.setBlock(i + 6, j + 17, k + 9, Blocks.quartz_stairs, 3, 2); + world.setBlock(i + 6, j + 18, k + 6, Blocks.quartz_block); + world.setBlock(i + 6, j + 18, k + 7, Blocks.quartz_block); + world.setBlock(i + 6, j + 18, k + 8, Blocks.quartz_block); + world.setBlock(i + 6, j + 19, k + 6, Blocks.quartz_block); + world.setBlock(i + 6, j + 19, k + 7, Blocks.quartz_block); + world.setBlock(i + 6, j + 19, k + 8, Blocks.quartz_block); + world.setBlock(i + 6, j + 20, k + 6, Blocks.quartz_stairs); + world.setBlock(i + 6, j + 20, k + 7, Blocks.quartz_stairs); + world.setBlock(i + 6, j + 20, k + 8, Blocks.quartz_stairs, 3, 2); + world.setBlock(i + 7, j + 1, k + 7, Blocks.dirt); + world.setBlock(i + 7, j + 2, k + 7, Blocks.dirt); + world.setBlock(i + 7, j + 3, k + 6, Blocks.dirt); + world.setBlock(i + 7, j + 3, k + 7, Blocks.dirt); + world.setBlock(i + 7, j + 3, k + 8, Blocks.dirt); + world.setBlock(i + 7, j + 3, k + 10, Blocks.dirt); + world.setBlock(i + 7, j + 4, k + 5, Blocks.dirt); + world.setBlock(i + 7, j + 4, k + 6, Blocks.dirt); + world.setBlock(i + 7, j + 4, k + 7, Blocks.dirt); + world.setBlock(i + 7, j + 4, k + 8, Blocks.dirt); + world.setBlock(i + 7, j + 4, k + 9, Blocks.dirt); + world.setBlock(i + 7, j + 4, k + 10, Blocks.dirt); + world.setBlock(i + 7, j + 5, k + 4, Blocks.dirt); + world.setBlock(i + 7, j + 5, k + 5, Blocks.dirt); + world.setBlock(i + 7, j + 5, k + 6, Blocks.dirt); + world.setBlock(i + 7, j + 5, k + 7, Blocks.dirt); + world.setBlock(i + 7, j + 5, k + 8, Blocks.dirt); + world.setBlock(i + 7, j + 5, k + 9, Blocks.dirt); + world.setBlock(i + 7, j + 5, k + 10, Blocks.dirt); + world.setBlock(i + 7, j + 6, k + 2, Blocks.dirt); + world.setBlock(i + 7, j + 6, k + 3, Blocks.dirt); + world.setBlock(i + 7, j + 6, k + 4, Blocks.dirt); + world.setBlock(i + 7, j + 6, k + 5, Blocks.dirt); + world.setBlock(i + 7, j + 6, k + 6, Blocks.dirt); + world.setBlock(i + 7, j + 6, k + 7, Blocks.dirt); + world.setBlock(i + 7, j + 6, k + 8, Blocks.dirt); + world.setBlock(i + 7, j + 6, k + 9, Blocks.dirt); + world.setBlock(i + 7, j + 6, k + 10, Blocks.dirt); + world.setBlock(i + 7, j + 6, k + 11, Blocks.dirt); + world.setBlock(i + 7, j + 6, k + 12, Blocks.dirt); + world.setBlock(i + 7, j + 7, k + 1, Blocks.dirt); + world.setBlock(i + 7, j + 7, k + 2, Blocks.dirt); + world.setBlock(i + 7, j + 7, k + 3, Blocks.dirt); + world.setBlock(i + 7, j + 7, k + 4, Blocks.dirt); + world.setBlock(i + 7, j + 7, k + 5, Blocks.dirt); + world.setBlock(i + 7, j + 7, k + 6, Blocks.quartz_block); + world.setBlock(i + 7, j + 7, k + 7, Blocks.quartz_block); + world.setBlock(i + 7, j + 7, k + 8, Blocks.quartz_block); + world.setBlock(i + 7, j + 7, k + 9, Blocks.dirt); + world.setBlock(i + 7, j + 7, k + 10, Blocks.dirt); + world.setBlock(i + 7, j + 7, k + 11, Blocks.dirt); + world.setBlock(i + 7, j + 7, k + 12, Blocks.dirt); + world.setBlock(i + 7, j + 7, k + 13, Blocks.dirt); + world.setBlock(i + 7, j + 8, k + 1, Blocks.dirt); + world.setBlock(i + 7, j + 8, k + 2, Blocks.dirt); + world.setBlock(i + 7, j + 8, k + 3, Blocks.dirt); + world.setBlock(i + 7, j + 8, k + 4, Blocks.dirt); + world.setBlock(i + 7, j + 8, k + 5, Blocks.quartz_block); + world.setBlock(i + 7, j + 8, k + 6, portal); + world.setBlock(i + 7, j + 8, k + 7, portal); + world.setBlock(i + 7, j + 8, k + 8, portal); + world.setBlock(i + 7, j + 8, k + 9, Blocks.quartz_block); + world.setBlock(i + 7, j + 8, k + 10, Blocks.dirt); + world.setBlock(i + 7, j + 8, k + 11, Blocks.dirt); + world.setBlock(i + 7, j + 8, k + 12, Blocks.dirt); + world.setBlock(i + 7, j + 8, k + 13, Blocks.dirt); + world.setBlock(i + 7, j + 9, k + 1, Blocks.grass); + world.setBlock(i + 7, j + 9, k + 2, Blocks.grass); + world.setBlock(i + 7, j + 9, k + 3, Blocks.grass); + world.setBlock(i + 7, j + 9, k + 4, Blocks.dirt); + world.setBlock(i + 7, j + 9, k + 5, Blocks.quartz_block); + world.setBlock(i + 7, j + 9, k + 9, Blocks.quartz_block); + world.setBlock(i + 7, j + 9, k + 10, Blocks.dirt); + world.setBlock(i + 7, j + 9, k + 11, Blocks.grass); + world.setBlock(i + 7, j + 9, k + 12, Blocks.grass); + world.setBlock(i + 7, j + 9, k + 13, Blocks.grass); + world.setBlock(i + 7, j + 10, k + 3, Blocks.stone_slab, 7, 2); + world.setBlock(i + 7, j + 10, k + 4, Blocks.quartz_block); + world.setBlock(i + 7, j + 10, k + 5, Blocks.quartz_stairs, 3, 2); + world.setBlock(i + 7, j + 10, k + 9, Blocks.quartz_stairs, 2, 2); + world.setBlock(i + 7, j + 10, k + 10, Blocks.quartz_block); + world.setBlock(i + 7, j + 10, k + 11, Blocks.stone_slab, 7, 2); + world.setBlock(i + 7, j + 14, k + 3, Blocks.quartz_stairs, 2, 2); + world.setBlock(i + 7, j + 14, k + 4, Blocks.quartz_block); + world.setBlock(i + 7, j + 14, k + 10, Blocks.quartz_block); + world.setBlock(i + 7, j + 14, k + 11, Blocks.quartz_stairs, 3, 2); + world.setBlock(i + 7, j + 15, k + 4, Blocks.quartz_stairs, 2, 2); + world.setBlock(i + 7, j + 15, k + 5, Blocks.quartz_block); + world.setBlock(i + 7, j + 15, k + 9, Blocks.quartz_block); + world.setBlock(i + 7, j + 15, k + 10, Blocks.quartz_stairs, 3, 2); + world.setBlock(i + 7, j + 16, k + 5, Blocks.quartz_block); + world.setBlock(i + 7, j + 16, k + 9, Blocks.quartz_block); + world.setBlock(i + 7, j + 17, k + 5, Blocks.quartz_stairs, 2, 2); + world.setBlock(i + 7, j + 17, k + 6, Blocks.quartz_block); + world.setBlock(i + 7, j + 17, k + 8, Blocks.quartz_block); + world.setBlock(i + 7, j + 17, k + 9, Blocks.quartz_stairs, 3, 2); + world.setBlock(i + 7, j + 18, k + 6, Blocks.quartz_block); + world.setBlock(i + 7, j + 18, k + 8, Blocks.quartz_block); + world.setBlock(i + 7, j + 19, k + 6, Blocks.quartz_block); + world.setBlock(i + 7, j + 19, k + 8, Blocks.quartz_block); + world.setBlock(i + 7, j + 20, k + 6, Blocks.quartz_stairs, 2, 2); + world.setBlock(i + 7, j + 20, k + 7, Blocks.quartz_block); + world.setBlock(i + 7, j + 20, k + 8, Blocks.quartz_stairs, 3, 2); + world.setBlock(i + 7, j + 21, k + 7, Blocks.quartz_block); + world.setBlock(i + 7, j + 22, k + 7, Blocks.quartz_block); + world.setBlock(i + 7, j + 23, k + 7, Blocks.quartz_block); + world.setBlock(i + 8, j + 3, k + 4, Blocks.dirt); + world.setBlock(i + 8, j + 3, k + 7, Blocks.dirt); + world.setBlock(i + 8, j + 4, k + 4, Blocks.dirt); + world.setBlock(i + 8, j + 4, k + 6, Blocks.dirt); + world.setBlock(i + 8, j + 4, k + 7, Blocks.dirt); + world.setBlock(i + 8, j + 4, k + 8, Blocks.dirt); + world.setBlock(i + 8, j + 5, k + 1, Blocks.dirt); + world.setBlock(i + 8, j + 5, k + 4, Blocks.dirt); + world.setBlock(i + 8, j + 5, k + 5, Blocks.dirt); + world.setBlock(i + 8, j + 5, k + 6, Blocks.dirt); + world.setBlock(i + 8, j + 5, k + 7, Blocks.dirt); + world.setBlock(i + 8, j + 5, k + 8, Blocks.dirt); + world.setBlock(i + 8, j + 5, k + 9, Blocks.dirt); + world.setBlock(i + 8, j + 5, k + 10, Blocks.dirt); + world.setBlock(i + 8, j + 6, k + 1, Blocks.dirt); + world.setBlock(i + 8, j + 6, k + 3, Blocks.dirt); + world.setBlock(i + 8, j + 6, k + 4, Blocks.dirt); + world.setBlock(i + 8, j + 6, k + 5, Blocks.dirt); + world.setBlock(i + 8, j + 6, k + 6, Blocks.dirt); + world.setBlock(i + 8, j + 6, k + 7, Blocks.dirt); + world.setBlock(i + 8, j + 6, k + 8, Blocks.dirt); + world.setBlock(i + 8, j + 6, k + 9, Blocks.dirt); + world.setBlock(i + 8, j + 6, k + 10, Blocks.dirt); + world.setBlock(i + 8, j + 6, k + 11, Blocks.dirt); + world.setBlock(i + 8, j + 7, k + 1, Blocks.dirt); + world.setBlock(i + 8, j + 7, k + 2, Blocks.dirt); + world.setBlock(i + 8, j + 7, k + 3, Blocks.dirt); + world.setBlock(i + 8, j + 7, k + 4, Blocks.dirt); + world.setBlock(i + 8, j + 7, k + 5, Blocks.dirt); + world.setBlock(i + 8, j + 7, k + 6, Blocks.quartz_block); + world.setBlock(i + 8, j + 7, k + 7, Blocks.quartz_block); + world.setBlock(i + 8, j + 7, k + 8, Blocks.quartz_block); + world.setBlock(i + 8, j + 7, k + 9, Blocks.dirt); + world.setBlock(i + 8, j + 7, k + 10, Blocks.dirt); + world.setBlock(i + 8, j + 7, k + 11, Blocks.dirt); + world.setBlock(i + 8, j + 7, k + 12, Blocks.dirt); + world.setBlock(i + 8, j + 7, k + 13, Blocks.dirt); + world.setBlock(i + 8, j + 8, k + 1, Blocks.dirt); + world.setBlock(i + 8, j + 8, k + 2, Blocks.dirt); + world.setBlock(i + 8, j + 8, k + 3, Blocks.dirt); + world.setBlock(i + 8, j + 8, k + 4, Blocks.dirt); + world.setBlock(i + 8, j + 8, k + 5, Blocks.quartz_block); + world.setBlock(i + 8, j + 8, k + 6, portal); + world.setBlock(i + 8, j + 8, k + 7, portal); + world.setBlock(i + 8, j + 8, k + 8, portal); + world.setBlock(i + 8, j + 8, k + 9, Blocks.quartz_block); + world.setBlock(i + 8, j + 8, k + 10, Blocks.dirt); + world.setBlock(i + 8, j + 8, k + 11, Blocks.dirt); + world.setBlock(i + 8, j + 8, k + 12, Blocks.dirt); + world.setBlock(i + 8, j + 8, k + 13, Blocks.dirt); + world.setBlock(i + 8, j + 9, k + 1, Blocks.grass); + world.setBlock(i + 8, j + 9, k + 2, Blocks.grass); + world.setBlock(i + 8, j + 9, k + 3, Blocks.grass); + world.setBlock(i + 8, j + 9, k + 4, Blocks.dirt); + world.setBlock(i + 8, j + 9, k + 5, Blocks.quartz_block); + world.setBlock(i + 8, j + 9, k + 9, Blocks.quartz_block); + world.setBlock(i + 8, j + 9, k + 10, Blocks.dirt); + world.setBlock(i + 8, j + 9, k + 11, Blocks.grass); + world.setBlock(i + 8, j + 9, k + 12, Blocks.grass); + world.setBlock(i + 8, j + 9, k + 13, Blocks.grass); + world.setBlock(i + 8, j + 10, k + 3, Blocks.stone_slab, 7, 2); + world.setBlock(i + 8, j + 10, k + 4, Blocks.quartz_block); + world.setBlock(i + 8, j + 10, k + 5, Blocks.quartz_stairs, 3, 2); + world.setBlock(i + 8, j + 10, k + 9, Blocks.quartz_stairs, 2, 2); + world.setBlock(i + 8, j + 10, k + 10, Blocks.quartz_block); + world.setBlock(i + 8, j + 10, k + 11, Blocks.stone_slab, 7, 2); + world.setBlock(i + 8, j + 14, k + 3, Blocks.quartz_stairs, 2, 2); + world.setBlock(i + 8, j + 14, k + 4, Blocks.quartz_block); + world.setBlock(i + 8, j + 14, k + 10, Blocks.quartz_block); + world.setBlock(i + 8, j + 14, k + 11, Blocks.quartz_stairs, 3, 2); + world.setBlock(i + 8, j + 15, k + 4, Blocks.quartz_stairs, 2, 2); + world.setBlock(i + 8, j + 15, k + 5, Blocks.quartz_block); + world.setBlock(i + 8, j + 15, k + 9, Blocks.quartz_block); + world.setBlock(i + 8, j + 15, k + 10, Blocks.quartz_stairs, 3, 2); + world.setBlock(i + 8, j + 16, k + 5, Blocks.quartz_block); + world.setBlock(i + 8, j + 16, k + 9, Blocks.quartz_block); + world.setBlock(i + 8, j + 17, k + 5, Blocks.quartz_stairs, 2, 2); + world.setBlock(i + 8, j + 17, k + 6, Blocks.quartz_block); + world.setBlock(i + 8, j + 17, k + 7, Blocks.quartz_block); + world.setBlock(i + 8, j + 17, k + 8, Blocks.quartz_block); + world.setBlock(i + 8, j + 17, k + 9, Blocks.quartz_stairs, 3, 2); + world.setBlock(i + 8, j + 18, k + 6, Blocks.quartz_block); + world.setBlock(i + 8, j + 18, k + 7, Blocks.quartz_block); + world.setBlock(i + 8, j + 18, k + 8, Blocks.quartz_block); + world.setBlock(i + 8, j + 19, k + 6, Blocks.quartz_block); + world.setBlock(i + 8, j + 19, k + 7, Blocks.quartz_block); + world.setBlock(i + 8, j + 19, k + 8, Blocks.quartz_block); + world.setBlock(i + 8, j + 20, k + 6, Blocks.quartz_stairs, 1, 2); + world.setBlock(i + 8, j + 20, k + 7, Blocks.quartz_stairs, 1, 2); + world.setBlock(i + 8, j + 20, k + 8, Blocks.quartz_stairs, 3, 2); + world.setBlock(i + 9, j + 4, k + 7, Blocks.dirt); + world.setBlock(i + 9, j + 5, k + 3, Blocks.dirt); + world.setBlock(i + 9, j + 5, k + 5, Blocks.dirt); + world.setBlock(i + 9, j + 5, k + 6, Blocks.dirt); + world.setBlock(i + 9, j + 5, k + 7, Blocks.dirt); + world.setBlock(i + 9, j + 5, k + 8, Blocks.dirt); + world.setBlock(i + 9, j + 5, k + 9, Blocks.dirt); + world.setBlock(i + 9, j + 5, k + 12, Blocks.dirt); + world.setBlock(i + 9, j + 6, k + 3, Blocks.dirt); + world.setBlock(i + 9, j + 6, k + 4, Blocks.dirt); + world.setBlock(i + 9, j + 6, k + 5, Blocks.dirt); + world.setBlock(i + 9, j + 6, k + 6, Blocks.dirt); + world.setBlock(i + 9, j + 6, k + 7, Blocks.dirt); + world.setBlock(i + 9, j + 6, k + 8, Blocks.dirt); + world.setBlock(i + 9, j + 6, k + 9, Blocks.dirt); + world.setBlock(i + 9, j + 6, k + 10, Blocks.dirt); + world.setBlock(i + 9, j + 6, k + 11, Blocks.dirt); + world.setBlock(i + 9, j + 6, k + 12, Blocks.dirt); + world.setBlock(i + 9, j + 7, k + 2, Blocks.dirt); + world.setBlock(i + 9, j + 7, k + 3, Blocks.dirt); + world.setBlock(i + 9, j + 7, k + 4, Blocks.dirt); + world.setBlock(i + 9, j + 7, k + 5, Blocks.dirt); + world.setBlock(i + 9, j + 7, k + 6, Blocks.dirt); + world.setBlock(i + 9, j + 7, k + 7, Blocks.dirt); + world.setBlock(i + 9, j + 7, k + 8, Blocks.dirt); + world.setBlock(i + 9, j + 7, k + 9, Blocks.dirt); + world.setBlock(i + 9, j + 7, k + 10, Blocks.dirt); + world.setBlock(i + 9, j + 7, k + 11, Blocks.dirt); + world.setBlock(i + 9, j + 7, k + 12, Blocks.dirt); + world.setBlock(i + 9, j + 8, k + 2, Blocks.dirt); + world.setBlock(i + 9, j + 8, k + 3, Blocks.dirt); + world.setBlock(i + 9, j + 8, k + 4, Blocks.dirt); + world.setBlock(i + 9, j + 8, k + 5, Blocks.dirt); + world.setBlock(i + 9, j + 8, k + 6, Blocks.quartz_block); + world.setBlock(i + 9, j + 8, k + 7, Blocks.quartz_block); + world.setBlock(i + 9, j + 8, k + 8, Blocks.quartz_block); + world.setBlock(i + 9, j + 8, k + 9, Blocks.dirt); + world.setBlock(i + 9, j + 8, k + 10, Blocks.dirt); + world.setBlock(i + 9, j + 8, k + 11, Blocks.dirt); + world.setBlock(i + 9, j + 8, k + 12, Blocks.dirt); + world.setBlock(i + 9, j + 9, k + 2, Blocks.grass); + world.setBlock(i + 9, j + 9, k + 3, Blocks.grass); + world.setBlock(i + 9, j + 9, k + 4, Blocks.dirt); + world.setBlock(i + 9, j + 9, k + 5, Blocks.dirt); + world.setBlock(i + 9, j + 9, k + 6, Blocks.quartz_block); + world.setBlock(i + 9, j + 9, k + 7, Blocks.quartz_block); + world.setBlock(i + 9, j + 9, k + 8, Blocks.quartz_block); + world.setBlock(i + 9, j + 9, k + 9, Blocks.dirt); + world.setBlock(i + 9, j + 9, k + 10, Blocks.dirt); + world.setBlock(i + 9, j + 9, k + 11, Blocks.grass); + world.setBlock(i + 9, j + 9, k + 12, Blocks.grass); + world.setBlock(i + 9, j + 10, k + 3, Blocks.stone_slab, 7, 2); + world.setBlock(i + 9, j + 10, k + 4, Blocks.quartz_block, 2, 2); + world.setBlock(i + 9, j + 10, k + 5, Blocks.quartz_block); + world.setBlock(i + 9, j + 10, k + 6, Blocks.quartz_stairs); + world.setBlock(i + 9, j + 10, k + 7, Blocks.quartz_stairs); + world.setBlock(i + 9, j + 10, k + 8, Blocks.quartz_stairs); + world.setBlock(i + 9, j + 10, k + 9, Blocks.quartz_block); + world.setBlock(i + 9, j + 10, k + 10, Blocks.quartz_block, 2, 2); + world.setBlock(i + 9, j + 10, k + 11, Blocks.stone_slab, 7, 2); + world.setBlock(i + 9, j + 11, k + 4, Blocks.quartz_block, 2, 2); + world.setBlock(i + 9, j + 11, k + 10, Blocks.quartz_block, 2, 2); + world.setBlock(i + 9, j + 12, k + 4, Blocks.quartz_block, 2, 2); + world.setBlock(i + 9, j + 12, k + 10, Blocks.quartz_block, 2, 2); + world.setBlock(i + 9, j + 13, k + 4, Blocks.quartz_block, 2, 2); + world.setBlock(i + 9, j + 13, k + 10, Blocks.quartz_block, 2, 2); + world.setBlock(i + 9, j + 14, k + 3, Blocks.quartz_stairs, 2, 2); + world.setBlock(i + 9, j + 14, k + 4, Blocks.quartz_block); + world.setBlock(i + 9, j + 14, k + 10, Blocks.quartz_block); + world.setBlock(i + 9, j + 14, k + 11, Blocks.quartz_stairs, 3, 2); + world.setBlock(i + 9, j + 15, k + 4, Blocks.quartz_stairs, 2, 2); + world.setBlock(i + 9, j + 15, k + 5, Blocks.quartz_block); + world.setBlock(i + 9, j + 15, k + 6, Blocks.quartz_block); + world.setBlock(i + 9, j + 15, k + 7, Blocks.quartz_block); + world.setBlock(i + 9, j + 15, k + 8, Blocks.quartz_block); + world.setBlock(i + 9, j + 15, k + 9, Blocks.quartz_block); + world.setBlock(i + 9, j + 15, k + 10, Blocks.quartz_stairs, 3, 2); + world.setBlock(i + 9, j + 16, k + 5, Blocks.quartz_block); + world.setBlock(i + 9, j + 16, k + 6, Blocks.quartz_block); + world.setBlock(i + 9, j + 16, k + 7, Blocks.quartz_block); + world.setBlock(i + 9, j + 16, k + 8, Blocks.quartz_block); + world.setBlock(i + 9, j + 16, k + 9, Blocks.quartz_block); + world.setBlock(i + 9, j + 17, k + 5, Blocks.quartz_stairs, 2, 2); + world.setBlock(i + 9, j + 17, k + 6, Blocks.quartz_stairs, 1, 2); + world.setBlock(i + 9, j + 17, k + 7, Blocks.quartz_stairs, 1, 2); + world.setBlock(i + 9, j + 17, k + 8, Blocks.quartz_stairs, 1, 2); + world.setBlock(i + 9, j + 17, k + 9, Blocks.quartz_stairs, 3, 2); + world.setBlock(i + 10, j + 4, k + 10, Blocks.dirt); + world.setBlock(i + 10, j + 5, k + 6, Blocks.dirt); + world.setBlock(i + 10, j + 5, k + 7, Blocks.dirt); + world.setBlock(i + 10, j + 5, k + 8, Blocks.dirt); + world.setBlock(i + 10, j + 5, k + 10, Blocks.dirt); + world.setBlock(i + 10, j + 6, k + 4, Blocks.dirt); + world.setBlock(i + 10, j + 6, k + 5, Blocks.dirt); + world.setBlock(i + 10, j + 6, k + 6, Blocks.dirt); + world.setBlock(i + 10, j + 6, k + 7, Blocks.dirt); + world.setBlock(i + 10, j + 6, k + 8, Blocks.dirt); + world.setBlock(i + 10, j + 6, k + 9, Blocks.dirt); + world.setBlock(i + 10, j + 6, k + 10, Blocks.dirt); + world.setBlock(i + 10, j + 7, k + 2, Blocks.dirt); + world.setBlock(i + 10, j + 7, k + 3, Blocks.dirt); + world.setBlock(i + 10, j + 7, k + 4, Blocks.dirt); + world.setBlock(i + 10, j + 7, k + 5, Blocks.dirt); + world.setBlock(i + 10, j + 7, k + 6, Blocks.dirt); + world.setBlock(i + 10, j + 7, k + 7, Blocks.dirt); + world.setBlock(i + 10, j + 7, k + 8, Blocks.dirt); + world.setBlock(i + 10, j + 7, k + 9, Blocks.dirt); + world.setBlock(i + 10, j + 7, k + 10, Blocks.dirt); + world.setBlock(i + 10, j + 7, k + 11, Blocks.dirt); + world.setBlock(i + 10, j + 7, k + 12, Blocks.dirt); + world.setBlock(i + 10, j + 8, k + 2, Blocks.dirt); + world.setBlock(i + 10, j + 8, k + 3, Blocks.dirt); + world.setBlock(i + 10, j + 8, k + 4, Blocks.dirt); + world.setBlock(i + 10, j + 8, k + 5, Blocks.dirt); + world.setBlock(i + 10, j + 8, k + 6, Blocks.dirt); + world.setBlock(i + 10, j + 8, k + 7, Blocks.dirt); + world.setBlock(i + 10, j + 8, k + 8, Blocks.dirt); + world.setBlock(i + 10, j + 8, k + 9, Blocks.dirt); + world.setBlock(i + 10, j + 8, k + 10, Blocks.dirt); + world.setBlock(i + 10, j + 8, k + 11, Blocks.dirt); + world.setBlock(i + 10, j + 8, k + 12, Blocks.dirt); + world.setBlock(i + 10, j + 9, k + 2, Blocks.grass); + world.setBlock(i + 10, j + 9, k + 3, Blocks.dirt); + world.setBlock(i + 10, j + 9, k + 4, Blocks.grass); + world.setBlock(i + 10, j + 9, k + 5, Blocks.dirt); + world.setBlock(i + 10, j + 9, k + 6, Blocks.dirt); + world.setBlock(i + 10, j + 9, k + 7, Blocks.dirt); + world.setBlock(i + 10, j + 9, k + 8, Blocks.dirt); + world.setBlock(i + 10, j + 9, k + 9, Blocks.dirt); + world.setBlock(i + 10, j + 9, k + 10, Blocks.grass); + world.setBlock(i + 10, j + 9, k + 11, Blocks.dirt); + world.setBlock(i + 10, j + 9, k + 12, Blocks.grass); + world.setBlock(i + 10, j + 10, k + 3, Blocks.log); + world.setBlock(i + 10, j + 10, k + 4, Blocks.stone_slab, 7, 2); + world.setBlock(i + 10, j + 10, k + 5, Blocks.quartz_block, 2, 2); + world.setBlock(i + 10, j + 10, k + 6, Blocks.quartz_block); + world.setBlock(i + 10, j + 10, k + 7, Blocks.quartz_block); + world.setBlock(i + 10, j + 10, k + 8, Blocks.quartz_block); + world.setBlock(i + 10, j + 10, k + 9, Blocks.quartz_block, 2, 2); + world.setBlock(i + 10, j + 10, k + 10, Blocks.stone_slab, 7, 2); + world.setBlock(i + 10, j + 10, k + 11, Blocks.log); + world.setBlock(i + 10, j + 11, k + 3, Blocks.leaves, 4, 2); + world.setBlock(i + 10, j + 11, k + 5, Blocks.quartz_block, 2, 2); + world.setBlock(i + 10, j + 11, k + 9, Blocks.quartz_block, 2, 2); + world.setBlock(i + 10, j + 11, k + 11, Blocks.leaves, 4, 2); + world.setBlock(i + 10, j + 12, k + 3, Blocks.leaves, 4, 2); + world.setBlock(i + 10, j + 12, k + 5, Blocks.quartz_block, 2, 2); + world.setBlock(i + 10, j + 12, k + 9, Blocks.quartz_block, 2, 2); + world.setBlock(i + 10, j + 12, k + 11, Blocks.leaves, 4, 2); + world.setBlock(i + 10, j + 13, k + 5, Blocks.quartz_block, 2, 2); + world.setBlock(i + 10, j + 13, k + 9, Blocks.quartz_block, 2, 2); + world.setBlock(i + 10, j + 14, k + 3, Blocks.quartz_stairs, 1, 2); + world.setBlock(i + 10, j + 14, k + 4, Blocks.quartz_stairs, 2, 2); + world.setBlock(i + 10, j + 14, k + 5, Blocks.quartz_block); + world.setBlock(i + 10, j + 14, k + 6, Blocks.quartz_block); + world.setBlock(i + 10, j + 14, k + 7, Blocks.quartz_block); + world.setBlock(i + 10, j + 14, k + 8, Blocks.quartz_block); + world.setBlock(i + 10, j + 14, k + 9, Blocks.quartz_block); + world.setBlock(i + 10, j + 14, k + 10, Blocks.quartz_stairs, 1, 2); + world.setBlock(i + 10, j + 14, k + 11, Blocks.quartz_stairs, 1, 2); + world.setBlock(i + 10, j + 15, k + 5, Blocks.quartz_stairs, 1, 2); + world.setBlock(i + 10, j + 15, k + 6, Blocks.quartz_stairs, 1, 2); + world.setBlock(i + 10, j + 15, k + 7, Blocks.quartz_stairs, 1, 2); + world.setBlock(i + 10, j + 15, k + 8, Blocks.quartz_stairs, 1, 2); + world.setBlock(i + 10, j + 15, k + 9, Blocks.quartz_stairs, 1, 2); + world.setBlock(i + 11, j + 3, k + 7, Blocks.dirt); + world.setBlock(i + 11, j + 4, k + 5, Blocks.dirt); + world.setBlock(i + 11, j + 4, k + 7, Blocks.dirt); + world.setBlock(i + 11, j + 5, k + 5, Blocks.dirt); + world.setBlock(i + 11, j + 5, k + 7, Blocks.dirt); + world.setBlock(i + 11, j + 6, k + 3, Blocks.dirt); + world.setBlock(i + 11, j + 6, k + 5, Blocks.dirt); + world.setBlock(i + 11, j + 6, k + 6, Blocks.dirt); + world.setBlock(i + 11, j + 6, k + 7, Blocks.dirt); + world.setBlock(i + 11, j + 6, k + 8, Blocks.dirt); + world.setBlock(i + 11, j + 6, k + 9, Blocks.dirt); + world.setBlock(i + 11, j + 6, k + 11, Blocks.dirt); + world.setBlock(i + 11, j + 7, k + 3, Blocks.dirt); + world.setBlock(i + 11, j + 7, k + 4, Blocks.dirt); + world.setBlock(i + 11, j + 7, k + 5, Blocks.dirt); + world.setBlock(i + 11, j + 7, k + 6, Blocks.dirt); + world.setBlock(i + 11, j + 7, k + 7, Blocks.dirt); + world.setBlock(i + 11, j + 7, k + 8, Blocks.dirt); + world.setBlock(i + 11, j + 7, k + 9, Blocks.dirt); + world.setBlock(i + 11, j + 7, k + 10, Blocks.dirt); + world.setBlock(i + 11, j + 7, k + 11, Blocks.dirt); + world.setBlock(i + 11, j + 8, k + 3, Blocks.dirt); + world.setBlock(i + 11, j + 8, k + 4, Blocks.dirt); + world.setBlock(i + 11, j + 8, k + 5, Blocks.dirt); + world.setBlock(i + 11, j + 8, k + 6, Blocks.dirt); + world.setBlock(i + 11, j + 8, k + 7, Blocks.dirt); + world.setBlock(i + 11, j + 8, k + 8, Blocks.dirt); + world.setBlock(i + 11, j + 8, k + 9, Blocks.dirt); + world.setBlock(i + 11, j + 8, k + 10, Blocks.dirt); + world.setBlock(i + 11, j + 8, k + 11, Blocks.dirt); + world.setBlock(i + 11, j + 9, k + 3, Blocks.grass); + world.setBlock(i + 11, j + 9, k + 4, Blocks.dirt); + world.setBlock(i + 11, j + 9, k + 5, Blocks.grass); + world.setBlock(i + 11, j + 9, k + 6, Blocks.grass); + world.setBlock(i + 11, j + 9, k + 7, Blocks.grass); + world.setBlock(i + 11, j + 9, k + 8, Blocks.grass); + world.setBlock(i + 11, j + 9, k + 9, Blocks.grass); + world.setBlock(i + 11, j + 9, k + 10, Blocks.dirt); + world.setBlock(i + 11, j + 9, k + 11, Blocks.grass); + world.setBlock(i + 11, j + 10, k + 4, Blocks.log); + world.setBlock(i + 11, j + 10, k + 5, Blocks.stone_slab, 7, 2); + world.setBlock(i + 11, j + 10, k + 6, Blocks.stone_slab, 7, 2); + world.setBlock(i + 11, j + 10, k + 7, Blocks.stone_slab, 7, 2); + world.setBlock(i + 11, j + 10, k + 8, Blocks.stone_slab, 7, 2); + world.setBlock(i + 11, j + 10, k + 9, Blocks.stone_slab, 7, 2); + world.setBlock(i + 11, j + 10, k + 10, Blocks.log); + world.setBlock(i + 11, j + 11, k + 4, Blocks.leaves, 4, 2); + world.setBlock(i + 11, j + 11, k + 10, Blocks.leaves, 4, 2); + world.setBlock(i + 11, j + 12, k + 4, Blocks.leaves, 4, 2); + world.setBlock(i + 11, j + 12, k + 10, Blocks.leaves, 4, 2); + world.setBlock(i + 11, j + 14, k + 4, Blocks.quartz_stairs, 2, 2); + world.setBlock(i + 11, j + 14, k + 5, Blocks.quartz_stairs, 1, 2); + world.setBlock(i + 11, j + 14, k + 6, Blocks.quartz_stairs, 1, 2); + world.setBlock(i + 11, j + 14, k + 7, Blocks.quartz_stairs, 1, 2); + world.setBlock(i + 11, j + 14, k + 8, Blocks.quartz_stairs, 1, 2); + world.setBlock(i + 11, j + 14, k + 9, Blocks.quartz_stairs, 1, 2); + world.setBlock(i + 11, j + 14, k + 10, Blocks.quartz_stairs, 3, 2); + world.setBlock(i + 12, j + 2, k + 9, Blocks.dirt); + world.setBlock(i + 12, j + 3, k + 9, Blocks.dirt); + world.setBlock(i + 12, j + 4, k + 9, Blocks.dirt); + world.setBlock(i + 12, j + 5, k + 9, Blocks.dirt); + world.setBlock(i + 12, j + 6, k + 6, Blocks.dirt); + world.setBlock(i + 12, j + 6, k + 7, Blocks.dirt); + world.setBlock(i + 12, j + 6, k + 9, Blocks.dirt); + world.setBlock(i + 12, j + 7, k + 4, Blocks.dirt); + world.setBlock(i + 12, j + 7, k + 5, Blocks.dirt); + world.setBlock(i + 12, j + 7, k + 6, Blocks.dirt); + world.setBlock(i + 12, j + 7, k + 7, Blocks.dirt); + world.setBlock(i + 12, j + 7, k + 8, Blocks.dirt); + world.setBlock(i + 12, j + 7, k + 9, Blocks.dirt); + world.setBlock(i + 12, j + 7, k + 10, Blocks.dirt); + world.setBlock(i + 12, j + 8, k + 4, Blocks.dirt); + world.setBlock(i + 12, j + 8, k + 5, Blocks.dirt); + world.setBlock(i + 12, j + 8, k + 6, Blocks.dirt); + world.setBlock(i + 12, j + 8, k + 7, Blocks.dirt); + world.setBlock(i + 12, j + 8, k + 8, Blocks.dirt); + world.setBlock(i + 12, j + 8, k + 9, Blocks.dirt); + world.setBlock(i + 12, j + 8, k + 10, Blocks.dirt); + world.setBlock(i + 12, j + 9, k + 4, Blocks.grass); + world.setBlock(i + 12, j + 9, k + 5, Blocks.grass); + world.setBlock(i + 12, j + 9, k + 6, Blocks.grass); + world.setBlock(i + 12, j + 9, k + 7, Blocks.grass); + world.setBlock(i + 12, j + 9, k + 8, Blocks.grass); + world.setBlock(i + 12, j + 9, k + 9, Blocks.grass); + world.setBlock(i + 12, j + 9, k + 10, Blocks.grass); + world.setBlock(i + 13, j + 5, k + 7, Blocks.dirt); + world.setBlock(i + 13, j + 6, k + 7, Blocks.dirt); + world.setBlock(i + 13, j + 7, k + 6, Blocks.dirt); + world.setBlock(i + 13, j + 7, k + 7, Blocks.dirt); + world.setBlock(i + 13, j + 7, k + 8, Blocks.dirt); + world.setBlock(i + 13, j + 8, k + 6, Blocks.dirt); + world.setBlock(i + 13, j + 8, k + 7, Blocks.dirt); + world.setBlock(i + 13, j + 8, k + 8, Blocks.dirt); + world.setBlock(i + 13, j + 9, k + 6, Blocks.grass); + world.setBlock(i + 13, j + 9, k + 7, Blocks.grass); + world.setBlock(i + 13, j + 9, k + 8, Blocks.grass); + world.setBlock(i + 0, j + 0, k + 8, ivy, 8, 2); + world.setBlock(i + 0, j + 1, k + 8, ivy, 8, 2); + world.setBlock(i + 0, j + 2, k + 8, ivy, 8, 2); + world.setBlock(i + 0, j + 3, k + 6, ivy, 8, 2); + world.setBlock(i + 0, j + 3, k + 8, ivy, 8, 2); + world.setBlock(i + 0, j + 4, k + 6, ivy, 8, 2); + world.setBlock(i + 0, j + 4, k + 8, ivy, 8, 2); + world.setBlock(i + 0, j + 5, k + 6, ivy, 8, 2); + world.setBlock(i + 0, j + 5, k + 7, ivy, 8, 2); + world.setBlock(i + 0, j + 5, k + 8, ivy, 8, 2); + world.setBlock(i + 0, j + 6, k + 6, ivy, 8, 2); + world.setBlock(i + 0, j + 6, k + 7, ivy, 8, 2); + world.setBlock(i + 0, j + 6, k + 8, ivy, 8, 2); + world.setBlock(i + 0, j + 7, k + 6, ivy, 8, 2); + world.setBlock(i + 0, j + 7, k + 7, ivy, 8, 2); + world.setBlock(i + 0, j + 7, k + 8, ivy, 8, 2); + world.setBlock(i + 0, j + 8, k + 6, ivy, 8, 2); + world.setBlock(i + 0, j + 8, k + 7, ivy, 8, 2); + world.setBlock(i + 0, j + 8, k + 8, ivy, 8, 2); + world.setBlock(i + 0, j + 9, k + 6, ivy, 8, 2); + world.setBlock(i + 0, j + 9, k + 7, ivy, 8, 2); + world.setBlock(i + 0, j + 9, k + 8, ivy, 8, 2); + world.setBlock(i + 1, j + 10, k + 6, Blocks.tallgrass, 2, 2); + world.setBlock(i + 1, j + 10, k + 7, Blocks.tallgrass, 2, 2); + world.setBlock(i + 1, j + 10, k + 8, Blocks.tallgrass, 2, 2); + world.setBlock(i + 2, j + 2, k + 3, ivy, 8, 2); + world.setBlock(i + 2, j + 2, k + 11, ivy, 8, 2); + world.setBlock(i + 2, j + 3, k + 3, ivy, 8, 2); + world.setBlock(i + 2, j + 3, k + 11, ivy, 8, 2); + world.setBlock(i + 2, j + 4, k + 3, ivy, 8, 2); + world.setBlock(i + 2, j + 4, k + 11, ivy, 8, 2); + world.setBlock(i + 2, j + 5, k + 3, ivy, 8, 2); + world.setBlock(i + 2, j + 5, k + 11, ivy, 8, 2); + world.setBlock(i + 2, j + 6, k + 3, ivy, 8, 2); + world.setBlock(i + 2, j + 6, k + 11, ivy, 8, 2); + world.setBlock(i + 2, j + 7, k + 3, ivy, 8, 2); + world.setBlock(i + 2, j + 7, k + 11, ivy, 8, 2); + world.setBlock(i + 2, j + 8, k + 3, ivy, 8, 2); + world.setBlock(i + 2, j + 8, k + 11, ivy, 8, 2); + world.setBlock(i + 2, j + 9, k + 3, ivy, 8, 2); + world.setBlock(i + 2, j + 9, k + 11, ivy, 8, 2); + world.setBlock(i + 2, j + 10, k + 4, Blocks.red_flower); + world.setBlock(i + 2, j + 10, k + 5, Blocks.tallgrass, 2, 2); + world.setBlock(i + 2, j + 10, k + 6, Blocks.tallgrass, 2, 2); + world.setBlock(i + 2, j + 10, k + 7, Blocks.tallgrass, 2, 2); + world.setBlock(i + 2, j + 10, k + 8, Blocks.tallgrass, 2, 2); + world.setBlock(i + 2, j + 10, k + 9, Blocks.tallgrass, 2, 2); + world.setBlock(i + 2, j + 10, k + 10, Blocks.red_flower); + world.setBlock(i + 3, j + 5, k + 2, ivy, 1, 2); + world.setBlock(i + 3, j + 5, k + 12, ivy, 4, 2); + world.setBlock(i + 3, j + 6, k + 2, ivy, 1, 2); + world.setBlock(i + 3, j + 6, k + 12, ivy, 4, 2); + world.setBlock(i + 3, j + 7, k + 2, ivy, 1, 2); + world.setBlock(i + 3, j + 7, k + 12, ivy, 4, 2); + world.setBlock(i + 3, j + 8, k + 2, ivy, 1, 2); + world.setBlock(i + 3, j + 8, k + 12, ivy, 4, 2); + world.setBlock(i + 3, j + 9, k + 2, ivy, 1, 2); + world.setBlock(i + 3, j + 9, k + 12, ivy, 4, 2); + world.setBlock(i + 3, j + 10, k + 3, Blocks.yellow_flower); + world.setBlock(i + 3, j + 10, k + 11, Blocks.yellow_flower); + world.setBlock(i + 4, j + 10, k + 2, Blocks.red_flower); + world.setBlock(i + 4, j + 10, k + 12, Blocks.red_flower); + world.setBlock(i + 5, j + 10, k + 2, Blocks.tallgrass, 2, 2); + world.setBlock(i + 5, j + 10, k + 12, Blocks.tallgrass, 2, 2); + world.setBlock(i + 6, j + 0, k + 14, ivy, 4, 2); + world.setBlock(i + 6, j + 1, k + 14, ivy, 4, 2); + world.setBlock(i + 6, j + 2, k + 14, ivy, 4, 2); + world.setBlock(i + 6, j + 3, k + 0, ivy, 1, 2); + world.setBlock(i + 6, j + 3, k + 14, ivy, 4, 2); + world.setBlock(i + 6, j + 4, k + 0, ivy, 1, 2); + world.setBlock(i + 6, j + 4, k + 14, ivy, 4, 2); + world.setBlock(i + 6, j + 5, k + 0, ivy, 1, 2); + world.setBlock(i + 6, j + 5, k + 14, ivy, 4, 2); + world.setBlock(i + 6, j + 6, k + 0, ivy, 1, 2); + world.setBlock(i + 6, j + 6, k + 14, ivy, 4, 2); + world.setBlock(i + 6, j + 7, k + 0, ivy, 1, 2); + world.setBlock(i + 6, j + 7, k + 14, ivy, 4, 2); + world.setBlock(i + 6, j + 8, k + 0, ivy, 1, 2); + world.setBlock(i + 6, j + 8, k + 14, ivy, 4, 2); + world.setBlock(i + 6, j + 9, k + 0, ivy, 1, 2); + world.setBlock(i + 6, j + 9, k + 14, ivy, 4, 2); + world.setBlock(i + 6, j + 10, k + 1, Blocks.tallgrass, 2, 2); + world.setBlock(i + 6, j + 10, k + 2, Blocks.tallgrass, 2, 2); + world.setBlock(i + 6, j + 10, k + 12, Blocks.tallgrass, 2, 2); + world.setBlock(i + 6, j + 10, k + 13, Blocks.tallgrass, 2, 2); + world.setBlock(i + 7, j + 1, k + 0, ivy, 1, 2); + world.setBlock(i + 7, j + 1, k + 14, ivy, 4, 2); + world.setBlock(i + 7, j + 2, k + 0, ivy, 1, 2); + world.setBlock(i + 7, j + 2, k + 14, ivy, 4, 2); + world.setBlock(i + 7, j + 3, k + 0, ivy, 1, 2); + world.setBlock(i + 7, j + 3, k + 14, ivy, 4, 2); + world.setBlock(i + 7, j + 4, k + 0, ivy, 1, 2); + world.setBlock(i + 7, j + 4, k + 14, ivy, 4, 2); + world.setBlock(i + 7, j + 5, k + 0, ivy, 1, 2); + world.setBlock(i + 7, j + 5, k + 14, ivy, 4, 2); + world.setBlock(i + 7, j + 6, k + 0, ivy, 1, 2); + world.setBlock(i + 7, j + 6, k + 14, ivy, 4, 2); + world.setBlock(i + 7, j + 7, k + 0, ivy, 1, 2); + world.setBlock(i + 7, j + 7, k + 14, ivy, 4, 2); + world.setBlock(i + 7, j + 8, k + 0, ivy, 1, 2); + world.setBlock(i + 7, j + 8, k + 14, ivy, 4, 2); + world.setBlock(i + 7, j + 9, k + 0, ivy, 1, 2); + world.setBlock(i + 7, j + 9, k + 14, ivy, 4, 2); + world.setBlock(i + 7, j + 10, k + 1, Blocks.tallgrass, 2, 2); + world.setBlock(i + 7, j + 10, k + 2, Blocks.tallgrass, 2, 2); + world.setBlock(i + 7, j + 10, k + 12, Blocks.tallgrass, 2, 2); + world.setBlock(i + 7, j + 10, k + 13, Blocks.tallgrass, 2, 2); + world.setBlock(i + 8, j + 3, k + 14, ivy, 4, 2); + world.setBlock(i + 8, j + 4, k + 0, ivy, 1, 2); + world.setBlock(i + 8, j + 4, k + 14, ivy, 4, 2); + world.setBlock(i + 8, j + 5, k + 0, ivy, 1, 2); + world.setBlock(i + 8, j + 5, k + 14, ivy, 4, 2); + world.setBlock(i + 8, j + 6, k + 0, ivy, 1, 2); + world.setBlock(i + 8, j + 6, k + 14, ivy, 4, 2); + world.setBlock(i + 8, j + 7, k + 0, ivy, 1, 2); + world.setBlock(i + 8, j + 7, k + 14, ivy, 4, 2); + world.setBlock(i + 8, j + 8, k + 0, ivy, 1, 2); + world.setBlock(i + 8, j + 8, k + 14, ivy, 4, 2); + world.setBlock(i + 8, j + 9, k + 0, ivy, 1, 2); + world.setBlock(i + 8, j + 9, k + 14, ivy, 4, 2); + world.setBlock(i + 8, j + 10, k + 1, Blocks.tallgrass, 2, 2); + world.setBlock(i + 8, j + 10, k + 2, Blocks.tallgrass, 2, 2); + world.setBlock(i + 8, j + 10, k + 12, Blocks.tallgrass, 2, 2); + world.setBlock(i + 8, j + 10, k + 13, Blocks.tallgrass, 2, 2); + world.setBlock(i + 9, j + 10, k + 2, Blocks.tallgrass, 2, 2); + world.setBlock(i + 9, j + 10, k + 12, Blocks.tallgrass, 2, 2); + world.setBlock(i + 10, j + 10, k + 2, Blocks.red_flower); + world.setBlock(i + 10, j + 10, k + 12, Blocks.red_flower); + world.setBlock(i + 11, j + 5, k + 2, ivy, 1, 2); + world.setBlock(i + 11, j + 5, k + 12, ivy, 4, 2); + world.setBlock(i + 11, j + 6, k + 2, ivy, 1, 2); + world.setBlock(i + 11, j + 6, k + 12, ivy, 4, 2); + world.setBlock(i + 11, j + 7, k + 2, ivy, 1, 2); + world.setBlock(i + 11, j + 7, k + 12, ivy, 4, 2); + world.setBlock(i + 11, j + 8, k + 2, ivy, 1, 2); + world.setBlock(i + 11, j + 8, k + 12, ivy, 4, 2); + world.setBlock(i + 11, j + 9, k + 2, ivy, 1, 2); + world.setBlock(i + 11, j + 9, k + 12, ivy, 4, 2); + world.setBlock(i + 11, j + 10, k + 3, Blocks.yellow_flower); + world.setBlock(i + 11, j + 10, k + 11, Blocks.yellow_flower); + world.setBlock(i + 12, j + 2, k + 3, ivy, 2, 2); + world.setBlock(i + 12, j + 2, k + 11, ivy, 2, 2); + world.setBlock(i + 12, j + 3, k + 3, ivy, 2, 2); + world.setBlock(i + 12, j + 3, k + 11, ivy, 2, 2); + world.setBlock(i + 12, j + 4, k + 3, ivy, 2, 2); + world.setBlock(i + 12, j + 4, k + 11, ivy, 2, 2); + world.setBlock(i + 12, j + 5, k + 3, ivy, 2, 2); + world.setBlock(i + 12, j + 5, k + 11, ivy, 2, 2); + world.setBlock(i + 12, j + 6, k + 3, ivy, 2, 2); + world.setBlock(i + 12, j + 6, k + 11, ivy, 2, 2); + world.setBlock(i + 12, j + 7, k + 3, ivy, 2, 2); + world.setBlock(i + 12, j + 7, k + 11, ivy, 2, 2); + world.setBlock(i + 12, j + 8, k + 3, ivy, 2, 2); + world.setBlock(i + 12, j + 8, k + 11, ivy, 2, 2); + world.setBlock(i + 12, j + 9, k + 3, ivy, 2, 2); + world.setBlock(i + 12, j + 9, k + 11, ivy, 2, 2); + world.setBlock(i + 12, j + 10, k + 4, Blocks.red_flower); + world.setBlock(i + 12, j + 10, k + 5, Blocks.tallgrass, 2, 2); + world.setBlock(i + 12, j + 10, k + 6, Blocks.tallgrass, 2, 2); + world.setBlock(i + 12, j + 10, k + 7, Blocks.tallgrass, 2, 2); + world.setBlock(i + 12, j + 10, k + 8, Blocks.tallgrass, 2, 2); + world.setBlock(i + 12, j + 10, k + 9, Blocks.tallgrass, 2, 2); + world.setBlock(i + 12, j + 10, k + 10, Blocks.red_flower); + world.setBlock(i + 13, j + 10, k + 6, Blocks.tallgrass, 2, 2); + world.setBlock(i + 13, j + 10, k + 7, Blocks.tallgrass, 2, 2); + world.setBlock(i + 13, j + 10, k + 8, Blocks.tallgrass, 2, 2); + world.setBlock(i + 14, j + 0, k + 7, ivy, 2, 2); + world.setBlock(i + 14, j + 1, k + 7, ivy, 2, 2); + world.setBlock(i + 14, j + 2, k + 7, ivy, 2, 2); + world.setBlock(i + 14, j + 2, k + 8, ivy, 2, 2); + world.setBlock(i + 14, j + 3, k + 7, ivy, 2, 2); + world.setBlock(i + 14, j + 3, k + 8, ivy, 2, 2); + world.setBlock(i + 14, j + 4, k + 6, ivy, 2, 2); + world.setBlock(i + 14, j + 4, k + 7, ivy, 2, 2); + world.setBlock(i + 14, j + 4, k + 8, ivy, 2, 2); + world.setBlock(i + 14, j + 5, k + 6, ivy, 2, 2); + world.setBlock(i + 14, j + 5, k + 7, ivy, 2, 2); + world.setBlock(i + 14, j + 5, k + 8, ivy, 2, 2); + world.setBlock(i + 14, j + 6, k + 6, ivy, 2, 2); + world.setBlock(i + 14, j + 6, k + 7, ivy, 2, 2); + world.setBlock(i + 14, j + 6, k + 8, ivy, 2, 2); + world.setBlock(i + 14, j + 7, k + 6, ivy, 2, 2); + world.setBlock(i + 14, j + 7, k + 7, ivy, 2, 2); + world.setBlock(i + 14, j + 7, k + 8, ivy, 2, 2); + world.setBlock(i + 14, j + 8, k + 6, ivy, 2, 2); + world.setBlock(i + 14, j + 8, k + 7, ivy, 2, 2); + world.setBlock(i + 14, j + 8, k + 8, ivy, 2, 2); + world.setBlock(i + 14, j + 9, k + 6, ivy, 2, 2); + world.setBlock(i + 14, j + 9, k + 7, ivy, 2, 2); + world.setBlock(i + 14, j + 9, k + 8, ivy, 2, 2); return true; } } diff --git a/src/main/java/biomesoplenty/common/world/features/WorldGenRiverCane.java b/src/main/java/biomesoplenty/common/world/features/WorldGenRiverCane.java index 1ba86408d..186bf26f9 100644 --- a/src/main/java/biomesoplenty/common/world/features/WorldGenRiverCane.java +++ b/src/main/java/biomesoplenty/common/world/features/WorldGenRiverCane.java @@ -23,17 +23,17 @@ public class WorldGenRiverCane extends WorldGeneratorBOP int k1 = z + par2Random.nextInt(8) - par2Random.nextInt(8); //TODO: isAirBlock() - if (world.func_147437_c(i1, j1, k1)) + if (world.isAirBlock(i1, j1, k1)) { int l1 = 1 + par2Random.nextInt(par2Random.nextInt(3) + 1); for (int i2 = 0; i2 < l1; ++i2) { //TODO: canReplace() - if (BOPBlockHelper.get("plants").func_149705_a(world, i1, j1, k1, 0, new ItemStack(BOPBlockHelper.get("plants"), 1, 8))) + if (BOPBlockHelper.get("plants").canReplace(world, i1, j1, k1, 0, new ItemStack(BOPBlockHelper.get("plants"), 1, 8))) { //TODO: setBlock() - world.func_147465_d(i1, j1 + i2, k1, BOPBlockHelper.get("plants"), 8, 2); + world.setBlock(i1, j1 + i2, k1, BOPBlockHelper.get("plants"), 8, 2); } } } diff --git a/src/main/java/biomesoplenty/common/world/features/WorldGenRockpile.java b/src/main/java/biomesoplenty/common/world/features/WorldGenRockpile.java index 4234460c2..3a1bd1d42 100644 --- a/src/main/java/biomesoplenty/common/world/features/WorldGenRockpile.java +++ b/src/main/java/biomesoplenty/common/world/features/WorldGenRockpile.java @@ -16,7 +16,7 @@ public class WorldGenRockpile extends WorldGeneratorBOP public boolean generate(World world, Random random, int x, int y, int z) { //TODO: isAirBlock() - while (world.func_147437_c(x, y, z) && y > 2) + while (world.isAirBlock(x, y, z) && y > 2) { --y; } @@ -27,7 +27,7 @@ public class WorldGenRockpile extends WorldGeneratorBOP { for (int iz = -1; iz <= 1; iz++) { - if (world.func_147439_a(x + ix, y, z + iz) != Blocks.grass) + if (world.getBlock(x + ix, y, z + iz) != Blocks.grass) { isGrass = false; break; @@ -46,7 +46,7 @@ public class WorldGenRockpile extends WorldGeneratorBOP for (int var8 = -2; var8 <= 2; ++var8) { //TODO: isAirBlock() isAirBlock() - if (world.func_147437_c(x + var7, y - 1, z + var8) && world.func_147437_c(x + var7, y - 2, z + var8)) + if (world.isAirBlock(x + var7, y - 1, z + var8) && world.isAirBlock(x + var7, y - 2, z + var8)) return false; } } @@ -62,12 +62,12 @@ public class WorldGenRockpile extends WorldGeneratorBOP this.func_150515_a(world, x, y, z - 1, Blocks.dirt); this.func_150515_a(world, x, y, z + 1, Blocks.dirt); //TODO: setBlockAndMetadata() - this.func_150516_a(world, x, y + 1, z, Blocks.stone, 0); - this.func_150516_a(world, x + 1, y + 1, z, Blocks.stone, 0); - this.func_150516_a(world, x - 1, y + 1, z, Blocks.stone, 0); - this.func_150516_a(world, x, y + 1, z + 1, Blocks.stone, 0); - this.func_150516_a(world, x, y + 1, z - 1, Blocks.stone, 0); - this.func_150516_a(world, x, y + 2, z, Blocks.stone, 0); + this.setBlockAndNotifyAdequately(world, x, y + 1, z, Blocks.stone, 0); + this.setBlockAndNotifyAdequately(world, x + 1, y + 1, z, Blocks.stone, 0); + this.setBlockAndNotifyAdequately(world, x - 1, y + 1, z, Blocks.stone, 0); + this.setBlockAndNotifyAdequately(world, x, y + 1, z + 1, Blocks.stone, 0); + this.setBlockAndNotifyAdequately(world, x, y + 1, z - 1, Blocks.stone, 0); + this.setBlockAndNotifyAdequately(world, x, y + 2, z, Blocks.stone, 0); return true; } else if (var999 == 1) @@ -75,7 +75,7 @@ public class WorldGenRockpile extends WorldGeneratorBOP //TODO: setBlock() this.func_150515_a(world, x, y, z, Blocks.dirt); //TODO: setBlockAndMetadata() - this.func_150516_a(world, x, y + 1, z, Blocks.stone, 0); + this.setBlockAndNotifyAdequately(world, x, y + 1, z, Blocks.stone, 0); return true; } diff --git a/src/main/java/biomesoplenty/common/world/features/WorldGenSplotches.java b/src/main/java/biomesoplenty/common/world/features/WorldGenSplotches.java index 6bde55d1b..e6fb62c48 100644 --- a/src/main/java/biomesoplenty/common/world/features/WorldGenSplotches.java +++ b/src/main/java/biomesoplenty/common/world/features/WorldGenSplotches.java @@ -77,10 +77,10 @@ public class WorldGenSplotches extends WorldGeneratorBOP double var45 = (var44 + 0.5D - var24) / (var28 / 2.0D); //TODO: getBlock() - if (var39 * var39 + var42 * var42 + var45 * var45 < 1.0D && world.func_147439_a(var38, var41, var44) != Blocks.air && (blockList.contains(world.func_147439_a(var38, var41, var44)))) + if (var39 * var39 + var42 * var42 + var45 * var45 < 1.0D && world.getBlock(var38, var41, var44) != Blocks.air && (blockList.contains(world.getBlock(var38, var41, var44)))) { //TODO: setBlockAndMetadata() - this.func_150516_a(world, var38, var41, var44, splotchBlock, splotchBlockMeta); + this.setBlockAndNotifyAdequately(world, var38, var41, var44, splotchBlock, splotchBlockMeta); } } } diff --git a/src/main/java/biomesoplenty/common/world/features/WorldGenWasteland.java b/src/main/java/biomesoplenty/common/world/features/WorldGenWasteland.java index 8b0c9825e..0c8437ae4 100644 --- a/src/main/java/biomesoplenty/common/world/features/WorldGenWasteland.java +++ b/src/main/java/biomesoplenty/common/world/features/WorldGenWasteland.java @@ -18,13 +18,13 @@ public class WorldGenWasteland extends WorldGeneratorBOP public boolean generate(World world, Random random, int x, int y, int z) { //TODO: isAirBlock() - while (world.func_147437_c(x, y, z) && y > 2) + while (world.isAirBlock(x, y, z) && y > 2) { --y; } //TODO: getBlock() - Block block = world.func_147439_a(x, y, z); + Block block = world.getBlock(x, y, z); if (block != BOPBlockHelper.get("driedDirt")) { @@ -37,101 +37,101 @@ public class WorldGenWasteland extends WorldGeneratorBOP for (int var8 = -2; var8 <= 2; ++var8) { //TODO: isAirBlock() isAirBlock() isAirBlock() - if (world.func_147437_c(x + var7, y - 1, z + var8) && world.func_147437_c(x + var7, y - 2, z + var8) && !world.func_147437_c(x + var7, y, z + var8)) + if (world.isAirBlock(x + var7, y - 1, z + var8) && world.isAirBlock(x + var7, y - 2, z + var8) && !world.isAirBlock(x + var7, y, z + var8)) { return false; } } } - world.func_147449_b(x, y, z, BOPBlockHelper.get("driedDirt")); + world.setBlock(x, y, z, BOPBlockHelper.get("driedDirt")); - world.func_147449_b(x - 1, y, z, BOPBlockHelper.get("driedDirt")); - world.func_147449_b(x + 1, y, z, BOPBlockHelper.get("driedDirt")); - world.func_147449_b(x, y, z - 1, BOPBlockHelper.get("driedDirt")); - world.func_147449_b(x, y, z + 1, BOPBlockHelper.get("driedDirt")); + world.setBlock(x - 1, y, z, BOPBlockHelper.get("driedDirt")); + world.setBlock(x + 1, y, z, BOPBlockHelper.get("driedDirt")); + world.setBlock(x, y, z - 1, BOPBlockHelper.get("driedDirt")); + world.setBlock(x, y, z + 1, BOPBlockHelper.get("driedDirt")); - world.func_147449_b(x - 1, y, z - 1, BOPBlockHelper.get("driedDirt")); - world.func_147449_b(x + 1, y, z + 1, BOPBlockHelper.get("driedDirt")); - world.func_147449_b(x - 1, y, z + 1, BOPBlockHelper.get("driedDirt")); - world.func_147449_b(x + 1, y, z - 1, BOPBlockHelper.get("driedDirt")); + world.setBlock(x - 1, y, z - 1, BOPBlockHelper.get("driedDirt")); + world.setBlock(x + 1, y, z + 1, BOPBlockHelper.get("driedDirt")); + world.setBlock(x - 1, y, z + 1, BOPBlockHelper.get("driedDirt")); + world.setBlock(x + 1, y, z - 1, BOPBlockHelper.get("driedDirt")); - world.func_147449_b(x - 2, y, z - 1, BOPBlockHelper.get("driedDirt")); - world.func_147449_b(x - 2, y, z, BOPBlockHelper.get("driedDirt")); - world.func_147449_b(x - 2, y, z + 1, BOPBlockHelper.get("driedDirt")); - world.func_147449_b(x + 2, y, z - 1, BOPBlockHelper.get("driedDirt")); - world.func_147449_b(x + 2, y, z, BOPBlockHelper.get("driedDirt")); - world.func_147449_b(x + 2, y, z + 1, BOPBlockHelper.get("driedDirt")); - world.func_147449_b(x - 1, y, z - 2, BOPBlockHelper.get("driedDirt")); - world.func_147449_b(x, y, z - 2, BOPBlockHelper.get("driedDirt")); - world.func_147449_b(x + 1, y, z - 2, BOPBlockHelper.get("driedDirt")); - world.func_147449_b(x - 1, y, z + 2, BOPBlockHelper.get("driedDirt")); - world.func_147449_b(x, y, z + 2, BOPBlockHelper.get("driedDirt")); - world.func_147449_b(x + 1, y, z + 2, BOPBlockHelper.get("driedDirt")); + world.setBlock(x - 2, y, z - 1, BOPBlockHelper.get("driedDirt")); + world.setBlock(x - 2, y, z, BOPBlockHelper.get("driedDirt")); + world.setBlock(x - 2, y, z + 1, BOPBlockHelper.get("driedDirt")); + world.setBlock(x + 2, y, z - 1, BOPBlockHelper.get("driedDirt")); + world.setBlock(x + 2, y, z, BOPBlockHelper.get("driedDirt")); + world.setBlock(x + 2, y, z + 1, BOPBlockHelper.get("driedDirt")); + world.setBlock(x - 1, y, z - 2, BOPBlockHelper.get("driedDirt")); + world.setBlock(x, y, z - 2, BOPBlockHelper.get("driedDirt")); + world.setBlock(x + 1, y, z - 2, BOPBlockHelper.get("driedDirt")); + world.setBlock(x - 1, y, z + 2, BOPBlockHelper.get("driedDirt")); + world.setBlock(x, y, z + 2, BOPBlockHelper.get("driedDirt")); + world.setBlock(x + 1, y, z + 2, BOPBlockHelper.get("driedDirt")); - world.func_147449_b(x, y + 1, z, BOPBlockHelper.get("driedDirt")); + world.setBlock(x, y + 1, z, BOPBlockHelper.get("driedDirt")); - world.func_147449_b(x - 1, y + 1, z, BOPBlockHelper.get("driedDirt")); - world.func_147449_b(x + 1, y + 1, z, BOPBlockHelper.get("driedDirt")); - world.func_147449_b(x, y + 1, z - 1, BOPBlockHelper.get("driedDirt")); - world.func_147449_b(x, y + 1, z + 1, BOPBlockHelper.get("driedDirt")); + world.setBlock(x - 1, y + 1, z, BOPBlockHelper.get("driedDirt")); + world.setBlock(x + 1, y + 1, z, BOPBlockHelper.get("driedDirt")); + world.setBlock(x, y + 1, z - 1, BOPBlockHelper.get("driedDirt")); + world.setBlock(x, y + 1, z + 1, BOPBlockHelper.get("driedDirt")); - world.func_147449_b(x - 1, y + 1, z - 1, BOPBlockHelper.get("driedDirt")); - world.func_147449_b(x + 1, y + 1, z + 1, BOPBlockHelper.get("driedDirt")); - world.func_147449_b(x - 1, y + 1, z + 1, BOPBlockHelper.get("driedDirt")); - world.func_147449_b(x + 1, y + 1, z - 1, BOPBlockHelper.get("driedDirt")); + world.setBlock(x - 1, y + 1, z - 1, BOPBlockHelper.get("driedDirt")); + world.setBlock(x + 1, y + 1, z + 1, BOPBlockHelper.get("driedDirt")); + world.setBlock(x - 1, y + 1, z + 1, BOPBlockHelper.get("driedDirt")); + world.setBlock(x + 1, y + 1, z - 1, BOPBlockHelper.get("driedDirt")); - world.func_147449_b(x - 2, y + 1, z - 1, BOPBlockHelper.get("driedDirt")); - world.func_147449_b(x - 2, y + 1, z, BOPBlockHelper.get("driedDirt")); - world.func_147449_b(x - 2, y + 1, z + 1, BOPBlockHelper.get("driedDirt")); - world.func_147449_b(x + 2, y + 1, z - 1, BOPBlockHelper.get("driedDirt")); - world.func_147449_b(x + 2, y + 1, z, BOPBlockHelper.get("driedDirt")); - world.func_147449_b(x + 2, y + 1, z + 1, BOPBlockHelper.get("driedDirt")); - world.func_147449_b(x - 1, y + 1, z - 2, BOPBlockHelper.get("driedDirt")); - world.func_147449_b(x, y + 1, z - 2, BOPBlockHelper.get("driedDirt")); - world.func_147449_b(x + 1, y + 1, z - 2, BOPBlockHelper.get("driedDirt")); - world.func_147449_b(x - 1, y + 1, z + 2, BOPBlockHelper.get("driedDirt")); - world.func_147449_b(x, y + 1, z + 2, BOPBlockHelper.get("driedDirt")); - world.func_147449_b(x + 1, y + 1, z + 2, BOPBlockHelper.get("driedDirt")); + world.setBlock(x - 2, y + 1, z - 1, BOPBlockHelper.get("driedDirt")); + world.setBlock(x - 2, y + 1, z, BOPBlockHelper.get("driedDirt")); + world.setBlock(x - 2, y + 1, z + 1, BOPBlockHelper.get("driedDirt")); + world.setBlock(x + 2, y + 1, z - 1, BOPBlockHelper.get("driedDirt")); + world.setBlock(x + 2, y + 1, z, BOPBlockHelper.get("driedDirt")); + world.setBlock(x + 2, y + 1, z + 1, BOPBlockHelper.get("driedDirt")); + world.setBlock(x - 1, y + 1, z - 2, BOPBlockHelper.get("driedDirt")); + world.setBlock(x, y + 1, z - 2, BOPBlockHelper.get("driedDirt")); + world.setBlock(x + 1, y + 1, z - 2, BOPBlockHelper.get("driedDirt")); + world.setBlock(x - 1, y + 1, z + 2, BOPBlockHelper.get("driedDirt")); + world.setBlock(x, y + 1, z + 2, BOPBlockHelper.get("driedDirt")); + world.setBlock(x + 1, y + 1, z + 2, BOPBlockHelper.get("driedDirt")); - world.func_147449_b(x - 1, y + 2, z, BOPBlockHelper.get("driedDirt")); - world.func_147449_b(x + 1, y + 2, z, BOPBlockHelper.get("driedDirt")); - world.func_147449_b(x, y + 2, z - 1, BOPBlockHelper.get("driedDirt")); - world.func_147449_b(x, y + 2, z + 1, BOPBlockHelper.get("driedDirt")); - world.func_147449_b(x - 1, y + 2, z - 1, BOPBlockHelper.get("driedDirt")); - world.func_147449_b(x + 1, y + 2, z + 1, BOPBlockHelper.get("driedDirt")); - world.func_147449_b(x - 1, y + 2, z + 1, BOPBlockHelper.get("driedDirt")); - world.func_147449_b(x + 1, y + 2, z - 1, BOPBlockHelper.get("driedDirt")); + world.setBlock(x - 1, y + 2, z, BOPBlockHelper.get("driedDirt")); + world.setBlock(x + 1, y + 2, z, BOPBlockHelper.get("driedDirt")); + world.setBlock(x, y + 2, z - 1, BOPBlockHelper.get("driedDirt")); + world.setBlock(x, y + 2, z + 1, BOPBlockHelper.get("driedDirt")); + world.setBlock(x - 1, y + 2, z - 1, BOPBlockHelper.get("driedDirt")); + world.setBlock(x + 1, y + 2, z + 1, BOPBlockHelper.get("driedDirt")); + world.setBlock(x - 1, y + 2, z + 1, BOPBlockHelper.get("driedDirt")); + world.setBlock(x + 1, y + 2, z - 1, BOPBlockHelper.get("driedDirt")); - world.func_147449_b(x, y + 2, z, BOPBlockHelper.get("driedDirt")); + world.setBlock(x, y + 2, z, BOPBlockHelper.get("driedDirt")); - world.func_147449_b(x - 1, y + 3, z, BOPBlockHelper.get("driedDirt")); - world.func_147449_b(x + 1, y + 3, z, BOPBlockHelper.get("driedDirt")); - world.func_147449_b(x, y + 3, z - 1, BOPBlockHelper.get("driedDirt")); - world.func_147449_b(x, y + 3, z + 1, BOPBlockHelper.get("driedDirt")); - world.func_147449_b(x - 1, y + 3, z - 1, BOPBlockHelper.get("driedDirt")); - world.func_147449_b(x + 1, y + 3, z + 1, BOPBlockHelper.get("driedDirt")); - world.func_147449_b(x - 1, y + 3, z + 1, BOPBlockHelper.get("driedDirt")); - world.func_147449_b(x + 1, y + 3, z - 1, BOPBlockHelper.get("driedDirt")); + world.setBlock(x - 1, y + 3, z, BOPBlockHelper.get("driedDirt")); + world.setBlock(x + 1, y + 3, z, BOPBlockHelper.get("driedDirt")); + world.setBlock(x, y + 3, z - 1, BOPBlockHelper.get("driedDirt")); + world.setBlock(x, y + 3, z + 1, BOPBlockHelper.get("driedDirt")); + world.setBlock(x - 1, y + 3, z - 1, BOPBlockHelper.get("driedDirt")); + world.setBlock(x + 1, y + 3, z + 1, BOPBlockHelper.get("driedDirt")); + world.setBlock(x - 1, y + 3, z + 1, BOPBlockHelper.get("driedDirt")); + world.setBlock(x + 1, y + 3, z - 1, BOPBlockHelper.get("driedDirt")); - world.func_147449_b(x, y + 3, z, BOPBlockHelper.get("driedDirt")); + world.setBlock(x, y + 3, z, BOPBlockHelper.get("driedDirt")); - world.func_147449_b(x - 1, y + 4, z, BOPBlockHelper.get("driedDirt")); - world.func_147449_b(x + 1, y + 4, z, BOPBlockHelper.get("driedDirt")); - world.func_147449_b(x, y + 4, z - 1, BOPBlockHelper.get("driedDirt")); - world.func_147449_b(x, y + 4, z + 1, BOPBlockHelper.get("driedDirt")); + world.setBlock(x - 1, y + 4, z, BOPBlockHelper.get("driedDirt")); + world.setBlock(x + 1, y + 4, z, BOPBlockHelper.get("driedDirt")); + world.setBlock(x, y + 4, z - 1, BOPBlockHelper.get("driedDirt")); + world.setBlock(x, y + 4, z + 1, BOPBlockHelper.get("driedDirt")); - world.func_147449_b(x, y + 4, z, BOPBlockHelper.get("driedDirt")); + world.setBlock(x, y + 4, z, BOPBlockHelper.get("driedDirt")); - world.func_147449_b(x - 1, y + 5, z, BOPBlockHelper.get("driedDirt")); - world.func_147449_b(x + 1, y + 5, z, BOPBlockHelper.get("driedDirt")); - world.func_147449_b(x, y + 5, z - 1, BOPBlockHelper.get("driedDirt")); - world.func_147449_b(x, y + 5, z + 1, BOPBlockHelper.get("driedDirt")); + world.setBlock(x - 1, y + 5, z, BOPBlockHelper.get("driedDirt")); + world.setBlock(x + 1, y + 5, z, BOPBlockHelper.get("driedDirt")); + world.setBlock(x, y + 5, z - 1, BOPBlockHelper.get("driedDirt")); + world.setBlock(x, y + 5, z + 1, BOPBlockHelper.get("driedDirt")); - world.func_147449_b(x, y + 5, z, BOPBlockHelper.get("driedDirt")); - world.func_147449_b(x, y + 6, z, BOPBlockHelper.get("driedDirt")); - world.func_147449_b(x, y + 7, z, BOPBlockHelper.get("driedDirt")); - world.func_147449_b(x, y + 8, z, BOPBlockHelper.get("driedDirt")); + world.setBlock(x, y + 5, z, BOPBlockHelper.get("driedDirt")); + world.setBlock(x, y + 6, z, BOPBlockHelper.get("driedDirt")); + world.setBlock(x, y + 7, z, BOPBlockHelper.get("driedDirt")); + world.setBlock(x, y + 8, z, BOPBlockHelper.get("driedDirt")); return true; } diff --git a/src/main/java/biomesoplenty/common/world/features/WorldGenWasteland2.java b/src/main/java/biomesoplenty/common/world/features/WorldGenWasteland2.java index fe9ad17d6..474f0cae0 100644 --- a/src/main/java/biomesoplenty/common/world/features/WorldGenWasteland2.java +++ b/src/main/java/biomesoplenty/common/world/features/WorldGenWasteland2.java @@ -17,13 +17,13 @@ public class WorldGenWasteland2 extends WorldGeneratorBOP public boolean generate(World world, Random random, int x, int y, int z) { //TODO: isAirBlock() - while (world.func_147437_c(x, y, z) && y > 2) + while (world.isAirBlock(x, y, z) && y > 2) { --y; } //TODO: getBlock() - Block block = world.func_147439_a(x, y, z); + Block block = world.getBlock(x, y, z); if (block != BOPBlockHelper.get("driedDirt")) { @@ -36,144 +36,144 @@ public class WorldGenWasteland2 extends WorldGeneratorBOP for (int var8 = -2; var8 <= 2; ++var8) { //TODO: isAirBlock() isAirBlock() isAirBlock() - if (world.func_147437_c(x + var7, y - 1, z + var8) && world.func_147437_c(x + var7, y - 2, z + var8) && !world.func_147437_c(x + var7, y, z + var8)) + if (world.isAirBlock(x + var7, y - 1, z + var8) && world.isAirBlock(x + var7, y - 2, z + var8) && !world.isAirBlock(x + var7, y, z + var8)) { return false; } } } - world.func_147449_b(x, y, z, BOPBlockHelper.get("driedDirt")); + world.setBlock(x, y, z, BOPBlockHelper.get("driedDirt")); - world.func_147449_b(x - 1, y, z, BOPBlockHelper.get("driedDirt")); - world.func_147449_b(x + 1, y, z, BOPBlockHelper.get("driedDirt")); - world.func_147449_b(x, y, z - 1, BOPBlockHelper.get("driedDirt")); - world.func_147449_b(x, y, z + 1, BOPBlockHelper.get("driedDirt")); + world.setBlock(x - 1, y, z, BOPBlockHelper.get("driedDirt")); + world.setBlock(x + 1, y, z, BOPBlockHelper.get("driedDirt")); + world.setBlock(x, y, z - 1, BOPBlockHelper.get("driedDirt")); + world.setBlock(x, y, z + 1, BOPBlockHelper.get("driedDirt")); - world.func_147449_b(x - 1, y, z - 1, BOPBlockHelper.get("driedDirt")); - world.func_147449_b(x + 1, y, z + 1, BOPBlockHelper.get("driedDirt")); - world.func_147449_b(x - 1, y, z + 1, BOPBlockHelper.get("driedDirt")); - world.func_147449_b(x + 1, y, z - 1, BOPBlockHelper.get("driedDirt")); + world.setBlock(x - 1, y, z - 1, BOPBlockHelper.get("driedDirt")); + world.setBlock(x + 1, y, z + 1, BOPBlockHelper.get("driedDirt")); + world.setBlock(x - 1, y, z + 1, BOPBlockHelper.get("driedDirt")); + world.setBlock(x + 1, y, z - 1, BOPBlockHelper.get("driedDirt")); - world.func_147449_b(x - 2, y, z - 1, BOPBlockHelper.get("driedDirt")); - world.func_147449_b(x - 2, y, z, BOPBlockHelper.get("driedDirt")); - world.func_147449_b(x - 2, y, z + 1, BOPBlockHelper.get("driedDirt")); - world.func_147449_b(x + 2, y, z - 1, BOPBlockHelper.get("driedDirt")); - world.func_147449_b(x + 2, y, z, BOPBlockHelper.get("driedDirt")); - world.func_147449_b(x + 2, y, z + 1, BOPBlockHelper.get("driedDirt")); - world.func_147449_b(x - 1, y, z - 2, BOPBlockHelper.get("driedDirt")); - world.func_147449_b(x, y, z - 2, BOPBlockHelper.get("driedDirt")); - world.func_147449_b(x + 1, y, z - 2, BOPBlockHelper.get("driedDirt")); - world.func_147449_b(x - 1, y, z + 2, BOPBlockHelper.get("driedDirt")); - world.func_147449_b(x, y, z + 2, BOPBlockHelper.get("driedDirt")); - world.func_147449_b(x + 1, y, z + 2, BOPBlockHelper.get("driedDirt")); + world.setBlock(x - 2, y, z - 1, BOPBlockHelper.get("driedDirt")); + world.setBlock(x - 2, y, z, BOPBlockHelper.get("driedDirt")); + world.setBlock(x - 2, y, z + 1, BOPBlockHelper.get("driedDirt")); + world.setBlock(x + 2, y, z - 1, BOPBlockHelper.get("driedDirt")); + world.setBlock(x + 2, y, z, BOPBlockHelper.get("driedDirt")); + world.setBlock(x + 2, y, z + 1, BOPBlockHelper.get("driedDirt")); + world.setBlock(x - 1, y, z - 2, BOPBlockHelper.get("driedDirt")); + world.setBlock(x, y, z - 2, BOPBlockHelper.get("driedDirt")); + world.setBlock(x + 1, y, z - 2, BOPBlockHelper.get("driedDirt")); + world.setBlock(x - 1, y, z + 2, BOPBlockHelper.get("driedDirt")); + world.setBlock(x, y, z + 2, BOPBlockHelper.get("driedDirt")); + world.setBlock(x + 1, y, z + 2, BOPBlockHelper.get("driedDirt")); - world.func_147449_b(x, y + 1, z, BOPBlockHelper.get("driedDirt")); + world.setBlock(x, y + 1, z, BOPBlockHelper.get("driedDirt")); - world.func_147449_b(x - 1, y + 1, z, BOPBlockHelper.get("driedDirt")); - world.func_147449_b(x + 1, y + 1, z, BOPBlockHelper.get("driedDirt")); - world.func_147449_b(x, y + 1, z - 1, BOPBlockHelper.get("driedDirt")); - world.func_147449_b(x, y + 1, z + 1, BOPBlockHelper.get("driedDirt")); + world.setBlock(x - 1, y + 1, z, BOPBlockHelper.get("driedDirt")); + world.setBlock(x + 1, y + 1, z, BOPBlockHelper.get("driedDirt")); + world.setBlock(x, y + 1, z - 1, BOPBlockHelper.get("driedDirt")); + world.setBlock(x, y + 1, z + 1, BOPBlockHelper.get("driedDirt")); - world.func_147449_b(x - 1, y + 1, z - 1, BOPBlockHelper.get("driedDirt")); - world.func_147449_b(x + 1, y + 1, z + 1, BOPBlockHelper.get("driedDirt")); - world.func_147449_b(x - 1, y + 1, z + 1, BOPBlockHelper.get("driedDirt")); - world.func_147449_b(x + 1, y + 1, z - 1, BOPBlockHelper.get("driedDirt")); + world.setBlock(x - 1, y + 1, z - 1, BOPBlockHelper.get("driedDirt")); + world.setBlock(x + 1, y + 1, z + 1, BOPBlockHelper.get("driedDirt")); + world.setBlock(x - 1, y + 1, z + 1, BOPBlockHelper.get("driedDirt")); + world.setBlock(x + 1, y + 1, z - 1, BOPBlockHelper.get("driedDirt")); - world.func_147449_b(x - 2, y + 1, z - 1, BOPBlockHelper.get("driedDirt")); - world.func_147449_b(x - 2, y + 1, z, BOPBlockHelper.get("driedDirt")); - world.func_147449_b(x - 2, y + 1, z + 1, BOPBlockHelper.get("driedDirt")); - world.func_147449_b(x + 2, y + 1, z - 1, BOPBlockHelper.get("driedDirt")); - world.func_147449_b(x + 2, y + 1, z, BOPBlockHelper.get("driedDirt")); - world.func_147449_b(x + 2, y + 1, z + 1, BOPBlockHelper.get("driedDirt")); - world.func_147449_b(x - 1, y + 1, z - 2, BOPBlockHelper.get("driedDirt")); - world.func_147449_b(x, y + 1, z - 2, BOPBlockHelper.get("driedDirt")); - world.func_147449_b(x + 1, y + 1, z - 2, BOPBlockHelper.get("driedDirt")); - world.func_147449_b(x - 1, y + 1, z + 2, BOPBlockHelper.get("driedDirt")); - world.func_147449_b(x, y + 1, z + 2, BOPBlockHelper.get("driedDirt")); - world.func_147449_b(x + 1, y + 1, z + 2, BOPBlockHelper.get("driedDirt")); + world.setBlock(x - 2, y + 1, z - 1, BOPBlockHelper.get("driedDirt")); + world.setBlock(x - 2, y + 1, z, BOPBlockHelper.get("driedDirt")); + world.setBlock(x - 2, y + 1, z + 1, BOPBlockHelper.get("driedDirt")); + world.setBlock(x + 2, y + 1, z - 1, BOPBlockHelper.get("driedDirt")); + world.setBlock(x + 2, y + 1, z, BOPBlockHelper.get("driedDirt")); + world.setBlock(x + 2, y + 1, z + 1, BOPBlockHelper.get("driedDirt")); + world.setBlock(x - 1, y + 1, z - 2, BOPBlockHelper.get("driedDirt")); + world.setBlock(x, y + 1, z - 2, BOPBlockHelper.get("driedDirt")); + world.setBlock(x + 1, y + 1, z - 2, BOPBlockHelper.get("driedDirt")); + world.setBlock(x - 1, y + 1, z + 2, BOPBlockHelper.get("driedDirt")); + world.setBlock(x, y + 1, z + 2, BOPBlockHelper.get("driedDirt")); + world.setBlock(x + 1, y + 1, z + 2, BOPBlockHelper.get("driedDirt")); - world.func_147449_b(x - 1, y + 2, z, BOPBlockHelper.get("driedDirt")); - world.func_147449_b(x + 1, y + 2, z, BOPBlockHelper.get("driedDirt")); - world.func_147449_b(x, y + 2, z - 1, BOPBlockHelper.get("driedDirt")); - world.func_147449_b(x, y + 2, z + 1, BOPBlockHelper.get("driedDirt")); - world.func_147449_b(x - 1, y + 2, z - 1, BOPBlockHelper.get("driedDirt")); - world.func_147449_b(x + 1, y + 2, z + 1, BOPBlockHelper.get("driedDirt")); - world.func_147449_b(x - 1, y + 2, z + 1, BOPBlockHelper.get("driedDirt")); - world.func_147449_b(x + 1, y + 2, z - 1, BOPBlockHelper.get("driedDirt")); + world.setBlock(x - 1, y + 2, z, BOPBlockHelper.get("driedDirt")); + world.setBlock(x + 1, y + 2, z, BOPBlockHelper.get("driedDirt")); + world.setBlock(x, y + 2, z - 1, BOPBlockHelper.get("driedDirt")); + world.setBlock(x, y + 2, z + 1, BOPBlockHelper.get("driedDirt")); + world.setBlock(x - 1, y + 2, z - 1, BOPBlockHelper.get("driedDirt")); + world.setBlock(x + 1, y + 2, z + 1, BOPBlockHelper.get("driedDirt")); + world.setBlock(x - 1, y + 2, z + 1, BOPBlockHelper.get("driedDirt")); + world.setBlock(x + 1, y + 2, z - 1, BOPBlockHelper.get("driedDirt")); - world.func_147449_b(x - 2, y + 2, z - 1, BOPBlockHelper.get("driedDirt")); - world.func_147449_b(x - 2, y + 2, z, BOPBlockHelper.get("driedDirt")); - world.func_147449_b(x - 2, y + 2, z + 1, BOPBlockHelper.get("driedDirt")); - world.func_147449_b(x + 2, y + 2, z - 1, BOPBlockHelper.get("driedDirt")); - world.func_147449_b(x + 2, y + 2, z, BOPBlockHelper.get("driedDirt")); - world.func_147449_b(x + 2, y + 2, z + 1, BOPBlockHelper.get("driedDirt")); - world.func_147449_b(x - 1, y + 2, z - 2, BOPBlockHelper.get("driedDirt")); - world.func_147449_b(x, y + 2, z - 2, BOPBlockHelper.get("driedDirt")); - world.func_147449_b(x + 1, y + 2, z - 2, BOPBlockHelper.get("driedDirt")); - world.func_147449_b(x - 1, y + 2, z + 2, BOPBlockHelper.get("driedDirt")); - world.func_147449_b(x, y + 2, z + 2, BOPBlockHelper.get("driedDirt")); - world.func_147449_b(x + 1, y + 2, z + 2, BOPBlockHelper.get("driedDirt")); + world.setBlock(x - 2, y + 2, z - 1, BOPBlockHelper.get("driedDirt")); + world.setBlock(x - 2, y + 2, z, BOPBlockHelper.get("driedDirt")); + world.setBlock(x - 2, y + 2, z + 1, BOPBlockHelper.get("driedDirt")); + world.setBlock(x + 2, y + 2, z - 1, BOPBlockHelper.get("driedDirt")); + world.setBlock(x + 2, y + 2, z, BOPBlockHelper.get("driedDirt")); + world.setBlock(x + 2, y + 2, z + 1, BOPBlockHelper.get("driedDirt")); + world.setBlock(x - 1, y + 2, z - 2, BOPBlockHelper.get("driedDirt")); + world.setBlock(x, y + 2, z - 2, BOPBlockHelper.get("driedDirt")); + world.setBlock(x + 1, y + 2, z - 2, BOPBlockHelper.get("driedDirt")); + world.setBlock(x - 1, y + 2, z + 2, BOPBlockHelper.get("driedDirt")); + world.setBlock(x, y + 2, z + 2, BOPBlockHelper.get("driedDirt")); + world.setBlock(x + 1, y + 2, z + 2, BOPBlockHelper.get("driedDirt")); - world.func_147449_b(x, y + 2, z, BOPBlockHelper.get("driedDirt")); + world.setBlock(x, y + 2, z, BOPBlockHelper.get("driedDirt")); - world.func_147449_b(x - 1, y + 3, z, BOPBlockHelper.get("driedDirt")); - world.func_147449_b(x + 1, y + 3, z, BOPBlockHelper.get("driedDirt")); - world.func_147449_b(x, y + 3, z - 1, BOPBlockHelper.get("driedDirt")); - world.func_147449_b(x, y + 3, z + 1, BOPBlockHelper.get("driedDirt")); - world.func_147449_b(x - 1, y + 3, z - 1, BOPBlockHelper.get("driedDirt")); - world.func_147449_b(x + 1, y + 3, z + 1, BOPBlockHelper.get("driedDirt")); - world.func_147449_b(x - 1, y + 3, z + 1, BOPBlockHelper.get("driedDirt")); - world.func_147449_b(x + 1, y + 3, z - 1, BOPBlockHelper.get("driedDirt")); + world.setBlock(x - 1, y + 3, z, BOPBlockHelper.get("driedDirt")); + world.setBlock(x + 1, y + 3, z, BOPBlockHelper.get("driedDirt")); + world.setBlock(x, y + 3, z - 1, BOPBlockHelper.get("driedDirt")); + world.setBlock(x, y + 3, z + 1, BOPBlockHelper.get("driedDirt")); + world.setBlock(x - 1, y + 3, z - 1, BOPBlockHelper.get("driedDirt")); + world.setBlock(x + 1, y + 3, z + 1, BOPBlockHelper.get("driedDirt")); + world.setBlock(x - 1, y + 3, z + 1, BOPBlockHelper.get("driedDirt")); + world.setBlock(x + 1, y + 3, z - 1, BOPBlockHelper.get("driedDirt")); - world.func_147449_b(x, y + 3, z, BOPBlockHelper.get("driedDirt")); + world.setBlock(x, y + 3, z, BOPBlockHelper.get("driedDirt")); - world.func_147449_b(x - 1, y + 4, z, BOPBlockHelper.get("driedDirt")); - world.func_147449_b(x + 1, y + 4, z, BOPBlockHelper.get("driedDirt")); - world.func_147449_b(x, y + 4, z - 1, BOPBlockHelper.get("driedDirt")); - world.func_147449_b(x, y + 4, z + 1, BOPBlockHelper.get("driedDirt")); - world.func_147449_b(x - 1, y + 4, z - 1, BOPBlockHelper.get("driedDirt")); - world.func_147449_b(x + 1, y + 4, z + 1, BOPBlockHelper.get("driedDirt")); - world.func_147449_b(x - 1, y + 4, z + 1, BOPBlockHelper.get("driedDirt")); - world.func_147449_b(x + 1, y + 4, z - 1, BOPBlockHelper.get("driedDirt")); + world.setBlock(x - 1, y + 4, z, BOPBlockHelper.get("driedDirt")); + world.setBlock(x + 1, y + 4, z, BOPBlockHelper.get("driedDirt")); + world.setBlock(x, y + 4, z - 1, BOPBlockHelper.get("driedDirt")); + world.setBlock(x, y + 4, z + 1, BOPBlockHelper.get("driedDirt")); + world.setBlock(x - 1, y + 4, z - 1, BOPBlockHelper.get("driedDirt")); + world.setBlock(x + 1, y + 4, z + 1, BOPBlockHelper.get("driedDirt")); + world.setBlock(x - 1, y + 4, z + 1, BOPBlockHelper.get("driedDirt")); + world.setBlock(x + 1, y + 4, z - 1, BOPBlockHelper.get("driedDirt")); - world.func_147449_b(x, y + 4, z, BOPBlockHelper.get("driedDirt")); + world.setBlock(x, y + 4, z, BOPBlockHelper.get("driedDirt")); - world.func_147449_b(x - 1, y + 5, z, BOPBlockHelper.get("driedDirt")); - world.func_147449_b(x + 1, y + 5, z, BOPBlockHelper.get("driedDirt")); - world.func_147449_b(x, y + 5, z - 1, BOPBlockHelper.get("driedDirt")); - world.func_147449_b(x, y + 5, z + 1, BOPBlockHelper.get("driedDirt")); - world.func_147449_b(x - 1, y + 5, z - 1, BOPBlockHelper.get("driedDirt")); - world.func_147449_b(x + 1, y + 5, z + 1, BOPBlockHelper.get("driedDirt")); - world.func_147449_b(x - 1, y + 5, z + 1, BOPBlockHelper.get("driedDirt")); - world.func_147449_b(x + 1, y + 5, z - 1, BOPBlockHelper.get("driedDirt")); + world.setBlock(x - 1, y + 5, z, BOPBlockHelper.get("driedDirt")); + world.setBlock(x + 1, y + 5, z, BOPBlockHelper.get("driedDirt")); + world.setBlock(x, y + 5, z - 1, BOPBlockHelper.get("driedDirt")); + world.setBlock(x, y + 5, z + 1, BOPBlockHelper.get("driedDirt")); + world.setBlock(x - 1, y + 5, z - 1, BOPBlockHelper.get("driedDirt")); + world.setBlock(x + 1, y + 5, z + 1, BOPBlockHelper.get("driedDirt")); + world.setBlock(x - 1, y + 5, z + 1, BOPBlockHelper.get("driedDirt")); + world.setBlock(x + 1, y + 5, z - 1, BOPBlockHelper.get("driedDirt")); - world.func_147449_b(x, y + 5, z, BOPBlockHelper.get("driedDirt")); + world.setBlock(x, y + 5, z, BOPBlockHelper.get("driedDirt")); - world.func_147449_b(x - 1, y + 6, z, BOPBlockHelper.get("driedDirt")); - world.func_147449_b(x + 1, y + 6, z, BOPBlockHelper.get("driedDirt")); - world.func_147449_b(x, y + 6, z - 1, BOPBlockHelper.get("driedDirt")); - world.func_147449_b(x, y + 6, z + 1, BOPBlockHelper.get("driedDirt")); + world.setBlock(x - 1, y + 6, z, BOPBlockHelper.get("driedDirt")); + world.setBlock(x + 1, y + 6, z, BOPBlockHelper.get("driedDirt")); + world.setBlock(x, y + 6, z - 1, BOPBlockHelper.get("driedDirt")); + world.setBlock(x, y + 6, z + 1, BOPBlockHelper.get("driedDirt")); - world.func_147449_b(x, y + 6, z, BOPBlockHelper.get("driedDirt")); + world.setBlock(x, y + 6, z, BOPBlockHelper.get("driedDirt")); - world.func_147449_b(x - 1, y + 7, z, BOPBlockHelper.get("driedDirt")); - world.func_147449_b(x + 1, y + 7, z, BOPBlockHelper.get("driedDirt")); - world.func_147449_b(x, y + 7, z - 1, BOPBlockHelper.get("driedDirt")); - world.func_147449_b(x, y + 7, z + 1, BOPBlockHelper.get("driedDirt")); + world.setBlock(x - 1, y + 7, z, BOPBlockHelper.get("driedDirt")); + world.setBlock(x + 1, y + 7, z, BOPBlockHelper.get("driedDirt")); + world.setBlock(x, y + 7, z - 1, BOPBlockHelper.get("driedDirt")); + world.setBlock(x, y + 7, z + 1, BOPBlockHelper.get("driedDirt")); - world.func_147449_b(x, y + 7, z, BOPBlockHelper.get("driedDirt")); + world.setBlock(x, y + 7, z, BOPBlockHelper.get("driedDirt")); - world.func_147449_b(x - 1, y + 8, z, BOPBlockHelper.get("driedDirt")); - world.func_147449_b(x + 1, y + 8, z, BOPBlockHelper.get("driedDirt")); - world.func_147449_b(x, y + 8, z - 1, BOPBlockHelper.get("driedDirt")); - world.func_147449_b(x, y + 8, z + 1, BOPBlockHelper.get("driedDirt")); + world.setBlock(x - 1, y + 8, z, BOPBlockHelper.get("driedDirt")); + world.setBlock(x + 1, y + 8, z, BOPBlockHelper.get("driedDirt")); + world.setBlock(x, y + 8, z - 1, BOPBlockHelper.get("driedDirt")); + world.setBlock(x, y + 8, z + 1, BOPBlockHelper.get("driedDirt")); - world.func_147449_b(x, y + 8, z, BOPBlockHelper.get("driedDirt")); - world.func_147449_b(x, y + 9, z, BOPBlockHelper.get("driedDirt")); - world.func_147449_b(x, y + 10, z, BOPBlockHelper.get("driedDirt")); - world.func_147449_b(x, y + 11, z, BOPBlockHelper.get("driedDirt")); - world.func_147449_b(x, y + 12, z, BOPBlockHelper.get("driedDirt")); + world.setBlock(x, y + 8, z, BOPBlockHelper.get("driedDirt")); + world.setBlock(x, y + 9, z, BOPBlockHelper.get("driedDirt")); + world.setBlock(x, y + 10, z, BOPBlockHelper.get("driedDirt")); + world.setBlock(x, y + 11, z, BOPBlockHelper.get("driedDirt")); + world.setBlock(x, y + 12, z, BOPBlockHelper.get("driedDirt")); return true; } diff --git a/src/main/java/biomesoplenty/common/world/features/WorldGenWasteland3.java b/src/main/java/biomesoplenty/common/world/features/WorldGenWasteland3.java index dae1993ef..74b282fcd 100644 --- a/src/main/java/biomesoplenty/common/world/features/WorldGenWasteland3.java +++ b/src/main/java/biomesoplenty/common/world/features/WorldGenWasteland3.java @@ -17,16 +17,16 @@ public class WorldGenWasteland3 extends WorldGeneratorBOP public boolean generate(World world, Random random, int x, int y, int z) { //TODO: isAirBlock() - while (world.func_147437_c(x, y, z) && y > 2) + while (world.isAirBlock(x, y, z) && y > 2) { --y; } - Block var6 = world.func_147439_a(x, y, z); - Block var95 = world.func_147439_a(x - 1, y, z); - Block var96 = world.func_147439_a(x + 1, y, z); - Block var97 = world.func_147439_a(x, y, z - 1); - Block var98 = world.func_147439_a(x, y, z + 1); + Block var6 = world.getBlock(x, y, z); + Block var95 = world.getBlock(x - 1, y, z); + Block var96 = world.getBlock(x + 1, y, z); + Block var97 = world.getBlock(x, y, z - 1); + Block var98 = world.getBlock(x, y, z + 1); if (var6 != BOPBlockHelper.get("driedDirt") || var95 != BOPBlockHelper.get("driedDirt") || var96 != BOPBlockHelper.get("driedDirt") || var97 != BOPBlockHelper.get("driedDirt") || var98 != BOPBlockHelper.get("driedDirt") ) return false; @@ -37,7 +37,7 @@ public class WorldGenWasteland3 extends WorldGeneratorBOP for (int var8 = -2; var8 <= 2; ++var8) { //TODO: isAirBlock() isAirBlock() - if (world.func_147437_c(x + var7, y - 1, z + var8) && world.func_147437_c(x + var7, y - 2, z + var8)) + if (world.isAirBlock(x + var7, y - 1, z + var8) && world.isAirBlock(x + var7, y - 2, z + var8)) { return false; } @@ -48,23 +48,23 @@ public class WorldGenWasteland3 extends WorldGeneratorBOP if (var999 == 0) { - world.func_147449_b(x, y, z, BOPBlockHelper.get("driedDirt")); - world.func_147449_b(x - 1, y, z, BOPBlockHelper.get("driedDirt")); - world.func_147449_b(x + 1, y, z, BOPBlockHelper.get("driedDirt")); - world.func_147449_b(x, y, z - 1, BOPBlockHelper.get("driedDirt")); - world.func_147449_b(x, y, z + 1, BOPBlockHelper.get("driedDirt")); - this.func_150516_a(world, x, y + 1, z, BOPBlockHelper.get("driedDirt"), 0); - this.func_150516_a(world, x + 1, y + 1, z, BOPBlockHelper.get("driedDirt"), 0); - this.func_150516_a(world, x - 1, y + 1, z, BOPBlockHelper.get("driedDirt"), 0); - this.func_150516_a(world, x, y + 1, z + 1, BOPBlockHelper.get("driedDirt"), 0); - this.func_150516_a(world, x, y + 1, z - 1, BOPBlockHelper.get("driedDirt"), 0); - this.func_150516_a(world, x, y + 2, z, BOPBlockHelper.get("driedDirt"), 0); + world.setBlock(x, y, z, BOPBlockHelper.get("driedDirt")); + world.setBlock(x - 1, y, z, BOPBlockHelper.get("driedDirt")); + world.setBlock(x + 1, y, z, BOPBlockHelper.get("driedDirt")); + world.setBlock(x, y, z - 1, BOPBlockHelper.get("driedDirt")); + world.setBlock(x, y, z + 1, BOPBlockHelper.get("driedDirt")); + this.setBlockAndNotifyAdequately(world, x, y + 1, z, BOPBlockHelper.get("driedDirt"), 0); + this.setBlockAndNotifyAdequately(world, x + 1, y + 1, z, BOPBlockHelper.get("driedDirt"), 0); + this.setBlockAndNotifyAdequately(world, x - 1, y + 1, z, BOPBlockHelper.get("driedDirt"), 0); + this.setBlockAndNotifyAdequately(world, x, y + 1, z + 1, BOPBlockHelper.get("driedDirt"), 0); + this.setBlockAndNotifyAdequately(world, x, y + 1, z - 1, BOPBlockHelper.get("driedDirt"), 0); + this.setBlockAndNotifyAdequately(world, x, y + 2, z, BOPBlockHelper.get("driedDirt"), 0); return true; } if (var999 == 1) { - world.func_147449_b(x, y, z, BOPBlockHelper.get("driedDirt")); - this.func_150516_a(world, x, y + 1, z, BOPBlockHelper.get("driedDirt"), 0); + world.setBlock(x, y, z, BOPBlockHelper.get("driedDirt")); + this.setBlockAndNotifyAdequately(world, x, y + 1, z, BOPBlockHelper.get("driedDirt"), 0); return true; } diff --git a/src/main/java/biomesoplenty/common/world/features/WorldGenWasteland4.java b/src/main/java/biomesoplenty/common/world/features/WorldGenWasteland4.java index ef98b7d95..ab311a0c1 100644 --- a/src/main/java/biomesoplenty/common/world/features/WorldGenWasteland4.java +++ b/src/main/java/biomesoplenty/common/world/features/WorldGenWasteland4.java @@ -18,16 +18,16 @@ public class WorldGenWasteland4 extends WorldGeneratorBOP public boolean generate(World world, Random random, int x, int y, int z) { //TODO: isAirBlock() - while (world.func_147437_c(x, y, z) && y > 2) + while (world.isAirBlock(x, y, z) && y > 2) { --y; } - Block var6 = world.func_147439_a(x, y, z); - Block var95 = world.func_147439_a(x - 1, y, z); - Block var96 = world.func_147439_a(x + 1, y, z); - Block var97 = world.func_147439_a(x, y, z - 1); - Block var98 = world.func_147439_a(x, y, z + 1); + Block var6 = world.getBlock(x, y, z); + Block var95 = world.getBlock(x - 1, y, z); + Block var96 = world.getBlock(x + 1, y, z); + Block var97 = world.getBlock(x, y, z - 1); + Block var98 = world.getBlock(x, y, z + 1); if (var6 != BOPBlockHelper.get("driedDirt") || var95 != BOPBlockHelper.get("driedDirt") || var96 != BOPBlockHelper.get("driedDirt") || var97 != BOPBlockHelper.get("driedDirt") || var98 != BOPBlockHelper.get("driedDirt") ) return false; @@ -38,7 +38,7 @@ public class WorldGenWasteland4 extends WorldGeneratorBOP for (int var8 = -2; var8 <= 2; ++var8) { //TODO: isAirBlock() isAirBlock() - if (world.func_147437_c(x + var7, y - 1, z + var8) && world.func_147437_c(x + var7, y - 2, z + var8)) + if (world.isAirBlock(x + var7, y - 1, z + var8) && world.isAirBlock(x + var7, y - 2, z + var8)) { return false; } diff --git a/src/main/java/biomesoplenty/common/world/features/WorldGenWaterReeds.java b/src/main/java/biomesoplenty/common/world/features/WorldGenWaterReeds.java index 80ecf68c8..a6599a758 100644 --- a/src/main/java/biomesoplenty/common/world/features/WorldGenWaterReeds.java +++ b/src/main/java/biomesoplenty/common/world/features/WorldGenWaterReeds.java @@ -24,15 +24,15 @@ public class WorldGenWaterReeds extends WorldGeneratorBOP int k1 = z + random.nextInt(8) - random.nextInt(8); //TODO: isAirBlock() canReplace() - if (world.func_147437_c(i1, j1, k1) && BOPBlockHelper.get("plants").func_149705_a(world, i1, j1, k1, 0, new ItemStack(BOPBlockHelper.get("plants"), 1, 14))) + if (world.isAirBlock(i1, j1, k1) && BOPBlockHelper.get("plants").canReplace(world, i1, j1, k1, 0, new ItemStack(BOPBlockHelper.get("plants"), 1, 14))) { for (int i = 4; i > -4; --i) { //TODO: getBlock() - if (world.func_147439_a(i1 - i, j1 - 1, k1 - i) != Blocks.water) + if (world.getBlock(i1 - i, j1 - 1, k1 - i) != Blocks.water) { //TODO: setBlock() - world.func_147465_d(i1, j1, k1, BOPBlockHelper.get("plants"), 14, 2); + world.setBlock(i1, j1, k1, BOPBlockHelper.get("plants"), 14, 2); } } } diff --git a/src/main/java/biomesoplenty/common/world/features/WorldGenWaterSpring.java b/src/main/java/biomesoplenty/common/world/features/WorldGenWaterSpring.java index 80ebca435..c65eb047d 100644 --- a/src/main/java/biomesoplenty/common/world/features/WorldGenWaterSpring.java +++ b/src/main/java/biomesoplenty/common/world/features/WorldGenWaterSpring.java @@ -64,11 +64,11 @@ public class WorldGenWaterSpring extends WorldGenerator { double var45 = (var44 + 0.5D - var24) / (var28 / 2.0D); - Block block = world.func_147439_a(var38, var41, var44); + Block block = world.getBlock(var38, var41, var44); if (var39 * var39 + var42 * var42 + var45 * var45 < 1.0D && block == BOPBlockHelper.get("holyStone")) { //world.setBlock(var38, var41, var44, minableBlockId); - world.func_147449_b(var38, var41, var44, minableBlockId); + world.setBlock(var38, var41, var44, minableBlockId); } } } diff --git a/src/main/java/biomesoplenty/common/world/features/WorldGenWaterside.java b/src/main/java/biomesoplenty/common/world/features/WorldGenWaterside.java index 4c81a4599..6fd497455 100644 --- a/src/main/java/biomesoplenty/common/world/features/WorldGenWaterside.java +++ b/src/main/java/biomesoplenty/common/world/features/WorldGenWaterside.java @@ -33,7 +33,7 @@ public class WorldGenWaterside extends WorldGeneratorBOP @Override public boolean generate(World world, Random random, int x, int y, int z) { - if (world.func_147439_a(x, y, z).func_149688_o() != Material.field_151586_h) + if (world.getBlock(x, y, z).getMaterial() != Material.water) { return false; } @@ -53,11 +53,11 @@ public class WorldGenWaterside extends WorldGeneratorBOP { for (int i2 = y - b0; i2 <= y + b0; ++i2) { - Block block = world.func_147439_a(i1, i2, j1); + Block block = world.getBlock(i1, i2, j1); if (sideBlocks.contains(block)) { - world.func_147465_d(i1, i2, j1, this.watersideBlock, 0, 2); + world.setBlock(i1, i2, j1, this.watersideBlock, 0, 2); } } } diff --git a/src/main/java/biomesoplenty/common/world/features/trees/WorldGenBOPBigTree.java b/src/main/java/biomesoplenty/common/world/features/trees/WorldGenBOPBigTree.java index 7c4a72dff..21d9ec603 100644 --- a/src/main/java/biomesoplenty/common/world/features/trees/WorldGenBOPBigTree.java +++ b/src/main/java/biomesoplenty/common/world/features/trees/WorldGenBOPBigTree.java @@ -160,7 +160,7 @@ public class WorldGenBOPBigTree extends WorldGenAbstractTree else { aint1[b2] = aint[b2] + j1; - Block block1 = this.worldObj.func_147439_a(aint1[0], aint1[1], aint1[2]); + Block block1 = this.worldObj.getBlock(aint1[0], aint1[1], aint1[2]); if (!block1.isAir(worldObj, aint1[0], aint1[1], aint1[2]) && !block1.isLeaves(worldObj, aint1[0], aint1[1], aint1[2])) { @@ -168,7 +168,7 @@ public class WorldGenBOPBigTree extends WorldGenAbstractTree } else { - this.func_150516_a(this.worldObj, aint1[0], aint1[1], aint1[2], p_150529_6_, metaLeaves); + this.setBlockAndNotifyAdequately(this.worldObj, aint1[0], aint1[1], aint1[2], p_150529_6_, metaLeaves); ++j1; } } @@ -176,7 +176,7 @@ public class WorldGenBOPBigTree extends WorldGenAbstractTree } } - // JAVADOC METHOD $$ func_76490_a + // JAVADOC METHOD $$ layerSize float layerSize(int par1) { if ((double)par1 < (double)((float)this.heightLimit) * 0.3D) @@ -212,7 +212,7 @@ public class WorldGenBOPBigTree extends WorldGenAbstractTree return par1 >= 0 && par1 < this.leafDistanceLimit ? (par1 != 0 && par1 != this.leafDistanceLimit - 1 ? 3.0F : 2.0F) : -1.0F; } - // JAVADOC METHOD $$ func_76491_a + // JAVADOC METHOD $$ generateLeafNode void generateLeafNode(int par1, int par2, int par3) { int l = par2; @@ -282,7 +282,7 @@ public class WorldGenBOPBigTree extends WorldGenAbstractTree } } - this.func_150516_a(this.worldObj, aint3[0], aint3[1], aint3[2], p_150530_3_, b5); + this.setBlockAndNotifyAdequately(this.worldObj, aint3[0], aint3[1], aint3[2], p_150530_3_, b5); } } } @@ -329,7 +329,7 @@ public class WorldGenBOPBigTree extends WorldGenAbstractTree } } - // JAVADOC METHOD $$ func_76494_d + // JAVADOC METHOD $$ generateLeafNodeBases void generateLeafNodeBases() { int i = 0; @@ -349,7 +349,7 @@ public class WorldGenBOPBigTree extends WorldGenAbstractTree } } - // JAVADOC METHOD $$ func_76496_a + // JAVADOC METHOD $$ checkBlockLine int checkBlockLine(int[] par1ArrayOfInteger, int[] par2ArrayOfInteger) { int[] aint2 = new int[] {0, 0, 0}; @@ -396,7 +396,7 @@ public class WorldGenBOPBigTree extends WorldGenAbstractTree aint3[b1] = par1ArrayOfInteger[b1] + i; aint3[b2] = MathHelper.floor_double((double)par1ArrayOfInteger[b2] + (double)i * d0); aint3[b3] = MathHelper.floor_double((double)par1ArrayOfInteger[b3] + (double)i * d1); - Block block = this.worldObj.func_147439_a(aint3[0], aint3[1], aint3[2]); + Block block = this.worldObj.getBlock(aint3[0], aint3[1], aint3[2]); if (!this.isReplaceable(worldObj, aint3[0], aint3[1], aint3[2])) { @@ -408,12 +408,12 @@ public class WorldGenBOPBigTree extends WorldGenAbstractTree } } - // JAVADOC METHOD $$ func_76497_e + // JAVADOC METHOD $$ validTreeLocation boolean validTreeLocation() { int[] aint = new int[] {this.basePos[0], this.basePos[1], this.basePos[2]}; int[] aint1 = new int[] {this.basePos[0], this.basePos[1] + this.heightLimit - 1, this.basePos[2]}; - Block block = this.worldObj.func_147439_a(this.basePos[0], this.basePos[1] - 1, this.basePos[2]); + Block block = this.worldObj.getBlock(this.basePos[0], this.basePos[1] - 1, this.basePos[2]); boolean isSoil = block.canSustainPlant(worldObj, basePos[0], basePos[1] - 1, basePos[2], ForgeDirection.UP, (BlockSapling)Blocks.sapling); if (!isSoil) diff --git a/src/main/java/biomesoplenty/common/world/features/trees/WorldGenBOPShrub.java b/src/main/java/biomesoplenty/common/world/features/trees/WorldGenBOPShrub.java index b1179c4bf..e8c007bee 100644 --- a/src/main/java/biomesoplenty/common/world/features/trees/WorldGenBOPShrub.java +++ b/src/main/java/biomesoplenty/common/world/features/trees/WorldGenBOPShrub.java @@ -50,7 +50,7 @@ public class WorldGenBOPShrub extends WorldGenTrees do { - block = world.func_147439_a(x, y, z); + block = world.getBlock(x, y, z); if (!(block.isLeaves(world, x, y, z) || block.isAir(world, x, y, z))) { break; @@ -58,7 +58,7 @@ public class WorldGenBOPShrub extends WorldGenTrees --y; } while (y > 0); - Block block1 = world.func_147439_a(x, y, z); + Block block1 = world.getBlock(x, y, z); if (soilBlocks.contains(block1)) { @@ -66,7 +66,7 @@ public class WorldGenBOPShrub extends WorldGenTrees if (y > minHeight && y < maxHeight) { - this.func_150516_a(world, x, y, z, wood, metaWood); + this.setBlockAndNotifyAdequately(world, x, y, z, wood, metaWood); for (int l = y; l <= y + 2; ++l) { @@ -81,9 +81,9 @@ public class WorldGenBOPShrub extends WorldGenTrees { int j2 = i2 - z; - if ((Math.abs(l1) != j1 || Math.abs(j2) != j1 || random.nextInt(2) != 0) && world.func_147439_a(k1, l, i2).canBeReplacedByLeaves(world, k1, l, i2)) + if ((Math.abs(l1) != j1 || Math.abs(j2) != j1 || random.nextInt(2) != 0) && world.getBlock(k1, l, i2).canBeReplacedByLeaves(world, k1, l, i2)) { - this.func_150516_a(world, k1, l, i2, leaves, metaLeaves); + this.setBlockAndNotifyAdequately(world, k1, l, i2, leaves, metaLeaves); } } } diff --git a/src/main/java/biomesoplenty/common/world/features/trees/WorldGenBOPSwampTree.java b/src/main/java/biomesoplenty/common/world/features/trees/WorldGenBOPSwampTree.java index 624c3948f..df401f5f2 100644 --- a/src/main/java/biomesoplenty/common/world/features/trees/WorldGenBOPSwampTree.java +++ b/src/main/java/biomesoplenty/common/world/features/trees/WorldGenBOPSwampTree.java @@ -53,7 +53,7 @@ public class WorldGenBOPSwampTree extends WorldGenAbstractTree { int l; - for (l = random.nextInt(randomTreeHeight) + minTreeHeight; world.func_147439_a(x, y - 1, z).func_149688_o() == Material.field_151586_h; --y) + for (l = random.nextInt(randomTreeHeight) + minTreeHeight; world.getBlock(x, y - 1, z).getMaterial() == Material.water; --y) { ; } @@ -85,7 +85,7 @@ public class WorldGenBOPSwampTree extends WorldGenAbstractTree { if (i1 >= 0 && i1 < 256) { - Block block = world.func_147439_a(j1, i1, k1); + Block block = world.getBlock(j1, i1, k1); if (!(block.isAir(world, j1, i1, k1) || block.isLeaves(world, j1, i1, k1))) { @@ -113,7 +113,7 @@ public class WorldGenBOPSwampTree extends WorldGenAbstractTree } else { - Block block1 = world.func_147439_a(x, y - 1, z); + Block block1 = world.getBlock(x, y - 1, z); boolean isSoil = block1.canSustainPlant(world, x, y - 1, z, ForgeDirection.UP, (BlockSapling)Blocks.sapling); if (isSoil && y < 256 - l - 1) @@ -136,10 +136,10 @@ public class WorldGenBOPSwampTree extends WorldGenAbstractTree { int j2 = i2 - z; - if ((Math.abs(l1) != k1 || Math.abs(j2) != k1 || random.nextInt(2) != 0 && j1 != 0) && world.func_147439_a(l2, k2, i2).canBeReplacedByLeaves(world, l2, k2, i2)) + if ((Math.abs(l1) != k1 || Math.abs(j2) != k1 || random.nextInt(2) != 0 && j1 != 0) && world.getBlock(l2, k2, i2).canBeReplacedByLeaves(world, l2, k2, i2)) { //TODO: setBlockAndMetadata() - this.func_150516_a(world, l2, k2, i2, this.leaves, this.leavesMeta); + this.setBlockAndNotifyAdequately(world, l2, k2, i2, this.leaves, this.leavesMeta); } } } @@ -147,12 +147,12 @@ public class WorldGenBOPSwampTree extends WorldGenAbstractTree for (k2 = 0; k2 < l; ++k2) { - Block block2 = world.func_147439_a(x, y + k2, z); + Block block2 = world.getBlock(x, y + k2, z); if (block2.isAir(world, x, y + k2, z) || block2.isLeaves(world, x, y + k2, z) || block2 == Blocks.flowing_water || block2 == Blocks.water) { //TODO: setBlockAndMetadata() - this.func_150516_a(world, x, y + k2, z, this.wood, this.woodMeta); + this.setBlockAndNotifyAdequately(world, x, y + k2, z, this.wood, this.woodMeta); } } @@ -165,24 +165,24 @@ public class WorldGenBOPSwampTree extends WorldGenAbstractTree { for (l1 = z - k1; l1 <= z + k1; ++l1) { - if (world.func_147439_a(l2, k2, l1).isLeaves(world, l2, k2, l1)) + if (world.getBlock(l2, k2, l1).isLeaves(world, l2, k2, l1)) { - if (random.nextInt(4) == 0 && world.func_147439_a(l2 - 1, k2, l1).isAir(world, l2 - 1, k2, l1)) + if (random.nextInt(4) == 0 && world.getBlock(l2 - 1, k2, l1).isAir(world, l2 - 1, k2, l1)) { this.generateVines(world, l2 - 1, k2, l1, 8); } - if (random.nextInt(4) == 0 && world.func_147439_a(l2 + 1, k2, l1).isAir(world, l2 + 1, k2, l1)) + if (random.nextInt(4) == 0 && world.getBlock(l2 + 1, k2, l1).isAir(world, l2 + 1, k2, l1)) { this.generateVines(world, l2 + 1, k2, l1, 2); } - if (random.nextInt(4) == 0 && world.func_147439_a(l2, k2, l1 - 1).isAir(world, l2, k2, l1 - 1)) + if (random.nextInt(4) == 0 && world.getBlock(l2, k2, l1 - 1).isAir(world, l2, k2, l1 - 1)) { this.generateVines(world, l2, k2, l1 - 1, 1); } - if (random.nextInt(4) == 0 && world.func_147439_a(l2, k2, l1 + 1).isAir(world, l2, k2, l1 + 1)) + if (random.nextInt(4) == 0 && world.getBlock(l2, k2, l1 + 1).isAir(world, l2, k2, l1 + 1)) { this.generateVines(world, l2, k2, l1 + 1, 4); } @@ -209,19 +209,19 @@ public class WorldGenBOPSwampTree extends WorldGenAbstractTree { if (vineMeta != -1) par5 = vineMeta; - this.func_150516_a(par1World, par2, par3, par4, vineBlock, par5); + this.setBlockAndNotifyAdequately(par1World, par2, par3, par4, vineBlock, par5); int i1 = 4; while (true) { --par3; - if (!(par1World.func_147439_a(par2, par3, par4).isAir(par1World, par2, par3, par4)) || i1 <= 0) + if (!(par1World.getBlock(par2, par3, par4).isAir(par1World, par2, par3, par4)) || i1 <= 0) { return; } - this.func_150516_a(par1World, par2, par3, par4, vineBlock, par5); + this.setBlockAndNotifyAdequately(par1World, par2, par3, par4, vineBlock, par5); --i1; } } diff --git a/src/main/java/biomesoplenty/common/world/features/trees/WorldGenBOPTaiga1.java b/src/main/java/biomesoplenty/common/world/features/trees/WorldGenBOPTaiga1.java index 3fd981599..6ba590bf3 100644 --- a/src/main/java/biomesoplenty/common/world/features/trees/WorldGenBOPTaiga1.java +++ b/src/main/java/biomesoplenty/common/world/features/trees/WorldGenBOPTaiga1.java @@ -86,7 +86,7 @@ public class WorldGenBOPTaiga1 extends WorldGenAbstractTree { if (l1 >= 0 && l1 < 256) { - Block block = world.func_147439_a(i2, l1, j2); + Block block = world.getBlock(i2, l1, j2); if (!this.isReplaceable(world, i2, l1, j2)) { @@ -107,7 +107,7 @@ public class WorldGenBOPTaiga1 extends WorldGenAbstractTree } else { - Block block1 = world.func_147439_a(x, y - 1, z); + Block block1 = world.getBlock(x, y - 1, z); boolean isSoil = block1.canSustainPlant(world, x, y - 1, z, ForgeDirection.UP, (BlockSapling)Blocks.sapling); if (isSoil && y < 256 - l - 1) @@ -125,9 +125,9 @@ public class WorldGenBOPTaiga1 extends WorldGenAbstractTree { int l2 = k2 - z; - if ((Math.abs(j3) != i3 || Math.abs(l2) != i3 || i3 <= 0) && world.func_147439_a(j2, i2, k2).canBeReplacedByLeaves(world, j2, i2, k2)) + if ((Math.abs(j3) != i3 || Math.abs(l2) != i3 || i3 <= 0) && world.getBlock(j2, i2, k2).canBeReplacedByLeaves(world, j2, i2, k2)) { - this.func_150516_a(world, j2, i2, k2, leaves, metaLeaves); + this.setBlockAndNotifyAdequately(world, j2, i2, k2, leaves, metaLeaves); } } } @@ -144,11 +144,11 @@ public class WorldGenBOPTaiga1 extends WorldGenAbstractTree for (i2 = 0; i2 < l - 1; ++i2) { - Block block2 = world.func_147439_a(x, y + i2, z); + Block block2 = world.getBlock(x, y + i2, z); if (block2.isAir(world, x, y + i2, z) || block2.isLeaves(world, x, y + i2, z)) { - this.func_150516_a(world, x, y + i2, z, wood, metaWood); + this.setBlockAndNotifyAdequately(world, x, y + i2, z, wood, metaWood); } } diff --git a/src/main/java/biomesoplenty/common/world/features/trees/WorldGenBOPTaiga2.java b/src/main/java/biomesoplenty/common/world/features/trees/WorldGenBOPTaiga2.java index c91c0a5b8..4e3a1dc33 100644 --- a/src/main/java/biomesoplenty/common/world/features/trees/WorldGenBOPTaiga2.java +++ b/src/main/java/biomesoplenty/common/world/features/trees/WorldGenBOPTaiga2.java @@ -128,7 +128,7 @@ public class WorldGenBOPTaiga2 extends WorldGenAbstractTree { if (l1 >= 0 && l1 < 256) { - Block block = world.func_147439_a(i2, l1, j2); + Block block = world.getBlock(i2, l1, j2); if (!block.isAir(world, i2, l1, j2) && !block.isLeaves(world, i2, l1, j2)) { @@ -149,7 +149,7 @@ public class WorldGenBOPTaiga2 extends WorldGenAbstractTree } else { - Block block1 = world.func_147439_a(x, y - 1, z); + Block block1 = world.getBlock(x, y - 1, z); boolean isSoil = block1.canSustainPlant(world, x, y - 1, z, ForgeDirection.UP, (BlockSapling)Blocks.sapling); if (isSoil && y < 256 - l - 1) @@ -173,10 +173,10 @@ public class WorldGenBOPTaiga2 extends WorldGenAbstractTree { int k3 = j3 - z; - if ((Math.abs(i3) != l3 || Math.abs(k3) != l3 || l3 <= 0) && world.func_147439_a(l2, k2, j3).canBeReplacedByLeaves(world, l2, k2, j3)) + if ((Math.abs(i3) != l3 || Math.abs(k3) != l3 || l3 <= 0) && world.getBlock(l2, k2, j3).canBeReplacedByLeaves(world, l2, k2, j3)) { //TODO: setBlockAndMetadata() - this.func_150516_a(world, l2, k2, j3, leaves, this.metaLeaves); + this.setBlockAndNotifyAdequately(world, l2, k2, j3, leaves, this.metaLeaves); } } } @@ -202,12 +202,12 @@ public class WorldGenBOPTaiga2 extends WorldGenAbstractTree for (k2 = 0; k2 < l - i4; ++k2) { - Block block2 = world.func_147439_a(x, y + k2, z); + Block block2 = world.getBlock(x, y + k2, z); if (block2.isAir(world, x, y + k2, z) || block2.isLeaves(world, x, y + k2, z)) { //TODO: setBlockAndMetadata() - this.func_150516_a(world, x, y + k2, z, wood, metaWood); + this.setBlockAndNotifyAdequately(world, x, y + k2, z, wood, metaWood); } } diff --git a/src/main/java/biomesoplenty/common/world/features/trees/WorldGenBOPTaiga3.java b/src/main/java/biomesoplenty/common/world/features/trees/WorldGenBOPTaiga3.java index b070e7a16..dbeb88f90 100644 --- a/src/main/java/biomesoplenty/common/world/features/trees/WorldGenBOPTaiga3.java +++ b/src/main/java/biomesoplenty/common/world/features/trees/WorldGenBOPTaiga3.java @@ -80,7 +80,7 @@ public class WorldGenBOPTaiga3 extends WorldGenAbstractTree { if (l1 >= 0 && l1 < 256) { - Block block = world.func_147439_a(i2, l1, j2); + Block block = world.getBlock(i2, l1, j2); if (!block.isAir(world, i2, l1, j2) && !block.isLeaves(world, i2, l1, j2)) { @@ -101,11 +101,11 @@ public class WorldGenBOPTaiga3 extends WorldGenAbstractTree } else { - Block block1 = world.func_147439_a(x, y - 1, z); - Block block2 = world.func_147439_a(x + 1, y - 1, z); - Block block3 = world.func_147439_a(x - 1, y - 1, z); - Block block4 = world.func_147439_a(x, y - 1, z + 1); - Block block5 = world.func_147439_a(x, y - 1, z - 1); + Block block1 = world.getBlock(x, y - 1, z); + Block block2 = world.getBlock(x + 1, y - 1, z); + Block block3 = world.getBlock(x - 1, y - 1, z); + Block block4 = world.getBlock(x, y - 1, z + 1); + Block block5 = world.getBlock(x, y - 1, z - 1); boolean isSoil = block1.canSustainPlant(world, x, y - 1, z, ForgeDirection.UP, (BlockSapling)Blocks.sapling) && block2.canSustainPlant(world, x + 1, y - 1, z, ForgeDirection.UP, (BlockSapling)Blocks.sapling) && @@ -138,14 +138,14 @@ public class WorldGenBOPTaiga3 extends WorldGenAbstractTree { int k3 = j3 - z; - if ((Math.abs(i3) != l3 || Math.abs(k3) != l3 || l3 <= 0) && world.func_147439_a(l2, k2, j3).canBeReplacedByLeaves(world, l2, k2, j3)) + if ((Math.abs(i3) != l3 || Math.abs(k3) != l3 || l3 <= 0) && world.getBlock(l2, k2, j3).canBeReplacedByLeaves(world, l2, k2, j3)) { //TODO: setBlockAndMetadata() - this.func_150516_a(world, l2, k2, j3, leaves, this.metaLeaves); - this.func_150516_a(world, l2 + 1, k2, j3, leaves, this.metaLeaves); - this.func_150516_a(world, l2 - 1, k2, j3, leaves, this.metaLeaves); - this.func_150516_a(world, l2, k2, j3 + 1, leaves, this.metaLeaves); - this.func_150516_a(world, l2, k2, j3 - 1, leaves, this.metaLeaves); + this.setBlockAndNotifyAdequately(world, l2, k2, j3, leaves, this.metaLeaves); + this.setBlockAndNotifyAdequately(world, l2 + 1, k2, j3, leaves, this.metaLeaves); + this.setBlockAndNotifyAdequately(world, l2 - 1, k2, j3, leaves, this.metaLeaves); + this.setBlockAndNotifyAdequately(world, l2, k2, j3 + 1, leaves, this.metaLeaves); + this.setBlockAndNotifyAdequately(world, l2, k2, j3 - 1, leaves, this.metaLeaves); } } } @@ -171,16 +171,16 @@ public class WorldGenBOPTaiga3 extends WorldGenAbstractTree for (int i = 0; i < l - i4; ++i) { - Block block6 = world.func_147439_a(x, y + i, z); + Block block6 = world.getBlock(x, y + i, z); if (block6.isAir(world, x, y + i, z) || block6.isLeaves(world, x, y + i, z)) { //TODO: setBlockAndMetadata() - this.func_150516_a(world, x, y + i, z, wood, metaWood); - this.func_150516_a(world, x + 1, y + i, z, wood, metaWood); - this.func_150516_a(world, x - 1, y + i, z, wood, metaWood); - this.func_150516_a(world, x, y + i, z + 1, wood, metaWood); - this.func_150516_a(world, x, y + i, z - 1, wood, metaWood); + this.setBlockAndNotifyAdequately(world, x, y + i, z, wood, metaWood); + this.setBlockAndNotifyAdequately(world, x + 1, y + i, z, wood, metaWood); + this.setBlockAndNotifyAdequately(world, x - 1, y + i, z, wood, metaWood); + this.setBlockAndNotifyAdequately(world, x, y + i, z + 1, wood, metaWood); + this.setBlockAndNotifyAdequately(world, x, y + i, z - 1, wood, metaWood); } } diff --git a/src/main/java/biomesoplenty/common/world/features/trees/WorldGenBayou1.java b/src/main/java/biomesoplenty/common/world/features/trees/WorldGenBayou1.java index 5900a793b..eb3761136 100644 --- a/src/main/java/biomesoplenty/common/world/features/trees/WorldGenBayou1.java +++ b/src/main/java/biomesoplenty/common/world/features/trees/WorldGenBayou1.java @@ -35,7 +35,7 @@ public class WorldGenBayou1 extends WorldGenAbstractTree { int l; - for (l = random.nextInt(8) + 10; world.func_147439_a(x, y - 1, z).func_149688_o() == Material.field_151586_h; --y) + for (l = random.nextInt(8) + 10; world.getBlock(x, y - 1, z).getMaterial() == Material.water; --y) { ; } @@ -67,7 +67,7 @@ public class WorldGenBayou1 extends WorldGenAbstractTree { if (i1 >= 0 && i1 < 256) { - Block block = world.func_147439_a(j1, i1, k1); + Block block = world.getBlock(j1, i1, k1); if (!(block.isAir(world, j1, i1, k1) || block.isLeaves(world, j1, i1, k1))) { @@ -95,11 +95,11 @@ public class WorldGenBayou1 extends WorldGenAbstractTree } else { - Block block1 = world.func_147439_a(x, y - 1, z); - Block block2 = world.func_147439_a(x + 1, y - 1, z); - Block block3 = world.func_147439_a(x - 1, y - 1, z); - Block block4 = world.func_147439_a(x, y - 1, z + 1); - Block block5 = world.func_147439_a(x, y - 1, z - 1); + Block block1 = world.getBlock(x, y - 1, z); + Block block2 = world.getBlock(x + 1, y - 1, z); + Block block3 = world.getBlock(x - 1, y - 1, z); + Block block4 = world.getBlock(x, y - 1, z + 1); + Block block5 = world.getBlock(x, y - 1, z - 1); boolean isSoil = block1.canSustainPlant(world, x, y - 1, z, ForgeDirection.UP, (BlockSapling)Blocks.sapling) && block2.canSustainPlant(world, x + 1, y - 1, z, ForgeDirection.UP, (BlockSapling)Blocks.sapling) && @@ -116,22 +116,22 @@ public class WorldGenBayou1 extends WorldGenAbstractTree block1.onPlantGrow(world, x, y - 1, z - 1, x, y, z - 1); //TODO: setBlockAndMetadata() - this.func_150516_a(world, x - 1, y, z, this.wood, this.woodMeta); - this.func_150516_a(world, x + 1, y, z, this.wood, this.woodMeta); - this.func_150516_a(world, x, y, z - 1, this.wood, this.woodMeta); - this.func_150516_a(world, x, y, z + 1, this.wood, this.woodMeta); - this.func_150516_a(world, x - 1, y + 1, z, this.wood, this.woodMeta); - this.func_150516_a(world, x + 1, y + 1, z, this.wood, this.woodMeta); - this.func_150516_a(world, x, y + 1, z - 1, this.wood, this.woodMeta); - this.func_150516_a(world, x, y + 1, z + 1, this.wood, this.woodMeta); - this.func_150516_a(world, x - 1, y + 2, z, this.wood, this.woodMeta); - this.func_150516_a(world, x + 1, y + 2, z, this.wood, this.woodMeta); - this.func_150516_a(world, x, y + 2, z - 1, this.wood, this.woodMeta); - this.func_150516_a(world, x, y + 2, z + 1, this.wood, this.woodMeta); - this.func_150516_a(world, x - 1, y + 3, z, this.wood, this.woodMeta); - this.func_150516_a(world, x + 1, y + 3, z, this.wood, this.woodMeta); - this.func_150516_a(world, x, y + 3, z - 1, this.wood, this.woodMeta); - this.func_150516_a(world, x, y + 3, z + 1, this.wood, this.woodMeta); + this.setBlockAndNotifyAdequately(world, x - 1, y, z, this.wood, this.woodMeta); + this.setBlockAndNotifyAdequately(world, x + 1, y, z, this.wood, this.woodMeta); + this.setBlockAndNotifyAdequately(world, x, y, z - 1, this.wood, this.woodMeta); + this.setBlockAndNotifyAdequately(world, x, y, z + 1, this.wood, this.woodMeta); + this.setBlockAndNotifyAdequately(world, x - 1, y + 1, z, this.wood, this.woodMeta); + this.setBlockAndNotifyAdequately(world, x + 1, y + 1, z, this.wood, this.woodMeta); + this.setBlockAndNotifyAdequately(world, x, y + 1, z - 1, this.wood, this.woodMeta); + this.setBlockAndNotifyAdequately(world, x, y + 1, z + 1, this.wood, this.woodMeta); + this.setBlockAndNotifyAdequately(world, x - 1, y + 2, z, this.wood, this.woodMeta); + this.setBlockAndNotifyAdequately(world, x + 1, y + 2, z, this.wood, this.woodMeta); + this.setBlockAndNotifyAdequately(world, x, y + 2, z - 1, this.wood, this.woodMeta); + this.setBlockAndNotifyAdequately(world, x, y + 2, z + 1, this.wood, this.woodMeta); + this.setBlockAndNotifyAdequately(world, x - 1, y + 3, z, this.wood, this.woodMeta); + this.setBlockAndNotifyAdequately(world, x + 1, y + 3, z, this.wood, this.woodMeta); + this.setBlockAndNotifyAdequately(world, x, y + 3, z - 1, this.wood, this.woodMeta); + this.setBlockAndNotifyAdequately(world, x, y + 3, z + 1, this.wood, this.woodMeta); int l1; int l2; @@ -150,10 +150,10 @@ public class WorldGenBayou1 extends WorldGenAbstractTree { int j2 = i2 - z; - if ((Math.abs(l1) != k1 || Math.abs(j2) != k1 || random.nextInt(2) != 0 && j1 != 0) && world.func_147439_a(l2, k2, i2).canBeReplacedByLeaves(world, l2, k2, i2)) + if ((Math.abs(l1) != k1 || Math.abs(j2) != k1 || random.nextInt(2) != 0 && j1 != 0) && world.getBlock(l2, k2, i2).canBeReplacedByLeaves(world, l2, k2, i2)) { //TODO: setBlockAndMetadata() - this.func_150516_a(world, l2, k2, i2, this.leaves, this.leavesMeta); + this.setBlockAndNotifyAdequately(world, l2, k2, i2, this.leaves, this.leavesMeta); } } } @@ -161,12 +161,12 @@ public class WorldGenBayou1 extends WorldGenAbstractTree for (k2 = 0; k2 < l; ++k2) { - Block block6 = world.func_147439_a(x, y + k2, z); + Block block6 = world.getBlock(x, y + k2, z); if (block6.isAir(world, x, y + k2, z) || block6.isLeaves(world, x, y + k2, z) || block6 == Blocks.flowing_water || block6 == Blocks.water) { //TODO: setBlockAndMetadata() - this.func_150516_a(world, x, y + k2, z, this.wood, this.woodMeta); + this.setBlockAndNotifyAdequately(world, x, y + k2, z, this.wood, this.woodMeta); } } @@ -179,24 +179,24 @@ public class WorldGenBayou1 extends WorldGenAbstractTree { for (l1 = z - k1; l1 <= z + k1; ++l1) { - if (world.func_147439_a(l2, k2, l1).isLeaves(world, l2, k2, l1)) + if (world.getBlock(l2, k2, l1).isLeaves(world, l2, k2, l1)) { - if (random.nextInt(4) == 0 && world.func_147439_a(l2 - 1, k2, l1).isAir(world, l2 - 1, k2, l1)) + if (random.nextInt(4) == 0 && world.getBlock(l2 - 1, k2, l1).isAir(world, l2 - 1, k2, l1)) { this.generateVines(world, l2 - 1, k2, l1, 8); } - if (random.nextInt(4) == 0 && world.func_147439_a(l2 + 1, k2, l1).isAir(world, l2 + 1, k2, l1)) + if (random.nextInt(4) == 0 && world.getBlock(l2 + 1, k2, l1).isAir(world, l2 + 1, k2, l1)) { this.generateVines(world, l2 + 1, k2, l1, 2); } - if (random.nextInt(4) == 0 && world.func_147439_a(l2, k2, l1 - 1).isAir(world, l2, k2, l1 - 1)) + if (random.nextInt(4) == 0 && world.getBlock(l2, k2, l1 - 1).isAir(world, l2, k2, l1 - 1)) { this.generateVines(world, l2, k2, l1 - 1, 1); } - if (random.nextInt(4) == 0 && world.func_147439_a(l2, k2, l1 + 1).isAir(world, l2, k2, l1 + 1)) + if (random.nextInt(4) == 0 && world.getBlock(l2, k2, l1 + 1).isAir(world, l2, k2, l1 + 1)) { this.generateVines(world, l2, k2, l1 + 1, 4); } @@ -222,7 +222,7 @@ public class WorldGenBayou1 extends WorldGenAbstractTree private void generateVines(World world, int x, int y, int z, int flag) { //TODO: setBlockAndMetadata() - this.func_150516_a(world, x, y, z, BOPBlockHelper.get("willow"), flag); + this.setBlockAndNotifyAdequately(world, x, y, z, BOPBlockHelper.get("willow"), flag); int i1 = 4; while (true) @@ -230,13 +230,13 @@ public class WorldGenBayou1 extends WorldGenAbstractTree --y; //TODO: getBlock() - if (world.func_147439_a(x, y, z).isAir(world, x, y, z) || i1 <= 0) + if (world.getBlock(x, y, z).isAir(world, x, y, z) || i1 <= 0) { return; } //TODO: setBlockAndMetadata() - this.func_150516_a(world, x, y, z, BOPBlockHelper.get("willow"), flag); + this.setBlockAndNotifyAdequately(world, x, y, z, BOPBlockHelper.get("willow"), flag); --i1; } } diff --git a/src/main/java/biomesoplenty/common/world/features/trees/WorldGenBayou2.java b/src/main/java/biomesoplenty/common/world/features/trees/WorldGenBayou2.java index ba56c0561..cb6606ef2 100644 --- a/src/main/java/biomesoplenty/common/world/features/trees/WorldGenBayou2.java +++ b/src/main/java/biomesoplenty/common/world/features/trees/WorldGenBayou2.java @@ -35,7 +35,7 @@ public class WorldGenBayou2 extends WorldGenAbstractTree { int l; - for (l = random.nextInt(5) + 8; world.func_147439_a(x, y - 1, z).func_149688_o() == Material.field_151586_h; --y) + for (l = random.nextInt(5) + 8; world.getBlock(x, y - 1, z).getMaterial() == Material.water; --y) { ; } @@ -67,7 +67,7 @@ public class WorldGenBayou2 extends WorldGenAbstractTree { if (i1 >= 0 && i1 < 256) { - Block block = world.func_147439_a(j1, i1, k1); + Block block = world.getBlock(j1, i1, k1); if (!(block.isAir(world, j1, i1, k1) || block.isLeaves(world, j1, i1, k1))) { @@ -95,11 +95,11 @@ public class WorldGenBayou2 extends WorldGenAbstractTree } else { - Block block1 = world.func_147439_a(x, y - 1, z); - Block block2 = world.func_147439_a(x + 1, y - 1, z); - Block block3 = world.func_147439_a(x - 1, y - 1, z); - Block block4 = world.func_147439_a(x, y - 1, z + 1); - Block block5 = world.func_147439_a(x, y - 1, z - 1); + Block block1 = world.getBlock(x, y - 1, z); + Block block2 = world.getBlock(x + 1, y - 1, z); + Block block3 = world.getBlock(x - 1, y - 1, z); + Block block4 = world.getBlock(x, y - 1, z + 1); + Block block5 = world.getBlock(x, y - 1, z - 1); boolean isSoil = block1.canSustainPlant(world, x, y - 1, z, ForgeDirection.UP, (BlockSapling)Blocks.sapling) && block2.canSustainPlant(world, x + 1, y - 1, z, ForgeDirection.UP, (BlockSapling)Blocks.sapling) && @@ -116,14 +116,14 @@ public class WorldGenBayou2 extends WorldGenAbstractTree block1.onPlantGrow(world, x, y - 1, z - 1, x, y, z - 1); //TODO: setBlockAndMetadata() - this.func_150516_a(world, x - 1, y, z, this.wood, this.woodMeta); - this.func_150516_a(world, x + 1, y, z, this.wood, this.woodMeta); - this.func_150516_a(world, x, y, z - 1, this.wood, this.woodMeta); - this.func_150516_a(world, x, y, z + 1, this.wood, this.woodMeta); - this.func_150516_a(world, x - 1, y + 1, z, this.wood, this.woodMeta); - this.func_150516_a(world, x + 1, y + 1, z, this.wood, this.woodMeta); - this.func_150516_a(world, x, y + 1, z - 1, this.wood, this.woodMeta); - this.func_150516_a(world, x, y + 1, z + 1, this.wood, this.woodMeta); + this.setBlockAndNotifyAdequately(world, x - 1, y, z, this.wood, this.woodMeta); + this.setBlockAndNotifyAdequately(world, x + 1, y, z, this.wood, this.woodMeta); + this.setBlockAndNotifyAdequately(world, x, y, z - 1, this.wood, this.woodMeta); + this.setBlockAndNotifyAdequately(world, x, y, z + 1, this.wood, this.woodMeta); + this.setBlockAndNotifyAdequately(world, x - 1, y + 1, z, this.wood, this.woodMeta); + this.setBlockAndNotifyAdequately(world, x + 1, y + 1, z, this.wood, this.woodMeta); + this.setBlockAndNotifyAdequately(world, x, y + 1, z - 1, this.wood, this.woodMeta); + this.setBlockAndNotifyAdequately(world, x, y + 1, z + 1, this.wood, this.woodMeta); int l1; int l2; @@ -142,10 +142,10 @@ public class WorldGenBayou2 extends WorldGenAbstractTree { int j2 = i2 - z; - if ((Math.abs(l1) != k1 || Math.abs(j2) != k1 || random.nextInt(2) != 0 && j1 != 0) && world.func_147439_a(l2, k2, i2).canBeReplacedByLeaves(world, l2, k2, i2)) + if ((Math.abs(l1) != k1 || Math.abs(j2) != k1 || random.nextInt(2) != 0 && j1 != 0) && world.getBlock(l2, k2, i2).canBeReplacedByLeaves(world, l2, k2, i2)) { //TODO: setBlockAndMetadata() - this.func_150516_a(world, l2, k2, i2, this.leaves, this.leavesMeta); + this.setBlockAndNotifyAdequately(world, l2, k2, i2, this.leaves, this.leavesMeta); } } } @@ -153,12 +153,12 @@ public class WorldGenBayou2 extends WorldGenAbstractTree for (k2 = 0; k2 < l; ++k2) { - Block block6 = world.func_147439_a(x, y + k2, z); + Block block6 = world.getBlock(x, y + k2, z); if (block6.isAir(world, x, y + k2, z) || block6.isLeaves(world, x, y + k2, z) || block6 == Blocks.flowing_water || block6 == Blocks.water) { //TODO: setBlockAndMetadata() - this.func_150516_a(world, x, y + k2, z, this.wood, this.woodMeta); + this.setBlockAndNotifyAdequately(world, x, y + k2, z, this.wood, this.woodMeta); } } @@ -171,24 +171,24 @@ public class WorldGenBayou2 extends WorldGenAbstractTree { for (l1 = z - k1; l1 <= z + k1; ++l1) { - if (world.func_147439_a(l2, k2, l1).isLeaves(world, l2, k2, l1)) + if (world.getBlock(l2, k2, l1).isLeaves(world, l2, k2, l1)) { - if (random.nextInt(4) == 0 && world.func_147439_a(l2 - 1, k2, l1).isAir(world, l2 - 1, k2, l1)) + if (random.nextInt(4) == 0 && world.getBlock(l2 - 1, k2, l1).isAir(world, l2 - 1, k2, l1)) { this.generateVines(world, l2 - 1, k2, l1, 8); } - if (random.nextInt(4) == 0 && world.func_147439_a(l2 + 1, k2, l1).isAir(world, l2 + 1, k2, l1)) + if (random.nextInt(4) == 0 && world.getBlock(l2 + 1, k2, l1).isAir(world, l2 + 1, k2, l1)) { this.generateVines(world, l2 + 1, k2, l1, 2); } - if (random.nextInt(4) == 0 && world.func_147439_a(l2, k2, l1 - 1).isAir(world, l2, k2, l1 - 1)) + if (random.nextInt(4) == 0 && world.getBlock(l2, k2, l1 - 1).isAir(world, l2, k2, l1 - 1)) { this.generateVines(world, l2, k2, l1 - 1, 1); } - if (random.nextInt(4) == 0 && world.func_147439_a(l2, k2, l1 + 1).isAir(world, l2, k2, l1 + 1)) + if (random.nextInt(4) == 0 && world.getBlock(l2, k2, l1 + 1).isAir(world, l2, k2, l1 + 1)) { this.generateVines(world, l2, k2, l1 + 1, 4); } @@ -214,7 +214,7 @@ public class WorldGenBayou2 extends WorldGenAbstractTree private void generateVines(World world, int x, int y, int z, int flag) { //TODO: setBlockAndMetadata() - this.func_150516_a(world, x, y, z, BOPBlockHelper.get("willow"), flag); + this.setBlockAndNotifyAdequately(world, x, y, z, BOPBlockHelper.get("willow"), flag); int i1 = 4; while (true) @@ -222,13 +222,13 @@ public class WorldGenBayou2 extends WorldGenAbstractTree --y; //TODO: getBlock() - if (world.func_147439_a(x, y, z).isAir(world, x, y, z) || i1 <= 0) + if (world.getBlock(x, y, z).isAir(world, x, y, z) || i1 <= 0) { return; } //TODO: setBlockAndMetadata() - this.func_150516_a(world, x, y, z, BOPBlockHelper.get("willow"), flag); + this.setBlockAndNotifyAdequately(world, x, y, z, BOPBlockHelper.get("willow"), flag); --i1; } } diff --git a/src/main/java/biomesoplenty/common/world/features/trees/WorldGenBayou3.java b/src/main/java/biomesoplenty/common/world/features/trees/WorldGenBayou3.java index 7e38e13e3..f6bbe1250 100644 --- a/src/main/java/biomesoplenty/common/world/features/trees/WorldGenBayou3.java +++ b/src/main/java/biomesoplenty/common/world/features/trees/WorldGenBayou3.java @@ -37,7 +37,7 @@ public class WorldGenBayou3 extends WorldGenAbstractTree { int l; - for (l = 7; world.func_147439_a(x, y - 1, z).func_149688_o() == Material.field_151586_h; --y) + for (l = 7; world.getBlock(x, y - 1, z).getMaterial() == Material.water; --y) { ; } @@ -69,7 +69,7 @@ public class WorldGenBayou3 extends WorldGenAbstractTree { if (i1 >= 0 && i1 < 256) { - Block block = world.func_147439_a(j1, i1, k1); + Block block = world.getBlock(j1, i1, k1); if (!(block.isAir(world, j1, i1, k1) || block.isLeaves(world, j1, i1, k1))) { @@ -97,7 +97,7 @@ public class WorldGenBayou3 extends WorldGenAbstractTree } else { - Block block1 = world.func_147439_a(x, y - 1, z); + Block block1 = world.getBlock(x, y - 1, z); boolean isSoil = block1.canSustainPlant(world, x, y - 1, z, ForgeDirection.UP, (BlockSapling)Blocks.sapling); if (isSoil && y < 256 - l - 1) @@ -105,26 +105,26 @@ public class WorldGenBayou3 extends WorldGenAbstractTree block1.onPlantGrow(world, x, y - 1, z, x, y, z); //TODO: setBlockAndMetadata() - this.func_150516_a(world, x - 1, y, z, this.wood, this.metaWood); - this.func_150516_a(world, x + 1, y, z, this.wood, this.metaWood); - this.func_150516_a(world, x, y, z - 1, this.wood, this.metaWood); - this.func_150516_a(world, x, y, z + 1, this.wood, this.metaWood); - this.func_150516_a(world, x - 1, y + 1, z, this.wood, this.metaWood); - this.func_150516_a(world, x + 1, y + 1, z, this.wood, this.metaWood); - this.func_150516_a(world, x, y + 1, z - 1, this.wood, this.metaWood); - this.func_150516_a(world, x, y + 1, z + 1, this.wood, this.metaWood); - this.func_150516_a(world, x - 1, y + 2, z, this.wood, this.metaWood); - this.func_150516_a(world, x + 1, y + 2, z, this.wood, this.metaWood); - this.func_150516_a(world, x, y + 2, z - 1, this.wood, this.metaWood); - this.func_150516_a(world, x, y + 2, z + 1, this.wood, this.metaWood); - this.func_150516_a(world, x - 1, y + 3, z, this.wood, this.metaWood); - this.func_150516_a(world, x + 1, y + 3, z, this.wood, this.metaWood); - this.func_150516_a(world, x, y + 3, z - 1, this.wood, this.metaWood); - this.func_150516_a(world, x, y + 3, z + 1, this.wood, this.metaWood); - this.func_150516_a(world, x - 1, y + 4, z, this.wood, this.metaWood); - this.func_150516_a(world, x + 1, y + 4, z, this.wood, this.metaWood); - this.func_150516_a(world, x, y + 4, z - 1, this.wood, this.metaWood); - this.func_150516_a(world, x, y + 4, z + 1, this.wood, this.metaWood); + this.setBlockAndNotifyAdequately(world, x - 1, y, z, this.wood, this.metaWood); + this.setBlockAndNotifyAdequately(world, x + 1, y, z, this.wood, this.metaWood); + this.setBlockAndNotifyAdequately(world, x, y, z - 1, this.wood, this.metaWood); + this.setBlockAndNotifyAdequately(world, x, y, z + 1, this.wood, this.metaWood); + this.setBlockAndNotifyAdequately(world, x - 1, y + 1, z, this.wood, this.metaWood); + this.setBlockAndNotifyAdequately(world, x + 1, y + 1, z, this.wood, this.metaWood); + this.setBlockAndNotifyAdequately(world, x, y + 1, z - 1, this.wood, this.metaWood); + this.setBlockAndNotifyAdequately(world, x, y + 1, z + 1, this.wood, this.metaWood); + this.setBlockAndNotifyAdequately(world, x - 1, y + 2, z, this.wood, this.metaWood); + this.setBlockAndNotifyAdequately(world, x + 1, y + 2, z, this.wood, this.metaWood); + this.setBlockAndNotifyAdequately(world, x, y + 2, z - 1, this.wood, this.metaWood); + this.setBlockAndNotifyAdequately(world, x, y + 2, z + 1, this.wood, this.metaWood); + this.setBlockAndNotifyAdequately(world, x - 1, y + 3, z, this.wood, this.metaWood); + this.setBlockAndNotifyAdequately(world, x + 1, y + 3, z, this.wood, this.metaWood); + this.setBlockAndNotifyAdequately(world, x, y + 3, z - 1, this.wood, this.metaWood); + this.setBlockAndNotifyAdequately(world, x, y + 3, z + 1, this.wood, this.metaWood); + this.setBlockAndNotifyAdequately(world, x - 1, y + 4, z, this.wood, this.metaWood); + this.setBlockAndNotifyAdequately(world, x + 1, y + 4, z, this.wood, this.metaWood); + this.setBlockAndNotifyAdequately(world, x, y + 4, z - 1, this.wood, this.metaWood); + this.setBlockAndNotifyAdequately(world, x, y + 4, z + 1, this.wood, this.metaWood); int l1; int l2; @@ -132,12 +132,12 @@ public class WorldGenBayou3 extends WorldGenAbstractTree for (k2 = 0; k2 < l; ++k2) { - Block block2 = world.func_147439_a(x, y + k2, z); + Block block2 = world.getBlock(x, y + k2, z); if (block2.isAir(world, x, y + k2, z) || block2.isLeaves(world, x, y + k2, z) || block2 == Blocks.flowing_water || block2 == Blocks.water) { //TODO: setBlockAndMetadata() - this.func_150516_a(world, x, y + k2, z, this.wood, this.metaWood); + this.setBlockAndNotifyAdequately(world, x, y + k2, z, this.wood, this.metaWood); } } diff --git a/src/main/java/biomesoplenty/common/world/features/trees/WorldGenBogBush.java b/src/main/java/biomesoplenty/common/world/features/trees/WorldGenBogBush.java index ca7be2321..0e05d4041 100644 --- a/src/main/java/biomesoplenty/common/world/features/trees/WorldGenBogBush.java +++ b/src/main/java/biomesoplenty/common/world/features/trees/WorldGenBogBush.java @@ -18,13 +18,13 @@ public class WorldGenBogBush extends WorldGenAbstractTree public boolean generate(World world, Random random, int x, int y, int z) { //TODO: isAirBlock() - while (world.func_147437_c(x, y, z) && y > 2) + while (world.isAirBlock(x, y, z) && y > 2) { --y; } //TODO: getBlock() - Block block = world.func_147439_a(x, y, z); + Block block = world.getBlock(x, y, z); if (block != Blocks.grass && block != Blocks.sand) { @@ -37,13 +37,13 @@ public class WorldGenBogBush extends WorldGenAbstractTree for (int var8 = -2; var8 <= 2; ++var8) { //TODO: isAirBlock() isAirBlock() - if (world.func_147437_c(x + var7, y - 1, z + var8) && world.func_147437_c(x + var7, y - 2, z + var8)) + if (world.isAirBlock(x + var7, y - 1, z + var8) && world.isAirBlock(x + var7, y - 2, z + var8)) return false; } } //TODO: setBlockAndMetadata() - this.func_150516_a(world, x, y + 1, z, Blocks.leaves, 4); + this.setBlockAndNotifyAdequately(world, x, y + 1, z, Blocks.leaves, 4); return true; } } diff --git a/src/main/java/biomesoplenty/common/world/features/trees/WorldGenBogTree1.java b/src/main/java/biomesoplenty/common/world/features/trees/WorldGenBogTree1.java index bfcdd1743..835ef9555 100644 --- a/src/main/java/biomesoplenty/common/world/features/trees/WorldGenBogTree1.java +++ b/src/main/java/biomesoplenty/common/world/features/trees/WorldGenBogTree1.java @@ -65,7 +65,7 @@ public class WorldGenBogTree1 extends WorldGenAbstractTree { if (i1 >= 0 && i1 < 256) { - block = par1World.func_147439_a(j1, i1, k1); + block = par1World.getBlock(j1, i1, k1); if (!this.isReplaceable(par1World, j1, i1, k1)) { @@ -86,7 +86,7 @@ public class WorldGenBogTree1 extends WorldGenAbstractTree } else { - Block block2 = par1World.func_147439_a(par3, par4 - 1, par5); + Block block2 = par1World.getBlock(par3, par4 - 1, par5); boolean isSoil = block2.canSustainPlant(par1World, par3, par4 - 1, par5, ForgeDirection.UP, (BlockSapling)Blocks.sapling); @@ -114,11 +114,11 @@ public class WorldGenBogTree1 extends WorldGenAbstractTree if (Math.abs(j2) != l1 || Math.abs(l2) != l1 || par2Random.nextInt(2) != 0 && i3 != 0) { - Block block1 = par1World.func_147439_a(i2, k1, k2); + Block block1 = par1World.getBlock(i2, k1, k2); if (block1.isAir(par1World, i2, k1, k2) || block1.isLeaves(par1World, i2, k1, k2)) { - this.func_150516_a(par1World, i2, k1, k2, this.leaves, this.leavesMeta); + this.setBlockAndNotifyAdequately(par1World, i2, k1, k2, this.leaves, this.leavesMeta); } } } @@ -127,40 +127,40 @@ public class WorldGenBogTree1 extends WorldGenAbstractTree for (k1 = 0; k1 < l; ++k1) { - block = par1World.func_147439_a(par3, par4 + k1, par5); + block = par1World.getBlock(par3, par4 + k1, par5); if (block.isAir(par1World, par3, par4 + k1, par5) || block.isLeaves(par1World, par3, par4 + k1, par5)) { //TODO: setBlockAndMetadata() - this.func_150516_a(par1World, par3, par4 + k1, par5, this.wood, this.woodMeta); - this.func_150516_a(par1World, par3 - 1, par4 + k1, par5, this.wood, this.woodMeta); - this.func_150516_a(par1World, par3 + 1, par4 + k1, par5, this.wood, this.woodMeta); - this.func_150516_a(par1World, par3, par4 + k1, par5 - 1, this.wood, this.woodMeta); - this.func_150516_a(par1World, par3, par4 + k1, par5 + 1, this.wood, this.woodMeta); - this.func_150516_a(par1World, par3 - 1, par4, par5 - 1, this.wood, this.woodMeta); - this.func_150516_a(par1World, par3 + 1, par4, par5 + 1, this.wood, this.woodMeta); - this.func_150516_a(par1World, par3 - 1, par4, par5 + 1, this.wood, this.woodMeta); - this.func_150516_a(par1World, par3 + 1, par4, par5 - 1, this.wood, this.woodMeta); - this.func_150516_a(par1World, par3 - 1, par4 + 1, par5 - 1, this.wood, this.woodMeta); - this.func_150516_a(par1World, par3 + 1, par4 + 1, par5 + 1, this.wood, this.woodMeta); - this.func_150516_a(par1World, par3 - 1, par4 + 1, par5 + 1, this.wood, this.woodMeta); - this.func_150516_a(par1World, par3 + 1, par4 + 1, par5 - 1, this.wood, this.woodMeta); - this.func_150516_a(par1World, par3 - 2, par4, par5, this.wood, 4); - this.func_150516_a(par1World, par3 + 2, par4, par5, this.wood, 4); - this.func_150516_a(par1World, par3, par4, par5 - 2, this.wood, 8); - this.func_150516_a(par1World, par3, par4, par5 + 2, this.wood, 8); - this.func_150516_a(par1World, par3 - 1, par4 + (l - 4), par5 - 1, this.wood, this.woodMeta); - this.func_150516_a(par1World, par3 + 1, par4 + (l - 4), par5 + 1, this.wood, this.woodMeta); - this.func_150516_a(par1World, par3 - 1, par4 + (l - 4), par5 + 1, this.wood, this.woodMeta); - this.func_150516_a(par1World, par3 + 1, par4 + (l - 4), par5 - 1, this.wood, this.woodMeta); - this.func_150516_a(par1World, par3 - 2, par4 + (l - 4), par5, this.wood, 4); - this.func_150516_a(par1World, par3 + 2, par4 + (l - 4), par5, this.wood, 4); - this.func_150516_a(par1World, par3, par4 + (l - 4), par5 - 2, this.wood, 8); - this.func_150516_a(par1World, par3, par4 + (l - 4), par5 + 2, this.wood, 8); - this.func_150516_a(par1World, par3 - 3, par4 + (l - 3), par5, this.wood, this.woodMeta); - this.func_150516_a(par1World, par3 + 3, par4 + (l - 3), par5, this.wood, this.woodMeta); - this.func_150516_a(par1World, par3, par4 + (l - 3), par5 - 3, this.wood, this.woodMeta); - this.func_150516_a(par1World, par3, par4 + (l - 3), par5 + 3, this.wood, this.woodMeta); + this.setBlockAndNotifyAdequately(par1World, par3, par4 + k1, par5, this.wood, this.woodMeta); + this.setBlockAndNotifyAdequately(par1World, par3 - 1, par4 + k1, par5, this.wood, this.woodMeta); + this.setBlockAndNotifyAdequately(par1World, par3 + 1, par4 + k1, par5, this.wood, this.woodMeta); + this.setBlockAndNotifyAdequately(par1World, par3, par4 + k1, par5 - 1, this.wood, this.woodMeta); + this.setBlockAndNotifyAdequately(par1World, par3, par4 + k1, par5 + 1, this.wood, this.woodMeta); + this.setBlockAndNotifyAdequately(par1World, par3 - 1, par4, par5 - 1, this.wood, this.woodMeta); + this.setBlockAndNotifyAdequately(par1World, par3 + 1, par4, par5 + 1, this.wood, this.woodMeta); + this.setBlockAndNotifyAdequately(par1World, par3 - 1, par4, par5 + 1, this.wood, this.woodMeta); + this.setBlockAndNotifyAdequately(par1World, par3 + 1, par4, par5 - 1, this.wood, this.woodMeta); + this.setBlockAndNotifyAdequately(par1World, par3 - 1, par4 + 1, par5 - 1, this.wood, this.woodMeta); + this.setBlockAndNotifyAdequately(par1World, par3 + 1, par4 + 1, par5 + 1, this.wood, this.woodMeta); + this.setBlockAndNotifyAdequately(par1World, par3 - 1, par4 + 1, par5 + 1, this.wood, this.woodMeta); + this.setBlockAndNotifyAdequately(par1World, par3 + 1, par4 + 1, par5 - 1, this.wood, this.woodMeta); + this.setBlockAndNotifyAdequately(par1World, par3 - 2, par4, par5, this.wood, 4); + this.setBlockAndNotifyAdequately(par1World, par3 + 2, par4, par5, this.wood, 4); + this.setBlockAndNotifyAdequately(par1World, par3, par4, par5 - 2, this.wood, 8); + this.setBlockAndNotifyAdequately(par1World, par3, par4, par5 + 2, this.wood, 8); + this.setBlockAndNotifyAdequately(par1World, par3 - 1, par4 + (l - 4), par5 - 1, this.wood, this.woodMeta); + this.setBlockAndNotifyAdequately(par1World, par3 + 1, par4 + (l - 4), par5 + 1, this.wood, this.woodMeta); + this.setBlockAndNotifyAdequately(par1World, par3 - 1, par4 + (l - 4), par5 + 1, this.wood, this.woodMeta); + this.setBlockAndNotifyAdequately(par1World, par3 + 1, par4 + (l - 4), par5 - 1, this.wood, this.woodMeta); + this.setBlockAndNotifyAdequately(par1World, par3 - 2, par4 + (l - 4), par5, this.wood, 4); + this.setBlockAndNotifyAdequately(par1World, par3 + 2, par4 + (l - 4), par5, this.wood, 4); + this.setBlockAndNotifyAdequately(par1World, par3, par4 + (l - 4), par5 - 2, this.wood, 8); + this.setBlockAndNotifyAdequately(par1World, par3, par4 + (l - 4), par5 + 2, this.wood, 8); + this.setBlockAndNotifyAdequately(par1World, par3 - 3, par4 + (l - 3), par5, this.wood, this.woodMeta); + this.setBlockAndNotifyAdequately(par1World, par3 + 3, par4 + (l - 3), par5, this.wood, this.woodMeta); + this.setBlockAndNotifyAdequately(par1World, par3, par4 + (l - 3), par5 - 3, this.wood, this.woodMeta); + this.setBlockAndNotifyAdequately(par1World, par3, par4 + (l - 3), par5 + 3, this.wood, this.woodMeta); } } @@ -173,24 +173,24 @@ public class WorldGenBogTree1 extends WorldGenAbstractTree { for (j2 = par5 - l1; j2 <= par5 + l1; ++j2) { - if (par1World.func_147439_a(i2, k1, j2).isLeaves(par1World, i2, k1, j2)) + if (par1World.getBlock(i2, k1, j2).isLeaves(par1World, i2, k1, j2)) { - if (par2Random.nextInt(4) == 0 && par1World.func_147439_a(i2 - 1, k1, j2).isAir(par1World, i2 - 1, k1, j2)) + if (par2Random.nextInt(4) == 0 && par1World.getBlock(i2 - 1, k1, j2).isAir(par1World, i2 - 1, k1, j2)) { this.growVines(par1World, i2 - 1, k1, j2, 8); } - if (par2Random.nextInt(4) == 0 && par1World.func_147439_a(i2 + 1, k1, j2).isAir(par1World, i2 + 1, k1, j2)) + if (par2Random.nextInt(4) == 0 && par1World.getBlock(i2 + 1, k1, j2).isAir(par1World, i2 + 1, k1, j2)) { this.growVines(par1World, i2 + 1, k1, j2, 2); } - if (par2Random.nextInt(4) == 0 && par1World.func_147439_a(i2, k1, j2 - 1).isAir(par1World, i2, k1, j2 - 1)) + if (par2Random.nextInt(4) == 0 && par1World.getBlock(i2, k1, j2 - 1).isAir(par1World, i2, k1, j2 - 1)) { this.growVines(par1World, i2, k1, j2 - 1, 1); } - if (par2Random.nextInt(4) == 0 && par1World.func_147439_a(i2, k1, j2 + 1).isAir(par1World, i2, k1, j2 + 1)) + if (par2Random.nextInt(4) == 0 && par1World.getBlock(i2, k1, j2 + 1).isAir(par1World, i2, k1, j2 + 1)) { this.growVines(par1World, i2, k1, j2 + 1, 4); } @@ -210,7 +210,7 @@ public class WorldGenBogTree1 extends WorldGenAbstractTree private void growVines(World world, int x, int y, int z, int flag) { //TODO: setBlockAndMetadata() - this.func_150516_a(world, x, y, z, Blocks.vine, flag); + this.setBlockAndNotifyAdequately(world, x, y, z, Blocks.vine, flag); int i1 = 4; while (true) @@ -218,13 +218,13 @@ public class WorldGenBogTree1 extends WorldGenAbstractTree --y; //TODO: getBlock() - if (world.func_147439_a(x, y, z).isAir(world, x, y, z) || i1 <= 0) + if (world.getBlock(x, y, z).isAir(world, x, y, z) || i1 <= 0) { return; } //TODO: setBlockAndMetadata() - this.func_150516_a(world, x, y, z, Blocks.vine, flag); + this.setBlockAndNotifyAdequately(world, x, y, z, Blocks.vine, flag); --i1; } } @@ -272,7 +272,7 @@ public class WorldGenBogTree1 extends WorldGenAbstractTree { int l; - for (l = random.nextInt(randomTreeHeight) + minTreeHeight; world.func_147439_a(x, y - 1, z).func_149688_o() == Material.field_151586_h; --y) + for (l = random.nextInt(randomTreeHeight) + minTreeHeight; world.getBlock(x, y - 1, z).getMaterial() == Material.water; --y) { ; } @@ -304,7 +304,7 @@ public class WorldGenBogTree1 extends WorldGenAbstractTree { if (i1 >= 0 && i1 < 256) { - Block block = world.func_147439_a(j1, i1, k1); + Block block = world.getBlock(j1, i1, k1); if (!(block.isAir(world, j1, i1, k1) || block.isLeaves(world, j1, i1, k1))) { @@ -332,7 +332,7 @@ public class WorldGenBogTree1 extends WorldGenAbstractTree } else { - Block block1 = world.func_147439_a(x, y - 1, z); + Block block1 = world.getBlock(x, y - 1, z); boolean isSoil = block1.canSustainPlant(world, x, y - 1, z, ForgeDirection.UP, (BlockSapling)Blocks.sapling); if (isSoil && y < 256 - l - 1) @@ -355,9 +355,9 @@ public class WorldGenBogTree1 extends WorldGenAbstractTree { int j2 = i2 - z; - if ((Math.abs(l1) != k1 || Math.abs(j2) != k1 || random.nextInt(2) != 0 && j1 != 0) && world.func_147439_a(l2, k2, i2).canBeReplacedByLeaves(world, l2, k2, i2)) + if ((Math.abs(l1) != k1 || Math.abs(j2) != k1 || random.nextInt(2) != 0 && j1 != 0) && world.getBlock(l2, k2, i2).canBeReplacedByLeaves(world, l2, k2, i2)) { - this.func_150516_a(world, l2, k2, i2, this.leaves, this.leavesMeta); + this.setBlockAndNotifyAdequately(world, l2, k2, i2, this.leaves, this.leavesMeta); } } } @@ -365,40 +365,40 @@ public class WorldGenBogTree1 extends WorldGenAbstractTree for (k2 = 0; k2 < l; ++k2) { - Block block2 = world.func_147439_a(x, y + k2, z); + Block block2 = world.getBlock(x, y + k2, z); if (block2.isAir(world, x, y + k2, z) || block2.isLeaves(world, x, y + k2, z) || block2 == Blocks.flowing_water || block2 == Blocks.water) { //TODO: setBlockAndMetadata() - this.func_150516_a(world, x, y + k2, z, this.wood, this.woodMeta); - this.func_150516_a(world, x - 1, y + k2, z, this.wood, this.woodMeta); - this.func_150516_a(world, x + 1, y + k2, z, this.wood, this.woodMeta); - this.func_150516_a(world, x, y + k2, z - 1, this.wood, this.woodMeta); - this.func_150516_a(world, x, y + k2, z + 1, this.wood, this.woodMeta); - this.func_150516_a(world, x - 1, y, z - 1, this.wood, this.woodMeta); - this.func_150516_a(world, x + 1, y, z + 1, this.wood, this.woodMeta); - this.func_150516_a(world, x - 1, y, z + 1, this.wood, this.woodMeta); - this.func_150516_a(world, x + 1, y, z - 1, this.wood, this.woodMeta); - this.func_150516_a(world, x - 1, y + 1, z - 1, this.wood, this.woodMeta); - this.func_150516_a(world, x + 1, y + 1, z + 1, this.wood, this.woodMeta); - this.func_150516_a(world, x - 1, y + 1, z + 1, this.wood, this.woodMeta); - this.func_150516_a(world, x + 1, y + 1, z - 1, this.wood, this.woodMeta); - this.func_150516_a(world, x - 2, y, z, this.wood, this.woodMeta + 4); - this.func_150516_a(world, x + 2, y, z, this.wood, this.woodMeta + 4); - this.func_150516_a(world, x, y, z - 2, this.wood, this.woodMeta + 8); - this.func_150516_a(world, x, y, z + 2, this.wood, this.woodMeta + 8); - this.func_150516_a(world, x - 1, y + (l - 4), z - 1, this.wood, this.woodMeta); - this.func_150516_a(world, x + 1, y + (l - 4), z + 1, this.wood, this.woodMeta); - this.func_150516_a(world, x - 1, y + (l - 4), z + 1, this.wood, this.woodMeta); - this.func_150516_a(world, x + 1, y + (l - 4), z - 1, this.wood, this.woodMeta); - this.func_150516_a(world, x - 2, y + (l - 4), z, this.wood, this.woodMeta + 4); - this.func_150516_a(world, x + 2, y + (l - 4), z, this.wood, this.woodMeta + 4); - this.func_150516_a(world, x, y + (l - 4), z - 2, this.wood, this.woodMeta + 8); - this.func_150516_a(world, x, y + (l - 4), z + 2, this.wood, this.woodMeta + 8); - this.func_150516_a(world, x - 3, y + (l - 3), z, this.wood, this.woodMeta); - this.func_150516_a(world, x + 3, y + (l - 3), z, this.wood, this.woodMeta); - this.func_150516_a(world, x, y + (l - 3), z - 3, this.wood, this.woodMeta); - this.func_150516_a(world, x, y + (l - 3), z + 3, this.wood, this.woodMeta); + this.setBlockAndNotifyAdequately(world, x, y + k2, z, this.wood, this.woodMeta); + this.setBlockAndNotifyAdequately(world, x - 1, y + k2, z, this.wood, this.woodMeta); + this.setBlockAndNotifyAdequately(world, x + 1, y + k2, z, this.wood, this.woodMeta); + this.setBlockAndNotifyAdequately(world, x, y + k2, z - 1, this.wood, this.woodMeta); + this.setBlockAndNotifyAdequately(world, x, y + k2, z + 1, this.wood, this.woodMeta); + this.setBlockAndNotifyAdequately(world, x - 1, y, z - 1, this.wood, this.woodMeta); + this.setBlockAndNotifyAdequately(world, x + 1, y, z + 1, this.wood, this.woodMeta); + this.setBlockAndNotifyAdequately(world, x - 1, y, z + 1, this.wood, this.woodMeta); + this.setBlockAndNotifyAdequately(world, x + 1, y, z - 1, this.wood, this.woodMeta); + this.setBlockAndNotifyAdequately(world, x - 1, y + 1, z - 1, this.wood, this.woodMeta); + this.setBlockAndNotifyAdequately(world, x + 1, y + 1, z + 1, this.wood, this.woodMeta); + this.setBlockAndNotifyAdequately(world, x - 1, y + 1, z + 1, this.wood, this.woodMeta); + this.setBlockAndNotifyAdequately(world, x + 1, y + 1, z - 1, this.wood, this.woodMeta); + this.setBlockAndNotifyAdequately(world, x - 2, y, z, this.wood, this.woodMeta + 4); + this.setBlockAndNotifyAdequately(world, x + 2, y, z, this.wood, this.woodMeta + 4); + this.setBlockAndNotifyAdequately(world, x, y, z - 2, this.wood, this.woodMeta + 8); + this.setBlockAndNotifyAdequately(world, x, y, z + 2, this.wood, this.woodMeta + 8); + this.setBlockAndNotifyAdequately(world, x - 1, y + (l - 4), z - 1, this.wood, this.woodMeta); + this.setBlockAndNotifyAdequately(world, x + 1, y + (l - 4), z + 1, this.wood, this.woodMeta); + this.setBlockAndNotifyAdequately(world, x - 1, y + (l - 4), z + 1, this.wood, this.woodMeta); + this.setBlockAndNotifyAdequately(world, x + 1, y + (l - 4), z - 1, this.wood, this.woodMeta); + this.setBlockAndNotifyAdequately(world, x - 2, y + (l - 4), z, this.wood, this.woodMeta + 4); + this.setBlockAndNotifyAdequately(world, x + 2, y + (l - 4), z, this.wood, this.woodMeta + 4); + this.setBlockAndNotifyAdequately(world, x, y + (l - 4), z - 2, this.wood, this.woodMeta + 8); + this.setBlockAndNotifyAdequately(world, x, y + (l - 4), z + 2, this.wood, this.woodMeta + 8); + this.setBlockAndNotifyAdequately(world, x - 3, y + (l - 3), z, this.wood, this.woodMeta); + this.setBlockAndNotifyAdequately(world, x + 3, y + (l - 3), z, this.wood, this.woodMeta); + this.setBlockAndNotifyAdequately(world, x, y + (l - 3), z - 3, this.wood, this.woodMeta); + this.setBlockAndNotifyAdequately(world, x, y + (l - 3), z + 3, this.wood, this.woodMeta); } } @@ -411,24 +411,24 @@ public class WorldGenBogTree1 extends WorldGenAbstractTree { for (l1 = z - k1; l1 <= z + k1; ++l1) { - if (world.func_147439_a(l2, k2, l1).isLeaves(world, l2, k2, l1)) + if (world.getBlock(l2, k2, l1).isLeaves(world, l2, k2, l1)) { - if (random.nextInt(4) == 0 && world.func_147439_a(l2 - 1, k2, l1).isAir(world, l2 - 1, k2, l1)) + if (random.nextInt(4) == 0 && world.getBlock(l2 - 1, k2, l1).isAir(world, l2 - 1, k2, l1)) { this.generateVines(world, l2 - 1, k2, l1, 8); } - if (random.nextInt(4) == 0 && world.func_147439_a(l2 + 1, k2, l1).isAir(world, l2 + 1, k2, l1)) + if (random.nextInt(4) == 0 && world.getBlock(l2 + 1, k2, l1).isAir(world, l2 + 1, k2, l1)) { this.generateVines(world, l2 + 1, k2, l1, 2); } - if (random.nextInt(4) == 0 && world.func_147439_a(l2, k2, l1 - 1).isAir(world, l2, k2, l1 - 1)) + if (random.nextInt(4) == 0 && world.getBlock(l2, k2, l1 - 1).isAir(world, l2, k2, l1 - 1)) { this.generateVines(world, l2, k2, l1 - 1, 1); } - if (random.nextInt(4) == 0 && world.func_147439_a(l2, k2, l1 + 1).isAir(world, l2, k2, l1 + 1)) + if (random.nextInt(4) == 0 && world.getBlock(l2, k2, l1 + 1).isAir(world, l2, k2, l1 + 1)) { this.generateVines(world, l2, k2, l1 + 1, 4); } @@ -451,22 +451,22 @@ public class WorldGenBogTree1 extends WorldGenAbstractTree } } - // JAVADOC METHOD $$ func_76536_b + // JAVADOC METHOD $$ generateVines private void generateVines(World par1World, int par2, int par3, int par4, int par5) { - this.func_150516_a(par1World, par2, par3, par4, Blocks.vine, par5); + this.setBlockAndNotifyAdequately(par1World, par2, par3, par4, Blocks.vine, par5); int i1 = 4; while (true) { --par3; - if (!(par1World.func_147439_a(par2, par3, par4).isAir(par1World, par2, par3, par4)) || i1 <= 0) + if (!(par1World.getBlock(par2, par3, par4).isAir(par1World, par2, par3, par4)) || i1 <= 0) { return; } - this.func_150516_a(par1World, par2, par3, par4, Blocks.vine, par5); + this.setBlockAndNotifyAdequately(par1World, par2, par3, par4, Blocks.vine, par5); --i1; } } diff --git a/src/main/java/biomesoplenty/common/world/features/trees/WorldGenBogTree2.java b/src/main/java/biomesoplenty/common/world/features/trees/WorldGenBogTree2.java index b61959326..1d3609ddb 100644 --- a/src/main/java/biomesoplenty/common/world/features/trees/WorldGenBogTree2.java +++ b/src/main/java/biomesoplenty/common/world/features/trees/WorldGenBogTree2.java @@ -65,7 +65,7 @@ public class WorldGenBogTree1 extends WorldGenAbstractTree { if (i1 >= 0 && i1 < 256) { - block = par1World.func_147439_a(j1, i1, k1); + block = par1World.getBlock(j1, i1, k1); if (!this.isReplaceable(par1World, j1, i1, k1)) { @@ -86,7 +86,7 @@ public class WorldGenBogTree1 extends WorldGenAbstractTree } else { - Block block2 = par1World.func_147439_a(par3, par4 - 1, par5); + Block block2 = par1World.getBlock(par3, par4 - 1, par5); boolean isSoil = block2.canSustainPlant(par1World, par3, par4 - 1, par5, ForgeDirection.UP, (BlockSapling)Blocks.sapling); @@ -114,11 +114,11 @@ public class WorldGenBogTree1 extends WorldGenAbstractTree if (Math.abs(j2) != l1 || Math.abs(l2) != l1 || par2Random.nextInt(2) != 0 && i3 != 0) { - Block block1 = par1World.func_147439_a(i2, k1, k2); + Block block1 = par1World.getBlock(i2, k1, k2); if (block1.isAir(par1World, i2, k1, k2) || block1.isLeaves(par1World, i2, k1, k2)) { - this.func_150516_a(par1World, i2, k1, k2, this.leaves, this.leavesMeta); + this.setBlockAndNotifyAdequately(par1World, i2, k1, k2, this.leaves, this.leavesMeta); } } } @@ -127,40 +127,40 @@ public class WorldGenBogTree1 extends WorldGenAbstractTree for (k1 = 0; k1 < l; ++k1) { - block = par1World.func_147439_a(par3, par4 + k1, par5); + block = par1World.getBlock(par3, par4 + k1, par5); if (block.isAir(par1World, par3, par4 + k1, par5) || block.isLeaves(par1World, par3, par4 + k1, par5)) { //TODO: setBlockAndMetadata() - this.func_150516_a(par1World, par3, par4 + k1, par5, this.wood, this.woodMeta); - this.func_150516_a(par1World, par3 - 1, par4 + k1, par5, this.wood, this.woodMeta); - this.func_150516_a(par1World, par3 + 1, par4 + k1, par5, this.wood, this.woodMeta); - this.func_150516_a(par1World, par3, par4 + k1, par5 - 1, this.wood, this.woodMeta); - this.func_150516_a(par1World, par3, par4 + k1, par5 + 1, this.wood, this.woodMeta); - this.func_150516_a(par1World, par3 - 1, par4, par5 - 1, this.wood, this.woodMeta); - this.func_150516_a(par1World, par3 + 1, par4, par5 + 1, this.wood, this.woodMeta); - this.func_150516_a(par1World, par3 - 1, par4, par5 + 1, this.wood, this.woodMeta); - this.func_150516_a(par1World, par3 + 1, par4, par5 - 1, this.wood, this.woodMeta); - this.func_150516_a(par1World, par3 - 1, par4 + 1, par5 - 1, this.wood, this.woodMeta); - this.func_150516_a(par1World, par3 + 1, par4 + 1, par5 + 1, this.wood, this.woodMeta); - this.func_150516_a(par1World, par3 - 1, par4 + 1, par5 + 1, this.wood, this.woodMeta); - this.func_150516_a(par1World, par3 + 1, par4 + 1, par5 - 1, this.wood, this.woodMeta); - this.func_150516_a(par1World, par3 - 2, par4, par5, this.wood, 4); - this.func_150516_a(par1World, par3 + 2, par4, par5, this.wood, 4); - this.func_150516_a(par1World, par3, par4, par5 - 2, this.wood, 8); - this.func_150516_a(par1World, par3, par4, par5 + 2, this.wood, 8); - this.func_150516_a(par1World, par3 - 1, par4 + (l - 4), par5 - 1, this.wood, this.woodMeta); - this.func_150516_a(par1World, par3 + 1, par4 + (l - 4), par5 + 1, this.wood, this.woodMeta); - this.func_150516_a(par1World, par3 - 1, par4 + (l - 4), par5 + 1, this.wood, this.woodMeta); - this.func_150516_a(par1World, par3 + 1, par4 + (l - 4), par5 - 1, this.wood, this.woodMeta); - this.func_150516_a(par1World, par3 - 2, par4 + (l - 4), par5, this.wood, 4); - this.func_150516_a(par1World, par3 + 2, par4 + (l - 4), par5, this.wood, 4); - this.func_150516_a(par1World, par3, par4 + (l - 4), par5 - 2, this.wood, 8); - this.func_150516_a(par1World, par3, par4 + (l - 4), par5 + 2, this.wood, 8); - this.func_150516_a(par1World, par3 - 3, par4 + (l - 3), par5, this.wood, this.woodMeta); - this.func_150516_a(par1World, par3 + 3, par4 + (l - 3), par5, this.wood, this.woodMeta); - this.func_150516_a(par1World, par3, par4 + (l - 3), par5 - 3, this.wood, this.woodMeta); - this.func_150516_a(par1World, par3, par4 + (l - 3), par5 + 3, this.wood, this.woodMeta); + this.setBlockAndNotifyAdequately(par1World, par3, par4 + k1, par5, this.wood, this.woodMeta); + this.setBlockAndNotifyAdequately(par1World, par3 - 1, par4 + k1, par5, this.wood, this.woodMeta); + this.setBlockAndNotifyAdequately(par1World, par3 + 1, par4 + k1, par5, this.wood, this.woodMeta); + this.setBlockAndNotifyAdequately(par1World, par3, par4 + k1, par5 - 1, this.wood, this.woodMeta); + this.setBlockAndNotifyAdequately(par1World, par3, par4 + k1, par5 + 1, this.wood, this.woodMeta); + this.setBlockAndNotifyAdequately(par1World, par3 - 1, par4, par5 - 1, this.wood, this.woodMeta); + this.setBlockAndNotifyAdequately(par1World, par3 + 1, par4, par5 + 1, this.wood, this.woodMeta); + this.setBlockAndNotifyAdequately(par1World, par3 - 1, par4, par5 + 1, this.wood, this.woodMeta); + this.setBlockAndNotifyAdequately(par1World, par3 + 1, par4, par5 - 1, this.wood, this.woodMeta); + this.setBlockAndNotifyAdequately(par1World, par3 - 1, par4 + 1, par5 - 1, this.wood, this.woodMeta); + this.setBlockAndNotifyAdequately(par1World, par3 + 1, par4 + 1, par5 + 1, this.wood, this.woodMeta); + this.setBlockAndNotifyAdequately(par1World, par3 - 1, par4 + 1, par5 + 1, this.wood, this.woodMeta); + this.setBlockAndNotifyAdequately(par1World, par3 + 1, par4 + 1, par5 - 1, this.wood, this.woodMeta); + this.setBlockAndNotifyAdequately(par1World, par3 - 2, par4, par5, this.wood, 4); + this.setBlockAndNotifyAdequately(par1World, par3 + 2, par4, par5, this.wood, 4); + this.setBlockAndNotifyAdequately(par1World, par3, par4, par5 - 2, this.wood, 8); + this.setBlockAndNotifyAdequately(par1World, par3, par4, par5 + 2, this.wood, 8); + this.setBlockAndNotifyAdequately(par1World, par3 - 1, par4 + (l - 4), par5 - 1, this.wood, this.woodMeta); + this.setBlockAndNotifyAdequately(par1World, par3 + 1, par4 + (l - 4), par5 + 1, this.wood, this.woodMeta); + this.setBlockAndNotifyAdequately(par1World, par3 - 1, par4 + (l - 4), par5 + 1, this.wood, this.woodMeta); + this.setBlockAndNotifyAdequately(par1World, par3 + 1, par4 + (l - 4), par5 - 1, this.wood, this.woodMeta); + this.setBlockAndNotifyAdequately(par1World, par3 - 2, par4 + (l - 4), par5, this.wood, 4); + this.setBlockAndNotifyAdequately(par1World, par3 + 2, par4 + (l - 4), par5, this.wood, 4); + this.setBlockAndNotifyAdequately(par1World, par3, par4 + (l - 4), par5 - 2, this.wood, 8); + this.setBlockAndNotifyAdequately(par1World, par3, par4 + (l - 4), par5 + 2, this.wood, 8); + this.setBlockAndNotifyAdequately(par1World, par3 - 3, par4 + (l - 3), par5, this.wood, this.woodMeta); + this.setBlockAndNotifyAdequately(par1World, par3 + 3, par4 + (l - 3), par5, this.wood, this.woodMeta); + this.setBlockAndNotifyAdequately(par1World, par3, par4 + (l - 3), par5 - 3, this.wood, this.woodMeta); + this.setBlockAndNotifyAdequately(par1World, par3, par4 + (l - 3), par5 + 3, this.wood, this.woodMeta); } } @@ -173,24 +173,24 @@ public class WorldGenBogTree1 extends WorldGenAbstractTree { for (j2 = par5 - l1; j2 <= par5 + l1; ++j2) { - if (par1World.func_147439_a(i2, k1, j2).isLeaves(par1World, i2, k1, j2)) + if (par1World.getBlock(i2, k1, j2).isLeaves(par1World, i2, k1, j2)) { - if (par2Random.nextInt(4) == 0 && par1World.func_147439_a(i2 - 1, k1, j2).isAir(par1World, i2 - 1, k1, j2)) + if (par2Random.nextInt(4) == 0 && par1World.getBlock(i2 - 1, k1, j2).isAir(par1World, i2 - 1, k1, j2)) { this.growVines(par1World, i2 - 1, k1, j2, 8); } - if (par2Random.nextInt(4) == 0 && par1World.func_147439_a(i2 + 1, k1, j2).isAir(par1World, i2 + 1, k1, j2)) + if (par2Random.nextInt(4) == 0 && par1World.getBlock(i2 + 1, k1, j2).isAir(par1World, i2 + 1, k1, j2)) { this.growVines(par1World, i2 + 1, k1, j2, 2); } - if (par2Random.nextInt(4) == 0 && par1World.func_147439_a(i2, k1, j2 - 1).isAir(par1World, i2, k1, j2 - 1)) + if (par2Random.nextInt(4) == 0 && par1World.getBlock(i2, k1, j2 - 1).isAir(par1World, i2, k1, j2 - 1)) { this.growVines(par1World, i2, k1, j2 - 1, 1); } - if (par2Random.nextInt(4) == 0 && par1World.func_147439_a(i2, k1, j2 + 1).isAir(par1World, i2, k1, j2 + 1)) + if (par2Random.nextInt(4) == 0 && par1World.getBlock(i2, k1, j2 + 1).isAir(par1World, i2, k1, j2 + 1)) { this.growVines(par1World, i2, k1, j2 + 1, 4); } @@ -210,7 +210,7 @@ public class WorldGenBogTree1 extends WorldGenAbstractTree private void growVines(World world, int x, int y, int z, int flag) { //TODO: setBlockAndMetadata() - this.func_150516_a(world, x, y, z, Blocks.vine, flag); + this.setBlockAndNotifyAdequately(world, x, y, z, Blocks.vine, flag); int i1 = 4; while (true) @@ -218,13 +218,13 @@ public class WorldGenBogTree1 extends WorldGenAbstractTree --y; //TODO: getBlock() - if (world.func_147439_a(x, y, z).isAir(world, x, y, z) || i1 <= 0) + if (world.getBlock(x, y, z).isAir(world, x, y, z) || i1 <= 0) { return; } //TODO: setBlockAndMetadata() - this.func_150516_a(world, x, y, z, Blocks.vine, flag); + this.setBlockAndNotifyAdequately(world, x, y, z, Blocks.vine, flag); --i1; } } @@ -272,7 +272,7 @@ public class WorldGenBogTree2 extends WorldGenAbstractTree { int l; - for (l = random.nextInt(randomTreeHeight) + minTreeHeight; world.func_147439_a(x, y - 1, z).func_149688_o() == Material.field_151586_h; --y) + for (l = random.nextInt(randomTreeHeight) + minTreeHeight; world.getBlock(x, y - 1, z).getMaterial() == Material.water; --y) { ; } @@ -304,7 +304,7 @@ public class WorldGenBogTree2 extends WorldGenAbstractTree { if (i1 >= 0 && i1 < 256) { - Block block = world.func_147439_a(j1, i1, k1); + Block block = world.getBlock(j1, i1, k1); if (!(block.isAir(world, j1, i1, k1) || block.isLeaves(world, j1, i1, k1))) { @@ -332,7 +332,7 @@ public class WorldGenBogTree2 extends WorldGenAbstractTree } else { - Block block1 = world.func_147439_a(x, y - 1, z); + Block block1 = world.getBlock(x, y - 1, z); boolean isSoil = block1.canSustainPlant(world, x, y - 1, z, ForgeDirection.UP, (BlockSapling)Blocks.sapling); if (isSoil && y < 256 - l - 1) @@ -355,9 +355,9 @@ public class WorldGenBogTree2 extends WorldGenAbstractTree { int j2 = i2 - z; - if ((Math.abs(l1) != k1 || Math.abs(j2) != k1 || random.nextInt(2) != 0 && j1 != 0) && world.func_147439_a(l2, k2, i2).canBeReplacedByLeaves(world, l2, k2, i2)) + if ((Math.abs(l1) != k1 || Math.abs(j2) != k1 || random.nextInt(2) != 0 && j1 != 0) && world.getBlock(l2, k2, i2).canBeReplacedByLeaves(world, l2, k2, i2)) { - this.func_150516_a(world, l2, k2, i2, this.leaves, this.leavesMeta); + this.setBlockAndNotifyAdequately(world, l2, k2, i2, this.leaves, this.leavesMeta); } } } @@ -365,24 +365,24 @@ public class WorldGenBogTree2 extends WorldGenAbstractTree for (k2 = 0; k2 < l; ++k2) { - Block block2 = world.func_147439_a(x, y + k2, z); + Block block2 = world.getBlock(x, y + k2, z); if (block2.isAir(world, x, y + k2, z) || block2.isLeaves(world, x, y + k2, z) || block2 == Blocks.flowing_water || block2 == Blocks.water) { //TODO: setBlockAndMetadata() - this.func_150516_a(world, x, y + k2, z, this.wood, this.woodMeta); - this.func_150516_a(world, x - 1, y, z, this.wood, this.woodMeta + 4); - this.func_150516_a(world, x + 1, y, z, this.wood, this.woodMeta + 4); - this.func_150516_a(world, x, y, z - 1, this.wood, this.woodMeta + 8); - this.func_150516_a(world, x, y, z + 1, this.wood, this.woodMeta + 8); - this.func_150516_a(world, x - 1, y + (l - 4), z, this.wood, this.woodMeta + 4); - this.func_150516_a(world, x + 1, y + (l - 4), z, this.wood, this.woodMeta + 4); - this.func_150516_a(world, x, y + (l - 4), z - 1, this.wood, this.woodMeta + 8); - this.func_150516_a(world, x, y + (l - 4), z + 1, this.wood, this.woodMeta + 8); - this.func_150516_a(world, x - 2, y + (l - 3), z, this.wood, this.woodMeta); - this.func_150516_a(world, x + 2, y + (l - 3), z, this.wood, this.woodMeta); - this.func_150516_a(world, x, y + (l - 3), z - 2, this.wood, this.woodMeta); - this.func_150516_a(world, x, y + (l - 3), z + 2, this.wood, this.woodMeta); + this.setBlockAndNotifyAdequately(world, x, y + k2, z, this.wood, this.woodMeta); + this.setBlockAndNotifyAdequately(world, x - 1, y, z, this.wood, this.woodMeta + 4); + this.setBlockAndNotifyAdequately(world, x + 1, y, z, this.wood, this.woodMeta + 4); + this.setBlockAndNotifyAdequately(world, x, y, z - 1, this.wood, this.woodMeta + 8); + this.setBlockAndNotifyAdequately(world, x, y, z + 1, this.wood, this.woodMeta + 8); + this.setBlockAndNotifyAdequately(world, x - 1, y + (l - 4), z, this.wood, this.woodMeta + 4); + this.setBlockAndNotifyAdequately(world, x + 1, y + (l - 4), z, this.wood, this.woodMeta + 4); + this.setBlockAndNotifyAdequately(world, x, y + (l - 4), z - 1, this.wood, this.woodMeta + 8); + this.setBlockAndNotifyAdequately(world, x, y + (l - 4), z + 1, this.wood, this.woodMeta + 8); + this.setBlockAndNotifyAdequately(world, x - 2, y + (l - 3), z, this.wood, this.woodMeta); + this.setBlockAndNotifyAdequately(world, x + 2, y + (l - 3), z, this.wood, this.woodMeta); + this.setBlockAndNotifyAdequately(world, x, y + (l - 3), z - 2, this.wood, this.woodMeta); + this.setBlockAndNotifyAdequately(world, x, y + (l - 3), z + 2, this.wood, this.woodMeta); } } @@ -395,24 +395,24 @@ public class WorldGenBogTree2 extends WorldGenAbstractTree { for (l1 = z - k1; l1 <= z + k1; ++l1) { - if (world.func_147439_a(l2, k2, l1).isLeaves(world, l2, k2, l1)) + if (world.getBlock(l2, k2, l1).isLeaves(world, l2, k2, l1)) { - if (random.nextInt(4) == 0 && world.func_147439_a(l2 - 1, k2, l1).isAir(world, l2 - 1, k2, l1)) + if (random.nextInt(4) == 0 && world.getBlock(l2 - 1, k2, l1).isAir(world, l2 - 1, k2, l1)) { this.generateVines(world, l2 - 1, k2, l1, 8); } - if (random.nextInt(4) == 0 && world.func_147439_a(l2 + 1, k2, l1).isAir(world, l2 + 1, k2, l1)) + if (random.nextInt(4) == 0 && world.getBlock(l2 + 1, k2, l1).isAir(world, l2 + 1, k2, l1)) { this.generateVines(world, l2 + 1, k2, l1, 2); } - if (random.nextInt(4) == 0 && world.func_147439_a(l2, k2, l1 - 1).isAir(world, l2, k2, l1 - 1)) + if (random.nextInt(4) == 0 && world.getBlock(l2, k2, l1 - 1).isAir(world, l2, k2, l1 - 1)) { this.generateVines(world, l2, k2, l1 - 1, 1); } - if (random.nextInt(4) == 0 && world.func_147439_a(l2, k2, l1 + 1).isAir(world, l2, k2, l1 + 1)) + if (random.nextInt(4) == 0 && world.getBlock(l2, k2, l1 + 1).isAir(world, l2, k2, l1 + 1)) { this.generateVines(world, l2, k2, l1 + 1, 4); } @@ -435,22 +435,22 @@ public class WorldGenBogTree2 extends WorldGenAbstractTree } } - // JAVADOC METHOD $$ func_76536_b + // JAVADOC METHOD $$ generateVines private void generateVines(World par1World, int par2, int par3, int par4, int par5) { - this.func_150516_a(par1World, par2, par3, par4, Blocks.vine, par5); + this.setBlockAndNotifyAdequately(par1World, par2, par3, par4, Blocks.vine, par5); int i1 = 4; while (true) { --par3; - if (!(par1World.func_147439_a(par2, par3, par4).isAir(par1World, par2, par3, par4)) || i1 <= 0) + if (!(par1World.getBlock(par2, par3, par4).isAir(par1World, par2, par3, par4)) || i1 <= 0) { return; } - this.func_150516_a(par1World, par2, par3, par4, Blocks.vine, par5); + this.setBlockAndNotifyAdequately(par1World, par2, par3, par4, Blocks.vine, par5); --i1; } } diff --git a/src/main/java/biomesoplenty/common/world/features/trees/WorldGenBrush1.java b/src/main/java/biomesoplenty/common/world/features/trees/WorldGenBrush1.java index eee59377b..bcad8a9fd 100644 --- a/src/main/java/biomesoplenty/common/world/features/trees/WorldGenBrush1.java +++ b/src/main/java/biomesoplenty/common/world/features/trees/WorldGenBrush1.java @@ -18,13 +18,13 @@ public class WorldGenBrush1 extends WorldGenAbstractTree public boolean generate(World world, Random random, int x, int y, int z) { //TODO: isAirBlock() - while (world.func_147437_c(x, y, z) && y > 2) + while (world.isAirBlock(x, y, z) && y > 2) { --y; } //TODO: getBlock() - Block block = world.func_147439_a(x, y, z); + Block block = world.getBlock(x, y, z); if (block != Blocks.grass) { @@ -37,37 +37,37 @@ public class WorldGenBrush1 extends WorldGenAbstractTree for (int var8 = -2; var8 <= 2; ++var8) { //TODO: isAirBlock() isAirBlock() - if (world.func_147437_c(x + var7, y - 1, z + var8) && world.func_147437_c(x + var7, y - 2, z + var8)) + if (world.isAirBlock(x + var7, y - 1, z + var8) && world.isAirBlock(x + var7, y - 2, z + var8)) return false; } } //TODO: setBlock() - world.func_147449_b(x, y, z, Blocks.dirt); - world.func_147465_d(x, y + 1, z, Blocks.log, 3, 2); - world.func_147465_d(x, y + 2, z, Blocks.log, 3, 2); - world.func_147465_d(x, y + 3, z, Blocks.log, 3, 2); - world.func_147465_d(x, y + 4, z, Blocks.log, 3, 2); - world.func_147465_d(x, y + 5, z, Blocks.log, 3, 2); - world.func_147465_d(x, y + 6, z, Blocks.log, 3, 2); - world.func_147465_d(x, y + 7, z, Blocks.log, 3, 2); - world.func_147449_b(x + 1, y + 7, z, Blocks.leaves); - world.func_147449_b(x - 1, y + 7, z, Blocks.leaves); - world.func_147449_b(x, y + 7, z + 1, Blocks.leaves); - world.func_147449_b(x, y + 7, z - 1, Blocks.leaves); + world.setBlock(x, y, z, Blocks.dirt); + world.setBlock(x, y + 1, z, Blocks.log, 3, 2); + world.setBlock(x, y + 2, z, Blocks.log, 3, 2); + world.setBlock(x, y + 3, z, Blocks.log, 3, 2); + world.setBlock(x, y + 4, z, Blocks.log, 3, 2); + world.setBlock(x, y + 5, z, Blocks.log, 3, 2); + world.setBlock(x, y + 6, z, Blocks.log, 3, 2); + world.setBlock(x, y + 7, z, Blocks.log, 3, 2); + world.setBlock(x + 1, y + 7, z, Blocks.leaves); + world.setBlock(x - 1, y + 7, z, Blocks.leaves); + world.setBlock(x, y + 7, z + 1, Blocks.leaves); + world.setBlock(x, y + 7, z - 1, Blocks.leaves); - world.func_147449_b(x + 1, y + 8, z, Blocks.leaves); - world.func_147449_b(x - 1, y + 8, z, Blocks.leaves); - world.func_147449_b(x, y + 8, z + 1, Blocks.leaves); - world.func_147449_b(x, y + 8, z - 1, Blocks.leaves); + world.setBlock(x + 1, y + 8, z, Blocks.leaves); + world.setBlock(x - 1, y + 8, z, Blocks.leaves); + world.setBlock(x, y + 8, z + 1, Blocks.leaves); + world.setBlock(x, y + 8, z - 1, Blocks.leaves); - world.func_147449_b(x + 1, y + 8, z + 1, Blocks.leaves); - world.func_147449_b(x + 1, y + 8, z - 1, Blocks.leaves); - world.func_147449_b(x - 1, y + 8, z + 1, Blocks.leaves); - world.func_147449_b(x - 1, y + 8, z - 1, Blocks.leaves); - world.func_147449_b(x, y + 8, z, Blocks.leaves); + world.setBlock(x + 1, y + 8, z + 1, Blocks.leaves); + world.setBlock(x + 1, y + 8, z - 1, Blocks.leaves); + world.setBlock(x - 1, y + 8, z + 1, Blocks.leaves); + world.setBlock(x - 1, y + 8, z - 1, Blocks.leaves); + world.setBlock(x, y + 8, z, Blocks.leaves); - world.func_147449_b(x, y + 9, z, Blocks.leaves); + world.setBlock(x, y + 9, z, Blocks.leaves); return true; } } diff --git a/src/main/java/biomesoplenty/common/world/features/trees/WorldGenBrush2.java b/src/main/java/biomesoplenty/common/world/features/trees/WorldGenBrush2.java index db2a53c4f..d04628782 100644 --- a/src/main/java/biomesoplenty/common/world/features/trees/WorldGenBrush2.java +++ b/src/main/java/biomesoplenty/common/world/features/trees/WorldGenBrush2.java @@ -35,13 +35,13 @@ public class WorldGenBrush2 extends WorldGenAbstractTree public boolean generate(World world, Random random, int x, int y, int z) { //TODO: isAirBlock() - while (world.func_147437_c(x, y, z) && y > 2) + while (world.isAirBlock(x, y, z) && y > 2) { --y; } //TODO: getBlock() - Block block = world.func_147439_a(x, y, z); + Block block = world.getBlock(x, y, z); if (!soilBlocks.contains(block)) { @@ -54,31 +54,31 @@ public class WorldGenBrush2 extends WorldGenAbstractTree for (int var8 = -2; var8 <= 2; ++var8) { //TODO: isAirBlock() isAirBlock() - if (world.func_147437_c(x + var7, y - 1, z + var8) && world.func_147437_c(x + var7, y - 2, z + var8)) + if (world.isAirBlock(x + var7, y - 1, z + var8) && world.isAirBlock(x + var7, y - 2, z + var8)) return false; } } //TODO: getBlock() - world.func_147439_a(x, y, z).onPlantGrow(world, x, y, z, x, y, z); + world.getBlock(x, y, z).onPlantGrow(world, x, y, z, x, y, z); //TODO: setBlock() - world.func_147465_d(x, y + 1, z, wood, woodMeta, 2); - world.func_147465_d(x, y + 2, z, wood, woodMeta, 2); - world.func_147465_d(x, y + 3, z, wood, woodMeta, 2); - world.func_147465_d(x, y + 4, z, wood, woodMeta, 2); - world.func_147465_d(x + 1, y + 4, z, leaves, leavesMeta, 2); - world.func_147465_d(x - 1, y + 4, z, leaves, leavesMeta, 2); - world.func_147465_d(x, y + 4, z + 1, leaves, leavesMeta, 2); - world.func_147465_d(x, y + 4, z - 1, leaves, leavesMeta, 2); - world.func_147465_d(x + 1, y + 4, z + 1, leaves, leavesMeta, 2); - world.func_147465_d(x + 1, y + 4, z - 1, leaves, leavesMeta, 2); - world.func_147465_d(x - 1, y + 4, z + 1, leaves, leavesMeta, 2); - world.func_147465_d(x - 1, y + 4, z - 1, leaves, leavesMeta, 2); - world.func_147465_d(x + 1, y + 5, z, leaves, leavesMeta, 2); - world.func_147465_d(x - 1, y + 5, z, leaves, leavesMeta, 2); - world.func_147465_d(x, y + 5, z + 1, leaves, leavesMeta, 2); - world.func_147465_d(x, y + 5, z - 1, leaves, leavesMeta, 2); - world.func_147465_d(x, y + 5, z, leaves, leavesMeta, 2); + world.setBlock(x, y + 1, z, wood, woodMeta, 2); + world.setBlock(x, y + 2, z, wood, woodMeta, 2); + world.setBlock(x, y + 3, z, wood, woodMeta, 2); + world.setBlock(x, y + 4, z, wood, woodMeta, 2); + world.setBlock(x + 1, y + 4, z, leaves, leavesMeta, 2); + world.setBlock(x - 1, y + 4, z, leaves, leavesMeta, 2); + world.setBlock(x, y + 4, z + 1, leaves, leavesMeta, 2); + world.setBlock(x, y + 4, z - 1, leaves, leavesMeta, 2); + world.setBlock(x + 1, y + 4, z + 1, leaves, leavesMeta, 2); + world.setBlock(x + 1, y + 4, z - 1, leaves, leavesMeta, 2); + world.setBlock(x - 1, y + 4, z + 1, leaves, leavesMeta, 2); + world.setBlock(x - 1, y + 4, z - 1, leaves, leavesMeta, 2); + world.setBlock(x + 1, y + 5, z, leaves, leavesMeta, 2); + world.setBlock(x - 1, y + 5, z, leaves, leavesMeta, 2); + world.setBlock(x, y + 5, z + 1, leaves, leavesMeta, 2); + world.setBlock(x, y + 5, z - 1, leaves, leavesMeta, 2); + world.setBlock(x, y + 5, z, leaves, leavesMeta, 2); return true; } diff --git a/src/main/java/biomesoplenty/common/world/features/trees/WorldGenBulbTree.java b/src/main/java/biomesoplenty/common/world/features/trees/WorldGenBulbTree.java index b2ac09eb0..15538357b 100644 --- a/src/main/java/biomesoplenty/common/world/features/trees/WorldGenBulbTree.java +++ b/src/main/java/biomesoplenty/common/world/features/trees/WorldGenBulbTree.java @@ -68,7 +68,7 @@ public class WorldGenBulbTree extends WorldGenAbstractTree { if (i1 >= 0 && i1 < 256) { - block = world.func_147439_a(j1, i1, k1); + block = world.getBlock(j1, i1, k1); if (!this.isReplaceable(world, j1, i1, k1)) { @@ -89,7 +89,7 @@ public class WorldGenBulbTree extends WorldGenAbstractTree } else { - Block block2 = world.func_147439_a(x, y - 1, z); + Block block2 = world.getBlock(x, y - 1, z); boolean isSoil = block2.canSustainPlant(world, x, y - 1, z, ForgeDirection.UP, (BlockSapling)Blocks.sapling); @@ -117,11 +117,11 @@ public class WorldGenBulbTree extends WorldGenAbstractTree if (Math.abs(j2) != l1 || Math.abs(l2) != l1 || random.nextInt(2) != 0 && i3 != 0) { - Block block1 = world.func_147439_a(i2, k1, k2); + Block block1 = world.getBlock(i2, k1, k2); if (block1.isAir(world, i2, k1, k2) || block1.isLeaves(world, i2, k1, k2)) { - this.func_150516_a(world, i2, k1, k2, leaves, this.metaLeaves); + this.setBlockAndNotifyAdequately(world, i2, k1, k2, leaves, this.metaLeaves); } } } @@ -130,66 +130,66 @@ public class WorldGenBulbTree extends WorldGenAbstractTree for (k1 = 0; k1 < l; ++k1) { - block = world.func_147439_a(x, y + k1, z); + block = world.getBlock(x, y + k1, z); if (block.isAir(world, x, y + k1, z) || block.isLeaves(world, x, y + k1, z)) { //TODO: setBlockAndMetadata() - this.func_150516_a(world, x, y + k1, z, wood, metaWood); + this.setBlockAndNotifyAdequately(world, x, y + k1, z, wood, metaWood); - this.func_150516_a(world, x - 1, y + (l - 4), z, leaves, metaLeaves); - this.func_150516_a(world, x + 1, y + (l - 4), z, leaves, metaLeaves); - this.func_150516_a(world, x, y + (l - 4), z - 1, leaves, metaLeaves); - this.func_150516_a(world, x, y + (l - 4), z + 1, leaves, metaLeaves); + this.setBlockAndNotifyAdequately(world, x - 1, y + (l - 4), z, leaves, metaLeaves); + this.setBlockAndNotifyAdequately(world, x + 1, y + (l - 4), z, leaves, metaLeaves); + this.setBlockAndNotifyAdequately(world, x, y + (l - 4), z - 1, leaves, metaLeaves); + this.setBlockAndNotifyAdequately(world, x, y + (l - 4), z + 1, leaves, metaLeaves); - this.func_150516_a(world, x - 1, y + (l - 5), z + 1, leaves, metaLeaves); - this.func_150516_a(world, x - 1, y + (l - 5), z - 1, leaves, metaLeaves); - this.func_150516_a(world, x + 1, y + (l - 5), z + 1, leaves, metaLeaves); - this.func_150516_a(world, x + 1, y + (l - 5), z - 1, leaves, metaLeaves); - this.func_150516_a(world, x - 1, y + (l - 5), z, leaves, metaLeaves); - this.func_150516_a(world, x + 1, y + (l - 5), z, leaves, metaLeaves); - this.func_150516_a(world, x, y + (l - 5), z - 1, leaves, metaLeaves); - this.func_150516_a(world, x, y + (l - 5), z + 1, leaves, metaLeaves); + this.setBlockAndNotifyAdequately(world, x - 1, y + (l - 5), z + 1, leaves, metaLeaves); + this.setBlockAndNotifyAdequately(world, x - 1, y + (l - 5), z - 1, leaves, metaLeaves); + this.setBlockAndNotifyAdequately(world, x + 1, y + (l - 5), z + 1, leaves, metaLeaves); + this.setBlockAndNotifyAdequately(world, x + 1, y + (l - 5), z - 1, leaves, metaLeaves); + this.setBlockAndNotifyAdequately(world, x - 1, y + (l - 5), z, leaves, metaLeaves); + this.setBlockAndNotifyAdequately(world, x + 1, y + (l - 5), z, leaves, metaLeaves); + this.setBlockAndNotifyAdequately(world, x, y + (l - 5), z - 1, leaves, metaLeaves); + this.setBlockAndNotifyAdequately(world, x, y + (l - 5), z + 1, leaves, metaLeaves); - this.func_150516_a(world, x - 1, y + (l - 6), z, leaves, metaLeaves); - this.func_150516_a(world, x + 1, y + (l - 6), z, leaves, metaLeaves); - this.func_150516_a(world, x, y + (l - 6), z - 1, leaves, metaLeaves); - this.func_150516_a(world, x, y + (l), z + 1, leaves, metaLeaves); + this.setBlockAndNotifyAdequately(world, x - 1, y + (l - 6), z, leaves, metaLeaves); + this.setBlockAndNotifyAdequately(world, x + 1, y + (l - 6), z, leaves, metaLeaves); + this.setBlockAndNotifyAdequately(world, x, y + (l - 6), z - 1, leaves, metaLeaves); + this.setBlockAndNotifyAdequately(world, x, y + (l), z + 1, leaves, metaLeaves); - this.func_150516_a(world, x - 1, y + (l - 7), z + 1, leaves, metaLeaves); - this.func_150516_a(world, x - 1, y + (l - 7), z - 1, leaves, metaLeaves); - this.func_150516_a(world, x + 1, y + (l - 7), z + 1, leaves, metaLeaves); - this.func_150516_a(world, x + 1, y + (l - 7), z - 1, leaves, metaLeaves); - this.func_150516_a(world, x - 1, y + (l - 7), z, leaves, metaLeaves); - this.func_150516_a(world, x + 1, y + (l - 7), z, leaves, metaLeaves); - this.func_150516_a(world, x, y + (l - 7), z - 1, leaves, metaLeaves); - this.func_150516_a(world, x, y + (l - 7), z + 1, leaves, metaLeaves); + this.setBlockAndNotifyAdequately(world, x - 1, y + (l - 7), z + 1, leaves, metaLeaves); + this.setBlockAndNotifyAdequately(world, x - 1, y + (l - 7), z - 1, leaves, metaLeaves); + this.setBlockAndNotifyAdequately(world, x + 1, y + (l - 7), z + 1, leaves, metaLeaves); + this.setBlockAndNotifyAdequately(world, x + 1, y + (l - 7), z - 1, leaves, metaLeaves); + this.setBlockAndNotifyAdequately(world, x - 1, y + (l - 7), z, leaves, metaLeaves); + this.setBlockAndNotifyAdequately(world, x + 1, y + (l - 7), z, leaves, metaLeaves); + this.setBlockAndNotifyAdequately(world, x, y + (l - 7), z - 1, leaves, metaLeaves); + this.setBlockAndNotifyAdequately(world, x, y + (l - 7), z + 1, leaves, metaLeaves); - this.func_150516_a(world, x - 1, y + (l - 8), z, leaves, metaLeaves); - this.func_150516_a(world, x + 1, y + (l - 8), z, leaves, metaLeaves); - this.func_150516_a(world, x, y + (l - 8), z - 1, leaves, metaLeaves); - this.func_150516_a(world, x, y + (l - 8), z + 1, leaves, metaLeaves); + this.setBlockAndNotifyAdequately(world, x - 1, y + (l - 8), z, leaves, metaLeaves); + this.setBlockAndNotifyAdequately(world, x + 1, y + (l - 8), z, leaves, metaLeaves); + this.setBlockAndNotifyAdequately(world, x, y + (l - 8), z - 1, leaves, metaLeaves); + this.setBlockAndNotifyAdequately(world, x, y + (l - 8), z + 1, leaves, metaLeaves); if (this.vinesGrow && k1 > 0) { - if (random.nextInt(3) > 0 && world.func_147437_c(x - 1, y + k1, z)) + if (random.nextInt(3) > 0 && world.isAirBlock(x - 1, y + k1, z)) { - this.func_150516_a(world, x - 1, y + k1, z, Blocks.vine, 8); + this.setBlockAndNotifyAdequately(world, x - 1, y + k1, z, Blocks.vine, 8); } - if (random.nextInt(3) > 0 && world.func_147437_c(x + 1, y + k1, z)) + if (random.nextInt(3) > 0 && world.isAirBlock(x + 1, y + k1, z)) { - this.func_150516_a(world, x + 1, y + k1, z, Blocks.vine, 2); + this.setBlockAndNotifyAdequately(world, x + 1, y + k1, z, Blocks.vine, 2); } - if (random.nextInt(3) > 0 && world.func_147437_c(x, y + k1, z - 1)) + if (random.nextInt(3) > 0 && world.isAirBlock(x, y + k1, z - 1)) { - this.func_150516_a(world, x, y + k1, z - 1, Blocks.vine, 1); + this.setBlockAndNotifyAdequately(world, x, y + k1, z - 1, Blocks.vine, 1); } - if (random.nextInt(3) > 0 && world.func_147437_c(x, y + k1, z + 1)) + if (random.nextInt(3) > 0 && world.isAirBlock(x, y + k1, z + 1)) { - this.func_150516_a(world, x, y + k1, z + 1, Blocks.vine, 4); + this.setBlockAndNotifyAdequately(world, x, y + k1, z + 1, Blocks.vine, 4); } } } @@ -206,24 +206,24 @@ public class WorldGenBulbTree extends WorldGenAbstractTree { for (j2 = z - l1; j2 <= z + l1; ++j2) { - if (world.func_147439_a(i2, k1, j2).isLeaves(world, i2, k1, j2)) + if (world.getBlock(i2, k1, j2).isLeaves(world, i2, k1, j2)) { - if (random.nextInt(4) == 0 && world.func_147439_a(i2 - 1, k1, j2).isAir(world, i2 - 1, k1, j2)) + if (random.nextInt(4) == 0 && world.getBlock(i2 - 1, k1, j2).isAir(world, i2 - 1, k1, j2)) { this.growVines(world, i2 - 1, k1, j2, 8); } - if (random.nextInt(4) == 0 && world.func_147439_a(i2 + 1, k1, j2).isAir(world, i2 + 1, k1, j2)) + if (random.nextInt(4) == 0 && world.getBlock(i2 + 1, k1, j2).isAir(world, i2 + 1, k1, j2)) { this.growVines(world, i2 + 1, k1, j2, 2); } - if (random.nextInt(4) == 0 && world.func_147439_a(i2, k1, j2 - 1).isAir(world, i2, k1, j2 - 1)) + if (random.nextInt(4) == 0 && world.getBlock(i2, k1, j2 - 1).isAir(world, i2, k1, j2 - 1)) { this.growVines(world, i2, k1, j2 - 1, 1); } - if (random.nextInt(4) == 0 && world.func_147439_a(i2, k1, j2 + 1).isAir(world, i2, k1, j2 + 1)) + if (random.nextInt(4) == 0 && world.getBlock(i2, k1, j2 + 1).isAir(world, i2, k1, j2 + 1)) { this.growVines(world, i2, k1, j2 + 1, 4); } @@ -241,7 +241,7 @@ public class WorldGenBulbTree extends WorldGenAbstractTree if (random.nextInt(4 - k1) == 0) { l1 = random.nextInt(3); - this.func_150516_a(world, x + Direction.offsetX[Direction.rotateOpposite[i3]], y + l - 5 + k1, z + Direction.offsetZ[Direction.rotateOpposite[i3]], Blocks.cocoa, l1 << 2 | i3); + this.setBlockAndNotifyAdequately(world, x + Direction.offsetX[Direction.rotateOpposite[i3]], y + l - 5 + k1, z + Direction.offsetZ[Direction.rotateOpposite[i3]], Blocks.cocoa, l1 << 2 | i3); } } } @@ -265,7 +265,7 @@ public class WorldGenBulbTree extends WorldGenAbstractTree private void growVines(World world, int x, int y, int z, int flag) { //TODO: setBlockAndMetadata() - this.func_150516_a(world, x, y, z, Blocks.vine, flag); + this.setBlockAndNotifyAdequately(world, x, y, z, Blocks.vine, flag); int i1 = 4; while (true) @@ -273,13 +273,13 @@ public class WorldGenBulbTree extends WorldGenAbstractTree --y; //TODO: getBlock() - if (world.func_147439_a(x, y, z).isAir(world, x, y, z) || i1 <= 0) + if (world.getBlock(x, y, z).isAir(world, x, y, z) || i1 <= 0) { return; } //TODO: setBlockAndMetadata() - this.func_150516_a(world, x, y, z, Blocks.vine, flag); + this.setBlockAndNotifyAdequately(world, x, y, z, Blocks.vine, flag); --i1; } } diff --git a/src/main/java/biomesoplenty/common/world/features/trees/WorldGenChaparral3.java b/src/main/java/biomesoplenty/common/world/features/trees/WorldGenChaparral3.java index e63ea3510..b3e6aaeec 100644 --- a/src/main/java/biomesoplenty/common/world/features/trees/WorldGenChaparral3.java +++ b/src/main/java/biomesoplenty/common/world/features/trees/WorldGenChaparral3.java @@ -18,13 +18,13 @@ public class WorldGenChaparral3 extends WorldGenAbstractTree public boolean generate(World world, Random random, int x, int y, int z) { //TODO: isAirBlock() - while (world.func_147437_c(x, y, z) && y > 2) + while (world.isAirBlock(x, y, z) && y > 2) { --y; } //TODO: getBlock() - Block block = world.func_147439_a(x, y, z); + Block block = world.getBlock(x, y, z); if (block != Blocks.grass && block != Blocks.sand) { @@ -37,14 +37,14 @@ public class WorldGenChaparral3 extends WorldGenAbstractTree for (int var8 = -2; var8 <= 2; ++var8) { //TODO: isAirBlock() isAirBlock() - if (world.func_147437_c(x + var7, y - 1, z + var8) && world.func_147437_c(x + var7, y - 2, z + var8)) + if (world.isAirBlock(x + var7, y - 1, z + var8) && world.isAirBlock(x + var7, y - 2, z + var8)) return false; } } //TODO: setBlock() - world.func_147449_b(x, y, z, Blocks.log); - world.func_147449_b(x, y + 1, z, Blocks.leaves); + world.setBlock(x, y, z, Blocks.log); + world.setBlock(x, y + 1, z, Blocks.leaves); return true; } } diff --git a/src/main/java/biomesoplenty/common/world/features/trees/WorldGenCypress.java b/src/main/java/biomesoplenty/common/world/features/trees/WorldGenCypress.java index 1b82bff68..f07b39303 100644 --- a/src/main/java/biomesoplenty/common/world/features/trees/WorldGenCypress.java +++ b/src/main/java/biomesoplenty/common/world/features/trees/WorldGenCypress.java @@ -92,7 +92,7 @@ public class WorldGenCypress extends WorldGenAbstractTree { if (l1 >= 0 && l1 < 256) { - Block block = world.func_147439_a(i2, l1, j2); + Block block = world.getBlock(i2, l1, j2); if (!block.isAir(world, i2, l1, j2) && !block.isLeaves(world, i2, l1, j2)) { @@ -113,7 +113,7 @@ public class WorldGenCypress extends WorldGenAbstractTree } else { - Block block1 = world.func_147439_a(x, y - 1, z); + Block block1 = world.getBlock(x, y - 1, z); boolean isSoil = block1.canSustainPlant(world, x, y - 1, z, ForgeDirection.UP, (BlockSapling)Blocks.sapling); if (isSoil && y < 256 - l - 1) @@ -137,12 +137,12 @@ public class WorldGenCypress extends WorldGenAbstractTree { int k3 = j3 - z; - if ((Math.abs(i3) != l3 || Math.abs(k3) != l3 || l3 <= 0) && world.func_147439_a(l2, k2, j3).canBeReplacedByLeaves(world, l2, k2, j3)) + if ((Math.abs(i3) != l3 || Math.abs(k3) != l3 || l3 <= 0) && world.getBlock(l2, k2, j3).canBeReplacedByLeaves(world, l2, k2, j3)) { if (random.nextInt(2) != 0) { //TODO: setBlockAndMetadata() - this.func_150516_a(world, l2, k2, j3, leaves, this.metaLeaves); + this.setBlockAndNotifyAdequately(world, l2, k2, j3, leaves, this.metaLeaves); } } } @@ -169,22 +169,22 @@ public class WorldGenCypress extends WorldGenAbstractTree for (k2 = 0; k2 < l - i4; ++k2) { - Block block2 = world.func_147439_a(x, y + k2, z); + Block block2 = world.getBlock(x, y + k2, z); if (block2.isAir(world, x, y + k2, z) || block2.isLeaves(world, x, y + k2, z)) { //TODO: setBlockAndMetadata() - this.func_150516_a(world, x, y + k2, z, wood, metaWood); - this.func_150516_a(world, x, (y + k2), z, wood, metaWood); - this.func_150516_a(world, x, (y + k2) - 2, z, wood, metaWood); - this.func_150516_a(world, x, (y + k2) - 1, z, wood, metaWood); - this.func_150516_a(world, x, (y + k2), z, wood, metaWood); - this.func_150516_a(world, x, (y + k2) + 1, z, wood, metaWood); - this.func_150516_a(world, x - 1, (y + k2) + 1, z, leaves, metaLeaves); - this.func_150516_a(world, x + 1, (y + k2) + 1, z, leaves, metaLeaves); - this.func_150516_a(world, x, (y + k2) + 1, z - 1, leaves, metaLeaves); - this.func_150516_a(world, x, (y + k2) + 1, z + 1, leaves, metaLeaves); - this.func_150516_a(world, x, (y + k2) + 2, z, leaves, metaLeaves); + this.setBlockAndNotifyAdequately(world, x, y + k2, z, wood, metaWood); + this.setBlockAndNotifyAdequately(world, x, (y + k2), z, wood, metaWood); + this.setBlockAndNotifyAdequately(world, x, (y + k2) - 2, z, wood, metaWood); + this.setBlockAndNotifyAdequately(world, x, (y + k2) - 1, z, wood, metaWood); + this.setBlockAndNotifyAdequately(world, x, (y + k2), z, wood, metaWood); + this.setBlockAndNotifyAdequately(world, x, (y + k2) + 1, z, wood, metaWood); + this.setBlockAndNotifyAdequately(world, x - 1, (y + k2) + 1, z, leaves, metaLeaves); + this.setBlockAndNotifyAdequately(world, x + 1, (y + k2) + 1, z, leaves, metaLeaves); + this.setBlockAndNotifyAdequately(world, x, (y + k2) + 1, z - 1, leaves, metaLeaves); + this.setBlockAndNotifyAdequately(world, x, (y + k2) + 1, z + 1, leaves, metaLeaves); + this.setBlockAndNotifyAdequately(world, x, (y + k2) + 2, z, leaves, metaLeaves); } } diff --git a/src/main/java/biomesoplenty/common/world/features/trees/WorldGenDeadTree1.java b/src/main/java/biomesoplenty/common/world/features/trees/WorldGenDeadTree1.java index d22d20035..a581deabc 100644 --- a/src/main/java/biomesoplenty/common/world/features/trees/WorldGenDeadTree1.java +++ b/src/main/java/biomesoplenty/common/world/features/trees/WorldGenDeadTree1.java @@ -172,7 +172,7 @@ public class WorldGenDeadTree1 extends WorldGenAbstractTree { var11[var9] = var10[var9] + var13; //TODO: getBlock() - Block var14 = worldObj.func_147439_a(var11[0], var11[1], var11[2]); + Block var14 = worldObj.getBlock(var11[0], var11[1], var11[2]); if (var14 != Blocks.air && var14 != Blocks.leaves) { @@ -181,7 +181,7 @@ public class WorldGenDeadTree1 extends WorldGenAbstractTree else { //TODO: setBlockAndMetadata() - this.func_150516_a(worldObj, var11[0], var11[1], var11[2], par6, 0); + this.setBlockAndNotifyAdequately(worldObj, var11[0], var11[1], var11[2], par6, 0); ++var13; } } @@ -301,7 +301,7 @@ public class WorldGenDeadTree1 extends WorldGenAbstractTree } //TODO: setBlockAndMetadata() - this.func_150516_a(worldObj, var14[0], var14[1], var14[2], par3, var17); + this.setBlockAndNotifyAdequately(worldObj, var14[0], var14[1], var14[2], par3, var17); } } } @@ -429,7 +429,7 @@ public class WorldGenDeadTree1 extends WorldGenAbstractTree var13[var6] = MathHelper.floor_double(par1ArrayOfInteger[var6] + var14 * var9); var13[var7] = MathHelper.floor_double(par1ArrayOfInteger[var7] + var14 * var11); //TODO: getBlock() - Block var16 = worldObj.func_147439_a(var13[0], var13[1], var13[2]); + Block var16 = worldObj.getBlock(var13[0], var13[1], var13[2]); if (var16 != Blocks.air && var16 != Blocks.leaves) { @@ -450,7 +450,7 @@ public class WorldGenDeadTree1 extends WorldGenAbstractTree int[] var1 = new int[] {basePos[0], basePos[1], basePos[2]}; int[] var2 = new int[] {basePos[0], basePos[1] + heightLimit - 1, basePos[2]}; //TODO: getBlock() - Block var3 = worldObj.func_147439_a(basePos[0], basePos[1] - 1, basePos[2]); + Block var3 = worldObj.getBlock(basePos[0], basePos[1] - 1, basePos[2]); if (!soilBlocks.contains(var3)) return false; diff --git a/src/main/java/biomesoplenty/common/world/features/trees/WorldGenMiniShrub.java b/src/main/java/biomesoplenty/common/world/features/trees/WorldGenMiniShrub.java index d21d0e712..6114eb497 100644 --- a/src/main/java/biomesoplenty/common/world/features/trees/WorldGenMiniShrub.java +++ b/src/main/java/biomesoplenty/common/world/features/trees/WorldGenMiniShrub.java @@ -36,13 +36,13 @@ public class WorldGenMiniShrub extends WorldGenAbstractTree public boolean generate(World world, Random random, int x, int y, int z) { //TODO: isAirBlock() - while (world.func_147437_c(x, y, z) && y > 2) + while (world.isAirBlock(x, y, z) && y > 2) { --y; } //TODO: getBlock() - Block block = world.func_147439_a(x, y, z); + Block block = world.getBlock(x, y, z); if (!soilBlocks.contains(block)) { @@ -55,21 +55,21 @@ public class WorldGenMiniShrub extends WorldGenAbstractTree for (int var8 = -2; var8 <= 2; ++var8) { //TODO: isAirBlock() isAirBlock() - if (world.func_147437_c(x + var7, y - 1, z + var8) && world.func_147437_c(x + var7, y - 2, z + var8)) + if (world.isAirBlock(x + var7, y - 1, z + var8) && world.isAirBlock(x + var7, y - 2, z + var8)) return false; } } //TODO: getBlock() - world.func_147439_a(x, y, z).onPlantGrow(world, x, y, z, x, y, z); + world.getBlock(x, y, z).onPlantGrow(world, x, y, z, x, y, z); //TODO: setBlock() - world.func_147465_d(x, y + 1, z, wood, woodMeta, 2); - world.func_147465_d(x, y + 2, z, wood, woodMeta, 2); - world.func_147465_d(x + 1, y + 2, z, leaves, leavesMeta, 2); - world.func_147465_d(x - 1, y + 2, z, leaves, leavesMeta, 2); - world.func_147465_d(x, y + 2, z + 1, leaves, leavesMeta, 2); - world.func_147465_d(x, y + 2, z - 1, leaves, leavesMeta, 2); - world.func_147465_d(x, y + 3, z, leaves, leavesMeta, 2); + world.setBlock(x, y + 1, z, wood, woodMeta, 2); + world.setBlock(x, y + 2, z, wood, woodMeta, 2); + world.setBlock(x + 1, y + 2, z, leaves, leavesMeta, 2); + world.setBlock(x - 1, y + 2, z, leaves, leavesMeta, 2); + world.setBlock(x, y + 2, z + 1, leaves, leavesMeta, 2); + world.setBlock(x, y + 2, z - 1, leaves, leavesMeta, 2); + world.setBlock(x, y + 3, z, leaves, leavesMeta, 2); return true; } } diff --git a/src/main/java/biomesoplenty/common/world/features/trees/WorldGenOriginalTree.java b/src/main/java/biomesoplenty/common/world/features/trees/WorldGenOriginalTree.java index 751876cbd..5bf4427f4 100644 --- a/src/main/java/biomesoplenty/common/world/features/trees/WorldGenOriginalTree.java +++ b/src/main/java/biomesoplenty/common/world/features/trees/WorldGenOriginalTree.java @@ -73,7 +73,7 @@ public class WorldGenOriginalTree extends WorldGenAbstractTree { if (i1 >= 0 && i1 < 256) { - block = par1World.func_147439_a(j1, i1, k1); + block = par1World.getBlock(j1, i1, k1); if (!this.isReplaceable(par1World, j1, i1, k1)) { @@ -94,7 +94,7 @@ public class WorldGenOriginalTree extends WorldGenAbstractTree } else { - Block block2 = par1World.func_147439_a(par3, par4 - 1, par5); + Block block2 = par1World.getBlock(par3, par4 - 1, par5); boolean isSoil = block2.canSustainPlant(par1World, par3, par4 - 1, par5, ForgeDirection.UP, (BlockSapling)Blocks.sapling); @@ -123,11 +123,11 @@ public class WorldGenOriginalTree extends WorldGenAbstractTree if (Math.abs(j2) != l1 || Math.abs(l2) != l1 || par2Random.nextInt(2) != 0 && i3 != 0) { - Block block1 = par1World.func_147439_a(i2, k1, k2); + Block block1 = par1World.getBlock(i2, k1, k2); if (block1.isAir(par1World, i2, k1, k2) || block1.isLeaves(par1World, i2, k1, k2)) { - this.func_150516_a(par1World, i2, k1, k2, this.leaves, this.metaLeaves); + this.setBlockAndNotifyAdequately(par1World, i2, k1, k2, this.leaves, this.metaLeaves); } } } @@ -136,32 +136,32 @@ public class WorldGenOriginalTree extends WorldGenAbstractTree for (k1 = 0; k1 < l; ++k1) { - block = par1World.func_147439_a(par3, par4 + k1, par5); + block = par1World.getBlock(par3, par4 + k1, par5); if (block.isAir(par1World, par3, par4 + k1, par5) || block.isLeaves(par1World, par3, par4 + k1, par5)) { - this.func_150516_a(par1World, par3, par4 + k1, par5, this.wood, this.metaWood); + this.setBlockAndNotifyAdequately(par1World, par3, par4 + k1, par5, this.wood, this.metaWood); if (this.vinesGrow && k1 > 0) { - if (par2Random.nextInt(3) > 0 && par1World.func_147437_c(par3 - 1, par4 + k1, par5)) + if (par2Random.nextInt(3) > 0 && par1World.isAirBlock(par3 - 1, par4 + k1, par5)) { - this.func_150516_a(par1World, par3 - 1, par4 + k1, par5, Blocks.vine, 8); + this.setBlockAndNotifyAdequately(par1World, par3 - 1, par4 + k1, par5, Blocks.vine, 8); } - if (par2Random.nextInt(3) > 0 && par1World.func_147437_c(par3 + 1, par4 + k1, par5)) + if (par2Random.nextInt(3) > 0 && par1World.isAirBlock(par3 + 1, par4 + k1, par5)) { - this.func_150516_a(par1World, par3 + 1, par4 + k1, par5, Blocks.vine, 2); + this.setBlockAndNotifyAdequately(par1World, par3 + 1, par4 + k1, par5, Blocks.vine, 2); } - if (par2Random.nextInt(3) > 0 && par1World.func_147437_c(par3, par4 + k1, par5 - 1)) + if (par2Random.nextInt(3) > 0 && par1World.isAirBlock(par3, par4 + k1, par5 - 1)) { - this.func_150516_a(par1World, par3, par4 + k1, par5 - 1, Blocks.vine, 1); + this.setBlockAndNotifyAdequately(par1World, par3, par4 + k1, par5 - 1, Blocks.vine, 1); } - if (par2Random.nextInt(3) > 0 && par1World.func_147437_c(par3, par4 + k1, par5 + 1)) + if (par2Random.nextInt(3) > 0 && par1World.isAirBlock(par3, par4 + k1, par5 + 1)) { - this.func_150516_a(par1World, par3, par4 + k1, par5 + 1, Blocks.vine, 4); + this.setBlockAndNotifyAdequately(par1World, par3, par4 + k1, par5 + 1, Blocks.vine, 4); } } } @@ -178,24 +178,24 @@ public class WorldGenOriginalTree extends WorldGenAbstractTree { for (j2 = par5 - l1; j2 <= par5 + l1; ++j2) { - if (par1World.func_147439_a(i2, k1, j2).isLeaves(par1World, i2, k1, j2)) + if (par1World.getBlock(i2, k1, j2).isLeaves(par1World, i2, k1, j2)) { - if (par2Random.nextInt(4) == 0 && par1World.func_147439_a(i2 - 1, k1, j2).isAir(par1World, i2 - 1, k1, j2)) + if (par2Random.nextInt(4) == 0 && par1World.getBlock(i2 - 1, k1, j2).isAir(par1World, i2 - 1, k1, j2)) { this.growVines(par1World, i2 - 1, k1, j2, 8); } - if (par2Random.nextInt(4) == 0 && par1World.func_147439_a(i2 + 1, k1, j2).isAir(par1World, i2 + 1, k1, j2)) + if (par2Random.nextInt(4) == 0 && par1World.getBlock(i2 + 1, k1, j2).isAir(par1World, i2 + 1, k1, j2)) { this.growVines(par1World, i2 + 1, k1, j2, 2); } - if (par2Random.nextInt(4) == 0 && par1World.func_147439_a(i2, k1, j2 - 1).isAir(par1World, i2, k1, j2 - 1)) + if (par2Random.nextInt(4) == 0 && par1World.getBlock(i2, k1, j2 - 1).isAir(par1World, i2, k1, j2 - 1)) { this.growVines(par1World, i2, k1, j2 - 1, 1); } - if (par2Random.nextInt(4) == 0 && par1World.func_147439_a(i2, k1, j2 + 1).isAir(par1World, i2, k1, j2 + 1)) + if (par2Random.nextInt(4) == 0 && par1World.getBlock(i2, k1, j2 + 1).isAir(par1World, i2, k1, j2 + 1)) { this.growVines(par1World, i2, k1, j2 + 1, 4); } @@ -213,7 +213,7 @@ public class WorldGenOriginalTree extends WorldGenAbstractTree if (par2Random.nextInt(4 - k1) == 0) { l1 = par2Random.nextInt(3); - this.func_150516_a(par1World, par3 + Direction.offsetX[Direction.rotateOpposite[i3]], par4 + l - 5 + k1, par5 + Direction.offsetZ[Direction.rotateOpposite[i3]], Blocks.cocoa, l1 << 2 | i3); + this.setBlockAndNotifyAdequately(par1World, par3 + Direction.offsetX[Direction.rotateOpposite[i3]], par4 + l - 5 + k1, par5 + Direction.offsetZ[Direction.rotateOpposite[i3]], Blocks.cocoa, l1 << 2 | i3); } } } @@ -237,7 +237,7 @@ public class WorldGenOriginalTree extends WorldGenAbstractTree private void growVines(World world, int x, int y, int z, int flag) { //TODO: setBlockAndMetadata() - this.func_150516_a(world, x, y, z, Blocks.vine, flag); + this.setBlockAndNotifyAdequately(world, x, y, z, Blocks.vine, flag); int i1 = 4; while (true) @@ -245,13 +245,13 @@ public class WorldGenOriginalTree extends WorldGenAbstractTree --y; //TODO: getBlock() - if (world.func_147439_a(x, y, z).isAir(world, x, y, z) || i1 <= 0) + if (world.getBlock(x, y, z).isAir(world, x, y, z) || i1 <= 0) { return; } //TODO: setBlockAndMetadata() - this.func_150516_a(world, x, y, z, Blocks.vine, flag); + this.setBlockAndNotifyAdequately(world, x, y, z, Blocks.vine, flag); --i1; } } diff --git a/src/main/java/biomesoplenty/common/world/features/trees/WorldGenPalmTree1.java b/src/main/java/biomesoplenty/common/world/features/trees/WorldGenPalmTree1.java index 5967ab0d5..4bd47a0e3 100644 --- a/src/main/java/biomesoplenty/common/world/features/trees/WorldGenPalmTree1.java +++ b/src/main/java/biomesoplenty/common/world/features/trees/WorldGenPalmTree1.java @@ -32,13 +32,13 @@ public class WorldGenPalmTree1 extends WorldGenAbstractTree public boolean generate(World world, Random random, int x, int y, int z) { //TODO: isAirBlock() - while (world.func_147437_c(x, y, z) && y > 2) + while (world.isAirBlock(x, y, z) && y > 2) { --y; } //TODO: getBlock() - Block block = world.func_147439_a(x, y, z); + Block block = world.getBlock(x, y, z); if (block != Blocks.grass) { @@ -51,7 +51,7 @@ public class WorldGenPalmTree1 extends WorldGenAbstractTree for (int var8 = -2; var8 <= 2; ++var8) { //TODO: isAirBlock() isAirBlock() isAirBlock() - if (world.func_147437_c(x + var7, y - 1, z + var8) && world.func_147437_c(x + var7, y - 2, z + var8) && !world.func_147437_c(x + var7, y, z + var8)) + if (world.isAirBlock(x + var7, y - 1, z + var8) && world.isAirBlock(x + var7, y - 2, z + var8) && !world.isAirBlock(x + var7, y, z + var8)) { return false; } @@ -121,6 +121,6 @@ public class WorldGenPalmTree1 extends WorldGenAbstractTree public void buildBlock(World world, int x, int y, int z, Block block, int meta) { - world.func_147465_d(x, y, z, block, meta, 2); + world.setBlock(x, y, z, block, meta, 2); } } diff --git a/src/main/java/biomesoplenty/common/world/features/trees/WorldGenPineTree.java b/src/main/java/biomesoplenty/common/world/features/trees/WorldGenPineTree.java index 2c704ed09..a874b04ac 100644 --- a/src/main/java/biomesoplenty/common/world/features/trees/WorldGenPineTree.java +++ b/src/main/java/biomesoplenty/common/world/features/trees/WorldGenPineTree.java @@ -20,13 +20,13 @@ public class WorldGenPineTree extends WorldGenAbstractTree public boolean generate(World world, Random random, int x, int y, int z) { //TODO: isAirBlock() - while (world.func_147437_c(x, y, z) && y > 2) + while (world.isAirBlock(x, y, z) && y > 2) { --y; } //TODO: getBlock() - Block var6 = world.func_147439_a(x, y, z); + Block var6 = world.getBlock(x, y, z); if (var6 != Blocks.grass && var6 != BOPBlockHelper.get("hardDirt") && var6 != Blocks.stone && var6 != Blocks.dirt) { @@ -39,7 +39,7 @@ public class WorldGenPineTree extends WorldGenAbstractTree for (int var8 = -2; var8 <= 2; ++var8) { //TODO: isAirBlock() isAirBlock() isAirBlock() - if (world.func_147437_c(x + var7, y - 1, z + var8) && world.func_147437_c(x + var7, y - 2, z + var8) && !world.func_147437_c(x + var7, y, z + var8)) + if (world.isAirBlock(x + var7, y - 1, z + var8) && world.isAirBlock(x + var7, y - 2, z + var8) && !world.isAirBlock(x + var7, y, z + var8)) { return false; } @@ -216,6 +216,6 @@ public class WorldGenPineTree extends WorldGenAbstractTree public void buildBlock(World world, int x, int y, int z, Block block, int meta) { //TODO: setBlock() - world.func_147465_d(x, y, z, block, meta, 2); + world.setBlock(x, y, z, block, meta, 2); } } \ No newline at end of file diff --git a/src/main/java/biomesoplenty/common/world/features/trees/WorldGenPoplar.java b/src/main/java/biomesoplenty/common/world/features/trees/WorldGenPoplar.java index 3d82093f8..d27f3394b 100644 --- a/src/main/java/biomesoplenty/common/world/features/trees/WorldGenPoplar.java +++ b/src/main/java/biomesoplenty/common/world/features/trees/WorldGenPoplar.java @@ -18,13 +18,13 @@ public class WorldGenPoplar extends WorldGenAbstractTree public boolean generate(World world, Random random, int x, int y, int z) { //TODO: isAirBlock() - while (world.func_147437_c(x, y, z) && y > 2) + while (world.isAirBlock(x, y, z) && y > 2) { --y; } //TODO: getBlock() - Block block = world.func_147439_a(x, y, z); + Block block = world.getBlock(x, y, z); if (block != Blocks.grass) { @@ -37,98 +37,98 @@ public class WorldGenPoplar extends WorldGenAbstractTree for (int var8 = -2; var8 <= 2; ++var8) { //TODO: isAirBlock() isAirBlock() isAirBlock() - if (world.func_147437_c(x + var7, y - 1, z + var8) && world.func_147437_c(x + var7, y - 2, z + var8) && !world.func_147437_c(x + var7, y, z + var8)) + if (world.isAirBlock(x + var7, y - 1, z + var8) && world.isAirBlock(x + var7, y - 2, z + var8) && !world.isAirBlock(x + var7, y, z + var8)) return false; } } //TODO: setBlock() - world.func_147449_b(x, y, z, Blocks.dirt); - world.func_147465_d(x, y + 1, z, Blocks.log, 1, 2); - world.func_147465_d(x, y + 2, z, Blocks.log, 1, 2); - world.func_147465_d(x, y + 3, z, Blocks.log, 1, 2); - world.func_147465_d(x, y + 4, z, Blocks.log, 1, 2); - world.func_147465_d(x, y + 5, z, Blocks.log, 1, 2); - world.func_147465_d(x, y + 6, z, Blocks.log, 1, 2); - world.func_147465_d(x, y + 7, z, Blocks.log, 1, 2); - world.func_147465_d(x, y + 8, z, Blocks.log, 1, 2); - world.func_147465_d(x, y + 9, z, Blocks.log, 1, 2); + world.setBlock(x, y, z, Blocks.dirt); + world.setBlock(x, y + 1, z, Blocks.log, 1, 2); + world.setBlock(x, y + 2, z, Blocks.log, 1, 2); + world.setBlock(x, y + 3, z, Blocks.log, 1, 2); + world.setBlock(x, y + 4, z, Blocks.log, 1, 2); + world.setBlock(x, y + 5, z, Blocks.log, 1, 2); + world.setBlock(x, y + 6, z, Blocks.log, 1, 2); + world.setBlock(x, y + 7, z, Blocks.log, 1, 2); + world.setBlock(x, y + 8, z, Blocks.log, 1, 2); + world.setBlock(x, y + 9, z, Blocks.log, 1, 2); - world.func_147465_d(x + 1, y + 3, z, Blocks.leaves, 1, 2); - world.func_147465_d(x - 1, y + 3, z, Blocks.leaves, 1, 2); - world.func_147465_d(x, y + 3, z + 1, Blocks.leaves, 1, 2); - world.func_147465_d(x, y + 3, z - 1, Blocks.leaves, 1, 2); + world.setBlock(x + 1, y + 3, z, Blocks.leaves, 1, 2); + world.setBlock(x - 1, y + 3, z, Blocks.leaves, 1, 2); + world.setBlock(x, y + 3, z + 1, Blocks.leaves, 1, 2); + world.setBlock(x, y + 3, z - 1, Blocks.leaves, 1, 2); - world.func_147465_d(x + 1, y + 4, z, Blocks.leaves, 1, 2); - world.func_147465_d(x - 1, y + 4, z, Blocks.leaves, 1, 2); - world.func_147465_d(x, y + 4, z + 1, Blocks.leaves, 1, 2); - world.func_147465_d(x, y + 4, z - 1, Blocks.leaves, 1, 2); - world.func_147465_d(x + 1, y + 4, z + 1, Blocks.leaves, 1, 2); - world.func_147465_d(x + 1, y + 4, z - 1, Blocks.leaves, 1, 2); - world.func_147465_d(x - 1, y + 4, z + 1, Blocks.leaves, 1, 2); - world.func_147465_d(x - 1, y + 4, z - 1, Blocks.leaves, 1, 2); + world.setBlock(x + 1, y + 4, z, Blocks.leaves, 1, 2); + world.setBlock(x - 1, y + 4, z, Blocks.leaves, 1, 2); + world.setBlock(x, y + 4, z + 1, Blocks.leaves, 1, 2); + world.setBlock(x, y + 4, z - 1, Blocks.leaves, 1, 2); + world.setBlock(x + 1, y + 4, z + 1, Blocks.leaves, 1, 2); + world.setBlock(x + 1, y + 4, z - 1, Blocks.leaves, 1, 2); + world.setBlock(x - 1, y + 4, z + 1, Blocks.leaves, 1, 2); + world.setBlock(x - 1, y + 4, z - 1, Blocks.leaves, 1, 2); - world.func_147465_d(x + 1, y + 5, z, Blocks.leaves, 1, 2); - world.func_147465_d(x - 1, y + 5, z, Blocks.leaves, 1, 2); - world.func_147465_d(x, y + 5, z + 1, Blocks.leaves, 1, 2); - world.func_147465_d(x, y + 5, z - 1, Blocks.leaves, 1, 2); - world.func_147465_d(x + 1, y + 5, z + 1, Blocks.leaves, 1, 2); - world.func_147465_d(x + 1, y + 5, z - 1, Blocks.leaves, 1, 2); - world.func_147465_d(x - 1, y + 5, z + 1, Blocks.leaves, 1, 2); - world.func_147465_d(x - 1, y + 5, z - 1, Blocks.leaves, 1, 2); - world.func_147465_d(x + 2, y + 5, z, Blocks.leaves, 1, 2); - world.func_147465_d(x - 2, y + 5, z, Blocks.leaves, 1, 2); - world.func_147465_d(x, y + 5, z + 2, Blocks.leaves, 1, 2); - world.func_147465_d(x, y + 5, z - 2, Blocks.leaves, 1, 2); + world.setBlock(x + 1, y + 5, z, Blocks.leaves, 1, 2); + world.setBlock(x - 1, y + 5, z, Blocks.leaves, 1, 2); + world.setBlock(x, y + 5, z + 1, Blocks.leaves, 1, 2); + world.setBlock(x, y + 5, z - 1, Blocks.leaves, 1, 2); + world.setBlock(x + 1, y + 5, z + 1, Blocks.leaves, 1, 2); + world.setBlock(x + 1, y + 5, z - 1, Blocks.leaves, 1, 2); + world.setBlock(x - 1, y + 5, z + 1, Blocks.leaves, 1, 2); + world.setBlock(x - 1, y + 5, z - 1, Blocks.leaves, 1, 2); + world.setBlock(x + 2, y + 5, z, Blocks.leaves, 1, 2); + world.setBlock(x - 2, y + 5, z, Blocks.leaves, 1, 2); + world.setBlock(x, y + 5, z + 2, Blocks.leaves, 1, 2); + world.setBlock(x, y + 5, z - 2, Blocks.leaves, 1, 2); - world.func_147465_d(x + 1, y + 6, z, Blocks.leaves, 1, 2); - world.func_147465_d(x - 1, y + 6, z, Blocks.leaves, 1, 2); - world.func_147465_d(x, y + 6, z + 1, Blocks.leaves, 1, 2); - world.func_147465_d(x, y + 6, z - 1, Blocks.leaves, 1, 2); - world.func_147465_d(x + 1, y + 6, z + 1, Blocks.leaves, 1, 2); - world.func_147465_d(x + 1, y + 6, z - 1, Blocks.leaves, 1, 2); - world.func_147465_d(x - 1, y + 6, z + 1, Blocks.leaves, 1, 2); - world.func_147465_d(x - 1, y + 6, z - 1, Blocks.leaves, 1, 2); - world.func_147465_d(x + 2, y + 6, z, Blocks.leaves, 1, 2); - world.func_147465_d(x - 2, y + 6, z, Blocks.leaves, 1, 2); - world.func_147465_d(x, y + 6, z + 2, Blocks.leaves, 1, 2); - world.func_147465_d(x, y + 6, z - 2, Blocks.leaves, 1, 2); + world.setBlock(x + 1, y + 6, z, Blocks.leaves, 1, 2); + world.setBlock(x - 1, y + 6, z, Blocks.leaves, 1, 2); + world.setBlock(x, y + 6, z + 1, Blocks.leaves, 1, 2); + world.setBlock(x, y + 6, z - 1, Blocks.leaves, 1, 2); + world.setBlock(x + 1, y + 6, z + 1, Blocks.leaves, 1, 2); + world.setBlock(x + 1, y + 6, z - 1, Blocks.leaves, 1, 2); + world.setBlock(x - 1, y + 6, z + 1, Blocks.leaves, 1, 2); + world.setBlock(x - 1, y + 6, z - 1, Blocks.leaves, 1, 2); + world.setBlock(x + 2, y + 6, z, Blocks.leaves, 1, 2); + world.setBlock(x - 2, y + 6, z, Blocks.leaves, 1, 2); + world.setBlock(x, y + 6, z + 2, Blocks.leaves, 1, 2); + world.setBlock(x, y + 6, z - 2, Blocks.leaves, 1, 2); - world.func_147465_d(x + 1, y + 7, z, Blocks.leaves, 1, 2); - world.func_147465_d(x - 1, y + 7, z, Blocks.leaves, 1, 2); - world.func_147465_d(x, y + 7, z + 1, Blocks.leaves, 1, 2); - world.func_147465_d(x, y + 7, z - 1, Blocks.leaves, 1, 2); - world.func_147465_d(x + 1, y + 7, z + 1, Blocks.leaves, 1, 2); - world.func_147465_d(x + 1, y + 7, z - 1, Blocks.leaves, 1, 2); - world.func_147465_d(x - 1, y + 7, z + 1, Blocks.leaves, 1, 2); - world.func_147465_d(x - 1, y + 7, z - 1, Blocks.leaves, 1, 2); - world.func_147465_d(x + 2, y + 7, z, Blocks.leaves, 1, 2); - world.func_147465_d(x - 2, y + 7, z, Blocks.leaves, 1, 2); - world.func_147465_d(x, y + 7, z + 2, Blocks.leaves, 1, 2); - world.func_147465_d(x, y + 7, z - 2, Blocks.leaves, 1, 2); + world.setBlock(x + 1, y + 7, z, Blocks.leaves, 1, 2); + world.setBlock(x - 1, y + 7, z, Blocks.leaves, 1, 2); + world.setBlock(x, y + 7, z + 1, Blocks.leaves, 1, 2); + world.setBlock(x, y + 7, z - 1, Blocks.leaves, 1, 2); + world.setBlock(x + 1, y + 7, z + 1, Blocks.leaves, 1, 2); + world.setBlock(x + 1, y + 7, z - 1, Blocks.leaves, 1, 2); + world.setBlock(x - 1, y + 7, z + 1, Blocks.leaves, 1, 2); + world.setBlock(x - 1, y + 7, z - 1, Blocks.leaves, 1, 2); + world.setBlock(x + 2, y + 7, z, Blocks.leaves, 1, 2); + world.setBlock(x - 2, y + 7, z, Blocks.leaves, 1, 2); + world.setBlock(x, y + 7, z + 2, Blocks.leaves, 1, 2); + world.setBlock(x, y + 7, z - 2, Blocks.leaves, 1, 2); - world.func_147465_d(x + 1, y + 8, z, Blocks.leaves, 1, 2); - world.func_147465_d(x - 1, y + 8, z, Blocks.leaves, 1, 2); - world.func_147465_d(x, y + 8, z + 1, Blocks.leaves, 1, 2); - world.func_147465_d(x, y + 8, z - 1, Blocks.leaves, 1, 2); - world.func_147465_d(x + 1, y + 8, z + 1, Blocks.leaves, 1, 2); - world.func_147465_d(x + 1, y + 8, z - 1, Blocks.leaves, 1, 2); - world.func_147465_d(x - 1, y + 8, z + 1, Blocks.leaves, 1, 2); - world.func_147465_d(x - 1, y + 8, z - 1, Blocks.leaves, 1, 2); + world.setBlock(x + 1, y + 8, z, Blocks.leaves, 1, 2); + world.setBlock(x - 1, y + 8, z, Blocks.leaves, 1, 2); + world.setBlock(x, y + 8, z + 1, Blocks.leaves, 1, 2); + world.setBlock(x, y + 8, z - 1, Blocks.leaves, 1, 2); + world.setBlock(x + 1, y + 8, z + 1, Blocks.leaves, 1, 2); + world.setBlock(x + 1, y + 8, z - 1, Blocks.leaves, 1, 2); + world.setBlock(x - 1, y + 8, z + 1, Blocks.leaves, 1, 2); + world.setBlock(x - 1, y + 8, z - 1, Blocks.leaves, 1, 2); - world.func_147465_d(x + 1, y + 9, z, Blocks.leaves, 1, 2); - world.func_147465_d(x - 1, y + 9, z, Blocks.leaves, 1, 2); - world.func_147465_d(x, y + 9, z + 1, Blocks.leaves, 1, 2); - world.func_147465_d(x, y + 9, z - 1, Blocks.leaves, 1, 2); + world.setBlock(x + 1, y + 9, z, Blocks.leaves, 1, 2); + world.setBlock(x - 1, y + 9, z, Blocks.leaves, 1, 2); + world.setBlock(x, y + 9, z + 1, Blocks.leaves, 1, 2); + world.setBlock(x, y + 9, z - 1, Blocks.leaves, 1, 2); - world.func_147465_d(x + 1, y + 10, z, Blocks.leaves, 1, 2); - world.func_147465_d(x - 1, y + 10, z, Blocks.leaves, 1, 2); - world.func_147465_d(x, y + 10, z + 1, Blocks.leaves, 1, 2); - world.func_147465_d(x, y + 10, z - 1, Blocks.leaves, 1, 2); + world.setBlock(x + 1, y + 10, z, Blocks.leaves, 1, 2); + world.setBlock(x - 1, y + 10, z, Blocks.leaves, 1, 2); + world.setBlock(x, y + 10, z + 1, Blocks.leaves, 1, 2); + world.setBlock(x, y + 10, z - 1, Blocks.leaves, 1, 2); - world.func_147465_d(x, y + 11, z, Blocks.leaves, 1, 2); - world.func_147465_d(x, y + 12, z, Blocks.leaves, 1, 2); - world.func_147465_d(x, y + 13, z, Blocks.leaves, 1, 2); + world.setBlock(x, y + 11, z, Blocks.leaves, 1, 2); + world.setBlock(x, y + 12, z, Blocks.leaves, 1, 2); + world.setBlock(x, y + 13, z, Blocks.leaves, 1, 2); return true; } diff --git a/src/main/java/biomesoplenty/common/world/features/trees/WorldGenPoplar2.java b/src/main/java/biomesoplenty/common/world/features/trees/WorldGenPoplar2.java index f704c9def..69dcfb60d 100644 --- a/src/main/java/biomesoplenty/common/world/features/trees/WorldGenPoplar2.java +++ b/src/main/java/biomesoplenty/common/world/features/trees/WorldGenPoplar2.java @@ -18,13 +18,13 @@ public class WorldGenPoplar2 extends WorldGenAbstractTree public boolean generate(World world, Random random, int x, int y, int z) { //TODO: isAirBlock() - while (world.func_147437_c(x, y, z) && y > 2) + while (world.isAirBlock(x, y, z) && y > 2) { --y; } //TODO: getBlock() - Block block = world.func_147439_a(x, y, z); + Block block = world.getBlock(x, y, z); if (block != Blocks.grass) { @@ -37,102 +37,102 @@ public class WorldGenPoplar2 extends WorldGenAbstractTree for (int var8 = -2; var8 <= 2; ++var8) { //TODO: isAirBlock() isAirBlock() isAirBlock() - if (world.func_147437_c(x + var7, y - 1, z + var8) && world.func_147437_c(x + var7, y - 2, z + var8) && !world.func_147437_c(x + var7, y, z + var8)) + if (world.isAirBlock(x + var7, y - 1, z + var8) && world.isAirBlock(x + var7, y - 2, z + var8) && !world.isAirBlock(x + var7, y, z + var8)) return false; } } - world.func_147449_b(x, y, z, Blocks.dirt); - world.func_147465_d(x, y + 1, z, Blocks.log, 1, 2); - world.func_147465_d(x, y + 2, z, Blocks.log, 1, 2); - world.func_147465_d(x, y + 3, z, Blocks.log, 1, 2); - world.func_147465_d(x, y + 4, z, Blocks.log, 1, 2); - world.func_147465_d(x, y + 5, z, Blocks.log, 1, 2); - world.func_147465_d(x, y + 6, z, Blocks.log, 1, 2); - world.func_147465_d(x, y + 7, z, Blocks.log, 1, 2); - world.func_147465_d(x, y + 8, z, Blocks.log, 1, 2); - world.func_147465_d(x, y + 9, z, Blocks.log, 1, 2); - world.func_147465_d(x, y + 10, z, Blocks.log, 1, 2); - world.func_147465_d(x, y + 11, z, Blocks.log, 1, 2); - world.func_147465_d(x, y + 12, z, Blocks.log, 1, 2); - world.func_147465_d(x, y + 13, z, Blocks.log, 1, 2); - world.func_147465_d(x, y + 14, z, Blocks.log, 1, 2); + world.setBlock(x, y, z, Blocks.dirt); + world.setBlock(x, y + 1, z, Blocks.log, 1, 2); + world.setBlock(x, y + 2, z, Blocks.log, 1, 2); + world.setBlock(x, y + 3, z, Blocks.log, 1, 2); + world.setBlock(x, y + 4, z, Blocks.log, 1, 2); + world.setBlock(x, y + 5, z, Blocks.log, 1, 2); + world.setBlock(x, y + 6, z, Blocks.log, 1, 2); + world.setBlock(x, y + 7, z, Blocks.log, 1, 2); + world.setBlock(x, y + 8, z, Blocks.log, 1, 2); + world.setBlock(x, y + 9, z, Blocks.log, 1, 2); + world.setBlock(x, y + 10, z, Blocks.log, 1, 2); + world.setBlock(x, y + 11, z, Blocks.log, 1, 2); + world.setBlock(x, y + 12, z, Blocks.log, 1, 2); + world.setBlock(x, y + 13, z, Blocks.log, 1, 2); + world.setBlock(x, y + 14, z, Blocks.log, 1, 2); - world.func_147465_d(x + 1, y + 7, z, Blocks.leaves, 1, 2); - world.func_147465_d(x - 1, y + 7, z, Blocks.leaves, 1, 2); - world.func_147465_d(x, y + 7, z + 1, Blocks.leaves, 1, 2); - world.func_147465_d(x, y + 7, z - 1, Blocks.leaves, 1, 2); + world.setBlock(x + 1, y + 7, z, Blocks.leaves, 1, 2); + world.setBlock(x - 1, y + 7, z, Blocks.leaves, 1, 2); + world.setBlock(x, y + 7, z + 1, Blocks.leaves, 1, 2); + world.setBlock(x, y + 7, z - 1, Blocks.leaves, 1, 2); - world.func_147465_d(x + 1, y + 8, z, Blocks.leaves, 1, 2); - world.func_147465_d(x - 1, y + 8, z, Blocks.leaves, 1, 2); - world.func_147465_d(x, y + 8, z + 1, Blocks.leaves, 1, 2); - world.func_147465_d(x, y + 8, z - 1, Blocks.leaves, 1, 2); - world.func_147465_d(x + 1, y + 8, z + 1, Blocks.leaves, 1, 2); - world.func_147465_d(x + 1, y + 8, z - 1, Blocks.leaves, 1, 2); - world.func_147465_d(x - 1, y + 8, z + 1, Blocks.leaves, 1, 2); - world.func_147465_d(x - 1, y + 8, z - 1, Blocks.leaves, 1, 2); + world.setBlock(x + 1, y + 8, z, Blocks.leaves, 1, 2); + world.setBlock(x - 1, y + 8, z, Blocks.leaves, 1, 2); + world.setBlock(x, y + 8, z + 1, Blocks.leaves, 1, 2); + world.setBlock(x, y + 8, z - 1, Blocks.leaves, 1, 2); + world.setBlock(x + 1, y + 8, z + 1, Blocks.leaves, 1, 2); + world.setBlock(x + 1, y + 8, z - 1, Blocks.leaves, 1, 2); + world.setBlock(x - 1, y + 8, z + 1, Blocks.leaves, 1, 2); + world.setBlock(x - 1, y + 8, z - 1, Blocks.leaves, 1, 2); - world.func_147465_d(x + 1, y + 9, z, Blocks.leaves, 1, 2); - world.func_147465_d(x - 1, y + 9, z, Blocks.leaves, 1, 2); - world.func_147465_d(x, y + 9, z + 1, Blocks.leaves, 1, 2); - world.func_147465_d(x, y + 9, z - 1, Blocks.leaves, 1, 2); - world.func_147465_d(x + 1, y + 9, z + 1, Blocks.leaves, 1, 2); - world.func_147465_d(x + 1, y + 9, z - 1, Blocks.leaves, 1, 2); - world.func_147465_d(x - 1, y + 9, z + 1, Blocks.leaves, 1, 2); - world.func_147465_d(x - 1, y + 9, z - 1, Blocks.leaves, 1, 2); - world.func_147465_d(x + 2, y + 9, z, Blocks.leaves, 1, 2); - world.func_147465_d(x - 2, y + 9, z, Blocks.leaves, 1, 2); - world.func_147465_d(x, y + 9, z + 2, Blocks.leaves, 1, 2); - world.func_147465_d(x, y + 9, z - 2, Blocks.leaves, 1, 2); + world.setBlock(x + 1, y + 9, z, Blocks.leaves, 1, 2); + world.setBlock(x - 1, y + 9, z, Blocks.leaves, 1, 2); + world.setBlock(x, y + 9, z + 1, Blocks.leaves, 1, 2); + world.setBlock(x, y + 9, z - 1, Blocks.leaves, 1, 2); + world.setBlock(x + 1, y + 9, z + 1, Blocks.leaves, 1, 2); + world.setBlock(x + 1, y + 9, z - 1, Blocks.leaves, 1, 2); + world.setBlock(x - 1, y + 9, z + 1, Blocks.leaves, 1, 2); + world.setBlock(x - 1, y + 9, z - 1, Blocks.leaves, 1, 2); + world.setBlock(x + 2, y + 9, z, Blocks.leaves, 1, 2); + world.setBlock(x - 2, y + 9, z, Blocks.leaves, 1, 2); + world.setBlock(x, y + 9, z + 2, Blocks.leaves, 1, 2); + world.setBlock(x, y + 9, z - 2, Blocks.leaves, 1, 2); - world.func_147465_d(x + 1, y + 10, z, Blocks.leaves, 1, 2); - world.func_147465_d(x - 1, y + 10, z, Blocks.leaves, 1, 2); - world.func_147465_d(x, y + 10, z + 1, Blocks.leaves, 1, 2); - world.func_147465_d(x, y + 10, z - 1, Blocks.leaves, 1, 2); - world.func_147465_d(x + 1, y + 10, z + 1, Blocks.leaves, 1, 2); - world.func_147465_d(x + 1, y + 10, z - 1, Blocks.leaves, 1, 2); - world.func_147465_d(x - 1, y + 10, z + 1, Blocks.leaves, 1, 2); - world.func_147465_d(x - 1, y + 10, z - 1, Blocks.leaves, 1, 2); - world.func_147465_d(x + 2, y + 10, z, Blocks.leaves, 1, 2); - world.func_147465_d(x - 2, y + 10, z, Blocks.leaves, 1, 2); - world.func_147465_d(x, y + 10, z + 2, Blocks.leaves, 1, 2); - world.func_147465_d(x, y + 10, z - 2, Blocks.leaves, 1, 2); + world.setBlock(x + 1, y + 10, z, Blocks.leaves, 1, 2); + world.setBlock(x - 1, y + 10, z, Blocks.leaves, 1, 2); + world.setBlock(x, y + 10, z + 1, Blocks.leaves, 1, 2); + world.setBlock(x, y + 10, z - 1, Blocks.leaves, 1, 2); + world.setBlock(x + 1, y + 10, z + 1, Blocks.leaves, 1, 2); + world.setBlock(x + 1, y + 10, z - 1, Blocks.leaves, 1, 2); + world.setBlock(x - 1, y + 10, z + 1, Blocks.leaves, 1, 2); + world.setBlock(x - 1, y + 10, z - 1, Blocks.leaves, 1, 2); + world.setBlock(x + 2, y + 10, z, Blocks.leaves, 1, 2); + world.setBlock(x - 2, y + 10, z, Blocks.leaves, 1, 2); + world.setBlock(x, y + 10, z + 2, Blocks.leaves, 1, 2); + world.setBlock(x, y + 10, z - 2, Blocks.leaves, 1, 2); - world.func_147465_d(x + 1, y + 11, z, Blocks.leaves, 1, 2); - world.func_147465_d(x - 1, y + 11, z, Blocks.leaves, 1, 2); - world.func_147465_d(x, y + 11, z + 1, Blocks.leaves, 1, 2); - world.func_147465_d(x, y + 11, z - 1, Blocks.leaves, 1, 2); - world.func_147465_d(x + 1, y + 11, z + 1, Blocks.leaves, 1, 2); - world.func_147465_d(x + 1, y + 11, z - 1, Blocks.leaves, 1, 2); - world.func_147465_d(x - 1, y + 11, z + 1, Blocks.leaves, 1, 2); - world.func_147465_d(x - 1, y + 11, z - 1, Blocks.leaves, 1, 2); - world.func_147465_d(x + 2, y + 11, z, Blocks.leaves, 1, 2); - world.func_147465_d(x - 2, y + 11, z, Blocks.leaves, 1, 2); - world.func_147465_d(x, y + 11, z + 2, Blocks.leaves, 1, 2); - world.func_147465_d(x, y + 11, z - 2, Blocks.leaves, 1, 2); + world.setBlock(x + 1, y + 11, z, Blocks.leaves, 1, 2); + world.setBlock(x - 1, y + 11, z, Blocks.leaves, 1, 2); + world.setBlock(x, y + 11, z + 1, Blocks.leaves, 1, 2); + world.setBlock(x, y + 11, z - 1, Blocks.leaves, 1, 2); + world.setBlock(x + 1, y + 11, z + 1, Blocks.leaves, 1, 2); + world.setBlock(x + 1, y + 11, z - 1, Blocks.leaves, 1, 2); + world.setBlock(x - 1, y + 11, z + 1, Blocks.leaves, 1, 2); + world.setBlock(x - 1, y + 11, z - 1, Blocks.leaves, 1, 2); + world.setBlock(x + 2, y + 11, z, Blocks.leaves, 1, 2); + world.setBlock(x - 2, y + 11, z, Blocks.leaves, 1, 2); + world.setBlock(x, y + 11, z + 2, Blocks.leaves, 1, 2); + world.setBlock(x, y + 11, z - 2, Blocks.leaves, 1, 2); - world.func_147465_d(x + 1, y + 12, z, Blocks.leaves, 1, 2); - world.func_147465_d(x - 1, y + 12, z, Blocks.leaves, 1, 2); - world.func_147465_d(x, y + 12, z + 1, Blocks.leaves, 1, 2); - world.func_147465_d(x, y + 12, z - 1, Blocks.leaves, 1, 2); - world.func_147465_d(x + 1, y + 12, z + 1, Blocks.leaves, 1, 2); - world.func_147465_d(x + 1, y + 12, z - 1, Blocks.leaves, 1, 2); - world.func_147465_d(x - 1, y + 12, z + 1, Blocks.leaves, 1, 2); - world.func_147465_d(x - 1, y + 12, z - 1, Blocks.leaves, 1, 2); + world.setBlock(x + 1, y + 12, z, Blocks.leaves, 1, 2); + world.setBlock(x - 1, y + 12, z, Blocks.leaves, 1, 2); + world.setBlock(x, y + 12, z + 1, Blocks.leaves, 1, 2); + world.setBlock(x, y + 12, z - 1, Blocks.leaves, 1, 2); + world.setBlock(x + 1, y + 12, z + 1, Blocks.leaves, 1, 2); + world.setBlock(x + 1, y + 12, z - 1, Blocks.leaves, 1, 2); + world.setBlock(x - 1, y + 12, z + 1, Blocks.leaves, 1, 2); + world.setBlock(x - 1, y + 12, z - 1, Blocks.leaves, 1, 2); - world.func_147465_d(x + 1, y + 13, z, Blocks.leaves, 1, 2); - world.func_147465_d(x - 1, y + 13, z, Blocks.leaves, 1, 2); - world.func_147465_d(x, y + 13, z + 1, Blocks.leaves, 1, 2); - world.func_147465_d(x, y + 13, z - 1, Blocks.leaves, 1, 2); + world.setBlock(x + 1, y + 13, z, Blocks.leaves, 1, 2); + world.setBlock(x - 1, y + 13, z, Blocks.leaves, 1, 2); + world.setBlock(x, y + 13, z + 1, Blocks.leaves, 1, 2); + world.setBlock(x, y + 13, z - 1, Blocks.leaves, 1, 2); - world.func_147465_d(x + 1, y + 14, z, Blocks.leaves, 1, 2); - world.func_147465_d(x - 1, y + 14, z, Blocks.leaves, 1, 2); - world.func_147465_d(x, y + 14, z + 1, Blocks.leaves, 1, 2); - world.func_147465_d(x, y + 14, z - 1, Blocks.leaves, 1, 2); + world.setBlock(x + 1, y + 14, z, Blocks.leaves, 1, 2); + world.setBlock(x - 1, y + 14, z, Blocks.leaves, 1, 2); + world.setBlock(x, y + 14, z + 1, Blocks.leaves, 1, 2); + world.setBlock(x, y + 14, z - 1, Blocks.leaves, 1, 2); - world.func_147465_d(x, y + 15, z, Blocks.leaves, 1, 2); - world.func_147465_d(x, y + 16, z, Blocks.leaves, 1, 2); - world.func_147465_d(x, y + 17, z, Blocks.leaves, 1, 2); + world.setBlock(x, y + 15, z, Blocks.leaves, 1, 2); + world.setBlock(x, y + 16, z, Blocks.leaves, 1, 2); + world.setBlock(x, y + 17, z, Blocks.leaves, 1, 2); return true; } diff --git a/src/main/java/biomesoplenty/common/world/features/trees/WorldGenPromisedTree.java b/src/main/java/biomesoplenty/common/world/features/trees/WorldGenPromisedTree.java index 91440d0ea..6c0af29aa 100644 --- a/src/main/java/biomesoplenty/common/world/features/trees/WorldGenPromisedTree.java +++ b/src/main/java/biomesoplenty/common/world/features/trees/WorldGenPromisedTree.java @@ -52,7 +52,7 @@ public class WorldGenPromisedTree extends WorldGenAbstractTree { if (var11 >= 0 && var11 < 256) { - block = world.func_147439_a(var13, var11, var14); + block = world.getBlock(var13, var11, var14); if (!(block.isAir(world, var13, var11, var14) || block.isLeaves(world, var13, var11, var14))) { @@ -72,12 +72,12 @@ public class WorldGenPromisedTree extends WorldGenAbstractTree else { //var11 = world.getBlockId(par3, par4 - 1, par5); - block = world.func_147439_a(par3, par4 - 1, par5); + block = world.getBlock(par3, par4 - 1, par5); if ((block == BOPBlockHelper.get("holyGrass") || block == BOPBlockHelper.get("holyDirt")) && par4 < 256 - var6 - 1) { //this.setBlockAndMetadata(world, par3, par4 - 1, par5, Blocks.holyDirt.get().blockID, 0); - this.func_150516_a(world, par3, par4 - 1, par5, BOPBlockHelper.get("holyDirt"), 0); + this.setBlockAndNotifyAdequately(world, par3, par4 - 1, par5, BOPBlockHelper.get("holyDirt"), 0); var21 = par2Random.nextInt(2); var13 = 1; byte var22 = 0; @@ -97,10 +97,10 @@ public class WorldGenPromisedTree extends WorldGenAbstractTree { int var20 = var19 - par5; - if ((Math.abs(var18) != var21 || Math.abs(var20) != var21 || var21 <= 0) && !world.func_147439_a(var17, var16, var19).func_149662_c()) + if ((Math.abs(var18) != var21 || Math.abs(var20) != var21 || var21 <= 0) && !world.getBlock(var17, var16, var19).isOpaqueCube()) { //this.setBlockAndMetadata(world, var17, var16, var19, Blocks.leaves2.get().blockID, 2); - this.func_150516_a(world, var17, var16, var19, BOPBlockHelper.get("leaves2"), 2); + this.setBlockAndNotifyAdequately(world, var17, var16, var19, BOPBlockHelper.get("leaves2"), 2); } } } @@ -127,12 +127,12 @@ public class WorldGenPromisedTree extends WorldGenAbstractTree for (var16 = 0; var16 < var6 - var15; ++var16) { //var17 = world.getBlockId(par3, par4 + var16, par5); - block = world.func_147439_a(par3, par4 + var16, par5); + block = world.getBlock(par3, par4 + var16, par5); if (block.isAir(world, par3, par4 + var16, par5) || block.isLeaves(world, par3, par4 + var16, par5)) { //this.setBlockAndMetadata(world, par3, par4 + var16, par5, Blocks.logs2.get().blockID,0); - this.func_150516_a(world, par3, par4 + var16, par5, BOPBlockHelper.get("logs2"), 0); + this.setBlockAndNotifyAdequately(world, par3, par4 + var16, par5, BOPBlockHelper.get("logs2"), 0); } } diff --git a/src/main/java/biomesoplenty/common/world/features/trees/WorldGenPromisedTree2.java b/src/main/java/biomesoplenty/common/world/features/trees/WorldGenPromisedTree2.java index 635013817..e136e38f2 100644 --- a/src/main/java/biomesoplenty/common/world/features/trees/WorldGenPromisedTree2.java +++ b/src/main/java/biomesoplenty/common/world/features/trees/WorldGenPromisedTree2.java @@ -51,7 +51,7 @@ public class WorldGenPromisedTree2 extends WorldGenAbstractTree if (var8 >= 0 && var8 < 256) { //var12 = world.getBlockId(var10, var8, var11); - block = world.func_147439_a(var10, var8, var11); + block = world.getBlock(var10, var8, var11); //if (var12 != 0 && var12 != Blocks.leaves1.get().blockID) //{ @@ -72,12 +72,12 @@ public class WorldGenPromisedTree2 extends WorldGenAbstractTree return false; else { - block = world.func_147439_a(par3, par4 - 1, par5); + block = world.getBlock(par3, par4 - 1, par5); if ((block == BOPBlockHelper.get("holyGrass") || block == BOPBlockHelper.get("holyDirt")) && par4 < 256 - var6 - 1) { //this.setBlockAndMetadata(world, par3, par4 - 1, par5, Blocks.holyDirt.get().blockID, 0); - this.func_150516_a(world, par3, par4 - 1, par5, BOPBlockHelper.get("holyDirt"), 0); + this.setBlockAndNotifyAdequately(world, par3, par4 - 1, par5, BOPBlockHelper.get("holyDirt"), 0); int var16; for (var16 = par4 - 3 + var6; var16 <= par4 + var6; ++var16) @@ -93,10 +93,10 @@ public class WorldGenPromisedTree2 extends WorldGenAbstractTree { int var15 = var14 - par5; - if ((Math.abs(var13) != var11 || Math.abs(var15) != var11 || par2Random.nextInt(2) != 0 && var10 != 0) && !world.func_147439_a(var12, var16, var14).func_149662_c()) + if ((Math.abs(var13) != var11 || Math.abs(var15) != var11 || par2Random.nextInt(2) != 0 && var10 != 0) && !world.getBlock(var12, var16, var14).isOpaqueCube()) { //this.setBlockAndMetadata(world, var12, var16, var14, Blocks.leaves1.get().blockID, 2); - this.func_150516_a(world, var12, var16, var14, BOPBlockHelper.get("leaves1"), 2);} + this.setBlockAndNotifyAdequately(world, var12, var16, var14, BOPBlockHelper.get("leaves1"), 2);} } } } @@ -104,12 +104,12 @@ public class WorldGenPromisedTree2 extends WorldGenAbstractTree for (var16 = 0; var16 < var6; ++var16) { //var10 = world.getBlockId(par3, par4 + var16, par5); - block = world.func_147439_a(par3, par4 + var16, par5); + block = world.getBlock(par3, par4 + var16, par5); if (!(block.isAir(world, par3, par4 + var16, par5) || block.isLeaves(world, par3, par4 + var16, par5))) { //this.setBlockAndMetadata(world, par3, par4 + var16, par5, Blocks.logs2.get().blockID,1); - this.func_150516_a(world, par3, par4 + var16, par5, BOPBlockHelper.get("logs2"), 1); + this.setBlockAndNotifyAdequately(world, par3, par4 + var16, par5, BOPBlockHelper.get("logs2"), 1); } } diff --git a/src/main/java/biomesoplenty/common/world/features/trees/WorldGenPromisedTree3.java b/src/main/java/biomesoplenty/common/world/features/trees/WorldGenPromisedTree3.java index 81a3d29fe..d92da6860 100644 --- a/src/main/java/biomesoplenty/common/world/features/trees/WorldGenPromisedTree3.java +++ b/src/main/java/biomesoplenty/common/world/features/trees/WorldGenPromisedTree3.java @@ -52,7 +52,7 @@ public class WorldGenPromisedTree3 extends WorldGenAbstractTree { if (var11 >= 0 && var11 < 256) { - Block block = world.func_147439_a(var13, var11, var14); + Block block = world.getBlock(var13, var11, var14); if (block.isAir(world, var13, var11, var14) || block.isLeaves(world, var13, var11, var14)) { @@ -71,10 +71,10 @@ public class WorldGenPromisedTree3 extends WorldGenAbstractTree return false; else { - Block block11 = world.func_147439_a(var3, var4 - 1, var5); - Block block24 = world.func_147439_a(var3 - 1, var4 - 1, var5); - Block block13 = world.func_147439_a(var3, var4 - 1, var5 - 1); - Block block14 = world.func_147439_a(var3 - 1, var4 - 1, var5 - 1); + Block block11 = world.getBlock(var3, var4 - 1, var5); + Block block24 = world.getBlock(var3 - 1, var4 - 1, var5); + Block block13 = world.getBlock(var3, var4 - 1, var5 - 1); + Block block14 = world.getBlock(var3 - 1, var4 - 1, var5 - 1); if ((block11 == BOPBlockHelper.get("holyGrass") || block11 == BOPBlockHelper.get("holyDirt")) && var4 < 256 - var6 - 1) { @@ -84,10 +84,10 @@ public class WorldGenPromisedTree3 extends WorldGenAbstractTree { if ((block14 == BOPBlockHelper.get("holyGrass") | block14 == BOPBlockHelper.get("holyDirt")) && var4 < 256 - var6 - 1) { - world.func_147465_d(var3, var4 - 1, var5, BOPBlockHelper.get("holyDirt"), 0, 2); - world.func_147465_d(var3 - 1, var4 - 1, var5, BOPBlockHelper.get("holyDirt"), 0, 2); - world.func_147465_d(var3, var4 - 1, var5 - 1, BOPBlockHelper.get("holyDirt"), 0, 2); - world.func_147465_d(var3 - 1, var4 - 1, var5 - 1, BOPBlockHelper.get("holyDirt"), 0, 2); + world.setBlock(var3, var4 - 1, var5, BOPBlockHelper.get("holyDirt"), 0, 2); + world.setBlock(var3 - 1, var4 - 1, var5, BOPBlockHelper.get("holyDirt"), 0, 2); + world.setBlock(var3, var4 - 1, var5 - 1, BOPBlockHelper.get("holyDirt"), 0, 2); + world.setBlock(var3 - 1, var4 - 1, var5 - 1, BOPBlockHelper.get("holyDirt"), 0, 2); int var15 = var2.nextInt(2); int var16 = 1; boolean var17 = false; @@ -107,12 +107,12 @@ public class WorldGenPromisedTree3 extends WorldGenAbstractTree { int var23 = var22 - var5; - if ((Math.abs(var21) != var15 || Math.abs(var23) != var15 || var15 <= 0) && !world.func_147439_a(var20, var19, var22).func_149662_c()) + if ((Math.abs(var21) != var15 || Math.abs(var23) != var15 || var15 <= 0) && !world.getBlock(var20, var19, var22).isOpaqueCube()) { - this.func_150516_a(world, var20, var19, var22, Blocks.leaves, 0); - this.func_150516_a(world, var20 - 1, var19, var22, Blocks.leaves, 0); - this.func_150516_a(world, var20, var19, var22 - 1, Blocks.leaves, 0); - this.func_150516_a(world, var20 - 1, var19, var22 - 1, Blocks.leaves, 0); + this.setBlockAndNotifyAdequately(world, var20, var19, var22, Blocks.leaves, 0); + this.setBlockAndNotifyAdequately(world, var20 - 1, var19, var22, Blocks.leaves, 0); + this.setBlockAndNotifyAdequately(world, var20, var19, var22 - 1, Blocks.leaves, 0); + this.setBlockAndNotifyAdequately(world, var20 - 1, var19, var22 - 1, Blocks.leaves, 0); } } } @@ -138,14 +138,14 @@ public class WorldGenPromisedTree3 extends WorldGenAbstractTree for (var19 = 0; var19 < var6 - var18; ++var19) { - Block block = world.func_147439_a(var3, var4 + var19, var5); + Block block = world.getBlock(var3, var4 + var19, var5); if (block.isAir(world, var3, var4 + var19, var5) || block == Blocks.leaves) { - this.func_150516_a(world, var3, var4 + var19, var5, Blocks.log, 0); - this.func_150516_a(world, var3 - 1, var4 + var19, var5, Blocks.log, 0); - this.func_150516_a(world, var3, var4 + var19, var5 - 1, Blocks.log, 0); - this.func_150516_a(world, var3 - 1, var4 + var19, var5 - 1, Blocks.log, 0); + this.setBlockAndNotifyAdequately(world, var3, var4 + var19, var5, Blocks.log, 0); + this.setBlockAndNotifyAdequately(world, var3 - 1, var4 + var19, var5, Blocks.log, 0); + this.setBlockAndNotifyAdequately(world, var3, var4 + var19, var5 - 1, Blocks.log, 0); + this.setBlockAndNotifyAdequately(world, var3 - 1, var4 + var19, var5 - 1, Blocks.log, 0); } } diff --git a/src/main/java/biomesoplenty/common/world/features/trees/WorldGenPromisedWillowTree.java b/src/main/java/biomesoplenty/common/world/features/trees/WorldGenPromisedWillowTree.java index fe0e3cb7b..16858d7a7 100644 --- a/src/main/java/biomesoplenty/common/world/features/trees/WorldGenPromisedWillowTree.java +++ b/src/main/java/biomesoplenty/common/world/features/trees/WorldGenPromisedWillowTree.java @@ -23,7 +23,7 @@ public class WorldGenPromisedWillowTree extends WorldGenAbstractTree int var6; Block block; - for (var6 = par2Random.nextInt(8) + 6; world.func_147439_a(par3, par4 - 1, par5) == Blocks.water; --par4) + for (var6 = par2Random.nextInt(8) + 6; world.getBlock(par3, par4 - 1, par5) == Blocks.water; --par4) { ; } @@ -57,7 +57,7 @@ public class WorldGenPromisedWillowTree extends WorldGenAbstractTree { if (var8 >= 0 && var8 < 128) { - block = world.func_147439_a(var10, var8, var11); + block = world.getBlock(var10, var8, var11); if (block.isAir(world, var10, var8, var11) || block.isLeaves(world, var10, var8, var11)) { @@ -83,11 +83,11 @@ public class WorldGenPromisedWillowTree extends WorldGenAbstractTree return false; else { - block = world.func_147439_a(par3, par4 - 1, par5); + block = world.getBlock(par3, par4 - 1, par5); if ((block == BOPBlockHelper.get("holyGrass") || block == BOPBlockHelper.get("holyDirt")) && par4 < 128 - var6 - 1) { - this.func_150516_a(world, par3, par4 - 1, par5, BOPBlockHelper.get("holyDirt"), 0); + this.setBlockAndNotifyAdequately(world, par3, par4 - 1, par5, BOPBlockHelper.get("holyDirt"), 0); int var13; int var16; @@ -104,9 +104,9 @@ public class WorldGenPromisedWillowTree extends WorldGenAbstractTree { int var15 = var14 - par5; - if ((Math.abs(var13) != var11 || Math.abs(var15) != var11 || par2Random.nextInt(2) != 0 && var10 != 0) && !world.func_147439_a(var12, var16, var14).func_149662_c()) + if ((Math.abs(var13) != var11 || Math.abs(var15) != var11 || par2Random.nextInt(2) != 0 && var10 != 0) && !world.getBlock(var12, var16, var14).isOpaqueCube()) { - this.func_150516_a(world, var12, var16, var14, Blocks.leaves, 4); + this.setBlockAndNotifyAdequately(world, var12, var16, var14, Blocks.leaves, 4); } } } @@ -114,12 +114,12 @@ public class WorldGenPromisedWillowTree extends WorldGenAbstractTree for (var16 = 0; var16 < var6; ++var16) { - Block block2 = world.func_147439_a(par3, par4 + var16, par5); + Block block2 = world.getBlock(par3, par4 + var16, par5); //if (var10 == 0 || var10 == Block.leaves.blockID || block2 == Blocks.water) if (block.isAir(world, par3, par4 + var16, par5) || block.isLeaves(world, par3, par4 + var16, par5) || block2 == Blocks.water) { - this.func_150516_a(world, par3, par4 + var16, par5, Blocks.log, 0); + this.setBlockAndNotifyAdequately(world, par3, par4 + var16, par5, Blocks.log, 0); } } @@ -134,25 +134,25 @@ public class WorldGenPromisedWillowTree extends WorldGenAbstractTree for (var13 = par5 - var11; var13 <= par5 + var11; ++var13) { //if (world.getBlockId(var12, var16, var13) == Block.leaves.blockID) - Block block2 = world.func_147439_a(var12, var16, var13); + Block block2 = world.getBlock(var12, var16, var13); if (!(block.isAir(world, var12, var16, var13) || block.isLeaves(world, var12, var16, var13))) { - if (par2Random.nextInt(4) == 0 && world.func_147439_a(var12 - 1, var16, var13).isAir(world, var12 - 1, var16, var13)) + if (par2Random.nextInt(4) == 0 && world.getBlock(var12 - 1, var16, var13).isAir(world, var12 - 1, var16, var13)) { this.generateVines(world, var12 - 1, var16, var13, 8); } - if (par2Random.nextInt(4) == 0 && world.func_147439_a(var12 + 1, var16, var13).isAir(world, var12 + 1, var16, var13)) + if (par2Random.nextInt(4) == 0 && world.getBlock(var12 + 1, var16, var13).isAir(world, var12 + 1, var16, var13)) { { this.generateVines(world, var12 + 1, var16, var13, 2); } - if (par2Random.nextInt(4) == 0 && world.func_147439_a(var12, var16, var13 - 1).isAir(world, var12, var16, var13 - 1)) + if (par2Random.nextInt(4) == 0 && world.getBlock(var12, var16, var13 - 1).isAir(world, var12, var16, var13 - 1)) { this.generateVines(world, var12, var16, var13 - 1, 1); } - if (par2Random.nextInt(4) == 0 && world.func_147439_a(var12, var16, var13 + 1).isAir(world, var12, var16, var13 + 1)) + if (par2Random.nextInt(4) == 0 && world.getBlock(var12, var16, var13 + 1).isAir(world, var12, var16, var13 + 1)) { this.generateVines(world, var12, var16, var13 + 1, 4); } @@ -177,17 +177,17 @@ public class WorldGenPromisedWillowTree extends WorldGenAbstractTree */ private void generateVines(World par1World, int par2, int par3, int par4, int par5) { - this.func_150516_a(par1World, par2, par3, par4, Blocks.leaves, 4); + this.setBlockAndNotifyAdequately(par1World, par2, par3, par4, Blocks.leaves, 4); int var6 = 24; while (true) { --par3; - if (!par1World.func_147439_a(par2, par3, par4).isAir(par1World, par2, par3, par4) || var6 <= 0) + if (!par1World.getBlock(par2, par3, par4).isAir(par1World, par2, par3, par4) || var6 <= 0) return; - this.func_150516_a(par1World, par2, par3, par4, Blocks.leaves, 4); + this.setBlockAndNotifyAdequately(par1World, par2, par3, par4, Blocks.leaves, 4); --var6; } } diff --git a/src/main/java/biomesoplenty/common/world/features/trees/WorldGenRainforestTree1.java b/src/main/java/biomesoplenty/common/world/features/trees/WorldGenRainforestTree1.java index 371b063f7..eb7ba51a7 100644 --- a/src/main/java/biomesoplenty/common/world/features/trees/WorldGenRainforestTree1.java +++ b/src/main/java/biomesoplenty/common/world/features/trees/WorldGenRainforestTree1.java @@ -65,7 +65,7 @@ public class WorldGenRainforestTree1 extends WorldGenAbstractTree { if (i1 >= 0 && i1 < 256) { - block = world.func_147439_a(j1, i1, k1); + block = world.getBlock(j1, i1, k1); if (!this.isReplaceable(world, j1, i1, k1)) { @@ -86,7 +86,7 @@ public class WorldGenRainforestTree1 extends WorldGenAbstractTree } else { - Block block2 = world.func_147439_a(x, y - 1, z); + Block block2 = world.getBlock(x, y - 1, z); boolean isSoil = block2.canSustainPlant(world, x, y - 1, z, ForgeDirection.UP, (BlockSapling)Blocks.sapling); if (isSoil && y < 256 - l - 1) @@ -114,11 +114,11 @@ public class WorldGenRainforestTree1 extends WorldGenAbstractTree if (Math.abs(j2) != l1 || Math.abs(l2) != l1 || random.nextInt(2) != 0 && i3 != 0) { - Block block1 = world.func_147439_a(i2, k1, k2); + Block block1 = world.getBlock(i2, k1, k2); if (block1.isAir(world, i2, k1, k2) || block1.isLeaves(world, i2, k1, k2)) { - this.func_150516_a(world, i2, k1, k2, this.leaves, this.leavesMeta); + this.setBlockAndNotifyAdequately(world, i2, k1, k2, this.leaves, this.leavesMeta); } } } @@ -127,39 +127,39 @@ public class WorldGenRainforestTree1 extends WorldGenAbstractTree for (k1 = 0; k1 < l; ++k1) { - block = world.func_147439_a(x, y + k1, z); + block = world.getBlock(x, y + k1, z); if (block.isAir(world, x, y + k1, z) || block.isLeaves(world, x, y + k1, z)) { //TODO: setBlock() - this.func_150516_a(world, x, y + k1, z, this.wood, this.woodMeta); - this.func_150516_a(world, x - 3, y + (l - 3), z, this.wood, this.woodMeta + 4); - this.func_150516_a(world, x + 3, y + (l - 3), z, this.wood, this.woodMeta + 4); - this.func_150516_a(world, x, y + (l - 3), z - 3, this.wood, this.woodMeta + 8); - this.func_150516_a(world, x, y + (l - 3), z + 3, this.wood, this.woodMeta + 8); - this.func_150516_a(world, x - 2, y + (l - 4), z, this.wood, this.woodMeta); - this.func_150516_a(world, x + 2, y + (l - 4), z, this.wood, this.woodMeta); - this.func_150516_a(world, x, y + (l - 4), z - 2, this.wood, this.woodMeta); - this.func_150516_a(world, x, y + (l - 4), z + 2, this.wood, this.woodMeta); - this.func_150516_a(world, x - 2, y + (l - 5), z, this.wood, this.woodMeta); - this.func_150516_a(world, x + 2, y + (l - 5), z, this.wood, this.woodMeta); - this.func_150516_a(world, x, y + (l - 5), z - 2, this.wood, this.woodMeta); - this.func_150516_a(world, x, y + (l - 5), z + 2, this.wood, this.woodMeta); - this.func_150516_a(world, x - 1, y + (l - 6), z, this.wood, this.woodMeta + 4); - this.func_150516_a(world, x + 1, y + (l - 6), z, this.wood, this.woodMeta + 4); - this.func_150516_a(world, x, y + (l - 6), z - 1, this.wood, this.woodMeta + 8); - this.func_150516_a(world, x, y + (l - 6), z + 1, this.wood, this.woodMeta + 8); - this.func_150516_a(world, x, y + (l - 3), z, this.leaves, this.leavesMeta); - this.func_150516_a(world, x, y + (l - 2), z, this.leaves, this.leavesMeta); - this.func_150516_a(world, x, y + (l - 1), z, this.leaves, this.leavesMeta); - this.func_150516_a(world, x, y + (l), z, this.leaves, this.leavesMeta); + this.setBlockAndNotifyAdequately(world, x, y + k1, z, this.wood, this.woodMeta); + this.setBlockAndNotifyAdequately(world, x - 3, y + (l - 3), z, this.wood, this.woodMeta + 4); + this.setBlockAndNotifyAdequately(world, x + 3, y + (l - 3), z, this.wood, this.woodMeta + 4); + this.setBlockAndNotifyAdequately(world, x, y + (l - 3), z - 3, this.wood, this.woodMeta + 8); + this.setBlockAndNotifyAdequately(world, x, y + (l - 3), z + 3, this.wood, this.woodMeta + 8); + this.setBlockAndNotifyAdequately(world, x - 2, y + (l - 4), z, this.wood, this.woodMeta); + this.setBlockAndNotifyAdequately(world, x + 2, y + (l - 4), z, this.wood, this.woodMeta); + this.setBlockAndNotifyAdequately(world, x, y + (l - 4), z - 2, this.wood, this.woodMeta); + this.setBlockAndNotifyAdequately(world, x, y + (l - 4), z + 2, this.wood, this.woodMeta); + this.setBlockAndNotifyAdequately(world, x - 2, y + (l - 5), z, this.wood, this.woodMeta); + this.setBlockAndNotifyAdequately(world, x + 2, y + (l - 5), z, this.wood, this.woodMeta); + this.setBlockAndNotifyAdequately(world, x, y + (l - 5), z - 2, this.wood, this.woodMeta); + this.setBlockAndNotifyAdequately(world, x, y + (l - 5), z + 2, this.wood, this.woodMeta); + this.setBlockAndNotifyAdequately(world, x - 1, y + (l - 6), z, this.wood, this.woodMeta + 4); + this.setBlockAndNotifyAdequately(world, x + 1, y + (l - 6), z, this.wood, this.woodMeta + 4); + this.setBlockAndNotifyAdequately(world, x, y + (l - 6), z - 1, this.wood, this.woodMeta + 8); + this.setBlockAndNotifyAdequately(world, x, y + (l - 6), z + 1, this.wood, this.woodMeta + 8); + this.setBlockAndNotifyAdequately(world, x, y + (l - 3), z, this.leaves, this.leavesMeta); + this.setBlockAndNotifyAdequately(world, x, y + (l - 2), z, this.leaves, this.leavesMeta); + this.setBlockAndNotifyAdequately(world, x, y + (l - 1), z, this.leaves, this.leavesMeta); + this.setBlockAndNotifyAdequately(world, x, y + (l), z, this.leaves, this.leavesMeta); this.func_150515_a(world, x, y + (l - 4), z, Blocks.air); this.func_150515_a(world, x, y + (l - 5), z, Blocks.air); - this.func_150516_a(world, x - 1, y + (l - 3), z, this.wood, this.woodMeta + 4); - this.func_150516_a(world, x + 1, y + (l - 3), z, this.wood, this.woodMeta + 4); - this.func_150516_a(world, x, y + (l - 3), z - 1, this.wood, this.woodMeta + 8); - this.func_150516_a(world, x, y + (l - 3), z + 1, this.wood, this.woodMeta + 8); - this.func_150516_a(world, x, y + (l - 2), z, this.wood, this.woodMeta); + this.setBlockAndNotifyAdequately(world, x - 1, y + (l - 3), z, this.wood, this.woodMeta + 4); + this.setBlockAndNotifyAdequately(world, x + 1, y + (l - 3), z, this.wood, this.woodMeta + 4); + this.setBlockAndNotifyAdequately(world, x, y + (l - 3), z - 1, this.wood, this.woodMeta + 8); + this.setBlockAndNotifyAdequately(world, x, y + (l - 3), z + 1, this.wood, this.woodMeta + 8); + this.setBlockAndNotifyAdequately(world, x, y + (l - 2), z, this.wood, this.woodMeta); } } diff --git a/src/main/java/biomesoplenty/common/world/features/trees/WorldGenRedwoodTree.java b/src/main/java/biomesoplenty/common/world/features/trees/WorldGenRedwoodTree.java index d37b20f08..0d8caef73 100644 --- a/src/main/java/biomesoplenty/common/world/features/trees/WorldGenRedwoodTree.java +++ b/src/main/java/biomesoplenty/common/world/features/trees/WorldGenRedwoodTree.java @@ -69,7 +69,7 @@ public class WorldGenRedwoodTree extends WorldGenAbstractTree { if (i1 >= 0 && i1 < 256) { - block = world.func_147439_a(j1, i1, k1); + block = world.getBlock(j1, i1, k1); if (!this.isReplaceable(world, j1, i1, k1)) { @@ -97,7 +97,7 @@ public class WorldGenRedwoodTree extends WorldGenAbstractTree { for (int iz = -3; iz <= 3; iz++) { - Block block2 = world.func_147439_a(x + ix, y - 1, z + iz); + Block block2 = world.getBlock(x + ix, y - 1, z + iz); if (!block2.canSustainPlant(world, x + ix, y - 1, z + iz, ForgeDirection.UP, (BlockSapling)Blocks.sapling)) { @@ -113,7 +113,7 @@ public class WorldGenRedwoodTree extends WorldGenAbstractTree { for (int iz = -3; iz <= 3; iz++) { - Block block2 = world.func_147439_a(x + ix, y + iy, z + iz); + Block block2 = world.getBlock(x + ix, y + iy, z + iz); if (!block2.isAir(world, x + ix, y + iy, z + iz)) { @@ -132,7 +132,7 @@ public class WorldGenRedwoodTree extends WorldGenAbstractTree { if (((ix != -3 && ix != 3) || (iz >= -1 && iz <= 1)) && ((iz != -3 && iz != 3) || (ix >= -1 && ix <= 1))) { - Block block2 = world.func_147439_a(x + ix, y - 1, z + iz); + Block block2 = world.getBlock(x + ix, y - 1, z + iz); block2.onPlantGrow(world, x + ix, y - 1, z + iz, x + ix, y - 1, z + iz); } @@ -161,14 +161,14 @@ public class WorldGenRedwoodTree extends WorldGenAbstractTree if (Math.abs(j2) != l1 || Math.abs(l2) != l1 || random.nextInt(2) != 0 && i3 != 0) { - Block block1 = world.func_147439_a(i2, k1, k2); + Block block1 = world.getBlock(i2, k1, k2); if (block1.isAir(world, i2, k1, k2) || block1.isLeaves(world, i2, k1, k2)) { //TODO: setBlockAndMetadata() - this.func_150516_a(world, i2, k1, k2, this.leaves, this.leavesMeta); - this.func_150516_a(world, i2, k1 + 6, k2, this.leaves, this.leavesMeta); - this.func_150516_a(world, i2, k1 + 10, k2, this.leaves, this.leavesMeta); + this.setBlockAndNotifyAdequately(world, i2, k1, k2, this.leaves, this.leavesMeta); + this.setBlockAndNotifyAdequately(world, i2, k1 + 6, k2, this.leaves, this.leavesMeta); + this.setBlockAndNotifyAdequately(world, i2, k1 + 10, k2, this.leaves, this.leavesMeta); } } } @@ -177,62 +177,62 @@ public class WorldGenRedwoodTree extends WorldGenAbstractTree for (k1 = 0; k1 < l; ++k1) { - block = world.func_147439_a(x, y + k1, z); + block = world.getBlock(x, y + k1, z); if (block.isAir(world, x, y + k1, z) || block.isLeaves(world, x, y + k1, z)) { //1 - this.func_150516_a(world, x, y + (l), z, this.wood, this.woodMeta); - this.func_150516_a(world, x, y + (l + 1), z, this.wood, this.woodMeta); - this.func_150516_a(world, x, y + (l + 2), z, this.wood, this.woodMeta); - this.func_150516_a(world, x, y + (l + 3), z, this.wood, this.woodMeta); - this.func_150516_a(world, x, y + (l), z, this.wood, this.woodMeta); - this.func_150516_a(world, x, y + (l), z, this.wood, this.woodMeta); - this.func_150516_a(world, x, y + k1, z, this.wood, this.woodMeta); - this.func_150516_a(world, x - 1, y + k1, z, this.wood, this.woodMeta); - this.func_150516_a(world, x + 1, y + k1, z, this.wood, this.woodMeta); - this.func_150516_a(world, x, y + k1, z - 1, this.wood, this.woodMeta); - this.func_150516_a(world, x, y + k1, z + 1, this.wood, this.woodMeta); + this.setBlockAndNotifyAdequately(world, x, y + (l), z, this.wood, this.woodMeta); + this.setBlockAndNotifyAdequately(world, x, y + (l + 1), z, this.wood, this.woodMeta); + this.setBlockAndNotifyAdequately(world, x, y + (l + 2), z, this.wood, this.woodMeta); + this.setBlockAndNotifyAdequately(world, x, y + (l + 3), z, this.wood, this.woodMeta); + this.setBlockAndNotifyAdequately(world, x, y + (l), z, this.wood, this.woodMeta); + this.setBlockAndNotifyAdequately(world, x, y + (l), z, this.wood, this.woodMeta); + this.setBlockAndNotifyAdequately(world, x, y + k1, z, this.wood, this.woodMeta); + this.setBlockAndNotifyAdequately(world, x - 1, y + k1, z, this.wood, this.woodMeta); + this.setBlockAndNotifyAdequately(world, x + 1, y + k1, z, this.wood, this.woodMeta); + this.setBlockAndNotifyAdequately(world, x, y + k1, z - 1, this.wood, this.woodMeta); + this.setBlockAndNotifyAdequately(world, x, y + k1, z + 1, this.wood, this.woodMeta); //2 - this.func_150516_a(world, x - 1, y + (k1 / 2), z - 1, this.wood, this.woodMeta); - this.func_150516_a(world, x + 1, y + (k1 / 2), z - 1, this.wood, this.woodMeta); - this.func_150516_a(world, x - 1, y + (k1 / 2), z + 1, this.wood, this.woodMeta); - this.func_150516_a(world, x + 1, y + (k1 / 2), z + 1, this.wood, this.woodMeta); + this.setBlockAndNotifyAdequately(world, x - 1, y + (k1 / 2), z - 1, this.wood, this.woodMeta); + this.setBlockAndNotifyAdequately(world, x + 1, y + (k1 / 2), z - 1, this.wood, this.woodMeta); + this.setBlockAndNotifyAdequately(world, x - 1, y + (k1 / 2), z + 1, this.wood, this.woodMeta); + this.setBlockAndNotifyAdequately(world, x + 1, y + (k1 / 2), z + 1, this.wood, this.woodMeta); //3 - this.func_150516_a(world, x - 2, y + (k1 / 4), z, this.wood, this.woodMeta); - this.func_150516_a(world, x - 2, y + (k1 / 4), z - 1, this.wood, this.woodMeta); - this.func_150516_a(world, x - 2, y + (k1 / 4), z + 1, this.wood, this.woodMeta); - this.func_150516_a(world, x + 2, y + (k1 / 4), z, this.wood, this.woodMeta); - this.func_150516_a(world, x + 2, y + (k1 / 4), z - 1, this.wood, this.woodMeta); - this.func_150516_a(world, x + 2, y + (k1 / 4), z + 1, this.wood, this.woodMeta); - this.func_150516_a(world, x, y + (k1 / 4), z - 2, this.wood, this.woodMeta); - this.func_150516_a(world, x - 1, y + (k1 / 4), z - 2, this.wood, this.woodMeta); - this.func_150516_a(world, x + 1, y + (k1 / 4), z - 2, this.wood, this.woodMeta); - this.func_150516_a(world, x, y + (k1 / 4), z + 2, this.wood, this.woodMeta); - this.func_150516_a(world, x - 1, y + (k1 / 4), z + 2, this.wood, this.woodMeta); - this.func_150516_a(world, x + 1, y + (k1 / 4), z + 2, this.wood, this.woodMeta); + this.setBlockAndNotifyAdequately(world, x - 2, y + (k1 / 4), z, this.wood, this.woodMeta); + this.setBlockAndNotifyAdequately(world, x - 2, y + (k1 / 4), z - 1, this.wood, this.woodMeta); + this.setBlockAndNotifyAdequately(world, x - 2, y + (k1 / 4), z + 1, this.wood, this.woodMeta); + this.setBlockAndNotifyAdequately(world, x + 2, y + (k1 / 4), z, this.wood, this.woodMeta); + this.setBlockAndNotifyAdequately(world, x + 2, y + (k1 / 4), z - 1, this.wood, this.woodMeta); + this.setBlockAndNotifyAdequately(world, x + 2, y + (k1 / 4), z + 1, this.wood, this.woodMeta); + this.setBlockAndNotifyAdequately(world, x, y + (k1 / 4), z - 2, this.wood, this.woodMeta); + this.setBlockAndNotifyAdequately(world, x - 1, y + (k1 / 4), z - 2, this.wood, this.woodMeta); + this.setBlockAndNotifyAdequately(world, x + 1, y + (k1 / 4), z - 2, this.wood, this.woodMeta); + this.setBlockAndNotifyAdequately(world, x, y + (k1 / 4), z + 2, this.wood, this.woodMeta); + this.setBlockAndNotifyAdequately(world, x - 1, y + (k1 / 4), z + 2, this.wood, this.woodMeta); + this.setBlockAndNotifyAdequately(world, x + 1, y + (k1 / 4), z + 2, this.wood, this.woodMeta); //4 - this.func_150516_a(world, x - 2, y + (k1 / 6), z - 2, this.wood, this.woodMeta); - this.func_150516_a(world, x + 2, y + (k1 / 6), z + 2, this.wood, this.woodMeta); - this.func_150516_a(world, x + 2, y + (k1 / 6), z - 2, this.wood, this.woodMeta); - this.func_150516_a(world, x - 2, y + (k1 / 6), z + 2, this.wood, this.woodMeta); - this.func_150516_a(world, x - 3, y + (k1 / 6), z, this.wood, this.woodMeta); - this.func_150516_a(world, x + 3, y + (k1 / 6), z, this.wood, this.woodMeta); - this.func_150516_a(world, x, y + (k1 / 6), z - 3, this.wood, this.woodMeta); - this.func_150516_a(world, x, y + (k1 / 6), z + 3, this.wood, this.woodMeta); + this.setBlockAndNotifyAdequately(world, x - 2, y + (k1 / 6), z - 2, this.wood, this.woodMeta); + this.setBlockAndNotifyAdequately(world, x + 2, y + (k1 / 6), z + 2, this.wood, this.woodMeta); + this.setBlockAndNotifyAdequately(world, x + 2, y + (k1 / 6), z - 2, this.wood, this.woodMeta); + this.setBlockAndNotifyAdequately(world, x - 2, y + (k1 / 6), z + 2, this.wood, this.woodMeta); + this.setBlockAndNotifyAdequately(world, x - 3, y + (k1 / 6), z, this.wood, this.woodMeta); + this.setBlockAndNotifyAdequately(world, x + 3, y + (k1 / 6), z, this.wood, this.woodMeta); + this.setBlockAndNotifyAdequately(world, x, y + (k1 / 6), z - 3, this.wood, this.woodMeta); + this.setBlockAndNotifyAdequately(world, x, y + (k1 / 6), z + 3, this.wood, this.woodMeta); //5 - this.func_150516_a(world, x - 3, y + (k1 / 8), z - 1, this.wood, this.woodMeta); - this.func_150516_a(world, x - 3, y + (k1 / 8), z + 1, this.wood, this.woodMeta); - this.func_150516_a(world, x + 3, y + (k1 / 8), z - 1, this.wood, this.woodMeta); - this.func_150516_a(world, x + 3, y + (k1 / 8), z + 1, this.wood, this.woodMeta); - this.func_150516_a(world, x - 1, y + (k1 / 8), z - 3, this.wood, this.woodMeta); - this.func_150516_a(world, x + 1, y + (k1 / 8), z - 3, this.wood, this.woodMeta); - this.func_150516_a(world, x - 1, y + (k1 / 8), z + 3, this.wood, this.woodMeta); - this.func_150516_a(world, x + 1, y + (k1 / 8), z + 3, this.wood, this.woodMeta); + this.setBlockAndNotifyAdequately(world, x - 3, y + (k1 / 8), z - 1, this.wood, this.woodMeta); + this.setBlockAndNotifyAdequately(world, x - 3, y + (k1 / 8), z + 1, this.wood, this.woodMeta); + this.setBlockAndNotifyAdequately(world, x + 3, y + (k1 / 8), z - 1, this.wood, this.woodMeta); + this.setBlockAndNotifyAdequately(world, x + 3, y + (k1 / 8), z + 1, this.wood, this.woodMeta); + this.setBlockAndNotifyAdequately(world, x - 1, y + (k1 / 8), z - 3, this.wood, this.woodMeta); + this.setBlockAndNotifyAdequately(world, x + 1, y + (k1 / 8), z - 3, this.wood, this.woodMeta); + this.setBlockAndNotifyAdequately(world, x - 1, y + (k1 / 8), z + 3, this.wood, this.woodMeta); + this.setBlockAndNotifyAdequately(world, x + 1, y + (k1 / 8), z + 3, this.wood, this.woodMeta); } } diff --git a/src/main/java/biomesoplenty/common/world/features/trees/WorldGenRedwoodTree2.java b/src/main/java/biomesoplenty/common/world/features/trees/WorldGenRedwoodTree2.java index 42f4f8077..d2c97aacc 100644 --- a/src/main/java/biomesoplenty/common/world/features/trees/WorldGenRedwoodTree2.java +++ b/src/main/java/biomesoplenty/common/world/features/trees/WorldGenRedwoodTree2.java @@ -69,7 +69,7 @@ public class WorldGenRedwoodTree2 extends WorldGenAbstractTree { if (i1 >= 0 && i1 < 256) { - block = world.func_147439_a(j1, i1, k1); + block = world.getBlock(j1, i1, k1); if (!this.isReplaceable(world, j1, i1, k1)) { @@ -97,7 +97,7 @@ public class WorldGenRedwoodTree2 extends WorldGenAbstractTree { for (int iz = -2; iz <= 2; iz++) { - Block block2 = world.func_147439_a(x + ix, y - 1, z + iz); + Block block2 = world.getBlock(x + ix, y - 1, z + iz); if (!block2.canSustainPlant(world, x + ix, y - 1, z + iz, ForgeDirection.UP, (BlockSapling)Blocks.sapling)) { @@ -113,7 +113,7 @@ public class WorldGenRedwoodTree2 extends WorldGenAbstractTree { for (int iz = -2; iz <= 2; iz++) { - Block block2 = world.func_147439_a(x + ix, y + iy, z + iz); + Block block2 = world.getBlock(x + ix, y + iy, z + iz); if (!block2.isAir(world, x + ix, y + iy, z + iz)) { @@ -132,7 +132,7 @@ public class WorldGenRedwoodTree2 extends WorldGenAbstractTree { if (((ix != -2 && ix != 2) || (iz == 0)) && ((iz != -2 && iz != 2) || (ix == 0))) { - Block block2 = world.func_147439_a(x + ix, y - 1, z + iz); + Block block2 = world.getBlock(x + ix, y - 1, z + iz); block2.onPlantGrow(world, x + ix, y - 1, z + iz, x + ix, y - 1, z + iz); } @@ -161,14 +161,14 @@ public class WorldGenRedwoodTree2 extends WorldGenAbstractTree if (Math.abs(j2) != l1 || Math.abs(l2) != l1 || random.nextInt(2) != 0 && i3 != 0) { - Block block1 = world.func_147439_a(i2, k1, k2); + Block block1 = world.getBlock(i2, k1, k2); if (block1.isAir(world, i2, k1, k2) || block1.isLeaves(world, i2, k1, k2)) { //TODO: setBlockAndMetadata() - this.func_150516_a(world, i2, k1, k2, this.leaves, this.leavesMeta); - this.func_150516_a(world, i2, k1 + 6, k2, this.leaves, this.leavesMeta); - this.func_150516_a(world, i2, k1 + 12, k2, this.leaves, this.leavesMeta); + this.setBlockAndNotifyAdequately(world, i2, k1, k2, this.leaves, this.leavesMeta); + this.setBlockAndNotifyAdequately(world, i2, k1 + 6, k2, this.leaves, this.leavesMeta); + this.setBlockAndNotifyAdequately(world, i2, k1 + 12, k2, this.leaves, this.leavesMeta); } } } @@ -177,36 +177,36 @@ public class WorldGenRedwoodTree2 extends WorldGenAbstractTree for (k1 = 0; k1 < l; ++k1) { - block = world.func_147439_a(x, y + k1, z); + block = world.getBlock(x, y + k1, z); if (block.isAir(world, x, y + k1, z) || block.isLeaves(world, x, y + k1, z)) { //1 - this.func_150516_a(world, x, y + (l), z, this.wood, this.woodMeta); - this.func_150516_a(world, x, y + (l + 1), z, this.wood, this.woodMeta); - this.func_150516_a(world, x, y + (l + 2), z, this.wood, this.woodMeta); - this.func_150516_a(world, x, y + (l + 3), z, this.wood, this.woodMeta); - this.func_150516_a(world, x, y + (l + 4), z, this.wood, this.woodMeta); - this.func_150516_a(world, x, y + (l + 5), z, this.wood, this.woodMeta); - this.func_150516_a(world, x, y + k1, z, this.wood, this.woodMeta); + this.setBlockAndNotifyAdequately(world, x, y + (l), z, this.wood, this.woodMeta); + this.setBlockAndNotifyAdequately(world, x, y + (l + 1), z, this.wood, this.woodMeta); + this.setBlockAndNotifyAdequately(world, x, y + (l + 2), z, this.wood, this.woodMeta); + this.setBlockAndNotifyAdequately(world, x, y + (l + 3), z, this.wood, this.woodMeta); + this.setBlockAndNotifyAdequately(world, x, y + (l + 4), z, this.wood, this.woodMeta); + this.setBlockAndNotifyAdequately(world, x, y + (l + 5), z, this.wood, this.woodMeta); + this.setBlockAndNotifyAdequately(world, x, y + k1, z, this.wood, this.woodMeta); //2 - this.func_150516_a(world, x - 1, y + (k1 / 2), z, this.wood, this.woodMeta); - this.func_150516_a(world, x + 1, y + (k1 / 2), z, this.wood, this.woodMeta); - this.func_150516_a(world, x, y + (k1 / 2), z - 1, this.wood, this.woodMeta); - this.func_150516_a(world, x, y + (k1 / 2), z + 1, this.wood, this.woodMeta); + this.setBlockAndNotifyAdequately(world, x - 1, y + (k1 / 2), z, this.wood, this.woodMeta); + this.setBlockAndNotifyAdequately(world, x + 1, y + (k1 / 2), z, this.wood, this.woodMeta); + this.setBlockAndNotifyAdequately(world, x, y + (k1 / 2), z - 1, this.wood, this.woodMeta); + this.setBlockAndNotifyAdequately(world, x, y + (k1 / 2), z + 1, this.wood, this.woodMeta); //3 - this.func_150516_a(world, x - 1, y + (k1 / 4), z - 1, this.wood, this.woodMeta); - this.func_150516_a(world, x + 1, y + (k1 / 4), z - 1, this.wood, this.woodMeta); - this.func_150516_a(world, x - 1, y + (k1 / 4), z + 1, this.wood, this.woodMeta); - this.func_150516_a(world, x + 1, y + (k1 / 4), z + 1, this.wood, this.woodMeta); + this.setBlockAndNotifyAdequately(world, x - 1, y + (k1 / 4), z - 1, this.wood, this.woodMeta); + this.setBlockAndNotifyAdequately(world, x + 1, y + (k1 / 4), z - 1, this.wood, this.woodMeta); + this.setBlockAndNotifyAdequately(world, x - 1, y + (k1 / 4), z + 1, this.wood, this.woodMeta); + this.setBlockAndNotifyAdequately(world, x + 1, y + (k1 / 4), z + 1, this.wood, this.woodMeta); //4 - this.func_150516_a(world, x - 2, y + (k1 / 8), z, this.wood, this.woodMeta); - this.func_150516_a(world, x + 2, y + (k1 / 8), z, this.wood, this.woodMeta); - this.func_150516_a(world, x, y + (k1 / 8), z - 2, this.wood, this.woodMeta); - this.func_150516_a(world, x, y + (k1 / 8), z + 2, this.wood, this.woodMeta); + this.setBlockAndNotifyAdequately(world, x - 2, y + (k1 / 8), z, this.wood, this.woodMeta); + this.setBlockAndNotifyAdequately(world, x + 2, y + (k1 / 8), z, this.wood, this.woodMeta); + this.setBlockAndNotifyAdequately(world, x, y + (k1 / 8), z - 2, this.wood, this.woodMeta); + this.setBlockAndNotifyAdequately(world, x, y + (k1 / 8), z + 2, this.wood, this.woodMeta); } } diff --git a/src/main/java/biomesoplenty/common/world/features/trees/WorldGenSacredOak.java b/src/main/java/biomesoplenty/common/world/features/trees/WorldGenSacredOak.java index 2d8f8d649..f22df7b05 100644 --- a/src/main/java/biomesoplenty/common/world/features/trees/WorldGenSacredOak.java +++ b/src/main/java/biomesoplenty/common/world/features/trees/WorldGenSacredOak.java @@ -194,7 +194,7 @@ public class WorldGenSacredOak extends WorldGenAbstractTree { var11[var9] = var10[var9] + var13; //TODO: getBlock() - Block block = worldObj.func_147439_a(var11[0], var11[1], var11[2]); + Block block = worldObj.getBlock(var11[0], var11[1], var11[2]); if (block != Blocks.air && block != leaves) { @@ -323,7 +323,7 @@ public class WorldGenSacredOak extends WorldGenAbstractTree } //TODO: setBlockAndMetadata() - this.func_150516_a(worldObj, var14[0], var14[1], var14[2], par3, var17); + this.setBlockAndNotifyAdequately(worldObj, var14[0], var14[1], var14[2], par3, var17); } } } @@ -462,7 +462,7 @@ public class WorldGenSacredOak extends WorldGenAbstractTree var13[var7] = MathHelper.floor_double(par1ArrayOfInteger[var7] + var14 * var11); //TODO: getBlock() - Block block = worldObj.func_147439_a(var13[0], var13[1], var13[2]); + Block block = worldObj.getBlock(var13[0], var13[1], var13[2]); if (block != Blocks.air && block != BOPBlockHelper.get("colorizedLeaves1")) { @@ -484,7 +484,7 @@ public class WorldGenSacredOak extends WorldGenAbstractTree int[] var2 = new int[] {basePos[0], basePos[1] + heightLimit - 1, basePos[2]}; //TODO: getBlock() - Block block = worldObj.func_147439_a(basePos[0], basePos[1] - 1, basePos[2]); + Block block = worldObj.getBlock(basePos[0], basePos[1] - 1, basePos[2]); if (block != Blocks.dirt && block != Blocks.grass) return false; diff --git a/src/main/java/biomesoplenty/common/world/features/trees/WorldGenTropicsShrub.java b/src/main/java/biomesoplenty/common/world/features/trees/WorldGenTropicsShrub.java index 3df3e9ace..04ed35a01 100644 --- a/src/main/java/biomesoplenty/common/world/features/trees/WorldGenTropicsShrub.java +++ b/src/main/java/biomesoplenty/common/world/features/trees/WorldGenTropicsShrub.java @@ -18,13 +18,13 @@ public class WorldGenTropicsShrub extends WorldGenAbstractTree public boolean generate(World world, Random random, int x, int y, int z) { //TODO: isAirBlock() - while (world.func_147437_c(x, y, z) && y > 2) + while (world.isAirBlock(x, y, z) && y > 2) { --y; } //TODO: getBlock() - Block block = world.func_147439_a(x, y, z); + Block block = world.getBlock(x, y, z); if (block != Blocks.grass && block != Blocks.sand) { @@ -37,7 +37,7 @@ public class WorldGenTropicsShrub extends WorldGenAbstractTree for (int var8 = -2; var8 <= 2; ++var8) { //TODO: isAirBlock() isAirBlock() - if (world.func_147437_c(x + var7, y - 1, z + var8) && world.func_147437_c(x + var7, y - 2, z + var8)) + if (world.isAirBlock(x + var7, y - 1, z + var8) && world.isAirBlock(x + var7, y - 2, z + var8)) { return false; } @@ -45,14 +45,14 @@ public class WorldGenTropicsShrub extends WorldGenAbstractTree } //TODO: setBlock() - world.func_147449_b(x, y, z, Blocks.dirt); - world.func_147465_d(x, y + 1, z, Blocks.log, 3, 2); - world.func_147465_d(x, y + 2, z, Blocks.log, 3, 2); - world.func_147465_d(x + 1, y + 2, z, Blocks.leaves, 3, 2); - world.func_147465_d(x - 1, y + 2, z, Blocks.leaves, 3, 2); - world.func_147465_d(x, y + 2, z + 1, Blocks.leaves, 3, 2); - world.func_147465_d(x, y + 2, z - 1, Blocks.leaves, 3, 2); - world.func_147465_d(x, y + 3, z, Blocks.leaves, 3, 2); + world.setBlock(x, y, z, Blocks.dirt); + world.setBlock(x, y + 1, z, Blocks.log, 3, 2); + world.setBlock(x, y + 2, z, Blocks.log, 3, 2); + world.setBlock(x + 1, y + 2, z, Blocks.leaves, 3, 2); + world.setBlock(x - 1, y + 2, z, Blocks.leaves, 3, 2); + world.setBlock(x, y + 2, z + 1, Blocks.leaves, 3, 2); + world.setBlock(x, y + 2, z - 1, Blocks.leaves, 3, 2); + world.setBlock(x, y + 3, z, Blocks.leaves, 3, 2); int var999 = random.nextInt(12); int var998 = random.nextInt(4); @@ -61,57 +61,57 @@ public class WorldGenTropicsShrub extends WorldGenAbstractTree { if (var999 == 0) { - world.func_147465_d(x - 1, y + 1, z, Blocks.cocoa, 11, 2); + world.setBlock(x - 1, y + 1, z, Blocks.cocoa, 11, 2); } if (var999 == 1) { - world.func_147465_d(x + 1, y + 1, z, Blocks.cocoa, 9, 2); + world.setBlock(x + 1, y + 1, z, Blocks.cocoa, 9, 2); } if (var999 == 2) { - world.func_147465_d(x, y + 1, z - 1, Blocks.cocoa, 8, 2); + world.setBlock(x, y + 1, z - 1, Blocks.cocoa, 8, 2); } if (var999 == 3) { - world.func_147465_d(x, y + 1, z + 1, Blocks.cocoa, 10, 2); + world.setBlock(x, y + 1, z + 1, Blocks.cocoa, 10, 2); } } else if (var998 == 1) { if (var999 == 0) { - world.func_147465_d(x - 1, y + 1, z, Blocks.cocoa, 7, 2); + world.setBlock(x - 1, y + 1, z, Blocks.cocoa, 7, 2); } if (var999 == 1) { - world.func_147465_d(x + 1, y + 1, z, Blocks.cocoa, 5, 2); + world.setBlock(x + 1, y + 1, z, Blocks.cocoa, 5, 2); } if (var999 == 2) { - world.func_147465_d(x, y + 1, z - 1, Blocks.cocoa, 4, 2); + world.setBlock(x, y + 1, z - 1, Blocks.cocoa, 4, 2); } if (var999 == 3) { - world.func_147465_d(x, y + 1, z + 1, Blocks.cocoa, 6, 2); + world.setBlock(x, y + 1, z + 1, Blocks.cocoa, 6, 2); } } else if (var998 == 2) { if (var999 == 0) { - world.func_147465_d(x - 1, y + 1, z, Blocks.cocoa, 3, 2); + world.setBlock(x - 1, y + 1, z, Blocks.cocoa, 3, 2); } if (var999 == 1) { - world.func_147465_d(x + 1, y + 1, z, Blocks.cocoa, 1, 2); + world.setBlock(x + 1, y + 1, z, Blocks.cocoa, 1, 2); } if (var999 == 2) { - world.func_147465_d(x, y + 1, z - 1, Blocks.cocoa, 0, 2); + world.setBlock(x, y + 1, z - 1, Blocks.cocoa, 0, 2); } if (var999 == 3) { - world.func_147465_d(x, y + 1, z + 1, Blocks.cocoa, 2, 2); + world.setBlock(x, y + 1, z + 1, Blocks.cocoa, 2, 2); } } return true; diff --git a/src/main/java/biomesoplenty/common/world/layer/GenLayerBiomeBOP.java b/src/main/java/biomesoplenty/common/world/layer/GenLayerBiomeBOP.java index 10f75cebe..67e57b965 100644 --- a/src/main/java/biomesoplenty/common/world/layer/GenLayerBiomeBOP.java +++ b/src/main/java/biomesoplenty/common/world/layer/GenLayerBiomeBOP.java @@ -59,12 +59,12 @@ public class GenLayerBiomeBOP extends GenLayerBiome if (this.nextInt(3) == 0 && BOPConfigurationBiomeGen.mesaPlateauGen) { //TODO: mesaPlateau - aint1[j1 + i1 * par3] = BiomeGenBase.field_150608_ab.biomeID; + aint1[j1 + i1 * par3] = BiomeGenBase.mesaPlateau.biomeID; } else if (BOPConfigurationBiomeGen.mesaPlateauFGen) { //TODO: mesaPlateau F - aint1[j1 + i1 * par3] = BiomeGenBase.field_150607_aa.biomeID; + aint1[j1 + i1 * par3] = BiomeGenBase.mesaPlateau_F.biomeID; } } else @@ -88,7 +88,7 @@ public class GenLayerBiomeBOP extends GenLayerBiome if (l1 > 0 && BOPConfigurationBiomeGen.megaTaigaGen) { //TODO: megaTaiga - aint1[j1 + i1 * par3] = BiomeGenBase.field_150578_U.biomeID; + aint1[j1 + i1 * par3] = BiomeGenBase.megaTaiga.biomeID; } else { @@ -144,6 +144,6 @@ public class GenLayerBiomeBOP extends GenLayerBiome protected static boolean isOceanBiome(int biomeID) { - return biomeID == BiomeGenBase.ocean.biomeID && BOPConfigurationBiomeGen.oceanGen || biomeID == BiomeGenBase.field_150575_M.biomeID && BOPConfigurationBiomeGen.deepOceanGen || biomeID == BiomeGenBase.frozenOcean.biomeID && BOPConfigurationBiomeGen.frozenOceanGen; + return biomeID == BiomeGenBase.ocean.biomeID && BOPConfigurationBiomeGen.oceanGen || biomeID == BiomeGenBase.deepOcean.biomeID && BOPConfigurationBiomeGen.deepOceanGen || biomeID == BiomeGenBase.frozenOcean.biomeID && BOPConfigurationBiomeGen.frozenOceanGen; } } diff --git a/src/main/java/biomesoplenty/common/world/layer/hell/BiomeLayerHell.java b/src/main/java/biomesoplenty/common/world/layer/hell/BiomeLayerHell.java index 7b5c84781..27fa875ea 100644 --- a/src/main/java/biomesoplenty/common/world/layer/hell/BiomeLayerHell.java +++ b/src/main/java/biomesoplenty/common/world/layer/hell/BiomeLayerHell.java @@ -19,9 +19,9 @@ public abstract class BiomeLayerHell extends GenLayer BiomeLayerHell obj = new BiomeLayerHellCreate(1L, false); obj = new BiomeLayerHellFuzzyZoom(2000L, (obj)); for(int i = 1; i < 3; i++) { obj = new BiomeLayerHellZoom(2000L + i, (obj)); } - obj = BiomeLayerHellZoom.func_75915_a(1000L, ((obj)), 0); + obj = BiomeLayerHellZoom.magnify(1000L, ((obj)), 0); obj = new BiomeLayerHellBiomes(200L, ((obj))); - obj = BiomeLayerHellZoom.func_75915_a(1000L, ((obj)), 2); + obj = BiomeLayerHellZoom.magnify(1000L, ((obj)), 2); for(int j = 0; j < biomesize; j++) { obj = new BiomeLayerHellZoom(1000L + j, (obj)); } BiomeLayerHellVoronoiZoom genlayervoronoizoom = new BiomeLayerHellVoronoiZoom(10L, ((obj))); (obj).initWorldGenSeed(seed); diff --git a/src/main/java/biomesoplenty/common/world/layer/hell/BiomeLayerHellZoom.java b/src/main/java/biomesoplenty/common/world/layer/hell/BiomeLayerHellZoom.java index 92b989101..9c865a9c6 100644 --- a/src/main/java/biomesoplenty/common/world/layer/hell/BiomeLayerHellZoom.java +++ b/src/main/java/biomesoplenty/common/world/layer/hell/BiomeLayerHellZoom.java @@ -105,7 +105,7 @@ public class BiomeLayerHellZoom extends BiomeLayerHell } } - public static BiomeLayerHell func_75915_a(long par0, BiomeLayerHell par2GenLayer, int par3) + public static BiomeLayerHell magnify(long par0, BiomeLayerHell par2GenLayer, int par3) { Object object = par2GenLayer; From ceb55012b2218374dce74284c390b35d014bc3d8 Mon Sep 17 00:00:00 2001 From: Progwml6 Date: Wed, 5 Feb 2014 19:47:27 -0500 Subject: [PATCH 2/2] switch to forge build with new names --- build.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.properties b/build.properties index d113ef119..4bf80228b 100644 --- a/build.properties +++ b/build.properties @@ -1,5 +1,5 @@ minecraft_version=1.7.2 -forge_version=10.12.0.1019 +forge_version=10.12.0.1024 mod_version=2.0.0 worldcore_version=1.1.0.17 fmp_version=1.0.0.182 \ No newline at end of file