From bfc532da1fe4d653e33a8bb138781689f3056a54 Mon Sep 17 00:00:00 2001 From: SenseiKiwi Date: Fri, 26 Jul 2013 02:09:14 -0400 Subject: [PATCH] Renamed and Moved Files Moved CommonTickHandler into the ticking package in preparation for the next change. Renamed CommandStartDungeonCreation to CommandCreatePocket, since creation pockets of variable sizes will be its future role now that it's not strictly necessary for exporting. Renamed CommandEndDungeonCreation to CommandExportDungeon, since we no longer have a dungeon creation process like before. --- StevenDimDoors/mod_pocketDim/DDProperties.java | 2 ++ ...rtDungeonCreation.java => CommandCreatePocket.java} | 10 +++++----- ...dDungeonCreation.java => CommandExportDungeon.java} | 10 +++++----- .../mod_pocketDim/items/ItemStableFabric.java | 2 +- StevenDimDoors/mod_pocketDim/mod_pocketDim.java | 9 +++++---- .../mod_pocketDim/{ => ticking}/CommonTickHandler.java | 9 +++++++-- StevenDimDoors/mod_pocketDim/world/LimboGenerator.java | 2 +- .../mod_pocketDim/world/PocketGenerator.java | 2 +- StevenDimDoors/mod_pocketDimClient/ClientProxy.java | 2 +- 9 files changed, 28 insertions(+), 20 deletions(-) rename StevenDimDoors/mod_pocketDim/commands/{CommandStartDungeonCreation.java => CommandCreatePocket.java} (82%) rename StevenDimDoors/mod_pocketDim/commands/{CommandEndDungeonCreation.java => CommandExportDungeon.java} (95%) rename StevenDimDoors/mod_pocketDim/{ => ticking}/CommonTickHandler.java (95%) diff --git a/StevenDimDoors/mod_pocketDim/DDProperties.java b/StevenDimDoors/mod_pocketDim/DDProperties.java index a4b0ca42..ac9df12e 100644 --- a/StevenDimDoors/mod_pocketDim/DDProperties.java +++ b/StevenDimDoors/mod_pocketDim/DDProperties.java @@ -2,6 +2,8 @@ package StevenDimDoors.mod_pocketDim; import java.io.File; +import StevenDimDoors.mod_pocketDim.ticking.CommonTickHandler; + import net.minecraftforge.common.Configuration; public class DDProperties diff --git a/StevenDimDoors/mod_pocketDim/commands/CommandStartDungeonCreation.java b/StevenDimDoors/mod_pocketDim/commands/CommandCreatePocket.java similarity index 82% rename from StevenDimDoors/mod_pocketDim/commands/CommandStartDungeonCreation.java rename to StevenDimDoors/mod_pocketDim/commands/CommandCreatePocket.java index 39fbccfa..27a0d5f5 100644 --- a/StevenDimDoors/mod_pocketDim/commands/CommandStartDungeonCreation.java +++ b/StevenDimDoors/mod_pocketDim/commands/CommandCreatePocket.java @@ -4,19 +4,19 @@ import net.minecraft.entity.player.EntityPlayer; import StevenDimDoors.mod_pocketDim.LinkData; import StevenDimDoors.mod_pocketDim.helpers.DungeonHelper; -public class CommandStartDungeonCreation extends DDCommandBase +public class CommandCreatePocket extends DDCommandBase { - private static CommandStartDungeonCreation instance = null; + private static CommandCreatePocket instance = null; - private CommandStartDungeonCreation() + private CommandCreatePocket() { super("dd-create", ""); } - public static CommandStartDungeonCreation instance() + public static CommandCreatePocket instance() { if (instance == null) - instance = new CommandStartDungeonCreation(); + instance = new CommandCreatePocket(); return instance; } diff --git a/StevenDimDoors/mod_pocketDim/commands/CommandEndDungeonCreation.java b/StevenDimDoors/mod_pocketDim/commands/CommandExportDungeon.java similarity index 95% rename from StevenDimDoors/mod_pocketDim/commands/CommandEndDungeonCreation.java rename to StevenDimDoors/mod_pocketDim/commands/CommandExportDungeon.java index 98ef5e5a..9ba047c2 100644 --- a/StevenDimDoors/mod_pocketDim/commands/CommandEndDungeonCreation.java +++ b/StevenDimDoors/mod_pocketDim/commands/CommandExportDungeon.java @@ -6,21 +6,21 @@ import net.minecraft.entity.player.EntityPlayer; import StevenDimDoors.mod_pocketDim.DDProperties; import StevenDimDoors.mod_pocketDim.helpers.DungeonHelper; -public class CommandEndDungeonCreation extends DDCommandBase +public class CommandExportDungeon extends DDCommandBase { - private static CommandEndDungeonCreation instance = null; + private static CommandExportDungeon instance = null; - private CommandEndDungeonCreation() + private CommandExportDungeon() { super("dd-export", new String[] { " <'open' | 'closed'> [weight]", " override" } ); } - public static CommandEndDungeonCreation instance() + public static CommandExportDungeon instance() { if (instance == null) - instance = new CommandEndDungeonCreation(); + instance = new CommandExportDungeon(); return instance; } diff --git a/StevenDimDoors/mod_pocketDim/items/ItemStableFabric.java b/StevenDimDoors/mod_pocketDim/items/ItemStableFabric.java index 50dafe83..5ed6bfed 100644 --- a/StevenDimDoors/mod_pocketDim/items/ItemStableFabric.java +++ b/StevenDimDoors/mod_pocketDim/items/ItemStableFabric.java @@ -2,12 +2,12 @@ package StevenDimDoors.mod_pocketDim.items; import java.util.List; -import StevenDimDoors.mod_pocketDim.CommonTickHandler; import StevenDimDoors.mod_pocketDim.LinkData; import StevenDimDoors.mod_pocketDim.SchematicLoader; import StevenDimDoors.mod_pocketDim.Spells; import StevenDimDoors.mod_pocketDim.mod_pocketDim; import StevenDimDoors.mod_pocketDim.helpers.dimHelper; +import StevenDimDoors.mod_pocketDim.ticking.CommonTickHandler; import StevenDimDoors.mod_pocketDimClient.ClientTickHandler; import net.minecraft.block.Block; diff --git a/StevenDimDoors/mod_pocketDim/mod_pocketDim.java b/StevenDimDoors/mod_pocketDim/mod_pocketDim.java index eadedada..e16dd139 100644 --- a/StevenDimDoors/mod_pocketDim/mod_pocketDim.java +++ b/StevenDimDoors/mod_pocketDim/mod_pocketDim.java @@ -27,11 +27,11 @@ import StevenDimDoors.mod_pocketDim.commands.CommandCreateDungeonRift; import StevenDimDoors.mod_pocketDim.commands.CommandDeleteAllLinks; import StevenDimDoors.mod_pocketDim.commands.CommandDeleteDimensionData; import StevenDimDoors.mod_pocketDim.commands.CommandDeleteRifts; -import StevenDimDoors.mod_pocketDim.commands.CommandEndDungeonCreation; +import StevenDimDoors.mod_pocketDim.commands.CommandExportDungeon; import StevenDimDoors.mod_pocketDim.commands.CommandPrintDimensionData; import StevenDimDoors.mod_pocketDim.commands.CommandPruneDimensions; import StevenDimDoors.mod_pocketDim.commands.CommandResetDungeons; -import StevenDimDoors.mod_pocketDim.commands.CommandStartDungeonCreation; +import StevenDimDoors.mod_pocketDim.commands.CommandCreatePocket; import StevenDimDoors.mod_pocketDim.helpers.BlockRotationHelper; import StevenDimDoors.mod_pocketDim.helpers.DungeonHelper; import StevenDimDoors.mod_pocketDim.helpers.dimHelper; @@ -44,6 +44,7 @@ import StevenDimDoors.mod_pocketDim.items.itemDimDoor; import StevenDimDoors.mod_pocketDim.items.itemExitDoor; import StevenDimDoors.mod_pocketDim.items.itemLinkSignature; import StevenDimDoors.mod_pocketDim.items.itemRiftRemover; +import StevenDimDoors.mod_pocketDim.ticking.CommonTickHandler; import StevenDimDoors.mod_pocketDim.ticking.MobObelisk; import StevenDimDoors.mod_pocketDim.world.BiomeGenLimbo; import StevenDimDoors.mod_pocketDim.world.BiomeGenPocket; @@ -428,10 +429,10 @@ public class mod_pocketDim CommandDeleteAllLinks.instance().register(event); CommandDeleteDimensionData.instance().register(event); CommandDeleteRifts.instance().register(event); - CommandEndDungeonCreation.instance().register(event); + CommandExportDungeon.instance().register(event); CommandPrintDimensionData.instance().register(event); CommandPruneDimensions.instance().register(event); - CommandStartDungeonCreation.instance().register(event); + CommandCreatePocket.instance().register(event); dimHelper.instance.load(); if(!dimHelper.dimList.containsKey(properties.LimboDimensionID)) diff --git a/StevenDimDoors/mod_pocketDim/CommonTickHandler.java b/StevenDimDoors/mod_pocketDim/ticking/CommonTickHandler.java similarity index 95% rename from StevenDimDoors/mod_pocketDim/CommonTickHandler.java rename to StevenDimDoors/mod_pocketDim/ticking/CommonTickHandler.java index d6926b44..100b64dd 100644 --- a/StevenDimDoors/mod_pocketDim/CommonTickHandler.java +++ b/StevenDimDoors/mod_pocketDim/ticking/CommonTickHandler.java @@ -1,4 +1,4 @@ -package StevenDimDoors.mod_pocketDim; +package StevenDimDoors.mod_pocketDim.ticking; import java.util.ArrayList; import java.util.EnumSet; @@ -8,9 +8,14 @@ import net.minecraft.entity.Entity; import net.minecraft.server.MinecraftServer; import net.minecraft.world.GameRules; import net.minecraft.world.World; +import StevenDimDoors.mod_pocketDim.DDProperties; +import StevenDimDoors.mod_pocketDim.DimData; +import StevenDimDoors.mod_pocketDim.LimboDecay; +import StevenDimDoors.mod_pocketDim.LinkData; +import StevenDimDoors.mod_pocketDim.TileEntityRift; +import StevenDimDoors.mod_pocketDim.mod_pocketDim; import StevenDimDoors.mod_pocketDim.helpers.dimHelper; import StevenDimDoors.mod_pocketDim.helpers.yCoordHelper; -import StevenDimDoors.mod_pocketDim.ticking.MobObelisk; import cpw.mods.fml.common.FMLCommonHandler; import cpw.mods.fml.common.ITickHandler; import cpw.mods.fml.common.TickType; diff --git a/StevenDimDoors/mod_pocketDim/world/LimboGenerator.java b/StevenDimDoors/mod_pocketDim/world/LimboGenerator.java index 0dae107c..8983afd5 100644 --- a/StevenDimDoors/mod_pocketDim/world/LimboGenerator.java +++ b/StevenDimDoors/mod_pocketDim/world/LimboGenerator.java @@ -3,11 +3,11 @@ package StevenDimDoors.mod_pocketDim.world; import java.util.List; import java.util.Random; -import StevenDimDoors.mod_pocketDim.CommonTickHandler; import StevenDimDoors.mod_pocketDim.DDProperties; import StevenDimDoors.mod_pocketDim.mod_pocketDim; import StevenDimDoors.mod_pocketDim.helpers.dimHelper; import StevenDimDoors.mod_pocketDim.helpers.yCoordHelper; +import StevenDimDoors.mod_pocketDim.ticking.CommonTickHandler; import StevenDimDoors.mod_pocketDim.ticking.MobObelisk; import net.minecraft.block.Block; diff --git a/StevenDimDoors/mod_pocketDim/world/PocketGenerator.java b/StevenDimDoors/mod_pocketDim/world/PocketGenerator.java index e897446c..014b2d83 100644 --- a/StevenDimDoors/mod_pocketDim/world/PocketGenerator.java +++ b/StevenDimDoors/mod_pocketDim/world/PocketGenerator.java @@ -13,12 +13,12 @@ import net.minecraft.world.World; import net.minecraft.world.chunk.Chunk; import net.minecraft.world.chunk.IChunkProvider; import net.minecraft.world.gen.ChunkProviderGenerate; -import StevenDimDoors.mod_pocketDim.CommonTickHandler; import StevenDimDoors.mod_pocketDim.DDProperties; import StevenDimDoors.mod_pocketDim.DimData; import StevenDimDoors.mod_pocketDim.mod_pocketDim; import StevenDimDoors.mod_pocketDim.helpers.dimHelper; import StevenDimDoors.mod_pocketDim.helpers.yCoordHelper; +import StevenDimDoors.mod_pocketDim.ticking.CommonTickHandler; import StevenDimDoors.mod_pocketDim.ticking.MobObelisk; public class PocketGenerator extends ChunkProviderGenerate implements IChunkProvider diff --git a/StevenDimDoors/mod_pocketDimClient/ClientProxy.java b/StevenDimDoors/mod_pocketDimClient/ClientProxy.java index 6c1668d5..a415f1e1 100644 --- a/StevenDimDoors/mod_pocketDimClient/ClientProxy.java +++ b/StevenDimDoors/mod_pocketDimClient/ClientProxy.java @@ -8,10 +8,10 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.src.ModLoader; import net.minecraftforge.client.MinecraftForgeClient; import StevenDimDoors.mod_pocketDim.CommonProxy; -import StevenDimDoors.mod_pocketDim.CommonTickHandler; import StevenDimDoors.mod_pocketDim.Spells; import StevenDimDoors.mod_pocketDim.TileEntityDimDoor; import StevenDimDoors.mod_pocketDim.mod_pocketDim; +import StevenDimDoors.mod_pocketDim.ticking.CommonTickHandler; import StevenDimDoors.mod_pocketDim.ticking.MobObelisk;