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())); + St |
