diff --git a/src/main/java/makeo/gadomancy/client/util/MultiTickEffectDispatcher.java b/src/main/java/makeo/gadomancy/client/util/MultiTickEffectDispatcher.java index 2ee8574..2b06012 100644 --- a/src/main/java/makeo/gadomancy/client/util/MultiTickEffectDispatcher.java +++ b/src/main/java/makeo/gadomancy/client/util/MultiTickEffectDispatcher.java @@ -37,7 +37,7 @@ public class MultiTickEffectDispatcher { VortexDigInfo info = it.next(); if(info.dimId != currentRenderWorld.provider.dimensionId) it.remove(); info.renderTicks++; - if(info.renderTicks > 7) it.remove(); + if(info.renderTicks > info.tickCap) it.remove(); Thaumcraft.proxy.boreDigFx(currentRenderWorld, info.tX, info.tY, info.tZ, info.oX, info.oY, info.oZ, info.blockInstance, info.meta); } @@ -60,8 +60,9 @@ public class MultiTickEffectDispatcher { private Block blockInstance; private int meta; private int renderTicks = 0; + private int tickCap; - public VortexDigInfo(int dimId, int oX, int oY, int oZ, int tX, int tY, int tZ, Block blockInstance, int meta) { + public VortexDigInfo(int dimId, int oX, int oY, int oZ, int tX, int tY, int tZ, Block blockInstance, int meta, int tickDuration) { this.dimId = dimId; this.oX = oX; this.oY = oY; @@ -71,6 +72,7 @@ public class MultiTickEffectDispatcher { this.tZ = tZ; this.blockInstance = blockInstance; this.meta = meta; + this.tickCap = tickDuration; } } diff --git a/src/main/java/makeo/gadomancy/common/blocks/BlockNodeManipulator.java b/src/main/java/makeo/gadomancy/common/blocks/BlockNodeManipulator.java new file mode 100644 index 0000000..27d8890 --- /dev/null +++ b/src/main/java/makeo/gadomancy/common/blocks/BlockNodeManipulator.java @@ -0,0 +1,74 @@ +package makeo.gadomancy.common.blocks; + +import makeo.gadomancy.common.blocks.tiles.TileNodeManipulator; +import makeo.gadomancy.common.registration.RegisteredItems; +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.world.World; +import thaumcraft.common.blocks.BlockStoneDevice; +import thaumcraft.common.tiles.TileWandPedestal; + +import java.util.List; + +/** + * 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 HellFirePvP @ 26.10.2015 19:23 + */ +public class BlockNodeManipulator extends BlockStoneDevice { + + public BlockNodeManipulator() { + setBlockName("blockNodeManipulator"); + setCreativeTab(RegisteredItems.creativeTab); + } + + @Override + public void registerBlockIcons(IIconRegister ir) { + super.registerBlockIcons(ir); + //iconPedestal[0] + //iconWandPedestal[0] + //iconWandPedestal[1] + } + + @Override + public TileEntity createNewTileEntity(World world, int meta) { + return null; + } + + //TC stuff... + @Override + public TileEntity createTileEntity(World world, int metadata) { + if(metadata == 5) + return new TileNodeManipulator(); + return null; + } + + @Override + public int getComparatorInputOverride(World world, int x, int y, int z, int rs) { + int ret = super.getComparatorInputOverride(world, x, y, z, rs); + + TileEntity te = world.getTileEntity(x, y, z); + if(te != null && te instanceof TileWandPedestal) return 0; + return ret; + } + + @Override + public void getSubBlocks(Item par1, CreativeTabs par2CreativeTabs, List par3List) { + par3List.add(new ItemStack(par1, 1, 5)); + } + + @Override + public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer player, int side, float par7, float par8, float par9) { + int meta = world.getBlockMetadata(x, y, z); + TileEntity te = world.getTileEntity(x, y, z); + //TODO DO! + return super.onBlockActivated(world, x, y, z, player, side, par7, par8, par9); + } +} diff --git a/src/main/java/makeo/gadomancy/common/blocks/tiles/GrowingNodeBehavior.java b/src/main/java/makeo/gadomancy/common/blocks/tiles/GrowingNodeBehavior.java index 5369cbb..a486476 100644 --- a/src/main/java/makeo/gadomancy/common/blocks/tiles/GrowingNodeBehavior.java +++ b/src/main/java/makeo/gadomancy/common/blocks/tiles/GrowingNodeBehavior.java @@ -168,6 +168,7 @@ public class GrowingNodeBehavior { } public boolean updateBehavior(boolean needUpdate) { + //TODO fix empty nodes... if(fixedNode != null && owningNode.ticksExisted % 3 == 0) { if(owningNode.getWorldObj().getBlock(fixedNode.xCoord, fixedNode.yCoord, fixedNode.zCoord) != RegisteredBlocks.blockNode || owningNode.getWorldObj().getTileEntity(fixedNode.xCoord, fixedNode.yCoord, fixedNode.zCoord) == null || @@ -209,7 +210,7 @@ public class GrowingNodeBehavior { PacketTCNodeBolt bolt = new PacketTCNodeBolt(ox + 0.5F, oy + 0.5F, oz + 0.5F, fx + 0.5F, fy + 0.5F, fz + 0.5F); PacketHandler.INSTANCE.sendToAllAround(bolt, point); - PacketAnimationAbsorb packet = new PacketAnimationAbsorb(ox, oy, oz, fx, fy, fz); + PacketAnimationAbsorb packet = new PacketAnimationAbsorb(ox, oy, oz, fx, fy, fz, 7); PacketHandler.INSTANCE.sendToAllAround(packet, point); world.markBlockForUpdate(fx, fy, fz); diff --git a/src/main/java/makeo/gadomancy/common/blocks/tiles/TileExtendedNode.java b/src/main/java/makeo/gadomancy/common/blocks/tiles/TileExtendedNode.java index 4979a87..4402110 100644 --- a/src/main/java/makeo/gadomancy/common/blocks/tiles/TileExtendedNode.java +++ b/src/main/java/makeo/gadomancy/common/blocks/tiles/TileExtendedNode.java @@ -42,7 +42,7 @@ import java.util.Random; * * Created by HellFirePvP @ 21.10.2015 23:39 */ -public class TileExtendedNode extends TileNode { +public class TileExtendedNode extends TileNode implements INode { public int ticksExisted = 0; private ExtendedNodeType extendedNodeType; diff --git a/src/main/java/makeo/gadomancy/common/blocks/tiles/TileNodeManipulator.java b/src/main/java/makeo/gadomancy/common/blocks/tiles/TileNodeManipulator.java new file mode 100644 index 0000000..eb9feef --- /dev/null +++ b/src/main/java/makeo/gadomancy/common/blocks/tiles/TileNodeManipulator.java @@ -0,0 +1,110 @@ +package makeo.gadomancy.common.blocks.tiles; + +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.world.World; +import thaumcraft.api.aspects.Aspect; +import thaumcraft.api.aspects.AspectList; +import thaumcraft.api.aspects.IAspectContainer; +import thaumcraft.api.wands.IWandable; +import thaumcraft.common.tiles.TileWandPedestal; + +/** + * 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 HellFirePvP @ 26.10.2015 20:16 + */ +public class TileNodeManipulator extends TileWandPedestal implements IAspectContainer, IWandable { + + public TileNodeManipulator() { + + } + + @Override + public void updateEntity() { + + } + + @Override + public void readCustomNBT(NBTTagCompound compound) { + super.readCustomNBT(compound); + + + } + + @Override + public void writeCustomNBT(NBTTagCompound compound) { + super.writeCustomNBT(compound); + + + } + + @Override + public AspectList getAspects() { + return null; + } + + @Override + public void setAspects(AspectList aspectList) { + + } + + @Override + public boolean doesContainerAccept(Aspect aspect) { + return false; + } + + @Override + public int addToContainer(Aspect aspect, int i) { + return 0; + } + + @Override + public boolean takeFromContainer(Aspect aspect, int i) { + return false; + } + + @Override + public boolean takeFromContainer(AspectList aspectList) { + return false; + } + + @Override + public boolean doesContainerContainAmount(Aspect aspect, int i) { + return false; + } + + @Override + public boolean doesContainerContain(AspectList aspectList) { + return false; + } + + @Override + public int containerContains(Aspect aspect) { + return 0; + } + + @Override + public int onWandRightClick(World world, ItemStack stack, EntityPlayer player, int i, int i2, int i3, int i4, int i5) { + return 0; + } + + @Override + public ItemStack onWandRightClick(World world, ItemStack stack, EntityPlayer player) { + return null; + } + + @Override + public void onUsingWandTick(ItemStack stack, EntityPlayer player, int i) { + + } + + @Override + public void onWandStoppedUsing(ItemStack stack, World world, EntityPlayer player, int i) { + + } +} diff --git a/src/main/java/makeo/gadomancy/common/items/ItemNodeManipulator.java b/src/main/java/makeo/gadomancy/common/items/ItemNodeManipulator.java new file mode 100644 index 0000000..9b86095 --- /dev/null +++ b/src/main/java/makeo/gadomancy/common/items/ItemNodeManipulator.java @@ -0,0 +1,20 @@ +package makeo.gadomancy.common.items; + +import net.minecraft.block.Block; +import thaumcraft.common.blocks.BlockStoneDeviceItem; + +/** + * 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 HellFirePvP @ 27.10.2015 13:00 + */ +public class ItemNodeManipulator extends BlockStoneDeviceItem { + + public ItemNodeManipulator(Block par1) { + super(par1); + } + +} diff --git a/src/main/java/makeo/gadomancy/common/network/packets/PacketAnimationAbsorb.java b/src/main/java/makeo/gadomancy/common/network/packets/PacketAnimationAbsorb.java index 81dc2fb..0d0b2e3 100644 --- a/src/main/java/makeo/gadomancy/common/network/packets/PacketAnimationAbsorb.java +++ b/src/main/java/makeo/gadomancy/common/network/packets/PacketAnimationAbsorb.java @@ -25,16 +25,18 @@ public class PacketAnimationAbsorb implements IMessage, IMessageHandler T registerBlock(String name, T block) { @@ -97,6 +102,7 @@ public class RegisteredBlocks { registerTile(TileRemoteJar.class); registerTile(TileExtendedNode.class); registerTile(TileExtendedNodeJar.class); + registerTile(TileNodeManipulator.class); } private static void registerTile(Class tile, String name) { diff --git a/src/main/java/makeo/gadomancy/common/registration/RegisteredResearches.java b/src/main/java/makeo/gadomancy/common/registration/RegisteredResearches.java index 3e2b8d5..52fe13d 100644 --- a/src/main/java/makeo/gadomancy/common/registration/RegisteredResearches.java +++ b/src/main/java/makeo/gadomancy/common/registration/RegisteredResearches.java @@ -81,17 +81,17 @@ public class RegisteredResearches { researchGrowingNodes = new ResearchItem(Gadomancy.MODID.toUpperCase() + ".GROWING", Gadomancy.MODID, new AspectList(), 2, 2, 5, new ResourceLocation("thaumcraft", "textures/misc/r_nodes.png")) .setSpecial().setLost() - .setPages(new ResearchPage("gadomancy.research_page.GROWING.1"), new ResearchPage("gadomancy.research_page.GROWING.2"));//.registerResearchItem(); + .setPages(new ResearchPage("gadomancy.research_page.GROWING.1"), new ResearchPage("gadomancy.research_page.GROWING.2")).registerResearchItem(); researchGrowingNodeAgression = new ResearchItem(Gadomancy.MODID.toUpperCase() + ".GROWING_AGGRESSION", Gadomancy.MODID, new AspectList(), 5, 3, 6, new ItemStack(ConfigBlocks.blockAiry, 1, 5)) .setLost() .setParents(Gadomancy.MODID.toUpperCase() + ".GROWING") - .setPages(new ResearchPage("gadomancy.research_page.GROWING_AGGRESSION.1"));//.registerResearchItem(); + .setPages(new ResearchPage("gadomancy.research_page.GROWING_AGGRESSION.1")).registerResearchItem(); researchGrowingNodeGrowth = new ResearchItem(Gadomancy.MODID.toUpperCase() + ".GROWING_GROWTH", Gadomancy.MODID, new AspectList(), 3, 5, 6, new ResourceLocation("thaumcraft", "textures/misc/r_nodes_2.png")) .setLost() .setParents(Gadomancy.MODID.toUpperCase() + ".GROWING") - .setPages(new ResearchPage("gadomancy.research_page.GROWING_GROWTH.1"), new ResearchPage("gadomancy.research_page.GROWING_GROWTH.2"));//.registerResearchItem(); + .setPages(new ResearchPage("gadomancy.research_page.GROWING_GROWTH.1"), new ResearchPage("gadomancy.research_page.GROWING_GROWTH.2")).registerResearchItem(); researchGrowingNodeGrowthClue = new ResearchItem(Gadomancy.MODID.toUpperCase() + ".GROWING_GROWTHCLUE", Gadomancy.MODID, new AspectList().add(Aspect.AURA, 10).add(Aspect.MAGIC, 15).add(Aspect.ELDRITCH, 5).add(Aspect.VOID, 12).add(Aspect.ENERGY, 12).add(Aspect.ENTROPY, 8).add(Aspect.DEATH, 3) @@ -99,9 +99,9 @@ public class RegisteredResearches { 6, 6, 2, new ItemStack(ConfigBlocks.blockAiry, 1, 0)) .setSpecial().setRound().setConcealed() .setParents(Gadomancy.MODID.toUpperCase() + ".GROWING_AGGRESSION", Gadomancy.MODID.toUpperCase() + ".GROWING_GROWTH") - .setPages(new ResearchPage("gadomancy.research_page.GROWING_GROWTHCLUE.1"), new ResearchPage("gadomancy.research_page.GROWING_GROWTHCLUE.2"));//.registerResearchItem(); + .setPages(new ResearchPage("gadomancy.research_page.GROWING_GROWTHCLUE.1"), new ResearchPage("gadomancy.research_page.GROWING_GROWTHCLUE.2")).registerResearchItem(); - //ThaumcraftApi.addWarpToResearch(Gadomancy.MODID.toUpperCase() + ".GROWING_GROWTHCLUE", 3); + ThaumcraftApi.addWarpToResearch(Gadomancy.MODID.toUpperCase() + ".GROWING_GROWTHCLUE", 3); } public static void postInit() { diff --git a/src/main/java/makeo/gadomancy/common/utils/ExplosionHelper.java b/src/main/java/makeo/gadomancy/common/utils/ExplosionHelper.java index 4526fa9..cac5f48 100644 --- a/src/main/java/makeo/gadomancy/common/utils/ExplosionHelper.java +++ b/src/main/java/makeo/gadomancy/common/utils/ExplosionHelper.java @@ -132,7 +132,7 @@ public class ExplosionHelper { Block b = world.getBlock(xx, yy, zz); float hardness = b.getBlockHardness(world, xx, yy, zz); if(b != Blocks.air && hardness > 0 && hardness <= 50 && b != RegisteredBlocks.blockNode) { - PacketAnimationAbsorb absorb = new PacketAnimationAbsorb(x, y, z, xx, yy, zz); + PacketAnimationAbsorb absorb = new PacketAnimationAbsorb(x, y, z, xx, yy, zz, 7); PacketHandler.INSTANCE.sendToAllAround(absorb, new NetworkRegistry.TargetPoint(world.provider.dimensionId, x, y, z, 32D)); pastTickBlocks.add(Vec3.createVectorHelper(xx, yy, zz)); } diff --git a/src/main/resources/assets/gadomancy/lang/en_US.lang b/src/main/resources/assets/gadomancy/lang/en_US.lang index 0862c3c..59a7143 100644 --- a/src/main/resources/assets/gadomancy/lang/en_US.lang +++ b/src/main/resources/assets/gadomancy/lang/en_US.lang @@ -67,6 +67,7 @@ tile.BlockInfusionClaw.name=Infusion Claw tile.BlockRemoteJar.name=Mirrored Jar tile.BlockNode.name=Aura Node tile.BlockExtendedNodeJar.name=Node in a Jar +tile.BlockNodeManipulator.5.name=Node Manipulator gadomancy.nodes.GROWING=Growing gadomancy.nodes.STARVING=Starving