From 10e7c3bd01d4d0ae3f69a8da5b64f8934b4e14f1 Mon Sep 17 00:00:00 2001 From: HellFirePvP <01ecs01m> Date: Thu, 22 Oct 2015 22:27:01 +0200 Subject: [PATCH] Fixed Extended Aura nodes --- .../java/makeo/gadomancy/client/ClientProxy.java | 9 ++++++--- .../client/renderers/item/ItemExNodeRenderer.java | 7 +------ .../java/makeo/gadomancy/common/CommonProxy.java | 13 +++++++++++++ .../makeo/gadomancy/common/blocks/BlockNode.java | 12 +++++------- .../common/registration/RegisteredBlocks.java | 4 +++- .../common/registration/RegisteredItems.java | 2 ++ 6 files changed, 30 insertions(+), 17 deletions(-) diff --git a/src/main/java/makeo/gadomancy/client/ClientProxy.java b/src/main/java/makeo/gadomancy/client/ClientProxy.java index 6ec3042..5c27893 100644 --- a/src/main/java/makeo/gadomancy/client/ClientProxy.java +++ b/src/main/java/makeo/gadomancy/client/ClientProxy.java @@ -24,6 +24,7 @@ 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.registration.RegisteredBlocks; +import makeo.gadomancy.common.registration.RegisteredItems; import makeo.gadomancy.common.utils.Injector; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.entity.Render; @@ -37,6 +38,8 @@ import net.minecraft.world.World; import net.minecraftforge.client.MinecraftForgeClient; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.common.util.ForgeDirection; +import sun.reflect.generics.visitor.Reifier; +import thaumcraft.api.nodes.INode; import thaumcraft.client.gui.GuiGolem; import thaumcraft.client.renderers.entity.RenderGolemBase; import thaumcraft.common.entities.golems.EntityGolemBase; @@ -59,6 +62,8 @@ public class ClientProxy extends CommonProxy { @Override public void initalize() { + super.initalize(); + injectGolemTextures(); //Tiles @@ -83,14 +88,12 @@ public class ClientProxy extends CommonProxy { MinecraftForgeClient.registerItemRenderer(Item.getItemFromBlock(RegisteredBlocks.blockInfusionClaw), new ItemRenderTileEntity(renderTileInfusionClaw, new TileInfusionClaw())); - MinecraftForgeClient.registerItemRenderer(Item.getItemFromBlock(RegisteredBlocks.blockNode), new ItemExNodeRenderer()); + MinecraftForgeClient.registerItemRenderer(RegisteredItems.itemBlockAiryCopy, new ItemExNodeRenderer()); MinecraftForgeClient.registerItemRenderer(Item.getItemFromBlock(RegisteredBlocks.blockRemoteJar), new ItemRenderRemoteJar(renderTileRemoteJar)); //Blocks RegisteredBlocks.rendererTransparentBlock = registerBlockRenderer(new RenderBlockTransparent()); - - super.initalize(); } @Override diff --git a/src/main/java/makeo/gadomancy/client/renderers/item/ItemExNodeRenderer.java b/src/main/java/makeo/gadomancy/client/renderers/item/ItemExNodeRenderer.java index 6b4ebed..d9e2093 100644 --- a/src/main/java/makeo/gadomancy/client/renderers/item/ItemExNodeRenderer.java +++ b/src/main/java/makeo/gadomancy/client/renderers/item/ItemExNodeRenderer.java @@ -9,16 +9,11 @@ import thaumcraft.client.renderers.tile.ItemNodeRenderer; * Gadomancy is Open Source and distributed under the * GNU LESSER GENERAL PUBLIC LICENSE * for more read the LICENSE file - *

+ * * Created by HellFirePvP @ 22.10.2015 20:11 */ public class ItemExNodeRenderer extends ItemNodeRenderer { - public ItemExNodeRenderer() { - //AspectList list = new AspectList().add(Aspect.FIRE, 100).add(Aspect.ENTROPY, 100).add(Aspect.WATER, 50); - //new Injector(this).setField("aspects", list); - } - @Override public boolean handleRenderType(ItemStack item, ItemRenderType type) { return (item != null) && (item.getItem() == Item.getItemFromBlock(RegisteredBlocks.blockNode)) && (item.getItemDamage() == 0); diff --git a/src/main/java/makeo/gadomancy/common/CommonProxy.java b/src/main/java/makeo/gadomancy/common/CommonProxy.java index 42e6ac0..9e824a9 100644 --- a/src/main/java/makeo/gadomancy/common/CommonProxy.java +++ b/src/main/java/makeo/gadomancy/common/CommonProxy.java @@ -3,6 +3,7 @@ package makeo.gadomancy.common; import cpw.mods.fml.common.FMLCommonHandler; import cpw.mods.fml.common.network.IGuiHandler; import cpw.mods.fml.common.network.NetworkRegistry; +import cpw.mods.fml.common.registry.GameRegistry; import cpw.mods.fml.relauncher.Side; import makeo.gadomancy.common.containers.ContainerInfusionClaw; import makeo.gadomancy.common.events.EventHandlerGolem; @@ -13,8 +14,11 @@ import makeo.gadomancy.common.registration.*; import makeo.gadomancy.client.ClientProxy; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; +import net.minecraft.item.Item; import net.minecraft.world.World; import net.minecraftforge.common.MinecraftForge; +import thaumcraft.common.blocks.BlockAiryItem; +import thaumcraft.common.config.ConfigBlocks; import thaumcraft.common.entities.golems.ContainerGolem; import thaumcraft.common.entities.golems.EntityGolemBase; @@ -42,6 +46,15 @@ public class CommonProxy implements IGuiHandler { } public void initalize() { + try { + RegisteredItems.itemBlockAiryCopy = new BlockAiryItem(RegisteredBlocks.blockNode); + GameRegistry.addSubstitutionAlias("Thaumcraft:blockAiry", GameRegistry.Type.BLOCK, RegisteredBlocks.blockNode); + GameRegistry.addSubstitutionAlias("Thaumcraft:blockAiry", GameRegistry.Type.ITEM, RegisteredItems.itemBlockAiryCopy); + ConfigBlocks.blockAiry = RegisteredBlocks.blockNode; + } catch (Exception e) { + e.printStackTrace(); + } + NetworkRegistry.INSTANCE.registerGuiHandler(Gadomancy.instance, this); MinecraftForge.EVENT_BUS.register(EVENT_HANDLER_GOLEM); diff --git a/src/main/java/makeo/gadomancy/common/blocks/BlockNode.java b/src/main/java/makeo/gadomancy/common/blocks/BlockNode.java index 22784d1..43ee92e 100644 --- a/src/main/java/makeo/gadomancy/common/blocks/BlockNode.java +++ b/src/main/java/makeo/gadomancy/common/blocks/BlockNode.java @@ -1,7 +1,6 @@ package makeo.gadomancy.common.blocks; import makeo.gadomancy.common.blocks.tiles.TileExtendedNode; -import makeo.gadomancy.common.registration.RegisteredItems; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; @@ -14,16 +13,15 @@ import net.minecraft.world.World; * Created by HellFirePvP @ 22.10.2015 19:47 */ public class BlockNode extends thaumcraft.common.blocks.BlockAiry { - //We overwrite and use the TC class for visual effects and world interact handling. - //This way our node behaves like TC ones. - public BlockNode() { - super(); - setCreativeTab(RegisteredItems.creativeTab); + @Override + public String getUnlocalizedName() { + return super.getUnlocalizedName(); } @Override public TileEntity createTileEntity(World world, int metadata) { - return new TileExtendedNode(); + if(metadata == 0) return new TileExtendedNode(); + return super.createTileEntity(world, metadata); } } diff --git a/src/main/java/makeo/gadomancy/common/registration/RegisteredBlocks.java b/src/main/java/makeo/gadomancy/common/registration/RegisteredBlocks.java index c221616..e03ea47 100644 --- a/src/main/java/makeo/gadomancy/common/registration/RegisteredBlocks.java +++ b/src/main/java/makeo/gadomancy/common/registration/RegisteredBlocks.java @@ -1,5 +1,7 @@ package makeo.gadomancy.common.registration; +import cpw.mods.fml.common.registry.ExistingSubstitutionException; +import cpw.mods.fml.common.registry.GameData; import cpw.mods.fml.common.registry.GameRegistry; import makeo.gadomancy.api.ClickBehavior; import makeo.gadomancy.common.blocks.BlockArcaneDropper; @@ -58,7 +60,7 @@ public class RegisteredBlocks { blockArcaneDropper = registerBlock(new BlockArcaneDropper()); blockInfusionClaw = registerBlock(new BlockInfusionClaw()); blockRemoteJar = registerBlock(new BlockRemoteJar(), ItemBlockRemoteJar.class); - blockNode = registerBlock(new BlockNode()); + blockNode = (BlockNode) new BlockNode().setBlockName("blockAiry"); } private static T registerBlock(String name, T block) { diff --git a/src/main/java/makeo/gadomancy/common/registration/RegisteredItems.java b/src/main/java/makeo/gadomancy/common/registration/RegisteredItems.java index 0aaa935..7c4cb96 100644 --- a/src/main/java/makeo/gadomancy/common/registration/RegisteredItems.java +++ b/src/main/java/makeo/gadomancy/common/registration/RegisteredItems.java @@ -32,6 +32,8 @@ public class RegisteredItems { public static Item itemTransformationFocus; public static Item itemGolemCoreBreak; + public static Item itemBlockAiryCopy; //!!!!!!!!!!DO NOT TOUCH THIS OR USE THIS ANYWHERE!!!!!!!!!! + public static void preInit() { creativeTab = new CreativeTabs(Gadomancy.MODID) { @Override