diff --git a/StevenDimDoors/mod_pocketDim/DimDoorsConfig.java b/StevenDimDoors/mod_pocketDim/DimDoorsConfig.java new file mode 100644 index 0000000..278d746 --- /dev/null +++ b/StevenDimDoors/mod_pocketDim/DimDoorsConfig.java @@ -0,0 +1,246 @@ +package StevenDimDoors.mod_pocketDim; + +import java.io.File; + +import net.minecraftforge.common.Configuration; +import net.minecraftforge.common.Property; + +public class DimDoorsConfig +{ + /** + * BlockIDs + */ + + public static Property chaosDoor; + public static Property dimDoor; + public static Property exitDoor; + public static Property dimHatch; + public static Property transientDoor; + + public static Property blockFabric; + public static Property blockRift; + + + + /** + * WorldGenBlockIDs + */ + + public static Property blockLimbo; + public static Property blockFabricPerm; + + + + /** + * ItemIDs + */ + + public static Property itemRiftBlade; + public static Property itemRiftSignature; + public static Property itemRiftRemover; + public static Property itemStableFabric; + public static Property itemStabilizedRiftSignature; + + public static Property itemDimDoor; + public static Property itemChaosDoor; + public static Property itemExitDoor; + + + /** + * Other IDs + */ + + public static Property limboBiomeID; + public static Property pocketBiomeID; + public static Property limboDimID; + public static Property limboProviderID; + public static Property pocketProviderID; + public static Property doorRenderID; + public static Property monolithID; + + + /** + * CraftingFlags + */ + public static Property bCraftDimDoor; + public static Property bCraftExitDoor; + public static Property bCraftRiftSig; + public static Property bCraftRiftRemover; + public static Property bCraftUnstableDoor; + public static Property bCraftRiftBlade; + public static Property bCraftDimHatch; + public static Property bCraftChaosDoor; + + /** + * OtherFlags + */ + public static Property bWorldGenRifts; + public static Property bRiftSpread; + public static Property bRiftGreif; + public static Property bRiftsSpawnEndermen; + public static Property bLimboActive; + public static Property bHardcoreLimbo; + public static Property bLimboReturnInventory; + public static Property bEnableDoorRender; + public static Property bTNFREAKINGT; + + + /** + * Other + */ + + public static Property HOWMUCHTNT; + public static Property riftSpreadModifier; + public static Property limboReturnRange; + + + + public static void loadConfig(File configFile) + { + Configuration config = new Configuration(configFile); + + + + + config.load(); + + bCraftDimHatch = config.get("Crafting control", "bCraftDimHatch", true); + + bCraftDimDoor = config.get("Crafting control", "bCraftDimDoor", true); + + bCraftRiftBlade = config.get("Crafting control", "bCraftRiftBlade", true); + + bCraftRiftRemover = config.get("Crafting control", "bCraftRiftRemover", true); + + bCraftRiftSig = config.get("Crafting control", "bCraftRiftSig", true); + + bCraftChaosDoor = config.get("Crafting control", "bCraftChaosDoor", true); + + bCraftExitDoor = config.get("Crafting control", "bCraftExitDoor", true); + + + + bHardcoreLimbo = config.get(Configuration.CATEGORY_GENERAL, "bHardcoreLimbo", false); + bHardcoreLimbo.comment = "True causes the player to respawn in limbo if they die in limbo"; + + + bTNFREAKINGT = config.get("Configuration.CATEGORY_GENERAL", "EXPLOSIONS!!???!!!?!?!!", false); + + bRiftGreif = config.get(Configuration.CATEGORY_GENERAL, "bRiftGreif", true); + bRiftGreif.comment = "toggles whether rifts eat blocks around them or not"; + + bEnableDoorRender = config.get(Configuration.CATEGORY_GENERAL, "bEnableDoorRender", true); + + bLimboReturnInventory = config.get(Configuration.CATEGORY_GENERAL, "bLimboReturnInventory", true); + bLimboReturnInventory.comment="Toggles whether or not your inventory is returned upon dying and respawning in limbo"; + + HOWMUCHTNT=config.get(Configuration.CATEGORY_GENERAL, "HOWMUCHTNT", 25); + HOWMUCHTNT.comment="Chance that a block will not be TNT. must be greater than 1. Explosions!?!?? must be set to true, and you figure out what it does. "; + + monolithID=config.get(Configuration.CATEGORY_GENERAL, "monolithID", 125); + + + // dimRailID = config.getBlock("Dimensional Rail", 1980).getInt(); + + chaosDoor = config.getBlock("Chaos Door", 1978); + dimDoor = config.getBlock("Dimensional Door", 1970); + dimHatch = config.getBlock("Transdimensional Trapdoor", 1971); + blockFabric=config.getBlock("Fabric of Reality", 1973); + exitDoor = config.getBlock("Warp Door", 1975); + blockRift = config.getBlock("Rift", 1977); + transientDoor = config.getBlock("transientDoorID", 1979); + + itemStabilizedRiftSignature=config.getItem("Stabilized Rift Signature", 5677); + itemRiftBlade=config.getItem("Rift Blade", 5676); + itemChaosDoor=config.getItem("Chaos Door", 5673); + itemRiftRemover=config.getItem("Rift Remover", 5671); + itemStableFabric=config.getItem("Stable Fabric", 5672); + itemExitDoor=config.getItem("Warp Door Item", 5673); + itemDimDoor=config.getItem("Dimensional Door Item", 5674); + itemRiftSignature=config.getItem("Rift Signature Item", 5675); + + bLimboActive=config.get(Configuration.CATEGORY_GENERAL, "bLimboActive", true); + + + + blockLimbo=config.get("Worldgen Block IDs - must be less than 256", "blockLimbo", 217); + blockFabricPerm=config.get("Worldgen Block IDs - must be less than 256", "blockFabricPerm", 220); + + + limboDimID=config.get(Configuration.CATEGORY_GENERAL, "limboDimID", -23); + doorRenderID=config.get(Configuration.CATEGORY_GENERAL, "doorRenderID", 89); + + limboReturnRange=config.get(Configuration.CATEGORY_GENERAL, "limboReturnRange", 500); + limboReturnRange.comment = "The farthest possible distance that limbo can send you upon return to the overworld."; + + pocketProviderID=config.get(Configuration.CATEGORY_GENERAL, "pocketProviderID", 12); + + limboProviderID=config.get(Configuration.CATEGORY_GENERAL, "limboProvider ID", 13); + + + + bWorldGenRifts = config.get(Configuration.CATEGORY_GENERAL, "bWorldGenRifts", true); + bWorldGenRifts.comment = "Toggles the natrual generation of dungeon rifts other dimensions"; + + bLimboActive = config.get(Configuration.CATEGORY_GENERAL, "bLimboActive", true); + bLimboActive.comment="Toggles if dying in a pocket dim respawns the player in limbo"; + + riftSpreadModifier = config.get(Configuration.CATEGORY_GENERAL, "riftSpreadModifier", 3); + riftSpreadModifier.comment = "How many times a rift can spread- 0 prevents rifts from spreading at all. I dont recommend putting it highter than 5, because its rather exponential. "; + + limboBiomeID=config.get(Configuration.CATEGORY_GENERAL, "limboBiomeID", 217); + pocketBiomeID=config.get(Configuration.CATEGORY_GENERAL, "pocketBiomeID", 218); + + + config.save(); + + + config.save(); + + mod_pocketDim.blockDimWallID=blockFabric.getInt(); + mod_pocketDim.blockDimWallPermID=blockFabricPerm.getInt(); + mod_pocketDim.blockLimboID=blockLimbo.getInt(); + mod_pocketDim.blockRiftID=blockLimbo.getInt(); + mod_pocketDim.dimDoorID=dimDoor.getInt(); + mod_pocketDim.chaosDoorID=chaosDoor.getInt(); + mod_pocketDim.transientDoorID=transientDoor.getInt(); + mod_pocketDim.dimHatchID=dimHatch.getInt(); + mod_pocketDim.ExitDoorID=exitDoor.getInt(); + mod_pocketDim.blockRiftID=blockRift.getInt(); + mod_pocketDim.DoorRenderID=doorRenderID.getInt(); + mod_pocketDim.hardcoreLimbo=bHardcoreLimbo.getBoolean(false); + mod_pocketDim.enableDimTrapDoor=bCraftDimHatch.getBoolean(true); + mod_pocketDim.enableDoorOpenGL=bEnableDoorRender.getBoolean(true); + mod_pocketDim.enableIronDimDoor=bCraftDimDoor.getBoolean(true); + mod_pocketDim.enableRiftBlade=bCraftRiftBlade.getBoolean(true); + mod_pocketDim.enableRiftRemover=bCraftRiftBlade.getBoolean(true); + mod_pocketDim.enableRiftSignature=bCraftRiftSig.getBoolean(true); + mod_pocketDim.enableUnstableDoor=bCraftRiftSig.getBoolean(true); + mod_pocketDim.enableWoodenDimDoor=bCraftExitDoor.getBoolean(true); + mod_pocketDim.itemChaosDoorID=itemChaosDoor.getInt(); + mod_pocketDim.itemDimDoorID=itemDimDoor.getInt(); + mod_pocketDim.itemExitDoorID=itemExitDoor.getInt(); + mod_pocketDim.itemLinkSignatureID=itemRiftSignature.getInt(); + mod_pocketDim.itemRiftBladeID=itemRiftBlade.getInt(); + mod_pocketDim.itemRiftRemoverID=itemRiftRemover.getInt(); + mod_pocketDim.itemStabilizedLinkSignatureID=itemStabilizedRiftSignature.getInt(); + mod_pocketDim.itemStableFabricID=itemStableFabric.getInt(); + mod_pocketDim.obeliskID=monolithID.getInt(); + mod_pocketDim.limboBiomeID=limboBiomeID.getInt(); + mod_pocketDim.pocketBiomeID=pocketBiomeID.getInt(); + mod_pocketDim.providerID=pocketProviderID.getInt(); + mod_pocketDim.limboProviderID=limboProviderID.getInt(); + mod_pocketDim.limboExitRange=limboReturnRange.getInt(); + mod_pocketDim.TNFREAKINGT=bTNFREAKINGT.getBoolean(false); + mod_pocketDim.riftsInWorldGen=bWorldGenRifts.getBoolean(true); + mod_pocketDim.riftSpreadFactor=riftSpreadModifier.getInt(); + mod_pocketDim.returnInventory=bLimboReturnInventory.getBoolean(true); + mod_pocketDim.HOW_MUCH_TNT=HOWMUCHTNT.getInt(); + mod_pocketDim.limboDimID = limboDimID.getInt(); + + +} + + + +} \ No newline at end of file diff --git a/StevenDimDoors/mod_pocketDim/EventHookContainer.java b/StevenDimDoors/mod_pocketDim/EventHookContainer.java index e9e5349..83cf06b 100644 --- a/StevenDimDoors/mod_pocketDim/EventHookContainer.java +++ b/StevenDimDoors/mod_pocketDim/EventHookContainer.java @@ -41,9 +41,9 @@ public class EventHookContainer { File dataDir = Minecraft.getMinecraft().mcDataDir; - event.manager.soundPoolSounds.addSound("mods/DimensionalDoors/sounds/Monolith.ogg", (mod_pocketDim.class.getResource("/mods/DimensionalDoors/sounds/Monolith.ogg"))); - event.manager.soundPoolSounds.addSound("mods/DimensionalDoors/sounds/wylkermaxcrack.ogg", (mod_pocketDim.class.getResource("/mods/DimensionalDoors/sounds/wylkermaxcrack.ogg"))); - event.manager.soundPoolSounds.addSound("mods/DimensionalDoors/sounds/tearing.ogg", (mod_pocketDim.class.getResource("/mods/DimensionalDoors/sounds/tearing.ogg"))); + event.manager.soundPoolSounds.addSound("mods/DimDoors/sfx/monk.ogg", (mod_pocketDim.class.getResource("/mods/DimDoors/sfx/monk.ogg"))); + event.manager.soundPoolSounds.addSound("mods/DimDoors/sfx/crack.ogg", (mod_pocketDim.class.getResource("/mods/DimDoors/sfx/crack.ogg"))); + event.manager.soundPoolSounds.addSound("mods/DimDoors/sfx/tearing.ogg", (mod_pocketDim.class.getResource("/mods/DimDoors/sfx/tearing.ogg"))); } diff --git a/StevenDimDoors/mod_pocketDim/dimHelper.java b/StevenDimDoors/mod_pocketDim/dimHelper.java index 6158c8e..33abbd9 100644 --- a/StevenDimDoors/mod_pocketDim/dimHelper.java +++ b/StevenDimDoors/mod_pocketDim/dimHelper.java @@ -697,13 +697,21 @@ public class dimHelper extends DimensionManager */ public void generatePocket(LinkData incomingLink) { - if(this.getWorld(incomingLink.destDimID)==null) + try { - this.initDimension(incomingLink.destDimID); + if(this.getWorld(incomingLink.destDimID)==null) + { + this.initDimension(incomingLink.destDimID); + } + if(this.getWorld(incomingLink.destDimID).provider==null) + { + this.initDimension(incomingLink.destDimID); + } } - if(this.getWorld(incomingLink.destDimID).provider==null) + catch(Exception E) { - this.initDimension(incomingLink.destDimID); + E.printStackTrace(); + return; } // World world = this.getWorld(incomingLink.destDimID); DimData data = this.dimList.get(incomingLink.destDimID); diff --git a/StevenDimDoors/mod_pocketDim/items/ItemStabilizedRiftSignature.java b/StevenDimDoors/mod_pocketDim/items/ItemStabilizedRiftSignature.java index fb41dfe..1c09fe6 100644 --- a/StevenDimDoors/mod_pocketDim/items/ItemStabilizedRiftSignature.java +++ b/StevenDimDoors/mod_pocketDim/items/ItemStabilizedRiftSignature.java @@ -85,9 +85,14 @@ public class ItemStabilizedRiftSignature extends itemLinkSignature boolean hasEnder = false; // checks to see if the item has a link stored, if so, it creates it - if(par2EntityPlayer.inventory.hasItem(Item.enderPearl.itemID)) + if(par2EntityPlayer.inventory.hasItem(Item.enderPearl.itemID)||par2EntityPlayer.inventory.hasItem(mod_pocketDim.itemStableFabricID)) { - par2EntityPlayer.inventory.consumeInventoryItem(Item.enderPearl.itemID); + if(!par2EntityPlayer.inventory.consumeInventoryItem(mod_pocketDim.itemStableFabricID)) + + { + par2EntityPlayer.inventory.consumeInventoryItem(Item.enderPearl.itemID); + + } hasEnder=true; } diff --git a/StevenDimDoors/mod_pocketDim/limboSkyProvider.java b/StevenDimDoors/mod_pocketDim/limboSkyProvider.java index 11e46b1..fd31976 100644 --- a/StevenDimDoors/mod_pocketDim/limboSkyProvider.java +++ b/StevenDimDoors/mod_pocketDim/limboSkyProvider.java @@ -125,7 +125,7 @@ public class limboSkyProvider extends IRenderHandler GL11.glRotatef(-90.0F, 0.0F, 1.0F, 0.0F); GL11.glRotatef(world.getCelestialAngle(par1) * 360.0F, 1.0F, 0.0F, 0.0F); f10 = 30.0F; - mc.renderEngine.bindTexture("/mods/DimensionalDoors/textures/other/limboSun.png"); + mc.renderEngine.bindTexture("/mods/DimDoors/textures/other/limboSun.png"); tessellator1.startDrawingQuads(); tessellator1.addVertexWithUV((double)(-f10), 100.0D, (double)(-f10), 0.0D, 0.0D); tessellator1.addVertexWithUV((double)f10, 100.0D, (double)(-f10), 1.0D, 0.0D); @@ -133,7 +133,7 @@ public class limboSkyProvider extends IRenderHandler tessellator1.addVertexWithUV((double)(-f10), 100.0D, (double)f10, 0.0D, 1.0D); tessellator1.draw(); f10 = 20.0F; - mc.renderEngine.bindTexture("/mods/DimensionalDoors/textures/other/limboMoon.png"); + mc.renderEngine.bindTexture("/mods/DimDoors/textures/other/limboMoon.png"); int k = world.getMoonPhase(); int l = k % 4; int i1 = k / 4 % 2; diff --git a/StevenDimDoors/mod_pocketDim/mod_pocketDim.java b/StevenDimDoors/mod_pocketDim/mod_pocketDim.java index dba2c32..fa69ccd 100644 --- a/StevenDimDoors/mod_pocketDim/mod_pocketDim.java +++ b/StevenDimDoors/mod_pocketDim/mod_pocketDim.java @@ -1,6 +1,7 @@ package StevenDimDoors.mod_pocketDim; +import java.io.File; import java.util.ArrayList; import java.util.HashMap; @@ -80,7 +81,7 @@ public class mod_pocketDim public static final String version = "1.5.2R1.3.6RC1"; - public static final String modid = "DimensionalDoors"; + public static final String modid = "DimDoors"; //need to clean up @SidedProxy(clientSide = "StevenDimDoors.mod_pocketDimClient.ClientProxy", serverSide = "StevenDimDoors.mod_pocketDim.CommonProxy") @@ -132,11 +133,11 @@ public class mod_pocketDim public static int itemRiftRemoverID; public static int blockDimWallPermID; public static int obeliskID; - public static Block linkDimDoor; + //public static Block linkDimDoor; public static Block transientDoor; public static Block ExitDoor; public static Block chaosDoor; - public static Block linkExitDoor; + // public static Block linkExitDoor; public static Block blockRift; public static Block blockLimbo; public static Block dimDoor; @@ -255,80 +256,23 @@ public class mod_pocketDim public void PreInit(FMLPreInitializationEvent event) { + MinecraftForge.EVENT_BUS.register(new EventHookContainer()); + File configFile = event.getSuggestedConfigurationFile(); + + Configuration config = new Configuration(configFile); + DimDoorsConfig.loadConfig(configFile); - - Configuration config = new Configuration(event.getSuggestedConfigurationFile()); - config.load(); - // this.enableDimRail = config.get("BOOLEAN", "true to enable dim rail crafting", true).getBoolean(true); - this.hardcoreLimbo = config.get("BOOLEAN", "true to cause player to respawn in Limbo", false).getBoolean(false); - this.enableDimTrapDoor = config.get("BOOLEAN", "true to enable trap door crafting", true).getBoolean(true); - this.enableIronDimDoor = config.get("BOOLEAN", "true to enable iron dim door crafting", true).getBoolean(true); - this.enableRiftBlade = config.get("BOOLEAN", "true to enable rift blade crafting", true).getBoolean(true); - this.enableRiftRemover = config.get("BOOLEAN", "true to enable rift remover crafting", true).getBoolean(true); - this.enableRiftSignature = config.get("BOOLEAN", "true to enable rift signature crafting", true).getBoolean(true); - this.enableUnstableDoor = config.get("BOOLEAN", "true to enable unstable door crafting", true).getBoolean(true); - this.enableWoodenDimDoor = config.get("BOOLEAN", "true to enable wooden door crafting", true).getBoolean(true); - this.enableDoorOpenGL = config.get("BOOLEAN", "Toggles the door render effect", true).getBoolean(true); - this.returnInventory = config.get("BOOLEAN", "Toggles whether or not your inventory is returned upon dying and respawning in limbo", true).getBoolean(true); - - - // dimRailID = config.getBlock("Dimensional Rail", 1980).getInt(); - - chaosDoorID = config.getBlock("Chaos Door", 1978).getInt(); - dimDoorID = config.getBlock("Dimensional Door", 1970).getInt(); - dimHatchID = config.getBlock("Transdimensional Trapdoor", 1971).getInt(); - linkDimDoorID= config.getBlock("Dimensional Door Link", 1972).getInt(); - blockDimWallID=config.getBlock("Fabric of Reality", 1973).getInt(); - ExitDoorID = config.getBlock("Warp Door", 1975).getInt(); - linkExitDoorID = config.getBlock("Warp Door Link", 1976).getInt(); - blockRiftID = config.getBlock("Rift", 1977).getInt(); - transientDoorID = config.getBlock("transientDoorID", 1979).getInt(); - - itemStabilizedLinkSignatureID=config.getItem("Stabilized Rift Signature", 5677).getInt(); - itemRiftBladeID=config.getItem("Rift Blade", 5676).getInt(); - itemChaosDoorID=config.getItem("Chaos Door", 5673).getInt(); - itemRiftRemoverID=config.getItem("Rift Remover", 5671).getInt(); - itemStableFabricID=config.getItem("Stable Fabric", 5672).getInt(); - itemExitDoorID=config.getItem("Warp Door Item", 5673).getInt(); - itemDimDoorID=config.getItem("Dimensional Door Item", 5674).getInt(); - itemLinkSignatureID=config.getItem("Rift Signature Item", 5675).getInt(); - - - TNFREAKINGT = config.get("BOOLEAN", "EXPLOSIONS!!???!!!?!?!!", false).getBoolean(false); - this.enableRiftGrief = config.get("BOOLEAN", "toggles whether rifts eat blocks around them or not", true).getBoolean(true); - HOW_MUCH_TNT=config.get("Int", "Chance that a block will not be TNT. must be greater than 1. Explosions!?!?? must be set to true, and you figure out what it does. ", 25).getInt(25); - this.obeliskID=config.get("Int", "MobObeliskID", 125).getInt(125); - - - blockLimboID=config.get("Int", "Block ID for Limbo- must be below 256", 217).getInt(); - blockDimWallPermID=config.get("Int", "Block ID for blockDimWallPermID- must be below 256", 220).getInt(); - this.limboDimID=config.get("Int", "Limbo Dimension ID", -23).getInt(); - this.limboExitRange=config.get("Int", "The farthest possible distance that limbo can send you upon return to the overworld.", 500).getInt(); - - providerID=config.get("Int", "ProviderID", 12).getInt(); - this.limboProviderID=config.get("Int", "Limbo Provider ID", 13).getInt(); - - - - this.riftsInWorldGen = config.get("BOOLEAN", "Should rifts generate natrually in the world? ", true).getBoolean(true); - this.isLimboActive = config.get("BOOLEAN", "Toggles limbo", true).getBoolean(true); - - this.riftSpreadFactor = config.get("Int", "How many times a rift can spread- 0 prevents rifts from spreading at all. I dont recommend putting it highter than 5, because its rather exponential. ", 3).getInt(); - - this.limboBiomeID=config.get("Int", "Biome ID for Limbo-", 217).getInt(); - this.pocketBiomeID=config.get("Int", "Biome ID for Pockets-", 218).getInt(); - - config.save(); + } @@ -341,11 +285,11 @@ public class mod_pocketDim transientDoor = (new TransientDoor(transientDoorID, Material.iron)).setHardness(1.0F) .setUnlocalizedName("transientDoor"); - linkDimDoor = (new linkDimDoor(linkDimDoorID, Material.iron)).setHardness(1.0F) .setUnlocalizedName("dimDoorLink"); + // linkDimDoor = (new linkDimDoor(linkDimDoorID, Material.iron)).setHardness(1.0F) .setUnlocalizedName("dimDoorLink"); blockDimWall = (new BlockDimWall(blockDimWallID, 0, Material.iron)).setLightValue(1.0F).setHardness(0.1F).setUnlocalizedName("blockDimWall"); blockDimWallPerm = (new BlockDimWallPerm(blockDimWallPermID, 0, Material.iron)).setLightValue(1.0F).setBlockUnbreakable().setHardness(100000.0F).setUnlocalizedName("blockDimWallPerm"); ExitDoor = (new ExitDoor(ExitDoorID, Material.wood)).setHardness(1.0F) .setUnlocalizedName("dimDoorWarp"); - linkExitDoor = (new linkExitDoor(linkExitDoorID, Material.wood)).setHardness(1.0F) .setUnlocalizedName("dimDoorexitlink"); + // linkExitDoor = (new linkExitDoor(linkExitDoorID, Material.wood)).setHardness(1.0F) .setUnlocalizedName("dimDoorexitlink"); blockRift = (new BlockRift(blockRiftID, 0, Material.air).setHardness(1.0F) .setUnlocalizedName("rift")); blockLimbo = (new BlockLimbo(blockLimboID, 15, Material.iron).setHardness(.2F).setUnlocalizedName("BlockLimbo").setLightValue(.0F)); chaosDoor = (new ChaosDoor(chaosDoorID, Material.iron).setHardness(.2F).setUnlocalizedName("chaosDoor").setLightValue(.0F) ); @@ -371,10 +315,10 @@ public class mod_pocketDim //GameRegistry.registerBlock(dimRail, "Dimensional Rail"); GameRegistry.registerBlock(chaosDoor, "Unstable Door"); GameRegistry.registerBlock(ExitDoor, "Warp Door"); - GameRegistry.registerBlock(linkExitDoor, "Warp Door link"); + //GameRegistry.registerBlock(linkExitDoor, "Warp Door link"); GameRegistry.registerBlock(blockRift, "Rift"); GameRegistry.registerBlock(blockLimbo, "Unraveled Fabric"); - GameRegistry.registerBlock(linkDimDoor, "Dimensional Door link"); + //GameRegistry.registerBlock(linkDimDoor, "Dimensional Door link"); GameRegistry.registerBlock(dimDoor, "Dimensional Door"); GameRegistry.registerBlock(dimHatch,"Transdimensional Trapdoor"); GameRegistry.registerBlock(blockDimWall, "Fabric of Reality"); @@ -398,7 +342,7 @@ public class mod_pocketDim LanguageRegistry.addName(blockLimbo , "Unraveled Fabric"); LanguageRegistry.addName(ExitDoor , "Warp Door"); LanguageRegistry.addName(chaosDoor , "Unstable Door"); - LanguageRegistry.addName(linkDimDoor, "Dimensional Door"); + //LanguageRegistry.addName(linkDimDoor, "Dimensional Door"); LanguageRegistry.addName(blockDimWall , "Fabric of Reality"); LanguageRegistry.addName(blockDimWallPerm , "Fabric of Reality"); LanguageRegistry.addName(dimDoor, "Dimensional Door"); @@ -425,7 +369,7 @@ public class mod_pocketDim EntityRegistry.registerModEntity(MobObelisk.class, "Obelisk", this.obeliskID, this,70, 1, true); EntityList.IDtoClassMapping.put(this.obeliskID, MobObelisk.class); EntityList.entityEggs.put(this.obeliskID, new EntityEggInfo(this.obeliskID, 0, 0xffffff)); - LanguageRegistry.instance().addStringLocalization("entity.DimensionalDoors.Obelisk.name", "Monolith"); + LanguageRegistry.instance().addStringLocalization("entity.DimDoors.Obelisk.name", "Monolith"); diff --git a/StevenDimDoors/mod_pocketDim/pocketProvider.java b/StevenDimDoors/mod_pocketDim/pocketProvider.java index 105bf12..7467827 100644 --- a/StevenDimDoors/mod_pocketDim/pocketProvider.java +++ b/StevenDimDoors/mod_pocketDim/pocketProvider.java @@ -6,6 +6,7 @@ import net.minecraft.util.Vec3; import net.minecraft.world.WorldProvider; import net.minecraft.world.biome.WorldChunkManagerHell; import net.minecraft.world.chunk.IChunkProvider; +import net.minecraftforge.common.DimensionManager; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @@ -81,14 +82,22 @@ public class pocketProvider extends WorldProvider public int getRespawnDimension(EntityPlayerMP player) { + int respawnDim; + if(mod_pocketDim.isLimboActive) { - return mod_pocketDim.limboDimID; + respawnDim= mod_pocketDim.limboDimID; } else { - return dimHelper.dimList.get(this.dimensionId).exitDimLink.destDimID; + respawnDim= dimHelper.dimList.get(this.dimensionId).exitDimLink.destDimID; } + + if(dimHelper.getWorld(respawnDim)==null) + { + dimHelper.initDimension(respawnDim); + } + return respawnDim; } public boolean canRespawnHere() diff --git a/StevenDimDoors/mod_pocketDim/ticking/MobObelisk.java b/StevenDimDoors/mod_pocketDim/ticking/MobObelisk.java index c7f4bec..c515ef4 100644 --- a/StevenDimDoors/mod_pocketDim/ticking/MobObelisk.java +++ b/StevenDimDoors/mod_pocketDim/ticking/MobObelisk.java @@ -40,7 +40,7 @@ public class MobObelisk extends EntityFlying implements IMob { super(par1World); - this.texture="/mods/DimensionalDoors/textures/mobs/Monolith0.png"; + this.texture="/mods/DimDoors/textures/mobs/Monolith0.png"; this.setSize(2F, 8.0F); this.noClip=true; this.scaleFactor= (float) (rand.nextDouble()+1); @@ -89,11 +89,9 @@ public class MobObelisk extends EntityFlying implements IMob } - @SideOnly(Side.CLIENT) + - /** - * Returns render size modifier - */ + @Override @@ -101,7 +99,7 @@ public class MobObelisk extends EntityFlying implements IMob { byte b0 = this.dataWatcher.getWatchableObjectByte(16); - this.texture="/mods/DimensionalDoors/textures/mobs/Monolith"+b0+".png"; + this.texture="/mods/DimDoors/textures/mobs/Monolith"+b0+".png"; if(!this.hasJumped&&!this.worldObj.isRemote) { @@ -143,7 +141,7 @@ public class MobObelisk extends EntityFlying implements IMob { if(this.soundTime<=0) { - this.playSound("mods.DimensionalDoors.sounds.Monolith", 1F, 1F); + this.playSound("mods.DimDoors.sfx.monk", 1F, 1F); this.soundTime=100; } @@ -178,12 +176,12 @@ public class MobObelisk extends EntityFlying implements IMob } if(aggro>430) { - this.worldObj.playSoundAtEntity(entityPlayer,"mods.DimensionalDoors.sounds.tearing",2, 1); + this.worldObj.playSoundAtEntity(entityPlayer,"mods.DimDoors.sfx.tearing",2, 1); } if(aggro>445) { - this.worldObj.playSoundAtEntity(entityPlayer,"mods.DimensionalDoors.sounds.tearing",6, 1); + this.worldObj.playSoundAtEntity(entityPlayer,"mods.DimDoors.sfx.tearing",6, 1); } @@ -201,7 +199,7 @@ public class MobObelisk extends EntityFlying implements IMob dimHelper.instance.teleportToPocket(worldObj, link, entityPlayer); - entityPlayer.worldObj.playSoundAtEntity(entityPlayer,"mods.DimensionalDoors.sounds.wylkermaxcrack",13, 1); + entityPlayer.worldObj.playSoundAtEntity(entityPlayer,"mods.DimDoors.sfx.crack",13, 1); if(!(this.worldObj.provider instanceof LimboProvider ||this.worldObj.provider instanceof pocketProvider)) { this.setDead(); diff --git a/resources/PocketBlockTextures.png b/resources/PocketBlockTextures.png deleted file mode 100644 index 059dad5..0000000 Binary files a/resources/PocketBlockTextures.png and /dev/null differ diff --git a/resources/PocketBlockTexturesNEW.png b/resources/PocketBlockTexturesNEW.png deleted file mode 100644 index 9e8c5d4..0000000 Binary files a/resources/PocketBlockTexturesNEW.png and /dev/null differ diff --git a/resources/mods/DimensionalDoors/sounds/wylkermaxcrack.ogg b/resources/mods/DimDoors/sfx/crack.ogg similarity index 100% rename from resources/mods/DimensionalDoors/sounds/wylkermaxcrack.ogg rename to resources/mods/DimDoors/sfx/crack.ogg diff --git a/resources/mods/DimensionalDoors/sounds/Monolith.ogg b/resources/mods/DimDoors/sfx/monk.ogg similarity index 100% rename from resources/mods/DimensionalDoors/sounds/Monolith.ogg rename to resources/mods/DimDoors/sfx/monk.ogg diff --git a/resources/mods/DimensionalDoors/sounds/tearing.ogg b/resources/mods/DimDoors/sfx/tearing.ogg similarity index 100% rename from resources/mods/DimensionalDoors/sounds/tearing.ogg rename to resources/mods/DimDoors/sfx/tearing.ogg diff --git a/resources/mods/DimensionalDoors/textures/blocks/BlockLimbo - Copy.png b/resources/mods/DimDoors/textures/blocks/BlockLimbo - Copy.png similarity index 100% rename from resources/mods/DimensionalDoors/textures/blocks/BlockLimbo - Copy.png rename to resources/mods/DimDoors/textures/blocks/BlockLimbo - Copy.png diff --git a/resources/mods/DimensionalDoors/textures/blocks/BlockLimbo.png b/resources/mods/DimDoors/textures/blocks/BlockLimbo.png similarity index 100% rename from resources/mods/DimensionalDoors/textures/blocks/BlockLimbo.png rename to resources/mods/DimDoors/textures/blocks/BlockLimbo.png diff --git a/resources/mods/DimensionalDoors/textures/blocks/BlockLimbo.psd b/resources/mods/DimDoors/textures/blocks/BlockLimbo.psd similarity index 100% rename from resources/mods/DimensionalDoors/textures/blocks/BlockLimbo.psd rename to resources/mods/DimDoors/textures/blocks/BlockLimbo.psd diff --git a/resources/mods/DimensionalDoors/textures/blocks/BlockLimbo0.png b/resources/mods/DimDoors/textures/blocks/BlockLimbo0.png similarity index 100% rename from resources/mods/DimensionalDoors/textures/blocks/BlockLimbo0.png rename to resources/mods/DimDoors/textures/blocks/BlockLimbo0.png diff --git a/resources/mods/DimensionalDoors/textures/blocks/BlockLimbo1.png b/resources/mods/DimDoors/textures/blocks/BlockLimbo1.png similarity index 100% rename from resources/mods/DimensionalDoors/textures/blocks/BlockLimbo1.png rename to resources/mods/DimDoors/textures/blocks/BlockLimbo1.png diff --git a/resources/mods/DimensionalDoors/textures/blocks/BlockLimbo2.png b/resources/mods/DimDoors/textures/blocks/BlockLimbo2.png similarity index 100% rename from resources/mods/DimensionalDoors/textures/blocks/BlockLimbo2.png rename to resources/mods/DimDoors/textures/blocks/BlockLimbo2.png diff --git a/resources/mods/DimensionalDoors/textures/blocks/BlockLimbo3.png b/resources/mods/DimDoors/textures/blocks/BlockLimbo3.png similarity index 100% rename from resources/mods/DimensionalDoors/textures/blocks/BlockLimbo3.png rename to resources/mods/DimDoors/textures/blocks/BlockLimbo3.png diff --git a/resources/mods/DimensionalDoors/textures/blocks/BlockLimboGOOD.png b/resources/mods/DimDoors/textures/blocks/BlockLimboGOOD.png similarity index 100% rename from resources/mods/DimensionalDoors/textures/blocks/BlockLimboGOOD.png rename to resources/mods/DimDoors/textures/blocks/BlockLimboGOOD.png diff --git a/resources/mods/DimensionalDoors/textures/blocks/blockDimWall.png b/resources/mods/DimDoors/textures/blocks/blockDimWall.png similarity index 100% rename from resources/mods/DimensionalDoors/textures/blocks/blockDimWall.png rename to resources/mods/DimDoors/textures/blocks/blockDimWall.png diff --git a/resources/mods/DimensionalDoors/textures/blocks/blockDimWallPerm.png b/resources/mods/DimDoors/textures/blocks/blockDimWallPerm.png similarity index 100% rename from resources/mods/DimensionalDoors/textures/blocks/blockDimWallPerm.png rename to resources/mods/DimDoors/textures/blocks/blockDimWallPerm.png diff --git a/resources/mods/DimensionalDoors/textures/blocks/chaosDoor_bottom.png b/resources/mods/DimDoors/textures/blocks/chaosDoor_bottom.png similarity index 100% rename from resources/mods/DimensionalDoors/textures/blocks/chaosDoor_bottom.png rename to resources/mods/DimDoors/textures/blocks/chaosDoor_bottom.png diff --git a/resources/mods/DimensionalDoors/textures/blocks/chaosDoor_top.png b/resources/mods/DimDoors/textures/blocks/chaosDoor_top.png similarity index 100% rename from resources/mods/DimensionalDoors/textures/blocks/chaosDoor_top.png rename to resources/mods/DimDoors/textures/blocks/chaosDoor_top.png diff --git a/resources/mods/DimensionalDoors/textures/blocks/dimDoorLink_bottom.png b/resources/mods/DimDoors/textures/blocks/dimDoorLink_bottom.png similarity index 100% rename from resources/mods/DimensionalDoors/textures/blocks/dimDoorLink_bottom.png rename to resources/mods/DimDoors/textures/blocks/dimDoorLink_bottom.png diff --git a/resources/mods/DimensionalDoors/textures/blocks/dimDoorLink_top.png b/resources/mods/DimDoors/textures/blocks/dimDoorLink_top.png similarity index 100% rename from resources/mods/DimensionalDoors/textures/blocks/dimDoorLink_top.png rename to resources/mods/DimDoors/textures/blocks/dimDoorLink_top.png diff --git a/resources/mods/DimensionalDoors/textures/blocks/dimDoorWarp_bottom.png b/resources/mods/DimDoors/textures/blocks/dimDoorWarp_bottom.png similarity index 100% rename from resources/mods/DimensionalDoors/textures/blocks/dimDoorWarp_bottom.png rename to resources/mods/DimDoors/textures/blocks/dimDoorWarp_bottom.png diff --git a/resources/mods/DimensionalDoors/textures/blocks/dimDoorWarp_top.png b/resources/mods/DimDoors/textures/blocks/dimDoorWarp_top.png similarity index 100% rename from resources/mods/DimensionalDoors/textures/blocks/dimDoorWarp_top.png rename to resources/mods/DimDoors/textures/blocks/dimDoorWarp_top.png diff --git a/resources/mods/DimensionalDoors/textures/blocks/dimDoor_bottom.png b/resources/mods/DimDoors/textures/blocks/dimDoor_bottom.png similarity index 100% rename from resources/mods/DimensionalDoors/textures/blocks/dimDoor_bottom.png rename to resources/mods/DimDoors/textures/blocks/dimDoor_bottom.png diff --git a/resources/mods/DimensionalDoors/textures/blocks/dimDoor_top.png b/resources/mods/DimDoors/textures/blocks/dimDoor_top.png similarity index 100% rename from resources/mods/DimensionalDoors/textures/blocks/dimDoor_top.png rename to resources/mods/DimDoors/textures/blocks/dimDoor_top.png diff --git a/resources/mods/DimensionalDoors/textures/blocks/dimDoorexitlink_bottom.png b/resources/mods/DimDoors/textures/blocks/dimDoorexitlink_bottom.png similarity index 100% rename from resources/mods/DimensionalDoors/textures/blocks/dimDoorexitlink_bottom.png rename to resources/mods/DimDoors/textures/blocks/dimDoorexitlink_bottom.png diff --git a/resources/mods/DimensionalDoors/textures/blocks/dimDoorexitlink_top.png b/resources/mods/DimDoors/textures/blocks/dimDoorexitlink_top.png similarity index 100% rename from resources/mods/DimensionalDoors/textures/blocks/dimDoorexitlink_top.png rename to resources/mods/DimDoors/textures/blocks/dimDoorexitlink_top.png diff --git a/resources/mods/DimensionalDoors/textures/blocks/dimHatch.png b/resources/mods/DimDoors/textures/blocks/dimHatch.png similarity index 100% rename from resources/mods/DimensionalDoors/textures/blocks/dimHatch.png rename to resources/mods/DimDoors/textures/blocks/dimHatch.png diff --git a/resources/mods/DimensionalDoors/textures/blocks/rift.png b/resources/mods/DimDoors/textures/blocks/rift.png similarity index 100% rename from resources/mods/DimensionalDoors/textures/blocks/rift.png rename to resources/mods/DimDoors/textures/blocks/rift.png diff --git a/resources/mods/DimensionalDoors/textures/blocks/transientDoor - Copy.png b/resources/mods/DimDoors/textures/blocks/transientDoor - Copy.png similarity index 100% rename from resources/mods/DimensionalDoors/textures/blocks/transientDoor - Copy.png rename to resources/mods/DimDoors/textures/blocks/transientDoor - Copy.png diff --git a/resources/mods/DimensionalDoors/textures/blocks/transientDoor_bottom.png b/resources/mods/DimDoors/textures/blocks/transientDoor_bottom.png similarity index 100% rename from resources/mods/DimensionalDoors/textures/blocks/transientDoor_bottom.png rename to resources/mods/DimDoors/textures/blocks/transientDoor_bottom.png diff --git a/resources/mods/DimensionalDoors/textures/blocks/transientDoor_top.png b/resources/mods/DimDoors/textures/blocks/transientDoor_top.png similarity index 100% rename from resources/mods/DimensionalDoors/textures/blocks/transientDoor_top.png rename to resources/mods/DimDoors/textures/blocks/transientDoor_top.png diff --git a/resources/mods/DimensionalDoors/textures/items/ItemRiftBlade.png b/resources/mods/DimDoors/textures/items/ItemRiftBlade.png similarity index 100% rename from resources/mods/DimensionalDoors/textures/items/ItemRiftBlade.png rename to resources/mods/DimDoors/textures/items/ItemRiftBlade.png diff --git a/resources/mods/DimensionalDoors/textures/items/dimDoorexit.png b/resources/mods/DimDoors/textures/items/dimDoorexit.png similarity index 100% rename from resources/mods/DimensionalDoors/textures/items/dimDoorexit.png rename to resources/mods/DimDoors/textures/items/dimDoorexit.png diff --git a/resources/mods/DimensionalDoors/textures/items/item.ItemRiftBlade.png b/resources/mods/DimDoors/textures/items/item.ItemRiftBlade.png similarity index 100% rename from resources/mods/DimensionalDoors/textures/items/item.ItemRiftBlade.png rename to resources/mods/DimDoors/textures/items/item.ItemRiftBlade.png diff --git a/resources/mods/DimensionalDoors/textures/items/item.dimDoorexit.png b/resources/mods/DimDoors/textures/items/item.dimDoorexit.png similarity index 100% rename from resources/mods/DimensionalDoors/textures/items/item.dimDoorexit.png rename to resources/mods/DimDoors/textures/items/item.dimDoorexit.png diff --git a/resources/mods/DimensionalDoors/textures/items/item.itemChaosDoor.png b/resources/mods/DimDoors/textures/items/item.itemChaosDoor.png similarity index 100% rename from resources/mods/DimensionalDoors/textures/items/item.itemChaosDoor.png rename to resources/mods/DimDoors/textures/items/item.itemChaosDoor.png diff --git a/resources/mods/DimensionalDoors/textures/items/item.itemDimDoor.png b/resources/mods/DimDoors/textures/items/item.itemDimDoor.png similarity index 100% rename from resources/mods/DimensionalDoors/textures/items/item.itemDimDoor.png rename to resources/mods/DimDoors/textures/items/item.itemDimDoor.png diff --git a/resources/mods/DimensionalDoors/textures/items/item.itemLinkSignature.png b/resources/mods/DimDoors/textures/items/item.itemLinkSignature.png similarity index 100% rename from resources/mods/DimensionalDoors/textures/items/item.itemLinkSignature.png rename to resources/mods/DimDoors/textures/items/item.itemLinkSignature.png diff --git a/resources/mods/DimensionalDoors/textures/items/item.itemRiftRemover.png b/resources/mods/DimDoors/textures/items/item.itemRiftRemover.png similarity index 100% rename from resources/mods/DimensionalDoors/textures/items/item.itemRiftRemover.png rename to resources/mods/DimDoors/textures/items/item.itemRiftRemover.png diff --git a/resources/mods/DimensionalDoors/textures/items/item.itemStableFabric.png b/resources/mods/DimDoors/textures/items/item.itemStableFabric.png similarity index 100% rename from resources/mods/DimensionalDoors/textures/items/item.itemStableFabric.png rename to resources/mods/DimDoors/textures/items/item.itemStableFabric.png diff --git a/resources/mods/DimensionalDoors/textures/items/itemChaosDoor.png b/resources/mods/DimDoors/textures/items/itemChaosDoor.png similarity index 100% rename from resources/mods/DimensionalDoors/textures/items/itemChaosDoor.png rename to resources/mods/DimDoors/textures/items/itemChaosDoor.png diff --git a/resources/mods/DimensionalDoors/textures/items/itemDimDoor.png b/resources/mods/DimDoors/textures/items/itemDimDoor.png similarity index 100% rename from resources/mods/DimensionalDoors/textures/items/itemDimDoor.png rename to resources/mods/DimDoors/textures/items/itemDimDoor.png diff --git a/resources/mods/DimensionalDoors/textures/items/itemDimDoorWarp.png b/resources/mods/DimDoors/textures/items/itemDimDoorWarp.png similarity index 100% rename from resources/mods/DimensionalDoors/textures/items/itemDimDoorWarp.png rename to resources/mods/DimDoors/textures/items/itemDimDoorWarp.png diff --git a/resources/mods/DimensionalDoors/textures/items/itemLinkSignature.png b/resources/mods/DimDoors/textures/items/itemLinkSignature.png similarity index 100% rename from resources/mods/DimensionalDoors/textures/items/itemLinkSignature.png rename to resources/mods/DimDoors/textures/items/itemLinkSignature.png diff --git a/resources/mods/DimensionalDoors/textures/items/itemRiftRemover.png b/resources/mods/DimDoors/textures/items/itemRiftRemover.png similarity index 100% rename from resources/mods/DimensionalDoors/textures/items/itemRiftRemover.png rename to resources/mods/DimDoors/textures/items/itemRiftRemover.png diff --git a/resources/mods/DimensionalDoors/textures/items/itemStabilizedRiftSig.png b/resources/mods/DimDoors/textures/items/itemStabilizedRiftSig.png similarity index 100% rename from resources/mods/DimensionalDoors/textures/items/itemStabilizedRiftSig.png rename to resources/mods/DimDoors/textures/items/itemStabilizedRiftSig.png diff --git a/resources/mods/DimensionalDoors/textures/items/itemStableFabric.png b/resources/mods/DimDoors/textures/items/itemStableFabric.png similarity index 100% rename from resources/mods/DimensionalDoors/textures/items/itemStableFabric.png rename to resources/mods/DimDoors/textures/items/itemStableFabric.png diff --git a/resources/mods/DimensionalDoors/textures/mobs/Monolith.psd b/resources/mods/DimDoors/textures/mobs/Monolith.psd similarity index 100% rename from resources/mods/DimensionalDoors/textures/mobs/Monolith.psd rename to resources/mods/DimDoors/textures/mobs/Monolith.psd diff --git a/resources/mods/DimensionalDoors/textures/mobs/Monolith0.png b/resources/mods/DimDoors/textures/mobs/Monolith0.png similarity index 100% rename from resources/mods/DimensionalDoors/textures/mobs/Monolith0.png rename to resources/mods/DimDoors/textures/mobs/Monolith0.png diff --git a/resources/mods/DimensionalDoors/textures/mobs/Monolith1.png b/resources/mods/DimDoors/textures/mobs/Monolith1.png similarity index 100% rename from resources/mods/DimensionalDoors/textures/mobs/Monolith1.png rename to resources/mods/DimDoors/textures/mobs/Monolith1.png diff --git a/resources/mods/DimensionalDoors/textures/mobs/Monolith10.png b/resources/mods/DimDoors/textures/mobs/Monolith10.png similarity index 100% rename from resources/mods/DimensionalDoors/textures/mobs/Monolith10.png rename to resources/mods/DimDoors/textures/mobs/Monolith10.png diff --git a/resources/mods/DimensionalDoors/textures/mobs/Monolith11.png b/resources/mods/DimDoors/textures/mobs/Monolith11.png similarity index 100% rename from resources/mods/DimensionalDoors/textures/mobs/Monolith11.png rename to resources/mods/DimDoors/textures/mobs/Monolith11.png diff --git a/resources/mods/DimensionalDoors/textures/mobs/Monolith12.png b/resources/mods/DimDoors/textures/mobs/Monolith12.png similarity index 100% rename from resources/mods/DimensionalDoors/textures/mobs/Monolith12.png rename to resources/mods/DimDoors/textures/mobs/Monolith12.png diff --git a/resources/mods/DimensionalDoors/textures/mobs/Monolith13.png b/resources/mods/DimDoors/textures/mobs/Monolith13.png similarity index 100% rename from resources/mods/DimensionalDoors/textures/mobs/Monolith13.png rename to resources/mods/DimDoors/textures/mobs/Monolith13.png diff --git a/resources/mods/DimensionalDoors/textures/mobs/Monolith14.png b/resources/mods/DimDoors/textures/mobs/Monolith14.png similarity index 100% rename from resources/mods/DimensionalDoors/textures/mobs/Monolith14.png rename to resources/mods/DimDoors/textures/mobs/Monolith14.png diff --git a/resources/mods/DimensionalDoors/textures/mobs/Monolith15.png b/resources/mods/DimDoors/textures/mobs/Monolith15.png similarity index 100% rename from resources/mods/DimensionalDoors/textures/mobs/Monolith15.png rename to resources/mods/DimDoors/textures/mobs/Monolith15.png diff --git a/resources/mods/DimensionalDoors/textures/mobs/Monolith16.png b/resources/mods/DimDoors/textures/mobs/Monolith16.png similarity index 100% rename from resources/mods/DimensionalDoors/textures/mobs/Monolith16.png rename to resources/mods/DimDoors/textures/mobs/Monolith16.png diff --git a/resources/mods/DimensionalDoors/textures/mobs/Monolith17.png b/resources/mods/DimDoors/textures/mobs/Monolith17.png similarity index 100% rename from resources/mods/DimensionalDoors/textures/mobs/Monolith17.png rename to resources/mods/DimDoors/textures/mobs/Monolith17.png diff --git a/resources/mods/DimensionalDoors/textures/mobs/Monolith18.png b/resources/mods/DimDoors/textures/mobs/Monolith18.png similarity index 100% rename from resources/mods/DimensionalDoors/textures/mobs/Monolith18.png rename to resources/mods/DimDoors/textures/mobs/Monolith18.png diff --git a/resources/mods/DimensionalDoors/textures/mobs/Monolith2.png b/resources/mods/DimDoors/textures/mobs/Monolith2.png similarity index 100% rename from resources/mods/DimensionalDoors/textures/mobs/Monolith2.png rename to resources/mods/DimDoors/textures/mobs/Monolith2.png diff --git a/resources/mods/DimensionalDoors/textures/mobs/Monolith3.png b/resources/mods/DimDoors/textures/mobs/Monolith3.png similarity index 100% rename from resources/mods/DimensionalDoors/textures/mobs/Monolith3.png rename to resources/mods/DimDoors/textures/mobs/Monolith3.png diff --git a/resources/mods/DimensionalDoors/textures/mobs/Monolith4.png b/resources/mods/DimDoors/textures/mobs/Monolith4.png similarity index 100% rename from resources/mods/DimensionalDoors/textures/mobs/Monolith4.png rename to resources/mods/DimDoors/textures/mobs/Monolith4.png diff --git a/resources/mods/DimensionalDoors/textures/mobs/Monolith5.png b/resources/mods/DimDoors/textures/mobs/Monolith5.png similarity index 100% rename from resources/mods/DimensionalDoors/textures/mobs/Monolith5.png rename to resources/mods/DimDoors/textures/mobs/Monolith5.png diff --git a/resources/mods/DimensionalDoors/textures/mobs/Monolith6.png b/resources/mods/DimDoors/textures/mobs/Monolith6.png similarity index 100% rename from resources/mods/DimensionalDoors/textures/mobs/Monolith6.png rename to resources/mods/DimDoors/textures/mobs/Monolith6.png diff --git a/resources/mods/DimensionalDoors/textures/mobs/Monolith7.png b/resources/mods/DimDoors/textures/mobs/Monolith7.png similarity index 100% rename from resources/mods/DimensionalDoors/textures/mobs/Monolith7.png rename to resources/mods/DimDoors/textures/mobs/Monolith7.png diff --git a/resources/mods/DimensionalDoors/textures/mobs/Monolith8.png b/resources/mods/DimDoors/textures/mobs/Monolith8.png similarity index 100% rename from resources/mods/DimensionalDoors/textures/mobs/Monolith8.png rename to resources/mods/DimDoors/textures/mobs/Monolith8.png diff --git a/resources/mods/DimensionalDoors/textures/mobs/Monolith9.png b/resources/mods/DimDoors/textures/mobs/Monolith9.png similarity index 100% rename from resources/mods/DimensionalDoors/textures/mobs/Monolith9.png rename to resources/mods/DimDoors/textures/mobs/Monolith9.png diff --git a/resources/mods/DimensionalDoors/textures/mobs/Untitled-2.psd b/resources/mods/DimDoors/textures/mobs/Untitled-2.psd similarity index 100% rename from resources/mods/DimensionalDoors/textures/mobs/Untitled-2.psd rename to resources/mods/DimDoors/textures/mobs/Untitled-2.psd diff --git a/resources/mods/DimensionalDoors/textures/other/limboMoon.png b/resources/mods/DimDoors/textures/other/limboMoon.png similarity index 100% rename from resources/mods/DimensionalDoors/textures/other/limboMoon.png rename to resources/mods/DimDoors/textures/other/limboMoon.png diff --git a/resources/mods/DimensionalDoors/textures/other/limboSun.png b/resources/mods/DimDoors/textures/other/limboSun.png similarity index 100% rename from resources/mods/DimensionalDoors/textures/other/limboSun.png rename to resources/mods/DimDoors/textures/other/limboSun.png diff --git a/resources/mods/DimensionalDoors/sounds/Shepard Tone.ogg b/resources/mods/DimensionalDoors/sounds/Shepard Tone.ogg deleted file mode 100644 index d854ba5..0000000 Binary files a/resources/mods/DimensionalDoors/sounds/Shepard Tone.ogg and /dev/null differ diff --git a/resources/mods/DimensionalDoors/sounds/wylkermaxcrack - Copy.wav b/resources/mods/DimensionalDoors/sounds/wylkermaxcrack - Copy.wav deleted file mode 100644 index 45a3e4a..0000000 Binary files a/resources/mods/DimensionalDoors/sounds/wylkermaxcrack - Copy.wav and /dev/null differ diff --git a/resources/mods/DimensionalDoors/textures/mobs/sparklymob/Monolith0.png b/resources/mods/DimensionalDoors/textures/mobs/sparklymob/Monolith0.png deleted file mode 100644 index 767a47d..0000000 Binary files a/resources/mods/DimensionalDoors/textures/mobs/sparklymob/Monolith0.png and /dev/null differ diff --git a/resources/mods/DimensionalDoors/textures/mobs/sparklymob/Monolith1.png b/resources/mods/DimensionalDoors/textures/mobs/sparklymob/Monolith1.png deleted file mode 100644 index 5b28b67..0000000 Binary files a/resources/mods/DimensionalDoors/textures/mobs/sparklymob/Monolith1.png and /dev/null differ diff --git a/resources/mods/DimensionalDoors/textures/mobs/sparklymob/Monolith10.png b/resources/mods/DimensionalDoors/textures/mobs/sparklymob/Monolith10.png deleted file mode 100644 index 9d7a04a..0000000 Binary files a/resources/mods/DimensionalDoors/textures/mobs/sparklymob/Monolith10.png and /dev/null differ diff --git a/resources/mods/DimensionalDoors/textures/mobs/sparklymob/Monolith11.png b/resources/mods/DimensionalDoors/textures/mobs/sparklymob/Monolith11.png deleted file mode 100644 index 8d4ba6c..0000000 Binary files a/resources/mods/DimensionalDoors/textures/mobs/sparklymob/Monolith11.png and /dev/null differ diff --git a/resources/mods/DimensionalDoors/textures/mobs/sparklymob/Monolith12.png b/resources/mods/DimensionalDoors/textures/mobs/sparklymob/Monolith12.png deleted file mode 100644 index 315ad55..0000000 Binary files a/resources/mods/DimensionalDoors/textures/mobs/sparklymob/Monolith12.png and /dev/null differ diff --git a/resources/mods/DimensionalDoors/textures/mobs/sparklymob/Monolith13.png b/resources/mods/DimensionalDoors/textures/mobs/sparklymob/Monolith13.png deleted file mode 100644 index 7eeb2f2..0000000 Binary files a/resources/mods/DimensionalDoors/textures/mobs/sparklymob/Monolith13.png and /dev/null differ diff --git a/resources/mods/DimensionalDoors/textures/mobs/sparklymob/Monolith14.png b/resources/mods/DimensionalDoors/textures/mobs/sparklymob/Monolith14.png deleted file mode 100644 index ff2f492..0000000 Binary files a/resources/mods/DimensionalDoors/textures/mobs/sparklymob/Monolith14.png and /dev/null differ diff --git a/resources/mods/DimensionalDoors/textures/mobs/sparklymob/Monolith15.png b/resources/mods/DimensionalDoors/textures/mobs/sparklymob/Monolith15.png deleted file mode 100644 index ec1b0f0..0000000 Binary files a/resources/mods/DimensionalDoors/textures/mobs/sparklymob/Monolith15.png and /dev/null differ diff --git a/resources/mods/DimensionalDoors/textures/mobs/sparklymob/Monolith16.png b/resources/mods/DimensionalDoors/textures/mobs/sparklymob/Monolith16.png deleted file mode 100644 index 7bdeb25..0000000 Binary files a/resources/mods/DimensionalDoors/textures/mobs/sparklymob/Monolith16.png and /dev/null differ diff --git a/resources/mods/DimensionalDoors/textures/mobs/sparklymob/Monolith17.png b/resources/mods/DimensionalDoors/textures/mobs/sparklymob/Monolith17.png deleted file mode 100644 index 03809d4..0000000 Binary files a/resources/mods/DimensionalDoors/textures/mobs/sparklymob/Monolith17.png and /dev/null differ diff --git a/resources/mods/DimensionalDoors/textures/mobs/sparklymob/Monolith18.png b/resources/mods/DimensionalDoors/textures/mobs/sparklymob/Monolith18.png deleted file mode 100644 index 908820a..0000000 Binary files a/resources/mods/DimensionalDoors/textures/mobs/sparklymob/Monolith18.png and /dev/null differ diff --git a/resources/mods/DimensionalDoors/textures/mobs/sparklymob/Monolith2.png b/resources/mods/DimensionalDoors/textures/mobs/sparklymob/Monolith2.png deleted file mode 100644 index 658cd30..0000000 Binary files a/resources/mods/DimensionalDoors/textures/mobs/sparklymob/Monolith2.png and /dev/null differ diff --git a/resources/mods/DimensionalDoors/textures/mobs/sparklymob/Monolith3.png b/resources/mods/DimensionalDoors/textures/mobs/sparklymob/Monolith3.png deleted file mode 100644 index 7e25d8f..0000000 Binary files a/resources/mods/DimensionalDoors/textures/mobs/sparklymob/Monolith3.png and /dev/null differ diff --git a/resources/mods/DimensionalDoors/textures/mobs/sparklymob/Monolith4.png b/resources/mods/DimensionalDoors/textures/mobs/sparklymob/Monolith4.png deleted file mode 100644 index bec4a7f..0000000 Binary files a/resources/mods/DimensionalDoors/textures/mobs/sparklymob/Monolith4.png and /dev/null differ diff --git a/resources/mods/DimensionalDoors/textures/mobs/sparklymob/Monolith5.png b/resources/mods/DimensionalDoors/textures/mobs/sparklymob/Monolith5.png deleted file mode 100644 index d770a91..0000000 Binary files a/resources/mods/DimensionalDoors/textures/mobs/sparklymob/Monolith5.png and /dev/null differ diff --git a/resources/mods/DimensionalDoors/textures/mobs/sparklymob/Monolith6.png b/resources/mods/DimensionalDoors/textures/mobs/sparklymob/Monolith6.png deleted file mode 100644 index 607c61d..0000000 Binary files a/resources/mods/DimensionalDoors/textures/mobs/sparklymob/Monolith6.png and /dev/null differ diff --git a/resources/mods/DimensionalDoors/textures/mobs/sparklymob/Monolith7.png b/resources/mods/DimensionalDoors/textures/mobs/sparklymob/Monolith7.png deleted file mode 100644 index 4330774..0000000 Binary files a/resources/mods/DimensionalDoors/textures/mobs/sparklymob/Monolith7.png and /dev/null differ diff --git a/resources/mods/DimensionalDoors/textures/mobs/sparklymob/Monolith8.png b/resources/mods/DimensionalDoors/textures/mobs/sparklymob/Monolith8.png deleted file mode 100644 index cbea45b..0000000 Binary files a/resources/mods/DimensionalDoors/textures/mobs/sparklymob/Monolith8.png and /dev/null differ diff --git a/resources/mods/DimensionalDoors/textures/mobs/sparklymob/Monolith9.png b/resources/mods/DimensionalDoors/textures/mobs/sparklymob/Monolith9.png deleted file mode 100644 index 8a7c3a5..0000000 Binary files a/resources/mods/DimensionalDoors/textures/mobs/sparklymob/Monolith9.png and /dev/null differ diff --git a/resources/mods/DimensionalDoors/textures/other/limboSun2.png b/resources/mods/DimensionalDoors/textures/other/limboSun2.png deleted file mode 100644 index 40fd7eb..0000000 Binary files a/resources/mods/DimensionalDoors/textures/other/limboSun2.png and /dev/null differ