diff options
| author | Draknyte1 <Draknyte1@hotmail.com> | 2016-09-12 17:08:57 +1000 |
|---|---|---|
| committer | Draknyte1 <Draknyte1@hotmail.com> | 2016-09-12 17:08:57 +1000 |
| commit | 50966a4786bfb4fe84b14939292ee73d51b431c4 (patch) | |
| tree | 7b5d45f615ea25fc49bfeb1eea7919d404064adb /src/Java | |
| parent | 8e0cf5dc9f6e75f0dd12b76f178123fedbb91821 (diff) | |
| download | GT5-Unofficial-50966a4786bfb4fe84b14939292ee73d51b431c4.tar.gz GT5-Unofficial-50966a4786bfb4fe84b14939292ee73d51b431c4.tar.bz2 GT5-Unofficial-50966a4786bfb4fe84b14939292ee73d51b431c4.zip | |
$ Fixed Blocks calling client side render code during block registration when loading on a server.
Diffstat (limited to 'src/Java')
3 files changed, 6 insertions, 7 deletions
diff --git a/src/Java/gtPlusPlus/core/block/base/BlockBaseModular.java b/src/Java/gtPlusPlus/core/block/base/BlockBaseModular.java index 9654caac00..a2d2589f5e 100644 --- a/src/Java/gtPlusPlus/core/block/base/BlockBaseModular.java +++ b/src/Java/gtPlusPlus/core/block/base/BlockBaseModular.java @@ -146,9 +146,4 @@ public class BlockBaseModular extends BasicBlock{ return this.blockColour; } - @Override - public int getBlockColor() { - return this.blockColour; - } - } diff --git a/src/Java/gtPlusPlus/core/item/base/itemblock/ItemBlockGtBlock.java b/src/Java/gtPlusPlus/core/item/base/itemblock/ItemBlockGtBlock.java index 04d01c2c97..ed21b3642a 100644 --- a/src/Java/gtPlusPlus/core/item/base/itemblock/ItemBlockGtBlock.java +++ b/src/Java/gtPlusPlus/core/item/base/itemblock/ItemBlockGtBlock.java @@ -1,6 +1,7 @@ package gtPlusPlus.core.item.base.itemblock; import gregtech.api.util.GT_OreDictUnificator; +import gtPlusPlus.core.block.base.BlockBaseModular; import gtPlusPlus.core.lib.CORE; import gtPlusPlus.core.util.Utils; import gtPlusPlus.core.util.item.UtilsItems; @@ -21,7 +22,8 @@ public class ItemBlockGtBlock extends ItemBlock{ public ItemBlockGtBlock(Block block) { super(block); - this.blockColour = block.getBlockColor(); + BlockBaseModular baseBlock = (BlockBaseModular) block; + this.blockColour = baseBlock.getRenderColor(0); if (block.getLocalizedName().toLowerCase().contains("uranium") || block.getLocalizedName().toLowerCase().contains("plutonium") || block.getLocalizedName().toLowerCase().contains("thorium")){ sRadiation = 2; } diff --git a/src/Java/gtPlusPlus/core/item/base/itemblock/ItemBlockGtFrameBox.java b/src/Java/gtPlusPlus/core/item/base/itemblock/ItemBlockGtFrameBox.java index c8d791b905..b4628f12ab 100644 --- a/src/Java/gtPlusPlus/core/item/base/itemblock/ItemBlockGtFrameBox.java +++ b/src/Java/gtPlusPlus/core/item/base/itemblock/ItemBlockGtFrameBox.java @@ -1,6 +1,7 @@ package gtPlusPlus.core.item.base.itemblock; import gregtech.api.util.GT_OreDictUnificator; +import gtPlusPlus.core.block.base.BlockBaseModular; import gtPlusPlus.core.util.item.UtilsItems; import net.minecraft.block.Block; import net.minecraft.item.ItemBlock; @@ -11,7 +12,8 @@ public class ItemBlockGtFrameBox extends ItemBlock{ public ItemBlockGtFrameBox(Block block) { super(block); - this.blockColour = block.getBlockColor(); + BlockBaseModular baseBlock = (BlockBaseModular) block; + this.blockColour = baseBlock.getRenderColor(1); GT_OreDictUnificator.registerOre("frameGt"+block.getUnlocalizedName().replace("tile.", "").replace("tile.BlockGtFrame", "").replace("-", "").replace("_", "").replace(" ", "").replace("FrameBox", ""), UtilsItems.getSimpleStack(this)); } |