From f8b7a9a50fbbb503ef8413ee64fec288e475a03c Mon Sep 17 00:00:00 2001 From: Griefed Date: Thu, 7 Sep 2023 21:43:49 +0200 Subject: [PATCH 1/2] chore: Add Essential and MemoryUsageScreen to clientside mods. Thanks to @Devilswarchild and @BlakeIsMyWaifu for the reports! --- .../serverpackcreator/api/ApiProperties.kt | 666 ++++++++++-------- .../resources/serverpackcreator.properties | 2 +- .../gui/window/settings/GlobalSettings.kt | 4 +- 3 files changed, 363 insertions(+), 309 deletions(-) diff --git a/serverpackcreator-api/src/jvmMain/kotlin/de/griefed/serverpackcreator/api/ApiProperties.kt b/serverpackcreator-api/src/jvmMain/kotlin/de/griefed/serverpackcreator/api/ApiProperties.kt index 0f3912064..7a72e7051 100644 --- a/serverpackcreator-api/src/jvmMain/kotlin/de/griefed/serverpackcreator/api/ApiProperties.kt +++ b/serverpackcreator-api/src/jvmMain/kotlin/de/griefed/serverpackcreator/api/ApiProperties.kt @@ -130,310 +130,364 @@ actual class ApiProperties( "spring.datasource.url" @Suppress("SpellCheckingInspection") - private var fallbackModsString = - "3dskinlayers-," + - "Absolutely-Not-A-Zoom-Mod-," + - "AdvancedChat-," + - "AdvancedChatCore-," + - "AdvancedChatHUD-," + - "AdvancedCompas-," + - "Ambience," + - "AmbientEnvironment-," + - "AmbientSounds_," + - "AreYouBlind-," + - "Armor Status HUD-," + - "ArmorSoundTweak-," + - "BH-Menu-," + - "Batty's Coordinates PLUS Mod," + - "BetterAdvancements-," + - "BetterAnimationsCollection-," + - "BetterDarkMode-," + - "BetterF3-," + - "BetterFog-," + - "BetterFoliage-," + - "BetterPingDisplay-," + - "BetterPlacement-," + - "BetterTaskbar-," + - "BetterThirdPerson," + - "BetterTitleScreen-," + - "Blur-," + - "BorderlessWindow-," + - "CTM-," + - "ChunkAnimator-," + - "ClientTweaks_," + - "CompletionistsIndex-," + - "Controller Support-," + - "Controlling-," + - "CraftPresence-," + - "CullLessLeaves-Reforged-," + - "CustomCursorMod-," + - "CustomMainMenu-," + - "DefaultOptions_," + - "DefaultSettings-," + - "DeleteWorldsToTrash-," + - "DetailArmorBar-," + - "Ding-," + - "DistantHorizons-," + - "DripSounds-," + - "Durability101-," + - "DurabilityNotifier-," + - "DynamicSurroundings-," + - "DynamicSurroundingsHuds-," + - "EffectsLeft-," + - "EiraMoticons_," + - "EnchantmentDescriptions-," + - "EnhancedVisuals_," + - "EquipmentCompare-," + - "FPS-Monitor-," + - "FabricCustomCursorMod-," + - "Fallingleaves-," + - "FancySpawnEggs," + - "FancyVideo-API-," + - "FirstPersonMod," + - "FogTweaker-," + - "ForgeCustomCursorMod-," + - "FpsReducer-," + - "FpsReducer2-," + - "FullscreenWindowed-," + - "GameMenuModOption-," + - "HealthOverlay-," + - "HeldItemTooltips-," + - "HorseStatsMod-," + - "ImmediatelyFastReforged-," + - "InventoryEssentials_," + - "InventoryHud_[1.17.1].forge-," + - "InventorySpam-," + - "InventoryTweaks-," + - "ItemBorders-," + - "ItemPhysicLite_," + - "ItemStitchingFix-," + - "JBRA-Client-," + - "JustEnoughCalculation-," + - "JustEnoughEffects-," + - "JustEnoughProfessions-," + - "LeaveMyBarsAlone-," + - "LLOverlayReloaded-," + - "LOTRDRP-," + - "LegendaryTooltips," + - "LegendaryTooltips-," + - "LightOverlay-," + - "MoBends," + - "MouseTweaks-," + - "MyServerIsCompatible-," + - "Neat ," + - "Neat-," + - "NekosEnchantedBooks-," + - "NoAutoJump-," + - "NoFog-," + - "Notes-," + - "NotifMod-," + - "OldJavaWarning-," + - "OptiFine," + - "OptiFine_," + - "OptiForge," + - "OptiForge-," + - "OverflowingBars-," + - "PackMenu-," + - "PackModeMenu-," + - "PickUpNotifier-," + - "Ping-," + - "PingHUD-," + - "PresenceFootsteps-," + - "RPG-HUD-," + - "ReAuth-," + - "Reforgium-," + - "ResourceLoader-," + - "ResourcePackOrganizer," + - "ShoulderSurfing-," + - "ShulkerTooltip-," + - "SimpleDiscordRichPresence-," + - "SimpleWorldTimer-," + - "SoundFilters-," + - "SpawnerFix-," + - "StylishEffects-," + - "TextruesRubidiumOptions-," + - "TRansliterationLib-," + - "TipTheScales-," + - "Tips-," + - "Toast Control-," + - "Toast-Control-," + - "ToastControl-," + - "TravelersTitles-," + - "VR-Combat_," + - "VoidFog-," + - "WindowedFullscreen-," + - "WorldNameRandomizer-," + - "[1.12.2]DamageIndicatorsMod-," + - "[1.12.2]bspkrscore-," + - "antighost-," + - "anviltooltipmod-," + - "appleskin-," + - "armorchroma-," + - "armorpointspp-," + - "auditory-," + - "authme-," + - "auto-reconnect-," + - "autojoin-," + - "autoreconnect-," + - "axolotl-item-fix-," + - "backtools-," + - "bannerunlimited-," + - "beenfo-1.19-," + - "better-recipe-book-," + - "betterbiomeblend-," + - "bhmenu-," + - "blur-," + - "borderless-mining-," + - "catalogue-," + - "charmonium-," + - "chat_heads-," + - "cherishedworlds-," + - "cirback-1.0-," + - "classicbar-," + - "clickadv-," + - "clienttweaks-," + - "combat_music-," + - "connectedness-," + - "controllable-," + - "cullleaves-," + - "cullparticles-," + - "custom-crosshair-mod-," + - "customdiscordrpc-," + - "darkness-," + - "dashloader-," + - "defaultoptions-," + - "desiredservers-," + - "discordrpc-," + - "drippyloadingscreen-," + - "drippyloadingscreen_," + - "durabilitytooltip-," + - "dynamic-fps-," + - "dynamic-music-," + - "dynamiclights-," + - "dynmus-," + - "effective-," + - "eggtab-," + - "eguilib-," + - "eiramoticons-," + - "enchantment-lore-," + - "entity-texture-features-," + - "entityculling-," + - "exhaustedstamina-," + - "extremesoundmuffler-," + - "fabricemotes-," + - "fancymenu_," + - "fancymenu_video_extension," + - "flickerfix-," + - "fm_audio_extension_," + - "forgemod_VoxelMap-," + - "freelook-," + - "galacticraft-rpc-," + - "gamestagesviewer-," + - "grid-," + - "helium-," + - "hiddenrecipebook_," + - "hiddenrecipebook-," + - "infinitemusic-," + - "inventoryprofiles," + - "invtweaks-," + - "itemzoom," + - "itlt-," + - "jeed-," + - "jehc-," + - "jeiintegration_," + - "just-enough-harvestcraft-," + - "justenoughbeacons-," + - "justenoughdrags-," + - "justzoom_," + - "keymap-," + - "keywizard-," + - "lazydfu-," + - "lib39-," + - "light-overlay-," + - "lightfallclient-," + - "lightspeed-," + - "loadmyresources_," + - "lock_minecart_view-," + - "lootbeams-," + - "lwl-," + - "magnesium_extras-," + - "maptooltip-," + - "massunbind," + - "mcbindtype-," + - "mcwifipnp-," + - "medievalmusic-," + - "mightyarchitect-," + - "mindful-eating-," + - "minetogether-," + - "mobplusplus-," + - "modcredits-," + - "modernworldcreation_," + - "modnametooltip-," + - "modnametooltip_," + - "moreoverlays-," + - "mousewheelie-," + - "movement-vision-," + - "multihotbar-," + - "music-duration-reducer-," + - "musicdr-," + - "neiRecipeHandlers-," + - "ngrok-lan-expose-mod-," + - "no_nv_flash-," + - "nopotionshift_," + - "notenoughanimations-," + - "oculus-," + - "ornaments-," + - "overloadedarmorbar-," + - "panorama-," + - "paperdoll-," + - "physics-mod-," + - "phosphor-," + - "preciseblockplacing-," + - "realm-of-lost-souls-," + - "rebind_narrator-," + - "rebind-narrator-," + - "rebindnarrator-," + - "rebrand-," + - "reforgium-," + - "replanter-," + - "rubidium-," + - "rubidium_extras-," + - "screenshot-to-clipboard-," + - "shutupexperimentalsettings-," + - "shutupmodelloader-," + - "signtools-," + - "simple-rpc-," + - "simpleautorun-," + - "smartcursor-," + - "smoothboot-," + - "smoothfocus-," + - "sodium-fabric-," + - "sounddeviceoptions-," + - "soundreloader-," + - "spoticraft-," + - "tconplanner-," + - "timestamps-," + - "tooltipscroller-," + - "torchoptimizer-," + - "torohealth-," + - "totaldarkness," + - "toughnessbar-," + - "whats-that-slot-forge-," + - "wisla-," + - "xlifeheartcolors-," + - "yisthereautojump-" + private var fallbackMods = TreeSet( + listOf( + "3dskinlayers-", + "Absolutely-Not-A-Zoom-Mod-", + "AdvancedChat-", + "AdvancedChatCore-", + "AdvancedChatHUD-", + "AdvancedCompas-", + "Ambience", + "AmbientEnvironment-", + "AmbientSounds_", + "AreYouBlind-", + "Armor Status HUD-", + "ArmorSoundTweak-", + "BH-Menu-", + "Batty's Coordinates PLUS Mod", + "BetterAdvancements-", + "BetterAnimationsCollection-", + "BetterDarkMode-", + "BetterF3-", + "BetterFog-", + "BetterFoliage-", + "BetterPingDisplay-", + "BetterPlacement-", + "BetterTaskbar-", + "BetterThirdPerson", + "BetterTitleScreen-", + "Blur-", + "BorderlessWindow-", + "CTM-", + "ChunkAnimator-", + "ClientTweaks_", + "CompletionistsIndex-", + "Controller Support-", + "Controlling-", + "CraftPresence-", + "CullLessLeaves-Reforged-", + "CustomCursorMod-", + "CustomMainMenu-", + "DefaultOptions_", + "DefaultSettings-", + "DeleteWorldsToTrash-", + "DetailArmorBar-", + "Ding-", + "DistantHorizons-", + "DripSounds-", + "Durability101-", + "DurabilityNotifier-", + "DynamicSurroundings-", + "DynamicSurroundingsHuds-", + "EffectsLeft-", + "EiraMoticons_", + "EnchantmentDescriptions-", + "EnhancedVisuals_", + "EquipmentCompare-", + "FPS-Monitor-", + "FabricCustomCursorMod-", + "Fallingleaves-", + "FancySpawnEggs", + "FancyVideo-API-", + "FirstPersonMod", + "FogTweaker-", + "ForgeCustomCursorMod-", + "FpsReducer-", + "FpsReducer2-", + "FullscreenWindowed-", + "GameMenuModOption-", + "HealthOverlay-", + "HeldItemTooltips-", + "HorseStatsMod-", + "ImmediatelyFastReforged-", + "InventoryEssentials_", + "InventoryHud_[1.17.1].forge-", + "InventorySpam-", + "InventoryTweaks-", + "ItemBorders-", + "ItemPhysicLite_", + "ItemStitchingFix-", + "JBRA-Client-", + "JustEnoughCalculation-", + "JustEnoughEffects-", + "JustEnoughProfessions-", + "LeaveMyBarsAlone-", + "LLOverlayReloaded-", + "LOTRDRP-", + "LegendaryTooltips", + "LegendaryTooltips-", + "LightOverlay-", + "MoBends", + "MouseTweaks-", + "MyServerIsCompatible-", + "Neat ", + "Neat-", + "NekosEnchantedBooks-", + "NoAutoJump-", + "NoFog-", + "Notes-", + "NotifMod-", + "OldJavaWarning-", + "OptiFine", + "OptiFine_", + "OptiForge", + "OptiForge-", + "OverflowingBars-", + "PackMenu-", + "PackModeMenu-", + "PickUpNotifier-", + "Ping-", + "PingHUD-", + "PresenceFootsteps-", + "RPG-HUD-", + "ReAuth-", + "Reforgium-", + "ResourceLoader-", + "ResourcePackOrganizer", + "ShoulderSurfing-", + "ShulkerTooltip-", + "SimpleDiscordRichPresence-", + "SimpleWorldTimer-", + "SoundFilters-", + "SpawnerFix-", + "StylishEffects-", + "TextruesRubidiumOptions-", + "TRansliterationLib-", + "TipTheScales-", + "Tips-", + "Toast Control-", + "Toast-Control-", + "ToastControl-", + "TravelersTitles-", + "VR-Combat_", + "VoidFog-", + "WindowedFullscreen-", + "WorldNameRandomizer-", + "[1.12.2]DamageIndicatorsMod-", + "[1.12.2]bspkrscore-", + "antighost-", + "anviltooltipmod-", + "appleskin-", + "armorchroma-", + "armorpointspp-", + "auditory-", + "authme-", + "auto-reconnect-", + "autojoin-", + "autoreconnect-", + "axolotl-item-fix-", + "backtools-", + "bannerunlimited-", + "beenfo-1.19-", + "better-recipe-book-", + "betterbiomeblend-", + "bhmenu-", + "blur-", + "borderless-mining-", + "catalogue-", + "charmonium-", + "chat_heads-", + "cherishedworlds-", + "cirback-1.0-", + "classicbar-", + "clickadv-", + "clienttweaks-", + "combat_music-", + "connectedness-", + "controllable-", + "cullleaves-", + "cullparticles-", + "custom-crosshair-mod-", + "customdiscordrpc-", + "darkness-", + "dashloader-", + "defaultoptions-", + "desiredservers-", + "discordrpc-", + "drippyloadingscreen-", + "drippyloadingscreen_", + "durabilitytooltip-", + "dynamic-fps-", + "dynamic-music-", + "dynamiclights-", + "dynmus-", + "effective-", + "eggtab-", + "eguilib-", + "eiramoticons-", + "enchantment-lore-", + "entity-texture-features-", + "entityculling-", + "essential_", + "exhaustedstamina-", + "extremesoundmuffler-", + "fabricemotes-", + "fancymenu_", + "fancymenu_video_extension", + "flickerfix-", + "fm_audio_extension_", + "forgemod_VoxelMap-", + "freelook-", + "galacticraft-rpc-", + "gamestagesviewer-", + "grid-", + "helium-", + "hiddenrecipebook_", + "hiddenrecipebook-", + "infinitemusic-", + "inventoryprofiles", + "invtweaks-", + "itemzoom", + "itlt-", + "jeed-", + "jehc-", + "jeiintegration_", + "just-enough-harvestcraft-", + "justenoughbeacons-", + "justenoughdrags-", + "justzoom_", + "keymap-", + "keywizard-", + "lazydfu-", + "lib39-", + "light-overlay-", + "lightfallclient-", + "lightspeed-", + "loadmyresources_", + "lock_minecart_view-", + "lootbeams-", + "lwl-", + "magnesium_extras-", + "maptooltip-", + "massunbind", + "mcbindtype-", + "mcwifipnp-", + "medievalmusic-", + "memoryusagescreen-", + "mightyarchitect-", + "mindful-eating-", + "minetogether-", + "mobplusplus-", + "modcredits-", + "modernworldcreation_", + "modnametooltip-", + "modnametooltip_", + "moreoverlays-", + "mousewheelie-", + "movement-vision-", + "multihotbar-", + "music-duration-reducer-", + "musicdr-", + "neiRecipeHandlers-", + "ngrok-lan-expose-mod-", + "no_nv_flash-", + "nopotionshift_", + "notenoughanimations-", + "oculus-", + "ornaments-", + "overloadedarmorbar-", + "panorama-", + "paperdoll-", + "physics-mod-", + "phosphor-", + "preciseblockplacing-", + "realm-of-lost-souls-", + "rebind_narrator-", + "rebind-narrator-", + "rebindnarrator-", + "rebrand-", + "reforgium-", + "replanter-", + "rubidium-", + "rubidium_extras-", + "screenshot-to-clipboard-", + "shutupexperimentalsettings-", + "shutupmodelloader-", + "signtools-", + "simple-rpc-", + "simpleautorun-", + "smartcursor-", + "smoothboot-", + "smoothfocus-", + "sodium-fabric-", + "sounddeviceoptions-", + "soundreloader-", + "spoticraft-", + "tconplanner-", + "timestamps-", + "tooltipscroller-", + "torchoptimizer-", + "torohealth-", + "totaldarkness", + "toughnessbar-", + "whats-that-slot-forge-", + "wisla-", + "xlifeheartcolors-", + "yisthereautojump-" + ) + ) @Suppress("MemberVisibilityCanBePrivate") - val fallbackDirectoriesInclusionString = - "addonpacks,blueprints,config,configs,customnpcs,defaultconfigs,global_data_packs,global_packs,kubejs,maps,mods,openloader,scripts,schematics,shrines-saves,structures,structurize,worldshape,Zoestria" + val fallbackDirectoriesInclusion = TreeSet( + listOf( + "addonpacks", + "blueprints", + "config", + "configs", + "customnpcs", + "defaultconfigs", + "global_data_packs", + "global_packs", + "kubejs", + "maps", + "mods", + "openloader", + "scripts", + "schematics", + "shrines-saves", + "structures", + "structurize", + "worldshape", + "Zoestria" + ) + ) @Suppress("MemberVisibilityCanBePrivate") - val fallbackDirectoriesExclusionString = - "animation,asm,cache,changelogs,craftpresence,crash-reports,downloads,icons,libraries,local,logs,overrides,packmenu,profileImage,profileImage,resourcepacks,screenshots,server_pack,shaderpacks,simple-rpc,tv-cache" + val fallbackDirectoriesExclusion = TreeSet( + listOf( + "animation", + "asm", + "cache", + "changelogs", + "craftpresence", + "crash-reports", + "downloads", + "icons", + "libraries", + "local", + "logs", + "overrides", + "packmenu", + "profileImage", + "profileImage", + "resourcepacks", + "screenshots", + "server_pack", + "shaderpacks", + "simple-rpc", + "tv-cache" + ) + ) @Suppress("MemberVisibilityCanBePrivate") - val fallbackZipExclusionsString = - "minecraft_server.MINECRAFT_VERSION.jar,server.jar,libraries/net/minecraft/server/MINECRAFT_VERSION/server-MINECRAFT_VERSION.jar" + val fallbackZipExclusions = TreeSet( + listOf( + "minecraft_server.MINECRAFT_VERSION.jar", + "server.jar", + "libraries/net/minecraft/server/MINECRAFT_VERSION/server-MINECRAFT_VERSION.jar" + ) + ) @Suppress("MemberVisibilityCanBePrivate") val fallbackAikarsFlags = "-Xms4G" + @@ -485,7 +539,7 @@ actual class ApiProperties( * String-list of clientside-only mods to exclude from server packs. */ @Suppress("MemberVisibilityCanBePrivate") - var clientsideMods = TreeSet(fallbackModsString.split(",")) + var clientsideMods = fallbackMods private set /** @@ -611,9 +665,9 @@ actual class ApiProperties( /** * Directories to include in a server pack. */ - var directoriesToInclude = TreeSet(fallbackDirectoriesInclusionString.split(",")) + var directoriesToInclude = fallbackDirectoriesInclusion get() { - val entries = getListProperty(pConfigurationDirectoriesMustInclude, fallbackDirectoriesInclusionString) + val entries = getListProperty(pConfigurationDirectoriesMustInclude, fallbackDirectoriesInclusion.joinToString(",")) field.addAll(entries) return field } @@ -627,9 +681,9 @@ actual class ApiProperties( /** * Directories to exclude from a server pack. */ - var directoriesToExclude = TreeSet(fallbackDirectoriesExclusionString.split(",")) + var directoriesToExclude = fallbackDirectoriesExclusion get() { - val prop = getListProperty(pConfigurationDirectoriesShouldExclude, fallbackDirectoriesExclusionString) + val prop = getListProperty(pConfigurationDirectoriesShouldExclude, fallbackDirectoriesExclusion.joinToString(",")) val use = TreeSet(prop) use.removeIf { n -> directoriesToInclude.contains(n) } field.clear() @@ -655,9 +709,9 @@ actual class ApiProperties( * * Should you want these filters to be expanded, open an issue on [GitHub](https://github.com/Griefed/ServerPackCreator/issues) */ - var zipArchiveExclusions = TreeSet(fallbackZipExclusionsString.split(",")) + var zipArchiveExclusions = fallbackZipExclusions get() { - val entries = getListProperty(pServerPackZipExclusions, fallbackZipExclusionsString) + val entries = getListProperty(pServerPackZipExclusions, fallbackZipExclusions.joinToString(",")) field.addAll(entries) return field } @@ -1531,7 +1585,7 @@ actual class ApiProperties( clientsideMods.addAll( getListProperty( pConfigurationFallbackModsList, - fallbackModsString + fallbackMods.joinToString(",") ) ) internalProps.setProperty( diff --git a/serverpackcreator-api/src/jvmMain/resources/serverpackcreator.properties b/serverpackcreator-api/src/jvmMain/resources/serverpackcreator.properties index 4489778d7..62a7aac7c 100644 --- a/serverpackcreator-api/src/jvmMain/resources/serverpackcreator.properties +++ b/serverpackcreator-api/src/jvmMain/resources/serverpackcreator.properties @@ -2,7 +2,7 @@ de.griefed.serverpackcreator.versioncheck.prerelease=false de.griefed.serverpackcreator.language=en_GB de.griefed.serverpackcreator.configuration.fallback.updateurl=https://raw.githubusercontent.com/Griefed/ServerPackCreator/main/serverpackcreator-api/src/jvmMain/resources/serverpackcreator.properties -de.griefed.serverpackcreator.configuration.fallbackmodslist=3dskinlayers-,Absolutely-Not-A-Zoom-Mod-,AdvancedChat-,AdvancedChatCore-,AdvancedChatHUD-,AdvancedCompas-,Ambience,AmbientEnvironment-,AmbientSounds_,AreYouBlind-,Armor Status HUD-,ArmorSoundTweak-,BH-Menu-,Batty's Coordinates PLUS Mod,BetterAdvancements-,BetterAnimationsCollection-,BetterDarkMode-,BetterF3-,BetterFog-,BetterFoliage-,BetterPingDisplay-,BetterPlacement-,BetterTaskbar-,BetterThirdPerson,BetterTitleScreen-,Blur-,BorderlessWindow-,CTM-,ChunkAnimator-,ClientTweaks_,CompletionistsIndex-,Controller Support-,Controlling-,CraftPresence-,CullLessLeaves-Reforged-,CustomCursorMod-,CustomMainMenu-,DefaultOptions_,DefaultSettings-,DeleteWorldsToTrash-,DetailArmorBar-,Ding-,DistantHorizons-,DripSounds-,Durability101-,DurabilityNotifier-,DynamicSurroundings-,DynamicSurroundingsHuds-,EffectsLeft-,EiraMoticons_,EnchantmentDescriptions-,EnhancedVisuals_,EquipmentCompare-,FPS-Monitor-,FabricCustomCursorMod-,Fallingleaves-,FancySpawnEggs,FancyVideo-API-,FirstPersonMod,FogTweaker-,ForgeCustomCursorMod-,FpsReducer-,FpsReducer2-,FullscreenWindowed-,GameMenuModOption-,HealthOverlay-,HeldItemTooltips-,HorseStatsMod-,ImmediatelyFastReforged-,InventoryEssentials_,InventoryHud_[1.17.1].forge-,InventorySpam-,InventoryTweaks-,ItemBorders-,ItemPhysicLite_,ItemStitchingFix-,JBRA-Client-,JustEnoughCalculation-,JustEnoughEffects-,JustEnoughProfessions-,LeaveMyBarsAlone-,LLOverlayReloaded-,LOTRDRP-,LegendaryTooltips,LegendaryTooltips-,LightOverlay-,MoBends,MouseTweaks-,MyServerIsCompatible-,Neat ,Neat-,NekosEnchantedBooks-,NoAutoJump-,NoFog-,Notes-,NotifMod-,OldJavaWarning-,OptiFine,OptiFine_,OptiForge,OptiForge-,OverflowingBars-,PackMenu-,PackModeMenu-,PickUpNotifier-,Ping-,PingHUD-,PresenceFootsteps-,RPG-HUD-,ReAuth-,Reforgium-,ResourceLoader-,ResourcePackOrganizer,ShoulderSurfing-,ShulkerTooltip-,SimpleDiscordRichPresence-,SimpleWorldTimer-,SoundFilters-,SpawnerFix-,StylishEffects-,TextruesRubidiumOptions-,TRansliterationLib-,TipTheScales-,Tips-,Toast Control-,Toast-Control-,ToastControl-,TravelersTitles-,VoidFog-,VR-Combat_,WindowedFullscreen-,WorldNameRandomizer-,[1.12.2]DamageIndicatorsMod-,[1.12.2]bspkrscore-,antighost-,anviltooltipmod-,appleskin-,armorchroma-,armorpointspp-,auditory-,authme-,auto-reconnect-,autojoin-,autoreconnect-,axolotl-item-fix-,backtools-,bannerunlimited-,beenfo-1.19-,better-recipe-book-,betterbiomeblend-,bhmenu-,blur-,borderless-mining-,catalogue-,charmonium-,chat_heads-,cherishedworlds-,cirback-1.0-,classicbar-,clickadv-,clienttweaks-,combat_music-,connectedness-,controllable-,cullleaves-,cullparticles-,custom-crosshair-mod-,customdiscordrpc-,darkness-,dashloader-,defaultoptions-,desiredservers-,discordrpc-,drippyloadingscreen-,drippyloadingscreen_,durabilitytooltip-,dynamic-fps-,dynamic-music-,dynamiclights-,dynmus-,effective-,eggtab-,eguilib-,eiramoticons-,enchantment-lore-,entity-texture-features-,entityculling-,exhaustedstamina-,extremesoundmuffler-,fabricemotes-,fancymenu_,fancymenu_video_extension,flickerfix-,fm_audio_extension_,forgemod_VoxelMap-,freelook-,galacticraft-rpc-,gamestagesviewer-,grid-,helium-,hiddenrecipebook_,hiddenrecipebook-,infinitemusic-,inventoryprofiles,invtweaks-,itemzoom,itlt-,jeed-,jehc-,jeiintegration_,just-enough-harvestcraft-,justenoughbeacons-,justenoughdrags-,justzoom_,keymap-,keywizard-,lazydfu-,lib39-,light-overlay-,lightfallclient-,lightspeed-,loadmyresources_,lock_minecart_view-,lootbeams-,lwl-,magnesium_extras-,maptooltip-,massunbind,mcbindtype-,mcwifipnp-,medievalmusic-,mightyarchitect-,mindful-eating-,minetogether-,mobplusplus-,modcredits-,modernworldcreation_,modnametooltip-,modnametooltip_,moreoverlays-,mousewheelie-,movement-vision-,multihotbar-,music-duration-reducer-,musicdr-,neiRecipeHandlers-,ngrok-lan-expose-mod-,no_nv_flash-,nopotionshift_,notenoughanimations-,oculus-,ornaments-,overloadedarmorbar-,panorama-,paperdoll-,physics-mod-,phosphor-,preciseblockplacing-,realm-of-lost-souls-,rebind_narrator-,rebind-narrator-,rebindnarrator-,rebrand-,reforgium-,replanter-,rubidium-,rubidium_extras-,screenshot-to-clipboard-,shutupexperimentalsettings-,shutupmodelloader-,signtools-,simple-rpc-,simpleautorun-,smartcursor-,smoothboot-,smoothfocus-,sodium-fabric-,sounddeviceoptions-,soundreloader-,spoticraft-,tconplanner-,timestamps-,tooltipscroller-,torchoptimizer-,torohealth-,totaldarkness,toughnessbar-,whats-that-slot-forge-,wisla-,xlifeheartcolors-,yisthereautojump- +de.griefed.serverpackcreator.configuration.fallbackmodslist=3dskinlayers-,Absolutely-Not-A-Zoom-Mod-,AdvancedChat-,AdvancedChatCore-,AdvancedChatHUD-,AdvancedCompas-,Ambience,AmbientEnvironment-,AmbientSounds_,AreYouBlind-,Armor Status HUD-,ArmorSoundTweak-,BH-Menu-,Batty's Coordinates PLUS Mod,BetterAdvancements-,BetterAnimationsCollection-,BetterDarkMode-,BetterF3-,BetterFog-,BetterFoliage-,BetterPingDisplay-,BetterPlacement-,BetterTaskbar-,BetterThirdPerson,BetterTitleScreen-,Blur-,BorderlessWindow-,CTM-,ChunkAnimator-,ClientTweaks_,CompletionistsIndex-,Controller Support-,Controlling-,CraftPresence-,CullLessLeaves-Reforged-,CustomCursorMod-,CustomMainMenu-,DefaultOptions_,DefaultSettings-,DeleteWorldsToTrash-,DetailArmorBar-,Ding-,DistantHorizons-,DripSounds-,Durability101-,DurabilityNotifier-,DynamicSurroundings-,DynamicSurroundingsHuds-,EffectsLeft-,EiraMoticons_,EnchantmentDescriptions-,EnhancedVisuals_,EquipmentCompare-,FPS-Monitor-,FabricCustomCursorMod-,Fallingleaves-,FancySpawnEggs,FancyVideo-API-,FirstPersonMod,FogTweaker-,ForgeCustomCursorMod-,FpsReducer-,FpsReducer2-,FullscreenWindowed-,GameMenuModOption-,HealthOverlay-,HeldItemTooltips-,HorseStatsMod-,ImmediatelyFastReforged-,InventoryEssentials_,InventoryHud_[1.17.1].forge-,InventorySpam-,InventoryTweaks-,ItemBorders-,ItemPhysicLite_,ItemStitchingFix-,JBRA-Client-,JustEnoughCalculation-,JustEnoughEffects-,JustEnoughProfessions-,LeaveMyBarsAlone-,LLOverlayReloaded-,LOTRDRP-,LegendaryTooltips,LegendaryTooltips-,LightOverlay-,MoBends,MouseTweaks-,MyServerIsCompatible-,Neat ,Neat-,NekosEnchantedBooks-,NoAutoJump-,NoFog-,Notes-,NotifMod-,OldJavaWarning-,OptiFine,OptiFine_,OptiForge,OptiForge-,OverflowingBars-,PackMenu-,PackModeMenu-,PickUpNotifier-,Ping-,PingHUD-,PresenceFootsteps-,RPG-HUD-,ReAuth-,Reforgium-,ResourceLoader-,ResourcePackOrganizer,ShoulderSurfing-,ShulkerTooltip-,SimpleDiscordRichPresence-,SimpleWorldTimer-,SoundFilters-,SpawnerFix-,StylishEffects-,TextruesRubidiumOptions-,TRansliterationLib-,TipTheScales-,Tips-,Toast Control-,Toast-Control-,ToastControl-,TravelersTitles-,VoidFog-,VR-Combat_,WindowedFullscreen-,WorldNameRandomizer-,[1.12.2]DamageIndicatorsMod-,[1.12.2]bspkrscore-,antighost-,anviltooltipmod-,appleskin-,armorchroma-,armorpointspp-,auditory-,authme-,auto-reconnect-,autojoin-,autoreconnect-,axolotl-item-fix-,backtools-,bannerunlimited-,beenfo-1.19-,better-recipe-book-,betterbiomeblend-,bhmenu-,blur-,borderless-mining-,catalogue-,charmonium-,chat_heads-,cherishedworlds-,cirback-1.0-,classicbar-,clickadv-,clienttweaks-,combat_music-,connectedness-,controllable-,cullleaves-,cullparticles-,custom-crosshair-mod-,customdiscordrpc-,darkness-,dashloader-,defaultoptions-,desiredservers-,discordrpc-,drippyloadingscreen-,drippyloadingscreen_,durabilitytooltip-,dynamic-fps-,dynamic-music-,dynamiclights-,dynmus-,effective-,eggtab-,eguilib-,eiramoticons-,enchantment-lore-,entity-texture-features-,entityculling-,essential_,exhaustedstamina-,extremesoundmuffler-,fabricemotes-,fancymenu_,fancymenu_video_extension,flickerfix-,fm_audio_extension_,forgemod_VoxelMap-,freelook-,galacticraft-rpc-,gamestagesviewer-,grid-,helium-,hiddenrecipebook_,hiddenrecipebook-,infinitemusic-,inventoryprofiles,invtweaks-,itemzoom,itlt-,jeed-,jehc-,jeiintegration_,just-enough-harvestcraft-,justenoughbeacons-,justenoughdrags-,justzoom_,keymap-,keywizard-,lazydfu-,lib39-,light-overlay-,lightfallclient-,lightspeed-,loadmyresources_,lock_minecart_view-,lootbeams-,lwl-,magnesium_extras-,maptooltip-,massunbind,mcbindtype-,mcwifipnp-,medievalmusic-,memoryusagescreen-,mightyarchitect-,mindful-eating-,minetogether-,mobplusplus-,modcredits-,modernworldcreation_,modnametooltip-,modnametooltip_,moreoverlays-,mousewheelie-,movement-vision-,multihotbar-,music-duration-reducer-,musicdr-,neiRecipeHandlers-,ngrok-lan-expose-mod-,no_nv_flash-,nopotionshift_,notenoughanimations-,oculus-,ornaments-,overloadedarmorbar-,panorama-,paperdoll-,physics-mod-,phosphor-,preciseblockplacing-,realm-of-lost-souls-,rebind_narrator-,rebind-narrator-,rebindnarrator-,rebrand-,reforgium-,replanter-,rubidium-,rubidium_extras-,screenshot-to-clipboard-,shutupexperimentalsettings-,shutupmodelloader-,signtools-,simple-rpc-,simpleautorun-,smartcursor-,smoothboot-,smoothfocus-,sodium-fabric-,sounddeviceoptions-,soundreloader-,spoticraft-,tconplanner-,timestamps-,tooltipscroller-,torchoptimizer-,torohealth-,totaldarkness,toughnessbar-,whats-that-slot-forge-,wisla-,xlifeheartcolors-,yisthereautojump- de.griefed.serverpackcreator.configuration.hastebinserver=https://haste.zneix.eu/documents de.griefed.serverpackcreator.configuration.aikar=-Xms4G -Xmx4G -XX:+UseG1GC -XX:+ParallelRefProcEnabled -XX:MaxGCPauseMillis=200 -XX:+UnlockExperimentalVMOptions -XX:+DisableExplicitGC -XX:+AlwaysPreTouch -XX:G1NewSizePercent=30 -XX:G1MaxNewSizePercent=40 -XX:G1HeapRegionSize=8M -XX:G1ReservePercent=20 -XX:G1HeapWastePercent=5 -XX:G1MixedGCCountTarget=4 -XX:InitiatingHeapOccupancyPercent=15 -XX:G1MixedGCLiveThresholdPercent=90 -XX:G1RSetUpdatingPauseTimePercent=5 -XX:SurvivorRatio=32 -XX:+PerfDisableSharedMem -XX:MaxTenuringThreshold=1 -Dusing.aikars.flags=https://mcflags.emc.gs -Daikars.new.flags=true de.griefed.serverpackcreator.serverpack.autodiscovery.enabled=true diff --git a/serverpackcreator-gui/src/main/kotlin/de/griefed/serverpackcreator/gui/window/settings/GlobalSettings.kt b/serverpackcreator-gui/src/main/kotlin/de/griefed/serverpackcreator/gui/window/settings/GlobalSettings.kt index cdfd381e0..4ff9432f6 100644 --- a/serverpackcreator-gui/src/main/kotlin/de/griefed/serverpackcreator/gui/window/settings/GlobalSettings.kt +++ b/serverpackcreator-gui/src/main/kotlin/de/griefed/serverpackcreator/gui/window/settings/GlobalSettings.kt @@ -56,13 +56,13 @@ class GlobalSettings(guiProps: GuiProps, apiProperties: ApiProperties, component val zipLabel = ElementLabel("ZIP-Exclusions") val zipSetting = ScrollTextArea(apiProperties.zipArchiveExclusions.joinToString(", "),"ZIP-Exclusions",guiProps) val zipRevert = BalloonTipButton(null, guiProps.revertIcon, "Revert changes.", guiProps) { zipSetting.text = apiProperties.zipArchiveExclusions.joinToString(", ") } - val zipReset = BalloonTipButton(null,guiProps.resetIcon,"Reset to default value",guiProps) { zipSetting.text = apiProperties.fallbackZipExclusionsString } + val zipReset = BalloonTipButton(null,guiProps.resetIcon,"Reset to default value",guiProps) { zipSetting.text = apiProperties.fallbackZipExclusions.joinToString(",") } val inclusionsIcon = StatusIcon(guiProps, "Recommended inclusions in server pack") val inclusionsLabel = ElementLabel("Recommended Inclusions") val inclusionsSetting = ScrollTextArea(apiProperties.directoriesToInclude.joinToString(", "),"Recommended Inclusions",guiProps) val inclusionsRevert = BalloonTipButton(null, guiProps.revertIcon, "Revert changes.", guiProps) { inclusionsSetting.text = apiProperties.directoriesToInclude.joinToString(", ") } - val inclusionsReset = BalloonTipButton(null,guiProps.resetIcon,"Reset to default value",guiProps) { inclusionsSetting.text = apiProperties.fallbackDirectoriesInclusionString } + val inclusionsReset = BalloonTipButton(null,guiProps.resetIcon,"Reset to default value",guiProps) { inclusionsSetting.text = apiProperties.fallbackDirectoriesInclusion.joinToString(",") } val aikarsIcon = StatusIcon(guiProps, "Global Aikars flags used when pressing the \"Use Aikars Flags\"-button in a server pack config tab") val aikarsLabel = ElementLabel("Global Aikars Flags") From 7c230f4300b587d18caf2c8b13f2a90e7177a76f Mon Sep 17 00:00:00 2001 From: Griefed Date: Thu, 7 Sep 2023 21:56:16 +0200 Subject: [PATCH 2/2] fix: Check for NeoForge installer availability --- .../serverpackcreator/api/ServerPackHandler.kt | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/serverpackcreator-api/src/jvmMain/kotlin/de/griefed/serverpackcreator/api/ServerPackHandler.kt b/serverpackcreator-api/src/jvmMain/kotlin/de/griefed/serverpackcreator/api/ServerPackHandler.kt index 27639ce66..0b1c4fc3a 100644 --- a/serverpackcreator-api/src/jvmMain/kotlin/de/griefed/serverpackcreator/api/ServerPackHandler.kt +++ b/serverpackcreator-api/src/jvmMain/kotlin/de/griefed/serverpackcreator/api/ServerPackHandler.kt @@ -848,11 +848,10 @@ actual class ServerPackHandler actual constructor( override fun serverDownloadable(mcVersion: String, modloader: String, modloaderVersion: String) = when (modloader) { "Fabric" -> utilities.webUtilities.isReachable(versionMeta.fabric.releaseInstallerUrl()) - "Forge" -> (versionMeta.forge.getForgeInstance( - mcVersion, modloaderVersion - ).isPresent && utilities.webUtilities.isReachable( - versionMeta.forge.getForgeInstance(mcVersion, modloaderVersion).get().installerUrl - )) + "Forge" -> { + val instance = versionMeta.forge.getForgeInstance(mcVersion, modloaderVersion) + instance.isPresent && utilities.webUtilities.isReachable(instance.get().installerUrl) + } "Quilt" -> utilities.webUtilities.isReachable(versionMeta.quilt.releaseInstallerUrl()) @@ -864,6 +863,11 @@ actual class ServerPackHandler actual constructor( } } + "NeoForge" -> { + val instance = versionMeta.neoForge.getNeoForgeInstance(mcVersion,modloaderVersion) + instance.isPresent && utilities.webUtilities.isReachable(instance.get().installerUrl) + } + else -> false }