Anvilcraft/DimDoors
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Renamed Classes

Browse source 
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.
This commit is contained in:
SenseiKiwi 2013-07-26 05:30:59 -04:00
parent 687a75f4d5
commit 3a6b22c7cc
16 changed files with 33 additions and 40 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
StevenDimDoors/mod_pocketDim/RiftGenerator.java
View file

@ -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;
}

4
StevenDimDoors/mod_pocketDim/SchematicLoader.java
View file

@ -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);
}

2
StevenDimDoors/mod_pocketDim/TileEntityRift.java
View file

@ -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;

4
StevenDimDoors/mod_pocketDim/blocks/dimHatch.java
View file

@ -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);

4
StevenDimDoors/mod_pocketDim/helpers/dimHelper.java
View file

@ -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);
}

10
StevenDimDoors/mod_pocketDim/mod_pocketDim.java
View file

@ -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");

19
StevenDimDoors/mod_pocketDim/ticking/MobObelisk.java → StevenDimDoors/mod_pocketDim/ticking/MobMonolith.java
View file

@ -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))
{

4
StevenDimDoors/mod_pocketDim/ticking/MonolithSpawner.java
View file

@ -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);
}

2
StevenDimDoors/mod_pocketDim/world/BiomeGenLimbo.java
View file

@ -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;

2
StevenDimDoors/mod_pocketDim/world/BiomeGenPocket.java
View file

@ -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;

2
StevenDimDoors/mod_pocketDim/world/LimboProvider.java
View file

@ -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;
}

2
StevenDimDoors/mod_pocketDim/world/limboSkyProvider.java → StevenDimDoors/mod_pocketDim/world/LimboSkyProviderX.java
View file

@ -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;

4
StevenDimDoors/mod_pocketDim/world/pocketProvider.java → StevenDimDoors/mod_pocketDim/world/PocketProviderX.java
View file

@ -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;

4
StevenDimDoors/mod_pocketDimClient/ClientProxy.java
View file

@ -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));

4
StevenDimDoors/mod_pocketDimClient/ModelMobObelisk.java
View file

@ -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);
}

2
StevenDimDoors/mod_pocketDimClient/RenderMobObelisk.java
View file

@ -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;