From 5761634103fe12a5a17139316f910e252cc801e6 Mon Sep 17 00:00:00 2001 From: HellFirePvP <01ecs01m> Date: Fri, 6 Nov 2015 22:17:56 +0100 Subject: [PATCH] - Prepared Node Manipulator for fake eldritch portal creation. --- .../makeo/gadomancy/client/util/UtilsFX.java | 18 +- .../blocks/tiles/TileNodeManipulator.java | 214 +++++++++++++----- .../common/events/EventHandlerWorld.java | 10 +- .../network/packets/PacketStartAnimation.java | 10 +- .../registration/RegisteredMultiblocks.java | 16 ++ .../common/utils/MultiblockHelper.java | 8 + 6 files changed, 214 insertions(+), 62 deletions(-) diff --git a/src/main/java/makeo/gadomancy/client/util/UtilsFX.java b/src/main/java/makeo/gadomancy/client/util/UtilsFX.java index 5a83140..c00fa23 100644 --- a/src/main/java/makeo/gadomancy/client/util/UtilsFX.java +++ b/src/main/java/makeo/gadomancy/client/util/UtilsFX.java @@ -4,6 +4,7 @@ import net.minecraft.world.World; import thaumcraft.common.Thaumcraft; import java.awt.*; +import java.util.Random; /** * This class is part of the Gadomancy Mod @@ -15,20 +16,31 @@ import java.awt.*; */ public class UtilsFX { - private static final Color[] runeColors = new Color[] { new Color(0xB60707), new Color(0xEE3782), new Color(0xF37B20), new Color(0xFF6722), new Color(0xFF6D30), new Color(0xFF0000) }; + private static final Color[] runeColors_red = new Color[] { new Color(0xB60707), new Color(0xEE3782), new Color(0xF37B20), new Color(0xFF6722), new Color(0xFF6D30), new Color(0xFF0000) }; + private static final Color[] runeColors_green = new Color[] { new Color(0x005629), new Color(0x0E9C00), new Color(0x000000), new Color(0x00FF00), new Color(0x004C3E)}; - public static void doRuneEffects(World world, int x, int y, int z) { + public static void doRuneEffects(World world, int x, int y, int z, byte colorFlag) { if(world.isRemote) { int cnt = 20; while(cnt > 0) { cnt--; - Color rand = runeColors[world.rand.nextInt(runeColors.length)]; + Color rand = evaluateRandomColor(world.rand, colorFlag); Thaumcraft.proxy.blockRunes(world, x + randomOffset(world), y + randomOffset(world), z + randomOffset(world), rand.getRed() / 255F, rand.getGreen() / 255F, rand.getBlue() / 255F, world.rand.nextInt(10) + 30, -0.01F - (world.rand.nextBoolean() ? world.rand.nextBoolean() ? 0.02F : 0.01F : 0F)); } } } + private static Color evaluateRandomColor(Random rand, byte colorFlag) { + Color[] possibleColors; + if(colorFlag == 1) { + possibleColors = runeColors_green; + } else { + possibleColors = runeColors_red; + } + return possibleColors[rand.nextInt(possibleColors.length)]; + } + private static float randomOffset(World worldObj) { return (worldObj.rand.nextFloat() * (worldObj.rand.nextBoolean() ? 1 : -1)) / 2F; } diff --git a/src/main/java/makeo/gadomancy/common/blocks/tiles/TileNodeManipulator.java b/src/main/java/makeo/gadomancy/common/blocks/tiles/TileNodeManipulator.java index 08f9270..94c599e 100644 --- a/src/main/java/makeo/gadomancy/common/blocks/tiles/TileNodeManipulator.java +++ b/src/main/java/makeo/gadomancy/common/blocks/tiles/TileNodeManipulator.java @@ -27,7 +27,9 @@ import thaumcraft.common.tiles.TileWandPedestal; import java.util.ArrayList; import java.util.Collections; +import java.util.HashMap; import java.util.List; +import java.util.Map; /** * This class is part of the Gadomancy Mod @@ -39,17 +41,21 @@ import java.util.List; */ public class TileNodeManipulator extends TileWandPedestal implements IAspectContainer, IWandable { - private static final int POSSIBLE_WORK_START = 70; - private static final int WORK_ASPECT_CAP = 150; + private static final int NODE_MANIPULATION_POSSIBLE_WORK_START = 70; + private static final int NODE_MANIPULATION_WORK_ASPECT_CAP = 150; + private static final int ELDRITCH_PORTAL_CREATOR_WORK_START = 120; + private static final int ELDRITCH_PORTAL_CREATOR_ASPECT_CAP = 150; + + //Already set when only multiblock would be present. + private MultiblockType multiblockType = null; private boolean multiblockStructurePresent = false; private boolean isMultiblock = false; - private int workPhase = 0; private AspectList workAspectList = new AspectList(); - private boolean isManipulating = false; - private int manipulatorTick = 0; + private boolean isWorking = false; + private int workTick = 0; @Override public void updateEntity() { @@ -65,17 +71,63 @@ public class TileNodeManipulator extends TileWandPedestal implements IAspectCont } private void multiblockTick() { - if(!isManipulating) { - doAspectChecks(); - } else { - manipulationTick(); + switch (multiblockType) { + case NODE_MANIPULATOR: + if(!isWorking) { + doAspectChecks(NODE_MANIPULATION_WORK_ASPECT_CAP, NODE_MANIPULATION_POSSIBLE_WORK_START); + } else { + manipulationTick(); + } + break; + case E_PORTAL_CREATOR: + if(!isWorking) { + doAspectChecks(ELDRITCH_PORTAL_CREATOR_ASPECT_CAP, ELDRITCH_PORTAL_CREATOR_WORK_START); + } else { + eldritchPortalCreationTick(); + } + break; } } + private void eldritchPortalCreationTick() { + + workTick++; + if(workTick < 400) { + if(workTick % 16 == 0) { + PacketStartAnimation packet = new PacketStartAnimation(PacketStartAnimation.ID_RUNES, xCoord, yCoord, zCoord, (byte) 1); + PacketHandler.INSTANCE.sendToAllAround(packet, getTargetPoint(32)); + } + if(worldObj.rand.nextInt(2) == 0) { + Vec3 rel = getRelPillarLoc(worldObj.rand.nextInt(4)); + PacketTCNodeBolt bolt = new PacketTCNodeBolt(xCoord + 0.5F, yCoord + 2.5F, zCoord + 0.5F, (float) (xCoord + 0.5F + rel.xCoord), (float) (yCoord + 2.5F + rel.yCoord), (float) (zCoord + 0.5F + rel.zCoord), 3, false); + PacketHandler.INSTANCE.sendToAllAround(bolt, getTargetPoint(32)); + } + } else { + shedulePortalCreation(); + } + } + + private void shedulePortalCreation() { + workTick = 0; + isWorking = false; + workAspectList = new AspectList(); + + TileEntity te = worldObj.getTileEntity(xCoord, yCoord + 2, zCoord); + if(te == null || !(te instanceof TileExtendedNode)) return; + TileExtendedNode node = (TileExtendedNode) te; + + System.out.println("portal creation?"); + + worldObj.markBlockForUpdate(xCoord, yCoord, zCoord); + worldObj.markBlockForUpdate(xCoord, yCoord + 2, zCoord); + markDirty(); + node.markDirty(); + } + private void manipulationTick() { - manipulatorTick++; - if(manipulatorTick < 300) { - if(manipulatorTick % 16 == 0) { + workTick++; + if(workTick < 300) { + if(workTick % 16 == 0) { PacketStartAnimation packet = new PacketStartAnimation(PacketStartAnimation.ID_RUNES, xCoord, yCoord, zCoord); PacketHandler.INSTANCE.sendToAllAround(packet, getTargetPoint(32)); } @@ -104,8 +156,8 @@ public class TileNodeManipulator extends TileWandPedestal implements IAspectCont } private void scheduleManipulation() { - manipulatorTick = 0; - isManipulating = false; + workTick = 0; + isWorking = false; workAspectList = new AspectList(); TileEntity te = worldObj.getTileEntity(xCoord, yCoord + 2, zCoord); @@ -123,38 +175,38 @@ public class TileNodeManipulator extends TileWandPedestal implements IAspectCont node.markDirty(); } - private void doAspectChecks() { - if(canDrainFromWand()) { - Aspect a = drainAspectFromWand(); + private void doAspectChecks(int aspectCap, int possibleWorkStart) { + if(canDrainFromWand(aspectCap)) { + Aspect a = drainAspectFromWand(aspectCap); if(a != null) { playAspectDrainFromWand(a); worldObj.markBlockForUpdate(xCoord, yCoord, zCoord); markDirty(); } } else { - checkIfEnoughVis(); + checkIfEnoughVis(possibleWorkStart); } } - private void checkIfEnoughVis() { + private void checkIfEnoughVis(int start) { boolean enough = true; for(Aspect a : Aspect.getPrimalAspects()) { - if(workAspectList.getAmount(a) < POSSIBLE_WORK_START) { + if(workAspectList.getAmount(a) < start) { enough = false; break; } } if(enough) { - isManipulating = true; + isWorking = true; } } - private Aspect drainAspectFromWand() { + private Aspect drainAspectFromWand(int cap) { ItemStack stack = getStackInSlot(0); if(stack == null || !(stack.getItem() instanceof ItemWandCasting)) return null; //Should never happen.. AspectList aspects = ((ItemWandCasting) stack.getItem()).getAllVis(stack); for(Aspect a : getRandomlyOrderedPrimalAspectList()) { - if(aspects.getAmount(a) >= 100 && workAspectList.getAmount(a) < WORK_ASPECT_CAP) { + if(aspects.getAmount(a) >= 100 && workAspectList.getAmount(a) < cap) { int amt = aspects.getAmount(a); ((ItemWandCasting) stack.getItem()).storeVis(stack, a, amt - 100); workAspectList.add(a, 1); @@ -170,13 +222,13 @@ public class TileNodeManipulator extends TileWandPedestal implements IAspectCont return primals; } - private boolean canDrainFromWand() { + private boolean canDrainFromWand(int cap) { ItemStack stack = getStackInSlot(0); if(stack == null || !(stack.getItem() instanceof ItemWandCasting)) return false; AspectList aspects = ((ItemWandCasting) stack.getItem()).getAllVis(stack); for(Aspect a : Aspect.getPrimalAspects()) { if(aspects.getAmount(a) < 100) continue; - if(workAspectList.getAmount(a) < WORK_ASPECT_CAP) return true; + if(workAspectList.getAmount(a) < cap) return true; } return false; } @@ -199,19 +251,30 @@ public class TileNodeManipulator extends TileWandPedestal implements IAspectCont PacketHandler.INSTANCE.sendToAllAround(line, point); } - @Override - public boolean receiveClientEvent(int p_145842_1_, int p_145842_2_) { - return super.receiveClientEvent(p_145842_1_, p_145842_2_); - } - private void dropWand() { if(getStackInSlot(0) != null) InventoryUtils.dropItems(worldObj, xCoord, yCoord, zCoord); } public void breakMultiblock() { - MultiblockHelper.MultiblockPattern compareableCompleteStructure = RegisteredMultiblocks.completeNodeManipulatorMultiblock; - MultiblockHelper.MultiblockPattern toRestore = RegisteredMultiblocks.incompleteNodeManipulatorMultiblock; + MultiblockHelper.MultiblockPattern compareableCompleteStructure, toRestore; + if(multiblockType == null) { + workAspectList = new AspectList(); + dropWand(); + return; + } + switch (multiblockType) { + case NODE_MANIPULATOR: + compareableCompleteStructure = RegisteredMultiblocks.completeNodeManipulatorMultiblock; + toRestore = RegisteredMultiblocks.incompleteNodeManipulatorMultiblock; + break; + case E_PORTAL_CREATOR: + compareableCompleteStructure = RegisteredMultiblocks.completeEldritchPortalCreator; + toRestore = RegisteredMultiblocks.incompleteEldritchPortalCreator; + break; + default: + return; + } for(MultiblockHelper.IntVec3 v : compareableCompleteStructure.keySet()) { MultiblockHelper.BlockInfo info = compareableCompleteStructure.get(v); MultiblockHelper.BlockInfo restoreInfo = toRestore.get(v); @@ -226,11 +289,23 @@ public class TileNodeManipulator extends TileWandPedestal implements IAspectCont } } + workAspectList = new AspectList(); + this.multiblockType = null; dropWand(); } public void formMultiblock() { - MultiblockHelper.MultiblockPattern toBuild = RegisteredMultiblocks.completeNodeManipulatorMultiblock; + MultiblockHelper.MultiblockPattern toBuild; + switch (multiblockType) { + case NODE_MANIPULATOR: + toBuild = RegisteredMultiblocks.completeNodeManipulatorMultiblock; + break; + case E_PORTAL_CREATOR: + toBuild = RegisteredMultiblocks.completeEldritchPortalCreator; + break; + default: + return; + } for(MultiblockHelper.IntVec3 v : toBuild.keySet()) { MultiblockHelper.BlockInfo info = toBuild.get(v); if(info.block == RegisteredBlocks.blockNode || info.block == Blocks.air || info.block == RegisteredBlocks.blockNodeManipulator) continue; @@ -268,9 +343,11 @@ public class TileNodeManipulator extends TileWandPedestal implements IAspectCont NBTTagCompound tag = compound.getCompoundTag("Gadomancy"); this.multiblockStructurePresent = tag.getBoolean("mBlockPresent"); this.isMultiblock = tag.getBoolean("mBlockState"); - this.isManipulating = tag.getBoolean("manipulating"); - this.manipulatorTick = tag.getInteger("manipulatorTick"); - this.workPhase = tag.getInteger("workPhase"); + this.isWorking = tag.getBoolean("manipulating"); + this.workTick = tag.getInteger("workTick"); + if(tag.hasKey("multiblockType")) { + this.multiblockType = MultiblockType.values()[tag.getInteger("multiblockType")]; + } workAspectList.readFromNBT(tag, "workAspectList"); } @@ -281,9 +358,11 @@ public class TileNodeManipulator extends TileWandPedestal implements IAspectCont NBTTagCompound tag = new NBTTagCompound(); tag.setBoolean("mBlockPresent", this.multiblockStructurePresent); tag.setBoolean("mBlockState", this.isMultiblock); - tag.setBoolean("manipulating", this.isManipulating); - tag.setInteger("manipulatorTick", this.manipulatorTick); - tag.setInteger("workPhase", this.workPhase); + tag.setBoolean("manipulating", this.isWorking); + tag.setInteger("workTick", this.workTick); + if(multiblockType != null) { + tag.setInteger("multiblockType", this.multiblockType.ordinal()); + } workAspectList.writeToNBT(tag, "workAspectList"); compound.setTag("Gadomancy", tag); } @@ -296,23 +375,51 @@ public class TileNodeManipulator extends TileWandPedestal implements IAspectCont return multiblockStructurePresent; } + public MultiblockType getMultiblockType() { + return multiblockType; + } + public boolean checkMultiblock() { boolean prevState = isMultiblockStructurePresent(); - MultiblockHelper.MultiblockPattern patternToCheck; if(prevState) { //If there is already a multiblock formed... if(isInMultiblock()) { //If we were actually in multiblock before - patternToCheck = RegisteredMultiblocks.completeNodeManipulatorMultiblock; - } else { //If we were'nt in multiblock eventhough it would be possible. - patternToCheck = RegisteredMultiblocks.incompleteNodeManipulatorMultiblock; + switch (multiblockType) { + case NODE_MANIPULATOR: + setMultiblockStructurePresent(MultiblockHelper.isMultiblockPresent(worldObj, xCoord, yCoord, zCoord, RegisteredMultiblocks.completeNodeManipulatorMultiblock), MultiblockType.NODE_MANIPULATOR); + break; + case E_PORTAL_CREATOR: + setMultiblockStructurePresent(MultiblockHelper.isMultiblockPresent(worldObj, xCoord, yCoord, zCoord, RegisteredMultiblocks.completeEldritchPortalCreator), MultiblockType.E_PORTAL_CREATOR); + break; + } + } else { //If we weren't in multiblock eventhough it would be possible. + checkForNonExistingMultiblock(); } - this.multiblockStructurePresent = MultiblockHelper.isMultiblockPresent(worldObj, xCoord, yCoord, zCoord, patternToCheck); } else { //If there was no multiblock formed before.. - patternToCheck = RegisteredMultiblocks.incompleteNodeManipulatorMultiblock; - this.multiblockStructurePresent = MultiblockHelper.isMultiblockPresent(worldObj, xCoord, yCoord, zCoord, patternToCheck); + checkForNonExistingMultiblock(); } return isMultiblockStructurePresent(); } + private void setMultiblockStructurePresent(boolean present, MultiblockType type) { + if(present) { + this.multiblockType = type; + } + this.multiblockStructurePresent = present; + } + + private void checkForNonExistingMultiblock() { + Map patternMap = new HashMap(); + patternMap.put(RegisteredMultiblocks.incompleteEldritchPortalCreator, MultiblockType.E_PORTAL_CREATOR); + patternMap.put(RegisteredMultiblocks.incompleteNodeManipulatorMultiblock, MultiblockType.NODE_MANIPULATOR); + + for(MultiblockHelper.MultiblockPattern pattern : patternMap.keySet()) { + if(MultiblockHelper.isMultiblockPresent(worldObj, xCoord, yCoord, zCoord, pattern)) { + setMultiblockStructurePresent(true, patternMap.get(pattern)); + return; + } + } + } + @Override public boolean canInsertItem(int par1, ItemStack par2ItemStack, int par3) { return isInMultiblock() && super.canInsertItem(par1, par2ItemStack, par3); @@ -328,9 +435,7 @@ public class TileNodeManipulator extends TileWandPedestal implements IAspectCont } @Override - public void setAspects(AspectList aspectList) { - - } + public void setAspects(AspectList aspectList) {} @Override public boolean doesContainerAccept(Aspect aspect) { @@ -378,12 +483,15 @@ public class TileNodeManipulator extends TileWandPedestal implements IAspectCont } @Override - public void onUsingWandTick(ItemStack stack, EntityPlayer player, int i) { - - } + public void onUsingWandTick(ItemStack stack, EntityPlayer player, int i) {} @Override - public void onWandStoppedUsing(ItemStack stack, World world, EntityPlayer player, int i) { + public void onWandStoppedUsing(ItemStack stack, World world, EntityPlayer player, int i) {} + + public static enum MultiblockType { + + NODE_MANIPULATOR, + E_PORTAL_CREATOR } } diff --git a/src/main/java/makeo/gadomancy/common/events/EventHandlerWorld.java b/src/main/java/makeo/gadomancy/common/events/EventHandlerWorld.java index f75b53d..91cf982 100644 --- a/src/main/java/makeo/gadomancy/common/events/EventHandlerWorld.java +++ b/src/main/java/makeo/gadomancy/common/events/EventHandlerWorld.java @@ -60,7 +60,7 @@ public class EventHandlerWorld { @SubscribeEvent public void on(TickEvent.WorldTickEvent event) { - if(!event.world.isRemote && event.world.provider.dimensionId == 0) { + if (!event.world.isRemote && event.world.provider.dimensionId == 0) { TCMazeHandler.tick(); } } @@ -93,11 +93,11 @@ public class EventHandlerWorld { @SubscribeEvent public void onBreak(BlockEvent.BreakEvent event) { - if(!event.world.isRemote) { - if(event.block == RegisteredBlocks.blockNodeManipulator) { + if (!event.world.isRemote) { + if (event.block == RegisteredBlocks.blockNodeManipulator) { TileEntity te = event.world.getTileEntity(event.x, event.y, event.z); - if(te != null && te instanceof TileNodeManipulator) { - if(((TileNodeManipulator) te).isInMultiblock()) + if (te != null && te instanceof TileNodeManipulator) { + if (((TileNodeManipulator) te).isInMultiblock()) ((TileNodeManipulator) te).breakMultiblock(); } } diff --git a/src/main/java/makeo/gadomancy/common/network/packets/PacketStartAnimation.java b/src/main/java/makeo/gadomancy/common/network/packets/PacketStartAnimation.java index e2fd842..9ab1e11 100644 --- a/src/main/java/makeo/gadomancy/common/network/packets/PacketStartAnimation.java +++ b/src/main/java/makeo/gadomancy/common/network/packets/PacketStartAnimation.java @@ -35,12 +35,18 @@ public class PacketStartAnimation implements IMessage, IMessageHandler patternList) { + for(MultiblockPattern pattern : patternList) { + if(isMultiblockPresent(world, x, y, z, pattern)) return true; + } + return false; + } + public static boolean isMultiblockPresent(World world, int x, int y, int z, MultiblockPattern pattern) { for(IntVec3 vec : pattern.keySet()) { BlockInfo expected = pattern.get(vec);