From 55f64675b42ac8d3c557cc850f78664bee006f6f Mon Sep 17 00:00:00 2001 From: Jason Mitchell Date: Sat, 28 Jan 2023 19:32:44 -0800 Subject: [ci skip] spotlessApply with the new settings --- src/main/java/gtPlusPlus/core/block/ModBlocks.java | 16 +- .../gtPlusPlus/core/block/base/AdvancedBlock.java | 33 +-- .../gtPlusPlus/core/block/base/BasicBlock.java | 12 +- .../core/block/base/BasicTileBlockWithTooltip.java | 75 ++++--- .../gtPlusPlus/core/block/base/BlockBaseFluid.java | 39 ++-- .../core/block/base/BlockBaseModular.java | 64 +++--- .../gtPlusPlus/core/block/base/BlockBaseNBT.java | 34 +-- .../gtPlusPlus/core/block/base/BlockBaseOre.java | 83 +++---- .../java/gtPlusPlus/core/block/base/MetaBlock.java | 5 +- .../core/block/base/MultiTextureBlock.java | 5 +- .../block/general/BlockCompressedObsidian.java | 18 +- .../gtPlusPlus/core/block/general/BlockNet.java | 10 +- .../core/block/general/BlockSuperLight.java | 43 ++-- .../core/block/general/BlockTankXpConverter.java | 110 +++------- .../gtPlusPlus/core/block/general/FirePit.java | 51 ++--- .../core/block/general/FluidTankInfinite.java | 41 ++-- .../gtPlusPlus/core/block/general/HellFire.java | 239 +++++++++------------ .../gtPlusPlus/core/block/general/LightGlass.java | 26 +-- .../core/block/general/MiningExplosives.java | 87 ++++---- .../gtPlusPlus/core/block/general/PlayerDoors.java | 82 +++---- .../block/general/antigrief/BlockWitherProof.java | 67 +++--- .../core/block/general/antigrief/TowerDevice.java | 54 ++--- .../block/general/fluids/BlockFluidSludge.java | 13 +- .../general/redstone/BlockGenericRedstone.java | 99 ++++----- .../redstone/BlockGenericRedstoneDetector.java | 27 ++- .../redstone/BlockGenericRedstoneEmitter.java | 3 +- .../general/redstone/BlockGenericRedstoneTest.java | 33 +-- .../core/block/machine/BlockGtFrameBox.java | 23 +- .../core/block/machine/CircuitProgrammer.java | 63 +++--- .../core/block/machine/DecayablesChest.java | 82 +++---- .../java/gtPlusPlus/core/block/machine/EggBox.java | 76 +++---- .../gtPlusPlus/core/block/machine/FishTrap.java | 79 +++---- .../core/block/machine/HeliumGenerator.java | 34 ++- .../block/machine/Machine_ModularityTable.java | 42 ++-- .../core/block/machine/Machine_PestKiller.java | 61 +++--- .../core/block/machine/Machine_PooCollector.java | 79 +++---- .../core/block/machine/Machine_ProjectTable.java | 44 ++-- .../core/block/machine/Machine_RoundRobinator.java | 48 ++--- .../core/block/machine/Machine_SuperJukebox.java | 144 ++++++------- .../core/block/machine/Machine_TradeTable.java | 34 ++- .../core/block/machine/VolumetricFlaskSetter.java | 69 +++--- .../block/machine/bedrock/Mining_Head_Fake.java | 40 ++-- .../block/machine/bedrock/Mining_Pipe_Fake.java | 40 ++-- 43 files changed, 1022 insertions(+), 1305 deletions(-) (limited to 'src/main/java/gtPlusPlus/core/block') 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 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[] 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 aMetaBlob = new CubicObject( - 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 aMetaBlob2 = new CubicObject(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(); } 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 getDrops( - final World world, final int x, final int y, final int z, final int metadata, final int fortune) { + public ArrayList 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 aBlocksToUpdate = new AutoMap(); 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(