diff options
| author | Jason Mitchell <mitchej@gmail.com> | 2023-01-28 19:32:44 -0800 |
|---|---|---|
| committer | Jason Mitchell <mitchej@gmail.com> | 2023-01-28 19:32:44 -0800 |
| commit | 55f64675b42ac8d3c557cc850f78664bee006f6f (patch) | |
| tree | 2afd26dd3d5e6f763119bc192b57c66a1a075922 /src/main/java/gtPlusPlus/core/block | |
| parent | 0f5dfd01b877b6a1019e0671b88d07974aae68c0 (diff) | |
| download | GT5-Unofficial-55f64675b42ac8d3c557cc850f78664bee006f6f.tar.gz GT5-Unofficial-55f64675b42ac8d3c557cc850f78664bee006f6f.tar.bz2 GT5-Unofficial-55f64675b42ac8d3c557cc850f78664bee006f6f.zip | |
[ci skip] spotlessApply with the new settings
Diffstat (limited to 'src/main/java/gtPlusPlus/core/block')
43 files changed, 1022 insertions, 1305 deletions
diff --git a/src/main/java/gtPlusPlus/core/block/ModBlocks.java b/src/main/java/gtPlusPlus/core/block/ModBlocks.java index 1a93d35ce2..0ec615ac3c 100644 --- a/src/main/java/gtPlusPlus/core/block/ModBlocks.java +++ b/src/main/java/gtPlusPlus/core/block/ModBlocks.java @@ -1,5 +1,9 @@ package gtPlusPlus.core.block; +import net.minecraft.block.Block; +import net.minecraft.block.material.Material; +import net.minecraftforge.fluids.Fluid; + import gtPlusPlus.api.objects.Logger; import gtPlusPlus.core.block.general.BlockCompressedObsidian; import gtPlusPlus.core.block.general.BlockNet; @@ -30,9 +34,6 @@ import gtPlusPlus.core.block.machine.bedrock.Mining_Head_Fake; import gtPlusPlus.core.block.machine.bedrock.Mining_Pipe_Fake; import gtPlusPlus.core.fluids.FluidRegistryHandler; import gtPlusPlus.xmod.gregtech.common.Meta_GT_Proxy; -import net.minecraft.block.Block; -import net.minecraft.block.material.Material; -import net.minecraftforge.fluids.Fluid; public final class ModBlocks { @@ -149,8 +150,13 @@ public final class ModBlocks { blockPlayerDoorIron = new PlayerDoors(Material.iron, "door_iron", true); blockPlayerDoorCustom_Glass = new PlayerDoors(Material.glass, "door_glass", false); blockPlayerDoorCustom_Ice = new PlayerDoors(Material.ice, "door_ice", false); - blockPlayerDoorCustom_Cactus = - new PlayerDoors(Material.cactus, "door_cactus", false, 0.6f, Block.soundTypeGrass, "Cactus"); + blockPlayerDoorCustom_Cactus = new PlayerDoors( + Material.cactus, + "door_cactus", + false, + 0.6f, + Block.soundTypeGrass, + "Cactus"); // blockCustomSuperLight = new BlockSuperLight(); blockCustomJukebox = new Machine_SuperJukebox(); diff --git a/src/main/java/gtPlusPlus/core/block/base/AdvancedBlock.java b/src/main/java/gtPlusPlus/core/block/base/AdvancedBlock.java index 61c7071a3e..b1f4eab4be 100644 --- a/src/main/java/gtPlusPlus/core/block/base/AdvancedBlock.java +++ b/src/main/java/gtPlusPlus/core/block/base/AdvancedBlock.java @@ -1,6 +1,5 @@ package gtPlusPlus.core.block.base; -import gtPlusPlus.core.lib.CORE; import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.creativetab.CreativeTabs; @@ -9,18 +8,13 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; +import gtPlusPlus.core.lib.CORE; + public class AdvancedBlock extends Block { - protected AdvancedBlock( - final String unlocalizedName, - final Material material, - final CreativeTabs x, - final float blockHardness, - final float blockResistance, - final float blockLightLevel, - final String blockHarvestTool, - final int blockHarvestLevel, - final SoundType BlockSound) { + protected AdvancedBlock(final String unlocalizedName, final Material material, final CreativeTabs x, + final float blockHardness, final float blockResistance, final float blockLightLevel, + final String blockHarvestTool, final int blockHarvestLevel, final SoundType BlockSound) { super(material); this.setBlockName(unlocalizedName); this.setBlockTextureName(CORE.MODID + ":" + unlocalizedName); @@ -33,22 +27,15 @@ public class AdvancedBlock extends Block { } @Override - public boolean onBlockActivated( - final World p_149727_1_, - final int p_149727_2_, - final int p_149727_3_, - final int p_149727_4_, - final EntityPlayer p_149727_5_, - final int p_149727_6_, - final float p_149727_7_, - final float p_149727_8_, - final float p_149727_9_) { + public boolean onBlockActivated(final World p_149727_1_, final int p_149727_2_, final int p_149727_3_, + final int p_149727_4_, final EntityPlayer p_149727_5_, final int p_149727_6_, final float p_149727_7_, + final float p_149727_8_, final float p_149727_9_) { return false; } @Override - public boolean canCreatureSpawn( - final EnumCreatureType type, final IBlockAccess world, final int x, final int y, final int z) { + public boolean canCreatureSpawn(final EnumCreatureType type, final IBlockAccess world, final int x, final int y, + final int z) { return false; } } diff --git a/src/main/java/gtPlusPlus/core/block/base/BasicBlock.java b/src/main/java/gtPlusPlus/core/block/base/BasicBlock.java index 876f27e5b6..54614d0288 100644 --- a/src/main/java/gtPlusPlus/core/block/base/BasicBlock.java +++ b/src/main/java/gtPlusPlus/core/block/base/BasicBlock.java @@ -1,8 +1,5 @@ package gtPlusPlus.core.block.base; -import gtPlusPlus.core.creative.AddToCreativeTab; -import gtPlusPlus.core.lib.CORE; -import gtPlusPlus.core.util.Utils; import net.minecraft.block.BlockContainer; import net.minecraft.block.material.Material; import net.minecraft.entity.EnumCreatureType; @@ -10,6 +7,10 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; +import gtPlusPlus.core.creative.AddToCreativeTab; +import gtPlusPlus.core.lib.CORE; +import gtPlusPlus.core.util.Utils; + public class BasicBlock extends BlockContainer { public BasicBlock(final String unlocalizedName, final Material material) { @@ -37,6 +38,7 @@ public class BasicBlock extends BlockContainer { } public static enum BlockTypes { + STANDARD("blockBlock", "pickaxe", soundTypeMetal), FRAME("blockFrameGt", "wrench", soundTypeMetal), ORE("blockStone", "pickaxe", soundTypeStone); @@ -70,8 +72,8 @@ public class BasicBlock extends BlockContainer { } @Override - public boolean canCreatureSpawn( - final EnumCreatureType type, final IBlockAccess world, final int x, final int y, final int z) { + public boolean canCreatureSpawn(final EnumCreatureType type, final IBlockAccess world, final int x, final int y, + final int z) { return false; } } diff --git a/src/main/java/gtPlusPlus/core/block/base/BasicTileBlockWithTooltip.java b/src/main/java/gtPlusPlus/core/block/base/BasicTileBlockWithTooltip.java index 05a995cbb5..f332573620 100644 --- a/src/main/java/gtPlusPlus/core/block/base/BasicTileBlockWithTooltip.java +++ b/src/main/java/gtPlusPlus/core/block/base/BasicTileBlockWithTooltip.java @@ -1,20 +1,9 @@ package gtPlusPlus.core.block.base; -import cpw.mods.fml.common.registry.GameRegistry; -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.data.AutoMap; -import gtPlusPlus.api.objects.minecraft.CubicObject; -import gtPlusPlus.api.objects.minecraft.SafeTexture; -import gtPlusPlus.core.lib.CORE; -import gtPlusPlus.core.util.Utils; -import gtPlusPlus.core.util.minecraft.InventoryUtils; -import gtPlusPlus.core.util.minecraft.ItemUtils; import java.util.ArrayList; import java.util.List; import java.util.Random; + import net.minecraft.block.Block; import net.minecraft.block.BlockContainer; import net.minecraft.block.material.Material; @@ -29,6 +18,19 @@ import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; +import cpw.mods.fml.common.registry.GameRegistry; +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.data.AutoMap; +import gtPlusPlus.api.objects.minecraft.CubicObject; +import gtPlusPlus.api.objects.minecraft.SafeTexture; +import gtPlusPlus.core.lib.CORE; +import gtPlusPlus.core.util.Utils; +import gtPlusPlus.core.util.minecraft.InventoryUtils; +import gtPlusPlus.core.util.minecraft.ItemUtils; + public abstract class BasicTileBlockWithTooltip extends BlockContainer implements ITileTooltip { /** @@ -45,6 +47,7 @@ public abstract class BasicTileBlockWithTooltip extends BlockContainer implement /** * Does this block have any meta at all? + * * @return */ public final boolean hasMeta() { @@ -53,12 +56,14 @@ public abstract class BasicTileBlockWithTooltip extends BlockContainer implement /** * The amount of meta this block has. + * * @return */ public abstract int getMetaCount(); /** * Does this {@link Block} require special {@link ItemBlock} handling? + * * @return The {@link Class} that will be used for this {@link Block}. */ public Class<? extends ItemBlock> getItemBlockClass() { @@ -67,12 +72,14 @@ public abstract class BasicTileBlockWithTooltip extends BlockContainer implement /** * A lazy way to declare the unlocal name for the block, makes boilerplating easy. + * * @return The internal name for this block. */ public abstract String getUnlocalBlockName(); /** * Does this Block have {@link ITileTooltip} support? + * * @return {@link boolean} that represents if this block supports {@link ITileTooltip} or not. */ public final boolean hasTooltip() { @@ -81,24 +88,29 @@ public abstract class BasicTileBlockWithTooltip extends BlockContainer implement /** * Lazy Boilerplating. + * * @return Block Hardness. */ protected abstract float initBlockHardness(); /** * Lazy Boilerplating. + * * @return Block Resistance. */ protected abstract float initBlockResistance(); /** * Lazy Boilerplating. + * * @return The {@link CreativeTab} this Block is shown on. */ protected abstract CreativeTabs initCreativeTab(); /** - * The ID used by the {@link ITileTooltip} handler. Return -1 if you are not providing a custom {@link ItemBlock} in {@link #getItemBlockClass}(). + * The ID used by the {@link ITileTooltip} handler. Return -1 if you are not providing a custom {@link ItemBlock} in + * {@link #getItemBlockClass}(). + * * @return */ @Override @@ -122,12 +134,14 @@ public abstract class BasicTileBlockWithTooltip extends BlockContainer implement /** * The name of the Tile Entity. + * * @return */ protected abstract String getTileEntityName(); /** * The String used for texture pathing. + * * @return Sanitized {@link String}, containing no spaces or illegal characters. */ private final String getTileEntityNameForTexturePathing() { @@ -135,10 +149,10 @@ public abstract class BasicTileBlockWithTooltip extends BlockContainer implement } /** - * An array of CubicObjects, one for each meta, else just a single cell array. - * Expected to be null regularly, as the default texture handling should suffice. - * Handy if re-using textures or using a non-standard structure for them. FULL texture path must be used, - * inclusive of the MODID and a colon. + * An array of CubicObjects, one for each meta, else just a single cell array. Expected to be null regularly, as the + * default texture handling should suffice. Handy if re-using textures or using a non-standard structure for them. + * FULL texture path must be used, inclusive of the MODID and a colon. + * * @return */ public CubicObject<String>[] getCustomTextureDirectoryObject() { @@ -171,8 +185,9 @@ public abstract class BasicTileBlockWithTooltip extends BlockContainer implement // Default Path Name, this will make us look inside 'miscutils\textures\blocks' final String aPrefixTexPath = CORE.MODID + ":"; // Default Path Name, this will make us look in the sub-directory for this Tile Entity. - final String aTexPathMid = - "TileEntities" + CORE.SEPERATOR + getTileEntityNameForTexturePathing() + CORE.SEPERATOR; + final String aTexPathMid = "TileEntities" + CORE.SEPERATOR + + getTileEntityNameForTexturePathing() + + CORE.SEPERATOR; // Construct a full path String aTexPathBuilt = aPrefixTexPath + aTexPathMid; // File Name Suffixes, without meta tags @@ -223,7 +238,12 @@ public abstract class BasicTileBlockWithTooltip extends BlockContainer implement aStringRight = aTexPathBuilt + aStringRight; // Convenience Blob CubicObject<String> aMetaBlob = new CubicObject<String>( - aStringBot, aStringTop, aStringBack, aStringFront, aStringLeft, aStringRight); + aStringBot, + aStringTop, + aStringBack, + aStringFront, + aStringLeft, + aStringRight); mSidedTexturePathArray.put(aMetaBlob); Logger.INFO("[TeTexture] Added Texture Path data to map for meta " + i); } @@ -243,7 +263,7 @@ public abstract class BasicTileBlockWithTooltip extends BlockContainer implement SafeTexture aWest = SafeTexture.register(aMetaBlob.WEST); SafeTexture aEast = SafeTexture.register(aMetaBlob.EAST); // Store them in an Array - SafeTexture[] aInjectBlob = new SafeTexture[] {aBottom, aTop, aBack, aFont, aWest, aEast}; + SafeTexture[] aInjectBlob = new SafeTexture[] { aBottom, aTop, aBack, aFont, aWest, aEast }; // Convenience Blob CubicObject<SafeTexture> aMetaBlob2 = new CubicObject<SafeTexture>(aInjectBlob); // Store this Blob into @@ -263,19 +283,20 @@ public abstract class BasicTileBlockWithTooltip extends BlockContainer implement public abstract TileEntity createNewTileEntity(final World world, final int p_149915_2_); /** - * Called when {@link #breakBlock}() is called, but before {@link InventoryUtils#dropInventoryItems} and the super call. + * Called when {@link #breakBlock}() is called, but before {@link InventoryUtils#dropInventoryItems} and the super + * call. */ public void onBlockBreak() {} @Override - public final void breakBlock( - final World world, final int x, final int y, final int z, final Block block, final int number) { + public final void breakBlock(final World world, final int x, final int y, final int z, final Block block, + final int number) { onBlockBreak(); InventoryUtils.dropInventoryItems(world, x, y, z, block); super.breakBlock(world, x, y, z, block, number); } - @SuppressWarnings({"unchecked", "rawtypes"}) + @SuppressWarnings({ "unchecked", "rawtypes" }) @Override public final void getSubBlocks(Item aItem, CreativeTabs p_149666_2_, List aList) { if (hasMeta()) { @@ -288,8 +309,8 @@ public abstract class BasicTileBlockWithTooltip extends BlockContainer implement } @Override - public boolean canCreatureSpawn( - final EnumCreatureType type, final IBlockAccess world, final int x, final int y, final int z) { + public boolean canCreatureSpawn(final EnumCreatureType type, final IBlockAccess world, final int x, final int y, + final int z) { return false; } diff --git a/src/main/java/gtPlusPlus/core/block/base/BlockBaseFluid.java b/src/main/java/gtPlusPlus/core/block/base/BlockBaseFluid.java index f48601447a..edb1ba4dcf 100644 --- a/src/main/java/gtPlusPlus/core/block/base/BlockBaseFluid.java +++ b/src/main/java/gtPlusPlus/core/block/base/BlockBaseFluid.java @@ -1,16 +1,7 @@ package gtPlusPlus.core.block.base; -import cpw.mods.fml.client.FMLClientHandler; -import cpw.mods.fml.common.Optional; -import cpw.mods.fml.common.registry.GameRegistry; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; -import gtPlusPlus.core.client.renderer.particle.EntityDropParticleFX; -import gtPlusPlus.core.creative.AddToCreativeTab; -import gtPlusPlus.core.item.base.itemblock.ItemBlockMeta; -import gtPlusPlus.core.lib.CORE; -import gtPlusPlus.core.util.Utils; import java.util.Random; + import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.EnumCreatureType; @@ -21,6 +12,17 @@ import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.fluids.BlockFluidClassic; import net.minecraftforge.fluids.Fluid; +import cpw.mods.fml.client.FMLClientHandler; +import cpw.mods.fml.common.Optional; +import cpw.mods.fml.common.registry.GameRegistry; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import gtPlusPlus.core.client.renderer.particle.EntityDropParticleFX; +import gtPlusPlus.core.creative.AddToCreativeTab; +import gtPlusPlus.core.item.base.itemblock.ItemBlockMeta; +import gtPlusPlus.core.lib.CORE; +import gtPlusPlus.core.util.Utils; + public class BlockBaseFluid extends BlockFluidClassic { private final String name; @@ -40,8 +42,8 @@ public class BlockBaseFluid extends BlockFluidClassic { } public BlockFluidClassic setParticleColor(int arg0) { - return this.setParticleColor( - (arg0 >> 16 & 255) / 255.0F, (arg0 >> 8 & 255) / 255.0F, (arg0 >> 0 & 255) / 255.0F); + return this + .setParticleColor((arg0 >> 16 & 255) / 255.0F, (arg0 >> 8 & 255) / 255.0F, (arg0 >> 0 & 255) / 255.0F); } public BlockFluidClassic setParticleColor(float arg0, float arg1, float arg2) { @@ -93,11 +95,16 @@ public class BlockBaseFluid extends BlockFluidClassic { arg2 + super.densityDir, arg3, super.densityDir == -1 ? ForgeDirection.UP : ForgeDirection.DOWN) - && !arg0.getBlock(arg1, arg2 + 2 * super.densityDir, arg3) - .getMaterial() - .blocksMovement()) { + && !arg0.getBlock(arg1, arg2 + 2 * super.densityDir, arg3).getMaterial().blocksMovement()) { EntityDropParticleFX arg11 = new EntityDropParticleFX( - arg0, arg5, arg7, arg9, this.particleRed, this.particleGreen, this.particleBlue, super.densityDir); + arg0, + arg5, + arg7, + arg9, + this.particleRed, + this.particleGreen, + this.particleBlue, + super.densityDir); FMLClientHandler.instance().getClient().effectRenderer.addEffect(arg11); } } diff --git a/src/main/java/gtPlusPlus/core/block/base/BlockBaseModular.java b/src/main/java/gtPlusPlus/core/block/base/BlockBaseModular.java index 4a9b81a1d9..a034dada97 100644 --- a/src/main/java/gtPlusPlus/core/block/base/BlockBaseModular.java +++ b/src/main/java/gtPlusPlus/core/block/base/BlockBaseModular.java @@ -1,5 +1,13 @@ package gtPlusPlus.core.block.base; +import java.util.HashMap; +import java.util.Map; + +import net.minecraft.block.Block; +import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.item.ItemStack; +import net.minecraft.world.IBlockAccess; + import cpw.mods.fml.common.registry.GameRegistry; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @@ -14,12 +22,6 @@ import gtPlusPlus.core.material.Material; import gtPlusPlus.core.util.Utils; import gtPlusPlus.core.util.math.MathUtils; import gtPlusPlus.core.util.minecraft.ItemUtils; -import java.util.HashMap; -import java.util.Map; -import net.minecraft.block.Block; -import net.minecraft.client.renderer.texture.IIconRegister; -import net.minecraft.item.ItemStack; -import net.minecraft.world.IBlockAccess; public class BlockBaseModular extends BasicBlock { @@ -58,12 +60,8 @@ public class BlockBaseModular extends BasicBlock { } } - protected BlockBaseModular( - final String unlocalizedName, - final String blockMaterialString, - final net.minecraft.block.material.Material vanillaMaterial, - final BlockTypes blockType, - final int colour, + protected BlockBaseModular(final String unlocalizedName, final String blockMaterialString, + final net.minecraft.block.material.Material vanillaMaterial, final BlockTypes blockType, final int colour, final int miningLevel) { super(blockType, unlocalizedName, vanillaMaterial, miningLevel); this.setHarvestLevel(blockType.getHarvestTool(), miningLevel); @@ -74,18 +72,21 @@ public class BlockBaseModular extends BasicBlock { this.thisBlockType = blockType.name().toUpperCase(); this.setBlockName(this.getUnlocalizedProperName()); int fx = getBlockTypeMeta(); - // ItemBlockGtBlock.sNameCache.put("block."+blockMaterial.getUnlocalizedName()+"."+this.thisBlock.name().toLowerCase(), GetProperName()); + // ItemBlockGtBlock.sNameCache.put("block."+blockMaterial.getUnlocalizedName()+"."+this.thisBlock.name().toLowerCase(), + // GetProperName()); GameRegistry.registerBlock( - this, ItemBlockGtBlock.class, Utils.sanitizeString(blockType.getTexture() + unlocalizedName)); + this, + ItemBlockGtBlock.class, + Utils.sanitizeString(blockType.getTexture() + unlocalizedName)); if (fx == 0) { - GT_OreDictUnificator.registerOre( - "block" + unifyMaterialName(thisBlockMaterial), ItemUtils.getSimpleStack(this)); + GT_OreDictUnificator + .registerOre("block" + unifyMaterialName(thisBlockMaterial), ItemUtils.getSimpleStack(this)); } else if (fx == 1) { - GT_OreDictUnificator.registerOre( - "frameGt" + unifyMaterialName(thisBlockMaterial), ItemUtils.getSimpleStack(this)); + GT_OreDictUnificator + .registerOre("frameGt" + unifyMaterialName(thisBlockMaterial), ItemUtils.getSimpleStack(this)); } else if (fx == 2) { - GT_OreDictUnificator.registerOre( - "frameGt" + unifyMaterialName(thisBlockMaterial), ItemUtils.getSimpleStack(this)); + GT_OreDictUnificator + .registerOre("frameGt" + unifyMaterialName(thisBlockMaterial), ItemUtils.getSimpleStack(this)); } } @@ -106,8 +107,8 @@ public class BlockBaseModular extends BasicBlock { aMap = new HashMap<String, ItemStack>(); } int fx = getBlockTypeMeta(); - String aKey = - (fx == 0 ? OrePrefixes.block.name() : (fx == 1 ? OrePrefixes.frameGt.name() : OrePrefixes.ore.name())); + String aKey = (fx == 0 ? OrePrefixes.block.name() + : (fx == 1 ? OrePrefixes.frameGt.name() : OrePrefixes.ore.name())); ItemStack x = aMap.get(aKey); if (x == null) { aMap.put(aKey, ItemUtils.getSimpleStack(this)); @@ -133,8 +134,7 @@ public class BlockBaseModular extends BasicBlock { } /** - * Returns which pass should this block be rendered on. 0 for solids and 1 - * for alpha + * Returns which pass should this block be rendered on. 0 for solids and 1 for alpha */ @Override @SideOnly(Side.CLIENT) @@ -158,24 +158,19 @@ public class BlockBaseModular extends BasicBlock { } public String getUnlocalizedProperName() { - return getProperName() - .replace("%s", "%temp") - .replace("%material", this.thisBlockMaterial) + return getProperName().replace("%s", "%temp").replace("%material", this.thisBlockMaterial) .replace("%temp", "%s"); } @Override public String getLocalizedName() { - return GT_LanguageManager.getTranslation("gtplusplus." + getUnlocalizedName() + ".name") - .replace("%s", "%temp") - .replace("%material", this.thisBlockMaterialTranslatedName) - .replace("%temp", "%s"); + return GT_LanguageManager.getTranslation("gtplusplus." + getUnlocalizedName() + ".name").replace("%s", "%temp") + .replace("%material", this.thisBlockMaterialTranslatedName).replace("%temp", "%s"); } @Override public String getUnlocalizedName() { - return "block." + blockMaterial.getUnlocalizedName() + "." - + this.thisBlock.name().toLowerCase(); + return "block." + blockMaterial.getUnlocalizedName() + "." + this.thisBlock.name().toLowerCase(); } @Override @@ -190,8 +185,7 @@ public class BlockBaseModular extends BasicBlock { @Override @SideOnly(Side.CLIENT) public void registerBlockIcons(final IIconRegister iIcon) { - if (!CORE.ConfigSwitches.useGregtechTextures - || this.blockMaterial == null + if (!CORE.ConfigSwitches.useGregtechTextures || this.blockMaterial == null || this.thisBlock == BlockTypes.ORE) { this.blockIcon = iIcon.registerIcon(CORE.MODID + ":" + this.thisBlock.getTexture()); } diff --git a/src/main/java/gtPlusPlus/core/block/base/BlockBaseNBT.java b/src/main/java/gtPlusPlus/core/block/base/BlockBaseNBT.java index 1697244ff5..a3527059ab 100644 --- a/src/main/java/gtPlusPlus/core/block/base/BlockBaseNBT.java +++ b/src/main/java/gtPlusPlus/core/block/base/BlockBaseNBT.java @@ -1,10 +1,5 @@ package gtPlusPlus.core.block.base; -import cpw.mods.fml.common.registry.GameRegistry; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; -import gtPlusPlus.core.creative.AddToCreativeTab; -import gtPlusPlus.core.item.base.itemblock.ItemBlockNBT; import net.minecraft.block.Block; import net.minecraft.block.BlockContainer; import net.minecraft.block.material.Material; @@ -16,7 +11,14 @@ import net.minecraft.world.Explosion; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; +import cpw.mods.fml.common.registry.GameRegistry; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import gtPlusPlus.core.creative.AddToCreativeTab; +import gtPlusPlus.core.item.base.itemblock.ItemBlockNBT; + public abstract class BlockBaseNBT extends BlockContainer { + @SideOnly(Side.CLIENT) private IIcon textureTop; @@ -41,10 +43,8 @@ public abstract class BlockBaseNBT extends BlockContainer { @Override @SideOnly(Side.CLIENT) public IIcon getIcon(final int p_149691_1_, final int p_149691_2_) { - return p_149691_1_ == 1 - ? this.textureTop - : (p_149691_1_ == 0 - ? this.textureBottom + return p_149691_1_ == 1 ? this.textureTop + : (p_149691_1_ == 0 ? this.textureBottom : ((p_149691_1_ != 2) && (p_149691_1_ != 4) ? this.blockIcon : this.textureFront)); } @@ -52,8 +52,8 @@ public abstract class BlockBaseNBT extends BlockContainer { public abstract TileEntity createNewTileEntity(final World world, final int p_149915_2_); @Override - public void breakBlock( - final World world, final int x, final int y, final int z, final Block block, final int meta) { + public void breakBlock(final World world, final int x, final int y, final int z, final Block block, + final int meta) { super.breakBlock(world, x, y, z, block, meta); } @@ -63,14 +63,14 @@ public abstract class BlockBaseNBT extends BlockContainer { } @Override - public void onBlockDestroyedByExplosion( - final World world, final int x, final int y, final int z, final Explosion explosion) { + public void onBlockDestroyedByExplosion(final World world, final int x, final int y, final int z, + final Explosion explosion) { super.onBlockDestroyedByExplosion(world, x, y, z, explosion); } @Override - public void onBlockHarvested( - final World world, final int x, final int y, final int z, final int meta, final EntityPlayer player) { + public void onBlockHarvested(final World world, final int x, final int y, final int z, final int meta, + final EntityPlayer player) { super.onBlockHarvested(world, x, y, z, meta, player); } @@ -80,8 +80,8 @@ public abstract class BlockBaseNBT extends BlockContainer { } @Override - public boolean canCreatureSpawn( - final EnumCreatureType type, final IBlockAccess world, final int x, final int y, final int z) { + public boolean canCreatureSpawn(final EnumCreatureType type, final IBlockAccess world, final int x, final int y, + final int z) { return false; } } diff --git a/src/main/java/gtPlusPlus/core/block/base/BlockBaseOre.java b/src/main/java/gtPlusPlus/core/block/base/BlockBaseOre.java index 81f1737f8c..c8c0f4ca08 100644 --- a/src/main/java/gtPlusPlus/core/block/base/BlockBaseOre.java +++ b/src/main/java/gtPlusPlus/core/block/base/BlockBaseOre.java @@ -1,5 +1,14 @@ package gtPlusPlus.core.block.base; +import java.lang.reflect.Field; + +import net.minecraft.block.Block; +import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.entity.EnumCreatureType; +import net.minecraft.init.Blocks; +import net.minecraft.util.IIcon; +import net.minecraft.world.IBlockAccess; + import cpw.mods.fml.common.registry.GameRegistry; import gregtech.api.enums.OrePrefixes; import gregtech.api.enums.Textures; @@ -16,13 +25,6 @@ import gtPlusPlus.core.util.minecraft.ItemUtils; import gtPlusPlus.core.util.reflect.ReflectionUtils; import gtPlusPlus.xmod.gregtech.api.objects.GTPP_CopiedBlockTexture; import gtPlusPlus.xmod.gregtech.api.objects.GTPP_RenderedTexture; -import java.lang.reflect.Field; -import net.minecraft.block.Block; -import net.minecraft.client.renderer.texture.IIconRegister; -import net.minecraft.entity.EnumCreatureType; -import net.minecraft.init.Blocks; -import net.minecraft.util.IIcon; -import net.minecraft.world.IBlockAccess; public class BlockBaseOre extends BasicBlock implements ITexturedBlock { @@ -57,8 +59,8 @@ public class BlockBaseOre extends BasicBlock implements ITexturedBlock { } @Override - public boolean canCreatureSpawn( - final EnumCreatureType type, final IBlockAccess world, final int x, final int y, final int z) { + public boolean canCreatureSpawn(final EnumCreatureType type, final IBlockAccess world, final int x, final int y, + final int z) { return false; } @@ -105,7 +107,7 @@ public class BlockBaseOre extends BasicBlock implements ITexturedBlock { blockMaterial.getTextureSet().mTextures[OrePrefixes.ore.mTextureIndex], this.blockMaterial.getRGBA()); if (aIconSet != null) { - return new ITexture[] {new GTPP_CopiedBlockTexture(Blocks.stone, 0, 0), aIconSet}; + return new ITexture[] { new GTPP_CopiedBlockTexture(Blocks.stone, 0, 0), aIconSet }; } } @@ -126,7 +128,7 @@ public class BlockBaseOre extends BasicBlock implements ITexturedBlock { } } } - return new ITexture[] {new GTPP_RenderedTexture(hiddenTextureArray[0], new short[] {240, 240, 240, 0})}; + return new ITexture[] { new GTPP_RenderedTexture(hiddenTextureArray[0], new short[] { 240, 240, 240, 0 }) }; } @Override @@ -134,52 +136,33 @@ public class BlockBaseOre extends BasicBlock implements ITexturedBlock { public static class oldOreBlock extends BlockBaseModular implements ITexturedBlock { - public oldOreBlock( - final String unlocalizedName, - final String blockMaterial, - final BlockTypes blockType, + public oldOreBlock(final String unlocalizedName, final String blockMaterial, final BlockTypes blockType, final int colour) { this(unlocalizedName, blockMaterial, net.minecraft.block.material.Material.iron, blockType, colour, 2); } - public oldOreBlock( - final String unlocalizedName, - final String blockMaterial, - final net.minecraft.block.material.Material vanillaMaterial, - final BlockTypes blockType, - final int colour, - final int miningLevel) { + public oldOreBlock(final String unlocalizedName, final String blockMaterial, + final net.minecraft.block.material.Material vanillaMaterial, final BlockTypes blockType, + final int colour, final int miningLevel) { super(unlocalizedName, blockMaterial, vanillaMaterial, blockType, colour, miningLevel); } - /*@Override - @SideOnly(Side.CLIENT) - public void registerBlockIcons(final IIconRegister iIcon) - { - this.blockIcon = iIcon.registerIcon(CORE.MODID + ":" + this.thisBlock.getTexture()); - //this.base = iIcon.registerIcon(CORE.MODID + ":" + "blockStone"); - //this.overlay = iIcon.registerIcon(CORE.MODID + ":" + "blockOre_Overlay"); - } - - @Override - public int colorMultiplier(final IBlockAccess par1IBlockAccess, final int par2, final int par3, final int par4){ - if (this.blockColour == 0){ - return MathUtils.generateSingularRandomHexValue(); - } - return this.blockColour; - } - - @Override - public int getRenderColor(final int aMeta) { - if (this.blockColour == 0){ - return MathUtils.generateSingularRandomHexValue(); - } - return this.blockColour; - }*/ + /* + * @Override + * @SideOnly(Side.CLIENT) public void registerBlockIcons(final IIconRegister iIcon) { this.blockIcon = + * iIcon.registerIcon(CORE.MODID + ":" + this.thisBlock.getTexture()); //this.base = + * iIcon.registerIcon(CORE.MODID + ":" + "blockStone"); //this.overlay = iIcon.registerIcon(CORE.MODID + ":" + + * "blockOre_Overlay"); } + * @Override public int colorMultiplier(final IBlockAccess par1IBlockAccess, final int par2, final int par3, + * final int par4){ if (this.blockColour == 0){ return MathUtils.generateSingularRandomHexValue(); } return + * this.blockColour; } + * @Override public int getRenderColor(final int aMeta) { if (this.blockColour == 0){ return + * MathUtils.generateSingularRandomHexValue(); } return this.blockColour; } + */ @Override - public boolean canCreatureSpawn( - final EnumCreatureType type, final IBlockAccess world, final int x, final int y, final int z) { + public boolean canCreatureSpawn(final EnumCreatureType type, final IBlockAccess world, final int x, final int y, + final int z) { return false; } @@ -218,7 +201,7 @@ public class BlockBaseOre extends BasicBlock implements ITexturedBlock { blockMaterial.getTextureSet().mTextures[OrePrefixes.ore.mTextureIndex], this.blockMaterial.getRGBA()); if (aIconSet != null) { - return new ITexture[] {new GTPP_CopiedBlockTexture(Blocks.stone, 0, 0), aIconSet}; + return new ITexture[] { new GTPP_CopiedBlockTexture(Blocks.stone, 0, 0), aIconSet }; } } @@ -239,7 +222,7 @@ public class BlockBaseOre extends BasicBlock implements ITexturedBlock { } } } - return new ITexture[] {new GTPP_RenderedTexture(hiddenTextureArray[0], new short[] {240, 240, 240, 0})}; + return new ITexture[] { new GTPP_RenderedTexture(hiddenTextureArray[0], new short[] { 240, 240, 240, 0 }) }; } } } diff --git a/src/main/java/gtPlusPlus/core/block/base/MetaBlock.java b/src/main/java/gtPlusPlus/core/block/base/MetaBlock.java index 68ddd47547..5995fb7d49 100644 --- a/src/main/java/gtPlusPlus/core/block/base/MetaBlock.java +++ b/src/main/java/gtPlusPlus/core/block/base/MetaBlock.java @@ -1,6 +1,7 @@ package gtPlusPlus.core.block.base; import java.util.List; + import net.minecraft.block.material.Material; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.EnumCreatureType; @@ -27,8 +28,8 @@ public class MetaBlock extends MultiTextureBlock { } @Override - public boolean canCreatureSpawn( - final EnumCreatureType type, final IBlockAccess world, final int x, final int y, final int z) { + public boolean canCreatureSpawn(final EnumCreatureType type, final IBlockAccess world, final int x, final int y, + final int z) { return false; } } diff --git a/src/main/java/gtPlusPlus/core/block/base/MultiTextureBlock.java b/src/main/java/gtPlusPlus/core/block/base/MultiTextureBlock.java index dfacc26b62..575c5ca33b 100644 --- a/src/main/java/gtPlusPlus/core/block/base/MultiTextureBlock.java +++ b/src/main/java/gtPlusPlus/core/block/base/MultiTextureBlock.java @@ -1,12 +1,13 @@ package gtPlusPlus.core.block.base; -import gtPlusPlus.core.creative.AddToCreativeTab; -import gtPlusPlus.core.lib.CORE; import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.util.IIcon; +import gtPlusPlus.core.creative.AddToCreativeTab; +import gtPlusPlus.core.lib.CORE; + public class MultiTextureBlock extends Block { public IIcon[] icons = new IIcon[6]; diff --git a/src/main/java/gtPlusPlus/core/block/general/BlockCompressedObsidian.java b/src/main/java/gtPlusPlus/core/block/general/BlockCompressedObsidian.java index 3bb09962b5..a3209d0907 100644 --- a/src/main/java/gtPlusPlus/core/block/general/BlockCompressedObsidian.java +++ b/src/main/java/gtPlusPlus/core/block/general/BlockCompressedObsidian.java @@ -1,14 +1,9 @@ package gtPlusPlus.core.block.general; -import cpw.mods.fml.common.registry.GameRegistry; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; -import gtPlusPlus.core.creative.AddToCreativeTab; -import gtPlusPlus.core.item.base.itemblock.ItemBlockMeta; -import gtPlusPlus.core.lib.CORE; import java.util.ArrayList; import java.util.List; import java.util.Random; + import net.minecraft.block.BlockObsidian; import net.minecraft.block.material.MapColor; import net.minecraft.client.renderer.texture.IIconRegister; @@ -18,6 +13,13 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.IIcon; import net.minecraft.world.World; +import cpw.mods.fml.common.registry.GameRegistry; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import gtPlusPlus.core.creative.AddToCreativeTab; +import gtPlusPlus.core.item.base.itemblock.ItemBlockMeta; +import gtPlusPlus.core.lib.CORE; + public class BlockCompressedObsidian extends BlockObsidian { private final IIcon textureArray[] = new IIcon[11]; @@ -86,8 +88,8 @@ public class BlockCompressedObsidian extends BlockObsidian { } @Override - public ArrayList<ItemStack> getDrops( - final World world, final int x, final int y, final int z, final int metadata, final int fortune) { + public ArrayList<ItemStack> getDrops(final World world, final int x, final int y, final int z, final int metadata, + final int fortune) { int m = metadata; if (m == 5) { m = 1; diff --git a/src/main/java/gtPlusPlus/core/block/general/BlockNet.java b/src/main/java/gtPlusPlus/core/block/general/BlockNet.java index 53adacac84..6064190fba 100644 --- a/src/main/java/gtPlusPlus/core/block/general/BlockNet.java +++ b/src/main/java/gtPlusPlus/core/block/general/BlockNet.java @@ -1,15 +1,17 @@ package gtPlusPlus.core.block.general; +import java.util.Random; + +import net.minecraft.block.BlockWeb; +import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.item.Item; + import cpw.mods.fml.common.registry.GameRegistry; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import gtPlusPlus.core.creative.AddToCreativeTab; import gtPlusPlus.core.item.ModItems; import gtPlusPlus.core.lib.CORE; -import java.util.Random; -import net.minecraft.block.BlockWeb; -import net.minecraft.client.renderer.texture.IIconRegister; -import net.minecraft.item.Item; public class BlockNet extends BlockWeb { diff --git a/src/main/java/gtPlusPlus/core/block/general/BlockSuperLight.java b/src/main/java/gtPlusPlus/core/block/general/BlockSuperLight.java index 5357bd2622..4f8ac3b4e7 100644 --- a/src/main/java/gtPlusPlus/core/block/general/BlockSuperLight.java +++ b/src/main/java/gtPlusPlus/core/block/general/BlockSuperLight.java @@ -1,14 +1,5 @@ package gtPlusPlus.core.block.general; -import cpw.mods.fml.common.registry.GameRegistry; -import cpw.mods.fml.common.registry.LanguageRegistry; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; -import gtPlusPlus.api.objects.Logger; -import gtPlusPlus.api.objects.data.AutoMap; -import gtPlusPlus.api.objects.minecraft.BlockPos; -import gtPlusPlus.core.block.ModBlocks; -import gtPlusPlus.core.lib.CORE; import net.minecraft.block.Block; import net.minecraft.block.BlockAir; import net.minecraft.block.BlockContainer; @@ -21,6 +12,16 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.util.IIcon; import net.minecraft.world.World; +import cpw.mods.fml.common.registry.GameRegistry; +import cpw.mods.fml.common.registry.LanguageRegistry; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import gtPlusPlus.api.objects.Logger; +import gtPlusPlus.api.objects.data.AutoMap; +import gtPlusPlus.api.objects.minecraft.BlockPos; +import gtPlusPlus.core.block.ModBlocks; +import gtPlusPlus.core.lib.CORE; + public class BlockSuperLight extends BlockContainer { @SideOnly(Side.CLIENT) @@ -52,8 +53,7 @@ public class BlockSuperLight extends BlockContainer { } /** - * Returns a new instance of a block's tile entity class. Called on placing the - * block. + * Returns a new instance of a block's tile entity class. Called on placing the block. */ public TileEntity createNewTileEntity(World aWorld, int p_149915_2_) { return new TileEntitySuperLight(); @@ -117,8 +117,8 @@ public class BlockSuperLight extends BlockContainer { try { if (mLastUpdateTick == 0 || (System.currentTimeMillis() - mLastUpdateTick) >= 30000) { - boolean powered = - (this.worldObj.isBlockIndirectlyGettingPowered(this.xCoord, this.yCoord, this.zCoord)); + boolean powered = (this.worldObj + .isBlockIndirectlyGettingPowered(this.xCoord, this.yCoord, this.zCoord)); boolean aLastState = mPowered; // Logger.INFO("Powered: "+powered); mPowered = powered; @@ -126,8 +126,7 @@ public class BlockSuperLight extends BlockContainer { updateLighting(powered); } } - } catch (Throwable t) { - } + } catch (Throwable t) {} } @Override @@ -153,8 +152,11 @@ public class BlockSuperLight extends BlockContainer { AutoMap<BlockPos> aBlocksToUpdate = new AutoMap<BlockPos>(); Logger.INFO("Trying to relight area."); - BlockPos aStartIterationPoint = - new BlockPos(this.xCoord - 24, this.yCoord - 4, this.zCoord - 24, this.worldObj); + BlockPos aStartIterationPoint = new BlockPos( + this.xCoord - 24, + this.yCoord - 4, + this.zCoord - 24, + this.worldObj); for (int x = 0; x < 50; x++) { for (int y = 0; y < 10; y++) { for (int z = 0; z < 50; z++) { @@ -177,7 +179,12 @@ public class BlockSuperLight extends BlockContainer { if (aBlockGet instanceof BlockAir) { Logger.INFO("Lit air."); this.worldObj.setBlock( - xOff, yOff, zOff, ModBlocks.MatterFabricatorEffectBlock, 0, 3); + xOff, + yOff, + zOff, + ModBlocks.MatterFabricatorEffectBlock, + 0, + 3); } // aBlockGet.setLightLevel(15); aLitCounter++; diff --git a/src/main/java/gtPlusPlus/core/block/general/BlockTankXpConverter.java b/src/main/java/gtPlusPlus/core/block/general/BlockTankXpConverter.java index 05d83cf133..e0feb70497 100644 --- a/src/main/java/gtPlusPlus/core/block/general/BlockTankXpConverter.java +++ b/src/main/java/gtPlusPlus/core/block/general/BlockTankXpConverter.java @@ -1,13 +1,7 @@ package gtPlusPlus.core.block.general; -import cpw.mods.fml.common.registry.GameRegistry; -import cpw.mods.fml.common.registry.LanguageRegistry; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; -import gtPlusPlus.core.creative.AddToCreativeTab; -import gtPlusPlus.core.item.base.itemblock.ItemBlockEntityBase; -import gtPlusPlus.core.lib.CORE; import java.util.Random; + import net.minecraft.block.BlockContainer; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; @@ -18,6 +12,14 @@ import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; +import cpw.mods.fml.common.registry.GameRegistry; +import cpw.mods.fml.common.registry.LanguageRegistry; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import gtPlusPlus.core.creative.AddToCreativeTab; +import gtPlusPlus.core.item.base.itemblock.ItemBlockEntityBase; +import gtPlusPlus.core.lib.CORE; + public class BlockTankXpConverter extends BlockContainer { @SideOnly(Side.CLIENT) @@ -48,10 +50,8 @@ public class BlockTankXpConverter extends BlockContainer { @Override @SideOnly(Side.CLIENT) public IIcon getIcon(final int p_149691_1_, final int p_149691_2_) { - return p_149691_1_ == 1 - ? this.textureTop - : (p_149691_1_ == 0 - ? this.textureBottom + return p_149691_1_ == 1 ? this.textureTop + : (p_149691_1_ == 0 ? this.textureBottom : ((p_149691_1_ != 2) && (p_149691_1_ != 4) ? this.blockIcon : this.textureFront)); } @@ -68,72 +68,28 @@ public class BlockTankXpConverter extends BlockContainer { * Called upon block activation (right click on the block.) */ @Override - public boolean onBlockActivated( - final World world, - final int x, - final int y, - final int z, - final EntityPlayer player, - final int side, - final float lx, - final float ly, - final float lz) { + public boolean onBlockActivated(final World world, final int x, final int y, final int z, final EntityPlayer player, + final int side, final float lx, final float ly, final float lz) { return true; /* - if (world.isRemote) { - return true; - } - else { - boolean mDidScrewDriver = false; - // Check For Screwdriver - try { - final ItemStack mHandStack = PlayerUtils.getItemStackInPlayersHand(world, player.getDisplayName()); - final Item mHandItem = mHandStack.getItem(); - if (((mHandItem instanceof GT_MetaGenerated_Tool_01) - && ((mHandItem.getDamage(mHandStack) == 22) || (mHandItem.getDamage(mHandStack) == 150)))) { - final TileEntityXpConverter tile = (TileEntityXpConverter) world.getTileEntity(x, y, z); - if (tile != null) { - mDidScrewDriver = true; - tile.onScrewdriverRightClick((byte) side, player, x, y, z); - } - - } - } - catch (final Throwable t) { - mDidScrewDriver = false; - } - - if (!mDidScrewDriver) { - - try { - final TileEntityXpConverter tile = (TileEntityXpConverter) world.getTileEntity(x, y, z); - if (tile != null) { - tile.onRightClick((byte) side, player, x, y, z); - } - } - catch (final Throwable t) { - } - - final TileEntityXpConverter tank = (TileEntityXpConverter) world.getTileEntity(x, y, z); - if (tank != null) { - if (tank.tankEssence.getFluid() != null) { - PlayerUtils.messagePlayer(player, "This tank contains " + tank.tankEssence.getFluidAmount() - + "L of " + tank.tankEssence.getFluid().getLocalizedName()); - } - if (tank.tankLiquidXp.getFluid() != null) { - PlayerUtils.messagePlayer(player, "This tank contains " + tank.tankLiquidXp.getFluidAmount() - + "L of " + tank.tankLiquidXp.getFluid().getLocalizedName()); - } - if ((tank.tankEssence.getFluid() != null) && (tank.tankLiquidXp.getFluid() != null)) { - PlayerUtils.messagePlayer(player, "This is worth " - + EnchantingUtils.getLevelForLiquid(tank.tankLiquidXp.getFluidAmount()) + " levels."); - } - } - } - } - return true; + * if (world.isRemote) { return true; } else { boolean mDidScrewDriver = false; // Check For Screwdriver try { + * final ItemStack mHandStack = PlayerUtils.getItemStackInPlayersHand(world, player.getDisplayName()); final + * Item mHandItem = mHandStack.getItem(); if (((mHandItem instanceof GT_MetaGenerated_Tool_01) && + * ((mHandItem.getDamage(mHandStack) == 22) || (mHandItem.getDamage(mHandStack) == 150)))) { final + * TileEntityXpConverter tile = (TileEntityXpConverter) world.getTileEntity(x, y, z); if (tile != null) { + * mDidScrewDriver = true; tile.onScrewdriverRightClick((byte) side, player, x, y, z); } } } catch (final + * Throwable t) { mDidScrewDriver = false; } if (!mDidScrewDriver) { try { final TileEntityXpConverter tile = + * (TileEntityXpConverter) world.getTileEntity(x, y, z); if (tile != null) { tile.onRightClick((byte) side, + * player, x, y, z); } } catch (final Throwable t) { } final TileEntityXpConverter tank = + * (TileEntityXpConverter) world.getTileEntity(x, y, z); if (tank != null) { if (tank.tankEssence.getFluid() != + * null) { PlayerUtils.messagePlayer(player, "This tank contains " + tank.tankEssence.getFluidAmount() + "L of " + * + tank.tankEssence.getFluid().getLocalizedName()); } if (tank.tankLiquidXp.getFluid() != null) { + * PlayerUtils.messagePlayer(player, "This tank contains " + tank.tankLiquidXp.getFluidAmount() + "L of " + + * tank.tankLiquidXp.getFluid().getLocalizedName()); } if ((tank.tankEssence.getFluid() != null) && + * (tank.tankLiquidXp.getFluid() != null)) { PlayerUtils.messagePlayer(player, "This is worth " + + * EnchantingUtils.getLevelForLiquid(tank.tankLiquidXp.getFluidAmount()) + " levels."); } } } } return true; */ } @Override @@ -158,8 +114,8 @@ public class BlockTankXpConverter extends BlockContainer { } @Override - public boolean canCreatureSpawn( - final EnumCreatureType type, final IBlockAccess world, final int x, final int y, final int z) { + public boolean canCreatureSpawn(final EnumCreatureType type, final IBlockAccess world, final int x, final int y, + final int z) { return false; } @@ -173,8 +129,8 @@ public class BlockTankXpConverter extends BlockContainer { } @Override - public int colorMultiplier( - final IBlockAccess p_149720_1_, final int p_149720_2_, final int p_149720_3_, final int p_149720_4_) { + public int colorMultiplier(final IBlockAccess p_149720_1_, final int p_149720_2_, final int p_149720_3_, + final int p_149720_4_) { return super.colorMultiplier(p_149720_1_, p_149720_2_, p_149720_3_, p_149720_4_); } diff --git a/src/main/java/gtPlusPlus/core/block/general/FirePit.java b/src/main/java/gtPlusPlus/core/block/general/FirePit.java index 92a22c5d7f..0ac8f240c1 100644 --- a/src/main/java/gtPlusPlus/core/block/general/FirePit.java +++ b/src/main/java/gtPlusPlus/core/block/general/FirePit.java @@ -2,15 +2,9 @@ package gtPlusPlus.core.block.general; import static net.minecraftforge.common.util.ForgeDirection.*; -import cpw.mods.fml.common.registry.GameRegistry; -import cpw.mods.fml.common.registry.LanguageRegistry; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; -import gtPlusPlus.core.block.base.BasicBlock; -import gtPlusPlus.core.creative.AddToCreativeTab; -import gtPlusPlus.core.tileentities.general.TileEntityFirepit; import java.util.List; import java.util.Random; + import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; @@ -23,7 +17,16 @@ import net.minecraft.util.IIcon; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; +import cpw.mods.fml.common.registry.GameRegistry; +import cpw.mods.fml.common.registry.LanguageRegistry; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import gtPlusPlus.core.block.base.BasicBlock; +import gtPlusPlus.core.creative.AddToCreativeTab; +import gtPlusPlus.core.tileentities.general.TileEntityFirepit; + public class FirePit extends BasicBlock { + private static IIcon[] TEXTURE; public static final int META_ANTIBUILDER = 2; private int meta; @@ -53,13 +56,11 @@ public class FirePit extends BasicBlock { @Override @SideOnly(Side.CLIENT) public void registerBlockIcons(final IIconRegister par1IconRegister) { - TEXTURE = new IIcon[] { - par1IconRegister.registerIcon(this.getTextureName() + "_layer_0"), - par1IconRegister.registerIcon(this.getTextureName() + "_layer_1") - }; + TEXTURE = new IIcon[] { par1IconRegister.registerIcon(this.getTextureName() + "_layer_0"), + par1IconRegister.registerIcon(this.getTextureName() + "_layer_1") }; } - @SuppressWarnings({"rawtypes", "unchecked"}) + @SuppressWarnings({ "rawtypes", "unchecked" }) @Override public void getSubBlocks(final Item par1, final CreativeTabs par2CreativeTabs, final List par3List) { par3List.add(new ItemStack(par1, 1, 2)); @@ -72,8 +73,7 @@ public class FirePit extends BasicBlock { this.meta = par1World.getBlockMetadata(x, y, z); // If Raining, Put out. if (par1World.isRaining() - && (par1World.canLightningStrikeAt(x, y, z) - || par1World.canLightningStrikeAt(x - 1, y, z) + && (par1World.canLightningStrikeAt(x, y, z) || par1World.canLightningStrikeAt(x - 1, y, z) || par1World.canLightningStrikeAt(x + 1, y, z) || par1World.canLightningStrikeAt(x, y, z - 1) || par1World.canLightningStrikeAt(x, y, z + 1))) { @@ -124,10 +124,10 @@ public class FirePit extends BasicBlock { return false; } - /*@Override - public AxisAlignedBB getCollisionBoundingBoxFromPool(World aParWorld, int x, int y, int z){ - return null; - }*/ + /* + * @Override public AxisAlignedBB getCollisionBoundingBoxFromPool(World aParWorld, int x, int y, int z){ return + * null; } + */ @Override protected boolean canSilkHarvest() { @@ -136,12 +136,8 @@ public class FirePit extends BasicBlock { @Override @SideOnly(Side.CLIENT) - public void randomDisplayTick( - final World p_149734_1_, - final int p_149734_2_, - final int p_149734_3_, - final int p_149734_4_, - final Random p_149734_5_) { + public void randomDisplayTick(final World p_149734_1_, final int p_149734_2_, final int p_149734_3_, + final int p_149734_4_, final Random p_149734_5_) { int l; float f; float f1; @@ -226,16 +222,15 @@ public class FirePit extends BasicBlock { } private static boolean isNeighborBurning(final World world, final int x, final int y, final int z) { - return canCatchFire(world, x + 1, y, z, WEST) - || canCatchFire(world, x - 1, y, z, EAST) + return canCatchFire(world, x + 1, y, z, WEST) || canCatchFire(world, x - 1, y, z, EAST) || canCatchFire(world, x, y - 1, z, UP) || canCatchFire(world, x, y + 1, z, DOWN) || canCatchFire(world, x, y, z - 1, SOUTH) || canCatchFire(world, x, y, z + 1, NORTH); } - public static boolean canCatchFire( - final World world, final int x, final int y, final int z, final ForgeDirection face) { + public static boolean canCatchFire(final World world, final int x, final int y, final int z, + final ForgeDirection face) { return world.getBlock(x, y, z).isFireSource(world, x, y, z, face); } } diff --git a/src/main/java/gtPlusPlus/core/block/general/FluidTankInfinite.java b/src/main/java/gtPlusPlus/core/block/general/FluidTankInfinite.java index 3f4a057221..6a01dd623b 100644 --- a/src/main/java/gtPlusPlus/core/block/general/FluidTankInfinite.java +++ b/src/main/java/gtPlusPlus/core/block/general/FluidTankInfinite.java @@ -1,13 +1,5 @@ package gtPlusPlus.core.block.general; -import cpw.mods.fml.common.registry.GameRegistry; -import cpw.mods.fml.common.registry.LanguageRegistry; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; -import gtPlusPlus.core.creative.AddToCreativeTab; -import gtPlusPlus.core.lib.CORE; -import gtPlusPlus.core.tileentities.general.TileEntityInfiniteFluid; -import gtPlusPlus.core.util.minecraft.PlayerUtils; import net.minecraft.block.BlockContainer; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; @@ -22,6 +14,15 @@ import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.IFluidContainerItem; import net.minecraftforge.fluids.ItemFluidContainer; +import cpw.mods.fml.common.registry.GameRegistry; +import cpw.mods.fml.common.registry.LanguageRegistry; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import gtPlusPlus.core.creative.AddToCreativeTab; +import gtPlusPlus.core.lib.CORE; +import gtPlusPlus.core.tileentities.general.TileEntityInfiniteFluid; +import gtPlusPlus.core.util.minecraft.PlayerUtils; + public class FluidTankInfinite extends BlockContainer { @SideOnly(Side.CLIENT) @@ -48,10 +49,8 @@ public class FluidTankInfinite extends BlockContainer { @Override @SideOnly(Side.CLIENT) public IIcon getIcon(final int p_149691_1_, final int p_149691_2_) { - return p_149691_1_ == 1 - ? this.textureTop - : (p_149691_1_ == 0 - ? this.textureBottom + return p_149691_1_ == 1 ? this.textureTop + : (p_149691_1_ == 0 ? this.textureBottom : ((p_149691_1_ != 2) && (p_149691_1_ != 4) ? this.blockIcon : this.textureFront)); } @@ -68,16 +67,8 @@ public class FluidTankInfinite extends BlockContainer { * Called upon block activation (right click on the block.) */ @Override - public boolean onBlockActivated( - final World world, - final int x, - final int y, - final int z, - final EntityPlayer player, - final int side, - final float lx, - final float ly, - final float lz) { + public boolean onBlockActivated(final World world, final int x, final int y, final int z, final EntityPlayer player, + final int side, final float lx, final float ly, final float lz) { if (world.isRemote) { return true; } else { @@ -90,8 +81,7 @@ public class FluidTankInfinite extends BlockContainer { handItem = null; } if (handItem != null - && (handItem instanceof IFluidContainerItem - || handItem instanceof ItemFluidContainer + && (handItem instanceof IFluidContainerItem || handItem instanceof ItemFluidContainer || FluidContainerRegistry.isFilledContainer(player.getHeldItem()))) { if (tank.tank.getFluid() == null) { try { @@ -118,7 +108,8 @@ public class FluidTankInfinite extends BlockContainer { if (tank.tank.getFluid() != null) { PlayerUtils.messagePlayer( player, - "This tank contains " + tank.tank.getFluidAmount() + "L of " + "This tank contains " + tank.tank.getFluidAmount() + + "L of " + tank.tank.getFluid().getLocalizedName()); } } diff --git a/src/main/java/gtPlusPlus/core/block/general/HellFire.java b/src/main/java/gtPlusPlus/core/block/general/HellFire.java index f2c9c1a319..4942d9555c 100644 --- a/src/main/java/gtPlusPlus/core/block/general/HellFire.java +++ b/src/main/java/gtPlusPlus/core/block/general/HellFire.java @@ -2,18 +2,10 @@ package gtPlusPlus.core.block.general; import static net.minecraftforge.common.util.ForgeDirection.*; -import com.google.common.collect.Maps; -import cpw.mods.fml.common.registry.GameRegistry; -import cpw.mods.fml.common.registry.LanguageRegistry; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; -import gtPlusPlus.api.objects.random.XSTR; -import gtPlusPlus.core.creative.AddToCreativeTab; -import gtPlusPlus.core.lib.CORE; -import gtPlusPlus.core.util.math.MathUtils; import java.util.IdentityHashMap; import java.util.Map.Entry; import java.util.Random; + import net.minecraft.block.Block; import net.minecraft.block.BlockFire; import net.minecraft.block.material.MapColor; @@ -26,7 +18,19 @@ import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; +import com.google.common.collect.Maps; + +import cpw.mods.fml.common.registry.GameRegistry; +import cpw.mods.fml.common.registry.LanguageRegistry; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import gtPlusPlus.api.objects.random.XSTR; +import gtPlusPlus.core.creative.AddToCreativeTab; +import gtPlusPlus.core.lib.CORE; +import gtPlusPlus.core.util.math.MathUtils; + public class HellFire extends BlockFire { + @Deprecated private final int[] field_149849_a = new int[Short.MAX_VALUE]; @@ -98,10 +102,8 @@ public class HellFire extends BlockFire { world.setBlockToAir(x, y, z); } - if (!flag - && world.isRaining() - && (world.canLightningStrikeAt(x, y, z) - || world.canLightningStrikeAt(x - 1, y, z) + if (!flag && world.isRaining() + && (world.canLightningStrikeAt(x, y, z) || world.canLightningStrikeAt(x - 1, y, z) || world.canLightningStrikeAt(x + 1, y, z) || world.canLightningStrikeAt(x, y, z - 1) || world.canLightningStrikeAt(x, y, z + 1))) { @@ -122,83 +124,74 @@ public class HellFire extends BlockFire { if (!World.doesBlockHaveSolidTopSurface(world, x, y - 1, z) || (blockMeta > 3)) { world.setBlockToAir(x, y, z); } - } else if (!flag - && !this.canCatchFire(world, x, y - 1, z, UP) + } else if (!flag && !this.canCatchFire(world, x, y - 1, z, UP) && (blockMeta == 15) && (random.nextInt(4) == 0)) { - world.setBlockToAir(x, y, z); - } else { - final boolean flag1 = world.isBlockHighHumidity(x, y, z); - byte b0 = 0; + world.setBlockToAir(x, y, z); + } else { + final boolean flag1 = world.isBlockHighHumidity(x, y, z); + byte b0 = 0; - if (flag1) { - b0 = -50; - } + if (flag1) { + b0 = -50; + } - this.tryCatchFire(world, x + 1, y, z, 300 + b0, random, blockMeta, WEST); - this.tryCatchFire(world, x - 1, y, z, 300 + b0, random, blockMeta, EAST); - this.tryCatchFire(world, x, y - 1, z, 250 + b0, random, blockMeta, UP); - this.tryCatchFire(world, x, y + 1, z, 250 + b0, random, blockMeta, DOWN); - this.tryCatchFire(world, x, y, z - 1, 300 + b0, random, blockMeta, SOUTH); - this.tryCatchFire(world, x, y, z + 1, 300 + b0, random, blockMeta, NORTH); - - for (int i1 = x - 1; i1 <= (x + 1); ++i1) { - for (int j1 = z - 1; j1 <= (z + 1); ++j1) { - for (int k1 = y - 1; k1 <= (y + 4); ++k1) { - if ((i1 != x) || (k1 != y) || (j1 != z)) { - int l1 = 100; - - if (k1 > (y + 1)) { - l1 += (k1 - (y + 1)) * 100; - } + this.tryCatchFire(world, x + 1, y, z, 300 + b0, random, blockMeta, WEST); + this.tryCatchFire(world, x - 1, y, z, 300 + b0, random, blockMeta, EAST); + this.tryCatchFire(world, x, y - 1, z, 250 + b0, random, blockMeta, UP); + this.tryCatchFire(world, x, y + 1, z, 250 + b0, random, blockMeta, DOWN); + this.tryCatchFire(world, x, y, z - 1, 300 + b0, random, blockMeta, SOUTH); + this.tryCatchFire(world, x, y, z + 1, 300 + b0, random, blockMeta, NORTH); + + for (int i1 = x - 1; i1 <= (x + 1); ++i1) { + for (int j1 = z - 1; j1 <= (z + 1); ++j1) { + for (int k1 = y - 1; k1 <= (y + 4); ++k1) { + if ((i1 != x) || (k1 != y) || (j1 != z)) { + int l1 = 100; + + if (k1 > (y + 1)) { + l1 += (k1 - (y + 1)) * 100; + } - final int neighbourFireChance = - this.getChanceOfNeighborsEncouragingFire(world, i1, k1, j1); + final int neighbourFireChance = this + .getChanceOfNeighborsEncouragingFire(world, i1, k1, j1); - if (neighbourFireChance > 0) { - int j2 = (neighbourFireChance - + 40 + if (neighbourFireChance > 0) { + int j2 = (neighbourFireChance + 40 + (world.difficultySetting.getDifficultyId() * 14)) - / (blockMeta + 30); - - if (flag1) { - j2 /= 2; - } - - if ((j2 > 0) - && (random.nextInt(l1) <= j2) - && (!world.isRaining() || !world.canLightningStrikeAt(i1, k1, j1)) - && !world.canLightningStrikeAt(i1 - 1, k1, z) - && !world.canLightningStrikeAt(i1 + 1, k1, j1) - && !world.canLightningStrikeAt(i1, k1, j1 - 1) - && !world.canLightningStrikeAt(i1, k1, j1 + 1)) { - int k2 = blockMeta + (random.nextInt(5) / 4); - - if (k2 > 15) { - k2 = 15; + / (blockMeta + 30); + + if (flag1) { + j2 /= 2; + } + + if ((j2 > 0) && (random.nextInt(l1) <= j2) + && (!world.isRaining() + || !world.canLightningStrikeAt(i1, k1, j1)) + && !world.canLightningStrikeAt(i1 - 1, k1, z) + && !world.canLightningStrikeAt(i1 + 1, k1, j1) + && !world.canLightningStrikeAt(i1, k1, j1 - 1) + && !world.canLightningStrikeAt(i1, k1, j1 + 1)) { + int k2 = blockMeta + (random.nextInt(5) / 4); + + if (k2 > 15) { + k2 = 15; + } + + world.setBlock(i1, k1, j1, this, k2, 3); + } } - - world.setBlock(i1, k1, j1, this, k2, 3); } } } } } - } - } } } } - private void tryCatchFire( - final World world, - final int p_149841_2_, - final int p_149841_3_, - final int p_149841_4_, - final int p_149841_5_, - final Random p_149841_6_, - final int p_149841_7_, - final ForgeDirection face) { + private void tryCatchFire(final World world, final int p_149841_2_, final int p_149841_3_, final int p_149841_4_, + final int p_149841_5_, final Random p_149841_6_, final int p_149841_7_, final ForgeDirection face) { final int j1 = world.getBlock(p_149841_2_, p_149841_3_, p_149841_4_) .getFlammability(world, p_149841_2_, p_149841_3_, p_149841_4_, face); @@ -228,8 +221,7 @@ public class HellFire extends BlockFire { * Returns true if at least one block next to this one can burn. */ private boolean canNeighborBurn(final World world, final int x, final int y, final int z) { - return this.canCatchFire(world, x + 1, y, z, WEST) - || this.canCatchFire(world, x - 1, y, z, EAST) + return this.canCatchFire(world, x + 1, y, z, WEST) || this.canCatchFire(world, x - 1, y, z, EAST) || this.canCatchFire(world, x, y - 1, z, UP) || this.canCatchFire(world, x, y + 1, z, DOWN) || this.canCatchFire(world, x, y, z - 1, SOUTH) @@ -237,8 +229,7 @@ public class HellFire extends BlockFire { } /** - * Gets the highest chance of a neighbor block encouraging this block to - * catch fire + * Gets the highest chance of a neighbor block encouraging this block to catch fire */ private int getChanceOfNeighborsEncouragingFire(final World world, final int x, final int y, final int z) { final byte b0 = 0; @@ -258,19 +249,17 @@ public class HellFire extends BlockFire { } /** - * Checks the specified block coordinate to see if it can catch fire. Args: - * blockAccess, x, y, z + * Checks the specified block coordinate to see if it can catch fire. Args: blockAccess, x, y, z */ @Override @Deprecated - public boolean canBlockCatchFire( - final IBlockAccess p_149844_1_, final int p_149844_2_, final int p_149844_3_, final int p_149844_4_) { + public boolean canBlockCatchFire(final IBlockAccess p_149844_1_, final int p_149844_2_, final int p_149844_3_, + final int p_149844_4_) { return this.canCatchFire(p_149844_1_, p_149844_2_, p_149844_3_, p_149844_4_, UP); } /** - * Checks to see if its valid to put this block at the specified - * coordinates. Args: world, x, y, z + * Checks to see if its valid to put this block at the specified coordinates. Args: world, x, y, z */ @Override public boolean canPlaceBlockAt(final World worldObj, final int x, final int y, final int z) { @@ -278,13 +267,12 @@ public class HellFire extends BlockFire { } /** - * 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 Block + * 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 Block */ @Override - public void onNeighborBlockChange( - final World worldObj, final int x, final int y, final int z, final Block blockObj) { + public void onNeighborBlockChange(final World worldObj, final int x, final int y, final int z, + final Block blockObj) { if (!World.doesBlockHaveSolidTopSurface(worldObj, x, y - 1, z) && !this.canNeighborBurn(worldObj, x, y, z)) { worldObj.setBlockToAir(x, y, z); } @@ -311,21 +299,20 @@ public class HellFire extends BlockFire { } @Override - public boolean canCreatureSpawn( - final EnumCreatureType type, final IBlockAccess world, final int x, final int y, final int z) { + public boolean canCreatureSpawn(final EnumCreatureType type, final IBlockAccess world, final int x, final int y, + final int z) { return false; } // Burn @Override - public void onEntityCollidedWithBlock( - final World world, final int i, final int j, final int k, final Entity entity) { + public void onEntityCollidedWithBlock(final World world, final int i, final int j, final int k, + final Entity entity) { entity.setFire(10); } /** - * A randomly called display update to be able to add particles or other - * items for display + * A randomly called display update to be able to add particles or other items for display */ @Override @SideOnly(Side.CLIENT) @@ -421,9 +408,8 @@ public class HellFire extends BlockFire { @SideOnly(Side.CLIENT) public void registerBlockIcons(final IIconRegister IIconRegister) { this.IIconArray = new IIcon[] { - IIconRegister.registerIcon(CORE.MODID + ":" + "hellfire/" + "blockHellFire" + "_layer_0"), - IIconRegister.registerIcon(CORE.MODID + ":" + "hellfire/" + "blockHellFire" + "_layer_1") - }; + IIconRegister.registerIcon(CORE.MODID + ":" + "hellfire/" + "blockHellFire" + "_layer_0"), + IIconRegister.registerIcon(CORE.MODID + ":" + "hellfire/" + "blockHellFire" + "_layer_1") }; } @Override @@ -447,10 +433,10 @@ public class HellFire extends BlockFire { } /* - * ================================= Forge Start - * ====================================== + * ================================= Forge Start ====================================== */ private static class FireInfo { + private int encouragement = 0; private int flammibility = 0; } @@ -473,8 +459,7 @@ public class HellFire extends BlockFire { final FireInfo info = this.getInfo(block, true); info.encouragement = encouragement; info.flammibility = flammibility; - } catch (Throwable t) { - } + } catch (Throwable t) {} } private FireInfo getInfo(final Block block, final boolean garentee) { @@ -521,55 +506,37 @@ public class HellFire extends BlockFire { /** * Side sensitive version that calls the block function. * - * @param world - * The current world - * @param x - * X Position - * @param y - * Y Position - * @param z - * Z Position - * @param face - * The side the fire is coming from + * @param world The current world + * @param x X Position + * @param y Y Position + * @param z Z Position + * @param face The side the fire is coming from * @return True if the face can catch fire. */ @Override - public boolean canCatchFire( - final IBlockAccess world, final int x, final int y, final int z, final ForgeDirection face) { + public boolean canCatchFire(final IBlockAccess world, final int x, final int y, final int z, + final ForgeDirection face) { return world.getBlock(x, y, z).isFlammable(world, x, y, z, face); } /** * Side sensitive version that calls the block function. * - * @param world - * The current world - * @param x - * X Position - * @param y - * Y Position - * @param z - * Z Position - * @param oldChance - * The previous maximum chance. - * @param face - * The side the fire is coming from - * @return The chance of the block catching fire, or oldChance if it is - * higher + * @param world The current world + * @param x X Position + * @param y Y Position + * @param z Z Position + * @param oldChance The previous maximum chance. + * @param face The side the fire is coming from + * @return The chance of the block catching fire, or oldChance if it is higher */ @Override - public int getChanceToEncourageFire( - final IBlockAccess world, - final int x, - final int y, - final int z, - final int oldChance, - final ForgeDirection face) { + public int getChanceToEncourageFire(final IBlockAccess world, final int x, final int y, final int z, + final int oldChance, final ForgeDirection face) { final int newChance = world.getBlock(x, y, z).getFireSpreadSpeed(world, x, y, z, face); return (newChance > oldChance ? newChance : oldChance); } /* - * ================================= Forge Start - * ====================================== + * ================================= Forge Start ====================================== */ } diff --git a/src/main/java/gtPlusPlus/core/block/general/LightGlass.java b/src/main/java/gtPlusPlus/core/block/general/LightGlass.java index df2ec518ce..4219666e2f 100644 --- a/src/main/java/gtPlusPlus/core/block/general/LightGlass.java +++ b/src/main/java/gtPlusPlus/core/block/general/LightGlass.java @@ -1,19 +1,22 @@ package gtPlusPlus.core.block.general; -import cpw.mods.fml.common.registry.GameRegistry; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; -import gtPlusPlus.core.creative.AddToCreativeTab; -import gtPlusPlus.core.lib.CORE; import java.util.Random; + import net.minecraft.block.Block; import net.minecraft.block.BlockAir; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; -/*public class LightGlass extends BlockBreakable -{*/ +import cpw.mods.fml.common.registry.GameRegistry; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import gtPlusPlus.core.creative.AddToCreativeTab; +import gtPlusPlus.core.lib.CORE; + +/* + * public class LightGlass extends BlockBreakable { + */ public class LightGlass extends BlockAir { private int state = 0; @@ -35,9 +38,8 @@ public class LightGlass extends BlockAir { GameRegistry.registerBlock(this, "blockMFEffect"); /* - this.setLightOpacity(0); - this.setTickRandomly(true); - this.setResistance(1);*/ + * this.setLightOpacity(0); this.setTickRandomly(true); this.setResistance(1); + */ } /** @@ -127,8 +129,8 @@ public class LightGlass extends BlockAir { */ @Override @SideOnly(Side.CLIENT) - public void randomDisplayTick( - final World world, final int posX, final int posY, final int posZ, final Random random) { + public void randomDisplayTick(final World world, final int posX, final int posY, final int posZ, + final Random random) { // Utils.spawnFX(world, posX, posY, posZ, "smoke", "cloud"); } diff --git a/src/main/java/gtPlusPlus/core/block/general/MiningExplosives.java b/src/main/java/gtPlusPlus/core/block/general/MiningExplosives.java index 2b71f12f6d..b254caadf3 100644 --- a/src/main/java/gtPlusPlus/core/block/general/MiningExplosives.java +++ b/src/main/java/gtPlusPlus/core/block/general/MiningExplosives.java @@ -1,13 +1,7 @@ package gtPlusPlus.core.block.general; -import cpw.mods.fml.common.registry.GameRegistry; -import cpw.mods.fml.common.registry.LanguageRegistry; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; -import gtPlusPlus.core.creative.AddToCreativeTab; -import gtPlusPlus.core.entity.EntityPrimedMiningExplosive; -import gtPlusPlus.core.lib.CORE; import java.util.Random; + import net.minecraft.block.Block; import net.minecraft.block.BlockTNT; import net.minecraft.client.renderer.texture.IIconRegister; @@ -20,7 +14,16 @@ import net.minecraft.util.IIcon; import net.minecraft.world.Explosion; import net.minecraft.world.World; +import cpw.mods.fml.common.registry.GameRegistry; +import cpw.mods.fml.common.registry.LanguageRegistry; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import gtPlusPlus.core.creative.AddToCreativeTab; +import gtPlusPlus.core.entity.EntityPrimedMiningExplosive; +import gtPlusPlus.core.lib.CORE; + public class MiningExplosives extends BlockTNT { + @SideOnly(Side.CLIENT) private IIcon textureTop; @@ -61,8 +64,8 @@ public class MiningExplosives extends BlockTNT { * their own) Args: x, y, z, neighbor Block */ @Override - public void onNeighborBlockChange( - final World world, final int x, final int y, final int z, final Block neighbourblock) { + public void onNeighborBlockChange(final World world, final int x, final int y, final int z, + final Block neighbourblock) { if (world.isBlockIndirectlyGettingPowered(x, y, z)) { this.onBlockDestroyedByPlayer(world, x, y, z, 1); world.setBlockToAir(x, y, z); @@ -81,19 +84,23 @@ public class MiningExplosives extends BlockTNT { * Called upon the block being destroyed by an explosion */ @Override - public void onBlockDestroyedByExplosion( - final World world, final int x, final int y, final int z, final Explosion bang) { + public void onBlockDestroyedByExplosion(final World world, final int x, final int y, final int z, + final Explosion bang) { if (!world.isRemote) { - final EntityPrimedMiningExplosive EntityPrimedMiningExplosive = - new EntityPrimedMiningExplosive(world, x + 0.5F, y + 0.5F, z + 0.5F, bang.getExplosivePlacedBy()); - EntityPrimedMiningExplosive.fuse = - world.rand.nextInt(EntityPrimedMiningExplosive.fuse / 4) + (EntityPrimedMiningExplosive.fuse / 8); + final EntityPrimedMiningExplosive EntityPrimedMiningExplosive = new EntityPrimedMiningExplosive( + world, + x + 0.5F, + y + 0.5F, + z + 0.5F, + bang.getExplosivePlacedBy()); + EntityPrimedMiningExplosive.fuse = world.rand.nextInt(EntityPrimedMiningExplosive.fuse / 4) + + (EntityPrimedMiningExplosive.fuse / 8); world.spawnEntityInWorld(EntityPrimedMiningExplosive); } } /** - * Called right before the block is destroyed by a player. Args: world, x, y, z, metaData + * Called right before the block is destroyed by a player. Args: world, x, y, z, metaData */ @Override public void onBlockDestroyedByPlayer(final World world, final int x, final int y, final int z, final int meta) { @@ -102,17 +109,16 @@ public class MiningExplosives extends BlockTNT { // TODO Spawns Primed TNT? @Override - public void func_150114_a( - final World world, - final int p_150114_2_, - final int p_150114_3_, - final int p_150114_4_, - final int p_150114_5_, - final EntityLivingBase entityLiving) { + public void func_150114_a(final World world, final int p_150114_2_, final int p_150114_3_, final int p_150114_4_, + final int p_150114_5_, final EntityLivingBase entityLiving) { if (!world.isRemote) { if ((p_150114_5_ & 1) == 1) { final EntityPrimedMiningExplosive EntityPrimedMiningExplosive = new EntityPrimedMiningExplosive( - world, p_150114_2_ + 0.5F, p_150114_3_ + 0.5F, p_150114_4_ + 0.5F, entityLiving); + world, + p_150114_2_ + 0.5F, + p_150114_3_ + 0.5F, + p_150114_4_ + 0.5F, + entityLiving); world.spawnEntityInWorld(EntityPrimedMiningExplosive); world.playSoundAtEntity(EntityPrimedMiningExplosive, "game.tnt.primed", 1.0F, 1.0F); } @@ -123,15 +129,8 @@ public class MiningExplosives extends BlockTNT { * Called upon block activation (right click on the block.) */ @Override - public boolean onBlockActivated( - final World world, - final int x, - final int y, - final int z, - final EntityPlayer clickingPlayer, - final int p_149727_6_, - final float p_149727_7_, - final float p_149727_8_, + public boolean onBlockActivated(final World world, final int x, final int y, final int z, + final EntityPlayer clickingPlayer, final int p_149727_6_, final float p_149727_7_, final float p_149727_8_, final float p_149727_9_) { if ((clickingPlayer.getCurrentEquippedItem() != null) && (clickingPlayer.getCurrentEquippedItem().getItem() == Items.flint_and_steel)) { @@ -141,7 +140,15 @@ public class MiningExplosives extends BlockTNT { return true; } else { return super.onBlockActivated( - world, x, y, z, clickingPlayer, p_149727_6_, p_149727_7_, p_149727_8_, p_149727_9_); + world, + x, + y, + z, + clickingPlayer, + p_149727_6_, + p_149727_7_, + p_149727_8_, + p_149727_9_); } } @@ -149,8 +156,8 @@ public class MiningExplosives extends BlockTNT { * Triggered whenever an entity collides with this block (enters into the block). Args: world, x, y, z, entity */ @Override - public void onEntityCollidedWithBlock( - final World world, final int x, final int y, final int z, final Entity entityTriggering) { + public void onEntityCollidedWithBlock(final World world, final int x, final int y, final int z, + final Entity entityTriggering) { if ((entityTriggering instanceof EntityArrow) && !world.isRemote) { final EntityArrow entityarrow = (EntityArrow) entityTriggering; @@ -181,9 +188,11 @@ public class MiningExplosives extends BlockTNT { @SideOnly(Side.CLIENT) public void registerBlockIcons(final IIconRegister iconRegister) { // - /*this.blockIcon = iconRegister.registerIcon(this.getTextureName() + "_side"); - this.textureTop = iconRegister.registerIcon(this.getTextureName() + "_top"); - this.textureBottom = iconRegister.registerIcon(this.getTextureName() + "_bottom");*/ + /* + * this.blockIcon = iconRegister.registerIcon(this.getTextureName() + "_side"); this.textureTop = + * iconRegister.registerIcon(this.getTextureName() + "_top"); this.textureBottom = + * iconRegister.registerIcon(this.getTextureName() + "_bottom"); + */ this.blockIcon = iconRegister.registerIcon(CORE.MODID + ":" + "chrono/" + "MetalSheet2"); this.textureTop = iconRegister.registerIcon(CORE.MODID + ":" + "chrono/" + "MetalFunnel"); this.textureBottom = iconRegister.registerIcon(CORE.MODID + ":" + "chrono/" + "MetalPanel"); diff --git a/src/main/java/gtPlusPlus/core/block/general/PlayerDoors.java b/src/main/java/gtPlusPlus/core/block/general/PlayerDoors.java index 01e63676cc..051a158515 100644 --- a/src/main/java/gtPlusPlus/core/block/general/PlayerDoors.java +++ b/src/main/java/gtPlusPlus/core/block/general/PlayerDoors.java @@ -1,14 +1,8 @@ package gtPlusPlus.core.block.general; -import cpw.mods.fml.common.registry.GameRegistry; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; -import gtPlusPlus.core.item.base.itemblock.ItemBlockDoor; -import gtPlusPlus.core.lib.CORE; -import gtPlusPlus.core.tileentities.general.TileEntityPlayerDoorBase; -import gtPlusPlus.core.util.Utils; import java.util.HashMap; import java.util.Random; + import net.minecraft.block.Block; import net.minecraft.block.BlockDoor; import net.minecraft.block.ITileEntityProvider; @@ -25,6 +19,14 @@ import net.minecraft.util.Vec3; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; +import cpw.mods.fml.common.registry.GameRegistry; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import gtPlusPlus.core.item.base.itemblock.ItemBlockDoor; +import gtPlusPlus.core.lib.CORE; +import gtPlusPlus.core.tileentities.general.TileEntityPlayerDoorBase; +import gtPlusPlus.core.util.Utils; + public class PlayerDoors extends BlockDoor implements ITileEntityProvider { @SideOnly(Side.CLIENT) @@ -39,13 +41,8 @@ public class PlayerDoors extends BlockDoor implements ITileEntityProvider { this(aMaterial, aTextureName, vanillaType, 0f, null, null); } - public PlayerDoors( - Material aMaterial, - String aTextureName, - boolean vanillaType, - float aHardness, - SoundType aStepSound, - String aBlockExtensionName) { + public PlayerDoors(Material aMaterial, String aTextureName, boolean vanillaType, float aHardness, + SoundType aStepSound, String aBlockExtensionName) { super(aMaterial); this.disableStats(); this.isBlockContainer = true; @@ -154,8 +151,7 @@ public class PlayerDoors extends BlockDoor implements ITileEntityProvider { } /** - * 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) */ public boolean renderAsNormalBlock() { return false; @@ -178,8 +174,8 @@ public class PlayerDoors extends BlockDoor implements ITileEntityProvider { } /** - * 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) */ public AxisAlignedBB getCollisionBoundingBoxFromPool(World aWorld, int aX, int aY, int aZ) { this.setBlockBoundsBasedOnState(aWorld, aX, aY, aZ); @@ -254,16 +250,8 @@ public class PlayerDoors extends BlockDoor implements ITileEntityProvider { /** * Called upon block activation (right click on the block.) */ - public boolean onBlockActivated( - World aWorld, - int aX, - int aY, - int aZ, - EntityPlayer aPlayer, - int p_149727_6_, - float p_149727_7_, - float p_149727_8_, - float p_149727_9_) { + public boolean onBlockActivated(World aWorld, int aX, int aY, int aZ, EntityPlayer aPlayer, int p_149727_6_, + float p_149727_7_, float p_149727_8_, float p_149727_9_) { if (this.blockMaterial == Material.iron) { return false; // Allow items to interact with the door } else { @@ -305,9 +293,8 @@ public class PlayerDoors extends BlockDoor implements ITileEntityProvider { } /** - * 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 - * Block + * 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 Block */ public void onNeighborBlockChange(World aWorld, int aX, int aY, int aZ, Block aNeighbour) { int l = aWorld.getBlockMetadata(aX, aY, aZ); @@ -365,18 +352,17 @@ public class PlayerDoors extends BlockDoor implements ITileEntityProvider { } /** - * Ray traces through the blocks collision from start vector to end vector - * returning a ray trace hit. Args: world, x, y, z, startVec, endVec + * Ray traces through the blocks collision from start vector to end vector returning a ray trace hit. Args: world, + * x, y, z, startVec, endVec */ - public MovingObjectPosition collisionRayTrace( - World p_149731_1_, int p_149731_2_, int p_149731_3_, int p_149731_4_, Vec3 p_149731_5_, Vec3 p_149731_6_) { + public MovingObjectPosition collisionRayTrace(World p_149731_1_, int p_149731_2_, int p_149731_3_, int p_149731_4_, + Vec3 p_149731_5_, Vec3 p_149731_6_) { this.setBlockBoundsBasedOnState(p_149731_1_, p_149731_2_, p_149731_3_, p_149731_4_); return super.collisionRayTrace(p_149731_1_, p_149731_2_, p_149731_3_, p_149731_4_, p_149731_5_, p_149731_6_); } /** - * Checks to see if its valid to put this block at the specified coordinates. - * Args: world, x, y, z + * Checks to see if its valid to put this block at the specified coordinates. Args: world, x, y, z */ public boolean canPlaceBlockAt(World aWorld, int aX, int aY, int aZ) { boolean aHeight = (aY < aWorld.getHeight() - 1); @@ -393,8 +379,8 @@ public class PlayerDoors extends BlockDoor implements ITileEntityProvider { } /** - * Returns the mobility information of the block, 0 = free, 1 = can't push but - * can move over, 2 = total immobility and stop pistons + * Returns the mobility information of the block, 0 = free, 1 = can't push but can move over, 2 = total immobility + * and stop pistons */ public int getMobilityFlag() { return 1; @@ -435,15 +421,9 @@ public class PlayerDoors extends BlockDoor implements ITileEntityProvider { /** * Called when the block is attempted to be harvested */ - public void onBlockHarvested( - World p_149681_1_, - int p_149681_2_, - int p_149681_3_, - int p_149681_4_, - int p_149681_5_, + public void onBlockHarvested(World p_149681_1_, int p_149681_2_, int p_149681_3_, int p_149681_4_, int p_149681_5_, EntityPlayer p_149681_6_) { - if (p_149681_6_.capabilities.isCreativeMode - && (p_149681_5_ & 8) != 0 + if (p_149681_6_.capabilities.isCreativeMode && (p_149681_5_ & 8) != 0 && p_149681_1_.getBlock(p_149681_2_, p_149681_3_ - 1, p_149681_4_) == this) { p_149681_1_.setBlockToAir(p_149681_2_, p_149681_3_ - 1, p_149681_4_); } @@ -458,15 +438,15 @@ public class PlayerDoors extends BlockDoor implements ITileEntityProvider { } @Override - public void breakBlock( - World p_149749_1_, int p_149749_2_, int p_149749_3_, int p_149749_4_, Block p_149749_5_, int p_149749_6_) { + public void breakBlock(World p_149749_1_, int p_149749_2_, int p_149749_3_, int p_149749_4_, Block p_149749_5_, + int p_149749_6_) { super.breakBlock(p_149749_1_, p_149749_2_, p_149749_3_, p_149749_4_, p_149749_5_, p_149749_6_); p_149749_1_.removeTileEntity(p_149749_2_, p_149749_3_, p_149749_4_); } @Override - public boolean onBlockEventReceived( - World p_149696_1_, int p_149696_2_, int p_149696_3_, int p_149696_4_, int p_149696_5_, int p_149696_6_) { + public boolean onBlockEventReceived(World p_149696_1_, int p_149696_2_, int p_149696_3_, int p_149696_4_, + int p_149696_5_, int p_149696_6_) { super.onBlockEventReceived(p_149696_1_, p_149696_2_, p_149696_3_, p_149696_4_, p_149696_5_, p_149696_6_); TileEntity tileentity = p_149696_1_.getTileEntity(p_149696_2_, p_149696_3_, p_149696_4_); return tileentity != null ? tileentity.receiveClientEvent(p_149696_5_, p_149696_6_) : false; diff --git a/src/main/java/gtPlusPlus/core/block/general/antigrief/BlockWitherProof.java b/src/main/java/gtPlusPlus/core/block/general/antigrief/BlockWitherProof.java index 4d11a8ac66..7e5600715a 100644 --- a/src/main/java/gtPlusPlus/core/block/general/antigrief/BlockWitherProof.java +++ b/src/main/java/gtPlusPlus/core/block/general/antigrief/BlockWitherProof.java @@ -1,11 +1,5 @@ package gtPlusPlus.core.block.general.antigrief; -import cpw.mods.fml.common.registry.GameRegistry; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; -import gtPlusPlus.core.creative.AddToCreativeTab; -import gtPlusPlus.core.lib.CORE; -import gtPlusPlus.core.util.Utils; import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; @@ -20,6 +14,13 @@ import net.minecraft.world.Explosion; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; +import cpw.mods.fml.common.registry.GameRegistry; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import gtPlusPlus.core.creative.AddToCreativeTab; +import gtPlusPlus.core.lib.CORE; +import gtPlusPlus.core.util.Utils; + public class BlockWitherProof extends Block { public BlockWitherProof() { @@ -62,12 +63,8 @@ public class BlockWitherProof extends Block { } @Override - public void onBlockDestroyedByExplosion( - final World p_149723_1_, - final int p_149723_2_, - final int p_149723_3_, - final int p_149723_4_, - final Explosion p_149723_5_) {} + public void onBlockDestroyedByExplosion(final World p_149723_1_, final int p_149723_2_, final int p_149723_3_, + final int p_149723_4_, final Explosion p_149723_5_) {} @Override public boolean canDropFromExplosion(final Explosion p_149659_1_) { @@ -75,13 +72,12 @@ public class BlockWitherProof extends Block { } @Override - public boolean canEntityDestroy( - final IBlockAccess world, final int x, final int y, final int z, final Entity entity) { + public boolean canEntityDestroy(final IBlockAccess world, final int x, final int y, final int z, + final Entity entity) { if ((entity == null) || !entity.isEntityAlive()) { return false; } - if ((entity instanceof EntityWither) - || (entity instanceof EntityDragon) + if ((entity instanceof EntityWither) || (entity instanceof EntityDragon) || (entity instanceof IBossDisplayData)) { return false; } else { @@ -103,20 +99,20 @@ public class BlockWitherProof extends Block { } @Override - public boolean canCreatureSpawn( - final EnumCreatureType type, final IBlockAccess world, final int x, final int y, final int z) { + public boolean canCreatureSpawn(final EnumCreatureType type, final IBlockAccess world, final int x, final int y, + final int z) { return false; } @Override - public void breakBlock( - World p_149749_1_, int p_149749_2_, int p_149749_3_, int p_149749_4_, Block p_149749_5_, int p_149749_6_) { + public void breakBlock(World p_149749_1_, int p_149749_2_, int p_149749_3_, int p_149749_4_, Block p_149749_5_, + int p_149749_6_) { super.breakBlock(p_149749_1_, p_149749_2_, p_149749_3_, p_149749_4_, p_149749_5_, p_149749_6_); } @Override - public float getPlayerRelativeBlockHardness( - EntityPlayer aPlayer, World p_149737_2_, int p_149737_3_, int p_149737_4_, int p_149737_5_) { + public float getPlayerRelativeBlockHardness(EntityPlayer aPlayer, World p_149737_2_, int p_149737_3_, + int p_149737_4_, int p_149737_5_) { if (aPlayer != null && aPlayer instanceof EntityPlayerMP) { return 1f; } @@ -129,8 +125,8 @@ public class BlockWitherProof extends Block { } @Override - public void onBlockClicked( - World p_149699_1_, int p_149699_2_, int p_149699_3_, int p_149699_4_, EntityPlayer p_149699_5_) { + public void onBlockClicked(World p_149699_1_, int p_149699_2_, int p_149699_3_, int p_149699_4_, + EntityPlayer p_149699_5_) { super.onBlockClicked(p_149699_1_, p_149699_2_, p_149699_3_, p_149699_4_, p_149699_5_); } @@ -139,8 +135,7 @@ public class BlockWitherProof extends Block { if ((entity == null) || !entity.isEntityAlive()) { return; } - if ((entity instanceof EntityWither) - || (entity instanceof EntityDragon) + if ((entity instanceof EntityWither) || (entity instanceof EntityDragon) || (entity instanceof IBossDisplayData)) { return; } else { @@ -149,13 +144,8 @@ public class BlockWitherProof extends Block { } @Override - public void harvestBlock( - World p_149636_1_, - EntityPlayer p_149636_2_, - int p_149636_3_, - int p_149636_4_, - int p_149636_5_, - int p_149636_6_) { + public void harvestBlock(World p_149636_1_, EntityPlayer p_149636_2_, int p_149636_3_, int p_149636_4_, + int p_149636_5_, int p_149636_6_) { super.harvestBlock(p_149636_1_, p_149636_2_, p_149636_3_, p_149636_4_, p_149636_5_, p_149636_6_); } @@ -168,15 +158,8 @@ public class BlockWitherProof extends Block { } @Override - public float getExplosionResistance( - Entity par1Entity, - World world, - int x, - int y, - int z, - double explosionX, - double explosionY, - double explosionZ) { + public float getExplosionResistance(Entity par1Entity, World world, int x, int y, int z, double explosionX, + double explosionY, double explosionZ) { return Float.MAX_VALUE; } } diff --git a/src/main/java/gtPlusPlus/core/block/general/antigrief/TowerDevice.java b/src/main/java/gtPlusPlus/core/block/general/antigrief/TowerDevice.java index b3bf56e3f5..c72da4cf4a 100644 --- a/src/main/java/gtPlusPlus/core/block/general/antigrief/TowerDevice.java +++ b/src/main/java/gtPlusPlus/core/block/general/antigrief/TowerDevice.java @@ -2,14 +2,9 @@ package gtPlusPlus.core.block.general.antigrief; import static gtPlusPlus.core.block.ModBlocks.blockGriefSaver; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; -import gtPlusPlus.api.objects.Logger; -import gtPlusPlus.core.creative.AddToCreativeTab; -import gtPlusPlus.core.lib.CORE; -import gtPlusPlus.core.tileentities.general.TileEntityReverter; import java.util.List; import java.util.Random; + import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; @@ -25,7 +20,15 @@ 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.objects.Logger; +import gtPlusPlus.core.creative.AddToCreativeTab; +import gtPlusPlus.core.lib.CORE; +import gtPlusPlus.core.tileentities.general.TileEntityReverter; + public class TowerDevice extends Block { + private static IIcon TEX_ANTIBUILDER; public static final int META_ANTIBUILDER = 9; private boolean bUnbreakable; @@ -67,30 +70,15 @@ public class TowerDevice extends Block { } @Override - public boolean onBlockActivated( - final World par1World, - final int x, - final int y, - final int z, - final EntityPlayer par5EntityPlayer, - final int par6, - final float par7, - final float par8, - final float par9) { + public boolean onBlockActivated(final World par1World, final int x, final int y, final int z, + final EntityPlayer par5EntityPlayer, final int par6, final float par7, final float par8, final float par9) { final int meta = par1World.getBlockMetadata(x, y, z); return false; } @Override - public float getExplosionResistance( - final Entity par1Entity, - final World world, - final int x, - final int y, - final int z, - final double explosionX, - final double explosionY, - final double explosionZ) { + public float getExplosionResistance(final Entity par1Entity, final World world, final int x, final int y, + final int z, final double explosionX, final double explosionY, final double explosionZ) { final int meta = world.getBlockMetadata(x, y, z); return super.getExplosionResistance(par1Entity, world, x, y, z, explosionX, explosionY, explosionZ); } @@ -124,8 +112,8 @@ public class TowerDevice extends Block { } } - private static void changeToBlockMeta( - final World par1World, final int x, final int y, final int z, final int meta) { + private static void changeToBlockMeta(final World par1World, final int x, final int y, final int z, + final int meta) { final Block thereBlockID = par1World.getBlock(x, y, z); if ((thereBlockID == blockGriefSaver)) { par1World.setBlock(x, y, z, thereBlockID, meta, 3); @@ -141,8 +129,8 @@ public class TowerDevice extends Block { } @Override - public void onNeighborBlockChange( - final World par1World, final int x, final int y, final int z, final Block myBlockID) { + public void onNeighborBlockChange(final World par1World, final int x, final int y, final int z, + final Block myBlockID) { final int meta = par1World.getBlockMetadata(x, y, z); if (!par1World.isRemote) {} } @@ -174,8 +162,8 @@ public class TowerDevice extends Block { @Override @SideOnly(Side.CLIENT) - public void randomDisplayTick( - final World par1World, final int x, final int y, final int z, final Random par5Random) { + public void randomDisplayTick(final World par1World, final int x, final int y, final int z, + final Random par5Random) { final int meta = par1World.getBlockMetadata(x, y, z); if ((meta == 3) || (meta == 1) || (meta == 9)) { for (int i = 0; i < 1; i++) { @@ -219,8 +207,8 @@ public class TowerDevice extends Block { final int thereMeta = world.getBlockMetadata(x, y, z); } - public static void changeToActiveVanishBlock( - final World par1World, final int x, final int y, final int z, final int meta) { + public static void changeToActiveVanishBlock(final World par1World, final int x, final int y, final int z, + final int meta) { changeToBlockMeta(par1World, x, y, z, meta); par1World.playSoundEffect(x + 0.5D, y + 0.5D, z + 0.5D, "random.pop", 0.3F, 0.6F); diff --git a/src/main/java/gtPlusPlus/core/block/general/fluids/BlockFluidSludge.java b/src/main/java/gtPlusPlus/core/block/general/fluids/BlockFluidSludge.java index fcce29d164..3200e497b8 100644 --- a/src/main/java/gtPlusPlus/core/block/general/fluids/BlockFluidSludge.java +++ b/src/main/java/gtPlusPlus/core/block/general/fluids/BlockFluidSludge.java @@ -1,9 +1,5 @@ package gtPlusPlus.core.block.general.fluids; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; -import gtPlusPlus.core.creative.AddToCreativeTab; -import gtPlusPlus.core.lib.CORE; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.EnumCreatureType; @@ -13,6 +9,11 @@ import net.minecraft.world.World; import net.minecraftforge.fluids.BlockFluidClassic; import net.minecraftforge.fluids.Fluid; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import gtPlusPlus.core.creative.AddToCreativeTab; +import gtPlusPlus.core.lib.CORE; + public class BlockFluidSludge extends BlockFluidClassic { @SideOnly(Side.CLIENT) @@ -55,8 +56,8 @@ public class BlockFluidSludge extends BlockFluidClassic { } @Override - public boolean canCreatureSpawn( - final EnumCreatureType type, final IBlockAccess world, final int x, final int y, final int z) { + public boolean canCreatureSpawn(final EnumCreatureType type, final IBlockAccess world, final int x, final int y, + final int z) { return false; } } diff --git a/src/main/java/gtPlusPlus/core/block/general/redstone/BlockGenericRedstone.java b/src/main/java/gtPlusPlus/core/block/general/redstone/BlockGenericRedstone.java index 1c1434b741..b18e6bcb29 100644 --- a/src/main/java/gtPlusPlus/core/block/general/redstone/BlockGenericRedstone.java +++ b/src/main/java/gtPlusPlus/core/block/general/redstone/BlockGenericRedstone.java @@ -1,21 +1,10 @@ package gtPlusPlus.core.block.general.redstone; -import cpw.mods.fml.common.registry.GameRegistry; -import cpw.mods.fml.common.registry.LanguageRegistry; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; -import gregtech.common.items.GT_MetaGenerated_Tool_01; -import gtPlusPlus.api.objects.Logger; -import gtPlusPlus.core.creative.AddToCreativeTab; -import gtPlusPlus.core.item.base.itemblock.ItemBlockMeta; -import gtPlusPlus.core.tileentities.general.redstone.TileEntityRedstoneHandler; -import gtPlusPlus.core.util.minecraft.InventoryUtils; -import gtPlusPlus.core.util.minecraft.ItemUtils; -import gtPlusPlus.core.util.minecraft.PlayerUtils; import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Random; + import net.minecraft.block.Block; import net.minecraft.block.BlockContainer; import net.minecraft.block.material.Material; @@ -33,6 +22,19 @@ import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; +import cpw.mods.fml.common.registry.GameRegistry; +import cpw.mods.fml.common.registry.LanguageRegistry; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import gregtech.common.items.GT_MetaGenerated_Tool_01; +import gtPlusPlus.api.objects.Logger; +import gtPlusPlus.core.creative.AddToCreativeTab; +import gtPlusPlus.core.item.base.itemblock.ItemBlockMeta; +import gtPlusPlus.core.tileentities.general.redstone.TileEntityRedstoneHandler; +import gtPlusPlus.core.util.minecraft.InventoryUtils; +import gtPlusPlus.core.util.minecraft.ItemUtils; +import gtPlusPlus.core.util.minecraft.PlayerUtils; + public abstract class BlockGenericRedstone extends BlockContainer { @SuppressWarnings("deprecation") @@ -45,11 +47,12 @@ public abstract class BlockGenericRedstone extends BlockContainer { LanguageRegistry.addName(this, aDisplayName); } - private final HashMap<Integer, HashMap<ForgeDirection, IIcon>> mTextures = - new HashMap<Integer, HashMap<ForgeDirection, IIcon>>(); + private final HashMap<Integer, HashMap<ForgeDirection, IIcon>> mTextures = new HashMap<Integer, HashMap<ForgeDirection, IIcon>>(); /** - * A map of the textures used for this blocks. The key is the meta, then each internal map holds textures tied to each forge direction. Do not use unknown direction. + * A map of the textures used for this blocks. The key is the meta, then each internal map holds textures tied to + * each forge direction. Do not use unknown direction. + * * @return */ public HashMap<Integer, HashMap<ForgeDirection, IIcon>> getTextureArray() { @@ -69,16 +72,8 @@ public abstract class BlockGenericRedstone extends BlockContainer { * Called upon block activation (right click on the block.) */ @Override - public boolean onBlockActivated( - final World world, - final int x, - final int y, - final int z, - final EntityPlayer player, - final int side, - final float lx, - final float ly, - final float lz) { + public boolean onBlockActivated(final World world, final int x, final int y, final int z, final EntityPlayer player, + final int side, final float lx, final float ly, final float lz) { if (world.isRemote) { return true; @@ -99,7 +94,8 @@ public abstract class BlockGenericRedstone extends BlockContainer { if (ItemUtils.isToolScrewdriver(mHandStack)) { mDidTool = tile.onScrewdriverRMB(); PlayerUtils.messagePlayer( - player, "Adjusted Light level by 0.0625f. " + tile.getLightBrightness()); + player, + "Adjusted Light level by 0.0625f. " + tile.getLightBrightness()); } } if (tile.isMalletable()) { @@ -115,8 +111,7 @@ public abstract class BlockGenericRedstone extends BlockContainer { } } } - } catch (final Throwable t) { - } + } catch (final Throwable t) {} if (mDidTool) { return true; } @@ -153,8 +148,7 @@ public abstract class BlockGenericRedstone extends BlockContainer { } } } - } catch (Throwable t) { - } + } catch (Throwable t) {} if (!mDidTool && !aPlayer.capabilities.isCreativeMode) { super.onBlockClicked(aWorld, aX, aY, aZ, aPlayer); @@ -167,19 +161,14 @@ public abstract class BlockGenericRedstone extends BlockContainer { public abstract TileEntity createNewTileEntity(final World world, final int p_149915_2_); @Override - public void breakBlock( - final World world, final int x, final int y, final int z, final Block block, final int number) { + public void breakBlock(final World world, final int x, final int y, final int z, final Block block, + final int number) { InventoryUtils.dropInventoryItems(world, x, y, z, block); super.breakBlock(world, x, y, z, block, number); } @Override - public void onBlockPlacedBy( - final World world, - final int x, - final int y, - final int z, - final EntityLivingBase entity, + public void onBlockPlacedBy(final World world, final int x, final int y, final int z, final EntityLivingBase entity, final ItemStack stack) { if (stack.hasDisplayName()) { ((TileEntityRedstoneHandler) world.getTileEntity(x, y, z)).setCustomName(stack.getDisplayName()); @@ -187,8 +176,8 @@ public abstract class BlockGenericRedstone extends BlockContainer { } @Override - public boolean canCreatureSpawn( - final EnumCreatureType type, final IBlockAccess world, final int x, final int y, final int z) { + public boolean canCreatureSpawn(final EnumCreatureType type, final IBlockAccess world, final int x, final int y, + final int z) { return false; } @@ -198,16 +187,8 @@ public abstract class BlockGenericRedstone extends BlockContainer { } @Override - public int onBlockPlaced( - World p_149660_1_, - int p_149660_2_, - int p_149660_3_, - int p_149660_4_, - int p_149660_5_, - float p_149660_6_, - float p_149660_7_, - float p_149660_8_, - int p_149660_9_) { + public int onBlockPlaced(World p_149660_1_, int p_149660_2_, int p_149660_3_, int p_149660_4_, int p_149660_5_, + float p_149660_6_, float p_149660_7_, float p_149660_8_, int p_149660_9_) { // TODO Auto-generated method stub return super.onBlockPlaced( p_149660_1_, @@ -251,8 +232,8 @@ public abstract class BlockGenericRedstone extends BlockContainer { } @Override - public int getComparatorInputOverride( - World p_149736_1_, int p_149736_2_, int p_149736_3_, int p_149736_4_, int p_149736_5_) { + public int getComparatorInputOverride(World p_149736_1_, int p_149736_2_, int p_149736_3_, int p_149736_4_, + int p_149736_5_) { // TODO Auto-generated method stub return super.getComparatorInputOverride(p_149736_1_, p_149736_2_, p_149736_3_, p_149736_4_, p_149736_5_); } @@ -315,9 +296,8 @@ public abstract class BlockGenericRedstone extends BlockContainer { } /** - * 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 - * Block + * 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 Block */ public void onNeighborBlockChange(World aWorld, int aX, int aY, int aZ, Block p_149695_5_) { @@ -371,16 +351,15 @@ public abstract class BlockGenericRedstone extends BlockContainer { public abstract Item getItem(World p_149694_1_, int p_149694_2_, int p_149694_3_, int p_149694_4_); /** - * Returns an item stack containing a single instance of the current block type. - * 'i' is the block's subtype/damage and is ignored for blocks which do not - * support subtypes. Blocks which cannot be harvested should return null. + * Returns an item stack containing a single instance of the current block type. 'i' is the block's subtype/damage + * and is ignored for blocks which do not support subtypes. Blocks which cannot be harvested should return null. */ @Override protected abstract ItemStack createStackedBlock(int p_149644_1_); @Override - public abstract ArrayList<ItemStack> getDrops( - final World world, final int x, final int y, final int z, final int metadata, final int fortune); + public abstract ArrayList<ItemStack> getDrops(final World world, final int x, final int y, final int z, + final int metadata, final int fortune); @Override public abstract Item getItemDropped(int p_149650_1_, Random p_149650_2_, int p_149650_3_); diff --git a/src/main/java/gtPlusPlus/core/block/general/redstone/BlockGenericRedstoneDetector.java b/src/main/java/gtPlusPlus/core/block/general/redstone/BlockGenericRedstoneDetector.java index 406b53fb59..21286ba993 100644 --- a/src/main/java/gtPlusPlus/core/block/general/redstone/BlockGenericRedstoneDetector.java +++ b/src/main/java/gtPlusPlus/core/block/general/redstone/BlockGenericRedstoneDetector.java @@ -1,12 +1,10 @@ package gtPlusPlus.core.block.general.redstone; -import gtPlusPlus.core.lib.CORE; -import gtPlusPlus.core.tileentities.general.redstone.TileEntityRedstoneHandler; -import gtPlusPlus.core.util.minecraft.ItemUtils; import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Random; + import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.Item; @@ -16,6 +14,10 @@ import net.minecraft.util.IIcon; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; +import gtPlusPlus.core.lib.CORE; +import gtPlusPlus.core.tileentities.general.redstone.TileEntityRedstoneHandler; +import gtPlusPlus.core.util.minecraft.ItemUtils; + public class BlockGenericRedstoneDetector extends BlockGenericRedstone { public BlockGenericRedstoneDetector() { @@ -29,6 +31,7 @@ public class BlockGenericRedstoneDetector extends BlockGenericRedstone { } public class TileEntityRedstoneDetector extends TileEntityRedstoneHandler { + public TileEntityRedstoneDetector() { super(0); } @@ -72,8 +75,7 @@ public class BlockGenericRedstoneDetector extends BlockGenericRedstone { } public void generateTextureArray(final IIconRegister iicon) { - HashMap<Integer, HashMap<ForgeDirection, IIcon>> aTextures = - new HashMap<Integer, HashMap<ForgeDirection, IIcon>>(); + HashMap<Integer, HashMap<ForgeDirection, IIcon>> aTextures = new HashMap<Integer, HashMap<ForgeDirection, IIcon>>(); // New Block for Each Meta int aMeta = 0; @@ -81,15 +83,20 @@ public class BlockGenericRedstoneDetector extends BlockGenericRedstone { HashMap<ForgeDirection, IIcon> aTempMap = new HashMap<ForgeDirection, IIcon>(); aTempMap.put(ForgeDirection.UP, iicon.registerIcon(CORE.MODID + ":" + "redstone/redstone_meter/" + "top")); aTempMap.put( - ForgeDirection.DOWN, iicon.registerIcon(CORE.MODID + ":" + "redstone/redstone_meter/" + "top")); + ForgeDirection.DOWN, + iicon.registerIcon(CORE.MODID + ":" + "redstone/redstone_meter/" + "top")); aTempMap.put( - ForgeDirection.NORTH, iicon.registerIcon(CORE.MODID + ":" + "redstone/redstone_meter/" + "top")); + ForgeDirection.NORTH, + iicon.registerIcon(CORE.MODID + ":" + "redstone/redstone_meter/" + "top")); aTempMap.put( - ForgeDirection.SOUTH, iicon.registerIcon(CORE.MODID + ":" + "redstone/redstone_meter/" + "top")); + ForgeDirection.SOUTH, + iicon.registerIcon(CORE.MODID + ":" + "redstone/redstone_meter/" + "top")); aTempMap.put( - ForgeDirection.EAST, iicon.registerIcon(CORE.MODID + ":" + "redstone/redstone_meter/" + "top")); + ForgeDirection.EAST, + iicon.registerIcon(CORE.MODID + ":" + "redstone/redstone_meter/" + "top")); aTempMap.put( - ForgeDirection.WEST, iicon.registerIcon(CORE.MODID + ":" + "redstone/redstone_meter/" + "top")); + ForgeDirection.WEST, + iicon.registerIcon(CORE.MODID + ":" + "redstone/redstone_meter/" + "top")); aTextures.put(aMeta++, aTempMap); } } diff --git a/src/main/java/gtPlusPlus/core/block/general/redstone/BlockGenericRedstoneEmitter.java b/src/main/java/gtPlusPlus/core/block/general/redstone/BlockGenericRedstoneEmitter.java index c732ed216b..fd5b996160 100644 --- a/src/main/java/gtPlusPlus/core/block/general/redstone/BlockGenericRedstoneEmitter.java +++ b/src/main/java/gtPlusPlus/core/block/general/redstone/BlockGenericRedstoneEmitter.java @@ -1,3 +1,4 @@ package gtPlusPlus.core.block.general.redstone; -public class BlockGenericRedstoneEmitter {} +public class BlockGenericRedstoneEmitter { +} diff --git a/src/main/java/gtPlusPlus/core/block/general/redstone/BlockGenericRedstoneTest.java b/src/main/java/gtPlusPlus/core/block/general/redstone/BlockGenericRedstoneTest.java index 85c2506359..0d8f66c326 100644 --- a/src/main/java/gtPlusPlus/core/block/general/redstone/BlockGenericRedstoneTest.java +++ b/src/main/java/gtPlusPlus/core/block/general/redstone/BlockGenericRedstoneTest.java @@ -1,15 +1,10 @@ package gtPlusPlus.core.block.general.redstone; -import gtPlusPlus.api.objects.Logger; -import gtPlusPlus.core.lib.CORE; -import gtPlusPlus.core.tileentities.general.redstone.TileEntityRedstoneHandler; -import gtPlusPlus.core.util.Utils; -import gtPlusPlus.core.util.minecraft.ItemUtils; -import gtPlusPlus.core.world.explosions.ExplosionHandler; import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Random; + import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.Item; @@ -20,6 +15,13 @@ import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; +import gtPlusPlus.api.objects.Logger; +import gtPlusPlus.core.lib.CORE; +import gtPlusPlus.core.tileentities.general.redstone.TileEntityRedstoneHandler; +import gtPlusPlus.core.util.Utils; +import gtPlusPlus.core.util.minecraft.ItemUtils; +import gtPlusPlus.core.world.explosions.ExplosionHandler; + public class BlockGenericRedstoneTest extends BlockGenericRedstone { public BlockGenericRedstoneTest() { @@ -33,6 +35,7 @@ public class BlockGenericRedstoneTest extends BlockGenericRedstone { } public class TileEntityRedstoneTest extends TileEntityRedstoneHandler { + public TileEntityRedstoneTest() { super(2); } @@ -141,8 +144,7 @@ public class BlockGenericRedstoneTest extends BlockGenericRedstone { } public void generateTextureArray(final IIconRegister iicon) { - HashMap<Integer, HashMap<ForgeDirection, IIcon>> aTextures = - new HashMap<Integer, HashMap<ForgeDirection, IIcon>>(); + HashMap<Integer, HashMap<ForgeDirection, IIcon>> aTextures = new HashMap<Integer, HashMap<ForgeDirection, IIcon>>(); // New Block for Each Meta int aMeta = 0; @@ -150,15 +152,20 @@ public class BlockGenericRedstoneTest extends BlockGenericRedstone { HashMap<ForgeDirection, IIcon> aTempMap = new HashMap<ForgeDirection, IIcon>(); aTempMap.put(ForgeDirection.UP, iicon.registerIcon(CORE.MODID + ":" + "redstone/redstone_meter/" + "top")); aTempMap.put( - ForgeDirection.DOWN, iicon.registerIcon(CORE.MODID + ":" + "redstone/redstone_meter/" + "top")); + ForgeDirection.DOWN, + iicon.registerIcon(CORE.MODID + ":" + "redstone/redstone_meter/" + "top")); aTempMap.put( - ForgeDirection.NORTH, iicon.registerIcon(CORE.MODID + ":" + "redstone/redstone_meter/" + "top")); + ForgeDirection.NORTH, + iicon.registerIcon(CORE.MODID + ":" + "redstone/redstone_meter/" + "top")); aTempMap.put( - ForgeDirection.SOUTH, iicon.registerIcon(CORE.MODID + ":" + "redstone/redstone_meter/" + "top")); + ForgeDirection.SOUTH, + iicon.registerIcon(CORE.MODID + ":" + "redstone/redstone_meter/" + "top")); aTempMap.put( - ForgeDirection.EAST, iicon.registerIcon(CORE.MODID + ":" + "redstone/redstone_meter/" + "top")); + ForgeDirection.EAST, + iicon.registerIcon(CORE.MODID + ":" + "redstone/redstone_meter/" + "top")); aTempMap.put( - ForgeDirection.WEST, iicon.registerIcon(CORE.MODID + ":" + "redstone/redstone_meter/" + "top")); + ForgeDirection.WEST, + iicon.registerIcon(CORE.MODID + ":" + "redstone/redstone_meter/" + "top")); aTextures.put(aMeta++, aTempMap); } } diff --git a/src/main/java/gtPlusPlus/core/block/machine/BlockGtFrameBox.java b/src/main/java/gtPlusPlus/core/block/machine/BlockGtFrameBox.java index 289b5e5c1c..83e3edac59 100644 --- a/src/main/java/gtPlusPlus/core/block/machine/BlockGtFrameBox.java +++ b/src/main/java/gtPlusPlus/core/block/machine/BlockGtFrameBox.java @@ -1,23 +1,20 @@ package gtPlusPlus.core.block.machine; -import gtPlusPlus.core.block.base.BasicBlock.BlockTypes; -import gtPlusPlus.core.block.base.MetaBlock; -import gtPlusPlus.core.lib.CORE; import net.minecraft.block.material.Material; import net.minecraft.entity.EnumCreatureType; import net.minecraft.world.IBlockAccess; +import gtPlusPlus.core.block.base.BasicBlock.BlockTypes; +import gtPlusPlus.core.block.base.MetaBlock; +import gtPlusPlus.core.lib.CORE; + public class BlockGtFrameBox extends MetaBlock { private int[] colours; private int totalColours; - public BlockGtFrameBox( - final String unlocalizedName, - final Material material, - final BlockTypes blockTypeENUM, - final boolean recolour, - final int... colour) { + public BlockGtFrameBox(final String unlocalizedName, final Material material, final BlockTypes blockTypeENUM, + final boolean recolour, final int... colour) { super(unlocalizedName, material, blockTypeENUM.getBlockSoundType()); this.setBlockTextureName(CORE.MODID + ":" + "blockGtFrame"); this.setHarvestLevel(blockTypeENUM.getHarvestTool(), 2); @@ -28,16 +25,16 @@ public class BlockGtFrameBox extends MetaBlock { } @Override - public int colorMultiplier( - final IBlockAccess p_149720_1_, final int p_149720_2_, final int p_149720_3_, final int p_149720_4_) { + public int colorMultiplier(final IBlockAccess p_149720_1_, final int p_149720_2_, final int p_149720_3_, + final int p_149720_4_) { for (final int i : this.colours) {} return super.colorMultiplier(p_149720_1_, p_149720_2_, p_149720_3_, p_149720_4_); } @Override - public boolean canCreatureSpawn( - final EnumCreatureType type, final IBlockAccess world, final int x, final int y, final int z) { + public boolean canCreatureSpawn(final EnumCreatureType type, final IBlockAccess world, final int x, final int y, + final int z) { return false; } } diff --git a/src/main/java/gtPlusPlus/core/block/machine/CircuitProgrammer.java b/src/main/java/gtPlusPlus/core/block/machine/CircuitProgrammer.java index 4cc3afec22..b25b24302f 100644 --- a/src/main/java/gtPlusPlus/core/block/machine/CircuitProgrammer.java +++ b/src/main/java/gtPlusPlus/core/block/machine/CircuitProgrammer.java @@ -1,15 +1,5 @@ package gtPlusPlus.core.block.machine; -import cpw.mods.fml.common.registry.LanguageRegistry; -import gregtech.common.items.GT_MetaGenerated_Tool_01; -import gtPlusPlus.GTplusplus; -import gtPlusPlus.api.objects.minecraft.CubicObject; -import gtPlusPlus.core.block.base.BasicTileBlockWithTooltip; -import gtPlusPlus.core.creative.AddToCreativeTab; -import gtPlusPlus.core.handler.GuiHandler; -import gtPlusPlus.core.lib.CORE; -import gtPlusPlus.core.tileentities.general.TileEntityCircuitProgrammer; -import gtPlusPlus.core.util.minecraft.PlayerUtils; import net.minecraft.block.material.Material; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.EntityLivingBase; @@ -21,6 +11,17 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; +import cpw.mods.fml.common.registry.LanguageRegistry; +import gregtech.common.items.GT_MetaGenerated_Tool_01; +import gtPlusPlus.GTplusplus; +import gtPlusPlus.api.objects.minecraft.CubicObject; +import gtPlusPlus.core.block.base.BasicTileBlockWithTooltip; +import gtPlusPlus.core.creative.AddToCreativeTab; +import gtPlusPlus.core.handler.GuiHandler; +import gtPlusPlus.core.lib.CORE; +import gtPlusPlus.core.tileentities.general.TileEntityCircuitProgrammer; +import gtPlusPlus.core.util.minecraft.PlayerUtils; + public class CircuitProgrammer extends BasicTileBlockWithTooltip { /** @@ -43,16 +44,8 @@ public class CircuitProgrammer extends BasicTileBlockWithTooltip { * Called upon block activation (right click on the block.) */ @Override - public boolean onBlockActivated( - final World world, - final int x, - final int y, - final int z, - final EntityPlayer player, - final int side, - final float lx, - final float ly, - final float lz) { + public boolean onBlockActivated(final World world, final int x, final int y, final int z, final EntityPlayer player, + final int side, final float lx, final float ly, final float lz) { if (world.isRemote) { return true; } else { @@ -69,8 +62,7 @@ public class CircuitProgrammer extends BasicTileBlockWithTooltip { mDidScrewDriver = tile.onScrewdriverRightClick((byte) side, player, x, y, z); } } - } catch (final Throwable t) { - } + } catch (final Throwable t) {} if (!mDidScrewDriver) { final TileEntity te = world.getTileEntity(x, y, z); @@ -106,12 +98,7 @@ public class CircuitProgrammer extends BasicTileBlockWithTooltip { } @Override - public void onBlockPlacedBy( - final World world, - final int x, - final int y, - final int z, - final EntityLivingBase entity, + public void onBlockPlacedBy(final World world, final int x, final int y, final int z, final EntityLivingBase entity, final ItemStack stack) { if (stack.hasDisplayName()) { ((TileEntityCircuitProgrammer) world.getTileEntity(x, y, z)).setCustomName(stack.getDisplayName()); @@ -119,8 +106,8 @@ public class CircuitProgrammer extends BasicTileBlockWithTooltip { } @Override - public boolean canCreatureSpawn( - final EnumCreatureType type, final IBlockAccess world, final int x, final int y, final int z) { + public boolean canCreatureSpawn(final EnumCreatureType type, final IBlockAccess world, final int x, final int y, + final int z) { return false; } @@ -156,15 +143,13 @@ public class CircuitProgrammer extends BasicTileBlockWithTooltip { @Override public CubicObject<String>[] getCustomTextureDirectoryObject() { - String[] aTexData = new String[] { - CORE.MODID + ":" + "metro/" + "TEXTURE_METAL_PANEL_G", - CORE.MODID + ":" + "metro/" + "TEXTURE_TECH_PANEL_B", - CORE.MODID + ":" + "metro/" + "TEXTURE_METAL_PANEL_I", - CORE.MODID + ":" + "metro/" + "TEXTURE_METAL_PANEL_I", - CORE.MODID + ":" + "metro/" + "TEXTURE_METAL_PANEL_I", - CORE.MODID + ":" + "metro/" + "TEXTURE_METAL_PANEL_I" - }; - CubicObject<String>[] aTextureData = new CubicObject[] {new CubicObject<String>(aTexData)}; + String[] aTexData = new String[] { CORE.MODID + ":" + "metro/" + "TEXTURE_METAL_PANEL_G", + CORE.MODID + ":" + "metro/" + "TEXTURE_TECH_PANEL_B", + CORE.MODID + ":" + "metro/" + "TEXTURE_METAL_PANEL_I", + CORE.MODID + ":" + "metro/" + "TEXTURE_METAL_PANEL_I", + CORE.MODID + ":" + "metro/" + "TEXTURE_METAL_PANEL_I", + CORE.MODID + ":" + "metro/" + "TEXTURE_METAL_PANEL_I" }; + CubicObject<String>[] aTextureData = new CubicObject[] { new CubicObject<String>(aTexData) }; return aTextureData; } } diff --git a/src/main/java/gtPlusPlus/core/block/machine/DecayablesChest.java b/src/main/java/gtPlusPlus/core/block/machine/DecayablesChest.java index c3c49ff03f..7ca23df3f9 100644 --- a/src/main/java/gtPlusPlus/core/block/machine/DecayablesChest.java +++ b/src/main/java/gtPlusPlus/core/block/machine/DecayablesChest.java @@ -1,5 +1,18 @@ package gtPlusPlus.core.block.machine; +import net.minecraft.block.Block; +import net.minecraft.block.BlockContainer; +import net.minecraft.block.material.Material; +import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.entity.EntityLivingBase; +import net.minecraft.entity.EnumCreatureType; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.IIcon; +import net.minecraft.world.IBlockAccess; +import net.minecraft.world.World; + import cpw.mods.fml.common.registry.GameRegistry; import cpw.mods.fml.common.registry.LanguageRegistry; import cpw.mods.fml.relauncher.Side; @@ -13,20 +26,9 @@ import gtPlusPlus.core.item.base.itemblock.ItemBlockBasicTile; import gtPlusPlus.core.lib.CORE; import gtPlusPlus.core.tileentities.general.TileEntityDecayablesChest; import gtPlusPlus.core.util.minecraft.InventoryUtils; -import net.minecraft.block.Block; -import net.minecraft.block.BlockContainer; -import net.minecraft.block.material.Material; -import net.minecraft.client.renderer.texture.IIconRegister; -import net.minecraft.entity.EntityLivingBase; -import net.minecraft.entity.EnumCreatureType; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemStack; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.IIcon; -import net.minecraft.world.IBlockAccess; -import net.minecraft.world.World; public class DecayablesChest extends BlockContainer implements ITileTooltip { + @SideOnly(Side.CLIENT) private IIcon textureTop; @@ -61,7 +63,7 @@ public class DecayablesChest extends BlockContainer implements ITileTooltip { } /** - * Is this block (a) opaque and (b) a full 1m cube? This determines whether or not to render the shared face of two + * 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. */ public boolean isOpaqueCube() { @@ -93,8 +95,8 @@ public class DecayablesChest extends BlockContainer implements ITileTooltip { /** * Updates the blocks bounds based on its current state. Args: world, x, y, z */ - public void setBlockBoundsBasedOnState( - IBlockAccess p_149719_1_, int p_149719_2_, int p_149719_3_, int p_149719_4_) { + public void setBlockBoundsBasedOnState(IBlockAccess p_149719_1_, int p_149719_2_, int p_149719_3_, + int p_149719_4_) { if (p_149719_1_.getBlock(p_149719_2_, p_149719_3_, p_149719_4_ - 1) == this) { this.setBlockBounds(0.0625F, 0.0F, 0.0F, 0.9375F, 0.875F, 0.9375F); } else if (p_149719_1_.getBlock(p_149719_2_, p_149719_3_, p_149719_4_ + 1) == this) { @@ -130,16 +132,8 @@ public class DecayablesChest extends BlockContainer implements ITileTooltip { * Called upon block activation (right click on the block.) */ @Override - public boolean onBlockActivated( - final World world, - final int x, - final int y, - final int z, - final EntityPlayer player, - final int side, - final float lx, - final float ly, - final float lz) { + public boolean onBlockActivated(final World world, final int x, final int y, final int z, final EntityPlayer player, + final int side, final float lx, final float ly, final float lz) { if (world.isRemote) { return true; } @@ -168,19 +162,14 @@ public class DecayablesChest extends BlockContainer implements ITileTooltip { } @Override - public void breakBlock( - final World world, final int x, final int y, final int z, final Block block, final int number) { + public void breakBlock(final World world, final int x, final int y, final int z, final Block block, + final int number) { InventoryUtils.dropInventoryItems(world, x, y, z, block); super.breakBlock(world, x, y, z, block, number); } @Override - public void onBlockPlacedBy( - final World world, - final int x, - final int y, - final int z, - final EntityLivingBase entity, + public void onBlockPlacedBy(final World world, final int x, final int y, final int z, final EntityLivingBase entity, final ItemStack stack) { if (stack.hasDisplayName()) { ((TileEntityDecayablesChest) world.getTileEntity(x, y, z)).setCustomName(stack.getDisplayName()); @@ -188,28 +177,23 @@ public class DecayablesChest extends BlockContainer implements ITileTooltip { } @Override - public boolean canCreatureSpawn( - final EnumCreatureType type, final IBlockAccess world, final int x, final int y, final int z) { + public boolean canCreatureSpawn(final EnumCreatureType type, final IBlockAccess world, final int x, final int y, + final int z) { return false; } - /*@Override - public void breakBlock(World world, BlockPos pos, IBlockState blockstate) { - TileEntityFishTrap te = (TileEntityFishTrap) world.getTileEntity(pos); - InventoryHelper.dropInventoryItems(world, pos, te); - super.breakBlock(world, pos, blockstate); - } - - - @Override - public void onBlockPlacedBy(World worldIn, BlockPos pos, IBlockState state, EntityLivingBase placer, ItemStack stack) { - if (stack.hasDisplayName()) { - ((TileEntityFishTrap) worldIn.getTileEntity(pos)).setCustomName(stack.getDisplayName()); - } - }*/ + /* + * @Override public void breakBlock(World world, BlockPos pos, IBlockState blockstate) { TileEntityFishTrap te = + * (TileEntityFishTrap) world.getTileEntity(pos); InventoryHelper.dropInventoryItems(world, pos, te); + * super.breakBlock(world, pos, blockstate); } + * @Override public void onBlockPlacedBy(World worldIn, BlockPos pos, IBlockState state, EntityLivingBase placer, + * ItemStack stack) { if (stack.hasDisplayName()) { ((TileEntityFishTrap) + * worldIn.getTileEntity(pos)).setCustomName(stack.getDisplayName()); } } + */ /** * Update Chest Meta - Stub + * * @param aWorld * @param xPos * @param yPos diff --git a/src/main/java/gtPlusPlus/core/block/machine/EggBox.java b/src/main/java/gtPlusPlus/core/block/machine/EggBox.java index 2950eeae98..f4de81cbd4 100644 --- a/src/main/java/gtPlusPlus/core/block/machine/EggBox.java +++ b/src/main/java/gtPlusPlus/core/block/machine/EggBox.java @@ -1,17 +1,5 @@ package gtPlusPlus.core.block.machine; -import cpw.mods.fml.common.registry.GameRegistry; -import cpw.mods.fml.common.registry.LanguageRegistry; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; -import gtPlusPlus.GTplusplus; -import gtPlusPlus.api.interfaces.ITileTooltip; -import gtPlusPlus.core.creative.AddToCreativeTab; -import gtPlusPlus.core.handler.GuiHandler; -import gtPlusPlus.core.item.base.itemblock.ItemBlockBasicTile; -import gtPlusPlus.core.lib.CORE; -import gtPlusPlus.core.tileentities.general.TileEntityEggBox; -import gtPlusPlus.core.util.minecraft.InventoryUtils; import net.minecraft.block.Block; import net.minecraft.block.BlockContainer; import net.minecraft.block.material.Material; @@ -25,7 +13,21 @@ import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; +import cpw.mods.fml.common.registry.GameRegistry; +import cpw.mods.fml.common.registry.LanguageRegistry; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import gtPlusPlus.GTplusplus; +import gtPlusPlus.api.interfaces.ITileTooltip; +import gtPlusPlus.core.creative.AddToCreativeTab; +import gtPlusPlus.core.handler.GuiHandler; +import gtPlusPlus.core.item.base.itemblock.ItemBlockBasicTile; +import gtPlusPlus.core.lib.CORE; +import gtPlusPlus.core.tileentities.general.TileEntityEggBox; +import gtPlusPlus.core.util.minecraft.InventoryUtils; + public class EggBox extends BlockContainer implements ITileTooltip { + @SideOnly(Side.CLIENT) private IIcon textureTop; @@ -95,16 +97,8 @@ public class EggBox extends BlockContainer implements ITileTooltip { * Called upon block activation (right click on the block.) */ @Override - public boolean onBlockActivated( - final World world, - final int x, - final int y, - final int z, - final EntityPlayer player, - final int side, - final float lx, - final float ly, - final float lz) { + public boolean onBlockActivated(final World world, final int x, final int y, final int z, final EntityPlayer player, + final int side, final float lx, final float ly, final float lz) { if (world.isRemote) { return true; } @@ -133,19 +127,14 @@ public class EggBox extends BlockContainer implements ITileTooltip { } @Override - public void breakBlock( - final World world, final int x, final int y, final int z, final Block block, final int number) { + public void breakBlock(final World world, final int x, final int y, final int z, final Block block, + final int number) { InventoryUtils.dropInventoryItems(world, x, y, z, block); super.breakBlock(world, x, y, z, block, number); } @Override - public void onBlockPlacedBy( - final World world, - final int x, - final int y, - final int z, - final EntityLivingBase entity, + public void onBlockPlacedBy(final World world, final int x, final int y, final int z, final EntityLivingBase entity, final ItemStack stack) { if (stack.hasDisplayName()) { ((TileEntityEggBox) world.getTileEntity(x, y, z)).setCustomName(stack.getDisplayName()); @@ -153,28 +142,23 @@ public class EggBox extends BlockContainer implements ITileTooltip { } @Override - public boolean canCreatureSpawn( - final EnumCreatureType type, final IBlockAccess world, final int x, final int y, final int z) { + public boolean canCreatureSpawn(final EnumCreatureType type, final IBlockAccess world, final int x, final int y, + final int z) { return false; } - /*@Override - public void breakBlock(World world, BlockPos pos, IBlockState blockstate) { - TileEntityFishTrap te = (TileEntityFishTrap) world.getTileEntity(pos); - InventoryHelper.dropInventoryItems(world, pos, te); - super.breakBlock(world, pos, blockstate); - } - - - @Override - public void onBlockPlacedBy(World worldIn, BlockPos pos, IBlockState state, EntityLivingBase placer, ItemStack stack) { - if (stack.hasDisplayName()) { - ((TileEntityFishTrap) worldIn.getTileEntity(pos)).setCustomName(stack.getDisplayName()); - } - }*/ + /* + * @Override public void breakBlock(World world, BlockPos pos, IBlockState blockstate) { TileEntityFishTrap te = + * (TileEntityFishTrap) world.getTileEntity(pos); InventoryHelper.dropInventoryItems(world, pos, te); + * super.breakBlock(world, pos, blockstate); } + * @Override public void onBlockPlacedBy(World worldIn, BlockPos pos, IBlockState state, EntityLivingBase placer, + * ItemStack stack) { if (stack.hasDisplayName()) { ((TileEntityFishTrap) + * worldIn.getTileEntity(pos)).setCustomName(stack.getDisplayName()); } } + */ /** * Update Chest Meta - Stub + * * @param aWorld * @param xPos * @param yPos diff --git a/src/main/java/gtPlusPlus/core/block/machine/FishTrap.java b/src/main/java/gtPlusPlus/core/block/machine/FishTrap.java index 0975b71ace..5571a4eb41 100644 --- a/src/main/java/gtPlusPlus/core/block/machine/FishTrap.java +++ b/src/main/java/gtPlusPlus/core/block/machine/FishTrap.java @@ -1,16 +1,5 @@ package gtPlusPlus.core.block.machine; -import cpw.mods.fml.common.registry.GameRegistry; -import cpw.mods.fml.common.registry.LanguageRegistry; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; -import gtPlusPlus.GTplusplus; -import gtPlusPlus.api.interfaces.ITileTooltip; -import gtPlusPlus.core.creative.AddToCreativeTab; -import gtPlusPlus.core.item.base.itemblock.ItemBlockBasicTile; -import gtPlusPlus.core.lib.CORE; -import gtPlusPlus.core.tileentities.general.TileEntityFishTrap; -import gtPlusPlus.core.util.minecraft.InventoryUtils; import net.minecraft.block.Block; import net.minecraft.block.BlockContainer; import net.minecraft.block.material.Material; @@ -24,7 +13,20 @@ import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; +import cpw.mods.fml.common.registry.GameRegistry; +import cpw.mods.fml.common.registry.LanguageRegistry; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import gtPlusPlus.GTplusplus; +import gtPlusPlus.api.interfaces.ITileTooltip; +import gtPlusPlus.core.creative.AddToCreativeTab; +import gtPlusPlus.core.item.base.itemblock.ItemBlockBasicTile; +import gtPlusPlus.core.lib.CORE; +import gtPlusPlus.core.tileentities.general.TileEntityFishTrap; +import gtPlusPlus.core.util.minecraft.InventoryUtils; + public class FishTrap extends BlockContainer implements ITileTooltip { + @SideOnly(Side.CLIENT) private IIcon textureTop; @@ -61,10 +63,8 @@ public class FishTrap extends BlockContainer implements ITileTooltip { @Override @SideOnly(Side.CLIENT) public IIcon getIcon(final int p_149691_1_, final int p_149691_2_) { - return p_149691_1_ == 1 - ? this.textureTop - : (p_149691_1_ == 0 - ? this.textureBottom + return p_149691_1_ == 1 ? this.textureTop + : (p_149691_1_ == 0 ? this.textureBottom : ((p_149691_1_ != 2) && (p_149691_1_ != 4) ? this.blockIcon : this.textureFront)); } @@ -81,16 +81,8 @@ public class FishTrap extends BlockContainer implements ITileTooltip { * Called upon block activation (right click on the block.) */ @Override - public boolean onBlockActivated( - final World world, - final int x, - final int y, - final int z, - final EntityPlayer player, - final int side, - final float lx, - final float ly, - final float lz) { + public boolean onBlockActivated(final World world, final int x, final int y, final int z, final EntityPlayer player, + final int side, final float lx, final float ly, final float lz) { if (world.isRemote) { return true; } @@ -124,19 +116,14 @@ public class FishTrap extends BlockContainer implements ITileTooltip { } @Override - public void breakBlock( - final World world, final int x, final int y, final int z, final Block block, final int number) { + public void breakBlock(final World world, final int x, final int y, final int z, final Block block, + final int number) { InventoryUtils.dropInventoryItems(world, x, y, z, block); super.breakBlock(world, x, y, z, block, number); } @Override - public void onBlockPlacedBy( - final World world, - final int x, - final int y, - final int z, - final EntityLivingBase entity, + public void onBlockPlacedBy(final World world, final int x, final int y, final int z, final EntityLivingBase entity, final ItemStack stack) { if (stack.hasDisplayName()) { ((TileEntityFishTrap) world.getTileEntity(x, y, z)).setCustomName(stack.getDisplayName()); @@ -144,24 +131,18 @@ public class FishTrap extends BlockContainer implements ITileTooltip { } @Override - public boolean canCreatureSpawn( - final EnumCreatureType type, final IBlockAccess world, final int x, final int y, final int z) { + public boolean canCreatureSpawn(final EnumCreatureType type, final IBlockAccess world, final int x, final int y, + final int z) { return false; } - /*@Override - public void breakBlock(World world, BlockPos pos, IBlockState blockstate) { - TileEntityFishTrap te = (TileEntityFishTrap) world.getTileEntity(pos); - InventoryHelper.dropInventoryItems(world, pos, te); - super.breakBlock(world, pos, blockstate); - } - - - @Override - public void onBlockPlacedBy(World worldIn, BlockPos pos, IBlockState state, EntityLivingBase placer, ItemStack stack) { - if (stack.hasDisplayName()) { - ((TileEntityFishTrap) worldIn.getTileEntity(pos)).setCustomName(stack.getDisplayName()); - } - }*/ + /* + * @Override public void breakBlock(World world, BlockPos pos, IBlockState blockstate) { TileEntityFishTrap te = + * (TileEntityFishTrap) world.getTileEntity(pos); InventoryHelper.dropInventoryItems(world, pos, te); + * super.breakBlock(world, pos, blockstate); } + * @Override public void onBlockPlacedBy(World worldIn, BlockPos pos, IBlockState state, EntityLivingBase placer, + * ItemStack stack) { if (stack.hasDisplayName()) { ((TileEntityFishTrap) + * worldIn.getTileEntity(pos)).setCustomName(stack.getDisplayName()); } } + */ } diff --git a/src/main/java/gtPlusPlus/core/block/machine/HeliumGenerator.java b/src/main/java/gtPlusPlus/core/block/machine/HeliumGenerator.java index 4c7668b9e0..8eaa331c12 100644 --- a/src/main/java/gtPlusPlus/core/block/machine/HeliumGenerator.java +++ b/src/main/java/gtPlusPlus/core/block/machine/HeliumGenerator.java @@ -1,5 +1,13 @@ package gtPlusPlus.core.block.machine; +import net.minecraft.block.BlockContainer; +import net.minecraft.block.material.Material; +import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.IIcon; +import net.minecraft.world.World; + import cpw.mods.fml.common.registry.GameRegistry; import cpw.mods.fml.common.registry.LanguageRegistry; import cpw.mods.fml.relauncher.Side; @@ -8,15 +16,9 @@ import gtPlusPlus.GTplusplus; import gtPlusPlus.core.creative.AddToCreativeTab; import gtPlusPlus.core.lib.CORE; import gtPlusPlus.core.tileentities.general.TileEntityHeliumGenerator; -import net.minecraft.block.BlockContainer; -import net.minecraft.block.material.Material; -import net.minecraft.client.renderer.texture.IIconRegister; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.IIcon; -import net.minecraft.world.World; public class HeliumGenerator extends BlockContainer { + @SideOnly(Side.CLIENT) private IIcon textureTop; @@ -41,10 +43,8 @@ public class HeliumGenerator extends BlockContainer { @Override @SideOnly(Side.CLIENT) public IIcon getIcon(final int p_149691_1_, final int p_149691_2_) { - return p_149691_1_ == 1 - ? this.textureTop - : (p_149691_1_ == 0 - ? this.textureBottom + return p_149691_1_ == 1 ? this.textureTop + : (p_149691_1_ == 0 ? this.textureBottom : ((p_149691_1_ != 2) && (p_149691_1_ != 4) ? this.blockIcon : this.textureFront)); } @@ -61,16 +61,8 @@ public class HeliumGenerator extends BlockContainer { * Called upon block activation (right click on the block.) */ @Override - public boolean onBlockActivated( - final World world, - final int x, - final int y, - final int z, - final EntityPlayer player, - final int side, - final float lx, - final float ly, - final float lz) { + public boolean onBlockActivated(final World world, final int x, final int y, final int z, final EntityPlayer player, + final int side, final float lx, final float ly, final float lz) { if (world.isRemote) { return true; } diff --git a/src/main/java/gtPlusPlus/core/block/machine/Machine_ModularityTable.java b/src/main/java/gtPlusPlus/core/block/machine/Machine_ModularityTable.java index 124860cb27..14c54b1040 100644 --- a/src/main/java/gtPlusPlus/core/block/machine/Machine_ModularityTable.java +++ b/src/main/java/gtPlusPlus/core/block/machine/Machine_ModularityTable.java @@ -1,5 +1,15 @@ package gtPlusPlus.core.block.machine; +import net.minecraft.block.BlockContainer; +import net.minecraft.block.material.Material; +import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.entity.EnumCreatureType; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.IIcon; +import net.minecraft.world.IBlockAccess; +import net.minecraft.world.World; + import cpw.mods.fml.common.registry.GameRegistry; import cpw.mods.fml.common.registry.LanguageRegistry; import cpw.mods.fml.relauncher.Side; @@ -11,17 +21,9 @@ import gtPlusPlus.core.creative.AddToCreativeTab; import gtPlusPlus.core.item.base.itemblock.ItemBlockBasicTile; import gtPlusPlus.core.lib.CORE; import gtPlusPlus.core.tileentities.machines.TileEntityModularityTable; -import net.minecraft.block.BlockContainer; -import net.minecraft.block.material.Material; -import net.minecraft.client.renderer.texture.IIconRegister; -import net.minecraft.entity.EnumCreatureType; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.IIcon; -import net.minecraft.world.IBlockAccess; -import net.minecraft.world.World; public class Machine_ModularityTable extends BlockContainer implements ITileTooltip { + @SideOnly(Side.CLIENT) private IIcon textureTop; @@ -56,10 +58,8 @@ public class Machine_ModularityTable extends BlockContainer implements ITileTool @Override @SideOnly(Side.CLIENT) public IIcon getIcon(final int p_149691_1_, final int p_149691_2_) { - return p_149691_1_ == 1 - ? this.textureTop - : (p_149691_1_ == 0 - ? this.textureBottom + return p_149691_1_ == 1 ? this.textureTop + : (p_149691_1_ == 0 ? this.textureBottom : ((p_149691_1_ != 2) && (p_149691_1_ != 4) ? this.blockIcon : this.textureFront)); } @@ -76,16 +76,8 @@ public class Machine_ModularityTable extends BlockContainer implements ITileTool * Called upon block activation (right click on the block.) */ @Override - public boolean onBlockActivated( - final World world, - final int x, - final int y, - final int z, - final EntityPlayer player, - final int side, - final float lx, - final float ly, - final float lz) { + public boolean onBlockActivated(final World world, final int x, final int y, final int z, final EntityPlayer player, + final int side, final float lx, final float ly, final float lz) { if (world.isRemote) { return true; } @@ -104,8 +96,8 @@ public class Machine_ModularityTable extends BlockContainer implements ITileTool } @Override - public boolean canCreatureSpawn( - final EnumCreatureType type, final IBlockAccess world, final int x, final int y, final int z) { + public boolean canCreatureSpawn(final EnumCreatureType type, final IBlockAccess world, final int x, final int y, + final int z) { return false; } } diff --git a/src/main/java/gtPlusPlus/core/block/machine/Machine_PestKiller.java b/src/main/java/gtPlusPlus/core/block/machine/Machine_PestKiller.java index 96fe4e20b1..895bc8847f 100644 --- a/src/main/java/gtPlusPlus/core/block/machine/Machine_PestKiller.java +++ b/src/main/java/gtPlusPlus/core/block/machine/Machine_PestKiller.java @@ -1,17 +1,5 @@ package gtPlusPlus.core.block.machine; -import cpw.mods.fml.common.registry.GameRegistry; -import cpw.mods.fml.common.registry.LanguageRegistry; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; -import gtPlusPlus.GTplusplus; -import gtPlusPlus.api.interfaces.ITileTooltip; -import gtPlusPlus.core.creative.AddToCreativeTab; -import gtPlusPlus.core.handler.GuiHandler; -import gtPlusPlus.core.item.base.itemblock.ItemBlockBasicTile; -import gtPlusPlus.core.lib.CORE; -import gtPlusPlus.core.tileentities.machines.TileEntityPestKiller; -import gtPlusPlus.core.util.minecraft.InventoryUtils; import net.minecraft.block.Block; import net.minecraft.block.BlockContainer; import net.minecraft.block.material.Material; @@ -25,7 +13,21 @@ import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; +import cpw.mods.fml.common.registry.GameRegistry; +import cpw.mods.fml.common.registry.LanguageRegistry; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import gtPlusPlus.GTplusplus; +import gtPlusPlus.api.interfaces.ITileTooltip; +import gtPlusPlus.core.creative.AddToCreativeTab; +import gtPlusPlus.core.handler.GuiHandler; +import gtPlusPlus.core.item.base.itemblock.ItemBlockBasicTile; +import gtPlusPlus.core.lib.CORE; +import gtPlusPlus.core.tileentities.machines.TileEntityPestKiller; +import gtPlusPlus.core.util.minecraft.InventoryUtils; + public class Machine_PestKiller extends BlockContainer implements ITileTooltip { + @SideOnly(Side.CLIENT) private IIcon textureTop; @@ -68,28 +70,20 @@ public class Machine_PestKiller extends BlockContainer implements ITileTooltip { @Override @SideOnly(Side.CLIENT) public void registerBlockIcons(final IIconRegister p_149651_1_) { - this.blockIcon = - p_149651_1_.registerIcon(CORE.MODID + ":" + "TileEntities/" + "MACHINE_CASING_FARM_MANAGER_STRUCTURAL"); + this.blockIcon = p_149651_1_ + .registerIcon(CORE.MODID + ":" + "TileEntities/" + "MACHINE_CASING_FARM_MANAGER_STRUCTURAL"); this.textureTop = p_149651_1_.registerIcon(CORE.MODID + ":" + "TileEntities/" + "MACHINE_PESTKILLER_TOP"); this.textureBottom = p_149651_1_.registerIcon("planks_acacia"); - this.textureFront = - p_149651_1_.registerIcon(CORE.MODID + ":" + "TileEntities/" + "MACHINE_CASING_FARM_MANAGER_STRUCTURAL"); + this.textureFront = p_149651_1_ + .registerIcon(CORE.MODID + ":" + "TileEntities/" + "MACHINE_CASING_FARM_MANAGER_STRUCTURAL"); } /** * Called upon block activation (right click on the block.) */ @Override - public boolean onBlockActivated( - final World world, - final int x, - final int y, - final int z, - final EntityPlayer player, - final int side, - final float lx, - final float ly, - final float lz) { + public boolean onBlockActivated(final World world, final int x, final int y, final int z, final EntityPlayer player, + final int side, final float lx, final float ly, final float lz) { if (world.isRemote) { return true; } @@ -123,19 +117,14 @@ public class Machine_PestKiller extends BlockContainer implements ITileTooltip { } @Override - public void breakBlock( - final World world, final int x, final int y, final int z, final Block block, final int number) { + public void breakBlock(final World world, final int x, final int y, final int z, final Block block, + final int number) { InventoryUtils.dropInventoryItems(world, x, y, z, block); super.breakBlock(world, x, y, z, block, number); } @Override - public void onBlockPlacedBy( - final World world, - final int x, - final int y, - final int z, - final EntityLivingBase entity, + public void onBlockPlacedBy(final World world, final int x, final int y, final int z, final EntityLivingBase entity, final ItemStack stack) { if (stack.hasDisplayName()) { ((TileEntityPestKiller) world.getTileEntity(x, y, z)).setCustomName(stack.getDisplayName()); @@ -143,8 +132,8 @@ public class Machine_PestKiller extends BlockContainer implements ITileTooltip { } @Override - public boolean canCreatureSpawn( - final EnumCreatureType type, final IBlockAccess world, final int x, final int y, final int z) { + public boolean canCreatureSpawn(final EnumCreatureType type, final IBlockAccess world, final int x, final int y, + final int z) { return false; } } diff --git a/src/main/java/gtPlusPlus/core/block/machine/Machine_PooCollector.java b/src/main/java/gtPlusPlus/core/block/machine/Machine_PooCollector.java index 374694ff48..c7198f7a64 100644 --- a/src/main/java/gtPlusPlus/core/block/machine/Machine_PooCollector.java +++ b/src/main/java/gtPlusPlus/core/block/machine/Machine_PooCollector.java @@ -1,18 +1,8 @@ package gtPlusPlus.core.block.machine; -import cpw.mods.fml.common.registry.GameRegistry; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; -import gtPlusPlus.core.creative.AddToCreativeTab; -import gtPlusPlus.core.item.base.itemblock.ItemBlockMeta; -import gtPlusPlus.core.lib.CORE; -import gtPlusPlus.core.tileentities.machines.TileEntityAdvPooCollector; -import gtPlusPlus.core.tileentities.machines.TileEntityBaseFluidCollector; -import gtPlusPlus.core.tileentities.machines.TileEntityPooCollector; -import gtPlusPlus.core.util.minecraft.ItemUtils; -import gtPlusPlus.core.util.minecraft.PlayerUtils; import java.util.List; import java.util.Random; + import net.minecraft.block.BlockContainer; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; @@ -24,6 +14,18 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.util.IIcon; import net.minecraft.world.World; +import cpw.mods.fml.common.registry.GameRegistry; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import gtPlusPlus.core.creative.AddToCreativeTab; +import gtPlusPlus.core.item.base.itemblock.ItemBlockMeta; +import gtPlusPlus.core.lib.CORE; +import gtPlusPlus.core.tileentities.machines.TileEntityAdvPooCollector; +import gtPlusPlus.core.tileentities.machines.TileEntityBaseFluidCollector; +import gtPlusPlus.core.tileentities.machines.TileEntityPooCollector; +import gtPlusPlus.core.util.minecraft.ItemUtils; +import gtPlusPlus.core.util.minecraft.PlayerUtils; + public class Machine_PooCollector extends BlockContainer { @SideOnly(Side.CLIENT) @@ -75,16 +77,8 @@ public class Machine_PooCollector extends BlockContainer { * Called upon block activation (right click on the block.) */ @Override - public boolean onBlockActivated( - final World world, - final int x, - final int y, - final int z, - final EntityPlayer player, - final int side, - final float lx, - final float ly, - final float lz) { + public boolean onBlockActivated(final World world, final int x, final int y, final int z, final EntityPlayer player, + final int side, final float lx, final float ly, final float lz) { if (world.isRemote) { return true; } else { @@ -98,32 +92,20 @@ public class Machine_PooCollector extends BlockContainer { } // Fluid container code - /*if (handItem != null - && (handItem instanceof IFluidContainerItem || handItem instanceof ItemFluidContainer - || FluidContainerRegistry.isFilledContainer(player.getHeldItem()))) { - if (tank.tank.getFluid() == null) { - try { - if (!FluidContainerRegistry.isFilledContainer(player.getHeldItem())) { - ItemStack handItemStack = player.getHeldItem(); - IFluidContainerItem container = (IFluidContainerItem) handItem; - FluidStack containerFluid = container.getFluid(handItemStack); - container.drain(handItemStack, container.getFluid(handItemStack).amount, true); - tank.tank.setFluid(containerFluid); - } else { - ItemStack handItemStack = player.getHeldItem(); - FluidContainerRegistry.drainFluidContainer(handItemStack); - FluidStack containerFluid = FluidContainerRegistry.getFluidForFilledItem(handItemStack); - ItemStack emptyContainer = FluidContainerRegistry.drainFluidContainer(handItemStack); - player.setItemInUse(emptyContainer, 0); - - tank.tank.setFluid(containerFluid); - } - } catch (Throwable t) { - t.printStackTrace(); - } - } - - }*/ + /* + * if (handItem != null && (handItem instanceof IFluidContainerItem || handItem instanceof + * ItemFluidContainer || FluidContainerRegistry.isFilledContainer(player.getHeldItem()))) { if + * (tank.tank.getFluid() == null) { try { if + * (!FluidContainerRegistry.isFilledContainer(player.getHeldItem())) { ItemStack handItemStack = + * player.getHeldItem(); IFluidContainerItem container = (IFluidContainerItem) handItem; FluidStack + * containerFluid = container.getFluid(handItemStack); container.drain(handItemStack, + * container.getFluid(handItemStack).amount, true); tank.tank.setFluid(containerFluid); } else { + * ItemStack handItemStack = player.getHeldItem(); + * FluidContainerRegistry.drainFluidContainer(handItemStack); FluidStack containerFluid = + * FluidContainerRegistry.getFluidForFilledItem(handItemStack); ItemStack emptyContainer = + * FluidContainerRegistry.drainFluidContainer(handItemStack); player.setItemInUse(emptyContainer, 0); + * tank.tank.setFluid(containerFluid); } } catch (Throwable t) { t.printStackTrace(); } } } + */ if (!tank.mInventory.isEmpty()) { PlayerUtils.messagePlayer(player, "Inventory contains:"); @@ -134,7 +116,8 @@ public class Machine_PooCollector extends BlockContainer { if (tank.tank.getFluid() != null) { PlayerUtils.messagePlayer( player, - "Tank contains " + tank.tank.getFluidAmount() + "L of " + "Tank contains " + tank.tank.getFluidAmount() + + "L of " + tank.tank.getFluid().getLocalizedName()); } } diff --git a/src/main/java/gtPlusPlus/core/block/machine/Machine_ProjectTable.java b/src/main/java/gtPlusPlus/core/block/machine/Machine_ProjectTable.java index 1959c20f70..1f0f03f0f0 100644 --- a/src/main/java/gtPlusPlus/core/block/machine/Machine_ProjectTable.java +++ b/src/main/java/gtPlusPlus/core/block/machine/Machine_ProjectTable.java @@ -1,5 +1,16 @@ package gtPlusPlus.core.block.machine; +import net.minecraft.block.BlockContainer; +import net.minecraft.block.material.Material; +import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.entity.EnumCreatureType; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.IIcon; +import net.minecraft.world.IBlockAccess; +import net.minecraft.world.World; + import cpw.mods.fml.common.Optional; import cpw.mods.fml.common.registry.GameRegistry; import cpw.mods.fml.common.registry.LanguageRegistry; @@ -16,19 +27,10 @@ import gtPlusPlus.core.tileentities.machines.TileEntityProjectTable; import gtPlusPlus.core.util.minecraft.PlayerUtils; import gtPlusPlus.core.util.reflect.ReflectionUtils; import ic2.core.item.tool.ItemToolWrench; -import net.minecraft.block.BlockContainer; -import net.minecraft.block.material.Material; -import net.minecraft.client.renderer.texture.IIconRegister; -import net.minecraft.entity.EnumCreatureType; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemStack; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.IIcon; -import net.minecraft.world.IBlockAccess; -import net.minecraft.world.World; @Optional.Interface(iface = "crazypants.enderio.api.tool.ITool", modid = "EnderIO") public class Machine_ProjectTable extends BlockContainer implements ITileTooltip { + @SideOnly(Side.CLIENT) private IIcon textureTop; @@ -63,10 +65,8 @@ public class Machine_ProjectTable extends BlockContainer implements ITileTooltip @Override @SideOnly(Side.CLIENT) public IIcon getIcon(final int p_149691_1_, final int p_149691_2_) { - return p_149691_1_ == 1 - ? this.textureTop - : (p_149691_1_ == 0 - ? this.textureBottom + return p_149691_1_ == 1 ? this.textureTop + : (p_149691_1_ == 0 ? this.textureBottom : ((p_149691_1_ != 2) && (p_149691_1_ != 4) ? this.blockIcon : this.textureFront)); } @@ -83,16 +83,8 @@ public class Machine_ProjectTable extends BlockContainer implements ITileTooltip * Called upon block activation (right click on the block.) */ @Override - public boolean onBlockActivated( - final World world, - final int x, - final int y, - final int z, - final EntityPlayer player, - final int side, - final float lx, - final float ly, - final float lz) { + public boolean onBlockActivated(final World world, final int x, final int y, final int z, final EntityPlayer player, + final int side, final float lx, final float ly, final float lz) { ItemStack heldItem = null; if (world.isRemote) { @@ -163,8 +155,8 @@ public class Machine_ProjectTable extends BlockContainer implements ITileTooltip } @Override - public boolean canCreatureSpawn( - final EnumCreatureType type, final IBlockAccess world, final int x, final int y, final int z) { + public boolean canCreatureSpawn(final EnumCreatureType type, final IBlockAccess world, final int x, final int y, + final int z) { return false; } } diff --git a/src/main/java/gtPlusPlus/core/block/machine/Machine_RoundRobinator.java b/src/main/java/gtPlusPlus/core/block/machine/Machine_RoundRobinator.java index caf961f91f..ef55f1ece1 100644 --- a/src/main/java/gtPlusPlus/core/block/machine/Machine_RoundRobinator.java +++ b/src/main/java/gtPlusPlus/core/block/machine/Machine_RoundRobinator.java @@ -1,5 +1,13 @@ package gtPlusPlus.core.block.machine; +import net.minecraft.block.material.Material; +import net.minecraft.creativetab.CreativeTabs; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemBlock; +import net.minecraft.item.ItemStack; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.world.World; + import gtPlusPlus.api.objects.data.AutoMap; import gtPlusPlus.api.objects.minecraft.CubicObject; import gtPlusPlus.core.block.base.BasicTileBlockWithTooltip; @@ -9,13 +17,6 @@ import gtPlusPlus.core.lib.CORE; import gtPlusPlus.core.tileentities.machines.TileEntityRoundRobinator; import gtPlusPlus.core.util.minecraft.ItemUtils; import gtPlusPlus.core.util.minecraft.PlayerUtils; -import net.minecraft.block.material.Material; -import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemBlock; -import net.minecraft.item.ItemStack; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.world.World; public class Machine_RoundRobinator extends BasicTileBlockWithTooltip { @@ -27,16 +28,8 @@ public class Machine_RoundRobinator extends BasicTileBlockWithTooltip { * Called upon block activation (right click on the block.) */ @Override - public boolean onBlockActivated( - final World world, - final int x, - final int y, - final int z, - final EntityPlayer player, - final int side, - final float lx, - final float ly, - final float lz) { + public boolean onBlockActivated(final World world, final int x, final int y, final int z, final EntityPlayer player, + final int side, final float lx, final float ly, final float lz) { if (world.isRemote) { return true; } else { @@ -51,8 +44,7 @@ public class Machine_RoundRobinator extends BasicTileBlockWithTooltip { mDidScrewDriver = tile.onScrewdriverRightClick((byte) side, player, x, y, z); } } - } catch (final Throwable t) { - } + } catch (final Throwable t) {} if (!mDidScrewDriver) { final TileEntity te = world.getTileEntity(x, y, z); @@ -115,22 +107,20 @@ public class Machine_RoundRobinator extends BasicTileBlockWithTooltip { public CubicObject<String>[] getCustomTextureDirectoryObject() { AutoMap<String[]> aTemp = new AutoMap<String[]>(); for (int i = 0; i < 5; i++) { - String[] aTexData = new String[] { - CORE.MODID + ":" + "TileEntities/RoundRobinator/Top_" + i, - CORE.MODID + ":" + "TileEntities/RoundRobinator/Top_" + i, - CORE.MODID + ":" + "TileEntities/RoundRobinator/Side_" + i, - CORE.MODID + ":" + "TileEntities/RoundRobinator/Side_" + i, - CORE.MODID + ":" + "TileEntities/RoundRobinator/Side_" + i, - CORE.MODID + ":" + "TileEntities/RoundRobinator/Side_" + i, - }; + String[] aTexData = new String[] { CORE.MODID + ":" + "TileEntities/RoundRobinator/Top_" + i, + CORE.MODID + ":" + "TileEntities/RoundRobinator/Top_" + i, + CORE.MODID + ":" + "TileEntities/RoundRobinator/Side_" + i, + CORE.MODID + ":" + "TileEntities/RoundRobinator/Side_" + i, + CORE.MODID + ":" + "TileEntities/RoundRobinator/Side_" + i, + CORE.MODID + ":" + "TileEntities/RoundRobinator/Side_" + i, }; aTemp.put(aTexData); } AutoMap<CubicObject<String>> aTemp2 = new AutoMap<CubicObject<String>>(); for (String[] y : aTemp) { aTemp2.put(new CubicObject<String>(y)); } - CubicObject<String>[] aTextureData = - new CubicObject[] {aTemp2.get(0), aTemp2.get(1), aTemp2.get(2), aTemp2.get(3), aTemp2.get(4)}; + CubicObject<String>[] aTextureData = new CubicObject[] { aTemp2.get(0), aTemp2.get(1), aTemp2.get(2), + aTemp2.get(3), aTemp2.get(4) }; return aTextureData; } } diff --git a/src/main/java/gtPlusPlus/core/block/machine/Machine_SuperJukebox.java b/src/main/java/gtPlusPlus/core/block/machine/Machine_SuperJukebox.java index cbf8323c07..b79edd3fd9 100644 --- a/src/main/java/gtPlusPlus/core/block/machine/Machine_SuperJukebox.java +++ b/src/main/java/gtPlusPlus/core/block/machine/Machine_SuperJukebox.java @@ -1,16 +1,5 @@ package gtPlusPlus.core.block.machine; -import cpw.mods.fml.common.registry.GameRegistry; -import cpw.mods.fml.common.registry.LanguageRegistry; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; -import gregtech.api.util.GT_Utility; -import gtPlusPlus.GTplusplus; -import gtPlusPlus.api.objects.Logger; -import gtPlusPlus.api.objects.data.AutoMap; -import gtPlusPlus.core.handler.GuiHandler; -import gtPlusPlus.core.inventories.Inventory_SuperJukebox; -import gtPlusPlus.core.util.math.MathUtils; import net.minecraft.block.Block; import net.minecraft.block.BlockJukebox; import net.minecraft.client.renderer.texture.IIconRegister; @@ -26,7 +15,20 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.util.IIcon; import net.minecraft.world.World; +import cpw.mods.fml.common.registry.GameRegistry; +import cpw.mods.fml.common.registry.LanguageRegistry; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import gregtech.api.util.GT_Utility; +import gtPlusPlus.GTplusplus; +import gtPlusPlus.api.objects.Logger; +import gtPlusPlus.api.objects.data.AutoMap; +import gtPlusPlus.core.handler.GuiHandler; +import gtPlusPlus.core.inventories.Inventory_SuperJukebox; +import gtPlusPlus.core.util.math.MathUtils; + public class Machine_SuperJukebox extends BlockJukebox { + @SideOnly(Side.CLIENT) private IIcon mIcon; @@ -53,16 +55,8 @@ public class Machine_SuperJukebox extends BlockJukebox { * Called upon block activation (right click on the block.) */ @Override - public boolean onBlockActivated( - final World world, - final int x, - final int y, - final int z, - final EntityPlayer player, - final int side, - final float lx, - final float ly, - final float lz) { + public boolean onBlockActivated(final World world, final int x, final int y, final int z, final EntityPlayer player, + final int side, final float lx, final float ly, final float lz) { if (world.isRemote) { return true; } @@ -74,15 +68,10 @@ public class Machine_SuperJukebox extends BlockJukebox { } return false; - /* if (aWorld.getBlockMetadata(aX, aY, aZ) == 0) - { - return false; - } - else - { - this.func_149925_e(aWorld, aX, aY, aZ); - return true; - }*/ + /* + * if (aWorld.getBlockMetadata(aX, aY, aZ) == 0) { return false; } else { this.func_149925_e(aWorld, aX, aY, + * aZ); return true; } + */ } /** @@ -124,23 +113,22 @@ public class Machine_SuperJukebox extends BlockJukebox { // aWorld.playRecord((String) null, aX, aY, aZ); // tileentityjukebox.func_145857_a((ItemStack) null); // aWorld.setBlockMetadataWithNotify(aX, aY, aZ, 0, 2); - /*float f = 0.7F; - double d0 = (double) (aWorld.rand.nextFloat() * f) + (double) (1.0F - f) * 0.5D; - double d1 = (double) (aWorld.rand.nextFloat() * f) + (double) (1.0F - f) * 0.2D + 0.6D; - double d2 = (double) (aWorld.rand.nextFloat() * f) + (double) (1.0F - f) * 0.5D; - ItemStack itemstack1 = itemstack.copy(); - EntityItem entityitem = new EntityItem(aWorld, (double) aX + d0, - (double) aY + d1, (double) aZ + d2, itemstack1); - entityitem.delayBeforeCanPickup = 10; - aWorld.spawnEntityInWorld(entityitem);*/ + /* + * float f = 0.7F; double d0 = (double) (aWorld.rand.nextFloat() * f) + (double) (1.0F - f) * 0.5D; + * double d1 = (double) (aWorld.rand.nextFloat() * f) + (double) (1.0F - f) * 0.2D + 0.6D; double d2 + * = (double) (aWorld.rand.nextFloat() * f) + (double) (1.0F - f) * 0.5D; ItemStack itemstack1 = + * itemstack.copy(); EntityItem entityitem = new EntityItem(aWorld, (double) aX + d0, (double) aY + + * d1, (double) aZ + d2, itemstack1); entityitem.delayBeforeCanPickup = 10; + * aWorld.spawnEntityInWorld(entityitem); + */ } } } } @Override - public void breakBlock( - World p_149749_1_, int p_149749_2_, int p_149749_3_, int p_149749_4_, Block p_149749_5_, int p_149749_6_) { + public void breakBlock(World p_149749_1_, int p_149749_2_, int p_149749_3_, int p_149749_4_, Block p_149749_5_, + int p_149749_6_) { this.func_149925_e(p_149749_1_, p_149749_2_, p_149749_3_, p_149749_4_); super.breakBlock(p_149749_1_, p_149749_2_, p_149749_3_, p_149749_4_, p_149749_5_, p_149749_6_); } @@ -149,17 +137,17 @@ public class Machine_SuperJukebox extends BlockJukebox { * Drops the block items with a specified chance of dropping the specified items */ @Override - public void dropBlockAsItemWithChance( - World p_149690_1_, - int p_149690_2_, - int p_149690_3_, - int p_149690_4_, - int p_149690_5_, - float p_149690_6_, - int p_149690_7_) { + public void dropBlockAsItemWithChance(World p_149690_1_, int p_149690_2_, int p_149690_3_, int p_149690_4_, + int p_149690_5_, float p_149690_6_, int p_149690_7_) { if (!p_149690_1_.isRemote) { super.dropBlockAsItemWithChance( - p_149690_1_, p_149690_2_, p_149690_3_, p_149690_4_, p_149690_5_, p_149690_6_, 0); + p_149690_1_, + p_149690_2_, + p_149690_3_, + p_149690_4_, + p_149690_5_, + p_149690_6_, + 0); } } @@ -230,8 +218,7 @@ public class Machine_SuperJukebox extends BlockJukebox { if (this.getCurrentRecord() != null) { aNBT.setTag("RecordItem", this.func_145856_a().writeToNBT(new NBTTagCompound())); - aNBT.setInteger( - "Record", Item.getIdFromItem(this.func_145856_a().getItem())); + aNBT.setInteger("Record", Item.getIdFromItem(this.func_145856_a().getItem())); } final NBTTagCompound chestData = new NBTTagCompound(); @@ -254,8 +241,7 @@ public class Machine_SuperJukebox extends BlockJukebox { } /** - * Called to get the internal stack, wraps vanilla function - * {@link func_145856_a}. + * Called to get the internal stack, wraps vanilla function {@link func_145856_a}. */ public ItemStack getCurrentRecord() { return func_145856_a(); @@ -271,8 +257,7 @@ public class Machine_SuperJukebox extends BlockJukebox { } /** - * Called to set the internal stack, wraps vanilla function - * {@link func_145857_a}. + * Called to set the internal stack, wraps vanilla function {@link func_145857_a}. */ public void setCurrentRecord(ItemStack aStack) { func_145857_a(aStack); @@ -342,7 +327,14 @@ public class Machine_SuperJukebox extends BlockJukebox { } GT_Utility.moveStackFromSlotAToSlotB( - aThisInv, aThisInv, aSlotCounter, 20, (byte) 1, (byte) 1, (byte) 1, (byte) 1); + aThisInv, + aThisInv, + aSlotCounter, + 20, + (byte) 1, + (byte) 1, + (byte) 1, + (byte) 1); setCurrentRecord(aThisInv.getStackInSlot(20)); World aWorld = this.worldObj; @@ -404,7 +396,14 @@ public class Machine_SuperJukebox extends BlockJukebox { if (g == null && aSlotCounter >= 0) { IInventory aThisInv = this.getInventory(); GT_Utility.moveStackFromSlotAToSlotB( - aThisInv, aThisInv, 20, i, (byte) 1, (byte) 1, (byte) 1, (byte) 1); + aThisInv, + aThisInv, + 20, + i, + (byte) 1, + (byte) 1, + (byte) 1, + (byte) 1); vanillaStopJukebox(); Logger.INFO("b++"); this.markDirty(); @@ -412,17 +411,12 @@ public class Machine_SuperJukebox extends BlockJukebox { } } - /*for (ItemStack g : this.getInventory().getInventory()) { - if (g == null && aSlotCounter >= 0) { - IInventory aThisInv = this.getInventory(); - GT_Utility.moveStackFromSlotAToSlotB(aThisInv, aThisInv, 20, aSlotCounter, (byte) 1, (byte) 1, (byte) 1, (byte) 1); - vanillaStopJukebox(); - Logger.INFO("b++"); - return true; - - } - aSlotCounter--; - } */ + /* + * for (ItemStack g : this.getInventory().getInventory()) { if (g == null && aSlotCounter >= 0) { IInventory + * aThisInv = this.getInventory(); GT_Utility.moveStackFromSlotAToSlotB(aThisInv, aThisInv, 20, + * aSlotCounter, (byte) 1, (byte) 1, (byte) 1, (byte) 1); vanillaStopJukebox(); Logger.INFO("b++"); return + * true; } aSlotCounter--; } + */ this.markDirty(); return false; } @@ -482,8 +476,8 @@ public class Machine_SuperJukebox extends BlockJukebox { if (!this.worldObj.isRemote) { this.numPlayersUsing++; } - this.worldObj.addBlockEvent( - this.xCoord, this.yCoord, this.zCoord, this.getBlockType(), 1, this.numPlayersUsing); + this.worldObj + .addBlockEvent(this.xCoord, this.yCoord, this.zCoord, this.getBlockType(), 1, this.numPlayersUsing); this.worldObj.notifyBlocksOfNeighborChange(this.xCoord, this.yCoord, this.zCoord, this.getBlockType()); this.worldObj.notifyBlocksOfNeighborChange(this.xCoord, this.yCoord - 1, this.zCoord, this.getBlockType()); this.getInventory().openInventory(); @@ -494,8 +488,8 @@ public class Machine_SuperJukebox extends BlockJukebox { if (!this.worldObj.isRemote) { this.numPlayersUsing--; } - this.worldObj.addBlockEvent( - this.xCoord, this.yCoord, this.zCoord, this.getBlockType(), 1, this.numPlayersUsing); + this.worldObj + .addBlockEvent(this.xCoord, this.yCoord, this.zCoord, this.getBlockType(), 1, this.numPlayersUsing); this.worldObj.notifyBlocksOfNeighborChange(this.xCoord, this.yCoord, this.zCoord, this.getBlockType()); this.worldObj.notifyBlocksOfNeighborChange(this.xCoord, this.yCoord - 1, this.zCoord, this.getBlockType()); this.getInventory().closeInventory(); @@ -509,8 +503,8 @@ public class Machine_SuperJukebox extends BlockJukebox { return this.getInventory().isItemValidForSlot(slot, itemstack); } - private static final int[] SIDED_SLOTS = - new int[] {0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17}; + private static final int[] SIDED_SLOTS = new int[] { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, + 17 }; @Override public int[] getAccessibleSlotsFromSide(final int p_94128_1_) { diff --git a/src/main/java/gtPlusPlus/core/block/machine/Machine_TradeTable.java b/src/main/java/gtPlusPlus/core/block/machine/Machine_TradeTable.java index 96102017a3..3897c005f9 100644 --- a/src/main/java/gtPlusPlus/core/block/machine/Machine_TradeTable.java +++ b/src/main/java/gtPlusPlus/core/block/machine/Machine_TradeTable.java @@ -1,13 +1,5 @@ package gtPlusPlus.core.block.machine; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; -import gtPlusPlus.GTplusplus; -import gtPlusPlus.api.interfaces.ITileTooltip; -import gtPlusPlus.api.objects.Logger; -import gtPlusPlus.core.block.base.BlockBaseNBT; -import gtPlusPlus.core.lib.CORE; -import gtPlusPlus.core.tileentities.machines.TileEntityTradeTable; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.EnumCreatureType; @@ -17,7 +9,17 @@ 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.GTplusplus; +import gtPlusPlus.api.interfaces.ITileTooltip; +import gtPlusPlus.api.objects.Logger; +import gtPlusPlus.core.block.base.BlockBaseNBT; +import gtPlusPlus.core.lib.CORE; +import gtPlusPlus.core.tileentities.machines.TileEntityTradeTable; + public class Machine_TradeTable extends BlockBaseNBT implements ITileTooltip { + @SideOnly(Side.CLIENT) private IIcon textureTop; @@ -54,16 +56,8 @@ public class Machine_TradeTable extends BlockBaseNBT implements ITileTooltip { * Called upon block activation (right click on the block.) */ @Override - public boolean onBlockActivated( - final World world, - final int x, - final int y, - final int z, - final EntityPlayer player, - final int side, - final float lx, - final float ly, - final float lz) { + public boolean onBlockActivated(final World world, final int x, final int y, final int z, final EntityPlayer player, + final int side, final float lx, final float ly, final float lz) { if (world.isRemote) { return true; } @@ -85,8 +79,8 @@ public class Machine_TradeTable extends BlockBaseNBT implements ITileTooltip { } @Override - public boolean canCreatureSpawn( - final EnumCreatureType type, final IBlockAccess world, final int x, final int y, final int z) { + public boolean canCreatureSpawn(final EnumCreatureType type, final IBlockAccess world, final int x, final int y, + final int z) { return false; } } diff --git a/src/main/java/gtPlusPlus/core/block/machine/VolumetricFlaskSetter.java b/src/main/java/gtPlusPlus/core/block/machine/VolumetricFlaskSetter.java index f4c4d4e17f..a25dd12e83 100644 --- a/src/main/java/gtPlusPlus/core/block/machine/VolumetricFlaskSetter.java +++ b/src/main/java/gtPlusPlus/core/block/machine/VolumetricFlaskSetter.java @@ -1,16 +1,5 @@ package gtPlusPlus.core.block.machine; -import cpw.mods.fml.common.registry.LanguageRegistry; -import gregtech.common.items.GT_MetaGenerated_Tool_01; -import gtPlusPlus.GTplusplus; -import gtPlusPlus.api.objects.minecraft.CubicObject; -import gtPlusPlus.core.block.base.BasicTileBlockWithTooltip; -import gtPlusPlus.core.creative.AddToCreativeTab; -import gtPlusPlus.core.handler.GuiHandler; -import gtPlusPlus.core.item.base.itemblock.ItemBlockBasicTile; -import gtPlusPlus.core.lib.CORE; -import gtPlusPlus.core.tileentities.general.TileEntityVolumetricFlaskSetter; -import gtPlusPlus.core.util.minecraft.PlayerUtils; import net.minecraft.block.material.Material; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.EntityLivingBase; @@ -23,6 +12,18 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; +import cpw.mods.fml.common.registry.LanguageRegistry; +import gregtech.common.items.GT_MetaGenerated_Tool_01; +import gtPlusPlus.GTplusplus; +import gtPlusPlus.api.objects.minecraft.CubicObject; +import gtPlusPlus.core.block.base.BasicTileBlockWithTooltip; +import gtPlusPlus.core.creative.AddToCreativeTab; +import gtPlusPlus.core.handler.GuiHandler; +import gtPlusPlus.core.item.base.itemblock.ItemBlockBasicTile; +import gtPlusPlus.core.lib.CORE; +import gtPlusPlus.core.tileentities.general.TileEntityVolumetricFlaskSetter; +import gtPlusPlus.core.util.minecraft.PlayerUtils; + public class VolumetricFlaskSetter extends BasicTileBlockWithTooltip { /** @@ -50,16 +51,8 @@ public class VolumetricFlaskSetter extends BasicTileBlockWithTooltip { * Called upon block activation (right click on the block.) */ @Override - public boolean onBlockActivated( - final World world, - final int x, - final int y, - final int z, - final EntityPlayer player, - final int side, - final float lx, - final float ly, - final float lz) { + public boolean onBlockActivated(final World world, final int x, final int y, final int z, final EntityPlayer player, + final int side, final float lx, final float ly, final float lz) { if (world.isRemote) { return true; } else { @@ -71,14 +64,13 @@ public class VolumetricFlaskSetter extends BasicTileBlockWithTooltip { final Item mHandItem = mHandStack.getItem(); if (((mHandItem instanceof GT_MetaGenerated_Tool_01) && ((mHandItem.getDamage(mHandStack) == 22) || (mHandItem.getDamage(mHandStack) == 150)))) { - final TileEntityVolumetricFlaskSetter tile = - (TileEntityVolumetricFlaskSetter) world.getTileEntity(x, y, z); + final TileEntityVolumetricFlaskSetter tile = (TileEntityVolumetricFlaskSetter) world + .getTileEntity(x, y, z); if (tile != null) { mDidScrewDriver = tile.onScrewdriverRightClick((byte) side, player, x, y, z); } } - } catch (final Throwable t) { - } + } catch (final Throwable t) {} if (!mDidScrewDriver) { final TileEntity te = world.getTileEntity(x, y, z); @@ -111,12 +103,7 @@ public class VolumetricFlaskSetter extends BasicTileBlockWithTooltip { } @Override - public void onBlockPlacedBy( - final World world, - final int x, - final int y, - final int z, - final EntityLivingBase entity, + public void onBlockPlacedBy(final World world, final int x, final int y, final int z, final EntityLivingBase entity, final ItemStack stack) { if (stack.hasDisplayName()) { ((TileEntityVolumetricFlaskSetter) world.getTileEntity(x, y, z)).setCustomName(stack.getDisplayName()); @@ -124,8 +111,8 @@ public class VolumetricFlaskSetter extends BasicTileBlockWithTooltip { } @Override - public boolean canCreatureSpawn( - final EnumCreatureType type, final IBlockAccess world, final int x, final int y, final int z) { + public boolean canCreatureSpawn(final EnumCreatureType type, final IBlockAccess world, final int x, final int y, + final int z) { return false; } @@ -161,15 +148,13 @@ public class VolumetricFlaskSetter extends BasicTileBlockWithTooltip { @Override public CubicObject<String>[] getCustomTextureDirectoryObject() { - String[] aTexData = new String[] { - CORE.MODID + ":" + "metro/" + "TEXTURE_METAL_PANEL_A", - CORE.MODID + ":" + "metro/" + "TEXTURE_TECH_PANEL_C", - CORE.MODID + ":" + "metro/" + "TEXTURE_METAL_PANEL_H", - CORE.MODID + ":" + "metro/" + "TEXTURE_METAL_PANEL_H", - CORE.MODID + ":" + "metro/" + "TEXTURE_METAL_PANEL_H", - CORE.MODID + ":" + "metro/" + "TEXTURE_METAL_PANEL_H" - }; - CubicObject<String>[] aTextureData = new CubicObject[] {new CubicObject<String>(aTexData)}; + String[] aTexData = new String[] { CORE.MODID + ":" + "metro/" + "TEXTURE_METAL_PANEL_A", + CORE.MODID + ":" + "metro/" + "TEXTURE_TECH_PANEL_C", + CORE.MODID + ":" + "metro/" + "TEXTURE_METAL_PANEL_H", + CORE.MODID + ":" + "metro/" + "TEXTURE_METAL_PANEL_H", + CORE.MODID + ":" + "metro/" + "TEXTURE_METAL_PANEL_H", + CORE.MODID + ":" + "metro/" + "TEXTURE_METAL_PANEL_H" }; + CubicObject<String>[] aTextureData = new CubicObject[] { new CubicObject<String>(aTexData) }; return aTextureData; } } diff --git a/src/main/java/gtPlusPlus/core/block/machine/bedrock/Mining_Head_Fake.java b/src/main/java/gtPlusPlus/core/block/machine/bedrock/Mining_Head_Fake.java index 00a5b97e2c..6bd84b13f7 100644 --- a/src/main/java/gtPlusPlus/core/block/machine/bedrock/Mining_Head_Fake.java +++ b/src/main/java/gtPlusPlus/core/block/machine/bedrock/Mining_Head_Fake.java @@ -1,15 +1,7 @@ package gtPlusPlus.core.block.machine.bedrock; -import cpw.mods.fml.common.registry.GameRegistry; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; -import gtPlusPlus.api.objects.minecraft.BlockPos; -import gtPlusPlus.core.creative.AddToCreativeTab; -import gtPlusPlus.core.lib.CORE; -import gtPlusPlus.core.util.Utils; -import gtPlusPlus.core.util.math.MathUtils; -import gtPlusPlus.core.util.minecraft.EntityUtils; import java.util.Random; + import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; @@ -21,6 +13,16 @@ import net.minecraft.world.Explosion; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; +import cpw.mods.fml.common.registry.GameRegistry; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import gtPlusPlus.api.objects.minecraft.BlockPos; +import gtPlusPlus.core.creative.AddToCreativeTab; +import gtPlusPlus.core.lib.CORE; +import gtPlusPlus.core.util.Utils; +import gtPlusPlus.core.util.math.MathUtils; +import gtPlusPlus.core.util.minecraft.EntityUtils; + public class Mining_Head_Fake extends Block { public Mining_Head_Fake() { @@ -63,12 +65,8 @@ public class Mining_Head_Fake extends Block { } @Override - public void onBlockDestroyedByExplosion( - final World p_149723_1_, - final int p_149723_2_, - final int p_149723_3_, - final int p_149723_4_, - final Explosion p_149723_5_) {} + public void onBlockDestroyedByExplosion(final World p_149723_1_, final int p_149723_2_, final int p_149723_3_, + final int p_149723_4_, final Explosion p_149723_5_) {} @Override public boolean canDropFromExplosion(final Explosion p_149659_1_) { @@ -76,8 +74,8 @@ public class Mining_Head_Fake extends Block { } @Override - public boolean canEntityDestroy( - final IBlockAccess world, final int x, final int y, final int z, final Entity entity) { + public boolean canEntityDestroy(final IBlockAccess world, final int x, final int y, final int z, + final Entity entity) { return false; } @@ -95,8 +93,8 @@ public class Mining_Head_Fake extends Block { } @Override - public boolean canCreatureSpawn( - final EnumCreatureType type, final IBlockAccess world, final int x, final int y, final int z) { + public boolean canCreatureSpawn(final EnumCreatureType type, final IBlockAccess world, final int x, final int y, + final int z) { return false; } @@ -112,8 +110,8 @@ public class Mining_Head_Fake extends Block { } @Override - public void onEntityCollidedWithBlock( - World p_149670_1_, int p_149670_2_, int p_149670_3_, int p_149670_4_, Entity ent) { + public void onEntityCollidedWithBlock(World p_149670_1_, int p_149670_2_, int p_149670_3_, int p_149670_4_, + Entity ent) { EntityUtils.doDamage(ent, DamageSource.outOfWorld, 20); EntityUtils.setEntityOnFire(ent, 100); super.onEntityCollidedWithBlock(p_149670_1_, p_149670_2_, p_149670_3_, p_149670_4_, ent); diff --git a/src/main/java/gtPlusPlus/core/block/machine/bedrock/Mining_Pipe_Fake.java b/src/main/java/gtPlusPlus/core/block/machine/bedrock/Mining_Pipe_Fake.java index 0da1650edf..a0ca4978c0 100644 --- a/src/main/java/gtPlusPlus/core/block/machine/bedrock/Mining_Pipe_Fake.java +++ b/src/main/java/gtPlusPlus/core/block/machine/bedrock/Mining_Pipe_Fake.java @@ -1,15 +1,7 @@ package gtPlusPlus.core.block.machine.bedrock; -import cpw.mods.fml.common.registry.GameRegistry; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; -import gtPlusPlus.api.objects.minecraft.BlockPos; -import gtPlusPlus.core.creative.AddToCreativeTab; -import gtPlusPlus.core.lib.CORE; -import gtPlusPlus.core.util.Utils; -import gtPlusPlus.core.util.math.MathUtils; -import gtPlusPlus.core.util.minecraft.EntityUtils; import java.util.Random; + import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; @@ -21,6 +13,16 @@ import net.minecraft.world.Explosion; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; +import cpw.mods.fml.common.registry.GameRegistry; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import gtPlusPlus.api.objects.minecraft.BlockPos; +import gtPlusPlus.core.creative.AddToCreativeTab; +import gtPlusPlus.core.lib.CORE; +import gtPlusPlus.core.util.Utils; +import gtPlusPlus.core.util.math.MathUtils; +import gtPlusPlus.core.util.minecraft.EntityUtils; + public class Mining_Pipe_Fake extends Block { public Mining_Pipe_Fake() { @@ -63,12 +65,8 @@ public class Mining_Pipe_Fake extends Block { } @Override - public void onBlockDestroyedByExplosion( - final World p_149723_1_, - final int p_149723_2_, - final int p_149723_3_, - final int p_149723_4_, - final Explosion p_149723_5_) {} + public void onBlockDestroyedByExplosion(final World p_149723_1_, final int p_149723_2_, final int p_149723_3_, + final int p_149723_4_, final Explosion p_149723_5_) {} @Override public boolean canDropFromExplosion(final Explosion p_149659_1_) { @@ -76,8 +74,8 @@ public class Mining_Pipe_Fake extends Block { } @Override - public boolean canEntityDestroy( - final IBlockAccess world, final int x, final int y, final int z, final Entity entity) { + public boolean canEntityDestroy(final IBlockAccess world, final int x, final int y, final int z, + final Entity entity) { return false; } @@ -95,8 +93,8 @@ public class Mining_Pipe_Fake extends Block { } @Override - public boolean canCreatureSpawn( - final EnumCreatureType type, final IBlockAccess world, final int x, final int y, final int z) { + public boolean canCreatureSpawn(final EnumCreatureType type, final IBlockAccess world, final int x, final int y, + final int z) { return false; } @@ -112,8 +110,8 @@ public class Mining_Pipe_Fake extends Block { } @Override - public void onEntityCollidedWithBlock( - World p_149670_1_, int p_149670_2_, int p_149670_3_, int p_149670_4_, Entity ent) { + public void onEntityCollidedWithBlock(World p_149670_1_, int p_149670_2_, int p_149670_3_, int p_149670_4_, + Entity ent) { if (MathUtils.randInt(0, 100) < 5) { EntityUtils.doDamage(ent, DamageSource.outOfWorld, 1); } |