From 241b64564ed8be9eee2b6aabbdb4397dcdd0635c Mon Sep 17 00:00:00 2001 From: makeo Date: Tue, 27 Oct 2015 18:29:34 +0100 Subject: [PATCH] -added pillars for Manipulator -added rendering for Manipulator -replaced old field headers -added textures for Manipulator and Pillars --- .../makeo/gadomancy/client/ClientProxy.java | 19 +-- .../block/BlockNodeManipulatorRenderer.java | 49 ++++++ .../entity/PlayerCameraRenderer.java | 9 +- .../tile/RenderTileManipulatorPillar.java | 37 +++++ .../tile/RenderTileNodeManipulator.java | 32 ++++ .../transformation/FakeEntityGolemBase.java | 9 +- .../transformation/TransformationHelper.java | 9 +- .../common/blocks/BlockNodeManipulator.java | 18 ++- .../common/blocks/BlockStoneMachine.java | 140 ++++++++++++++++++ .../blocks/tiles/TileManipulatorPillar.java | 15 ++ .../common/items/ItemBlockStoneMachine.java | 41 +++++ .../network/packets/PacketAbortTransform.java | 9 +- .../common/registration/RegisteredBlocks.java | 21 +-- .../assets/gadomancy/lang/en_US.lang | 2 + .../textures/blocks/manipulator_bot.png | Bin 0 -> 565 bytes .../textures/blocks/manipulator_focus_bot.png | Bin 0 -> 477 bytes .../blocks/manipulator_focus_side.png | Bin 0 -> 377 bytes .../textures/blocks/manipulator_focus_top.png | Bin 0 -> 464 bytes .../textures/blocks/manipulator_side.png | Bin 0 -> 599 bytes .../textures/blocks/manipulator_top.png | Bin 0 -> 670 bytes .../textures/models/manipulator_pillar.png | Bin 0 -> 2545 bytes 21 files changed, 369 insertions(+), 41 deletions(-) create mode 100644 src/main/java/makeo/gadomancy/client/renderers/block/BlockNodeManipulatorRenderer.java create mode 100644 src/main/java/makeo/gadomancy/client/renderers/tile/RenderTileManipulatorPillar.java create mode 100644 src/main/java/makeo/gadomancy/client/renderers/tile/RenderTileNodeManipulator.java create mode 100644 src/main/java/makeo/gadomancy/common/blocks/BlockStoneMachine.java create mode 100644 src/main/java/makeo/gadomancy/common/blocks/tiles/TileManipulatorPillar.java create mode 100644 src/main/java/makeo/gadomancy/common/items/ItemBlockStoneMachine.java create mode 100644 src/main/resources/assets/gadomancy/textures/blocks/manipulator_bot.png create mode 100644 src/main/resources/assets/gadomancy/textures/blocks/manipulator_focus_bot.png create mode 100644 src/main/resources/assets/gadomancy/textures/blocks/manipulator_focus_side.png create mode 100644 src/main/resources/assets/gadomancy/textures/blocks/manipulator_focus_top.png create mode 100644 src/main/resources/assets/gadomancy/textures/blocks/manipulator_side.png create mode 100644 src/main/resources/assets/gadomancy/textures/blocks/manipulator_top.png create mode 100644 src/main/resources/assets/gadomancy/textures/models/manipulator_pillar.png diff --git a/src/main/java/makeo/gadomancy/client/ClientProxy.java b/src/main/java/makeo/gadomancy/client/ClientProxy.java index cf065f4..e0d8302 100644 --- a/src/main/java/makeo/gadomancy/client/ClientProxy.java +++ b/src/main/java/makeo/gadomancy/client/ClientProxy.java @@ -8,25 +8,16 @@ import makeo.gadomancy.client.events.RenderEventHandler; import makeo.gadomancy.client.events.ResourceReloadListener; import makeo.gadomancy.client.gui.InfusionClawGui; import makeo.gadomancy.client.renderers.block.BlockExtendedNodeJarRenderer; +import makeo.gadomancy.client.renderers.block.BlockNodeManipulatorRenderer; import makeo.gadomancy.client.renderers.block.RenderBlockTransparent; import makeo.gadomancy.client.renderers.entity.RenderAdditionalGolemBase; import makeo.gadomancy.client.renderers.item.ItemExNodeRenderer; import makeo.gadomancy.client.renderers.item.ItemJarExtendedNodeRenderer; import makeo.gadomancy.client.renderers.item.ItemRenderRemoteJar; import makeo.gadomancy.client.renderers.item.ItemRenderTileEntity; -import makeo.gadomancy.client.renderers.tile.RenderTileArcaneDropper; -import makeo.gadomancy.client.renderers.tile.RenderTileExtendedNode; -import makeo.gadomancy.client.renderers.tile.RenderTileExtendedNodeJar; -import makeo.gadomancy.client.renderers.tile.RenderTileInfusionClaw; -import makeo.gadomancy.client.renderers.tile.RenderTileRemoteJar; -import makeo.gadomancy.client.renderers.tile.RenderTileStickyJar; +import makeo.gadomancy.client.renderers.tile.*; import makeo.gadomancy.common.CommonProxy; -import makeo.gadomancy.common.blocks.tiles.TileArcaneDropper; -import makeo.gadomancy.common.blocks.tiles.TileExtendedNode; -import makeo.gadomancy.common.blocks.tiles.TileExtendedNodeJar; -import makeo.gadomancy.common.blocks.tiles.TileInfusionClaw; -import makeo.gadomancy.common.blocks.tiles.TileRemoteJar; -import makeo.gadomancy.common.blocks.tiles.TileStickyJar; +import makeo.gadomancy.common.blocks.tiles.*; import makeo.gadomancy.common.registration.RegisteredBlocks; import makeo.gadomancy.common.registration.RegisteredItems; import makeo.gadomancy.common.utils.Injector; @@ -87,6 +78,9 @@ public class ClientProxy extends CommonProxy { RenderTileExtendedNodeJar nodeJarRenderer = new RenderTileExtendedNodeJar(); ClientRegistry.bindTileEntitySpecialRenderer(TileExtendedNodeJar.class, nodeJarRenderer); + ClientRegistry.bindTileEntitySpecialRenderer(TileNodeManipulator.class, new RenderTileNodeManipulator()); + ClientRegistry.bindTileEntitySpecialRenderer(TileManipulatorPillar.class, new RenderTileManipulatorPillar()); + //Items TileArcaneDropper fakeTile = new TileArcaneDropper(); fakeTile.blockMetadata = 8 | ForgeDirection.SOUTH.ordinal(); @@ -102,6 +96,7 @@ public class ClientProxy extends CommonProxy { //Blocks RegisteredBlocks.rendererTransparentBlock = registerBlockRenderer(new RenderBlockTransparent()); RegisteredBlocks.rendererExtendedNodeJarBlock = registerBlockRenderer(new BlockExtendedNodeJarRenderer()); + RegisteredBlocks.rendererNodeManipulator = registerBlockRenderer(new BlockNodeManipulatorRenderer()); } @Override diff --git a/src/main/java/makeo/gadomancy/client/renderers/block/BlockNodeManipulatorRenderer.java b/src/main/java/makeo/gadomancy/client/renderers/block/BlockNodeManipulatorRenderer.java new file mode 100644 index 0000000..ac50d23 --- /dev/null +++ b/src/main/java/makeo/gadomancy/client/renderers/block/BlockNodeManipulatorRenderer.java @@ -0,0 +1,49 @@ +package makeo.gadomancy.client.renderers.block; + +import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; +import makeo.gadomancy.common.registration.RegisteredBlocks; +import net.minecraft.block.Block; +import net.minecraft.client.renderer.RenderBlocks; +import net.minecraft.world.IBlockAccess; +import org.lwjgl.opengl.GL11; +import thaumcraft.client.renderers.block.BlockStoneDeviceRenderer; + +/** + * This class is part of the Gadomancy Mod + * Gadomancy is Open Source and distributed under the + * GNU LESSER GENERAL PUBLIC LICENSE + * for more read the LICENSE file + *

+ * Created by makeo @ 27.10.2015 13:46 + */ +public class BlockNodeManipulatorRenderer implements ISimpleBlockRenderingHandler { + public static final BlockStoneDeviceRenderer PARENT_RENDERER = new BlockStoneDeviceRenderer(); + + @Override + public void renderInventoryBlock(Block block, int metadata, int modelId, RenderBlocks renderer) { + GL11.glPushMatrix(); + GL11.glTranslatef(0, -0.1f, 0); + GL11.glScalef(0.85f, 0.85f, 0.85f); + + PARENT_RENDERER.renderInventoryBlock(block, 5, modelId, renderer); + + GL11.glTranslatef(0, 1f, 0); + PARENT_RENDERER.renderInventoryBlock(block, 8, modelId, renderer); + GL11.glPopMatrix(); + } + + @Override + public boolean renderWorldBlock(IBlockAccess world, int x, int y, int z, Block block, int modelId, RenderBlocks renderer) { + return PARENT_RENDERER.renderWorldBlock(world, x, y, z, block, modelId, renderer); + } + + @Override + public boolean shouldRender3DInInventory(int modelId) { + return true; + } + + @Override + public int getRenderId() { + return RegisteredBlocks.rendererNodeManipulator; + } +} diff --git a/src/main/java/makeo/gadomancy/client/renderers/entity/PlayerCameraRenderer.java b/src/main/java/makeo/gadomancy/client/renderers/entity/PlayerCameraRenderer.java index edb2674..186574e 100644 --- a/src/main/java/makeo/gadomancy/client/renderers/entity/PlayerCameraRenderer.java +++ b/src/main/java/makeo/gadomancy/client/renderers/entity/PlayerCameraRenderer.java @@ -5,9 +5,12 @@ import net.minecraft.client.renderer.EntityRenderer; import net.minecraft.entity.player.EntityPlayer; /** - * User: makeo - * Date: 09.07.2015 - * Time: 02:34 + * This class is part of the Gadomancy Mod + * Gadomancy is Open Source and distributed under the + * GNU LESSER GENERAL PUBLIC LICENSE + * for more read the LICENSE file + *

+ * Created by makeo @ 09.07.2015 02:34 */ public class PlayerCameraRenderer extends EntityRenderer { private final Minecraft minecraft; diff --git a/src/main/java/makeo/gadomancy/client/renderers/tile/RenderTileManipulatorPillar.java b/src/main/java/makeo/gadomancy/client/renderers/tile/RenderTileManipulatorPillar.java new file mode 100644 index 0000000..dd63136 --- /dev/null +++ b/src/main/java/makeo/gadomancy/client/renderers/tile/RenderTileManipulatorPillar.java @@ -0,0 +1,37 @@ +package makeo.gadomancy.client.renderers.tile; + +import makeo.gadomancy.common.utils.Injector; +import makeo.gadomancy.common.utils.SimpleResourceLocation; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.ResourceLocation; +import thaumcraft.client.lib.UtilsFX; +import thaumcraft.client.renderers.tile.TileInfusionPillarRenderer; + +import java.util.Map; + +/** + * This class is part of the Gadomancy Mod + * Gadomancy is Open Source and distributed under the + * GNU LESSER GENERAL PUBLIC LICENSE + * for more read the LICENSE file + *

+ * Created by makeo @ 27.10.2015 13:23 + */ +public class RenderTileManipulatorPillar extends TileInfusionPillarRenderer { + private static final String TC_TEXTURE = "textures/models/pillar.png"; + private static final ResourceLocation TEXTURE = new SimpleResourceLocation("models/manipulator_pillar.png"); + private static final Map BOUND_TEXTURES = new Injector(UtilsFX.class).getField("boundTextures"); + + @Override + public void renderTileEntityAt(TileEntity par1TileEntity, double par2, double par4, double par6, float par8) { + ResourceLocation originalTexture = BOUND_TEXTURES.get(TC_TEXTURE); + BOUND_TEXTURES.put(TC_TEXTURE, TEXTURE); + super.renderTileEntityAt(par1TileEntity, par2, par4, par6, par8); + + if(originalTexture != null) { + BOUND_TEXTURES.put(TC_TEXTURE, originalTexture); + } else { + BOUND_TEXTURES.remove(TC_TEXTURE); + } + } +} diff --git a/src/main/java/makeo/gadomancy/client/renderers/tile/RenderTileNodeManipulator.java b/src/main/java/makeo/gadomancy/client/renderers/tile/RenderTileNodeManipulator.java new file mode 100644 index 0000000..677d640 --- /dev/null +++ b/src/main/java/makeo/gadomancy/client/renderers/tile/RenderTileNodeManipulator.java @@ -0,0 +1,32 @@ +package makeo.gadomancy.client.renderers.tile; + +import makeo.gadomancy.client.renderers.block.BlockNodeManipulatorRenderer; +import makeo.gadomancy.common.registration.RegisteredBlocks; +import net.minecraft.client.renderer.RenderBlocks; +import net.minecraft.client.renderer.texture.TextureMap; +import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; +import net.minecraft.tileentity.TileEntity; +import org.lwjgl.opengl.GL11; + +/** + * This class is part of the Gadomancy Mod + * Gadomancy is Open Source and distributed under the + * GNU LESSER GENERAL PUBLIC LICENSE + * for more read the LICENSE file + *

+ * Created by makeo @ 27.10.2015 15:19 + */ +public class RenderTileNodeManipulator extends TileEntitySpecialRenderer { + @Override + public void renderTileEntityAt(TileEntity tile, double x, double y, double z, float partitalTicks) { + GL11.glPushMatrix(); + + GL11.glTranslated(x, y, z); + GL11.glTranslatef(0.5f, 1.5f, 0.5f); + + bindTexture(TextureMap.locationBlocksTexture); + BlockNodeManipulatorRenderer.PARENT_RENDERER.renderInventoryBlock(RegisteredBlocks.blockNodeManipulator, 8, 0, RenderBlocks.getInstance()); + + GL11.glPopMatrix(); + } +} diff --git a/src/main/java/makeo/gadomancy/client/transformation/FakeEntityGolemBase.java b/src/main/java/makeo/gadomancy/client/transformation/FakeEntityGolemBase.java index 17acfbe..bb8d873 100644 --- a/src/main/java/makeo/gadomancy/client/transformation/FakeEntityGolemBase.java +++ b/src/main/java/makeo/gadomancy/client/transformation/FakeEntityGolemBase.java @@ -6,9 +6,12 @@ import thaumcraft.common.entities.golems.EntityGolemBase; import thaumcraft.common.entities.golems.EnumGolemType; /** - * User: makeo - * Date: 05.07.2015 - * Time: 15:47 + * This class is part of the Gadomancy Mod + * Gadomancy is Open Source and distributed under the + * GNU LESSER GENERAL PUBLIC LICENSE + * for more read the LICENSE file + *

+ * Created by makeo @ 05.07.2015 15:47 */ public class FakeEntityGolemBase extends EntityGolemBase { private EntityGolemBase golem; diff --git a/src/main/java/makeo/gadomancy/client/transformation/TransformationHelper.java b/src/main/java/makeo/gadomancy/client/transformation/TransformationHelper.java index 0198ee0..2ecbef4 100644 --- a/src/main/java/makeo/gadomancy/client/transformation/TransformationHelper.java +++ b/src/main/java/makeo/gadomancy/client/transformation/TransformationHelper.java @@ -17,9 +17,12 @@ import java.util.List; import java.util.Map; /** - * User: makeo - * Date: 04.07.2015 - * Time: 02:38 + * This class is part of the Gadomancy Mod + * Gadomancy is Open Source and distributed under the + * GNU LESSER GENERAL PUBLIC LICENSE + * for more read the LICENSE file + *

+ * Created by makeo @ 04.07.2015 02:38 */ @SideOnly(Side.CLIENT) public class TransformationHelper { diff --git a/src/main/java/makeo/gadomancy/common/blocks/BlockNodeManipulator.java b/src/main/java/makeo/gadomancy/common/blocks/BlockNodeManipulator.java index 27d8890..b0f74fc 100644 --- a/src/main/java/makeo/gadomancy/common/blocks/BlockNodeManipulator.java +++ b/src/main/java/makeo/gadomancy/common/blocks/BlockNodeManipulator.java @@ -1,6 +1,8 @@ package makeo.gadomancy.common.blocks; +import makeo.gadomancy.common.Gadomancy; import makeo.gadomancy.common.blocks.tiles.TileNodeManipulator; +import makeo.gadomancy.common.registration.RegisteredBlocks; import makeo.gadomancy.common.registration.RegisteredItems; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; @@ -32,9 +34,14 @@ public class BlockNodeManipulator extends BlockStoneDevice { @Override public void registerBlockIcons(IIconRegister ir) { super.registerBlockIcons(ir); - //iconPedestal[0] - //iconWandPedestal[0] - //iconWandPedestal[1] + + iconPedestal[1] = ir.registerIcon(Gadomancy.MODID + ":manipulator_bot"); + iconWandPedestal[0] = ir.registerIcon(Gadomancy.MODID + ":manipulator_side"); + iconWandPedestal[1] = ir.registerIcon(Gadomancy.MODID + ":manipulator_top"); + + iconWandPedestalFocus[0] = ir.registerIcon(Gadomancy.MODID + ":manipulator_focus_side"); + iconWandPedestalFocus[1] = ir.registerIcon(Gadomancy.MODID + ":manipulator_focus_top"); + iconWandPedestalFocus[2] = ir.registerIcon(Gadomancy.MODID + ":manipulator_focus_bot"); } @Override @@ -71,4 +78,9 @@ public class BlockNodeManipulator extends BlockStoneDevice { //TODO DO! return super.onBlockActivated(world, x, y, z, player, side, par7, par8, par9); } + + @Override + public int getRenderType() { + return RegisteredBlocks.rendererNodeManipulator; + } } diff --git a/src/main/java/makeo/gadomancy/common/blocks/BlockStoneMachine.java b/src/main/java/makeo/gadomancy/common/blocks/BlockStoneMachine.java new file mode 100644 index 0000000..7791626 --- /dev/null +++ b/src/main/java/makeo/gadomancy/common/blocks/BlockStoneMachine.java @@ -0,0 +1,140 @@ +package makeo.gadomancy.common.blocks; + +import makeo.gadomancy.common.blocks.tiles.TileManipulatorPillar; +import makeo.gadomancy.common.registration.RegisteredItems; +import net.minecraft.block.Block; +import net.minecraft.block.material.Material; +import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.creativetab.CreativeTabs; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.IIcon; +import net.minecraft.util.MovingObjectPosition; +import net.minecraft.world.IBlockAccess; +import net.minecraft.world.World; +import thaumcraft.common.config.ConfigBlocks; + +import java.util.List; +import java.util.Random; + +/** + * This class is part of the Gadomancy Mod + * Gadomancy is Open Source and distributed under the + * GNU LESSER GENERAL PUBLIC LICENSE + * for more read the LICENSE file + *

+ * Created by makeo @ 27.10.2015 13:16 + */ +public class BlockStoneMachine extends Block { + public BlockStoneMachine() { + super(Material.rock); + setHardness(3.0F); + setResistance(25.0F); + setStepSound(Block.soundTypeStone); + setBlockBounds(0.0F, 0.0F, 0.0F, 1.0F, 1.0F, 1.0F); + setCreativeTab(RegisteredItems.creativeTab); + } + + private IIcon pillarIcon; + + @Override + public void registerBlockIcons(IIconRegister ir) { + pillarIcon = ir.registerIcon("thaumcraft:es_1"); + } + + @Override + public IIcon getIcon(int side, int metadata) { + if(metadata == 11 || metadata == 15) { + return pillarIcon; + } + + return super.getIcon(side, metadata); + } + + @Override + public boolean hasTileEntity(int metadata) { + return metadata == 15; + } + + @Override + public void getSubBlocks(Item item, CreativeTabs tab, List list) { + list.add(new ItemStack(item, 1, 15)); + list.add(new ItemStack(item, 1, 11)); + } + + @Override + public ItemStack getPickBlock(MovingObjectPosition target, World world, int x, int y, int z, EntityPlayer player) { + int metadata = world.getBlockMetadata(x, y, z); + if(metadata == 11 || metadata == 15) { + return new ItemStack(getItemDropped(metadata, null, 0), 1, damageDropped(metadata)); + } + + return super.getPickBlock(target, world, x, y, z, player); + } + + @Override + public TileEntity createTileEntity(World world, int metadata) { + if(metadata == 15) { + return new TileManipulatorPillar(); + } + return null; + } + + @Override + public Item getItemDropped(int metadata, Random random, int fortune) { + if(metadata == 11 || metadata == 15) { + return Item.getItemFromBlock(ConfigBlocks.blockCosmeticSolid); + } + + return super.getItemDropped(metadata, random, fortune); + } + + @Override + public int damageDropped(int metadata) { + return metadata == 0 ? 15 : metadata == 1 ? 11 : metadata; + } + + @Override + public void onNeighborBlockChange(World world, int x, int y, int z, Block block) { + int metadata = world.getBlockMetadata(x, y, z); + if(metadata == 15) { + if(world.getBlock(x, y + 1, z) != this || world.getBlockMetadata(x, y, z) != 1) { + dropBlockAsItem(world, x, y, z, metadata, 0); + world.setBlockToAir(x, y, z); + } + } else if(metadata == 11) { + if(world.getBlock(x, y - 1, z) != this || world.getBlockMetadata(x, y, z) != 0) { + dropBlockAsItem(world, x, y, z, metadata, 0); + world.setBlockToAir(x, y, z); + } + } + } + + @Override + public void setBlockBoundsBasedOnState(IBlockAccess world, int x, int y, int z) { + int metadata = world.getBlockMetadata(x, y, z); + if(metadata == 15) { + setBlockBounds(0, 0, 0, 1, 0.5f, 1); + } else if(metadata == 11) { + setBlockBounds(0.0F, -1.0F, 0.0F, 1.0F, -0.5F, 1.0F); + } + super.setBlockBoundsBasedOnState(world, x, y, z); + } + + public boolean isOpaqueCube() +/* 97: */ { +/* 98: 96 */ return false; +/* 99: */ } + + public boolean renderAsNormalBlock() +/* 102: */ { +/* 103:102 */ return false; +/* 104: */ } + + @Override + public int getRenderType() { + return -1; + } +} diff --git a/src/main/java/makeo/gadomancy/common/blocks/tiles/TileManipulatorPillar.java b/src/main/java/makeo/gadomancy/common/blocks/tiles/TileManipulatorPillar.java new file mode 100644 index 0000000..859fbfd --- /dev/null +++ b/src/main/java/makeo/gadomancy/common/blocks/tiles/TileManipulatorPillar.java @@ -0,0 +1,15 @@ +package makeo.gadomancy.common.blocks.tiles; + +import thaumcraft.common.tiles.TileInfusionPillar; + +/** + * This class is part of the Gadomancy Mod + * Gadomancy is Open Source and distributed under the + * GNU LESSER GENERAL PUBLIC LICENSE + * for more read the LICENSE file + *

+ * Created by makeo @ 27.10.2015 13:21 + */ +public class TileManipulatorPillar extends TileInfusionPillar { + +} \ No newline at end of file diff --git a/src/main/java/makeo/gadomancy/common/items/ItemBlockStoneMachine.java b/src/main/java/makeo/gadomancy/common/items/ItemBlockStoneMachine.java new file mode 100644 index 0000000..b94ecd0 --- /dev/null +++ b/src/main/java/makeo/gadomancy/common/items/ItemBlockStoneMachine.java @@ -0,0 +1,41 @@ +package makeo.gadomancy.common.items; + +import makeo.gadomancy.common.blocks.BlockStoneMachine; +import net.minecraft.block.Block; +import net.minecraft.block.BlockBrewingStand; +import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.item.ItemBlock; +import net.minecraft.item.ItemStack; +import net.minecraft.util.IIcon; + +/** + * This class is part of the Gadomancy Mod + * Gadomancy is Open Source and distributed under the + * GNU LESSER GENERAL PUBLIC LICENSE + * for more read the LICENSE file + *

+ * Created by makeo @ 27.10.2015 17:05 + */ +public class ItemBlockStoneMachine extends ItemBlock { + public ItemBlockStoneMachine(Block block) { + super(block); + } + + @Override + public IIcon getIconFromDamage(int metadata) { + if(metadata == 11 || metadata == 15) { + return this.field_150939_a.getIcon(0, metadata); + } + return super.getIconFromDamage(metadata); + } + + @Override + public String getUnlocalizedName(ItemStack stack) { + return getUnlocalizedName() + "." + stack.getItemDamage(); + } + + @Override + public int getMetadata(int metadata) { + return metadata; + } +} diff --git a/src/main/java/makeo/gadomancy/common/network/packets/PacketAbortTransform.java b/src/main/java/makeo/gadomancy/common/network/packets/PacketAbortTransform.java index f056417..79da376 100644 --- a/src/main/java/makeo/gadomancy/common/network/packets/PacketAbortTransform.java +++ b/src/main/java/makeo/gadomancy/common/network/packets/PacketAbortTransform.java @@ -8,9 +8,12 @@ import io.netty.buffer.ByteBuf; import makeo.gadomancy.client.transformation.TransformationHelper; /** - * User: makeo - * Date: 03.07.2015 - * Time: 21:42 + * This class is part of the Gadomancy Mod + * Gadomancy is Open Source and distributed under the + * GNU LESSER GENERAL PUBLIC LICENSE + * for more read the LICENSE file + *

+ * Created by makeo @ 03.07.2015 21:42 */ public class PacketAbortTransform implements IMessage, IMessageHandler { private int entityId; diff --git a/src/main/java/makeo/gadomancy/common/registration/RegisteredBlocks.java b/src/main/java/makeo/gadomancy/common/registration/RegisteredBlocks.java index d2e5f9d..9c6b918 100644 --- a/src/main/java/makeo/gadomancy/common/registration/RegisteredBlocks.java +++ b/src/main/java/makeo/gadomancy/common/registration/RegisteredBlocks.java @@ -2,21 +2,10 @@ package makeo.gadomancy.common.registration; import cpw.mods.fml.common.registry.GameRegistry; import makeo.gadomancy.api.ClickBehavior; -import makeo.gadomancy.common.blocks.BlockArcaneDropper; -import makeo.gadomancy.common.blocks.BlockExtendedNodeJar; -import makeo.gadomancy.common.blocks.BlockInfusionClaw; -import makeo.gadomancy.common.blocks.BlockNode; -import makeo.gadomancy.common.blocks.BlockNodeManipulator; -import makeo.gadomancy.common.blocks.BlockRemoteJar; -import makeo.gadomancy.common.blocks.BlockStickyJar; -import makeo.gadomancy.common.blocks.tiles.TileArcaneDropper; -import makeo.gadomancy.common.blocks.tiles.TileExtendedNode; -import makeo.gadomancy.common.blocks.tiles.TileExtendedNodeJar; -import makeo.gadomancy.common.blocks.tiles.TileInfusionClaw; -import makeo.gadomancy.common.blocks.tiles.TileNodeManipulator; -import makeo.gadomancy.common.blocks.tiles.TileRemoteJar; -import makeo.gadomancy.common.blocks.tiles.TileStickyJar; +import makeo.gadomancy.common.blocks.*; +import makeo.gadomancy.common.blocks.tiles.*; import makeo.gadomancy.common.items.ItemBlockRemoteJar; +import makeo.gadomancy.common.items.ItemBlockStoneMachine; import makeo.gadomancy.common.items.ItemNodeManipulator; import net.minecraft.block.Block; import net.minecraft.init.Blocks; @@ -43,6 +32,7 @@ public class RegisteredBlocks { public static int rendererTransparentBlock; public static int rendererExtendedNodeJarBlock; + public static int rendererNodeManipulator; public static BlockStickyJar blockStickyJar; public static BlockArcaneDropper blockArcaneDropper; @@ -51,6 +41,7 @@ public class RegisteredBlocks { public static BlockNode blockNode; public static BlockExtendedNodeJar blockExtendedNodeJar; public static BlockNodeManipulator blockNodeManipulator; + public static BlockStoneMachine blockStoneMachine; public static void init() { registerBlocks(); @@ -70,6 +61,7 @@ public class RegisteredBlocks { blockNode = (BlockNode) new BlockNode().setBlockName("blockAiry"); blockExtendedNodeJar = registerBlock(new BlockExtendedNodeJar()); blockNodeManipulator = registerBlock(new BlockNodeManipulator(), ItemNodeManipulator.class); + blockStoneMachine = registerBlock(new BlockStoneMachine(), ItemBlockStoneMachine.class); } private static T registerBlock(String name, T block) { @@ -103,6 +95,7 @@ public class RegisteredBlocks { registerTile(TileExtendedNode.class); registerTile(TileExtendedNodeJar.class); registerTile(TileNodeManipulator.class); + registerTile(TileManipulatorPillar.class); } private static void registerTile(Class tile, String name) { diff --git a/src/main/resources/assets/gadomancy/lang/en_US.lang b/src/main/resources/assets/gadomancy/lang/en_US.lang index 59a7143..c840f58 100644 --- a/src/main/resources/assets/gadomancy/lang/en_US.lang +++ b/src/main/resources/assets/gadomancy/lang/en_US.lang @@ -68,6 +68,8 @@ tile.BlockRemoteJar.name=Mirrored Jar tile.BlockNode.name=Aura Node tile.BlockExtendedNodeJar.name=Node in a Jar tile.BlockNodeManipulator.5.name=Node Manipulator +tile.BlockStoneMachine.11.name=Manipulation Pillar +tile.BlockStoneMachine.15.name=Manipulation Pillar gadomancy.nodes.GROWING=Growing gadomancy.nodes.STARVING=Starving diff --git a/src/main/resources/assets/gadomancy/textures/blocks/manipulator_bot.png b/src/main/resources/assets/gadomancy/textures/blocks/manipulator_bot.png new file mode 100644 index 0000000000000000000000000000000000000000..33faf20e5c262c165108750dfc5539df57880fcc GIT binary patch literal 565 zcmV-50?Pe~P)WdKukZXhu=AX8;SV&9i{66@h2a_pJ$*ta^L&&T6&wOV~X zpPf!evfuBI$74$A^Z95=-tTv%Qpxjtu~?+RV9;u{8jZ&H`>oY#zW4jR*XyZ3-)^__ z`HX+LTriu>W>RXm+XTAZ?(6kJ?)Uo$>cipia5xx<{CGSJq?M0GBSV;hfUDQ*!9j*# zBfN2?LN}4;9#ujq$g9{1ApAqvL3Oj) zFs)%iAmSLDBTF)ibD|AxfmazEPp4CLAhehucl6@Mg|jRp7Uz$U$LV~FYo=t>a=A>X z&Z5eRs{1evZC!f5nJ`327q<9`+tG;8Dy=dU@p;>Bx85#HCREU{_%6d`p(QM7nWjt2 zsC+V+@H3mupuc6XA-9tH^FMHmEl#ZGQEbCoER&T%j{!p@0PFQS-ly1I+mpp*8AbDs zdfvo+;>qZeFP!goJ4#NZ6t6C^B3x8Bw7UFsIuZQ?sp3lX+1_G@00000NkvXXu0mjf DqnP`B literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/gadomancy/textures/blocks/manipulator_focus_bot.png b/src/main/resources/assets/gadomancy/textures/blocks/manipulator_focus_bot.png new file mode 100644 index 0000000000000000000000000000000000000000..052e887e3da37e22ed100a4266bdbd2901bd9673 GIT binary patch literal 477 zcmV<30V4j1P)WdKcYZXh=xPh)f-GB7bSATlsIF*Z6gGaxH4GB7Zdlql%{000McNliru z-3kX205STlm|6e;010qNS#tmY9>M?s9>M``&~-il000DMK}|sb0I`n?{9y$E00A{g zL_t(|+GAj#CHQnq;s31-vj6d^VZv*`dnSer`@b@fZ2&V11H;=7|HwCh5r|b}Ss4ha z!2tj7hyTBD;Vr}8-`^SdIo>hI2>)hSzyA|MRLv_4^(P zSD<%(f^FS$_&Wn5kbe054+F{I$yTNRUHL-fr$o9WB)kT^{rrnTR-Bo1zmoz0(C%^< TEe+b900000NkvXXu0mjf7J$V* literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/gadomancy/textures/blocks/manipulator_focus_side.png b/src/main/resources/assets/gadomancy/textures/blocks/manipulator_focus_side.png new file mode 100644 index 0000000000000000000000000000000000000000..bad4dd74bd1f92de5f214f9b048153d67900bb83 GIT binary patch literal 377 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`+9j?LCC){ui6xo&c?uz!xv31k zK!&-3e{zX}k%6Hxkgzf|u`)4H&^9nKFoEaktaVt4Nf^~62)`6Kn?VF7r z*B2d`d4Q?P;T50xvV$%i#&NOA%!~fp*ZpfhsQjH(d6U%wnYh9Ub<;l2zjUDKj?x^5 zO(I7ZRrfsQv2UqM=!pL{>+AuoGfZil4U7$&CHF8XN$5R&B9`{xS@IEq>65}zetiF~ zex#wEM}W2dzhR<=h=5RP!mt1Q&U4zQ&wqHl|NI1lA0yCDw@-ZVyyCcm z@}Jp>fB*UO*!jiq=*Rs{4Y;~JX-C0B-NX0q-#_?ix&Gc%gNupmuh|)dzIs)NRd6l` PdXB-<)z4*}Q$iB}5xk8L literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/gadomancy/textures/blocks/manipulator_focus_top.png b/src/main/resources/assets/gadomancy/textures/blocks/manipulator_focus_top.png new file mode 100644 index 0000000000000000000000000000000000000000..fd65c328ea5af867d13527d5945669c8b00468f9 GIT binary patch literal 464 zcmV;>0WbcEP)WdKcYZXh=xPh)f-GB7bSATlsIF*Z6gGaxH4GB7Zdlql%{000McNliru z-3kX20ShI%aH#+Q010qNS#tmY9>D+r9>D>_X;f1H000DMK}|sb0I`n?{9y$E00AgT zL_t(|+GAj#DR5@~&!EisADH2$ymv6o>Xv#4#ymkEb_Pu?+1-N3=X#>U35s*#D|-#-S1U&mGc zpT72;!Ft&X29SD&yZ;%PkVBh|gO@>9Re<5en|}y};p)XPT0^JunxG2oB?;!|XbT`bxmEvR^ zO>F#0G^ROssMN&8d=L`8d+)jDoO`1XJN;WTyu8rywUxu$Y6mxZ3_XBlr!bubxVp2{ z=X^a55Qe~CC&cS751tcy{vQA- zSF2U&?7zIg{oa>vf}R6NctGuw$ppDv4&NRg<*xOm1;=r)+wBqnDt^&!x5Ma&X1;}q z@56OnjK^cFRx5QDpx5h#G;hD(OLtAvPOQTJnB!bG~ygi56%$uyJnIeXi-g-Ns7M6p;r@#4fp8Z{gag)$3{T_P!D z#50{vkKf`!x7!WbmHNqmZx*mKLCA)2%HeV`Mn*K1)6!YQ8B-fKjzvtSq>r(Bo`-U| zjQM;n(g^Txts{2SIU0?mGn2T1ET#;`SU^C_vXIZ`Wh3bY8xcfxIvx4P7$ij=j*&VE lN@fK4pwDq~lw5BDzXNqp1-U=-p56ce002ovPDHLkV1iJU1E&B0 literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/gadomancy/textures/blocks/manipulator_top.png b/src/main/resources/assets/gadomancy/textures/blocks/manipulator_top.png new file mode 100644 index 0000000000000000000000000000000000000000..b294c4729946b38c7348dbd63b588f9d0dce1c27 GIT binary patch literal 670 zcmV;P0%84$P)WdKukZXhu=AX8;3IPD2pE2G5000SaNLh0L01FcU01FcV0GgZ_00004XF*Lt006O%3;baP0005? zNkl0ZEJs0x6}X zh0@kv=`6_O&3pf^sjOD3`Ft)SP18hCL~%Nu&gZkWw(B~sDB8AFN*QA|n~hD9BnSe} z^ZLGb9EacQ^*WtS=`dZ_by=3|UoICmec!jV!Y~A2GMU`(cb4NgW`X`}Hp}xILY8m0 z8-!q)G)*Bv3=_<`t~>6q%mgw zlRNNWqX`PQkPONp0*Q!djjv9DMdrp1Ul(~$7exW+f1ZUoN7@w*kN^Mx07*qoM6N<$ Ef_%Ci5C8xG literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/gadomancy/textures/models/manipulator_pillar.png b/src/main/resources/assets/gadomancy/textures/models/manipulator_pillar.png new file mode 100644 index 0000000000000000000000000000000000000000..45958894ff9a86bf56b8840aa3add4660f7ff9b1 GIT binary patch literal 2545 zcmVWdKuQbRaP_AX8;;BAY}>lsCxZWRnHkWS6Y+2qA9} zu^?h&2?1geFvQH00W&!DmH1nob{pKd8`{K2D&M}hrZd+$r`$Blunfzv49l<#|63UG zXYJax9~zH$hU3SN&#qasrkS3eZeG58*&H}Q(dN#fxU;%9YK-hYy?k z_wP3sE?gLCpFjGc30N#3e%rQf&8}U$niVTnG_$j_l>vUQTeq$m85wDwJ$qK4Po6xP zGk?i5V03h}5_{&%nXdgCHf(5i?%dfNIdY_q{pc7#^*3+c{2zibgv3{`Ufpckw5i#+ zabxrJ>C_>CzT@Xp7e;Gz?*UAxvfW_5Y|UcP_vw)tJ=o+^(&O8cv{uS)-1Oy_~9_4e)C zo2^^7R)W{BUtft82l$NvckkZqssVj*f`x#+<*}g~@$(Se+5cy0TguO$OPenJKQ46d zM0p1f9;^)D^%1&f&z|~D{Y8LNQ&Y{IJ9p;H@0SUDS=#A>I4OQ#h?(hifim}Wd3;;i zcxgW@bl!sp530J8xM!k4PudY5aqr%})@jjq1{8vSDFpmle*RS2MEU(``F6LBxX$sN z#2YYG+R@TJDQ!;=dyg!1Y&Yo11UeD#=$kDMI`(%v@e70prF~P{Kc#(#iHjks7wB07 z-o%6gUzc`jzB%2T>FfT7vsEJ7){dv|5nxZw#X<;w{``5}P=aBj9Xoc^2{tz_c{N0A z5QY>6^j!nOXv7M05hC&Z2=+UD`>$~+Z z#+nkO>I9?8h$`mLN+e`hDJ%f}DK6MdOFG)E;MgyKTL?wK$&)ARx3g!@)~XL_r=MLT zm_Xrr`0(LoY;3FsW9QDDYo*Ddr(zwcnxOOc?b~$&5;iE(wo%N4+Tl8>bSpOY3sUkT zJ$N8^Vq&67loa8U(icZa5Z=QyV^5qo(OkTEu^As9uVXNQmRN5^7?39phj@eHNg<&8 zgtPnh?Q7-Xh=;_Wz@EwC;NqPrlIE2wS1P`6Ny!TXFh=8(2-O&xopI<&mRK2p0D~fF z_7ll-ayV%M$4DYPzCKLhb#c_ZK|l~?l8Et6rH>suR+(Xc4RZ)5g2M=c;wvs+zFcuN z-@87IU`L}m=`h(qT+az$@t6tXgH)J=K{;Rh4e>Gdi%Bv&dpZ^TCT)TtI7G!C@L`0; zq&d&{HbNCMw2ncO5tt*ygg7+|(U7RQ?^FbT1eF=$ZGYso7G z(GZ-k!V2f=lTu3W`p|Blg!VP zIim%A{9JN{)+xZwEoQT1OQdWdhDa?Dohv7O$+10Y%AlgbUb8`_=!lL0ee>?Sap*A@ z%@|Y}kZcbjIA#**ny8PoP0*M8I@irNZrm7HCJ5TI!KB_Xy>XM>4JQWU|ogwvkZ zVlD~XTBkq~4V<<(`#_jUIG5r=vPSQT#*FRu&jP=1w$wW^REo37MiN`lFnO`a^=A;-o2x!j+;gTv8ob(X@;EQN+lC(sE zN#G*9l*%H&RvE{_IRY&Z`!^}aN)nRM)%1rk!;%eRh{!MgqP=96$`U4GXv+lH(|q>=V4?Q{ zgMePM!31WQ0iq!}xvY^8x)ll!^SwY~jzoMZ$svTJMnrNK5Mq-Ccis%eS^M46fMLED zzbw^~XeLH0A`P4P7SI1a?gb!^pzNJ&58*l65yMx! z)6LK@-wVKldZ%VV8xzt7$0S3D@4Oj`-$=CD^=4?8?*)PzyiyFkdi83Rw%@5y#QAmJ z48c3vLaV#p4CP)RNk+VD;%YlJX*l9l4cQ~0LL3h0w8s>X}#2Go-Qs{sW zP4t9g(&qVYhA