From fbdbb388c369fae549cfde3eed38b536f7461d90 Mon Sep 17 00:00:00 2001 From: Connor-Colenso <52056774+Connor-Colenso@users.noreply.github.com> Date: Wed, 18 Oct 2023 17:03:23 +0100 Subject: Cleaning up (#767) * Kill playerAPI * Gut more events and compat that is now obsolete * Remove commented out code * Remove final modifier from methods * Make more stuff final * Remove slow building ring * Protected -> private in final classes * More cleaning * More cleaning v2 * Purging * Clean DevHelper * Clean DevHelper 2 * delete DevHelper * remove useless IFMLLoadingPlugin.MCVersion annotation from @Mod files * check for obfuscation only once in the IFMLloadingPlugin.injectData * don't instantiate the static class ASMConfig * delete unused and empty implementation of IFMLCallHook * delete empty class * delete ClassesToTransform class that just holds the class names constants * delete unused methods and unsless logging in dummymod container * delete unused transformer ClassTransformer_TT_ThaumicRestorer * spotless * Clean * Clean utils * Build checkpoint * Purge * Stage 2 * Stage 3 * Stage 4 * Stage 5 * Stage 6 * Spotless * Imports * Stage idk * Stage 1 * Fix issue * Spotless * Format numbers --------- Co-authored-by: GTNH-Colen <54497873+GTNH-Colen@users.noreply.github.com> Co-authored-by: Alexdoru <57050655+Alexdoru@users.noreply.github.com> Co-authored-by: Connor Colenso --- src/main/java/gtPlusPlus/core/block/ModBlocks.java | 4 - .../gtPlusPlus/core/block/base/BasicBlock.java | 19 +- .../core/block/base/BasicTileBlockWithTooltip.java | 34 +- .../gtPlusPlus/core/block/base/BlockBaseFluid.java | 22 +- .../core/block/base/BlockBaseModular.java | 20 +- .../gtPlusPlus/core/block/base/BlockBaseOre.java | 2 +- .../core/block/general/BlockSuperLight.java | 38 +- .../core/block/general/MiningExplosives.java | 3 +- .../block/general/antigrief/BlockWitherProof.java | 4 - .../core/block/machine/CircuitProgrammer.java | 2 +- .../core/block/machine/Machine_RoundRobinator.java | 128 ---- .../core/block/machine/Machine_SuperJukebox.java | 5 +- .../core/block/machine/VolumetricFlaskSetter.java | 5 +- .../core/chunkloading/GTPP_ChunkManager.java | 110 ---- .../core/client/model/ModelSickBlaze.java | 4 +- .../client/renderer/CustomOreBlockRenderer.java | 36 +- .../core/commands/CommandDebugChunks.java | 141 ----- .../commands/CommandEnableDebugWhileRunning.java | 15 +- .../java/gtPlusPlus/core/commands/CommandMath.java | 2 - .../java/gtPlusPlus/core/common/BasePlayer.java | 211 ------- .../java/gtPlusPlus/core/common/CommonProxy.java | 67 +- .../core/common/compat/COMPAT_Baubles.java | 6 - .../core/common/compat/COMPAT_ExtraUtils.java | 2 +- .../core/common/compat/COMPAT_HarvestCraft.java | 2 +- .../gtPlusPlus/core/common/compat/COMPAT_IC2.java | 2 +- .../core/common/compat/COMPAT_PlayerAPI.java | 38 -- .../core/common/compat/COMPAT_Thaumcraft.java | 2 +- .../core/common/compat/COMPAT_Witchery.java | 2 +- .../java/gtPlusPlus/core/config/ConfigHandler.java | 112 +++- .../core/container/Container_ProjectTable.java | 2 - .../core/container/Container_RoundRobinator.java | 241 -------- .../core/container/Container_SuperJukebox.java | 27 +- .../container/Container_VolumetricFlaskSetter.java | 11 +- .../core/entity/InternalEntityRegistry.java | 41 -- .../core/entity/monster/EntitySickBlaze.java | 9 +- .../projectile/EntityHydrofluoricAcidPotion.java | 141 ----- .../projectile/EntitySulfuricAcidPotion.java | 130 ---- .../entity/projectile/EntityThrowableBomb.java | 314 ---------- .../core/entity/projectile/EntityToxinball.java | 4 +- .../entity/projectile/EntityToxinballSmall.java | 23 +- .../gtPlusPlus/core/gui/beta/Gui_ID_Registry.java | 14 +- .../core/gui/machine/GUI_DecayablesChest.java | 3 - .../core/gui/machine/GUI_ProjectTable.java | 3 - .../core/gui/machine/GUI_RoundRobinator.java | 125 ---- .../core/gui/machine/GUI_SuperJukebox.java | 2 +- .../gui/machine/GUI_VolumetricFlaskSetter.java | 34 +- .../gtPlusPlus/core/gui/widget/GuiValueField.java | 20 +- .../java/gtPlusPlus/core/handler/BookHandler.java | 553 ++++++++--------- .../gtPlusPlus/core/handler/COMPAT_HANDLER.java | 14 +- .../core/handler/COMPAT_IntermodStaging.java | 3 - .../java/gtPlusPlus/core/handler/GuiHandler.java | 9 +- .../java/gtPlusPlus/core/handler/MobMentality.java | 61 -- .../gtPlusPlus/core/handler/PacketHandler.java | 4 +- .../core/handler/Recipes/DecayableRecipe.java | 5 +- .../handler/Recipes/LateRegistrationHandler.java | 2 +- .../core/handler/Recipes/RegistrationHandler.java | 4 +- .../core/handler/events/CustomMovementHandler.java | 2 - .../core/handler/events/EntityDeathHandler.java | 20 +- .../handler/events/GeneralTooltipEventHandler.java | 1 + .../core/handler/events/LoginEventHandler.java | 104 ---- .../events/PickaxeBlockBreakEventHandler.java | 20 - .../handler/events/PlayerSleepEventHandler.java | 8 +- .../core/handler/events/SneakManager.java | 2 +- .../workbench/Workbench_CraftingHandler.java | 17 +- .../core/inventories/Inventory_RoundRobinator.java | 154 ----- src/main/java/gtPlusPlus/core/item/ModItems.java | 62 +- .../core/item/base/BaseItemBurnable.java | 2 +- .../core/item/base/BaseItemComponent.java | 10 +- .../java/gtPlusPlus/core/item/base/CoreItem.java | 2 - .../core/item/base/cell/BaseItemCell.java | 2 - .../core/item/base/dusts/BaseItemDustUnique.java | 2 +- .../core/item/base/ingots/BaseItemIngotHot.java | 2 - .../core/item/base/itemblock/ItemBlockGtBlock.java | 10 +- .../core/item/base/itemblock/ItemBlockMeta.java | 5 +- .../core/item/base/itemblock/ItemBlockOre.java | 6 +- .../base/itemblock/ItemBlockRoundRobinator.java | 105 ---- .../core/item/base/misc/BaseItemMisc.java | 6 +- .../core/item/base/misc/BaseItemParticle.java | 2 +- .../core/item/base/ore/BaseOreComponent.java | 10 +- .../gtPlusPlus/core/item/bauble/BaseBauble.java | 5 +- .../core/item/bauble/ElectricBaseBauble.java | 10 +- .../core/item/bauble/FireProtectionBauble.java | 14 +- .../core/item/chemistry/AgriculturalChem.java | 33 +- .../gtPlusPlus/core/item/chemistry/CoalTar.java | 4 - .../core/item/chemistry/GenericChem.java | 18 +- .../core/item/chemistry/IonParticles.java | 4 +- .../core/item/chemistry/MilledOreProcessing.java | 28 +- .../core/item/chemistry/RocketFuels.java | 6 +- .../core/item/chemistry/StandardBaseParticles.java | 4 +- .../core/item/crafting/ItemDummyResearch.java | 6 +- .../core/item/food/BaseItemMetaFood.java | 40 +- .../core/item/general/ItemBlueprint.java | 27 +- .../core/item/general/ItemCloakingDevice.java | 31 +- .../core/item/general/ItemGenericToken.java | 12 +- .../core/item/general/ItemHealingDevice.java | 70 ++- .../core/item/general/ItemLavaFilter.java | 2 +- .../core/item/general/ItemMagicFeather.java | 6 +- .../core/item/general/ItemSlowBuildingRing.java | 136 ---- .../item/general/spawn/ItemCustomSpawnEgg.java | 35 +- .../throwables/ItemHydrofluoricAcidPotion.java | 40 -- .../general/throwables/ItemSulfuricAcidPotion.java | 40 -- .../item/general/throwables/ItemThrowableBomb.java | 129 ---- .../core/item/tool/misc/DebugScanner.java | 9 +- .../core/item/tool/misc/GregtechPump.java | 14 +- .../core/item/tool/staballoy/StaballoySpade.java | 45 +- src/main/java/gtPlusPlus/core/lib/CORE.java | 6 +- .../java/gtPlusPlus/core/material/Material.java | 61 +- .../core/material/MaterialGenerator.java | 6 +- .../java/gtPlusPlus/core/material/Particle.java | 2 +- .../core/material/state/MaterialState.java | 2 +- .../java/gtPlusPlus/core/proxy/ClientProxy.java | 58 +- .../core/recipe/LOADER_Machine_Components.java | 31 +- .../gtPlusPlus/core/recipe/RECIPES_GREGTECH.java | 96 +-- .../gtPlusPlus/core/recipe/RECIPES_General.java | 29 - .../core/recipe/RECIPES_MachineComponents.java | 184 ------ .../gtPlusPlus/core/recipe/RECIPES_Machines.java | 419 ++----------- .../java/gtPlusPlus/core/recipe/common/CI.java | 205 ++---- .../core/tileentities/ModTileEntities.java | 4 - .../core/tileentities/base/TileEntityBase.java | 2 +- .../general/TileEntityCircuitProgrammer.java | 2 +- .../general/TileEntityDecayablesChest.java | 5 +- .../general/TileEntityPlayerDoorBase.java | 281 --------- .../general/TileEntityVolumetricFlaskSetter.java | 40 +- .../machines/TileEntityAdvPooCollector.java | 2 +- .../machines/TileEntityPestKiller.java | 20 +- .../machines/TileEntityPooCollector.java | 2 +- .../machines/TileEntityProjectTable.java | 6 - .../machines/TileEntityRoundRobinator.java | 687 --------------------- src/main/java/gtPlusPlus/core/util/Utils.java | 541 +++------------- src/main/java/gtPlusPlus/core/util/data/AES.java | 37 +- .../java/gtPlusPlus/core/util/data/ArrayUtils.java | 60 +- .../java/gtPlusPlus/core/util/data/FileUtils.java | 8 +- .../gtPlusPlus/core/util/data/LocaleUtils.java | 18 +- .../gtPlusPlus/core/util/data/StringUtils.java | 79 +-- .../java/gtPlusPlus/core/util/math/MathUtils.java | 250 +------- .../core/util/minecraft/EnchantingUtils.java | 63 +- .../core/util/minecraft/EntityUtils.java | 160 +---- .../gtPlusPlus/core/util/minecraft/FluidUtils.java | 91 +-- .../core/util/minecraft/InventoryUtils.java | 40 +- .../gtPlusPlus/core/util/minecraft/ItemUtils.java | 286 +-------- .../gtPlusPlus/core/util/minecraft/LangUtils.java | 28 +- .../core/util/minecraft/MaterialUtils.java | 142 ++--- .../core/util/minecraft/MiningUtils.java | 92 +-- .../core/util/minecraft/ModularArmourUtils.java | 136 +--- .../gtPlusPlus/core/util/minecraft/NBTUtils.java | 396 +----------- .../core/util/minecraft/PlayerUtils.java | 13 +- .../core/util/minecraft/RecipeUtils.java | 373 +---------- .../core/util/minecraft/ShapelessUtils.java | 1 - .../util/minecraft/gregtech/PollutionUtils.java | 63 +- .../particles/EntityParticleFXMysterious.java | 15 - .../gtPlusPlus/core/util/player/PlayerCache.java | 43 +- .../core/util/reflect/ReflectionUtils.java | 16 +- .../core/world/damage/BaseCustomDamageSource.java | 20 - .../core/world/explosions/MiningExplosion.java | 3 +- 154 files changed, 1234 insertions(+), 8049 deletions(-) delete mode 100644 src/main/java/gtPlusPlus/core/block/machine/Machine_RoundRobinator.java delete mode 100644 src/main/java/gtPlusPlus/core/chunkloading/GTPP_ChunkManager.java delete mode 100644 src/main/java/gtPlusPlus/core/commands/CommandDebugChunks.java delete mode 100644 src/main/java/gtPlusPlus/core/common/BasePlayer.java delete mode 100644 src/main/java/gtPlusPlus/core/common/compat/COMPAT_PlayerAPI.java delete mode 100644 src/main/java/gtPlusPlus/core/container/Container_RoundRobinator.java delete mode 100644 src/main/java/gtPlusPlus/core/entity/projectile/EntityHydrofluoricAcidPotion.java delete mode 100644 src/main/java/gtPlusPlus/core/entity/projectile/EntitySulfuricAcidPotion.java delete mode 100644 src/main/java/gtPlusPlus/core/entity/projectile/EntityThrowableBomb.java delete mode 100644 src/main/java/gtPlusPlus/core/gui/machine/GUI_RoundRobinator.java delete mode 100644 src/main/java/gtPlusPlus/core/handler/MobMentality.java delete mode 100644 src/main/java/gtPlusPlus/core/handler/events/LoginEventHandler.java delete mode 100644 src/main/java/gtPlusPlus/core/handler/events/PickaxeBlockBreakEventHandler.java delete mode 100644 src/main/java/gtPlusPlus/core/inventories/Inventory_RoundRobinator.java delete mode 100644 src/main/java/gtPlusPlus/core/item/base/itemblock/ItemBlockRoundRobinator.java delete mode 100644 src/main/java/gtPlusPlus/core/item/general/ItemSlowBuildingRing.java delete mode 100644 src/main/java/gtPlusPlus/core/item/general/throwables/ItemHydrofluoricAcidPotion.java delete mode 100644 src/main/java/gtPlusPlus/core/item/general/throwables/ItemSulfuricAcidPotion.java delete mode 100644 src/main/java/gtPlusPlus/core/item/general/throwables/ItemThrowableBomb.java delete mode 100644 src/main/java/gtPlusPlus/core/tileentities/general/TileEntityPlayerDoorBase.java delete mode 100644 src/main/java/gtPlusPlus/core/tileentities/machines/TileEntityRoundRobinator.java delete mode 100644 src/main/java/gtPlusPlus/core/util/minecraft/particles/EntityParticleFXMysterious.java delete mode 100644 src/main/java/gtPlusPlus/core/world/damage/BaseCustomDamageSource.java (limited to 'src/main/java/gtPlusPlus/core') diff --git a/src/main/java/gtPlusPlus/core/block/ModBlocks.java b/src/main/java/gtPlusPlus/core/block/ModBlocks.java index 5058ac51cd..634a073b02 100644 --- a/src/main/java/gtPlusPlus/core/block/ModBlocks.java +++ b/src/main/java/gtPlusPlus/core/block/ModBlocks.java @@ -16,14 +16,12 @@ import gtPlusPlus.core.block.machine.FishTrap; import gtPlusPlus.core.block.machine.Machine_PestKiller; import gtPlusPlus.core.block.machine.Machine_PooCollector; import gtPlusPlus.core.block.machine.Machine_ProjectTable; -import gtPlusPlus.core.block.machine.Machine_RoundRobinator; import gtPlusPlus.core.block.machine.Machine_SuperJukebox; import gtPlusPlus.core.block.machine.VolumetricFlaskSetter; import gtPlusPlus.core.fluids.FluidRegistryHandler; public final class ModBlocks { - public static Block blockRoundRobinator; public static Block blockCircuitProgrammer; public static Block blockVolumetricFlaskSetter; @@ -100,8 +98,6 @@ public final class ModBlocks { blockPestKiller = new Machine_PestKiller(); - blockRoundRobinator = new Machine_RoundRobinator(); - blockVolumetricFlaskSetter = new VolumetricFlaskSetter(); } diff --git a/src/main/java/gtPlusPlus/core/block/base/BasicBlock.java b/src/main/java/gtPlusPlus/core/block/base/BasicBlock.java index 72e3b24124..006314b2db 100644 --- a/src/main/java/gtPlusPlus/core/block/base/BasicBlock.java +++ b/src/main/java/gtPlusPlus/core/block/base/BasicBlock.java @@ -14,14 +14,6 @@ import gtPlusPlus.core.util.Utils; public class BasicBlock extends BlockContainer { - public BasicBlock(final String unlocalizedName, final Material material) { - this(BlockTypes.STANDARD, unlocalizedName, material, 2); - } - - public BasicBlock(final BlockTypes type, final String unlocalizedName, final Material material) { - this(type, unlocalizedName, material, 2); - } - public BasicBlock(BlockTypes type, final String unlocalizedName, final Material material, final int harvestLevel) { super(material); this.setBlockName(Utils.sanitizeString(unlocalizedName)); @@ -44,11 +36,11 @@ public class BasicBlock extends BlockContainer { FRAME("blockFrameGt", "wrench", soundTypeMetal), ORE("blockStone", "pickaxe", soundTypeStone); - private String TEXTURE_NAME; - private String HARVEST_TOOL; - private SoundType soundOfBlock; + private final String TEXTURE_NAME; + private final String HARVEST_TOOL; + private final SoundType soundOfBlock; - private BlockTypes(final String textureName, final String harvestTool, final SoundType blockSound) { + BlockTypes(final String textureName, final String harvestTool, final SoundType blockSound) { this.TEXTURE_NAME = textureName; this.HARVEST_TOOL = harvestTool; this.soundOfBlock = blockSound; @@ -62,9 +54,6 @@ public class BasicBlock extends BlockContainer { return this.HARVEST_TOOL; } - public SoundType getBlockSoundType() { - return this.soundOfBlock; - } } @Override diff --git a/src/main/java/gtPlusPlus/core/block/base/BasicTileBlockWithTooltip.java b/src/main/java/gtPlusPlus/core/block/base/BasicTileBlockWithTooltip.java index 7f0a504a79..c4e8b191d0 100644 --- a/src/main/java/gtPlusPlus/core/block/base/BasicTileBlockWithTooltip.java +++ b/src/main/java/gtPlusPlus/core/block/base/BasicTileBlockWithTooltip.java @@ -51,8 +51,6 @@ public abstract class BasicTileBlockWithTooltip extends BlockContainer implement /** * Does this block have any meta at all? - * - * @return */ public final boolean hasMeta() { return getMetaCount() > 0; @@ -60,8 +58,6 @@ public abstract class BasicTileBlockWithTooltip extends BlockContainer implement /** * The amount of meta this block has. - * - * @return */ public abstract int getMetaCount(); @@ -81,15 +77,6 @@ public abstract class BasicTileBlockWithTooltip extends BlockContainer implement */ 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() { - return getTooltipID() >= -1; - } - /** * Lazy Boilerplating. * @@ -114,8 +101,6 @@ public abstract class BasicTileBlockWithTooltip extends BlockContainer implement /** * The ID used by the {@link ITileTooltip} handler. Return -1 if you are not providing a custom {@link ItemBlock} in * {@link #getItemBlockClass}(). - * - * @return */ @Override public abstract int getTooltipID(); @@ -138,8 +123,6 @@ public abstract class BasicTileBlockWithTooltip extends BlockContainer implement /** * The name of the Tile Entity. - * - * @return */ protected abstract String getTileEntityName(); @@ -148,7 +131,7 @@ public abstract class BasicTileBlockWithTooltip extends BlockContainer implement * * @return Sanitized {@link String}, containing no spaces or illegal characters. */ - private final String getTileEntityNameForTexturePathing() { + private String getTileEntityNameForTexturePathing() { return Utils.sanitizeString(getTileEntityName().replace(" ", "")); } @@ -156,8 +139,6 @@ 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. - * - * @return */ public CubicObject[] getCustomTextureDirectoryObject() { return null; @@ -175,7 +156,7 @@ public abstract class BasicTileBlockWithTooltip extends BlockContainer implement } @SideOnly(Side.CLIENT) - private final void handleTextures() { + private void handleTextures() { Logger.INFO("[TeTexture] Building Texture Maps for " + getTileEntityName() + "."); @@ -188,7 +169,7 @@ public abstract class BasicTileBlockWithTooltip extends BlockContainer implement // Default Path Name, this will make us look inside 'miscutils\textures\blocks' final String aPrefixTexPath = GTPlusPlus.ID + ":"; - // Default Path Name, this will make us look in the sub-directory for this Tile Entity. + // Default Path Name, this will make us look in the subdirectory for this Tile Entity. final String aTexPathMid = "TileEntities" + CORE.SEPERATOR + getTileEntityNameForTexturePathing() + CORE.SEPERATOR; @@ -241,7 +222,7 @@ public abstract class BasicTileBlockWithTooltip extends BlockContainer implement aStringLeft = aTexPathBuilt + aStringLeft; aStringRight = aTexPathBuilt + aStringRight; // Convenience Blob - CubicObject aMetaBlob = new CubicObject( + CubicObject aMetaBlob = new CubicObject<>( aStringBot, aStringTop, aStringBack, @@ -269,7 +250,7 @@ public abstract class BasicTileBlockWithTooltip extends BlockContainer implement // Store them in an Array SafeTexture[] aInjectBlob = new SafeTexture[] { aBottom, aTop, aBack, aFont, aWest, aEast }; // Convenience Blob - CubicObject aMetaBlob2 = new CubicObject(aInjectBlob); + CubicObject aMetaBlob2 = new CubicObject<>(aInjectBlob); // Store this Blob into mSidedTextureArray.put(aMetaBlob2); Logger.INFO("[TeTexture] Added SafeTexture data to map for meta " + (aIndex++)); @@ -323,8 +304,7 @@ public abstract class BasicTileBlockWithTooltip extends BlockContainer implement */ @Override public int getDamageValue(World aWorld, int aX, int aY, int aZ) { - int l = aWorld.getBlockMetadata(aX, aY, aZ); - return l; + return aWorld.getBlockMetadata(aX, aY, aZ); } @Override @@ -334,7 +314,7 @@ public abstract class BasicTileBlockWithTooltip extends BlockContainer implement @Override public ArrayList getDrops(World world, int x, int y, int z, int metadata, int fortune) { - ArrayList drops = new ArrayList(); + ArrayList drops = new ArrayList<>(); drops.add(ItemUtils.simpleMetaStack(this, metadata, 1)); return drops; } diff --git a/src/main/java/gtPlusPlus/core/block/base/BlockBaseFluid.java b/src/main/java/gtPlusPlus/core/block/base/BlockBaseFluid.java index e992d01d60..0f6f5947e8 100644 --- a/src/main/java/gtPlusPlus/core/block/base/BlockBaseFluid.java +++ b/src/main/java/gtPlusPlus/core/block/base/BlockBaseFluid.java @@ -28,7 +28,7 @@ import gtPlusPlus.core.util.Utils; public class BlockBaseFluid extends BlockFluidClassic { private final String name; - private final IIcon textureArray[] = new IIcon[6]; + private final IIcon[] textureArray = new IIcon[6]; protected float particleRed = 1.0F; protected float particleGreen = 1.0F; @@ -43,18 +43,6 @@ public class BlockBaseFluid extends BlockFluidClassic { GameRegistry.registerBlock(this, ItemBlockMeta.class, "fluid" + this.name); } - public BlockFluidClassic setParticleColor(int arg0) { - 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) { - this.particleRed = arg0; - this.particleGreen = arg1; - this.particleBlue = arg2; - return this; - } - @Override public boolean canCreatureSpawn(EnumCreatureType arg0, IBlockAccess arg1, int arg2, int arg3, int arg4) { return false; @@ -72,11 +60,9 @@ public class BlockBaseFluid extends BlockFluidClassic { @Override @SideOnly(Side.CLIENT) - public void registerBlockIcons(IIconRegister iicon) { - this.textureArray[0] = iicon.registerIcon(GTPlusPlus.ID + ":" + "fluid/" + "Fluid_" + this.name + "_Still"); - this.textureArray[1] = iicon.registerIcon(GTPlusPlus.ID + ":" + "fluid/" + "Fluid_" + this.name + "_Flow"); - // IconRegistry.addIcon("Fluid" + this.name, this.modName + ":fluid/Fluid_" + this.name + "_Still", arg0); - // IconRegistry.addIcon("Fluid" + this.name + "1", this.modName + ":fluid/Fluid_" + this.name + "_Flow", arg0); + public void registerBlockIcons(IIconRegister icon) { + this.textureArray[0] = icon.registerIcon(GTPlusPlus.ID + ":" + "fluid/" + "Fluid_" + this.name + "_Still"); + this.textureArray[1] = icon.registerIcon(GTPlusPlus.ID + ":" + "fluid/" + "Fluid_" + this.name + "_Flow"); } @Override diff --git a/src/main/java/gtPlusPlus/core/block/base/BlockBaseModular.java b/src/main/java/gtPlusPlus/core/block/base/BlockBaseModular.java index f0ecd6def9..81c14bb16c 100644 --- a/src/main/java/gtPlusPlus/core/block/base/BlockBaseModular.java +++ b/src/main/java/gtPlusPlus/core/block/base/BlockBaseModular.java @@ -36,7 +36,7 @@ public class BlockBaseModular extends BasicBlock { protected String thisBlockMaterialTranslatedName; protected final String thisBlockType; - private static HashMap sBlockCache = new HashMap(); + private static final HashMap sBlockCache = new HashMap<>(); public static Block getMaterialBlock(Material aMaterial, BlockTypes aType) { return sBlockCache.get(aMaterial.getUnlocalizedName() + "." + aType.name()); @@ -56,11 +56,9 @@ public class BlockBaseModular extends BasicBlock { Math.min(Math.max(material.vTier, 1), 6)); blockMaterial = material; registerComponent(); - if (material != null) { - sBlockCache.put(material.getUnlocalizedName() + "." + blockType.name(), this); - thisBlockMaterialTranslatedName = material.getTranslatedName(); - GT_LanguageManager.addStringLocalization("gtplusplus." + getUnlocalizedName() + ".name", getProperName()); - } + sBlockCache.put(material.getUnlocalizedName() + "." + blockType.name(), this); + thisBlockMaterialTranslatedName = material.getTranslatedName(); + GT_LanguageManager.addStringLocalization("gtplusplus." + getUnlocalizedName() + ".name", getProperName()); } protected BlockBaseModular(final String unlocalizedName, final String blockMaterialString, @@ -75,8 +73,6 @@ 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()); GameRegistry.registerBlock( this, ItemBlockGtBlock.class, @@ -97,17 +93,17 @@ public class BlockBaseModular extends BasicBlock { return rawMaterName.replace(" ", "").replace("-", "").replace("_", ""); } - public boolean registerComponent() { + public void registerComponent() { Logger.MATERIALS("Attempting to register " + this.getUnlocalizedName() + "."); if (this.blockMaterial == null) { Logger.MATERIALS("Tried to register " + this.getUnlocalizedName() + " but the material was null."); - return false; + return; } String aName = blockMaterial.getUnlocalizedName(); // Register Component Map aMap = Material.mComponentMap.get(aName); if (aMap == null) { - aMap = new HashMap(); + aMap = new HashMap<>(); } int fx = getBlockTypeMeta(); String aKey = (fx == 0 ? OrePrefixes.block.name() @@ -117,11 +113,9 @@ public class BlockBaseModular extends BasicBlock { aMap.put(aKey, ItemUtils.getSimpleStack(this)); Logger.MATERIALS("Registering a material component. Item: [" + aName + "] Map: [" + aKey + "]"); Material.mComponentMap.put(aName, aMap); - return true; } else { // Bad Logger.MATERIALS("Tried to double register a material component."); - 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 208838859b..91b49cb7a3 100644 --- a/src/main/java/gtPlusPlus/core/block/base/BlockBaseOre.java +++ b/src/main/java/gtPlusPlus/core/block/base/BlockBaseOre.java @@ -30,7 +30,7 @@ public class BlockBaseOre extends BasicBlock implements ITexturedBlock { private final Material blockMaterial; - public BlockBaseOre(final Material material, final BlockTypes blockType, final int colour) { + public BlockBaseOre(final Material material, final BlockTypes blockType) { super( blockType, Utils.sanitizeString(material.getUnlocalizedName()), diff --git a/src/main/java/gtPlusPlus/core/block/general/BlockSuperLight.java b/src/main/java/gtPlusPlus/core/block/general/BlockSuperLight.java index f62fc50a69..ceb9b5500b 100644 --- a/src/main/java/gtPlusPlus/core/block/general/BlockSuperLight.java +++ b/src/main/java/gtPlusPlus/core/block/general/BlockSuperLight.java @@ -27,8 +27,6 @@ public class BlockSuperLight extends BlockContainer { @SideOnly(Side.CLIENT) private IIcon textureFront; - // propecia (Inhibit DHD - recover hair get depression) - public BlockSuperLight() { super(Material.circuits); this.setBlockName("blockSuperLight"); @@ -65,8 +63,6 @@ public class BlockSuperLight extends BlockContainer { private long mLastUpdateTick = 0; - private int mLitBlockCount = 0; - private int[][][][] aLitBlocks = new int[50][10][50][1]; private boolean mPowered = false; @@ -128,7 +124,7 @@ public class BlockSuperLight extends BlockContainer { updateLighting(powered); } } - } catch (Throwable t) {} + } catch (Throwable ignored) {} } @Override @@ -145,13 +141,9 @@ public class BlockSuperLight extends BlockContainer { mLastUpdateTick = System.currentTimeMillis(); - if (false) { - return; - } - aLitBlocks = new int[50][10][50][1]; int aLitCounter = 0; - AutoMap aBlocksToUpdate = new AutoMap(); + AutoMap aBlocksToUpdate = new AutoMap<>(); Logger.INFO("Trying to relight area."); BlockPos aStartIterationPoint = new BlockPos( @@ -167,7 +159,7 @@ public class BlockSuperLight extends BlockContainer { int zOff = aStartIterationPoint.zPos + z; Block aBlockGet = this.worldObj.getBlock(xOff, yOff, zOff); if (aBlockGet != null) { - if (aBlockGet instanceof BlockAir || aBlockGet instanceof LightGlass) { + if (aBlockGet instanceof BlockAir) { int aLight = aBlockGet.getLightValue(); @@ -178,15 +170,8 @@ public class BlockSuperLight extends BlockContainer { // Turning Lights on else if (enable && aLight == 0) { aBlocksToUpdate.put(new BlockPos(xOff, yOff, zOff, this.worldObj)); - if (aBlockGet instanceof BlockAir) { - this.worldObj.setBlock( - xOff, - yOff, - zOff, - ModBlocks.MatterFabricatorEffectBlock, - 0, - 3); - } + this.worldObj + .setBlock(xOff, yOff, zOff, ModBlocks.MatterFabricatorEffectBlock, 0, 3); aLitCounter++; } // Turning Lights off @@ -196,7 +181,6 @@ public class BlockSuperLight extends BlockContainer { Logger.INFO("Dimmed air."); this.worldObj.setBlock(xOff, yOff, zOff, Blocks.air, 0, 3); } - // aBlockGet.setLightLevel(0); } aLitBlocks[x][y][z][0] = enable ? 15 : 0; } else { @@ -208,18 +192,6 @@ public class BlockSuperLight extends BlockContainer { } } } - mLitBlockCount = aLitCounter; - doLargeBlockUpdate(aBlocksToUpdate); - } - - public void doLargeBlockUpdate(AutoMap aUpdateMap) { - if (aUpdateMap.isEmpty()) { - return; - } - for (BlockPos p : aUpdateMap) { - // this.worldObj.markBlockForUpdate(p.xPos, p.yPos, p.zPos); - // this.worldObj.markBlocksDirtyVertical(p_72975_1_, p_72975_2_, p_72975_3_, p_72975_4_); - } } } } diff --git a/src/main/java/gtPlusPlus/core/block/general/MiningExplosives.java b/src/main/java/gtPlusPlus/core/block/general/MiningExplosives.java index 6254201261..a2773e646c 100644 --- a/src/main/java/gtPlusPlus/core/block/general/MiningExplosives.java +++ b/src/main/java/gtPlusPlus/core/block/general/MiningExplosives.java @@ -157,8 +157,7 @@ public class MiningExplosives extends BlockTNT { @Override public void onEntityCollidedWithBlock(final World world, final int x, final int y, final int z, final Entity entityTriggering) { - if ((entityTriggering instanceof EntityArrow) && !world.isRemote) { - final EntityArrow entityarrow = (EntityArrow) entityTriggering; + if ((entityTriggering instanceof final EntityArrow entityarrow) && !world.isRemote) { if (entityarrow.isBurning()) { this.func_150114_a( 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 1956d98a39..fa7372090c 100644 --- a/src/main/java/gtPlusPlus/core/block/general/antigrief/BlockWitherProof.java +++ b/src/main/java/gtPlusPlus/core/block/general/antigrief/BlockWitherProof.java @@ -37,10 +37,6 @@ public class BlockWitherProof extends Block { GameRegistry.registerBlock(this, Utils.sanitizeString("blockBlackGate")); } - public String GetProperName() { - return "Wither Cage"; - } - @Override @SideOnly(Side.CLIENT) public int getRenderBlockPass() { diff --git a/src/main/java/gtPlusPlus/core/block/machine/CircuitProgrammer.java b/src/main/java/gtPlusPlus/core/block/machine/CircuitProgrammer.java index 0fc3b5b666..95dca7163e 100644 --- a/src/main/java/gtPlusPlus/core/block/machine/CircuitProgrammer.java +++ b/src/main/java/gtPlusPlus/core/block/machine/CircuitProgrammer.java @@ -147,7 +147,7 @@ public class CircuitProgrammer extends BasicTileBlockWithTooltip { GTPlusPlus.ID + ":" + "metro/" + "TEXTURE_METAL_PANEL_I", GTPlusPlus.ID + ":" + "metro/" + "TEXTURE_METAL_PANEL_I", GTPlusPlus.ID + ":" + "metro/" + "TEXTURE_METAL_PANEL_I" }; - CubicObject[] aTextureData = new CubicObject[] { new CubicObject(aTexData) }; + CubicObject[] aTextureData = new CubicObject[] { new CubicObject<>(aTexData) }; return aTextureData; } } diff --git a/src/main/java/gtPlusPlus/core/block/machine/Machine_RoundRobinator.java b/src/main/java/gtPlusPlus/core/block/machine/Machine_RoundRobinator.java deleted file mode 100644 index d7c383cc6e..0000000000 --- a/src/main/java/gtPlusPlus/core/block/machine/Machine_RoundRobinator.java +++ /dev/null @@ -1,128 +0,0 @@ -package gtPlusPlus.core.block.machine; - -import static gregtech.api.enums.Mods.GTPlusPlus; - -import net.minecraft.block.material.Material; -import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemBlock; -import net.minecraft.item.ItemStack; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.world.World; -import net.minecraftforge.common.util.ForgeDirection; - -import gtPlusPlus.api.objects.data.AutoMap; -import gtPlusPlus.api.objects.minecraft.CubicObject; -import gtPlusPlus.core.block.base.BasicTileBlockWithTooltip; -import gtPlusPlus.core.creative.AddToCreativeTab; -import gtPlusPlus.core.item.base.itemblock.ItemBlockRoundRobinator; -import gtPlusPlus.core.tileentities.machines.TileEntityRoundRobinator; -import gtPlusPlus.core.util.minecraft.ItemUtils; -import gtPlusPlus.core.util.minecraft.PlayerUtils; - -public class Machine_RoundRobinator extends BasicTileBlockWithTooltip { - - public Machine_RoundRobinator() { - super(Material.iron); - } - - /** - * 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 ordinalSide, final float lx, final float ly, final float lz) { - if (world.isRemote) { - return true; - } else { - final ForgeDirection side = ForgeDirection.getOrientation(ordinalSide); - boolean mDidScrewDriver = false; - // Check For Screwdriver - try { - final ItemStack mHandStack = PlayerUtils.getItemStackInPlayersHand(world, player.getDisplayName()); - if (ItemUtils.isToolScrewdriver(mHandStack)) { - final TileEntityRoundRobinator tile = (TileEntityRoundRobinator) world.getTileEntity(x, y, z); - if (tile != null) { - mDidScrewDriver = tile.onScrewdriverRightClick(side, player, x, y, z); - } - } - } catch (final Throwable t) {} - - if (!mDidScrewDriver) { - final TileEntity te = world.getTileEntity(x, y, z); - if ((te != null) && (te instanceof TileEntityRoundRobinator)) { - return ((TileEntityRoundRobinator) te).onRightClick(side, player, x, y, z); - } - return false; - } else { - return true; - } - } - } - - @Override - public TileEntity createNewTileEntity(final World world, final int p_149915_2_) { - return new TileEntityRoundRobinator(); - } - - @Override - public int getMetaCount() { - return 5; - } - - @Override - public String getUnlocalBlockName() { - return "blockRoundRobinator"; - } - - @Override - protected float initBlockHardness() { - return 1; - } - - @Override - protected float initBlockResistance() { - return 1; - } - - @Override - protected CreativeTabs initCreativeTab() { - return AddToCreativeTab.tabMachines; - } - - @Override - public int getTooltipID() { - return -1; - } - - @Override - protected String getTileEntityName() { - return "Round Robinator"; - } - - @Override - public Class getItemBlockClass() { - return ItemBlockRoundRobinator.class; - } - - @Override - public CubicObject[] getCustomTextureDirectoryObject() { - AutoMap aTemp = new AutoMap(); - for (int i = 0; i < 5; i++) { - String[] aTexData = new String[] { GTPlusPlus.ID + ":" + "TileEntities/RoundRobinator/Top_" + i, - GTPlusPlus.ID + ":" + "TileEntities/RoundRobinator/Top_" + i, - GTPlusPlus.ID + ":" + "TileEntities/RoundRobinator/Side_" + i, - GTPlusPlus.ID + ":" + "TileEntities/RoundRobinator/Side_" + i, - GTPlusPlus.ID + ":" + "TileEntities/RoundRobinator/Side_" + i, - GTPlusPlus.ID + ":" + "TileEntities/RoundRobinator/Side_" + i, }; - aTemp.put(aTexData); - } - AutoMap> aTemp2 = new AutoMap>(); - for (String[] y : aTemp) { - aTemp2.put(new CubicObject(y)); - } - CubicObject[] aTextureData = new CubicObject[] { aTemp2.get(0), aTemp2.get(1), aTemp2.get(2), - aTemp2.get(3), aTemp2.get(4) }; - return aTextureData; - } -} diff --git a/src/main/java/gtPlusPlus/core/block/machine/Machine_SuperJukebox.java b/src/main/java/gtPlusPlus/core/block/machine/Machine_SuperJukebox.java index 52ddb7cc10..755636b4d3 100644 --- a/src/main/java/gtPlusPlus/core/block/machine/Machine_SuperJukebox.java +++ b/src/main/java/gtPlusPlus/core/block/machine/Machine_SuperJukebox.java @@ -109,9 +109,6 @@ public class Machine_SuperJukebox extends BlockJukebox { if (itemstack != null) { aWorld.playAuxSFX(1005, aX, aY, aZ, Item.getIdFromItem(itemstack.getItem())); - // aWorld.playRecord((String) null, aX, aY, aZ); - // tileentityjukebox.func_145857_a((ItemStack) null); - // aWorld.setBlockMetadataWithNotify(aX, aY, aZ, 0, 2); /* * float f = 0.7F; double d0 = (double) (aWorld.rand.nextFloat() * f) + (double) (1.0F - f) * 0.5D; * double d1 = (double) (aWorld.rand.nextFloat() * f) + (double) (1.0F - f) * 0.2D + 0.6D; double d2 @@ -295,7 +292,7 @@ public class Machine_SuperJukebox extends BlockJukebox { // Determine which record to play public boolean selectRecordToPlayFromInventoryAndSetViaVanillaHandler() { - AutoMap mValidRecords = new AutoMap(); + AutoMap mValidRecords = new AutoMap<>(); for (ItemStack g : this.getInventory().getInventory()) { if (g != null) { if (g.getItem() instanceof ItemRecord) { diff --git a/src/main/java/gtPlusPlus/core/block/machine/VolumetricFlaskSetter.java b/src/main/java/gtPlusPlus/core/block/machine/VolumetricFlaskSetter.java index 982b29ed97..68c054fb59 100644 --- a/src/main/java/gtPlusPlus/core/block/machine/VolumetricFlaskSetter.java +++ b/src/main/java/gtPlusPlus/core/block/machine/VolumetricFlaskSetter.java @@ -72,9 +72,8 @@ public class VolumetricFlaskSetter extends BasicTileBlockWithTooltip { if (!mDidScrewDriver) { final TileEntity te = world.getTileEntity(x, y, z); - if ((te != null) && (te instanceof TileEntityVolumetricFlaskSetter)) { + if ((te != null) && (te instanceof TileEntityVolumetricFlaskSetter aTile)) { player.openGui(GTplusplus.instance, GuiHandler.GUI18, world, x, y, z); - TileEntityVolumetricFlaskSetter aTile = (TileEntityVolumetricFlaskSetter) te; // new Packet_VolumetricFlaskGui2(aTile, aTile.getCustomValue()); return true; } @@ -152,7 +151,7 @@ public class VolumetricFlaskSetter extends BasicTileBlockWithTooltip { GTPlusPlus.ID + ":" + "metro/" + "TEXTURE_METAL_PANEL_H", GTPlusPlus.ID + ":" + "metro/" + "TEXTURE_METAL_PANEL_H", GTPlusPlus.ID + ":" + "metro/" + "TEXTURE_METAL_PANEL_H" }; - CubicObject[] aTextureData = new CubicObject[] { new CubicObject(aTexData) }; + CubicObject[] aTextureData = new CubicObject[] { new CubicObject<>(aTexData) }; return aTextureData; } } diff --git a/src/main/java/gtPlusPlus/core/chunkloading/GTPP_ChunkManager.java b/src/main/java/gtPlusPlus/core/chunkloading/GTPP_ChunkManager.java deleted file mode 100644 index ae3917451a..0000000000 --- a/src/main/java/gtPlusPlus/core/chunkloading/GTPP_ChunkManager.java +++ /dev/null @@ -1,110 +0,0 @@ -package gtPlusPlus.core.chunkloading; - -import java.util.HashSet; -import java.util.LinkedList; -import java.util.List; -import java.util.Set; - -import net.minecraft.entity.Entity; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.world.ChunkCoordIntPair; -import net.minecraft.world.World; -import net.minecraftforge.common.ForgeChunkManager; -import net.minecraftforge.common.ForgeChunkManager.Ticket; -import net.minecraftforge.common.MinecraftForge; - -import com.google.common.collect.LinkedListMultimap; -import com.google.common.collect.ListMultimap; - -import gregtech.api.interfaces.tileentity.IGregTechTileEntity; -import gtPlusPlus.GTplusplus; -import gtPlusPlus.xmod.gregtech.common.tileentities.machines.basic.GregtechMetaTileEntityChunkLoader; - -/** - * - * This class handles re-initializing chunks after a server restart Credits to Repo-Alt for the original implementation. - * - * @author Repo-Alt, Alkalus - * - */ -public class GTPP_ChunkManager implements ForgeChunkManager.LoadingCallback, ForgeChunkManager.OrderedLoadingCallback, - ForgeChunkManager.PlayerOrderedLoadingCallback { - - private static GTPP_ChunkManager instance; - - public static boolean enableChunkloaders = true; - public static boolean alwaysReloadChunkloaders = false; - public static boolean debugChunkloaders = false; - - public static GTPP_ChunkManager getInstance() { - if (instance == null) { - instance = new GTPP_ChunkManager(); - } - return instance; - } - - public static void init() { - if (enableChunkloaders) { - ForgeChunkManager.setForcedChunkLoadingCallback(GTplusplus.instance, getInstance()); - MinecraftForge.EVENT_BUS.register(getInstance()); - } - } - - @Override - public void ticketsLoaded(List tickets, World world) { - for (Ticket ticket : tickets) { - if (ticket.isPlayerTicket()) continue; - Entity entity = ticket.getEntity(); - if (entity == null) { - int x = ticket.getModData().getInteger("xCoord"); - int y = ticket.getModData().getInteger("yCoord"); - int z = ticket.getModData().getInteger("zCoord"); - - if (y >= 0) { - TileEntity tile = world.getTileEntity(x, y, z); - if (((IGregTechTileEntity) tile).getMetaTileEntity() instanceof GregtechMetaTileEntityChunkLoader) { - ((GregtechMetaTileEntityChunkLoader) ((IGregTechTileEntity) tile).getMetaTileEntity()) - .forceChunkLoading(ticket); - } - } - } - } - } - - @Override - public List ticketsLoaded(List tickets, World world, int maxTicketCount) { - Set validTickets = new HashSet<>(); - for (Ticket ticket : tickets) { - Entity entity = ticket.getEntity(); - if (entity == null) { - int x = ticket.getModData().getInteger("xCoord"); - int y = ticket.getModData().getInteger("yCoord"); - int z = ticket.getModData().getInteger("zCoord"); - - if (y >= 0) { - TileEntity tile = world.getTileEntity(x, y, z); - if (((IGregTechTileEntity) tile).getMetaTileEntity() instanceof GregtechMetaTileEntityChunkLoader) { - validTickets.add(ticket); - } - } - } - } - - return new LinkedList<>(validTickets); - } - - @Override - public ListMultimap playerTicketsLoaded(ListMultimap tickets, World world) { - return LinkedListMultimap.create(); - } - - public static Set getChunksAround(int xChunk, int zChunk, int radius) { - Set chunkList = new HashSet<>(); - for (int xx = xChunk - radius; xx <= xChunk + radius; xx++) { - for (int zz = zChunk - radius; zz <= zChunk + radius; zz++) { - chunkList.add(new ChunkCoordIntPair(xx, zz)); - } - } - return chunkList; - } -} diff --git a/src/main/java/gtPlusPlus/core/client/model/ModelSickBlaze.java b/src/main/java/gtPlusPlus/core/client/model/ModelSickBlaze.java index 961f365f69..f5c255e420 100644 --- a/src/main/java/gtPlusPlus/core/client/model/ModelSickBlaze.java +++ b/src/main/java/gtPlusPlus/core/client/model/ModelSickBlaze.java @@ -40,8 +40,8 @@ public class ModelSickBlaze extends ModelBlaze { this.setRotationAngles(p_78088_2_, p_78088_3_, p_78088_4_, p_78088_5_, p_78088_6_, p_78088_7_, p_78088_1_); this.blazeHead.render(p_78088_7_); - for (int i = 0; i < this.blazeSticks.length; ++i) { - this.blazeSticks[i].render(p_78088_7_); + for (ModelRenderer blazeStick : this.blazeSticks) { + blazeStick.render(p_78088_7_); } } diff --git a/src/main/java/gtPlusPlus/core/client/renderer/CustomOreBlockRenderer.java b/src/main/java/gtPlusPlus/core/client/renderer/CustomOreBlockRenderer.java index 779713d130..03295d0cb1 100644 --- a/src/main/java/gtPlusPlus/core/client/renderer/CustomOreBlockRenderer.java +++ b/src/main/java/gtPlusPlus/core/client/renderer/CustomOreBlockRenderer.java @@ -136,9 +136,9 @@ public class CustomOreBlockRenderer implements ISimpleBlockRenderingHandler { .setBrightness(aBlock.getMixedBrightnessForBlock(aWorld, aX, aFullBlock ? aY - 1 : aY, aZ)); } if (aIcon != null) { - for (int i = 0; i < aIcon.length; i++) { - if (aIcon[i] != null) { - aIcon[i].renderYNeg(aRenderer, aBlock, aX, aY, aZ); + for (ITexture iTexture : aIcon) { + if (iTexture != null) { + iTexture.renderYNeg(aRenderer, aBlock, aX, aY, aZ); } } } @@ -155,9 +155,9 @@ public class CustomOreBlockRenderer implements ISimpleBlockRenderingHandler { .setBrightness(aBlock.getMixedBrightnessForBlock(aWorld, aX, aFullBlock ? aY + 1 : aY, aZ)); } if (aIcon != null) { - for (int i = 0; i < aIcon.length; i++) { - if (aIcon[i] != null) { - aIcon[i].renderYPos(aRenderer, aBlock, aX, aY, aZ); + for (ITexture iTexture : aIcon) { + if (iTexture != null) { + iTexture.renderYPos(aRenderer, aBlock, aX, aY, aZ); } } } @@ -175,9 +175,9 @@ public class CustomOreBlockRenderer implements ISimpleBlockRenderingHandler { } aRenderer.flipTexture = (!aFullBlock); if (aIcon != null) { - for (int i = 0; i < aIcon.length; i++) { - if (aIcon[i] != null) { - aIcon[i].renderZNeg(aRenderer, aBlock, aX, aY, aZ); + for (ITexture iTexture : aIcon) { + if (iTexture != null) { + iTexture.renderZNeg(aRenderer, aBlock, aX, aY, aZ); } } } @@ -194,9 +194,9 @@ public class CustomOreBlockRenderer implements ISimpleBlockRenderingHandler { .setBrightness(aBlock.getMixedBrightnessForBlock(aWorld, aX, aY, aFullBlock ? aZ + 1 : aZ)); } if (aIcon != null) { - for (int i = 0; i < aIcon.length; i++) { - if (aIcon[i] != null) { - aIcon[i].renderZPos(aRenderer, aBlock, aX, aY, aZ); + for (ITexture iTexture : aIcon) { + if (iTexture != null) { + iTexture.renderZPos(aRenderer, aBlock, aX, aY, aZ); } } } @@ -213,9 +213,9 @@ public class CustomOreBlockRenderer implements ISimpleBlockRenderingHandler { .setBrightness(aBlock.getMixedBrightnessForBlock(aWorld, aFullBlock ? aX - 1 : aX, aY, aZ)); } if (aIcon != null) { - for (int i = 0; i < aIcon.length; i++) { - if (aIcon[i] != null) { - aIcon[i].renderXNeg(aRenderer, aBlock, aX, aY, aZ); + for (ITexture iTexture : aIcon) { + if (iTexture != null) { + iTexture.renderXNeg(aRenderer, aBlock, aX, aY, aZ); } } } @@ -233,9 +233,9 @@ public class CustomOreBlockRenderer implements ISimpleBlockRenderingHandler { } aRenderer.flipTexture = (!aFullBlock); if (aIcon != null) { - for (int i = 0; i < aIcon.length; i++) { - if (aIcon[i] != null) { - aIcon[i].renderXPos(aRenderer, aBlock, aX, aY, aZ); + for (ITexture iTexture : aIcon) { + if (iTexture != null) { + iTexture.renderXPos(aRenderer, aBlock, aX, aY, aZ); } } } diff --git a/src/main/java/gtPlusPlus/core/commands/CommandDebugChunks.java b/src/main/java/gtPlusPlus/core/commands/CommandDebugChunks.java deleted file mode 100644 index 8bd51e1459..0000000000 --- a/src/main/java/gtPlusPlus/core/commands/CommandDebugChunks.java +++ /dev/null @@ -1,141 +0,0 @@ -package gtPlusPlus.core.commands; - -import java.util.ArrayList; -import java.util.LinkedHashMap; -import java.util.List; -import java.util.Map; - -import net.minecraft.command.ICommand; -import net.minecraft.command.ICommandSender; -import net.minecraft.entity.Entity; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.world.World; - -import gtPlusPlus.api.objects.Logger; -import gtPlusPlus.api.objects.data.Pair; -import gtPlusPlus.core.util.minecraft.PlayerUtils; -import gtPlusPlus.preloader.ChunkDebugger; -import gtPlusPlus.preloader.asm.AsmConfig; - -public class CommandDebugChunks implements ICommand { - - private final List aliases; - - protected String fullEntityName; - protected Entity conjuredEntity; - - public CommandDebugChunks() { - this.aliases = new ArrayList<>(); - aliases.add("debugchunks"); - aliases.add("DC"); - } - - @Override - public int compareTo(final Object o) { - return 0; - } - - @Override - public String getCommandName() { - return "DebugChunks"; - } - - @Override - public String getCommandUsage(final ICommandSender var1) { - return "/DebugChunks"; - } - - @Override - public List getCommandAliases() { - return this.aliases; - } - - @Override - public void processCommand(final ICommandSender S, final String[] argString) { - Logger.INFO("Debug Command"); - - final World W = S.getEntityWorld(); - final EntityPlayer P = CommandUtils.getPlayer(S); - - if (!AsmConfig.enableChunkDebugging) { - PlayerUtils.messagePlayer(P, "Chunk Debugging is disabled."); - return; - } - - Map aTicketCounter = new LinkedHashMap(); - for (Pair f : ChunkDebugger.mChunkTicketsMap.values()) { - String aMod = f.getKey(); - String aDim = f.getValue(); - if (aMod != null) { - if (aTicketCounter.containsKey(aMod)) { - int aModTicketCount = aTicketCounter.get(aMod); - aModTicketCount++; - aTicketCounter.put(aMod, aModTicketCount); - } else { - aTicketCounter.put(aMod, 1); - } - } - } - if (aTicketCounter.isEmpty()) { - PlayerUtils.messagePlayer(P, "No forced chunk tickets active."); - } - for (String x : aTicketCounter.keySet()) { - PlayerUtils.messagePlayer(P, x + " has " + aTicketCounter.get(x) + " tickets active."); - } - - Map aChunkCounter = new LinkedHashMap(); - for (Pair f : ChunkDebugger.mChunksLoadedByModsMap.values()) { - String aMod = f.getKey(); - String aDim = f.getValue(); - if (aMod == null) { - aMod = "Bad ModId"; - } - - if (aMod != null) { - // PlayerUtils.messagePlayer(P, aMod+" has "+aDim+" active."); - if (aChunkCounter.containsKey(aMod)) { - int aModTicketCount = aChunkCounter.get(aMod); - aModTicketCount = aModTicketCount + 1; - aChunkCounter.put(aMod, aModTicketCount); - Logger.INFO("Counting +1 for " + aMod + ", total of " + aModTicketCount); - } else { - aChunkCounter.put(aMod, 1); - Logger.INFO("Counting +1 for " + aMod); - } - } - } - if (aChunkCounter.isEmpty()) { - PlayerUtils.messagePlayer(P, "No chunks force loaded."); - } - for (String x : aChunkCounter.keySet()) { - PlayerUtils.messagePlayer(P, x + " has " + aChunkCounter.get(x) + " chunks active."); - } - } - - @Override - public boolean canCommandSenderUseCommand(final ICommandSender var1) { - final EntityPlayer P = CommandUtils.getPlayer(var1); - if (P == null) { - return false; - } - if (PlayerUtils.isPlayerOP(P)) { - return true; - } - return false; - } - - @Override - public List addTabCompletionOptions(final ICommandSender var1, final String[] var2) { - return new ArrayList<>(); - } - - @Override - public boolean isUsernameIndex(final String[] var1, final int var2) { - // TODO Auto-generated method stub - return false; - } - - public boolean playerUsesCommand(final World W, final EntityPlayer P, final int cost) { - return true; - } -} diff --git a/src/main/java/gtPlusPlus/core/commands/CommandEnableDebugWhileRunning.java b/src/main/java/gtPlusPlus/core/commands/CommandEnableDebugWhileRunning.java index 76b27ce93e..ad57019bce 100644 --- a/src/main/java/gtPlusPlus/core/commands/CommandEnableDebugWhileRunning.java +++ b/src/main/java/gtPlusPlus/core/commands/CommandEnableDebugWhileRunning.java @@ -18,7 +18,6 @@ import net.minecraftforge.oredict.OreDictionary; import cpw.mods.fml.common.registry.GameRegistry; import gtPlusPlus.api.objects.Logger; import gtPlusPlus.api.objects.data.AutoMap; -import gtPlusPlus.core.util.Utils; import gtPlusPlus.core.util.minecraft.FluidUtils; import gtPlusPlus.core.util.minecraft.ItemUtils; import gtPlusPlus.core.util.minecraft.NBTUtils; @@ -75,7 +74,7 @@ public class CommandEnableDebugWhileRunning implements ICommand { || argString[0].toLowerCase().equals("?")) { Logger.INFO("Listing commands and their uses."); final EntityPlayer P = CommandUtils.getPlayer(S); - AsmConfig.disableAllLogging = Utils.invertBoolean(AsmConfig.disableAllLogging); + AsmConfig.disableAllLogging = !AsmConfig.disableAllLogging; PlayerUtils.messagePlayer(P, "The following are valid args for the '/gtpp' command:"); PlayerUtils.messagePlayer(P, "? - This help command."); PlayerUtils.messagePlayer(P, "logging - Toggles ALL GT++ logging for current session."); @@ -88,13 +87,13 @@ public class CommandEnableDebugWhileRunning implements ICommand { Logger.INFO("Toggling Debug Mode."); final EntityPlayer P = CommandUtils.getPlayer(S); if (PlayerUtils.isPlayerOP(P)) { - CORE_Preloader.DEBUG_MODE = Utils.invertBoolean(CORE_Preloader.DEBUG_MODE); + CORE_Preloader.DEBUG_MODE = !CORE_Preloader.DEBUG_MODE; PlayerUtils.messagePlayer(P, "Toggled GT++ Debug Mode - Enabled: " + CORE_Preloader.DEBUG_MODE); } } else if (argString[0].toLowerCase().equals("logging")) { Logger.INFO("Toggling Logging."); final EntityPlayer P = CommandUtils.getPlayer(S); - AsmConfig.disableAllLogging = Utils.invertBoolean(AsmConfig.disableAllLogging); + AsmConfig.disableAllLogging = !AsmConfig.disableAllLogging; PlayerUtils.messagePlayer(P, "Toggled GT++ Logging - Enabled: " + (!AsmConfig.disableAllLogging)); } /* @@ -130,7 +129,7 @@ public class CommandEnableDebugWhileRunning implements ICommand { String aItemDisplayName = ItemUtils.getItemName(aHeldItem); String aItemUnlocalName = ItemUtils.getUnlocalizedItemName(aHeldItem); String aNbtString = tryIterateNBTData(aHeldItem); - AutoMap aOreDictNames = new AutoMap(); + AutoMap aOreDictNames = new AutoMap<>(); int[] aOreIDs = OreDictionary.getOreIDs(aHeldItem); for (int id : aOreIDs) { @@ -151,7 +150,7 @@ public class CommandEnableDebugWhileRunning implements ICommand { } } - AutoMap aFluidContainerData = new AutoMap(); + AutoMap aFluidContainerData = new AutoMap<>(); FluidStack aHeldItemFluid = FluidContainerRegistry.getFluidForFilledItem(aHeldItem); if (aHeldItemFluid != null) { aFluidContainerData.put("FluidStack Unlocal Name: " + aHeldItemFluid.getUnlocalizedName()); @@ -214,7 +213,7 @@ public class CommandEnableDebugWhileRunning implements ICommand { @Override public List addTabCompletionOptions(final ICommandSender var1, final String[] var2) { - ArrayList aTabCompletes = new ArrayList(); + ArrayList aTabCompletes = new ArrayList<>(); aTabCompletes.add("?"); aTabCompletes.add("logging"); aTabCompletes.add("debug"); @@ -235,7 +234,7 @@ public class CommandEnableDebugWhileRunning implements ICommand { public static String tryIterateNBTData(ItemStack aStack) { try { - AutoMap aItemDataTags = new AutoMap(); + AutoMap aItemDataTags = new AutoMap<>(); NBTTagCompound aNBT = NBTUtils.getNBT(aStack); if (aNBT != null) { if (!aNBT.hasNoTags()) { diff --git a/src/main/java/gtPlusPlus/core/commands/CommandMath.java b/src/main/java/gtPlusPlus/core/commands/CommandMath.java index 8659c00246..eb872160cc 100644 --- a/src/main/java/gtPlusPlus/core/commands/CommandMath.java +++ b/src/main/java/gtPlusPlus/core/commands/CommandMath.java @@ -22,8 +22,6 @@ public class CommandMath implements ICommand { public CommandMath() { this.aliases = new ArrayList<>(); - // this.aliases.add("hometele"); - // this.aliases.add("warphome"); } @Override diff --git a/src/main/java/gtPlusPlus/core/common/BasePlayer.java b/src/main/java/gtPlusPlus/core/common/BasePlayer.java deleted file mode 100644 index d119ca2015..0000000000 --- a/src/main/java/gtPlusPlus/core/common/BasePlayer.java +++ /dev/null @@ -1,211 +0,0 @@ -package gtPlusPlus.core.common; - -import net.minecraft.client.Minecraft; -import net.minecraft.client.settings.GameSettings; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.potion.Potion; -import net.minecraft.util.MovementInputFromOptions; - -import api.player.client.ClientPlayerAPI; -import api.player.client.ClientPlayerBase; -import gtPlusPlus.core.handler.events.CustomMovementHandler; -import gtPlusPlus.core.handler.events.SneakManager; - -public class BasePlayer extends ClientPlayerBase { - - private final Minecraft mc = Minecraft.getMinecraft(); - private final CustomMovementHandler customMovementInput = new CustomMovementHandler(); - private final GameSettings settings = this.mc.gameSettings; - - public BasePlayer(final ClientPlayerAPI api) { - super(api); - } - - /* - * EntityPlayerSP.onLivingUpdate() - Adapted to PlayerAPI - */ - @Override - public void onLivingUpdate() { - - super.onLivingUpdate(); - EntityPlayer aPlayer = this.player; - if (aPlayer != null) { - SneakManager aSneak = SneakManager.get(aPlayer); - if (!aSneak.isWearingRing()) { - return; - } - } - - if (this.player.sprintingTicksLeft > 0) { - --this.player.sprintingTicksLeft; - if (this.player.sprintingTicksLeft == 0) { - this.player.setSprinting(false); - } - } - - if (this.playerAPI.getSprintToggleTimerField() > 0) { - this.playerA