Minor code style changes

This commit is contained in:
object-Object 2023-09-10 11:48:00 -04:00
parent 89106c664f
commit f10d3e46fe
3 changed files with 18 additions and 11 deletions

View file

@ -1,5 +1,12 @@
- [ ] Unit test for mock addon book
## Before release
- [ ] Remove `docgen-2-1.20` from the workflow branch settings
- [ ] Remove `.dev` from the hexdoc version in `cookiecutter.json`
- [ ] Re-add edified wood recipe to [Common/src/main/resources/assets/hexcasting/patchouli_books/thehexbook/en_us/entries/items/edified.json](items/edified) when it actually exists
- [ ] Fix mobile styling for navbar dropdowns
## Backlog
- [ ] Remove base_asset_urls
- [ ] Publish the CI actions/workflow
- [ ] Unit test for mock addon book
- [ ] Fix mobile styling for navbar dropdowns (or find a nice web developer to do it for me :) )

View file

@ -5,7 +5,7 @@ default_lang = "en_us"
_export_root = "src/hexdoc/_export"
resource_dirs = [ # top takes priority
{ path = "{^_export_root}/resources", reexport = false },
{ path="{^_export_root}/resources", reexport=false },
"{_common.src}/main/resources",
"{_common.src}/generated/resources",
"{_fabric.src}/main/resources",
@ -16,7 +16,7 @@ resource_dirs = [ # top takes priority
export_dir = "{_export_root}/generated"
# NOTE: "!Raw" means "don't apply variable interpolation to this value"
_pattern_regex = { "!Raw" = 'make\(\s*"(?P<name>[a-zA-Z0-9_\/]+)",\s*(?:new )?(?:ActionRegistryEntry|OperationAction)\(\s*HexPattern\.fromAngles\(\s*"(?P<signature>[aqweds]+)",\s*HexDir.(?P<startdir>\w+)\)' }
_pattern_regex = { "!Raw"='make\(\s*"(?P<name>[a-zA-Z0-9_\/]+)",\s*(?:new )?(?:ActionRegistryEntry|OperationAction)\(\s*HexPattern\.fromAngles\(\s*"(?P<signature>[aqweds]+)",\s*HexDir.(?P<startdir>\w+)\)' }
[[pattern_stubs]]

View file

@ -5,28 +5,28 @@ default_lang = "en_us"
_export_root = "{{ cookiecutter.__export_root }}"
resource_dirs = [ # top takes priority
{ path = "{^_export_root}/resources", reexport = false },
{ path="{^_export_root}/resources", reexport=false },
"{_common.src}/main/resources",
"{_common.src}/generated/resources",
"{_fabric.src}/main/resources",
"{_fabric.src}/generated/resources",
"{_forge.src}/main/resources",
"{_forge.src}/generated/resources",
{ modid = "hexcasting" },
{ modid="hexcasting" },
]
export_dir = "{_export_root}/generated"
{# beware of eldritch abombinations lurking beneath these waters #}
{# beware of eldritch abombinations lurking beneath these waters -#}
# NOTE: "!Raw" means "don't apply variable interpolation to this value"
{% if cookiecutter.pattern_regex == "hex_latest" -%}
_pattern_regex = { "!Raw" = 'make\(\s*"(?P<name>[a-zA-Z0-9_\/]+)",\s*(?:new )?(?:ActionRegistryEntry|OperationAction)\(\s*HexPattern\.fromAngles\(\s*"(?P<signature>[aqweds]+)",\s*HexDir.(?P<startdir>\w+)\)' }
_pattern_regex = { "!Raw"='make\(\s*"(?P<name>[a-zA-Z0-9_\/]+)",\s*(?:new )?(?:ActionRegistryEntry|OperationAction)\(\s*HexPattern\.fromAngles\(\s*"(?P<signature>[aqweds]+)",\s*HexDir.(?P<startdir>\w+)\)' }
{% elif cookiecutter.pattern_regex == "hex_0.10.3" -%}
_pattern_regex = { "!Raw" = 'HexPattern\.fromAngles\("(?P<signature>[qweasd]+)", HexDir\.(?P<startdir>\w+)\),\s*modLoc\("(?P<name>[^"]+)"\)[^;]+?(?:makeConstantOp|Op\w+|Widget\.\w+)(?:[^;]*(?P<is_per_world>true)\);)?' }
_pattern_regex = { "!Raw"='HexPattern\.fromAngles\("(?P<signature>[qweasd]+)", HexDir\.(?P<startdir>\w+)\),\s*modLoc\("(?P<name>[^"]+)"\)[^;]+?(?:makeConstantOp|Op\w+|Widget\.\w+)(?:[^;]*(?P<is_per_world>true)\);)?' }
{% elif cookiecutter.pattern_regex == "hexal_0.3.0" -%}
_pattern_regex = { "!Raw" = 'make\(\s*"(?P<name>[a-zA-Z0-9_\/]+)",\s*HexPattern\.fromAngles\(\s*"(?P<signature>[aqweds]+)",\s*HexDir.(?P<startdir>\w+)\)' }
_pattern_regex = { "!Raw"='make\(\s*"(?P<name>[a-zA-Z0-9_\/]+)",\s*HexPattern\.fromAngles\(\s*"(?P<signature>[aqweds]+)",\s*HexDir.(?P<startdir>\w+)\)' }
{% elif cookiecutter.pattern_regex == "hexal_0.2.18" -%}
{#- :yea: -#}
_pattern_regex = { "!Raw" = '(?s-m:HexPattern\.fromAngles\("(?P<signature>[qweasd]+)", HexDir\.(?P<startdir>\w+)\),\s*modLoc\("(?P<name>[^"]+)"\),[^,]+?(?:makeConstantOp|Op\w+).*?(?P<is_per_world>\btrue)?\)(?:[^\)]+?\bval\b|(?:(?!\bval\b)(?:.))+$))' }
_pattern_regex = { "!Raw"='(?s-m:HexPattern\.fromAngles\("(?P<signature>[qweasd]+)", HexDir\.(?P<startdir>\w+)\),\s*modLoc\("(?P<name>[^"]+)"\),[^,]+?(?:makeConstantOp|Op\w+).*?(?P<is_per_world>\btrue)?\)(?:[^\)]+?\bval\b|(?:(?!\bval\b)(?:.))+$))' }
{% else %}
{# intentionally crash the template because we got an unhandled value #}
{{ 0/0 }}