From 4651be614e370c6c1ff43b3b1a7c5e9aa13a2805 Mon Sep 17 00:00:00 2001 From: StevenRS11 Date: Sun, 9 Jun 2013 23:56:31 -0400 Subject: [PATCH] working on dungeon changes --- .../commands/CommandEndDungeonCreation.java | 2 +- StevenDimDoors/mod_pocketDim/dimHelper.java | 2 +- .../world/WorldChunkManagerLimbo.java | 51 ------------------- .../world/WorldChunkManagerPocket.java | 23 --------- .../mod_pocketDim/world/pocketGenerator.java | 5 ++ 5 files changed, 7 insertions(+), 76 deletions(-) delete mode 100644 StevenDimDoors/mod_pocketDim/world/WorldChunkManagerLimbo.java delete mode 100644 StevenDimDoors/mod_pocketDim/world/WorldChunkManagerPocket.java diff --git a/StevenDimDoors/mod_pocketDim/commands/CommandEndDungeonCreation.java b/StevenDimDoors/mod_pocketDim/commands/CommandEndDungeonCreation.java index 260f66c..c5946e5 100644 --- a/StevenDimDoors/mod_pocketDim/commands/CommandEndDungeonCreation.java +++ b/StevenDimDoors/mod_pocketDim/commands/CommandEndDungeonCreation.java @@ -57,7 +57,7 @@ public class CommandEndDungeonCreation extends CommandBase player.sendChatToPlayer("created dungeon schematic in " +mod_pocketDim.schematicContainer+"/"+var2[0]+".schematic"); mod_pocketDim.customDungeons.add(newDungeon); - if(customDungeonImporter.customDungeonStatus.containsKey(player.worldObj.provider.dimensionId)) + if(customDungeonImporter.customDungeonStatus.containsKey(player.worldObj.provider.dimensionId)&&!player.worldObj.isRemote) { dimHelper.instance.teleportToPocket(player.worldObj, customDungeonImporter.customDungeonStatus.get(player.worldObj.provider.dimensionId), player); diff --git a/StevenDimDoors/mod_pocketDim/dimHelper.java b/StevenDimDoors/mod_pocketDim/dimHelper.java index c6f3b04..b9b3302 100644 --- a/StevenDimDoors/mod_pocketDim/dimHelper.java +++ b/StevenDimDoors/mod_pocketDim/dimHelper.java @@ -288,7 +288,7 @@ public class dimHelper extends DimensionManager if(entity instanceof EntityPlayerMP) { - WorldServer.class.cast(newWorld).theChunkProviderServer.loadChunk(MathHelper.floor_double(entity.posX) >> 4, MathHelper.floor_double(entity.posZ) >> 4); + WorldServer.class.cast(newWorld).getChunkProvider().loadChunk(MathHelper.floor_double(entity.posX) >> 4, MathHelper.floor_double(entity.posZ) >> 4); } mod_pocketDim.teleporter.placeInPortal(entity, newWorld, link); return entity; diff --git a/StevenDimDoors/mod_pocketDim/world/WorldChunkManagerLimbo.java b/StevenDimDoors/mod_pocketDim/world/WorldChunkManagerLimbo.java deleted file mode 100644 index fb9118d..0000000 --- a/StevenDimDoors/mod_pocketDim/world/WorldChunkManagerLimbo.java +++ /dev/null @@ -1,51 +0,0 @@ -package StevenDimDoors.mod_pocketDim.world; - -import StevenDimDoors.mod_pocketDim.mod_pocketDim; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; -import java.util.Random; -import net.minecraft.world.ChunkPosition; -import net.minecraft.world.World; -import net.minecraft.world.WorldType; -import net.minecraft.world.biome.BiomeGenBase; -import net.minecraft.world.biome.WorldChunkManager; -import net.minecraft.world.gen.layer.GenLayer; -import net.minecraft.world.gen.layer.IntCache; - -import net.minecraftforge.common.*; -import net.minecraftforge.event.terraingen.*; -import static net.minecraft.world.biome.BiomeGenBase.*; - -public class WorldChunkManagerLimbo extends WorldChunkManager - - -{ - - BiomeGenBase biomeGenerator = mod_pocketDim.limboBiome; - public BiomeGenBase[] getBiomesForGeneration(BiomeGenBase[] par1ArrayOfBiomeGenBase, int par2, int par3, int par4, int par5) - { - return new BiomeGenBase[] {mod_pocketDim.limboBiome}; - } - - public BiomeGenBase[] getBiomeGenAt(BiomeGenBase[] par1ArrayOfBiomeGenBase, int par2, int par3, int par4, int par5, boolean par6) - { - return new BiomeGenBase[] {mod_pocketDim.limboBiome}; - - } - - public BiomeGenBase getBiomeGenAt(int par1, int par2) - { - return mod_pocketDim.limboBiome; - } - - public boolean areBiomesViable(int par1, int par2, int par3, List par4List) - { - return par4List.contains(this.biomeGenerator); - } - - - -} \ No newline at end of file diff --git a/StevenDimDoors/mod_pocketDim/world/WorldChunkManagerPocket.java b/StevenDimDoors/mod_pocketDim/world/WorldChunkManagerPocket.java deleted file mode 100644 index b23c1ad..0000000 --- a/StevenDimDoors/mod_pocketDim/world/WorldChunkManagerPocket.java +++ /dev/null @@ -1,23 +0,0 @@ -package StevenDimDoors.mod_pocketDim.world; - -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; -import java.util.Random; -import net.minecraft.world.ChunkPosition; -import net.minecraft.world.World; -import net.minecraft.world.WorldType; -import net.minecraft.world.biome.WorldChunkManager; -import net.minecraft.world.gen.layer.GenLayer; -import net.minecraft.world.gen.layer.IntCache; - -import net.minecraftforge.common.*; -import net.minecraftforge.event.terraingen.*; -import static net.minecraft.world.biome.BiomeGenBase.*; - -public class WorldChunkManagerPocket extends WorldChunkManager -{ - -} \ No newline at end of file diff --git a/StevenDimDoors/mod_pocketDim/world/pocketGenerator.java b/StevenDimDoors/mod_pocketDim/world/pocketGenerator.java index f8b9db9..0639c9b 100644 --- a/StevenDimDoors/mod_pocketDim/world/pocketGenerator.java +++ b/StevenDimDoors/mod_pocketDim/world/pocketGenerator.java @@ -31,6 +31,11 @@ public class pocketGenerator extends ChunkProviderGenerate implements IChunkProv } + public boolean unloadQueuedChunks() + { + return true; + } + @Override