diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index c9c5ae8466..295823d731 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -87,9 +87,9 @@ jobs: # https://modrinth.com/mod/fabric-api/versions # https://modrinth.com/mod/packtest/versions - version: '26.3' - fabric_server_url: https://meta.fabricmc.net/v2/versions/loader/26.3-rc-1/0.19.5/1.1.2/server/jar - fabric_api_url: https://cdn.modrinth.com/data/P7dR8mSH/versions/QfyrYezy/fabric-api-0.160.3%2B26.3.jar - packtest_url: https://cdn.modrinth.com/data/XsKUhp45/versions/5pthhuxY/packtest-2.7.0-beta1.jar + fabric_server_url: https://meta.fabricmc.net/v2/versions/loader/26.3/0.19.5/1.1.2/server/jar + fabric_api_url: https://cdn.modrinth.com/data/P7dR8mSH/versions/bq3SsNGk/fabric-api-0.163.0%2B26.3.jar + packtest_url: https://cdn.modrinth.com/data/XsKUhp45/versions/Mbso179m/packtest-2.8.0.jar command_limit_tracer_url: https://cdn.modrinth.com/data/Ao12dSbt/versions/zKvlVzlN/commandlimittracer-0.3.0.jar name: 'test-${{ matrix.version }}' runs-on: ubuntu-24.04 diff --git a/gm4/plugins/manifest.py b/gm4/plugins/manifest.py index 88497bf326..38c1675db0 100644 --- a/gm4/plugins/manifest.py +++ b/gm4/plugins/manifest.py @@ -152,7 +152,7 @@ def create(ctx: Context): ctx.cache["gm4_manifest"].json = manifest.model_dump() # Read in the previous manifest, if found - version = os.getenv("VERSION", "26.3-rc-1") + version = os.getenv("VERSION", "26.3") release_dir = Path('release') / version manifest_file = release_dir / "meta.json" @@ -226,7 +226,7 @@ def update_patch(ctx: Context): def write_meta(ctx: Context): """Write the updated meta.json file.""" - version = os.getenv("VERSION", "26.3-rc-1") + version = os.getenv("VERSION", "26.3") release_dir = Path('release') / version os.makedirs(release_dir, exist_ok=True) diff --git a/gm4/plugins/output.py b/gm4/plugins/output.py index 03b155a296..12a575f9f4 100644 --- a/gm4/plugins/output.py +++ b/gm4/plugins/output.py @@ -21,7 +21,7 @@ def beet_default(ctx: Context): """Saves the datapack to the ./out folder in it's exit phase. Should be first in pipeline to properly wrap all other plugins cleanup phases""" - version = os.getenv("VERSION", "26.3-rc-1") + version = os.getenv("VERSION", "26.3") out_dir = Path("out") yield # wait for exit phase, after other plugins cleanup @@ -33,7 +33,7 @@ def beet_default(ctx: Context): def resource_pack(ctx: Context): """Saves the resourcepack to the ./out folder.""" - version = os.getenv("VERSION", "26.3-rc-1") + version = os.getenv("VERSION", "26.3") out_dir = Path("out") ctx.assets.save( @@ -43,7 +43,7 @@ def resource_pack(ctx: Context): def release_resource_pack(ctx: Context): """Saves the resourcepack to the ./out folder.""" - version = os.getenv("VERSION", "26.3-rc-1") + version = os.getenv("VERSION", "26.3") release_dir = Path("release") / version yield @@ -82,7 +82,7 @@ def release(ctx: Context): `BEET_SMITHED_TOKEN` environment variable is set, will try to publish a new version to Smithed if it doesn't already exist. """ - version_dir = os.getenv("VERSION", "26.3-rc-1") + version_dir = os.getenv("VERSION", "26.3") release_dir = Path("release") / version_dir corrected_project_id = stem if (stem:=ctx.directory.stem).startswith("lib") else ctx.project_id @@ -199,7 +199,7 @@ def publish_smithed(ctx: Context, config: ManifestConfig, file_name: str): """Attempts to publish pack to smithed""" auth_token = os.getenv(SMITHED_AUTH_KEY, None) logger = parent_logger.getChild(f"smithed.{ctx.project_id}") - mc_version_dir = os.getenv("VERSION", "26.3-rc-1") + mc_version_dir = os.getenv("VERSION", "26.3") manifest = ManifestCacheModel.model_validate(ctx.cache["gm4_manifest"].json) project_id = stem if (stem:=ctx.directory.stem).startswith("lib") else ctx.project_id @@ -299,7 +299,7 @@ def clear_release(ctx: Context): 1. Deleted modules no longer stick around in the current version 2. Changes to the build system (such as renamed files/folders) are properly reflected """ - version = os.getenv("VERSION", "26.3-rc-1") + version = os.getenv("VERSION", "26.3") release_dir = Path("release") / version shutil.rmtree(release_dir, ignore_errors=True) os.makedirs(release_dir, exist_ok=True) diff --git a/gm4/plugins/resource_pack.py b/gm4/plugins/resource_pack.py index b3a88dd6ae..3855751413 100644 --- a/gm4/plugins/resource_pack.py +++ b/gm4/plugins/resource_pack.py @@ -43,7 +43,7 @@ JsonType = dict[str,Any] -MINECRAFT_REFERENCE_VERSION = "26.3-rc-1" +MINECRAFT_REFERENCE_VERSION = "26.3" parent_logger = logging.getLogger("gm4.resource_pack") diff --git a/gm4_disassemblers/generate_disassembly.py b/gm4_disassemblers/generate_disassembly.py index 603a74484b..58c02bd964 100644 --- a/gm4_disassemblers/generate_disassembly.py +++ b/gm4_disassemblers/generate_disassembly.py @@ -66,7 +66,7 @@ def beet_default(ctx: Context): """Creates a loot table for dropping the 9 result items when disassembling an item.""" vanilla = ctx.inject(Vanilla) - vanilla.minecraft_version = '26.3-rc-1' + vanilla.minecraft_version = '26.3' recipes = vanilla.data.recipes for item, durability in ITEMS.items(): diff --git a/gm4_double_doors/generate.py b/gm4_double_doors/generate.py index 9d4fd29906..f9782e40dd 100644 --- a/gm4_double_doors/generate.py +++ b/gm4_double_doors/generate.py @@ -63,7 +63,7 @@ def beet_default(ctx: Context): # prepare list of door materials door_materials = [ door.removeprefix("minecraft:").removesuffix("_door") - for door in resolve_blocktag(ctx, "26.3-rc-1", "minecraft:mob_interactable_doors") + for door in resolve_blocktag(ctx, "26.3", "minecraft:mob_interactable_doors") ] # make list of wood types accessible for bolt ctx.meta['door_materials'] = door_materials diff --git a/gm4_guidebook/generate_guidebooks.py b/gm4_guidebook/generate_guidebooks.py index 4723ecc758..3bc579499c 100644 --- a/gm4_guidebook/generate_guidebooks.py +++ b/gm4_guidebook/generate_guidebooks.py @@ -789,7 +789,7 @@ def generate_lectern_header(book: Book) -> list[dict[Any, Any]|str]: """ def item_to_display(item: str, components: dict[str, Any] | None, ctx: Context) -> tuple[TextComponent, TextComponent]: vanilla = ctx.inject(Vanilla) - vanilla.minecraft_version = '26.3-rc-1' + vanilla.minecraft_version = '26.3' if item == "air": # show empty slot slot = { @@ -947,7 +947,7 @@ def generate_recipe_display(recipe: str, ctx: Context) -> list[TextComponent]: ingr = ingr[0] elif ingr.startswith("#"): vanilla = ctx.inject(Vanilla) - vanilla.minecraft_version = '26.3-rc-1' + vanilla.minecraft_version = '26.3' ingr = get_item_from_tag(ctx, ingr, vanilla) ingredients.append(ingr) @@ -980,7 +980,7 @@ def generate_recipe_display(recipe: str, ctx: Context) -> list[TextComponent]: ingr = ingr[0] elif ingr.startswith("#"): vanilla = ctx.inject(Vanilla) - vanilla.minecraft_version = '26.3-rc-1' + vanilla.minecraft_version = '26.3' ingr = get_item_from_tag(ctx, ingr, vanilla) ingredients.append(ingr) while len(ingredients) < 9: diff --git a/gm4_metallurgy/shamir_model_template.py b/gm4_metallurgy/shamir_model_template.py index 47db9207b1..f8bb00f488 100644 --- a/gm4_metallurgy/shamir_model_template.py +++ b/gm4_metallurgy/shamir_model_template.py @@ -221,7 +221,7 @@ def beet_default(ctx: Context): # bind context object to a ClassVar so it can be accessed later during template processing ShamirTemplate.bound_ctx = ctx vanilla = ctx.inject(Vanilla) - vanilla.minecraft_version = '26.3-rc-1' + vanilla.minecraft_version = '26.3' ShamirTemplate.vanilla_models_jar = vanilla.mount("assets/minecraft/items") merge_policy(ctx) diff --git a/gm4_standard_crafting/generate_recipes.py b/gm4_standard_crafting/generate_recipes.py index 2ca62ae5f3..1e9860f07d 100644 --- a/gm4_standard_crafting/generate_recipes.py +++ b/gm4_standard_crafting/generate_recipes.py @@ -11,7 +11,7 @@ def beet_default(ctx: Context): """ vanilla = ctx.inject(Vanilla) - vanilla.minecraft_version = '26.3-rc-1' + vanilla.minecraft_version = '26.3' item_tags = vanilla.mount("data/minecraft/tags/item").data.item_tags recipes = vanilla.mount("data/minecraft/recipe").data.recipes diff --git a/spyglass.json b/spyglass.json index 6baaab19d4..ca87558a8d 100644 --- a/spyglass.json +++ b/spyglass.json @@ -1,6 +1,6 @@ { "env": { - "gameVersion": "Latest snapshot", + "gameVersion": "26.3", "exclude": [ ".*/**", "docs/**",