From 9218809993ca64c1dc0dbd1c30db14a28f6f93d1 Mon Sep 17 00:00:00 2001 From: makeo Date: Mon, 9 Nov 2015 21:09:28 +0100 Subject: [PATCH] added new foci (rendering missing) --- .../makeo/gadomancy/client/ClientProxy.java | 3 ++- .../tile/RenderTileManipulationFocus.java | 6 ++++-- .../common/blocks/BlockStoneMachine.java | 5 ++++- .../blocks/tiles/TileManipulationFocus.java | 21 +++++++------------ 4 files changed, 18 insertions(+), 17 deletions(-) diff --git a/src/main/java/makeo/gadomancy/client/ClientProxy.java b/src/main/java/makeo/gadomancy/client/ClientProxy.java index 5a2223e..7c0165f 100644 --- a/src/main/java/makeo/gadomancy/client/ClientProxy.java +++ b/src/main/java/makeo/gadomancy/client/ClientProxy.java @@ -123,7 +123,8 @@ public class ClientProxy extends CommonProxy { ItemRenderStoneMachine itemRenderStoneMachine = new ItemRenderStoneMachine(); MinecraftForgeClient.registerItemRenderer(Item.getItemFromBlock(RegisteredBlocks.blockStoneMachine), itemRenderStoneMachine); - itemRenderStoneMachine.registerRenderer(0, new TileManipulationFocus(), renderTileManipulationFocus); + itemRenderStoneMachine.registerRenderer(0, new TileManipulationFocus(0), renderTileManipulationFocus); + itemRenderStoneMachine.registerRenderer(3, new TileManipulationFocus(1), renderTileManipulationFocus); MinecraftForgeClient.registerItemRenderer(RegisteredItems.itemFamiliar, new ItemRenderFamiliar()); MinecraftForgeClient.registerItemRenderer(RegisteredItems.itemCreativeNode, new ItemCreativeNodeRenderer()); diff --git a/src/main/java/makeo/gadomancy/client/renderers/tile/RenderTileManipulationFocus.java b/src/main/java/makeo/gadomancy/client/renderers/tile/RenderTileManipulationFocus.java index 7cfef48..09e3ff4 100644 --- a/src/main/java/makeo/gadomancy/client/renderers/tile/RenderTileManipulationFocus.java +++ b/src/main/java/makeo/gadomancy/client/renderers/tile/RenderTileManipulationFocus.java @@ -22,18 +22,20 @@ public class RenderTileManipulationFocus extends TileEntitySpecialRenderer { GL11.glPushMatrix(); GL11.glTranslated(x, y, z); - bindTexture(new SimpleResourceLocation("models/manipulation_focus_" + tile.fociId + ".png")); + bindTexture(new SimpleResourceLocation("models/manipulation_focus_" + tile.getFociId() + ".png")); GL11.glRotatef(180, 1, 0, 0); GL11.glTranslatef(0.5f, -1.5f + (2/16f), -0.5f); - if(tile.fociId == 0) { + if(tile.getFociId() == 0) { GL11.glPushMatrix(); for(int i = 0; i < 4; i++) { RANDOM_FOCUS.render(null, 0, 0, 0, 0, 0, 0.0625f); GL11.glRotatef(90, 0, 1, 0); } GL11.glPopMatrix(); + } else if(tile.getFociId() == 1) { + //TODO: Hell hell hell } GL11.glPopMatrix(); diff --git a/src/main/java/makeo/gadomancy/common/blocks/BlockStoneMachine.java b/src/main/java/makeo/gadomancy/common/blocks/BlockStoneMachine.java index c031f9e..c038dd6 100644 --- a/src/main/java/makeo/gadomancy/common/blocks/BlockStoneMachine.java +++ b/src/main/java/makeo/gadomancy/common/blocks/BlockStoneMachine.java @@ -87,6 +87,7 @@ public class BlockStoneMachine extends Block { list.add(new ItemStack(item, 1, 0)); list.add(new ItemStack(item, 1, 1)); list.add(new ItemStack(item, 1, 2)); + list.add(new ItemStack(item, 1, 3)); } @Override @@ -104,11 +105,13 @@ public class BlockStoneMachine extends Block { if (metadata == 15) { return new TileManipulatorPillar(); } else if (metadata == 0) { - return new TileManipulationFocus(); + return new TileManipulationFocus(0); } else if(metadata == 1) { return new TilePedestal(); } else if(metadata == 2) { return new TileBlockProtector(); + } else if(metadata == 3) { + return new TileManipulationFocus(1); } return null; } diff --git a/src/main/java/makeo/gadomancy/common/blocks/tiles/TileManipulationFocus.java b/src/main/java/makeo/gadomancy/common/blocks/tiles/TileManipulationFocus.java index eb66316..ece42a1 100644 --- a/src/main/java/makeo/gadomancy/common/blocks/tiles/TileManipulationFocus.java +++ b/src/main/java/makeo/gadomancy/common/blocks/tiles/TileManipulationFocus.java @@ -1,7 +1,5 @@ package makeo.gadomancy.common.blocks.tiles; -import net.minecraft.nbt.NBTTagCompound; - /** * This class is part of the Gadomancy Mod * Gadomancy is Open Source and distributed under the @@ -11,20 +9,17 @@ import net.minecraft.nbt.NBTTagCompound; * Created by makeo @ 28.10.2015 16:27 */ public class TileManipulationFocus extends SynchronizedTileEntity { - public int fociId; + private int fociId; + public TileManipulationFocus(int fociId) { + this.fociId = fociId; + } + + public int getFociId() { + return fociId; + } @Override public boolean canUpdate() { return false; } - - @Override - public void readCustomNBT(NBTTagCompound compound) { - fociId = compound.getInteger("fociId"); - } - - @Override - public void writeCustomNBT(NBTTagCompound compound) { - compound.setInteger("fociId", fociId); - } }