From 33169dc2fb1e5668d1750a17a8a932ea4d481b49 Mon Sep 17 00:00:00 2001 From: StevenRS11 Date: Thu, 11 Jul 2013 20:42:57 -0400 Subject: [PATCH] Renamed printAllLinkData and limbo decay --- StevenDimDoors/mod_pocketDim/DimData.java | 2 +- .../mod_pocketDim/EventHookContainer.java | 140 +++++------------- .../commands/CommandDeleteAllLinks.java | 2 +- .../commands/CommandDeleteDimensionData.java | 2 +- .../commands/CommandDeleteRifts.java | 2 +- .../commands/CommandPrintDimensionData.java | 2 +- .../commands/CommandPruneDimensions.java | 2 +- .../mod_pocketDim/helpers/dimHelper.java | 4 +- 8 files changed, 42 insertions(+), 114 deletions(-) diff --git a/StevenDimDoors/mod_pocketDim/DimData.java b/StevenDimDoors/mod_pocketDim/DimData.java index 2da42b1..043856c 100644 --- a/StevenDimDoors/mod_pocketDim/DimData.java +++ b/StevenDimDoors/mod_pocketDim/DimData.java @@ -232,7 +232,7 @@ public class DimData implements Serializable return null; } - public ArrayList printAllLinkData() + public ArrayList getLinksInDim() { //TODO: We might want to modify this function, but I'm afraid of breaking something right now. //To begin with, the name is wrong. This doesn't print anything! >_o ~SenseiKiwi diff --git a/StevenDimDoors/mod_pocketDim/EventHookContainer.java b/StevenDimDoors/mod_pocketDim/EventHookContainer.java index 1e23a2d..f2188af 100644 --- a/StevenDimDoors/mod_pocketDim/EventHookContainer.java +++ b/StevenDimDoors/mod_pocketDim/EventHookContainer.java @@ -7,6 +7,7 @@ import java.util.List; import java.util.Random; import StevenDimDoors.mod_pocketDim.helpers.dimHelper; +import StevenDimDoors.mod_pocketDim.items.ItemRiftBlade; import cpw.mods.fml.client.FMLClientHandler; import cpw.mods.fml.relauncher.Side; @@ -17,6 +18,7 @@ import net.minecraft.client.Minecraft; import net.minecraft.entity.EntityLiving; import net.minecraft.entity.monster.EntityEnderman; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; import net.minecraft.util.AxisAlignedBB; @@ -46,7 +48,6 @@ public class EventHookContainer } @SideOnly(Side.CLIENT) - @ForgeSubscribe public void onSoundLoad(SoundLoadEvent event) { @@ -60,7 +61,6 @@ public class EventHookContainer @ForgeSubscribe public void onWorldLoad(WorldEvent.Load event) { - if(!mod_pocketDim.hasInitDims&&event.world.provider.dimensionId==0&&!event.world.isRemote) { System.out.println("Registering Pocket Dims"); @@ -69,9 +69,7 @@ public class EventHookContainer dimHelper.dimList.clear(); dimHelper.instance.interDimLinkList.clear(); dimHelper.instance.initPockets(); - } - for(Integer ids : dimHelper.getIDs()) { World world = dimHelper.getWorld(ids); @@ -79,140 +77,70 @@ public class EventHookContainer if(dimHelper.dimList.containsKey(world.provider.dimensionId)) { - - for(LinkData link:dimHelper.dimList.get(world.provider.dimensionId).printAllLinkData()) - { - if(linkCount>100) - { - break; - } - linkCount++; - int blocktoReplace = world.getBlockId(link.locXCoord, link.locYCoord, link.locZCoord); - if(!mod_pocketDim.blocksImmuneToRift.contains(blocktoReplace)) - { - dimHelper.getWorld(link.locDimID).setBlock(link.locXCoord, link.locYCoord, link.locZCoord, properties.RiftBlockID); - } - - + //TODO added temporary Try/catch block to prevent a crash here, getLinksInDim needs to be looked at + try + { + for(LinkData link:dimHelper.dimList.get(world.provider.dimensionId).getLinksInDim()) + { + if(linkCount>100) + { + break; + } + linkCount++; + int blocktoReplace = world.getBlockId(link.locXCoord, link.locYCoord, link.locZCoord); + if(!mod_pocketDim.blocksImmuneToRift.contains(blocktoReplace)) + { + dimHelper.getWorld(link.locDimID).setBlock(link.locXCoord, link.locYCoord, link.locZCoord, properties.RiftBlockID); + } + } + } + catch(Exception e) + { + e.printStackTrace(); } - } - } - - - - - - + } } + @ForgeSubscribe public void EntityJoinWorldEvent(net.minecraftforge.event.entity.EntityJoinWorldEvent event) { - if(event.entity instanceof EntityPlayer) + if(event.entity instanceof EntityPlayer) { - // System.out.println(event.entity.worldObj.provider.dimensionId); - + // System.out.println(event.entity.worldObj.provider.dimensionId); // PacketDispatcher.sendPacketToPlayer(DimUpdatePacket.sendPacket(event.world.provider.dimensionId,1),(Player) event.entity); - - - } - } @ForgeSubscribe public void onPlayerFall(LivingFallEvent event) { - - event.setCanceled(event.entity.worldObj.provider.dimensionId==properties.LimboDimensionID); - + event.setCanceled(event.entity.worldObj.provider.dimensionId==properties.LimboDimensionID); } @ForgeSubscribe public void onPlayerInteract(PlayerInteractEvent event) { - - - - /** - if(event.entityPlayer.worldObj.provider.dimensionId==properties.LimboDimensionID&&event.action==PlayerInteractEvent.Action.RIGHT_CLICK_BLOCK) { - - int x = event.x; - int y = event.y; - + int y = event.y; int z = event.z; - - - - - + if(event.entityPlayer.getHeldItem()!=null) { if(event.entityPlayer.getHeldItem().getItem() instanceof ItemBlock) { - // if(event.entityPlayer instanceof EntityPlayerMP) + if(event.entityPlayer instanceof EntityPlayerMP) { - Point3D point = new Point3D(x,y,z); dimHelper.blocksToDecay.add(point); } - } - else - { - event.setCanceled(true); - } - - - } - - } - **/ - + } + } + } } - - - - - // @ForgeSubscribe - public void onPlayerEvent(PlayerEvent event) - { - /** - if(!event.entity.worldObj.isRemote) - { - ItemStack item = event.entityPlayer.inventory.getCurrentItem(); - if(item!=null) - { - if(item.getItem() instanceof ItemRiftBlade) - { - List list = event.entity.worldObj.getEntitiesWithinAABB(EntityLiving.class, AxisAlignedBB.getBoundingBox( event.entityPlayer.posX-7,event.entityPlayer.posY-7, event.entityPlayer.posZ-7, event.entityPlayer.posX+7,event.entityPlayer.posY+7, event.entityPlayer.posZ+7)); - list.remove(event.entity); - - for(EntityLiving ent : list) - { - - Vec3 var3 = event.entityPlayer.getLook(1.0F).normalize(); - Vec3 var4 = event.entityPlayer.worldObj.getWorldVec3Pool().getVecFromPool(ent.posX - event.entityPlayer.posX, ent.boundingBox.minY + (double)((ent.height) / 2.0F) - ( event.entityPlayer.posY + (double) event.entityPlayer.getEyeHeight()), ent.posZ - event.entityPlayer.posZ); - double var5 = var4.lengthVector(); - var4 = var4.normalize(); - double var7 = var3.dotProduct(var4); - if( (var7+.1) > 1.0D - 0.025D / var5 ? event.entityPlayer.canEntityBeSeen(ent) : false) - { - System.out.println(list.size()); - ItemRiftBlade.class.cast(item.getItem()).teleportToEntity(item,ent, event.entityPlayer); - break; - - //ItemRiftBlade.class.cast(item.getItem()).teleportTo(event.entityPlayer, ent.posX, ent.posY, ent.posZ); - } - } - - } - } - } - **/ - } + @ForgeSubscribe public void onPlayerDrops(PlayerDropsEvent event) { diff --git a/StevenDimDoors/mod_pocketDim/commands/CommandDeleteAllLinks.java b/StevenDimDoors/mod_pocketDim/commands/CommandDeleteAllLinks.java index 191424e..29b8028 100644 --- a/StevenDimDoors/mod_pocketDim/commands/CommandDeleteAllLinks.java +++ b/StevenDimDoors/mod_pocketDim/commands/CommandDeleteAllLinks.java @@ -57,7 +57,7 @@ public class CommandDeleteAllLinks extends DDCommandBase if(dimHelper.dimList.containsKey(targetDim)) { DimData dim = dimHelper.dimList.get(targetDim); - ArrayList linksInDim = dim.printAllLinkData(); + ArrayList linksInDim = dim.getLinksInDim(); for (LinkData link : linksInDim) { diff --git a/StevenDimDoors/mod_pocketDim/commands/CommandDeleteDimensionData.java b/StevenDimDoors/mod_pocketDim/commands/CommandDeleteDimensionData.java index 388e3db..f25e8d9 100644 --- a/StevenDimDoors/mod_pocketDim/commands/CommandDeleteDimensionData.java +++ b/StevenDimDoors/mod_pocketDim/commands/CommandDeleteDimensionData.java @@ -61,7 +61,7 @@ public class CommandDeleteDimensionData extends DDCommandBase for(DimData dimData :dimHelper.dimList.values()) { Collection links= new ArrayList(); - links.addAll( dimData.printAllLinkData()); + links.addAll( dimData.getLinksInDim()); for(LinkData link : links) { diff --git a/StevenDimDoors/mod_pocketDim/commands/CommandDeleteRifts.java b/StevenDimDoors/mod_pocketDim/commands/CommandDeleteRifts.java index d109d82..0f61224 100644 --- a/StevenDimDoors/mod_pocketDim/commands/CommandDeleteRifts.java +++ b/StevenDimDoors/mod_pocketDim/commands/CommandDeleteRifts.java @@ -58,7 +58,7 @@ public class CommandDeleteRifts extends DDCommandBase if(dimHelper.dimList.containsKey(targetDim)) { DimData dim = dimHelper.dimList.get(targetDim); - ArrayList linksInDim = dim.printAllLinkData(); + ArrayList linksInDim = dim.getLinksInDim(); for(LinkData link : linksInDim) { diff --git a/StevenDimDoors/mod_pocketDim/commands/CommandPrintDimensionData.java b/StevenDimDoors/mod_pocketDim/commands/CommandPrintDimensionData.java index 7a8c5c0..ddb2df9 100644 --- a/StevenDimDoors/mod_pocketDim/commands/CommandPrintDimensionData.java +++ b/StevenDimDoors/mod_pocketDim/commands/CommandPrintDimensionData.java @@ -56,7 +56,7 @@ public class CommandPrintDimensionData extends DDCommandBase return DDCommandResult.UNREGISTERED_DIMENSION; } - ArrayList links = dimData.printAllLinkData(); + ArrayList links = dimData.getLinksInDim(); sender.sendChatToPlayer("Dimension ID = " + dimData.dimID); sender.sendChatToPlayer("Dimension Depth = " + dimData.depth); diff --git a/StevenDimDoors/mod_pocketDim/commands/CommandPruneDimensions.java b/StevenDimDoors/mod_pocketDim/commands/CommandPruneDimensions.java index b130dbf..dacb16e 100644 --- a/StevenDimDoors/mod_pocketDim/commands/CommandPruneDimensions.java +++ b/StevenDimDoors/mod_pocketDim/commands/CommandPruneDimensions.java @@ -47,7 +47,7 @@ public class CommandPruneDimensions extends DDCommandBase for (DimData data : allDims) { - for (LinkData link : data.printAllLinkData()) + for (LinkData link : data.getLinksInDim()) { linkedDimensions.add(link.destDimID); } diff --git a/StevenDimDoors/mod_pocketDim/helpers/dimHelper.java b/StevenDimDoors/mod_pocketDim/helpers/dimHelper.java index b017b63..97938ad 100644 --- a/StevenDimDoors/mod_pocketDim/helpers/dimHelper.java +++ b/StevenDimDoors/mod_pocketDim/helpers/dimHelper.java @@ -824,7 +824,7 @@ public class dimHelper extends DimensionManager DeleteFolder.deleteFolder(save); dimData.hasBeenFilled = false; dimData.hasDoor = false; - for(LinkData link : dimData.printAllLinkData()) + for(LinkData link : dimData.getLinksInDim()) { link.hasGennedDoor = false; LinkData linkOut = this.getLinkDataFromCoords(link.destXCoord, link.destYCoord, link.destZCoord, link.destDimID); @@ -1248,7 +1248,7 @@ public class dimHelper extends DimensionManager { break; } - linksInDim = dimData.printAllLinkData(); + linksInDim = dimData.getLinksInDim(); if(!linksInDim.isEmpty()) { break;