Added creative node creators for all node types

This commit is contained in:
makeo committed 2015-11-04 20:55:39 +01:00
1 parent d0eb1fd087
commit 33cdd7ef3d
5 files changed
+76 -17

No files matched your search

@@ -13,12 +13,7 @@ import makeo.gadomancy.client.renderers.block.BlockExtendedNodeJarRenderer;
import makeo.gadomancy.client.renderers.block.RenderBlockStoneMachine;
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.ItemRenderFamiliar;
import makeo.gadomancy.client.renderers.item.ItemRenderRemoteJar;
import makeo.gadomancy.client.renderers.item.ItemRenderStoneMachine;
import makeo.gadomancy.client.renderers.item.ItemRenderTileEntity;
import makeo.gadomancy.client.renderers.item.*;
import makeo.gadomancy.client.renderers.tile.RenderTileArcaneDropper;
import makeo.gadomancy.client.renderers.tile.RenderTileExtendedNode;
import makeo.gadomancy.client.renderers.tile.RenderTileExtendedNodeJar;
@@ -121,6 +116,7 @@ public class ClientProxy extends CommonProxy {
itemRenderStoneMachine.registerRenderer(0, new TileManipulationFocus(), renderTileManipulationFocus);
MinecraftForgeClient.registerItemRenderer(RegisteredItems.itemFamiliar, new ItemRenderFamiliar());
MinecraftForgeClient.registerItemRenderer(RegisteredItems.itemCreativeNode, new ItemCreativeNodeRenderer());
//Blocks
RegisteredBlocks.rendererTransparentBlock = registerBlockRenderer(new RenderBlockTransparent());
@@ -0,0 +1,29 @@
package makeo.gadomancy.client.renderers.item;
import makeo.gadomancy.common.registration.RegisteredItems;
import net.minecraft.item.ItemStack;
import thaumcraft.api.aspects.Aspect;
import thaumcraft.api.aspects.AspectList;
import thaumcraft.api.nodes.NodeType;
/**
* 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
* <p/>
* Created by makeo @ 04.11.2015 20:41
*/
public class ItemCreativeNodeRenderer extends ItemExNodeRenderer {
private static final AspectList ASPECTS = new AspectList().add(Aspect.AIR, 50).add(Aspect.FIRE, 50).add(Aspect.EARTH, 50).add(Aspect.WATER, 50);
@Override
public boolean handleRenderType(ItemStack item, ItemRenderType type) {
return (item != null) && (item.getItem() == RegisteredItems.itemCreativeNode);
}
@Override
public void renderItem(ItemRenderType type, ItemStack item, Object... data) {
makeo.gadomancy.client.renderers.item.ItemNodeRenderer.renderNodeItem(type, item, ASPECTS, NodeType.values()[item.getItemDamage()], null, data);
}
}
@@ -11,6 +11,7 @@ import org.lwjgl.opengl.GL11;
import thaumcraft.api.aspects.Aspect;
import thaumcraft.api.aspects.AspectList;
import thaumcraft.api.nodes.INode;
import thaumcraft.api.nodes.NodeModifier;
import thaumcraft.api.nodes.NodeType;
import thaumcraft.client.lib.UtilsFX;
import thaumcraft.client.renderers.tile.TileNodeRenderer;
@@ -44,8 +45,8 @@ public class ItemNodeRenderer implements IItemRenderer {
renderNodeItem(type, item, data);
}
//Gadomancy: Renamed to access it static from another class
public static void renderNodeItem(IItemRenderer.ItemRenderType type, ItemStack item, Object... data) {
//Gadomancy: Renamed to access it static from another class and added aspects, nodeType and nodeModifier as params
public static void renderNodeItem(IItemRenderer.ItemRenderType type, ItemStack item, AspectList aspects, NodeType nodeType, NodeModifier nodeModifier, Object... data) {
if (type == IItemRenderer.ItemRenderType.ENTITY) {
GL11.glTranslatef(-0.5F, -0.25F, -0.5F);
} else if ((type == IItemRenderer.ItemRenderType.EQUIPPED) && ((data[1] instanceof EntityPlayer))) {
@@ -53,7 +54,7 @@ public class ItemNodeRenderer implements IItemRenderer {
}
TileNode tjf = new TileNode();
tjf.setAspects(aspects);
tjf.setNodeType(NodeType.NORMAL);
tjf.setNodeType(nodeType);
tjf.blockType = ConfigBlocks.blockAiry;
tjf.blockMetadata = 0;
GL11.glPushMatrix();
@@ -68,6 +69,11 @@ public class ItemNodeRenderer implements IItemRenderer {
GL11.glEnable(32826);
}
public static void renderNodeItem(IItemRenderer.ItemRenderType type, ItemStack item, Object... data) {
renderNodeItem(type, item, aspects, NodeType.NORMAL, null, data);
}
private static AspectList aspects = new AspectList().add(Aspect.AIR, 40).add(Aspect.FIRE, 40).add(Aspect.EARTH, 40).add(Aspect.WATER, 40);
public static void renderItemNode(INode node) {
@@ -6,6 +6,7 @@ import makeo.gadomancy.common.blocks.tiles.TileManipulatorPillar;
import makeo.gadomancy.common.registration.RegisteredBlocks;
import makeo.gadomancy.common.registration.RegisteredItems;
import net.minecraft.block.Block;
import net.minecraft.block.BlockContainer;
import net.minecraft.block.material.Material;
import net.minecraft.client.renderer.texture.IIconRegister;
import net.minecraft.creativetab.CreativeTabs;
@@ -20,6 +21,7 @@ import net.minecraft.util.MovingObjectPosition;
import net.minecraft.world.IBlockAccess;
import net.minecraft.world.World;
import thaumcraft.common.config.ConfigBlocks;
import thaumcraft.common.lib.utils.InventoryUtils;
import thaumcraft.common.tiles.TilePedestal;
import java.util.List;
@@ -120,6 +122,13 @@ public class BlockStoneMachine extends Block {
return super.getItemDropped(metadata, random, fortune);
}
public void breakBlock(World world, int x, int y, int z, Block block, int metadata) {
if(metadata == 1) {
InventoryUtils.dropItems(world, x, y, z);
}
super.breakBlock(world, x, y, z, block, metadata);
}
@Override
public boolean canReplace(World world, int x, int y, int z, int side, ItemStack stack) {
if (stack.getItemDamage() == 0 && (y < 1 || world.getBlock(x, y - 1, z) != RegisteredBlocks.blockNodeManipulator)) {
@@ -1,18 +1,22 @@
package makeo.gadomancy.common.items;
import makeo.gadomancy.common.blocks.tiles.TileExtendedNode;
import makeo.gadomancy.common.registration.RegisteredItems;
import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.init.Blocks;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.world.World;
import net.minecraftforge.common.util.ForgeDirection;
import org.apache.logging.log4j.LogManager;
import thaumcraft.api.aspects.Aspect;
import thaumcraft.api.aspects.AspectList;
import thaumcraft.api.nodes.NodeModifier;
import thaumcraft.api.nodes.NodeType;
import thaumcraft.common.blocks.BlockAiry;
import thaumcraft.common.config.ConfigBlocks;
import thaumcraft.common.tiles.TileNode;
import thaumcraft.common.lib.world.ThaumcraftWorldGenerator;
import java.util.List;
@@ -27,11 +31,19 @@ import java.util.List;
public class ItemCreativeNode extends Item {
public ItemCreativeNode() {
setCreativeTab(RegisteredItems.creativeTab);
setUnlocalizedName("nodePlacer");
}
@Override
public String getUnlocalizedName(ItemStack stack) {
return super.getUnlocalizedName(stack) + "." + stack.getItemDamage();
public void getSubItems(Item item, CreativeTabs tab, List list) {
for(int i = 0; i < NodeType.values().length; i++) {
list.add(new ItemStack(item, 1, i));
}
}
@Override
public String getUnlocalizedNameInefficiently(ItemStack stack) {
return Item.getItemFromBlock(ConfigBlocks.blockAiry).getUnlocalizedName(new ItemStack(ConfigBlocks.blockAiry, 1, 0));
}
@Override
@@ -43,7 +55,7 @@ public class ItemCreativeNode extends Item {
if(placeRandomNode(world, x, y, z)) {
int metadata = stack.getItemDamage();
TileNode node = (TileNode) world.getTileEntity(x, y, z);
TileExtendedNode node = (TileExtendedNode) world.getTileEntity(x, y, z);
if(metadata == 0) {
node.setNodeType(NodeType.NORMAL);
@@ -51,29 +63,36 @@ public class ItemCreativeNode extends Item {
AspectList aspects = new AspectList();
for(Aspect primal : Aspect.getPrimalAspects()) {
aspects.add(primal, 10000);
aspects.add(primal, 500);
}
node.setAspects(aspects);
node.markDirty();
world.markBlockForUpdate(x, y, z);
} else {
node.setNodeType(NodeType.values()[metadata]);
}
return true;
}
return false;
}
private boolean placeRandomNode(World world, int x, int y, int z) {
return world.getBlock(x, y, z) == Blocks.air && world.setBlock(x, y, z, ConfigBlocks.blockAiry);
if(world.getBlock(x, y, z) == Blocks.air) {
ThaumcraftWorldGenerator.createRandomNodeAt(world, x, y, z, world.rand, false, false, false);
return world.getBlock(x, y, z) == ConfigBlocks.blockAiry;
}
return false;
}
@Override
public void addInformation(ItemStack stack, EntityPlayer player, List list, boolean advancedItemTooltips) {
int metadata = stack.getItemDamage();
if(metadata == 0) {
list.add("\u00a75Place a huge and bright aura node");
} else {
list.add("\u00a75Place a node of type " + NodeType.values()[metadata].name().toLowerCase());
}
list.add("\u00a7oCreative Mode Only");
}
}