From 69ce418e29e22391f60cdd55815727762a78c33a Mon Sep 17 00:00:00 2001 From: Raven Szewczyk Date: Fri, 24 May 2024 19:04:17 +0100 Subject: Apply updated GT5u spotless configs --- .../gtPlusPlus/core/block/base/BasicBlock.java | 5 +- .../core/block/base/BasicTileBlockWithTooltip.java | 27 +- .../gtPlusPlus/core/block/base/BlockBaseFluid.java | 33 +- .../core/block/base/BlockBaseModular.java | 74 +- .../gtPlusPlus/core/block/base/BlockBaseOre.java | 42 +- .../block/general/BlockCompressedObsidian.java | 2 +- .../core/block/general/BlockSuperLight.java | 12 +- .../core/block/general/FluidTankInfinite.java | 26 +- .../gtPlusPlus/core/block/general/HellFire.java | 156 +- .../gtPlusPlus/core/block/general/LightGlass.java | 2 +- .../core/block/general/MiningExplosives.java | 57 +- .../block/general/antigrief/BlockWitherProof.java | 20 +- .../block/general/fluids/BlockFluidSludge.java | 10 +- .../core/block/machine/CircuitProgrammer.java | 18 +- .../core/block/machine/DecayablesChest.java | 10 +- .../gtPlusPlus/core/block/machine/FishTrap.java | 12 +- .../core/block/machine/Machine_PestKiller.java | 12 +- .../core/block/machine/Machine_PooCollector.java | 14 +- .../core/block/machine/Machine_ProjectTable.java | 8 +- .../core/block/machine/Machine_SuperJukebox.java | 108 +- .../core/block/machine/VolumetricFlaskSetter.java | 20 +- .../gtPlusPlus/core/client/CustomTextureSet.java | 4 +- .../core/client/model/ModelSickBlaze.java | 4 +- .../core/client/model/ModelStaballoyConstruct.java | 30 +- .../client/renderer/CustomItemBlockRenderer.java | 4 +- .../client/renderer/CustomOreBlockRenderer.java | 1149 +++--- .../core/client/renderer/RenderDecayChest.java | 18 +- .../renderer/RenderMiningExplosivesPrimed.java | 16 +- .../core/client/renderer/RenderSickBlaze.java | 10 +- .../client/renderer/RenderStaballoyConstruct.java | 56 +- .../core/client/renderer/RenderToxinball.java | 4 +- .../renderer/particle/EntityDropParticleFX.java | 32 +- .../commands/CommandEnableDebugWhileRunning.java | 229 +- .../java/gtPlusPlus/core/commands/CommandMath.java | 13 +- .../java/gtPlusPlus/core/common/CommonProxy.java | 27 +- .../gtPlusPlus/core/common/compat/COMPAT_IC2.java | 40 +- .../core/common/compat/COMPAT_Thaumcraft.java | 17 +- .../core/common/compat/COMPAT_Witchery.java | 6 +- .../java/gtPlusPlus/core/config/ConfigHandler.java | 849 ++--- .../container/Container_CircuitProgrammer.java | 4 +- .../core/container/Container_DecayablesChest.java | 2 +- .../core/container/Container_FishTrap.java | 2 +- .../core/container/Container_PestKiller.java | 5 +- .../core/container/Container_ProjectTable.java | 11 +- .../core/container/Container_SuperJukebox.java | 6 +- .../container/Container_VolumetricFlaskSetter.java | 2 +- .../core/entity/EntityPrimedMiningExplosive.java | 422 +-- .../core/entity/InternalEntityRegistry.java | 70 +- .../core/entity/monster/EntitySickBlaze.java | 42 +- .../entity/monster/EntityStaballoyConstruct.java | 278 +- .../entity/projectile/EntityLightningAttack.java | 27 +- .../core/entity/projectile/EntityToxinball.java | 46 +- .../entity/projectile/EntityToxinballSmall.java | 2 +- .../core/fluids/FluidRegistryHandler.java | 6 +- .../gtPlusPlus/core/gui/beta/Gui_ID_Registry.java | 4 +- .../core/gui/machine/GUI_CircuitProgrammer.java | 4 +- .../core/gui/machine/GUI_DecayablesChest.java | 4 +- .../gtPlusPlus/core/gui/machine/GUI_FishTrap.java | 4 +- .../core/gui/machine/GUI_PestKiller.java | 34 +- .../core/gui/machine/GUI_ProjectTable.java | 4 +- .../core/gui/machine/GUI_SuperJukebox.java | 4 +- .../gui/machine/GUI_VolumetricFlaskSetter.java | 23 +- .../gtPlusPlus/core/gui/widget/GuiValueField.java | 32 +- .../core/handler/AchievementHandler.java | 304 +- .../java/gtPlusPlus/core/handler/BookHandler.java | 749 ++-- .../core/handler/BurnableFuelHandler.java | 4 +- .../gtPlusPlus/core/handler/COMPAT_HANDLER.java | 12 +- .../java/gtPlusPlus/core/handler/GuiHandler.java | 38 +- .../gtPlusPlus/core/handler/PacketHandler.java | 6 +- .../core/handler/Recipes/DecayableRecipe.java | 2 +- .../core/handler/events/CustomMovementHandler.java | 17 +- .../handler/events/EnderDragonDeathHandler.java | 8 +- .../core/handler/events/EntityDeathHandler.java | 23 +- .../handler/events/PlayerSleepEventHandler.java | 10 +- .../core/handler/events/SneakManager.java | 4 +- .../workbench/Workbench_CraftingHandler.java | 15 +- src/main/java/gtPlusPlus/core/item/ModItems.java | 379 +- .../core/item/base/BaseItemBurnable.java | 2 +- .../core/item/base/BaseItemColourable.java | 14 +- .../core/item/base/BaseItemComponent.java | 120 +- .../core/item/base/BaseItemDamageable.java | 18 +- .../gtPlusPlus/core/item/base/BaseItemTCShard.java | 6 +- .../core/item/base/BaseItemTickable.java | 26 +- .../gtPlusPlus/core/item/base/BasicSpawnEgg.java | 18 +- .../java/gtPlusPlus/core/item/base/CoreItem.java | 106 +- .../core/item/base/cell/BaseItemCell.java | 6 +- .../core/item/base/cell/BaseItemPlasmaCell.java | 2 +- .../core/item/base/dusts/BaseItemDust.java | 2 +- .../core/item/base/dusts/BaseItemDustUnique.java | 38 +- .../core/item/base/ingots/BaseItemIngotHot.java | 15 +- .../core/item/base/ingots/BaseItemIngot_OLD.java | 21 +- .../core/item/base/itemblock/ItemBlockGtBlock.java | 15 +- .../core/item/base/itemblock/ItemBlockOre.java | 31 +- .../core/item/base/misc/BaseItemMisc.java | 13 +- .../core/item/base/misc/BaseItemParticle.java | 20 +- .../core/item/base/ore/BaseOreComponent.java | 35 +- .../core/item/base/plates/BaseItemPlate.java | 12 +- .../core/item/base/plates/BaseItemPlate_OLD.java | 9 +- .../gtPlusPlus/core/item/bauble/BaseBauble.java | 10 +- .../core/item/bauble/BatteryPackBaseBauble.java | 62 +- .../core/item/bauble/ElectricBaseBauble.java | 59 +- .../core/item/bauble/FireProtectionBauble.java | 4 +- .../core/item/chemistry/AgriculturalChem.java | 251 +- .../gtPlusPlus/core/item/chemistry/CoalTar.java | 291 +- .../core/item/chemistry/GenericChem.java | 824 ++--- .../core/item/chemistry/IonParticles.java | 24 +- .../core/item/chemistry/MilledOreProcessing.java | 700 ++-- .../core/item/chemistry/NuclearChem.java | 77 +- .../core/item/chemistry/RocketFuels.java | 525 +-- .../core/item/chemistry/StandardBaseParticles.java | 47 +- .../chemistry/general/ItemGenericChemBase.java | 32 +- .../item/circuit/GTPP_IntegratedCircuit_Item.java | 56 +- .../core/item/crafting/ItemDummyResearch.java | 12 +- .../core/item/food/BaseItemMetaFood.java | 211 +- .../gtPlusPlus/core/item/general/BufferCore.java | 18 +- .../core/item/general/ItemBlueprint.java | 46 +- .../core/item/general/ItemCloakingDevice.java | 30 +- .../core/item/general/ItemGenericToken.java | 44 +- .../core/item/general/ItemHalfCompleteCasings.java | 2 +- .../core/item/general/ItemHealingDevice.java | 124 +- .../core/item/general/ItemLavaFilter.java | 18 +- .../core/item/general/ItemMagicFeather.java | 35 +- .../core/item/general/books/ItemBaseBook.java | 19 +- .../item/general/chassis/ItemDehydratorCoil.java | 2 +- .../general/chassis/ItemDehydratorCoilWire.java | 2 +- .../item/general/spawn/ItemCustomSpawnEgg.java | 39 +- .../core/item/materials/DustDecayable.java | 2 +- .../core/item/tool/misc/GregtechPump.java | 212 +- .../core/item/wearable/armour/ArmourLoader.java | 2 +- .../wearable/armour/tinfoil/ArmourTinFoilHat.java | 16 +- .../core/item/wearable/base/BaseItemWearable.java | 4 +- .../item/wearable/hazmat/ItemArmorHazmatEx.java | 8 +- src/main/java/gtPlusPlus/core/lib/CORE.java | 13 +- src/main/java/gtPlusPlus/core/material/ALLOY.java | 1386 ++++--- .../java/gtPlusPlus/core/material/ELEMENT.java | 930 ++--- .../gtPlusPlus/core/material/MISC_MATERIALS.java | 955 +++-- .../java/gtPlusPlus/core/material/Material.java | 647 ++-- .../core/material/MaterialGenerator.java | 47 +- .../gtPlusPlus/core/material/MaterialStack.java | 5 +- .../java/gtPlusPlus/core/material/NONMATERIAL.java | 4 +- src/main/java/gtPlusPlus/core/material/ORES.java | 1238 +++---- .../java/gtPlusPlus/core/material/Particle.java | 8 +- .../core/material/nuclear/FLUORIDES.java | 351 +- .../gtPlusPlus/core/material/nuclear/NUCLIDE.java | 496 ++- .../network/packet/Packet_VolumetricFlaskGui.java | 2 +- .../network/packet/Packet_VolumetricFlaskGui2.java | 2 +- .../java/gtPlusPlus/core/proxy/ClientProxy.java | 10 +- .../gtPlusPlus/core/recipe/RECIPES_GREGTECH.java | 2221 ++++++------ .../gtPlusPlus/core/recipe/RECIPES_General.java | 460 +-- .../core/recipe/RECIPES_LaserEngraver.java | 106 +- .../gtPlusPlus/core/recipe/RECIPES_Machines.java | 3792 ++++++++++---------- .../core/recipe/RECIPES_RareEarthProcessing.java | 111 +- .../core/recipe/RECIPES_SeleniumProcessing.java | 163 +- .../gtPlusPlus/core/recipe/RECIPE_Batteries.java | 60 +- .../gtPlusPlus/core/recipe/ShapedRecipeObject.java | 24 +- .../java/gtPlusPlus/core/recipe/common/CI.java | 133 +- .../java/gtPlusPlus/core/slots/SlotCrafting.java | 20 +- .../core/slots/SlotCraftingNoCollect.java | 7 +- .../java/gtPlusPlus/core/slots/SlotDataStick.java | 2 +- .../core/slots/SlotIntegratedCircuit.java | 22 +- .../core/tileentities/base/TileEntityBase.java | 226 +- .../general/TileEntityCircuitProgrammer.java | 40 +- .../general/TileEntityDecayablesChest.java | 74 +- .../tileentities/general/TileEntityFishTrap.java | 44 +- .../general/TileEntityInfiniteFluid.java | 16 +- .../general/TileEntityVolumetricFlaskSetter.java | 59 +- .../machines/TileEntityAdvPooCollector.java | 13 +- .../machines/TileEntityBaseFluidCollector.java | 18 +- .../machines/TileEntityPestKiller.java | 90 +- .../machines/TileEntityProjectTable.java | 21 +- .../gtPlusPlus/core/util/MovingAverageLong.java | 12 +- src/main/java/gtPlusPlus/core/util/Utils.java | 112 +- src/main/java/gtPlusPlus/core/util/data/AES.java | 5 +- .../gtPlusPlus/core/util/data/LocaleUtils.java | 7 +- .../gtPlusPlus/core/util/data/StringUtils.java | 39 +- .../java/gtPlusPlus/core/util/math/MathUtils.java | 2 +- .../core/util/minecraft/EntityUtils.java | 89 +- .../gtPlusPlus/core/util/minecraft/FluidUtils.java | 363 +- .../core/util/minecraft/InventoryUtils.java | 18 +- .../gtPlusPlus/core/util/minecraft/ItemUtils.java | 243 +- .../core/util/minecraft/MaterialUtils.java | 94 +- .../core/util/minecraft/MiningUtils.java | 31 +- .../core/util/minecraft/PlayerUtils.java | 32 +- .../core/util/minecraft/RecipeUtils.java | 127 +- .../util/minecraft/gregtech/PollutionUtils.java | 4 +- .../core/util/recipe/GT_RecipeUtils.java | 31 +- .../core/util/recipe/RecipeHashStrat.java | 12 +- .../core/util/reflect/AddGregtechRecipe.java | 27 +- .../core/util/reflect/ReflectionUtils.java | 67 +- .../gtPlusPlus/core/util/sys/KeyboardUtils.java | 2 +- .../core/world/explosions/ExplosionHandler.java | 4 +- .../core/world/explosions/MiningExplosion.java | 380 +- 192 files changed, 13189 insertions(+), 12450 deletions(-) (limited to 'src/main/java/gtPlusPlus/core') diff --git a/src/main/java/gtPlusPlus/core/block/base/BasicBlock.java b/src/main/java/gtPlusPlus/core/block/base/BasicBlock.java index 006314b2db..d39c194dfd 100644 --- a/src/main/java/gtPlusPlus/core/block/base/BasicBlock.java +++ b/src/main/java/gtPlusPlus/core/block/base/BasicBlock.java @@ -18,7 +18,8 @@ public class BasicBlock extends BlockContainer { super(material); this.setBlockName(Utils.sanitizeString(unlocalizedName)); - if (type != BlockTypes.ORE && !unlocalizedName.toLowerCase().contains("ore")) { + if (type != BlockTypes.ORE && !unlocalizedName.toLowerCase() + .contains("ore")) { this.setBlockTextureName(GTPlusPlus.ID + ":" + unlocalizedName); } @@ -63,7 +64,7 @@ public class BasicBlock extends BlockContainer { @Override public boolean canCreatureSpawn(final EnumCreatureType type, final IBlockAccess world, final int x, final int y, - final int z) { + 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 d6119e5608..c39565ea41 100644 --- a/src/main/java/gtPlusPlus/core/block/base/BasicTileBlockWithTooltip.java +++ b/src/main/java/gtPlusPlus/core/block/base/BasicTileBlockWithTooltip.java @@ -147,7 +147,9 @@ public abstract class BasicTileBlockWithTooltip extends BlockContainer implement @Override @SideOnly(Side.CLIENT) public final IIcon getIcon(final int ordinalSide, final int aMeta) { - return mSidedTextureArray.get(aMeta).get(ForgeDirection.getOrientation(ordinalSide)).getIcon(); + return mSidedTextureArray.get(aMeta) + .get(ForgeDirection.getOrientation(ordinalSide)) + .getIcon(); } @Override @@ -171,8 +173,8 @@ public abstract class BasicTileBlockWithTooltip extends BlockContainer implement final String aPrefixTexPath = GTPlusPlus.ID + ":"; // Default Path Name, this will make us look in the subdirectory for this Tile Entity. final String aTexPathMid = "TileEntities" + CORE.SEPERATOR - + getTileEntityNameForTexturePathing() - + CORE.SEPERATOR; + + getTileEntityNameForTexturePathing() + + CORE.SEPERATOR; // Construct a full path String aTexPathBuilt = aPrefixTexPath + aTexPathMid; // File Name Suffixes, without meta tags @@ -223,12 +225,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); } @@ -273,7 +275,7 @@ public abstract class BasicTileBlockWithTooltip extends BlockContainer implement @Override public final void breakBlock(final World world, final int x, final int y, final int z, final Block block, - final int number) { + final int number) { onBlockBreak(); InventoryUtils.dropInventoryItems(world, x, y, z, block); super.breakBlock(world, x, y, z, block, number); @@ -293,7 +295,7 @@ 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) { + final int z) { return false; } @@ -307,7 +309,8 @@ public abstract class BasicTileBlockWithTooltip extends BlockContainer implement @Override public Item getItemDropped(int meta, Random rand, int p_149650_3_) { - return ItemUtils.getSimpleStack(this, 1).getItem(); + return ItemUtils.getSimpleStack(this, 1) + .getItem(); } @Override diff --git a/src/main/java/gtPlusPlus/core/block/base/BlockBaseFluid.java b/src/main/java/gtPlusPlus/core/block/base/BlockBaseFluid.java index 0f6f5947e8..6772b71262 100644 --- a/src/main/java/gtPlusPlus/core/block/base/BlockBaseFluid.java +++ b/src/main/java/gtPlusPlus/core/block/base/BlockBaseFluid.java @@ -78,22 +78,25 @@ public class BlockBaseFluid extends BlockFluidClassic { } if (arg4.nextInt(20) == 0 - && arg0.isSideSolid( - arg1, - arg2 + super.densityDir, - arg3, - super.densityDir == -1 ? ForgeDirection.UP : ForgeDirection.DOWN) - && !arg0.getBlock(arg1, arg2 + 2 * super.densityDir, arg3).getMaterial().blocksMovement()) { + && arg0.isSideSolid( + arg1, + arg2 + super.densityDir, + arg3, + super.densityDir == -1 ? ForgeDirection.UP : ForgeDirection.DOWN) + && !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); - FMLClientHandler.instance().getClient().effectRenderer.addEffect(arg11); + 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 81c14bb16c..b07c6d1529 100644 --- a/src/main/java/gtPlusPlus/core/block/base/BlockBaseModular.java +++ b/src/main/java/gtPlusPlus/core/block/base/BlockBaseModular.java @@ -48,12 +48,12 @@ public class BlockBaseModular extends BasicBlock { public BlockBaseModular(final Material material, final BlockTypes blockType, final int colour) { this( - material.getUnlocalizedName(), - material.getLocalizedName(), - net.minecraft.block.material.Material.iron, - blockType, - colour, - Math.min(Math.max(material.vTier, 1), 6)); + material.getUnlocalizedName(), + material.getLocalizedName(), + net.minecraft.block.material.Material.iron, + blockType, + colour, + Math.min(Math.max(material.vTier, 1), 6)); blockMaterial = material; registerComponent(); sBlockCache.put(material.getUnlocalizedName() + "." + blockType.name(), this); @@ -62,35 +62,38 @@ 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, - final int miningLevel) { + 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); this.setBlockTextureName(GTPlusPlus.ID + ":" + blockType.getTexture()); this.blockColour = colour; this.thisBlock = blockType; this.thisBlockMaterial = blockMaterialString; - this.thisBlockType = blockType.name().toUpperCase(); + this.thisBlockType = blockType.name() + .toUpperCase(); this.setBlockName(this.getUnlocalizedProperName()); int fx = getBlockTypeMeta(); 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)); + .registerOre("block" + unifyMaterialName(thisBlockMaterial), ItemUtils.getSimpleStack(this)); } else if (fx == 1) { GT_OreDictUnificator - .registerOre("frameGt" + unifyMaterialName(thisBlockMaterial), ItemUtils.getSimpleStack(this)); + .registerOre("frameGt" + unifyMaterialName(thisBlockMaterial), ItemUtils.getSimpleStack(this)); } else if (fx == 2) { GT_OreDictUnificator - .registerOre("frameGt" + unifyMaterialName(thisBlockMaterial), ItemUtils.getSimpleStack(this)); + .registerOre("frameGt" + unifyMaterialName(thisBlockMaterial), ItemUtils.getSimpleStack(this)); } } public static String unifyMaterialName(String rawMaterName) { - return rawMaterName.replace(" ", "").replace("-", "").replace("_", ""); + return rawMaterName.replace(" ", "") + .replace("-", "") + .replace("_", ""); } public void registerComponent() { @@ -107,7 +110,7 @@ public class BlockBaseModular extends BasicBlock { } int fx = getBlockTypeMeta(); String aKey = (fx == 0 ? OrePrefixes.block.name() - : (fx == 1 ? OrePrefixes.frameGt.name() : OrePrefixes.ore.name())); + : (fx == 1 ? OrePrefixes.frameGt.name() : OrePrefixes.ore.name())); ItemStack x = aMap.get(aKey); if (x == null) { aMap.put(aKey, ItemUtils.getSimpleStack(this)); @@ -120,13 +123,20 @@ public class BlockBaseModular extends BasicBlock { } public int getBlockTypeMeta() { - if (this.thisBlockType.equals(BlockTypes.STANDARD.name().toUpperCase())) { + if (this.thisBlockType.equals( + BlockTypes.STANDARD.name() + .toUpperCase())) { return 0; - } else if (this.thisBlockType.equals(BlockTypes.FRAME.name().toUpperCase())) { - return 1; - } else if (this.thisBlockType.equals(BlockTypes.ORE.name().toUpperCase())) { - return 2; - } + } else if (this.thisBlockType.equals( + BlockTypes.FRAME.name() + .toUpperCase())) { + return 1; + } else + if (this.thisBlockType.equals( + BlockTypes.ORE.name() + .toUpperCase())) { + return 2; + } return 0; } @@ -155,19 +165,25 @@ public class BlockBaseModular extends BasicBlock { } public String getUnlocalizedProperName() { - return getProperName().replace("%s", "%temp").replace("%material", this.thisBlockMaterial) - .replace("%temp", "%s"); + 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 @@ -183,7 +199,7 @@ public class BlockBaseModular extends BasicBlock { @SideOnly(Side.CLIENT) public void registerBlockIcons(final IIconRegister iIcon) { if (!CORE.ConfigSwitches.useGregtechTextures || this.blockMaterial == null - || this.thisBlock == BlockTypes.ORE) { + || this.thisBlock == BlockTypes.ORE) { this.blockIcon = iIcon.registerIcon(GTPlusPlus.ID + ":" + this.thisBlock.getTexture()); } String metType = "9j4852jyo3rjmh3owlhw9oe"; diff --git a/src/main/java/gtPlusPlus/core/block/base/BlockBaseOre.java b/src/main/java/gtPlusPlus/core/block/base/BlockBaseOre.java index 7d2b89d0b4..1813090810 100644 --- a/src/main/java/gtPlusPlus/core/block/base/BlockBaseOre.java +++ b/src/main/java/gtPlusPlus/core/block/base/BlockBaseOre.java @@ -42,10 +42,10 @@ public class BlockBaseOre extends BasicBlock implements ITexturedBlock { public BlockBaseOre(final Material material, final BlockTypes blockType) { super( - blockType, - Utils.sanitizeString(material.getUnlocalizedName()), - net.minecraft.block.material.Material.rock, - Math.min(Math.max(material.vTier, 1), 6)); + blockType, + Utils.sanitizeString(material.getUnlocalizedName()), + net.minecraft.block.material.Material.rock, + Math.min(Math.max(material.vTier, 1), 6)); int aMaterialTierForMining = Math.min(Math.max(material.vTier, 1), 6); this.blockMaterial = material; this.setHardness(1.0f * aMaterialTierForMining); @@ -57,12 +57,12 @@ public class BlockBaseOre extends BasicBlock implements ITexturedBlock { this.setBlockTextureName("stone"); try { GameRegistry.registerBlock( - this, - ItemBlockOre.class, - Utils.sanitizeString("ore" + Utils.sanitizeString(this.blockMaterial.getLocalizedName()))); + this, + ItemBlockOre.class, + Utils.sanitizeString("ore" + Utils.sanitizeString(this.blockMaterial.getLocalizedName()))); GT_OreDictUnificator.registerOre( - "ore" + Utils.sanitizeString(this.blockMaterial.getLocalizedName()), - ItemUtils.getSimpleStack(this)); + "ore" + Utils.sanitizeString(this.blockMaterial.getLocalizedName()), + ItemUtils.getSimpleStack(this)); } catch (Throwable t) { t.printStackTrace(); } @@ -70,7 +70,7 @@ 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) { + final int z) { return false; } @@ -116,8 +116,8 @@ public class BlockBaseOre extends BasicBlock implements ITexturedBlock { public ITexture[] getTexture(Block block, ForgeDirection side) { if (this.blockMaterial != null) { GTPP_RenderedTexture aIconSet = new GTPP_RenderedTexture( - blockMaterial.getTextureSet().mTextures[OrePrefixes.ore.mTextureIndex], - this.blockMaterial.getRGBA()); + blockMaterial.getTextureSet().mTextures[OrePrefixes.ore.mTextureIndex], + this.blockMaterial.getRGBA()); return new ITexture[] { new GTPP_CopiedBlockTexture(Blocks.stone, 0, 0), aIconSet }; } @@ -170,9 +170,9 @@ public class BlockBaseOre extends BasicBlock implements ITexturedBlock { switch (GT_Mod.gregtechproxy.oreDropSystem) { case Item -> { drops.add( - ItemUtils.getItemStackOfAmountFromOreDictNoBroken( - "oreRaw" + this.blockMaterial.getLocalizedName(), - 1)); + ItemUtils.getItemStackOfAmountFromOreDictNoBroken( + "oreRaw" + this.blockMaterial.getLocalizedName(), + 1)); } case FortuneItem -> { // if shouldFortune and isNatural then get fortune drops @@ -186,15 +186,15 @@ public class BlockBaseOre extends BasicBlock implements ITexturedBlock { long amount = (long) new Random().nextInt(fortune) + aMinAmount; for (int i = 0; i < amount; i++) { drops.add( - ItemUtils.getItemStackOfAmountFromOreDictNoBroken( - "oreRaw" + this.blockMaterial.getLocalizedName(), - 1)); + ItemUtils.getItemStackOfAmountFromOreDictNoBroken( + "oreRaw" + this.blockMaterial.getLocalizedName(), + 1)); } } else { drops.add( - ItemUtils.getItemStackOfAmountFromOreDictNoBroken( - "oreRaw" + this.blockMaterial.getLocalizedName(), - 1)); + ItemUtils.getItemStackOfAmountFromOreDictNoBroken( + "oreRaw" + this.blockMaterial.getLocalizedName(), + 1)); } } case UnifiedBlock -> { diff --git a/src/main/java/gtPlusPlus/core/block/general/BlockCompressedObsidian.java b/src/main/java/gtPlusPlus/core/block/general/BlockCompressedObsidian.java index d80c056d65..0c353cfbdd 100644 --- a/src/main/java/gtPlusPlus/core/block/general/BlockCompressedObsidian.java +++ b/src/main/java/gtPlusPlus/core/block/general/BlockCompressedObsidian.java @@ -90,7 +90,7 @@ 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) { + final int fortune) { int m = metadata; if (m == 5) { m = 1; diff --git a/src/main/java/gtPlusPlus/core/block/general/BlockSuperLight.java b/src/main/java/gtPlusPlus/core/block/general/BlockSuperLight.java index ceb9b5500b..dc6c92f065 100644 --- a/src/main/java/gtPlusPlus/core/block/general/BlockSuperLight.java +++ b/src/main/java/gtPlusPlus/core/block/general/BlockSuperLight.java @@ -116,7 +116,7 @@ public class BlockSuperLight extends BlockContainer { try { if (mLastUpdateTick == 0 || (System.currentTimeMillis() - mLastUpdateTick) >= 30000) { boolean powered = (this.worldObj - .isBlockIndirectlyGettingPowered(this.xCoord, this.yCoord, this.zCoord)); + .isBlockIndirectlyGettingPowered(this.xCoord, this.yCoord, this.zCoord)); boolean aLastState = mPowered; // Logger.INFO("Powered: "+powered); mPowered = powered; @@ -147,10 +147,10 @@ public class BlockSuperLight extends BlockContainer { Logger.INFO("Trying to relight area."); BlockPos aStartIterationPoint = new BlockPos( - this.xCoord - 24, - this.yCoord - 4, - this.zCoord - 24, - this.worldObj); + 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++) { @@ -171,7 +171,7 @@ public class BlockSuperLight extends BlockContainer { else if (enable && aLight == 0) { aBlocksToUpdate.put(new BlockPos(xOff, yOff, zOff, this.worldObj)); this.worldObj - .setBlock(xOff, yOff, zOff, ModBlocks.MatterFabricatorEffectBlock, 0, 3); + .setBlock(xOff, yOff, zOff, ModBlocks.MatterFabricatorEffectBlock, 0, 3); aLitCounter++; } // Turning Lights off diff --git a/src/main/java/gtPlusPlus/core/block/general/FluidTankInfinite.java b/src/main/java/gtPlusPlus/core/block/general/FluidTankInfinite.java index 0a09e902f7..41a581394b 100644 --- a/src/main/java/gtPlusPlus/core/block/general/FluidTankInfinite.java +++ b/src/main/java/gtPlusPlus/core/block/general/FluidTankInfinite.java @@ -48,8 +48,8 @@ public class FluidTankInfinite extends BlockContainer { @SideOnly(Side.CLIENT) public IIcon getIcon(final int ordinalSide, final int meta) { return ordinalSide == 1 ? this.textureTop - : (ordinalSide == 0 ? this.textureBottom - : ((ordinalSide != 2) && (ordinalSide != 4) ? this.blockIcon : this.textureFront)); + : (ordinalSide == 0 ? this.textureBottom + : ((ordinalSide != 2) && (ordinalSide != 4) ? this.blockIcon : this.textureFront)); } @Override @@ -58,9 +58,9 @@ public class FluidTankInfinite extends BlockContainer { this.blockIcon = p_149651_1_.registerIcon(GTPlusPlus.ID + ":" + "TileEntities/" + "Generic_Creative_Texture"); this.textureTop = p_149651_1_.registerIcon(GTPlusPlus.ID + ":" + "TileEntities/" + "Generic_Creative_Texture"); this.textureBottom = p_149651_1_ - .registerIcon(GTPlusPlus.ID + ":" + "TileEntities/" + "Generic_Creative_Texture"); + .registerIcon(GTPlusPlus.ID + ":" + "TileEntities/" + "Generic_Creative_Texture"); this.textureFront = p_149651_1_ - .registerIcon(GTPlusPlus.ID + ":" + "TileEntities/" + "Generic_Creative_Texture"); + .registerIcon(GTPlusPlus.ID + ":" + "TileEntities/" + "Generic_Creative_Texture"); } /** @@ -68,7 +68,7 @@ public class FluidTankInfinite extends BlockContainer { */ @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) { + final int side, final float lx, final float ly, final float lz) { if (world.isRemote) { return true; } else { @@ -76,13 +76,14 @@ public class FluidTankInfinite extends BlockContainer { if (tank != null) { Item handItem; try { - handItem = player.getHeldItem().getItem(); + handItem = player.getHeldItem() + .getItem(); } catch (Throwable t) { handItem = null; } if (handItem != null - && (handItem instanceof IFluidContainerItem || handItem instanceof ItemFluidContainer - || FluidContainerRegistry.isFilledContainer(player.getHeldItem()))) { + && (handItem instanceof IFluidContainerItem || handItem instanceof ItemFluidContainer + || FluidContainerRegistry.isFilledContainer(player.getHeldItem()))) { if (tank.tank.getFluid() == null) { try { if (!FluidContainerRegistry.isFilledContainer(player.getHeldItem())) { @@ -107,10 +108,11 @@ public class FluidTankInfinite extends BlockContainer { } if (tank.tank.getFluid() != null) { PlayerUtils.messagePlayer( - player, - "This tank contains " + tank.tank.getFluidAmount() - + "L of " - + tank.tank.getFluid().getLocalizedName()); + player, + "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 15a5c5ae17..4e8d94328d 100644 --- a/src/main/java/gtPlusPlus/core/block/general/HellFire.java +++ b/src/main/java/gtPlusPlus/core/block/general/HellFire.java @@ -96,18 +96,20 @@ public class HellFire extends BlockFire { random = new XSTR(); - if (world.getGameRules().getGameRuleBooleanValue("doFireTick")) { - final boolean flag = world.getBlock(x, y - 1, z).isFireSource(world, x, y - 1, z, UP); + if (world.getGameRules() + .getGameRuleBooleanValue("doFireTick")) { + final boolean flag = world.getBlock(x, y - 1, z) + .isFireSource(world, x, y - 1, z, UP); if (!this.canPlaceBlockAt(world, x, y, z)) { world.setBlockToAir(x, 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))) { + && (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))) { if (MathUtils.randInt(0, 100) >= 90) { world.setBlockToAir(x, y, z); @@ -126,81 +128,79 @@ public class HellFire extends BlockFire { world.setBlockToAir(x, y, z); } } 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; - - if (flag1) { - b0 = -50; - } + && (blockMeta == 15) + && (random.nextInt(4) == 0)) { + world.setBlockToAir(x, y, z); + } else { + final boolean flag1 = world.isBlockHighHumidity(x, y, z); + byte b0 = 0; - 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; - } + if (flag1) { + b0 = -50; + } - final int neighbourFireChance = this - .getChanceOfNeighborsEncouragingFire(world, i1, k1, j1); + 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; + } - if (neighbourFireChance > 0) { - int j2 = (neighbourFireChance + 40 - + (world.difficultySetting.getDifficultyId() * 14)) - / (blockMeta + 30); + final int neighbourFireChance = this + .getChanceOfNeighborsEncouragingFire(world, i1, k1, j1); - if (flag1) { - j2 /= 2; - } + if (neighbourFireChance > 0) { + int j2 = (neighbourFireChance + 40 + + (world.difficultySetting.getDifficultyId() * 14)) / (blockMeta + 30); - 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 (flag1) { + j2 /= 2; + } - if (k2 > 15) { - k2 = 15; - } + 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); - world.setBlock(i1, k1, j1, this, k2, 3); + if (k2 > 15) { + k2 = 15; } + + 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) { + 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); + .getFlammability(world, p_149841_2_, p_149841_3_, p_149841_4_, face); if (p_149841_6_.nextInt(p_149841_5_) < j1) { final boolean flag = world.getBlock(p_149841_2_, p_149841_3_, p_149841_4_) == Blocks.tnt; if ((p_149841_6_.nextInt(p_149841_7_ + 10) < 5) - && !world.canLightningStrikeAt(p_149841_2_, p_149841_3_, p_149841_4_)) { + && !world.canLightningStrikeAt(p_149841_2_, p_149841_3_, p_149841_4_)) { int k1 = p_149841_7_ + (p_149841_6_.nextInt(5) / 4); if (k1 > 15) { @@ -223,10 +223,10 @@ public class HellFire extends BlockFire { */ 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) - || this.canCatchFire(world, x, y - 1, z, UP) - || this.canCatchFire(world, x, y + 1, z, DOWN) - || this.canCatchFire(world, x, y, z - 1, SOUTH) - || this.canCatchFire(world, x, y, z + 1, NORTH); + || this.canCatchFire(world, x, y - 1, z, UP) + || this.canCatchFire(world, x, y + 1, z, DOWN) + || this.canCatchFire(world, x, y, z - 1, SOUTH) + || this.canCatchFire(world, x, y, z + 1, NORTH); } /** @@ -263,7 +263,7 @@ public class HellFire extends BlockFire { */ @Override public void onNeighborBlockChange(final World worldObj, final int x, final int y, final int z, - final Block blockObj) { + final Block blockObj) { if (!World.doesBlockHaveSolidTopSurface(worldObj, x, y - 1, z) && !this.canNeighborBurn(worldObj, x, y, z)) { worldObj.setBlockToAir(x, y, z); } @@ -291,14 +291,14 @@ public class HellFire extends BlockFire { @Override public boolean canCreatureSpawn(final EnumCreatureType type, final IBlockAccess world, final int x, final int y, - final int z) { + 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) { + final Entity entity) { entity.setFire(10); } @@ -313,13 +313,13 @@ public class HellFire extends BlockFire { if (randomObj.nextInt(24) == 0) { world.playSound( - x + 0.5F, - y + 0.5F, - z + 0.5F, - "fire.fire", - 1.0F + randomObj.nextFloat(), - (randomObj.nextFloat() * 0.7F) + 0.3F, - false); + x + 0.5F, + y + 0.5F, + z + 0.5F, + "fire.fire", + 1.0F + randomObj.nextFloat(), + (randomObj.nextFloat() * 0.7F) + 0.3F, + false); } int l; @@ -328,7 +328,7 @@ public class HellFire extends BlockFire { float f2; if (!World.doesBlockHaveSolidTopSurface(world, x, y - 1, z) - && !Blocks.fire.canCatchFire(world, x, y - 1, z, UP)) { + && !Blocks.fire.canCatchFire(world, x, y - 1, z, UP)) { if (Blocks.fire.canCatchFire(world, x - 1, y, z, EAST)) { for (l = 0; l < 2; ++l) { f = x + (randomObj.nextFloat() * 0.1F); @@ -399,8 +399,8 @@ public class HellFire extends BlockFire { @SideOnly(Side.CLIENT) public void registerBlockIcons(final IIconRegister IIconRegister) { this.IIconArray = new IIcon[] { - IIconRegister.registerIcon(GTPlusPlus.ID + ":" + "hellfire/" + "blockHellFire" + "_layer_0"), - IIconRegister.registerIcon(GTPlusPlus.ID + ":" + "hellfire/" + "blockHellFire" + "_layer_1") }; + IIconRegister.registerIcon(GTPlusPlus.ID + ":" + "hellfire/" + "blockHellFire" + "_layer_0"), + IIconRegister.registerIcon(GTPlusPlus.ID + ":" + "hellfire/" + "blockHellFire" + "_layer_1") }; } @Override @@ -506,8 +506,9 @@ public class HellFire extends BlockFire { */ @Override 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); + final ForgeDirection face) { + return world.getBlock(x, y, z) + .isFlammable(world, x, y, z, face); } /** @@ -523,8 +524,9 @@ public class HellFire extends BlockFire { */ @Override 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); + 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); } /* diff --git a/src/main/java/gtPlusPlus/core/block/general/LightGlass.java b/src/main/java/gtPlusPlus/core/block/general/LightGlass.java index 64b2455e41..b6facce45f 100644 --- a/src/main/java/gtPlusPlus/core/block/general/LightGlass.java +++ b/src/main/java/gtPlusPlus/core/block/general/LightGlass.java @@ -130,7 +130,7 @@ 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) { + 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 a2773e646c..7579907e9d 100644 --- a/src/main/java/gtPlusPlus/core/block/general/MiningExplosives.java +++ b/src/main/java/gtPlusPlus/core/block/general/MiningExplosives.java @@ -64,7 +64,7 @@ public class MiningExplosives extends BlockTNT { */ @Override public void onNeighborBlockChange(final World world, final int x, final int y, final int z, - final Block neighbourblock) { + final Block neighbourblock) { if (world.isBlockIndirectlyGettingPowered(x, y, z)) { this.onBlockDestroyedByPlayer(world, x, y, z, 1); world.setBlockToAir(x, y, z); @@ -84,16 +84,16 @@ public class MiningExplosives extends BlockTNT { */ @Override public void onBlockDestroyedByExplosion(final World world, final int x, final int y, final int z, - final Explosion bang) { + final Explosion bang) { if (!world.isRemote) { final EntityPrimedMiningExplosive EntityPrimedMiningExplosive = new EntityPrimedMiningExplosive( - world, - x + 0.5F, - y + 0.5F, - z + 0.5F, - bang.getExplosivePlacedBy()); + world, + x + 0.5F, + y + 0.5F, + z + 0.5F, + bang.getExplosivePlacedBy()); EntityPrimedMiningExplosive.fuse = world.rand.nextInt(EntityPrimedMiningExplosive.fuse / 4) - + (EntityPrimedMiningExplosive.fuse / 8); + + (EntityPrimedMiningExplosive.fuse / 8); world.spawnEntityInWorld(EntityPrimedMiningExplosive); } } @@ -109,15 +109,15 @@ 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) { + 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); } @@ -129,25 +129,26 @@ public class MiningExplosives extends BlockTNT { */ @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_, - final float p_149727_9_) { - if ((clickingPlayer.getCurrentEquippedItem() != null) - && (clickingPlayer.getCurrentEquippedItem().getItem() == Items.flint_and_steel)) { + 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)) { this.func_150114_a(world, x, y, z, 1, clickingPlayer); world.setBlockToAir(x, y, z); - clickingPlayer.getCurrentEquippedItem().damageItem(1, clickingPlayer); + clickingPlayer.getCurrentEquippedItem() + .damageItem(1, clickingPlayer); 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_); } } 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 c24ef46f5c..7e64f19bf3 100644 --- a/src/main/java/gtPlusPlus/core/block/general/antigrief/BlockWitherProof.java +++ b/src/main/java/gtPlusPlus/core/block/general/antigrief/BlockWitherProof.java @@ -60,7 +60,7 @@ 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_) {} + final int p_149723_4_, final Explosion p_149723_5_) {} @Override public boolean canDropFromExplosion(final Explosion p_149659_1_) { @@ -69,12 +69,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) { + final Entity entity) { if ((entity == null) || !entity.isEntityAlive()) { return false; } if ((entity instanceof EntityWither) || (entity instanceof EntityDragon) - || (entity instanceof IBossDisplayData)) { + || (entity instanceof IBossDisplayData)) { return false; } else { return super.canEntityDestroy(world, x, y, z, entity); @@ -96,19 +96,19 @@ public class BlockWitherProof extends Block { @Override public boolean canCreatureSpawn(final EnumCreatureType type, final IBlockAccess world, final int x, final int y, - final int z) { + 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_) { + 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_) { + int p_149737_4_, int p_149737_5_) { if (aPlayer != null && aPlayer instanceof EntityPlayerMP) { return 1f; } @@ -122,7 +122,7 @@ 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_) { + EntityPlayer p_149699_5_) { super.onBlockClicked(p_149699_1_, p_149699_2_, p_149699_3_, p_149699_4_, p_149699_5_); } @@ -132,7 +132,7 @@ public class BlockWitherProof extends Block { return; } if ((entity instanceof EntityWither) || (entity instanceof EntityDragon) - || (entity instanceof IBossDisplayData)) { + || (entity instanceof IBossDisplayData)) { return; } else { super.onEntityCollidedWithBlock(world, x, y, z, entity); @@ -141,7 +141,7 @@ 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_) { + 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_); } @@ -155,7 +155,7 @@ 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) { + double explosionY, double explosionZ) { return Float.MAX_VALUE; } } 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 804a09ee45..200f85d31d 100644 --- a/src/main/java/gtPlusPlus/core/block/general/fluids/BlockFluidSludge.java +++ b/src/main/java/gtPlusPlus/core/block/general/fluids/BlockFluidSludge.java @@ -42,7 +42,9 @@ public class BlockFluidSludge extends BlockFluidClassic { @Override public boolean canDisplace(final IBlockAccess world, final int x, final int y, final int z) { - if (world.getBlock(x, y, z).getMaterial().isLiquid()) { + if (world.getBlock(x, y, z) + .getMaterial() + .isLiquid()) { return false; } return super.canDisplace(world, x, y, z); @@ -50,7 +52,9 @@ public class BlockFluidSludge extends BlockFluidClassic { @Override public boolean displaceIfPossible(final World world, final int x, final int y, final int z) { - if (world.getBlock(x, y, z).getMaterial().isLiquid()) { + if (world.getBlock(x, y, z) + .getMaterial() + .isLiquid()) { return false; } return super.displaceIfPossible(world, x, y, z); @@ -58,7 +62,7 @@ public class BlockFluidSludge extends BlockFluidClassic { @Override public boolean canCreatureSpawn(final EnumCreatureType type, final IBlockAccess world, final int x, final int y, - final int z) { + 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 95dca7163e..f6cd34aec1 100644 --- a/src/main/java/gtPlusPlus/core/block/machine/CircuitProgrammer.java +++ b/src/main/java/gtPlusPlus/core/block/machine/CircuitProgrammer.java @@ -43,7 +43,7 @@ public class CircuitProgrammer extends BasicTileBlockWithTooltip { */ @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) { + final int side, final float lx, final float ly, final float lz) { if (world.isRemote) { return true; } else { @@ -54,7 +54,7 @@ public class CircuitProgrammer extends BasicTileBlockWithTooltip { 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)))) { + && ((mHandItem.getDamage(mHandStack) == 22) || (mHandItem.getDamage(mHandStack) == 150)))) { final TileEntityCircuitProgrammer tile = (TileEntityCircuitProgrammer) world.getTileEntity(x, y, z); if (tile != null) { mDidScrewDriver = tile.onScrewdriverRightClick((byte) side, player, x, y, z); @@ -97,7 +97,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, - final ItemStack stack) { + final ItemStack stack) { if (stack.hasDisplayName()) { ((TileEntityCircuitProgrammer) world.getTileEntity(x, y, z)).setCustomName(stack.getDisplayName()); } @@ -105,7 +105,7 @@ public class CircuitProgrammer extends BasicTileBlockWithTooltip { @Override public boolean canCreatureSpawn(final EnumCreatureType type, final IBlockAccess world, final int x, final int y, - final int