From ff135ea4a7f62b32c0b3fb4e2d7158e65c6c6a7e Mon Sep 17 00:00:00 2001 From: cp Date: Tue, 15 Apr 2014 10:48:59 +0800 Subject: [PATCH] Fix farm station crash and removed the block from creative tab + NEI. --- resources/assets/enderio/lang/en_US.lang | 2 +- src/main/java/crazypants/enderio/farm/BlockFarmStation.java | 1 + .../java/crazypants/enderio/farm/FarmingStationRenderer.java | 4 ++-- src/main/java/crazypants/enderio/nei/NEIEnderIOConfig.java | 1 + 4 files changed, 5 insertions(+), 3 deletions(-) diff --git a/resources/assets/enderio/lang/en_US.lang b/resources/assets/enderio/lang/en_US.lang index 18180607..3a6cc26b 100644 --- a/resources/assets/enderio/lang/en_US.lang +++ b/resources/assets/enderio/lang/en_US.lang @@ -106,7 +106,7 @@ tile.blockHyperCube.name=Dimensional Transceiver tile.blockPowerMonitor.name=Power Monitor tile.blockVat.name=The Vat tile.blockCombustionGenerator.name=Combustion Generator -tile.blockFarmStation.name=Farming Station +tile.blockFarmStation.name=Farming Station [NOT IMPLEMENTED] //Travel tile.blockTravelAnchor.name=Travel Anchor diff --git a/src/main/java/crazypants/enderio/farm/BlockFarmStation.java b/src/main/java/crazypants/enderio/farm/BlockFarmStation.java index 972e5310..f04de0f6 100644 --- a/src/main/java/crazypants/enderio/farm/BlockFarmStation.java +++ b/src/main/java/crazypants/enderio/farm/BlockFarmStation.java @@ -23,6 +23,7 @@ public class BlockFarmStation extends AbstractMachineBlock { protected BlockFarmStation() { super(ModObject.blockFarmStation, TileFarmStation.class); setBlockBounds(0, 0, 0, 1, 0.85f, 1); + setCreativeTab(null); } @Override diff --git a/src/main/java/crazypants/enderio/farm/FarmingStationRenderer.java b/src/main/java/crazypants/enderio/farm/FarmingStationRenderer.java index a1612283..679b3549 100644 --- a/src/main/java/crazypants/enderio/farm/FarmingStationRenderer.java +++ b/src/main/java/crazypants/enderio/farm/FarmingStationRenderer.java @@ -1,11 +1,11 @@ package crazypants.enderio.farm; import net.minecraft.block.Block; +import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.RenderBlocks; import net.minecraft.client.renderer.Tessellator; import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; -import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; import crazypants.enderio.EnderIO; @@ -41,7 +41,7 @@ public class FarmingStationRenderer implements ISimpleBlockRenderingHandler { Tessellator.instance.setBrightness(15 << 20 | 15 << 4); float b = 1; if(world != null) { - b = RenderUtil.claculateTotalBrightnessForLocation((World) world, x, y, z); + b = RenderUtil.claculateTotalBrightnessForLocation(Minecraft.getMinecraft().theWorld, x, y, z); } float[] cols = new float[6]; diff --git a/src/main/java/crazypants/enderio/nei/NEIEnderIOConfig.java b/src/main/java/crazypants/enderio/nei/NEIEnderIOConfig.java index ce4d74a2..b47e846f 100644 --- a/src/main/java/crazypants/enderio/nei/NEIEnderIOConfig.java +++ b/src/main/java/crazypants/enderio/nei/NEIEnderIOConfig.java @@ -20,6 +20,7 @@ public class NEIEnderIOConfig implements IConfigureNEI { API.hideItem(new ItemStack(EnderIO.blockConduitFacade)); API.hideItem(new ItemStack(EnderIO.itemEnderface)); + API.hideItem(new ItemStack(EnderIO.blockFarmStation)); if(!Config.photovoltaicCellEnabled) { API.hideItem(new ItemStack(EnderIO.blockSolarPanel)); }