diff --git a/StevenDimDoors/mod_pocketDim/RiftGenerator.java b/StevenDimDoors/mod_pocketDim/RiftGenerator.java index 30d87da..5c3715a 100644 --- a/StevenDimDoors/mod_pocketDim/RiftGenerator.java +++ b/StevenDimDoors/mod_pocketDim/RiftGenerator.java @@ -10,7 +10,7 @@ import StevenDimDoors.mod_pocketDim.helpers.dimHelper; import StevenDimDoors.mod_pocketDim.items.ItemRiftBlade; import StevenDimDoors.mod_pocketDim.items.itemDimDoor; import StevenDimDoors.mod_pocketDim.world.LimboProvider; -import StevenDimDoors.mod_pocketDim.world.PocketProviderX; +import StevenDimDoors.mod_pocketDim.world.PocketProvider; import cpw.mods.fml.common.IWorldGenerator; public class RiftGenerator implements IWorldGenerator @@ -38,7 +38,7 @@ public class RiftGenerator implements IWorldGenerator //Don't generate rifts or gateways if the rift generation flag is disabled, //the current world is a pocket dimension, or the world is remote. if ((!properties.WorldRiftGenerationEnabled && !(world.provider instanceof LimboProvider)) || - world.provider instanceof PocketProviderX || world.isRemote) + world.provider instanceof PocketProvider || world.isRemote) { return; } diff --git a/StevenDimDoors/mod_pocketDim/blocks/dimHatch.java b/StevenDimDoors/mod_pocketDim/blocks/dimHatch.java index 81e1b47..c1655a5 100644 --- a/StevenDimDoors/mod_pocketDim/blocks/dimHatch.java +++ b/StevenDimDoors/mod_pocketDim/blocks/dimHatch.java @@ -4,7 +4,7 @@ import StevenDimDoors.mod_pocketDim.DimData; import StevenDimDoors.mod_pocketDim.LinkData; import StevenDimDoors.mod_pocketDim.mod_pocketDim; import StevenDimDoors.mod_pocketDim.helpers.dimHelper; -import StevenDimDoors.mod_pocketDim.world.PocketProviderX; +import StevenDimDoors.mod_pocketDim.world.PocketProvider; import net.minecraft.block.BlockTrapDoor; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IconRegister; @@ -48,7 +48,7 @@ public class dimHatch extends BlockTrapDoor int num = par1World.getBlockMetadata(par2, par3, par4); - if(!par1World.isRemote&&(num>3&&num<8||num>11)&&par1World.provider instanceof PocketProviderX) + if(!par1World.isRemote&&(num>3&&num<8||num>11)&&par1World.provider instanceof PocketProvider) { this.onPoweredBlockChange(par1World, par2, par3, par4, false); diff --git a/StevenDimDoors/mod_pocketDim/helpers/dimHelper.java b/StevenDimDoors/mod_pocketDim/helpers/dimHelper.java index 316ff2c..795c603 100644 --- a/StevenDimDoors/mod_pocketDim/helpers/dimHelper.java +++ b/StevenDimDoors/mod_pocketDim/helpers/dimHelper.java @@ -42,7 +42,7 @@ import StevenDimDoors.mod_pocketDim.Point3D; import StevenDimDoors.mod_pocketDim.TileEntityRift; import StevenDimDoors.mod_pocketDim.mod_pocketDim; import StevenDimDoors.mod_pocketDim.world.LimboProvider; -import StevenDimDoors.mod_pocketDim.world.PocketProviderX; +import StevenDimDoors.mod_pocketDim.world.PocketProvider; import cpw.mods.fml.common.FMLCommonHandler; import cpw.mods.fml.common.registry.GameRegistry; import cpw.mods.fml.relauncher.Side; @@ -386,7 +386,7 @@ public class dimHelper extends DimensionManager } else if(!this.dimList.containsKey(world.provider.dimensionId)) { - if(!(world.provider instanceof PocketProviderX ||world.provider instanceof LimboProvider)) + if(!(world.provider instanceof PocketProvider ||world.provider instanceof LimboProvider)) { DimData data = new DimData(world.provider.dimensionId, false, 0, 0, world.getSpawnPoint().posX, world.getSpawnPoint().posY, world.getSpawnPoint().posZ); } diff --git a/StevenDimDoors/mod_pocketDim/mod_pocketDim.java b/StevenDimDoors/mod_pocketDim/mod_pocketDim.java index 2c652fd..068299c 100644 --- a/StevenDimDoors/mod_pocketDim/mod_pocketDim.java +++ b/StevenDimDoors/mod_pocketDim/mod_pocketDim.java @@ -51,7 +51,7 @@ import StevenDimDoors.mod_pocketDim.ticking.RiftRegenerator; import StevenDimDoors.mod_pocketDim.world.BiomeGenLimbo; import StevenDimDoors.mod_pocketDim.world.BiomeGenPocket; import StevenDimDoors.mod_pocketDim.world.LimboProvider; -import StevenDimDoors.mod_pocketDim.world.PocketProviderX; +import StevenDimDoors.mod_pocketDim.world.PocketProvider; import StevenDimDoors.mod_pocketDimClient.ClientPacketHandler; import StevenDimDoors.mod_pocketDimClient.ClientTickHandler; import cpw.mods.fml.common.Mod; @@ -228,7 +228,7 @@ public class mod_pocketDim GameRegistry.registerPlayerTracker(tracker); - DimensionManager.registerProviderType(properties.PocketProviderID, PocketProviderX.class, false); + DimensionManager.registerProviderType(properties.PocketProviderID, PocketProvider.class, false); DimensionManager.registerProviderType(properties.LimboProviderID, LimboProvider.class, false); DimensionManager.registerDimension(properties.LimboDimensionID, properties.LimboProviderID); diff --git a/StevenDimDoors/mod_pocketDim/ticking/MobMonolith.java b/StevenDimDoors/mod_pocketDim/ticking/MobMonolith.java index ba08249..1cdb7f3 100644 --- a/StevenDimDoors/mod_pocketDim/ticking/MobMonolith.java +++ b/StevenDimDoors/mod_pocketDim/ticking/MobMonolith.java @@ -16,7 +16,7 @@ import StevenDimDoors.mod_pocketDim.DDProperties; import StevenDimDoors.mod_pocketDim.LinkData; import StevenDimDoors.mod_pocketDim.helpers.dimHelper; import StevenDimDoors.mod_pocketDim.world.LimboProvider; -import StevenDimDoors.mod_pocketDim.world.PocketProviderX; +import StevenDimDoors.mod_pocketDim.world.PocketProvider; public class MobMonolith extends EntityFlying implements IMob { @@ -86,7 +86,7 @@ public class MobMonolith extends EntityFlying implements IMob @Override public void onEntityUpdate() { - if(!(this.worldObj.provider instanceof LimboProvider ||this.worldObj.provider instanceof PocketProviderX)) + if(!(this.worldObj.provider instanceof LimboProvider ||this.worldObj.provider instanceof PocketProvider)) { this.setDead(); } @@ -133,7 +133,7 @@ public class MobMonolith extends EntityFlying implements IMob } - if(this.worldObj.provider instanceof PocketProviderX||this.worldObj.getClosestPlayerToEntity(this, 5)!=null) + if(this.worldObj.provider instanceof PocketProvider||this.worldObj.getClosestPlayerToEntity(this, 5)!=null) { aggro++; @@ -372,7 +372,7 @@ public class MobMonolith extends EntityFlying implements IMob } } - else if(this.worldObj.provider instanceof PocketProviderX) + else if(this.worldObj.provider instanceof PocketProvider) { if(list.size()>5||this.worldObj.canBlockSeeTheSky((int)this.posX, (int)this.posY, (int)this.posZ)) { diff --git a/StevenDimDoors/mod_pocketDim/world/LimboProvider.java b/StevenDimDoors/mod_pocketDim/world/LimboProvider.java index f6a9eda..166a89f 100644 --- a/StevenDimDoors/mod_pocketDim/world/LimboProvider.java +++ b/StevenDimDoors/mod_pocketDim/world/LimboProvider.java @@ -30,7 +30,7 @@ public class LimboProvider extends WorldProvider public LimboProvider() { this.hasNoSky = false; - this.skyRenderer = new LimboSkyProviderX(); + this.skyRenderer = new LimboSkyProvider(); this.spawner = mod_pocketDim.spawner; this.properties = mod_pocketDim.properties; } diff --git a/StevenDimDoors/mod_pocketDim/world/LimboSkyProviderX.java b/StevenDimDoors/mod_pocketDim/world/LimboSkyProvider.java similarity index 99% rename from StevenDimDoors/mod_pocketDim/world/LimboSkyProviderX.java rename to StevenDimDoors/mod_pocketDim/world/LimboSkyProvider.java index 6ce832e..21b1d73 100644 --- a/StevenDimDoors/mod_pocketDim/world/LimboSkyProviderX.java +++ b/StevenDimDoors/mod_pocketDim/world/LimboSkyProvider.java @@ -11,7 +11,7 @@ import net.minecraft.util.MathHelper; import net.minecraft.util.Vec3; import net.minecraftforge.client.IRenderHandler; -public class LimboSkyProviderX extends IRenderHandler +public class LimboSkyProvider extends IRenderHandler { int starGLCallList; diff --git a/StevenDimDoors/mod_pocketDim/world/PocketProviderX.java b/StevenDimDoors/mod_pocketDim/world/PocketProvider.java similarity index 97% rename from StevenDimDoors/mod_pocketDim/world/PocketProviderX.java rename to StevenDimDoors/mod_pocketDim/world/PocketProvider.java index e39ce39..e6047d3 100644 --- a/StevenDimDoors/mod_pocketDim/world/PocketProviderX.java +++ b/StevenDimDoors/mod_pocketDim/world/PocketProvider.java @@ -14,7 +14,7 @@ import StevenDimDoors.mod_pocketDim.ticking.MonolithSpawner; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -public class PocketProviderX extends WorldProvider +public class PocketProvider extends WorldProvider { public int exitXCoord; public int exitYCoord; @@ -27,7 +27,7 @@ public class PocketProviderX extends WorldProvider private DDProperties properties; private MonolithSpawner spawner; - public PocketProviderX() + public PocketProvider() { this.hasNoSky = true; this.spawner = mod_pocketDim.spawner;