From 3a6b22c7cc15c3143fe14dcf4009da69bec5e4a3 Mon Sep 17 00:00:00 2001 From: SenseiKiwi Date: Fri, 26 Jul 2013 05:30:59 -0400 Subject: [PATCH] Renamed Classes Renamed MobObelisk to MobMonolith. Renamed LimboSkyProvider and PocketProvider to have Xs at the ends of their names. This is temporary so that I can change the name's capitalization. Windows considers the names the same because it's file naming is case insensitive. --- .../mod_pocketDim/RiftGenerator.java | 4 ++-- .../mod_pocketDim/SchematicLoader.java | 4 ++-- .../mod_pocketDim/TileEntityRift.java | 2 +- .../mod_pocketDim/blocks/dimHatch.java | 4 ++-- .../mod_pocketDim/helpers/dimHelper.java | 4 ++-- .../mod_pocketDim/mod_pocketDim.java | 10 +++++----- .../{MobObelisk.java => MobMonolith.java} | 19 ++++++------------- .../ticking/MonolithSpawner.java | 4 ++-- .../mod_pocketDim/world/BiomeGenLimbo.java | 2 +- .../mod_pocketDim/world/BiomeGenPocket.java | 2 +- .../mod_pocketDim/world/LimboProvider.java | 2 +- ...kyProvider.java => LimboSkyProviderX.java} | 2 +- ...cketProvider.java => PocketProviderX.java} | 4 ++-- .../mod_pocketDimClient/ClientProxy.java | 4 ++-- .../mod_pocketDimClient/ModelMobObelisk.java | 4 ++-- .../mod_pocketDimClient/RenderMobObelisk.java | 2 +- 16 files changed, 33 insertions(+), 40 deletions(-) rename StevenDimDoors/mod_pocketDim/ticking/{MobObelisk.java => MobMonolith.java} (92%) rename StevenDimDoors/mod_pocketDim/world/{limboSkyProvider.java => LimboSkyProviderX.java} (99%) rename StevenDimDoors/mod_pocketDim/world/{pocketProvider.java => PocketProviderX.java} (97%) diff --git a/StevenDimDoors/mod_pocketDim/RiftGenerator.java b/StevenDimDoors/mod_pocketDim/RiftGenerator.java index 76888069..30d87daf 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.pocketProvider; +import StevenDimDoors.mod_pocketDim.world.PocketProviderX; 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 pocketProvider || world.isRemote) + world.provider instanceof PocketProviderX || world.isRemote) { return; } diff --git a/StevenDimDoors/mod_pocketDim/SchematicLoader.java b/StevenDimDoors/mod_pocketDim/SchematicLoader.java index c9938362..332c535d 100644 --- a/StevenDimDoors/mod_pocketDim/SchematicLoader.java +++ b/StevenDimDoors/mod_pocketDim/SchematicLoader.java @@ -31,7 +31,7 @@ import net.minecraftforge.common.ChestGenHooks; import StevenDimDoors.mod_pocketDim.helpers.DungeonHelper; import StevenDimDoors.mod_pocketDim.helpers.dimHelper; import StevenDimDoors.mod_pocketDim.helpers.yCoordHelper; -import StevenDimDoors.mod_pocketDim.ticking.MobObelisk; +import StevenDimDoors.mod_pocketDim.ticking.MobMonolith; public class SchematicLoader { @@ -1151,7 +1151,7 @@ public class SchematicLoader Point3D frameLocation = point.clone(); transformPoint(frameLocation, schematicEntrance, orientation - entryDirection, pocketCenter); - Entity mob = new MobObelisk(world); + Entity mob = new MobMonolith(world); mob.setLocationAndAngles(frameLocation.getX(), frameLocation.getY(), frameLocation.getZ(), 1, 1); //TODO: Why not set the angles to 0? @.@ ~SenseiKiwi world.spawnEntityInWorld(mob); } diff --git a/StevenDimDoors/mod_pocketDim/TileEntityRift.java b/StevenDimDoors/mod_pocketDim/TileEntityRift.java index ba7d97cf..2d057bb5 100644 --- a/StevenDimDoors/mod_pocketDim/TileEntityRift.java +++ b/StevenDimDoors/mod_pocketDim/TileEntityRift.java @@ -8,7 +8,7 @@ import java.util.Random; import StevenDimDoors.mod_pocketDim.helpers.dimHelper; import StevenDimDoors.mod_pocketDim.helpers.yCoordHelper; -import StevenDimDoors.mod_pocketDim.ticking.MobObelisk; +import StevenDimDoors.mod_pocketDim.ticking.MobMonolith; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityList; diff --git a/StevenDimDoors/mod_pocketDim/blocks/dimHatch.java b/StevenDimDoors/mod_pocketDim/blocks/dimHatch.java index c4aaad2a..81e1b47e 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.pocketProvider; +import StevenDimDoors.mod_pocketDim.world.PocketProviderX; 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 pocketProvider) + if(!par1World.isRemote&&(num>3&&num<8||num>11)&&par1World.provider instanceof PocketProviderX) { this.onPoweredBlockChange(par1World, par2, par3, par4, false); diff --git a/StevenDimDoors/mod_pocketDim/helpers/dimHelper.java b/StevenDimDoors/mod_pocketDim/helpers/dimHelper.java index 97938adb..316ff2cd 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.pocketProvider; +import StevenDimDoors.mod_pocketDim.world.PocketProviderX; 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 pocketProvider ||world.provider instanceof LimboProvider)) + if(!(world.provider instanceof PocketProviderX ||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 e86dde42..2c652fdd 100644 --- a/StevenDimDoors/mod_pocketDim/mod_pocketDim.java +++ b/StevenDimDoors/mod_pocketDim/mod_pocketDim.java @@ -45,13 +45,13 @@ 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.ticking.MobMonolith; import StevenDimDoors.mod_pocketDim.ticking.MonolithSpawner; 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.pocketProvider; +import StevenDimDoors.mod_pocketDim.world.PocketProviderX; 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, pocketProvider.class, false); + DimensionManager.registerProviderType(properties.PocketProviderID, PocketProviderX.class, false); DimensionManager.registerProviderType(properties.LimboProviderID, LimboProvider.class, false); DimensionManager.registerDimension(properties.LimboDimensionID, properties.LimboProviderID); @@ -265,8 +265,8 @@ public class mod_pocketDim GameRegistry.registerTileEntity(TileEntityDimDoor.class, "TileEntityDimDoor"); GameRegistry.registerTileEntity(TileEntityRift.class, "TileEntityRift"); - EntityRegistry.registerModEntity(MobObelisk.class, "Monolith", properties.MonolithEntityID, this, 70, 1, true); - EntityList.IDtoClassMapping.put(properties.MonolithEntityID, MobObelisk.class); + EntityRegistry.registerModEntity(MobMonolith.class, "Monolith", properties.MonolithEntityID, this, 70, 1, true); + EntityList.IDtoClassMapping.put(properties.MonolithEntityID, MobMonolith.class); EntityList.entityEggs.put(properties.MonolithEntityID, new EntityEggInfo(properties.MonolithEntityID, 0, 0xffffff)); LanguageRegistry.instance().addStringLocalization("entity.DimDoors.Obelisk.name", "Monolith"); diff --git a/StevenDimDoors/mod_pocketDim/ticking/MobObelisk.java b/StevenDimDoors/mod_pocketDim/ticking/MobMonolith.java similarity index 92% rename from StevenDimDoors/mod_pocketDim/ticking/MobObelisk.java rename to StevenDimDoors/mod_pocketDim/ticking/MobMonolith.java index b91b65ea..ba082491 100644 --- a/StevenDimDoors/mod_pocketDim/ticking/MobObelisk.java +++ b/StevenDimDoors/mod_pocketDim/ticking/MobMonolith.java @@ -8,24 +8,17 @@ import net.minecraft.entity.EntityLiving; import net.minecraft.entity.monster.IMob; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.network.packet.Packet34EntityTeleport; import net.minecraft.util.AxisAlignedBB; import net.minecraft.util.DamageSource; import net.minecraft.util.MathHelper; import net.minecraft.world.World; import StevenDimDoors.mod_pocketDim.DDProperties; import StevenDimDoors.mod_pocketDim.LinkData; -import StevenDimDoors.mod_pocketDim.mod_pocketDim; import StevenDimDoors.mod_pocketDim.helpers.dimHelper; import StevenDimDoors.mod_pocketDim.world.LimboProvider; -import StevenDimDoors.mod_pocketDim.world.pocketProvider; +import StevenDimDoors.mod_pocketDim.world.PocketProviderX; -import cpw.mods.fml.client.FMLClientHandler; -import cpw.mods.fml.common.network.PacketDispatcher; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; - -public class MobObelisk extends EntityFlying implements IMob +public class MobMonolith extends EntityFlying implements IMob { float soundTime = 0; @@ -38,7 +31,7 @@ public class MobObelisk extends EntityFlying implements IMob int destY=0; int destZ=0; - public MobObelisk(World par1World) + public MobMonolith(World par1World) { super(par1World); this.texture="/mods/DimDoors/textures/mobs/Monolith0.png"; @@ -93,7 +86,7 @@ public class MobObelisk extends EntityFlying implements IMob @Override public void onEntityUpdate() { - if(!(this.worldObj.provider instanceof LimboProvider ||this.worldObj.provider instanceof pocketProvider)) + if(!(this.worldObj.provider instanceof LimboProvider ||this.worldObj.provider instanceof PocketProviderX)) { this.setDead(); } @@ -140,7 +133,7 @@ public class MobObelisk extends EntityFlying implements IMob } - if(this.worldObj.provider instanceof pocketProvider||this.worldObj.getClosestPlayerToEntity(this, 5)!=null) + if(this.worldObj.provider instanceof PocketProviderX||this.worldObj.getClosestPlayerToEntity(this, 5)!=null) { aggro++; @@ -379,7 +372,7 @@ public class MobObelisk extends EntityFlying implements IMob } } - else if(this.worldObj.provider instanceof pocketProvider) + else if(this.worldObj.provider instanceof PocketProviderX) { if(list.size()>5||this.worldObj.canBlockSeeTheSky((int)this.posX, (int)this.posY, (int)this.posZ)) { diff --git a/StevenDimDoors/mod_pocketDim/ticking/MonolithSpawner.java b/StevenDimDoors/mod_pocketDim/ticking/MonolithSpawner.java index 2e6d269d..fb2fece6 100644 --- a/StevenDimDoors/mod_pocketDim/ticking/MonolithSpawner.java +++ b/StevenDimDoors/mod_pocketDim/ticking/MonolithSpawner.java @@ -127,7 +127,7 @@ public class MonolithSpawner implements IRegularTickReceiver { } while (!pocket.isAirBlock(x,jumpHeight+6 , z)&&jumpSanity<20); - Entity monolith = new MobObelisk(pocket); + Entity monolith = new MobMonolith(pocket); monolith.setLocationAndAngles(x, jumpHeight, z, 1, 1); pocket.spawnEntityInWorld(monolith); didSpawn = true; @@ -184,7 +184,7 @@ public class MonolithSpawner implements IRegularTickReceiver { while (!limbo.isAirBlock(x, jumpHeight + 6, z) && jumpSanity < 20); - Entity monolith = new MobObelisk(limbo); + Entity monolith = new MobMonolith(limbo); monolith.setLocationAndAngles(x, jumpHeight, z, 1, 1); limbo.spawnEntityInWorld(monolith); } diff --git a/StevenDimDoors/mod_pocketDim/world/BiomeGenLimbo.java b/StevenDimDoors/mod_pocketDim/world/BiomeGenLimbo.java index e8b48e11..4b8fd1d4 100644 --- a/StevenDimDoors/mod_pocketDim/world/BiomeGenLimbo.java +++ b/StevenDimDoors/mod_pocketDim/world/BiomeGenLimbo.java @@ -1,6 +1,6 @@ package StevenDimDoors.mod_pocketDim.world; -import StevenDimDoors.mod_pocketDim.ticking.MobObelisk; +import StevenDimDoors.mod_pocketDim.ticking.MobMonolith; import net.minecraft.entity.monster.EntitySpider; import net.minecraft.world.biome.BiomeGenBase; import net.minecraft.world.biome.SpawnListEntry; diff --git a/StevenDimDoors/mod_pocketDim/world/BiomeGenPocket.java b/StevenDimDoors/mod_pocketDim/world/BiomeGenPocket.java index 7a884a87..3fe0c57a 100644 --- a/StevenDimDoors/mod_pocketDim/world/BiomeGenPocket.java +++ b/StevenDimDoors/mod_pocketDim/world/BiomeGenPocket.java @@ -1,6 +1,6 @@ package StevenDimDoors.mod_pocketDim.world; -import StevenDimDoors.mod_pocketDim.ticking.MobObelisk; +import StevenDimDoors.mod_pocketDim.ticking.MobMonolith; import net.minecraft.world.biome.BiomeGenBase; import net.minecraft.world.biome.SpawnListEntry; diff --git a/StevenDimDoors/mod_pocketDim/world/LimboProvider.java b/StevenDimDoors/mod_pocketDim/world/LimboProvider.java index 99737fd4..f6a9eda1 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 limboSkyProvider(); + this.skyRenderer = new LimboSkyProviderX(); this.spawner = mod_pocketDim.spawner; this.properties = mod_pocketDim.properties; } diff --git a/StevenDimDoors/mod_pocketDim/world/limboSkyProvider.java b/StevenDimDoors/mod_pocketDim/world/LimboSkyProviderX.java similarity index 99% rename from StevenDimDoors/mod_pocketDim/world/limboSkyProvider.java rename to StevenDimDoors/mod_pocketDim/world/LimboSkyProviderX.java index 52e4cfe3..6ce832ea 100644 --- a/StevenDimDoors/mod_pocketDim/world/limboSkyProvider.java +++ b/StevenDimDoors/mod_pocketDim/world/LimboSkyProviderX.java @@ -11,7 +11,7 @@ import net.minecraft.util.MathHelper; import net.minecraft.util.Vec3; import net.minecraftforge.client.IRenderHandler; -public class limboSkyProvider extends IRenderHandler +public class LimboSkyProviderX extends IRenderHandler { int starGLCallList; diff --git a/StevenDimDoors/mod_pocketDim/world/pocketProvider.java b/StevenDimDoors/mod_pocketDim/world/PocketProviderX.java similarity index 97% rename from StevenDimDoors/mod_pocketDim/world/pocketProvider.java rename to StevenDimDoors/mod_pocketDim/world/PocketProviderX.java index c2981e7d..e39ce39a 100644 --- a/StevenDimDoors/mod_pocketDim/world/pocketProvider.java +++ b/StevenDimDoors/mod_pocketDim/world/PocketProviderX.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 pocketProvider extends WorldProvider +public class PocketProviderX extends WorldProvider { public int exitXCoord; public int exitYCoord; @@ -27,7 +27,7 @@ public class pocketProvider extends WorldProvider private DDProperties properties; private MonolithSpawner spawner; - public pocketProvider() + public PocketProviderX() { this.hasNoSky = true; this.spawner = mod_pocketDim.spawner; diff --git a/StevenDimDoors/mod_pocketDimClient/ClientProxy.java b/StevenDimDoors/mod_pocketDimClient/ClientProxy.java index a415f1e1..e169140f 100644 --- a/StevenDimDoors/mod_pocketDimClient/ClientProxy.java +++ b/StevenDimDoors/mod_pocketDimClient/ClientProxy.java @@ -12,7 +12,7 @@ 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; +import StevenDimDoors.mod_pocketDim.ticking.MobMonolith; public class ClientProxy extends CommonProxy @@ -27,7 +27,7 @@ public class ClientProxy extends CommonProxy //MinecraftForgeClient.preloadTexture(RIFT2_PNG); - RenderingRegistry.registerEntityRenderingHandler(MobObelisk.class, new RenderMobObelisk(.5F)); + RenderingRegistry.registerEntityRenderingHandler(MobMonolith.class, new RenderMobObelisk(.5F)); diff --git a/StevenDimDoors/mod_pocketDimClient/ModelMobObelisk.java b/StevenDimDoors/mod_pocketDimClient/ModelMobObelisk.java index 172008fd..564a9ca0 100644 --- a/StevenDimDoors/mod_pocketDimClient/ModelMobObelisk.java +++ b/StevenDimDoors/mod_pocketDimClient/ModelMobObelisk.java @@ -17,7 +17,7 @@ import java.util.Random; import org.lwjgl.opengl.GL11; -import StevenDimDoors.mod_pocketDim.ticking.MobObelisk; +import StevenDimDoors.mod_pocketDim.ticking.MobMonolith; import net.minecraft.client.model.ModelBase; import net.minecraft.client.model.ModelRenderer; @@ -55,7 +55,7 @@ public class ModelMobObelisk extends ModelBase this.setRotationAngles(0, 0, 0, 0, 0,0, par1Entity); - GL11.glScalef(((MobObelisk) par1Entity).getRenderSizeModifier(), ((MobObelisk) par1Entity).getRenderSizeModifier(), ((MobObelisk) par1Entity).getRenderSizeModifier()); + GL11.glScalef(((MobMonolith) par1Entity).getRenderSizeModifier(), ((MobMonolith) par1Entity).getRenderSizeModifier(), ((MobMonolith) par1Entity).getRenderSizeModifier()); wholemonolith.render(par7); } diff --git a/StevenDimDoors/mod_pocketDimClient/RenderMobObelisk.java b/StevenDimDoors/mod_pocketDimClient/RenderMobObelisk.java index 4a6a8c75..e1060a96 100644 --- a/StevenDimDoors/mod_pocketDimClient/RenderMobObelisk.java +++ b/StevenDimDoors/mod_pocketDimClient/RenderMobObelisk.java @@ -1,6 +1,6 @@ package StevenDimDoors.mod_pocketDimClient; -import StevenDimDoors.mod_pocketDim.ticking.MobObelisk; +import StevenDimDoors.mod_pocketDim.ticking.MobMonolith; import net.minecraft.client.renderer.entity.RenderLiving; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLiving;