From 18560992cd7b8ed44616c8dcb649bd2749f8b060 Mon Sep 17 00:00:00 2001 From: mist475 <70655895+mist475@users.noreply.github.com> Date: Mon, 1 Apr 2024 20:42:52 +0200 Subject: [PATCH] Cleanup codebase (#19) * update buildscript + deps * applyDecompilerCleanupToMain * remove commented out code * move to tags based injected version * cleanup code * remove .bak files --- dependencies.gradle | 2 +- gradle.properties | 8 +- settings.gradle | 2 +- src/main/java/mcp/mobius/waila/Waila.java | 27 +-- .../addons/agriculture/AgricultureModule.java | 4 +- .../waila/addons/buildcraft/BCModule.java | 9 +- .../addons/buildcraft/HUDHandlerBCTanks.java | 9 +- .../addons/carpenters/CarpentersModule.java | 22 +- .../carpenters/HUDCarpentersBlocksTE.java | 9 - .../waila/addons/enderio/EnderIOModule.java | 9 +- .../addons/enderio/HUDHandlerTesseract.java | 1 - .../enderstorage/EnderStorageModule.java | 8 +- .../mobius/waila/addons/etb/ETBModule.java | 24 +- .../waila/addons/etb/HUDHandlerSocket.java | 10 +- .../addons/exu/ExtraUtilitiesModule.java | 5 +- .../addons/gravestone/GravestoneModule.java | 4 +- .../harvestcraft/HarvestcraftModule.java | 4 +- .../addons/ic2/HUDHandlerTEGenerator.java | 14 +- .../mobius/waila/addons/ic2/IC2Module.java | 11 +- .../magicalcrops/MagicalCropsModule.java | 4 +- .../addons/openblocks/OpenBlocksModule.java | 5 +- .../projectred/HUDDecoratorRsGateLogic.java | 3 - .../addons/projectred/ProjectRedModule.java | 6 +- .../addons/railcraft/RailcraftModule.java | 8 +- .../addons/secretrooms/HUDTileEntityCamo.java | 17 -- .../addons/secretrooms/SecretRoomsModule.java | 23 +- .../addons/statues/HUDHandlerStatues.java | 10 +- .../waila/addons/statues/StatuesModule.java | 9 +- .../addons/stevescarts/HUDCargoManager.java | 58 ++--- .../addons/stevescarts/HUDCartAssembler.java | 19 -- .../addons/stevescarts/HUDLiquidManager.java | 50 ++-- .../stevescarts/HUDMinecartModular.java | 10 +- .../addons/stevescarts/StevesCartsModule.java | 41 +--- .../HUDHandlerIAspectContainer.java | 13 +- .../addons/thaumcraft/ThaumcraftModule.java | 4 - .../ThermalDynamicsModule.java | 13 +- .../thermalexpansion/HUDHandlerCache.java | 4 +- .../HUDHandlerIBlockInfo.java | 2 +- .../HUDHandlerISecureTile.java | 20 +- .../ThermalExpansionModule.java | 32 +-- .../twilightforest/TwilightForestModule.java | 8 +- .../addons/vanillamc/HUDDecoratorVanilla.java | 2 - .../addons/vanillamc/HUDHandlerFurnace.java | 5 +- .../addons/vanillamc/HUDHandlerVanilla.java | 33 +-- .../mcp/mobius/waila/api/ITaggedList.java | 22 +- .../mobius/waila/api/IWailaConfigHandler.java | 11 +- .../mcp/mobius/waila/api/IWailaRegistrar.java | 54 ++--- .../waila/api/IWailaSummaryProvider.java | 12 +- .../mcp/mobius/waila/api/SpecialChars.java | 12 +- .../mobius/waila/api/impl/ConfigHandler.java | 6 +- .../mobius/waila/api/impl/ConfigModule.java | 2 +- .../waila/api/impl/DataAccessorCommon.java | 4 +- .../waila/api/impl/MetaDataProvider.java | 30 +-- .../waila/api/impl/ModuleRegistrar.java | 77 ++----- .../mcp/mobius/waila/api/impl/TipList.java | 23 +- .../mcp/mobius/waila/cbcore/LangUtil.java | 12 +- .../mcp/mobius/waila/client/ProxyClient.java | 6 - .../waila/commands/CommandDumpHandlers.java | 54 +++-- .../mobius/waila/gui/events/MouseEvent.java | 36 +-- .../waila/gui/helpers/ReverseIterator.java | 6 +- .../mobius/waila/gui/helpers/UIHelper.java | 54 +---- .../mobius/waila/gui/interfaces/CType.java | 2 +- .../mobius/waila/gui/interfaces/IWidget.java | 5 - .../waila/gui/interfaces/RenderPriority.java | 2 +- .../mobius/waila/gui/interfaces/Signal.java | 2 +- .../mobius/waila/gui/interfaces/WAlign.java | 2 +- .../mobius/waila/gui/screens/ScreenBase.java | 8 +- .../gui/screens/config/ScreenHUDConfig.java | 31 +-- .../screens/config/ScreenModuleConfig.java | 15 +- .../gui/screens/info/ScreenEnchants.java | 11 +- .../mobius/waila/gui/testing/ScreenTest.java | 18 -- .../mobius/waila/gui/testing/ScreenTest2.java | 8 - .../waila/gui/truetyper/FontHelper.java | 6 - .../mcp/mobius/waila/gui/truetyper/Test.java | 14 +- .../waila/gui/truetyper/TrueTypeFont.java | 25 -- .../waila/gui/widgets/ItemStackDisplay.java | 2 +- .../waila/gui/widgets/LabelFixedFont.java | 1 - .../mobius/waila/gui/widgets/LayoutBase.java | 8 - .../waila/gui/widgets/LayoutCanvas.java | 12 - .../waila/gui/widgets/LayoutCropping.java | 7 - .../waila/gui/widgets/PictureSwitch.java | 2 - .../mobius/waila/gui/widgets/ViewTable.java | 11 +- .../waila/gui/widgets/ViewportScrollable.java | 4 +- .../mobius/waila/gui/widgets/WidgetBase.java | 59 ++--- .../waila/gui/widgets/WidgetGeometry.java | 20 +- .../gui/widgets/buttons/ButtonContainer.java | 1 - .../gui/widgets/movable/PictureMovableRC.java | 4 - .../gui_old/widget_old/Button2States.java.bak | 117 ---------- .../widget_old/ButtonChangeScreen.java.bak | 46 ---- .../widget_old/ButtonConfigNEI.java.bak | 39 ---- .../widget_old/ButtonConfigOption.java.bak | 54 ----- .../widget_old/ButtonConfigRemote.java.bak | 43 ---- .../widget_old/ContainerButtons.java.bak | 68 ------ .../mobius/waila/handlers/DecoratorFMP.java | 2 +- .../waila/handlers/HUDHandlerBlocks.java | 11 +- .../waila/handlers/HUDHandlerEntities.java | 3 +- .../mobius/waila/handlers/HUDHandlerFMP.java | 2 +- .../waila/handlers/SummaryProvider.java.bak | 32 --- .../handlers/SummaryProviderDefault.java.bak | 213 ------------------ .../waila/handlers/VanillaTooltipHandler.java | 2 +- .../waila/handlers/nei/HandlerEnchants.java | 34 +-- .../mobius/waila/handlers/nei/NEIHandler.java | 17 +- .../handlers/nei/TooltipHandlerWaila.java | 2 +- .../mobius/waila/network/IWailaMessage.java | 4 +- .../waila/network/Message0x00ServerPing.java | 2 +- .../waila/network/Message0x01TERequest.java | 27 +-- .../waila/network/Message0x03EntRequest.java | 4 +- .../waila/network/WailaPacketHandler.java | 7 +- .../network/old/Packet0x00ServerPing.java.bak | 76 ------- .../network/old/Packet0x01TERequest.java.bak | 67 ------ .../network/old/Packet0x02TENBTData.java.bak | 42 ---- .../network/old/Packet0x03EntRequest.java.bak | 60 ----- .../network/old/Packet0x04EntNBTData.java.bak | 45 ---- .../old/WailaConnectionHandler.java.bak | 40 ---- .../network/old/WailaPacketHandler.java.bak | 99 -------- .../mcp/mobius/waila/overlay/DisplayUtil.java | 22 +- .../java/mcp/mobius/waila/overlay/IconUI.java | 6 +- .../mobius/waila/overlay/OverlayRenderer.java | 13 -- .../mcp/mobius/waila/overlay/RayTracing.java | 17 +- .../mcp/mobius/waila/overlay/Tooltip.java | 21 +- .../waila/overlay/WailaTickHandler.java | 64 +++--- .../tooltiprenderers/TTRenderHealth.java | 11 +- .../tooltiprenderers/TTRenderProgressBar.java | 4 +- .../tooltiprenderers/TTRenderStack.java | 6 +- .../tooltiprenderers/TTRenderString.java | 2 +- .../tooltiprenderers/TTRenderTrueTyper.java | 2 +- .../mcp/mobius/waila/server/ProxyServer.java | 15 +- .../mcp/mobius/waila/utils/AccessHelper.java | 33 +-- .../mcp/mobius/waila/utils/Constants.java | 4 - .../mobius/waila/utils/ModIdentification.java | 49 +--- .../java/mcp/mobius/waila/utils/NBTUtil.java | 6 +- 131 files changed, 453 insertions(+), 2262 deletions(-) delete mode 100644 src/main/java/mcp/mobius/waila/gui_old/widget_old/Button2States.java.bak delete mode 100644 src/main/java/mcp/mobius/waila/gui_old/widget_old/ButtonChangeScreen.java.bak delete mode 100644 src/main/java/mcp/mobius/waila/gui_old/widget_old/ButtonConfigNEI.java.bak delete mode 100644 src/main/java/mcp/mobius/waila/gui_old/widget_old/ButtonConfigOption.java.bak delete mode 100644 src/main/java/mcp/mobius/waila/gui_old/widget_old/ButtonConfigRemote.java.bak delete mode 100644 src/main/java/mcp/mobius/waila/gui_old/widget_old/ContainerButtons.java.bak delete mode 100644 src/main/java/mcp/mobius/waila/handlers/SummaryProvider.java.bak delete mode 100644 src/main/java/mcp/mobius/waila/handlers/SummaryProviderDefault.java.bak delete mode 100644 src/main/java/mcp/mobius/waila/network/old/Packet0x00ServerPing.java.bak delete mode 100644 src/main/java/mcp/mobius/waila/network/old/Packet0x01TERequest.java.bak delete mode 100644 src/main/java/mcp/mobius/waila/network/old/Packet0x02TENBTData.java.bak delete mode 100644 src/main/java/mcp/mobius/waila/network/old/Packet0x03EntRequest.java.bak delete mode 100644 src/main/java/mcp/mobius/waila/network/old/Packet0x04EntNBTData.java.bak delete mode 100644 src/main/java/mcp/mobius/waila/network/old/WailaConnectionHandler.java.bak delete mode 100644 src/main/java/mcp/mobius/waila/network/old/WailaPacketHandler.java.bak diff --git a/dependencies.gradle b/dependencies.gradle index 4762015..88c557b 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -1,7 +1,7 @@ // Add your dependencies here dependencies { - implementation('com.github.GTNewHorizons:NotEnoughItems:2.5.19-GTNH:dev') + implementation('com.github.GTNewHorizons:NotEnoughItems:2.5.25-GTNH:dev') shadowImplementation('au.com.bytecode:opencsv:2.4') } diff --git a/gradle.properties b/gradle.properties index e3f7af5..e5d4c08 100644 --- a/gradle.properties +++ b/gradle.properties @@ -41,16 +41,16 @@ developmentEnvironmentUserName = Developer # Enables using modern Java syntax (up to version 17) via Jabel, while still targeting JVM 8. # See https://github.com/bsideup/jabel for details on how this works. -enableModernJavaSyntax = false +enableModernJavaSyntax = true # Enables injecting missing generics into the decompiled source code for a better coding experience. # Turns most publicly visible List, Map, etc. into proper List, Map types. -enableGenericInjection = false +enableGenericInjection = true # Generate a class with a String field for the mod version named as defined below. # If generateGradleTokenClass is empty or not missing, no such class will be generated. # If gradleTokenVersion is empty or missing, the field will not be present in the class. -generateGradleTokenClass = +generateGradleTokenClass = mcp.mobius.waila.Tags # Name of the token containing the project's current version to generate/replace. gradleTokenVersion = GRADLETOKEN_VERSION @@ -70,7 +70,7 @@ gradleTokenGroupName = # The string's content will be replaced with your mod's version when compiled. You should use this to specify your mod's # version in @Mod([...], version = VERSION, [...]). # Leave these properties empty to skip individual token replacements. -replaceGradleTokenInFile = Waila.java +replaceGradleTokenInFile = # In case your mod provides an API for other mods to implement you may declare its package here. Otherwise, you can # leave this property empty. diff --git a/settings.gradle b/settings.gradle index 16a5b4c..c52d518 100644 --- a/settings.gradle +++ b/settings.gradle @@ -17,7 +17,7 @@ pluginManagement { } plugins { - id 'com.gtnewhorizons.gtnhsettingsconvention' version '1.0.14' + id 'com.gtnewhorizons.gtnhsettingsconvention' version '1.0.19' } diff --git a/src/main/java/mcp/mobius/waila/Waila.java b/src/main/java/mcp/mobius/waila/Waila.java index 15e9db5..5f98ec4 100644 --- a/src/main/java/mcp/mobius/waila/Waila.java +++ b/src/main/java/mcp/mobius/waila/Waila.java @@ -39,15 +39,9 @@ import mcp.mobius.waila.utils.ModIdentification; @Mod( modid = "Waila", name = "Waila", - version = "GRADLETOKEN_VERSION", + version = Tags.GRADLETOKEN_VERSION, dependencies = "after:NotEnoughItems@[1.0.4.0,)", acceptableRemoteVersions = "*") -/* - * @NetworkMod(channels = {"Waila"},clientSideRequired=false, serverSideRequired=false, connectionHandler = - * WailaConnectionHandler.class, packetHandler = WailaPacketHandler.class, versionBounds="[1.5.0,)") //packetHandler = - * WailaPacketHandler.class) - */ - public class Waila { // The instance of your mod that Forge uses. @@ -75,7 +69,7 @@ public class Waila { eBus.setAccessible(true); EventBus FMLbus = (EventBus) eBus.get(FMLCommonHandler.instance().findContainerFor(this)); FMLbus.register(this); - } catch (Throwable t) {} + } catch (Throwable ignored) {} if (FMLCommonHandler.instance().getEffectiveSide() == Side.CLIENT) { MinecraftForge.EVENT_BUS.register(new DecoratorRenderer()); @@ -90,29 +84,12 @@ public class Waila { public void postInit(FMLPostInitializationEvent event) { proxy.registerHandlers(); ModIdentification.init(); - - /* - * if (ConfigHandler.instance().getConfig(Configuration.CATEGORY_GENERAL, Constants.CFG_WAILA_KEYBIND, true)){ - * for (String key: ModIdentification.keyhandlerStrings.keySet()){ String orig = I18n.getString(key); if - * (orig.equals(key)) orig = LanguageRegistry.instance().getStringLocalization(key); if (orig.equals(key)) orig - * = LangUtil.translateG(key); if (orig.isEmpty()) orig = key; String modif; if (orig.startsWith("[") || - * orig.contains(":")) modif = orig; else{ String id = ModIdentification.keyhandlerStrings.get(key); if - * (id.contains(".")) id = id.split("\\.")[0]; if (id.length() > 10) id = id.substring(0, 11); if (id.isEmpty()) - * id = "????"; modif = String.format("[%s] %s", id, orig); } - * LanguageRegistry.instance().addStringLocalization(key, modif); } } - */ - } @Subscribe public void loadComplete(FMLLoadCompleteEvent event) { proxy.registerMods(); proxy.registerIMCs(); - - /* - * String[] ores = OreDictionary.getOreNames(); for (String s : ores) for (ItemStack stack : - * OreDictionary.getOres(s)) System.out.printf("%s : %s\n", s, stack); - */ } @EventHandler diff --git a/src/main/java/mcp/mobius/waila/addons/agriculture/AgricultureModule.java b/src/main/java/mcp/mobius/waila/addons/agriculture/AgricultureModule.java index b0ae7eb..d7038f0 100644 --- a/src/main/java/mcp/mobius/waila/addons/agriculture/AgricultureModule.java +++ b/src/main/java/mcp/mobius/waila/addons/agriculture/AgricultureModule.java @@ -7,11 +7,11 @@ import mcp.mobius.waila.api.impl.ModuleRegistrar; public class AgricultureModule { - public static Class BlockCrop = null; + public static Class BlockCrop = null; public static void register() { try { - Class Agriculture = Class.forName("com.teammetallurgy.agriculture.Agriculture"); + Class.forName("com.teammetallurgy.agriculture.Agriculture"); Waila.log.log(Level.INFO, "Agriculture mod found."); } catch (ClassNotFoundException e) { Waila.log.log(Level.INFO, "[Agriculture] Agriculture mod not found."); diff --git a/src/main/java/mcp/mobius/waila/addons/buildcraft/BCModule.java b/src/main/java/mcp/mobius/waila/addons/buildcraft/BCModule.java index 8fb07fb..8df1d0f 100644 --- a/src/main/java/mcp/mobius/waila/addons/buildcraft/BCModule.java +++ b/src/main/java/mcp/mobius/waila/addons/buildcraft/BCModule.java @@ -11,14 +11,9 @@ import mcp.mobius.waila.api.impl.ModuleRegistrar; public class BCModule { - public static Class TileTank = null; + public static Class TileTank = null; public static Method TileTank_getTankInfo = null; - // public static Class IPowerReceptor = null; - // public static Class PipeTransportPower = null; - // public static Class TileGenericPipe = null; - // public static Class TileEngine = null; - public static void register() { try { TileTank = Class.forName("buildcraft.factory.TileTank"); @@ -31,10 +26,8 @@ public class BCModule { } catch (ClassNotFoundException e) { Waila.log.log(Level.WARN, "[BC] Class not found. " + e); - return; } catch (NoSuchMethodException e) { Waila.log.log(Level.WARN, "[BC] Method not found." + e); - return; } } diff --git a/src/main/java/mcp/mobius/waila/addons/buildcraft/HUDHandlerBCTanks.java b/src/main/java/mcp/mobius/waila/addons/buildcraft/HUDHandlerBCTanks.java index ea6bbc3..a3430ba 100644 --- a/src/main/java/mcp/mobius/waila/addons/buildcraft/HUDHandlerBCTanks.java +++ b/src/main/java/mcp/mobius/waila/addons/buildcraft/HUDHandlerBCTanks.java @@ -50,8 +50,7 @@ public class HUDHandlerBCTanks implements IWailaDataProvider { int liquidAmount = stack != null ? stack.amount : 0; int capacity = tank != null ? tank.capacity : 0; - if (ConfigHandler.instance().getConfig("bc.tankamount")) - currenttip.add(String.valueOf(liquidAmount) + "/" + String.valueOf(capacity) + " mB"); + if (ConfigHandler.instance().getConfig("bc.tankamount")) currenttip.add(liquidAmount + "/" + capacity + " mB"); return currenttip; } @@ -63,14 +62,12 @@ public class HUDHandlerBCTanks implements IWailaDataProvider { } public FluidTankInfo getTank(IWailaDataAccessor accessor) { - FluidTankInfo tank = null; + FluidTankInfo tank; try { tank = ((FluidTankInfo[]) BCModule.TileTank_getTankInfo .invoke(BCModule.TileTank.cast(accessor.getTileEntity()), ForgeDirection.UNKNOWN))[0]; } catch (Exception e) { - Waila.log.log( - Level.ERROR, - "[BC] Unhandled exception trying to access a tank for display !.\n" + String.valueOf(e)); + Waila.log.log(Level.ERROR, "[BC] Unhandled exception trying to access a tank for display !.\n" + e); return null; } return tank; diff --git a/src/main/java/mcp/mobius/waila/addons/carpenters/CarpentersModule.java b/src/main/java/mcp/mobius/waila/addons/carpenters/CarpentersModule.java index 66da0cb..9591d54 100644 --- a/src/main/java/mcp/mobius/waila/addons/carpenters/CarpentersModule.java +++ b/src/main/java/mcp/mobius/waila/addons/carpenters/CarpentersModule.java @@ -2,26 +2,6 @@ package mcp.mobius.waila.addons.carpenters; public class CarpentersModule { - public static Class TEBase = null; - public static Class BlockCarpentersDoor = null; - public static Class BlockCarpentersHatch = null; - - public static void register() { - /* - * try{ Class CarpentersBlocks = Class.forName("carpentersblocks.CarpentersBlocks"); Waila.log.log(Level.INFO, - * "CarpentersBlocks mod found."); } catch (ClassNotFoundException e){ Waila.log.log(Level.INFO, - * "[CarpentersBlocks] CarpentersBlocks mod not found."); return; } try{ TEBase = - * Class.forName("carpentersblocks.tileentity.TEBase"); BlockCarpentersDoor = - * Class.forName("carpentersblocks.block.BlockCarpentersDoor"); BlockCarpentersHatch = - * Class.forName("carpentersblocks.block.BlockCarpentersHatch"); } catch (ClassNotFoundException e){ - * Waila.log.log(Level.WARNING, "[CarpentersBlocks] Class not found. " + e); return; } catch (Exception e) { - * Waila.log.log(Level.WARNING, "[CarpentersBlocks] Error while loading module. " + e); return; } - * ModuleRegistrar.instance().addConfig("Carpenter's Blocks", "carpenters.hide"); - * ModuleRegistrar.instance().registerStackProvider(new HUDCarpentersBlocksTE(), BlockCarpentersDoor); - * ModuleRegistrar.instance().registerStackProvider(new HUDCarpentersBlocksTE(), BlockCarpentersHatch); - * ModuleRegistrar.instance().registerSyncedNBTKey("data", TEBase); - * ModuleRegistrar.instance().registerSyncedNBTKey("cover_6", TEBase); - */ - } + public static void register() {} } diff --git a/src/main/java/mcp/mobius/waila/addons/carpenters/HUDCarpentersBlocksTE.java b/src/main/java/mcp/mobius/waila/addons/carpenters/HUDCarpentersBlocksTE.java index f573d03..6b4681e 100644 --- a/src/main/java/mcp/mobius/waila/addons/carpenters/HUDCarpentersBlocksTE.java +++ b/src/main/java/mcp/mobius/waila/addons/carpenters/HUDCarpentersBlocksTE.java @@ -16,15 +16,6 @@ public class HUDCarpentersBlocksTE implements IWailaDataProvider { @Override public ItemStack getWailaStack(IWailaDataAccessor accessor, IWailaConfigHandler config) { - /* - * if (!config.getConfig("carpenters.hide")) return null; NBTTagCompound tag = accessor.getNBTData(); short data - * = tag.getShort("data"); short cover = tag.getShort("cover_6"); - * if(CarpentersModule.BlockCarpentersDoor.isInstance(accessor.getBlock())){ int type = data & 0x7; if (type != - * 5) return null; if (cover == 0) return null; return new ItemStack(cover & 0xfff, 0, (cover & 0xf000) >>> 12); - * } else if (CarpentersModule.BlockCarpentersHatch.isInstance(accessor.getBlock())){ int type = data & 0x7; if - * (type != 0) return null; if (cover == 0) return null; return new ItemStack(cover & 0xfff, 0, (cover & 0xf000) - * >>> 12); } - */ return null; } diff --git a/src/main/java/mcp/mobius/waila/addons/enderio/EnderIOModule.java b/src/main/java/mcp/mobius/waila/addons/enderio/EnderIOModule.java index 1205210..ea0a2c5 100644 --- a/src/main/java/mcp/mobius/waila/addons/enderio/EnderIOModule.java +++ b/src/main/java/mcp/mobius/waila/addons/enderio/EnderIOModule.java @@ -9,18 +9,18 @@ import mcp.mobius.waila.api.impl.ModuleRegistrar; public class EnderIOModule { - public static Class TileCapacitorBank = null; + public static Class TileCapacitorBank = null; public static Method TCB_getMaxInput = null; public static Method TCB_getMaxOutput = null; public static Method TCB_getEnergyStored = null; public static Method TCB_getMaxEnergyStored = null; public static Method TCB_getMaxIO = null; - public static Class TileTesseract = null; + public static Class TileTesseract = null; public static void register() { try { - Class ModClass = Class.forName("crazypants.enderio.EnderIO"); + Class.forName("crazypants.enderio.EnderIO"); Waila.log.log(Level.INFO, "EnderIO mod found."); } catch (ClassNotFoundException e) { Waila.log.log(Level.INFO, "[EnderIO] EnderIO mod not found."); @@ -44,9 +44,6 @@ public class EnderIOModule { } catch (NoSuchMethodException e) { Waila.log.log(Level.WARN, "[EnderStorage] Method not found." + e); return; - // } catch (NoSuchFieldException e){ - // mod_Waila.log.log(Level.WARNING, "[EnderStorage] Field not found." + e); - // return; } catch (Exception e) { Waila.log.log(Level.WARN, "[EnderStorage] Unhandled exception." + e); return; diff --git a/src/main/java/mcp/mobius/waila/addons/enderio/HUDHandlerTesseract.java b/src/main/java/mcp/mobius/waila/addons/enderio/HUDHandlerTesseract.java index c7fd2ed..ef66b47 100644 --- a/src/main/java/mcp/mobius/waila/addons/enderio/HUDHandlerTesseract.java +++ b/src/main/java/mcp/mobius/waila/addons/enderio/HUDHandlerTesseract.java @@ -39,7 +39,6 @@ public class HUDHandlerTesseract implements IWailaDataProvider { String channel = "%s : %s%s%s %s"; String freq; String frequser; - String owner; if (config.getConfig("enderio.channel")) { diff --git a/src/main/java/mcp/mobius/waila/addons/enderstorage/EnderStorageModule.java b/src/main/java/mcp/mobius/waila/addons/enderstorage/EnderStorageModule.java index 2ff623f..9650976 100644 --- a/src/main/java/mcp/mobius/waila/addons/enderstorage/EnderStorageModule.java +++ b/src/main/java/mcp/mobius/waila/addons/enderstorage/EnderStorageModule.java @@ -10,17 +10,17 @@ import mcp.mobius.waila.api.impl.ModuleRegistrar; public class EnderStorageModule { - public static Class TileFrequencyOwner = null; + public static Class TileFrequencyOwner = null; public static Field TileFrequencyOwner_Freq = null; - public static Class EnderStorageManager = null; + public static Class EnderStorageManager = null; public static Method GetColourFromFreq = null; - public static Class TileEnderTank = null; + public static Class TileEnderTank = null; public static void register() { try { - Class EnderStorage = Class.forName("codechicken.enderstorage.EnderStorage"); + Class.forName("codechicken.enderstorage.EnderStorage"); Waila.log.log(Level.INFO, "EnderStorage mod found."); } catch (ClassNotFoundException e) { Waila.log.log(Level.INFO, "[EnderStorage] EnderStorage mod not found."); diff --git a/src/main/java/mcp/mobius/waila/addons/etb/ETBModule.java b/src/main/java/mcp/mobius/waila/addons/etb/ETBModule.java index 183ad01..780c994 100644 --- a/src/main/java/mcp/mobius/waila/addons/etb/ETBModule.java +++ b/src/main/java/mcp/mobius/waila/addons/etb/ETBModule.java @@ -9,18 +9,14 @@ import mcp.mobius.waila.api.impl.ModuleRegistrar; public class ETBModule { - public static Class TileSocket = null; + public static Class TileSocket = null; public static Field Socket_sides = null; public static Field Socket_configs = null; - // public static Field Socket_sideID = null; - // public static Field Socket_sideMeta = null; - // public static Field Socket_facID = null; - // public static Field Socket_facMeta = null; - public static Class SocketsMod = null; + public static Class SocketsMod = null; public static Field module = null; - public static Class SideConfig = null; + public static Class SideConfig = null; public static Field SC_tank = null; public static Field SC_inventory = null; public static Field SC_rsControl = null; @@ -28,7 +24,7 @@ public class ETBModule { public static void register() { try { - Class ModClass = Class.forName("emasher.sockets.TileSocket"); + Class.forName("emasher.sockets.TileSocket"); Waila.log.log(Level.INFO, "Engineer Toolbox mod found."); } catch (ClassNotFoundException e) { Waila.log.log(Level.INFO, "[Engineer Toolbox] Engineer Toolbox mod not found."); @@ -40,18 +36,9 @@ public class ETBModule { TileSocket = Class.forName("emasher.sockets.TileSocket"); Socket_sides = TileSocket.getField("sides"); Socket_configs = TileSocket.getField("configs"); - // Socket_sideID = TileSocket.getField("sideID"); - // Socket_sideMeta = TileSocket.getField("sideMeta"); - // Socket_facID = TileSocket.getField("facID"); - // Socket_facMeta = TileSocket.getField("facMeta"); SocketsMod = Class.forName("emasher.sockets.SocketsMod"); module = SocketsMod.getField("module"); - // module = (Item)SocketsMod.getField("module").get(null); - /* - * if (module == null){ mod_Waila.log.log(Level.WARNING, "[Engineer Toolbox] module field is null !"); - * return; } - */ SideConfig = Class.forName("emasher.api.SideConfig"); SC_tank = SideConfig.getField("tank"); @@ -62,9 +49,6 @@ public class ETBModule { } catch (ClassNotFoundException e) { Waila.log.log(Level.WARN, "[Engineer Toolbox] Class not found. " + e); return; - // } catch (NoSuchMethodException e){ - // Waila.log.log(Level.WARN, "[Engineer Toolbox] Method not found." + e); - // return; } catch (NoSuchFieldException e) { Waila.log.log(Level.WARN, "[Engineer Toolbox] Field not found." + e); return; diff --git a/src/main/java/mcp/mobius/waila/addons/etb/HUDHandlerSocket.java b/src/main/java/mcp/mobius/waila/addons/etb/HUDHandlerSocket.java index 326475a..acc974b 100644 --- a/src/main/java/mcp/mobius/waila/addons/etb/HUDHandlerSocket.java +++ b/src/main/java/mcp/mobius/waila/addons/etb/HUDHandlerSocket.java @@ -52,9 +52,9 @@ public class HUDHandlerSocket implements IWailaDataProvider { String configstr = "[ "; - if (tank != -1) configstr += "\u00a79" + String.valueOf(tank) + " "; + if (tank != -1) configstr += "\u00a79" + tank + " "; - if (inventory != -1) configstr += "\u00a7a" + String.valueOf(inventory) + " "; + if (inventory != -1) configstr += "\u00a7a" + inventory + " "; if (rsControl[0] || rsControl[1] || rsControl[2]) { configstr += "\u00a7c"; @@ -76,12 +76,6 @@ public class HUDHandlerSocket implements IWailaDataProvider { if (!configstr.equals("[ \u00a7r]")) tipstr += " " + configstr; - /* - * if ((tank != -1) && (inventory != -1)) tipstr += String.format("[ \u00a79%d \u00a7a%d \u00a7r]", - * tank, inventory); else if (tank != -1) tipstr += String.format("[ \u00a79%d \u00a7r]", tank); - * else if (inventory != -1) tipstr += String.format("[ \u00a7a%d \u00a7r]", inventory); - */ - currenttip.add(tipstr); } } diff --git a/src/main/java/mcp/mobius/waila/addons/exu/ExtraUtilitiesModule.java b/src/main/java/mcp/mobius/waila/addons/exu/ExtraUtilitiesModule.java index 0fcb97a..26d7aae 100644 --- a/src/main/java/mcp/mobius/waila/addons/exu/ExtraUtilitiesModule.java +++ b/src/main/java/mcp/mobius/waila/addons/exu/ExtraUtilitiesModule.java @@ -7,13 +7,12 @@ import mcp.mobius.waila.api.impl.ModuleRegistrar; public class ExtraUtilitiesModule { - public static Class ModExtraUtilities = null; - public static Class TileEntityDrum = null; + public static Class TileEntityDrum = null; public static void register() { try { - Class ModExtraUtilities = Class.forName("com.rwtema.extrautils.ExtraUtils"); + Class.forName("com.rwtema.extrautils.ExtraUtils"); Waila.log.log(Level.INFO, "ExtraUtilities mod found."); } catch (ClassNotFoundException e) { Waila.log.log(Level.INFO, "[ExtraUtilities] ExtraUtilities mod not found."); diff --git a/src/main/java/mcp/mobius/waila/addons/gravestone/GravestoneModule.java b/src/main/java/mcp/mobius/waila/addons/gravestone/GravestoneModule.java index 5cf5b3a..12894ca 100644 --- a/src/main/java/mcp/mobius/waila/addons/gravestone/GravestoneModule.java +++ b/src/main/java/mcp/mobius/waila/addons/gravestone/GravestoneModule.java @@ -7,12 +7,12 @@ import mcp.mobius.waila.api.impl.ModuleRegistrar; public class GravestoneModule { - public static Class BlockGraveStone = null; + public static Class BlockGraveStone = null; public static void register() { try { - Class ModGravestone = Class.forName("GraveStone.ModGraveStone"); + Class.forName("GraveStone.ModGraveStone"); Waila.log.log(Level.INFO, "GraveStone mod found."); } catch (ClassNotFoundException e) { Waila.log.log(Level.INFO, "[GraveStone] GraveStone mod not found."); diff --git a/src/main/java/mcp/mobius/waila/addons/harvestcraft/HarvestcraftModule.java b/src/main/java/mcp/mobius/waila/addons/harvestcraft/HarvestcraftModule.java index 03647c6..49abe31 100644 --- a/src/main/java/mcp/mobius/waila/addons/harvestcraft/HarvestcraftModule.java +++ b/src/main/java/mcp/mobius/waila/addons/harvestcraft/HarvestcraftModule.java @@ -7,11 +7,11 @@ import mcp.mobius.waila.api.impl.ModuleRegistrar; public class HarvestcraftModule { - public static Class TileEntityPamCrop = null; + public static Class TileEntityPamCrop = null; public static void register() { try { - Class PamHarvestCraft = Class.forName("assets.pamharvestcraft.PamHarvestCraft"); + Class.forName("assets.pamharvestcraft.PamHarvestCraft"); Waila.log.log(Level.INFO, "PamHarvestCraft mod found."); } catch (ClassNotFoundException e) { Waila.log.log(Level.INFO, "[PamHarvestCraft] PamHarvestCraft mod not found."); diff --git a/src/main/java/mcp/mobius/waila/addons/ic2/HUDHandlerTEGenerator.java b/src/main/java/mcp/mobius/waila/addons/ic2/HUDHandlerTEGenerator.java index 1eff8c1..020ab7c 100644 --- a/src/main/java/mcp/mobius/waila/addons/ic2/HUDHandlerTEGenerator.java +++ b/src/main/java/mcp/mobius/waila/addons/ic2/HUDHandlerTEGenerator.java @@ -82,32 +82,32 @@ public class HUDHandlerTEGenerator implements IWailaDataProvider { if (IC2Module.TileBaseGenerator.isInstance(te)) { storage = IC2Module.TileBaseGenerator_storage.getDouble(te); - production = (long) IC2Module.TileBaseGenerator_production.getInt(te); - maxStorage = (long) IC2Module.TileBaseGenerator_maxStorage.getShort(te); + production = IC2Module.TileBaseGenerator_production.getInt(te); + maxStorage = IC2Module.TileBaseGenerator_maxStorage.getShort(te); } else if (IC2Module.TileGeoGenerator.isInstance(te)) { storage = IC2Module.TileGeoGenerator_storage.getDouble(te); - production = (long) IC2Module.TileGeoGenerator_production.getInt(te); - maxStorage = (long) IC2Module.TileGeoGenerator_maxStorage.getShort(te); + production = IC2Module.TileGeoGenerator_production.getInt(te); + maxStorage = IC2Module.TileGeoGenerator_maxStorage.getShort(te); } else if (IC2Module.TileKineticGenerator.isInstance(te)) { storage = IC2Module.TileKineticGenerator_storage.getDouble(te); production = MathHelper.floor_double_long(IC2Module.TileKineticGenerator_production.getDouble(te)); - maxStorage = (long) IC2Module.TileKineticGenerator_maxStorage.getInt(te); + maxStorage = IC2Module.TileKineticGenerator_maxStorage.getInt(te); } else if (IC2Module.TileSemifluidGenerator.isInstance(te)) { storage = IC2Module.TileSemifluidGenerator_storage.getDouble(te); production = MathHelper.floor_double_long(IC2Module.TileSemifluidGenerator_production.getDouble(te)); - maxStorage = (long) IC2Module.TileSemifluidGenerator_maxStorage.getShort(te); + maxStorage = IC2Module.TileSemifluidGenerator_maxStorage.getShort(te); } else if (IC2Module.TileStirlingGenerator.isInstance(te)) { storage = IC2Module.TileStirlingGenerator_storage.getDouble(te); production = MathHelper.floor_double_long(IC2Module.TileStirlingGenerator_production.getDouble(te)); - maxStorage = (long) IC2Module.TileStirlingGenerator_maxStorage.getShort(te); + maxStorage = IC2Module.TileStirlingGenerator_maxStorage.getShort(te); } tag.setDouble("storage", storage); diff --git a/src/main/java/mcp/mobius/waila/addons/ic2/IC2Module.java b/src/main/java/mcp/mobius/waila/addons/ic2/IC2Module.java index 1ff574f..cc2bb8d 100644 --- a/src/main/java/mcp/mobius/waila/addons/ic2/IC2Module.java +++ b/src/main/java/mcp/mobius/waila/addons/ic2/IC2Module.java @@ -9,27 +9,27 @@ import mcp.mobius.waila.api.impl.ModuleRegistrar; public class IC2Module { - public static Class TileBaseGenerator = null; + public static Class TileBaseGenerator = null; public static Field TileBaseGenerator_storage = null; public static Field TileBaseGenerator_maxStorage = null; public static Field TileBaseGenerator_production = null; - public static Class TileGeoGenerator = null; + public static Class TileGeoGenerator = null; public static Field TileGeoGenerator_storage = null; public static Field TileGeoGenerator_maxStorage = null; public static Field TileGeoGenerator_production = null; - public static Class TileKineticGenerator = null; + public static Class TileKineticGenerator = null; public static Field TileKineticGenerator_storage = null; public static Field TileKineticGenerator_maxStorage = null; public static Field TileKineticGenerator_production = null; - public static Class TileSemifluidGenerator = null; + public static Class TileSemifluidGenerator = null; public static Field TileSemifluidGenerator_storage = null; public static Field TileSemifluidGenerator_maxStorage = null; public static Field TileSemifluidGenerator_production = null; - public static Class TileStirlingGenerator = null; + public static Class TileStirlingGenerator = null; public static Field TileStirlingGenerator_storage = null; public static Field TileStirlingGenerator_maxStorage = null; public static Field TileStirlingGenerator_production = null; @@ -68,7 +68,6 @@ public class IC2Module { TileStirlingGenerator_maxStorage = TileStirlingGenerator.getDeclaredField("maxEUStorage"); TileStirlingGenerator_production = TileStirlingGenerator.getDeclaredField("production"); - // ModuleRegistrar.instance().addConfigRemote("Thermal Expansion", "thermalexpansion.energyhandler"); ModuleRegistrar.instance().registerBodyProvider(new HUDHandlerTEGenerator(), TileBaseGenerator); ModuleRegistrar.instance().registerBodyProvider(new HUDHandlerTEGenerator(), TileGeoGenerator); ModuleRegistrar.instance().registerBodyProvider(new HUDHandlerTEGenerator(), TileKineticGenerator); diff --git a/src/main/java/mcp/mobius/waila/addons/magicalcrops/MagicalCropsModule.java b/src/main/java/mcp/mobius/waila/addons/magicalcrops/MagicalCropsModule.java index b61058a..d7970ae 100644 --- a/src/main/java/mcp/mobius/waila/addons/magicalcrops/MagicalCropsModule.java +++ b/src/main/java/mcp/mobius/waila/addons/magicalcrops/MagicalCropsModule.java @@ -7,11 +7,11 @@ import mcp.mobius.waila.api.impl.ModuleRegistrar; public class MagicalCropsModule { - public static Class BlockMagicalCrops = null; + public static Class BlockMagicalCrops = null; public static void register() { try { - Class MagicalCrops = Class.forName("magicalcrops.mod_sCrops"); + Class.forName("magicalcrops.mod_sCrops"); Waila.log.log(Level.INFO, "MagicalCrops mod found."); } catch (ClassNotFoundException e) { Waila.log.log(Level.INFO, "[MagicalCrops] MagicalCrops mod not found."); diff --git a/src/main/java/mcp/mobius/waila/addons/openblocks/OpenBlocksModule.java b/src/main/java/mcp/mobius/waila/addons/openblocks/OpenBlocksModule.java index 05309ef..3213e36 100644 --- a/src/main/java/mcp/mobius/waila/addons/openblocks/OpenBlocksModule.java +++ b/src/main/java/mcp/mobius/waila/addons/openblocks/OpenBlocksModule.java @@ -7,12 +7,11 @@ import mcp.mobius.waila.api.impl.ModuleRegistrar; public class OpenBlocksModule { - public static Class ModOpenBlocks = null; - public static Class TileEntityTank = null; + public static Class TileEntityTank = null; public static void register() { try { - Class ModOpenBlocks = Class.forName("openblocks.OpenBlocks"); + Class.forName("openblocks.OpenBlocks"); Waila.log.log(Level.INFO, "OpenBlocks mod found."); } catch (ClassNotFoundException e) { Waila.log.log(Level.INFO, "[OpenBlocks] OpenBlocks mod not found."); diff --git a/src/main/java/mcp/mobius/waila/addons/projectred/HUDDecoratorRsGateLogic.java b/src/main/java/mcp/mobius/waila/addons/projectred/HUDDecoratorRsGateLogic.java index d626d1b..a7bcdf5 100644 --- a/src/main/java/mcp/mobius/waila/addons/projectred/HUDDecoratorRsGateLogic.java +++ b/src/main/java/mcp/mobius/waila/addons/projectred/HUDDecoratorRsGateLogic.java @@ -41,12 +41,9 @@ public class HUDDecoratorRsGateLogic implements IWailaFMPDecorator { subID = NBTUtil.getNBTInteger(accessor.getNBTData(), "subID"); shape = NBTUtil.getNBTInteger(accessor.getNBTData(), "shape"); - // orient = orient - ((orient & 0x10) + (orient & 0x8) + (orient & 0x4)); int hOrient = orient & 0x3; ForgeDirection vOrient = ForgeDirection.getOrientation((orient - (orient & 0x3)) >> 2); - // System.out.printf("%s\n", ForgeDirection.getOrientation(vOrient)); - if (vOrient == ForgeDirection.EAST) hOrient -= 1; if (vOrient == ForgeDirection.WEST) hOrient += 1; diff --git a/src/main/java/mcp/mobius/waila/addons/projectred/ProjectRedModule.java b/src/main/java/mcp/mobius/waila/addons/projectred/ProjectRedModule.java index 7de9140..a6d3512 100644 --- a/src/main/java/mcp/mobius/waila/addons/projectred/ProjectRedModule.java +++ b/src/main/java/mcp/mobius/waila/addons/projectred/ProjectRedModule.java @@ -9,7 +9,7 @@ public class ProjectRedModule { public static void register() { try { - Class ModClass = Class.forName("mrtjp.projectred.ProjectRedIntegration"); + Class.forName("mrtjp.projectred.ProjectRedIntegration"); Waila.log.log(Level.INFO, "ProjectRed|Integration mod found."); } catch (ClassNotFoundException e) { Waila.log.log(Level.INFO, "[ProjectRed] ProjectRed|Integration mod not found."); @@ -32,10 +32,6 @@ public class ProjectRedModule { ModuleRegistrar.instance().registerDecorator(new HUDDecoratorRsGateLogic(), "pr_bgate"); ModuleRegistrar.instance().registerDecorator(new HUDDecoratorRsGateLogic(), "pr_agate"); ModuleRegistrar.instance().registerDecorator(new HUDDecoratorRsGateLogic(), "pr_rgate"); - - // ModuleRegistrar.instance().registerBlockDecorator(new HUDDecoratorRsGateLogic(), BlockMultipart); - // ModuleRegistrar.instance().registerBodyProvider(new HUDHandlerRsGateLogic(), BlockMultipart); - // ModuleRegistrar.instance().registerSyncedNBTKey("*", BlockMultipart); } } diff --git a/src/main/java/mcp/mobius/waila/addons/railcraft/RailcraftModule.java b/src/main/java/mcp/mobius/waila/addons/railcraft/RailcraftModule.java index 689371a..363cf8b 100644 --- a/src/main/java/mcp/mobius/waila/addons/railcraft/RailcraftModule.java +++ b/src/main/java/mcp/mobius/waila/addons/railcraft/RailcraftModule.java @@ -9,14 +9,13 @@ import mcp.mobius.waila.api.impl.ModuleRegistrar; public class RailcraftModule { - public static Class TileTankBase = null; - public static Class ITankTile = null; + public static Class TileTankBase = null; + public static Class ITankTile = null; public static Method ITankTile_getTank = null; - // public static Class StandardTank = null; public static void register() { try { - Class ModRailcraft = Class.forName("mods.railcraft.common.core.Railcraft"); + Class.forName("mods.railcraft.common.core.Railcraft"); Waila.log.log(Level.INFO, "Railcraft mod found."); } catch (ClassNotFoundException e) { Waila.log.log(Level.INFO, "[Railcraft] Railcraft mod not found."); @@ -27,7 +26,6 @@ public class RailcraftModule { TileTankBase = Class.forName("mods.railcraft.common.blocks.machine.beta.TileTankBase"); ITankTile = Class.forName("mods.railcraft.common.blocks.machine.ITankTile"); ITankTile_getTank = ITankTile.getMethod("getTank"); - // StandardTank = Class.forName("mods.railcraft.common.fluids.tanks.StandardTank"); } catch (ClassNotFoundException e) { Waila.log.log(Level.WARN, "[Railcraft] Class not found. " + e); diff --git a/src/main/java/mcp/mobius/waila/addons/secretrooms/HUDTileEntityCamo.java b/src/main/java/mcp/mobius/waila/addons/secretrooms/HUDTileEntityCamo.java index c63d5b7..b06fc01 100644 --- a/src/main/java/mcp/mobius/waila/addons/secretrooms/HUDTileEntityCamo.java +++ b/src/main/java/mcp/mobius/waila/addons/secretrooms/HUDTileEntityCamo.java @@ -16,15 +16,6 @@ public class HUDTileEntityCamo implements IWailaDataProvider { @Override public ItemStack getWailaStack(IWailaDataAccessor accessor, IWailaConfigHandler config) { - /* - * if (!config.getConfig("secretrooms.hide")) return null; if ( - * SecretRoomsModule.BlockCamoTrapDoor.isInstance(accessor.getBlock()) ){ return - * this.getTrapDoorBlock(accessor); } else if ( - * SecretRoomsModule.BlockTorchLever.isInstance(accessor.getBlock()) ){ return new ItemStack(Blocks.torch); } - * else if (accessor.getNBTData() != null){ NBTTagCompound tag = accessor.getNBTData(); if (tag.hasKey("copyID") - * && tag.hasKey("copyMeta")){ int copyID = accessor.getNBTInteger(tag, "copyID"); int copyMeta = - * accessor.getNBTInteger(tag, "copyMeta"); return new ItemStack(copyID, 1, copyMeta); } } - */ return null; } @@ -47,14 +38,6 @@ public class HUDTileEntityCamo implements IWailaDataProvider { } private ItemStack getTrapDoorBlock(IWailaDataAccessor accessor) { - // modify coordinates to get hinge Block. - /* - * int i = accessor.getMetadata(); int j = accessor.getPosition().blockX; int k = accessor.getPosition().blockZ; - * if ((i & 3) == 0) { k++; } if ((i & 3) == 1) { k--; } if ((i & 3) == 2) { j++; } if ((i & 3) == 3) { j--; } - * int blockID = accessor.getWorld().getBlockId(j, accessor.getPosition().blockY, k); int blockMeta = - * accessor.getWorld().getBlockMetadata(j, accessor.getPosition().blockY, k); return new ItemStack(blockID, 1, - * blockMeta); - */ return null; } diff --git a/src/main/java/mcp/mobius/waila/addons/secretrooms/SecretRoomsModule.java b/src/main/java/mcp/mobius/waila/addons/secretrooms/SecretRoomsModule.java index 6b22bcc..a66980a 100644 --- a/src/main/java/mcp/mobius/waila/addons/secretrooms/SecretRoomsModule.java +++ b/src/main/java/mcp/mobius/waila/addons/secretrooms/SecretRoomsModule.java @@ -2,27 +2,6 @@ package mcp.mobius.waila.addons.secretrooms; public class SecretRoomsModule { - public static Class TileEntityCamo = null; - public static Class BlockTorchLever = null; - public static Class BlockCamoTrapDoor = null; - - public static void register() { - /* - * try{ Class SecretRooms = Class.forName("com.github.AbrarSyed.secretroomsmod.common.SecretRooms"); - * Waila.log.log(Level.INFO, "SecretRooms mod found."); } catch (ClassNotFoundException e){ - * Waila.log.log(Level.INFO, "[SecretRooms] SecretRooms mod not found."); return; } try{ TileEntityCamo = - * Class.forName("com.github.AbrarSyed.secretroomsmod.blocks.TileEntityCamo"); BlockTorchLever = - * Class.forName("com.github.AbrarSyed.secretroomsmod.blocks.BlockTorchLever"); BlockCamoTrapDoor = - * Class.forName("com.github.AbrarSyed.secretroomsmod.blocks.BlockCamoTrapDoor"); } catch - * (ClassNotFoundException e){ Waila.log.log(Level.WARNING, "[SecretRooms] Class not found. " + e); return; } - * catch (Exception e) { Waila.log.log(Level.WARNING, "[SecretRooms] Error while loading module. " + e); return; - * } ModuleRegistrar.instance().addConfig("SecretRooms", "secretrooms.hide"); - * ModuleRegistrar.instance().registerStackProvider(new HUDTileEntityCamo(), TileEntityCamo); - * ModuleRegistrar.instance().registerStackProvider(new HUDTileEntityCamo(), BlockTorchLever); - * ModuleRegistrar.instance().registerStackProvider(new HUDTileEntityCamo(), BlockCamoTrapDoor); - * ModuleRegistrar.instance().registerSyncedNBTKey("copyID", TileEntityCamo); - * ModuleRegistrar.instance().registerSyncedNBTKey("copyMeta", TileEntityCamo); - */ - } + public static void register() {} } diff --git a/src/main/java/mcp/mobius/waila/addons/statues/HUDHandlerStatues.java b/src/main/java/mcp/mobius/waila/addons/statues/HUDHandlerStatues.java index 69e2a41..67dc905 100644 --- a/src/main/java/mcp/mobius/waila/addons/statues/HUDHandlerStatues.java +++ b/src/main/java/mcp/mobius/waila/addons/statues/HUDHandlerStatues.java @@ -29,7 +29,7 @@ public class HUDHandlerStatues implements IWailaDataProvider { IWailaConfigHandler config) { try { String skinName = (String) StatuesModule.skinName.get(accessor.getTileEntity()); - if (skinName.equals("")) { + if (skinName.isEmpty()) { TileEntity belowEnt = accessor.getWorld().getTileEntity( accessor.getPosition().blockX, accessor.getPosition().blockY - 1, @@ -38,7 +38,7 @@ public class HUDHandlerStatues implements IWailaDataProvider { skinName = (String) StatuesModule.skinName.get(belowEnt); } - if (skinName.equals("")) { + if (skinName.isEmpty()) { currenttip.clear(); currenttip.add(WHITE + "Statue : Unknown"); } else { @@ -50,12 +50,6 @@ public class HUDHandlerStatues implements IWailaDataProvider { currenttip = WailaExceptionHandler.handleErr(e, accessor.getTileEntity().getClass().getName(), currenttip); } - /* - * String skinName = accessor.getNBTData().getString("skin"); if (skinName.equals("")){ if - * (accessor.getWorld().getBlockTileEntity(accessor.getPosition().blockX, accessor.getPosition().blockY - 1, - * accessor.getPosition().blockZ) != null){ } } - */ - return currenttip; } diff --git a/src/main/java/mcp/mobius/waila/addons/statues/StatuesModule.java b/src/main/java/mcp/mobius/waila/addons/statues/StatuesModule.java index 9ecfc25..96e9b48 100644 --- a/src/main/java/mcp/mobius/waila/addons/statues/StatuesModule.java +++ b/src/main/java/mcp/mobius/waila/addons/statues/StatuesModule.java @@ -9,12 +9,12 @@ import mcp.mobius.waila.api.impl.ModuleRegistrar; public class StatuesModule { - public static Class TileEntityStatue = null; + public static Class TileEntityStatue = null; public static Field skinName = null; public static void register() { try { - Class Statues = Class.forName("info.jbcs.minecraft.statues.Statues"); + Class.forName("info.jbcs.minecraft.statues.Statues"); Waila.log.log(Level.INFO, "Statues mod found."); } catch (ClassNotFoundException e) { Waila.log.log(Level.INFO, "[Statues] Statues mod not found."); @@ -24,10 +24,7 @@ public class StatuesModule { try { TileEntityStatue = Class.forName("info.jbcs.minecraft.statues.TileEntityStatue"); skinName = TileEntityStatue.getDeclaredField("skinName"); - } catch (ClassNotFoundException e) { - Waila.log.log(Level.WARN, "[Statues] Class not found. " + e); - return; - } catch (NoSuchFieldException e) { + } catch (ClassNotFoundException | NoSuchFieldException e) { Waila.log.log(Level.WARN, "[Statues] Class not found. " + e); return; } diff --git a/src/main/java/mcp/mobius/waila/addons/stevescarts/HUDCargoManager.java b/src/main/java/mcp/mobius/waila/addons/stevescarts/HUDCargoManager.java index e928de4..c78975c 100644 --- a/src/main/java/mcp/mobius/waila/addons/stevescarts/HUDCargoManager.java +++ b/src/main/java/mcp/mobius/waila/addons/stevescarts/HUDCargoManager.java @@ -22,8 +22,8 @@ import mcp.mobius.waila.utils.WailaExceptionHandler; public class HUDCargoManager implements IWailaDataProvider { - private static String colors[] = { "NA", "Red", "Blue", "Yellow", "Green", "Dis." }; - private static String sides[] = { "Yellow", "Blue", "Green", "Red" }; + private static String[] colors = { "NA", "Red", "Blue", "Yellow", "Green", "Dis." }; + private static String[] sides = { "Yellow", "Blue", "Green", "Red" }; @Override public ItemStack getWailaStack(IWailaDataAccessor accessor, IWailaConfigHandler config) { @@ -73,15 +73,14 @@ public class HUDCargoManager implements IWailaDataProvider { int doReturn = accessor.getNBTInteger(tag, "doReturn"); for (int i = 0; i < 4; i++) { - int target = accessor.getNBTInteger(tag, "target" + String.valueOf(i)); - int color = accessor.getNBTInteger(tag, "color" + String.valueOf(i)); - int amount = accessor.getNBTInteger(tag, "amount" + String.valueOf(i)); + int target = accessor.getNBTInteger(tag, "target" + i); + int color = accessor.getNBTInteger(tag, "color" + i); + int amount = accessor.getNBTInteger(tag, "amount" + i); if (color == 5) continue; String direction = (toCart & (1 << i)) != 0 ? "Load" : "Unload"; String shouldReturn = (doReturn & (1 << i)) != 0 ? "Ret." : "Cont."; - String sAmount = amount == 0 ? "All" - : String.valueOf(this.getAmount(amount) + " " + this.getAmountType(amount)); + String sAmount = amount == 0 ? "All" : this.getAmount(amount) + " " + this.getAmountType(amount); String selection = (String) StevesCartsModule.GetSelectionName .invoke(StevesCartsModule.CargoItemSelection.cast(itemSelection.get(target))); @@ -112,40 +111,17 @@ public class HUDCargoManager implements IWailaDataProvider { } public int getAmount(int id) { - switch (id) { - case 1: - return 1; - - case 2: - return 3; - - case 3: - return 8; - - case 4: - return 16; - - case 5: - return 32; - - case 6: - return 64; - - case 7: - return 1; - - case 8: - return 2; - - case 9: - return 3; - - case 10: - return 5; - - default: - return 0; - } + return switch (id) { + case 1, 7 -> 1; + case 2, 9 -> 3; + case 3 -> 8; + case 4 -> 16; + case 5 -> 32; + case 6 -> 64; + case 8 -> 2; + case 10 -> 5; + default -> 0; + }; } // 0 - MAX diff --git a/src/main/java/mcp/mobius/waila/addons/stevescarts/HUDCartAssembler.java b/src/main/java/mcp/mobius/waila/addons/stevescarts/HUDCartAssembler.java index 3ab5b32..cd55293 100644 --- a/src/main/java/mcp/mobius/waila/addons/stevescarts/HUDCartAssembler.java +++ b/src/main/java/mcp/mobius/waila/addons/stevescarts/HUDCartAssembler.java @@ -28,25 +28,6 @@ public class HUDCartAssembler implements IWailaDataProvider { @Override public List getWailaBody(ItemStack itemStack, List currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config) { - /* - * if (!config.getConfig("stevescarts.showall")) return currenttip; if - * (config.getConfig("stevescarts.shifttoggle") && !accessor.getPlayer().isSneaking()){ currenttip.add(ITALIC + - * "Press shift for more data"); return currenttip; } int currTime = - * accessor.getNBTInteger(accessor.getNBTData(), "currentTime"); int maxTime = - * accessor.getNBTInteger(accessor.getNBTData(), "maxTime"); int isAssembling = - * accessor.getNBTInteger(accessor.getNBTData(), "isAssembling"); NBTTagList slots = - * accessor.getNBTData().getTagList("Items"); boolean hasOutput = false; Item ItemCartModule = null; try { - * ItemCartModule = (Item)StevesCartsModule.ItemCartModule.get(null); } catch (Exception e) { currenttip = - * WailaExceptionHandler.handleErr(e, accessor.getTileEntity().getClass().getName(), currenttip); return - * currenttip; } for (int i = 0; i < slots.tagCount(); i++){ NBTTagCompound subtag = - * (NBTTagCompound)(slots.tagAt(i)); byte slot = subtag.getByte("Slot"); if (slot == 30) hasOutput = true; } if - * (isAssembling == 1){ currenttip.add(String.format("Time remaining : %.1f sec", (maxTime - currTime) / - * 20.0f)); NBTTagCompound output = accessor.getNBTData().getCompoundTag("Output"); short outID = - * output.getShort("id"); byte[] metas = output.getCompoundTag("tag").getByteArray("Modules"); for (byte b : - * metas){ currenttip.add(new ItemStack(ItemCartModule, 1, b).getDisplayName()); } } else if (hasOutput) - * currenttip.add(String.format("Time remaining : ")); else - * currenttip.add(String.format("Time remaining : ")); - */ return currenttip; } diff --git a/src/main/java/mcp/mobius/waila/addons/stevescarts/HUDLiquidManager.java b/src/main/java/mcp/mobius/waila/addons/stevescarts/HUDLiquidManager.java index 6a8cbd7..33959ed 100644 --- a/src/main/java/mcp/mobius/waila/addons/stevescarts/HUDLiquidManager.java +++ b/src/main/java/mcp/mobius/waila/addons/stevescarts/HUDLiquidManager.java @@ -20,8 +20,8 @@ import mcp.mobius.waila.api.IWailaDataProvider; public class HUDLiquidManager implements IWailaDataProvider { - private static String colors[] = { "NA", "Red", "Blue", "Yellow", "Green", "Dis." }; - private static String sides[] = { "Yellow", "Blue", "Green", "Red" }; + private static String[] colors = { "NA", "Red", "Blue", "Yellow", "Green", "Dis." }; + private static String[] sides = { "Yellow", "Blue", "Green", "Red" }; @Override public ItemStack getWailaStack(IWailaDataAccessor accessor, IWailaConfigHandler config) { @@ -67,9 +67,8 @@ public class HUDLiquidManager implements IWailaDataProvider { int doReturn = accessor.getNBTInteger(tag, "doReturn"); for (int i = 0; i < 4; i++) { - int target = accessor.getNBTInteger(tag, "target" + String.valueOf(i)); - int color = accessor.getNBTInteger(tag, "color" + String.valueOf(i)); - int amount = accessor.getNBTInteger(tag, "amount" + String.valueOf(i)); + int color = accessor.getNBTInteger(tag, "color" + i); + int amount = accessor.getNBTInteger(tag, "amount" + i); String fluidName = ""; int fluidAmount = 0; @@ -84,10 +83,8 @@ public class HUDLiquidManager implements IWailaDataProvider { String direction = (toCart & (1 << i)) != 0 ? "Load" : "Unload"; String shouldReturn = (doReturn & (1 << i)) != 0 ? "Ret." : "Cont."; - String sAmount = amount == 0 ? "All" : String.valueOf(this.getMaxAmountBuckets(amount)) + " mB"; + String sAmount = amount == 0 ? "All" : this.getMaxAmountBuckets(amount) + " mB"; - // String selection = (String) - // StevesCartsModule.GetSelectionName.invoke(StevesCartsModule.CargoItemSelection.cast(itemSelection.get(target))); currenttip.add( String.format( "Side %s %s[ %s ]%s[ %s , %s]%s[ %s ]", @@ -112,30 +109,19 @@ public class HUDLiquidManager implements IWailaDataProvider { } public int getMaxAmountBuckets(int id) { - switch (id) { - case 1: - return 250; - case 2: - return 500; - case 3: - return 750; - case 4: - return 1000; - case 5: - return 2000; - case 6: - return 3000; - case 7: - return 5000; - case 8: - return 7500; - case 9: - return 10000; - case 10: - return 15000; - default: - return 0; - } + return switch (id) { + case 1 -> 250; + case 2 -> 500; + case 3 -> 750; + case 4 -> 1000; + case 5 -> 2000; + case 6 -> 3000; + case 7 -> 5000; + case 8 -> 7500; + case 9 -> 10000; + case 10 -> 15000; + default -> 0; + }; } @Override diff --git a/src/main/java/mcp/mobius/waila/addons/stevescarts/HUDMinecartModular.java b/src/main/java/mcp/mobius/waila/addons/stevescarts/HUDMinecartModular.java index 7924074..f4f40cf 100644 --- a/src/main/java/mcp/mobius/waila/addons/stevescarts/HUDMinecartModular.java +++ b/src/main/java/mcp/mobius/waila/addons/stevescarts/HUDMinecartModular.java @@ -60,16 +60,16 @@ public class HUDMinecartModular implements IWailaEntityProvider { byte[] metas = tag.getByteArray("Modules"); for (int i = 0; i < metas.length; i++) { - if (tag.hasKey("module" + String.valueOf(i) + "Fuel")) { + if (tag.hasKey("module" + i + "Fuel")) { - int fuel = accessor.getNBTInteger(tag, "module" + String.valueOf(i) + "Fuel"); + int fuel = accessor.getNBTInteger(tag, "module" + i + "Fuel"); currenttip.add( new ItemStack(ItemCartModule, 1, metas[i]) .getDisplayName() + TAB + ALIGNRIGHT + " [ " + WHITE + fuel + GRAY + " POW ]"); - } else if (tag.hasKey("module" + String.valueOf(i) + "Fluid")) { + } else if (tag.hasKey("module" + i + "Fluid")) { - NBTTagCompound subtag = tag.getCompoundTag("module" + String.valueOf(i) + "Fluid"); + NBTTagCompound subtag = tag.getCompoundTag("module" + i + "Fluid"); if (subtag.hasKey("Amount")) { int amount = accessor.getNBTInteger(subtag, "Amount"); String fluid = subtag.getString("FluidName"); @@ -78,7 +78,7 @@ public class HUDMinecartModular implements IWailaEntityProvider { + ALIGNRIGHT + " [ " + WHITE - + String.valueOf(amount) + + amount + GRAY + " mB of " + WHITE diff --git a/src/main/java/mcp/mobius/waila/addons/stevescarts/StevesCartsModule.java b/src/main/java/mcp/mobius/waila/addons/stevescarts/StevesCartsModule.java index 4bdf2f0..5cb46bd 100644 --- a/src/main/java/mcp/mobius/waila/addons/stevescarts/StevesCartsModule.java +++ b/src/main/java/mcp/mobius/waila/addons/stevescarts/StevesCartsModule.java @@ -5,50 +5,13 @@ import java.lang.reflect.Method; public class StevesCartsModule { - public static Class TileEntityCartAssembler = null; - public static Class TileEntityCargo = null; - public static Class TileEntityLiquid = null; - public static Class MinecartModular = null; - public static Class StevesItems = null; - public static Class CargoItemSelection = null; + public static Class CargoItemSelection = null; - public static Field ItemCartComponent = null; // Items.component public static Field ItemCartModule = null; // Items.modules public static Field ItemSelections = null; // TileEntityCargo.itemSelections public static Method GetSelectionName = null; // CargoItemSelection.getName - public static void register() { - /* - * try{ Class ModStevesCarts = Class.forName("vswe.stevescarts.StevesCarts"); Waila.log.log(Level.INFO, - * "StevesCarts mod found."); } catch (ClassNotFoundException e){ Waila.log.log(Level.INFO, - * "[StevesCarts] StevesCarts mod not found."); return; } try{ TileEntityCartAssembler = - * Class.forName("vswe.stevescarts.TileEntities.TileEntityCartAssembler"); TileEntityCargo = - * Class.forName("vswe.stevescarts.TileEntities.TileEntityCargo"); TileEntityLiquid = - * Class.forName("vswe.stevescarts.TileEntities.TileEntityLiquid"); MinecartModular = - * Class.forName("vswe.stevescarts.Carts.MinecartModular"); StevesItems = - * Class.forName("vswe.stevescarts.Items.Items"); CargoItemSelection = - * Class.forName("vswe.stevescarts.Helpers.CargoItemSelection"); ItemCartComponent = - * StevesItems.getDeclaredField("component"); ItemCartModule = StevesItems.getDeclaredField("modules"); - * ItemSelections = TileEntityCargo.getDeclaredField("itemSelections"); GetSelectionName = - * CargoItemSelection.getDeclaredMethod("getName"); } catch (ClassNotFoundException e){ - * Waila.log.log(Level.WARNING, "[StevesCarts] Class not found. " + e); return; } catch (NoSuchFieldException e) - * { Waila.log.log(Level.WARNING, "[StevesCarts] Field not found. " + e); return; } catch (NoSuchMethodException - * e) { Waila.log.log(Level.WARNING, "[StevesCarts] Method not found. " + e); return; } catch (Exception e) { - * Waila.log.log(Level.WARNING, "[StevesCarts] Error while loading module. " + e); return; } - * ModuleRegistrar.instance().addConfigRemote("Steve's carts", "stevescarts.showall"); - * ModuleRegistrar.instance().addConfigRemote("Steve's carts", "stevescarts.colorblind"); - * ModuleRegistrar.instance().addConfigRemote("Steve's carts", "stevescarts.shifttoggle"); - * ModuleRegistrar.instance().registerBodyProvider(new HUDCartAssembler(), TileEntityCartAssembler); - * ModuleRegistrar.instance().registerBodyProvider(new HUDCargoManager(), TileEntityCargo); - * ModuleRegistrar.instance().registerBodyProvider(new HUDLiquidManager(), TileEntityLiquid); - * ModuleRegistrar.instance().registerHeadProvider(new HUDMinecartModular(), MinecartModular); - * ModuleRegistrar.instance().registerBodyProvider(new HUDMinecartModular(), MinecartModular); - * ModuleRegistrar.instance().registerSyncedNBTKey("*", TileEntityCartAssembler); - * ModuleRegistrar.instance().registerSyncedNBTKey("*", MinecartModular); - * ModuleRegistrar.instance().registerSyncedNBTKey("*", TileEntityCargo); - * ModuleRegistrar.instance().registerSyncedNBTKey("*", TileEntityLiquid); - */ - } + public static void register() {} } diff --git a/src/main/java/mcp/mobius/waila/addons/thaumcraft/HUDHandlerIAspectContainer.java b/src/main/java/mcp/mobius/waila/addons/thaumcraft/HUDHandlerIAspectContainer.java index 907ae97..5c54b95 100644 --- a/src/main/java/mcp/mobius/waila/addons/thaumcraft/HUDHandlerIAspectContainer.java +++ b/src/main/java/mcp/mobius/waila/addons/thaumcraft/HUDHandlerIAspectContainer.java @@ -43,7 +43,7 @@ public class HUDHandlerIAspectContainer implements IWailaDataProvider { if (tag.hasKey("Aspects")) { NBTTagList taglist = tag.getTagList("Aspects", 10); - List unknownAspects = new ArrayList(); + List unknownAspects = new ArrayList<>(); for (int i = 0; i < taglist.tagCount(); i++) { NBTTagCompound subtag = taglist.getCompoundTagAt(i); @@ -97,26 +97,21 @@ public class HUDHandlerIAspectContainer implements IWailaDataProvider { } for (Object o : tileAspects.keySet()) { - if ((Integer) tileAspects.get(o) > 0) { + if (tileAspects.get(o) > 0) { if (playerAspects.containsKey(o)) { NBTTagCompound cmptag = new NBTTagCompound(); cmptag.setString("key", (String) ThaumcraftModule.Aspect_getName.invoke(o)); - cmptag.setInteger("value", (Integer) tileAspects.get(o)); + cmptag.setInteger("value", tileAspects.get(o)); aspects.appendTag(cmptag); } else { NBTTagCompound cmptag = new NBTTagCompound(); cmptag.setString("key", "???"); - cmptag.setInteger("value", (Integer) tileAspects.get(o)); + cmptag.setInteger("value", tileAspects.get(o)); aspects.appendTag(cmptag); } } } - // for (int i = 0; i < aspects.tagCount(); i++){ - // System.out.printf("%s : %s\n", aspects.getCompoundTagAt(i).getString("key"), - // aspects.getCompoundTagAt(i).getString("value")); - // } - } catch (Exception e) { throw new RuntimeException(e); } diff --git a/src/main/java/mcp/mobius/waila/addons/thaumcraft/ThaumcraftModule.java b/src/main/java/mcp/mobius/waila/addons/thaumcraft/ThaumcraftModule.java index 14134a8..9023b33 100644 --- a/src/main/java/mcp/mobius/waila/addons/thaumcraft/ThaumcraftModule.java +++ b/src/main/java/mcp/mobius/waila/addons/thaumcraft/ThaumcraftModule.java @@ -34,8 +34,6 @@ public class ThaumcraftModule { public static Class IGoggles = null; - // public static Class TileAlchemyFurnace = null; - public static void register() { try { Thaumcraft = Class.forName("thaumcraft.common.Thaumcraft"); @@ -69,10 +67,8 @@ public class ThaumcraftModule { } catch (ClassNotFoundException e) { Waila.log.log(Level.WARN, "[Thaumcraft] Class not found. " + e); - return; } catch (Exception e) { Waila.log.log(Level.WARN, "[Thaumcraft] Unhandled exception." + e); - return; } } diff --git a/src/main/java/mcp/mobius/waila/addons/thermaldynamics/ThermalDynamicsModule.java b/src/main/java/mcp/mobius/waila/addons/thermaldynamics/ThermalDynamicsModule.java index 087a09f..2266055 100644 --- a/src/main/java/mcp/mobius/waila/addons/thermaldynamics/ThermalDynamicsModule.java +++ b/src/main/java/mcp/mobius/waila/addons/thermaldynamics/ThermalDynamicsModule.java @@ -7,7 +7,7 @@ import mcp.mobius.waila.api.impl.ModuleRegistrar; public class ThermalDynamicsModule { - public static Class TileFluidDuct = null; + public static Class TileFluidDuct = null; public static void register() { // XXX : We register the Fluiduct @@ -23,17 +23,6 @@ public class ThermalDynamicsModule { } catch (Exception e) { Waila.log.log(Level.WARN, "[Thermal Dynamics] Error while loading FluidDuct hooks." + e); } - - // XXX : We register the IBlockInfo interface - /* - * try{ IBlockInfo = Class.forName("cofh.api.block.IBlockInfo"); IBlockInfo_getBlockInfo = - * IBlockInfo.getMethod("getBlockInfo", IBlockAccess.class, int.class, int.class, int.class, - * ForgeDirection.class, EntityPlayer.class, List.class, boolean.class); - * //ModuleRegistrar.instance().addConfigRemote("Thermal Expansion", "thermalexpansion.energyhandler"); - * ModuleRegistrar.instance().registerBodyProvider(new HUDHandlerIBlockInfo(), IBlockInfo); - * ModuleRegistrar.instance().registerNBTProvider (new HUDHandlerIBlockInfo(), IBlockInfo); } catch (Exception - * e){ Waila.log.log(Level.WARN, "[Thermal Expansion] Error while loading IBlockInfo hooks." + e); } - */ } } diff --git a/src/main/java/mcp/mobius/waila/addons/thermalexpansion/HUDHandlerCache.java b/src/main/java/mcp/mobius/waila/addons/thermalexpansion/HUDHandlerCache.java index 9a3ef87..2ce28ed 100644 --- a/src/main/java/mcp/mobius/waila/addons/thermalexpansion/HUDHandlerCache.java +++ b/src/main/java/mcp/mobius/waila/addons/thermalexpansion/HUDHandlerCache.java @@ -91,9 +91,7 @@ public class HUDHandlerCache implements IWailaDataProvider { try { tag.setInteger("MaxStored", (Integer) ThermalExpansionModule.TileCache_getMaxStored.invoke(te)); tag.setInteger("Stored", (Integer) ThermalExpansionModule.TileCache_getStored.invoke(te)); - } catch (InvocationTargetException e) { - e.printStackTrace(); - } catch (IllegalAccessException e) { + } catch (InvocationTargetException | IllegalAccessException e) { e.printStackTrace(); } return tag; diff --git a/src/main/java/mcp/mobius/waila/addons/thermalexpansion/HUDHandlerIBlockInfo.java b/src/main/java/mcp/mobius/waila/addons/thermalexpansion/HUDHandlerIBlockInfo.java index 1c12ba8..21d72cc 100644 --- a/src/main/java/mcp/mobius/waila/addons/thermalexpansion/HUDHandlerIBlockInfo.java +++ b/src/main/java/mcp/mobius/waila/addons/thermalexpansion/HUDHandlerIBlockInfo.java @@ -44,7 +44,7 @@ public class HUDHandlerIBlockInfo implements IWailaDataProvider { public NBTTagCompound getNBTData(EntityPlayerMP player, TileEntity te, NBTTagCompound tag, World world, int x, int y, int z) { try { - List info = new ArrayList(); + List info = new ArrayList<>(); Block block = world.getBlock(x, y, z); ThermalExpansionModule.IBlockInfo_getBlockInfo .invoke(block, world, x, y, z, ForgeDirection.UNKNOWN, player, info, false); diff --git a/src/main/java/mcp/mobius/waila/addons/thermalexpansion/HUDHandlerISecureTile.java b/src/main/java/mcp/mobius/waila/addons/thermalexpansion/HUDHandlerISecureTile.java index 2fdb067..c525206 100644 --- a/src/main/java/mcp/mobius/waila/addons/thermalexpansion/HUDHandlerISecureTile.java +++ b/src/main/java/mcp/mobius/waila/addons/thermalexpansion/HUDHandlerISecureTile.java @@ -37,18 +37,12 @@ public class HUDHandlerISecureTile implements IWailaDataProvider { if (owner.equals("[None]")) return currenttip; - String access = "INVALID"; - switch (iaccess) { - case 0: - access = LangUtil.translateG("hud.msg.public"); - break; - case 1: - access = LangUtil.translateG("hud.msg.restricted"); - break; - case 2: - access = LangUtil.translateG("hud.msg.private"); - break; - } + String access = switch (iaccess) { + case 0 -> LangUtil.translateG("hud.msg.public"); + case 1 -> LangUtil.translateG("hud.msg.restricted"); + case 2 -> LangUtil.translateG("hud.msg.private"); + default -> "INVALID"; + }; currenttip.add( String.format("%s : \u00a7f%s\u00a7r [ %s ]", LangUtil.translateG("hud.msg.owner"), owner, access)); @@ -69,7 +63,7 @@ public class HUDHandlerISecureTile implements IWailaDataProvider { int y, int z) { try { String owner = (String) ThermalExpansionModule.ISecureTile_getOwnerName.invoke(te); - int access = ((Enum) ThermalExpansionModule.ISecureTile_getAccess.invoke(te)).ordinal(); + int access = ((Enum) ThermalExpansionModule.ISecureTile_getAccess.invoke(te)).ordinal(); tag.setString("Owner", owner); tag.setInteger("Access", access); diff --git a/src/main/java/mcp/mobius/waila/addons/thermalexpansion/ThermalExpansionModule.java b/src/main/java/mcp/mobius/waila/addons/thermalexpansion/ThermalExpansionModule.java index 19e854a..2ee5b42 100644 --- a/src/main/java/mcp/mobius/waila/addons/thermalexpansion/ThermalExpansionModule.java +++ b/src/main/java/mcp/mobius/waila/addons/thermalexpansion/ThermalExpansionModule.java @@ -12,45 +12,42 @@ import mcp.mobius.waila.api.impl.ModuleRegistrar; public class ThermalExpansionModule { - public static Class IEnergyProvider = null; + public static Class IEnergyProvider = null; public static Method IEnergyProvider_getMaxStorage = null; public static Method IEnergyProvider_getCurStorage = null; - public static Class IEnergyReceiver = null; + public static Class IEnergyReceiver = null; public static Method IEnergyReceiver_getMaxStorage = null; public static Method IEnergyReceiver_getCurStorage = null; - public static Class IEnergyInfo = null; + public static Class IEnergyInfo = null; public static Method IEnergyInfo_getMaxStorage = null; public static Method IEnergyInfo_getCurStorage = null; - public static Class TileEnergyCell = null; + public static Class TileEnergyCell = null; public static Field TileEnergyCell_Recv = null; public static Field TileEnergyCell_Send = null; - public static Class TileTank = null; + public static Class TileTank = null; public static Method TileTank_getTankFluid = null; public static Method TileTank_getTankCapacity = null; public static Method TileTank_getTankAmount = null; public static Field TileTank_mode = null; - public static Class TileTesseract = null; + public static Class TileTesseract = null; public static Field TileTesseract_Item = null; public static Field TileTesseract_Fluid = null; public static Field TileTesseract_Energy = null; - public static Class ISecureTile = null; + public static Class ISecureTile = null; public static Method ISecureTile_getAccess = null; public static Method ISecureTile_getOwnerName = null; - public static Class TileCache = null; + public static Class TileCache = null; public static Method TileCache_getItemStack = null; public static Method TileCache_getMaxStored = null; public static Method TileCache_getStored = null; - public static Class BlockMultipart = null; - - public static Class IBlockInfo = null; public static Method IBlockInfo_getBlockInfo = null; public static void register() { @@ -138,8 +135,6 @@ public class ThermalExpansionModule { ModuleRegistrar.instance().addConfigRemote("Thermal Expansion", "thermalexpansion.owner"); ModuleRegistrar.instance().registerBodyProvider(new HUDHandlerISecureTile(), ISecureTile); ModuleRegistrar.instance().registerNBTProvider(new HUDHandlerISecureTile(), ISecureTile); - // ModuleRegistrar.instance().registerSyncedNBTKey("Owner", ISecureTile); - // ModuleRegistrar.instance().registerSyncedNBTKey("Access", ISecureTile); } catch (Exception e) { Waila.log.log(Level.WARN, "[Thermal Expansion] Error while loading ISecureTile hooks." + e); @@ -160,17 +155,6 @@ public class ThermalExpansionModule { } catch (Exception e) { Waila.log.log(Level.WARN, "[Thermal Expansion] Error while loading Tesseract hooks." + e); } - - // XXX : We register the IBlockInfo interface - /* - * try{ IBlockInfo = Class.forName("cofh.api.block.IBlockInfo"); IBlockInfo_getBlockInfo = - * IBlockInfo.getMethod("getBlockInfo", IBlockAccess.class, int.class, int.class, int.class, - * ForgeDirection.class, EntityPlayer.class, List.class, boolean.class); - * //ModuleRegistrar.instance().addConfigRemote("Thermal Expansion", "thermalexpansion.energyhandler"); - * ModuleRegistrar.instance().registerBodyProvider(new HUDHandlerIBlockInfo(), IBlockInfo); - * ModuleRegistrar.instance().registerNBTProvider (new HUDHandlerIBlockInfo(), IBlockInfo); } catch (Exception - * e){ Waila.log.log(Level.WARN, "[Thermal Expansion] Error while loading IBlockInfo hooks." + e); } - */ } } diff --git a/src/main/java/mcp/mobius/waila/addons/twilightforest/TwilightForestModule.java b/src/main/java/mcp/mobius/waila/addons/twilightforest/TwilightForestModule.java index 89e742b..97d9d52 100644 --- a/src/main/java/mcp/mobius/waila/addons/twilightforest/TwilightForestModule.java +++ b/src/main/java/mcp/mobius/waila/addons/twilightforest/TwilightForestModule.java @@ -7,14 +7,14 @@ import mcp.mobius.waila.api.impl.ModuleRegistrar; public class TwilightForestModule { - public static Class BlockTFRoots = null; - public static Class BlockTFPlant = null; - public static Class BlockTFSapling = null; + public static Class BlockTFRoots = null; + public static Class BlockTFPlant = null; + public static Class BlockTFSapling = null; public static void register() { try { - Class TwilightForestMod = Class.forName("twilightforest.TwilightForestMod"); + Class.forName("twilightforest.TwilightForestMod"); Waila.log.log(Level.INFO, "TwilightForestMod mod found."); } catch (ClassNotFoundException e) { Waila.log.log(Level.INFO, "[TwilightForestMod] TwilightForestMod mod not found."); diff --git a/src/main/java/mcp/mobius/waila/addons/vanillamc/HUDDecoratorVanilla.java b/src/main/java/mcp/mobius/waila/addons/vanillamc/HUDDecoratorVanilla.java index 087a7f9..b2b13d0 100644 --- a/src/main/java/mcp/mobius/waila/addons/vanillamc/HUDDecoratorVanilla.java +++ b/src/main/java/mcp/mobius/waila/addons/vanillamc/HUDDecoratorVanilla.java @@ -15,8 +15,6 @@ public class HUDDecoratorVanilla implements IWailaBlockDecorator { Tessellator tessellator = Tessellator.instance; - // UIHelper.drawBillboardText(itemStack.getDisplayName(), accessor.getRenderingPosition(), 0.5F, 1.5F, 0.5F, - // accessor.getPartialFrame()); UIHelper.drawFloatingText("IN", accessor.getRenderingPosition(), 0.5F, 0.2F, -0.2F, 90F, 0F, 0F); UIHelper.drawFloatingText("OUT", accessor.getRenderingPosition(), -0.2F, 0.2F, 0.5F, 90F, 90F, 0F); UIHelper.drawFloatingText("OUT", accessor.getRenderingPosition(), 1.2F, 0.2F, 0.5F, 90F, -90F, 0F); diff --git a/src/main/java/mcp/mobius/waila/addons/vanillamc/HUDHandlerFurnace.java b/src/main/java/mcp/mobius/waila/addons/vanillamc/HUDHandlerFurnace.java index 165e9e1..5ae680a 100644 --- a/src/main/java/mcp/mobius/waila/addons/vanillamc/HUDHandlerFurnace.java +++ b/src/main/java/mcp/mobius/waila/addons/vanillamc/HUDHandlerFurnace.java @@ -87,8 +87,5 @@ public class HUDHandlerFurnace implements IWailaDataProvider { return tag; } - public static void register() { - // ModuleRegistrar.instance().registerBodyProvider(new HUDHandlerFurnace(), TileEntityFurnace.class); - // ModuleRegistrar.instance().registerNBTProvider(new HUDHandlerFurnace(), TileEntityFurnace.class); - } + public static void register() {} } diff --git a/src/main/java/mcp/mobius/waila/addons/vanillamc/HUDHandlerVanilla.java b/src/main/java/mcp/mobius/waila/addons/vanillamc/HUDHandlerVanilla.java index 3199058..fea15c4 100644 --- a/src/main/java/mcp/mobius/waila/addons/vanillamc/HUDHandlerVanilla.java +++ b/src/main/java/mcp/mobius/waila/addons/vanillamc/HUDHandlerVanilla.java @@ -55,16 +55,12 @@ public class HUDHandlerVanilla implements IWailaDataProvider { if (block == silverfish && config.getConfig("vanilla.silverfish")) { int metadata = accessor.getMetadata(); - switch (metadata) { - case 0: - return new ItemStack(Blocks.stone); - case 1: - return new ItemStack(Blocks.cobblestone); - case 2: - return new ItemStack(Blocks.brick_block); - default: - return null; - } + return switch (metadata) { + case 0 -> new ItemStack(Blocks.stone); + case 1 -> new ItemStack(Blocks.cobblestone); + case 2 -> new ItemStack(Blocks.brick_block); + default -> null; + }; } if (block == redstone) { @@ -206,9 +202,7 @@ public class HUDHandlerVanilla implements IWailaDataProvider { if (config.getConfig("vanilla.comparator")) if ((block == comparatorIdl) || (block == comparatorAct)) { String mode = ((accessor.getMetadata() >> 2) & 1) == 0 ? LangUtil.translateG("hud.msg.comparator") : LangUtil.translateG("hud.msg.substractor"); - // int outputSignal = ((TileEntityComparator)entity).func_96100_a(); currenttip.add("Mode : " + mode); - // currenttip.add(String.format("Out : %s", outputSignal)); return currenttip; } @@ -217,13 +211,6 @@ public class HUDHandlerVanilla implements IWailaDataProvider { return currenttip; } - /* - * if (config.getConfig("vanilla.jukebox")) if (block == jukebox){ NBTTagCompound tag = accessor.getNBTData(); - * Item record = null; if (tag.hasKey("Record")){ record = Item.itemsList[accessor.getNBTInteger(tag, - * "Record")]; currenttip.add(((ItemRecord)record).getRecordTitle()); } else { - * currenttip.add(LangUtil.translateG("hud.msg.empty")); } } - */ - return currenttip; } @@ -266,7 +253,6 @@ public class HUDHandlerVanilla implements IWailaDataProvider { ModuleRegistrar.instance().registerStackProvider(provider, BlockStoneSlab.class); ModuleRegistrar.instance().registerStackProvider(provider, BlockWoodSlab.class); - // ModuleRegistrar.instance().registerStackProvider(provider, Block.class); ModuleRegistrar.instance().registerHeadProvider(provider, mobSpawner.getClass()); ModuleRegistrar.instance().registerHeadProvider(provider, melonStem.getClass()); ModuleRegistrar.instance().registerHeadProvider(provider, pumpkinStem.getClass()); @@ -274,8 +260,7 @@ public class HUDHandlerVanilla implements IWailaDataProvider { ModuleRegistrar.instance().registerBodyProvider(provider, crops.getClass()); ModuleRegistrar.instance().registerBodyProvider(provider, melonStem.getClass()); ModuleRegistrar.instance().registerBodyProvider(provider, pumpkinStem.getClass()); - // ModuleRegistrar.instance().registerBodyProvider(provider, carrot.getClass()); - // ModuleRegistrar.instance().registerBodyProvider(provider, potato.getClass()); + ModuleRegistrar.instance().registerBodyProvider(provider, lever.getClass()); ModuleRegistrar.instance().registerBodyProvider(provider, repeaterIdle.getClass()); ModuleRegistrar.instance().registerBodyProvider(provider, repeaterActv.getClass()); @@ -303,10 +288,6 @@ public class HUDHandlerVanilla implements IWailaDataProvider { ModuleRegistrar.instance().registerNBTProvider(provider, cocoa.getClass()); ModuleRegistrar.instance().registerNBTProvider(provider, netherwart.getClass()); ModuleRegistrar.instance().registerNBTProvider(provider, silverfish.getClass()); - - // ModuleRegistrar.instance().registerDocTextFile("/mcp/mobius/waila/addons/vanillamc/WikiData.csv"); - - // ExternalModulesHandler.instance().registerBlockDecorator(new HUDDecoratorVanilla(), repeaterIdle); } } diff --git a/src/main/java/mcp/mobius/waila/api/ITaggedList.java b/src/main/java/mcp/mobius/waila/api/ITaggedList.java index 543750c..642e8e1 100644 --- a/src/main/java/mcp/mobius/waila/api/ITaggedList.java +++ b/src/main/java/mcp/mobius/waila/api/ITaggedList.java @@ -6,25 +6,25 @@ import java.util.Set; public interface ITaggedList extends List { - public boolean add(E e, T tag); + boolean add(E e, T tag); - public boolean add(E e, Collection taglst); + boolean add(E e, Collection taglst); - public Set getTags(E e); + Set getTags(E e); - public Set getTags(int index); + Set getTags(int index); - public void addTag(E e, T tag); + void addTag(E e, T tag); - public void addTag(int index, T tag); + void addTag(int index, T tag); - public void removeTag(E e, T tag); + void removeTag(E e, T tag); - public void removeTag(int index, T tag); + void removeTag(int index, T tag); - public Set getEntries(T tag); + Set getEntries(T tag); - public void removeEntries(T tag); + void removeEntries(T tag); - public String getTagsAsString(E e); + String getTagsAsString(E e); } diff --git a/src/main/java/mcp/mobius/waila/api/IWailaConfigHandler.java b/src/main/java/mcp/mobius/waila/api/IWailaConfigHandler.java index 5a5e992..57db3b6 100644 --- a/src/main/java/mcp/mobius/waila/api/IWailaConfigHandler.java +++ b/src/main/java/mcp/mobius/waila/api/IWailaConfigHandler.java @@ -15,18 +15,15 @@ public interface IWailaConfigHandler { /** * Returns a set of all the currently loaded modules in the config handler. - * - * @return */ - public Set getModuleNames(); + Set getModuleNames(); /** * Returns all the currently available options for a given module * * @param modName Module name - * @return */ - public HashMap getConfigKeys(String modName); + HashMap getConfigKeys(String modName); /** * Returns the current value of an option (true/false) with a default value if not set. @@ -35,7 +32,7 @@ public interface IWailaConfigHandler { * @param defvalue Default values * @return Value of the option or defvalue if not set. */ - public boolean getConfig(String key, boolean defvalue); + boolean getConfig(String key, boolean defvalue); /** * Returns the current value of an option (true/false) with a default value true if not set @@ -43,5 +40,5 @@ public interface IWailaConfigHandler { * @param key Option to lookup * @return Value of the option or true if not set. */ - public boolean getConfig(String key); + boolean getConfig(String key); } diff --git a/src/main/java/mcp/mobius/waila/api/IWailaRegistrar.java b/src/main/java/mcp/mobius/waila/api/IWailaRegistrar.java index 3f4ae70..66874a1 100644 --- a/src/main/java/mcp/mobius/waila/api/IWailaRegistrar.java +++ b/src/main/java/mcp/mobius/waila/api/IWailaRegistrar.java @@ -23,58 +23,58 @@ package mcp.mobius.waila.api; public interface IWailaRegistrar { /* Add a config option in the section modname with displayed text configtext and access key keyname */ - public void addConfig(String modname, String keyname, String configtext); + void addConfig(String modname, String keyname, String configtext); - public void addConfig(String modname, String keyname, String configtext, boolean defvalue); + void addConfig(String modname, String keyname, String configtext, boolean defvalue); - public void addConfigRemote(String modname, String keyname, String configtext); + void addConfigRemote(String modname, String keyname, String configtext); - public void addConfigRemote(String modname, String keyname, String configtext, boolean defvalue); + void addConfigRemote(String modname, String keyname, String configtext, boolean defvalue); - public void addConfig(String modname, String keyname); + void addConfig(String modname, String keyname); - public void addConfig(String modname, String keyname, boolean defvalue); + void addConfig(String modname, String keyname, boolean defvalue); - public void addConfigRemote(String modname, String keyname); + void addConfigRemote(String modname, String keyname); - public void addConfigRemote(String modname, String keyname, boolean defvalue); + void addConfigRemote(String modname, String keyname, boolean defvalue); /* Register a stack overrider for the given blockID */ - public void registerStackProvider(IWailaDataProvider dataProvider, Class block); + void registerStackProvider(IWailaDataProvider dataProvider, Class block); /* Same thing, but works on a class hierarchy instead */ - public void registerHeadProvider(IWailaDataProvider dataProvider, Class block); + void registerHeadProvider(IWailaDataProvider dataProvider, Class block); - public void registerBodyProvider(IWailaDataProvider dataProvider, Class block); + void registerBodyProvider(IWailaDataProvider dataProvider, Class block); - public void registerTailProvider(IWailaDataProvider dataProvider, Class block); + void registerTailProvider(IWailaDataProvider dataProvider, Class block); /* Registering an NBT Provider provides a way to override the default "writeToNBT" way of doing things. */ - public void registerNBTProvider(IWailaDataProvider dataProvider, Class block); + void registerNBTProvider(IWailaDataProvider dataProvider, Class block); /* Entity text registration methods */ - public void registerHeadProvider(IWailaEntityProvider dataProvider, Class entity); + void registerHeadProvider(IWailaEntityProvider dataProvider, Class entity); - public void registerBodyProvider(IWailaEntityProvider dataProvider, Class entity); + void registerBodyProvider(IWailaEntityProvider dataProvider, Class entity); - public void registerTailProvider(IWailaEntityProvider dataProvider, Class entity); + void registerTailProvider(IWailaEntityProvider dataProvider, Class entity); - public void registerOverrideEntityProvider(IWailaEntityProvider dataProvider, Class entity); + void registerOverrideEntityProvider(IWailaEntityProvider dataProvider, Class entity); /* Registering an NBT Provider provides a way to override the default "writeToNBT" way of doing things. */ - public void registerNBTProvider(IWailaEntityProvider dataProvider, Class entity); + void registerNBTProvider(IWailaEntityProvider dataProvider, Class entity); /* FMP Providers */ - public void registerHeadProvider(IWailaFMPProvider dataProvider, String name); + void registerHeadProvider(IWailaFMPProvider dataProvider, String name); - public void registerBodyProvider(IWailaFMPProvider dataProvider, String name); + void registerBodyProvider(IWailaFMPProvider dataProvider, String name); - public void registerTailProvider(IWailaFMPProvider dataProvider, String name); + void registerTailProvider(IWailaFMPProvider dataProvider, String name); /* The block decorators */ - public void registerDecorator(IWailaBlockDecorator decorator, Class block); + void registerDecorator(IWailaBlockDecorator decorator, Class block); - public void registerDecorator(IWailaFMPDecorator decorator, String name); + void registerDecorator(IWailaFMPDecorator decorator, String name); /* * Selective NBT key syncing. Will register a key to sync over the network for the given class (block, te or ent). @@ -83,11 +83,7 @@ public interface IWailaRegistrar { * is deprecated in favor to registerNBTProvider. It will be removed in MC 1.8 !!! */ @Deprecated - public void registerSyncedNBTKey(String key, Class target); + void registerSyncedNBTKey(String key, Class target); - public void registerTooltipRenderer(String name, IWailaTooltipRenderer renderer); - - /* UNUSED FOR NOW (Will be used for the ingame wiki */ - // public void registerDocTextFile (String filename); - // public void registerShortDataProvider (IWailaSummaryProvider dataProvider, Class item); + void registerTooltipRenderer(String name, IWailaTooltipRenderer renderer); } diff --git a/src/main/java/mcp/mobius/waila/api/IWailaSummaryProvider.java b/src/main/java/mcp/mobius/waila/api/IWailaSummaryProvider.java index 8a25864..fa8a207 100644 --- a/src/main/java/mcp/mobius/waila/api/IWailaSummaryProvider.java +++ b/src/main/java/mcp/mobius/waila/api/IWailaSummaryProvider.java @@ -5,18 +5,8 @@ import java.util.LinkedHashMap; import net.minecraft.item.ItemStack; public interface IWailaSummaryProvider { + /* This interface is used to control the display data in the description screen */ - - /* BASIC TOOLS & ITEMS DATA */ - // EnumToolMaterial getMaterial(ItemStack stack); - // String getMaterialName(ItemStack stack); - // String getEffectiveBlock(ItemStack stack); - // int getHarvestLevel(ItemStack stack); - // float getEfficiencyOnProperMaterial(ItemStack stack); - // int getEnchantability(ItemStack stack); - // int getDamageVsEntity(ItemStack stack); - // int getDurability(ItemStack stack); - LinkedHashMap getSummary(ItemStack stack, LinkedHashMap currentSummary, IWailaConfigHandler config); } diff --git a/src/main/java/mcp/mobius/waila/api/SpecialChars.java b/src/main/java/mcp/mobius/waila/api/SpecialChars.java index 593ed2d..fa3c760 100644 --- a/src/main/java/mcp/mobius/waila/api/SpecialChars.java +++ b/src/main/java/mcp/mobius/waila/api/SpecialChars.java @@ -67,17 +67,13 @@ public class SpecialChars { /** * Helper method to get a proper RENDER string. Just put the name of the renderer and the params in, and it will * give back a directly usable String for the tooltip. - * - * @param name - * @param params - * @return */ public static String getRenderString(String name, String... params) { - String result = RENDER + "{" + name; + StringBuilder result = new StringBuilder(RENDER + "{" + name); for (String s : params) { - result += "," + s; + result.append(",").append(s); } - result += "}"; - return result; + result.append("}"); + return result.toString(); } } diff --git a/src/main/java/mcp/mobius/waila/api/impl/ConfigHandler.java b/src/main/java/mcp/mobius/waila/api/impl/ConfigHandler.java index be1710b..b38448c 100644 --- a/src/main/java/mcp/mobius/waila/api/impl/ConfigHandler.java +++ b/src/main/java/mcp/mobius/waila/api/impl/ConfigHandler.java @@ -29,9 +29,9 @@ public class ConfigHandler implements IWailaConfigHandler { } /* === */ - private LinkedHashMap modules = new LinkedHashMap(); - private ArrayList serverconfigs = new ArrayList(); - public HashMap forcedConfigs = new HashMap(); + private LinkedHashMap modules = new LinkedHashMap<>(); + private ArrayList serverconfigs = new ArrayList<>(); + public HashMap forcedConfigs = new HashMap<>(); public Configuration config = null; public void addModule(String modName, HashMap options) { diff --git a/src/main/java/mcp/mobius/waila/api/impl/ConfigModule.java b/src/main/java/mcp/mobius/waila/api/impl/ConfigModule.java index 0a7d035..0a80ad8 100644 --- a/src/main/java/mcp/mobius/waila/api/impl/ConfigModule.java +++ b/src/main/java/mcp/mobius/waila/api/impl/ConfigModule.java @@ -9,7 +9,7 @@ public class ConfigModule { public ConfigModule(String _modName) { this.modName = _modName; - this.options = new HashMap(); + this.options = new HashMap<>(); } public ConfigModule(String _modName, HashMap _options) { diff --git a/src/main/java/mcp/mobius/waila/api/impl/DataAccessorCommon.java b/src/main/java/mcp/mobius/waila/api/impl/DataAccessorCommon.java index 11d3c20..550ebaf 100644 --- a/src/main/java/mcp/mobius/waila/api/impl/DataAccessorCommon.java +++ b/src/main/java/mcp/mobius/waila/api/impl/DataAccessorCommon.java @@ -57,7 +57,7 @@ public class DataAccessorCommon implements IWailaCommonAccessor, IWailaDataAcces this.blockResource = GameData.getBlockRegistry().getNameForObject(this.block); try { this.stack = new ItemStack(this.block, 1, this.metadata); - } catch (Exception e) {} + } catch (Exception ignored) {} } else if (this.mop.typeOfHit == MovingObjectType.ENTITY) { this.block = null; @@ -131,7 +131,7 @@ public class DataAccessorCommon implements IWailaCommonAccessor, IWailaDataAcces NBTTagCompound tag = new NBTTagCompound(); try { this.tileEntity.writeToNBT(tag); - } catch (Exception e) {} + } catch (Exception ignored) {} return tag; } diff --git a/src/main/java/mcp/mobius/waila/api/impl/MetaDataProvider.java b/src/main/java/mcp/mobius/waila/api/impl/MetaDataProvider.java index a492277..8bf8392 100644 --- a/src/main/java/mcp/mobius/waila/api/impl/MetaDataProvider.java +++ b/src/main/java/mcp/mobius/waila/api/impl/MetaDataProvider.java @@ -10,7 +10,6 @@ import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.tileentity.TileEntity; import net.minecraft.util.MovingObjectPosition; import net.minecraft.world.World; @@ -26,23 +25,19 @@ import mcp.mobius.waila.utils.WailaExceptionHandler; public class MetaDataProvider { - private Map> headBlockProviders = new TreeMap>(); - private Map> bodyBlockProviders = new TreeMap>(); - private Map> tailBlockProviders = new TreeMap>(); + private final Map> headBlockProviders = new TreeMap<>(); + private final Map> bodyBlockProviders = new TreeMap<>(); + private Map> tailBlockProviders = new TreeMap<>(); - private Map> headEntityProviders = new TreeMap>(); - private Map> bodyEntityProviders = new TreeMap>(); - private Map> tailEntityProviders = new TreeMap>(); - - private Class prevBlock = null; - private Class prevTile = null; + private final Map> headEntityProviders = new TreeMap<>(); + private final Map> bodyEntityProviders = new TreeMap<>(); + private final Map> tailEntityProviders = new TreeMap<>(); public ItemStack identifyBlockHighlight(World world, EntityPlayer player, MovingObjectPosition mop, DataAccessorCommon accessor) { Block block = accessor.getBlock(); - int blockID = accessor.getBlockID(); - if (IWailaBlock.class.isInstance(block)) { + if (block instanceof IWailaBlock) { try { return ((IWailaBlock) block).getWailaStack(accessor, ConfigHandler.instance()); } catch (Throwable e) { @@ -73,7 +68,7 @@ public class MetaDataProvider { && accessor.isTimeElapsed(250) && ConfigHandler.instance().showTooltip()) { accessor.resetTimer(); - HashSet keys = new HashSet(); + HashSet keys = new HashSet<>(); if (ModuleRegistrar.instance().hasSyncedNBTKeys(block)) keys.addAll(ModuleRegistrar.instance().getSyncedNBTKeys(block)); @@ -81,7 +76,7 @@ public class MetaDataProvider { if (ModuleRegistrar.instance().hasSyncedNBTKeys(accessor.getTileEntity())) keys.addAll(ModuleRegistrar.instance().getSyncedNBTKeys(accessor.getTileEntity())); - if (keys.size() != 0 || ModuleRegistrar.instance().hasNBTProviders(block) + if (!keys.isEmpty() || ModuleRegistrar.instance().hasNBTProviders(block) || ModuleRegistrar.instance().hasNBTProviders(accessor.getTileEntity())) WailaPacketHandler.INSTANCE.sendToServer(new Message0x01TERequest(accessor.getTileEntity(), keys)); @@ -99,8 +94,7 @@ public class MetaDataProvider { } /* Interface IWailaBlock */ - if (IWailaBlock.class.isInstance(block)) { - TileEntity entity = world.getTileEntity(mop.blockX, mop.blockY, mop.blockZ); + if (block instanceof IWailaBlock) { if (layout == Layout.HEADER) try { return ((IWailaBlock) block).getWailaHead(itemStack, currenttip, accessor, ConfigHandler.instance()); } catch (Throwable e) { @@ -173,12 +167,12 @@ public class MetaDataProvider { if (accessor.getEntity() != null && Waila.instance.serverPresent && accessor.isTimeElapsed(250)) { accessor.resetTimer(); - HashSet keys = new HashSet(); + HashSet keys = new HashSet<>(); if (ModuleRegistrar.instance().hasSyncedNBTKeys(accessor.getEntity())) keys.addAll(ModuleRegistrar.instance().getSyncedNBTKeys(accessor.getEntity())); - if (keys.size() != 0 || ModuleRegistrar.instance().hasNBTEntityProviders(accessor.getEntity())) + if (!keys.isEmpty() || ModuleRegistrar.instance().hasNBTEntityProviders(accessor.getEntity())) WailaPacketHandler.INSTANCE.sendToServer(new Message0x03EntRequest(accessor.getEntity(), keys)); } else if (accessor.getEntity() != null && !Waila.instance.serverPresent && accessor.isTimeElapsed(250)) { diff --git a/src/main/java/mcp/mobius/waila/api/impl/ModuleRegistrar.java b/src/main/java/mcp/mobius/waila/api/impl/ModuleRegistrar.java index efa1f83..9ad57c0 100644 --- a/src/main/java/mcp/mobius/waila/api/impl/ModuleRegistrar.java +++ b/src/main/java/mcp/mobius/waila/api/impl/ModuleRegistrar.java @@ -29,34 +29,34 @@ public class ModuleRegistrar implements IWailaRegistrar { private static ModuleRegistrar instance = null; - public LinkedHashMap> headBlockProviders = new LinkedHashMap>(); - public LinkedHashMap> bodyBlockProviders = new LinkedHashMap>(); - public LinkedHashMap> tailBlockProviders = new LinkedHashMap>(); - public LinkedHashMap> stackBlockProviders = new LinkedHashMap>(); - public LinkedHashMap> NBTDataProviders = new LinkedHashMap>(); + public LinkedHashMap> headBlockProviders = new LinkedHashMap<>(); + public LinkedHashMap> bodyBlockProviders = new LinkedHashMap<>(); + public LinkedHashMap> tailBlockProviders = new LinkedHashMap<>(); + public LinkedHashMap> stackBlockProviders = new LinkedHashMap<>(); + public LinkedHashMap> NBTDataProviders = new LinkedHashMap<>(); - public LinkedHashMap> blockClassDecorators = new LinkedHashMap>(); + public LinkedHashMap> blockClassDecorators = new LinkedHashMap<>(); - public LinkedHashMap> headEntityProviders = new LinkedHashMap>(); - public LinkedHashMap> bodyEntityProviders = new LinkedHashMap>(); - public LinkedHashMap> tailEntityProviders = new LinkedHashMap>(); - public LinkedHashMap> overrideEntityProviders = new LinkedHashMap>(); - public LinkedHashMap> NBTEntityProviders = new LinkedHashMap>(); + public LinkedHashMap> headEntityProviders = new LinkedHashMap<>(); + public LinkedHashMap> bodyEntityProviders = new LinkedHashMap<>(); + public LinkedHashMap> tailEntityProviders = new LinkedHashMap<>(); + public LinkedHashMap> overrideEntityProviders = new LinkedHashMap<>(); + public LinkedHashMap> NBTEntityProviders = new LinkedHashMap<>(); - public LinkedHashMap> headFMPProviders = new LinkedHashMap>(); - public LinkedHashMap> bodyFMPProviders = new LinkedHashMap>(); - public LinkedHashMap> tailFMPProviders = new LinkedHashMap>(); + public LinkedHashMap> headFMPProviders = new LinkedHashMap<>(); + public LinkedHashMap> bodyFMPProviders = new LinkedHashMap<>(); + public LinkedHashMap> tailFMPProviders = new LinkedHashMap<>(); - public LinkedHashMap> FMPClassDecorators = new LinkedHashMap>(); + public LinkedHashMap> FMPClassDecorators = new LinkedHashMap<>(); - public LinkedHashMap> syncedNBTKeys = new LinkedHashMap>(); + public LinkedHashMap> syncedNBTKeys = new LinkedHashMap<>(); - public LinkedHashMap>> wikiDescriptions = new LinkedHashMap>>(); - public LinkedHashMap> summaryProviders = new LinkedHashMap>(); + public LinkedHashMap>> wikiDescriptions = new LinkedHashMap<>(); + public LinkedHashMap> summaryProviders = new LinkedHashMap<>(); - public LinkedHashMap IMCRequests = new LinkedHashMap(); + public LinkedHashMap IMCRequests = new LinkedHashMap<>(); - public LinkedHashMap tooltipRenderers = new LinkedHashMap(); + public LinkedHashMap tooltipRenderers = new LinkedHashMap<>(); private ModuleRegistrar() { instance = this; @@ -201,7 +201,7 @@ public class ModuleRegistrar implements IWailaRegistrar { dataProvider.getClass().getName(), clazz)); - if (!target.containsKey(clazz)) target.put(clazz, new ArrayList()); + if (!target.containsKey(clazz)) target.put(clazz, new ArrayList<>()); ArrayList providers = target.get(clazz); if (providers.contains(dataProvider)) return; @@ -212,7 +212,7 @@ public class ModuleRegistrar implements IWailaRegistrar { @Deprecated @Override public void registerSyncedNBTKey(String key, Class target) { - if (!this.syncedNBTKeys.containsKey(target)) this.syncedNBTKeys.put(target, new HashSet()); + if (!this.syncedNBTKeys.containsKey(target)) this.syncedNBTKeys.put(target, new HashSet<>()); this.syncedNBTKeys.get(target).add(key); } @@ -298,7 +298,7 @@ public class ModuleRegistrar implements IWailaRegistrar { } private Map> getProviders(Object obj, LinkedHashMap> target) { - Map> returnList = new TreeMap>(); + Map> returnList = new TreeMap<>(); Integer index = 0; for (Class clazz : target.keySet()) { @@ -311,14 +311,14 @@ public class ModuleRegistrar implements IWailaRegistrar { } private Map> getProviders(String name, LinkedHashMap> target) { - Map> returnList = new TreeMap>(); + Map> returnList = new TreeMap<>(); returnList.put(0, target.get(name)); return returnList; } @Deprecated public HashSet getSyncedNBTKeys(Object target) { - HashSet returnList = new HashSet(); + HashSet returnList = new HashSet<>(); for (Class clazz : this.syncedNBTKeys.keySet()) if (clazz.isInstance(target)) returnList.addAll(this.syncedNBTKeys.get(clazz)); @@ -407,24 +407,6 @@ public class ModuleRegistrar implements IWailaRegistrar { } /* ----------------- */ - /* - * @Override public void registerDocTextFile(String filename) { List docData = null; int nentries = 0; - * try{ docData = this.readFileAsString(filename); } catch (IOException e){ Waila.log.log(Level.WARN, - * String.format("Error while accessing file %s : %s", filename, e)); return; } for (String[] ss : docData){ String - * modid = ss[0]; String name = ss[1]; String meta = ss[2]; String desc = ss[5].replace('$', '\n'); if - * (!(desc.trim().equals(""))){ if (!this.wikiDescriptions.containsKey(modid)) this.wikiDescriptions.put(modid, new - * LinkedHashMap >()); if - * (!this.wikiDescriptions.get(modid).containsKey(name)) this.wikiDescriptions.get(modid).put(name, new - * LinkedHashMap()); this.wikiDescriptions.get(modid).get(name).put(meta, desc); - * System.out.printf("Registered %s %s %s\n", modid, name, meta); nentries += 1; } } // String[] sections = - * docData.split(">>>>"); // for (String s : sections){ // s.trim(); // if (!s.equals("")){ // try{ // String name = - * s.split("\r?\n",2)[0].trim(); // String desc = s.split("\r?\n",2)[1].trim(); // if - * (!this.wikiDescriptions.containsKey(modid)) // this.wikiDescriptions.put(modid, new LinkedHashMap ()); // this.wikiDescriptions.get(modid).put(name, desc); // nentries += 1; // }catch (Exception e){ // - * System.out.printf("%s\n", e); // } // } // } Waila.log.log(Level.INFO, - * String.format("Registered %s entries from %s", nentries, filename)); } - */ - public boolean hasDocTextModID(String modid) { return this.wikiDescriptions.containsKey(modid); } @@ -465,10 +447,6 @@ public class ModuleRegistrar implements IWailaRegistrar { } private List readFileAsString(String filePath) throws IOException { - // URL fileURL = this.getClass().getResource(filePath); - // File filedata = new File(fileURL); - // Reader paramReader = new InputStreamReader(this.getClass().getResourceAsStream(filePath)); - InputStream in = getClass().getResourceAsStream(filePath); BufferedReader input = new BufferedReader(new InputStreamReader(in)); CSVReader reader = new CSVReader(input); @@ -477,10 +455,5 @@ public class ModuleRegistrar implements IWailaRegistrar { reader.close(); return myEntries; - /* - * StringBuffer fileData = new StringBuffer(); //BufferedReader reader = new BufferedReader(paramReader); char[] - * buf = new char[1024]; int numRead=0; while((numRead=input.read(buf)) != -1){ String readData = - * String.valueOf(buf, 0, numRead); fileData.append(readData); } input.close(); return fileData.toString(); - */ } } diff --git a/src/main/java/mcp/mobius/waila/api/impl/TipList.java b/src/main/java/mcp/mobius/waila/api/impl/TipList.java index ad64252..c96e235 100644 --- a/src/main/java/mcp/mobius/waila/api/impl/TipList.java +++ b/src/main/java/mcp/mobius/waila/api/impl/TipList.java @@ -12,18 +12,18 @@ import mcp.mobius.waila.api.ITaggedList; public class TipList extends ArrayList implements ITaggedList { - Map> tags = new HashMap(); + Map> tags = new HashMap<>(); @Override public boolean add(E e, T tag) { - if (!tags.containsKey(e)) tags.put(e, new HashSet()); + if (!tags.containsKey(e)) tags.put(e, new HashSet<>()); tags.get(e).add(tag); return super.add(e); } @Override public boolean add(E e, Collection taglst) { - if (!tags.containsKey(e)) tags.put(e, new HashSet()); + if (!tags.containsKey(e)) tags.put(e, new HashSet<>()); tags.get(e).addAll(taglst); return super.add(e); @@ -33,7 +33,7 @@ public class TipList extends ArrayList implements ITaggedList { public Set getTags(E e) { Set ret = tags.get(e); if (ret == null && this.contains(e)) { - tags.put(e, new HashSet()); + tags.put(e, new HashSet<>()); ret = tags.get(e); } return ret; @@ -46,7 +46,7 @@ public class TipList extends ArrayList implements ITaggedList { @Override public void addTag(E e, T tag) { - if (this.contains(e) && !tags.containsKey(e)) tags.put(e, new HashSet()); + if (this.contains(e) && !tags.containsKey(e)) tags.put(e, new HashSet<>()); tags.get(e).add(tag); } @@ -58,7 +58,7 @@ public class TipList extends ArrayList implements ITaggedList { @Override public void removeTag(E e, T tag) { - if (this.contains(e) && !tags.containsKey(e)) tags.put(e, new HashSet()); + if (this.contains(e) && !tags.containsKey(e)) tags.put(e, new HashSet<>()); tags.get(e).remove(tag); } @@ -70,7 +70,7 @@ public class TipList extends ArrayList implements ITaggedList { @Override public Set getEntries(T tag) { - Set ret = new HashSet(); + Set ret = new HashSet<>(); for (Entry> s : tags.entrySet()) { if (s.getValue().contains(tag)) ret.add(s.getKey()); } @@ -84,12 +84,13 @@ public class TipList extends ArrayList implements ITaggedList { @Override public String getTagsAsString(E e) { - String ret = ""; - for (T s : tags.get(e)) ret += s.toString() + ","; + StringBuilder ret = new StringBuilder(); + for (T s : tags.get(e)) ret.append(s.toString()).append(","); - if (ret.length() > 0) ret = ret.substring(0, ret.length() - 1); + // noinspection SizeReplaceableByIsEmpty + if (ret.length() > 0) ret = new StringBuilder(ret.substring(0, ret.length() - 1)); - return ret; + return ret.toString(); } @Override diff --git a/src/main/java/mcp/mobius/waila/cbcore/LangUtil.java b/src/main/java/mcp/mobius/waila/cbcore/LangUtil.java index 3dacafd..2dd3977 100644 --- a/src/main/java/mcp/mobius/waila/cbcore/LangUtil.java +++ b/src/main/java/mcp/mobius/waila/cbcore/LangUtil.java @@ -4,7 +4,7 @@ import java.io.BufferedReader; import java.io.IOException; import java.io.InputStream; import java.io.InputStreamReader; -import java.util.SortedSet; +import java.nio.charset.StandardCharsets; import net.minecraft.client.Minecraft; import net.minecraft.client.resources.IResource; @@ -37,16 +37,16 @@ public class LangUtil { public String translate(String s, Object... format) { if (prefix != null && !s.startsWith(prefix + ".")) s = prefix + "." + s; String ret = LanguageRegistry.instance().getStringLocalization(s); - if (ret.length() == 0) ret = LanguageRegistry.instance().getStringLocalization(s, "en_US"); - if (ret.length() == 0) ret = StatCollector.translateToLocal(s); - if (ret.length() == 0) return s; + if (ret.isEmpty()) ret = LanguageRegistry.instance().getStringLocalization(s, "en_US"); + if (ret.isEmpty()) ret = StatCollector.translateToLocal(s); + if (ret.isEmpty()) return s; if (format.length > 0) ret = String.format(ret, format); return ret; } public void addLangFile(InputStream resource, String lang) throws IOException { LanguageRegistry reg = LanguageRegistry.instance(); - BufferedReader reader = new BufferedReader(new InputStreamReader(resource, "UTF-8")); + BufferedReader reader = new BufferedReader(new InputStreamReader(resource, StandardCharsets.UTF_8)); while (true) { String read = reader.readLine(); if (read == null) break; @@ -68,7 +68,7 @@ public class LangUtil { @SideOnly(Side.CLIENT) public LangUtil addLangDir(ResourceLocation dir) { IResourceManager resManager = Minecraft.getMinecraft().getResourceManager(); - for (Language lang : (SortedSet) Minecraft.getMinecraft().getLanguageManager().getLanguages()) { + for (Language lang : Minecraft.getMinecraft().getLanguageManager().getLanguages()) { String langID = lang.getLanguageCode(); IResource langRes; try { diff --git a/src/main/java/mcp/mobius/waila/client/ProxyClient.java b/src/main/java/mcp/mobius/waila/client/ProxyClient.java index 9b15473..cb4466a 100644 --- a/src/main/java/mcp/mobius/waila/client/ProxyClient.java +++ b/src/main/java/mcp/mobius/waila/client/ProxyClient.java @@ -26,8 +26,6 @@ public class ProxyClient extends ProxyServer { TrueTypeFont minecraftiaFont; - // public static LangUtil lang = LangUtil.loadLangDir("waila"); - public ProxyClient() {} @Override @@ -35,8 +33,6 @@ public class ProxyClient extends ProxyServer { LangUtil.loadLangDir("waila"); - // TickRegistry.registerTickHandler(WailaTickHandler.instance(), Side.CLIENT); - if (Loader.isModLoaded("NotEnoughItems")) { try { Class.forName("mcp.mobius.waila.handlers.nei.NEIHandler").getDeclaredMethod("register").invoke(null); @@ -55,8 +51,6 @@ public class ProxyClient extends ProxyServer { ModuleRegistrar.instance().registerBodyProvider(new HUDHandlerEntities(), Entity.class); ModuleRegistrar.instance().registerTailProvider(new HUDHandlerEntities(), Entity.class); - // ModuleRegistrar.instance().registerShortDataProvider(new SummaryProviderDefault(), Item.class); - ModuleRegistrar.instance().addConfig("General", "general.showents"); ModuleRegistrar.instance().addConfig("General", "general.showhp"); ModuleRegistrar.instance().addConfig("General", "general.showcrop"); diff --git a/src/main/java/mcp/mobius/waila/commands/CommandDumpHandlers.java b/src/main/java/mcp/mobius/waila/commands/CommandDumpHandlers.java index 7f0a38c..c3e12e4 100644 --- a/src/main/java/mcp/mobius/waila/commands/CommandDumpHandlers.java +++ b/src/main/java/mcp/mobius/waila/commands/CommandDumpHandlers.java @@ -15,83 +15,83 @@ public class CommandDumpHandlers extends CommandBase { } @Override - public String getCommandUsage(ICommandSender p_71518_1_) { + public String getCommandUsage(ICommandSender sender) { return "/dumphandlers"; } @Override - public void processCommand(ICommandSender p_71515_1_, String[] p_71515_2_) { + public void processCommand(ICommandSender sender, String[] args) { - System.out.printf("\n\n== HEAD BLOCK PROVIDERS ==\n"); - for (Class clazz : ModuleRegistrar.instance().headBlockProviders.keySet()) { + System.out.print("\n\n== HEAD BLOCK PROVIDERS ==\n"); + for (Class clazz : ModuleRegistrar.instance().headBlockProviders.keySet()) { System.out.printf("+ %s +\n", clazz.getName()); for (IWailaDataProvider provider : ModuleRegistrar.instance().headBlockProviders.get(clazz)) { System.out.printf(" - %s\n", provider.getClass().getName()); } - System.out.printf("\n"); + System.out.print("\n"); } - System.out.printf("\n\n== BODY BLOCK PROVIDERS ==\n"); - for (Class clazz : ModuleRegistrar.instance().bodyBlockProviders.keySet()) { + System.out.print("\n\n== BODY BLOCK PROVIDERS ==\n"); + for (Class clazz : ModuleRegistrar.instance().bodyBlockProviders.keySet()) { System.out.printf("+ %s +\n", clazz.getName()); for (IWailaDataProvider provider : ModuleRegistrar.instance().bodyBlockProviders.get(clazz)) { System.out.printf(" - %s\n", provider.getClass().getName()); } - System.out.printf("\n"); + System.out.print("\n"); } - System.out.printf("\n\n== TAIL BLOCK PROVIDERS ==\n"); - for (Class clazz : ModuleRegistrar.instance().tailBlockProviders.keySet()) { + System.out.print("\n\n== TAIL BLOCK PROVIDERS ==\n"); + for (Class clazz : ModuleRegistrar.instance().tailBlockProviders.keySet()) { System.out.printf("+ %s +\n", clazz.getName()); for (IWailaDataProvider provider : ModuleRegistrar.instance().tailBlockProviders.get(clazz)) { System.out.printf(" - %s\n", provider.getClass().getName()); } - System.out.printf("\n"); + System.out.print("\n"); } - System.out.printf("\n\n== STACK BLOCK PROVIDERS ==\n"); - for (Class clazz : ModuleRegistrar.instance().stackBlockProviders.keySet()) { + System.out.print("\n\n== STACK BLOCK PROVIDERS ==\n"); + for (Class clazz : ModuleRegistrar.instance().stackBlockProviders.keySet()) { System.out.printf("+ %s +\n", clazz.getName()); for (IWailaDataProvider provider : ModuleRegistrar.instance().stackBlockProviders.get(clazz)) { System.out.printf(" - %s\n", provider.getClass().getName()); } - System.out.printf("\n"); + System.out.print("\n"); } - System.out.printf("\n\n== HEAD ENTITY PROVIDERS ==\n"); - for (Class clazz : ModuleRegistrar.instance().headEntityProviders.keySet()) { + System.out.print("\n\n== HEAD ENTITY PROVIDERS ==\n"); + for (Class clazz : ModuleRegistrar.instance().headEntityProviders.keySet()) { System.out.printf("+ %s +\n", clazz.getName()); for (IWailaEntityProvider provider : ModuleRegistrar.instance().headEntityProviders.get(clazz)) { System.out.printf(" - %s\n", provider.getClass().getName()); } - System.out.printf("\n"); + System.out.print("\n"); } - System.out.printf("\n\n== BODY ENTITY PROVIDERS ==\n"); - for (Class clazz : ModuleRegistrar.instance().bodyEntityProviders.keySet()) { + System.out.print("\n\n== BODY ENTITY PROVIDERS ==\n"); + for (Class clazz : ModuleRegistrar.instance().bodyEntityProviders.keySet()) { System.out.printf("+ %s +\n", clazz.getName()); for (IWailaEntityProvider provider : ModuleRegistrar.instance().bodyEntityProviders.get(clazz)) { System.out.printf(" - %s\n", provider.getClass().getName()); } - System.out.printf("\n"); + System.out.print("\n"); } - System.out.printf("\n\n== TAIL ENTITY PROVIDERS ==\n"); - for (Class clazz : ModuleRegistrar.instance().tailEntityProviders.keySet()) { + System.out.print("\n\n== TAIL ENTITY PROVIDERS ==\n"); + for (Class clazz : ModuleRegistrar.instance().tailEntityProviders.keySet()) { System.out.printf("+ %s +\n", clazz.getName()); for (IWailaEntityProvider provider : ModuleRegistrar.instance().tailEntityProviders.get(clazz)) { System.out.printf(" - %s\n", provider.getClass().getName()); } - System.out.printf("\n"); + System.out.print("\n"); } - System.out.printf("\n\n== STACK ENTITY PROVIDERS ==\n"); - for (Class clazz : ModuleRegistrar.instance().overrideEntityProviders.keySet()) { + System.out.print("\n\n== STACK ENTITY PROVIDERS ==\n"); + for (Class clazz : ModuleRegistrar.instance().overrideEntityProviders.keySet()) { System.out.printf("+ %s +\n", clazz.getName()); for (IWailaEntityProvider provider : ModuleRegistrar.instance().overrideEntityProviders.get(clazz)) { System.out.printf(" - %s\n", provider.getClass().getName()); } - System.out.printf("\n"); + System.out.print("\n"); } } @@ -103,8 +103,6 @@ public class CommandDumpHandlers extends CommandBase { @Override public boolean canCommandSenderUseCommand(ICommandSender sender) { - // if ((sender instanceof EntityPlayerMP) && ((EntityPlayerMP)sender).playerNetServerHandler.netManager - // instanceof MemoryConnection) return true; return super.canCommandSenderUseCommand(sender); } diff --git a/src/main/java/mcp/mobius/waila/gui/events/MouseEvent.java b/src/main/java/mcp/mobius/waila/gui/events/MouseEvent.java index 69dd5ff..1de9abd 100644 --- a/src/main/java/mcp/mobius/waila/gui/events/MouseEvent.java +++ b/src/main/java/mcp/mobius/waila/gui/events/MouseEvent.java @@ -17,7 +17,7 @@ public class MouseEvent { WHEEL, ENTER, LEAVE - }; + } public long timestamp; public Minecraft mc; @@ -41,12 +41,6 @@ public class MouseEvent { - (double) Mouse.getEventY() * (double) this.srcwidget.getSize().getY() / (double) this.mc.displayHeight - 1.0; - // this.x = Mouse.getEventX(); - // this.y = Mouse.getEventY(); - - // System.out.printf("%s %s\n", this.x, this.y); - - // this.z = Mouse.getEventDWheel(); this.z = Mouse.getDWheel(); for (int i = 0; i < buttonCount; i++) buttonState[i] = Mouse.isButtonDown(i); @@ -55,16 +49,22 @@ public class MouseEvent { } public String toString() { - String retstring = String - .format("MOUSE %s : [%s] [ %.2f %.2f %d ] [", this.type, this.timestamp, this.x, this.y, this.z); - if (this.buttonCount < 5) - for (int i = 0; i < this.buttonCount; i++) retstring += String.format(" %s ", this.buttonState[i]); - else for (int i = 0; i < 5; i++) retstring += String.format(" %s ", this.buttonState[i]); - retstring += "]"; + StringBuilder retstring = new StringBuilder( + String.format( + "MOUSE %s : [%s] [ %.2f %.2f %d ] [", + this.type, + this.timestamp, + this.x, + this.y, + this.z)); + if (buttonCount < 5) + for (int i = 0; i < buttonCount; i++) retstring.append(String.format(" %s ", this.buttonState[i])); + else for (int i = 0; i < 5; i++) retstring.append(String.format(" %s ", this.buttonState[i])); + retstring.append("]"); - if (this.button != -1) retstring += String.format(" Button %s", this.button); + if (this.button != -1) retstring.append(String.format(" Button %s", this.button)); - return retstring; + return retstring.toString(); } // Returns the event type based on the previous mouse event. @@ -82,9 +82,9 @@ public class MouseEvent { return this.type; } - for (int i = 0; i < this.buttonCount; i++) { + for (int i = 0; i < buttonCount; i++) { if (this.buttonState[i] != me.buttonState[i]) { - if (this.buttonState[i] == true) this.type = EventType.CLICK; + if (this.buttonState[i]) this.type = EventType.CLICK; else this.type = EventType.RELEASED; this.button = i; return this.type; @@ -93,7 +93,7 @@ public class MouseEvent { // MOVE & DRAG EVENTS (we moved the mouse and button 0 was clicked or not) if ((this.x != me.x) || (this.y != me.y)) { - if (this.buttonState[0] == true) this.type = EventType.DRAG; + if (this.buttonState[0]) this.type = EventType.DRAG; else this.type = EventType.MOVE; return this.type; } diff --git a/src/main/java/mcp/mobius/waila/gui/helpers/ReverseIterator.java b/src/main/java/mcp/mobius/waila/gui/helpers/ReverseIterator.java index 85a02e1..b56895a 100644 --- a/src/main/java/mcp/mobius/waila/gui/helpers/ReverseIterator.java +++ b/src/main/java/mcp/mobius/waila/gui/helpers/ReverseIterator.java @@ -9,15 +9,15 @@ import com.google.common.collect.Lists; public class ReverseIterator implements Iterable { - private ListIterator listIterator; + private final ListIterator listIterator; public ReverseIterator(Collection wrappedList) { - List list = Lists.newArrayList(wrappedList); + List list = Lists.newArrayList(wrappedList); this.listIterator = list.listIterator(wrappedList.size()); } public Iterator iterator() { - return new Iterator() { + return new Iterator<>() { public boolean hasNext() { return listIterator.hasPrevious(); diff --git a/src/main/java/mcp/mobius/waila/gui/helpers/UIHelper.java b/src/main/java/mcp/mobius/waila/gui/helpers/UIHelper.java index 900c6d4..9d6df67 100644 --- a/src/main/java/mcp/mobius/waila/gui/helpers/UIHelper.java +++ b/src/main/java/mcp/mobius/waila/gui/helpers/UIHelper.java @@ -21,25 +21,10 @@ public class UIHelper { Tessellator tess = Tessellator.instance; tess.startDrawingQuads(); - tess.addVertexWithUV( - (double) (posX + 0), - (double) (posY + sizeY), - (double) zLevel, - texU * f, - (texV + texSizeV) * f); - tess.addVertexWithUV( - (double) (posX + sizeX), - (double) (posY + sizeY), - (double) zLevel, - (texU + texSizeU) * f, - (texV + texSizeV) * f); - tess.addVertexWithUV( - (double) (posX + sizeX), - (double) (posY + 0), - (double) zLevel, - (texU + texSizeU) * f, - texV * f); - tess.addVertexWithUV((double) (posX + 0), (double) (posY + 0), (double) zLevel, texU * f, texV * f); + tess.addVertexWithUV(posX, posY + sizeY, zLevel, texU * f, (texV + texSizeV) * f); + tess.addVertexWithUV(posX + sizeX, posY + sizeY, zLevel, (texU + texSizeU) * f, (texV + texSizeV) * f); + tess.addVertexWithUV(posX + sizeX, posY, zLevel, (texU + texSizeU) * f, texV * f); + tess.addVertexWithUV(posX, posY, zLevel, texU * f, texV * f); tess.draw(); } @@ -60,11 +45,11 @@ public class UIHelper { Tessellator tessellator = Tessellator.instance; tessellator.startDrawingQuads(); tessellator.setColorRGBA_F(red1, green1, blue1, alpha1); - tessellator.addVertex((double) maxx, (double) miny, (double) zlevel); - tessellator.addVertex((double) minx, (double) miny, (double) zlevel); + tessellator.addVertex(maxx, miny, zlevel); + tessellator.addVertex(minx, miny, zlevel); tessellator.setColorRGBA_F(red2, green2, blue2, alpha2); - tessellator.addVertex((double) minx, (double) maxy, (double) zlevel); - tessellator.addVertex((double) maxx, (double) maxy, (double) zlevel); + tessellator.addVertex(minx, maxy, zlevel); + tessellator.addVertex(maxx, maxy, zlevel); tessellator.draw(); GL11.glShadeModel(GL11.GL_FLAT); GL11.glDisable(GL11.GL_BLEND); @@ -123,7 +108,6 @@ public class UIHelper { public static void drawBillboard(float posX, float posY, float posZ, float offX, float offY, float offZ, float rotX, float rotY, float rotZ, double x1, double y1, double x2, double y2, int r, int g, int b, int a) { float f = 1.6F; - float f1 = 0.016666668F * f; GL11.glPushMatrix(); GL11.glTranslatef(posX + offX, posY + offY, posZ + offZ); @@ -133,14 +117,12 @@ public class UIHelper { GL11.glRotatef(rotX, 1.0F, 0.0F, 0.0F); GL11.glRotatef(rotZ, 0.0F, 0.0F, 1.0F); - // GL11.glScalef(-f1, -f1, f1); GL11.glDisable(GL11.GL_LIGHTING); GL11.glDepthMask(false); GL11.glDisable(GL11.GL_DEPTH_TEST); GL11.glEnable(GL11.GL_BLEND); GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); - // GL11.glDisable(GL11.GL_TEXTURE_2D); drawRectangle(x1, y1, 0, x2, y2, 0, r, g, b, a); GL11.glPopMatrix(); @@ -196,16 +178,12 @@ public class UIHelper { float f1 = 0.016666668F * f; GL11.glPushMatrix(); - // GL11.glTranslatef((float)accessor.getPosition().blockX + 0.0F, (float)accessor.getPosition().blockY + 0.5F, - // (float)accessor.getPosition().blockZ); GL11.glTranslatef(posX + offX, posY + offY, posZ + offZ); - // GL11.glTranslatef(posX, posY, posZ); GL11.glNormal3f(0.0F, 1.0F, 0.0F); GL11.glRotatef(rotY, 0.0F, 1.0F, 0.0F); GL11.glRotatef(rotX, 1.0F, 0.0F, 0.0F); GL11.glRotatef(rotZ, 0.0F, 0.0F, 1.0F); - // GL11.glTranslatef(offX, offY, offZ); GL11.glScalef(-f1, -f1, f1); GL11.glDisable(GL11.GL_LIGHTING); @@ -217,26 +195,14 @@ public class UIHelper { GL11.glDisable(GL11.GL_TEXTURE_2D); int j = fontrenderer.getStringWidth(text) / 2; - drawRectangle( - (double) (-j - 1), - (double) (8 + b0), - 0.0, - (double) (j + 1), - (double) (-1 + b0), - 0.0, - 0, - 0, - 0, - 64); + drawRectangle(-j - 1, 8 + b0, 0.0, j + 1, -1 + b0, 0.0, 0, 0, 0, 64); GL11.glEnable(GL11.GL_TEXTURE_2D); fontrenderer.drawString(text, -fontrenderer.getStringWidth(text) / 2, b0, 553648127); GL11.glEnable(GL11.GL_DEPTH_TEST); GL11.glDepthMask(true); fontrenderer.drawString(text, -fontrenderer.getStringWidth(text) / 2, b0, -1); - // GL11.glEnable(GL11.GL_LIGHTING); - // GL11.glDisable(GL11.GL_BLEND); - // GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); + GL11.glDisable(GL11.GL_TEXTURE_2D); GL11.glPopMatrix(); diff --git a/src/main/java/mcp/mobius/waila/gui/interfaces/CType.java b/src/main/java/mcp/mobius/waila/gui/interfaces/CType.java index e13ec92..fa2e44c 100644 --- a/src/main/java/mcp/mobius/waila/gui/interfaces/CType.java +++ b/src/main/java/mcp/mobius/waila/gui/interfaces/CType.java @@ -4,5 +4,5 @@ public enum CType { REL_X, REL_Y, RELXY, - ABSXY; + ABSXY } diff --git a/src/main/java/mcp/mobius/waila/gui/interfaces/IWidget.java b/src/main/java/mcp/mobius/waila/gui/interfaces/IWidget.java index d186eba..eaf70f5 100644 --- a/src/main/java/mcp/mobius/waila/gui/interfaces/IWidget.java +++ b/src/main/java/mcp/mobius/waila/gui/interfaces/IWidget.java @@ -84,9 +84,4 @@ public interface IWidget { void emit(Signal signal, Object... params); void onWidgetEvent(IWidget srcwidget, Signal signal, Object... params); - - // boolean onMouseEnter(); - // boolean onMouseMoved(); - // boolean onMouseLeave(); - } diff --git a/src/main/java/mcp/mobius/waila/gui/interfaces/RenderPriority.java b/src/main/java/mcp/mobius/waila/gui/interfaces/RenderPriority.java index 7446865..20a489e 100644 --- a/src/main/java/mcp/mobius/waila/gui/interfaces/RenderPriority.java +++ b/src/main/java/mcp/mobius/waila/gui/interfaces/RenderPriority.java @@ -3,5 +3,5 @@ package mcp.mobius.waila.gui.interfaces; public enum RenderPriority { LOW, MEDIUM, - HIGH; + HIGH } diff --git a/src/main/java/mcp/mobius/waila/gui/interfaces/Signal.java b/src/main/java/mcp/mobius/waila/gui/interfaces/Signal.java index 5ec6881..430eca7 100644 --- a/src/main/java/mcp/mobius/waila/gui/interfaces/Signal.java +++ b/src/main/java/mcp/mobius/waila/gui/interfaces/Signal.java @@ -4,5 +4,5 @@ public enum Signal { DRAGGED, CLICKED, VALUE_CHANGED, - GEOM_CHANGED; + GEOM_CHANGED } diff --git a/src/main/java/mcp/mobius/waila/gui/interfaces/WAlign.java b/src/main/java/mcp/mobius/waila/gui/interfaces/WAlign.java index 9e1380c..71482d5 100644 --- a/src/main/java/mcp/mobius/waila/gui/interfaces/WAlign.java +++ b/src/main/java/mcp/mobius/waila/gui/interfaces/WAlign.java @@ -5,5 +5,5 @@ public enum WAlign { CENTER, RIGHT, TOP, - BOTTOM; + BOTTOM } diff --git a/src/main/java/mcp/mobius/waila/gui/screens/ScreenBase.java b/src/main/java/mcp/mobius/waila/gui/screens/ScreenBase.java index 0457265..7f6aaa7 100644 --- a/src/main/java/mcp/mobius/waila/gui/screens/ScreenBase.java +++ b/src/main/java/mcp/mobius/waila/gui/screens/ScreenBase.java @@ -19,7 +19,7 @@ public abstract class ScreenBase extends GuiScreen { public ScreenBase(GuiScreen parent) { this.parent = parent; this.mc = Minecraft.getMinecraft(); - this.widgets = new HashMap(); + this.widgets = new HashMap<>(); this.addWidget("canvas", new LayoutCanvas()); @@ -41,9 +41,7 @@ public abstract class ScreenBase extends GuiScreen { } public IWidget delWidget(String name) { - IWidget widget = this.getWidget(name); - this.widgets.remove(widget); - return widget; + return this.widgets.remove(name); } public IWidget getRoot() { @@ -75,7 +73,7 @@ public abstract class ScreenBase extends GuiScreen { @Override public void keyTyped(char keyChar, int keyID) { if (keyID == 1) if (this.parent == null) { - this.mc.displayGuiScreen((GuiScreen) null); + this.mc.displayGuiScreen(null); this.mc.setIngameFocus(); } else this.mc.displayGuiScreen(this.parent); } diff --git a/src/main/java/mcp/mobius/waila/gui/screens/config/ScreenHUDConfig.java b/src/main/java/mcp/mobius/waila/gui/screens/config/ScreenHUDConfig.java index 6e411b4..9ab54bf 100644 --- a/src/main/java/mcp/mobius/waila/gui/screens/config/ScreenHUDConfig.java +++ b/src/main/java/mcp/mobius/waila/gui/screens/config/ScreenHUDConfig.java @@ -23,7 +23,7 @@ import mcp.mobius.waila.utils.Constants; public class ScreenHUDConfig extends ScreenBase { - private class EventCanvas extends LayoutBase { + private static class EventCanvas extends LayoutBase { IWidget draggedWidget = null; @@ -33,28 +33,6 @@ public class ScreenHUDConfig extends ScreenBase { super(parent); this.setGeometry(new WidgetGeometry(0.0, 0.0, 100.0, 100.0, CType.RELXY, CType.RELXY)); - /* - * IWidget layoutX = this.addWidget("LayoutX", new LayoutBase(this)); layoutX.setGeometry(new - * WidgetGeometry(40.0,50.0,20,60, CType.RELXY, CType.ABSXY, WAlign.CENTER, WAlign.CENTER)); - * layoutX.addWidget("ButtonXAdd", new ButtonLabel(null, "+")).setGeometry(new WidgetGeometry(0.0, - * 0.0,20,20, CType.RELXY, CType.ABSXY, WAlign.LEFT, WAlign.TOP)); layoutX.addWidget("ButtonXSub", new - * ButtonLabel(null, "-")).setGeometry(new WidgetGeometry(0.0,100.0,20,20, CType.RELXY, CType.ABSXY, - * WAlign.LEFT, WAlign.BOTTOM)); layoutX.addWidget("ValueDisplayX", new LabelFixedFont(null, - * "0")).setGeometry(new WidgetGeometry(50.0,50.0,20,20, CType.RELXY, CType.ABSXY, WAlign.CENTER, - * WAlign.CENTER)); - */ - - /* - * IWidget layoutY = this.addWidget("LayoutY", new LayoutBase(this)); layoutY.setGeometry(new - * WidgetGeometry(50.0,50.0,20,60,CType.RELXY, CType.ABSXY, WAlign.CENTER, WAlign.CENTER)); - * layoutY.addWidget("ButtonYAdd", new ButtonLabel(null, "+")).setGeometry(new WidgetGeometry(0.0, - * 0.0,20,20, CType.RELXY, CType.ABSXY, WAlign.LEFT, WAlign.TOP)); layoutY.addWidget("ButtonYSub", new - * ButtonLabel(null, "-")).setGeometry(new WidgetGeometry(0.0,100.0,20,20, CType.RELXY, CType.ABSXY, - * WAlign.LEFT, WAlign.BOTTOM)); layoutY.addWidget("ValueDisplayY", new LabelFixedFont(null, - * "0")).setGeometry(new WidgetGeometry(50.0,50.0,20,20, CType.RELXY, CType.ABSXY, WAlign.CENTER, - * WAlign.CENTER)); - */ - double picX = ConfigHandler.instance() .getConfig(Configuration.CATEGORY_GENERAL, Constants.CFG_WAILA_POSX, 0) / 100.0; double picY = ConfigHandler.instance() @@ -81,7 +59,7 @@ public class ScreenHUDConfig extends ScreenBase { WAlign.CENTER)); this.addWidget("TextTuto1", new LabelFixedFont(null, "screen.label.dragtuto")).setGeometry( - new WidgetGeometry(50.0, 30.0, 20, 20, CType.RELXY, CType.ABSXY, WAlign.CENTER, WAlign.CENTER));; + new WidgetGeometry(50.0, 30.0, 20, 20, CType.RELXY, CType.ABSXY, WAlign.CENTER, WAlign.CENTER)); IWidget layoutX = this.addWidget("LayoutX", new LayoutBase(this)); layoutX.setGeometry( @@ -169,8 +147,6 @@ public class ScreenHUDConfig extends ScreenBase { @Override public void onMouseClick(MouseEvent event) { - // System.out.println(this.getWidgetAtCoordinates(event.x, event.y)); - if ((event.button == 0) && (this.getWidget("Layout").getWidget("Picture").isWidgetAtCoordinates(event.x, event.y))) { this.getWidget("Layout").getWidget("Picture").onMouseClick(event); @@ -180,8 +156,6 @@ public class ScreenHUDConfig extends ScreenBase { @Override public void onMouseDrag(MouseEvent event) { - - // if ((this.getWidgetAtCoordinates(event.x, event.y) == this) && (this.draggedWidget != null)){ if (this.draggedWidget != null) { this.draggedWidget.onMouseDrag(event); } else { @@ -276,7 +250,6 @@ public class ScreenHUDConfig extends ScreenBase { ((LayoutMargin) this.getWidget("Layout")).setMargins(picSX / 2, picSX / 2, picSY / 2, picSY / 2); } - // picture.emit(Signal.DRAGGED, picture.getPos()); this.updateData(); } diff --git a/src/main/java/mcp/mobius/waila/gui/screens/config/ScreenModuleConfig.java b/src/main/java/mcp/mobius/waila/gui/screens/config/ScreenModuleConfig.java index b396d6a..7899f40 100644 --- a/src/main/java/mcp/mobius/waila/gui/screens/config/ScreenModuleConfig.java +++ b/src/main/java/mcp/mobius/waila/gui/screens/config/ScreenModuleConfig.java @@ -16,20 +16,16 @@ import mcp.mobius.waila.utils.Constants; public class ScreenModuleConfig extends ScreenBase { - private String modName; - public ScreenModuleConfig(GuiScreen parent, String modname) { super(parent); - this.modName = modname; - this.getRoot().addWidget("ButtonContainer", new ButtonContainerLabel(this.getRoot(), 2, 100, 25.0)); this.getRoot().getWidget("ButtonContainer").setGeometry( new WidgetGeometry(0.0, 20.0, 100.0, 60.0, CType.RELXY, CType.RELXY, WAlign.LEFT, WAlign.TOP)); ButtonContainerLabel buttonContainer = ((ButtonContainerLabel) this.getRoot().getWidget("ButtonContainer")); - for (String key : ConfigHandler.instance().getConfigKeys(this.modName).keySet()) { + for (String key : ConfigHandler.instance().getConfigKeys(modname).keySet()) { if (ConfigHandler.instance().isServerRequired(key)) buttonContainer.addButton( new ButtonBooleanConfigRemote( this.getRoot(), @@ -37,7 +33,7 @@ public class ScreenModuleConfig extends ScreenBase { key, "screen.button.no", "screen.button.yes"), - ConfigHandler.instance().getConfigKeys(this.modName).get(key)); + ConfigHandler.instance().getConfigKeys(modname).get(key)); else buttonContainer.addButton( new ButtonBooleanConfig( this.getRoot(), @@ -45,12 +41,7 @@ public class ScreenModuleConfig extends ScreenBase { key, "screen.button.no", "screen.button.yes"), - ConfigHandler.instance().getConfigKeys(this.modName).get(key)); - // buttonContainer.addButton(new ButtonConfigRemote(-1, "No", "Yes", - // ConfigHandler.instance().getConfigKeys(this.modName).get(key), key )); - // else - // buttonContainer.addButton(new ButtonConfigOption(-1, "No", "Yes", - // ConfigHandler.instance().getConfigKeys(this.modName).get(key), key )); + ConfigHandler.instance().getConfigKeys(modname).get(key)); } this.getRoot().addWidget("LayoutBack", new LayoutBase(this.getRoot())); diff --git a/src/main/java/mcp/mobius/waila/gui/screens/info/ScreenEnchants.java b/src/main/java/mcp/mobius/waila/gui/screens/info/ScreenEnchants.java index a4f6392..4782fea 100644 --- a/src/main/java/mcp/mobius/waila/gui/screens/info/ScreenEnchants.java +++ b/src/main/java/mcp/mobius/waila/gui/screens/info/ScreenEnchants.java @@ -43,9 +43,9 @@ public class ScreenEnchants extends ScreenBase { new WidgetGeometry(50.0, 50.0, 90.0, 80.0, CType.REL_X, CType.RELXY, WAlign.CENTER, WAlign.TOP)); String columnName = "\u00a7a\u00a7o" + LangUtil.translateG("enchant.title.name"); - String columnMinLvl = "\u00a7a\u00a7o" + LangUtil.translateG("enchant.title.minlvl");; - String columnMaxLvl = "\u00a7a\u00a7o" + LangUtil.translateG("enchant.title.maxlvl");; - String columnWeight = "\u00a7a\u00a7o" + LangUtil.translateG("enchant.title.weight");; + String columnMinLvl = "\u00a7a\u00a7o" + LangUtil.translateG("enchant.title.minlvl"); + String columnMaxLvl = "\u00a7a\u00a7o" + LangUtil.translateG("enchant.title.maxlvl"); + String columnWeight = "\u00a7a\u00a7o" + LangUtil.translateG("enchant.title.weight"); ((ViewTable) this.getRoot().getWidget("Table")) .setColumnsTitle(columnName, columnMinLvl, columnMaxLvl, columnWeight, "\u00a7a\u00a7oMod") @@ -80,9 +80,4 @@ public class ScreenEnchants extends ScreenBase { this.getRoot().getWidget("Layout_Title").adjustSize(); return this; } - - /* - * public ScreenEnchants setStack(ItemStack stack){ - * ((ItemStackDisplay)this.getRoot().getWidget("ItemStack")).setStack(stack); return this; } - */ } diff --git a/src/main/java/mcp/mobius/waila/gui/testing/ScreenTest.java b/src/main/java/mcp/mobius/waila/gui/testing/ScreenTest.java index 41c0289..971629b 100644 --- a/src/main/java/mcp/mobius/waila/gui/testing/ScreenTest.java +++ b/src/main/java/mcp/mobius/waila/gui/testing/ScreenTest.java @@ -21,23 +21,5 @@ public class ScreenTest extends ScreenBase { .addRow("test1", "test2", "test3").addRow("test1", "test2", "test3").addRow("test1", "test2", "test3") .addRow("test1", "test2", "test3").addRow("test1", "test2", "test3").addRow("test1", "test2", "test3") .addRow("test1", "test2", "test3"); - - /* - * this.getRoot().addWidget("Test", new Row(null)).setGeometry(new WidgetGeometry(50.0, 50.0, 90.0, 20.0, - * CType.RELXY, CType.REL_X, WAlign.CENTER, WAlign.CENTER)); - * ((Row)this.getRoot().getWidget("Test")).setColumnsText("aabbbbbbbbbbbbbbbbbbbbbbbbb","bb","cc"); - * ((Row)this.getRoot().getWidget("Test")).setColumnsWidth(30.0,30.0,30.0); - * ((Row)this.getRoot().getWidget("Test")).setColumnsAlign(WAlign.LEFT, WAlign.CENTER, WAlign.CENTER); - */ - - // this.getRoot().addWidget("TestLayout", new LayoutBase(null)).setGeometry(new WidgetGeometry(50.0, 50.0, 90.0, - // 90.0, CType.RELXY, CType.RELXY, WAlign.CENTER, WAlign.CENTER)); - // ((LayoutBase)this.getRoot().getWidget("TestLayout")).setBackgroundColors(0xff505050, 0xff505050); - - // this.getRoot().addWidget("Layout", new ViewportScrollable(null)).setGeometry(new - // WidgetGeometry(50.0,50.0,75.0,75.0,CType.RELXY, CType.RELXY, WAlign.CENTER, WAlign.CENTER)); - // ((ViewportScrollable)this.getRoot().getWidget("Layout")).attachWidget(new PictureSwitch(this.getRoot(), - // "waila:textures/test.png", "waila:textures/test_solar.png")).setSize(900, 900); - } } diff --git a/src/main/java/mcp/mobius/waila/gui/testing/ScreenTest2.java b/src/main/java/mcp/mobius/waila/gui/testing/ScreenTest2.java index 83cf21e..16b1531 100644 --- a/src/main/java/mcp/mobius/waila/gui/testing/ScreenTest2.java +++ b/src/main/java/mcp/mobius/waila/gui/testing/ScreenTest2.java @@ -13,19 +13,11 @@ public class ScreenTest2 extends ScreenBase { public ScreenTest2(GuiScreen parent) { super(parent); - // this.getRoot().addWidget("Picture", new PictureSwitch(this.getRoot(), "waila:textures/test.png", - // "waila:textures/test_solar.png")); - // this.getRoot().addWidget("Button", new ButtonInteger(this.getRoot(), "Val0", "Val1", "Val2")); - // this.getRoot().getWidget("Button").setGeometry(new WidgetGeometry(50.0D, 50.0D, 100.0D, 20.0D, true, false, - // WidgetAlign.CENTER, WidgetAlign.CENTER)); this.getRoot().addWidget("Buttons", new ButtonContainerLabel(this.getRoot(), 2, 100, 30.0)); this.getRoot().getWidget("Buttons") .setGeometry(new WidgetGeometry(0.0, 0.0, 100.0, 50.0, CType.RELXY, CType.RELXY)); - // ((ButtonContainer)this.getRoot().getWidget("Buttons")).addButton(new ButtonIntegerConfig(this.getRoot(), - // "testconfig", true, 0, "Val0", "Val1", "Val2")); - this.getRoot().addWidget("Text", new LabelFixedFont(this.getRoot(), "waila:textures/test.png")); this.getRoot().getWidget("Text").setGeometry( new WidgetGeometry(50.0D, 10.0D, 50.0D, 50.0D, CType.RELXY, CType.ABSXY, WAlign.CENTER, WAlign.TOP)); diff --git a/src/main/java/mcp/mobius/waila/gui/truetyper/FontHelper.java b/src/main/java/mcp/mobius/waila/gui/truetyper/FontHelper.java index db50809..31a12ff 100644 --- a/src/main/java/mcp/mobius/waila/gui/truetyper/FontHelper.java +++ b/src/main/java/mcp/mobius/waila/gui/truetyper/FontHelper.java @@ -27,11 +27,6 @@ public class FontHelper { private static String formatEscape = "\u00A7"; - /* - * public static void drawString(String s, float x, float y, TrueTypeFont font, float scaleX, float scaleY, float... - * rgba){ drawString(s,x,y,font,scaleX,scaleY,0,rgba); } - */ - public static void drawString(String s, float x, float y, TrueTypeFont font, float scaleX, float scaleY, float rotationZ, float... rgba) { Minecraft mc = Minecraft.getMinecraft(); @@ -84,7 +79,6 @@ public class FontHelper { mc.entityRenderer.setupOverlayRendering(); GL11.glMatrixMode(GL11.GL_PROJECTION); GL11.glPushMatrix(); - // GL11.glLoadMatrix(matrixData); GL11.glLoadIdentity(); GL11.glOrtho(0, mc.displayWidth, 0, mc.displayHeight, -1, 1); diff --git a/src/main/java/mcp/mobius/waila/gui/truetyper/Test.java b/src/main/java/mcp/mobius/waila/gui/truetyper/Test.java index cb02782..c239f37 100644 --- a/src/main/java/mcp/mobius/waila/gui/truetyper/Test.java +++ b/src/main/java/mcp/mobius/waila/gui/truetyper/Test.java @@ -22,17 +22,5 @@ public class Test { public static float[] white = { 1f, 1f, 1f, 1f }; public static boolean init = false; - public static void initTest() { - return; - /* - * GraphicsEnvironment e = GraphicsEnvironment.getLocalGraphicsEnvironment(); Font[] fonts = e.getAllFonts(); { - * int max = 9; for(Font f : fonts){ boolean pass = true; for(TrueTypeFont ttf : testFonts){ - * if(ttf.font.getFontName().startsWith(f.getFontName().substring(0, 1))){ pass = false; continue; } } if(pass){ - * max--; if(max == 0){ break; } testFonts.add(FontLoader.loadSystemFont(f.getFontName(), 24f, false)); - * testFonts.add(FontLoader.loadSystemFont(f.getFontName(), 24f, true)); } } } init = true; } public static void - * doTest(){ if(!init){ initTest(); } for(int i =0; i < testFonts.size(); i++){ int y = 10+i*12; int x = 10; - * FontHelper.drawString("He"+EnumChatFormatting.GOLD+"llo "+EnumChatFormatting.GREEN+"wor"+EnumChatFormatting. - * YELLOW+"ld", x, y, testFonts.get(i), 1f, 1f); } - */ - } + public static void initTest() {} } diff --git a/src/main/java/mcp/mobius/waila/gui/truetyper/TrueTypeFont.java b/src/main/java/mcp/mobius/waila/gui/truetyper/TrueTypeFont.java index a2ca4ae..14e1512 100644 --- a/src/main/java/mcp/mobius/waila/gui/truetyper/TrueTypeFont.java +++ b/src/main/java/mcp/mobius/waila/gui/truetyper/TrueTypeFont.java @@ -212,8 +212,6 @@ public class TrueTypeFont { fontTextureID = loadImage(imgTemp); - // .getTexture(font.toString(), imgTemp); - } catch (Exception e) { System.err.println("Failed to create font."); e.printStackTrace(); @@ -232,15 +230,9 @@ public class TrueTypeFont { float RenderHeight = (SrcHeight / textureHeight); Tessellator t = Tessellator.instance; - // t.setColorRGBA_F(0f, 0f, 0f, 1f); - t.addVertexWithUV(drawX, drawY, 0, TextureSrcX, TextureSrcY); - // GL11.glTexCoord2f(TextureSrcX, TextureSrcY); - // GL11.glVertex2f(drawX, drawY); t.addVertexWithUV(drawX, drawY + DrawHeight, 0, TextureSrcX, TextureSrcY + RenderHeight); - // GL11.glTexCoord2f(TextureSrcX, TextureSrcY + RenderHeight); - // GL11.glVertex2f(drawX, drawY + DrawHeight); t.addVertexWithUV( drawX + DrawWidth, @@ -248,12 +240,8 @@ public class TrueTypeFont { 0, TextureSrcX + RenderWidth, TextureSrcY + RenderHeight); - // GL11.glTexCoord2f(TextureSrcX + RenderWidth, TextureSrcY + RenderHeight); - // GL11.glVertex2f(drawX + DrawWidth, drawY + DrawHeight); t.addVertexWithUV(drawX + DrawWidth, drawY, 0, TextureSrcX + RenderWidth, TextureSrcY); - // GL11.glTexCoord2f(TextureSrcX + RenderWidth, TextureSrcY); - // GL11.glVertex2f(drawX + DrawWidth, drawY); } public float getWidth(String whatchars) { @@ -274,9 +262,7 @@ public class TrueTypeFont { lastWidth = floatObject.width; } } - // System.out.println("Size: "+totalwidth); return this.fontMetrics.stringWidth(whatchars); - // return (totalwidth); } public float getHeight() { @@ -350,7 +336,6 @@ public class TrueTypeFont { GL11.glBindTexture(GL11.GL_TEXTURE_2D, fontTextureID); Tessellator t = Tessellator.instance; t.startDrawingQuads(); - // GL11.glBegin(GL11.GL_QUADS); if (rgba.length == 4) t.setColorRGBA_F(rgba[0], rgba[1], rgba[2], rgba[3]); while (i >= startIndex && i <= endIndex) { @@ -397,8 +382,6 @@ public class TrueTypeFont { } } t.draw(); - // GL11.glEnd(); - GL11.glPopMatrix(); } @@ -406,7 +389,6 @@ public class TrueTypeFont { try { short width = (short) bufferedImage.getWidth(); short height = (short) bufferedImage.getHeight(); - // textureLoader.bpp = bufferedImage.getColorModel().hasAlpha() ? (byte)32 : (byte)24; int bpp = (byte) bufferedImage.getColorModel().getPixelSize(); ByteBuffer byteBuffer; DataBuffer db = bufferedImage.getData().getDataBuffer(); @@ -441,12 +423,6 @@ public class TrueTypeFont { GL11.glTexParameteri(GL11.GL_TEXTURE_2D, GL11.GL_TEXTURE_MAG_FILTER, GL11.GL_NEAREST); GL11.glTexParameteri(GL11.GL_TEXTURE_2D, GL11.GL_TEXTURE_MIN_FILTER, GL11.GL_NEAREST); - // GL11.glTexParameteri(GL11.GL_TEXTURE_2D, GL11.GL_TEXTURE_MIN_FILTER, GL11.GL_LINEAR); - // GL11.glTexParameteri(GL11.GL_TEXTURE_2D, GL11.GL_TEXTURE_MIN_FILTER, GL11.GL_LINEAR_MIPMAP_NEAREST); - - // GL11.glTexParameteri(GL11.GL_TEXTURE_2D, GL11.GL_TEXTURE_MIN_FILTER, GL11.GL_LINEAR_MIPMAP_LINEAR); - // GL11.glTexParameteri(GL11.GL_TEXTURE_2D, GL11.GL_TEXTURE_MIN_FILTER, GL11.GL_NEAREST_MIPMAP_LINEAR); - // GL11.glTexParameteri(GL11.GL_TEXTURE_2D, GL11.GL_TEXTURE_MIN_FILTER, GL11.GL_NEAREST_MIPMAP_NEAREST); GL11.glTexEnvf(GL11.GL_TEXTURE_ENV, GL11.GL_TEXTURE_ENV_MODE, GL11.GL_MODULATE); @@ -462,7 +438,6 @@ public class TrueTypeFont { } catch (Exception e) { throw new RuntimeException(e); - // System.exit(-1); } } diff --git a/src/main/java/mcp/mobius/waila/gui/widgets/ItemStackDisplay.java b/src/main/java/mcp/mobius/waila/gui/widgets/ItemStackDisplay.java index acabb04..a92f575 100644 --- a/src/main/java/mcp/mobius/waila/gui/widgets/ItemStackDisplay.java +++ b/src/main/java/mcp/mobius/waila/gui/widgets/ItemStackDisplay.java @@ -11,7 +11,7 @@ import mcp.mobius.waila.overlay.DisplayUtil; public class ItemStackDisplay extends WidgetBase { - ItemStack stack = null; + ItemStack stack; public ItemStackDisplay(IWidget parent) { this(parent, null); diff --git a/src/main/java/mcp/mobius/waila/gui/widgets/LabelFixedFont.java b/src/main/java/mcp/mobius/waila/gui/widgets/LabelFixedFont.java index 01336dd..96ba4b0 100644 --- a/src/main/java/mcp/mobius/waila/gui/widgets/LabelFixedFont.java +++ b/src/main/java/mcp/mobius/waila/gui/widgets/LabelFixedFont.java @@ -57,7 +57,6 @@ public class LabelFixedFont extends WidgetBase { public void draw(Point pos) { this.saveGLState(); this.mc.fontRenderer.drawString(this.text, pos.getX(), pos.getY(), this.color); - // this.mc.fontRenderer.drawString(this.text, pos.getX(), pos.getY(), this.color); this.loadGLState(); } } diff --git a/src/main/java/mcp/mobius/waila/gui/widgets/LayoutBase.java b/src/main/java/mcp/mobius/waila/gui/widgets/LayoutBase.java index bd3044e..6d3e6de 100644 --- a/src/main/java/mcp/mobius/waila/gui/widgets/LayoutBase.java +++ b/src/main/java/mcp/mobius/waila/gui/widgets/LayoutBase.java @@ -32,12 +32,4 @@ public class LayoutBase extends WidgetBase { this.bgcolor2 = bg2; this.renderBG = true; } - - /* - * @Override public void onMouseEnter(MouseEvent event) { IWidget widget = this.getWidgetAtCoordinates(event.x, - * event.y); if (widget != null && widget != this) widget.onMouseEnter(event); } - * @Override public void onMouseLeave(MouseEvent event) { IWidget widget = this.getWidgetAtCoordinates(event.x, - * event.y); if (widget != null && widget != this) widget.onMouseLeave(event); } - */ - } diff --git a/src/main/java/mcp/mobius/waila/gui/widgets/LayoutCanvas.java b/src/main/java/mcp/mobius/waila/gui/widgets/LayoutCanvas.java index 586fe34..64d5e17 100644 --- a/src/main/java/mcp/mobius/waila/gui/widgets/LayoutCanvas.java +++ b/src/main/java/mcp/mobius/waila/gui/widgets/LayoutCanvas.java @@ -28,11 +28,6 @@ public class LayoutCanvas extends LayoutBase { this.rez = new ScaledResolution(mc, mc.displayWidth, mc.displayHeight); this.setGeometry(0, 0, this.rez.getScaledWidth(), this.rez.getScaledHeight(), CType.ABSXY, CType.ABSXY); - /* - * this.draw(this.getPos()); for (IWidget widget: this.widgets.values()) if (widget.shouldRender()) - * widget.draw(); - */ - super.draw(); this.handleMouseInput(); @@ -56,23 +51,18 @@ public class LayoutCanvas extends LayoutBase { switch (type) { case CLICK: if (targetWidget != null) targetWidget.onMouseClick(event); - // this.onMouseClick(event); break; case DRAG: if (targetWidget != null) targetWidget.onMouseDrag(event); - // this.onMouseDrag(event); break; case MOVE: if (targetWidget != null) targetWidget.onMouseMove(event); - // this.onMouseMove(event); break; case RELEASED: if (targetWidget != null) targetWidget.onMouseRelease(event); - // this.onMouseRelease(event); break; case WHEEL: if (targetWidget != null) targetWidget.onMouseWheel(event); - // this.onMouseWheel(event); break; case ENTER: if (event.trgwidget != null) event.trgwidget.onMouseEnter(event); @@ -81,8 +71,6 @@ public class LayoutCanvas extends LayoutBase { this.lastMouseEvent.trgwidget.onMouseLeave(event); } break; - case NONE: - break; default: break; } diff --git a/src/main/java/mcp/mobius/waila/gui/widgets/LayoutCropping.java b/src/main/java/mcp/mobius/waila/gui/widgets/LayoutCropping.java index b716c3c..665f3da 100644 --- a/src/main/java/mcp/mobius/waila/gui/widgets/LayoutCropping.java +++ b/src/main/java/mcp/mobius/waila/gui/widgets/LayoutCropping.java @@ -39,16 +39,9 @@ public class LayoutCropping extends LayoutBase { * this.rez.getScaleFactor(), this.getSize().getX() * this.rez.getScaleFactor(), this.getSize().getY() * this.rez.getScaleFactor()); - // GL11.glScissor(this.getPos().getX()*this.rez.getScaleFactor(), - // this.getPos().getY()*this.rez.getScaleFactor(), this.getSize().getX()*this.rez.getScaleFactor(), - // this.getSize().getY()*this.rez.getScaleFactor()); GL11.glTranslatef(xOffset, yOffset, 0.0f); - /* - * for (IWidget widget: this.widgets.values()) if (widget.shouldRender()) widget.draw(); - */ - for (IWidget widget : this.renderQueue_LOW.values()) if (widget.shouldRender()) widget.draw(); for (IWidget widget : this.renderQueue_MEDIUM.values()) if (widget.shouldRender()) widget.draw(); diff --git a/src/main/java/mcp/mobius/waila/gui/widgets/PictureSwitch.java b/src/main/java/mcp/mobius/waila/gui/widgets/PictureSwitch.java index 6ad2158..c240fa4 100644 --- a/src/main/java/mcp/mobius/waila/gui/widgets/PictureSwitch.java +++ b/src/main/java/mcp/mobius/waila/gui/widgets/PictureSwitch.java @@ -37,13 +37,11 @@ public class PictureSwitch extends WidgetBase { @Override public void onMouseEnter(MouseEvent event) { - // System.out.printf("%s %s\n", this, event); mouseOver = true; } @Override public void onMouseLeave(MouseEvent event) { - // System.out.printf("%s %s\n", this, event); mouseOver = false; } diff --git a/src/main/java/mcp/mobius/waila/gui/widgets/ViewTable.java b/src/main/java/mcp/mobius/waila/gui/widgets/ViewTable.java index 8fd2b04..bbc504d 100644 --- a/src/main/java/mcp/mobius/waila/gui/widgets/ViewTable.java +++ b/src/main/java/mcp/mobius/waila/gui/widgets/ViewTable.java @@ -9,17 +9,12 @@ import mcp.mobius.waila.gui.interfaces.WAlign; public class ViewTable extends WidgetBase { - public class Cell extends WidgetBase { + public static class Cell extends WidgetBase { public Cell(IWidget parent, String text, WAlign align) { super(parent); - - // this.addWidget("Crop", new LayoutCropping(null)).setGeometry(new WidgetGeometry(50.0, 50.0, 90.0, 100.0, - // CType.RELXY, CType.RELXY, WAlign.CENTER, WAlign.CENTER)); - switch (align) { case CENTER: - // this.getWidget("Crop").addWidget("Text", new LabelFixedFont(null, text)) this.addWidget("Text", new LabelFixedFont(null, text)).setGeometry( new WidgetGeometry( 50.0, @@ -32,7 +27,6 @@ public class ViewTable extends WidgetBase { WAlign.CENTER)); break; case LEFT: - // this.getWidget("Crop").addWidget("Text", new LabelFixedFont(null, text)) this.addWidget("Text", new LabelFixedFont(null, text)).setGeometry( new WidgetGeometry( 5.0, @@ -45,7 +39,6 @@ public class ViewTable extends WidgetBase { WAlign.CENTER)); break; case RIGHT: - // this.getWidget("Crop").addWidget("Text", new LabelFixedFont(null, text)) this.addWidget("Text", new LabelFixedFont(null, text)).setGeometry( new WidgetGeometry( 5.0, @@ -241,7 +234,7 @@ public class ViewTable extends WidgetBase { IWidget tableLayout = ((ViewportScrollable) (this.getWidget("Viewport"))).getAttachedWidget(); tableLayout.setSize(100.0, (this.nrows + 1) * 16); - Row newRow = (Row) new Row(null); + Row newRow = new Row(null); newRow.setColumnsWidth(this.widths); newRow.setColumnsText(strings); newRow.setColumnsAlign(this.aligns); diff --git a/src/main/java/mcp/mobius/waila/gui/widgets/ViewportScrollable.java b/src/main/java/mcp/mobius/waila/gui/widgets/ViewportScrollable.java index 3ff30a8..d2d8514 100644 --- a/src/main/java/mcp/mobius/waila/gui/widgets/ViewportScrollable.java +++ b/src/main/java/mcp/mobius/waila/gui/widgets/ViewportScrollable.java @@ -11,7 +11,7 @@ import mcp.mobius.waila.gui.interfaces.WAlign; public class ViewportScrollable extends WidgetBase { - public class Escalator extends WidgetBase { + public static class Escalator extends WidgetBase { int yOffset = 0; int sizeCursor = 8; @@ -133,8 +133,6 @@ public class ViewportScrollable extends WidgetBase { @Override public void draw() { - // if (Display.wasResized()) - if ((this.attachedWidget != null) && (this.attachedWidget.getSize().getY() > this.getSize().getY())) this.getWidget("Escalator").show(); else this.getWidget("Escalator").hide(); diff --git a/src/main/java/mcp/mobius/waila/gui/widgets/WidgetBase.java b/src/main/java/mcp/mobius/waila/gui/widgets/WidgetBase.java index 44931c7..a726563 100644 --- a/src/main/java/mcp/mobius/waila/gui/widgets/WidgetBase.java +++ b/src/main/java/mcp/mobius/waila/gui/widgets/WidgetBase.java @@ -20,10 +20,10 @@ public abstract class WidgetBase implements IWidget { protected IWidget parent; protected WidgetGeometry geom; - protected LinkedHashMap widgets = new LinkedHashMap(); - protected LinkedHashMap renderQueue_HIGH = new LinkedHashMap(); - protected LinkedHashMap renderQueue_MEDIUM = new LinkedHashMap(); - protected LinkedHashMap renderQueue_LOW = new LinkedHashMap(); + protected LinkedHashMap widgets = new LinkedHashMap<>(); + protected LinkedHashMap renderQueue_HIGH = new LinkedHashMap<>(); + protected LinkedHashMap renderQueue_MEDIUM = new LinkedHashMap<>(); + protected LinkedHashMap renderQueue_LOW = new LinkedHashMap<>(); protected Minecraft mc; protected TextureManager texManager; protected ScaledResolution rez; @@ -88,14 +88,12 @@ public abstract class WidgetBase implements IWidget { @Override public IWidget delWidget(String name) { - IWidget widget = this.getWidget(name); - this.widgets.remove(widget); - return widget; + return this.widgets.remove(name); } @Override public IWidget getWidgetAtCoordinates(double posX, double posY) { - for (IWidget widget : new ReverseIterator(this.widgets.values())) + for (IWidget widget : new ReverseIterator<>(this.widgets.values())) if ((posX >= widget.getPos().getX()) && (posX <= widget.getPos().getX() + widget.getSize().getX()) && (posY >= widget.getPos().getY()) && (posY <= widget.getPos().getY() + widget.getSize().getY())) @@ -114,8 +112,7 @@ public abstract class WidgetBase implements IWidget { if (this.getLeft() > posx) return false; if (this.getRight() < posx) return false; if (this.getTop() > posy) return false; - if (this.getBottom() < posy) return false; - return true; + return !(this.getBottom() < posy); } /////////////////////// @@ -141,10 +138,6 @@ public abstract class WidgetBase implements IWidget { this.draw(this.getPos()); - /* - * for (IWidget widget: this.widgets.values()) if (widget.shouldRender()) widget.draw(); - */ - for (IWidget widget : this.renderQueue_LOW.values()) if (widget.shouldRender()) widget.draw(); for (IWidget widget : this.renderQueue_MEDIUM.values()) if (widget.shouldRender()) widget.draw(); @@ -215,7 +208,7 @@ public abstract class WidgetBase implements IWidget { this.geom.setPos(x, y, fracX, fracY); this.emit(Signal.GEOM_CHANGED, this.geom); return this; - }; + } @Override public IWidget setSize(double sx, double sy) { @@ -227,7 +220,7 @@ public abstract class WidgetBase implements IWidget { this.geom.setSize(sx, sy, fracX, fracY); this.emit(Signal.GEOM_CHANGED, this.geom); return this; - }; + } @Override public IWidget adjustSize() { @@ -270,33 +263,32 @@ public abstract class WidgetBase implements IWidget { GL11.glBindTexture(GL11.GL_TEXTURE_2D, boundTexIndex); GL11.glPopMatrix(); GL11.glPopAttrib(); - // GL11.glColor4f(1.0f, 1.0f, 1.0f, 1.0f); } @Override public void setAlpha(float alpha) { this.alpha = alpha; - }; + } @Override public float getAlpha() { return this.alpha; - }; + } @Override public void show() { this.isRendering = true; - }; + } @Override public void hide() { this.isRendering = false; - }; + } @Override public boolean shouldRender() { return this.isRendering; - }; + } //////////////////// // INPUT HANDLING // @@ -307,59 +299,36 @@ public abstract class WidgetBase implements IWidget { @Override public void onMouseClick(MouseEvent event) { - // System.out.printf("%s %s\n", this, event); if (this.parent != null) this.parent.onMouseClick(event); - - // IWidget widget = this.getWidgetAtCoordinates(event.x, event.y); - // if (widget != null && widget != this) - // widget.onMouseClick(event); } @Override public void onMouseDrag(MouseEvent event) { - // System.out.printf("%s %s\n", this, event); if (this.parent != null) this.parent.onMouseDrag(event); - - // IWidget widget = this.getWidgetAtCoordinates(event.x, event.y); - // if (widget != null && widget != this) - // widget.onMouseDrag(event); } @Override public void onMouseMove(MouseEvent event) { - // System.out.printf("%s %s\n", this, event); if (this.parent != null) this.parent.onMouseMove(event); - - // IWidget widget = this.getWidgetAtCoordinates(event.x, event.y); - // if (widget != null && widget != this) - // widget.onMouseMove(event); } @Override public void onMouseRelease(MouseEvent event) { - // System.out.printf("%s %s\n", this, event); if (this.parent != null) this.parent.onMouseRelease(event); - - // IWidget widget = this.getWidgetAtCoordinates(event.x, event.y); - // if (widget != null && widget != this) - // widget.onMouseRelease(event); } @Override public void onMouseWheel(MouseEvent event) { - // System.out.printf("%s %s\n", this, event); if (this.parent != null) this.parent.onMouseWheel(event); } @Override public void onMouseEnter(MouseEvent event) { - // System.out.printf("%s %s\n", this, event); if (this.parent != null) this.parent.onMouseEnter(event); } @Override public void onMouseLeave(MouseEvent event) { - // System.out.printf("%s %s\n", this, event); if (this.parent != null) this.parent.onMouseLeave(event); } diff --git a/src/main/java/mcp/mobius/waila/gui/widgets/WidgetGeometry.java b/src/main/java/mcp/mobius/waila/gui/widgets/WidgetGeometry.java index 0d0710b..cd8d310 100644 --- a/src/main/java/mcp/mobius/waila/gui/widgets/WidgetGeometry.java +++ b/src/main/java/mcp/mobius/waila/gui/widgets/WidgetGeometry.java @@ -8,15 +8,12 @@ import mcp.mobius.waila.gui.interfaces.CType; import mcp.mobius.waila.gui.interfaces.IWidget; import mcp.mobius.waila.gui.interfaces.WAlign; -// public class WidgetGeometry implements Cloneable{ public class WidgetGeometry { - // public enum Align {LEFT, CENTER, RIGHT, TOP, BOTTOM}; - - double x = -1; - double y = -1; - double sx = -1; - double sy = -1; + double x; + double y; + double sx; + double sy; CType posType; CType sizeType; @@ -29,7 +26,7 @@ public class WidgetGeometry { WAlign alignX; WAlign alignY; - public class PointDouble { + public static class PointDouble { double x; double y; @@ -37,7 +34,7 @@ public class WidgetGeometry { public PointDouble(double x, double y) { this.x = x; this.y = y; - }; + } public double getX() { return this.x; @@ -184,9 +181,4 @@ public class WidgetGeometry { this.alignX, this.alignY); } - - // @Override - // public WidgetGeometry clone() throws CloneNotSupportedException{ - // return (WidgetGeometry)super.clone(); - // } } diff --git a/src/main/java/mcp/mobius/waila/gui/widgets/buttons/ButtonContainer.java b/src/main/java/mcp/mobius/waila/gui/widgets/buttons/ButtonContainer.java index bd14092..b9eb27c 100644 --- a/src/main/java/mcp/mobius/waila/gui/widgets/buttons/ButtonContainer.java +++ b/src/main/java/mcp/mobius/waila/gui/widgets/buttons/ButtonContainer.java @@ -27,7 +27,6 @@ public class ButtonContainer extends WidgetBase { String buttonName = String.format("Button_%d", nButtons); String layoutName = String.format("Layout_%d", nButtons); String layoutLabelName = String.format("LayoutLabel_%d", nButtons); - String labelName = String.format("Label_%d", nButtons); this.addWidget(layoutName, new LayoutBase(this)); this.addWidget(layoutLabelName, new LayoutBase(this)); diff --git a/src/main/java/mcp/mobius/waila/gui/widgets/movable/PictureMovableRC.java b/src/main/java/mcp/mobius/waila/gui/widgets/movable/PictureMovableRC.java index 05f4ea9..ef47688 100644 --- a/src/main/java/mcp/mobius/waila/gui/widgets/movable/PictureMovableRC.java +++ b/src/main/java/mcp/mobius/waila/gui/widgets/movable/PictureMovableRC.java @@ -27,7 +27,6 @@ public class PictureMovableRC extends WidgetBase { public void onMouseClick(MouseEvent event) { this.offsetX = event.x - this.geom.getUnalignedPos(this.parent).getX(); this.offsetY = event.y - this.geom.getUnalignedPos(this.parent).getY(); - // System.out.printf("%s %s\n", this.offsetX, this.offsetY); } @Override @@ -45,9 +44,6 @@ public class PictureMovableRC extends WidgetBase { ((newX - this.parent.getLeft()) / this.parent.getSize().getX()) * 100.0, ((newY - this.parent.getTop()) / this.parent.getSize().getY()) * 100.0); - // System.out.printf("%s\n", this.parent.getGeometry()); - // System.out.printf("%s %s\n", this.parent.getPos(), this.parent.getSize()); - this.emit(Signal.DRAGGED, this.getPos()); } diff --git a/src/main/java/mcp/mobius/waila/gui_old/widget_old/Button2States.java.bak b/src/main/java/mcp/mobius/waila/gui_old/widget_old/Button2States.java.bak deleted file mode 100644 index c90e46b..0000000 --- a/src/main/java/mcp/mobius/waila/gui_old/widget_old/Button2States.java.bak +++ /dev/null @@ -1,117 +0,0 @@ -package mcp.mobius.waila.gui_old.widget_old; - -import org.lwjgl.opengl.GL11; - -import net.minecraft.client.Minecraft; -import net.minecraft.client.gui.FontRenderer; -import net.minecraft.client.gui.GuiButton; -import net.minecraft.util.ResourceLocation; - -public class Button2States extends GuiButton { - - boolean state; - String label; - int labelSize; - String stateFalse; - String stateTrue; - - public Button2States(int par1, String _stateFalse, String _stateTrue, String _label, int _labelSize, boolean _state) { - super(par1, 0, 0, 80, 20, _stateFalse); - state = _state; - label = _label; - stateFalse = _stateFalse; - stateTrue = _stateTrue; - labelSize = _labelSize; - this.displayString = state ? stateTrue:stateFalse; - } - - public Button2States(int par1, int par2, int par3, String _stateFalse, String _stateTrue, String _label, int _labelSize, boolean _state) { - super(par1, par2, par3, _stateFalse); - state = _state; - label = _label; - stateFalse = _stateFalse; - stateTrue = _stateTrue; - labelSize = _labelSize; - this.displayString = state ? stateTrue:stateFalse; - } - - public Button2States(int par1, int par2, int par3, int par4, int par5, String _stateFalse, String _stateTrue, String _label, int _labelSize, boolean _state) { - super(par1, par2, par3, par4, par5, _stateFalse); - state = _state; - label = _label; - stateFalse = _stateFalse; - stateTrue = _stateTrue; - labelSize = _labelSize; - this.displayString = state ? stateTrue:stateFalse; - } - - @Override - public void drawButton(Minecraft par1Minecraft, int par2, int par3) - { - if (this.drawButton) - { - FontRenderer fontrenderer = par1Minecraft.fontRenderer; - - //DONE : Changed from v1.5.2 to 1.6.2 resource handling - //par1Minecraft.renderEngine.bindTexture("/gui/gui.png"); - ResourceLocation guipng = new ResourceLocation("textures/gui/widgets.png"); - par1Minecraft.renderEngine.func_110577_a(guipng); - - if (this.labelSize == -1) - labelSize = fontrenderer.getStringWidth(this.label) + 5; - - - GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); - this.field_82253_i = par2 >= this.xPosition + this.labelSize && par3 >= this.yPosition && par2 < this.xPosition + this.width + this.labelSize && par3 < this.yPosition + this.height; - int k = this.getHoverState(this.field_82253_i); - this.drawTexturedModalRect(this.xPosition + this.labelSize, this.yPosition, 0, 46 + k * 20, this.width / 2, this.height); - this.drawTexturedModalRect(this.xPosition + this.labelSize + this.width / 2, this.yPosition, 200 - this.width / 2, 46 + k * 20, this.width / 2, this.height); - this.mouseDragged(par1Minecraft, par2, par3); - int l = 14737632; - - if (!this.enabled) - { - l = -6250336; - } - else if (this.field_82253_i) - { - l = 16777120; - } - - this.drawCenteredString(fontrenderer, this.displayString, this.xPosition + this.labelSize + this.width / 2, this.yPosition + (this.height - 8) / 2, l); - this.drawCenteredString(fontrenderer, this.label, this.xPosition + this.labelSize/2, this.yPosition + (this.height - 8) / 2, 14737632); - } - } - - public void pressButton(){ - state = state?false:true; - this.displayString = state ? stateTrue:stateFalse; - } - - public boolean getState(){ - return state; - } - - @Override - public boolean mousePressed(Minecraft par1Minecraft, int par2, int par3) - { - return this.enabled && this.drawButton && par2 >= this.xPosition + this.labelSize && par3 >= this.yPosition && par2 < this.xPosition + this.labelSize + this.width && par3 < this.yPosition + this.height; - } - - public int getHeight(){ - return this.height; - } - - public int getWidth(){ - return this.width + this.labelSize; - } - - public void setHeight(int value){ - this.height = value; - } - - public void setWidth(int value){ - this.width = value; - } - -} diff --git a/src/main/java/mcp/mobius/waila/gui_old/widget_old/ButtonChangeScreen.java.bak b/src/main/java/mcp/mobius/waila/gui_old/widget_old/ButtonChangeScreen.java.bak deleted file mode 100644 index a1895ba..0000000 --- a/src/main/java/mcp/mobius/waila/gui_old/widget_old/ButtonChangeScreen.java.bak +++ /dev/null @@ -1,46 +0,0 @@ -package mcp.mobius.waila.gui_old.widget_old; - -import net.minecraft.client.Minecraft; -import net.minecraft.client.gui.GuiButton; -import net.minecraft.client.gui.GuiScreen; - -public class ButtonChangeScreen extends GuiButton { - - GuiScreen linkedScreen; - - public ButtonChangeScreen(int par1, String par4Str, GuiScreen _linkedScreen) { - super(par1, 0, 0, 80, 20, par4Str); - this.linkedScreen = _linkedScreen; - } - - public ButtonChangeScreen(int par1, int par2, int par3, String par4Str, GuiScreen _linkedScreen) { - super(par1, par2, par3, par4Str); - this.linkedScreen = _linkedScreen; - } - - public ButtonChangeScreen(int par1, int par2, int par3, int par4, int par5, String par6Str, GuiScreen _linkedScreen) { - super(par1, par2, par3, par4, par5, par6Str); - this.linkedScreen = _linkedScreen; - } - - public void pressButton(){ - Minecraft mc = Minecraft.getMinecraft(); - mc.displayGuiScreen(this.linkedScreen); - } - - public int getHeight(){ - return this.height; - } - - public int getWidth(){ - return this.width; - } - - public void setHeight(int value){ - this.height = value; - } - - public void setWidth(int value){ - this.width = value; - } -} diff --git a/src/main/java/mcp/mobius/waila/gui_old/widget_old/ButtonConfigNEI.java.bak b/src/main/java/mcp/mobius/waila/gui_old/widget_old/ButtonConfigNEI.java.bak deleted file mode 100644 index daa040c..0000000 --- a/src/main/java/mcp/mobius/waila/gui_old/widget_old/ButtonConfigNEI.java.bak +++ /dev/null @@ -1,39 +0,0 @@ -package mcp.mobius.waila.gui_old.widget_old; - -import codechicken.nei.NEIClientConfig; - -public class ButtonConfigNEI extends ButtonConfigOption { - - public ButtonConfigNEI(int par1, String _stateFalse, String _stateTrue, - String _label, String _configKey) { - super(par1, _stateFalse, _stateTrue, _label, _configKey); - } - - public ButtonConfigNEI(int par1, int par2, int par3, String _stateFalse, String _stateTrue, String _label, int _labelSize, boolean _state, - String _configKey) { - super(par1, par2, par3, _stateFalse, _stateTrue, _label, _labelSize, - _state, _configKey); - } - - public ButtonConfigNEI(int par1, int par2, int par3, int par4, int par5, - String _stateFalse, String _stateTrue, String _label, - int _labelSize, boolean _state, String _configKey) { - super(par1, par2, par3, par4, par5, _stateFalse, _stateTrue, _label, - _labelSize, _state, _configKey); - } - - @Override - public void setupInitialState(String _configKey, boolean _state){ - this.configKey = _configKey; - this.state = NEIClientConfig.getSetting(this.configKey).getBooleanValue(); - this.displayString = state ? stateTrue:stateFalse; - } - - @Override - public void pressButton(){ - super.pressButton(); - this.state = !NEIClientConfig.getSetting(this.configKey).getBooleanValue(); - NEIClientConfig.getSetting(this.configKey).setBooleanValue(this.state); - } - -} diff --git a/src/main/java/mcp/mobius/waila/gui_old/widget_old/ButtonConfigOption.java.bak b/src/main/java/mcp/mobius/waila/gui_old/widget_old/ButtonConfigOption.java.bak deleted file mode 100644 index 73c2000..0000000 --- a/src/main/java/mcp/mobius/waila/gui_old/widget_old/ButtonConfigOption.java.bak +++ /dev/null @@ -1,54 +0,0 @@ -package mcp.mobius.waila.gui_old.widget_old; - -import mcp.mobius.waila.mod_Waila; -import net.minecraftforge.common.Configuration; -import net.minecraftforge.common.Property; - -public class ButtonConfigOption extends Button2States { - - String configKey; - - public ButtonConfigOption(int par1, String _stateFalse, String _stateTrue, String _label, String _configKey) { - super(par1, 0, 0, 80, 20, _stateFalse, _stateTrue, _label, -1, false); - this.setupInitialState(_configKey, true); - } - - public ButtonConfigOption(int par1, String _stateFalse, String _stateTrue, String _label, String _configKey, boolean _state) { - super(par1, 0, 0, 80, 20, _stateFalse, _stateTrue, _label, -1, _state); - this.setupInitialState(_configKey, _state); - } - - public ButtonConfigOption(int par1, int par2, int par3, String _stateFalse, String _stateTrue, String _label, int _labelSize, boolean _state, String _configKey) { - super(par1, par2, par3, _stateFalse, _stateTrue, _label, _labelSize, _state); - this.setupInitialState(_configKey, true); - } - - public ButtonConfigOption(int par1, int par2, int par3, int par4, int par5, String _stateFalse, String _stateTrue, String _label, int _labelSize, boolean _state, String _configKey) { - super(par1, par2, par3, par4, par5, _stateFalse, _stateTrue, _label, _labelSize, _state); - this.setupInitialState(_configKey, true); - } - - public void setupInitialState(String _configKey, boolean _state){ - this.configKey = _configKey; - this.state = this.readConfigKey(this.configKey, _state); - this.displayString = state ? stateTrue:stateFalse; - } - - @Override - public void pressButton(){ - super.pressButton(); - this.writeConfigKey(this.configKey, this.state); - } - - protected void writeConfigKey(String keyname, boolean value){ - mod_Waila.instance.config.getCategory(Configuration.CATEGORY_GENERAL).put(keyname, new Property(keyname,String.valueOf(value),Property.Type.BOOLEAN)); - mod_Waila.instance.config.save(); - } - - protected boolean readConfigKey(String keyname, boolean _state){ - mod_Waila.instance.config.load(); - Property prop = mod_Waila.instance.config.get(Configuration.CATEGORY_GENERAL, keyname, _state); - return prop.getBoolean(_state); - } - -} diff --git a/src/main/java/mcp/mobius/waila/gui_old/widget_old/ButtonConfigRemote.java.bak b/src/main/java/mcp/mobius/waila/gui_old/widget_old/ButtonConfigRemote.java.bak deleted file mode 100644 index 784dfcb..0000000 --- a/src/main/java/mcp/mobius/waila/gui_old/widget_old/ButtonConfigRemote.java.bak +++ /dev/null @@ -1,43 +0,0 @@ -package mcp.mobius.waila.gui_old.widget_old; - -import mcp.mobius.waila.mod_Waila; -import net.minecraft.client.Minecraft; - -public class ButtonConfigRemote extends ButtonConfigOption { - - public ButtonConfigRemote(int par1, String _stateFalse, String _stateTrue, String _label, String _configKey) { - super(par1, _stateFalse, _stateTrue, _label, _configKey); - } - public ButtonConfigRemote(int par1, String _stateFalse, String _stateTrue, String _label, String _configKey, boolean _state) { - super(par1, _stateFalse, _stateTrue, _label, _configKey, _state); - } - public ButtonConfigRemote(int par1, int par2, int par3, String _stateFalse, String _stateTrue, String _label, int _labelSize, boolean _state, String _configKey) { - super(par1, par2, par3, _stateFalse, _stateTrue, _label, _labelSize, _state, _configKey); - } - - public ButtonConfigRemote(int par1, int par2, int par3, int par4, int par5, String _stateFalse, String _stateTrue, String _label, int _labelSize, boolean _state, String _configKey) { - super(par1, par2, par3, par4, par5, _stateFalse, _stateTrue, _label, _labelSize, _state, _configKey); - } - - @Override - public void drawButton(Minecraft par1Minecraft, int par2, int par3) - { - this.enabled = mod_Waila.instance.serverPresent; - super.drawButton(par1Minecraft, par2, par3); - } - - @Override - public boolean mousePressed(Minecraft par1Minecraft, int par2, int par3) - { - this.enabled = mod_Waila.instance.serverPresent; - return super.mousePressed(par1Minecraft, par2, par3); - } - - @Override - protected int getHoverState(boolean par1) - { - this.enabled = mod_Waila.instance.serverPresent; - return super.getHoverState(par1); - } - -} diff --git a/src/main/java/mcp/mobius/waila/gui_old/widget_old/ContainerButtons.java.bak b/src/main/java/mcp/mobius/waila/gui_old/widget_old/ContainerButtons.java.bak deleted file mode 100644 index 81cea8b..0000000 --- a/src/main/java/mcp/mobius/waila/gui_old/widget_old/ContainerButtons.java.bak +++ /dev/null @@ -1,68 +0,0 @@ -package mcp.mobius.waila.gui_old.widget_old; - -import java.util.ArrayList; - -import net.minecraft.client.gui.GuiButton; -import net.minecraft.client.gui.GuiScreen; - -public class ContainerButtons { - - GuiScreen parentScreen; - int posX, posY, width, height; - int maxLabelSize = 0; - int maxColumnWidth = 0; - - ArrayList buttons = new ArrayList(); - - public ContainerButtons(GuiScreen _parentScreen, int _posX, int _posY, int _width, int _height) { - this.parentScreen = _parentScreen; - this.posX = _posX; this.posY = _posY; - this.width = _width; this.height = _height; - this.maxColumnWidth = this.width/2; - } - - public void addButton(GuiButton button){ - - this.buttons.add(button); - - /* - FontRenderer fontrenderer = Minecraft.getMinecraft().fontRenderer; - if (button instanceof Button2States){ - maxLabelSize = Math.max(maxLabelSize, fontrenderer.getStringWidth(((Button2States)button).label) + 5); - ((Button2States)button).labelSize = maxLabelSize; - maxColumnWidth = Math.max(maxColumnWidth, ((Button2States)button).getWidth()); - } - */ - - /* - for (GuiButton other : this.buttons){ - if (other instanceof Button2States) - ((Button2States) other).labelSize = this.maxLabelSize; - - if (other instanceof ButtonChangeScreen) - ((ButtonChangeScreen) other).setWidth(maxColumnWidth); - } - */ - - if (button instanceof Button2States){ - ((Button2States) button).setWidth(80); - ((Button2States) button).labelSize = this.width/2 - 80; - button.xPosition = (this.buttons.size() - 1)%2 * this.width / 2 + this.posX; - button.yPosition = (this.buttons.size() - 1)/2 * 20 + this.posY; - } - - if (button instanceof ButtonChangeScreen){ - //((ButtonChangeScreen) button).setWidth(this.width/2); - ((ButtonChangeScreen) button).setWidth(120); - button.xPosition = (this.buttons.size() - 1)%2 * this.width / 2 + this.posX + (this.width / 2 - ((ButtonChangeScreen) button).getWidth())/2; - button.yPosition = (this.buttons.size() - 1)/2 * 20 + this.posY; - } - - - - - this.parentScreen.buttonList.add(button); - - } - -} diff --git a/src/main/java/mcp/mobius/waila/handlers/DecoratorFMP.java b/src/main/java/mcp/mobius/waila/handlers/DecoratorFMP.java index 5ae4318..909558b 100644 --- a/src/main/java/mcp/mobius/waila/handlers/DecoratorFMP.java +++ b/src/main/java/mcp/mobius/waila/handlers/DecoratorFMP.java @@ -43,7 +43,7 @@ public class DecoratorFMP implements IWailaBlockDecorator { } public static void register() { - Class BlockMultipart = null; + Class BlockMultipart; try { BlockMultipart = Class.forName("codechicken.multipart.BlockMultipart"); } catch (ClassNotFoundException e) { diff --git a/src/main/java/mcp/mobius/waila/handlers/HUDHandlerBlocks.java b/src/main/java/mcp/mobius/waila/handlers/HUDHandlerBlocks.java index 2b90f3f..14e54fe 100644 --- a/src/main/java/mcp/mobius/waila/handlers/HUDHandlerBlocks.java +++ b/src/main/java/mcp/mobius/waila/handlers/HUDHandlerBlocks.java @@ -39,7 +39,7 @@ public class HUDHandlerBlocks implements IWailaDataProvider { if (s != null && !s.endsWith("Unnamed")) name = s; if (name != null) currenttip.add(name); - } catch (Exception e) {} + } catch (Exception ignored) {} if (itemStack.getItem() == Items.redstone) { int md = accessor.getMetadata(); @@ -48,7 +48,7 @@ public class HUDHandlerBlocks implements IWailaDataProvider { currenttip.set(currenttip.size() - 1, name + " " + s); } - if (currenttip.size() == 0) currenttip.add("< Unnamed >"); + if (currenttip.isEmpty()) currenttip.add("< Unnamed >"); else { if (ConfigHandler.instance() .getConfig(Configuration.CATEGORY_GENERAL, Constants.CFG_WAILA_METADATA, true)) { @@ -66,11 +66,6 @@ public class HUDHandlerBlocks implements IWailaDataProvider { @Override public List getWailaBody(ItemStack itemStack, List currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config) { - /* - * if (ConfigHandler.instance().getConfig(Configuration.CATEGORY_GENERAL, Constants.CFG_WAILA_SHIFTBLOCK, false) - * && currenttip.size() > 0 && !accessor.getPlayer().isSneaking()){ currenttip.clear(); currenttip.add(ITALIC + - * "Press shift for more data"); return currenttip; } - */ return currenttip; } @@ -80,7 +75,7 @@ public class HUDHandlerBlocks implements IWailaDataProvider { currenttip.add(RENDER + "{Plip}" + RENDER + "{Plop,thisisatest,222,333}"); String modName = ModIdentification.nameFromStack(itemStack); - if (modName != null && !modName.equals("")) { + if (modName != null && !modName.isEmpty()) { currenttip.add(BLUE + ITALIC + modName); } diff --git a/src/main/java/mcp/mobius/waila/handlers/HUDHandlerEntities.java b/src/main/java/mcp/mobius/waila/handlers/HUDHandlerEntities.java index ccf32f3..9eaeaac 100644 --- a/src/main/java/mcp/mobius/waila/handlers/HUDHandlerEntities.java +++ b/src/main/java/mcp/mobius/waila/handlers/HUDHandlerEntities.java @@ -48,7 +48,6 @@ public class HUDHandlerEntities implements IWailaEntityProvider { if (!config.getConfig("general.showhp")) return currenttip; if (entity instanceof EntityLivingBase) { - String hptip = ""; nhearts = nhearts <= 0 ? 20 : nhearts; @@ -91,7 +90,7 @@ public class HUDHandlerEntities implements IWailaEntityProvider { } private static String getEntityMod(Entity entity) { - String modName = ""; + String modName; try { EntityRegistration er = EntityRegistry.instance().lookupModSpawn(entity.getClass(), true); ModContainer modC = er.getContainer(); diff --git a/src/main/java/mcp/mobius/waila/handlers/HUDHandlerFMP.java b/src/main/java/mcp/mobius/waila/handlers/HUDHandlerFMP.java index c3b0cac..2c8672c 100644 --- a/src/main/java/mcp/mobius/waila/handlers/HUDHandlerFMP.java +++ b/src/main/java/mcp/mobius/waila/handlers/HUDHandlerFMP.java @@ -104,7 +104,7 @@ public class HUDHandlerFMP implements IWailaDataProvider { } public static void register() { - Class BlockMultipart = null; + Class BlockMultipart; try { BlockMultipart = Class.forName("codechicken.multipart.BlockMultipart"); } catch (ClassNotFoundException e) { diff --git a/src/main/java/mcp/mobius/waila/handlers/SummaryProvider.java.bak b/src/main/java/mcp/mobius/waila/handlers/SummaryProvider.java.bak deleted file mode 100644 index 3a4e2c3..0000000 --- a/src/main/java/mcp/mobius/waila/handlers/SummaryProvider.java.bak +++ /dev/null @@ -1,32 +0,0 @@ -package mcp.mobius.waila.handlers; - -import java.util.LinkedHashMap; - -import net.minecraft.item.ItemStack; -import mcp.mobius.waila.api.IWailaConfigHandler; -import mcp.mobius.waila.api.IWailaSummaryProvider; -import mcp.mobius.waila.api.impl.ModuleRegistrar; - -public class SummaryProvider { - - private static SummaryProvider instance = null; - - private SummaryProvider() { - instance = this; - } - - public static SummaryProvider instance(){ - if (SummaryProvider.instance == null) - SummaryProvider.instance = new SummaryProvider(); - return SummaryProvider.instance; - } - - public LinkedHashMap getSummary(ItemStack stack, IWailaConfigHandler config) { - LinkedHashMap currentSummary = new LinkedHashMap(); - - for (IWailaSummaryProvider provider : ModuleRegistrar.instance().getSummaryProvider(stack.getItem())){ - currentSummary = provider.getSummary(stack, currentSummary, config); - } - return currentSummary; - } -} diff --git a/src/main/java/mcp/mobius/waila/handlers/SummaryProviderDefault.java.bak b/src/main/java/mcp/mobius/waila/handlers/SummaryProviderDefault.java.bak deleted file mode 100644 index 34bd92b..0000000 --- a/src/main/java/mcp/mobius/waila/handlers/SummaryProviderDefault.java.bak +++ /dev/null @@ -1,213 +0,0 @@ -package mcp.mobius.waila.handlers; - -import java.lang.reflect.Field; -import java.util.ArrayList; -import java.util.Collections; -import java.util.HashMap; -import java.util.LinkedHashMap; - -import net.minecraft.block.Block; -import net.minecraft.client.Minecraft; -import net.minecraft.item.EnumArmorMaterial; -import net.minecraft.item.EnumToolMaterial; -import net.minecraft.item.ItemArmor; -import net.minecraft.item.ItemBlock; -import net.minecraft.item.ItemStack; -import net.minecraftforge.common.IShearable; -import mcp.mobius.waila.api.IWailaConfigHandler; -import mcp.mobius.waila.api.IWailaSummaryProvider; - -public class SummaryProviderDefault implements IWailaSummaryProvider { - - public SummaryProviderDefault() { - // TODO Auto-generated constructor stub - } - - @Override - public LinkedHashMap getSummary(ItemStack stack, LinkedHashMap currentSummary, IWailaConfigHandler config) { - - if (!(stack.getItem() instanceof ItemBlock)){ - //For now, we have either a basic item or a tool/weapon/armor - if (this.getToolMaterialName(stack) != null){ - currentSummary.put("Material", this.getToolMaterialName(stack)); - currentSummary.put("Tier", this.getHarvestLevel(stack) != null?String.valueOf(this.getHarvestLevel(stack)):null); - currentSummary.put("Durability", this.getItemDurability(stack) != null?String.valueOf(this.getItemDurability(stack)):null); - - currentSummary.put("Harvest", this.getEffectiveBlock(stack)); - if (this.getEffectiveBlock(stack) != null) - currentSummary.put("Efficiency", this.getEfficiencyOnProperMaterial(stack) != null?String.valueOf(this.getEfficiencyOnProperMaterial(stack)):null); - - currentSummary.put("Enchant", this.getToolEnchantability(stack) != null?String.valueOf(this.getToolEnchantability(stack)):null); - currentSummary.put("Damage", this.getDamageVsEntity(stack) != null?String.valueOf(this.getDamageVsEntity(stack)):null); - } - else if (this.getArmorMaterialName(stack) != null){ - currentSummary.put("Material", this.getArmorMaterialName(stack)); - currentSummary.put("Durability", this.getItemDurability(stack) != null?String.valueOf(this.getItemDurability(stack)):null); - currentSummary.put("Armor Value", this.getDamageReduction(stack) != null?String.valueOf(this.getDamageReduction(stack)):null); - currentSummary.put("Enchant", this.getArmorEnchantability(stack) != null?String.valueOf(this.getArmorEnchantability(stack)):null); - } - } else { - //We have an ItemBlock - ItemBlock itemBlock = (ItemBlock)stack.getItem(); - Block block = Block.blocksList[itemBlock.getBlockID()]; - try{currentSummary.put("Hardness", String.valueOf(block.getBlockHardness(Minecraft.getMinecraft().theWorld, 0, 0, 0)));} catch (Exception e){}; - try{currentSummary.put("Resistance", String.valueOf(block.getExplosionResistance(null)));} catch (Exception e){}; - - try{ - ArrayList droppedStacks = block.getBlockDropped(Minecraft.getMinecraft().theWorld, 0, 0, 0, stack.getItemDamage(), 3); - if (droppedStacks.size() == 1) - currentSummary.put("Drop", droppedStacks.get(0).getDisplayName()); - else - for (int i=0; i < droppedStacks.size(); i++) - currentSummary.put(String.format("Drop %s", i), droppedStacks.get(i).getDisplayName()); - }catch (Exception e){System.out.printf("%s\n",e);}; - - try{ - if (block instanceof IShearable){ - IShearable shearable = (IShearable)block; - ArrayList droppedStacks = shearable.onSheared(null, Minecraft.getMinecraft().theWorld, 0, 0, 0, 3); - if (droppedStacks.size() == 1) - currentSummary.put("Sheared", droppedStacks.get(0).getDisplayName()); - else - for (int i=0; i < droppedStacks.size(); i++) - currentSummary.put(String.format("Sheared %s", i), droppedStacks.get(i).getDisplayName()); - } - }catch (Exception e){System.out.printf("%s\n",e);}; - } - - - - return currentSummary; - } - - public EnumToolMaterial getToolMaterial(ItemStack stack){ - Class itemClass = stack.getItem().getClass(); - EnumToolMaterial material = null; - try{ - Field getMaterial = this.findField(itemClass, "toolMaterial"); - if (getMaterial != null){ - getMaterial.setAccessible(true); - material = (EnumToolMaterial)(getMaterial.get(stack.getItem())); - } - } catch (Exception e){} - return material; - } - - public EnumArmorMaterial getArmorMaterial(ItemStack stack){ - Class itemClass = stack.getItem().getClass(); - EnumArmorMaterial material = null; - try{ - Field getMaterial = this.findField(itemClass, "material"); - if (getMaterial != null){ - getMaterial.setAccessible(true); - material = (EnumArmorMaterial)(getMaterial.get(stack.getItem())); - } - } catch (Exception e){} - return material; - } - - public String getToolMaterialName(ItemStack stack){ - EnumToolMaterial material = this.getToolMaterial(stack); - if (material == null) - return null; - - HashMap matName = new HashMap(); - matName.put("WOOD", "Wood"); - matName.put("STONE", "Stone"); - matName.put("IRON", "Iron"); - matName.put("EMERALD", "Diamond"); - matName.put("GOLD", "Gold"); - String materialName = material.toString(); - materialName = matName.containsKey(materialName)?matName.get(materialName):materialName; - return materialName; - } - - public String getArmorMaterialName(ItemStack stack){ - EnumArmorMaterial material = this.getArmorMaterial(stack); - if (material == null) - return null; - - HashMap matName = new HashMap(); - matName.put("CLOTH", "Cloth"); - matName.put("CHAIN", "Chain"); - matName.put("IRON", "Iron"); - matName.put("DIAMOND", "Diamond"); - matName.put("GOLD", "Gold"); - String materialName = material.toString(); - materialName = matName.containsKey(materialName)?matName.get(materialName):materialName; - return materialName; - } - - public String getEffectiveBlock(ItemStack stack){ - Class itemClass = stack.getItem().getClass(); - try{ - Field blocksEffectiveField = itemClass.getField("blocksEffectiveAgainst"); - Block[] effectiveBlocksArray = (Block[])(blocksEffectiveField.get(stack.getItem())); - ArrayList effectiveBlocks = new ArrayList(); - Collections.addAll(effectiveBlocks, effectiveBlocksArray); - String effectiveAgainst = ""; - - if (effectiveBlocks.contains(Block.obsidian)) - effectiveAgainst = Block.obsidian.getLocalizedName(); - else if (effectiveBlocks.contains(Block.stone)) - effectiveAgainst = Block.stone.getLocalizedName(); - else if (effectiveBlocks.contains(Block.dirt)) - effectiveAgainst = Block.dirt.getLocalizedName(); - else if (effectiveBlocks.contains(Block.wood)) - effectiveAgainst = Block.wood.getLocalizedName(); - - return effectiveAgainst.equals("")?null:effectiveAgainst; - }catch (Exception e){} - return null; - } - - public Integer getHarvestLevel(ItemStack stack){ - EnumToolMaterial material = this.getToolMaterial(stack); - return material!=null?material.getHarvestLevel():null; - } - - public Float getEfficiencyOnProperMaterial(ItemStack stack){ - EnumToolMaterial material = this.getToolMaterial(stack); - return material!=null?material.getEfficiencyOnProperMaterial():null; - } - - public Integer getToolEnchantability(ItemStack stack){ - EnumToolMaterial material = this.getToolMaterial(stack); - return material!=null?material.getEnchantability():null; - } - - public Float getDamageVsEntity(ItemStack stack){ - EnumToolMaterial material = this.getToolMaterial(stack); - return material!=null?material.getDamageVsEntity():null; - } - - public Integer getItemDurability(ItemStack stack){ - return stack.getMaxDamage() > 0?stack.getMaxDamage():null; - } - - public Integer getDamageReduction(ItemStack stack){ - if (stack.getItem() instanceof ItemArmor){ - ItemArmor armor = (ItemArmor)stack.getItem(); - return armor.damageReduceAmount; - } - return null; - } - - public Integer getArmorEnchantability(ItemStack stack){ - EnumArmorMaterial material = this.getArmorMaterial(stack); - return material!=null?material.getEnchantability():null; - } - - public Field findField(Class lookup, String name){ - Field retField = null; - try{ - retField = lookup.getDeclaredField(name); - } catch (Exception e){ - if (lookup.getSuperclass() == null) - retField = null; - else - retField = findField(lookup.getSuperclass(), name); - } - return retField; - } -} diff --git a/src/main/java/mcp/mobius/waila/handlers/VanillaTooltipHandler.java b/src/main/java/mcp/mobius/waila/handlers/VanillaTooltipHandler.java index dab5d19..0d52579 100644 --- a/src/main/java/mcp/mobius/waila/handlers/VanillaTooltipHandler.java +++ b/src/main/java/mcp/mobius/waila/handlers/VanillaTooltipHandler.java @@ -13,6 +13,6 @@ public class VanillaTooltipHandler { @SideOnly(Side.CLIENT) public void tooltipEvent(ItemTooltipEvent event) { String canonicalName = ModIdentification.nameFromStack(event.itemStack); - if (canonicalName != null && !canonicalName.equals("")) event.toolTip.add("\u00a79\u00a7o" + canonicalName); + if (canonicalName != null && !canonicalName.isEmpty()) event.toolTip.add("\u00a79\u00a7o" + canonicalName); } } diff --git a/src/main/java/mcp/mobius/waila/handlers/nei/HandlerEnchants.java b/src/main/java/mcp/mobius/waila/handlers/nei/HandlerEnchants.java index 1d96d4a..fcab26e 100644 --- a/src/main/java/mcp/mobius/waila/handlers/nei/HandlerEnchants.java +++ b/src/main/java/mcp/mobius/waila/handlers/nei/HandlerEnchants.java @@ -33,7 +33,6 @@ public class HandlerEnchants implements IContainerInputHandler { if (stackover == null) return false; if (keyID == NEIClientConfig.getKeyBinding(Constants.BIND_SCREEN_ENCH)) { - // try{ int itemEnchantability = stackover.getItem().getItemEnchantability(); if (itemEnchantability == 0) { return false; @@ -45,7 +44,7 @@ public class HandlerEnchants implements IContainerInputHandler { screen.setName(stackover.getDisplayName()); screen.setEnchantability(String.valueOf(itemEnchantability)); - Enchantment[] enchants = null; + Enchantment[] enchants; if (stackover.getItem() == Items.book) enchants = Enchantment.enchantmentsBookList; else enchants = Enchantment.enchantmentsList; @@ -60,13 +59,12 @@ public class HandlerEnchants implements IContainerInputHandler { if (enchant.canApplyAtEnchantingTable(stackover) || stackover.getItem() == Items.book) { if (stackover.isItemEnchanted()) { - Map stackenchants = EnchantmentHelper.getEnchantments(stackover); - for (Object id : stackenchants.keySet()) { - if (!enchant.canApplyTogether(Enchantment.enchantmentsList[(Integer) id])) - isCompatible = false; - if ((Integer) id == enchant.effectId) { + Map stackenchants = EnchantmentHelper.getEnchantments(stackover); + for (Integer id : stackenchants.keySet()) { + if (!enchant.canApplyTogether(Enchantment.enchantmentsList[id])) isCompatible = false; + if (id == enchant.effectId) { isApplied = true; - level = (Integer) stackenchants.get(id); + level = stackenchants.get(id); } } } @@ -76,28 +74,23 @@ public class HandlerEnchants implements IContainerInputHandler { int maxEnchantEnchantability = enchant.getMaxEnchantability(lvl); int minItemEnchantability = 1; - int meanItemEnchantability = 1 + itemEnchantability / 4; int maxItemEnchantability = 1 + itemEnchantability / 2; int minModifiedEnchantability = (int) (0.85 * minItemEnchantability + 0.5); - int meanModifiedEnchantability = (int) (1.00 * meanItemEnchantability + 0.5); int maxModifiedEnchantability = (int) (1.15 * maxItemEnchantability + 0.5); int minLevel = (int) ((minEnchantEnchantability - minModifiedEnchantability) / 1.15); int maxLevel = (int) ((maxEnchantEnchantability - maxModifiedEnchantability) / 0.85); - int meanMinLevel = (int) ((minEnchantEnchantability - meanModifiedEnchantability) / 1.0); - int meanMaxLevel = (int) ((maxEnchantEnchantability - meanModifiedEnchantability) / 1.0); - String colorcode = isCompatible ? "\u00a7f" : "\u00a7c"; if (isApplied && lvl == level) colorcode = "\u00a7e"; screen.addRow( colorcode + enchant.getTranslatedName(lvl), - colorcode + String.valueOf(minLevel), - colorcode + String.valueOf(maxLevel), - colorcode + String.valueOf(enchant.getWeight()), + colorcode + minLevel, + colorcode + maxLevel, + colorcode + enchant.getWeight(), "\u00a79\u00a7o" + ModIdentification.nameFromObject(enchant)); } } @@ -108,15 +101,6 @@ public class HandlerEnchants implements IContainerInputHandler { return false; } - /* - * public String getEnchantModName(Enchantment enchant){ String enchantPath = - * enchant.getClass().getProtectionDomain().getCodeSource().getLocation().toString(); - * //mod_Waila.log.log(Level.INFO, enchantPath); String enchantModName = ""; for (String s: - * mod_Waila.instance.modSourceList.keySet()) if (enchantPath.contains(s)) enchantModName = - * mod_Waila.instance.modSourceList.get(s); if (enchantModName.equals("Minecraft Coder Pack")) enchantModName = - * "Minecraft"; return enchantModName; } - */ - @Override public boolean mouseClicked(GuiContainer gui, int mousex, int mousey, int button) { return false; diff --git a/src/main/java/mcp/mobius/waila/handlers/nei/NEIHandler.java b/src/main/java/mcp/mobius/waila/handlers/nei/NEIHandler.java index fafc1b0..cd93d22 100644 --- a/src/main/java/mcp/mobius/waila/handlers/nei/NEIHandler.java +++ b/src/main/java/mcp/mobius/waila/handlers/nei/NEIHandler.java @@ -3,7 +3,6 @@ package mcp.mobius.waila.handlers.nei; import java.util.List; import net.minecraft.client.Minecraft; -import net.minecraft.client.gui.GuiScreen; import net.minecraft.client.gui.inventory.GuiInventory; import net.minecraft.item.ItemStack; import net.minecraft.util.ChatComponentTranslation; @@ -25,7 +24,6 @@ import mcp.mobius.waila.utils.Constants; public class NEIHandler { public static void register() { - // GuiContainerManager.addTooltipHandler(new TooltipHandlerWaila()); if (ConfigHandler.instance().getConfig(Configuration.CATEGORY_GENERAL, Constants.CFG_WAILA_NEWFILTERS, true)) { API.addSearchProvider(new ModNameFilter()); API.addSearchProvider(new OreDictFilter()); @@ -33,15 +31,10 @@ public class NEIHandler { GuiContainerManager.addTooltipHandler(new TooltipHandlerWaila()); - // KeyBindingRegistry.registerKeyBinding(new ConfigKeyHandler()); - // We mute the default keybind for displaying the tooltip NEIClientConfig.getSetting(Constants.BIND_NEI_SHOW).setIntValue(Keyboard.KEY_NONE); NEIClientConfig.getSetting(Constants.CFG_NEI_SHOW).setBooleanValue(false); - // API.addKeyBind(Constants.BIND_WIKI, "Display wiki", Keyboard.KEY_RSHIFT); - // API.addKeyBind(Constants.BIND_TECH, "Display techtree", Keyboard.KEY_RSHIFT); - GuiContainerManager.addInputHandler(new HandlerEnchants()); API.addKeyBind(Constants.BIND_SCREEN_ENCH, Keyboard.KEY_I); } @@ -50,18 +43,16 @@ public class NEIHandler { public static void openRecipeGUI(boolean recipe) { Minecraft mc = Minecraft.getMinecraft(); - boolean uiResult; - String msg; if ((RayTracing.instance().getTarget() != null) && (RayTracing.instance().getTarget().typeOfHit == MovingObjectPosition.MovingObjectType.BLOCK)) { List stacks = RayTracing.instance().getIdentifierItems(); - if (stacks.size() > 0) { + if (!stacks.isEmpty()) { mc.displayGuiScreen(new GuiInventory(mc.thePlayer)); if (firstInventory) { try { Thread.sleep(1000); - } catch (Exception e) {} ; + } catch (Exception ignored) {} firstInventory = false; } @@ -72,7 +63,7 @@ public class NEIHandler { mc.thePlayer.addChatMessage( new ChatComponentTranslation( "\u00a7f\u00a7o" + LangUtil.translateG("client.msg.norecipe"))); - mc.displayGuiScreen((GuiScreen) null); + mc.displayGuiScreen(null); mc.setIngameFocus(); } } @@ -84,7 +75,7 @@ public class NEIHandler { mc.thePlayer.addChatMessage( new ChatComponentTranslation( "\u00a7f\u00a7o" + LangUtil.translateG("client.msg.nousage"))); - mc.displayGuiScreen((GuiScreen) null); + mc.displayGuiScreen(null); mc.setIngameFocus(); } } diff --git a/src/main/java/mcp/mobius/waila/handlers/nei/TooltipHandlerWaila.java b/src/main/java/mcp/mobius/waila/handlers/nei/TooltipHandlerWaila.java index a55074c..de5f630 100644 --- a/src/main/java/mcp/mobius/waila/handlers/nei/TooltipHandlerWaila.java +++ b/src/main/java/mcp/mobius/waila/handlers/nei/TooltipHandlerWaila.java @@ -19,7 +19,7 @@ public class TooltipHandlerWaila implements IContainerTooltipHandler { public List handleItemTooltip(GuiContainer arg0, ItemStack itemstack, int arg2, int arg3, List currenttip) { String canonicalName = ModIdentification.nameFromStack(itemstack); - if (canonicalName != null && !canonicalName.equals("")) currenttip.add("\u00a79\u00a7o" + canonicalName); + if (canonicalName != null && !canonicalName.isEmpty()) currenttip.add("\u00a79\u00a7o" + canonicalName); return currenttip; } diff --git a/src/main/java/mcp/mobius/waila/network/IWailaMessage.java b/src/main/java/mcp/mobius/waila/network/IWailaMessage.java index 6d66b45..361c948 100644 --- a/src/main/java/mcp/mobius/waila/network/IWailaMessage.java +++ b/src/main/java/mcp/mobius/waila/network/IWailaMessage.java @@ -5,7 +5,7 @@ import io.netty.channel.ChannelHandlerContext; public interface IWailaMessage { - public void encodeInto(ChannelHandlerContext ctx, IWailaMessage msg, ByteBuf target) throws Exception; + void encodeInto(ChannelHandlerContext ctx, IWailaMessage msg, ByteBuf target) throws Exception; - public void decodeInto(ChannelHandlerContext ctx, ByteBuf dat, IWailaMessage msg); + void decodeInto(ChannelHandlerContext ctx, ByteBuf dat, IWailaMessage msg); } diff --git a/src/main/java/mcp/mobius/waila/network/Message0x00ServerPing.java b/src/main/java/mcp/mobius/waila/network/Message0x00ServerPing.java index 1cfdf56..4fd3e93 100644 --- a/src/main/java/mcp/mobius/waila/network/Message0x00ServerPing.java +++ b/src/main/java/mcp/mobius/waila/network/Message0x00ServerPing.java @@ -14,7 +14,7 @@ import mcp.mobius.waila.utils.WailaExceptionHandler; public class Message0x00ServerPing extends SimpleChannelInboundHandler implements IWailaMessage { - HashMap forcedKeys = new HashMap(); + HashMap forcedKeys = new HashMap<>(); public Message0x00ServerPing() { ConfigCategory serverForcingCfg = ConfigHandler.instance().config.getCategory(Constants.CATEGORY_SERVER); diff --git a/src/main/java/mcp/mobius/waila/network/Message0x01TERequest.java b/src/main/java/mcp/mobius/waila/network/Message0x01TERequest.java index b58c6f1..e0bc3ad 100644 --- a/src/main/java/mcp/mobius/waila/network/Message0x01TERequest.java +++ b/src/main/java/mcp/mobius/waila/network/Message0x01TERequest.java @@ -14,6 +14,7 @@ import net.minecraft.world.World; import net.minecraftforge.common.DimensionManager; import cpw.mods.fml.common.network.NetworkRegistry; +import cpw.mods.fml.relauncher.ReflectionHelper; import io.netty.buffer.ByteBuf; import io.netty.channel.ChannelHandlerContext; import io.netty.channel.SimpleChannelInboundHandler; @@ -25,21 +26,13 @@ import mcp.mobius.waila.utils.WailaExceptionHandler; public class Message0x01TERequest extends SimpleChannelInboundHandler implements IWailaMessage { - private static Field classToNameMap = null; + private static final Field classToNameMap; static { try { - classToNameMap = TileEntity.class.getDeclaredField("classToNameMap"); - classToNameMap.setAccessible(true); + classToNameMap = ReflectionHelper.findField(TileEntity.class, "classToNameMap", "field_145853_j"); } catch (Exception e) { - - try { - classToNameMap = TileEntity.class.getDeclaredField("field_145853_j"); - classToNameMap.setAccessible(true); - } catch (Exception f) { - throw new RuntimeException(f); - } - + throw new RuntimeException(e); } } @@ -47,7 +40,7 @@ public class Message0x01TERequest extends SimpleChannelInboundHandler keys = new HashSet(); + public HashSet keys = new HashSet<>(); public Message0x01TERequest() {} @@ -115,9 +108,7 @@ public class Message0x01TERequest extends SimpleChannelInboundHandler keys = new HashSet(); + public HashSet keys = new HashSet<>(); public Message0x03EntRequest() {} @@ -91,8 +91,6 @@ public class Message0x03EntRequest extends SimpleChannelInboundHandler channels; - private WailaPacketHandler() { + WailaPacketHandler() { this.channels = NetworkRegistry.INSTANCE.newChannel("Waila", new WailaCodec()); if (FMLCommonHandler.instance().getSide() == Side.CLIENT) { addClientHandlers(); @@ -55,7 +55,7 @@ public enum WailaPacketHandler { channel.pipeline().addAfter("TERequest", "EntRequest", new Message0x03EntRequest()); } - private class WailaCodec extends FMLIndexedMessageToMessageCodec { + private static class WailaCodec extends FMLIndexedMessageToMessageCodec { public WailaCodec() { addDiscriminator(0, Message0x00ServerPing.class); @@ -117,8 +117,7 @@ public enum WailaPacketHandler { public String readString(ByteBuf buffer) throws IOException { int j = buffer.readShort(); - String s = new String(buffer.readBytes(j).array(), Charsets.UTF_8); - return s; + return new String(buffer.readBytes(j).array(), Charsets.UTF_8); } public static EntityPlayerMP getPlayer(ChannelHandlerContext ctx) { diff --git a/src/main/java/mcp/mobius/waila/network/old/Packet0x00ServerPing.java.bak b/src/main/java/mcp/mobius/waila/network/old/Packet0x00ServerPing.java.bak deleted file mode 100644 index da393d4..0000000 --- a/src/main/java/mcp/mobius/waila/network/old/Packet0x00ServerPing.java.bak +++ /dev/null @@ -1,76 +0,0 @@ -package mcp.mobius.waila.network; - -import java.io.ByteArrayInputStream; -import java.io.ByteArrayOutputStream; -import java.io.DataInputStream; -import java.io.DataOutputStream; -import java.io.IOException; -import java.util.HashMap; - -import mcp.mobius.waila.api.impl.ConfigHandler; -import mcp.mobius.waila.utils.Constants; -import net.minecraft.network.packet.Packet; -import net.minecraft.network.packet.Packet250CustomPayload; -import net.minecraftforge.common.config.ConfigCategory; - -public class Packet0x00ServerPing { - - public byte header; - public HashMap forcedKeys = new HashMap(); - - public Packet0x00ServerPing(Packet250CustomPayload packet){ - DataInputStream inputStream = new DataInputStream(new ByteArrayInputStream(packet.data)); - try{ - this.header = inputStream.readByte(); - - forcedKeys.clear(); - while (true){ - String key = Packet.readString(inputStream, 255); - if (key.equals("END OF LIST")) break; - boolean value = inputStream.readBoolean(); - forcedKeys.put(key, value); - } - - } catch (IOException e){} - } - - public static Packet250CustomPayload create(){ - Packet250CustomPayload packet = new Packet250CustomPayload(); - ByteArrayOutputStream bos = new ByteArrayOutputStream(1); - DataOutputStream outputStream = new DataOutputStream(bos); - - try{ - outputStream.writeByte(0x00); - - ConfigCategory serverForcing = ConfigHandler.instance().config.getCategory(Constants.CATEGORY_SERVER); - - /* - ConfigCategory serverModules = ConfigHandler.instance().config.getCategory(Constants.CATEGORY_MODULES); - - HashMap keys = new HashMap(); - - for (String key : serverModules.keySet()){ - keys.put(key, serverModules.get(key).getBoolean(true)); - } - */ - - for (String key : serverForcing.keySet()){ - if (serverForcing.get(key).getBoolean(false)){ - Packet.writeString(key, outputStream); - outputStream.writeBoolean(ConfigHandler.instance().getConfig(key)); - } - } - - Packet.writeString("END OF LIST", outputStream); - - }catch(IOException e){} - - packet.channel = "Waila"; - packet.data = bos.toByteArray(); - packet.length = bos.size(); - - return packet; - } - - -} diff --git a/src/main/java/mcp/mobius/waila/network/old/Packet0x01TERequest.java.bak b/src/main/java/mcp/mobius/waila/network/old/Packet0x01TERequest.java.bak deleted file mode 100644 index 210ec7b..0000000 --- a/src/main/java/mcp/mobius/waila/network/old/Packet0x01TERequest.java.bak +++ /dev/null @@ -1,67 +0,0 @@ -package mcp.mobius.waila.network; - -import java.io.ByteArrayInputStream; -import java.io.ByteArrayOutputStream; -import java.io.DataInputStream; -import java.io.DataOutputStream; -import java.io.IOException; -import java.util.HashSet; - -import net.minecraft.network.packet.Packet; -import net.minecraft.network.packet.Packet250CustomPayload; -import net.minecraft.util.MovingObjectPosition; -import net.minecraft.world.World; - -public class Packet0x01TERequest { - - public byte header; - public int worldID; - public int posX; - public int posY; - public int posZ; - public HashSet keys = new HashSet (); - - public Packet0x01TERequest(Packet250CustomPayload packet){ - DataInputStream inputStream = new DataInputStream(new ByteArrayInputStream(packet.data)); - keys.clear(); - try{ - this.header = inputStream.readByte(); - this.worldID = inputStream.readInt(); - this.posX = inputStream.readInt(); - this.posY = inputStream.readInt(); - this.posZ = inputStream.readInt(); - - int nkeys = inputStream.readInt(); - for (int i = 0; i < nkeys; i++) - keys.add(Packet.readString(inputStream, 250)); - - } catch (IOException e){} - } - - public static Packet250CustomPayload create(World world, MovingObjectPosition mop, HashSet keys){ - Packet250CustomPayload packet = new Packet250CustomPayload(); - ByteArrayOutputStream bos = new ByteArrayOutputStream(1 + 4 + 4 + 4 + 4); - DataOutputStream outputStream = new DataOutputStream(bos); - - keys.add("x"); keys.add("y"); keys.add("z"); - - try{ - outputStream.writeByte(0x01); - outputStream.writeInt(world.provider.dimensionId); - outputStream.writeInt(mop.blockX); - outputStream.writeInt(mop.blockY); - outputStream.writeInt(mop.blockZ); - outputStream.writeInt(keys.size()); - - for (String key : keys) - Packet.writeString(key, outputStream); - - }catch(IOException e){} - - packet.channel = "Waila"; - packet.data = bos.toByteArray(); - packet.length = bos.size(); - - return packet; - } -} diff --git a/src/main/java/mcp/mobius/waila/network/old/Packet0x02TENBTData.java.bak b/src/main/java/mcp/mobius/waila/network/old/Packet0x02TENBTData.java.bak deleted file mode 100644 index ed790f5..0000000 --- a/src/main/java/mcp/mobius/waila/network/old/Packet0x02TENBTData.java.bak +++ /dev/null @@ -1,42 +0,0 @@ -package mcp.mobius.waila.network; - -import java.io.ByteArrayInputStream; -import java.io.ByteArrayOutputStream; -import java.io.DataInputStream; -import java.io.DataOutputStream; -import java.io.IOException; - -import mcp.mobius.waila.utils.NBTUtil; -import net.minecraft.nbt.CompressedStreamTools; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.network.packet.Packet250CustomPayload; - -public class Packet0x02TENBTData { - public byte header; - public NBTTagCompound tag; - - public Packet0x02TENBTData(Packet250CustomPayload packet){ - DataInputStream inputStream = new DataInputStream(new ByteArrayInputStream(packet.data)); - try{ - this.header = inputStream.readByte(); - this.tag = NBTUtil.readNBTTagCompound(inputStream); - } catch (IOException e){} - } - - public static Packet250CustomPayload create(NBTTagCompound tag){ - Packet250CustomPayload packet = new Packet250CustomPayload(); - ByteArrayOutputStream bos = new ByteArrayOutputStream(1 + 4 + 4 + 4 + 4); - DataOutputStream outputStream = new DataOutputStream(bos); - - try{ - outputStream.writeByte(0x02); - NBTUtil.writeNBTTagCompound(tag, outputStream); - }catch(IOException e){} - - packet.channel = "Waila"; - packet.data = bos.toByteArray(); - packet.length = bos.size(); - - return packet; - } -} diff --git a/src/main/java/mcp/mobius/waila/network/old/Packet0x03EntRequest.java.bak b/src/main/java/mcp/mobius/waila/network/old/Packet0x03EntRequest.java.bak deleted file mode 100644 index d7e800d..0000000 --- a/src/main/java/mcp/mobius/waila/network/old/Packet0x03EntRequest.java.bak +++ /dev/null @@ -1,60 +0,0 @@ -package mcp.mobius.waila.network; - -import java.io.ByteArrayInputStream; -import java.io.ByteArrayOutputStream; -import java.io.DataInputStream; -import java.io.DataOutputStream; -import java.io.IOException; -import java.util.HashSet; - -import net.minecraft.entity.Entity; -import net.minecraft.network.packet.Packet; -import net.minecraft.network.packet.Packet250CustomPayload; -import net.minecraft.world.World; - -public class Packet0x03EntRequest { - - public byte header; - public int worldID; - public int id; - public HashSet keys = new HashSet (); - - public Packet0x03EntRequest(Packet250CustomPayload packet){ - DataInputStream inputStream = new DataInputStream(new ByteArrayInputStream(packet.data)); - keys.clear(); - try{ - this.header = inputStream.readByte(); - this.worldID = inputStream.readInt(); - this.id = inputStream.readInt(); - - int nkeys = inputStream.readInt(); - for (int i = 0; i < nkeys; i++) - keys.add(Packet.readString(inputStream, 250)); - - } catch (IOException e){} - } - - public static Packet250CustomPayload create(World world, Entity ent, HashSet keys){ - Packet250CustomPayload packet = new Packet250CustomPayload(); - ByteArrayOutputStream bos = new ByteArrayOutputStream(1 + 4 + 4 + 4 + 4); - DataOutputStream outputStream = new DataOutputStream(bos); - - try{ - outputStream.writeByte(0x03); - outputStream.writeInt(world.provider.dimensionId); - outputStream.writeInt(ent.entityId); - outputStream.writeInt(keys.size()); - - for (String key : keys) - Packet.writeString(key, outputStream); - - }catch(IOException e){} - - packet.channel = "Waila"; - packet.data = bos.toByteArray(); - packet.length = bos.size(); - - return packet; - } - -} diff --git a/src/main/java/mcp/mobius/waila/network/old/Packet0x04EntNBTData.java.bak b/src/main/java/mcp/mobius/waila/network/old/Packet0x04EntNBTData.java.bak deleted file mode 100644 index 5071ccf..0000000 --- a/src/main/java/mcp/mobius/waila/network/old/Packet0x04EntNBTData.java.bak +++ /dev/null @@ -1,45 +0,0 @@ -package mcp.mobius.waila.network; - -import java.io.ByteArrayInputStream; -import java.io.ByteArrayOutputStream; -import java.io.DataInputStream; -import java.io.DataOutputStream; -import java.io.IOException; - -import mcp.mobius.waila.utils.NBTUtil; -import net.minecraft.nbt.CompressedStreamTools; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.network.packet.Packet250CustomPayload; - -public class Packet0x04EntNBTData { - public byte header; - public NBTTagCompound tag; - - public Packet0x04EntNBTData(Packet250CustomPayload packet){ - DataInputStream inputStream = new DataInputStream(new ByteArrayInputStream(packet.data)); - try{ - this.header = inputStream.readByte(); - this.tag = NBTUtil.readNBTTagCompound(inputStream); - } catch (IOException e){} - } - - public static Packet250CustomPayload create(NBTTagCompound tag){ - Packet250CustomPayload packet = new Packet250CustomPayload(); - ByteArrayOutputStream bos = new ByteArrayOutputStream(1 + 4 + 4 + 4 + 4); - DataOutputStream outputStream = new DataOutputStream(bos); - - try{ - outputStream.writeByte(0x04); - NBTUtil.writeNBTTagCompound(tag, outputStream); - }catch(IOException e){} - - packet.channel = "Waila"; - packet.data = bos.toByteArray(); - packet.length = bos.size(); - - return packet; - } - - - -} diff --git a/src/main/java/mcp/mobius/waila/network/old/WailaConnectionHandler.java.bak b/src/main/java/mcp/mobius/waila/network/old/WailaConnectionHandler.java.bak deleted file mode 100644 index 76e35c3..0000000 --- a/src/main/java/mcp/mobius/waila/network/old/WailaConnectionHandler.java.bak +++ /dev/null @@ -1,40 +0,0 @@ -package mcp.mobius.waila.network; - -import net.minecraft.network.INetworkManager; -import net.minecraft.network.NetLoginHandler; -import net.minecraft.network.packet.NetHandler; -import net.minecraft.network.packet.Packet1Login; -import net.minecraft.server.MinecraftServer; -import cpw.mods.fml.common.network.IConnectionHandler; -import cpw.mods.fml.common.network.PacketDispatcher; -import cpw.mods.fml.common.network.Player; - -public class WailaConnectionHandler implements IConnectionHandler { - - @Override - public void playerLoggedIn(Player player, NetHandler netHandler, INetworkManager manager) { - PacketDispatcher.sendPacketToPlayer(Packet0x00ServerPing.create(), player); - } - - @Override - public String connectionReceived(NetLoginHandler netHandler, INetworkManager manager) { - return null; - } - - @Override - public void connectionOpened(NetHandler netClientHandler, String server, int port, INetworkManager manager) { - } - - @Override - public void connectionOpened(NetHandler netClientHandler, MinecraftServer server, INetworkManager manager) { - } - - @Override - public void connectionClosed(INetworkManager manager) { - } - - @Override - public void clientLoggedIn(NetHandler clientHandler, INetworkManager manager, Packet1Login login) { - } - -} diff --git a/src/main/java/mcp/mobius/waila/network/old/WailaPacketHandler.java.bak b/src/main/java/mcp/mobius/waila/network/old/WailaPacketHandler.java.bak deleted file mode 100644 index f09956c..0000000 --- a/src/main/java/mcp/mobius/waila/network/old/WailaPacketHandler.java.bak +++ /dev/null @@ -1,99 +0,0 @@ -package mcp.mobius.waila.network; - -import java.io.ByteArrayInputStream; -import java.io.DataInputStream; -import java.io.IOException; - -import mcp.mobius.waila.Waila; -import mcp.mobius.waila.api.impl.ConfigHandler; -import mcp.mobius.waila.api.impl.DataAccessorBlock; -import mcp.mobius.waila.api.impl.DataAccessorEntity; -import mcp.mobius.waila.utils.NBTUtil; -import mcp.mobius.waila.utils.WailaExceptionHandler; -import net.minecraft.entity.Entity; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.network.INetworkManager; -import net.minecraft.network.packet.Packet250CustomPayload; -import net.minecraft.server.MinecraftServer; -import net.minecraft.tileentity.TileEntity; -import net.minecraftforge.common.DimensionManager; -import cpw.mods.fml.common.FMLCommonHandler; -import cpw.mods.fml.common.network.IPacketHandler; -import cpw.mods.fml.common.network.PacketDispatcher; -import cpw.mods.fml.common.network.Player; - -public class WailaPacketHandler implements IPacketHandler { - - @Override - public void onPacketData(INetworkManager manager, Packet250CustomPayload packet, Player player){ - try{ - if (packet.channel.equals("Waila")) { - - byte header = this.getHeader(packet); - if (header == 0x00){ - Packet0x00ServerPing castedPacket = new Packet0x00ServerPing(packet); - Waila.log.info("Received server authentication msg. Remote sync will be activated"); - Waila.instance.serverPresent = true; - - for (String key : castedPacket.forcedKeys.keySet()) - Waila.log.info(String.format("Received forced key config %s : %s", key, castedPacket.forcedKeys.get(key))); - - ConfigHandler.instance().forcedConfigs = castedPacket.forcedKeys; - } - - else if (header == 0x01){ - Packet0x01TERequest castedPacket = new Packet0x01TERequest(packet); - MinecraftServer server = FMLCommonHandler.instance().getMinecraftServerInstance(); - TileEntity entity = DimensionManager.getWorld(castedPacket.worldID).getBlockTileEntity(castedPacket.posX, castedPacket.posY, castedPacket.posZ); - if (entity != null){ - try{ - NBTTagCompound tag = new NBTTagCompound(); - entity.writeToNBT(tag); - PacketDispatcher.sendPacketToPlayer(Packet0x02TENBTData.create(NBTUtil.createTag(tag, castedPacket.keys)), player); - }catch(Throwable e){ - WailaExceptionHandler.handleErr(e, entity.getClass().toString(), null); - } - } - } - else if (header == 0x02){ - Packet0x02TENBTData castedPacket = new Packet0x02TENBTData(packet); - DataAccessorBlock.instance.remoteNbt = castedPacket.tag; - } - - else if (header == 0x03){ - Packet0x03EntRequest castedPacket = new Packet0x03EntRequest(packet); - MinecraftServer server = FMLCommonHandler.instance().getMinecraftServerInstance(); - Entity entity = DimensionManager.getWorld(castedPacket.worldID).getEntityByID(castedPacket.id); - if (entity != null){ - try{ - NBTTagCompound tag = new NBTTagCompound(); - entity.writeToNBT(tag); - PacketDispatcher.sendPacketToPlayer(Packet0x04EntNBTData.create(NBTUtil.createTag(tag, castedPacket.keys)), player); - }catch(Throwable e){ - WailaExceptionHandler.handleErr(e, entity.getClass().toString(), null); - } - } - } - - else if (header == 0x04){ - Packet0x04EntNBTData castedPacket = new Packet0x04EntNBTData(packet); - DataAccessorEntity.instance.remoteNbt = castedPacket.tag; - } - } - } - catch (Exception e){ - return; - } - } - - public byte getHeader(Packet250CustomPayload packet){ - DataInputStream inputStream = new DataInputStream(new ByteArrayInputStream(packet.data)); - try{ - return inputStream.readByte(); - } catch (IOException e){ - return -1; - } - } - - -} diff --git a/src/main/java/mcp/mobius/waila/overlay/DisplayUtil.java b/src/main/java/mcp/mobius/waila/overlay/DisplayUtil.java index a12b0ea..80f3180 100644 --- a/src/main/java/mcp/mobius/waila/overlay/DisplayUtil.java +++ b/src/main/java/mcp/mobius/waila/overlay/DisplayUtil.java @@ -34,7 +34,7 @@ public class DisplayUtil { private static RenderItem renderItem = new RenderItem(); public static int getDisplayWidth(String s) { - if (s == null || s.equals("")) return 0; + if (s == null || s.isEmpty()) return 0; int width = 0; @@ -112,11 +112,11 @@ public class DisplayUtil { Tessellator tessellator = Tessellator.instance; tessellator.startDrawingQuads(); tessellator.setColorRGBA_F(f1, f2, f3, f); - tessellator.addVertex((double) (x + w), (double) y, (double) zLevel); - tessellator.addVertex((double) x, (double) y, (double) zLevel); + tessellator.addVertex(x + w, y, zLevel); + tessellator.addVertex(x, y, zLevel); tessellator.setColorRGBA_F(f5, f6, f7, f4); - tessellator.addVertex((double) x, (double) (y + h), (double) zLevel); - tessellator.addVertex((double) (x + w), (double) (y + h), (double) zLevel); + tessellator.addVertex(x, y + h, zLevel); + tessellator.addVertex(x + w, y + h, zLevel); tessellator.draw(); GL11.glShadeModel(GL11.GL_FLAT); GL11.glDisable(GL11.GL_BLEND); @@ -131,10 +131,10 @@ public class DisplayUtil { Tessellator tessellator = Tessellator.instance; tessellator.startDrawingQuads(); tessellator.setColorOpaque_F(1, 1, 1); - tessellator.addVertexWithUV(x + 0, y + h, zLevel, (u + 0) * f, (v + th) * f1); + tessellator.addVertexWithUV(x, y + h, zLevel, (u) * f, (v + th) * f1); tessellator.addVertexWithUV(x + w, y + h, zLevel, (u + tw) * f, (v + th) * f1); - tessellator.addVertexWithUV(x + w, y + 0, zLevel, (u + tw) * f, (v + 0) * f1); - tessellator.addVertexWithUV(x + 0, y + 0, zLevel, (u + 0) * f, (v + 0) * f1); + tessellator.addVertexWithUV(x + w, y, zLevel, (u + tw) * f, (v) * f1); + tessellator.addVertexWithUV(x, y, zLevel, (u) * f, (v) * f1); tessellator.draw(); } @@ -151,11 +151,11 @@ public class DisplayUtil { Minecraft.getMinecraft().gameSettings.advancedItemTooltips); } catch (Throwable ignored) {} - if (namelist == null) namelist = new ArrayList(); + if (namelist == null) namelist = new ArrayList<>(); - if (namelist.size() == 0) namelist.add("Unnamed"); + if (namelist.isEmpty()) namelist.add("Unnamed"); - if (namelist.get(0) == null || namelist.get(0).equals("")) namelist.set(0, "Unnamed"); + if (namelist.get(0) == null || namelist.get(0).isEmpty()) namelist.set(0, "Unnamed"); namelist.set(0, itemstack.getRarity().rarityColor.toString() + namelist.get(0)); for (int i = 1; i < namelist.size(); i++) namelist.set(i, "\u00a77" + namelist.get(i)); diff --git a/src/main/java/mcp/mobius/waila/overlay/IconUI.java b/src/main/java/mcp/mobius/waila/overlay/IconUI.java index a93bc0d..a001a3b 100644 --- a/src/main/java/mcp/mobius/waila/overlay/IconUI.java +++ b/src/main/java/mcp/mobius/waila/overlay/IconUI.java @@ -12,7 +12,7 @@ public enum IconUI { EHEART(52, 9, 9, 9, "c"), BUBBLEEXP(25, 18, 9, 9, "x"); - private final static HashMap lk = new HashMap(); + private final static HashMap lk = new HashMap<>(); static { for (IconUI icon : IconUI.values()) { lk.put(icon.symbol, icon); @@ -23,11 +23,11 @@ public enum IconUI { public final int bu, bv, bsu, bsv; public final String symbol; - private IconUI(int u, int v, int su, int sv, String symbol) { + IconUI(int u, int v, int su, int sv, String symbol) { this(u, v, su, sv, -1, -1, -1, -1, symbol); } - private IconUI(int u, int v, int su, int sv, int bu, int bv, int bsu, int bsv, String symbol) { + IconUI(int u, int v, int su, int sv, int bu, int bv, int bsu, int bsv, String symbol) { this.u = u; this.v = v; this.su = su; diff --git a/src/main/java/mcp/mobius/waila/overlay/OverlayRenderer.java b/src/main/java/mcp/mobius/waila/overlay/OverlayRenderer.java index 75bb5f3..a597ed8 100644 --- a/src/main/java/mcp/mobius/waila/overlay/OverlayRenderer.java +++ b/src/main/java/mcp/mobius/waila/overlay/OverlayRenderer.java @@ -41,7 +41,6 @@ public class OverlayRenderer { } public static void renderOverlay(Tooltip tooltip) { - // TrueTypeFont font = (TrueTypeFont)mod_Waila.proxy.getFont(); GL11.glPushMatrix(); saveGLState(); @@ -84,11 +83,7 @@ public class OverlayRenderer { public static void saveGLState() { hasBlending = GL11.glGetBoolean(GL11.GL_BLEND); hasLight = GL11.glGetBoolean(GL11.GL_LIGHTING); - // hasLight0 = GL11.glGetBoolean(GL11.GL_LIGHT0); - // hasLight1 = GL11.glGetBoolean(GL11.GL_LIGHT1); hasDepthTest = GL11.glGetBoolean(GL11.GL_DEPTH_TEST); - // hasRescaleNormal = GL11.glGetBoolean(GL12.GL_RESCALE_NORMAL); - // hasColorMaterial = GL11.glGetBoolean(GL11.GL_COLOR_MATERIAL); boundTexIndex = GL11.glGetInteger(GL11.GL_TEXTURE_BINDING_2D); GL11.glPushAttrib(GL11.GL_CURRENT_BIT); } @@ -96,28 +91,20 @@ public class OverlayRenderer { public static void loadGLState() { if (hasBlending) GL11.glEnable(GL11.GL_BLEND); else GL11.glDisable(GL11.GL_BLEND); - // if (hasLight) GL11.glEnable(GL11.GL_LIGHTING); else GL11.glDisable(GL11.GL_LIGHTING); - // if (hasLight0) GL11.glEnable(GL11.GL_LIGHT0); else GL11.glDisable(GL11.GL_LIGHT0); if (hasLight1) GL11.glEnable(GL11.GL_LIGHT1); else GL11.glDisable(GL11.GL_LIGHT1); if (hasDepthTest) GL11.glEnable(GL11.GL_DEPTH_TEST); else GL11.glDisable(GL11.GL_DEPTH_TEST); - // if (hasRescaleNormal) GL11.glEnable(GL12.GL_RESCALE_NORMAL); else GL11.glDisable(GL12.GL_RESCALE_NORMAL); - // if (hasColorMaterial) GL11.glEnable(GL11.GL_COLOR_MATERIAL); else GL11.glDisable(GL11.GL_COLOR_MATERIAL); GL11.glBindTexture(GL11.GL_TEXTURE_2D, boundTexIndex); GL11.glPopAttrib(); - // GL11.glColor4f(1.0f, 1.0f, 1.0f, 1.0f); } public static void drawTooltipBox(int x, int y, int w, int h, int bg, int grad1, int grad2) { - // int bg = 0xf0100010; DisplayUtil.drawGradientRect(x + 1, y, w - 1, 1, bg, bg); DisplayUtil.drawGradientRect(x + 1, y + h, w - 1, 1, bg, bg); DisplayUtil.drawGradientRect(x + 1, y + 1, w - 1, h - 1, bg, bg);// center DisplayUtil.drawGradientRect(x, y + 1, 1, h - 1, bg, bg); DisplayUtil.drawGradientRect(x + w, y + 1, 1, h - 1, bg, bg); - // int grad1 = 0x505000ff; - // int grad2 = 0x5028007F; DisplayUtil.drawGradientRect(x + 1, y + 2, 1, h - 3, grad1, grad2); DisplayUtil.drawGradientRect(x + w - 1, y + 2, 1, h - 3, grad1, grad2); diff --git a/src/main/java/mcp/mobius/waila/overlay/RayTracing.java b/src/main/java/mcp/mobius/waila/overlay/RayTracing.java index e575ba9..50aed1f 100644 --- a/src/main/java/mcp/mobius/waila/overlay/RayTracing.java +++ b/src/main/java/mcp/mobius/waila/overlay/RayTracing.java @@ -68,7 +68,6 @@ public class RayTracing { Vec3 vec31 = entity.getLook(par3); Vec3 vec32 = vec3.addVector(vec31.xCoord * par1, vec31.yCoord * par1, vec31.zCoord * par1); - // if (ConfigHandler.instance().getConfig(Configuration.CATEGORY_GENERAL, Constants.CFG_WAILA_LIQUID, true)) if (ConfigHandler.instance().getConfig(Configuration.CATEGORY_GENERAL, Constants.CFG_WAILA_LIQUID, true)) return entity.worldObj.rayTraceBlocks(vec3, vec32, true); else return entity.worldObj.rayTraceBlocks(vec3, vec32, false); @@ -112,8 +111,7 @@ public class RayTracing { int x = this.target.blockX; int y = this.target.blockY; int z = this.target.blockZ; - // int blockID = world.getBlockId(x, y, z); - // Block mouseoverBlock = Block.blocksList[blockID]; + Block mouseoverBlock = world.getBlock(x, y, z); TileEntity tileEntity = world.getTileEntity(x, y, z); if (mouseoverBlock == null) return items; @@ -157,15 +155,9 @@ public class RayTracing { try { ItemStack block = new ItemStack(mouseoverBlock, 1, world.getBlockMetadata(x, y, z)); - // System.out.printf("%s %s %s\n", block, block.getDisplayName(), block.getItemDamage()); - if (block.getItem() != null) items.add(block); - // else - // items.add(new ItemStack(new ItemBlock(mouseoverBlock))); - // else - // items.add(new ItemStack(Item.getItemFromBlock(mouseoverBlock))); - } catch (Exception e) {} + } catch (Exception ignored) {} } if (!items.isEmpty()) return items; @@ -177,11 +169,6 @@ public class RayTracing { if (!items.isEmpty()) return items; - /* - * try { items.addAll(mouseoverBlock.getBlockDropped(world, x, y, z, world.getBlockMetadata(x, y, z), 0)); } - * catch(Exception e){} if(items.size() > 0) return items; - */ - if (mouseoverBlock instanceof IShearable) { IShearable shearable = (IShearable) mouseoverBlock; if (shearable.isShearable(new ItemStack(Items.shears), world, x, y, z)) { diff --git a/src/main/java/mcp/mobius/waila/overlay/Tooltip.java b/src/main/java/mcp/mobius/waila/overlay/Tooltip.java index e517713..67466c5 100644 --- a/src/main/java/mcp/mobius/waila/overlay/Tooltip.java +++ b/src/main/java/mcp/mobius/waila/overlay/Tooltip.java @@ -32,15 +32,14 @@ import mcp.mobius.waila.utils.WailaExceptionHandler; public class Tooltip { public static int TabSpacing = 8; - public static int IconSize = 8; - ArrayList> lines = new ArrayList>(); - ArrayList> sizes = new ArrayList>(); - ArrayList columnsWidth = new ArrayList(); - ArrayList columnsPos = new ArrayList(); + ArrayList> lines = new ArrayList<>(); + ArrayList> sizes = new ArrayList<>(); + ArrayList columnsWidth = new ArrayList<>(); + ArrayList columnsPos = new ArrayList<>(); - ArrayList elements = new ArrayList(); - ArrayList elements2nd = new ArrayList(); + ArrayList elements = new ArrayList<>(); + ArrayList elements2nd = new ArrayList<>(); int w, h, x, y, ty; int offsetX; @@ -52,7 +51,7 @@ public class Tooltip { IWailaCommonAccessor accessor = DataAccessorCommon.instance; ///////////////////////////////////// Renderable/////////////////////////////////////// - private class Renderable { + private static class Renderable { final IWailaTooltipRenderer renderer; final Point pos; @@ -112,8 +111,8 @@ public class Tooltip { for (String s : textData) { - ArrayList line = new ArrayList(Arrays.asList(patternTab.split(s))); - ArrayList size = new ArrayList(); + ArrayList line = new ArrayList<>(Arrays.asList(patternTab.split(s))); + ArrayList size = new ArrayList<>(); for (String ss : line) size.add(DisplayUtil.getDisplayWidth(ss)); // This line.size() > 1 is to prevent columns to align on lines without column (ie : the name & modid) @@ -186,8 +185,6 @@ public class Tooltip { renderable = new Renderable( new TTRenderString(DisplayUtil.stripWailaSymbols(cs)), new Point(offsetX, offsetY)); - // renderable = new Renderable(new TTRenderTrueTyper(DisplayUtil.stripWailaSymbols(cs)), new - // Point(offsetX, offsetY)); this.elements.add(renderable); } diff --git a/src/main/java/mcp/mobius/waila/overlay/WailaTickHandler.java b/src/main/java/mcp/mobius/waila/overlay/WailaTickHandler.java index 2857d27..48e430e 100644 --- a/src/main/java/mcp/mobius/waila/overlay/WailaTickHandler.java +++ b/src/main/java/mcp/mobius/waila/overlay/WailaTickHandler.java @@ -7,7 +7,6 @@ import java.util.List; import net.minecraft.client.Minecraft; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; import net.minecraft.util.MovingObjectPosition; import net.minecraft.world.World; @@ -29,17 +28,9 @@ import mcp.mobius.waila.utils.Constants; public class WailaTickHandler { - // public static LangUtil lang = LangUtil.loadLangDir("waila"); - - private int ticks = 0; - public ItemStack identifiedHighlight = new ItemStack(Blocks.dirt); - private List currenttip = new TipList(); - private List currenttipHead = new TipList(); - private List currenttipBody = new TipList(); - private List currenttipTail = new TipList(); public Tooltip tooltip = null; public MetaDataProvider handler = new MetaDataProvider(); - private Minecraft mc = Minecraft.getMinecraft(); + private final Minecraft mc = Minecraft.getMinecraft(); private static WailaTickHandler _instance; @@ -73,6 +64,10 @@ public class WailaTickHandler { RayTracing.instance().fire(); MovingObjectPosition target = RayTracing.instance().getTarget(); + List currenttip; + List currenttipHead; + List currenttipBody; + List currenttipTail; if (target != null && target.typeOfHit == MovingObjectPosition.MovingObjectType.BLOCK) { DataAccessorCommon accessor = DataAccessorCommon.instance; accessor.set(world, player, target); @@ -80,13 +75,12 @@ public class WailaTickHandler { // or the override if (targetStack != null) { - this.currenttip = new TipList(); - this.currenttipHead = new TipList(); - this.currenttipBody = new TipList(); - this.currenttipTail = new TipList(); + currenttip = new TipList(); + currenttipHead = new TipList(); + currenttipBody = new TipList(); + currenttipTail = new TipList(); - // this.identifiedHighlight = handler.identifyHighlight(world, player, target); - this.currenttipHead = handler.handleBlockTextData( + currenttipHead = handler.handleBlockTextData( targetStack, world, player, @@ -94,7 +88,7 @@ public class WailaTickHandler { accessor, currenttipHead, Layout.HEADER); - this.currenttipBody = handler.handleBlockTextData( + currenttipBody = handler.handleBlockTextData( targetStack, world, player, @@ -102,7 +96,7 @@ public class WailaTickHandler { accessor, currenttipBody, Layout.BODY); - this.currenttipTail = handler.handleBlockTextData( + currenttipTail = handler.handleBlockTextData( targetStack, world, player, @@ -113,17 +107,17 @@ public class WailaTickHandler { if (ConfigHandler.instance() .getConfig(Configuration.CATEGORY_GENERAL, Constants.CFG_WAILA_SHIFTBLOCK, false) - && currenttipBody.size() > 0 + && !currenttipBody.isEmpty() && !accessor.getPlayer().isSneaking()) { currenttipBody.clear(); currenttipBody.add(ITALIC + "Press shift for more data"); } - this.currenttip.addAll(this.currenttipHead); - this.currenttip.addAll(this.currenttipBody); - this.currenttip.addAll(this.currenttipTail); + currenttip.addAll(currenttipHead); + currenttip.addAll(currenttipBody); + currenttip.addAll(currenttipTail); - this.tooltip = new Tooltip(this.currenttip, targetStack); + this.tooltip = new Tooltip(currenttip, targetStack); } } else if (target != null && target.typeOfHit == MovingObjectPosition.MovingObjectType.ENTITY) { DataAccessorCommon accessor = DataAccessorCommon.instance; @@ -133,12 +127,12 @@ public class WailaTickHandler { // check. if (targetEnt != null) { - this.currenttip = new TipList(); - this.currenttipHead = new TipList(); - this.currenttipBody = new TipList(); - this.currenttipTail = new TipList(); + currenttip = new TipList(); + currenttipHead = new TipList(); + currenttipBody = new TipList(); + currenttipTail = new TipList(); - this.currenttipHead = handler.handleEntityTextData( + currenttipHead = handler.handleEntityTextData( targetEnt, world, player, @@ -146,7 +140,7 @@ public class WailaTickHandler { accessor, currenttipHead, Layout.HEADER); - this.currenttipBody = handler.handleEntityTextData( + currenttipBody = handler.handleEntityTextData( targetEnt, world, player, @@ -154,7 +148,7 @@ public class WailaTickHandler { accessor, currenttipBody, Layout.BODY); - this.currenttipTail = handler.handleEntityTextData( + currenttipTail = handler.handleEntityTextData( targetEnt, world, player, @@ -165,17 +159,17 @@ public class WailaTickHandler { if (ConfigHandler.instance() .getConfig(Configuration.CATEGORY_GENERAL, Constants.CFG_WAILA_SHIFTENTS, false) - && currenttipBody.size() > 0 + && !currenttipBody.isEmpty() && !accessor.getPlayer().isSneaking()) { currenttipBody.clear(); currenttipBody.add(ITALIC + "Press shift for more data"); } - this.currenttip.addAll(this.currenttipHead); - this.currenttip.addAll(this.currenttipBody); - this.currenttip.addAll(this.currenttipTail); + currenttip.addAll(currenttipHead); + currenttip.addAll(currenttipBody); + currenttip.addAll(currenttipTail); - this.tooltip = new Tooltip(this.currenttip, false); + this.tooltip = new Tooltip(currenttip, false); } } } diff --git a/src/main/java/mcp/mobius/waila/overlay/tooltiprenderers/TTRenderHealth.java b/src/main/java/mcp/mobius/waila/overlay/tooltiprenderers/TTRenderHealth.java index 81c4c49..630d819 100644 --- a/src/main/java/mcp/mobius/waila/overlay/tooltiprenderers/TTRenderHealth.java +++ b/src/main/java/mcp/mobius/waila/overlay/tooltiprenderers/TTRenderHealth.java @@ -17,9 +17,8 @@ public class TTRenderHealth implements IWailaTooltipRenderer { @Override public Dimension getSize(String[] params, IWailaCommonAccessor accessor) { - float maxhearts = Float.valueOf(params[0]); - float health = Float.valueOf(params[1]); - float maxhealth = Float.valueOf(params[2]); + float maxhearts = Float.parseFloat(params[0]); + float maxhealth = Float.parseFloat(params[2]); int heartsPerLine = (int) (Math.min(maxhearts, Math.ceil(maxhealth))); int nlines = (int) (Math.ceil(maxhealth / maxhearts)); @@ -29,9 +28,9 @@ public class TTRenderHealth implements IWailaTooltipRenderer { @Override public void draw(String[] params, IWailaCommonAccessor accessor) { - float maxhearts = Float.valueOf(params[0]); - float health = Float.valueOf(params[1]); - float maxhealth = Float.valueOf(params[2]); + float maxhearts = Float.parseFloat(params[0]); + float health = Float.parseFloat(params[1]); + float maxhealth = Float.parseFloat(params[2]); int nhearts = MathHelper.ceiling_float_int(maxhealth); int heartsPerLine = (int) (Math.min(maxhearts, Math.ceil(maxhealth))); diff --git a/src/main/java/mcp/mobius/waila/overlay/tooltiprenderers/TTRenderProgressBar.java b/src/main/java/mcp/mobius/waila/overlay/tooltiprenderers/TTRenderProgressBar.java index 24e3f4b..01304c1 100644 --- a/src/main/java/mcp/mobius/waila/overlay/tooltiprenderers/TTRenderProgressBar.java +++ b/src/main/java/mcp/mobius/waila/overlay/tooltiprenderers/TTRenderProgressBar.java @@ -21,8 +21,8 @@ public class TTRenderProgressBar implements IWailaTooltipRenderer { @Override public void draw(String[] params, IWailaCommonAccessor accessor) { - int currentValue = Integer.valueOf(params[0]); - int maxValue = Integer.valueOf(params[1]); + int currentValue = Integer.parseInt(params[0]); + int maxValue = Integer.parseInt(params[1]); int progress = (currentValue * 28) / maxValue; diff --git a/src/main/java/mcp/mobius/waila/overlay/tooltiprenderers/TTRenderStack.java b/src/main/java/mcp/mobius/waila/overlay/tooltiprenderers/TTRenderStack.java index 1831b0e..c541292 100644 --- a/src/main/java/mcp/mobius/waila/overlay/tooltiprenderers/TTRenderStack.java +++ b/src/main/java/mcp/mobius/waila/overlay/tooltiprenderers/TTRenderStack.java @@ -20,10 +20,10 @@ public class TTRenderStack implements IWailaTooltipRenderer { @Override public void draw(String[] params, IWailaCommonAccessor accessor) { - int type = Integer.valueOf(params[0]); // 0 for block, 1 for item + int type = Integer.parseInt(params[0]); // 0 for block, 1 for item String name = params[1]; // Fully qualified name - int amount = Integer.valueOf(params[2]); - int meta = Integer.valueOf(params[3]); + int amount = Integer.parseInt(params[2]); + int meta = Integer.parseInt(params[3]); ItemStack stack = null; if (type == 0) stack = new ItemStack((Block) Block.blockRegistry.getObject(name), amount, meta); diff --git a/src/main/java/mcp/mobius/waila/overlay/tooltiprenderers/TTRenderString.java b/src/main/java/mcp/mobius/waila/overlay/tooltiprenderers/TTRenderString.java index cf68bb9..f0d2e7c 100644 --- a/src/main/java/mcp/mobius/waila/overlay/tooltiprenderers/TTRenderString.java +++ b/src/main/java/mcp/mobius/waila/overlay/tooltiprenderers/TTRenderString.java @@ -14,7 +14,7 @@ public class TTRenderString implements IWailaTooltipRenderer { public TTRenderString(String data) { this.data = data; - this.size = new Dimension(DisplayUtil.getDisplayWidth(data), data.equals("") ? 0 : 8); + this.size = new Dimension(DisplayUtil.getDisplayWidth(data), data.isEmpty() ? 0 : 8); } @Override diff --git a/src/main/java/mcp/mobius/waila/overlay/tooltiprenderers/TTRenderTrueTyper.java b/src/main/java/mcp/mobius/waila/overlay/tooltiprenderers/TTRenderTrueTyper.java index c3f87b9..e4381f9 100644 --- a/src/main/java/mcp/mobius/waila/overlay/tooltiprenderers/TTRenderTrueTyper.java +++ b/src/main/java/mcp/mobius/waila/overlay/tooltiprenderers/TTRenderTrueTyper.java @@ -18,7 +18,7 @@ public class TTRenderTrueTyper implements IWailaTooltipRenderer { this.data = data; this.size = new Dimension( DisplayUtil.getDisplayWidth(data), - data.equals("") ? 0 : (int) ((TrueTypeFont) Waila.proxy.getFont()).getHeight() / 2); + data.isEmpty() ? 0 : (int) ((TrueTypeFont) Waila.proxy.getFont()).getHeight() / 2); } @Override diff --git a/src/main/java/mcp/mobius/waila/server/ProxyServer.java b/src/main/java/mcp/mobius/waila/server/ProxyServer.java index dccc60c..57460ac 100644 --- a/src/main/java/mcp/mobius/waila/server/ProxyServer.java +++ b/src/main/java/mcp/mobius/waila/server/ProxyServer.java @@ -68,9 +68,6 @@ public class ProxyServer { /* ETB */ ETBModule.register(); - /* EnderIO */ - // EnderIOModule.register(); - /* ProjectRed API */ ProjectRedModule.register(); @@ -86,9 +83,6 @@ public class ProxyServer { /* Steve's Carts */ StevesCartsModule.register(); - /* Secret Rooms */ - // SecretRoomsModule.register(); - /* Carpenter's Blocks */ CarpentersModule.register(); @@ -108,9 +102,6 @@ public class ProxyServer { HUDHandlerFMP.register(); DecoratorFMP.register(); } - - // ModuleRegistrar.instance().registerBodyProvider(new HUDHandlerBlocks(), Block.class); - // ModuleRegistrar.instance().registerBodyProvider(new HUDHandlerBlocks(), TileEntity.class); } public void registerIMCs() { @@ -127,9 +118,9 @@ public class ProxyServer { Waila.log.info(String.format("Trying to reflect %s %s", className, methodName)); try { - Class reflectClass = Class.forName(className); + Class reflectClass = Class.forName(className); Method reflectMethod = reflectClass.getDeclaredMethod(methodName, IWailaRegistrar.class); - reflectMethod.invoke(null, (IWailaRegistrar) ModuleRegistrar.instance()); + reflectMethod.invoke(null, ModuleRegistrar.instance()); Waila.log.info(String.format("Success in registering %s", modname)); @@ -138,7 +129,7 @@ public class ProxyServer { } catch (NoSuchMethodException e) { Waila.log.warn(String.format("Could not find method %s", methodName)); } catch (Exception e) { - Waila.log.warn(String.format("Exception while trying to access the method : %s", e.toString())); + Waila.log.warn(String.format("Exception while trying to access the method : %s", e)); } } diff --git a/src/main/java/mcp/mobius/waila/utils/AccessHelper.java b/src/main/java/mcp/mobius/waila/utils/AccessHelper.java index 49367b6..0bd49d5 100644 --- a/src/main/java/mcp/mobius/waila/utils/AccessHelper.java +++ b/src/main/java/mcp/mobius/waila/utils/AccessHelper.java @@ -24,10 +24,9 @@ public class AccessHelper { public static Field getDeclaredField(String classname, String fieldname) { try { - Class class_ = Class.forName(classname); + Class class_ = Class.forName(classname); Field field_ = class_.getDeclaredField(fieldname); field_.setAccessible(true); - // mod_Waila.log.fine(String.format("++ Found field %s %s\n", classname, fieldname)); return field_; } catch (NoSuchFieldException e) { Waila.log.warn(String.format("== Field %s %s not found !\n", classname, fieldname)); @@ -44,11 +43,9 @@ public class AccessHelper { public static Object getField(String classname, String fieldname, Object instance) { try { - Class class_ = Class.forName(classname); + Class class_ = Class.forName(classname); Field field_ = class_.getDeclaredField(fieldname); field_.setAccessible(true); - - // mod_Waila.log.fine(String.format("++ Found field %s %s\n", classname, fieldname)); return field_.get(instance); } catch (NoSuchFieldException e) { Waila.log.warn(String.format("== Field %s %s not found !\n", classname, fieldname)); @@ -59,21 +56,16 @@ public class AccessHelper { } catch (ClassNotFoundException e) { Waila.log.warn(String.format("== Class %s not found !\n", classname)); return null; - } catch (IllegalArgumentException e) { - Waila.log.warn(String.format("== %s\n", e)); - return null; - } catch (IllegalAccessException e) { + } catch (IllegalArgumentException | IllegalAccessException e) { Waila.log.warn(String.format("== %s\n", e)); return null; } } public static Object getFieldExcept(String classname, String fieldname, Object instance) throws Exception { - Class class_ = Class.forName(classname); + Class class_ = Class.forName(classname); Field field_ = class_.getDeclaredField(fieldname); field_.setAccessible(true); - - // mod_Waila.log.fine(String.format("++ Found field %s %s\n", classname, fieldname)); return field_.get(instance); } @@ -100,9 +92,9 @@ public class AccessHelper { } public static ArrayList getCraftingRecipes(ItemStack stack) { - ArrayList recipes = new ArrayList(); + ArrayList recipes = new ArrayList<>(); - for (IRecipe recipe : (ArrayList) CraftingManager.getInstance().getRecipeList()) { + for (IRecipe recipe : CraftingManager.getInstance().getRecipeList()) { if (recipe != null && recipe.getRecipeOutput() != null) { if (recipe.getRecipeOutput().isItemEqual(stack)) recipes.add(recipe); } @@ -137,17 +129,4 @@ public class AccessHelper { Method getNBTData = provider.getClass().getMethod("getNBTData", Entity.class, NBTTagCompound.class); return (NBTTagCompound) getNBTData.invoke(provider, entity, tag); } - - /* - * public static void cleanSmeltingRecipes(ItemStack stack){ Map smeltingList = - * FurnaceRecipes.smelting().getSmeltingList(); Map, ItemStack> smeltingListMeta = - * FurnaceRecipes.smelting().getMetaSmeltingList(); HashMap matchingRecipes = new - * HashMap(); HashMap, ItemStack> matchingRecipesMeta = new HashMap, - * ItemStack>(); // We walk the none meta list to find all the recipes for (Object id_ : smeltingList.keySet()){ - * Integer id = (Integer)id_; ItemStack result = (ItemStack)smeltingList.get(id_); if (stack.isItemEqual(result)) - * matchingRecipes.put(id, result); } for (List key : smeltingListMeta.keySet()){ ItemStack result = - * smeltingListMeta.get(key); if (stack.isItemEqual(result)) matchingRecipesMeta.put(key, result); } for (Integer - * key : matchingRecipes.keySet()) FurnaceRecipes.smelting().getSmeltingList().remove(key); for (List key : - * matchingRecipesMeta.keySet()) FurnaceRecipes.smelting().getMetaSmeltingList().remove(key); } - */ } diff --git a/src/main/java/mcp/mobius/waila/utils/Constants.java b/src/main/java/mcp/mobius/waila/utils/Constants.java index f440279..53a348d 100644 --- a/src/main/java/mcp/mobius/waila/utils/Constants.java +++ b/src/main/java/mcp/mobius/waila/utils/Constants.java @@ -2,8 +2,6 @@ package mcp.mobius.waila.utils; public final class Constants { - public static String BIND_SCREEN_WIKI = "showwiki"; - public static String BIND_SCREEN_TECH = "showtechtree"; public static String BIND_SCREEN_ENCH = "showenchant"; public static String BIND_WAILA_CFG = "waila.keybind.wailaconfig"; @@ -11,7 +9,6 @@ public final class Constants { public static String BIND_WAILA_LIQUID = "waila.keybind.liquid"; public static String BIND_WAILA_RECIPE = "waila.keybind.recipe"; public static String BIND_WAILA_USAGE = "waila.keybind.usage"; - public static String BIND_WAILA_TESTING = "waila.keybind.testing"; public static String CFG_NEI_SHOW = "world.highlight_tips"; public static String BIND_NEI_SHOW = "keys.world.highlight_tips"; @@ -40,6 +37,5 @@ public final class Constants { public static String CATEGORY_MODULES = "modules"; public static String CATEGORY_SERVER = "server_forcing"; public static boolean SERVER_FREE = false; - public static boolean SERVER_FORCED = true; } diff --git a/src/main/java/mcp/mobius/waila/utils/ModIdentification.java b/src/main/java/mcp/mobius/waila/utils/ModIdentification.java index 046e078..410db8e 100644 --- a/src/main/java/mcp/mobius/waila/utils/ModIdentification.java +++ b/src/main/java/mcp/mobius/waila/utils/ModIdentification.java @@ -12,20 +12,11 @@ import cpw.mods.fml.common.registry.GameData; public class ModIdentification { - public static HashMap modSource_Name = new HashMap(); - public static HashMap modSource_ID = new HashMap(); - public static HashMap itemMap = new HashMap(); - public static HashMap keyhandlerStrings = new HashMap(); + public static HashMap modSource_Name = new HashMap<>(); + public static HashMap modSource_ID = new HashMap<>(); public static void init() { - // TODO : Redo this for the new frameworkn (1.7.2) - /* - * NBTTagList itemDataList = new NBTTagList(); GameData.writeItemData(itemDataList); for(int i = 0; i < - * itemDataList.tagCount(); i++) { ItemData itemData = new ItemData((NBTTagCompound) itemDataList.tagAt(i)); - * itemMap.put(itemData.getItemId(), itemData.getModId()); } - */ - for (ModContainer mod : Loader.instance().getModList()) { modSource_Name.put(mod.getSource().getName(), mod.getName()); modSource_ID.put(mod.getSource().getName(), mod.getModId()); @@ -42,22 +33,6 @@ public class ModIdentification { modSource_ID.put("1.6.4.jar", "Minecraft"); modSource_ID.put("1.7.2.jar", "Minecraft"); modSource_ID.put("Forge", "Minecraft"); - - // for (String s : this.modSourceList.keySet()) - // if (this.modSourceList.get(s) == "Minecraft Coder Pack") - // this.modSourceList.put(s, "Minecraft"); - - // Code to retrieve all the registered keybindings along with the mod adding them. - /* - * Field keyHandlers_Field = AccessHelper.getDeclaredField("cpw.mods.fml.client.registry.KeyBindingRegistry", - * "keyHandlers"); try { Set keyHandlers = - * (Set)keyHandlers_Field.get(KeyBindingRegistry.instance()); for (KeyHandler keyhandler : - * keyHandlers) for (int i = 0; i < keyhandler.getKeyBindings().length; i++) - * keyhandlerStrings.put(keyhandler.getKeyBindings()[i].keyDescription, idFromObject(keyhandler)); } catch - * (IllegalArgumentException e) { e.printStackTrace(); } catch (IllegalAccessException e) { e.printStackTrace(); - * } - */ - } public static String nameFromObject(Object obj) { @@ -80,30 +55,12 @@ public class ModIdentification { return modName; } - /* - * public static String idFromObject(Object obj){ String objPath = - * obj.getClass().getProtectionDomain().getCodeSource().getLocation().toString(); try { objPath = - * URLDecoder.decode(objPath, "UTF-8"); } catch (UnsupportedEncodingException e) { e.printStackTrace(); } String - * modName = ""; for (String s: modSource_ID.keySet()) if (objPath.contains(s)){ modName = - * modSource_ID.get(s); break; } if (modName.equals("Minecraft Coder Pack")) modName = "Minecraft"; return modName; - * } - */ - public static String nameFromStack(ItemStack stack) { try { - // String modID = itemMap.get(itemstack.itemID); - // ModContainer mod = ModIdentification.findModContainer(modID); ModContainer mod = GameData.findModOwner(GameData.itemRegistry.getNameForObject(stack.getItem())); - String modname = mod == null ? "Minecraft" : mod.getName(); - return modname; + return mod == null ? "Minecraft" : mod.getName(); } catch (NullPointerException e) { - // System.out.printf("NPE : %s\n",itemstack.toString()); return ""; } } - - /* - * public static ModContainer findModContainer(String modID) { for(ModContainer mc : Loader.instance().getModList()) - * if(modID.equals(mc.getModId())) return mc; return null; } - */ } diff --git a/src/main/java/mcp/mobius/waila/utils/NBTUtil.java b/src/main/java/mcp/mobius/waila/utils/NBTUtil.java index f68585c..9757dab 100644 --- a/src/main/java/mcp/mobius/waila/utils/NBTUtil.java +++ b/src/main/java/mcp/mobius/waila/utils/NBTUtil.java @@ -26,7 +26,6 @@ public class NBTUtil { return deepTag.getTag(i); } } else { - // Waila.log.log(Level.WARN, "Leaf " + key + " not found."); return null; } } @@ -38,9 +37,7 @@ public class NBTUtil { NBTTagCompound deepTag = targetTag; for (int i = 0; i < path.length - 1; i++) { - if (!deepTag.hasKey(path[i])) - // deepTag.setCompoundTag(path[i], new NBTTagCompound()); - deepTag.setTag(path[i], new NBTTagCompound()); + if (!deepTag.hasKey(path[i])) deepTag.setTag(path[i], new NBTTagCompound()); deepTag = deepTag.getCompoundTag(path[i]); } @@ -57,7 +54,6 @@ public class NBTUtil { for (String key : keys) { NBTBase tagToAdd = getTag(key, inTag); - // System.out.printf("%s\n", tagToAdd); if (tagToAdd != null) outTag = setTag(key, outTag, tagToAdd); }