From 0bdc48c86fa2c20c18fa60089218dc88cf969417 Mon Sep 17 00:00:00 2001 From: Matt Date: Sat, 23 May 2026 12:57:41 +0000 Subject: [PATCH] gitignore: scope overrides ignore to mods/, track defaultconfigs/ The previous rule 'pack/overrides/' ignored the whole directory, which made it impossible to re-include subpaths via ! exception (git's rule). Narrow the ignore to 'pack/overrides/mods/' -- the only path that Build-Tweaks.ps1 actually writes -- and drop the broken whitelist block. Other subdirs under pack/overrides/ (defaultconfigs/, etc.) now live in git like normal source. Adds the Waystones override that 0.16.1 attempted (spawnInVillages = DISABLED). Bumps to 0.16.3 so launcher caches re-sync. --- .gitignore | 7 +- .../defaultconfigs/waystones-common.toml | 87 +++++++++++++++++++ pack/pack.lock.json | 2 +- 3 files changed, 89 insertions(+), 7 deletions(-) create mode 100644 pack/overrides/defaultconfigs/waystones-common.toml diff --git a/.gitignore b/.gitignore index 9032ee4..c3962c4 100644 --- a/.gitignore +++ b/.gitignore @@ -55,14 +55,9 @@ CLAUDE.md # ─── Build artifacts that get regenerated ───────────────────────────────── # Tweak jars rebuilt by scripts/Build-Tweaks.ps1 -pack/overrides/ +pack/overrides/mods/ # manifest.json regenerated by scripts/Build-Pack.ps1 -- produced at scripts/ # (default OutputPath) and copied to the deploy share by Deploy-Brass.ps1 scripts/manifest.json pack/manifest.json -# pack/overrides/ is build output, but defaultconfigs/ holds hand-written -# source-of-truth configs we ship as first-run defaults (see Build-Pack.ps1). -# Whitelist that subdir so it lives in git like other source files. -!pack/overrides/defaultconfigs/ -!pack/overrides/defaultconfigs/** diff --git a/pack/overrides/defaultconfigs/waystones-common.toml b/pack/overrides/defaultconfigs/waystones-common.toml new file mode 100644 index 0000000..7a33db3 --- /dev/null +++ b/pack/overrides/defaultconfigs/waystones-common.toml @@ -0,0 +1,87 @@ +[general] + #List of waystone origins that should prevent others from editing. PLAYER is special in that it allows only edits by the owner of the waystone. + restrictedWaystones = ["PLAYER"] + #Set to "GLOBAL" to have newly placed or found waystones be global by default. + #Allowed Values: ACTIVATION, GLOBAL, SHARD_ONLY, ORANGE_SHARESTONE, MAGENTA_SHARESTONE, LIGHT_BLUE_SHARESTONE, YELLOW_SHARESTONE, LIME_SHARESTONE, PINK_SHARESTONE, GRAY_SHARESTONE, LIGHT_GRAY_SHARESTONE, CYAN_SHARESTONE, PURPLE_SHARESTONE, BLUE_SHARESTONE, BROWN_SHARESTONE, GREEN_SHARESTONE, RED_SHARESTONE, BLACK_SHARESTONE + defaultVisibility = "ACTIVATION" + #Add "GLOBAL" to allow every player to create global waystones. + allowedVisibilities = [] + #The time in ticks that it takes to use a warp stone. This is the charge-up time when holding right-click. + warpStoneUseTime = 32 + #The time in ticks that it takes to use a warp plate. This is the time the player has to stand on top for. + warpPlateUseTime = 15 + #The time in ticks it takes to use a scroll. This is the charge-up time when holding right-click. + scrollUseTime = 32 + +[inventoryButton] + #Set to 'NONE' for no inventory button. Set to 'NEAREST' for an inventory button that teleports to the nearest waystone. Set to 'ANY' for an inventory button that opens the waystone selection menu. Set to a waystone name for an inventory button that teleports to a specifically named waystone. + inventoryButton = "" + #The x position of the inventory button in the inventory. + inventoryButtonX = 58 + #The y position of the inventory button in the inventory. + inventoryButtonY = 60 + #The y position of the inventory button in the creative menu. + creativeInventoryButtonX = 88 + #The y position of the inventory button in the creative menu. + creativeInventoryButtonY = 33 + +[worldGen] + #Set to 'DEFAULT' to only generate the normally textured waystones. Set to 'MOSSY' or 'SANDY' to generate all as that variant. Set to 'BIOME' to make the style depend on the biome it is generated in. + #Allowed Values: DEFAULT, MOSSY, SANDY, BLACKSTONE, DEEPSLATE, END_STONE, BIOME + wildWaystoneStyle = "BIOME" + #Approximate chunk distance between wild waystones being generated. Set to 0 to disable generation. + chunksBetweenWildWaystones = 25 + #List of dimensions that wild waystones are allowed to spawn in. If left empty, all dimensions except those in wildWaystonesDimensionDenyList will be able to spawn waystones, provided the biomes are in the `has_structure/waystone` tag. + wildWaystonesDimensionAllowList = ["minecraft:the_nether", "minecraft:overworld", "minecraft:the_end"] + #List of dimensions that wild waystones are not allowed to spawn in, even if the biome is in the `has_structure/waystone` tag. Only used if wildWaystonesDimensionAllowList is empty. + wildWaystonesDimensionDenyList = [] + #Set to 'PRESET_FIRST' to first use names from the nameGenerationPresets. Set to 'PRESET_ONLY' to use only those custom names. Set to 'MIXED' to have some waystones use custom names, and others random names. + #Allowed Values: PRESET_FIRST, RANDOM_ONLY, PRESET_ONLY, MIXED + nameGenerationMode = "PRESET_FIRST" + #The template to use when generating new names. Supported placeholders are {Biome} (english biome name) and {MrPork} (the default name generator). + nameGenerationTemplate = "{MrPork}" + #These names will be used for the PRESET name generation mode. See the nameGenerationMode option for more info. + nameGenerationPresets = [] + #Set to REGULAR to have waystones spawn in some villages. Set to FREQUENT to have waystones spawn in most villages. Set to DISABLED to disable waystone generation in villages. Waystones will only spawn in vanilla or supported villages. + #Allowed Values: DISABLED, REGULAR, FREQUENT + spawnInVillages = "DISABLED" + +[teleports] + #Set to false to simply disable all xp costs. See warpRequirements for more fine-grained control. + enableCosts = true + #Set to false to simply disable all cooldowns. See warpRequirements for more fine-grained control. + enableCooldowns = true + #List of warp requirements with comma-separated parameters in parentheses. Conditions can be defined as comma-separated list in square brackets. Will be applied in order. + warpRequirements = ["[is_not_interdimensional] scaled_add_xp_cost(distance, 0.01)", "[is_interdimensional] add_xp_cost(27)", "[source_is_warp_plate] multiply_xp_cost(0)", "[target_is_global] multiply_xp_cost(0)", "min_xp_cost(0)", "max_xp_cost(27)", "[source_is_inventory_button] add_cooldown(inventory_button, 300)"] + #Set to ENABLED to have nearby pets teleport with you. Set to SAME_DIMENSION to have nearby pets teleport with you only if you're not changing dimensions. Set to DISABLED to disable. + #Allowed Values: ENABLED, SAME_DIMENSION, DISABLED + transportPets = "DISABLED" + #Set to ENABLED to have leashed mobs teleport with you. Set to SAME_DIMENSION to have leashed mobs teleport with you only if you're not changing dimensions. Set to DISABLED to disable. + #Allowed Values: ENABLED, SAME_DIMENSION, DISABLED + transportLeashed = "ENABLED" + #List of entities that cannot be teleported, either as pet, leashed, or on warp plates. + entityDenyList = ["minecraft:wither"] + #Set to true to enable warp modifier items for applying status effects on teleports. + enableModifiers = true + +[client] + #If enabled, the text overlay on waystones will no longer always render at full brightness. + disableTextGlow = false + +[compatibility] + #If enabled, JourneyMap waypoints will be created for each activated waystone. + journeyMap = true + #If enabled, JourneyMap waypoints will only be created if the mod 'JourneyMap Integration' is not installed + preferJourneyMapIntegrationMod = true + #If enabled, Waystones will add markers for waystones and sharestones to Dynmap. + dynmap = true + +[blueMap] + #Controls whether Waystones' BlueMap integration should be loaded + enabled = true + #If enabled, waystones will be tracked as markers on BlueMap + includeWaystones = true + #If enabled, sharestones will be tracked as markers on BlueMap. + includeSharestones = true + #If enabled, undiscovered waystones will be tracked as markers on BlueMap. + includeUndiscoveredWaystones = false diff --git a/pack/pack.lock.json b/pack/pack.lock.json index fa6acb3..a0ba0ce 100644 --- a/pack/pack.lock.json +++ b/pack/pack.lock.json @@ -1,7 +1,7 @@ { "$schema": "Brass-and-Sigil pack.lock.json - generated, do not edit by hand unless you know what you are doing", "name": "Brass and Sigil", - "version": "0.16.2", + "version": "0.16.3", "minecraft": "1.21.1", "loader": { "type": "neoforge", -- 2.52.0