aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorLinnea Gräf <nea@nea.moe>2025-09-14 19:46:52 +0200
committerLinnea Gräf <nea@nea.moe>2025-09-14 19:46:52 +0200
commit0a96dd618acba15269627c7eae8a2291fb2dc84a (patch)
treef31a66cbd13cefbfb2d006f07d3ef3da1010f7e7 /src
parent9abe9f46f04f188037687adb2740b32220ad21b2 (diff)
downloadFirmament-0a96dd618acba15269627c7eae8a2291fb2dc84a.tar.gz
Firmament-0a96dd618acba15269627c7eae8a2291fb2dc84a.tar.bz2
Firmament-0a96dd618acba15269627c7eae8a2291fb2dc84a.zip
snapshot
Diffstat (limited to 'src')
-rw-r--r--src/compat/rei/java/moe/nea/firmament/compat/rei/FirmamentReiPlugin.kt4
-rw-r--r--src/compat/rei/java/moe/nea/firmament/compat/rei/NEUItemEntryRenderer.kt4
-rw-r--r--src/compat/rei/java/moe/nea/firmament/compat/rei/SBItemEntryDefinition.kt2
-rw-r--r--src/main/java/moe/nea/firmament/util/data/ManagedConfig.kt2
-rw-r--r--src/main/kotlin/Firmament.kt3
-rw-r--r--src/main/kotlin/apis/Profiles.kt8
-rw-r--r--src/main/kotlin/apis/Routes.kt14
-rw-r--r--src/main/kotlin/apis/UrsaManager.kt16
-rw-r--r--src/main/kotlin/commands/Duration.kt1
-rw-r--r--src/main/kotlin/commands/dsl.kt8
-rw-r--r--src/main/kotlin/commands/rome.kt2
-rw-r--r--src/main/kotlin/events/AllowChatEvent.kt2
-rw-r--r--src/main/kotlin/events/EntityRenderTintEvent.kt1
-rw-r--r--src/main/kotlin/events/FeaturesInitializedEvent.kt8
-rw-r--r--src/main/kotlin/events/IsSlotProtectedEvent.kt1
-rw-r--r--src/main/kotlin/events/ModifyChatEvent.kt2
-rw-r--r--src/main/kotlin/events/SlotRenderEvents.kt3
-rw-r--r--src/main/kotlin/events/WorldRenderLastEvent.kt4
-rw-r--r--src/main/kotlin/events/subscription/Subscription.kt4
-rw-r--r--src/main/kotlin/features/FeatureManager.kt107
-rw-r--r--src/main/kotlin/features/FirmamentFeature.kt23
-rw-r--r--src/main/kotlin/features/chat/AutoCompletions.kt13
-rw-r--r--src/main/kotlin/features/chat/ChatLinks.kt11
-rw-r--r--src/main/kotlin/features/chat/CopyChat.kt16
-rw-r--r--src/main/kotlin/features/chat/PartyCommands.kt2
-rw-r--r--src/main/kotlin/features/chat/QuickCommands.kt41
-rw-r--r--src/main/kotlin/features/debug/DebugLogger.kt4
-rw-r--r--src/main/kotlin/features/debug/DebugView.kt29
-rw-r--r--src/main/kotlin/features/debug/DeveloperFeatures.kt13
-rw-r--r--src/main/kotlin/features/debug/MinorTrolling.kt6
-rw-r--r--src/main/kotlin/features/debug/PowerUserTools.kt12
-rw-r--r--src/main/kotlin/features/diana/AncestralSpadeSolver.kt9
-rw-r--r--src/main/kotlin/features/diana/DianaWaypoints.kt38
-rw-r--r--src/main/kotlin/features/diana/NearbyBurrowsSolver.kt7
-rw-r--r--src/main/kotlin/features/events/anniversity/AnniversaryFeatures.kt392
-rw-r--r--src/main/kotlin/features/events/anniversity/CenturyRaffleFeatures.kt2
-rw-r--r--src/main/kotlin/features/events/carnival/CarnivalFeatures.kt7
-rw-r--r--src/main/kotlin/features/fixes/CompatibliltyFeatures.kt10
-rw-r--r--src/main/kotlin/features/fixes/Fixes.kt10
-rw-r--r--src/main/kotlin/features/garden/HideComposterNoises.kt2
-rw-r--r--src/main/kotlin/features/inventory/CraftingOverlay.kt5
-rw-r--r--src/main/kotlin/features/inventory/ItemHotkeys.kt3
-rw-r--r--src/main/kotlin/features/inventory/ItemRarityCosmetics.kt16
-rw-r--r--src/main/kotlin/features/inventory/JunkHighlighter.kt7
-rw-r--r--src/main/kotlin/features/inventory/PetFeatures.kt10
-rw-r--r--src/main/kotlin/features/inventory/PriceData.kt9
-rw-r--r--src/main/kotlin/features/inventory/REIDependencyWarner.kt6
-rw-r--r--src/main/kotlin/features/inventory/SaveCursorPosition.kt93
-rw-r--r--src/main/kotlin/features/inventory/SlotLocking.kt16
-rw-r--r--src/main/kotlin/features/inventory/TimerInLore.kt2
-rw-r--r--src/main/kotlin/features/inventory/WardrobeKeybinds.kt3
-rw-r--r--src/main/kotlin/features/inventory/buttons/InventoryButtonTemplates.kt1
-rw-r--r--src/main/kotlin/features/inventory/buttons/InventoryButtons.kt109
-rw-r--r--src/main/kotlin/features/inventory/storageoverlay/StorageOverlay.kt12
-rw-r--r--src/main/kotlin/features/inventory/storageoverlay/StorageOverviewScreen.kt10
-rw-r--r--src/main/kotlin/features/inventory/storageoverlay/VirtualInventory.kt1
-rw-r--r--src/main/kotlin/features/items/BlockZapperOverlay.kt15
-rw-r--r--src/main/kotlin/features/items/BonemerangOverlay.kt16
-rw-r--r--src/main/kotlin/features/items/EtherwarpOverlay.kt10
-rw-r--r--src/main/kotlin/features/macros/ComboProcessor.kt1
-rw-r--r--src/main/kotlin/features/macros/MacroData.kt2
-rw-r--r--src/main/kotlin/features/mining/CommissionFeatures.kt2
-rw-r--r--src/main/kotlin/features/mining/Histogram.kt3
-rw-r--r--src/main/kotlin/features/mining/HotmPresets.kt1
-rw-r--r--src/main/kotlin/features/mining/MiningBlockInfoUi.kt1
-rw-r--r--src/main/kotlin/features/mining/PickaxeAbility.kt10
-rw-r--r--src/main/kotlin/features/mining/PristineProfitTracker.kt36
-rw-r--r--src/main/kotlin/features/misc/CustomCapes.kt20
-rw-r--r--src/main/kotlin/features/misc/Hud.kt19
-rw-r--r--src/main/kotlin/features/misc/ModAnnouncer.kt1
-rw-r--r--src/main/kotlin/features/notifications/Notifications.kt7
-rw-r--r--src/main/kotlin/features/world/FairySouls.kt200
-rw-r--r--src/main/kotlin/features/world/TemporaryWaypoints.kt2
-rw-r--r--src/main/kotlin/features/world/Waypoints.kt70
-rw-r--r--src/main/kotlin/gui/BarComponent.kt4
-rw-r--r--src/main/kotlin/gui/CheckboxComponent.kt1
-rw-r--r--src/main/kotlin/gui/config/AllConfigsGui.kt2
-rw-r--r--src/main/kotlin/gui/config/ChoiceHandler.kt2
-rw-r--r--src/main/kotlin/gui/config/DurationHandler.kt3
-rw-r--r--src/main/kotlin/gui/config/HudMetaHandler.kt2
-rw-r--r--src/main/kotlin/gui/config/IntegerHandler.kt2
-rw-r--r--src/main/kotlin/gui/config/KeyBindingHandler.kt8
-rw-r--r--src/main/kotlin/gui/config/ManagedOption.kt2
-rw-r--r--src/main/kotlin/gui/config/StringHandler.kt2
-rw-r--r--src/main/kotlin/gui/config/storage/ConfigLoadContext.kt16
-rw-r--r--src/main/kotlin/gui/config/storage/FirmamentConfigLoader.kt4
-rw-r--r--src/main/kotlin/gui/config/storage/LegacyImporter.kt3
-rw-r--r--src/main/kotlin/gui/entity/GuiPlayer.kt2
-rw-r--r--src/main/kotlin/gui/entity/ModifyEquipment.kt2
-rw-r--r--src/main/kotlin/gui/entity/ModifyHorse.kt3
-rw-r--r--src/main/kotlin/jarvis/JarvisIntegration.kt8
-rw-r--r--src/main/kotlin/repo/ItemCache.kt1
-rw-r--r--src/main/kotlin/repo/MiningRepoData.kt3
-rw-r--r--src/main/kotlin/repo/RepoDownloadManager.kt9
-rw-r--r--src/main/kotlin/repo/RepoManager.kt12
-rw-r--r--src/main/kotlin/repo/RepoModResourcePack.kt2
-rw-r--r--src/main/kotlin/repo/recipes/SBEssenceUpgradeRecipeRenderer.kt2
-rw-r--r--src/main/kotlin/util/LegacyTagParser.kt2
-rw-r--r--src/main/kotlin/util/MoulConfigUtils.kt1
-rw-r--r--src/main/kotlin/util/TemplateUtil.kt3
-rw-r--r--src/main/kotlin/util/WarpUtil.kt141
-rw-r--r--src/main/kotlin/util/accessors/GetRectangle.kt2
-rw-r--r--src/main/kotlin/util/data/DataHolder.kt5
-rw-r--r--src/main/kotlin/util/data/IDataHolder.kt20
-rw-r--r--src/main/kotlin/util/json/DashlessUUIDSerializer.kt1
-rw-r--r--src/main/kotlin/util/json/jsonConversion.kt1
-rw-r--r--src/main/kotlin/util/mc/NbtPrism.kt6
-rw-r--r--src/main/kotlin/util/render/DrawContextExt.kt1
-rw-r--r--src/main/kotlin/util/render/FacingThePlayerContext.kt2
-rw-r--r--src/main/kotlin/util/render/FirmamentShaders.kt8
-rw-r--r--src/main/kotlin/util/render/MultiSpecialGuiRenderState.kt1
-rw-r--r--src/main/kotlin/util/render/RenderCircleProgress.kt1
-rw-r--r--src/main/kotlin/util/render/RenderInWorldContext.kt1
-rw-r--r--src/main/kotlin/util/render/TranslatedScissors.kt1
-rw-r--r--src/main/kotlin/util/skyblock/SackUtil.kt2
-rw-r--r--src/texturePacks/java/moe/nea/firmament/features/texturepack/CustomGlobalTextures.kt19
-rw-r--r--src/texturePacks/java/moe/nea/firmament/features/texturepack/CustomSkyBlockTextures.kt10
117 files changed, 767 insertions, 1118 deletions
diff --git a/src/compat/rei/java/moe/nea/firmament/compat/rei/FirmamentReiPlugin.kt b/src/compat/rei/java/moe/nea/firmament/compat/rei/FirmamentReiPlugin.kt
index 3a494b9..1c97738 100644
--- a/src/compat/rei/java/moe/nea/firmament/compat/rei/FirmamentReiPlugin.kt
+++ b/src/compat/rei/java/moe/nea/firmament/compat/rei/FirmamentReiPlugin.kt
@@ -64,7 +64,7 @@ class FirmamentReiPlugin : REIClientPlugin {
if (recipe !is NEUCraftingRecipe) return@TransferHandler TransferHandler.Result.createNotApplicable()
val neuItem = RepoManager.getNEUItem(SkyblockId(recipe.output.itemId))
?: error("Could not find neu item ${recipe.output.itemId} which is used in a recipe output")
- val useSuperCraft = context.isStackedCrafting || RepoManager.Config.alwaysSuperCraft
+ val useSuperCraft = context.isStackedCrafting || RepoManager.TConfig.alwaysSuperCraft
if (neuItem.isVanilla && useSuperCraft) return@TransferHandler TransferHandler.Result.createFailed(
Text.translatable(
"firmament.recipe.novanilla"
@@ -138,7 +138,7 @@ class FirmamentReiPlugin : REIClientPlugin {
override fun registerCollapsibleEntries(registry: CollapsibleEntryRegistry) {
if (!RepoManager.shouldLoadREI()) return
- if (!RepoManager.Config.disableItemGroups)
+ if (!RepoManager.TConfig.disableItemGroups)
RepoManager.neuRepo.constants.parents.parents
.forEach { (parent, children) ->
registry.group(
diff --git a/src/compat/rei/java/moe/nea/firmament/compat/rei/NEUItemEntryRenderer.kt b/src/compat/rei/java/moe/nea/firmament/compat/rei/NEUItemEntryRenderer.kt
index f881f77..e273020 100644
--- a/src/compat/rei/java/moe/nea/firmament/compat/rei/NEUItemEntryRenderer.kt
+++ b/src/compat/rei/java/moe/nea/firmament/compat/rei/NEUItemEntryRenderer.kt
@@ -45,7 +45,7 @@ object NEUItemEntryRenderer : EntryRenderer<SBItemStack> {
delta: Float
) {
val neuItem = entry.value.neuItem
- val itemToRender = if(!RepoManager.Config.perfectRenders.rendersPerfectVisuals() && !entry.value.isWarm() && neuItem != null) {
+ val itemToRender = if(!RepoManager.TConfig.perfectRenders.rendersPerfectVisuals() && !entry.value.isWarm() && neuItem != null) {
ItemCache.recacheSoon(neuItem)
ItemStack(Items.PAINTING)
} else {
@@ -72,7