diff --git a/StevenDimDoors/mod_pocketDim/BlankTeleporter.java b/StevenDimDoors/mod_pocketDim/BlankTeleporter.java index a0668375..f0cebca6 100644 --- a/StevenDimDoors/mod_pocketDim/BlankTeleporter.java +++ b/StevenDimDoors/mod_pocketDim/BlankTeleporter.java @@ -29,7 +29,7 @@ public class BlankTeleporter extends Teleporter public void setEntityPosition(Entity entity, double x, double y, double z) { entity.lastTickPosX = entity.prevPosX = entity.posX = x; - entity.lastTickPosY = entity.prevPosY = entity.posY = y + (double)entity.yOffset; + entity.lastTickPosY = entity.prevPosY = entity.posY = y + entity.yOffset; entity.lastTickPosZ = entity.prevPosZ = entity.posZ = z; entity.setPosition(x, y, z); } diff --git a/StevenDimDoors/mod_pocketDim/CloudRenderBlank.java b/StevenDimDoors/mod_pocketDim/CloudRenderBlank.java index 74f8f2d7..17d5bfe4 100644 --- a/StevenDimDoors/mod_pocketDim/CloudRenderBlank.java +++ b/StevenDimDoors/mod_pocketDim/CloudRenderBlank.java @@ -8,7 +8,8 @@ import cpw.mods.fml.relauncher.SideOnly; public class CloudRenderBlank extends IRenderHandler { - @SideOnly(Side.CLIENT) + @Override + @SideOnly(Side.CLIENT) public void render(float partialTicks, WorldClient world, Minecraft mc) { diff --git a/StevenDimDoors/mod_pocketDim/ObjectSaveInputStream.java b/StevenDimDoors/mod_pocketDim/ObjectSaveInputStream.java index a70dfa83..20b7e5ef 100644 --- a/StevenDimDoors/mod_pocketDim/ObjectSaveInputStream.java +++ b/StevenDimDoors/mod_pocketDim/ObjectSaveInputStream.java @@ -1,4 +1,5 @@ package StevenDimDoors.mod_pocketDim; + import java.io.IOException; import java.io.InputStream; import java.io.InvalidClassException; @@ -6,7 +7,7 @@ import java.io.ObjectInputStream; import java.io.ObjectStreamClass; import java.util.logging.Logger; - +@SuppressWarnings("unused") public class ObjectSaveInputStream extends ObjectInputStream { // private static Logger logger = LoggerFactory.getLogger(ObjectSaveInputStream.class); @@ -18,7 +19,7 @@ public class ObjectSaveInputStream extends ObjectInputStream { @Override protected ObjectStreamClass readClassDescriptor() throws IOException, ClassNotFoundException { ObjectStreamClass resultClassDescriptor = super.readClassDescriptor(); // initially streams descriptor - Class localClass; // the class in the local JVM that this descriptor represents. + Class localClass; // the class in the local JVM that this descriptor represents. try { localClass = Class.forName(resultClassDescriptor.getName()); } catch (ClassNotFoundException e) { @@ -33,7 +34,7 @@ public class ObjectSaveInputStream extends ObjectInputStream { final StringBuffer s = new StringBuffer("Overriding serialized class version mismatch: "); s.append("local serialVersionUID = ").append(localSUID); s.append(" stream serialVersionUID = ").append(streamSUID); - Exception e = new InvalidClassException(s.toString()); + Exception e = new InvalidClassException(s.toString()); // logger.error("Potentially Fatal Deserialization Operation.", e); resultClassDescriptor = localClassDescriptor; // Use local class descriptor for deserialization } diff --git a/StevenDimDoors/mod_pocketDim/Point3D.java b/StevenDimDoors/mod_pocketDim/Point3D.java index b9c032e5..204edb8c 100644 --- a/StevenDimDoors/mod_pocketDim/Point3D.java +++ b/StevenDimDoors/mod_pocketDim/Point3D.java @@ -56,6 +56,7 @@ public class Point3D implements Serializable { return this.z = z; } + @Override public Point3D clone() { return new Point3D(x, y, z); @@ -75,6 +76,7 @@ public class Point3D implements Serializable { return (this.x == other.x && this.y == other.y && this.z == other.z); } + @Override public boolean equals(Object other) { return equals((Point3D) other); diff --git a/StevenDimDoors/mod_pocketDim/blocks/BaseDimDoor.java b/StevenDimDoors/mod_pocketDim/blocks/BaseDimDoor.java index 6537d859..02632ebc 100644 --- a/StevenDimDoors/mod_pocketDim/blocks/BaseDimDoor.java +++ b/StevenDimDoors/mod_pocketDim/blocks/BaseDimDoor.java @@ -6,12 +6,10 @@ import net.minecraft.block.Block; import net.minecraft.block.BlockDoor; import net.minecraft.block.ITileEntityProvider; import net.minecraft.block.material.Material; -import net.minecraft.client.particle.EntityFX; import net.minecraft.client.renderer.texture.IconRegister; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLiving; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemDoor; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.Icon; import net.minecraft.util.MathHelper; @@ -22,12 +20,12 @@ import StevenDimDoors.mod_pocketDim.mod_pocketDim; import StevenDimDoors.mod_pocketDim.core.DDTeleporter; import StevenDimDoors.mod_pocketDim.core.DimLink; import StevenDimDoors.mod_pocketDim.core.PocketManager; -import StevenDimDoors.mod_pocketDim.items.BaseItemDoor; import StevenDimDoors.mod_pocketDim.schematic.BlockRotator; import StevenDimDoors.mod_pocketDim.tileentities.TileEntityDimDoor; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +@SuppressWarnings("deprecation") public abstract class BaseDimDoor extends BlockDoor implements IDimDoor, ITileEntityProvider { protected final DDProperties properties; @@ -40,13 +38,15 @@ public abstract class BaseDimDoor extends BlockDoor implements IDimDoor, ITileEn this.properties = properties; } + @Override public void registerIcons(IconRegister par1IconRegister) { - this.blockIcon = par1IconRegister.registerIcon(mod_pocketDim.modid + ":" + this.getUnlocalizedName2()+"_top"); - this.blockIconBottom = par1IconRegister.registerIcon(mod_pocketDim.modid + ":" + this.getUnlocalizedName2()+"_bottom"); + this.blockIcon = par1IconRegister.registerIcon(mod_pocketDim.modid + ":" + this.getUnlocalizedName()+"_top"); + this.blockIconBottom = par1IconRegister.registerIcon(mod_pocketDim.modid + ":" + this.getUnlocalizedName()+"_bottom"); } - @SideOnly(Side.CLIENT) + @Override + @SideOnly(Side.CLIENT) /** * From the specified side and block metadata retrieves the blocks texture. Args: side, metadata @@ -64,6 +64,7 @@ public abstract class BaseDimDoor extends BlockDoor implements IDimDoor, ITileEn this.enterDimDoor(world, x, y, z, entity); } + @Override public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer player, int side, float hitX, float hitY, float hitZ) { @@ -77,7 +78,7 @@ public abstract class BaseDimDoor extends BlockDoor implements IDimDoor, ITileEn shouldOpen = false; if (!world.isRemote && world.getBlockId(x, y-1, z) == this.blockID) { - int var12 = (int) (MathHelper.floor_double((double)((player.rotationYaw+90) * 4.0F / 360.0F) + 0.5D) & 3); + int var12 = MathHelper.floor_double((player.rotationYaw+90) * 4.0F / 360.0F + 0.5D) & 3; if (world.getBlockMetadata(x, y-1, z) == var12) { @@ -87,7 +88,7 @@ public abstract class BaseDimDoor extends BlockDoor implements IDimDoor, ITileEn } if (!world.isRemote && world.getBlockId(x, y+1, z) == this.blockID) { - int var12 = (int) (MathHelper.floor_double((double)((player.rotationYaw+90) * 4.0F / 360.0F) + 0.5D) & 3); + int var12 = MathHelper.floor_double((player.rotationYaw+90) * 4.0F / 360.0F + 0.5D) & 3; if(world.getBlockMetadata(x, y, z)==var12) { var12 = BlockRotator.transformMetadata(var12, 1, this.blockID); @@ -144,6 +145,7 @@ public abstract class BaseDimDoor extends BlockDoor implements IDimDoor, ITileEn /** * Retrieves the block texture to use based on the display side. Args: iBlockAccess, x, y, z, side */ + @Override @SideOnly(Side.CLIENT) public Icon getBlockTexture(IBlockAccess par1IBlockAccess, int par2, int par3, int par4, int par5) { @@ -175,6 +177,7 @@ public abstract class BaseDimDoor extends BlockDoor implements IDimDoor, ITileEn * Is this block (a) opaque and (b) a full 1m cube? This determines whether or not to render the shared face of two * adjacent blocks and also whether the player can attach torches, redstone wire, etc to this block. */ + @Override public void updateTick(World par1World, int par2, int par3, int par4, Random par5Random) { TileEntityDimDoor tile = (TileEntityDimDoor) par1World.getBlockTileEntity(par2, par3, par4); @@ -423,7 +426,7 @@ public abstract class BaseDimDoor extends BlockDoor implements IDimDoor, ITileEn // Although any entity has the proper fields for this check, // we should only apply it to living entities since things // like Minecarts might come in backwards. - int direction = (int) (MathHelper.floor_double((double) ((entity.rotationYaw + 90) * 4.0F / 360.0F) + 0.5D) & 3); + int direction = MathHelper.floor_double((entity.rotationYaw + 90) * 4.0F / 360.0F + 0.5D) & 3; return ((metadata & 3) == direction); } } \ No newline at end of file diff --git a/StevenDimDoors/mod_pocketDim/blocks/BlockDimWall.java b/StevenDimDoors/mod_pocketDim/blocks/BlockDimWall.java index 6144d4d1..8d90548e 100644 --- a/StevenDimDoors/mod_pocketDim/blocks/BlockDimWall.java +++ b/StevenDimDoors/mod_pocketDim/blocks/BlockDimWall.java @@ -57,10 +57,11 @@ public class BlockDimWall extends Block } } + @Override public void registerIcons(IconRegister par1IconRegister) { - this.blockIcon[0] = par1IconRegister.registerIcon(mod_pocketDim.modid + ":" + this.getUnlocalizedName2()); - this.blockIcon[1] = par1IconRegister.registerIcon(mod_pocketDim.modid + ":" + this.getUnlocalizedName2() + "Perm"); + this.blockIcon[0] = par1IconRegister.registerIcon(mod_pocketDim.modid + ":" + this.getUnlocalizedName()); + this.blockIcon[1] = par1IconRegister.registerIcon(mod_pocketDim.modid + ":" + this.getUnlocalizedName() + "Perm"); } @SideOnly(Side.CLIENT) @@ -77,6 +78,7 @@ public class BlockDimWall extends Block return 0; } + @Override @SuppressWarnings({ "rawtypes", "unchecked" }) @SideOnly(Side.CLIENT) public void getSubBlocks(int unknown, CreativeTabs tab, List subItems) @@ -86,14 +88,17 @@ public class BlockDimWall extends Block subItems.add(new ItemStack(this, 1, ix)); } } - public void onBlockDestroyedByPlayer(World par1World, int par2, int par3, int par4, int par5) {} + @Override + public void onBlockDestroyedByPlayer(World par1World, int par2, int par3, int par4, int par5) {} - protected boolean canSilkHarvest() + @Override + protected boolean canSilkHarvest() { return true; } - public int quantityDropped(Random par1Random) + @Override + public int quantityDropped(Random par1Random) { return 0; } @@ -101,7 +106,8 @@ public class BlockDimWall extends Block /** * replaces the block clicked with the held block, instead of placing the block on top of it. Shift click to disable. */ - public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer entityPlayer, int par6, float par7, float par8, float par9) + @Override + public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer entityPlayer, int par6, float par7, float par8, float par9) { //Check if the metadata value is 0 -- we don't want the user to replace Ancient Fabric if (entityPlayer.getCurrentEquippedItem() != null && world.getBlockMetadata(x, y, z) == 0) diff --git a/StevenDimDoors/mod_pocketDim/blocks/BlockDimWallPerm.java b/StevenDimDoors/mod_pocketDim/blocks/BlockDimWallPerm.java index c635b7f6..5047d9e4 100644 --- a/StevenDimDoors/mod_pocketDim/blocks/BlockDimWallPerm.java +++ b/StevenDimDoors/mod_pocketDim/blocks/BlockDimWallPerm.java @@ -30,21 +30,25 @@ public class BlockDimWallPerm extends Block properties = DDProperties.instance(); } + @Override public void registerIcons(IconRegister par1IconRegister) { - this.blockIcon = par1IconRegister.registerIcon(mod_pocketDim.modid + ":" + this.getUnlocalizedName2()); + this.blockIcon = par1IconRegister.registerIcon(mod_pocketDim.modid + ":" + this.getUnlocalizedName()); } + @Override public int quantityDropped(Random par1Random) { return 0; } + @Override public void onBlockDestroyedByPlayer(World par1World, int par2, int par3, int par4, int par5) {} /** * Only matters if the player is in limbo, acts to teleport the player from limbo back to dim 0 */ + @Override public void onEntityWalking(World world, int x, int y, int z, Entity entity) { if (!world.isRemote && world.provider.dimensionId == properties.LimboDimensionID) diff --git a/StevenDimDoors/mod_pocketDim/blocks/BlockDoorGold.java b/StevenDimDoors/mod_pocketDim/blocks/BlockDoorGold.java index fdc26c3f..5e715402 100644 --- a/StevenDimDoors/mod_pocketDim/blocks/BlockDoorGold.java +++ b/StevenDimDoors/mod_pocketDim/blocks/BlockDoorGold.java @@ -14,6 +14,7 @@ public class BlockDoorGold extends BlockDoor { private Icon blockIconBottom; + @SuppressWarnings("unused") // ?? private DDProperties properties; public BlockDoorGold(int par1, Material par2Material,DDProperties properties) @@ -23,17 +24,20 @@ public class BlockDoorGold extends BlockDoor } + @Override public void registerIcons(IconRegister par1IconRegister) { - this.blockIcon = par1IconRegister.registerIcon(mod_pocketDim.modid + ":" + this.getUnlocalizedName2()+"_top"); - this.blockIconBottom = par1IconRegister.registerIcon(mod_pocketDim.modid + ":" + this.getUnlocalizedName2()+"_bottom"); + this.blockIcon = par1IconRegister.registerIcon(mod_pocketDim.modid + ":" + this.getUnlocalizedName()+"_top"); + this.blockIconBottom = par1IconRegister.registerIcon(mod_pocketDim.modid + ":" + this.getUnlocalizedName()+"_bottom"); } + @Override public Icon getIcon(int par1, int par2) { return this.blockIcon; } + @Override @SideOnly(Side.CLIENT) public Icon getBlockTexture(IBlockAccess par1IBlockAccess, int par2, int par3, int par4, int par5) { diff --git a/StevenDimDoors/mod_pocketDim/blocks/BlockGoldDimDoor.java b/StevenDimDoors/mod_pocketDim/blocks/BlockGoldDimDoor.java index 9089d0e2..4dad5c0b 100644 --- a/StevenDimDoors/mod_pocketDim/blocks/BlockGoldDimDoor.java +++ b/StevenDimDoors/mod_pocketDim/blocks/BlockGoldDimDoor.java @@ -1,24 +1,23 @@ package StevenDimDoors.mod_pocketDim.blocks; -import net.minecraft.block.material.Material; -import net.minecraft.item.Item; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.world.World; import StevenDimDoors.mod_pocketDim.DDProperties; import StevenDimDoors.mod_pocketDim.core.DimLink; import StevenDimDoors.mod_pocketDim.core.LinkTypes; import StevenDimDoors.mod_pocketDim.core.NewDimData; import StevenDimDoors.mod_pocketDim.core.PocketManager; -import StevenDimDoors.mod_pocketDim.tileentities.TileEntityDimDoor; import StevenDimDoors.mod_pocketDim.tileentities.TileEntityDimDoorGold; -public class BlockGoldDimDoor extends BaseDimDoor implements IDimDoor +import net.minecraft.block.material.Material; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.world.World; + +@SuppressWarnings("deprecation") +public class BlockGoldDimDoor extends BaseDimDoor { public BlockGoldDimDoor(int blockID, Material material, DDProperties properties) { super(blockID, material, properties); - // TODO Auto-generated constructor stub } @Override diff --git a/StevenDimDoors/mod_pocketDim/blocks/BlockLimbo.java b/StevenDimDoors/mod_pocketDim/blocks/BlockLimbo.java index 0ec6bbe3..8da0dfec 100644 --- a/StevenDimDoors/mod_pocketDim/blocks/BlockLimbo.java +++ b/StevenDimDoors/mod_pocketDim/blocks/BlockLimbo.java @@ -40,7 +40,7 @@ public class BlockLimbo extends Block @Override public void registerIcons(IconRegister iconRegister) { - this.blockIcon = iconRegister.registerIcon(mod_pocketDim.modid + ":" + this.getUnlocalizedName2()); + this.blockIcon = iconRegister.registerIcon(mod_pocketDim.modid + ":" + this.getUnlocalizedName()); } @Override diff --git a/StevenDimDoors/mod_pocketDim/blocks/BlockRift.java b/StevenDimDoors/mod_pocketDim/blocks/BlockRift.java index 11fe9604..780df979 100644 --- a/StevenDimDoors/mod_pocketDim/blocks/BlockRift.java +++ b/StevenDimDoors/mod_pocketDim/blocks/BlockRift.java @@ -66,7 +66,7 @@ public class BlockRift extends BlockContainer @Override public void registerIcons(IconRegister par1IconRegister) { - this.blockIcon = par1IconRegister.registerIcon(mod_pocketDim.modid + ":" + this.getUnlocalizedName2()); + this.blockIcon = par1IconRegister.registerIcon(mod_pocketDim.modid + ":" + this.getUnlocalizedName()); } //sends a packet informing the client that there is a link present so it renders properly. (when placed) @@ -313,10 +313,10 @@ public class BlockRift extends BlockContainer yChange=(float) ((yGrowth+yGrowthn)+rand.nextGaussian()*.05F); zChange=(float) ((zGrowth+zGrowthn)+rand.nextGaussian()*.05F); - Xoffset= (float) ((0.25F/(1+Math.abs(xChange)))); + Xoffset= ((0.25F/(1+Math.abs(xChange)))); - Yoffset= (float) ((0.25F/(1+Math.abs(yChange)))); - Zoffset= (float) ((0.25F/(1+Math.abs(zChange)))); + Yoffset= ((0.25F/(1+Math.abs(yChange)))); + Zoffset= ((0.25F/(1+Math.abs(zChange)))); diff --git a/StevenDimDoors/mod_pocketDim/blocks/DimensionalDoor.java b/StevenDimDoors/mod_pocketDim/blocks/DimensionalDoor.java index 47225435..f75aedff 100644 --- a/StevenDimDoors/mod_pocketDim/blocks/DimensionalDoor.java +++ b/StevenDimDoors/mod_pocketDim/blocks/DimensionalDoor.java @@ -9,6 +9,7 @@ import StevenDimDoors.mod_pocketDim.core.LinkTypes; import StevenDimDoors.mod_pocketDim.core.NewDimData; import StevenDimDoors.mod_pocketDim.core.PocketManager; +@SuppressWarnings("deprecation") public class DimensionalDoor extends BaseDimDoor { diff --git a/StevenDimDoors/mod_pocketDim/blocks/TransTrapdoor.java b/StevenDimDoors/mod_pocketDim/blocks/TransTrapdoor.java index 97f94ba8..20815034 100644 --- a/StevenDimDoors/mod_pocketDim/blocks/TransTrapdoor.java +++ b/StevenDimDoors/mod_pocketDim/blocks/TransTrapdoor.java @@ -8,7 +8,6 @@ import net.minecraft.block.ITileEntityProvider; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IconRegister; import net.minecraft.entity.Entity; -import net.minecraft.item.ItemDoor; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; import StevenDimDoors.mod_pocketDim.mod_pocketDim; @@ -17,9 +16,9 @@ import StevenDimDoors.mod_pocketDim.core.DimLink; import StevenDimDoors.mod_pocketDim.core.LinkTypes; import StevenDimDoors.mod_pocketDim.core.NewDimData; import StevenDimDoors.mod_pocketDim.core.PocketManager; -import StevenDimDoors.mod_pocketDim.items.BaseItemDoor; import StevenDimDoors.mod_pocketDim.tileentities.TileEntityTransTrapdoor; +@SuppressWarnings("deprecation") public class TransTrapdoor extends BlockTrapDoor implements IDimDoor, ITileEntityProvider { @@ -32,7 +31,7 @@ public class TransTrapdoor extends BlockTrapDoor implements IDimDoor, ITileEntit @Override public void registerIcons(IconRegister par1IconRegister) { - this.blockIcon = par1IconRegister.registerIcon(mod_pocketDim.modid + ":" + this.getUnlocalizedName2()); + this.blockIcon = par1IconRegister.registerIcon(mod_pocketDim.modid + ":" + this.getUnlocalizedName()); } //Teleports the player to the exit link of that dimension, assuming it is a pocket @@ -65,6 +64,7 @@ public class TransTrapdoor extends BlockTrapDoor implements IDimDoor, ITileEntit this.updateAttachedTile(world, x, y, z); } + @Override public void updateTick(World world, int x, int y, int z, Random random) { TileEntityTransTrapdoor tile = (TileEntityTransTrapdoor) world.getBlockTileEntity(x, y, z); diff --git a/StevenDimDoors/mod_pocketDim/blocks/TransientDoor.java b/StevenDimDoors/mod_pocketDim/blocks/TransientDoor.java index 1a1232ba..786b629f 100644 --- a/StevenDimDoors/mod_pocketDim/blocks/TransientDoor.java +++ b/StevenDimDoors/mod_pocketDim/blocks/TransientDoor.java @@ -1,21 +1,20 @@ package StevenDimDoors.mod_pocketDim.blocks; -import net.minecraft.block.material.Material; -import net.minecraft.client.particle.EntityFX; -import net.minecraft.entity.Entity; -import net.minecraft.entity.EntityLiving; -import net.minecraft.item.ItemDoor; -import net.minecraft.util.AxisAlignedBB; -import net.minecraft.world.World; import StevenDimDoors.mod_pocketDim.DDProperties; -import StevenDimDoors.mod_pocketDim.mod_pocketDim; import StevenDimDoors.mod_pocketDim.core.DDTeleporter; import StevenDimDoors.mod_pocketDim.core.DimLink; import StevenDimDoors.mod_pocketDim.core.LinkTypes; import StevenDimDoors.mod_pocketDim.core.NewDimData; import StevenDimDoors.mod_pocketDim.core.PocketManager; -import StevenDimDoors.mod_pocketDim.items.BaseItemDoor; +import net.minecraft.block.material.Material; +import net.minecraft.client.particle.EntityFX; +import net.minecraft.entity.Entity; +import net.minecraft.entity.EntityLiving; +import net.minecraft.util.AxisAlignedBB; +import net.minecraft.world.World; + +@SuppressWarnings("deprecation") public class TransientDoor extends BaseDimDoor { public TransientDoor(int blockID, Material material, DDProperties properties) diff --git a/StevenDimDoors/mod_pocketDim/blocks/WarpDoor.java b/StevenDimDoors/mod_pocketDim/blocks/WarpDoor.java index f8861a5a..7decebfc 100644 --- a/StevenDimDoors/mod_pocketDim/blocks/WarpDoor.java +++ b/StevenDimDoors/mod_pocketDim/blocks/WarpDoor.java @@ -9,6 +9,7 @@ import StevenDimDoors.mod_pocketDim.core.LinkTypes; import StevenDimDoors.mod_pocketDim.core.NewDimData; import StevenDimDoors.mod_pocketDim.core.PocketManager; +@SuppressWarnings("deprecation") public class WarpDoor extends BaseDimDoor { public WarpDoor(int blockID, Material material, DDProperties properties) diff --git a/StevenDimDoors/mod_pocketDim/commands/CommandCreateDungeonRift.java b/StevenDimDoors/mod_pocketDim/commands/CommandCreateDungeonRift.java index b9e0cd92..86e12bf5 100644 --- a/StevenDimDoors/mod_pocketDim/commands/CommandCreateDungeonRift.java +++ b/StevenDimDoors/mod_pocketDim/commands/CommandCreateDungeonRift.java @@ -1,10 +1,5 @@ package StevenDimDoors.mod_pocketDim.commands; -import java.util.Collection; - -import net.minecraft.command.ICommandSender; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.util.MathHelper; import StevenDimDoors.mod_pocketDim.mod_pocketDim; import StevenDimDoors.mod_pocketDim.core.DimLink; import StevenDimDoors.mod_pocketDim.core.LinkTypes; @@ -13,6 +8,13 @@ import StevenDimDoors.mod_pocketDim.core.PocketManager; import StevenDimDoors.mod_pocketDim.dungeon.DungeonData; import StevenDimDoors.mod_pocketDim.helpers.DungeonHelper; +import java.util.Collection; + +import net.minecraft.command.ICommandSender; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.util.MathHelper; + +@SuppressWarnings("deprecation") public class CommandCreateDungeonRift extends DDCommandBase { private static CommandCreateDungeonRift instance = null; @@ -65,7 +67,7 @@ public class CommandCreateDungeonRift extends DDCommandBase int x = MathHelper.floor_double(sender.posX); int y = MathHelper.floor_double(sender.posY); int z = MathHelper.floor_double (sender.posZ); - int orientation = MathHelper.floor_double((double) ((sender.rotationYaw + 180.0F) * 4.0F / 360.0F) - 0.5D) & 3; + int orientation = MathHelper.floor_double((sender.rotationYaw + 180.0F) * 4.0F / 360.0F - 0.5D) & 3; if (command[0].equals("random")) { diff --git a/StevenDimDoors/mod_pocketDim/commands/CommandDeleteAllLinks.java b/StevenDimDoors/mod_pocketDim/commands/CommandDeleteAllLinks.java index 177904ec..a8b238cc 100644 --- a/StevenDimDoors/mod_pocketDim/commands/CommandDeleteAllLinks.java +++ b/StevenDimDoors/mod_pocketDim/commands/CommandDeleteAllLinks.java @@ -1,15 +1,16 @@ package StevenDimDoors.mod_pocketDim.commands; +import StevenDimDoors.mod_pocketDim.core.DimLink; +import StevenDimDoors.mod_pocketDim.core.NewDimData; +import StevenDimDoors.mod_pocketDim.core.PocketManager; + import java.util.ArrayList; import net.minecraft.command.ICommandSender; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.world.World; -import net.minecraftforge.common.DimensionManager; -import StevenDimDoors.mod_pocketDim.core.DimLink; -import StevenDimDoors.mod_pocketDim.core.NewDimData; -import StevenDimDoors.mod_pocketDim.core.PocketManager; +@SuppressWarnings("deprecation") public class CommandDeleteAllLinks extends DDCommandBase { private static CommandDeleteAllLinks instance = null; diff --git a/StevenDimDoors/mod_pocketDim/commands/CommandDeleteRifts.java b/StevenDimDoors/mod_pocketDim/commands/CommandDeleteRifts.java index 91c9565d..13d71e8c 100644 --- a/StevenDimDoors/mod_pocketDim/commands/CommandDeleteRifts.java +++ b/StevenDimDoors/mod_pocketDim/commands/CommandDeleteRifts.java @@ -10,6 +10,7 @@ import StevenDimDoors.mod_pocketDim.core.DimLink; import StevenDimDoors.mod_pocketDim.core.NewDimData; import StevenDimDoors.mod_pocketDim.core.PocketManager; +@SuppressWarnings("deprecation") public class CommandDeleteRifts extends DDCommandBase { private static CommandDeleteRifts instance = null; diff --git a/StevenDimDoors/mod_pocketDim/commands/CommandResetDungeons.java b/StevenDimDoors/mod_pocketDim/commands/CommandResetDungeons.java index 0f1c13ac..03512dd7 100644 --- a/StevenDimDoors/mod_pocketDim/commands/CommandResetDungeons.java +++ b/StevenDimDoors/mod_pocketDim/commands/CommandResetDungeons.java @@ -10,6 +10,7 @@ import StevenDimDoors.mod_pocketDim.core.LinkTypes; import StevenDimDoors.mod_pocketDim.core.NewDimData; import StevenDimDoors.mod_pocketDim.core.PocketManager; +@SuppressWarnings("deprecation") public class CommandResetDungeons extends DDCommandBase { private static CommandResetDungeons instance = null; diff --git a/StevenDimDoors/mod_pocketDim/commands/CommandTeleportPlayer.java b/StevenDimDoors/mod_pocketDim/commands/CommandTeleportPlayer.java index acfac068..c5d3b249 100644 --- a/StevenDimDoors/mod_pocketDim/commands/CommandTeleportPlayer.java +++ b/StevenDimDoors/mod_pocketDim/commands/CommandTeleportPlayer.java @@ -1,24 +1,16 @@ package StevenDimDoors.mod_pocketDim.commands; -import java.util.ArrayList; + +import StevenDimDoors.mod_pocketDim.core.DDTeleporter; +import StevenDimDoors.mod_pocketDim.core.PocketManager; +import StevenDimDoors.mod_pocketDim.util.Point4D; + import java.util.Arrays; import java.util.List; -import cpw.mods.fml.common.FMLCommonHandler; - -import StevenDimDoors.mod_pocketDim.BlankTeleporter; -import StevenDimDoors.mod_pocketDim.core.DDTeleporter; -import StevenDimDoors.mod_pocketDim.core.PocketManager; -import StevenDimDoors.mod_pocketDim.helpers.yCoordHelper; -import StevenDimDoors.mod_pocketDim.util.Point4D; - import net.minecraft.command.ICommandSender; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.entity.player.EntityPlayerMP; -import net.minecraft.world.World; -import net.minecraft.world.WorldServer; import net.minecraftforge.common.DimensionManager; - public class CommandTeleportPlayer extends DDCommandBase { private static CommandTeleportPlayer instance = null; @@ -43,7 +35,7 @@ public class CommandTeleportPlayer extends DDCommandBase @Override protected DDCommandResult processCommand(EntityPlayer sender, String[] command) { - List dimensionIDs = Arrays.asList(DimensionManager.getStaticDimensionIDs()); //Gets list of all registered dimensions, regardless if loaded or not + List dimensionIDs = Arrays.asList(DimensionManager.getStaticDimensionIDs()); //Gets list of all registered dimensions, regardless if loaded or not EntityPlayer targetPlayer = sender; int dimDestinationID = sender.worldObj.provider.dimensionId; diff --git a/StevenDimDoors/mod_pocketDim/commands/DDCommandBase.java b/StevenDimDoors/mod_pocketDim/commands/DDCommandBase.java index c48c5fc3..a5baa9b3 100644 --- a/StevenDimDoors/mod_pocketDim/commands/DDCommandBase.java +++ b/StevenDimDoors/mod_pocketDim/commands/DDCommandBase.java @@ -33,6 +33,7 @@ public abstract class DDCommandBase extends CommandBase */ protected abstract DDCommandResult processCommand(EntityPlayer sender, String[] command); + @Override public final String getCommandName() { return name; @@ -50,6 +51,7 @@ public abstract class DDCommandBase extends CommandBase * Method invoked by the server to execute a command. The call is forwarded to a derived class * to provide the sending player directly. */ + @Override public final void processCommand(ICommandSender sender, String[] command) { //Forward the command diff --git a/StevenDimDoors/mod_pocketDim/core/DDTeleporter.java b/StevenDimDoors/mod_pocketDim/core/DDTeleporter.java index 66f48560..2d2770c9 100644 --- a/StevenDimDoors/mod_pocketDim/core/DDTeleporter.java +++ b/StevenDimDoors/mod_pocketDim/core/DDTeleporter.java @@ -9,7 +9,6 @@ import net.minecraft.entity.EntityList; import net.minecraft.entity.item.EntityMinecart; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; -import net.minecraft.item.ItemDoor; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.network.packet.Packet41EntityEffect; import net.minecraft.network.packet.Packet43Experience; @@ -23,8 +22,6 @@ import net.minecraftforge.common.DimensionManager; import StevenDimDoors.mod_pocketDim.DDProperties; import StevenDimDoors.mod_pocketDim.Point3D; import StevenDimDoors.mod_pocketDim.mod_pocketDim; -import StevenDimDoors.mod_pocketDim.blocks.BlockRift; -import StevenDimDoors.mod_pocketDim.blocks.IDimDoor; import StevenDimDoors.mod_pocketDim.helpers.yCoordHelper; import StevenDimDoors.mod_pocketDim.items.BaseItemDoor; import StevenDimDoors.mod_pocketDim.items.ItemDimensionalDoor; @@ -34,6 +31,7 @@ import StevenDimDoors.mod_pocketDim.util.Point4D; import StevenDimDoors.mod_pocketDim.world.PocketBuilder; import cpw.mods.fml.common.registry.GameRegistry; +@SuppressWarnings("deprecation") public class DDTeleporter { private static final Random random = new Random(); @@ -235,7 +233,7 @@ public class DDTeleporter private static void setEntityPosition(Entity entity, double x, double y, double z) { entity.lastTickPosX = entity.prevPosX = entity.posX = x; - entity.lastTickPosY = entity.prevPosY = entity.posY = y + (double)entity.yOffset; + entity.lastTickPosY = entity.prevPosY = entity.posY = y + entity.yOffset; entity.lastTickPosZ = entity.prevPosZ = entity.posZ = z; entity.setPosition(x, y, z); } @@ -304,7 +302,7 @@ public class DDTeleporter } else { - newWorld = (WorldServer) oldWorld; + newWorld = oldWorld; } diff --git a/StevenDimDoors/mod_pocketDim/core/NewDimData.java b/StevenDimDoors/mod_pocketDim/core/NewDimData.java index cc909d9e..4c1d0027 100644 --- a/StevenDimDoors/mod_pocketDim/core/NewDimData.java +++ b/StevenDimDoors/mod_pocketDim/core/NewDimData.java @@ -14,6 +14,7 @@ import StevenDimDoors.mod_pocketDim.dungeon.pack.DungeonPack; import StevenDimDoors.mod_pocketDim.util.Point4D; import StevenDimDoors.mod_pocketDim.watcher.IUpdateWatcher; +@SuppressWarnings("deprecation") public abstract class NewDimData { private static class InnerDimLink extends DimLink diff --git a/StevenDimDoors/mod_pocketDim/core/PocketManager.java b/StevenDimDoors/mod_pocketDim/core/PocketManager.java index 63eec3b5..334b0b97 100644 --- a/StevenDimDoors/mod_pocketDim/core/PocketManager.java +++ b/StevenDimDoors/mod_pocketDim/core/PocketManager.java @@ -35,6 +35,7 @@ import StevenDimDoors.mod_pocketDim.watcher.UpdateWatcherProxy; * This class regulates all the operations involving the storage and manipulation of dimensions. It handles saving dim data, teleporting the player, and * creating/registering new dimensions as well as loading old dimensions on startup */ +@SuppressWarnings("deprecation") public class PocketManager { private static class InnerDimData extends NewDimData implements IPackable diff --git a/StevenDimDoors/mod_pocketDim/dungeon/DungeonSchematic.java b/StevenDimDoors/mod_pocketDim/dungeon/DungeonSchematic.java index 053008f7..a4b3d237 100644 --- a/StevenDimDoors/mod_pocketDim/dungeon/DungeonSchematic.java +++ b/StevenDimDoors/mod_pocketDim/dungeon/DungeonSchematic.java @@ -81,6 +81,7 @@ public class DungeonSchematic extends Schematic { public static DungeonSchematic readFromFile(File schematicFile) throws FileNotFoundException, InvalidSchematicException { + // TODO: fix resource leak return readFromStream(new FileInputStream(schematicFile)); } diff --git a/StevenDimDoors/mod_pocketDim/dungeon/pack/DungeonPackConfigReader.java b/StevenDimDoors/mod_pocketDim/dungeon/pack/DungeonPackConfigReader.java index a4aae616..bbefaa74 100644 --- a/StevenDimDoors/mod_pocketDim/dungeon/pack/DungeonPackConfigReader.java +++ b/StevenDimDoors/mod_pocketDim/dungeon/pack/DungeonPackConfigReader.java @@ -49,6 +49,7 @@ public class DungeonPackConfigReader extends BaseConfigurationProcessor typeNames = config.getTypeNames(); @@ -229,6 +231,7 @@ public class DungeonPackConfigReader extends BaseConfigurationProcessor> orientation0 = new HashMap>(); - HashMap stairs0 = new HashMap(); + HashMap stairs0 = new HashMap(); stairs0.put(0, 2); stairs0.put(1, 3); diff --git a/StevenDimDoors/mod_pocketDim/helpers/ChunkLoaderHelper.java b/StevenDimDoors/mod_pocketDim/helpers/ChunkLoaderHelper.java index 1e368ec0..140e2a88 100644 --- a/StevenDimDoors/mod_pocketDim/helpers/ChunkLoaderHelper.java +++ b/StevenDimDoors/mod_pocketDim/helpers/ChunkLoaderHelper.java @@ -1,5 +1,11 @@ package StevenDimDoors.mod_pocketDim.helpers; +import StevenDimDoors.mod_pocketDim.IChunkLoader; +import StevenDimDoors.mod_pocketDim.core.NewDimData; +import StevenDimDoors.mod_pocketDim.core.PocketManager; + +import cpw.mods.fml.common.event.FMLServerStartingEvent; + import java.io.File; import java.util.List; @@ -8,16 +14,6 @@ import net.minecraftforge.common.DimensionManager; import net.minecraftforge.common.ForgeChunkManager; import net.minecraftforge.common.ForgeChunkManager.LoadingCallback; import net.minecraftforge.common.ForgeChunkManager.Ticket; -import StevenDimDoors.mod_pocketDim.IChunkLoader; -import StevenDimDoors.mod_pocketDim.mod_pocketDim; -import StevenDimDoors.mod_pocketDim.core.NewDimData; -import StevenDimDoors.mod_pocketDim.core.PocketManager; -import StevenDimDoors.mod_pocketDim.tileentities.TileEntityDimDoorGold; - -import com.google.common.collect.Lists; - -import cpw.mods.fml.common.event.FMLServerStartingEvent; - public class ChunkLoaderHelper implements LoadingCallback { diff --git a/StevenDimDoors/mod_pocketDim/helpers/Compactor.java b/StevenDimDoors/mod_pocketDim/helpers/Compactor.java index e13d9029..611fe99d 100644 --- a/StevenDimDoors/mod_pocketDim/helpers/Compactor.java +++ b/StevenDimDoors/mod_pocketDim/helpers/Compactor.java @@ -16,6 +16,7 @@ import StevenDimDoors.mod_pocketDim.util.Point4D; public class Compactor { + @SuppressWarnings("unused") // ? private static class DimComparator implements Comparator { @Override diff --git a/StevenDimDoors/mod_pocketDim/helpers/DungeonHelper.java b/StevenDimDoors/mod_pocketDim/helpers/DungeonHelper.java index 6207f71d..e6d13061 100644 --- a/StevenDimDoors/mod_pocketDim/helpers/DungeonHelper.java +++ b/StevenDimDoors/mod_pocketDim/helpers/DungeonHelper.java @@ -140,7 +140,11 @@ public class DungeonHelper config.setName(name); return config; } - catch (ConfigurationProcessingException e) + catch (FileNotFoundException e) + { + System.err.println("Could not find a dungeon pack config file: " + configPath); + } + catch (Exception e) // handles IOException and ConfigurationProcessingException { System.err.println(e.getMessage()); if (e.getCause() != null) @@ -148,10 +152,6 @@ public class DungeonHelper System.err.println(e.getCause()); } } - catch (FileNotFoundException e) - { - System.err.println("Could not find a dungeon pack config file: " + configPath); - } return null; } @@ -442,6 +442,7 @@ public class DungeonHelper System.out.println("Registering bundled dungeon pack: " + name); InputStream listStream = this.getClass().getResourceAsStream(listPath); + // chance of leak? if (listStream == null) { System.err.println("Unable to open list of bundled dungeon schematics for " + name); diff --git a/StevenDimDoors/mod_pocketDim/items/BaseItemDoor.java b/StevenDimDoors/mod_pocketDim/items/BaseItemDoor.java index ea5bbec8..a3863d80 100644 --- a/StevenDimDoors/mod_pocketDim/items/BaseItemDoor.java +++ b/StevenDimDoors/mod_pocketDim/items/BaseItemDoor.java @@ -29,6 +29,7 @@ public abstract class BaseItemDoor extends ItemDoor properties = DDProperties.instance(); } + @Override public void registerIcons(IconRegister par1IconRegister) { this.itemIcon = par1IconRegister.registerIcon(mod_pocketDim.modid + ":" + this.getUnlocalizedName().replace("item.", "")); @@ -59,7 +60,7 @@ public abstract class BaseItemDoor extends ItemDoor player.canPlayerEdit(x, y, z, side, stack) && player.canPlayerEdit(x, y + 1, z, side, stack) && (!requireLink || PocketManager.getLink(x, y + 1, z, world) != null)&&stack.stackSize>0) { - int orientation = MathHelper.floor_double((double) ((player.rotationYaw + 180.0F) * 4.0F / 360.0F) - 0.5D) & 3; + int orientation = MathHelper.floor_double((player.rotationYaw + 180.0F) * 4.0F / 360.0F - 0.5D) & 3; placeDoorBlock(world, x, y, z, orientation, doorBlock); if (!player.capabilities.isCreativeMode && reduceStack) diff --git a/StevenDimDoors/mod_pocketDim/items/ItemBlockDimWall.java b/StevenDimDoors/mod_pocketDim/items/ItemBlockDimWall.java index 572f506b..0bce03cd 100644 --- a/StevenDimDoors/mod_pocketDim/items/ItemBlockDimWall.java +++ b/StevenDimDoors/mod_pocketDim/items/ItemBlockDimWall.java @@ -15,7 +15,8 @@ public class ItemBlockDimWall extends ItemBlock this.setCreativeTab(mod_pocketDim.dimDoorsCreativeTab); setHasSubtypes(true); } - public void registerIcons(IconRegister par1IconRegister) + @Override + public void registerIcons(IconRegister par1IconRegister) { this.itemIcon = par1IconRegister.registerIcon(mod_pocketDim.modid + ":" + this.getUnlocalizedName().replace("tile.", "")); } @@ -26,8 +27,9 @@ public class ItemBlockDimWall extends ItemBlock return damageValue; } - public String getUnlocalizedName(ItemStack par1ItemStack) + @Override + public String getUnlocalizedName(ItemStack par1ItemStack) { - return subNames[getItemDamageFromStack(par1ItemStack)]; + return subNames[par1ItemStack.getItemDamage()]; } } \ No newline at end of file diff --git a/StevenDimDoors/mod_pocketDim/items/ItemGoldDimDoor.java b/StevenDimDoors/mod_pocketDim/items/ItemGoldDimDoor.java index b30bd7f9..2a3c08bf 100644 --- a/StevenDimDoors/mod_pocketDim/items/ItemGoldDimDoor.java +++ b/StevenDimDoors/mod_pocketDim/items/ItemGoldDimDoor.java @@ -2,7 +2,6 @@ package StevenDimDoors.mod_pocketDim.items; import java.util.List; -import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; diff --git a/StevenDimDoors/mod_pocketDim/items/ItemGoldDoor.java b/StevenDimDoors/mod_pocketDim/items/ItemGoldDoor.java index d077d43c..889a52df 100644 --- a/StevenDimDoors/mod_pocketDim/items/ItemGoldDoor.java +++ b/StevenDimDoors/mod_pocketDim/items/ItemGoldDoor.java @@ -12,53 +12,47 @@ import net.minecraft.world.World; public class ItemGoldDoor extends ItemDoor { - public ItemGoldDoor(int par1, Material par2Material) { super(par1, par2Material); - // TODO Auto-generated constructor stub } - + + @Override public void registerIcons(IconRegister par1IconRegister) { this.itemIcon = par1IconRegister.registerIcon(mod_pocketDim.modid + ":" + this.getUnlocalizedName().replace("item.", "")); } - + + @Override public boolean onItemUse(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, World par3World, int par4, int par5, int par6, int par7, float par8, float par9, float par10) - { - if (par7 != 1) - { - return false; - } - else - { - ++par5; - Block block = mod_pocketDim.goldDoor; - - - - if (par2EntityPlayer.canPlayerEdit(par4, par5, par6, par7, par1ItemStack) && par2EntityPlayer.canPlayerEdit(par4, par5 + 1, par6, par7, par1ItemStack)) - { - if (!block.canPlaceBlockAt(par3World, par4, par5, par6)) - { - return false; - } - else - { - int i1 = MathHelper.floor_double((double)((par2EntityPlayer.rotationYaw + 180.0F) * 4.0F / 360.0F) - 0.5D) & 3; - placeDoorBlock(par3World, par4, par5, par6, i1, block); - --par1ItemStack.stackSize; - return true; - } - } - else - { - return false; - } - } - } - - - + { + if (par7 != 1) + { + return false; + } + else + { + ++par5; + Block block = mod_pocketDim.goldDoor; + if (par2EntityPlayer.canPlayerEdit(par4, par5, par6, par7, par1ItemStack) && par2EntityPlayer.canPlayerEdit(par4, par5 + 1, par6, par7, par1ItemStack)) + { + if (!block.canPlaceBlockAt(par3World, par4, par5, par6)) + { + return false; + } + else + { + int i1 = MathHelper.floor_double((par2EntityPlayer.rotationYaw + 180.0F) * 4.0F / 360.0F - 0.5D) & 3; + placeDoorBlock(par3World, par4, par5, par6, i1, block); + --par1ItemStack.stackSize; + return true; + } + } + else + { + return false; + } + } + } } diff --git a/StevenDimDoors/mod_pocketDim/items/ItemRiftBlade.java b/StevenDimDoors/mod_pocketDim/items/ItemRiftBlade.java index b51950c7..48164fe9 100644 --- a/StevenDimDoors/mod_pocketDim/items/ItemRiftBlade.java +++ b/StevenDimDoors/mod_pocketDim/items/ItemRiftBlade.java @@ -7,6 +7,9 @@ import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IconRegister; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLiving; +import net.minecraft.entity.EntityLivingBase; +import net.minecraft.entity.SharedMonsterAttributes; +import net.minecraft.entity.ai.attributes.AttributeModifier; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.item.EnumToolMaterial; @@ -20,6 +23,7 @@ import net.minecraft.world.World; import StevenDimDoors.mod_pocketDim.DDProperties; import StevenDimDoors.mod_pocketDim.mod_pocketDim; import StevenDimDoors.mod_pocketDim.core.PocketManager; +import com.google.common.collect.Multimap; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @@ -58,11 +62,14 @@ public class ItemRiftBlade extends ItemSword return material != Material.plants && material != Material.vine && material != Material.coral && material != Material.leaves && material != Material.pumpkin ? 1.0F : 1.5F; } } - + @Override - public int getDamageVsEntity(Entity par1Entity) + @SuppressWarnings({ "unchecked", "rawtypes"}) + public Multimap getItemAttributeModifiers() { - return 7; + Multimap multimap = super.getItemAttributeModifiers(); + multimap.put(SharedMonsterAttributes.attackDamage.getAttributeUnlocalizedName(), new AttributeModifier(field_111210_e, "Weapon modifier", 7, 0)); + return multimap; } @Override @@ -73,7 +80,7 @@ public class ItemRiftBlade extends ItemSword } @Override - public boolean hitEntity(ItemStack par1ItemStack, EntityLiving par2EntityLiving, EntityLiving par3EntityLiving) + public boolean hitEntity(ItemStack par1ItemStack, EntityLivingBase par2EntityLiving, EntityLivingBase par3EntityLiving) { par1ItemStack.damageItem(1, par3EntityLiving); return true; @@ -85,9 +92,9 @@ public class ItemRiftBlade extends ItemSword float var4 = 1.0F; float var5 = par2EntityPlayer.prevRotationPitch + (par2EntityPlayer.rotationPitch - par2EntityPlayer.prevRotationPitch) * var4; float var6 = par2EntityPlayer.prevRotationYaw + (par2EntityPlayer.rotationYaw - par2EntityPlayer.prevRotationYaw) * var4; - double var7 = par2EntityPlayer.prevPosX + (par2EntityPlayer.posX - par2EntityPlayer.prevPosX) * (double)var4; - double var9 = par2EntityPlayer.prevPosY + (par2EntityPlayer.posY - par2EntityPlayer.prevPosY) * (double)var4 + 1.62D - (double)par2EntityPlayer.yOffset; - double var11 = par2EntityPlayer.prevPosZ + (par2EntityPlayer.posZ - par2EntityPlayer.prevPosZ) * (double)var4; + double var7 = par2EntityPlayer.prevPosX + (par2EntityPlayer.posX - par2EntityPlayer.prevPosX) * var4; + double var9 = par2EntityPlayer.prevPosY + (par2EntityPlayer.posY - par2EntityPlayer.prevPosY) * var4 + 1.62D - par2EntityPlayer.yOffset; + double var11 = par2EntityPlayer.prevPosZ + (par2EntityPlayer.posZ - par2EntityPlayer.prevPosZ) * var4; Vec3 var13 = par1World.getWorldVec3Pool().getVecFromPool(var7, var9, var11); float var14 = MathHelper.cos(-var6 * 0.017453292F - (float)Math.PI); float var15 = MathHelper.sin(-var6 * 0.017453292F - (float)Math.PI); @@ -100,13 +107,13 @@ public class ItemRiftBlade extends ItemSword { var21 = 7; } - Vec3 var23 = var13.addVector((double)var18 * var21, (double)var17 * var21, (double)var20 * var21); + Vec3 var23 = var13.addVector(var18 * var21, var17 * var21, var20 * var21); return par1World.rayTraceBlocks_do_do(var13, var23, true, false); } private boolean teleportToEntity(ItemStack item, Entity par1Entity, EntityPlayer holder) { - Vec3 var2 = holder.worldObj.getWorldVec3Pool().getVecFromPool(holder.posX - par1Entity.posX, holder.boundingBox.minY + (double)(holder.height / 2.0F) - par1Entity.posY + (double)par1Entity.getEyeHeight(), holder.posZ - par1Entity.posZ); + Vec3 var2 = holder.worldObj.getWorldVec3Pool().getVecFromPool(holder.posX - par1Entity.posX, holder.boundingBox.minY + holder.height / 2.0F - par1Entity.posY + par1Entity.getEyeHeight(), holder.posZ - par1Entity.posZ); double cooef =( var2.lengthVector()-2.5)/var2.lengthVector(); var2.xCoord*=cooef; @@ -141,13 +148,13 @@ public class ItemRiftBlade extends ItemSword if (!world.isRemote) { @SuppressWarnings("unchecked") - List list = (List) world.getEntitiesWithinAABB(EntityLiving.class, AxisAlignedBB.getBoundingBox(player.posX-8,player.posY-8, player.posZ-8, player.posX+8,player.posY+8, player.posZ+8)); + List list = world.getEntitiesWithinAABB(EntityLiving.class, AxisAlignedBB.getBoundingBox(player.posX-8,player.posY-8, player.posZ-8, player.posX+8,player.posY+8, player.posZ+8)); list.remove(player); for (EntityLiving ent : list) { Vec3 var3 = player.getLook(1.0F).normalize(); - Vec3 var4 = player.worldObj.getWorldVec3Pool().getVecFromPool(ent.posX - player.posX, ent.boundingBox.minY + (double)((ent.height) / 2.0F) - ( player.posY + (double) player.getEyeHeight()), ent.posZ - player.posZ); + Vec3 var4 = player.worldObj.getWorldVec3Pool().getVecFromPool(ent.posX - player.posX, ent.boundingBox.minY + (ent.height) / 2.0F - ( player.posY + player.getEyeHeight()), ent.posZ - player.posZ); double var5 = var4.lengthVector(); var4 = var4.normalize(); double var7 = var3.dotProduct(var4); @@ -172,7 +179,7 @@ public class ItemRiftBlade extends ItemSword if (player.canPlayerEdit(x, y, z, hit.sideHit, stack) && player.canPlayerEdit(x, y + 1, z, hit.sideHit, stack)) { - int orientation = MathHelper.floor_double((double)((player.rotationYaw + 180.0F) * 4.0F / 360.0F) - 0.5D) & 3; + int orientation = MathHelper.floor_double((player.rotationYaw + 180.0F) * 4.0F / 360.0F - 0.5D) & 3; if (BaseItemDoor.canPlace(world, x, y, z) && BaseItemDoor.canPlace(world, x, y - 1, z)) @@ -212,6 +219,7 @@ public class ItemRiftBlade extends ItemSword /** * allows items to add custom lines of information to the mouseover description */ + @Override @SuppressWarnings({ "unchecked", "rawtypes" }) @SideOnly(Side.CLIENT) public void addInformation(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, List par3List, boolean par4) diff --git a/StevenDimDoors/mod_pocketDim/items/ItemStabilizedRiftSignature.java b/StevenDimDoors/mod_pocketDim/items/ItemStabilizedRiftSignature.java index fca2c24e..14dd73b6 100644 --- a/StevenDimDoors/mod_pocketDim/items/ItemStabilizedRiftSignature.java +++ b/StevenDimDoors/mod_pocketDim/items/ItemStabilizedRiftSignature.java @@ -25,6 +25,7 @@ public class ItemStabilizedRiftSignature extends ItemRiftSignature super(itemID); } + @Override public void registerIcons(IconRegister par1IconRegister) { this.itemIcon = par1IconRegister.registerIcon(mod_pocketDim.modid + ":" + this.getUnlocalizedName().replace("item.", "")); @@ -49,7 +50,7 @@ public class ItemStabilizedRiftSignature extends ItemRiftSignature int adjustedY = adjustYForSpecialBlocks(world,x,y,z); // Check if the Stabilized Rift Signature has been initialized - int orientation = MathHelper.floor_double((double) ((player.rotationYaw + 180.0F) * 4.0F / 360.0F) - 0.5D) & 3; + int orientation = MathHelper.floor_double((player.rotationYaw + 180.0F) * 4.0F / 360.0F - 0.5D) & 3; if (source != null) { // Yes, it's initialized. Check if the player is in creative @@ -57,6 +58,9 @@ public class ItemStabilizedRiftSignature extends ItemRiftSignature if (!player.capabilities.isCreativeMode && !player.inventory.hasItem(Item.enderPearl.itemID)) { player.sendChatToPlayer("You don't have any Ender Pearls!"); + // I won't do this, but this is the chance to localize chat + // messages sent to the player; look at ChatMessageComponent + // and how MFR does it with items like the safari net launcher return true; } diff --git a/StevenDimDoors/mod_pocketDim/items/ItemStableFabric.java b/StevenDimDoors/mod_pocketDim/items/ItemStableFabric.java index b12d8dfe..3e283b4d 100644 --- a/StevenDimDoors/mod_pocketDim/items/ItemStableFabric.java +++ b/StevenDimDoors/mod_pocketDim/items/ItemStableFabric.java @@ -12,6 +12,7 @@ public class ItemStableFabric extends Item this.setCreativeTab(mod_pocketDim.dimDoorsCreativeTab); } + @Override public void registerIcons(IconRegister par1IconRegister) { this.itemIcon = par1IconRegister.registerIcon(mod_pocketDim.modid + ":" + this.getUnlocalizedName().replace("item.", "")); diff --git a/StevenDimDoors/mod_pocketDim/items/ItemWorldThread.java b/StevenDimDoors/mod_pocketDim/items/ItemWorldThread.java index 0f5a10e4..91162c2a 100644 --- a/StevenDimDoors/mod_pocketDim/items/ItemWorldThread.java +++ b/StevenDimDoors/mod_pocketDim/items/ItemWorldThread.java @@ -12,6 +12,7 @@ public class ItemWorldThread extends Item this.setCreativeTab(mod_pocketDim.dimDoorsCreativeTab); } + @Override public void registerIcons(IconRegister par1IconRegister) { this.itemIcon = par1IconRegister.registerIcon(mod_pocketDim.modid + ":" + this.getUnlocalizedName().replace("item.", "")); diff --git a/StevenDimDoors/mod_pocketDim/items/itemRiftRemover.java b/StevenDimDoors/mod_pocketDim/items/itemRiftRemover.java index 6d1b1edd..b2824d68 100644 --- a/StevenDimDoors/mod_pocketDim/items/itemRiftRemover.java +++ b/StevenDimDoors/mod_pocketDim/items/itemRiftRemover.java @@ -29,6 +29,7 @@ public class itemRiftRemover extends Item this.setMaxDamage(4); } + @Override public void registerIcons(IconRegister par1IconRegister) { this.itemIcon = par1IconRegister.registerIcon(mod_pocketDim.modid + ":" + this.getUnlocalizedName()); diff --git a/StevenDimDoors/mod_pocketDim/mod_pocketDim.java b/StevenDimDoors/mod_pocketDim/mod_pocketDim.java index 4c19fd73..1188fb1b 100644 --- a/StevenDimDoors/mod_pocketDim/mod_pocketDim.java +++ b/StevenDimDoors/mod_pocketDim/mod_pocketDim.java @@ -1,20 +1,5 @@ package StevenDimDoors.mod_pocketDim; - -import java.io.File; - -import net.minecraft.block.Block; -import net.minecraft.block.material.Material; -import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.entity.EntityEggInfo; -import net.minecraft.entity.EntityList; -import net.minecraft.item.EnumToolMaterial; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.world.biome.BiomeGenBase; -import net.minecraftforge.common.DimensionManager; -import net.minecraftforge.common.ForgeChunkManager; -import net.minecraftforge.common.MinecraftForge; import StevenDimDoors.mod_pocketDim.blocks.BlockDimWall; import StevenDimDoors.mod_pocketDim.blocks.BlockDimWallPerm; import StevenDimDoors.mod_pocketDim.blocks.BlockDoorGold; @@ -64,13 +49,10 @@ import StevenDimDoors.mod_pocketDim.world.LimboProvider; import StevenDimDoors.mod_pocketDim.world.PocketProvider; import StevenDimDoors.mod_pocketDimClient.ClientPacketHandler; import StevenDimDoors.mod_pocketDimClient.ClientTickHandler; + import cpw.mods.fml.common.Mod; -import cpw.mods.fml.common.Mod.Init; +import cpw.mods.fml.common.Mod.EventHandler; import cpw.mods.fml.common.Mod.Instance; -import cpw.mods.fml.common.Mod.PostInit; -import cpw.mods.fml.common.Mod.PreInit; -import cpw.mods.fml.common.Mod.ServerStarting; -import cpw.mods.fml.common.Mod.ServerStopping; import cpw.mods.fml.common.SidedProxy; import cpw.mods.fml.common.event.FMLInitializationEvent; import cpw.mods.fml.common.event.FMLPostInitializationEvent; @@ -85,6 +67,20 @@ import cpw.mods.fml.common.registry.LanguageRegistry; import cpw.mods.fml.common.registry.TickRegistry; import cpw.mods.fml.relauncher.Side; +import java.io.File; + +import net.minecraft.block.Block; +import net.minecraft.block.material.Material; +import net.minecraft.creativetab.CreativeTabs; +import net.minecraft.entity.EntityEggInfo; +import net.minecraft.entity.EntityList; +import net.minecraft.item.EnumToolMaterial; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.world.biome.BiomeGenBase; +import net.minecraftforge.common.DimensionManager; +import net.minecraftforge.common.ForgeChunkManager; +import net.minecraftforge.common.MinecraftForge; @Mod(modid = mod_pocketDim.modid, name = "Dimensional Doors", version = mod_pocketDim.version) @@ -93,7 +89,6 @@ clientPacketHandlerSpec = @SidedPacketHandler(channels = {PacketConstants.CHANNEL_NAME}, packetHandler = ClientPacketHandler.class), serverPacketHandlerSpec = @SidedPacketHandler(channels = {PacketConstants.CHANNEL_NAME}, packetHandler = ServerPacketHandler.class)) - public class mod_pocketDim { public static final String version = "1.5.2R1.4.1RC1"; @@ -105,7 +100,7 @@ public class mod_pocketDim @Instance("PocketDimensions") public static mod_pocketDim instance = new mod_pocketDim(); - + public static Block transientDoor; public static Block warpDoor; public static Block goldDoor; @@ -130,55 +125,56 @@ public class mod_pocketDim public static Item itemStableFabric; public static Item itemChaosDoor; public static Item itemStabilizedLinkSignature; - + public static BiomeGenBase limboBiome; public static BiomeGenBase pocketBiome; - + public static boolean isPlayerWearingGoogles = false; public static DDProperties properties; public static MonolithSpawner spawner; //Added this field temporarily. Will be refactored out later. public static GatewayGenerator riftGen; - - public static CreativeTabs dimDoorsCreativeTab = new CreativeTabs("dimDoorsCreativeTab") - { - @Override - public ItemStack getIconItemStack() - { - return new ItemStack(mod_pocketDim.itemDimDoor, 1, 0); - } - - @Override - public String getTranslatedTabLabel() - { - return "Dimensional Doors"; - } - }; - - - @PreInit + public static CreativeTabs dimDoorsCreativeTab = new CreativeTabs("dimDoorsCreativeTab") + { + @Override + public ItemStack getIconItemStack() + { + return new ItemStack(mod_pocketDim.itemDimDoor, 1, 0); + } + + @Override + public String getTranslatedTabLabel() + { + return "Dimensional Doors"; + } + }; + + + + @EventHandler public void onPreInitialization(FMLPreInitializationEvent event) { - this.instance = this; + instance = this; //This should be the FIRST thing that gets done. String path = event.getSuggestedConfigurationFile().getAbsolutePath().replace(modid, "DimDoors"); - + properties = DDProperties.initialize(new File(path)); //Now do other stuff MinecraftForge.EVENT_BUS.register(new EventHookContainer(properties)); - + riftGen = new GatewayGenerator(properties); } - @Init + @SuppressWarnings("unused") + @EventHandler public void onInitialization(FMLInitializationEvent event) { CommonTickHandler commonTickHandler = new CommonTickHandler(); TickRegistry.registerTickHandler(new ClientTickHandler(), Side.CLIENT); TickRegistry.registerTickHandler(commonTickHandler, Side.SERVER); - + //MonolithSpawner should be initialized before any provider instances are created //Register the other regular tick receivers as well spawner = new MonolithSpawner(commonTickHandler, properties); @@ -197,7 +193,7 @@ public class mod_pocketDim unstableDoor = (new UnstableDoor(properties.UnstableDoorID, Material.iron, properties).setHardness(.2F).setUnlocalizedName("chaosDoor").setLightValue(.0F) ); dimensionalDoor = (DimensionalDoor) (new DimensionalDoor(properties.DimensionalDoorID, Material.iron, properties).setHardness(1.0F).setResistance(2000.0F) .setUnlocalizedName("dimDoor")); transTrapdoor = (TransTrapdoor) (new TransTrapdoor(properties.TransTrapdoorID, Material.wood).setHardness(1.0F) .setUnlocalizedName("dimHatch")); - + itemGoldDimDoor = (new ItemGoldDimDoor(properties.GoldDimDoorItemID, Material.iron)).setUnlocalizedName("itemGoldDimDoor"); itemGoldDoor = (new ItemGoldDoor(properties.GoldDoorID, Material.wood)).setUnlocalizedName("itemGoldDoor"); itemDimDoor = (new ItemDimensionalDoor(properties.DimensionalDoorItemID, Material.iron)).setUnlocalizedName("itemDimDoor"); @@ -210,7 +206,7 @@ public class mod_pocketDim itemStabilizedLinkSignature = (new ItemStabilizedRiftSignature(properties.StabilizedRiftSignatureItemID)).setUnlocalizedName("itemStabilizedRiftSig"); itemWorldThread = (new ItemWorldThread(properties.ItemWorldThreadID)).setUnlocalizedName("itemWorldThread"); - + mod_pocketDim.limboBiome= (new BiomeGenLimbo(properties.LimboBiomeID)); mod_pocketDim.pocketBiome= (new BiomeGenPocket(properties.PocketBiomeID)); @@ -226,7 +222,7 @@ public class mod_pocketDim GameRegistry.registerBlock(transTrapdoor,"Transdimensional Trapdoor"); GameRegistry.registerBlock(blockDimWallPerm, "Fabric of RealityPerm"); GameRegistry.registerBlock(transientDoor, "transientDoor"); - + GameRegistry.registerBlock(blockDimWall, ItemBlockDimWall.class, "Fabric of Reality"); DimensionManager.registerProviderType(properties.PocketProviderID, PocketProvider.class, false); @@ -244,7 +240,7 @@ public class mod_pocketDim LanguageRegistry.addName(blockDimWallPerm , "Eternal Fabric"); LanguageRegistry.addName(dimensionalDoor, "Dimensional Door"); LanguageRegistry.addName(transTrapdoor, "Transdimensional Trapdoor"); - + LanguageRegistry.addName(itemExitDoor, "Warp Door"); LanguageRegistry.addName(itemLinkSignature , "Rift Signature"); LanguageRegistry.addName(itemGoldDoor, "Golden Door"); @@ -257,16 +253,16 @@ public class mod_pocketDim LanguageRegistry.addName(itemRiftBlade , "Rift Blade"); LanguageRegistry.addName(itemWorldThread, "World Thread"); - + /** * Add names for multiblock inventory item */ LanguageRegistry.addName(new ItemStack(blockDimWall, 1, 0), "Fabric of Reality"); LanguageRegistry.addName(new ItemStack(blockDimWall, 1, 1), "Ancient Fabric"); - + LanguageRegistry.instance().addStringLocalization("itemGroup.dimDoorsCustomTab", "en_US", "Dimensional Doors Items"); - + GameRegistry.registerTileEntity(TileEntityDimDoor.class, "TileEntityDimDoor"); GameRegistry.registerTileEntity(TileEntityRift.class, "TileEntityRift"); GameRegistry.registerTileEntity(TileEntityTransTrapdoor.class, "TileEntityDimHatch"); @@ -280,20 +276,20 @@ public class mod_pocketDim CraftingManager.registerRecipies(); DungeonHelper.initialize(); - + proxy.loadTextures(); proxy.registerRenderers(); } - @PostInit + @EventHandler public void onPostInitialization(FMLPostInitializationEvent event) { ForgeChunkManager.setForcedChunkLoadingCallback(instance, new ChunkLoaderHelper()); //Register loot chests DDLoot.registerInfo(); } - @ServerStopping + @EventHandler public void onServerStopping(FMLServerStoppingEvent event) { try @@ -306,12 +302,12 @@ public class mod_pocketDim } } - @ServerStarting + @EventHandler public void onServerStarting(FMLServerStartingEvent event) { - + //TODO- load dims with forced chunks on server startup here - + CommandResetDungeons.instance().register(event); CommandCreateDungeonRift.instance().register(event); CommandDeleteAllLinks.instance().register(event); @@ -322,8 +318,8 @@ public class mod_pocketDim //CommandPruneDimensions.instance().register(event); CommandCreatePocket.instance().register(event); CommandTeleportPlayer.instance().register(event); - - + + ChunkLoaderHelper.loadChunkForcedWorlds(event); } } diff --git a/StevenDimDoors/mod_pocketDim/saving/BlacklistProcessor.java b/StevenDimDoors/mod_pocketDim/saving/BlacklistProcessor.java index da1cb3b6..9b8b44ab 100644 --- a/StevenDimDoors/mod_pocketDim/saving/BlacklistProcessor.java +++ b/StevenDimDoors/mod_pocketDim/saving/BlacklistProcessor.java @@ -25,6 +25,7 @@ public class BlacklistProcessor extends BaseConfigurationProcessor { JsonReader reader = new JsonReader(new InputStreamReader(inputStream, "UTF-8")); List data = this.createBlacklistFromJson(reader); + reader.close(); return data; } catch (IOException e) diff --git a/StevenDimDoors/mod_pocketDim/saving/DDSaveHandler.java b/StevenDimDoors/mod_pocketDim/saving/DDSaveHandler.java index e821b57b..c5ea571c 100644 --- a/StevenDimDoors/mod_pocketDim/saving/DDSaveHandler.java +++ b/StevenDimDoors/mod_pocketDim/saving/DDSaveHandler.java @@ -144,6 +144,7 @@ public class DDSaveHandler linkType = LinkTypes.NORMAL; } + @SuppressWarnings("deprecation") DimLink link = data.createLink(packedLink.source, linkType, packedLink.orientation); Point4D destination = packedLink.tail.destination; if(destination!=null) diff --git a/StevenDimDoors/mod_pocketDim/saving/DimDataProcessor.java b/StevenDimDoors/mod_pocketDim/saving/DimDataProcessor.java index c539396c..7b3dd39a 100644 --- a/StevenDimDoors/mod_pocketDim/saving/DimDataProcessor.java +++ b/StevenDimDoors/mod_pocketDim/saving/DimDataProcessor.java @@ -1,22 +1,16 @@ package StevenDimDoors.mod_pocketDim.saving; -import java.io.BufferedReader; import java.io.IOException; import java.io.InputStream; import java.io.InputStreamReader; import java.io.OutputStream; -import java.io.OutputStreamWriter; -import java.io.PrintWriter; -import java.io.UnsupportedEncodingException; import java.util.ArrayList; import java.util.List; import com.google.gson.Gson; import com.google.gson.GsonBuilder; -import com.google.gson.JsonObject; import com.google.gson.stream.JsonReader; import com.google.gson.stream.JsonToken; -import com.google.gson.stream.JsonWriter; import StevenDimDoors.mod_pocketDim.Point3D; import StevenDimDoors.mod_pocketDim.util.BaseConfigurationProcessor; @@ -33,6 +27,7 @@ public class DimDataProcessor extends BaseConfigurationProcessor { JsonReader reader = new JsonReader(new InputStreamReader(inputStream, "UTF-8")); PackedDimData data = this.createDImDataFromJson(reader); + reader.close(); return data; } catch (IOException e) @@ -92,7 +87,7 @@ public class DimDataProcessor extends BaseConfigurationProcessor reader.beginObject(); reader.nextName(); - if(reader.nextLong()!=PackedDimData.SAVE_DATA_VERSION_ID) + if (reader.nextLong() != PackedDimData.SAVE_DATA_VERSION_ID) { throw new IOException("Save data version mismatch"); } @@ -182,7 +177,7 @@ public class DimDataProcessor extends BaseConfigurationProcessor List list = new ArrayList(); reader.beginArray(); - while(reader.peek()!= JsonToken.END_ARRAY) + while (reader.peek() != JsonToken.END_ARRAY) { list.add(reader.nextInt()); @@ -197,7 +192,7 @@ public class DimDataProcessor extends BaseConfigurationProcessor reader.beginArray(); - while(reader.peek()!= JsonToken.END_ARRAY) + while (reader.peek() != JsonToken.END_ARRAY) { list.add(createLinkDataFromJson(reader)); } @@ -230,7 +225,7 @@ public class DimDataProcessor extends BaseConfigurationProcessor reader.nextName(); reader.beginArray(); - while(reader.peek() != JsonToken.END_ARRAY) + while (reader.peek() != JsonToken.END_ARRAY) { children.add(this.createPointFromJson(reader)); } @@ -250,6 +245,7 @@ public class DimDataProcessor extends BaseConfigurationProcessor String DungeonPackName; reader.beginObject(); + @SuppressWarnings("unused") JsonToken test = reader.peek(); if(reader.peek() == JsonToken.END_OBJECT) @@ -283,13 +279,14 @@ public class DimDataProcessor extends BaseConfigurationProcessor } private PackedLinkTail createLinkTailFromJson(JsonReader reader) throws IOException { - Point4D destination=null; + Point4D destination = null; int linkType; reader.beginObject(); reader.nextName(); - JsonToken test =reader.peek(); - if(reader.peek()==JsonToken.BEGIN_OBJECT) + @SuppressWarnings("unused") + JsonToken test = reader.peek(); + if (reader.peek() == JsonToken.BEGIN_OBJECT) { destination = this.createPoint4DFromJson(reader); reader.nextName(); diff --git a/StevenDimDoors/mod_pocketDim/saving/PackedDungeonData.java b/StevenDimDoors/mod_pocketDim/saving/PackedDungeonData.java index caa5c00e..f1cdc1d0 100644 --- a/StevenDimDoors/mod_pocketDim/saving/PackedDungeonData.java +++ b/StevenDimDoors/mod_pocketDim/saving/PackedDungeonData.java @@ -1,10 +1,7 @@ package StevenDimDoors.mod_pocketDim.saving; -import StevenDimDoors.mod_pocketDim.dungeon.pack.DungeonType; - public class PackedDungeonData { - public final int Weight; public final boolean IsOpen; public final boolean IsInternal; @@ -23,7 +20,4 @@ public class PackedDungeonData this.DungeonTypeName=dungeonTypeName; this.DungeonPackName=dungeonPackName; } - - - } diff --git a/StevenDimDoors/mod_pocketDim/saving/PackedLinkData.java b/StevenDimDoors/mod_pocketDim/saving/PackedLinkData.java index c1a81e0d..a98b448d 100644 --- a/StevenDimDoors/mod_pocketDim/saving/PackedLinkData.java +++ b/StevenDimDoors/mod_pocketDim/saving/PackedLinkData.java @@ -3,7 +3,6 @@ package StevenDimDoors.mod_pocketDim.saving; import java.util.List; import StevenDimDoors.mod_pocketDim.Point3D; -import StevenDimDoors.mod_pocketDim.core.DimLink; import StevenDimDoors.mod_pocketDim.util.Point4D; public class PackedLinkData diff --git a/StevenDimDoors/mod_pocketDim/schematic/CompactBoundsOperation.java b/StevenDimDoors/mod_pocketDim/schematic/CompactBoundsOperation.java index 7bb11bc3..298bff50 100644 --- a/StevenDimDoors/mod_pocketDim/schematic/CompactBoundsOperation.java +++ b/StevenDimDoors/mod_pocketDim/schematic/CompactBoundsOperation.java @@ -47,6 +47,7 @@ public class CompactBoundsOperation extends WorldOperation return true; } + @Override protected boolean finish() { if (minX == Integer.MAX_VALUE) diff --git a/StevenDimDoors/mod_pocketDim/schematic/Schematic.java b/StevenDimDoors/mod_pocketDim/schematic/Schematic.java index 4c6eee4c..df751415 100644 --- a/StevenDimDoors/mod_pocketDim/schematic/Schematic.java +++ b/StevenDimDoors/mod_pocketDim/schematic/Schematic.java @@ -118,6 +118,7 @@ public class Schematic { public static Schematic readFromFile(File schematicFile) throws FileNotFoundException, InvalidSchematicException { + // TODO: fix resource leaks here return readFromStream(new FileInputStream(schematicFile)); } @@ -329,7 +330,7 @@ public class Schematic { { //Used when the result of this function will be passed outside this class. //Avoids exposing the private field to external modifications. - schematicTag.setTag("TileEntities", (NBTTagList) tileEntities.copy()); + schematicTag.setTag("TileEntities", tileEntities.copy()); } else { diff --git a/StevenDimDoors/mod_pocketDim/schematic/SchematicFilter.java b/StevenDimDoors/mod_pocketDim/schematic/SchematicFilter.java index 7e809594..105a28c7 100644 --- a/StevenDimDoors/mod_pocketDim/schematic/SchematicFilter.java +++ b/StevenDimDoors/mod_pocketDim/schematic/SchematicFilter.java @@ -48,6 +48,7 @@ public class SchematicFilter { return true; } + @Override public String toString() { return name; diff --git a/StevenDimDoors/mod_pocketDim/ticking/MobMonolith.java b/StevenDimDoors/mod_pocketDim/ticking/MobMonolith.java index 928877f8..73df95b2 100644 --- a/StevenDimDoors/mod_pocketDim/ticking/MobMonolith.java +++ b/StevenDimDoors/mod_pocketDim/ticking/MobMonolith.java @@ -29,9 +29,9 @@ public class MobMonolith extends EntityFlying implements IMob float scaleFactor = 0; int aggroMax; - int destX=0; - int destY=0; - int destZ=0; + int destX = 0; // unused fields? + int destY = 0; + int destZ = 0; public MobMonolith(World par1World) { @@ -55,17 +55,12 @@ public class MobMonolith extends EntityFlying implements IMob } @Override - public int getMaxHealth() - { - // TODO Auto-generated method stub - return 20; - } - public boolean canBePushed() { return false; } + @Override public float getRenderSizeModifier() { return this.scaleFactor; @@ -74,11 +69,12 @@ public class MobMonolith extends EntityFlying implements IMob public void setEntityPosition(Entity entity, double x, double y, double z) { entity.lastTickPosX = entity.prevPosX = entity.posX = x; - entity.lastTickPosY = entity.prevPosY = entity.posY = y + (double)entity.yOffset; + entity.lastTickPosY = entity.prevPosY = entity.posY = y + entity.yOffset; entity.lastTickPosZ = entity.prevPosZ = entity.posZ = z; entity.setPosition(x, y, z); } + @Override protected void entityInit() { super.entityInit(); @@ -148,17 +144,17 @@ public class MobMonolith extends EntityFlying implements IMob else if (!this.worldObj.isRemote && !entityPlayer.capabilities.isCreativeMode) { ChunkCoordinates coords = LimboProvider.getLimboSkySpawn(entityPlayer.worldObj.rand); - Point4D destination = new Point4D((int) (coords.posX+entityPlayer.posX), coords.posY, (int) (coords.posZ+entityPlayer.posZ ), mod_pocketDim.properties.LimboDimensionID); - DDTeleporter.teleportEntity(entityPlayer, destination, false); - - this.aggro = 0; + Point4D destination = new Point4D((int) (coords.posX+entityPlayer.posX), coords.posY, (int) (coords.posZ+entityPlayer.posZ ), mod_pocketDim.properties.LimboDimensionID); + DDTeleporter.teleportEntity(entityPlayer, destination, false); + + this.aggro = 0; entityPlayer.worldObj.playSoundAtEntity(entityPlayer,"mods.DimDoors.sfx.crack",13, 1); } if (!(this.worldObj.provider instanceof LimboProvider || this.worldObj.getClosestPlayerToEntity(this, 5) != null) || this.aggro > 300) { for (int i = 0; i < -1+this.textureState/2; ++i) { - entityPlayer.worldObj.spawnParticle("portal", entityPlayer.posX + (this.rand.nextDouble() - 0.5D) * (double)this.width, entityPlayer.posY + this.rand.nextDouble() * (double)entityPlayer.height - 0.75D, entityPlayer.posZ + (this.rand.nextDouble() - 0.5D) * (double)entityPlayer.width, (this.rand.nextDouble() - 0.5D) * 2.0D, -this.rand.nextDouble(), (this.rand.nextDouble() - 0.5D) * 2.0D); + entityPlayer.worldObj.spawnParticle("portal", entityPlayer.posX + (this.rand.nextDouble() - 0.5D) * this.width, entityPlayer.posY + this.rand.nextDouble() * entityPlayer.height - 0.75D, entityPlayer.posZ + (this.rand.nextDouble() - 0.5D) * entityPlayer.width, (this.rand.nextDouble() - 0.5D) * 2.0D, -this.rand.nextDouble(), (this.rand.nextDouble() - 0.5D) * 2.0D); } } } @@ -203,34 +199,16 @@ public class MobMonolith extends EntityFlying implements IMob return par1EntityPlayer.canEntityBeSeen(this); } - private boolean isCourseTraversable(double par1, double par3, double par5, double par7) - { - double d4 = (par1 - this.posX) / par7; - double d5 = (par3 - this.posY) / par7; - double d6 = (par5 - this.posZ) / par7; - AxisAlignedBB axisalignedbb = this.boundingBox.copy(); - - for (int i = 1; (double)i < par7; ++i) - { - axisalignedbb.offset(d4, d5, d6); - - if (!this.worldObj.getCollidingBoundingBoxes(this, axisalignedbb).isEmpty()) - { - return false; - } - } - return true; - } - public boolean attackEntityFrom(DamageSource par1DamageSource, int par2) { - if(!(par1DamageSource==DamageSource.inWall)) + if(!(par1DamageSource == DamageSource.inWall)) { this.aggro=400; } return false; } - + + @Override public void faceEntity(Entity par1Entity, float par2, float par3) { double d0 = par1Entity.posX - this.posX; @@ -240,14 +218,14 @@ public class MobMonolith extends EntityFlying implements IMob if (par1Entity instanceof EntityLiving) { EntityLiving entityliving = (EntityLiving)par1Entity; - d2 = entityliving.posY + (double)entityliving.getEyeHeight() - (this.posY + (double)this.getEyeHeight()); + d2 = entityliving.posY + entityliving.getEyeHeight() - (this.posY + this.getEyeHeight()); } else { - d2 = (par1Entity.boundingBox.minY + par1Entity.boundingBox.maxY) - (this.posY + (double)this.getEyeHeight()); + d2 = (par1Entity.boundingBox.minY + par1Entity.boundingBox.maxY) - (this.posY + this.getEyeHeight()); } - double d3 = (double)MathHelper.sqrt_double(d0 * d0 + d1 * d1); + double d3 = MathHelper.sqrt_double(d0 * d0 + d1 * d1); float f2 = (float)(Math.atan2(d1, d0) * 180.0D / Math.PI) - 90.0F; float f3 = (float)(-(Math.atan2(d2, d3) * 180.0D / Math.PI)); this.rotationPitch = f3; @@ -258,28 +236,13 @@ public class MobMonolith extends EntityFlying implements IMob this.renderYawOffset=this.rotationYaw; } - private float updateRotation(float par1, float par2, float par3) - { - float f3 = MathHelper.wrapAngleTo180_float(par2 - par1); - - if (f3 > par3) - { - f3 = par3; - } - - if (f3 < -par3) - { - f3 = -par3; - } - - return par1 + f3; - } - + @Override public float getRotationYawHead() { return 0.0F; } + @Override public void writeEntityToNBT(NBTTagCompound par1NBTTagCompound) { super.writeEntityToNBT(par1NBTTagCompound); @@ -300,9 +263,11 @@ public class MobMonolith extends EntityFlying implements IMob this.textureState = par1NBTTagCompound.getByte("textureState"); this.scaleFactor = par1NBTTagCompound.getFloat("scaleFactor"); } - + + @Override public boolean getCanSpawnHere() { + @SuppressWarnings("rawtypes") List list = this.worldObj.getEntitiesWithinAABBExcludingEntity(this, AxisAlignedBB.getBoundingBox( this.posX-15, posY-4, this.posZ-15, this.posX+15, this.posY+15, this.posZ+15)); if(this.worldObj.provider.dimensionId==DDProperties.instance().LimboDimensionID) @@ -315,11 +280,14 @@ public class MobMonolith extends EntityFlying implements IMob } else if(this.worldObj.provider instanceof PocketProvider) { - if(list.size()>5||this.worldObj.canBlockSeeTheSky((int)this.posX, (int)this.posY, (int)this.posZ)) + if (list.size() > 5 || + this.worldObj.canBlockSeeTheSky((int)this.posX, (int)this.posY, (int)this.posZ)) { return false; } } - return this.worldObj.checkNoEntityCollision(this.boundingBox) && this.worldObj.getCollidingBoundingBoxes(this, this.boundingBox).isEmpty() && !this.worldObj.isAnyLiquid(this.boundingBox); + return this.worldObj.checkNoEntityCollision(this.boundingBox) && + this.worldObj.getCollidingBoundingBoxes(this, this.boundingBox).isEmpty() && + !this.worldObj.isAnyLiquid(this.boundingBox); } } \ No newline at end of file diff --git a/StevenDimDoors/mod_pocketDim/ticking/RiftRegenerator.java b/StevenDimDoors/mod_pocketDim/ticking/RiftRegenerator.java index 3bcb859d..2d2d368f 100644 --- a/StevenDimDoors/mod_pocketDim/ticking/RiftRegenerator.java +++ b/StevenDimDoors/mod_pocketDim/ticking/RiftRegenerator.java @@ -25,6 +25,7 @@ public class RiftRegenerator implements IRegularTickReceiver { regenerateRiftsInAllWorlds(); } + @SuppressWarnings("deprecation") public static void regenerateRiftsInAllWorlds() { //Regenerate rifts that have been replaced (not permanently removed) by players @@ -40,7 +41,7 @@ public class RiftRegenerator implements IRegularTickReceiver { { for (int count = 0; count < RIFTS_REGENERATED_PER_DIMENSION; count++) { - DimLink link = dimension.getRandomLink(); + DimLink link = dimension.getRandomLink(); Point4D source = link.source(); if (!mod_pocketDim.blockRift.isBlockImmune(world, source.getX(), source.getY(), source.getZ())&& world.getChunkProvider().chunkExists(source.getX() >> 4, source.getZ() >> 4)) { diff --git a/StevenDimDoors/mod_pocketDim/tileentities/TileEntityDimDoor.java b/StevenDimDoors/mod_pocketDim/tileentities/TileEntityDimDoor.java index eb43d249..d2d89001 100644 --- a/StevenDimDoors/mod_pocketDim/tileentities/TileEntityDimDoor.java +++ b/StevenDimDoors/mod_pocketDim/tileentities/TileEntityDimDoor.java @@ -1,78 +1,57 @@ package StevenDimDoors.mod_pocketDim.tileentities; -import StevenDimDoors.mod_pocketDim.mod_pocketDim; -import StevenDimDoors.mod_pocketDim.core.PocketManager; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; -import net.minecraft.world.World; public class TileEntityDimDoor extends TileEntity - { public boolean openOrClosed; public int orientation; public boolean hasExit; public boolean isDungeonChainLink; public boolean hasGennedPair=false; - - - - - - public boolean canUpdate() - { - return false; - } - - public void updateEntity() - { - - } - - @Override - public void readFromNBT(NBTTagCompound nbt) - { - super.readFromNBT(nbt); - int i = nbt.getInteger(("Size")); + @Override + public boolean canUpdate() + { + return false; + } - try - { - this.openOrClosed = nbt.getBoolean("openOrClosed"); - - this.orientation = nbt.getInteger("orientation"); - - this.hasExit = nbt.getBoolean("hasExit"); - - this.isDungeonChainLink = nbt.getBoolean("isDungeonChainLink"); + @Override + public void updateEntity() { } - this.hasGennedPair = nbt.getBoolean("hasGennedPair"); + @Override + public void readFromNBT(NBTTagCompound nbt) + { + super.readFromNBT(nbt); + @SuppressWarnings("unused") // ??? + int i = nbt.getInteger(("Size")); - + try + { + this.openOrClosed = nbt.getBoolean("openOrClosed"); + this.orientation = nbt.getInteger("orientation"); + this.hasExit = nbt.getBoolean("hasExit"); + this.isDungeonChainLink = nbt.getBoolean("isDungeonChainLink"); + this.hasGennedPair = nbt.getBoolean("hasGennedPair"); + } + catch (Exception e) // ??? + { - + } + } - } - catch (Exception e) - { - - } - } - - @Override - public void writeToNBT(NBTTagCompound nbt) - { - int i = 0; - super.writeToNBT(nbt); - nbt.setBoolean("openOrClosed", this.openOrClosed); - - nbt.setBoolean("hasExit", this.hasExit); - - nbt.setInteger("orientation", this.orientation); - - nbt.setBoolean("isDungeonChainLink", isDungeonChainLink); - - nbt.setBoolean("hasGennedPair", hasGennedPair); - - } + @Override + public void writeToNBT(NBTTagCompound nbt) + { + @SuppressWarnings("unused") // ????? + int i = 0; + super.writeToNBT(nbt); + + nbt.setBoolean("openOrClosed", this.openOrClosed); + nbt.setBoolean("hasExit", this.hasExit); + nbt.setInteger("orientation", this.orientation); + nbt.setBoolean("isDungeonChainLink", isDungeonChainLink); + nbt.setBoolean("hasGennedPair", hasGennedPair); + } } diff --git a/StevenDimDoors/mod_pocketDim/tileentities/TileEntityDimDoorGold.java b/StevenDimDoors/mod_pocketDim/tileentities/TileEntityDimDoorGold.java index 6091aedb..819eecde 100644 --- a/StevenDimDoors/mod_pocketDim/tileentities/TileEntityDimDoorGold.java +++ b/StevenDimDoors/mod_pocketDim/tileentities/TileEntityDimDoorGold.java @@ -12,99 +12,90 @@ import net.minecraftforge.common.ForgeChunkManager.Type; public class TileEntityDimDoorGold extends TileEntityDimDoor implements IChunkLoader { - private Ticket chunkTicket; - - public boolean canUpdate() - { - return true; - } - - public void updateEntity() - { - if(PocketManager.getDimensionData(this.worldObj)!=null&&PocketManager.getDimensionData(this.worldObj).isPocketDimension()&&!this.worldObj.isRemote) - { - if(this.chunkTicket==null) - { - chunkTicket = ForgeChunkManager.requestTicket(mod_pocketDim.instance, worldObj, Type.NORMAL); - } - - chunkTicket.getModData().setInteger("goldDimDoorX", xCoord); - chunkTicket.getModData().setInteger("goldDimDoorY", yCoord); - chunkTicket.getModData().setInteger("goldDimDoorZ", zCoord); - ForgeChunkManager.forceChunk(chunkTicket, new ChunkCoordIntPair(xCoord >> 4, zCoord >> 4)); - forceChunkLoading(chunkTicket,this.xCoord,this.zCoord); - } - } - - public void forceChunkLoading(Ticket chunkTicket,int x,int z) - { - if(PocketManager.getDimensionData(chunkTicket.world)==null) - { - return; - } - if(!PocketManager.getDimensionData(chunkTicket.world).isPocketDimension()) - { - return; - } - - for(int chunks = (PocketBuilder.DEFAULT_POCKET_SIZE/16)+1;chunks>0;chunks--) + + @Override + public boolean canUpdate() + { + return true; + } + + @Override + public void updateEntity() + { // every tick? + if (PocketManager.getDimensionData(this.worldObj) != null && + PocketManager.getDimensionData(this.worldObj).isPocketDimension() && + !this.worldObj.isRemote) + { + if (this.chunkTicket == null) { - ForgeChunkManager.forceChunk(chunkTicket, new ChunkCoordIntPair((xCoord >> 4)+chunks, (zCoord >> 4)+chunks)); + chunkTicket = ForgeChunkManager.requestTicket(mod_pocketDim.instance, worldObj, Type.NORMAL); + } - } - } - - - - @Override - public void invalidate() - { - ForgeChunkManager.releaseTicket(chunkTicket); - super.invalidate(); + chunkTicket.getModData().setInteger("goldDimDoorX", xCoord); + chunkTicket.getModData().setInteger("goldDimDoorY", yCoord); + chunkTicket.getModData().setInteger("goldDimDoorZ", zCoord); + ForgeChunkManager.forceChunk(chunkTicket, new ChunkCoordIntPair(xCoord >> 4, zCoord >> 4)); + forceChunkLoading(chunkTicket,this.xCoord,this.zCoord); } + } + + @Override + public void forceChunkLoading(Ticket chunkTicket,int x,int z) + { + if (PocketManager.getDimensionData(chunkTicket.world) == null) + { + return; + } + if (!PocketManager.getDimensionData(chunkTicket.world).isPocketDimension()) + { + return; + } + + for(int chunks = (PocketBuilder.DEFAULT_POCKET_SIZE/16) + 1; chunks > 0; --chunks) + { + ForgeChunkManager.forceChunk(chunkTicket, new ChunkCoordIntPair((xCoord >> 4) + chunks, + (zCoord >> 4) + chunks)); + } + } + + @Override + public void invalidate() + { + ForgeChunkManager.releaseTicket(chunkTicket); + super.invalidate(); + } + + @Override + public void readFromNBT(NBTTagCompound nbt) + { // this and write both call user, and super saves/reads all the same data. why override at all? + super.readFromNBT(nbt); + @SuppressWarnings("unused") // ??? + int i = nbt.getInteger(("Size")); + + try + { + this.openOrClosed = nbt.getBoolean("openOrClosed"); + this.orientation = nbt.getInteger("orientation"); + this.hasExit = nbt.getBoolean("hasExit"); + this.isDungeonChainLink = nbt.getBoolean("isDungeonChainLink"); + } + catch (Exception e) // ??? + { + + } + } + + @Override + public void writeToNBT(NBTTagCompound nbt) + { + @SuppressWarnings("unused") // ????? + int i = 0; + super.writeToNBT(nbt); - - @Override - public void readFromNBT(NBTTagCompound nbt) - { - super.readFromNBT(nbt); - int i = nbt.getInteger(("Size")); - - try - { - this.openOrClosed = nbt.getBoolean("openOrClosed"); - - this.orientation = nbt.getInteger("orientation"); - - this.hasExit = nbt.getBoolean("hasExit"); - - this.isDungeonChainLink = nbt.getBoolean("isDungeonChainLink"); - - - - - - } - catch (Exception e) - { - - } - } - - @Override - public void writeToNBT(NBTTagCompound nbt) - { - int i = 0; - super.writeToNBT(nbt); - nbt.setBoolean("openOrClosed", this.openOrClosed); - - nbt.setBoolean("hasExit", this.hasExit); - - nbt.setInteger("orientation", this.orientation); - - nbt.setBoolean("isDungeonChainLink", isDungeonChainLink); - - - } + nbt.setBoolean("openOrClosed", this.openOrClosed); + nbt.setBoolean("hasExit", this.hasExit); + nbt.setInteger("orientation", this.orientation); + nbt.setBoolean("isDungeonChainLink", isDungeonChainLink); + } } diff --git a/StevenDimDoors/mod_pocketDim/tileentities/TileEntityRift.java b/StevenDimDoors/mod_pocketDim/tileentities/TileEntityRift.java index 5ae69c6d..21516cf9 100644 --- a/StevenDimDoors/mod_pocketDim/tileentities/TileEntityRift.java +++ b/StevenDimDoors/mod_pocketDim/tileentities/TileEntityRift.java @@ -38,10 +38,12 @@ public class TileEntityRift extends TileEntity public int age = 0; public HashMap renderingCenters = new HashMap(); + @SuppressWarnings("deprecation") public DimLink nearestRiftData; public int spawnedEndermenID=0; DataWatcher watcher = new DataWatcher(); + @Override public void updateEntity() { //Invalidate this tile entity if it shouldn't exist @@ -92,6 +94,7 @@ public class TileEntityRift extends TileEntity } } + @Override public boolean canUpdate() { return true; @@ -143,7 +146,7 @@ public class TileEntityRift extends TileEntity if (random.nextInt(30) == 0) { @SuppressWarnings("unchecked") - List list = (List) worldObj.getEntitiesWithinAABB(EntityEnderman.class, + List list = worldObj.getEntitiesWithinAABB(EntityEnderman.class, AxisAlignedBB.getBoundingBox(xCoord - 9, yCoord - 3, zCoord - 9, xCoord + 9, yCoord + 3, zCoord + 9)); if (list.isEmpty()) diff --git a/StevenDimDoors/mod_pocketDim/tileentities/TileEntityTransTrapdoor.java b/StevenDimDoors/mod_pocketDim/tileentities/TileEntityTransTrapdoor.java index 19c52eba..125a2256 100644 --- a/StevenDimDoors/mod_pocketDim/tileentities/TileEntityTransTrapdoor.java +++ b/StevenDimDoors/mod_pocketDim/tileentities/TileEntityTransTrapdoor.java @@ -1,10 +1,7 @@ package StevenDimDoors.mod_pocketDim.tileentities; -import StevenDimDoors.mod_pocketDim.mod_pocketDim; -import StevenDimDoors.mod_pocketDim.core.PocketManager; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; -import net.minecraft.world.World; public class TileEntityTransTrapdoor extends TileEntity { diff --git a/StevenDimDoors/mod_pocketDim/util/BaseConfigurationProcessor.java b/StevenDimDoors/mod_pocketDim/util/BaseConfigurationProcessor.java index 8fe75a23..2e493fb6 100644 --- a/StevenDimDoors/mod_pocketDim/util/BaseConfigurationProcessor.java +++ b/StevenDimDoors/mod_pocketDim/util/BaseConfigurationProcessor.java @@ -2,8 +2,8 @@ package StevenDimDoors.mod_pocketDim.util; import java.io.File; import java.io.FileInputStream; -import java.io.FileNotFoundException; import java.io.FileOutputStream; +import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; @@ -21,14 +21,17 @@ public abstract class BaseConfigurationProcessor return true; } - public T readFromFile(String path) throws FileNotFoundException, ConfigurationProcessingException + public T readFromFile(String path) throws ConfigurationProcessingException, IOException { return readFromFile(new File(path)); } - public T readFromFile(File file) throws FileNotFoundException, ConfigurationProcessingException + public T readFromFile(File file) throws ConfigurationProcessingException, IOException { - return readFromStream(new FileInputStream(file)); + FileInputStream t = new FileInputStream(file); + T ret = readFromStream(t); + t.close(); + return ret; } public T readFromResource(String resourcePath) throws ConfigurationProcessingException @@ -38,12 +41,14 @@ public abstract class BaseConfigurationProcessor public abstract T readFromStream(InputStream inputStream) throws ConfigurationProcessingException; - public void writeToFile(File file, T data) throws FileNotFoundException, ConfigurationProcessingException + public void writeToFile(File file, T data) throws ConfigurationProcessingException, IOException { - writeToStream(new FileOutputStream(file), data); + FileOutputStream t = new FileOutputStream(file); + writeToStream(t, data); + t.close(); } - public void writeToFile(String path, T data) throws FileNotFoundException, ConfigurationProcessingException + public void writeToFile(String path, T data) throws ConfigurationProcessingException, IOException { writeToFile(new File(path), data); } diff --git a/StevenDimDoors/mod_pocketDim/util/WeightedContainer.java b/StevenDimDoors/mod_pocketDim/util/WeightedContainer.java index 71332f3f..65d239c7 100644 --- a/StevenDimDoors/mod_pocketDim/util/WeightedContainer.java +++ b/StevenDimDoors/mod_pocketDim/util/WeightedContainer.java @@ -24,6 +24,7 @@ public class WeightedContainer extends WeightedRandomItem { return data; } + @Override public WeightedContainer clone() { return new WeightedContainer(data, itemWeight); diff --git a/StevenDimDoors/mod_pocketDim/world/BiomeGenLimbo.java b/StevenDimDoors/mod_pocketDim/world/BiomeGenLimbo.java index b60eabef..243baf17 100644 --- a/StevenDimDoors/mod_pocketDim/world/BiomeGenLimbo.java +++ b/StevenDimDoors/mod_pocketDim/world/BiomeGenLimbo.java @@ -31,7 +31,8 @@ public class BiomeGenLimbo extends BiomeGenBase } - public float getSpawningChance() + @Override + public float getSpawningChance() { return 0.00001F; } diff --git a/StevenDimDoors/mod_pocketDim/world/CustomCaveGen.java b/StevenDimDoors/mod_pocketDim/world/CustomCaveGen.java index cf3d4895..3e892be6 100644 --- a/StevenDimDoors/mod_pocketDim/world/CustomCaveGen.java +++ b/StevenDimDoors/mod_pocketDim/world/CustomCaveGen.java @@ -31,8 +31,8 @@ public class CustomCaveGen extends MapGenBase */ protected void generateCaveNode(long par1, int par3, int par4, byte[] par5ArrayOfByte, double par6, double par8, double par10, float par12, float par13, float par14, int par15, int par16, double par17) { - double var19 = (double)(par3 * 16 + 8); - double var21 = (double)(par4 * 16 + 8); + double var19 = par3 * 16 + 8; + double var21 = par4 * 16 + 8; float var23 = 0.0F; float var24 = 0.0F; Random var25 = new Random(par1); @@ -55,13 +55,13 @@ public class CustomCaveGen extends MapGenBase for (boolean var28 = var25.nextInt(6) == 0; par15 < par16; ++par15) { - double var29 = 1.5D + (double)(MathHelper.sin((float)par15 * (float)Math.PI / (float)par16) * par12 * 1.0F); + double var29 = 1.5D + MathHelper.sin(par15 * (float)Math.PI / par16) * par12 * 1.0F; double var31 = var29 * par17; float var33 = MathHelper.cos(par14); float var34 = MathHelper.sin(par14); - par6 += (double)(MathHelper.cos(par13) * var33); - par8 += (double)var34; - par10 += (double)(MathHelper.sin(par13) * var33); + par6 += MathHelper.cos(par13) * var33; + par8 += var34; + par10 += MathHelper.sin(par13) * var33; if (var28) { @@ -90,8 +90,8 @@ public class CustomCaveGen extends MapGenBase { double var35 = par6 - var19; double var37 = par10 - var21; - double var39 = (double)(par16 - par15); - double var41 = (double)(par12 + 2.0F + 16.0F); + double var39 = par16 - par15; + double var41 = par12 + 2.0F + 16.0F; if (var35 * var35 + var37 * var37 - var39 * var39 > var41 * var41) { @@ -169,11 +169,11 @@ public class CustomCaveGen extends MapGenBase { for (var42 = var55; var42 < var36; ++var42) { - double var59 = ((double)(var42 + par3 * 16) + 0.5D - par6) / var29; + double var59 = (var42 + par3 * 16 + 0.5D - par6) / var29; for (var45 = var56; var45 < var40; ++var45) { - double var46 = ((double)(var45 + par4 * 16) + 0.5D - par10) / var29; + double var46 = (var45 + par4 * 16 + 0.5D - par10) / var29; int var48 = (var42 * 16 + var45) * 128 + var38; boolean var49 = false; @@ -181,7 +181,7 @@ public class CustomCaveGen extends MapGenBase { for (int var50 = var38 - 1; var50 >= var57; --var50) { - double var51 = ((double)var50 + 0.5D - par8) / var31; + double var51 = (var50 + 0.5D - par8) / var31; if (var51 > -0.7D && var59 * var59 + var51 * var51 + var46 * var46 < 1.0D) { @@ -229,7 +229,8 @@ public class CustomCaveGen extends MapGenBase /** * Recursively called by generate() (generate) and optionally by itself. */ - protected void recursiveGenerate(World par1World, int par2, int par3, int par4, int par5, byte[] par6ArrayOfByte) + @Override + protected void recursiveGenerate(World par1World, int par2, int par3, int par4, int par5, byte[] par6ArrayOfByte) { int var7 = this.rand.nextInt(this.rand.nextInt(this.rand.nextInt(40) + 1) + 1); @@ -240,9 +241,9 @@ public class CustomCaveGen extends MapGenBase for (int var8 = 0; var8 < var7; ++var8) { - double var9 = (double)(par2 * 16 + this.rand.nextInt(16)); - double var11 = (double)this.rand.nextInt(this.rand.nextInt(120) + 8); - double var13 = (double)(par3 * 16 + this.rand.nextInt(16)); + double var9 = par2 * 16 + this.rand.nextInt(16); + double var11 = this.rand.nextInt(this.rand.nextInt(120) + 8); + double var13 = par3 * 16 + this.rand.nextInt(16); int var15 = 1; if (this.rand.nextInt(4) == 0) diff --git a/StevenDimDoors/mod_pocketDim/world/CustomSkyProvider.java b/StevenDimDoors/mod_pocketDim/world/CustomSkyProvider.java index c88377c1..3a668027 100644 --- a/StevenDimDoors/mod_pocketDim/world/CustomSkyProvider.java +++ b/StevenDimDoors/mod_pocketDim/world/CustomSkyProvider.java @@ -8,23 +8,24 @@ import net.minecraft.client.renderer.GLAllocation; import net.minecraft.client.renderer.RenderHelper; import net.minecraft.client.renderer.Tessellator; import net.minecraft.util.MathHelper; +import net.minecraft.util.ResourceLocation; import net.minecraft.util.Vec3; import net.minecraftforge.client.IRenderHandler; public class CustomSkyProvider extends IRenderHandler { - + int starGLCallList; int glSkyList; int glSkyList2; - - - public String getMoonRenderPath() + + + public ResourceLocation getMoonRenderPath() { return null; } - - public String getSunRenderPath() + + public ResourceLocation getSunRenderPath() { return null; } @@ -33,200 +34,199 @@ public class CustomSkyProvider extends IRenderHandler @Override public void render(float par1, WorldClient world, Minecraft mc) { - + starGLCallList = GLAllocation.generateDisplayLists(3); glSkyList = this.starGLCallList + 1; glSkyList2 = this.starGLCallList + 2; - GL11.glDisable(GL11.GL_FOG); - GL11.glDisable(GL11.GL_ALPHA_TEST); - GL11.glEnable(GL11.GL_BLEND); - GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); - RenderHelper.disableStandardItemLighting(); - GL11.glDepthMask(false); - mc.renderEngine.bindTexture("/misc/tunnel.png"); - Tessellator tessellator = Tessellator.instance; - - if (mc.theWorld.provider.isSurfaceWorld()) - { - GL11.glDisable(GL11.GL_TEXTURE_2D); - Vec3 vec3 = world.getSkyColor(mc.renderViewEntity, par1); - float f1 = (float)vec3.xCoord; - float f2 = (float)vec3.yCoord; - float f3 = (float)vec3.zCoord; - float f4; + GL11.glDisable(GL11.GL_FOG); + GL11.glDisable(GL11.GL_ALPHA_TEST); + GL11.glEnable(GL11.GL_BLEND); + GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); + RenderHelper.disableStandardItemLighting(); + GL11.glDepthMask(false); + mc.renderEngine.bindTexture(new ResourceLocation("/misc/tunnel.png")); - if (mc.gameSettings.anaglyph) - { - float f5 = (f1 * 30.0F + f2 * 59.0F + f3 * 11.0F) / 100.0F; - float f6 = (f1 * 30.0F + f2 * 70.0F) / 100.0F; - f4 = (f1 * 30.0F + f3 * 70.0F) / 100.0F; - f1 = f5; - f2 = f6; - f3 = f4; - } + if (mc.theWorld.provider.isSurfaceWorld()) + { + GL11.glDisable(GL11.GL_TEXTURE_2D); + Vec3 vec3 = world.getSkyColor(mc.renderViewEntity, par1); + float f1 = (float)vec3.xCoord; + float f2 = (float)vec3.yCoord; + float f3 = (float)vec3.zCoord; + float f4; - GL11.glColor3f(f1, f2, f3); - Tessellator tessellator1 = Tessellator.instance; - GL11.glDepthMask(false); - GL11.glEnable(GL11.GL_FOG); - GL11.glColor3f(f1, f2, f3); - GL11.glCallList(this.glSkyList); - GL11.glDisable(GL11.GL_FOG); - GL11.glDisable(GL11.GL_ALPHA_TEST); - GL11.glEnable(GL11.GL_BLEND); - GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); - RenderHelper.disableStandardItemLighting(); - float[] afloat = world.provider.calcSunriseSunsetColors(world.getCelestialAngle(par1), par1); - float f7; - float f8; - float f9; - float f10; + if (mc.gameSettings.anaglyph) + { + float f5 = (f1 * 30.0F + f2 * 59.0F + f3 * 11.0F) / 100.0F; + float f6 = (f1 * 30.0F + f2 * 70.0F) / 100.0F; + f4 = (f1 * 30.0F + f3 * 70.0F) / 100.0F; + f1 = f5; + f2 = f6; + f3 = f4; + } - if (afloat != null) - { - GL11.glDisable(GL11.GL_TEXTURE_2D); - GL11.glShadeModel(GL11.GL_SMOOTH); - GL11.glPushMatrix(); - GL11.glRotatef(90.0F, 1.0F, 0.0F, 0.0F); - GL11.glRotatef(MathHelper.sin(world.getCelestialAngleRadians(par1)) < 0.0F ? 180.0F : 0.0F, 0.0F, 0.0F, 1.0F); - GL11.glRotatef(90.0F, 0.0F, 0.0F, 1.0F); - f4 = afloat[0]; - f7 = afloat[1]; - f8 = afloat[2]; - float f11; + GL11.glColor3f(f1, f2, f3); + Tessellator tessellator1 = Tessellator.instance; + GL11.glDepthMask(false); + GL11.glEnable(GL11.GL_FOG); + GL11.glColor3f(f1, f2, f3); + GL11.glCallList(this.glSkyList); + GL11.glDisable(GL11.GL_FOG); + GL11.glDisable(GL11.GL_ALPHA_TEST); + GL11.glEnable(GL11.GL_BLEND); + GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); + RenderHelper.disableStandardItemLighting(); + float[] afloat = world.provider.calcSunriseSunsetColors(world.getCelestialAngle(par1), par1); + float f7; + float f8; + float f9; + float f10; - if (mc.gameSettings.anaglyph) - { - f9 = (f4 * 30.0F + f7 * 59.0F + f8 * 11.0F) / 100.0F; - f10 = (f4 * 30.0F + f7 * 70.0F) / 100.0F; - f11 = (f4 * 30.0F + f8 * 70.0F) / 100.0F; - f4 = f9; - f7 = f10; - f8 = f11; - } + if (afloat != null) + { + GL11.glDisable(GL11.GL_TEXTURE_2D); + GL11.glShadeModel(GL11.GL_SMOOTH); + GL11.glPushMatrix(); + GL11.glRotatef(90.0F, 1.0F, 0.0F, 0.0F); + GL11.glRotatef(MathHelper.sin(world.getCelestialAngleRadians(par1)) < 0.0F ? 180.0F : 0.0F, 0.0F, 0.0F, 1.0F); + GL11.glRotatef(90.0F, 0.0F, 0.0F, 1.0F); + f4 = afloat[0]; + f7 = afloat[1]; + f8 = afloat[2]; + float f11; - tessellator1.startDrawing(6); - tessellator1.setColorRGBA_F(f4, f7, f8, afloat[3]); - tessellator1.addVertex(0.0D, 100.0D, 0.0D); - byte b0 = 16; - tessellator1.setColorRGBA_F(afloat[0], afloat[1], afloat[2], 0.0F); + if (mc.gameSettings.anaglyph) + { + f9 = (f4 * 30.0F + f7 * 59.0F + f8 * 11.0F) / 100.0F; + f10 = (f4 * 30.0F + f7 * 70.0F) / 100.0F; + f11 = (f4 * 30.0F + f8 * 70.0F) / 100.0F; + f4 = f9; + f7 = f10; + f8 = f11; + } - for (int j = 0; j <= b0; ++j) - { - f11 = (float)j * (float)Math.PI * 2.0F / (float)b0; - float f12 = MathHelper.sin(f11); - float f13 = MathHelper.cos(f11); - tessellator1.addVertex((double)(f12 * 120.0F), (double)(f13 * 120.0F), (double)(-f13 * 40.0F * afloat[3])); - } + tessellator1.startDrawing(6); + tessellator1.setColorRGBA_F(f4, f7, f8, afloat[3]); + tessellator1.addVertex(0.0D, 100.0D, 0.0D); + byte b0 = 16; + tessellator1.setColorRGBA_F(afloat[0], afloat[1], afloat[2], 0.0F); - tessellator1.draw(); - GL11.glPopMatrix(); - GL11.glShadeModel(GL11.GL_FLAT); - } + for (int j = 0; j <= b0; ++j) + { + f11 = j * (float)Math.PI * 2.0F / b0; + float f12 = MathHelper.sin(f11); + float f13 = MathHelper.cos(f11); + tessellator1.addVertex(f12 * 120.0F, f13 * 120.0F, -f13 * 40.0F * afloat[3]); + } - GL11.glEnable(GL11.GL_TEXTURE_2D); - GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE); - GL11.glPushMatrix(); - f4 = 1.0F - world.getRainStrength(par1); - f7 = 0.0F; - f8 = 0.0F; - f9 = 0.0F; - GL11.glColor4f(1.0F, 1.0F, 1.0F, f4); - GL11.glTranslatef(f7, f8, f9); - 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(this.getSunRenderPath()); - 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); - tessellator1.addVertexWithUV((double)f10, 100.0D, (double)f10, 1.0D, 1.0D); - tessellator1.addVertexWithUV((double)(-f10), 100.0D, (double)f10, 0.0D, 1.0D); - tessellator1.draw(); - f10 = 20.0F; - mc.renderEngine.bindTexture(this.getMoonRenderPath()); - int k = world.getMoonPhase(); - int l = k % 4; - int i1 = k / 4 % 2; - float f14 = (float)(l + 0) ; - float f15 = (float)(i1 + 0); - float f16 = (float)(l + 1) ; - float f17 = (float)(i1 + 1); - tessellator1.startDrawingQuads(); - tessellator1.addVertexWithUV((double)(-f10), -100.0D, (double)f10, (double)f16, (double)f17); - tessellator1.addVertexWithUV((double)f10, -100.0D, (double)f10, (double)f14, (double)f17); - tessellator1.addVertexWithUV((double)f10, -100.0D, (double)(-f10), (double)f14, (double)f15); - tessellator1.addVertexWithUV((double)(-f10), -100.0D, (double)(-f10), (double)f16, (double)f15); - tessellator1.draw(); - GL11.glDisable(GL11.GL_TEXTURE_2D); - float f18 = world.getStarBrightness(par1) * f4; + tessellator1.draw(); + GL11.glPopMatrix(); + GL11.glShadeModel(GL11.GL_FLAT); + } - if (f18 > 0.0F) - { - GL11.glColor4f(f18, f18, f18, f18); - GL11.glCallList(this.starGLCallList); - } + GL11.glEnable(GL11.GL_TEXTURE_2D); + GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE); + GL11.glPushMatrix(); + f4 = 1.0F - world.getRainStrength(par1); + f7 = 0.0F; + f8 = 0.0F; + f9 = 0.0F; + GL11.glColor4f(1.0F, 1.0F, 1.0F, f4); + GL11.glTranslatef(f7, f8, f9); + 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(this.getSunRenderPath()); + tessellator1.startDrawingQuads(); + tessellator1.addVertexWithUV((-f10), 100.0D, (-f10), 0.0D, 0.0D); + tessellator1.addVertexWithUV(f10, 100.0D, (-f10), 1.0D, 0.0D); + tessellator1.addVertexWithUV(f10, 100.0D, f10, 1.0D, 1.0D); + tessellator1.addVertexWithUV((-f10), 100.0D, f10, 0.0D, 1.0D); + tessellator1.draw(); + f10 = 20.0F; + mc.renderEngine.bindTexture(this.getMoonRenderPath()); + int k = world.getMoonPhase(); + int l = k % 4; + int i1 = k / 4 % 2; + float f14 = l + 0 ; + float f15 = i1 + 0; + float f16 = l + 1 ; + float f17 = i1 + 1; + tessellator1.startDrawingQuads(); + tessellator1.addVertexWithUV((-f10), -100.0D, f10, f16, f17); + tessellator1.addVertexWithUV(f10, -100.0D, f10, f14, f17); + tessellator1.addVertexWithUV(f10, -100.0D, (-f10), f14, f15); + tessellator1.addVertexWithUV((-f10), -100.0D, (-f10), f16, f15); + tessellator1.draw(); + GL11.glDisable(GL11.GL_TEXTURE_2D); + float f18 = world.getStarBrightness(par1) * f4; - GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); - GL11.glDisable(GL11.GL_BLEND); - GL11.glEnable(GL11.GL_ALPHA_TEST); - GL11.glEnable(GL11.GL_FOG); - GL11.glPopMatrix(); - GL11.glDisable(GL11.GL_TEXTURE_2D); - GL11.glColor3f(0.0F, 0.0F, 0.0F); - double d0 = mc.thePlayer.getPosition(par1).yCoord - world.getHorizon(); + if (f18 > 0.0F) + { + GL11.glColor4f(f18, f18, f18, f18); + GL11.glCallList(this.starGLCallList); + } - if (d0 < 0.0D) - { - GL11.glPushMatrix(); - GL11.glTranslatef(0.0F, 12.0F, 0.0F); - GL11.glCallList(this.glSkyList2); - GL11.glPopMatrix(); - f8 = 1.0F; - f9 = -((float)(d0 + 65.0D)); - f10 = -f8; - tessellator1.startDrawingQuads(); - tessellator1.setColorRGBA_I(0, 255); - tessellator1.addVertex((double)(-f8), (double)f9, (double)f8); - tessellator1.addVertex((double)f8, (double)f9, (double)f8); - tessellator1.addVertex((double)f8, (double)f10, (double)f8); - tessellator1.addVertex((double)(-f8), (double)f10, (double)f8); - tessellator1.addVertex((double)(-f8), (double)f10, (double)(-f8)); - tessellator1.addVertex((double)f8, (double)f10, (double)(-f8)); - tessellator1.addVertex((double)f8, (double)f9, (double)(-f8)); - tessellator1.addVertex((double)(-f8), (double)f9, (double)(-f8)); - tessellator1.addVertex((double)f8, (double)f10, (double)(-f8)); - tessellator1.addVertex((double)f8, (double)f10, (double)f8); - tessellator1.addVertex((double)f8, (double)f9, (double)f8); - tessellator1.addVertex((double)f8, (double)f9, (double)(-f8)); - tessellator1.addVertex((double)(-f8), (double)f9, (double)(-f8)); - tessellator1.addVertex((double)(-f8), (double)f9, (double)f8); - tessellator1.addVertex((double)(-f8), (double)f10, (double)f8); - tessellator1.addVertex((double)(-f8), (double)f10, (double)(-f8)); - tessellator1.addVertex((double)(-f8), (double)f10, (double)(-f8)); - tessellator1.addVertex((double)(-f8), (double)f10, (double)f8); - tessellator1.addVertex((double)f8, (double)f10, (double)f8); - tessellator1.addVertex((double)f8, (double)f10, (double)(-f8)); - tessellator1.draw(); - } + GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); + GL11.glDisable(GL11.GL_BLEND); + GL11.glEnable(GL11.GL_ALPHA_TEST); + GL11.glEnable(GL11.GL_FOG); + GL11.glPopMatrix(); + GL11.glDisable(GL11.GL_TEXTURE_2D); + GL11.glColor3f(0.0F, 0.0F, 0.0F); + double d0 = mc.thePlayer.getPosition(par1).yCoord - world.getHorizon(); - if (world.provider.isSkyColored()) - { - GL11.glColor3f(f1 * 0.2F + 0.04F, f2 * 0.2F + 0.04F, f3 * 0.6F + 0.1F); - } - else - { - GL11.glColor3f(f1, f2, f3); - } + if (d0 < 0.0D) + { + GL11.glPushMatrix(); + GL11.glTranslatef(0.0F, 12.0F, 0.0F); + GL11.glCallList(this.glSkyList2); + GL11.glPopMatrix(); + f8 = 1.0F; + f9 = -((float)(d0 + 65.0D)); + f10 = -f8; + tessellator1.startDrawingQuads(); + tessellator1.setColorRGBA_I(0, 255); + tessellator1.addVertex((-f8), f9, f8); + tessellator1.addVertex(f8, f9, f8); + tessellator1.addVertex(f8, f10, f8); + tessellator1.addVertex((-f8), f10, f8); + tessellator1.addVertex((-f8), f10, (-f8)); + tessellator1.addVertex(f8, f10, (-f8)); + tessellator1.addVertex(f8, f9, (-f8)); + tessellator1.addVertex((-f8), f9, (-f8)); + tessellator1.addVertex(f8, f10, (-f8)); + tessellator1.addVertex(f8, f10, f8); + tessellator1.addVertex(f8, f9, f8); + tessellator1.addVertex(f8, f9, (-f8)); + tessellator1.addVertex((-f8), f9, (-f8)); + tessellator1.addVertex((-f8), f9, f8); + tessellator1.addVertex((-f8), f10, f8); + tessellator1.addVertex((-f8), f10, (-f8)); + tessellator1.addVertex((-f8), f10, (-f8)); + tessellator1.addVertex((-f8), f10, f8); + tessellator1.addVertex(f8, f10, f8); + tessellator1.addVertex(f8, f10, (-f8)); + tessellator1.draw(); + } + + if (world.provider.isSkyColored()) + { + GL11.glColor3f(f1 * 0.2F + 0.04F, f2 * 0.2F + 0.04F, f3 * 0.6F + 0.1F); + } + else + { + GL11.glColor3f(f1, f2, f3); + } + + GL11.glPushMatrix(); + GL11.glTranslatef(0.0F, -((float)(d0 - 16.0D)), 0.0F); + GL11.glCallList(this.glSkyList2); + GL11.glPopMatrix(); + GL11.glEnable(GL11.GL_TEXTURE_2D); + GL11.glDepthMask(true); + } - GL11.glPushMatrix(); - GL11.glTranslatef(0.0F, -((float)(d0 - 16.0D)), 0.0F); - GL11.glCallList(this.glSkyList2); - GL11.glPopMatrix(); - GL11.glEnable(GL11.GL_TEXTURE_2D); - GL11.glDepthMask(true); - } - } - + } \ No newline at end of file diff --git a/StevenDimDoors/mod_pocketDim/world/GatewayGenerator.java b/StevenDimDoors/mod_pocketDim/world/GatewayGenerator.java index 43efc217..a37ce803 100644 --- a/StevenDimDoors/mod_pocketDim/world/GatewayGenerator.java +++ b/StevenDimDoors/mod_pocketDim/world/GatewayGenerator.java @@ -60,6 +60,7 @@ public class GatewayGenerator implements IWorldGenerator int attempts; int correction; boolean valid; + @SuppressWarnings("deprecation") DimLink link; NewDimData dimension; diff --git a/StevenDimDoors/mod_pocketDim/world/LimboGenerator.java b/StevenDimDoors/mod_pocketDim/world/LimboGenerator.java index 33a754f7..9c5a7090 100644 --- a/StevenDimDoors/mod_pocketDim/world/LimboGenerator.java +++ b/StevenDimDoors/mod_pocketDim/world/LimboGenerator.java @@ -20,7 +20,7 @@ import net.minecraftforge.event.terraingen.ChunkProviderEvent; import StevenDimDoors.mod_pocketDim.DDProperties; import StevenDimDoors.mod_pocketDim.ticking.MonolithSpawner; -public class LimboGenerator extends ChunkProviderGenerate implements IChunkProvider +public class LimboGenerator extends ChunkProviderGenerate { private static Random rand; @@ -128,7 +128,7 @@ public class LimboGenerator extends ChunkProviderGenerate implements IChunkProvi public Chunk provideChunk(int chunkX, int chunkZ) { //TODO: Wtf? Why do you reinitialize the seed when we already initialized it in the constructor?! ~SenseiKiwi - LimboGenerator.rand.setSeed((long) chunkX * 341873128712L + (long) chunkZ * 132897987541L); + LimboGenerator.rand.setSeed(chunkX * 341873128712L + chunkZ * 132897987541L); byte[] var3 = new byte[32768]; this.generateTerrain(chunkX, chunkZ, var3); Chunk var4 = new Chunk(this.worldObj, var3, chunkX, chunkZ); @@ -178,7 +178,7 @@ public class LimboGenerator extends ChunkProviderGenerate implements IChunkProvi { for (int var9 = -2; var9 <= 2; ++var9) { - float var10 = 10.0F / MathHelper.sqrt_float((float)(var8 * var8 + var9 * var9) + 0.2F); + float var10 = 10.0F / MathHelper.sqrt_float(var8 * var8 + var9 * var9 + 0.2F); this.parabolicField[var8 + 2 + (var9 + 2) * 5] = var10; } } @@ -191,8 +191,7 @@ public class LimboGenerator extends ChunkProviderGenerate implements IChunkProvi this.noise3 = this.noiseGen3.generateNoiseOctaves(this.noise3, par2, par3, par4, par5, par6, par7, var44 / 80.0D, var45 / 160.0D, var44 / 80.0D); this.noise1 = this.noiseGen1.generateNoiseOctaves(this.noise1, par2, par3, par4, par5, par6, par7, var44, var45, var44); this.noise2 = this.noiseGen2.generateNoiseOctaves(this.noise2, par2, par3, par4, par5, par6, par7, var44, var45, var44); - boolean var43 = false; - boolean var42 = false; + int var12 = 0; int var13 = 0; @@ -204,7 +203,6 @@ public class LimboGenerator extends ChunkProviderGenerate implements IChunkProvi float var17 = 0.0F; float var18 = 0.0F; byte var19 = 2; - BiomeGenBase var20 = this.biomesForGeneration[var14 + 2 + (var15 + 2) * (par5 + 5)]; for (int var21 = -var19; var21 <= var19; ++var21) { @@ -260,13 +258,13 @@ public class LimboGenerator extends ChunkProviderGenerate implements IChunkProvi for (int var46 = 0; var46 < par6; ++var46) { - double var48 = (double)var17; - double var26 = (double)var16; + double var48 = var17; + double var26 = var16; var48 += var47 * 0.2D; - var48 = var48 * (double)par6 / 16.0D; - double var28 = (double)par6 / 2.0D + var48 * 4.0D; + var48 = var48 * par6 / 16.0D; + double var28 = par6 / 2.0D + var48 * 4.0D; double var30 = 0.0D; - double var32 = ((double)var46 - var28) * 12.0D * 128.0D / 128.0D / var26; + double var32 = (var46 - var28) * 12.0D * 128.0D / 128.0D / var26; if (var32 < 0.0D) { @@ -294,7 +292,7 @@ public class LimboGenerator extends ChunkProviderGenerate implements IChunkProvi if (var46 > par6 - 4) { - double var40 = (double)((float)(var46 - (par6 - 4)) / 3.0F); + double var40 = (var46 - (par6 - 4)) / 3.0F; var30 = var30 * (1.0D - var40) + -10.0D * var40; } @@ -306,6 +304,7 @@ public class LimboGenerator extends ChunkProviderGenerate implements IChunkProvi return par1ArrayOfDouble; } + @Override public void generateTerrain(int par1, int par2, byte[] par3ArrayOfByte) { byte var4 = 4; diff --git a/StevenDimDoors/mod_pocketDim/world/LimboProvider.java b/StevenDimDoors/mod_pocketDim/world/LimboProvider.java index c0d45144..c7d6fb9f 100644 --- a/StevenDimDoors/mod_pocketDim/world/LimboProvider.java +++ b/StevenDimDoors/mod_pocketDim/world/LimboProvider.java @@ -37,6 +37,7 @@ public class LimboProvider extends WorldProvider this.properties = mod_pocketDim.properties; } + @Override @SideOnly(Side.CLIENT) public IRenderHandler getSkyRenderer() { @@ -55,11 +56,13 @@ public class LimboProvider extends WorldProvider return mod_pocketDim.limboBiome; } + @Override public boolean canRespawnHere() { return properties.HardcoreLimboEnabled && properties.LimboEnabled; } + @Override public boolean isBlockHighHumidity(int x, int y, int z) { return false; @@ -79,22 +82,24 @@ public class LimboProvider extends WorldProvider for (int steps = 0; steps <= 15; ++steps) { - float var3 = 1.0F - (float)steps / 15.0F; + float var3 = 1.0F - steps / 15.0F; this.lightBrightnessTable[steps] = ((0.0F + var3) / (var3 * 3.0F + 1.0F) * (1.0F - modifier) + modifier)*3; // System.out.println( this.lightBrightnessTable[steps]+"light"); } } + @Override public ChunkCoordinates getSpawnPoint() { return this.getRandomizedSpawnPoint(); } + @Override public float calculateCelestialAngle(long par1, float par3) { int var4 = (int)(par1 % 24000L); - float var5 = ((float)var4 + par3) / 24000.0F - 0.25F; + float var5 = (var4 + par3) / 24000.0F - 0.25F; if (var5 < 0.0F) { @@ -107,7 +112,7 @@ public class LimboProvider extends WorldProvider } float var6 = var5; - var5 = 1.0F - (float)((Math.cos((double)var5 * Math.PI) + 1.0D) / 2.0D); + var5 = 1.0F - (float)((Math.cos(var5 * Math.PI) + 1.0D) / 2.0D); var5 = var6 + (var5 - var6) / 3.0F; return 0; } @@ -125,6 +130,7 @@ public class LimboProvider extends WorldProvider return (dimensionId == 0 ? null : "DimensionalDoors/Limbo" + dimensionId); } + @Override public boolean canCoordinateBeSpawn(int par1, int par2) { int var3 = this.worldObj.getFirstUncoveredBlock(par1, par2); @@ -135,19 +141,21 @@ public class LimboProvider extends WorldProvider { return worldObj.getHeight()/4-800; } + @Override public Vec3 getSkyColor(Entity cameraEntity, float partialTicks) { setCloudRenderer( new CloudRenderBlank()); - return this.worldObj.getWorldVec3Pool().getVecFromPool((double)0, (double)0, (double)0); + return this.worldObj.getWorldVec3Pool().getVecFromPool(0, 0, 0); } @SideOnly(Side.CLIENT) @Override public Vec3 getFogColor(float par1, float par2) { - return this.worldObj.getWorldVec3Pool().getVecFromPool((double).2, (double).2, (double).2); + return this.worldObj.getWorldVec3Pool().getVecFromPool(.2, .2, .2); } + @Override public int getRespawnDimension(EntityPlayerMP player) { return 0; @@ -160,6 +168,7 @@ public class LimboProvider extends WorldProvider return new LimboGenerator(worldObj, 45, spawner, properties); } + @Override public boolean canBlockFreeze(int x, int y, int z, boolean byWater) { return false; diff --git a/StevenDimDoors/mod_pocketDim/world/LimboSkyProvider.java b/StevenDimDoors/mod_pocketDim/world/LimboSkyProvider.java index 4252564b..943f135c 100644 --- a/StevenDimDoors/mod_pocketDim/world/LimboSkyProvider.java +++ b/StevenDimDoors/mod_pocketDim/world/LimboSkyProvider.java @@ -1,27 +1,18 @@ package StevenDimDoors.mod_pocketDim.world; -import org.lwjgl.opengl.GL11; - -import net.minecraft.client.Minecraft; -import net.minecraft.client.multiplayer.WorldClient; -import net.minecraft.client.renderer.GLAllocation; -import net.minecraft.client.renderer.RenderHelper; -import net.minecraft.client.renderer.Tessellator; -import net.minecraft.util.MathHelper; -import net.minecraft.util.Vec3; -import net.minecraftforge.client.IRenderHandler; +import net.minecraft.util.ResourceLocation; public class LimboSkyProvider extends CustomSkyProvider { @Override - public String getMoonRenderPath() + public ResourceLocation getMoonRenderPath() { - return "/mods/DimDoors/textures/other/limboMoon.png"; + return new ResourceLocation("DimDoors:textures/other/limboMoon.png"); } @Override - public String getSunRenderPath() + public ResourceLocation getSunRenderPath() { - return "/mods/DimDoors/textures/other/limboSun.png"; + return new ResourceLocation("DimDoors:textures/other/limboSun.png"); } } \ No newline at end of file diff --git a/StevenDimDoors/mod_pocketDim/world/PocketBuilder.java b/StevenDimDoors/mod_pocketDim/world/PocketBuilder.java index 88b326a1..89c618a2 100644 --- a/StevenDimDoors/mod_pocketDim/world/PocketBuilder.java +++ b/StevenDimDoors/mod_pocketDim/world/PocketBuilder.java @@ -3,7 +3,6 @@ package StevenDimDoors.mod_pocketDim.world; import java.util.Random; import net.minecraft.block.Block; -import net.minecraft.item.ItemDoor; import net.minecraft.util.MathHelper; import net.minecraft.world.World; import net.minecraft.world.chunk.Chunk; @@ -11,7 +10,6 @@ import net.minecraft.world.chunk.storage.ExtendedBlockStorage; import net.minecraftforge.common.DimensionManager; import StevenDimDoors.mod_pocketDim.DDProperties; import StevenDimDoors.mod_pocketDim.Point3D; -import StevenDimDoors.mod_pocketDim.blocks.DimensionalDoor; import StevenDimDoors.mod_pocketDim.blocks.IDimDoor; import StevenDimDoors.mod_pocketDim.core.DimLink; import StevenDimDoors.mod_pocketDim.core.LinkTypes; @@ -25,9 +23,9 @@ import StevenDimDoors.mod_pocketDim.helpers.yCoordHelper; import StevenDimDoors.mod_pocketDim.schematic.BlockRotator; import StevenDimDoors.mod_pocketDim.util.Pair; import StevenDimDoors.mod_pocketDim.util.Point4D; -import StevenDimDoors.mod_pocketDim.items.BaseItemDoor; import StevenDimDoors.mod_pocketDim.items.ItemDimensionalDoor; +@SuppressWarnings("deprecation") public class PocketBuilder { public static final int MIN_POCKET_SIZE = 5; @@ -51,6 +49,7 @@ public class PocketBuilder * @param properties * @return */ + public static boolean regenerateDungeonPocket(NewDimData dimension, DimLink linkIn, DDProperties properties) { if (linkIn == null) @@ -79,6 +78,7 @@ public class PocketBuilder dimension.createLink(oldLinkPos, LinkTypes.SAFE_EXIT, (orientation+2)%4); return false; } + @SuppressWarnings("unused") // ? NewDimData parent = PocketManager.getDimensionData(incomingLink.source().getDimension()); if (!dimension.isDungeon()) @@ -118,6 +118,7 @@ public class PocketBuilder } + public static boolean generateNewDungeonPocket(DimLink link, DDProperties properties) { if (link == null) diff --git a/StevenDimDoors/mod_pocketDim/world/PocketGenerator.java b/StevenDimDoors/mod_pocketDim/world/PocketGenerator.java index fd341842..60761225 100644 --- a/StevenDimDoors/mod_pocketDim/world/PocketGenerator.java +++ b/StevenDimDoors/mod_pocketDim/world/PocketGenerator.java @@ -12,7 +12,7 @@ import StevenDimDoors.mod_pocketDim.core.NewDimData; import StevenDimDoors.mod_pocketDim.core.PocketManager; import StevenDimDoors.mod_pocketDim.ticking.MonolithSpawner; -public class PocketGenerator extends ChunkProviderGenerate implements IChunkProvider +public class PocketGenerator extends ChunkProviderGenerate { private World worldObj; @@ -32,6 +32,7 @@ public class PocketGenerator extends ChunkProviderGenerate implements IChunkProv } + @Override public boolean unloadQueuedChunks() { return true; diff --git a/StevenDimDoors/mod_pocketDim/world/PocketProvider.java b/StevenDimDoors/mod_pocketDim/world/PocketProvider.java index ca515809..f80480cc 100644 --- a/StevenDimDoors/mod_pocketDim/world/PocketProvider.java +++ b/StevenDimDoors/mod_pocketDim/world/PocketProvider.java @@ -20,6 +20,7 @@ public class PocketProvider extends WorldProvider { private DDProperties properties; private MonolithSpawner spawner; + @SuppressWarnings("unused") // ? private IRenderHandler skyRenderer; public PocketProvider() @@ -47,14 +48,14 @@ public class PocketProvider extends WorldProvider public Vec3 getSkyColor(Entity cameraEntity, float partialTicks) { setCloudRenderer( new CloudRenderBlank()); - return this.worldObj.getWorldVec3Pool().getVecFromPool((double)0, (double)0, (double)0); + return this.worldObj.getWorldVec3Pool().getVecFromPool(0d, 0d, 0d); } @SideOnly(Side.CLIENT) @Override public Vec3 getFogColor(float par1, float par2) { - return this.worldObj.getWorldVec3Pool().getVecFromPool((double)0, (double)0, (double)0); + return this.worldObj.getWorldVec3Pool().getVecFromPool(0d, 0d, 0d); } @Override diff --git a/StevenDimDoors/mod_pocketDim/world/PocketSkyProvider.java b/StevenDimDoors/mod_pocketDim/world/PocketSkyProvider.java index a3503fe9..7d734fa8 100644 --- a/StevenDimDoors/mod_pocketDim/world/PocketSkyProvider.java +++ b/StevenDimDoors/mod_pocketDim/world/PocketSkyProvider.java @@ -1,31 +1,18 @@ package StevenDimDoors.mod_pocketDim.world; -import org.lwjgl.opengl.GL11; - -import net.minecraft.client.Minecraft; -import net.minecraft.client.multiplayer.WorldClient; -import net.minecraft.client.renderer.GLAllocation; -import net.minecraft.client.renderer.RenderHelper; -import net.minecraft.client.renderer.Tessellator; -import net.minecraft.util.MathHelper; -import net.minecraft.util.Vec3; -import net.minecraftforge.client.IRenderHandler; +import net.minecraft.util.ResourceLocation; public class PocketSkyProvider extends CustomSkyProvider { - - public class LimboSkyProvider extends CustomSkyProvider + @Override + public ResourceLocation getMoonRenderPath() { - @Override - public String getMoonRenderPath() - { - return "/mods/DimDoors/textures/other/pocketMoon.png"; - } - - @Override - public String getSunRenderPath() - { - return "/mods/DimDoors/textures/other/pocketSun.png"; - } + return new ResourceLocation("DimDoors:textures/other/limboMoon.png"); + } + + @Override + public ResourceLocation getSunRenderPath() + { + return new ResourceLocation("DimDoors:textures/other/limboSun.png"); } } \ No newline at end of file diff --git a/StevenDimDoors/mod_pocketDimClient/ClientPacketHandler.java b/StevenDimDoors/mod_pocketDimClient/ClientPacketHandler.java index 3c2a6665..5e6be4d6 100644 --- a/StevenDimDoors/mod_pocketDimClient/ClientPacketHandler.java +++ b/StevenDimDoors/mod_pocketDimClient/ClientPacketHandler.java @@ -1,21 +1,22 @@ package StevenDimDoors.mod_pocketDimClient; +import StevenDimDoors.mod_pocketDim.PacketConstants; +import StevenDimDoors.mod_pocketDim.core.PocketManager; +import StevenDimDoors.mod_pocketDim.util.Point4D; +import StevenDimDoors.mod_pocketDim.watcher.ClientDimData; +import StevenDimDoors.mod_pocketDim.watcher.IUpdateSource; +import StevenDimDoors.mod_pocketDim.watcher.IUpdateWatcher; + +import cpw.mods.fml.common.FMLCommonHandler; +import cpw.mods.fml.common.network.IPacketHandler; +import cpw.mods.fml.common.network.Player; + import java.io.ByteArrayInputStream; import java.io.DataInputStream; import net.minecraft.network.INetworkManager; import net.minecraft.network.packet.Packet250CustomPayload; import net.minecraft.server.integrated.IntegratedServer; -import StevenDimDoors.mod_pocketDim.PacketConstants; -import StevenDimDoors.mod_pocketDim.core.PocketManager; -import StevenDimDoors.mod_pocketDim.util.Point4D; -import StevenDimDoors.mod_pocketDim.watcher.ClientDimData; -import StevenDimDoors.mod_pocketDim.watcher.IUpdateSource; -import StevenDimDoors.mod_pocketDim.watcher.IUpdateWatcher; -import cpw.mods.fml.common.FMLCommonHandler; -import cpw.mods.fml.common.network.IPacketHandler; -import cpw.mods.fml.common.network.Player; -import cpw.mods.fml.relauncher.Side; public class ClientPacketHandler implements IPacketHandler, IUpdateSource { diff --git a/StevenDimDoors/mod_pocketDimClient/ClosingRiftFX.java b/StevenDimDoors/mod_pocketDimClient/ClosingRiftFX.java index f1e409ce..2ea32391 100644 --- a/StevenDimDoors/mod_pocketDimClient/ClosingRiftFX.java +++ b/StevenDimDoors/mod_pocketDimClient/ClosingRiftFX.java @@ -46,25 +46,26 @@ public class ClosingRiftFX extends EntityFX public void func_92044_a(int par1) { - float var2 = (float)((par1 & 16711680) >> 16) / 255.0F; - float var3 = (float)((par1 & 65280) >> 8) / 255.0F; - float var4 = (float)((par1 & 255) >> 0) / 255.0F; + float var2 = ((par1 & 16711680) >> 16) / 255.0F; + float var3 = ((par1 & 65280) >> 8) / 255.0F; + float var4 = ((par1 & 255) >> 0) / 255.0F; float var5 = 1.0F; this.setRBGColorF(var2 * var5, var3 * var5, var4 * var5); } public void func_92046_g(int par1) { - this.field_92050_aA = (float)((par1 & 16711680) >> 16) / 255.0F; - this.field_92051_aB = (float)((par1 & 65280) >> 8) / 255.0F; - this.field_92052_aC = (float)((par1 & 255) >> 0) / 255.0F; + this.field_92050_aA = ((par1 & 16711680) >> 16) / 255.0F; + this.field_92051_aB = ((par1 & 65280) >> 8) / 255.0F; + this.field_92052_aC = ((par1 & 255) >> 0) / 255.0F; this.field_92053_aD = true; } /** * returns the bounding box for this entity */ - public AxisAlignedBB getBoundingBox() + @Override + public AxisAlignedBB getBoundingBox() { return null; } @@ -72,12 +73,14 @@ public class ClosingRiftFX extends EntityFX /** * Returns true if this entity should push and be pushed by other entities when colliding. */ - public boolean canBePushed() + @Override + public boolean canBePushed() { return false; } - public void renderParticle(Tessellator par1Tessellator, float par2, float par3, float par4, float par5, float par6, float par7) + @Override + public void renderParticle(Tessellator par1Tessellator, float par2, float par3, float par4, float par5, float par6, float par7) { if (!this.field_92048_ay || this.particleAge < this.particleMaxAge / 3 || (this.particleAge + this.particleMaxAge) / 3 % 2 == 0) { @@ -87,14 +90,14 @@ public class ClosingRiftFX extends EntityFX public void doRenderParticle(Tessellator par1Tessellator, float par2, float par3, float par4, float par5, float par6, float par7) { - float var8 = (float)(super.particleTextureIndexX % 16) / 16.0F; + float var8 = super.particleTextureIndexX % 16 / 16.0F; float var9 = var8 + 0.0624375F; - float var10 = (float)(this.particleTextureIndexX / 16) / 16.0F; + float var10 = this.particleTextureIndexX / 16 / 16.0F; float var11 = var10 + 0.0624375F; float var12 = 0.1F * this.particleScale; - float var13 = (float)(this.prevPosX + (this.posX - this.prevPosX) * (double)par2 - interpPosX); - float var14 = (float)(this.prevPosY + (this.posY - this.prevPosY) * (double)par2 - interpPosY); - float var15 = (float)(this.prevPosZ + (this.posZ - this.prevPosZ) * (double)par2 - interpPosZ); + float var13 = (float)(this.prevPosX + (this.posX - this.prevPosX) * par2 - interpPosX); + float var14 = (float)(this.prevPosY + (this.posY - this.prevPosY) * par2 - interpPosY); + float var15 = (float)(this.prevPosZ + (this.posZ - this.prevPosZ) * par2 - interpPosZ); float var16 = 0.8F; if (PocketManager.getDimensionData(worldObj).isPocketDimension()) @@ -104,16 +107,17 @@ public class ClosingRiftFX extends EntityFX par1Tessellator.setColorRGBA_F(this.particleRed * var16, this.particleGreen * var16, this.particleBlue * var16, (float) .7); - par1Tessellator.addVertexWithUV((double)(var13 - par3 * var12 - par6 * var12), (double)(var14 - par4 * var12), (double)(var15 - par5 * var12 - par7 * var12), (double)var9, (double)var11); - par1Tessellator.addVertexWithUV((double)(var13 - par3 * var12 + par6 * var12), (double)(var14 + par4 * var12), (double)(var15 - par5 * var12 + par7 * var12), (double)var9, (double)var10); - par1Tessellator.addVertexWithUV((double)(var13 + par3 * var12 + par6 * var12), (double)(var14 + par4 * var12), (double)(var15 + par5 * var12 + par7 * var12), (double)var8, (double)var10); - par1Tessellator.addVertexWithUV((double)(var13 + par3 * var12 - par6 * var12), (double)(var14 - par4 * var12), (double)(var15 + par5 * var12 - par7 * var12), (double)var8, (double)var11); + par1Tessellator.addVertexWithUV(var13 - par3 * var12 - par6 * var12, var14 - par4 * var12, var15 - par5 * var12 - par7 * var12, var9, var11); + par1Tessellator.addVertexWithUV(var13 - par3 * var12 + par6 * var12, var14 + par4 * var12, var15 - par5 * var12 + par7 * var12, var9, var10); + par1Tessellator.addVertexWithUV(var13 + par3 * var12 + par6 * var12, var14 + par4 * var12, var15 + par5 * var12 + par7 * var12, var8, var10); + par1Tessellator.addVertexWithUV(var13 + par3 * var12 - par6 * var12, var14 - par4 * var12, var15 + par5 * var12 - par7 * var12, var8, var11); } /** * Called to update the entity's position/logic. */ - public void onUpdate() + @Override + public void onUpdate() { this.prevPosX = this.posX; this.prevPosY = this.posY; @@ -126,7 +130,7 @@ public class ClosingRiftFX extends EntityFX if (this.particleAge > this.particleMaxAge / 2) { - this.setAlphaF(1.0F - ((float)this.particleAge - (float)(this.particleMaxAge / 2)) / (float)this.particleMaxAge); + this.setAlphaF(1.0F - ((float)this.particleAge - (float)(this.particleMaxAge / 2)) / this.particleMaxAge); if (this.field_92053_aD) { @@ -168,7 +172,8 @@ public class ClosingRiftFX extends EntityFX } } - public int getBrightnessForRender(float par1) + @Override + public int getBrightnessForRender(float par1) { return 15728880; } @@ -176,7 +181,8 @@ public class ClosingRiftFX extends EntityFX /** * Gets how bright this entity is. */ - public float getBrightness(float par1) + @Override + public float getBrightness(float par1) { return 1.0F; } diff --git a/StevenDimDoors/mod_pocketDimClient/GoggleRiftFX.java b/StevenDimDoors/mod_pocketDimClient/GoggleRiftFX.java index 339e0021..069d58ff 100644 --- a/StevenDimDoors/mod_pocketDimClient/GoggleRiftFX.java +++ b/StevenDimDoors/mod_pocketDimClient/GoggleRiftFX.java @@ -33,6 +33,7 @@ public class GoggleRiftFX extends EntityFireworkSparkFX this.particleMaxAge = 30 + this.rand.nextInt(16); this.noClip = true; } + @Override public void renderParticle(Tessellator par1Tessellator, float par2, float par3, float par4, float par5, float par6, float par7) { if (!this.field_92048_ay || this.particleAge < this.particleMaxAge / 3 || (this.particleAge + this.particleMaxAge) / 3 % 2 == 0) @@ -43,14 +44,14 @@ public class GoggleRiftFX extends EntityFireworkSparkFX public void doRenderParticle(Tessellator par1Tessellator, float par2, float par3, float par4, float par5, float par6, float par7) { - float var8 = (float)(super.particleTextureIndexX % 16) / 16.0F; + float var8 = super.particleTextureIndexX % 16 / 16.0F; float var9 = var8 + 0.0624375F; - float var10 = (float)(this.particleTextureIndexX / 16) / 16.0F; + float var10 = this.particleTextureIndexX / 16 / 16.0F; float var11 = var10 + 0.0624375F; float var12 = 0.1F * this.particleScale; - float var13 = (float)(this.prevPosX + (this.posX - this.prevPosX) * (double)par2 - interpPosX); - float var14 = (float)(this.prevPosY + (this.posY - this.prevPosY) * (double)par2 - interpPosY); - float var15 = (float)(this.prevPosZ + (this.posZ - this.prevPosZ) * (double)par2 - interpPosZ); + float var13 = (float)(this.prevPosX + (this.posX - this.prevPosX) * par2 - interpPosX); + float var14 = (float)(this.prevPosY + (this.posY - this.prevPosY) * par2 - interpPosY); + float var15 = (float)(this.prevPosZ + (this.posZ - this.prevPosZ) * par2 - interpPosZ); float var16 = .0F; if (PocketManager.getDimensionData(worldObj).isPocketDimension()) @@ -60,10 +61,10 @@ public class GoggleRiftFX extends EntityFireworkSparkFX par1Tessellator.setColorRGBA_F(this.particleRed * var16, this.particleGreen * var16, this.particleBlue * var16, (float) .7); - par1Tessellator.addVertexWithUV((double)(var13 - par3 * var12 - par6 * var12), (double)(var14 - par4 * var12), (double)(var15 - par5 * var12 - par7 * var12), (double)var9, (double)var11); - par1Tessellator.addVertexWithUV((double)(var13 - par3 * var12 + par6 * var12), (double)(var14 + par4 * var12), (double)(var15 - par5 * var12 + par7 * var12), (double)var9, (double)var10); - par1Tessellator.addVertexWithUV((double)(var13 + par3 * var12 + par6 * var12), (double)(var14 + par4 * var12), (double)(var15 + par5 * var12 + par7 * var12), (double)var8, (double)var10); - par1Tessellator.addVertexWithUV((double)(var13 + par3 * var12 - par6 * var12), (double)(var14 - par4 * var12), (double)(var15 + par5 * var12 - par7 * var12), (double)var8, (double)var11); + par1Tessellator.addVertexWithUV(var13 - par3 * var12 - par6 * var12, var14 - par4 * var12, var15 - par5 * var12 - par7 * var12, var9, var11); + par1Tessellator.addVertexWithUV(var13 - par3 * var12 + par6 * var12, var14 + par4 * var12, var15 - par5 * var12 + par7 * var12, var9, var10); + par1Tessellator.addVertexWithUV(var13 + par3 * var12 + par6 * var12, var14 + par4 * var12, var15 + par5 * var12 + par7 * var12, var8, var10); + par1Tessellator.addVertexWithUV(var13 + par3 * var12 - par6 * var12, var14 - par4 * var12, var15 + par5 * var12 - par7 * var12, var8, var11); } @@ -79,25 +80,26 @@ public class GoggleRiftFX extends EntityFireworkSparkFX public void func_92044_a(int par1) { - float var2 = (float)((par1 & 16711680) >> 16) / 255.0F; - float var3 = (float)((par1 & 65280) >> 8) / 255.0F; - float var4 = (float)((par1 & 255) >> 0) / 255.0F; + float var2 = ((par1 & 16711680) >> 16) / 255.0F; + float var3 = ((par1 & 65280) >> 8) / 255.0F; + float var4 = ((par1 & 255) >> 0) / 255.0F; float var5 = 1.0F; this.setRBGColorF(var2 * var5, var3 * var5, var4 * var5); } public void func_92046_g(int par1) { - this.field_92050_aA = (float)((par1 & 16711680) >> 16) / 255.0F; - this.field_92051_aB = (float)((par1 & 65280) >> 8) / 255.0F; - this.field_92052_aC = (float)((par1 & 255) >> 0) / 255.0F; + this.field_92050_aA = ((par1 & 16711680) >> 16) / 255.0F; + this.field_92051_aB = ((par1 & 65280) >> 8) / 255.0F; + this.field_92052_aC = ((par1 & 255) >> 0) / 255.0F; this.field_92053_aD = true; } /** * returns the bounding box for this entity */ - public AxisAlignedBB getBoundingBox() + @Override + public AxisAlignedBB getBoundingBox() { return null; } @@ -105,7 +107,8 @@ public class GoggleRiftFX extends EntityFireworkSparkFX /** * Returns true if this entity should push and be pushed by other entities when colliding. */ - public boolean canBePushed() + @Override + public boolean canBePushed() { return false; } @@ -115,7 +118,8 @@ public class GoggleRiftFX extends EntityFireworkSparkFX /** * Called to update the entity's position/logic. */ - public void onUpdate() + @Override + public void onUpdate() { this.prevPosX = this.posX; this.prevPosY = this.posY; @@ -128,7 +132,7 @@ public class GoggleRiftFX extends EntityFireworkSparkFX if (this.particleAge > this.particleMaxAge / 2) { - this.setAlphaF(1.0F - ((float)this.particleAge - (float)(this.particleMaxAge / 2)) / (float)this.particleMaxAge); + this.setAlphaF(1.0F - ((float)this.particleAge - (float)(this.particleMaxAge / 2)) / this.particleMaxAge); if (this.field_92053_aD) { @@ -170,7 +174,8 @@ public class GoggleRiftFX extends EntityFireworkSparkFX } } - public int getBrightnessForRender(float par1) + @Override + public int getBrightnessForRender(float par1) { return 15728880; } @@ -178,7 +183,8 @@ public class GoggleRiftFX extends EntityFireworkSparkFX /** * Gets how bright this entity is. */ - public float getBrightness(float par1) + @Override + public float getBrightness(float par1) { return 1.0F; } diff --git a/StevenDimDoors/mod_pocketDimClient/RenderDimDoor.java b/StevenDimDoors/mod_pocketDimClient/RenderDimDoor.java index 1374baf9..ae23ffb7 100644 --- a/StevenDimDoors/mod_pocketDimClient/RenderDimDoor.java +++ b/StevenDimDoors/mod_pocketDimClient/RenderDimDoor.java @@ -59,13 +59,14 @@ public class RenderDimDoor extends TileEntitySpecialRenderer for (int count = 0; count < 16; ++count) { GL11.glPushMatrix(); - float var15 = (float) (16 - count); + float var15 = 16 - count; float var16 = 0.2625F; float var17 = 1.0F / (var15 + .80F); if (count == 0) { this.bindTextureByName("/RIFT.png"); + // move files into assets/modid and change to new ResourceLocation(modid:/RIFT.png) var17 = 0.1F; var15 = 25.0F; var16 = 0.125F; @@ -76,6 +77,7 @@ public class RenderDimDoor extends TileEntitySpecialRenderer if (count == 1) { this.bindTextureByName("/WARP.png"); + // move files into assets/modid and change to new ResourceLocation(modid:/WARP.png) GL11.glEnable(GL11.GL_BLEND); GL11.glBlendFunc(GL11.GL_ONE, GL11.GL_ONE); var16 = .5F; @@ -98,14 +100,14 @@ public class RenderDimDoor extends TileEntitySpecialRenderer **/ GL11.glTranslatef( - (float) (Minecraft.getSystemTime() % 200000L) / 200000.0F, + Minecraft.getSystemTime() % 200000L / 200000.0F, 0, 0.0F); GL11.glTranslatef(0, - (float) (Minecraft.getSystemTime() % 200000L) / 200000.0F, + Minecraft.getSystemTime() % 200000L / 200000.0F, 0.0F); GL11.glTranslatef(0, 0, - (float) (Minecraft.getSystemTime() % 200000L) / 200000.0F); + Minecraft.getSystemTime() % 200000L / 200000.0F); GL11.glTexGeni(GL11.GL_S, GL11.GL_TEXTURE_GEN_MODE, GL11.GL_OBJECT_LINEAR); @@ -172,11 +174,11 @@ public class RenderDimDoor extends TileEntitySpecialRenderer GL11.glPushMatrix(); GL11.glLoadIdentity(); GL11.glTranslatef(0.0F, - (float) (Minecraft.getSystemTime() % 200000L) / 200000.0F + Minecraft.getSystemTime() % 200000L / 200000.0F * var15, 0.0F); GL11.glScalef(var16, var16, var16); GL11.glTranslatef(0.5F, 0.5F, 0.5F); - GL11.glRotatef((float) (count * count * 4321 + count * 9) * 2.0F, + GL11.glRotatef((count * count * 4321 + count * 9) * 2.0F, 0.0F, 0.0F, 1.0F); GL11.glTranslatef(0.5F, 0.5F, 0.5F); diff --git a/StevenDimDoors/mod_pocketDimClient/RenderMobObelisk.java b/StevenDimDoors/mod_pocketDimClient/RenderMobObelisk.java index bf5c4721..4d32304b 100644 --- a/StevenDimDoors/mod_pocketDimClient/RenderMobObelisk.java +++ b/StevenDimDoors/mod_pocketDimClient/RenderMobObelisk.java @@ -9,13 +9,17 @@ import cpw.mods.fml.relauncher.SideOnly; @SideOnly(Side.CLIENT) public class RenderMobObelisk extends RenderLiving { -protected ModelMobObelisk obeliskModel; + protected ModelMobObelisk obeliskModel; - public RenderMobObelisk(float f) - { - super(new ModelMobObelisk(), f); - this.obeliskModel = (ModelMobObelisk)this.mainModel; - - - } + public RenderMobObelisk(float f) + { + super(new ModelMobObelisk(), f); + this.obeliskModel = (ModelMobObelisk)this.mainModel; + } + + @Override + protected ResourceLocation getEntityTexture(Entity entity) { + // TODO Auto-generated method stub + return null; + } } \ No newline at end of file diff --git a/StevenDimDoors/mod_pocketDimClient/RenderTransTrapdoor.java b/StevenDimDoors/mod_pocketDimClient/RenderTransTrapdoor.java index 68fe35c4..35fa18e1 100644 --- a/StevenDimDoors/mod_pocketDimClient/RenderTransTrapdoor.java +++ b/StevenDimDoors/mod_pocketDimClient/RenderTransTrapdoor.java @@ -56,13 +56,14 @@ public class RenderTransTrapdoor extends TileEntitySpecialRenderer for (int count = 0; count < 16; ++count) { GL11.glPushMatrix(); - float var15 = (float)(16 - count); + float var15 = 16 - count; float var16 = 0.2625F; float var17 = 1.0F / (var15 + 1.0F); if (count == 0) { this.bindTextureByName("/RIFT.png"); + // move files into assets/modid and change to new ResourceLocation(modid:/RIFT.png) var17 = 0.1F; var15 = 25.0F; var16 = 0.125F; @@ -73,15 +74,16 @@ public class RenderTransTrapdoor extends TileEntitySpecialRenderer if (count == 1) { this.bindTextureByName("/WARP.png"); + // move files into assets/modid and change to new ResourceLocation(modid:/WARP.png) GL11.glEnable(GL11.GL_BLEND); GL11.glBlendFunc(GL11.GL_ONE, GL11.GL_ONE); var16 = .5F; } - GL11.glTranslatef( (float)(Minecraft.getSystemTime() % 200000L) / 200000.0F,0, 0.0F); - GL11.glTranslatef(0, (float)(Minecraft.getSystemTime() % 200000L) / 200000.0F, 0.0F); + GL11.glTranslatef( Minecraft.getSystemTime() % 200000L / 200000.0F,0, 0.0F); + GL11.glTranslatef(0, Minecraft.getSystemTime() % 200000L / 200000.0F, 0.0F); - GL11.glTranslatef(0,0, (float)(Minecraft.getSystemTime() % 200000L) / 200000.0F); + GL11.glTranslatef(0,0, Minecraft.getSystemTime() % 200000L / 200000.0F); GL11.glTexGeni(GL11.GL_S, GL11.GL_TEXTURE_GEN_MODE, GL11.GL_OBJECT_LINEAR); GL11.glTexGeni(GL11.GL_T, GL11.GL_TEXTURE_GEN_MODE, GL11.GL_OBJECT_LINEAR); @@ -102,10 +104,10 @@ public class RenderTransTrapdoor extends TileEntitySpecialRenderer GL11.glMatrixMode(GL11.GL_TEXTURE); GL11.glPushMatrix(); GL11.glLoadIdentity(); - GL11.glTranslatef(0.0F, (float)(Minecraft.getSystemTime() % 200000L) / 200000.0F*var15, 0.0F); + GL11.glTranslatef(0.0F, Minecraft.getSystemTime() % 200000L / 200000.0F*var15, 0.0F); GL11.glScalef(var16, var16, var16); GL11.glTranslatef(0.5F, 0.5F, 0.5F); - GL11.glRotatef((float)(count * count * 4321 + count * 9) * 2.0F, 0.0F, 0.0F, 1.0F); + GL11.glRotatef((count * count * 4321 + count * 9) * 2.0F, 0.0F, 0.0F, 1.0F); GL11.glTranslatef(0.5F, 0.5F, 0.5F); GL11.glBegin(GL11.GL_QUADS); diff --git a/StevenDimDoors/mod_pocketDimClient/RiftFX.java b/StevenDimDoors/mod_pocketDimClient/RiftFX.java index 06a9c318..7f4dc941 100644 --- a/StevenDimDoors/mod_pocketDimClient/RiftFX.java +++ b/StevenDimDoors/mod_pocketDimClient/RiftFX.java @@ -46,25 +46,26 @@ public class RiftFX extends EntityFX public void func_92044_a(int par1) { - float var2 = (float)((par1 & 16711680) >> 16) / 255.0F; - float var3 = (float)((par1 & 65280) >> 8) / 255.0F; - float var4 = (float)((par1 & 255) >> 0) / 255.0F; + float var2 = ((par1 & 16711680) >> 16) / 255.0F; + float var3 = ((par1 & 65280) >> 8) / 255.0F; + float var4 = ((par1 & 255) >> 0) / 255.0F; float var5 = 1.0F; this.setRBGColorF(var2 * var5, var3 * var5, var4 * var5); } public void func_92046_g(int par1) { - this.field_92050_aA = (float)((par1 & 16711680) >> 16) / 255.0F; - this.field_92051_aB = (float)((par1 & 65280) >> 8) / 255.0F; - this.field_92052_aC = (float)((par1 & 255) >> 0) / 255.0F; + this.field_92050_aA = ((par1 & 16711680) >> 16) / 255.0F; + this.field_92051_aB = ((par1 & 65280) >> 8) / 255.0F; + this.field_92052_aC = ((par1 & 255) >> 0) / 255.0F; this.field_92053_aD = true; } /** * returns the bounding box for this entity */ - public AxisAlignedBB getBoundingBox() + @Override + public AxisAlignedBB getBoundingBox() { return null; } @@ -72,12 +73,14 @@ public class RiftFX extends EntityFX /** * Returns true if this entity should push and be pushed by other entities when colliding. */ - public boolean canBePushed() + @Override + public boolean canBePushed() { return false; } - public void renderParticle(Tessellator par1Tessellator, float par2, float par3, float par4, float par5, float par6, float par7) + @Override + public void renderParticle(Tessellator par1Tessellator, float par2, float par3, float par4, float par5, float par6, float par7) { if (!this.field_92048_ay || this.particleAge < this.particleMaxAge / 3 || (this.particleAge + this.particleMaxAge) / 3 % 2 == 0) { @@ -89,9 +92,9 @@ public class RiftFX extends EntityFX public void doRenderParticle(Tessellator par1Tessellator, float par2, float par3, float par4, float par5, float par6, float par7) { - float f6 = (float)this.particleTextureIndexX / 16.0F; + float f6 = this.particleTextureIndexX / 16.0F; float f7 = f6 + 0.0624375F; - float f8 = (float)this.particleTextureIndexY / 16.0F; + float f8 = this.particleTextureIndexY / 16.0F; float f9 = f8 + 0.0624375F; float f10 = 0.1F * this.particleScale; @@ -103,9 +106,9 @@ public class RiftFX extends EntityFX f9 = this.particleIcon.getMaxV(); } - float f11 = (float)(this.prevPosX + (this.posX - this.prevPosX) * (double)par2 - interpPosX); - float f12 = (float)(this.prevPosY + (this.posY - this.prevPosY) * (double)par2 - interpPosY); - float f13 = (float)(this.prevPosZ + (this.posZ - this.prevPosZ) * (double)par2 - interpPosZ); + float f11 = (float)(this.prevPosX + (this.posX - this.prevPosX) * par2 - interpPosX); + float f12 = (float)(this.prevPosY + (this.posY - this.prevPosY) * par2 - interpPosY); + float f13 = (float)(this.prevPosZ + (this.posZ - this.prevPosZ) * par2 - interpPosZ); float f14 = 0F; if (PocketManager.getDimensionData(worldObj).isPocketDimension()) @@ -114,16 +117,17 @@ public class RiftFX extends EntityFX } par1Tessellator.setColorRGBA_F(this.particleRed * f14, this.particleGreen * f14, this.particleBlue * f14, (float) .7); - par1Tessellator.addVertexWithUV((double)(f11 - par3 * f10 - par6 * f10), (double)(f12 - par4 * f10), (double)(f13 - par5 * f10 - par7 * f10), (double)f7, (double)f9); - par1Tessellator.addVertexWithUV((double)(f11 - par3 * f10 + par6 * f10), (double)(f12 + par4 * f10), (double)(f13 - par5 * f10 + par7 * f10), (double)f7, (double)f8); - par1Tessellator.addVertexWithUV((double)(f11 + par3 * f10 + par6 * f10), (double)(f12 + par4 * f10), (double)(f13 + par5 * f10 + par7 * f10), (double)f6, (double)f8); - par1Tessellator.addVertexWithUV((double)(f11 + par3 * f10 - par6 * f10), (double)(f12 - par4 * f10), (double)(f13 + par5 * f10 - par7 * f10), (double)f6, (double)f9); + par1Tessellator.addVertexWithUV(f11 - par3 * f10 - par6 * f10, f12 - par4 * f10, f13 - par5 * f10 - par7 * f10, f7, f9); + par1Tessellator.addVertexWithUV(f11 - par3 * f10 + par6 * f10, f12 + par4 * f10, f13 - par5 * f10 + par7 * f10, f7, f8); + par1Tessellator.addVertexWithUV(f11 + par3 * f10 + par6 * f10, f12 + par4 * f10, f13 + par5 * f10 + par7 * f10, f6, f8); + par1Tessellator.addVertexWithUV(f11 + par3 * f10 - par6 * f10, f12 - par4 * f10, f13 + par5 * f10 - par7 * f10, f6, f9); } /** * Called to update the entity's position/logic. */ - public void onUpdate() + @Override + public void onUpdate() { this.prevPosX = this.posX; this.prevPosY = this.posY; @@ -136,7 +140,7 @@ public class RiftFX extends EntityFX if (this.particleAge > this.particleMaxAge / 2) { - this.setAlphaF(1.0F - ((float)this.particleAge - (float)(this.particleMaxAge / 2)) / (float)this.particleMaxAge); + this.setAlphaF(1.0F - ((float)this.particleAge - (float)(this.particleMaxAge / 2)) / this.particleMaxAge); if (this.field_92053_aD) { @@ -178,7 +182,8 @@ public class RiftFX extends EntityFX } } - public int getBrightnessForRender(float par1) + @Override + public int getBrightnessForRender(float par1) { return 15728880; } @@ -186,7 +191,8 @@ public class RiftFX extends EntityFX /** * Gets how bright this entity is. */ - public float getBrightness(float par1) + @Override + public float getBrightness(float par1) { return 1.0F; }