diff options
Diffstat (limited to 'src/main/java/gtPlusPlus/everglades/block')
6 files changed, 69 insertions, 104 deletions
diff --git a/src/main/java/gtPlusPlus/everglades/block/BlockDarkWorldGround.java b/src/main/java/gtPlusPlus/everglades/block/BlockDarkWorldGround.java index 85154ef1fb..72ab766652 100644 --- a/src/main/java/gtPlusPlus/everglades/block/BlockDarkWorldGround.java +++ b/src/main/java/gtPlusPlus/everglades/block/BlockDarkWorldGround.java @@ -1,9 +1,10 @@ package gtPlusPlus.everglades.block; +import net.minecraft.block.BlockGrass; + import cpw.mods.fml.common.registry.LanguageRegistry; import gtPlusPlus.api.interfaces.ITileTooltip; import gtPlusPlus.core.creative.AddToCreativeTab; -import net.minecraft.block.BlockGrass; public class BlockDarkWorldGround extends BlockGrass implements ITileTooltip { diff --git a/src/main/java/gtPlusPlus/everglades/block/BlockDarkWorldPollutedDirt.java b/src/main/java/gtPlusPlus/everglades/block/BlockDarkWorldPollutedDirt.java index 043f632804..8d74fdd087 100644 --- a/src/main/java/gtPlusPlus/everglades/block/BlockDarkWorldPollutedDirt.java +++ b/src/main/java/gtPlusPlus/everglades/block/BlockDarkWorldPollutedDirt.java @@ -1,13 +1,14 @@ package gtPlusPlus.everglades.block; +import net.minecraft.block.BlockDirt; +import net.minecraft.world.ColorizerGrass; +import net.minecraft.world.IBlockAccess; + import cpw.mods.fml.common.registry.LanguageRegistry; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import gtPlusPlus.api.interfaces.ITileTooltip; import gtPlusPlus.core.creative.AddToCreativeTab; -import net.minecraft.block.BlockDirt; -import net.minecraft.world.ColorizerGrass; -import net.minecraft.world.IBlockAccess; public class BlockDarkWorldPollutedDirt extends BlockDirt implements ITileTooltip { @@ -49,8 +50,7 @@ public class BlockDarkWorldPollutedDirt extends BlockDirt implements ITileToolti for (int k1 = -1; k1 <= 1; ++k1) { for (int l1 = -1; l1 <= 1; ++l1) { - int i2 = p_149720_1_ - .getBiomeGenForCoords(p_149720_2_ + l1, p_149720_4_ + k1) + int i2 = p_149720_1_.getBiomeGenForCoords(p_149720_2_ + l1, p_149720_4_ + k1) .getBiomeGrassColor(p_149720_2_ + l1, p_149720_3_, p_149720_4_ + k1); l += (i2 & 16711680) >> 16; i1 += (i2 & 65280) >> 8; diff --git a/src/main/java/gtPlusPlus/everglades/block/BlockDarkWorldPortalFrame.java b/src/main/java/gtPlusPlus/everglades/block/BlockDarkWorldPortalFrame.java index 96f32be8a1..e9cf49b447 100644 --- a/src/main/java/gtPlusPlus/everglades/block/BlockDarkWorldPortalFrame.java +++ b/src/main/java/gtPlusPlus/everglades/block/BlockDarkWorldPortalFrame.java @@ -1,11 +1,12 @@ package gtPlusPlus.everglades.block; +import net.minecraft.block.Block; +import net.minecraft.block.material.Material; + import cpw.mods.fml.common.registry.LanguageRegistry; import gtPlusPlus.api.interfaces.ITileTooltip; import gtPlusPlus.core.creative.AddToCreativeTab; import gtPlusPlus.core.lib.CORE; -import net.minecraft.block.Block; -import net.minecraft.block.material.Material; public class BlockDarkWorldPortalFrame extends Block implements ITileTooltip { diff --git a/src/main/java/gtPlusPlus/everglades/block/BlockDarkWorldSludgeFluid.java b/src/main/java/gtPlusPlus/everglades/block/BlockDarkWorldSludgeFluid.java index 155319deaa..e3ee1b91df 100644 --- a/src/main/java/gtPlusPlus/everglades/block/BlockDarkWorldSludgeFluid.java +++ b/src/main/java/gtPlusPlus/everglades/block/BlockDarkWorldSludgeFluid.java @@ -48,29 +48,13 @@ public class BlockDarkWorldSludgeFluid extends Fluid { return this; } - /*public blockDarkWorldSludgeFluid setEmptySound(SoundEvent parSound) - { - emptySound = parSound; - return this; - } - - public SoundEvent getEmptySound() - { - return emptySound; - } - - @Override - public blockDarkWorldSludgeFluid setFillSound(SoundEvent parSound) - { - fillSound = parSound; - return this; - } - - @Override - public SoundEvent getFillSound() - { - return fillSound; - }*/ + /* + * public blockDarkWorldSludgeFluid setEmptySound(SoundEvent parSound) { emptySound = parSound; return this; } + * public SoundEvent getEmptySound() { return emptySound; } + * @Override public blockDarkWorldSludgeFluid setFillSound(SoundEvent parSound) { fillSound = parSound; return this; + * } + * @Override public SoundEvent getFillSound() { return fillSound; } + */ public BlockDarkWorldSludgeFluid setMaterial(Material parMaterial) { material = parMaterial; @@ -81,11 +65,8 @@ public class BlockDarkWorldSludgeFluid extends Fluid { return material; } - /*@Override - public boolean doesVaporize(FluidStack fluidStack) - { - if (block == null) - return false; - return block.getDefaultState().getMaterial() == getMaterial(); - }*/ + /* + * @Override public boolean doesVaporize(FluidStack fluidStack) { if (block == null) return false; return + * block.getDefaultState().getMaterial() == getMaterial(); } + */ } diff --git a/src/main/java/gtPlusPlus/everglades/block/BlockEvergladesPortal.java b/src/main/java/gtPlusPlus/everglades/block/BlockEvergladesPortal.java index d4385bc701..d90027ea60 100644 --- a/src/main/java/gtPlusPlus/everglades/block/BlockEvergladesPortal.java +++ b/src/main/java/gtPlusPlus/everglades/block/BlockEvergladesPortal.java @@ -1,15 +1,7 @@ package gtPlusPlus.everglades.block; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; -import gtPlusPlus.api.interfaces.ITileTooltip; -import gtPlusPlus.api.objects.Logger; -import gtPlusPlus.api.objects.minecraft.BlockPos; -import gtPlusPlus.core.lib.CORE; -import gtPlusPlus.core.util.Utils; -import gtPlusPlus.everglades.dimension.Dimension_Everglades; -import gtPlusPlus.everglades.world.TeleporterDimensionMod; import java.util.Random; + import net.minecraft.block.Block; import net.minecraft.block.BlockBreakable; import net.minecraft.block.material.Material; @@ -24,7 +16,18 @@ import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import gtPlusPlus.api.interfaces.ITileTooltip; +import gtPlusPlus.api.objects.Logger; +import gtPlusPlus.api.objects.minecraft.BlockPos; +import gtPlusPlus.core.lib.CORE; +import gtPlusPlus.core.util.Utils; +import gtPlusPlus.everglades.dimension.Dimension_Everglades; +import gtPlusPlus.everglades.world.TeleporterDimensionMod; + public class BlockEvergladesPortal extends BlockBreakable implements ITileTooltip { + IIcon gor = null, dol = null, st1 = null, st2 = null, st3 = null, st4 = null; public BlockEvergladesPortal() { @@ -82,8 +85,8 @@ public class BlockEvergladesPortal extends BlockBreakable implements ITileToolti } /** - * Returns a bounding box from the pool of bounding boxes (this means - * this box can change after the pool has been cleared to be reused) + * Returns a bounding box from the pool of bounding boxes (this means this box can change after the pool has been + * cleared to be reused) */ @Override public AxisAlignedBB getCollisionBoundingBoxFromPool(World par1World, int par2, int par3, int par4) { @@ -91,8 +94,7 @@ public class BlockEvergladesPortal extends BlockBreakable implements ITileToolti } /** - * Updates the blocks bounds based on its current state. Args: world, x, - * y, z + * Updates the blocks bounds based on its current state. Args: world, x, y, z */ @Override public void setBlockBoundsBasedOnState(IBlockAccess par1IBlockAccess, int par2, int par3, int par4) { @@ -111,10 +113,8 @@ public class BlockEvergladesPortal extends BlockBreakable implements ITileToolti } /** - * 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. + * 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 boolean isOpaqueCube() { @@ -122,8 +122,7 @@ public class BlockEvergladesPortal extends BlockBreakable implements ITileToolti } /** - * If this block doesn't render as an ordinary block it will return - * False (examples: signs, buttons, stairs, etc) + * If this block doesn't render as an ordinary block it will return False (examples: signs, buttons, stairs, etc) */ @Override public boolean renderAsNormalBlock() { @@ -131,8 +130,7 @@ public class BlockEvergladesPortal extends BlockBreakable implements ITileToolti } /** - * Checks to see if this location is valid to create a portal and will - * return True if it does. Args: world, x, y, z + * Checks to see if this location is valid to create a portal and will return True if it does. Args: world, x, y, z */ public boolean tryToCreatePortal(World par1World, int par2, int par3, int par4) { byte b0 = 0; @@ -165,8 +163,7 @@ public class BlockEvergladesPortal extends BlockBreakable implements ITileToolti } } /* - * else if (j1 != 0 && j1 != - * Main.TutorialFire.blockID) { return false; } + * else if (j1 != 0 && j1 != Main.TutorialFire.blockID) { return false; } */ } } @@ -181,9 +178,8 @@ public class BlockEvergladesPortal extends BlockBreakable implements ITileToolti } /** - * Lets the block know when one of its neighbor changes. Doesn't know - * which neighbor changed (coordinates passed are their own) Args: x, y, - * z, neighbor blockID + * Lets the block know when one of its neighbor changes. Doesn't know which neighbor changed (coordinates passed are + * their own) Args: x, y, z, neighbor blockID */ public void onNeighborBlockChange(BlockPos pos) { int x = pos.xPos, y = pos.yPos, z = pos.zPos; @@ -226,7 +222,7 @@ public class BlockEvergladesPortal extends BlockBreakable implements ITileToolti par1World.setBlockToAir(x, y, z); } else { if ((par1World.getBlock(x + b0, y, z + b1) != Dimension_Everglades.blockPortalFrame - || par1World.getBlock(x - b0, y, z - b1) != this) + || par1World.getBlock(x - b0, y, z - b1) != this) && (par1World.getBlock(x - b0, y, z - b1) != Dimension_Everglades.blockPortalFrame || par1World.getBlock(x + b0, y, z + b1) != this)) { par1World.setBlockToAir(x, y, z); @@ -244,11 +240,11 @@ public class BlockEvergladesPortal extends BlockBreakable implements ITileToolti super.onNeighborBlockChange(world, x, y, z, block); } - /*@Override - public void onNeighborChange(IBlockAccess world, int x, int y, int z, int tileX, int tileY, int tileZ) { - onNeighborBlockChange(new BlockPos(x, y, z, world.)); - super.onNeighborChange(world, x, y, z, tileX, tileY, tileZ); - }*/ + /* + * @Override public void onNeighborChange(IBlockAccess world, int x, int y, int z, int tileX, int tileY, int tileZ) + * { onNeighborBlockChange(new BlockPos(x, y, z, world.)); super.onNeighborChange(world, x, y, z, tileX, tileY, + * tileZ); } + */ @Override @SideOnly(Side.CLIENT) @@ -270,8 +266,7 @@ public class BlockEvergladesPortal extends BlockBreakable implements ITileToolti && par1IBlockAccess.getBlock(par2, par3, par4 + 2) != this; boolean flag4 = flag || flag1; boolean flag5 = flag2 || flag3; - return flag4 && par5 == 4 - ? true + return flag4 && par5 == 4 ? true : (flag4 && par5 == 5 ? true : (flag5 && par5 == 2 ? true : flag5 && par5 == 3)); } } @@ -285,36 +280,28 @@ public class BlockEvergladesPortal extends BlockBreakable implements ITileToolti } /** - * Triggered whenever an entity collides with this block (enters into - * the block). Args: world, x, y, z, entity + * Triggered whenever an entity collides with this block (enters into the block). Args: world, x, y, z, entity */ @Override public void onEntityCollidedWithBlock(World par1World, int par2, int par3, int par4, Entity par5Entity) { - if ((par5Entity.ridingEntity == null) - && (par5Entity.riddenByEntity == null) + if ((par5Entity.ridingEntity == null) && (par5Entity.riddenByEntity == null) && ((par5Entity instanceof EntityPlayerMP))) { EntityPlayerMP thePlayer = (EntityPlayerMP) par5Entity; if (thePlayer.timeUntilPortal > 0) { thePlayer.timeUntilPortal = 100; } else if (thePlayer.dimension != Dimension_Everglades.DIMID) { thePlayer.timeUntilPortal = 100; - thePlayer - .mcServer - .getConfigurationManager() - .transferPlayerToDimension( - thePlayer, - Dimension_Everglades.DIMID, - new TeleporterDimensionMod( - thePlayer.mcServer.worldServerForDimension(Dimension_Everglades.DIMID))); + thePlayer.mcServer.getConfigurationManager().transferPlayerToDimension( + thePlayer, + Dimension_Everglades.DIMID, + new TeleporterDimensionMod( + thePlayer.mcServer.worldServerForDimension(Dimension_Everglades.DIMID))); } else { thePlayer.timeUntilPortal = 100; - thePlayer - .mcServer - .getConfigurationManager() - .transferPlayerToDimension( - thePlayer, - 0, - new TeleporterDimensionMod(thePlayer.mcServer.worldServerForDimension(0))); + thePlayer.mcServer.getConfigurationManager().transferPlayerToDimension( + thePlayer, + 0, + new TeleporterDimensionMod(thePlayer.mcServer.worldServerForDimension(0))); } } } diff --git a/src/main/java/gtPlusPlus/everglades/block/DarkWorldContentLoader.java b/src/main/java/gtPlusPlus/everglades/block/DarkWorldContentLoader.java index 86c7053dfc..66e03d8a77 100644 --- a/src/main/java/gtPlusPlus/everglades/block/DarkWorldContentLoader.java +++ b/src/main/java/gtPlusPlus/everglades/block/DarkWorldContentLoader.java @@ -2,13 +2,14 @@ package gtPlusPlus.everglades.block; import static gtPlusPlus.everglades.dimension.Dimension_Everglades.*; +import net.minecraft.init.Blocks; +import net.minecraftforge.fluids.FluidRegistry; + import cpw.mods.fml.common.registry.GameRegistry; import gtPlusPlus.core.block.base.BlockBaseFluid; import gtPlusPlus.core.util.Utils; import gtPlusPlus.everglades.item.ItemBlockToxicEverglades; import gtPlusPlus.everglades.item.ItemEvergladesPortalTrigger; -import net.minecraft.init.Blocks; -import net.minecraftforge.fluids.FluidRegistry; public class DarkWorldContentLoader { @@ -25,19 +26,15 @@ public class DarkWorldContentLoader { // Fluids SLUDGE = (BlockDarkWorldSludgeFluid) new BlockDarkWorldSludgeFluid("sludge", Utils.rgbtoHexValue(30, 130, 30)) - .setDensity(1800) - .setGaseous(false) - .setLuminosity(2) - .setViscosity(25000) - .setTemperature(300); + .setDensity(1800).setGaseous(false).setLuminosity(2).setViscosity(25000).setTemperature(300); FluidRegistry.registerFluid(SLUDGE); return true; } public static synchronized boolean initItems() { - portalItem = (ItemEvergladesPortalTrigger) - (new ItemEvergladesPortalTrigger().setUnlocalizedName("everglades.trigger")); + portalItem = (ItemEvergladesPortalTrigger) (new ItemEvergladesPortalTrigger() + .setUnlocalizedName("everglades.trigger")); GameRegistry.registerItem(portalItem, "everglades.trigger"); return true; } @@ -45,10 +42,8 @@ public class DarkWorldContentLoader { public static synchronized boolean initBlocks() { // Create Block Instances - blockFluidLakes = new BlockBaseFluid("Sludge", SLUDGE, BlockDarkWorldSludgeFluid.SLUDGE) - .setLightLevel(2f) - .setLightOpacity(1) - .setBlockName("fluidSludge"); + blockFluidLakes = new BlockBaseFluid("Sludge", SLUDGE, BlockDarkWorldSludgeFluid.SLUDGE).setLightLevel(2f) + .setLightOpacity(1).setBlockName("fluidSludge"); portalBlock = new BlockEvergladesPortal(); blockTopLayer = new BlockDarkWorldGround(); blockSecondLayer = new BlockDarkWorldPollutedDirt(); |