From 8ef2c23969d94bb43ce7e455ed414bda7658cf4e Mon Sep 17 00:00:00 2001 From: Face o' Cat Date: Mon, 2 Nov 2026 20:21:58 +0200 Subject: [PATCH 1/3] Port Villager Market to NeoForge 1.21.1, NeoForge 26.3, and Fabric 26.3. One block still trades with nearby villagers. CI, Discord, and publish workflows are on this line only, so the 1.12 branch stays a Forge snapshot. --- .gitattributes | 17 + .github/scripts/curseforge-version-ids.py | 51 ++ .github/scripts/discord-merge-message.sh | 25 + .github/scripts/release-bump.sh | 43 ++ .github/scripts/release-changelog.sh | 105 ++++ .github/scripts/release-commit.sh | 51 ++ .github/scripts/release-publish.sh | 268 ++++++++++ .github/scripts/release-version.sh | 107 ++++ .github/scripts/test_curseforge_versions.py | 138 +++++ .github/scripts/test_release_changelog.py | 125 +++++ .github/scripts/test_release_commit.py | 123 +++++ .github/workflows/ci.yml | 90 ++++ .github/workflows/discord-merge-notify.yml | 26 + .github/workflows/release-metadata.yml | 27 + .github/workflows/release.yml | 199 ++++++++ .github/workflows/retry-release.yml | 90 ++++ .gitignore | 36 +- CHANGELOG.md | 25 + README.md | 21 +- build-logic/build.gradle | 3 + .../src/main/groovy/multiloader-common.gradle | 146 ++++++ .../src/main/groovy/multiloader-loader.gradle | 51 ++ build.gradle | 250 ++------- changelog.md | 17 - credits/CREDITS-fml.txt | 28 - credits/LICENSE-new.txt | 483 ------------------ credits/MinecraftForge-Credits.txt | 26 - credits/Paulscode IBXM Library License.txt | 10 - ...aulscode SoundSystem CodecIBXM License.txt | 40 -- fabric/build.gradle | 64 +++ fabric/gradle.properties | 1 + .../fabric/VillagerMarketFabric.java | 31 ++ .../client/VillagerMarketFabricClient.java | 17 + .../gametest/FabricMarketGameTests.java | 27 + .../fabric/platform/FabricPlatformHelper.java | 61 +++ ...germarket.platform.services.PlatformHelper | 1 + fabric/src/main/resources/fabric.mod.json | 31 ++ .../villagermarket.fabric.mixins.json | 11 + fabric/versions/26.3/gradle.properties | 4 + gradle.properties | 32 +- gradle/wrapper/gradle-wrapper.jar | Bin 54333 -> 47505 bytes gradle/wrapper/gradle-wrapper.properties | 9 +- gradlew | 302 +++++++---- gradlew.bat | 100 ++-- neoforge/build.gradle | 61 +++ neoforge/gradle.properties | 1 + .../neoforge/VillagerMarketNeoForge.java | 53 ++ .../client/VillagerMarketNeoForgeClient.java | 30 ++ .../gametest/NeoForgeMarketGameTests.java | 75 +++ .../platform/NeoForgePlatformHelper.java | 60 +++ .../resources/META-INF/neoforge.mods.toml | 26 + ...germarket.platform.services.PlatformHelper | 1 + .../villagermarket.neoforge.mixins.json | 11 + neoforge/versions/1.21.1/gradle.properties | 6 + neoforge/versions/26.3/gradle.properties | 5 + settings.gradle.kts | 39 ++ .../minecraft/villagermarket/Constants.java | 13 + .../minecraft/villagermarket/ModContent.java | 82 +++ .../villagermarket/VillagerMarket.java | 10 + .../villagermarket/block/MarketBlock.java | 25 + .../client/MarketScreenLogic.java | 154 ++++++ .../client/VillagerMarketScreen.java | 151 ++++++ .../gametest/MarketGameTests.java | 121 +++++ .../villagermarket/menu/OpeningData.java | 18 + .../menu/VillagerMarketMenu.java | 62 +++ .../network/MarketPayloads.java | 56 ++ .../villagermarket/platform/Services.java | 23 + .../platform/services/PlatformHelper.java | 20 + .../villagermarket/search/MarketSearch.java | 29 ++ .../villagermarket/trade/ListedOffer.java | 81 +++ .../villagermarket/trade/MainSlots.java | 16 + .../villagermarket/trade/TradeExecutor.java | 89 ++++ .../villagermarket/trade/TradeGroups.java | 13 + .../villagermarket/trade/TradeMath.java | 15 + .../net/ndrei/villagermarket/Constants.java | 16 - .../villagermarket/VillagerMarketBlock.java | 69 --- .../VillagerMarketContainer.java | 307 ----------- .../villagermarket/VillagerMarketEvents.java | 31 -- .../VillagerMarketGuiHandler.java | 42 -- .../villagermarket/VillagerMarketMod.java | 150 ------ .../villagermarket/VillagerMarketNetwork.java | 42 -- .../villagermarket/VillagerMarketPacket.java | 25 - .../VillagerMarketPacketClient.java | 13 - .../VillagerMarketPacketServer.java | 12 - .../villagermarket/VillagerMarketScreen.java | 396 -------------- .../blockstates/villager_market.json | 17 +- .../villagermarket/items/villager_market.json | 6 + .../assets/villagermarket/lang/en_US.lang | 2 - .../assets/villagermarket/lang/en_us.json | 7 + .../models/block/villager_market.json | 4 +- .../models/item/villager_market.json | 3 + .../recipes/villager_market.json | 14 - .../minecraft/tags/block/mineable/axe.json | 4 + .../loot_table/blocks/villager_market.json | 10 + .../recipe/villager_market.json | 13 + .../data/villagermarket/structure/empty.nbt | Bin 0 -> 110 bytes src/main/resources/mcmod.info | 16 - src/main/resources/pack.mcmeta | 7 + src/main/resources/villagermarket.mixins.json | 11 + .../villagermarket/trade/TradeGroupsTest.java | 22 + .../villagermarket/trade/TradeMathTest.java | 47 ++ stonecutter.gradle.kts | 81 +++ versions/1.21.1/gradle.properties | 5 + .../client/VillagerMarketScreen.java | 146 ++++++ .../models/item/villager_market.json | 3 + .../recipe/villager_market.json | 13 + versions/26.3/gradle.properties | 4 + 107 files changed, 4035 insertions(+), 2161 deletions(-) create mode 100644 .gitattributes create mode 100644 .github/scripts/curseforge-version-ids.py create mode 100644 .github/scripts/discord-merge-message.sh create mode 100644 .github/scripts/release-bump.sh create mode 100644 .github/scripts/release-changelog.sh create mode 100644 .github/scripts/release-commit.sh create mode 100644 .github/scripts/release-publish.sh create mode 100644 .github/scripts/release-version.sh create mode 100644 .github/scripts/test_curseforge_versions.py create mode 100644 .github/scripts/test_release_changelog.py create mode 100644 .github/scripts/test_release_commit.py create mode 100644 .github/workflows/ci.yml create mode 100644 .github/workflows/discord-merge-notify.yml create mode 100644 .github/workflows/release-metadata.yml create mode 100644 .github/workflows/release.yml create mode 100644 .github/workflows/retry-release.yml create mode 100644 CHANGELOG.md create mode 100644 build-logic/build.gradle create mode 100644 build-logic/src/main/groovy/multiloader-common.gradle create mode 100644 build-logic/src/main/groovy/multiloader-loader.gradle delete mode 100644 changelog.md delete mode 100644 credits/CREDITS-fml.txt delete mode 100644 credits/LICENSE-new.txt delete mode 100644 credits/MinecraftForge-Credits.txt delete mode 100644 credits/Paulscode IBXM Library License.txt delete mode 100644 credits/Paulscode SoundSystem CodecIBXM License.txt create mode 100644 fabric/build.gradle create mode 100644 fabric/gradle.properties create mode 100644 fabric/src/main/java/net/modcrafters/minecraft/villagermarket/fabric/VillagerMarketFabric.java create mode 100644 fabric/src/main/java/net/modcrafters/minecraft/villagermarket/fabric/client/VillagerMarketFabricClient.java create mode 100644 fabric/src/main/java/net/modcrafters/minecraft/villagermarket/fabric/gametest/FabricMarketGameTests.java create mode 100644 fabric/src/main/java/net/modcrafters/minecraft/villagermarket/fabric/platform/FabricPlatformHelper.java create mode 100644 fabric/src/main/resources/META-INF/services/net.modcrafters.minecraft.villagermarket.platform.services.PlatformHelper create mode 100644 fabric/src/main/resources/fabric.mod.json create mode 100644 fabric/src/main/resources/villagermarket.fabric.mixins.json create mode 100644 fabric/versions/26.3/gradle.properties create mode 100644 neoforge/build.gradle create mode 100644 neoforge/gradle.properties create mode 100644 neoforge/src/main/java/net/modcrafters/minecraft/villagermarket/neoforge/VillagerMarketNeoForge.java create mode 100644 neoforge/src/main/java/net/modcrafters/minecraft/villagermarket/neoforge/client/VillagerMarketNeoForgeClient.java create mode 100644 neoforge/src/main/java/net/modcrafters/minecraft/villagermarket/neoforge/gametest/NeoForgeMarketGameTests.java create mode 100644 neoforge/src/main/java/net/modcrafters/minecraft/villagermarket/neoforge/platform/NeoForgePlatformHelper.java create mode 100644 neoforge/src/main/resources/META-INF/neoforge.mods.toml create mode 100644 neoforge/src/main/resources/META-INF/services/net.modcrafters.minecraft.villagermarket.platform.services.PlatformHelper create mode 100644 neoforge/src/main/resources/villagermarket.neoforge.mixins.json create mode 100644 neoforge/versions/1.21.1/gradle.properties create mode 100644 neoforge/versions/26.3/gradle.properties create mode 100644 settings.gradle.kts create mode 100644 src/main/java/net/modcrafters/minecraft/villagermarket/Constants.java create mode 100644 src/main/java/net/modcrafters/minecraft/villagermarket/ModContent.java create mode 100644 src/main/java/net/modcrafters/minecraft/villagermarket/VillagerMarket.java create mode 100644 src/main/java/net/modcrafters/minecraft/villagermarket/block/MarketBlock.java create mode 100644 src/main/java/net/modcrafters/minecraft/villagermarket/client/MarketScreenLogic.java create mode 100644 src/main/java/net/modcrafters/minecraft/villagermarket/client/VillagerMarketScreen.java create mode 100644 src/main/java/net/modcrafters/minecraft/villagermarket/gametest/MarketGameTests.java create mode 100644 src/main/java/net/modcrafters/minecraft/villagermarket/menu/OpeningData.java create mode 100644 src/main/java/net/modcrafters/minecraft/villagermarket/menu/VillagerMarketMenu.java create mode 100644 src/main/java/net/modcrafters/minecraft/villagermarket/network/MarketPayloads.java create mode 100644 src/main/java/net/modcrafters/minecraft/villagermarket/platform/Services.java create mode 100644 src/main/java/net/modcrafters/minecraft/villagermarket/platform/services/PlatformHelper.java create mode 100644 src/main/java/net/modcrafters/minecraft/villagermarket/search/MarketSearch.java create mode 100644 src/main/java/net/modcrafters/minecraft/villagermarket/trade/ListedOffer.java create mode 100644 src/main/java/net/modcrafters/minecraft/villagermarket/trade/MainSlots.java create mode 100644 src/main/java/net/modcrafters/minecraft/villagermarket/trade/TradeExecutor.java create mode 100644 src/main/java/net/modcrafters/minecraft/villagermarket/trade/TradeGroups.java create mode 100644 src/main/java/net/modcrafters/minecraft/villagermarket/trade/TradeMath.java delete mode 100644 src/main/java/net/ndrei/villagermarket/Constants.java delete mode 100644 src/main/java/net/ndrei/villagermarket/VillagerMarketBlock.java delete mode 100644 src/main/java/net/ndrei/villagermarket/VillagerMarketContainer.java delete mode 100644 src/main/java/net/ndrei/villagermarket/VillagerMarketEvents.java delete mode 100644 src/main/java/net/ndrei/villagermarket/VillagerMarketGuiHandler.java delete mode 100644 src/main/java/net/ndrei/villagermarket/VillagerMarketMod.java delete mode 100644 src/main/java/net/ndrei/villagermarket/VillagerMarketNetwork.java delete mode 100644 src/main/java/net/ndrei/villagermarket/VillagerMarketPacket.java delete mode 100644 src/main/java/net/ndrei/villagermarket/VillagerMarketPacketClient.java delete mode 100644 src/main/java/net/ndrei/villagermarket/VillagerMarketPacketServer.java delete mode 100644 src/main/java/net/ndrei/villagermarket/VillagerMarketScreen.java create mode 100644 src/main/resources/assets/villagermarket/items/villager_market.json delete mode 100644 src/main/resources/assets/villagermarket/lang/en_US.lang create mode 100644 src/main/resources/assets/villagermarket/lang/en_us.json create mode 100644 src/main/resources/assets/villagermarket/models/item/villager_market.json delete mode 100644 src/main/resources/assets/villagermarket/recipes/villager_market.json create mode 100644 src/main/resources/data/minecraft/tags/block/mineable/axe.json create mode 100644 src/main/resources/data/villagermarket/loot_table/blocks/villager_market.json create mode 100644 src/main/resources/data/villagermarket/recipe/villager_market.json create mode 100644 src/main/resources/data/villagermarket/structure/empty.nbt delete mode 100644 src/main/resources/mcmod.info create mode 100644 src/main/resources/pack.mcmeta create mode 100644 src/main/resources/villagermarket.mixins.json create mode 100644 src/test/java/net/modcrafters/minecraft/villagermarket/trade/TradeGroupsTest.java create mode 100644 src/test/java/net/modcrafters/minecraft/villagermarket/trade/TradeMathTest.java create mode 100644 stonecutter.gradle.kts create mode 100644 versions/1.21.1/gradle.properties create mode 100644 versions/1.21.1/src/main/java/net/modcrafters/minecraft/villagermarket/client/VillagerMarketScreen.java create mode 100644 versions/1.21.1/src/main/resources/assets/villagermarket/models/item/villager_market.json create mode 100644 versions/1.21.1/src/main/resources/data/villagermarket/recipe/villager_market.json create mode 100644 versions/26.3/gradle.properties diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..71e4432 --- /dev/null +++ b/.gitattributes @@ -0,0 +1,17 @@ +* text eol=lf +*.bat text eol=crlf +*.patch text eol=lf +*.java text eol=lf +*.gradle text eol=crlf +*.png binary +*.gif binary +*.exe binary +*.dll binary +*.jar binary +*.lzma binary +*.zip binary +*.pyd binary +*.cfg text eol=lf +*.jks binary +*.ogg binary +*.nbt binary diff --git a/.github/scripts/curseforge-version-ids.py b/.github/scripts/curseforge-version-ids.py new file mode 100644 index 0000000..2dee337 --- /dev/null +++ b/.github/scripts/curseforge-version-ids.py @@ -0,0 +1,51 @@ +#!/usr/bin/env python3 +"""Resolve CurseForge upload IDs by category and name, not name alone.""" +import json +from pathlib import Path +import sys + + +def entries(value): + if isinstance(value, dict): + value = value.get("data") + if not isinstance(value, list) or not value: + raise ValueError("CurseForge returned an empty or invalid catalog") + return value + + +def resolve(versions, types, game, loader, java): + versions, types = entries(versions), entries(types) + + def find(name, category, required=True): + type_ids = {row["id"] for row in types if row.get("slug") == category} + ids = { + row["id"] for row in versions + if row.get("name") == name and row.get("gameVersionTypeID") in type_ids + } + if len(type_ids) != 1 or len(ids) != 1: + message = f"CurseForge needs one {name!r} in category {category!r}; found {len(type_ids)} categories and {len(ids)} versions" + if required: + raise ValueError(message) + print(message + "; omitting optional Java metadata", file=sys.stderr) + return None + return ids.pop() + + # 1.21.1 belongs to minecraft-1-21; 26.3 belongs to minecraft-26-3. + category = "minecraft-" + "-".join(game.split(".")[:2]) + result = [find(game, category), find(loader, "modloader"), + find("Client", "environment"), find("Server", "environment")] + java_id = find(java, "java", required=False) + if java_id is not None: + result.append(java_id) + return result + + +if __name__ == "__main__": + if len(sys.argv) != 6: + sys.exit("Usage: curseforge-version-ids.py ") + try: + versions = json.loads(Path(sys.argv[1]).read_text(encoding="utf-8")) + types = json.loads(Path(sys.argv[2]).read_text(encoding="utf-8")) + print(json.dumps(resolve(versions, types, *sys.argv[3:]))) + except (OSError, ValueError, KeyError, TypeError) as error: + sys.exit(str(error)) diff --git a/.github/scripts/discord-merge-message.sh b/.github/scripts/discord-merge-message.sh new file mode 100644 index 0000000..c084361 --- /dev/null +++ b/.github/scripts/discord-merge-message.sh @@ -0,0 +1,25 @@ +#!/usr/bin/env bash +# Prints the Discord webhook payload for a merged pull request: its title as a link, then the CHANGELOG.md bullets +# that this merge added. GitHub's own preview card is switched off (flags 4) and no one gets pinged. +# Usage: discord-merge-message.sh <url> +set -euo pipefail + +merge=$1 repo=$2 number=$3 title=$4 url=$5 +# Discord rejects messages over 2000 characters; leave room for the "more" line. +limit=1900 + +# The first parent is main before the merge, so this diff is exactly what the pull request changed. +bullets=$(git diff --unified=0 "$merge^1" "$merge" -- CHANGELOG.md | sed -n 's/^+\([[:space:]]*[-*] \)/\1/p') + +content="✅ **[${repo} #${number}: ${title}](${url})**" +if [ -n "$bullets" ]; then + while IFS= read -r line; do + if [ $(( ${#content} + ${#line} + 1 )) -gt "$limit" ]; then + content+=$'\n'"…and more in CHANGELOG.md" + break + fi + content+=$'\n'"$line" + done <<< "$bullets" +fi + +jq -n --arg content "$content" '{content: $content, flags: 4, allowed_mentions: {parse: []}}' diff --git a/.github/scripts/release-bump.sh b/.github/scripts/release-bump.sh new file mode 100644 index 0000000..78f98c5 --- /dev/null +++ b/.github/scripts/release-bump.sh @@ -0,0 +1,43 @@ +#!/usr/bin/env bash +# Points main at the patch after a published tag. The published number itself is never +# committed: the tag's jars already used it, and this only writes the following version. +# Usage: release-bump.sh 0.2.0 0.2.1 CHANGELOG.md tag-changelog.md gradle.properties +# Prints a summary. Exits 1 when the change would move the version backwards. +set -euo pipefail + +die() { echo "$1" >&2; exit 1; } + +[[ $# -eq 5 ]] || die "Usage: release-bump.sh 0.2.0 0.2.1 CHANGELOG.md tag-changelog.md gradle.properties" +released=$1 +next=$2 +changelog=$3 +tagged=$4 +properties=$5 +here=$(dirname "$0") + +order=$(bash "$here/release-version.sh" cmp "$(bash "$here/release-version.sh" read "$properties")" "$next") +case "$order" in + gt) die "gradle.properties is already past ${next}, so this would move the version backwards" ;; + eq) version_note="\`gradle.properties\` is already \`${next}\`." ;; + lt) + bash "$here/release-version.sh" write "$properties" "$next" + version_note="\`gradle.properties\` now says \`${next}\`." + ;; +esac + +if grep -Fxq "## ${released}" "$changelog"; then + changelog_note="\`## ${released}\` is already in the changelog." +elif cmp -s \ + <(bash "$here/release-changelog.sh" extract "$changelog") \ + <(bash "$here/release-changelog.sh" extract "$tagged"); then + bash "$here/release-changelog.sh" bump "$changelog" "$released" + changelog_note="The new notes are under \`## ${released}\`, and \`## Unreleased\` is empty again. Earlier version sections stay in place." +else + changelog_note="\`## Unreleased\` on main does not match the notes that were published, so the heading was left as it is." +fi + +cat <<EOF +\`${released}\` is published. ${version_note} + +${changelog_note} +EOF diff --git a/.github/scripts/release-changelog.sh b/.github/scripts/release-changelog.sh new file mode 100644 index 0000000..e419489 --- /dev/null +++ b/.github/scripts/release-changelog.sh @@ -0,0 +1,105 @@ +#!/usr/bin/env bash +# Prereleases publish Unreleased only. Stable releases also include the prerelease +# sections since the previous stable heading. Bumping archives only Unreleased. +# Usage: +# release-changelog.sh extract CHANGELOG.md # may be empty; used to compare notes +# release-changelog.sh notes CHANGELOG.md 0.2.0 +# release-changelog.sh bump CHANGELOG.md 0.2.0 +set -euo pipefail + +die() { echo "$1" >&2; exit 1; } + +semver='^(0|[1-9][0-9]*)[.](0|[1-9][0-9]*)[.](0|[1-9][0-9]*)(-alpha|-beta)?$' + +extract() { + local file=$1 body + body=$(awk ' + /^## Unreleased$/ { in_section = 1; found = 1; next } + /^## / && in_section { exit } + in_section { lines[++n] = $0 } + END { + if (!found) exit 1 + start = 1 + while (start <= n && lines[start] ~ /^[[:space:]]*$/) start++ + end = n + while (end >= start && lines[end] ~ /^[[:space:]]*$/) end-- + for (i = start; i <= end; i++) print lines[i] + } + ' "$file") || die "${file} has no ## Unreleased section" + printf '%s\n' "$body" +} + +notes() { + local file=$1 version=$2 body history + [[ "$version" =~ $semver ]] || die "Version ${version} has to look like 0.0.1 or 0.0.1-alpha" + body=$(extract "$file") + case "$version" in + *-alpha|*-beta) + printf '%s\n' "$body" | grep '^[[:space:]]*[-*] ' >/dev/null || die "${file} has no bullets under ## Unreleased" + ;; + *) + # Headings are newest first. A stable heading is the exclusive cutoff; beta + # headings are included just like alpha headings. Reject unknown headings. + history=$(awk -v semver="$semver" ' + /^## Unreleased$/ { found = 1; next } + /^## / && found { + version = substr($0, 4) + if (version !~ semver) exit 1 + if (version !~ /-(alpha|beta)$/) exit + in_history = 1 + } + in_history { lines[++n] = $0 } + END { + while (n > 0 && lines[n] ~ /^[[:space:]]*$/) n-- + for (i = 1; i <= n; i++) print lines[i] + } + ' "$file") || die "${file} has an invalid version heading" + if [[ -n "$body" ]]; then + body=$(printf '## %s\n\n%s' "$version" "$body") + fi + if [[ -n "$history" ]]; then + if [[ -n "$body" ]]; then + body=$(printf '%s\n\n%s' "$body" "$history") + else + body=$history + fi + fi + printf '%s\n' "$body" | grep '^[[:space:]]*[-*] ' >/dev/null || die "${file} has no changes since the previous stable release" + ;; + esac + printf '%s\n' "$body" +} + +bump() { + local file=$1 version=$2 tmp + [[ "$version" =~ $semver ]] || die "Version ${version} has to look like 0.0.1 or 0.0.1-alpha" + grep -Fxq "## ${version}" "$file" && die "${file} already has a ## ${version} section" + # A stable promotion can have an empty Unreleased section. Still insert its + # heading so it becomes the cutoff for the next stable release. + notes "$file" "$version" >/dev/null + tmp=$(mktemp) + awk -v version="$version" ' + /^## Unreleased$/ && !done { + print "## Unreleased" + print "" + print "## " version + done = 1 + next + } + { print } + END { if (!done) exit 1 } + ' "$file" > "$tmp" && mv "$tmp" "$file" || { + rm -f "$tmp" + die "Could not rename ## Unreleased in ${file}" + } +} + +[[ $# -ge 1 ]] || die "Usage: release-changelog.sh extract|notes|bump ..." +cmd=$1 +shift +case "$cmd" in + extract) [[ $# -eq 1 ]] || die "Usage: release-changelog.sh extract CHANGELOG.md"; extract "$1" ;; + notes) [[ $# -eq 2 ]] || die "Usage: release-changelog.sh notes CHANGELOG.md 0.2.0"; notes "$1" "$2" ;; + bump) [[ $# -eq 2 ]] || die "Usage: release-changelog.sh bump CHANGELOG.md 0.2.0"; bump "$1" "$2" ;; + *) die "Unknown command: ${cmd}" ;; +esac diff --git a/.github/scripts/release-commit.sh b/.github/scripts/release-commit.sh new file mode 100644 index 0000000..065af33 --- /dev/null +++ b/.github/scripts/release-commit.sh @@ -0,0 +1,51 @@ +#!/usr/bin/env bash +# Commit the post-release version and changelog directly to current main. +# Usage: release-commit.sh 0.0.1-alpha 0.0.2 0.0.1-alpha +set -euo pipefail + +die() { echo "$1" >&2; exit 1; } +[[ $# -eq 3 ]] || die "Usage: release-commit.sh <version> <next> <tag>" +version=$1 +next=$2 +tag=$3 +here=$(dirname "$0") + +[[ -z "$(git status --porcelain)" ]] || die "The release checkout must be clean" + +# Keep using the tagged scripts even if main has changed since the release build. +work=$(mktemp -d) +trap 'rm -f "$work/"*.sh "$work/tag-changelog.md"; rmdir "$work"' EXIT +cp "$here/release-version.sh" "$here/release-changelog.sh" "$here/release-bump.sh" "$work/" +git show "${tag}:CHANGELOG.md" > "$work/tag-changelog.md" +git fetch origin main +git checkout --detach origin/main +bash "$work/release-bump.sh" "$version" "$next" CHANGELOG.md "$work/tag-changelog.md" gradle.properties +git diff --stat -- gradle.properties CHANGELOG.md +if git diff --quiet -- gradle.properties CHANGELOG.md; then + echo "main already has the next version and changelog heading." + exit 0 +fi +git add gradle.properties CHANGELOG.md +git -c user.name='github-actions[bot]' -c user.email='41898282+github-actions[bot]@users.noreply.github.com' \ + commit -m "Set the development version to ${next} after publishing ${tag}." +# Main requires all-versions from GitHub Actions, even for generated commits. +# GITHUB_TOKEN pushes do not trigger push workflows, so dispatch CI explicitly. +commit=$(git rev-parse HEAD) +branch="release-next/${tag}-${commit:0:12}" +git push origin "HEAD:refs/heads/${branch}" +gh workflow run ci.yml --ref "$branch" +run_id='' +for attempt in {1..12}; do + run_id=$(gh run list --workflow ci.yml --branch "$branch" --commit "$commit" \ + --event workflow_dispatch --limit 1 --json databaseId --jq '.[0].databaseId // empty') + [[ -n "$run_id" ]] && break + sleep 5 +done +[[ -n "$run_id" ]] || die "CI did not start for ${branch}; main was not changed" +gh run watch "$run_id" --exit-status --interval 15 || die "CI did not pass for ${branch}; main was not changed" + +# Never force-push: concurrent commits must survive. Rerunning the job fetches +# fresh main and computes the update again instead of replaying a stale edit. +git push origin HEAD:refs/heads/main || die "Could not update main. If main advanced, rerun this job; otherwise check the action's push permissions." + +git push origin --delete "$branch" diff --git a/.github/scripts/release-publish.sh b/.github/scripts/release-publish.sh new file mode 100644 index 0000000..545481d --- /dev/null +++ b/.github/scripts/release-publish.sh @@ -0,0 +1,268 @@ +#!/usr/bin/env bash +# Publishes the three jars for one tag: NeoForge 1.21.1, Fabric 26.3, and NeoForge 26.3. +# Each loader gets its own Modrinth version and CurseForge file, so the download button +# is the jar for that loader. GitHub gets one release with all three attached. +# Usage: +# release-publish.sh check-env +# release-publish.sh classify <jars-dir> <version> +# release-publish.sh upload <version> <changelog-file> <jars-dir> +set -euo pipefail + +die() { echo "$1" >&2; exit 1; } + +user_agent='MinecraftModDevelopmentMods/Villager-Market (release)' +# Fabric API on Modrinth. The loader itself is selected with the loaders field. +fabric_api='P7dR8mSH' +here=$(cd -- "$(dirname -- "${BASH_SOURCE[0]}")" && pwd) + +check_env() { + local missing=() + [[ -n "${MODRINTH_TOKEN:-}" ]] || missing+=(MODRINTH_TOKEN) + [[ -n "${CURSEFORGE_TOKEN:-}" ]] || missing+=(CURSEFORGE_TOKEN) + [[ -n "${MODRINTH_PROJECT_ID:-}" ]] || missing+=(MODRINTH_PROJECT_ID) + [[ -n "${CURSEFORGE_PROJECT_ID:-}" ]] || missing+=(CURSEFORGE_PROJECT_ID) + if [[ ${#missing[@]} -gt 0 ]]; then + die "Missing ${missing[*]}. Tokens are repository secrets. Project ids are repository variables." + fi + [[ "$MODRINTH_PROJECT_ID" =~ ^[A-Za-z0-9]+$ ]] || die "MODRINTH_PROJECT_ID should be the id from the Modrinth project page" + [[ "$CURSEFORGE_PROJECT_ID" =~ ^[0-9]+$ ]] || die "CURSEFORGE_PROJECT_ID should be the number from the CurseForge project page" +} + +# Sets neo_121, fabric_263, and neo_263. A sources jar, or a jar from another version, is ignored. +classify() { + local dir=$1 version=$2 jar base + neo_121='' fabric_263='' neo_263='' + [[ -d "$dir" ]] || die "No jar directory at ${dir}" + while IFS= read -r jar; do + base=$(basename "$jar") + case "$base" in + "villagermarket-neoforge-1.21.1-${version}.jar") + [[ -z "$neo_121" ]] || die "Two NeoForge 1.21.1 jars named ${base}" + neo_121=$jar + ;; + "villagermarket-fabric-26.3-${version}.jar") + [[ -z "$fabric_263" ]] || die "Two Fabric 26.3 jars named ${base}" + fabric_263=$jar + ;; + "villagermarket-neoforge-26.3-${version}.jar") + [[ -z "$neo_263" ]] || die "Two NeoForge 26.3 jars named ${base}" + neo_263=$jar + ;; + esac + done < <(find "$dir" -type f -name '*.jar' | sort) + [[ -n "$neo_121" ]] || die "Missing villagermarket-neoforge-1.21.1-${version}.jar" + [[ -n "$fabric_263" ]] || die "Missing villagermarket-fabric-26.3-${version}.jar" + [[ -n "$neo_263" ]] || die "Missing villagermarket-neoforge-26.3-${version}.jar" +} + +http_code() { + local out=$1 + shift + local code + code=$(curl -sS -o "$out" -w "%{http_code}" "$@") || die "The request did not complete" + printf '%s' "$code" +} + +curseforge_game_versions() { + python3 "$here/curseforge-version-ids.py" "$versions_file" "$types_file" "$@" +} + +modrinth_upload() { + local version_number=$1 name=$2 loader=$3 game=$4 jar=$5 + local encoded code deps + encoded=$(jq -nr --arg value "$version_number" '$value|@uri') + code=$(http_code "$work/exists.json" \ + -H "User-Agent: ${user_agent}" \ + -H "Authorization: ${MODRINTH_TOKEN}" \ + "https://api.modrinth.com/v2/project/${MODRINTH_PROJECT_ID}/version/${encoded}") + if [[ "$code" == 200 ]]; then + echo "Modrinth ${version_number} already exists" + return 0 + fi + [[ "$code" == 404 ]] || { + echo "Modrinth lookup for ${version_number} returned ${code}" >&2 + cat "$work/exists.json" >&2 + exit 1 + } + if [[ "$loader" == fabric ]]; then + deps="[{\"project_id\":\"${fabric_api}\",\"dependency_type\":\"required\"}]" + else + deps='[]' + fi + jq -n \ + --rawfile changelog "$notes" \ + --arg name "$name" \ + --arg version_number "$version_number" \ + --arg project_id "$MODRINTH_PROJECT_ID" \ + --arg version_type "$release_type" \ + --arg game "$game" \ + --arg loader "$loader" \ + --argjson dependencies "$deps" \ + '{ + name: $name, + version_number: $version_number, + changelog: $changelog, + dependencies: $dependencies, + game_versions: [$game], + version_type: $version_type, + loaders: [$loader], + featured: true, + project_id: $project_id, + file_parts: ["jar"], + primary_file: "jar", + status: "listed", + requested_status: "listed", + environment: "client_and_server" + }' > "$work/modrinth.json" + code=$(http_code "$work/created.json" \ + -H "User-Agent: ${user_agent}" \ + -H "Authorization: ${MODRINTH_TOKEN}" \ + -F "data=<${work}/modrinth.json;type=application/json" \ + -F "jar=@${jar};filename=$(basename "$jar")" \ + https://api.modrinth.com/v2/version) + [[ "$code" == 200 ]] || { + echo "Modrinth upload of ${version_number} returned ${code}" >&2 + cat "$work/created.json" >&2 + exit 1 + } + echo "Modrinth ${version_number} published ($(jq -r .id "$work/created.json"))" +} + +curseforge_listed() { + local file_name=$1 display=$2 + [[ "$files_listed" == yes ]] || return 1 + jq -e --arg file "$file_name" --arg display "$display" ' + def files: + if type == "array" then . + elif .data then .data + elif .files then .files + else [] end; + files | any(.[]; .fileName == $file or .displayName == $display) + ' "$work/files.json" >/dev/null +} + +curseforge_upload() { + local display=$1 loader=$2 jar=$3 game_versions=$4 + local code relations='null' + if curseforge_listed "$(basename "$jar")" "$display"; then + echo "CurseForge already has ${display}" + return 0 + fi + [[ "$loader" == Fabric ]] && relations='{"projects":[{"slug":"fabric-api","type":"requiredDependency"}]}' + jq -n \ + --rawfile changelog "$notes" \ + --arg display "$display" \ + --arg release_type "$release_type" \ + --argjson game_versions "$game_versions" \ + --argjson relations "$relations" \ + '{ + changelog: $changelog, + changelogType: "markdown", + displayName: $display, + gameVersions: $game_versions, + releaseType: $release_type + } + (if $relations == null then {} else {relations: $relations} end)' > "$work/curseforge.json" + code=$(http_code "$work/uploaded.json" \ + -H "X-Api-Token: ${CURSEFORGE_TOKEN}" \ + -F "metadata=<${work}/curseforge.json;type=application/json" \ + -F "file=@${jar};filename=$(basename "$jar")" \ + "https://minecraft.curseforge.com/api/projects/${CURSEFORGE_PROJECT_ID}/upload-file") + [[ "$code" == 200 ]] || { + echo "CurseForge upload of ${display} returned ${code}" >&2 + cat "$work/uploaded.json" >&2 + exit 1 + } + echo "CurseForge ${display} published ($(jq -r .id "$work/uploaded.json"))" +} + +github_release() { + local tag=$1 + shift + if gh release view "$tag" >/dev/null 2>&1; then + echo "GitHub release ${tag} already exists" + else + local -a args=(release create "$tag" --title "Villager Market ${tag#v}" --notes-file "$notes") + [[ "$release_type" == release ]] || args+=(--prerelease) + gh "${args[@]}" + fi + gh release upload "$tag" --clobber "$@" + echo "GitHub release ${tag} has the jars" +} + +upload() { + local version=$1 + notes=$2 + local jars=$3 code cf_neo_121 cf_fabric_263 cf_neo_263 + check_env + [[ -f "$notes" ]] || die "No changelog at ${notes}" + [[ -n "${TAG:-}" ]] || die "TAG is missing" + case "${RELEASE_TYPE:-}" in + alpha|beta|release) release_type=$RELEASE_TYPE ;; + *) die "RELEASE_TYPE has to be alpha, beta, or release" ;; + esac + classify "$jars" "$version" + work=$(mktemp -d) + trap 'rm -f "$work/"*.json; rmdir "$work"' EXIT + + code=$(http_code "$work/versions.json" \ + -H "X-Api-Token: ${CURSEFORGE_TOKEN}" \ + https://minecraft.curseforge.com/api/game/versions) + [[ "$code" == 200 ]] || { + echo "CurseForge game versions returned ${code}" >&2 + cat "$work/versions.json" >&2 + exit 1 + } + versions_file=$work/versions.json + types_file=$work/types.json + code=$(http_code "$types_file" \ + -H "X-Api-Token: ${CURSEFORGE_TOKEN}" \ + https://minecraft.curseforge.com/api/game/version-types) + [[ "$code" == 200 ]] || { + echo "CurseForge game version types returned ${code}" >&2 + cat "$types_file" >&2 + exit 1 + } + + # Resolve every target before the first upload, so a catalog error cannot + # leave a release published only on Modrinth. + cf_neo_121=$(curseforge_game_versions 1.21.1 NeoForge "Java 21") + cf_fabric_263=$(curseforge_game_versions 26.3 Fabric "Java 25") + cf_neo_263=$(curseforge_game_versions 26.3 NeoForge "Java 25") + + code=$(http_code "$work/files.json" \ + -H "X-Api-Token: ${CURSEFORGE_TOKEN}" \ + "https://minecraft.curseforge.com/api/projects/${CURSEFORGE_PROJECT_ID}/files") + if [[ "$code" == 200 ]]; then + files_listed=yes + else + files_listed=no + echo "CurseForge file list returned ${code}. A repeated run may upload the same jar again." >&2 + fi + + modrinth_upload "${version}+1.21.1" "Villager Market ${version} for NeoForge 1.21.1" neoforge 1.21.1 "$neo_121" + modrinth_upload "${version}+26.3+fabric" "Villager Market ${version} for Fabric 26.3" fabric 26.3 "$fabric_263" + modrinth_upload "${version}+26.3+neoforge" "Villager Market ${version} for NeoForge 26.3" neoforge 26.3 "$neo_263" + + curseforge_upload "Villager Market ${version} for NeoForge 1.21.1" NeoForge "$neo_121" "$cf_neo_121" + curseforge_upload "Villager Market ${version} for Fabric 26.3" Fabric "$fabric_263" "$cf_fabric_263" + curseforge_upload "Villager Market ${version} for NeoForge 26.3" NeoForge "$neo_263" "$cf_neo_263" + + github_release "$TAG" "$neo_121" "$fabric_263" "$neo_263" +} + +[[ $# -ge 1 ]] || die "Usage: release-publish.sh check-env|classify|upload ..." +cmd=$1 +shift +case "$cmd" in + check-env) check_env ;; + classify) + [[ $# -eq 2 ]] || die "Usage: release-publish.sh classify <jars-dir> <version>" + classify "$1" "$2" + printf '%s\n' "$neo_121" "$fabric_263" "$neo_263" + ;; + upload) + [[ $# -eq 3 ]] || die "Usage: release-publish.sh upload <version> <changelog> <jars-dir>" + upload "$1" "$2" "$3" + ;; + *) die "Unknown command: ${cmd}" ;; +esac diff --git a/.github/scripts/release-version.sh b/.github/scripts/release-version.sh new file mode 100644 index 0000000..70f9a45 --- /dev/null +++ b/.github/scripts/release-version.sh @@ -0,0 +1,107 @@ +#!/usr/bin/env bash +# Reads and writes the mod version in gradle.properties. The tag is the version the jars +# are built with: 0.0.1 is a release, and 0.0.1-alpha or 0.0.1-beta is that channel. +# A leading v is accepted. The following development version is the next patch, with no channel. +# Usage: +# release-version.sh parse 0.0.1-alpha +# release-version.sh channel 0.0.1-alpha # prints alpha, beta, or release +# release-version.sh next 0.0.1-alpha # prints 0.0.2 +# release-version.sh read gradle.properties +# release-version.sh write gradle.properties 0.0.1-alpha +# release-version.sh cmp 0.0.1-alpha 0.0.1 # prints lt, eq, or gt +set -euo pipefail + +die() { echo "$1" >&2; exit 1; } + +part='(0|[1-9][0-9]*)' +ver_re="^${part}\\.${part}\\.${part}(-alpha|-beta)?$" +tag_re="^v?${part}\\.${part}\\.${part}(-alpha|-beta)?$" +version_line='^version=(0|[1-9][0-9]*)\.(0|[1-9][0-9]*)\.(0|[1-9][0-9]*)(-alpha|-beta)?$' + +parse() { + local tag=$1 + [[ "$tag" =~ $tag_re ]] || die "Tag ${tag} has to look like 0.0.1 or 0.0.1-alpha" + echo "${BASH_REMATCH[1]}.${BASH_REMATCH[2]}.${BASH_REMATCH[3]}${BASH_REMATCH[4]}" +} + +channel() { + local tag=$1 + [[ "$tag" =~ $tag_re ]] || die "Tag ${tag} has to look like 0.0.1 or 0.0.1-alpha" + case "${BASH_REMATCH[4]}" in + -alpha) echo alpha ;; + -beta) echo beta ;; + '') echo release ;; + *) die "Tag ${tag} has to look like 0.0.1 or 0.0.1-alpha" ;; + esac +} + +next_version() { + local version=$1 + [[ "$version" =~ $ver_re ]] || die "Version ${version} has to look like 0.0.1 or 0.0.1-alpha" + echo "${BASH_REMATCH[1]}.${BASH_REMATCH[2]}.$((BASH_REMATCH[3] + 1))" +} + +read_version() { + local file=$1 line count + line=$(grep -E "$version_line" "$file" || true) + [[ -n "$line" ]] || die "${file} has no version=MAJOR.MINOR.PATCH line" + count=$(printf '%s\n' "$line" | wc -l) + [[ "$count" -eq 1 ]] || die "${file} has more than one version line" + echo "${line#version=}" +} + +write_version() { + local file=$1 version=$2 tmp + [[ "$version" =~ $ver_re ]] || die "Version ${version} has to look like 0.0.1 or 0.0.1-alpha" + tmp=$(mktemp) + awk -v version="$version" ' + /^version=(0|[1-9][0-9]*)\.(0|[1-9][0-9]*)\.(0|[1-9][0-9]*)(-alpha|-beta)?$/ { + if (seen++) exit 1 + print "version=" version + next + } + { print } + END { if (!seen) exit 1 } + ' "$file" > "$tmp" && mv "$tmp" "$file" || { + rm -f "$tmp" + die "Could not replace the version line in ${file}" + } +} + +channel_rank() { + case "$1" in + -alpha) echo 1 ;; + -beta) echo 2 ;; + '') echo 3 ;; + *) die "Version channel ${1} is not alpha, beta, or a release" ;; + esac +} + +cmp_version() { + local left=$1 right=$2 + [[ "$left" =~ $ver_re ]] || die "Version ${left} has to look like 0.0.1 or 0.0.1-alpha" + local l1=${BASH_REMATCH[1]} l2=${BASH_REMATCH[2]} l3=${BASH_REMATCH[3]} ls=${BASH_REMATCH[4]} + [[ "$right" =~ $ver_re ]] || die "Version ${right} has to look like 0.0.1 or 0.0.1-alpha" + local r1=${BASH_REMATCH[1]} r2=${BASH_REMATCH[2]} r3=${BASH_REMATCH[3]} rs=${BASH_REMATCH[4]} + local lr rr + if ((l1 != r1)); then ((l1 > r1)) && echo gt || echo lt; return; fi + if ((l2 != r2)); then ((l2 > r2)) && echo gt || echo lt; return; fi + if ((l3 != r3)); then ((l3 > r3)) && echo gt || echo lt; return; fi + lr=$(channel_rank "$ls") + rr=$(channel_rank "$rs") + if ((lr != rr)); then ((lr > rr)) && echo gt || echo lt; return; fi + echo eq +} + +[[ $# -ge 1 ]] || die "Usage: release-version.sh parse|channel|next|read|write|cmp ..." +cmd=$1 +shift +case "$cmd" in + parse) [[ $# -eq 1 ]] || die "Usage: release-version.sh parse 0.0.1-alpha"; parse "$1" ;; + channel) [[ $# -eq 1 ]] || die "Usage: release-version.sh channel 0.0.1-alpha"; channel "$1" ;; + next) [[ $# -eq 1 ]] || die "Usage: release-version.sh next 0.0.1-alpha"; next_version "$1" ;; + read) [[ $# -eq 1 ]] || die "Usage: release-version.sh read gradle.properties"; read_version "$1" ;; + write) [[ $# -eq 2 ]] || die "Usage: release-version.sh write gradle.properties 0.2.0"; write_version "$1" "$2" ;; + cmp) [[ $# -eq 2 ]] || die "Usage: release-version.sh cmp 0.2.0 0.2.1"; cmp_version "$1" "$2" ;; + *) die "Unknown command: ${cmd}" ;; +esac diff --git a/.github/scripts/test_curseforge_versions.py b/.github/scripts/test_curseforge_versions.py new file mode 100644 index 0000000..d2b64db --- /dev/null +++ b/.github/scripts/test_curseforge_versions.py @@ -0,0 +1,138 @@ +"""Version catalog captured on 2026-11-02, with synthetic environment IDs.""" +import contextlib +import io +import json +import os +from pathlib import Path +import runpy +import subprocess +import sys +import tempfile +import unittest + + +resolve = runpy.run_path(str(Path(__file__).with_name("curseforge-version-ids.py")))["resolve"] + +TYPES = [ + {"id": 2, "slug": "java"}, + {"id": 615, "slug": "addons"}, + {"id": 75208, "slug": "environment"}, + {"id": 68441, "slug": "modloader"}, + {"id": 77784, "slug": "minecraft-1-21"}, + {"id": 88556, "slug": "minecraft-26-3"}, +] +VERSIONS = [ + {"id": 99901, "gameVersionTypeID": 75208, "name": "Client"}, + {"id": 99902, "gameVersionTypeID": 75208, "name": "Server"}, + {"id": 7499, "gameVersionTypeID": 68441, "name": "Fabric"}, + {"id": 10150, "gameVersionTypeID": 68441, "name": "NeoForge"}, + {"id": 11135, "gameVersionTypeID": 2, "name": "Java 21"}, + {"id": 11779, "gameVersionTypeID": 77784, "name": "1.21.1"}, + {"id": 12735, "gameVersionTypeID": 1, "name": "1.21.1"}, + {"id": 14454, "gameVersionTypeID": 2, "name": "Java 25"}, + {"id": 16115, "gameVersionTypeID": 615, "name": "1.21.1"}, + {"id": 17045, "gameVersionTypeID": 88556, "name": "26.3"}, + {"id": 17046, "gameVersionTypeID": 1, "name": "26.3"}, +] + + +class CurseForgeVersionsTest(unittest.TestCase): + def test_actual_duplicate_names_resolve_for_all_three_jars(self): + for game, loader, java, expected in ( + ("1.21.1", "NeoForge", "Java 21", [11779, 10150, 99901, 99902, 11135]), + ("26.3", "Fabric", "Java 25", [17045, 7499, 99901, 99902, 14454]), + ("26.3", "NeoForge", "Java 25", [17045, 10150, 99901, 99902, 14454]), + ): + with self.subTest(game=game, loader=loader): + self.assertEqual(resolve(VERSIONS, TYPES, game, loader, java), expected) + + def test_data_envelopes(self): + self.assertEqual(resolve({"data": VERSIONS}, {"data": TYPES}, "26.3", "Fabric", "Java 25"), [17045, 7499, 99901, 99902, 14454]) + + def test_wrong_categories_are_not_used_as_fallback(self): + versions = [row for row in VERSIONS if row["id"] != 11779] + with self.assertRaisesRegex(ValueError, "minecraft-1-21"): + resolve(versions, TYPES, "1.21.1", "NeoForge", "Java 21") + + def test_ambiguous_id_within_correct_category_fails(self): + versions = VERSIONS + [{"id": 99999, "gameVersionTypeID": 77784, "name": "1.21.1"}] + with self.assertRaisesRegex(ValueError, "2 versions"): + resolve(versions, TYPES, "1.21.1", "NeoForge", "Java 21") + + def test_missing_or_ambiguous_category_fails(self): + for types in ( + [row for row in TYPES if row["slug"] != "modloader"], + TYPES + [{"id": 99999, "slug": "modloader"}], + ): + with self.assertRaisesRegex(ValueError, "modloader"): + resolve(VERSIONS, types, "26.3", "Fabric", "Java 25") + + def test_optional_java_can_be_absent(self): + with contextlib.redirect_stderr(io.StringIO()) as warning: + self.assertEqual(resolve(VERSIONS, TYPES, "26.3", "Fabric", "Java 99"), [17045, 7499, 99901, 99902]) + self.assertIn("omitting optional Java", warning.getvalue()) + + def test_empty_catalog_fails(self): + with self.assertRaisesRegex(ValueError, "empty or invalid"): + resolve([], TYPES, "26.3", "Fabric", "Java 25") + + def test_required_environment_is_not_silently_omitted(self): + versions = [row for row in VERSIONS if row["name"] != "Server"] + with self.assertRaisesRegex(ValueError, "environment"): + resolve(versions, TYPES, "26.3", "Fabric", "Java 25") + + def test_publisher_preflight_and_resolved_upload_metadata(self): + for valid in (False, True): + with self.subTest(valid=valid), tempfile.TemporaryDirectory(prefix="curseforge-test-") as folder: + root = Path(folder) + versions = VERSIONS if valid else [row for row in VERSIONS if row["id"] != 17045] + (root / "versions.json").write_text(json.dumps(versions), encoding="utf-8") + (root / "types.json").write_text(json.dumps(TYPES), encoding="utf-8") + (root / "notes.md").write_text("- Release notes.\n", encoding="utf-8") + for target in ("neoforge-1.21.1", "fabric-26.3", "neoforge-26.3"): + (root / f"villagermarket-{target}-0.0.2-alpha.jar").touch() + trace = root / "uploads.txt" + env = dict(os.environ, MODRINTH_TOKEN="test", CURSEFORGE_TOKEN="test", + MODRINTH_PROJECT_ID="test", CURSEFORGE_PROJECT_ID="123", + TAG="0.0.2-alpha", RELEASE_TYPE="alpha", TEST_DIR=root.as_posix(), + TEST_PYTHON=Path(sys.executable).as_posix()) + # Mock network and uploads; keep the actual publisher orchestration + # and Python category resolver. No credentials or services are used. + harness = r''' +source "$1" check-env +python3() { "$TEST_PYTHON" "$@"; } +http_code() { + case "${!#}" in + */game/versions) cp "$TEST_DIR/versions.json" "$1"; printf 200 ;; + */game/version-types) cp "$TEST_DIR/types.json" "$1"; printf 200 ;; + */files) printf '{}' > "$1"; printf 403 ;; + *) echo "Unexpected network request" >&2; exit 1 ;; + esac +} +modrinth_upload() { echo "Modrinth $1" >> "$TEST_DIR/uploads.txt"; } +curseforge_upload() { echo "CurseForge $4" >> "$TEST_DIR/uploads.txt"; } +github_release() { echo "GitHub $1" >> "$TEST_DIR/uploads.txt"; } +upload 0.0.2-alpha "$TEST_DIR/notes.md" "$TEST_DIR" +''' + result = subprocess.run( + [os.environ.get("BASH_EXECUTABLE", "bash"), "-c", harness, "test", + Path(__file__).with_name("release-publish.sh").resolve().as_posix()], + env=env, capture_output=True, text=True, + ) + if valid: + self.assertEqual(result.returncode, 0, result.stderr) + uploads = trace.read_text().splitlines() + self.assertEqual(len(uploads), 7) + self.assertEqual(uploads[3:6], [ + "CurseForge [11779, 10150, 99901, 99902, 11135]", + "CurseForge [17045, 7499, 99901, 99902, 14454]", + "CurseForge [17045, 10150, 99901, 99902, 14454]", + ]) + else: + self.assertNotEqual(result.returncode, 0) + self.assertIn("minecraft-26-3", result.stderr) + self.assertFalse(trace.exists(), "No upload should run when a required target is missing") + + +if __name__ == "__main__": + unittest.main() diff --git a/.github/scripts/test_release_changelog.py b/.github/scripts/test_release_changelog.py new file mode 100644 index 0000000..a3b5369 --- /dev/null +++ b/.github/scripts/test_release_changelog.py @@ -0,0 +1,125 @@ +"""Release-note and archival checks; run with Python 3 and Bash, without uploads.""" +import os +from pathlib import Path +import subprocess +import tempfile +import unittest + + +SCRIPTS = Path(__file__).resolve().parent +BASH = os.environ.get("BASH_EXECUTABLE", "bash") +HISTORY = """## 0.0.3-beta + +- Beta fixes. + +## 0.0.2-alpha + +- Alpha additions. +""" +OLDER = """ +## 0.0.1 + +- Previous stable changes. + +## 0.0.1-alpha + +- Older alpha changes. +""" + + +class ReleaseChangelogTest(unittest.TestCase): + def setUp(self): + self.temp = tempfile.TemporaryDirectory(prefix="release-notes-test-") + self.addCleanup(self.temp.cleanup) + self.root = Path(self.temp.name) + self.changelog = self.root / "CHANGELOG.md" + + def write_changelog(self, new="- New changes.\n", history=HISTORY + OLDER): + self.changelog.write_text( + "# Changelog\n\nIntroduction.\n\n## Unreleased\n\n" + new + "\n" + history, + encoding="utf-8", + ) + + def run_script(self, script, *args, success=True): + result = subprocess.run( + [BASH, (SCRIPTS / script).as_posix(), *[ + arg.as_posix() if isinstance(arg, Path) else arg for arg in args + ]], capture_output=True, text=True, + ) + if success: + self.assertEqual(result.returncode, 0, result.stderr) + else: + self.assertNotEqual(result.returncode, 0) + return result.stdout + + def notes(self, version, success=True): + return self.run_script("release-changelog.sh", "notes", self.changelog, version, success=success) + + def test_prereleases_only_include_unreleased(self): + self.write_changelog() + for version in ("0.0.4-alpha", "0.0.4-beta"): + with self.subTest(version=version): + self.assertEqual(self.notes(version), "- New changes.\n") + + def test_first_stable_includes_all_prereleases_by_version(self): + self.write_changelog(history=HISTORY) + self.assertEqual(self.notes("0.0.4"), "## 0.0.4\n\n- New changes.\n\n" + HISTORY) + + def test_stable_stops_before_previous_stable(self): + self.write_changelog() + self.assertEqual(self.notes("0.0.4"), "## 0.0.4\n\n- New changes.\n\n" + HISTORY) + + def test_stable_without_prereleases(self): + self.write_changelog(history=OLDER.lstrip()) + self.assertEqual(self.notes("0.0.4"), "## 0.0.4\n\n- New changes.\n") + + def test_stable_without_any_history(self): + self.write_changelog(history="") + self.assertEqual(self.notes("0.0.1"), "## 0.0.1\n\n- New changes.\n") + + def test_promotion_archives_empty_stable_cutoff(self): + self.write_changelog(new="") + self.assertEqual(self.notes("0.0.4"), HISTORY) + tagged = self.root / "tagged.md" + tagged.write_bytes(self.changelog.read_bytes()) + properties = self.root / "gradle.properties" + properties.write_text("version=0.0.4\n", encoding="utf-8") + self.run_script("release-bump.sh", "0.0.4", "0.0.5", self.changelog, tagged, properties) + self.assertEqual(properties.read_text(), "version=0.0.5\n") + archived = self.changelog.read_text() + self.assertIn("## Unreleased\n\n## 0.0.4\n", archived) + self.assertEqual(archived.count("- Beta fixes."), 1) + self.assertEqual(archived.count("- Alpha additions."), 1) + self.changelog.write_text(archived.replace("## Unreleased\n", "## Unreleased\n\n- Next cycle.\n"), encoding="utf-8") + self.assertEqual(self.notes("0.0.5"), "## 0.0.5\n\n- Next cycle.\n") + + def test_stable_bump_only_archives_new_notes(self): + self.write_changelog() + self.run_script("release-changelog.sh", "bump", self.changelog, "0.0.4") + archived = self.changelog.read_text() + self.assertIn("## 0.0.4\n\n- New changes.\n\n## 0.0.3-beta", archived) + self.assertEqual(archived.count("- Beta fixes."), 1) + + def test_empty_prereleases_and_empty_stable_cycle_fail(self): + self.write_changelog(new="") + for version in ("0.0.4-alpha", "0.0.4-beta"): + self.notes(version, success=False) + self.write_changelog(new="", history=OLDER.lstrip()) + self.notes("0.0.4", success=False) + + def test_invalid_changelog_or_version_fails(self): + for heading in ("Typo", "0x0x3-alpha"): + self.write_changelog(history=f"## {heading}\n\n- Changes.\n") + self.notes("0.0.4", success=False) + self.notes("invalid", success=False) + self.changelog.write_text("# No Unreleased section\n", encoding="utf-8") + self.notes("0.0.4", success=False) + + def test_large_accumulated_history(self): + history = "## 0.0.3-beta\n\n" + "- An earlier change.\n" * 10000 + self.write_changelog(history=history + OLDER) + self.assertEqual(self.notes("0.0.4"), "## 0.0.4\n\n- New changes.\n\n" + history) + + +if __name__ == "__main__": + unittest.main() diff --git a/.github/scripts/test_release_commit.py b/.github/scripts/test_release_commit.py new file mode 100644 index 0000000..581332d --- /dev/null +++ b/.github/scripts/test_release_commit.py @@ -0,0 +1,123 @@ +"""Exercise direct release commits against temporary local Git repositories.""" +import os +from pathlib import Path +import shlex +import shutil +import subprocess +import tempfile +import unittest + + +SCRIPTS = Path(__file__).resolve().parent +BASH = os.environ.get("BASH_EXECUTABLE", "bash") + + +class ReleaseCommitTest(unittest.TestCase): + def git(self, directory, *args): + result = subprocess.run(["git", "-C", str(directory), *args], capture_output=True, text=True) + self.assertEqual(result.returncode, 0, result.stderr) + return result.stdout.strip() + + def setUp(self): + self.temp = tempfile.TemporaryDirectory(prefix="release-commit-test-") + self.addCleanup(self.temp.cleanup) + root = Path(self.temp.name) + self.remote = root / "remote.git" + self.writer = root / "writer" + self.runner = root / "runner" + self.git(root, "init", "--bare", str(self.remote)) + self.git(root, "init", "--initial-branch=main", str(self.writer)) + self.git(self.writer, "config", "user.name", "Release test") + self.git(self.writer, "config", "user.email", "release-test@example.invalid") + self.git(self.writer, "config", "core.autocrlf", "false") + scripts = self.writer / ".github/scripts" + scripts.mkdir(parents=True) + for source in SCRIPTS.glob("release-*.sh"): + shutil.copyfile(source, scripts / source.name) + (self.writer / "gradle.properties").write_text("version=0.0.1\n", encoding="utf-8") + (self.writer / "CHANGELOG.md").write_text("# Changelog\n\n## Unreleased\n\n- First changes.\n", encoding="utf-8") + self.git(self.writer, "add", ".") + self.git(self.writer, "commit", "-m", "Initial release") + self.git(self.writer, "tag", "0.0.1-alpha") + self.git(self.writer, "remote", "add", "origin", str(self.remote)) + self.git(self.writer, "push", "origin", "main", "0.0.1-alpha") + self.git(root, "clone", "--branch", "main", str(self.remote), str(self.runner)) + self.git(self.runner, "checkout", "--detach", "0.0.1-alpha") + + def bump(self, success=True, ci_exit="0"): + env = dict(os.environ, TEST_CI_TRACE=(self.runner.parent / "ci-trace.txt").as_posix(), TEST_CI_EXIT=ci_exit) + harness = r''' + gh() { + printf '%s\n' "$*" >> "$TEST_CI_TRACE" + case "$1 $2" in + "workflow run") return 0 ;; + "run list") echo 123 ;; + "run watch") return "$TEST_CI_EXIT" ;; + *) echo "Unexpected gh call" >&2; return 1 ;; + esac +} +export -f gh +bash .github/scripts/release-commit.sh 0.0.1-alpha 0.0.2 0.0.1-alpha +''' + result = subprocess.run( + [BASH, "-c", harness], + cwd=self.runner, env=env, capture_output=True, text=True, + ) + if success: + self.assertEqual(result.returncode, 0, result.stdout + result.stderr) + else: + self.assertNotEqual(result.returncode, 0) + return result + + def test_direct_commit_and_idempotent_rerun(self): + tagged = self.git(self.remote, "rev-parse", "0.0.1-alpha") + self.bump() + committed = self.git(self.remote, "rev-parse", "main") + self.assertNotEqual(committed, tagged) + self.assertEqual(self.git(self.remote, "show", "main:gradle.properties"), "version=0.0.2") + self.assertIn("## Unreleased\n\n## 0.0.1-alpha", self.git(self.remote, "show", "main:CHANGELOG.md")) + self.assertEqual(self.git(self.remote, "rev-parse", "0.0.1-alpha"), tagged) + self.assertEqual(self.git(self.remote, "for-each-ref", "--format=%(refname)", "refs/heads"), "refs/heads/main") + self.bump() + self.assertEqual(self.git(self.remote, "rev-parse", "main"), committed) + + def test_failed_ci_leaves_main_unchanged(self): + original = self.git(self.remote, "rev-parse", "main") + self.bump(success=False, ci_exit="1") + self.assertEqual(self.git(self.remote, "rev-parse", "main"), original) + trace = (self.runner.parent / "ci-trace.txt").read_text() + self.assertIn("workflow run ci.yml --ref release-next/", trace) + self.assertIn("run watch 123 --exit-status", trace) + + def test_newer_main_notes_are_preserved(self): + changelog = self.writer / "CHANGELOG.md" + changelog.write_text(changelog.read_text().replace("## Unreleased\n", "## Unreleased\n\n- Added during build.\n"), encoding="utf-8") + self.git(self.writer, "add", "CHANGELOG.md") + self.git(self.writer, "commit", "-m", "Concurrent changes") + self.git(self.writer, "push", "origin", "main") + self.bump() + self.assertEqual(self.git(self.remote, "show", "main:CHANGELOG.md"), changelog.read_text().strip()) + self.assertEqual(self.git(self.remote, "show", "main:gradle.properties"), "version=0.0.2") + + def test_push_race_is_rejected_and_rerun_preserves_concurrent_commit(self): + (self.writer / "concurrent.txt").write_text("Keep this change.\n", encoding="utf-8") + self.git(self.writer, "add", "concurrent.txt") + self.git(self.writer, "commit", "-m", "Concurrent commit") + concurrent = self.git(self.writer, "rev-parse", "HEAD") + # Advance remote main after the release script fetches, just before its push. + hook = self.runner / ".git/hooks/pre-push" + hook.write_text( + "#!/usr/bin/env bash\nset -eu\n" + + "env -u GIT_DIR -u GIT_WORK_TREE git -C " + shlex.quote(self.writer.as_posix()) + + ' push origin main\nrm -- "$0"\n', encoding="utf-8", + ) + hook.chmod(0o755) + self.bump(success=False) + self.assertEqual(self.git(self.remote, "rev-parse", "main"), concurrent) + self.bump() + self.assertEqual(self.git(self.remote, "rev-parse", "main^"), concurrent) + self.assertEqual(self.git(self.remote, "show", "main:concurrent.txt"), "Keep this change.") + + +if __name__ == "__main__": + unittest.main() diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml new file mode 100644 index 0000000..0980146 --- /dev/null +++ b/.github/workflows/ci.yml @@ -0,0 +1,90 @@ +name: CI + +# Every pull request must build and pass on every Minecraft version before it can merge. +# `all-versions` requires every version job and the release-script checks, so it is the one check for a ruleset on main to require. +on: + workflow_dispatch: + pull_request: + branches: [main] + push: + branches: [main] + +jobs: + release-scripts: + name: Release script checks + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v7 + - run: python3 .github/scripts/test_release_changelog.py + - run: python3 .github/scripts/test_release_commit.py + - run: python3 .github/scripts/test_curseforge_versions.py + + mc-26-3: + name: Minecraft 26.3 (Fabric + NeoForge) + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v7 + - uses: actions/setup-java@v6 + with: + distribution: temurin + java-version: | + 21 + 25 + - uses: gradle/actions/setup-gradle@v6 + + # Git must hold the sources in their 26.3 state; Stonecutter rewrites them when another version is active. + - name: Check the sources are committed with 26.3 active + run: | + ./gradlew "Reset active project" + git diff --exit-code + + # Every version comment and replacement in stonecutter.gradle.kts has to turn back exactly, or switching the + # IDE to another version and back would rewrite code. The build itself never switches, so check it here. + - name: Check switching to 1.21.1 and back changes nothing + run: | + ./gradlew "Set active project to 1.21.1" + ./gradlew "Reset active project" + git diff --exit-code + + - name: Unit tests, jars and server game tests + run: ./gradlew :26.3:test :fabric:26.3:build :neoforge:26.3:build :neoforge:26.3:runGameTestServer :fabric:26.3:runGametest + + - name: Collect jars + run: ./gradlew collectJars + + - uses: actions/upload-artifact@v7 + with: + name: jars-26.3 + path: build/libs/*/*.jar + + mc-1-21-1: + name: Minecraft 1.21.1 (NeoForge) + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v7 + - uses: actions/setup-java@v6 + with: + distribution: temurin + java-version: | + 21 + 25 + - uses: gradle/actions/setup-gradle@v6 + + - name: Unit tests, jar and server game tests + run: ./gradlew :1.21.1:test :neoforge:1.21.1:build :neoforge:1.21.1:runGameTestServer + + - uses: actions/upload-artifact@v7 + with: + name: jars-1.21.1 + path: neoforge/versions/1.21.1/build/libs/villagermarket-neoforge-1.21.1-*.jar + + all-versions: + name: all-versions + if: always() + needs: [mc-26-3, mc-1-21-1, release-scripts] + runs-on: ubuntu-latest + steps: + - name: Every check passed + run: | + echo '${{ toJSON(needs) }}' + [ "${{ contains(needs.*.result, 'failure') || contains(needs.*.result, 'cancelled') || contains(needs.*.result, 'skipped') }}" = "false" ] diff --git a/.github/workflows/discord-merge-notify.yml b/.github/workflows/discord-merge-notify.yml new file mode 100644 index 0000000..bdf9324 --- /dev/null +++ b/.github/workflows/discord-merge-notify.yml @@ -0,0 +1,26 @@ +name: Discord merge notify +on: + pull_request: + types: [closed] +jobs: + notify: + if: github.event.pull_request.merged == true && github.event.pull_request.base.ref == 'main' + runs-on: ubuntu-latest + steps: + # The merge commit and its first parent, so the script can see which changelog bullets the merge added. + - uses: actions/checkout@v7 + with: + ref: ${{ github.event.pull_request.merge_commit_sha }} + fetch-depth: 2 + + - name: Post the title and new changelog bullets + env: + WEBHOOK: ${{ secrets.DISCORD_WEBHOOK }} + MERGE: ${{ github.event.pull_request.merge_commit_sha }} + REPO: ${{ github.event.repository.name }} + NUMBER: ${{ github.event.pull_request.number }} + TITLE: ${{ github.event.pull_request.title }} + URL: ${{ github.event.pull_request.html_url }} + run: | + bash .github/scripts/discord-merge-message.sh "$MERGE" "$REPO" "$NUMBER" "$TITLE" "$URL" \ + | curl -sf -H "Content-Type: application/json" -d @- "$WEBHOOK" diff --git a/.github/workflows/release-metadata.yml b/.github/workflows/release-metadata.yml new file mode 100644 index 0000000..e86641a --- /dev/null +++ b/.github/workflows/release-metadata.yml @@ -0,0 +1,27 @@ +name: Inspect release metadata + +on: + workflow_dispatch: + +permissions: + contents: read + +jobs: + curseforge: + if: github.ref == 'refs/heads/main' + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v7 + - name: Validate target game versions without uploading + env: + CURSEFORGE_TOKEN: ${{ secrets.CURSEFORGE_TOKEN }} + run: | + set -euo pipefail + curl --fail-with-body -sS -H "X-Api-Token: ${CURSEFORGE_TOKEN}" \ + https://minecraft.curseforge.com/api/game/versions > versions.json + curl --fail-with-body -sS -H "X-Api-Token: ${CURSEFORGE_TOKEN}" \ + https://minecraft.curseforge.com/api/game/version-types > types.json + jq --slurpfile types types.json '[$types[0][] | select(.slug == "environment") | .id] as $ids | [.[] | select(.gameVersionTypeID as $id | $ids | index($id))]' versions.json + python3 .github/scripts/curseforge-version-ids.py versions.json types.json 1.21.1 NeoForge "Java 21" + python3 .github/scripts/curseforge-version-ids.py versions.json types.json 26.3 Fabric "Java 25" + python3 .github/scripts/curseforge-version-ids.py versions.json types.json 26.3 NeoForge "Java 25" diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml new file mode 100644 index 0000000..c1825ab --- /dev/null +++ b/.github/workflows/release.yml @@ -0,0 +1,199 @@ +name: Release + +# Tag 0.0.1 to publish a release, or 0.0.1-alpha / 0.0.1-beta for that channel. A leading v +# is also accepted. The version edit is made in the build checkout only, so the tag stays +# on the commit you tagged. After the upload, the action commits the next patch to main +# and moves the published notes under that version. +# +# Repository secrets: MODRINTH_TOKEN, CURSEFORGE_TOKEN. +# Repository variables: MODRINTH_PROJECT_ID, CURSEFORGE_PROJECT_ID. +# Tag a commit that is already on main. This file, on that commit, is what runs. +on: + push: + tags: + - "[0-9]+.[0-9]+.[0-9]+" + - "[0-9]+.[0-9]+.[0-9]+-alpha" + - "[0-9]+.[0-9]+.[0-9]+-beta" + - "v[0-9]+.[0-9]+.[0-9]+" + - "v[0-9]+.[0-9]+.[0-9]+-alpha" + - "v[0-9]+.[0-9]+.[0-9]+-beta" + +permissions: + contents: read + +concurrency: + group: release + cancel-in-progress: false + +jobs: + notes: + name: Check the tag + runs-on: ubuntu-latest + outputs: + version: ${{ steps.meta.outputs.version }} + next: ${{ steps.meta.outputs.next }} + channel: ${{ steps.meta.outputs.channel }} + steps: + - uses: actions/checkout@v7 + with: + fetch-depth: 0 + + - name: The tag is on main + run: | + set -euo pipefail + git fetch origin main + git merge-base --is-ancestor "$GITHUB_SHA" origin/main || { + echo "The tag is not on main. Tag a commit that is already on main." + exit 1 + } + + - name: Secrets and the changelog + id: meta + env: + MODRINTH_TOKEN: ${{ secrets.MODRINTH_TOKEN }} + CURSEFORGE_TOKEN: ${{ secrets.CURSEFORGE_TOKEN }} + MODRINTH_PROJECT_ID: ${{ vars.MODRINTH_PROJECT_ID }} + CURSEFORGE_PROJECT_ID: ${{ vars.CURSEFORGE_PROJECT_ID }} + run: | + set -euo pipefail + bash .github/scripts/release-publish.sh check-env + version=$(bash .github/scripts/release-version.sh parse "$GITHUB_REF_NAME") + channel=$(bash .github/scripts/release-version.sh channel "$GITHUB_REF_NAME") + next=$(bash .github/scripts/release-version.sh next "$version") + echo "version=${version}" >> "$GITHUB_OUTPUT" + echo "channel=${channel}" >> "$GITHUB_OUTPUT" + echo "next=${next}" >> "$GITHUB_OUTPUT" + bash .github/scripts/release-changelog.sh notes CHANGELOG.md "$version" > release-notes.md + + - uses: actions/upload-artifact@v7 + with: + name: release-notes + path: release-notes.md + + mc-26-3: + name: Minecraft 26.3 (Fabric + NeoForge) + needs: notes + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v7 + - uses: actions/setup-java@v6 + with: + distribution: temurin + java-version: | + 21 + 25 + - uses: gradle/actions/setup-gradle@v6 + + - name: Check the sources are committed with 26.3 active + run: | + ./gradlew "Reset active project" + git diff --exit-code + + - name: Check switching to 1.21.1 and back changes nothing + run: | + ./gradlew "Set active project to 1.21.1" + ./gradlew "Reset active project" + git diff --exit-code + + - name: Set the published version + run: bash .github/scripts/release-version.sh write gradle.properties "${{ needs.notes.outputs.version }}" + + - name: Unit tests and jars + run: ./gradlew :26.3:test :fabric:26.3:build :neoforge:26.3:build :neoforge:26.3:runGameTestServer :fabric:26.3:runGametest + + - name: Collect jars + run: ./gradlew collectJars + + - uses: actions/upload-artifact@v7 + with: + name: jars-26.3 + if-no-files-found: error + path: | + build/libs/*/villagermarket-fabric-26.3-*.jar + build/libs/*/villagermarket-neoforge-26.3-*.jar + !**/*-sources.jar + !**/*-javadoc.jar + !**/*-dev.jar + + mc-1-21-1: + name: Minecraft 1.21.1 (NeoForge) + needs: notes + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v7 + - uses: actions/setup-java@v6 + with: + distribution: temurin + java-version: | + 21 + 25 + - uses: gradle/actions/setup-gradle@v6 + + - name: Set the published version + run: bash .github/scripts/release-version.sh write gradle.properties "${{ needs.notes.outputs.version }}" + + - name: Unit tests and jar + run: ./gradlew :1.21.1:test :neoforge:1.21.1:build :neoforge:1.21.1:runGameTestServer + + - uses: actions/upload-artifact@v7 + with: + name: jars-1.21.1 + if-no-files-found: error + path: | + neoforge/versions/1.21.1/build/libs/villagermarket-neoforge-1.21.1-*.jar + !**/*-sources.jar + !**/*-javadoc.jar + !**/*-dev.jar + + publish: + name: Publish + needs: [notes, mc-26-3, mc-1-21-1] + runs-on: ubuntu-latest + permissions: + contents: write + steps: + - uses: actions/checkout@v7 + + - uses: actions/download-artifact@v7 + with: + name: release-notes + path: notes + + - uses: actions/download-artifact@v7 + with: + pattern: jars-* + path: jars + + - name: Upload the release + env: + GH_TOKEN: ${{ github.token }} + MODRINTH_TOKEN: ${{ secrets.MODRINTH_TOKEN }} + CURSEFORGE_TOKEN: ${{ secrets.CURSEFORGE_TOKEN }} + MODRINTH_PROJECT_ID: ${{ vars.MODRINTH_PROJECT_ID }} + CURSEFORGE_PROJECT_ID: ${{ vars.CURSEFORGE_PROJECT_ID }} + RELEASE_TYPE: ${{ needs.notes.outputs.channel }} + TAG: ${{ github.ref_name }} + run: bash .github/scripts/release-publish.sh upload "${{ needs.notes.outputs.version }}" notes/release-notes.md jars + + bump: + name: Next version + timeout-minutes: 60 + needs: [notes, publish] + if: needs.publish.result == 'success' + runs-on: ubuntu-latest + permissions: + contents: write + actions: write + steps: + - uses: actions/checkout@v7 + with: + fetch-depth: 0 + fetch-tags: true + + - name: Validate and commit the next version to main + env: + GH_TOKEN: ${{ github.token }} + VERSION: ${{ needs.notes.outputs.version }} + NEXT: ${{ needs.notes.outputs.next }} + TAG: ${{ github.ref_name }} + run: bash .github/scripts/release-commit.sh "$VERSION" "$NEXT" "$TAG" diff --git a/.github/workflows/retry-release.yml b/.github/workflows/retry-release.yml new file mode 100644 index 0000000..c2f0d8e --- /dev/null +++ b/.github/workflows/retry-release.yml @@ -0,0 +1,90 @@ +name: Retry release publication + +# Uses the original tag's built jars and notes, with the publishing scripts on +# main. This repairs a partial publication without moving a tag or rebuilding. +on: + workflow_dispatch: + inputs: + tag: + description: Existing release tag + required: true + type: string + run_id: + description: Failed Release run containing the original artifacts + required: true + type: string + +permissions: + contents: write + actions: write + +concurrency: + group: release + cancel-in-progress: false + +jobs: + retry: + if: github.ref == 'refs/heads/main' + runs-on: ubuntu-latest + timeout-minutes: 60 + steps: + - uses: actions/checkout@v7 + with: + fetch-depth: 0 + fetch-tags: true + + - name: Validate the tag and original build + id: meta + env: + GH_TOKEN: ${{ github.token }} + TAG: ${{ inputs.tag }} + RUN_ID: ${{ inputs.run_id }} + run: | + set -euo pipefail + [[ "$RUN_ID" =~ ^[0-9]+$ ]] + version=$(bash .github/scripts/release-version.sh parse "$TAG") + sha=$(git rev-parse "refs/tags/${TAG}^{commit}") + git merge-base --is-ancestor "$sha" origin/main + gh api "repos/${GITHUB_REPOSITORY}/actions/runs/${RUN_ID}" > "$RUNNER_TEMP/release-run.json" + jq -e --arg tag "$TAG" --arg sha "$sha" ' + .head_branch == $tag and .head_sha == $sha and .event == "push" + and .path == ".github/workflows/release.yml" + and .status == "completed" and .conclusion == "failure" + ' "$RUNNER_TEMP/release-run.json" >/dev/null + echo "version=${version}" >> "$GITHUB_OUTPUT" + echo "channel=$(bash .github/scripts/release-version.sh channel "$TAG")" >> "$GITHUB_OUTPUT" + echo "next=$(bash .github/scripts/release-version.sh next "$version")" >> "$GITHUB_OUTPUT" + + - uses: actions/download-artifact@v7 + with: + name: release-notes + path: ${{ runner.temp }}/release-notes + run-id: ${{ inputs.run_id }} + github-token: ${{ github.token }} + + - uses: actions/download-artifact@v7 + with: + pattern: jars-* + path: ${{ runner.temp }}/release-jars + run-id: ${{ inputs.run_id }} + github-token: ${{ github.token }} + + - name: Complete publication + env: + GH_TOKEN: ${{ github.token }} + MODRINTH_TOKEN: ${{ secrets.MODRINTH_TOKEN }} + CURSEFORGE_TOKEN: ${{ secrets.CURSEFORGE_TOKEN }} + MODRINTH_PROJECT_ID: ${{ vars.MODRINTH_PROJECT_ID }} + CURSEFORGE_PROJECT_ID: ${{ vars.CURSEFORGE_PROJECT_ID }} + TAG: ${{ inputs.tag }} + VERSION: ${{ steps.meta.outputs.version }} + RELEASE_TYPE: ${{ steps.meta.outputs.channel }} + run: bash .github/scripts/release-publish.sh upload "$VERSION" "$RUNNER_TEMP/release-notes/release-notes.md" "$RUNNER_TEMP/release-jars" + + - name: Validate and commit the next version to main + env: + GH_TOKEN: ${{ github.token }} + TAG: ${{ inputs.tag }} + VERSION: ${{ steps.meta.outputs.version }} + NEXT: ${{ steps.meta.outputs.next }} + run: bash .github/scripts/release-commit.sh "$VERSION" "$NEXT" "$TAG" diff --git a/.gitignore b/.gitignore index 2c770e0..a695b0d 100644 --- a/.gitignore +++ b/.gitignore @@ -1,22 +1,22 @@ -# eclipse -bin +# private agent/design docs live in faceofcat/mod-design +AGENTS.md +.agent/ +docs/ +.cursor/ +# build +.gradle/ +build/ +run/ +runs/ +out/ +.idea/ +.vscode/ +*.iml +*.ipr +*.iws +bin/ *.launch -.settings +.settings/ .metadata .classpath .project - -# idea -out -*.ipr -*.iws -*.iml -.idea - -# gradle -build -.gradle - -# other -eclipse -run diff --git a/CHANGELOG.md b/CHANGELOG.md new file mode 100644 index 0000000..885f03c --- /dev/null +++ b/CHANGELOG.md @@ -0,0 +1,25 @@ +# Changelog + +Each pull request adds its own bullets at the top of **Unreleased**, written for players. When a merge lands, the Discord message shows only the bullets that pull request added. + +Push a version tag to publish. Alpha and beta releases use only **Unreleased**. Stable releases include those new notes under the tagged version, followed by every alpha/beta section since the previous stable release, newest first. The same notes go to CurseForge, Modrinth, and GitHub. + +After publishing, the action prepares the next development version and archives the new notes under the released heading. It runs the full CI suite on a temporary branch before committing the update directly to **main**, without a follow-up PR. Earlier sections stay in place without duplication. A stable promotion may have no new notes; its empty heading still marks the next stable cutoff. Concurrent main changes are never overwritten, and unpublished notes changed since the tag are preserved for manual reconciliation. + +## Unreleased + +- Place a Villager Market (planks around an emerald block) and trade with every villager within 48 blocks, 16 up and 16 down. Offers are grouped by the villager's name, or by profession. Show All lists offers you cannot pay for. x1 buys once, and xN buys as many as you can pay for and the offer still has left. + +## 1.0.2 + +- fixed #12 concurrent list CTD + +## 1.0.1 + +- update item highlight +- fixed issues around server/client network handling + +## 1.0.0 + +- moved to MMD servers +- jar should now be signed diff --git a/README.md b/README.md index efa78e3..2b79dbc 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,19 @@ # Villager Market -[![](http://cf.way2muchnoise.eu/villager-market.svg)](https://minecraft.curseforge.com/projects/villager-market) -[![](http://cf.way2muchnoise.eu/versions/villager-market.svg)](https://minecraft.curseforge.com/projects/villager-market) -[![](https://img.shields.io/badge/Discord-MMD%20Cat%20Mods-blue.svg)](https://discord.gg/3ccTHus) -A mod that adds one easy to use block for villager trading. \ No newline at end of file +One block for trading with nearby villagers. + +The Villager Market looks for villagers within 48 blocks, and 16 blocks up or down. Their offers are grouped by a custom name when they have one, and by profession otherwise. Show All, on by default, lists offers you cannot pay for yet. x1 buys the selected offer once. xN buys as many as you can pay for and the offer still has left. The window closes when you walk more than 8 blocks away. + +## Jars + +| Jar | Minecraft | Loader | +| --- | --- | --- | +| `villagermarket-neoforge-1.21.1-2.0.0.jar` | 1.21.1 | NeoForge | +| `villagermarket-neoforge-26.3-2.0.0.jar` | 26.3 | NeoForge | +| `villagermarket-fabric-26.3-2.0.0.jar` | 26.3 | Fabric | + +There is no Fabric jar for 1.21.1. + +## Recipe + +Eight planks (`#minecraft:planks`) around an emerald block. diff --git a/build-logic/build.gradle b/build-logic/build.gradle new file mode 100644 index 0000000..6784052 --- /dev/null +++ b/build-logic/build.gradle @@ -0,0 +1,3 @@ +plugins { + id 'groovy-gradle-plugin' +} diff --git a/build-logic/src/main/groovy/multiloader-common.gradle b/build-logic/src/main/groovy/multiloader-common.gradle new file mode 100644 index 0000000..ef54462 --- /dev/null +++ b/build-logic/src/main/groovy/multiloader-common.gradle @@ -0,0 +1,146 @@ +plugins { + id 'java-library' + id 'maven-publish' +} + +// Version projects sit at :<mc> for the common code and :<loader>:<mc> for fabric and neoforge. +def loaderName = project.parent == rootProject ? 'common' : project.parent.name +// The common project for this Minecraft version, e.g. :26.3 for :fabric:26.3. +def commonProject = loaderName == 'common' ? project : rootProject.project(":${project.name}") +// stonecutter.gradle.kts gives each branch its own Gradle group; published jars keep the mod's group. +def modGroup = rootProject.group + +repositories { + mavenCentral() +} + +dependencies { + // Null annotations: newer Minecraft ships JSpecify, 1.21.1 doesn't. + compileOnly 'org.jspecify:jspecify:1.0.0' +} + +base { + archivesName = "${mod_id}-${loaderName}-${minecraft_version}" +} + +// A file under versions/<mc>/src replaces the shared file at the same path, for the common code and for this +// project's own branch. Stonecutter already drops the shared copy when it processes an inactive version, but the +// active version compiles the shared folders as they are, so the shared copy is left out here as well. +def versionOverrides = [rootProject.projectDir, project.parent.projectDir].unique().collectMany { branchDir -> + ['java', 'resources'].collect { kind -> + [shared: new File(branchDir, "src/main/${kind}").toPath(), local: new File(branchDir, "versions/${project.name}/src/main/${kind}")] + } +} +def overridden = { FileTreeElement element -> + !element.directory && versionOverrides.any { dirs -> + element.file.toPath().startsWith(dirs.shared) && new File(dirs.local, element.relativePath.pathString).exists() + } +} +// The active version compiles the shared sources directly. Its merge task writes those same folders, so the +// tasks that read them have to depend on the merge or Gradle rejects the implicit dependency. Inactive +// versions compile Stonecutter's generated copy; depending on their merge would copy that version back +// over the shared sources. +def activeVersion = stonecutter.current.isActive +if (activeVersion) { + tasks.matching { it.name == 'stonecutterGenerate' || it.name == 'stonecutterGenerateTest' }.configureEach { + dependsOn(it.name == 'stonecutterGenerate' ? 'stonecutterMerge' : 'stonecutterMergeTest') + } +} + +tasks.withType(SourceTask).configureEach { task -> + if (task.name.startsWith('stonecutter')) return + exclude(overridden) + if (activeVersion) { + dependsOn(task.name.toLowerCase().contains('test') ? 'stonecutterMergeTest' : 'stonecutterMerge') + } +} +tasks.withType(AbstractCopyTask).configureEach { task -> + if (task.name.startsWith('stonecutter')) return + exclude(overridden) + if (activeVersion) { + dependsOn(task.name.toLowerCase().contains('test') ? 'stonecutterMergeTest' : 'stonecutterMerge') + } +} + +java { + toolchain.languageVersion = JavaLanguageVersion.of(java_version) + withSourcesJar() + withJavadocJar() +} + +tasks.withType(Jar).configureEach { + from(rootProject.file('LICENSE')) { + rename { "${it}_${mod_name}" } + } +} + +jar { + + manifest { + attributes([ + 'Specification-Title' : mod_name, + 'Specification-Vendor' : mod_author, + 'Specification-Version' : project.jar.archiveVersion, + 'Implementation-Title' : project.name, + 'Implementation-Version': project.jar.archiveVersion, + 'Implementation-Vendor' : mod_author, + 'Built-On-Minecraft' : minecraft_version + ]) + } +} + +processResources { + var expandProps = [ + 'version' : version, + 'group' : modGroup, //Else we target the task's group. + 'minecraft_version' : minecraft_version, + 'minecraft_version_range' : minecraft_version_range, + // Only one loader's nodes define each loader's versions. + 'fabric_version' : findProperty('fabric_version') ?: '', + 'fabric_loader_version' : findProperty('fabric_loader_version') ?: '', + 'mod_name' : mod_name, + 'mod_author' : mod_author, + 'mod_id' : mod_id, + 'license' : license, + 'description' : project.description, + 'neoforge_version' : findProperty('neoforge_version') ?: '', + 'neoforge_loader_version_range': findProperty('neoforge_loader_version_range') ?: '', + 'jade_version' : findProperty('jade_version') ?: '', + 'jei_version' : findProperty('jei_version') ?: '', + 'credits' : credits, + 'java_version' : java_version, + // Mixins only some versions have, as quoted names with a trailing comma, from versions/<mc>/gradle.properties. + 'extra_mixins' : commonProject.findProperty('extra_mixins') ?: '', + // The same for client-only mixins. + 'extra_client_mixins' : commonProject.findProperty('extra_client_mixins') ?: '' + ] + + var jsonExpandProps = expandProps.collectEntries { + key, value -> [(key): value instanceof String ? value.replace('\n', '\\\\n') : value] + } + + filesMatching(['META-INF/mods.toml', 'META-INF/neoforge.mods.toml']) { + expand expandProps + } + + filesMatching(['pack.mcmeta', 'fabric.mod.json', '*.mixins.json']) { + expand jsonExpandProps + } + + inputs.properties(expandProps) +} + +publishing { + publications { + register('mavenJava', MavenPublication) { + groupId modGroup + artifactId base.archivesName.get() + from components.java + } + } + repositories { + maven { + url System.getenv('local_maven_url') + } + } +} diff --git a/build-logic/src/main/groovy/multiloader-loader.gradle b/build-logic/src/main/groovy/multiloader-loader.gradle new file mode 100644 index 0000000..ad9b91b --- /dev/null +++ b/build-logic/src/main/groovy/multiloader-loader.gradle @@ -0,0 +1,51 @@ +plugins { + id 'multiloader-common' +} + +configurations { + // Only resolved here; the common project for the same Minecraft version provides them. + commonJava { + canBeResolved = true + canBeConsumed = false + } + commonResources { + canBeResolved = true + canBeConsumed = false + } +} + +// The common project for this loader's Minecraft version, e.g. :26.3 for :fabric:26.3. +def commonPath = ":${stonecutter.current.project}" + +dependencies { + compileOnly(project(commonPath)) { + def loaderAttribute = Attribute.of('io.github.mcgradleconventions.loader', String) + attributes { + attribute(loaderAttribute, 'common') + } + } + commonJava(project(path: commonPath, configuration: 'commonJava')) + commonResources(project(path: commonPath, configuration: 'commonResources')) +} + +tasks.named('compileJava', JavaCompile) { + dependsOn(configurations.commonJava) + source(configurations.commonJava) +} + +processResources { + dependsOn(configurations.commonResources) + from(configurations.commonResources) +} + +tasks.named('javadoc', Javadoc).configure { + dependsOn(configurations.commonJava) + source(configurations.commonJava) +} + +tasks.named('sourcesJar', Jar) { + dependsOn(configurations.commonJava) + from(configurations.commonJava) + dependsOn(configurations.commonResources) + from(configurations.commonResources) +} diff --git a/build.gradle b/build.gradle index 8ca6ef3..71acbfa 100644 --- a/build.gradle +++ b/build.gradle @@ -1,229 +1,75 @@ -buildscript { - repositories { - mavenCentral() - maven { url = "http://files.minecraftforge.net/maven" } - maven { url = "https://repo.maven.apache.org/maven2" } - maven { url = "https://plugins.gradle.org/m2/" } - maven { url = "https://oss.sonatype.org/content/repositories/snapshots/" } - } - dependencies { - classpath 'net.minecraftforge.gradle:ForgeGradle:2.3-SNAPSHOT' - classpath "gradle.plugin.com.matthewprenger:CurseGradle:${project.cursegradle_version}" - } -} -apply plugin: "net.minecraftforge.gradle.forge" -apply plugin: 'com.matthewprenger.cursegradle' -apply plugin: "maven-publish" -apply plugin: "maven" - -archivesBaseName = project.mod_name.replace(' ', '-').toLowerCase() -group = "${project.group_name}" - -version = "${project.minecraft_version}-${project.mod_version}" -if (project.hasProperty('mod_suffix')) { - version += "-${project.mod_suffix}" -} - -compileJava { sourceCompatibility = targetCompatibility = "1.8" } - -minecraft { - version = "${project.minecraft_version}-${project.forge_version}" - mappings = "${project.mcp_version}" - runDir = "run" - - replace '@MOD-ID@', project.mod_id - replace '@MOD-NAME@', project.mod_name - replace '@MOD-VERSION@', project.mod_version - replace '@MOD-MC-VERSION@', project.minecraft_version - replace '@FORGE-VERSION@', project.forge_version - replace '@FINGERPRINT@', project.findProperty('signSHA1') - - replaceIn 'Constants.java' - - if (project.hasProperty('mc_username')) { - clientRunArgs += ['--username', "${project.mc_username}"] - if (project.hasProperty('mc_password')) { - clientRunArgs += ['--password=', "${project.mc_password}"] - } - } - if (project.hasProperty('mc_uuid')) { - clientRunArgs += ['--uuid', "${project.mc_uuid}"] - } - - // disable server gui - serverRunArgs += "nogui" - - // skip the screen to confirm that you want to load a world with missing registry entries - serverJvmArgs += "-Dfml.doNotBackup=true" - clientJvmArgs += "-Dfml.doNotBackup=true" - - // skip having to confirm on server - serverJvmArgs += "-Dfml.queryResult=confirm" - - // skip jansi warnings in the log - serverJvmArgs += "-Dlog4j.skipJansi=true" - clientJvmArgs += "-Dlog4j.skipJansi=true" - - if (project.hasProperty('client_args')) { - clientJvmArgs += "${project.client_args}" - } - if (project.hasProperty('server_args')) { - serverJvmArgs += "${project.server_args}" - } -} - -import groovy.json.JsonSlurper - -class Secrets { - def data = null - - def getProperty(String key) { - return data ? data[key] : '' - } -} - -def secretFile -if (System.getenv().SECRET_FILE) { - secretFile = file System.getenv().SECRET_FILE -} else { - secretFile = file 'secret.json' +plugins { + id 'multiloader-common' + id 'net.neoforged.moddev' } -project.ext.secret = new Secrets() -if (secretFile.exists()) { - secretFile.withReader { - project.ext.secret.data = new JsonSlurper().parse it +neoForge { + neoFormVersion = neo_form_version + // Automatically enable AccessTransformers if the file exists + def at = rootProject.file('src/main/resources/META-INF/accesstransformer.cfg') + if (at.exists()) { + accessTransformers.from(at.absolutePath) } } repositories { mavenCentral() - mavenLocal() - jcenter() - maven { name='mmd'; url='https://maven.mcmoddev.com' } - - maven { name='jei'; url="http://dvs1.progwml6.com/files/maven" } } dependencies { - runtime "mezz.jei:jei_${project.minecraft_version}:${project.jei_version}+" -} - -processResources { - inputs.property "version", project.version - inputs.property "mcversion", project.minecraft.version - inputs.property "modid", project.mod_id - inputs.property "modname", project.mod_name - - from(sourceSets.main.resources.srcDirs) { - include '**/*.info' - include '**/*.properties' - - // replace version and mcversion - expand 'version':project.version, 'mcversion':project.minecraft.version, 'modid': project.mod_id, 'modname': project.mod_name - } + // Fabric and NeoForge both bundle Fabric Mixin, so it is safe to use it in common + // If you need to update, check what version they are using to see what is compatible + // https://github.com/neoforged/NeoForge/blob/26.3.x/gradle.properties#L37 + // https://github.com/FabricMC/fabric-loader/blob/master/gradle.properties#L12 + compileOnly('net.fabricmc:sponge-mixin:0.17.3+mixin.0.8.7') + // Fabric and NeoForge both bundle MixinExtras, so it is safe to use it in common + compileOnly(annotationProcessor('io.github.llamalad7:mixinextras-common:0.5.3')) - from(sourceSets.main.resources.srcDirs) { - exclude '**/*.info' - exclude '**/*.properties' - } -} - -jar { - from sourceSets.api.output - from sourceSets.main.output + testImplementation 'org.junit.jupiter:junit-jupiter:5.12.2' + testRuntimeOnly 'org.junit.platform:junit-platform-launcher' + testRuntimeOnly 'com.google.code.gson:gson:2.14.0' + testRuntimeOnly 'org.slf4j:slf4j-nop:2.0.17' } -task sourcesJar(type: Jar) { - from sourceSets.api.allSource - from sourceSets.main.allSource - classifier = 'sources' +tasks.named('test', Test) { + useJUnitPlatform() } -task deobfJar(type: Jar) { - from sourceSets.api.output - from sourceSets.main.output - classifier = 'deobf' -} - -task signJar(type: SignJar, dependsOn: reobfJar) { - // Skips if the keyStore property is missing. - onlyIf { - project.hasProperty('keyStore') +configurations { + commonJava { + canBeResolved = false + canBeConsumed = true + } + commonResources { + canBeResolved = false + canBeConsumed = true } - - // findProperty allows us to reference the property without it existing. - // Using project.propName would cause the script to fail validation if - // the property did not exist. - keyStore = project.findProperty('keyStore') - alias = project.findProperty('keyStoreAlias') - storePass = project.findProperty('keyStorePass') - keyPass = project.findProperty('keyStoreKeyPass') - inputFile = jar.archivePath - outputFile = jar.archivePath } -build.dependsOn signJar -tasks.publish.dependsOn build -tasks.curseforge.dependsOn build -tasks.publish.finalizedBy tasks.curseforge - artifacts { - archives sourceJar, deobfJar + // Stonecutter generates the sources this version compiles, and the loaders compile those same files. + sourceSets.main.java.srcDirs.each { dir -> + add('commonJava', dir) { builtBy 'stonecutterGenerate' } + } + sourceSets.main.resources.srcDirs.each { dir -> + add('commonResources', dir) { builtBy 'stonecutterGenerate' } + } } -publishing { - publications { - mavenJava(MavenPublication) { - groupId project.group - artifactId project.archivesBaseName - def versionForMaven = "$project.minecraft_version-$project.mod_version" - if (System.getenv().BUILD_NUMBER) { - versionForMaven += '.' + System.getenv().BUILD_NUMBER - } - version versionForMaven - from components.java - artifact sourceJar { - classifier 'sources' - } - artifact deobfJar { - classifier 'deobf' - } - } - } - repositories { - maven { - credentials { - username secret.username - password secret.password - } - url secret.url +// Implement mcgradleconventions loader attribute +def loaderAttribute = Attribute.of('io.github.mcgradleconventions.loader', String) +['apiElements', 'runtimeElements', 'sourcesElements', 'javadocElements'].each { variant -> + configurations.named(variant) { + attributes { + attribute(loaderAttribute, 'common') } } } - -curseforge { - if (project.hasProperty('cf_project_id') && project.hasProperty('cf_release_type') && - ((project.cf_release_type == "alpha") || (project.cf_release_type == "beta") || (project.cf_release_type == "release"))) { - apiKey = secret.curseforgeAPIKey - project { - id = "$project.cf_project_id" - changelog = file('current-changelog.txt') - releaseType = project.cf_release_type - addGameVersion(project.minecraft_version) - def projectName = project.mod_name - def displayVersion = project.mod_version - if (System.getenv().BUILD_NUMBER) { - displayVersion += '.' + System.getenv().BUILD_NUMBER - } - mainArtifact(jar) { - displayName = "$project.mod_name : $displayVersion" - } - addArtifact(sourceJar) { - displayName = "$project.mod_name : $displayVersion : Sources" - } - addArtifact(deobfJar) { - displayName = "$project.mod_name : $displayVersion : Development" +sourceSets.configureEach { + [it.compileClasspathConfigurationName, it.runtimeClasspathConfigurationName].each { variant-> + configurations.named(variant) { + attributes { + attribute(loaderAttribute, 'common') } } } diff --git a/changelog.md b/changelog.md deleted file mode 100644 index 9c210e0..0000000 --- a/changelog.md +++ /dev/null @@ -1,17 +0,0 @@ -#future - 1.13 - -#future -- add automation support (slow redstone only, fast forge energy) - -#1.0.3 - -#1.0.2 -- fixed #12 concurrent list CTD - -#1.0.1 -- update item highlight -- fixed issues around server/client network handling - -#1.0.0 -- moved to MMD servers -- jar should now be signed diff --git a/credits/CREDITS-fml.txt b/credits/CREDITS-fml.txt deleted file mode 100644 index 97122f5..0000000 --- a/credits/CREDITS-fml.txt +++ /dev/null @@ -1,28 +0,0 @@ -This is Forge Mod Loader. - -You can find the source code at all times at https://github.com/MinecraftForge/FML - -This minecraft mod is a clean open source implementation of a mod loader for minecraft servers -and minecraft clients. - -The code is authored by cpw. - -It began by partially implementing an API defined by the client side ModLoader, authored by Risugami. -http://www.minecraftforum.net/topic/75440- -This support has been dropped as of Minecraft release 1.7, as Risugami no longer maintains ModLoader. - -It also contains suggestions and hints and generous helpings of code from LexManos, author of MinecraftForge. -http://www.minecraftforge.net/ - -Additionally, it contains an implementation of topological sort based on that -published at http://keithschwarz.com/interesting/code/?dir=topological-sort - -It also contains code from the Maven project for performing versioned dependency -resolution. http://maven.apache.org/ - -It also contains a partial repackaging of the javaxdelta library from http://sourceforge.net/projects/javaxdelta/ -with credit to it's authors. - -Forge Mod Loader downloads components from the Minecraft Coder Pack -(http://mcp.ocean-labs.de/index.php/Main_Page) with kind permission from the MCP team. - diff --git a/credits/LICENSE-new.txt b/credits/LICENSE-new.txt deleted file mode 100644 index be2c9e6..0000000 --- a/credits/LICENSE-new.txt +++ /dev/null @@ -1,483 +0,0 @@ -Minecraft Forge is licensed under the terms of the LGPL 2.1 found -here http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt and copied -below. - -A note on authorship: -All source artifacts are property of their original author, with -the exclusion of the contents of the patches directory and others -copied from it from time to time. Authorship of the contents of -the patches directory is retained by the Minecraft Forge project. -This is because the patches are partially machine generated -artifacts, and are changed heavily due to the way forge works. -Individual attribution within them is impossible. - -Consent: -All contributions to Forge must consent to the release of any -patch content to the Forge project. - -A note on infectivity: -The LGPL is chosen specifically so that projects may depend on Forge -features without being infected with its license. That is the -purpose of the LGPL. Mods and others using this code via ordinary -Java mechanics for referencing libraries are specifically not bound -by Forge's license for the Mod code. - - - GNU LESSER GENERAL PUBLIC LICENSE - Version 2.1, February 1999 - - Copyright (C) 1991, 1999 Free Software Foundation, Inc. - 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - -[This is the first released version of the Lesser GPL. It also counts - as the successor of the GNU Library Public License, version 2, hence - the version number 2.1.] - - Preamble - - The licenses for most software are designed to take away your -freedom to share and change it. By contrast, the GNU General Public -Licenses are intended to guarantee your freedom to share and change -free software--to make sure the software is free for all its users. - - This license, the Lesser General Public License, applies to some -specially designated software packages--typically libraries--of the -Free Software Foundation and other authors who decide to use it. You -can use it too, but we suggest you first think carefully about whether -this license or the ordinary General Public License is the better -strategy to use in any particular case, based on the explanations below. - - When we speak of free software, we are referring to freedom of use, -not price. Our General Public Licenses are designed to make sure that -you have the freedom to distribute copies of free software (and charge -for this service if you wish); that you receive source code or can get -it if you want it; that you can change the software and use pieces of -it in new free programs; and that you are informed that you can do -these things. - - To protect your rights, we need to make restrictions that forbid -distributors to deny you these rights or to ask you to surrender these -rights. These restrictions translate to certain responsibilities for -you if you distribute copies of the library or if you modify it. - - For example, if you distribute copies of the library, whether gratis -or for a fee, you must give the recipients all the rights that we gave -you. You must make sure that they, too, receive or can get the source -code. If you link other code with the library, you must provide -complete object files to the recipients, so that they can relink them -with the library after making changes to the library and recompiling -it. And you must show them these terms so they know their rights. - - We protect your rights with a two-step method: (1) we copyright the -library, and (2) we offer you this license, which gives you legal -permission to copy, distribute and/or modify the library. - - To protect each distributor, we want to make it very clear that -there is no warranty for the free library. Also, if the library is -modified by someone else and passed on, the recipients should know -that what they have is not the original version, so that the original -author's reputation will not be affected by problems that might be -introduced by others. - - Finally, software patents pose a constant threat to the existence of -any free program. We wish to make sure that a company cannot -effectively restrict the users of a free program by obtaining a -restrictive license from a patent holder. Therefore, we insist that -any patent license obtained for a version of the library must be -consistent with the full freedom of use specified in this license. - - Most GNU software, including some libraries, is covered by the -ordinary GNU General Public License. This license, the GNU Lesser -General Public License, applies to certain designated libraries, and -is quite different from the ordinary General Public License. We use -this license for certain libraries in order to permit linking those -libraries into non-free programs. - - When a program is linked with a library, whether statically or using -a shared library, the combination of the two is legally speaking a -combined work, a derivative of the original library. The ordinary -General Public License therefore permits such linking only if the -entire combination fits its criteria of freedom. The Lesser General -Public License permits more lax criteria for linking other code with -the library. - - We call this license the "Lesser" General Public License because it -does Less to protect the user's freedom than the ordinary General -Public License. It also provides other free software developers Less -of an advantage over competing non-free programs. These disadvantages -are the reason we use the ordinary General Public License for many -libraries. However, the Lesser license provides advantages in certain -special circumstances. - - For example, on rare occasions, there may be a special need to -encourage the widest possible use of a certain library, so that it becomes -a de-facto standard. To achieve this, non-free programs must be -allowed to use the library. A more frequent case is that a free -library does the same job as widely used non-free libraries. In this -case, there is little to gain by limiting the free library to free -software only, so we use the Lesser General Public License. - - In other cases, permission to use a particular library in non-free -programs enables a greater number of people to use a large body of -free software. For example, permission to use the GNU C Library in -non-free programs enables many more people to use the whole GNU -operating system, as well as its variant, the GNU/Linux operating -system. - - Although the Lesser General Public License is Less protective of the -users' freedom, it does ensure that the user of a program that is -linked with the Library has the freedom and the wherewithal to run -that program using a modified version of the Library. - - The precise terms and conditions for copying, distribution and -modification follow. Pay close attention to the difference between a -"work based on the library" and a "work that uses the library". The -former contains code derived from the library, whereas the latter must -be combined with the library in order to run. - - GNU LESSER GENERAL PUBLIC LICENSE - TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - - 0. This License Agreement applies to any software library or other -program which contains a notice placed by the copyright holder or -other authorized party saying it may be distributed under the terms of -this Lesser General Public License (also called "this License"). -Each licensee is addressed as "you". - - A "library" means a collection of software functions and/or data -prepared so as to be conveniently linked with application programs -(which use some of those functions and data) to form executables. - - The "Library", below, refers to any such software library or work -which has been distributed under these terms. A "work based on the -Library" means either the Library or any derivative work under -copyright law: that is to say, a work containing the Library or a -portion of it, either verbatim or with modifications and/or translated -straightforwardly into another language. (Hereinafter, translation is -included without limitation in the term "modification".) - - "Source code" for a work means the preferred form of the work for -making modifications to it. For a library, complete source code means -all the source code for all modules it contains, plus any associated -interface definition files, plus the scripts used to control compilation -and installation of the library. - - Activities other than copying, distribution and modification are not -covered by this License; they are outside its scope. The act of -running a program using the Library is not restricted, and output from -such a program is covered only if its contents constitute a work based -on the Library (independent of the use of the Library in a tool for -writing it). Whether that is true depends on what the Library does -and what the program that uses the Library does. - - 1. You may copy and distribute verbatim copies of the Library's -complete source code as you receive it, in any medium, provided that -you conspicuously and appropriately publish on each copy an -appropriate copyright notice and disclaimer of warranty; keep intact -all the notices that refer to this License and to the absence of any -warranty; and distribute a copy of this License along with the -Library. - - You may charge a fee for the physical act of transferring a copy, -and you may at your option offer warranty protection in exchange for a -fee. - - 2. You may modify your copy or copies of the Library or any portion -of it, thus forming a work based on the Library, and copy and -distribute such modifications or work under the terms of Section 1 -above, provided that you also meet all of these conditions: - - a) The modified work must itself be a software library. - - b) You must cause the files modified to carry prominent notices - stating that you changed the files and the date of any change. - - c) You must cause the whole of the work to be licensed at no - charge to all third parties under the terms of this License. - - d) If a facility in the modified Library refers to a function or a - table of data to be supplied by an application program that uses - the facility, other than as an argument passed when the facility - is invoked, then you must make a good faith effort to ensure that, - in the event an application does not supply such function or - table, the facility still operates, and performs whatever part of - its purpose remains meaningful. - - (For example, a function in a library to compute square roots has - a purpose that is entirely well-defined independent of the - application. Therefore, Subsection 2d requires that any - application-supplied function or table used by this function must - be optional: if the application does not supply it, the square - root function must still compute square roots.) - -These requirements apply to the modified work as a whole. If -identifiable sections of that work are not derived from the Library, -and can be reasonably considered independent and separate works in -themselves, then this License, and its terms, do not apply to those -sections when you distribute them as separate works. But when you -distribute the same sections as part of a whole which is a work based -on the Library, the distribution of the whole must be on the terms of -this License, whose permissions for other licensees extend to the -entire whole, and thus to each and every part regardless of who wrote -it. - -Thus, it is not the intent of this section to claim rights or contest -your rights to work written entirely by you; rather, the intent is to -exercise the right to control the distribution of derivative or -collective works based on the Library. - -In addition, mere aggregation of another work not based on the Library -with the Library (or with a work based on the Library) on a volume of -a storage or distribution medium does not bring the other work under -the scope of this License. - - 3. You may opt to apply the terms of the ordinary GNU General Public -License instead of this License to a given copy of the Library. To do -this, you must alter all the notices that refer to this License, so -that they refer to the ordinary GNU General Public License, version 2, -instead of to this License. (If a newer version than version 2 of the -ordinary GNU General Public License has appeared, then you can specify -that version instead if you wish.) Do not make any other change in -these notices. - - Once this change is made in a given copy, it is irreversible for -that copy, so the ordinary GNU General Public License applies to all -subsequent copies and derivative works made from that copy. - - This option is useful when you wish to copy part of the code of -the Library into a program that is not a library. - - 4. You may copy and distribute the Library (or a portion or -derivative of it, under Section 2) in object code or executable form -under the terms of Sections 1 and 2 above provided that you accompany -it with the complete corresponding machine-readable source code, which -must be distributed under the terms of Sections 1 and 2 above on a -medium customarily used for software interchange. - - If distribution of object code is made by offering access to copy -from a designated place, then offering equivalent access to copy the -source code from the same place satisfies the requirement to -distribute the source code, even though third parties are not -compelled to copy the source along with the object code. - - 5. A program that contains no derivative of any portion of the -Library, but is designed to work with the Library by being compiled or -linked with it, is called a "work that uses the Library". Such a -work, in isolation, is not a derivative work of the Library, and -therefore falls outside the scope of this License. - - However, linking a "work that uses the Library" with the Library -creates an executable that is a derivative of the Library (because it -contains portions of the Library), rather than a "work that uses the -library". The executable is therefore covered by this License. -Section 6 states terms for distribution of such executables. - - When a "work that uses the Library" uses material from a header file -that is part of the Library, the object code for the work may be a -derivative work of the Library even though the source code is not. -Whether this is true is especially significant if the work can be -linked without the Library, or if the work is itself a library. The -threshold for this to be true is not precisely defined by law. - - If such an object file uses only numerical parameters, data -structure layouts and accessors, and small macros and small inline -functions (ten lines or less in length), then the use of the object -file is unrestricted, regardless of whether it is legally a derivative -work. (Executables containing this object code plus portions of the -Library will still fall under Section 6.) - - Otherwise, if the work is a derivative of the Library, you may -distribute the object code for the work under the terms of Section 6. -Any executables containing that work also fall under Section 6, -whether or not they are linked directly with the Library itself. - - 6. As an exception to the Sections above, you may also combine or -link a "work that uses the Library" with the Library to produce a -work containing portions of the Library, and distribute that work -under terms of your choice, provided that the terms permit -modification of the work for the customer's own use and reverse -engineering for debugging such modifications. - - You must give prominent notice with each copy of the work that the -Library is used in it and that the Library and its use are covered by -this License. You must supply a copy of this License. If the work -during execution displays copyright notices, you must include the -copyright notice for the Library among them, as well as a reference -directing the user to the copy of this License. Also, you must do one -of these things: - - a) Accompany the work with the complete corresponding - machine-readable source code for the Library including whatever - changes were used in the work (which must be distributed under - Sections 1 and 2 above); and, if the work is an executable linked - with the Library, with the complete machine-readable "work that - uses the Library", as object code and/or source code, so that the - user can modify the Library and then relink to produce a modified - executable containing the modified Library. (It is understood - that the user who changes the contents of definitions files in the - Library will not necessarily be able to recompile the application - to use the modified definitions.) - - b) Use a suitable shared library mechanism for linking with the - Library. A suitable mechanism is one that (1) uses at run time a - copy of the library already present on the user's computer system, - rather than copying library functions into the executable, and (2) - will operate properly with a modified version of the library, if - the user installs one, as long as the modified version is - interface-compatible with the version that the work was made with. - - c) Accompany the work with a written offer, valid for at - least three years, to give the same user the materials - specified in Subsection 6a, above, for a charge no more - than the cost of performing this distribution. - - d) If distribution of the work is made by offering access to copy - from a designated place, offer equivalent access to copy the above - specified materials from the same place. - - e) Verify that the user has already received a copy of these - materials or that you have already sent this user a copy. - - For an executable, the required form of the "work that uses the -Library" must include any data and utility programs needed for -reproducing the executable from it. However, as a special exception, -the materials to be distributed need not include anything that is -normally distributed (in either source or binary form) with the major -components (compiler, kernel, and so on) of the operating system on -which the executable runs, unless that component itself accompanies -the executable. - - It may happen that this requirement contradicts the license -restrictions of other proprietary libraries that do not normally -accompany the operating system. Such a contradiction means you cannot -use both them and the Library together in an executable that you -distribute. - - 7. You may place library facilities that are a work based on the -Library side-by-side in a single library together with other library -facilities not covered by this License, and distribute such a combined -library, provided that the separate distribution of the work based on -the Library and of the other library facilities is otherwise -permitted, and provided that you do these two things: - - a) Accompany the combined library with a copy of the same work - based on the Library, uncombined with any other library - facilities. This must be distributed under the terms of the - Sections above. - - b) Give prominent notice with the combined library of the fact - that part of it is a work based on the Library, and explaining - where to find the accompanying uncombined form of the same work. - - 8. You may not copy, modify, sublicense, link with, or distribute -the Library except as expressly provided under this License. Any -attempt otherwise to copy, modify, sublicense, link with, or -distribute the Library is void, and will automatically terminate your -rights under this License. However, parties who have received copies, -or rights, from you under this License will not have their licenses -terminated so long as such parties remain in full compliance. - - 9. You are not required to accept this License, since you have not -signed it. However, nothing else grants you permission to modify or -distribute the Library or its derivative works. These actions are -prohibited by law if you do not accept this License. Therefore, by -modifying or distributing the Library (or any work based on the -Library), you indicate your acceptance of this License to do so, and -all its terms and conditions for copying, distributing or modifying -the Library or works based on it. - - 10. Each time you redistribute the Library (or any work based on the -Library), the recipient automatically receives a license from the -original licensor to copy, distribute, link with or modify the Library -subject to these terms and conditions. You may not impose any further -restrictions on the recipients' exercise of the rights granted herein. -You are not responsible for enforcing compliance by third parties with -this License. - - 11. If, as a consequence of a court judgment or allegation of patent -infringement or for any other reason (not limited to patent issues), -conditions are imposed on you (whether by court order, agreement or -otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot -distribute so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you -may not distribute the Library at all. For example, if a patent -license would not permit royalty-free redistribution of the Library by -all those who receive copies directly or indirectly through you, then -the only way you could satisfy both it and this License would be to -refrain entirely from distribution of the Library. - -If any portion of this section is held invalid or unenforceable under any -particular circumstance, the balance of the section is intended to apply, -and the section as a whole is intended to apply in other circumstances. - -It is not the purpose of this section to induce you to infringe any -patents or other property right claims or to contest validity of any -such claims; this section has the sole purpose of protecting the -integrity of the free software distribution system which is -implemented by public license practices. Many people have made -generous contributions to the wide range of software distributed -through that system in reliance on consistent application of that -system; it is up to the author/donor to decide if he or she is willing -to distribute software through any other system and a licensee cannot -impose that choice. - -This section is intended to make thoroughly clear what is believed to -be a consequence of the rest of this License. - - 12. If the distribution and/or use of the Library is restricted in -certain countries either by patents or by copyrighted interfaces, the -original copyright holder who places the Library under this License may add -an explicit geographical distribution limitation excluding those countries, -so that distribution is permitted only in or among countries not thus -excluded. In such case, this License incorporates the limitation as if -written in the body of this License. - - 13. The Free Software Foundation may publish revised and/or new -versions of the Lesser General Public License from time to time. -Such new versions will be similar in spirit to the present version, -but may differ in detail to address new problems or concerns. - -Each version is given a distinguishing version number. If the Library -specifies a version number of this License which applies to it and -"any later version", you have the option of following the terms and -conditions either of that version or of any later version published by -the Free Software Foundation. If the Library does not specify a -license version number, you may choose any version ever published by -the Free Software Foundation. - - 14. If you wish to incorporate parts of the Library into other free -programs whose distribution conditions are incompatible with these, -write to the author to ask for permission. For software which is -copyrighted by the Free Software Foundation, write to the Free -Software Foundation; we sometimes make exceptions for this. Our -decision will be guided by the two goals of preserving the free status -of all derivatives of our free software and of promoting the sharing -and reuse of software generally. - - NO WARRANTY - - 15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO -WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW. -EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR -OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY -KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE -IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE -LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME -THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. - - 16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN -WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY -AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU -FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR -CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE -LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING -RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A -FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF -SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH -DAMAGES. - - END OF TERMS AND CONDITIONS diff --git a/credits/MinecraftForge-Credits.txt b/credits/MinecraftForge-Credits.txt deleted file mode 100644 index d0de5a5..0000000 --- a/credits/MinecraftForge-Credits.txt +++ /dev/null @@ -1,26 +0,0 @@ -* Eloraam * - -* FlowerChild * - -* Hawkye * - -* MALfunction84 * - -Submitted the sleep handler code for his mod (Somnia) and others to use. - -* Scokeev9 * - -Gave permission for ScotTools API to be integrated into MCF, and also supported the Forge by converting his mods to use it. - -ScotTools Background: ScotTools was an API that enabled modders to add blocks to harvesting levels (and many other ease-of-use features to create new tools), and the first tool API that used block material for block breaking efficiency which allowed blocks from mods that didn't use ScotTools API to break with the correct speed. - -* SpaceToad * - -* LexManos * - -* cpw * - -* Minecraft Coder Pack (MCP) * -Forge Mod Loader and Minecraft Forge have permission to distribute and automatically download components of MCP and distribute MCP data files. -This permission is not transitive and others wishing to redistribute the Minecraft Forge source independently should seek permission of MCP or -remove the MCP data files and request their users to download MCP separately. diff --git a/credits/Paulscode IBXM Library License.txt b/credits/Paulscode IBXM Library License.txt deleted file mode 100644 index d4884b0..0000000 --- a/credits/Paulscode IBXM Library License.txt +++ /dev/null @@ -1,10 +0,0 @@ -IBXM is copyright (c) 2007, Martin Cameron, and is licensed under the BSD License. -All rights reserved. - -Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: - -Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. -Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. -Neither the name of mumart nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - diff --git a/credits/Paulscode SoundSystem CodecIBXM License.txt b/credits/Paulscode SoundSystem CodecIBXM License.txt deleted file mode 100644 index a68a494..0000000 --- a/credits/Paulscode SoundSystem CodecIBXM License.txt +++ /dev/null @@ -1,40 +0,0 @@ -SoundSystem CodecIBXM Class License: - -You are free to use this class for any purpose, commercial or otherwise. -You may modify this class or source code, and distribute it any way you -like, provided the following conditions are met: - -1) You may not falsely claim to be the author of this class or any - unmodified portion of it. -2) You may not copyright this class or a modified version of it and then - sue me for copyright infringement. -3) If you modify the source code, you must clearly document the changes - made before redistributing the modified source code, so other users know - it is not the original code. -4) You are not required to give me credit for this class in any derived - work, but if you do, you must also mention my website: - http://www.paulscode.com -5) I the author will not be responsible for any damages (physical, - financial, or otherwise) caused by the use if this class or any - portion of it. -6) I the author do not guarantee, warrant, or make any representations, - either expressed or implied, regarding the use of this class or any - portion of it. - -Author: Paul Lamb -http://www.paulscode.com - - -This software is based on or using the IBXM library available from -http://www.geocities.com/sunet2000/ - - -IBXM is copyright (c) 2007, Martin Cameron, and is licensed under the BSD License. -All rights reserved. - -Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: - -Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. -Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. -Neither the name of mumart nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. diff --git a/fabric/build.gradle b/fabric/build.gradle new file mode 100644 index 0000000..4b3d4ca --- /dev/null +++ b/fabric/build.gradle @@ -0,0 +1,64 @@ +plugins { + id 'multiloader-loader' + id 'net.fabricmc.fabric-loom' +} +dependencies { + minecraft("com.mojang:minecraft:${minecraft_version}") + implementation("net.fabricmc:fabric-loader:${fabric_loader_version}") + implementation("net.fabricmc.fabric-api:fabric-api:${fabric_version}") +} + +loom { + def aw = rootProject.file("src/main/resources/${mod_id}.accesswidener") + if (aw.exists()) { + accessWidenerPath.set(aw) + } + runs { + client { + client() + setConfigName('Fabric Client') + ideConfigGenerated(true) + runDir('runs/client') + } + server { + server() + setConfigName('Fabric Server') + ideConfigGenerated(true) + runDir('runs/server') + } + gametest { + server() + setConfigName('Fabric Game Test') + ideConfigGenerated(true) + vmArg('-Dfabric-api.gametest') + vmArg("-Dfabric-api.gametest.report-file=${project.layout.buildDirectory.get().asFile}/gametest/junit.xml") + runDir('runs/gametest') + } + clientGametest { + client() + setConfigName('Fabric Client Game Test') + ideConfigGenerated(true) + vmArg('-Dfabric.client.gametest') + runDir('runs/clientGametest') + } + } +} + +// Implement mcgradleconventions loader attribute +def loaderAttribute = Attribute.of('io.github.mcgradleconventions.loader', String) +['apiElements', 'runtimeElements', 'sourcesElements', 'javadocElements', 'includeInternal', 'modCompileClasspath'].each { variant -> + configurations.named(variant) { + attributes { + attribute(loaderAttribute, 'fabric') + } + } +} +sourceSets.configureEach { + [it.compileClasspathConfigurationName, it.runtimeClasspathConfigurationName].each { variant-> + configurations.named(variant) { + attributes { + attribute(loaderAttribute, 'fabric') + } + } + } +} diff --git a/fabric/gradle.properties b/fabric/gradle.properties new file mode 100644 index 0000000..a73fc9d --- /dev/null +++ b/fabric/gradle.properties @@ -0,0 +1 @@ +fabric_loader_version=0.19.5 diff --git a/fabric/src/main/java/net/modcrafters/minecraft/villagermarket/fabric/VillagerMarketFabric.java b/fabric/src/main/java/net/modcrafters/minecraft/villagermarket/fabric/VillagerMarketFabric.java new file mode 100644 index 0000000..b5a6b7e --- /dev/null +++ b/fabric/src/main/java/net/modcrafters/minecraft/villagermarket/fabric/VillagerMarketFabric.java @@ -0,0 +1,31 @@ +package net.modcrafters.minecraft.villagermarket.fabric; + +import net.modcrafters.minecraft.villagermarket.Constants; +import net.modcrafters.minecraft.villagermarket.ModContent; +import net.modcrafters.minecraft.villagermarket.VillagerMarket; +import net.modcrafters.minecraft.villagermarket.network.MarketPayloads; +import net.fabricmc.api.ModInitializer; +import net.fabricmc.fabric.api.creativetab.v1.FabricCreativeModeTab; +import net.fabricmc.fabric.api.networking.v1.PayloadTypeRegistry; +import net.fabricmc.fabric.api.networking.v1.ServerPlayNetworking; +import net.minecraft.core.Registry; +import net.minecraft.core.registries.BuiltInRegistries; + +public class VillagerMarketFabric implements ModInitializer { + @Override + public void onInitialize() { + VillagerMarket.init(); + Registry.register(BuiltInRegistries.BLOCK, ModContent.MARKET_ID.identifier(), ModContent.marketBlock()); + Registry.register(BuiltInRegistries.ITEM, ModContent.MARKET_ITEM_ID.identifier(), ModContent.marketItem()); + Registry.register(BuiltInRegistries.MENU, ModContent.MENU_ID.identifier(), ModContent.menu()); + Registry.register(BuiltInRegistries.CREATIVE_MODE_TAB, ModContent.TAB_ID.identifier(), + ModContent.titled(FabricCreativeModeTab.builder()) + .displayItems((parameters, output) -> output.accept(ModContent.MARKET_ITEM)) + .build()); + PayloadTypeRegistry.clientboundPlay().register(MarketPayloads.Offers.TYPE, MarketPayloads.Offers.STREAM_CODEC); + PayloadTypeRegistry.serverboundPlay().register(MarketPayloads.Trade.TYPE, MarketPayloads.Trade.STREAM_CODEC); + ServerPlayNetworking.registerGlobalReceiver(MarketPayloads.Trade.TYPE, + (payload, context) -> context.server().execute(() -> MarketPayloads.handleTrade(context.player(), payload))); + Constants.LOG.info("Villager Market Fabric init"); + } +} diff --git a/fabric/src/main/java/net/modcrafters/minecraft/villagermarket/fabric/client/VillagerMarketFabricClient.java b/fabric/src/main/java/net/modcrafters/minecraft/villagermarket/fabric/client/VillagerMarketFabricClient.java new file mode 100644 index 0000000..72c0a38 --- /dev/null +++ b/fabric/src/main/java/net/modcrafters/minecraft/villagermarket/fabric/client/VillagerMarketFabricClient.java @@ -0,0 +1,17 @@ +package net.modcrafters.minecraft.villagermarket.fabric.client; + +import net.modcrafters.minecraft.villagermarket.ModContent; +import net.modcrafters.minecraft.villagermarket.client.VillagerMarketScreen; +import net.modcrafters.minecraft.villagermarket.network.MarketPayloads; +import net.fabricmc.api.ClientModInitializer; +import net.fabricmc.fabric.api.client.networking.v1.ClientPlayNetworking; +import net.minecraft.client.gui.screens.MenuScreens; + +public class VillagerMarketFabricClient implements ClientModInitializer { + @Override + public void onInitializeClient() { + MenuScreens.register(ModContent.menu(), VillagerMarketScreen::new); + ClientPlayNetworking.registerGlobalReceiver(MarketPayloads.Offers.TYPE, + (payload, context) -> context.client().execute(() -> VillagerMarketScreen.apply(payload))); + } +} diff --git a/fabric/src/main/java/net/modcrafters/minecraft/villagermarket/fabric/gametest/FabricMarketGameTests.java b/fabric/src/main/java/net/modcrafters/minecraft/villagermarket/fabric/gametest/FabricMarketGameTests.java new file mode 100644 index 0000000..14c0582 --- /dev/null +++ b/fabric/src/main/java/net/modcrafters/minecraft/villagermarket/fabric/gametest/FabricMarketGameTests.java @@ -0,0 +1,27 @@ +package net.modcrafters.minecraft.villagermarket.fabric.gametest; + +import net.modcrafters.minecraft.villagermarket.gametest.MarketGameTests; +import net.fabricmc.fabric.api.gametest.v1.GameTest; +import net.minecraft.gametest.framework.GameTestHelper; + +public class FabricMarketGameTests { + @GameTest(structure = "minecraft:empty") + public void oneEmeraldBuysBread(GameTestHelper helper) { + MarketGameTests.oneEmeraldBuysBread(helper); + } + + @GameTest(structure = "minecraft:empty") + public void componentsMustMatch(GameTestHelper helper) { + MarketGameTests.componentsMustMatch(helper); + } + + @GameTest(structure = "minecraft:empty") + public void villagerOutsideTheBoxIsNotTraded(GameTestHelper helper) { + MarketGameTests.villagerOutsideTheBoxIsNotTraded(helper); + } + + @GameTest(structure = "minecraft:empty") + public void adjustedPriceIsWhatIsCharged(GameTestHelper helper) { + MarketGameTests.adjustedPriceIsWhatIsCharged(helper); + } +} diff --git a/fabric/src/main/java/net/modcrafters/minecraft/villagermarket/fabric/platform/FabricPlatformHelper.java b/fabric/src/main/java/net/modcrafters/minecraft/villagermarket/fabric/platform/FabricPlatformHelper.java new file mode 100644 index 0000000..4f07da3 --- /dev/null +++ b/fabric/src/main/java/net/modcrafters/minecraft/villagermarket/fabric/platform/FabricPlatformHelper.java @@ -0,0 +1,61 @@ +package net.modcrafters.minecraft.villagermarket.fabric.platform; + +import net.modcrafters.minecraft.villagermarket.menu.OpeningData; +import net.modcrafters.minecraft.villagermarket.menu.VillagerMarketMenu; +import net.modcrafters.minecraft.villagermarket.platform.services.PlatformHelper; +import net.fabricmc.fabric.api.client.networking.v1.ClientPlayNetworking; +import net.fabricmc.fabric.api.menu.v1.ExtendedMenuProvider; +import net.fabricmc.fabric.api.menu.v1.ExtendedMenuType; +import net.fabricmc.fabric.api.networking.v1.ServerPlayNetworking; +import net.minecraft.core.BlockPos; +import net.minecraft.network.chat.Component; +import net.minecraft.network.protocol.common.custom.CustomPacketPayload; +import net.minecraft.server.level.ServerLevel; +import net.minecraft.server.level.ServerPlayer; +import net.minecraft.world.entity.player.Inventory; +import net.minecraft.world.entity.player.Player; +import net.minecraft.world.inventory.AbstractContainerMenu; +import net.minecraft.world.inventory.MenuType; + +public class FabricPlatformHelper implements PlatformHelper { + @Override + public String platformName() { + return "Fabric"; + } + + @Override + public MenuType<VillagerMarketMenu> marketMenu() { + return new ExtendedMenuType<>(VillagerMarketMenu::new, OpeningData.STREAM_CODEC); + } + + @Override + public void openMarket(ServerPlayer player, BlockPos pos) { + OpeningData data = VillagerMarketMenu.opening((ServerLevel) player.level(), pos); + player.openMenu(new ExtendedMenuProvider<OpeningData>() { + @Override + public OpeningData getScreenOpeningData(ServerPlayer player) { + return data; + } + + @Override + public Component getDisplayName() { + return Component.translatable("block.villagermarket.villager_market"); + } + + @Override + public AbstractContainerMenu createMenu(int containerId, Inventory inventory, Player player) { + return new VillagerMarketMenu(containerId, inventory, data); + } + }); + } + + @Override + public void sendToPlayer(ServerPlayer player, CustomPacketPayload payload) { + ServerPlayNetworking.send(player, payload); + } + + @Override + public void sendToServer(CustomPacketPayload payload) { + ClientPlayNetworking.send(payload); + } +} diff --git a/fabric/src/main/resources/META-INF/services/net.modcrafters.minecraft.villagermarket.platform.services.PlatformHelper b/fabric/src/main/resources/META-INF/services/net.modcrafters.minecraft.villagermarket.platform.services.PlatformHelper new file mode 100644 index 0000000..ff1ba7e --- /dev/null +++ b/fabric/src/main/resources/META-INF/services/net.modcrafters.minecraft.villagermarket.platform.services.PlatformHelper @@ -0,0 +1 @@ +net.modcrafters.minecraft.villagermarket.fabric.platform.FabricPlatformHelper diff --git a/fabric/src/main/resources/fabric.mod.json b/fabric/src/main/resources/fabric.mod.json new file mode 100644 index 0000000..795bb27 --- /dev/null +++ b/fabric/src/main/resources/fabric.mod.json @@ -0,0 +1,31 @@ +{ + "schemaVersion": 1, + "id": "${mod_id}", + "version": "${version}", + "name": "${mod_name}", + "description": "${description}", + "authors": ["${mod_author}"], + "license": "${license}", + "environment": "*", + "entrypoints": { + "main": [ + "net.modcrafters.minecraft.villagermarket.fabric.VillagerMarketFabric" + ], + "client": [ + "net.modcrafters.minecraft.villagermarket.fabric.client.VillagerMarketFabricClient" + ], + "fabric-gametest": [ + "net.modcrafters.minecraft.villagermarket.fabric.gametest.FabricMarketGameTests" + ] + }, + "mixins": [ + "${mod_id}.mixins.json", + "${mod_id}.fabric.mixins.json" + ], + "depends": { + "fabricloader": ">=${fabric_loader_version}", + "fabric-api": "*", + "minecraft": "~${minecraft_version}", + "java": ">=${java_version}" + } +} diff --git a/fabric/src/main/resources/villagermarket.fabric.mixins.json b/fabric/src/main/resources/villagermarket.fabric.mixins.json new file mode 100644 index 0000000..06c4e11 --- /dev/null +++ b/fabric/src/main/resources/villagermarket.fabric.mixins.json @@ -0,0 +1,11 @@ +{ + "required": true, + "minVersion": "0.8", + "package": "net.modcrafters.minecraft.villagermarket.fabric.mixin", + "compatibilityLevel": "JAVA_${java_version}", + "mixins": [], + "client": [], + "server": [], + "injectors": { "defaultRequire": 1 }, + "overwrites": { "requireAnnotations": true } +} diff --git a/fabric/versions/26.3/gradle.properties b/fabric/versions/26.3/gradle.properties new file mode 100644 index 0000000..1ebc472 --- /dev/null +++ b/fabric/versions/26.3/gradle.properties @@ -0,0 +1,4 @@ +minecraft_version=26.3 +minecraft_version_range=[26.3, 26.4) +java_version=25 +fabric_version=0.162.0+26.3 diff --git a/gradle.properties b/gradle.properties index fa090a4..0c26a6a 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,16 +1,20 @@ -minecraft_version=1.12.2 -forge_version=14.23.2.2611 -mcp_version=snapshot_20180223 +# Every field added here must also be added to the expandProps map in +# build-logic/src/main/groovy/multiloader-common.gradle, or resource expansion +# fails with a missing property. +# Minecraft, Java and loader versions differ per version, so they live in each +# version's gradle.properties: versions/<mc>, fabric/versions/<mc> and neoforge/versions/<mc>. +# Values shared by every version of one loader live in fabric/ and neoforge/gradle.properties. +version=2.0.0 +group=net.modcrafters.minecraft +mod_name=Villager Market +mod_author=Face_of_Cat +mod_id=villagermarket +license=MIT +credits= +description=One block for trading with nearby villagers. -cursegradle_version = 1.4.0 +# Stonecutter refuses to run when the generated sources are not the VCS version. +dev.kikugie.stonecutter.hard_mode=true -group_name = net.ndrei -mod_id = villagermarket -mod_name = Villager Market -mod_version = 1.0.2 - -cf_project_id = 261505 -# none | alpha | beta | release -cf_release_type = none - -jei_version = 4.8.5 +org.gradle.jvmargs=-Xmx3G +org.gradle.daemon=false diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 99340b4ad18d3c7e764794d300ffd35017036793..eddabd2eef8d94a5437d6168ff9c87a78ff725b3 100644 GIT binary patch literal 47505 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 YQ9&9GvPg!4B8U80L2j|o-`~Caf9B|G;{X5v literal 54333 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 D&=%~j diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 97af591..ad7845b 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,9 @@ -#Sun Feb 16 07:52:09 EET 2020 -distributionUrl=https\://services.gradle.org/distributions/gradle-4.4.1-all.zip distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -zipStorePath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-9.7.1-bin.zip +networkTimeout=10000 +retries=0 +retryBackOffMs=500 +validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew index cccdd3d..249efbb 100644 --- a/gradlew +++ b/gradlew @@ -1,78 +1,128 @@ -#!/usr/bin/env sh +#!/bin/sh + +# +# Copyright © 2015 the original authors. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +# SPDX-License-Identifier: Apache-2.0 +# ############################################################################## -## -## Gradle start up script for UN*X -## +# +# gradlew start up script for POSIX generated by Gradle. +# +# Important for running: +# +# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is +# noncompliant, but you have some other compliant shell such as ksh or +# bash, then to run this script, type that shell name before the whole +# command line, like: +# +# ksh gradlew +# +# Busybox and similar reduced shells will NOT work, because this script +# requires all of these POSIX shell features: +# * functions; +# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», +# «${var#prefix}», «${var%suffix}», and «$( cmd )»; +# * compound commands having a testable exit status, especially «case»; +# * various built-in commands including «command», «set», and «ulimit». +# +# Important for patching: +# +# (2) This script targets any POSIX shell, so it avoids extensions provided +# by Bash, Ksh, etc; in particular arrays are avoided. +# +# The "traditional" practice of packing multiple parameters into a +# space-separated string is a well documented source of bugs and security +# problems, so this is (mostly) avoided, by progressively accumulating +# options in "$@", and eventually passing that to Java. +# +# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS, +# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly; +# see the in-line comments for details. +# +# There are tweaks for specific operating systems such as AIX, CygWin, +# Darwin, MinGW, and NonStop. +# +# (3) This script is generated from the Groovy template +# https://github.com/gradle/gradle/blob/3d91ce3b8caaf77ad09f381f43615b715b53f72c/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# within the Gradle project. +# +# You can find Gradle at https://github.com/gradle/gradle/. +# ############################################################################## # Attempt to set APP_HOME + # Resolve links: $0 may be a link -PRG="$0" -# Need this for relative symlinks. -while [ -h "$PRG" ] ; do - ls=`ls -ld "$PRG"` - link=`expr "$ls" : '.*-> \(.*\)$'` - if expr "$link" : '/.*' > /dev/null; then - PRG="$link" - else - PRG=`dirname "$PRG"`"/$link" - fi +app_path=$0 + +# Need this for daisy-chained symlinks. +while + APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path + [ -h "$app_path" ] +do + ls=$( ls -ld "$app_path" ) + link=${ls#*' -> '} + case $link in #( + /*) app_path=$link ;; #( + *) app_path=$APP_HOME$link ;; + esac done -SAVED="`pwd`" -cd "`dirname \"$PRG\"`/" >/dev/null -APP_HOME="`pwd -P`" -cd "$SAVED" >/dev/null - -APP_NAME="Gradle" -APP_BASE_NAME=`basename "$0"` -# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -DEFAULT_JVM_OPTS="" +# This is normally unused +# shellcheck disable=SC2034 +APP_BASE_NAME=${0##*/} +# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) +APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit # Use the maximum available, or set MAX_FD != -1 to use that value. -MAX_FD="maximum" +MAX_FD=maximum warn () { echo "$*" -} +} >&2 die () { echo echo "$*" echo exit 1 -} +} >&2 # OS specific support (must be 'true' or 'false'). cygwin=false msys=false darwin=false nonstop=false -case "`uname`" in - CYGWIN* ) - cygwin=true - ;; - Darwin* ) - darwin=true - ;; - MINGW* ) - msys=true - ;; - NONSTOP* ) - nonstop=true - ;; +case "$( uname )" in #( + CYGWIN* ) cygwin=true ;; #( + Darwin* ) darwin=true ;; #( + MSYS* | MINGW* ) msys=true ;; #( + NONSTOP* ) nonstop=true ;; esac -CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + # Determine the Java command to use to start the JVM. if [ -n "$JAVA_HOME" ] ; then if [ -x "$JAVA_HOME/jre/sh/java" ] ; then # IBM's JDK on AIX uses strange locations for the executables - JAVACMD="$JAVA_HOME/jre/sh/java" + JAVACMD=$JAVA_HOME/jre/sh/java else - JAVACMD="$JAVA_HOME/bin/java" + JAVACMD=$JAVA_HOME/bin/java fi if [ ! -x "$JAVACMD" ] ; then die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME @@ -81,92 +131,118 @@ Please set the JAVA_HOME variable in your environment to match the location of your Java installation." fi else - JAVACMD="java" - which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + JAVACMD=java + if ! command -v java >/dev/null 2>&1 + then + die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. Please set the JAVA_HOME variable in your environment to match the location of your Java installation." + fi fi # Increase the maximum file descriptors if we can. -if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then - MAX_FD_LIMIT=`ulimit -H -n` - if [ $? -eq 0 ] ; then - if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then - MAX_FD="$MAX_FD_LIMIT" - fi - ulimit -n $MAX_FD - if [ $? -ne 0 ] ; then - warn "Could not set maximum file descriptor limit: $MAX_FD" - fi - else - warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" - fi +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 + ulimit -n "$MAX_FD" || + warn "Could not set maximum file descriptor limit to $MAX_FD" + esac fi -# For Darwin, add options to specify how the application appears in the dock -if $darwin; then - GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" -fi +# Collect all arguments for the java command, stacking in reverse order: +# * args from the command line +# * the main class name +# * -classpath +# * -D...appname settings +# * --module-path (only if needed) +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. + +# For Cygwin or MSYS, switch paths to Windows format before running java +if "$cygwin" || "$msys" ; then + APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) + + JAVACMD=$( cygpath --unix "$JAVACMD" ) -# For Cygwin, switch paths to Windows format before running java -if $cygwin ; then - APP_HOME=`cygpath --path --mixed "$APP_HOME"` - CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` - JAVACMD=`cygpath --unix "$JAVACMD"` - - # We build the pattern for arguments to be converted via cygpath - ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` - SEP="" - for dir in $ROOTDIRSRAW ; do - ROOTDIRS="$ROOTDIRS$SEP$dir" - SEP="|" - done - OURCYGPATTERN="(^($ROOTDIRS))" - # Add a user-defined pattern to the cygpath arguments - if [ "$GRADLE_CYGPATTERN" != "" ] ; then - OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" - fi # Now convert the arguments - kludge to limit ourselves to /bin/sh - i=0 - for arg in "$@" ; do - CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` - CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option - - if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition - eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` - else - eval `echo args$i`="\"$arg\"" + for arg do + if + case $arg in #( + -*) false ;; # don't mess with options #( + /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath + [ -e "$t" ] ;; #( + *) false ;; + esac + then + arg=$( cygpath --path --ignore --mixed "$arg" ) fi - i=$((i+1)) + # Roll the args list around exactly as many times as the number of + # args, so each arg winds up back in the position where it started, but + # possibly modified. + # + # NB: a `for` loop captures its iteration list before it begins, so + # changing the positional parameters here affects neither the number of + # iterations, nor the values presented in `arg`. + shift # remove old arg + set -- "$@" "$arg" # push replacement arg done - case $i in - (0) set -- ;; - (1) set -- "$args0" ;; - (2) set -- "$args0" "$args1" ;; - (3) set -- "$args0" "$args1" "$args2" ;; - (4) set -- "$args0" "$args1" "$args2" "$args3" ;; - (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; - (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; - (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; - (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; - (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; - esac fi -# Escape application args -save () { - for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done - echo " " -} -APP_ARGS=$(save "$@") - -# Collect all arguments for the java command, following the shell quoting and substitution rules -eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" -# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong -if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then - cd "$(dirname "$0")" +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + +# Collect all arguments for the java command: +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments, +# and any embedded shellness will be escaped. +# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be +# treated as '${Hostname}' itself on the command line. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \ + "$@" + +# Stop when "xargs" is not available. +if ! command -v xargs >/dev/null 2>&1 +then + die "xargs is not available" fi +# Use "xargs" to parse quoted args. +# +# With -n1 it outputs one arg per line, with the quotes and backslashes removed. +# +# In Bash we could simply go: +# +# readarray ARGS < <( xargs -n1 <<<"$var" ) && +# set -- "${ARGS[@]}" "$@" +# +# but POSIX shell has neither arrays nor command substitution, so instead we +# post-process each arg (as a line of input to sed) to backslash-escape any +# character that might be a shell metacharacter, then use eval to reverse +# that process (while maintaining the separation between arguments), and wrap +# the whole thing up as a single "set" statement. +# +# This will of course break if any of these variables contains a newline or +# an unmatched quote. +# + +eval "set -- $( + printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | + xargs -n1 | + sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | + tr '\n' ' ' + )" '"$@"' + exec "$JAVACMD" "$@" diff --git a/gradlew.bat b/gradlew.bat index f955316..a51ec4f 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -1,84 +1,82 @@ -@if "%DEBUG%" == "" @echo off +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem You may obtain a copy of the License at +@rem +@rem https://www.apache.org/licenses/LICENSE-2.0 +@rem +@rem Unless required by applicable law or agreed to in writing, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@rem See the License for the specific language governing permissions and +@rem limitations under the License. +@rem +@rem SPDX-License-Identifier: Apache-2.0 +@rem + +@if "%DEBUG%"=="" @echo off @rem ########################################################################## @rem -@rem Gradle startup script for Windows +@rem gradlew startup script for Windows @rem @rem ########################################################################## -@rem Set local scope for the variables with windows NT shell -if "%OS%"=="Windows_NT" setlocal +@rem Set local scope for the variables, and ensure extensions are enabled +setlocal EnableExtensions set DIRNAME=%~dp0 -if "%DIRNAME%" == "" set DIRNAME=. +if "%DIRNAME%"=="" set DIRNAME=. +@rem This is normally unused set APP_BASE_NAME=%~n0 set APP_HOME=%DIRNAME% +@rem Resolve any "." and ".." in APP_HOME to make it shorter. +for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi + @rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -set DEFAULT_JVM_OPTS= +set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" @rem Find java.exe if defined JAVA_HOME goto findJavaFromJavaHome set JAVA_EXE=java.exe %JAVA_EXE% -version >NUL 2>&1 -if "%ERRORLEVEL%" == "0" goto init +if %ERRORLEVEL% equ 0 goto execute -echo. -echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. +echo. 1>&2 +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 -goto fail +"%COMSPEC%" /c exit 1 :findJavaFromJavaHome set JAVA_HOME=%JAVA_HOME:"=% set JAVA_EXE=%JAVA_HOME%/bin/java.exe -if exist "%JAVA_EXE%" goto init +if exist "%JAVA_EXE%" goto execute -echo. -echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. +echo. 1>&2 +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 -goto fail - -:init -@rem Get command-line arguments, handling Windows variants - -if not "%OS%" == "Windows_NT" goto win9xME_args - -:win9xME_args -@rem Slurp the command line arguments. -set CMD_LINE_ARGS= -set _SKIP=2 - -:win9xME_args_slurp -if "x%~1" == "x" goto execute - -set CMD_LINE_ARGS=%* +"%COMSPEC%" /c exit 1 :execute @rem Setup the command line -set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar - -@rem Execute Gradle -"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS% - -:end -@rem End local scope for the variables with windows NT shell -if "%ERRORLEVEL%"=="0" goto mainEnd -:fail -rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of -rem the _cmd.exe /c_ return code! -if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 -exit /b 1 -:mainEnd -if "%OS%"=="Windows_NT" endlocal +@rem Execute gradlew +@rem endlocal doesn't take effect until after the line is parsed and variables are expanded +@rem which allows us to clear the local environment before executing the java command +endlocal & "%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %* & call :exitWithErrorLevel -:omega +:exitWithErrorLevel +@rem Use "%COMSPEC%" /c exit to allow operators to work properly in scripts +"%COMSPEC%" /c exit %ERRORLEVEL% diff --git a/neoforge/build.gradle b/neoforge/build.gradle new file mode 100644 index 0000000..66611f8 --- /dev/null +++ b/neoforge/build.gradle @@ -0,0 +1,61 @@ +plugins { + id 'multiloader-loader' + id 'net.neoforged.moddev' +} + +neoForge { + version = neoforge_version + def at = rootProject.file('src/main/resources/META-INF/accesstransformer.cfg') + if (at.exists()) { + accessTransformers.from(at.absolutePath) + } + runs { + configureEach { + systemProperty('neoforge.enabledGameTestNamespaces', mod_id) + ideName = "NeoForge ${it.name.capitalize()} (${project.path})" + } + client { + client() + gameDirectory = this.mkdir(this.file('runs/client')) + } + data { + "${neoforge_data_run}"() + gameDirectory = this.mkdir(this.file('runs/data')) + programArguments.addAll '--mod', project.mod_id, '--all', '--output', file('src/generated/resources/').getAbsolutePath(), '--existing', file('src/main/resources/').getAbsolutePath() + } + server { + server() + this.file('runs/server').createParentDirectories() + gameDirectory = this.mkdir(this.file('runs/server')) + } + gameTestServer { + type = 'gameTestServer' + gameDirectory = this.mkdir(this.file('runs/gametest')) + } + } + mods { + "${mod_id}" { + sourceSet sourceSets.main + } + } +} + +sourceSets.main.resources { srcDir 'src/generated/resources' } + +def loaderAttribute = Attribute.of('io.github.mcgradleconventions.loader', String) +['apiElements', 'runtimeElements', 'sourcesElements', 'javadocElements'].each { variant -> + configurations.named(variant) { + attributes { + attribute(loaderAttribute, 'neoforge') + } + } +} +sourceSets.configureEach { + [it.compileClasspathConfigurationName, it.runtimeClasspathConfigurationName, it.getTaskName(null, 'jarJar')].each { variant -> + configurations.named(variant) { + attributes { + attribute(loaderAttribute, 'neoforge') + } + } + } +} diff --git a/neoforge/gradle.properties b/neoforge/gradle.properties new file mode 100644 index 0000000..15cb837 --- /dev/null +++ b/neoforge/gradle.properties @@ -0,0 +1 @@ +neoforge_loader_version_range=[4,) diff --git a/neoforge/src/main/java/net/modcrafters/minecraft/villagermarket/neoforge/VillagerMarketNeoForge.java b/neoforge/src/main/java/net/modcrafters/minecraft/villagermarket/neoforge/VillagerMarketNeoForge.java new file mode 100644 index 0000000..b4fe65d --- /dev/null +++ b/neoforge/src/main/java/net/modcrafters/minecraft/villagermarket/neoforge/VillagerMarketNeoForge.java @@ -0,0 +1,53 @@ +package net.modcrafters.minecraft.villagermarket.neoforge; + +import net.modcrafters.minecraft.villagermarket.Constants; +import net.modcrafters.minecraft.villagermarket.ModContent; +import net.modcrafters.minecraft.villagermarket.VillagerMarket; +import net.modcrafters.minecraft.villagermarket.neoforge.client.VillagerMarketNeoForgeClient; +import net.modcrafters.minecraft.villagermarket.neoforge.gametest.NeoForgeMarketGameTests; +import net.modcrafters.minecraft.villagermarket.network.MarketPayloads; +import net.minecraft.core.registries.Registries; +import net.minecraft.world.item.CreativeModeTab; +import net.neoforged.api.distmarker.Dist; +import net.neoforged.bus.api.IEventBus; +import net.neoforged.fml.common.Mod; +import net.neoforged.fml.loading.FMLEnvironment; +import net.neoforged.neoforge.network.event.RegisterPayloadHandlersEvent; +import net.neoforged.neoforge.network.registration.PayloadRegistrar; +import net.neoforged.neoforge.registries.RegisterEvent; + +@Mod(Constants.MOD_ID) +public class VillagerMarketNeoForge { + public VillagerMarketNeoForge(IEventBus modBus) { + VillagerMarket.init(); + modBus.addListener(VillagerMarketNeoForge::registerContent); + modBus.addListener(VillagerMarketNeoForge::registerPayloads); + NeoForgeMarketGameTests.register(modBus); + //? if >=1.21.9 { + if (FMLEnvironment.getDist() == Dist.CLIENT) { + //?} else + //if (FMLEnvironment.dist == Dist.CLIENT) { + VillagerMarketNeoForgeClient.register(modBus); + } + } + + private static void registerContent(RegisterEvent event) { + event.register(Registries.BLOCK, ModContent.MARKET_ID.identifier(), ModContent::marketBlock); + event.register(Registries.ITEM, ModContent.MARKET_ITEM_ID.identifier(), ModContent::marketItem); + event.register(Registries.MENU, ModContent.MENU_ID.identifier(), ModContent::menu); + event.register(Registries.CREATIVE_MODE_TAB, ModContent.TAB_ID.identifier(), () -> + ModContent.titled(CreativeModeTab.builder()) + .displayItems((parameters, output) -> output.accept(ModContent.MARKET_ITEM)) + .build()); + } + + private static void registerPayloads(RegisterPayloadHandlersEvent event) { + PayloadRegistrar registrar = event.registrar("1"); + //? if >=1.21.6 { + registrar.playToClient(MarketPayloads.Offers.TYPE, MarketPayloads.Offers.STREAM_CODEC); + //?} else + //registrar.playToClient(MarketPayloads.Offers.TYPE, MarketPayloads.Offers.STREAM_CODEC, (payload, context) -> net.modcrafters.minecraft.villagermarket.client.VillagerMarketScreen.apply(payload)); + registrar.playToServer(MarketPayloads.Trade.TYPE, MarketPayloads.Trade.STREAM_CODEC, + (payload, context) -> context.enqueueWork(() -> MarketPayloads.handleTrade((net.minecraft.server.level.ServerPlayer) context.player(), payload))); + } +} diff --git a/neoforge/src/main/java/net/modcrafters/minecraft/villagermarket/neoforge/client/VillagerMarketNeoForgeClient.java b/neoforge/src/main/java/net/modcrafters/minecraft/villagermarket/neoforge/client/VillagerMarketNeoForgeClient.java new file mode 100644 index 0000000..0e9169f --- /dev/null +++ b/neoforge/src/main/java/net/modcrafters/minecraft/villagermarket/neoforge/client/VillagerMarketNeoForgeClient.java @@ -0,0 +1,30 @@ +package net.modcrafters.minecraft.villagermarket.neoforge.client; + +import net.modcrafters.minecraft.villagermarket.ModContent; +import net.modcrafters.minecraft.villagermarket.client.VillagerMarketScreen; +import net.modcrafters.minecraft.villagermarket.network.MarketPayloads; +import net.neoforged.bus.api.IEventBus; +import net.neoforged.neoforge.client.event.RegisterMenuScreensEvent; +//? if >=1.21.6 +import net.neoforged.neoforge.client.network.event.RegisterClientPayloadHandlersEvent; + +public final class VillagerMarketNeoForgeClient { + private VillagerMarketNeoForgeClient() { + } + + public static void register(IEventBus modBus) { + modBus.addListener(VillagerMarketNeoForgeClient::registerScreens); + //? if >=1.21.6 + modBus.addListener(VillagerMarketNeoForgeClient::registerPayloads); + } + + private static void registerScreens(RegisterMenuScreensEvent event) { + event.register(ModContent.menu(), VillagerMarketScreen::new); + } + + //? if >=1.21.6 { + private static void registerPayloads(RegisterClientPayloadHandlersEvent event) { + event.register(MarketPayloads.Offers.TYPE, (payload, context) -> VillagerMarketScreen.apply(payload)); + } + //?} +} diff --git a/neoforge/src/main/java/net/modcrafters/minecraft/villagermarket/neoforge/gametest/NeoForgeMarketGameTests.java b/neoforge/src/main/java/net/modcrafters/minecraft/villagermarket/neoforge/gametest/NeoForgeMarketGameTests.java new file mode 100644 index 0000000..45c83c8 --- /dev/null +++ b/neoforge/src/main/java/net/modcrafters/minecraft/villagermarket/neoforge/gametest/NeoForgeMarketGameTests.java @@ -0,0 +1,75 @@ +package net.modcrafters.minecraft.villagermarket.neoforge.gametest; + +import net.modcrafters.minecraft.villagermarket.Constants; +import net.modcrafters.minecraft.villagermarket.gametest.MarketGameTests; +import net.minecraft.core.Holder; +import net.minecraft.gametest.framework.GameTestHelper; +import net.minecraft.resources.Identifier; +import net.minecraft.resources.ResourceKey; +import net.neoforged.bus.api.IEventBus; +import net.neoforged.neoforge.event.RegisterGameTestsEvent; +import net.neoforged.neoforge.gametest.GameTestHooks; +//? if >=1.21.5 { +import net.minecraft.core.registries.Registries; +import net.minecraft.gametest.framework.FunctionGameTestInstance; +import net.minecraft.gametest.framework.TestData; +import net.minecraft.gametest.framework.TestEnvironmentDefinition; +import net.neoforged.neoforge.registries.DeferredRegister; + +import java.util.function.Consumer; +//?} else { +/*import net.minecraft.gametest.framework.GameTestGenerator; +import net.minecraft.gametest.framework.TestFunction; +import net.neoforged.neoforge.gametest.GameTestHolder; + +import java.util.Collection; +*///?} + +//? if <1.21.5 +//@GameTestHolder(Constants.MOD_ID) +public final class NeoForgeMarketGameTests { + private NeoForgeMarketGameTests() { + } + + public static void register(IEventBus modBus) { + if (!GameTestHooks.isGametestEnabled()) { + return; + } + //? if >=1.21.5 { + DeferredRegister<Consumer<GameTestHelper>> functions = DeferredRegister.create(Registries.TEST_FUNCTION, Constants.MOD_ID); + for (MarketGameTests.Case test : MarketGameTests.CASES) { + functions.register(test.name(), () -> test.body()); + } + functions.register(modBus); + //?} + modBus.addListener(NeoForgeMarketGameTests::registerTests); + } + + //? if >=1.21.5 { + private static void registerTests(RegisterGameTestsEvent event) { + Holder<TestEnvironmentDefinition<?>> environment = event.registerEnvironment(id("default")); + for (MarketGameTests.Case test : MarketGameTests.CASES) { + event.registerTest(id(test.name()), new FunctionGameTestInstance( + ResourceKey.create(Registries.TEST_FUNCTION, id(test.name())), + new TestData<>(environment, Identifier.withDefaultNamespace("empty"), 100, 0, true) + )); + } + } + //?} else { + /*private static void registerTests(RegisterGameTestsEvent event) { + event.register(NeoForgeMarketGameTests.class); + } + + @GameTestGenerator + public static Collection<TestFunction> generated() { + return MarketGameTests.CASES.stream() + .map(test -> new TestFunction(test.name(), Constants.MOD_ID + "." + test.name(), "villagermarket:empty", + 100, 0L, true, test.body())) + .toList(); + } + *///?} + + private static Identifier id(String path) { + return Identifier.fromNamespaceAndPath(Constants.MOD_ID, path); + } +} diff --git a/neoforge/src/main/java/net/modcrafters/minecraft/villagermarket/neoforge/platform/NeoForgePlatformHelper.java b/neoforge/src/main/java/net/modcrafters/minecraft/villagermarket/neoforge/platform/NeoForgePlatformHelper.java new file mode 100644 index 0000000..4058435 --- /dev/null +++ b/neoforge/src/main/java/net/modcrafters/minecraft/villagermarket/neoforge/platform/NeoForgePlatformHelper.java @@ -0,0 +1,60 @@ +package net.modcrafters.minecraft.villagermarket.neoforge.platform; + +import net.modcrafters.minecraft.villagermarket.menu.OpeningData; +import net.modcrafters.minecraft.villagermarket.menu.VillagerMarketMenu; +import net.modcrafters.minecraft.villagermarket.platform.services.PlatformHelper; +import net.minecraft.core.BlockPos; +import net.minecraft.network.chat.Component; +import net.minecraft.network.protocol.common.custom.CustomPacketPayload; +import net.minecraft.server.level.ServerLevel; +import net.minecraft.server.level.ServerPlayer; +import net.minecraft.world.entity.player.Inventory; +import net.minecraft.world.entity.player.Player; +import net.minecraft.world.inventory.AbstractContainerMenu; +import net.minecraft.world.inventory.MenuType; +import net.neoforged.neoforge.common.extensions.IMenuTypeExtension; +import net.neoforged.neoforge.network.PacketDistributor; +//? if >=1.21.6 +import net.neoforged.neoforge.client.network.ClientPacketDistributor; + +public class NeoForgePlatformHelper implements PlatformHelper { + @Override + public String platformName() { + return "NeoForge"; + } + + @Override + public MenuType<VillagerMarketMenu> marketMenu() { + return IMenuTypeExtension.create((containerId, inventory, buf) -> + new VillagerMarketMenu(containerId, inventory, OpeningData.STREAM_CODEC.decode(buf))); + } + + @Override + public void openMarket(ServerPlayer player, BlockPos pos) { + OpeningData data = VillagerMarketMenu.opening((ServerLevel) player.level(), pos); + player.openMenu(new net.minecraft.world.MenuProvider() { + @Override + public Component getDisplayName() { + return Component.translatable("block.villagermarket.villager_market"); + } + + @Override + public AbstractContainerMenu createMenu(int containerId, Inventory inventory, Player player) { + return new VillagerMarketMenu(containerId, inventory, data); + } + }, buf -> OpeningData.STREAM_CODEC.encode(buf, data)); + } + + @Override + public void sendToPlayer(ServerPlayer player, CustomPacketPayload payload) { + PacketDistributor.sendToPlayer(player, payload); + } + + @Override + public void sendToServer(CustomPacketPayload payload) { + //? if >=1.21.6 { + ClientPacketDistributor.sendToServer(payload); + //?} else + //PacketDistributor.sendToServer(payload); + } +} diff --git a/neoforge/src/main/resources/META-INF/neoforge.mods.toml b/neoforge/src/main/resources/META-INF/neoforge.mods.toml new file mode 100644 index 0000000..1443583 --- /dev/null +++ b/neoforge/src/main/resources/META-INF/neoforge.mods.toml @@ -0,0 +1,26 @@ +modLoader = "javafml" +loaderVersion = "${neoforge_loader_version_range}" +license = "${license}" +[[mods]] +modId = "${mod_id}" +version = "${version}" +displayName = "${mod_name}" +credits = "${credits}" +authors = "${mod_author}" +description = '''${description}''' +[[mixins]] +config = "${mod_id}.mixins.json" +[[mixins]] +config = "${mod_id}.neoforge.mixins.json" +[[dependencies.${mod_id}]] +modId = "neoforge" +type = "required" +versionRange = "[${neoforge_version},)" +ordering = "NONE" +side = "BOTH" +[[dependencies.${mod_id}]] +modId = "minecraft" +type = "required" +versionRange = "${minecraft_version_range}" +ordering = "NONE" +side = "BOTH" diff --git a/neoforge/src/main/resources/META-INF/services/net.modcrafters.minecraft.villagermarket.platform.services.PlatformHelper b/neoforge/src/main/resources/META-INF/services/net.modcrafters.minecraft.villagermarket.platform.services.PlatformHelper new file mode 100644 index 0000000..03c05a3 --- /dev/null +++ b/neoforge/src/main/resources/META-INF/services/net.modcrafters.minecraft.villagermarket.platform.services.PlatformHelper @@ -0,0 +1 @@ +net.modcrafters.minecraft.villagermarket.neoforge.platform.NeoForgePlatformHelper diff --git a/neoforge/src/main/resources/villagermarket.neoforge.mixins.json b/neoforge/src/main/resources/villagermarket.neoforge.mixins.json new file mode 100644 index 0000000..1ff8006 --- /dev/null +++ b/neoforge/src/main/resources/villagermarket.neoforge.mixins.json @@ -0,0 +1,11 @@ +{ + "required": true, + "minVersion": "0.8", + "package": "net.modcrafters.minecraft.villagermarket.neoforge.mixin", + "compatibilityLevel": "JAVA_${java_version}", + "mixins": [], + "client": [], + "server": [], + "injectors": { "defaultRequire": 1 }, + "overwrites": { "requireAnnotations": true } +} diff --git a/neoforge/versions/1.21.1/gradle.properties b/neoforge/versions/1.21.1/gradle.properties new file mode 100644 index 0000000..b71d53e --- /dev/null +++ b/neoforge/versions/1.21.1/gradle.properties @@ -0,0 +1,6 @@ +minecraft_version=1.21.1 +minecraft_version_range=[1.21.1, 1.21.2) +java_version=21 +# see https://projects.neoforged.net/neoforged/neoforge +neoforge_version=21.1.265 +neoforge_data_run=data diff --git a/neoforge/versions/26.3/gradle.properties b/neoforge/versions/26.3/gradle.properties new file mode 100644 index 0000000..56fe907 --- /dev/null +++ b/neoforge/versions/26.3/gradle.properties @@ -0,0 +1,5 @@ +minecraft_version=26.3 +minecraft_version_range=[26.3, 26.4) +java_version=25 +neoforge_version=26.3.0.76 +neoforge_data_run=clientData diff --git a/settings.gradle.kts b/settings.gradle.kts new file mode 100644 index 0000000..4f3a8c2 --- /dev/null +++ b/settings.gradle.kts @@ -0,0 +1,39 @@ +pluginManagement { + repositories { + gradlePluginPortal() + mavenCentral() + exclusiveContent { + forRepository { + maven("https://maven.fabricmc.net") { name = "Fabric" } + } + filter { + includeGroupAndSubgroups("net.fabricmc") + } + } + maven("https://maven.neoforged.net/releases/") { name = "NeoForged" } + maven("https://maven.kikugie.dev/releases") { name = "KikuGie Releases" } + } +} + +plugins { + id("org.gradle.toolchains.foojay-resolver-convention") version "1.0.0" + // see https://stonecutter.kikugie.dev for new versions + id("dev.kikugie.stonecutter") version "0.9.8" +} + +// The root src/ is the common code. Its versions live in versions/<mc>, and each loader branch in <loader>/versions/<mc>. +stonecutter { + kotlinController = true + centralScript = "build.gradle" + create(rootProject) { + versions("1.21.1", "26.3") + // Each version node runs its branch's build.gradle (centralScript above). + branch("fabric") { versions("26.3") } + branch("neoforge") { versions("1.21.1", "26.3") } + vcsVersion = "26.3" + } +} + +// This should match the folder name of the project, or else IDEA may complain (see https://youtrack.jetbrains.com/issue/IDEA-317606) +rootProject.name = "Villager-Market" +includeBuild("build-logic") diff --git a/src/main/java/net/modcrafters/minecraft/villagermarket/Constants.java b/src/main/java/net/modcrafters/minecraft/villagermarket/Constants.java new file mode 100644 index 0000000..865896c --- /dev/null +++ b/src/main/java/net/modcrafters/minecraft/villagermarket/Constants.java @@ -0,0 +1,13 @@ +package net.modcrafters.minecraft.villagermarket; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +public final class Constants { + public static final String MOD_ID = "villagermarket"; + public static final String MOD_NAME = "Villager Market"; + public static final Logger LOG = LoggerFactory.getLogger(MOD_NAME); + + private Constants() { + } +} diff --git a/src/main/java/net/modcrafters/minecraft/villagermarket/ModContent.java b/src/main/java/net/modcrafters/minecraft/villagermarket/ModContent.java new file mode 100644 index 0000000..c6c3fff --- /dev/null +++ b/src/main/java/net/modcrafters/minecraft/villagermarket/ModContent.java @@ -0,0 +1,82 @@ +package net.modcrafters.minecraft.villagermarket; + +import net.modcrafters.minecraft.villagermarket.block.MarketBlock; +import net.modcrafters.minecraft.villagermarket.menu.VillagerMarketMenu; +import net.modcrafters.minecraft.villagermarket.platform.Services; +import net.minecraft.core.registries.Registries; +import net.minecraft.network.chat.Component; +import net.minecraft.resources.Identifier; +import net.minecraft.resources.ResourceKey; +import net.minecraft.world.item.BlockItem; +import net.minecraft.world.item.CreativeModeTab; +import net.minecraft.world.item.Item; +import net.minecraft.world.item.ItemStack; +import net.minecraft.world.level.block.SoundType; +import net.minecraft.world.level.block.state.BlockBehaviour; +import net.minecraft.world.level.material.MapColor; +import net.minecraft.world.inventory.MenuType; + +public final class ModContent { + public static final ResourceKey<net.minecraft.world.level.block.Block> MARKET_ID = ResourceKey.create( + Registries.BLOCK, Identifier.fromNamespaceAndPath(Constants.MOD_ID, "villager_market")); + public static final ResourceKey<Item> MARKET_ITEM_ID = ResourceKey.create( + Registries.ITEM, Identifier.fromNamespaceAndPath(Constants.MOD_ID, "villager_market")); + public static final ResourceKey<MenuType<?>> MENU_ID = ResourceKey.create( + Registries.MENU, Identifier.fromNamespaceAndPath(Constants.MOD_ID, "villager_market")); + public static final ResourceKey<CreativeModeTab> TAB_ID = ResourceKey.create( + Registries.CREATIVE_MODE_TAB, Identifier.fromNamespaceAndPath(Constants.MOD_ID, "villagermarket")); + + public static MarketBlock MARKET; + public static BlockItem MARKET_ITEM; + + private static MenuType<VillagerMarketMenu> menu; + + private ModContent() { + } + + public static void init() { + menu = Services.PLATFORM.marketMenu(); + Constants.LOG.info("{} common init", Constants.MOD_NAME); + } + + public static MenuType<VillagerMarketMenu> menu() { + return menu; + } + + public static MarketBlock marketBlock() { + if (MARKET == null) { + MARKET = new MarketBlock(blockProperties()); + } + return MARKET; + } + + public static BlockItem marketItem() { + if (MARKET_ITEM == null) { + MARKET_ITEM = new BlockItem(marketBlock(), itemProperties()); + } + return MARKET_ITEM; + } + + public static CreativeModeTab.Builder titled(CreativeModeTab.Builder builder) { + return builder.title(Component.translatable("itemGroup.villagermarket")).icon(() -> new ItemStack(MARKET_ITEM)); + } + + private static BlockBehaviour.Properties blockProperties() { + var properties = BlockBehaviour.Properties.of() + .mapColor(MapColor.COLOR_BROWN) + .sound(SoundType.WOOD) + .strength(3.0F); + //? if >=1.21.2 + properties = properties.setId(MARKET_ID); + return properties; + } + + private static Item.Properties itemProperties() { + var properties = new Item.Properties(); + //? if >=1.21.2 + properties = properties.useBlockDescriptionPrefix(); + //? if >=1.21.2 + properties = properties.setId(MARKET_ITEM_ID); + return properties; + } +} diff --git a/src/main/java/net/modcrafters/minecraft/villagermarket/VillagerMarket.java b/src/main/java/net/modcrafters/minecraft/villagermarket/VillagerMarket.java new file mode 100644 index 0000000..f719485 --- /dev/null +++ b/src/main/java/net/modcrafters/minecraft/villagermarket/VillagerMarket.java @@ -0,0 +1,10 @@ +package net.modcrafters.minecraft.villagermarket; + +public final class VillagerMarket { + private VillagerMarket() { + } + + public static void init() { + ModContent.init(); + } +} diff --git a/src/main/java/net/modcrafters/minecraft/villagermarket/block/MarketBlock.java b/src/main/java/net/modcrafters/minecraft/villagermarket/block/MarketBlock.java new file mode 100644 index 0000000..6d83e1b --- /dev/null +++ b/src/main/java/net/modcrafters/minecraft/villagermarket/block/MarketBlock.java @@ -0,0 +1,25 @@ +package net.modcrafters.minecraft.villagermarket.block; + +import net.modcrafters.minecraft.villagermarket.platform.Services; +import net.minecraft.core.BlockPos; +import net.minecraft.server.level.ServerPlayer; +import net.minecraft.world.InteractionResult; +import net.minecraft.world.entity.player.Player; +import net.minecraft.world.level.Level; +import net.minecraft.world.level.block.Block; +import net.minecraft.world.level.block.state.BlockState; +import net.minecraft.world.phys.BlockHitResult; + +public class MarketBlock extends Block { + public MarketBlock(Properties properties) { + super(properties); + } + + @Override + protected InteractionResult useWithoutItem(BlockState state, Level level, BlockPos pos, Player player, BlockHitResult hit) { + if (player instanceof ServerPlayer serverPlayer) { + Services.PLATFORM.openMarket(serverPlayer, pos); + } + return InteractionResult.SUCCESS; + } +} diff --git a/src/main/java/net/modcrafters/minecraft/villagermarket/client/MarketScreenLogic.java b/src/main/java/net/modcrafters/minecraft/villagermarket/client/MarketScreenLogic.java new file mode 100644 index 0000000..6787ed9 --- /dev/null +++ b/src/main/java/net/modcrafters/minecraft/villagermarket/client/MarketScreenLogic.java @@ -0,0 +1,154 @@ +package net.modcrafters.minecraft.villagermarket.client; + +import net.modcrafters.minecraft.villagermarket.trade.ListedOffer; +import net.modcrafters.minecraft.villagermarket.trade.MainSlots; +import net.modcrafters.minecraft.villagermarket.trade.TradeMath; +import net.minecraft.world.entity.player.Inventory; +import net.minecraft.world.item.ItemStack; + +import java.util.ArrayList; +import java.util.LinkedHashSet; +import java.util.List; + +// Hit testing and the Show All filter. Both screens draw this; neither one decides the rules. +public final class MarketScreenLogic { + public static final int WIDTH = 256; + public static final int HEIGHT = 209; + public static final int GROUP_X = 6; + public static final int GROUP_Y = 6; + public static final int GROUP_W = 88; + public static final int GROUP_H = 140; + public static final int OFFER_X = 100; + public static final int OFFER_Y = 6; + public static final int OFFER_W = 149; + public static final int OFFER_H = 165; + public static final int OFFER_ROW = 28; + public static final int SHOW_X = 5; + public static final int SHOW_Y = 152; + public static final int SHOW_W = 90; + public static final int SHOW_H = 20; + public static final int SELECTED_Y = 176; + public static final int ONCE_X = 156; + public static final int MAX_X = 196; + public static final int BUTTON_Y = 180; + public static final int BUTTON_W = 35; + public static final int BUTTON_H = 20; + + public boolean showAll = true; + public String selectedGroup = ""; + public int groupScroll; + public int offerScroll; + public ListedOffer selected; + + public List<String> groups(List<ListedOffer> offers) { + LinkedHashSet<String> keys = new LinkedHashSet<>(); + for (ListedOffer offer : offers) { + keys.add(offer.groupKey()); + } + return new ArrayList<>(keys); + } + + public List<ListedOffer> visible(List<ListedOffer> offers, Inventory inventory) { + List<ListedOffer> shown = new ArrayList<>(); + for (ListedOffer offer : offers) { + if (!selectedGroup.isEmpty() && !selectedGroup.equals(offer.groupKey())) { + continue; + } + if (!showAll && affordable(offer, inventory) <= 0) { + continue; + } + shown.add(offer); + } + return shown; + } + + public int affordable(ListedOffer offer, Inventory inventory) { + boolean hasSecond = !offer.costB().isEmpty(); + return TradeMath.affordableUses( + count(inventory, offer.costA()), offer.costA().getCount(), + hasSecond ? count(inventory, offer.costB()) : 0, offer.costB().getCount(), + hasSecond, offer.usesLeft()); + } + + public void onOffers(List<ListedOffer> offers) { + if (selected == null) { + return; + } + for (ListedOffer offer : offers) { + if (offer.villagerId() == selected.villagerId() && offer.offerIndex() == selected.offerIndex() && offer.usesLeft() > 0) { + selected = offer; + return; + } + } + selected = null; + } + + public Click click(double mouseX, double mouseY, int left, int top, int rowHeight, List<ListedOffer> offers, Inventory inventory) { + int x = (int) mouseX - left; + int y = (int) mouseY - top; + if (inside(x, y, SHOW_X, SHOW_Y, SHOW_W, SHOW_H)) { + showAll = !showAll; + return Click.TOGGLE; + } + if (selected != null && affordable(selected, inventory) > 0) { + if (inside(x, y, ONCE_X, BUTTON_Y, BUTTON_W, BUTTON_H)) { + return Click.ONCE; + } + if (inside(x, y, MAX_X, BUTTON_Y, BUTTON_W, BUTTON_H)) { + return Click.MAX; + } + } + if (inside(x, y, GROUP_X, GROUP_Y, GROUP_W, GROUP_H)) { + int index = groupScroll + (y - GROUP_Y) / rowHeight; + List<String> groups = groups(offers); + if (index == 0) { + selectedGroup = ""; + } else if (index > 0 && index <= groups.size()) { + selectedGroup = groups.get(index - 1); + } + return Click.GROUP; + } + if (inside(x, y, OFFER_X, OFFER_Y, OFFER_W, OFFER_H)) { + int index = offerScroll + (y - OFFER_Y) / OFFER_ROW; + List<ListedOffer> shown = visible(offers, inventory); + selected = index >= 0 && index < shown.size() ? shown.get(index) : null; + return Click.OFFER; + } + return Click.NONE; + } + + public void scroll(double mouseX, double mouseY, int left, int top, double delta, int rowHeight, int offerCount, int groupCount) { + int x = (int) mouseX - left; + int y = (int) mouseY - top; + int step = delta > 0 ? -1 : 1; + if (inside(x, y, GROUP_X, GROUP_Y, GROUP_W, GROUP_H)) { + int visible = Math.max(1, GROUP_H / rowHeight); + groupScroll = clamp(groupScroll + step, groupCount + 1 - visible); + } else if (inside(x, y, OFFER_X, OFFER_Y, OFFER_W, OFFER_H)) { + int visible = Math.max(1, OFFER_H / OFFER_ROW); + offerScroll = clamp(offerScroll + step, offerCount - visible); + } + } + + private static int clamp(int value, int max) { + return Math.max(0, Math.min(value, Math.max(0, max))); + } + + private static boolean inside(int x, int y, int boxX, int boxY, int width, int height) { + return x >= boxX && y >= boxY && x < boxX + width && y < boxY + height; + } + + private static int count(Inventory inventory, ItemStack cost) { + int have = 0; + for (ItemStack stack : MainSlots.of(inventory)) { + if (ItemStack.isSameItemSameComponents(stack, cost)) { + have += stack.getCount(); + } + } + return have; + } + + public enum Click { + NONE, TOGGLE, GROUP, OFFER, ONCE, MAX + } +} diff --git a/src/main/java/net/modcrafters/minecraft/villagermarket/client/VillagerMarketScreen.java b/src/main/java/net/modcrafters/minecraft/villagermarket/client/VillagerMarketScreen.java new file mode 100644 index 0000000..cfa340c --- /dev/null +++ b/src/main/java/net/modcrafters/minecraft/villagermarket/client/VillagerMarketScreen.java @@ -0,0 +1,151 @@ +package net.modcrafters.minecraft.villagermarket.client; + +import net.modcrafters.minecraft.villagermarket.Constants; +import net.modcrafters.minecraft.villagermarket.menu.VillagerMarketMenu; +import net.modcrafters.minecraft.villagermarket.network.MarketPayloads; +import net.modcrafters.minecraft.villagermarket.platform.Services; +import net.modcrafters.minecraft.villagermarket.trade.ListedOffer; +import net.minecraft.client.input.MouseButtonEvent; +import net.minecraft.client.Minecraft; +import net.minecraft.client.gui.GuiGraphicsExtractor; +import net.minecraft.client.gui.screens.inventory.AbstractContainerScreen; +import net.minecraft.client.renderer.RenderPipelines; +import net.minecraft.network.chat.Component; +import net.minecraft.resources.Identifier; +import net.minecraft.world.entity.player.Inventory; +import net.minecraft.world.item.ItemStack; + +import java.util.List; + +public class VillagerMarketScreen extends AbstractContainerScreen<VillagerMarketMenu> { + private static final Identifier TEXTURE = Identifier.fromNamespaceAndPath(Constants.MOD_ID, "textures/gui/gui.png"); + private static final int TEXT = 0xFFFFFFFF; + private static final int SELECTED = 0x886B4A2A; + private final MarketScreenLogic logic = new MarketScreenLogic(); + private ItemStack hovered = ItemStack.EMPTY; + + public VillagerMarketScreen(VillagerMarketMenu menu, Inventory inventory, Component title) { + super(menu, inventory, title, MarketScreenLogic.WIDTH, MarketScreenLogic.HEIGHT); + } + + public void onOffers(List<ListedOffer> offers) { + logic.onOffers(offers); + } + + public static void apply(MarketPayloads.Offers payload) { + if (Minecraft.getInstance().gui.screen() instanceof VillagerMarketScreen screen) { + screen.getMenu().replace(payload.offers()); + screen.onOffers(payload.offers()); + } + } + + @Override + public void extractBackground(GuiGraphicsExtractor graphics, int mouseX, int mouseY, float partialTick) { + super.extractBackground(graphics, mouseX, mouseY, partialTick); + int left = this.leftPos; + int top = this.topPos; + graphics.blit(RenderPipelines.GUI_TEXTURED, TEXTURE, left, top, 0, 0, MarketScreenLogic.WIDTH, MarketScreenLogic.HEIGHT, 256, 256); + int row = this.font.lineHeight + 2; + List<String> groups = logic.groups(this.menu.offers()); + drawGroup(graphics, left, top, row, 0, logic.selectedGroup.isEmpty(), Component.translatable("gui.villagermarket.all")); + for (int i = 0; i < groups.size(); i++) { + drawGroup(graphics, left, top, row, i + 1, groups.get(i).equals(logic.selectedGroup), groupLabel(groups.get(i))); + } + hovered = ItemStack.EMPTY; + List<ListedOffer> shown = logic.visible(this.menu.offers(), this.minecraft.player.getInventory()); + for (int i = logic.offerScroll; i < shown.size(); i++) { + int y = top + MarketScreenLogic.OFFER_Y + (i - logic.offerScroll) * MarketScreenLogic.OFFER_ROW; + if (y + MarketScreenLogic.OFFER_ROW > top + MarketScreenLogic.OFFER_Y + MarketScreenLogic.OFFER_H) { + break; + } + ListedOffer offer = shown.get(i); + if (logic.selected != null && logic.selected.villagerId() == offer.villagerId() && logic.selected.offerIndex() == offer.offerIndex()) { + graphics.fill(left + MarketScreenLogic.OFFER_X, y, left + MarketScreenLogic.OFFER_X + MarketScreenLogic.OFFER_W, y + MarketScreenLogic.OFFER_ROW, SELECTED); + } + drawOffer(graphics, offer, left + MarketScreenLogic.OFFER_X, y, mouseX, mouseY, this.minecraft.player.getInventory()); + } + graphics.fill(left + MarketScreenLogic.SHOW_X, top + MarketScreenLogic.SHOW_Y, + left + MarketScreenLogic.SHOW_X + MarketScreenLogic.SHOW_W, top + MarketScreenLogic.SHOW_Y + MarketScreenLogic.SHOW_H, + logic.showAll ? SELECTED : 0x66000000); + graphics.text(this.font, Component.translatable("gui.villagermarket.show_all"), left + MarketScreenLogic.SHOW_X + 4, top + MarketScreenLogic.SHOW_Y + 6, TEXT, false); + if (logic.selected != null) { + drawOffer(graphics, logic.selected, left + 5, top + MarketScreenLogic.SELECTED_Y, mouseX, mouseY, this.minecraft.player.getInventory()); + int affordable = logic.affordable(logic.selected, this.minecraft.player.getInventory()); + drawButton(graphics, left + MarketScreenLogic.ONCE_X, top + MarketScreenLogic.BUTTON_Y, Component.translatable("gui.villagermarket.once"), affordable > 0); + drawButton(graphics, left + MarketScreenLogic.MAX_X, top + MarketScreenLogic.BUTTON_Y, Component.literal("x " + affordable), affordable > 0); + } + } + + private void drawGroup(GuiGraphicsExtractor graphics, int left, int top, int row, int index, boolean selected, Component label) { + int y = top + MarketScreenLogic.GROUP_Y + (index - logic.groupScroll) * row; + if (y < top + MarketScreenLogic.GROUP_Y || y + row > top + MarketScreenLogic.GROUP_Y + MarketScreenLogic.GROUP_H) { + return; + } + if (selected) { + graphics.fill(left + MarketScreenLogic.GROUP_X, y, left + MarketScreenLogic.GROUP_X + MarketScreenLogic.GROUP_W, y + row, SELECTED); + } + graphics.text(this.font, label, left + MarketScreenLogic.GROUP_X + 2, y + 1, TEXT, false); + } + + private void drawOffer(GuiGraphicsExtractor graphics, ListedOffer offer, int x, int y, int mouseX, int mouseY, Inventory inventory) { + drawStack(graphics, offer.costA(), x + 5, y + 5, mouseX, mouseY); + drawStack(graphics, offer.costB(), x + 30, y + 5, mouseX, mouseY); + drawStack(graphics, offer.result(), x + 73, y + 5, mouseX, mouseY); + int affordable = logic.affordable(offer, inventory); + graphics.text(this.font, "[" + affordable + " / " + offer.usesLeft() + "]", x + 101, y + 10, TEXT, false); + } + + private void drawStack(GuiGraphicsExtractor graphics, ItemStack stack, int x, int y, int mouseX, int mouseY) { + if (stack.isEmpty()) { + return; + } + graphics.item(stack, x, y); + if (mouseX >= x && mouseX < x + 16 && mouseY >= y && mouseY < y + 16) { + hovered = stack; + } + } + + private void drawButton(GuiGraphicsExtractor graphics, int x, int y, Component label, boolean enabled) { + graphics.fill(x, y, x + MarketScreenLogic.BUTTON_W, y + MarketScreenLogic.BUTTON_H, enabled ? SELECTED : 0x66000000); + graphics.text(this.font, label, x + 4, y + 6, TEXT, false); + } + + @Override + public void extractRenderState(GuiGraphicsExtractor graphics, int mouseX, int mouseY, float partialTick) { + super.extractRenderState(graphics, mouseX, mouseY, partialTick); + if (!hovered.isEmpty()) { + graphics.setTooltipForNextFrame(this.font, hovered, mouseX, mouseY); + } + } + + @Override + public boolean mouseClicked(MouseButtonEvent event, boolean doubleClick) { + Inventory inventory = this.minecraft.player.getInventory(); + MarketScreenLogic.Click click = logic.click(event.x(), event.y(), this.leftPos, this.topPos, this.font.lineHeight + 2, this.menu.offers(), inventory); + if (click == MarketScreenLogic.Click.ONCE && logic.selected != null) { + send(1); + } else if (click == MarketScreenLogic.Click.MAX && logic.selected != null) { + send(logic.affordable(logic.selected, inventory)); + } + return click != MarketScreenLogic.Click.NONE || super.mouseClicked(event, doubleClick); + } + + @Override + public boolean mouseScrolled(double mouseX, double mouseY, double scrollX, double scrollY) { + List<ListedOffer> shown = logic.visible(this.menu.offers(), this.minecraft.player.getInventory()); + logic.scroll(mouseX, mouseY, this.leftPos, this.topPos, scrollY, this.font.lineHeight + 2, shown.size(), logic.groups(this.menu.offers()).size()); + return true; + } + + private void send(int uses) { + Services.PLATFORM.sendToServer(new MarketPayloads.Trade(logic.selected.villagerId(), logic.selected.offerIndex(), uses)); + } + + static Component groupLabel(String groupKey) { + int colon = groupKey.indexOf(':'); + if (colon > 0 && groupKey.indexOf(' ') < 0) { + return Component.translatable("entity.minecraft.villager." + groupKey.substring(colon + 1)); + } + return Component.literal(groupKey); + } +} diff --git a/src/main/java/net/modcrafters/minecraft/villagermarket/gametest/MarketGameTests.java b/src/main/java/net/modcrafters/minecraft/villagermarket/gametest/MarketGameTests.java new file mode 100644 index 0000000..b7d370b --- /dev/null +++ b/src/main/java/net/modcrafters/minecraft/villagermarket/gametest/MarketGameTests.java @@ -0,0 +1,121 @@ +package net.modcrafters.minecraft.villagermarket.gametest; + +import net.modcrafters.minecraft.villagermarket.search.MarketSearch; +import net.modcrafters.minecraft.villagermarket.trade.MainSlots; +import net.modcrafters.minecraft.villagermarket.trade.TradeExecutor; +import net.minecraft.core.BlockPos; +import net.minecraft.core.component.DataComponents; +import net.minecraft.gametest.framework.GameTestHelper; +import net.minecraft.network.chat.Component; +import net.minecraft.server.level.ServerPlayer; +import net.minecraft.world.entity.EntityTypes; +import net.minecraft.world.entity.npc.villager.Villager; +import net.minecraft.world.item.Item; +import net.minecraft.world.item.ItemStack; +import net.minecraft.world.item.Items; +import net.minecraft.world.item.trading.ItemCost; +import net.minecraft.world.item.trading.MerchantOffer; +import net.minecraft.world.item.trading.MerchantOffers; + +import java.util.List; +import java.util.Optional; +import java.util.function.Consumer; + +public final class MarketGameTests { + public record Case(String name, Consumer<GameTestHelper> body) { + } + + public static final List<Case> CASES = List.of( + new Case("one_emerald_buys_bread", MarketGameTests::oneEmeraldBuysBread), + new Case("components_must_match", MarketGameTests::componentsMustMatch), + new Case("villager_outside_the_box_is_not_traded", MarketGameTests::villagerOutsideTheBoxIsNotTraded), + new Case("adjusted_price_is_what_is_charged", MarketGameTests::adjustedPriceIsWhatIsCharged) + ); + + private MarketGameTests() { + } + + public static void oneEmeraldBuysBread(GameTestHelper helper) { + Villager villager = villager(helper, offer(new ItemCost(Items.EMERALD), new ItemStack(Items.BREAD), 4, 0.0f, 0)); + ServerPlayer player = player(helper); + player.getInventory().add(new ItemStack(Items.EMERALD)); + + TradeExecutor.Result result = TradeExecutor.execute(player, villager.blockPosition(), villager.getId(), 0, 1); + + helper.assertTrue(result.performed() == 1, "performed " + result.performed()); + helper.assertTrue(count(player, Items.BREAD) == 1, "bread " + count(player, Items.BREAD)); + helper.assertTrue(count(player, Items.EMERALD) == 0, "emeralds left " + count(player, Items.EMERALD)); + helper.succeed(); + } + + public static void componentsMustMatch(GameTestHelper helper) { + ItemCost named = new ItemCost(Items.BOOK).withComponents(builder -> builder.expect(DataComponents.CUSTOM_NAME, Component.literal("ledger"))); + Villager villager = villager(helper, offer(named, new ItemStack(Items.BREAD), 4, 0.0f, 0)); + ServerPlayer player = player(helper); + player.getInventory().add(new ItemStack(Items.BOOK)); + + TradeExecutor.Result result = TradeExecutor.execute(player, villager.blockPosition(), villager.getId(), 0, 1); + + helper.assertTrue(result.performed() == 0, "a plain book paid for a named book"); + helper.assertTrue(count(player, Items.BOOK) == 1, "the book was taken"); + helper.succeed(); + } + + public static void villagerOutsideTheBoxIsNotTraded(GameTestHelper helper) { + Villager villager = villager(helper, offer(new ItemCost(Items.EMERALD), new ItemStack(Items.BREAD), 4, 0.0f, 0)); + BlockPos market = villager.blockPosition(); + villager.setPos(villager.getX() + MarketSearch.RADIUS + 5, villager.getY(), villager.getZ()); + ServerPlayer player = player(helper); + player.getInventory().add(new ItemStack(Items.EMERALD)); + + TradeExecutor.Result result = TradeExecutor.execute(player, market, villager.getId(), 0, 1); + + helper.assertTrue(result.outOfRange(), "a villager past the box was traded"); + helper.assertTrue(count(player, Items.EMERALD) == 1, "payment was taken"); + helper.succeed(); + } + + public static void adjustedPriceIsWhatIsCharged(GameTestHelper helper) { + MerchantOffer offer = offer(new ItemCost(Items.EMERALD), new ItemStack(Items.BREAD), 12, 0.2f, 100); + int adjusted = offer.getCostA().getCount(); + if (adjusted <= 1) { + helper.fail("adjusted price did not rise"); + return; + } + Villager villager = villager(helper, offer); + ServerPlayer player = player(helper); + player.getInventory().add(new ItemStack(Items.EMERALD, adjusted)); + + TradeExecutor.Result result = TradeExecutor.execute(player, villager.blockPosition(), villager.getId(), 0, 1); + + helper.assertTrue(result.performed() == 1, "performed " + result.performed()); + helper.assertTrue(count(player, Items.EMERALD) == 0, "charged " + (adjusted - count(player, Items.EMERALD)) + " of " + adjusted); + helper.succeed(); + } + + private static MerchantOffer offer(ItemCost cost, ItemStack result, int maxUses, float multiplier, int demand) { + return new MerchantOffer(cost, Optional.empty(), result, 0, maxUses, 1, multiplier, demand); + } + + private static Villager villager(GameTestHelper helper, MerchantOffer offer) { + Villager villager = helper.spawn(EntityTypes.VILLAGER, 1, 2, 1); + MerchantOffers offers = new MerchantOffers(); + offers.add(offer); + villager.setOffers(offers); + return villager; + } + + private static ServerPlayer player(GameTestHelper helper) { + return helper.makeMockServerPlayerInLevel(); + } + + private static int count(ServerPlayer player, Item item) { + int total = 0; + for (ItemStack stack : MainSlots.of(player.getInventory())) { + if (stack.is(item)) { + total += stack.getCount(); + } + } + return total; + } +} diff --git a/src/main/java/net/modcrafters/minecraft/villagermarket/menu/OpeningData.java b/src/main/java/net/modcrafters/minecraft/villagermarket/menu/OpeningData.java new file mode 100644 index 0000000..b851290 --- /dev/null +++ b/src/main/java/net/modcrafters/minecraft/villagermarket/menu/OpeningData.java @@ -0,0 +1,18 @@ +package net.modcrafters.minecraft.villagermarket.menu; + +import net.modcrafters.minecraft.villagermarket.trade.ListedOffer; +import net.minecraft.core.BlockPos; +import net.minecraft.network.RegistryFriendlyByteBuf; +import net.minecraft.network.codec.StreamCodec; + +import java.util.List; + +public record OpeningData(BlockPos pos, List<ListedOffer> offers) { + public static final StreamCodec<RegistryFriendlyByteBuf, OpeningData> STREAM_CODEC = StreamCodec.composite( + BlockPos.STREAM_CODEC, + OpeningData::pos, + ListedOffer.LIST_CODEC, + OpeningData::offers, + OpeningData::new + ); +} diff --git a/src/main/java/net/modcrafters/minecraft/villagermarket/menu/VillagerMarketMenu.java b/src/main/java/net/modcrafters/minecraft/villagermarket/menu/VillagerMarketMenu.java new file mode 100644 index 0000000..fadd07c --- /dev/null +++ b/src/main/java/net/modcrafters/minecraft/villagermarket/menu/VillagerMarketMenu.java @@ -0,0 +1,62 @@ +package net.modcrafters.minecraft.villagermarket.menu; + +import net.modcrafters.minecraft.villagermarket.ModContent; +import net.modcrafters.minecraft.villagermarket.block.MarketBlock; +import net.modcrafters.minecraft.villagermarket.search.MarketSearch; +import net.modcrafters.minecraft.villagermarket.trade.ListedOffer; +import net.minecraft.core.BlockPos; +import net.minecraft.server.level.ServerLevel; +import net.minecraft.world.entity.player.Inventory; +import net.minecraft.world.entity.player.Player; +import net.minecraft.world.inventory.AbstractContainerMenu; +import net.minecraft.world.item.ItemStack; +import net.minecraft.world.phys.Vec3; + +import java.util.ArrayList; +import java.util.List; + +public class VillagerMarketMenu extends AbstractContainerMenu { + private final BlockPos pos; + private List<ListedOffer> offers; + + public VillagerMarketMenu(int containerId, Inventory inventory, OpeningData data) { + super(ModContent.menu(), containerId); + this.pos = data.pos(); + this.offers = List.copyOf(data.offers()); + } + + public static OpeningData opening(ServerLevel level, BlockPos pos) { + return new OpeningData(pos, scan(level, pos)); + } + + public static List<ListedOffer> scan(ServerLevel level, BlockPos pos) { + List<ListedOffer> listed = new ArrayList<>(); + for (var villager : MarketSearch.find(level, pos)) { + listed.addAll(ListedOffer.from(villager)); + } + return List.copyOf(listed); + } + + public BlockPos pos() { + return pos; + } + + public List<ListedOffer> offers() { + return offers; + } + + public void replace(List<ListedOffer> offers) { + this.offers = List.copyOf(offers); + } + + @Override + public boolean stillValid(Player player) { + return player.level().getBlockState(pos).getBlock() instanceof MarketBlock + && player.distanceToSqr(Vec3.atCenterOf(pos)) < 64.0; + } + + @Override + public ItemStack quickMoveStack(Player player, int index) { + return ItemStack.EMPTY; + } +} diff --git a/src/main/java/net/modcrafters/minecraft/villagermarket/network/MarketPayloads.java b/src/main/java/net/modcrafters/minecraft/villagermarket/network/MarketPayloads.java new file mode 100644 index 0000000..5a43907 --- /dev/null +++ b/src/main/java/net/modcrafters/minecraft/villagermarket/network/MarketPayloads.java @@ -0,0 +1,56 @@ +package net.modcrafters.minecraft.villagermarket.network; + +import net.modcrafters.minecraft.villagermarket.Constants; +import net.modcrafters.minecraft.villagermarket.menu.VillagerMarketMenu; +import net.modcrafters.minecraft.villagermarket.platform.Services; +import net.modcrafters.minecraft.villagermarket.trade.ListedOffer; +import net.modcrafters.minecraft.villagermarket.trade.TradeExecutor; +import net.minecraft.network.RegistryFriendlyByteBuf; +import net.minecraft.network.codec.ByteBufCodecs; +import net.minecraft.network.codec.StreamCodec; +import net.minecraft.network.protocol.common.custom.CustomPacketPayload; +import net.minecraft.resources.Identifier; +import net.minecraft.server.level.ServerLevel; +import net.minecraft.server.level.ServerPlayer; + +import java.util.List; + +public final class MarketPayloads { + private MarketPayloads() { + } + + public record Offers(List<ListedOffer> offers) implements CustomPacketPayload { + public static final Type<Offers> TYPE = new Type<>(Identifier.fromNamespaceAndPath(Constants.MOD_ID, "offers")); + public static final StreamCodec<RegistryFriendlyByteBuf, Offers> STREAM_CODEC = StreamCodec.composite( + ListedOffer.LIST_CODEC, Offers::offers, Offers::new); + + @Override + public Type<? extends CustomPacketPayload> type() { + return TYPE; + } + } + + public record Trade(int villagerId, int offerIndex, int uses) implements CustomPacketPayload { + public static final Type<Trade> TYPE = new Type<>(Identifier.fromNamespaceAndPath(Constants.MOD_ID, "trade")); + public static final StreamCodec<RegistryFriendlyByteBuf, Trade> STREAM_CODEC = StreamCodec.composite( + ByteBufCodecs.INT, Trade::villagerId, + ByteBufCodecs.INT, Trade::offerIndex, + ByteBufCodecs.INT, Trade::uses, + Trade::new); + + @Override + public Type<? extends CustomPacketPayload> type() { + return TYPE; + } + } + + public static void handleTrade(ServerPlayer player, Trade trade) { + if (!(player.containerMenu instanceof VillagerMarketMenu menu)) { + return; + } + TradeExecutor.execute(player, menu.pos(), trade.villagerId(), trade.offerIndex(), trade.uses()); + List<ListedOffer> fresh = VillagerMarketMenu.scan((ServerLevel) player.level(), menu.pos()); + menu.replace(fresh); + Services.PLATFORM.sendToPlayer(player, new Offers(fresh)); + } +} diff --git a/src/main/java/net/modcrafters/minecraft/villagermarket/platform/Services.java b/src/main/java/net/modcrafters/minecraft/villagermarket/platform/Services.java new file mode 100644 index 0000000..e9d8892 --- /dev/null +++ b/src/main/java/net/modcrafters/minecraft/villagermarket/platform/Services.java @@ -0,0 +1,23 @@ +package net.modcrafters.minecraft.villagermarket.platform; + +import net.modcrafters.minecraft.villagermarket.Constants; +import net.modcrafters.minecraft.villagermarket.platform.services.PlatformHelper; + +import java.util.ServiceLoader; + +public final class Services { + public static final PlatformHelper PLATFORM = load(PlatformHelper.class); + + private Services() { + } + + public static <T> T load(Class<T> clazz) { + return ServiceLoader.load(clazz, Services.class.getClassLoader()) + .findFirst() + .orElseThrow(() -> new IllegalStateException("Failed to load service for " + clazz.getName())); + } + + static { + Constants.LOG.debug("Loaded platform {}", PLATFORM.getClass().getName()); + } +} diff --git a/src/main/java/net/modcrafters/minecraft/villagermarket/platform/services/PlatformHelper.java b/src/main/java/net/modcrafters/minecraft/villagermarket/platform/services/PlatformHelper.java new file mode 100644 index 0000000..dcfaebe --- /dev/null +++ b/src/main/java/net/modcrafters/minecraft/villagermarket/platform/services/PlatformHelper.java @@ -0,0 +1,20 @@ +package net.modcrafters.minecraft.villagermarket.platform.services; + +import net.modcrafters.minecraft.villagermarket.menu.VillagerMarketMenu; +import net.modcrafters.minecraft.villagermarket.network.MarketPayloads; +import net.minecraft.core.BlockPos; +import net.minecraft.network.protocol.common.custom.CustomPacketPayload; +import net.minecraft.server.level.ServerPlayer; +import net.minecraft.world.inventory.MenuType; + +public interface PlatformHelper { + String platformName(); + + MenuType<VillagerMarketMenu> marketMenu(); + + void openMarket(ServerPlayer player, BlockPos pos); + + void sendToPlayer(ServerPlayer player, CustomPacketPayload payload); + + void sendToServer(CustomPacketPayload payload); +} diff --git a/src/main/java/net/modcrafters/minecraft/villagermarket/search/MarketSearch.java b/src/main/java/net/modcrafters/minecraft/villagermarket/search/MarketSearch.java new file mode 100644 index 0000000..6c6eb10 --- /dev/null +++ b/src/main/java/net/modcrafters/minecraft/villagermarket/search/MarketSearch.java @@ -0,0 +1,29 @@ +package net.modcrafters.minecraft.villagermarket.search; + +import net.minecraft.core.BlockPos; +import net.minecraft.server.level.ServerLevel; +import net.minecraft.world.entity.npc.villager.Villager; +import net.minecraft.world.phys.AABB; +import net.minecraft.world.phys.Vec3; + +import java.util.List; + +public final class MarketSearch { + public static final int RADIUS = 48; + public static final int HEIGHT = 16; + + private MarketSearch() { + } + + public static AABB box(BlockPos marketPos) { + return new AABB(marketPos).inflate(RADIUS, HEIGHT, RADIUS); + } + + public static boolean contains(BlockPos marketPos, Vec3 villagerPos) { + return box(marketPos).contains(villagerPos); + } + + public static List<Villager> find(ServerLevel level, BlockPos marketPos) { + return level.getEntitiesOfClass(Villager.class, box(marketPos), villager -> villager.isAlive() && !villager.getOffers().isEmpty()); + } +} diff --git a/src/main/java/net/modcrafters/minecraft/villagermarket/trade/ListedOffer.java b/src/main/java/net/modcrafters/minecraft/villagermarket/trade/ListedOffer.java new file mode 100644 index 0000000..e7ad7b9 --- /dev/null +++ b/src/main/java/net/modcrafters/minecraft/villagermarket/trade/ListedOffer.java @@ -0,0 +1,81 @@ +package net.modcrafters.minecraft.villagermarket.trade; + +import net.minecraft.core.registries.BuiltInRegistries; +import net.minecraft.network.RegistryFriendlyByteBuf; +import net.minecraft.network.codec.ByteBufCodecs; +import net.minecraft.network.codec.StreamCodec; +import net.minecraft.resources.Identifier; +import net.minecraft.world.entity.npc.villager.Villager; +import net.minecraft.world.item.ItemStack; +import net.minecraft.world.item.trading.MerchantOffer; +import net.minecraft.world.item.trading.MerchantOffers; + +import java.util.ArrayList; +import java.util.List; + +public record ListedOffer( + int villagerId, + int offerIndex, + String groupKey, + ItemStack costA, + ItemStack costB, + ItemStack result, + int usesLeft, + int maxUses +) { + public static final StreamCodec<RegistryFriendlyByteBuf, ListedOffer> STREAM_CODEC = StreamCodec.of( + (buf, offer) -> { + ByteBufCodecs.INT.encode(buf, offer.villagerId); + ByteBufCodecs.INT.encode(buf, offer.offerIndex); + ByteBufCodecs.STRING_UTF8.encode(buf, offer.groupKey); + ItemStack.OPTIONAL_STREAM_CODEC.encode(buf, offer.costA); + ItemStack.OPTIONAL_STREAM_CODEC.encode(buf, offer.costB); + ItemStack.OPTIONAL_STREAM_CODEC.encode(buf, offer.result); + ByteBufCodecs.INT.encode(buf, offer.usesLeft); + ByteBufCodecs.INT.encode(buf, offer.maxUses); + }, + buf -> new ListedOffer( + ByteBufCodecs.INT.decode(buf), + ByteBufCodecs.INT.decode(buf), + ByteBufCodecs.STRING_UTF8.decode(buf), + ItemStack.OPTIONAL_STREAM_CODEC.decode(buf), + ItemStack.OPTIONAL_STREAM_CODEC.decode(buf), + ItemStack.OPTIONAL_STREAM_CODEC.decode(buf), + ByteBufCodecs.INT.decode(buf), + ByteBufCodecs.INT.decode(buf) + ) + ); + + public static final StreamCodec<RegistryFriendlyByteBuf, List<ListedOffer>> LIST_CODEC = STREAM_CODEC.apply(ByteBufCodecs.list()); + + public static List<ListedOffer> from(Villager villager) { + String customName = villager.hasCustomName() ? villager.getCustomName().getString() : null; + //? if >=26.1 { + String professionId = villager.getVillagerData().profession().unwrapKey() + .map(key -> key.identifier().toString()) + .orElse("minecraft:none"); + //?} else { + /*Identifier profession = BuiltInRegistries.VILLAGER_PROFESSION.getKey(villager.getVillagerData().getProfession()); + String professionId = profession == null ? "minecraft:none" : profession.toString(); + *///?} + String group = TradeGroups.groupKey(customName, professionId); + MerchantOffers offers = villager.getOffers(); + List<ListedOffer> listed = new ArrayList<>(); + for (int index = 0; index < offers.size(); index++) { + MerchantOffer offer = offers.get(index); + int maxUses = offer.getMaxUses(); + int usesLeft = Math.max(0, maxUses - offer.getUses()); + listed.add(new ListedOffer( + villager.getId(), + index, + group, + offer.getCostA().copy(), + offer.getCostB().copy(), + offer.getResult().copy(), + usesLeft, + maxUses + )); + } + return listed; + } +} diff --git a/src/main/java/net/modcrafters/minecraft/villagermarket/trade/MainSlots.java b/src/main/java/net/modcrafters/minecraft/villagermarket/trade/MainSlots.java new file mode 100644 index 0000000..517ab1b --- /dev/null +++ b/src/main/java/net/modcrafters/minecraft/villagermarket/trade/MainSlots.java @@ -0,0 +1,16 @@ +package net.modcrafters.minecraft.villagermarket.trade; + +import net.minecraft.world.entity.player.Inventory; +import net.minecraft.world.item.ItemStack; + +public final class MainSlots { + private MainSlots() { + } + + public static Iterable<ItemStack> of(Inventory inventory) { + //? if >=26.1 { + return inventory.getNonEquipmentItems(); + //?} else + //return inventory.items; + } +} diff --git a/src/main/java/net/modcrafters/minecraft/villagermarket/trade/TradeExecutor.java b/src/main/java/net/modcrafters/minecraft/villagermarket/trade/TradeExecutor.java new file mode 100644 index 0000000..c142ac6 --- /dev/null +++ b/src/main/java/net/modcrafters/minecraft/villagermarket/trade/TradeExecutor.java @@ -0,0 +1,89 @@ +package net.modcrafters.minecraft.villagermarket.trade; + +import net.modcrafters.minecraft.villagermarket.search.MarketSearch; +import net.minecraft.core.BlockPos; +import net.minecraft.server.level.ServerPlayer; +import net.minecraft.world.entity.Entity; +import net.minecraft.world.entity.ExperienceOrb; +import net.minecraft.world.entity.item.ItemEntity; +import net.minecraft.world.entity.npc.villager.Villager; +import net.minecraft.world.item.ItemStack; +import net.minecraft.world.item.trading.MerchantOffer; +import net.minecraft.world.item.trading.MerchantOffers; + +public final class TradeExecutor { + private TradeExecutor() { + } + + public record Result(int performed, boolean outOfRange) { + } + + public static Result execute(ServerPlayer player, BlockPos marketPos, int villagerId, int offerIndex, int requestedUses) { + Entity entity = player.level().getEntity(villagerId); + if (!(entity instanceof Villager villager) || !villager.isAlive() || !MarketSearch.contains(marketPos, villager.position())) { + return new Result(0, true); + } + MerchantOffers offers = villager.getOffers(); + if (offerIndex < 0 || offerIndex >= offers.size()) { + return new Result(0, false); + } + MerchantOffer offer = offers.get(offerIndex); + ItemStack costA = offer.getCostA(); + ItemStack costB = offer.getCostB(); + boolean hasSecond = !costB.isEmpty(); + int usesLeft = Math.max(0, offer.getMaxUses() - offer.getUses()); + int performed = Math.min(Math.max(requestedUses, 0), TradeMath.affordableUses( + count(player, costA), costA.getCount(), + hasSecond ? count(player, costB) : 0, costB.getCount(), + hasSecond, usesLeft)); + if (performed == 0) { + return new Result(0, false); + } + for (int i = 0; i < performed; i++) { + ItemStack payA = offer.getCostA(); + ItemStack payB = offer.getCostB(); + remove(player, payA, payA.getCount()); + if (!payB.isEmpty()) { + remove(player, payB, payB.getCount()); + } + ItemStack result = offer.getResult().copy(); + player.getInventory().add(result); + if (!result.isEmpty()) { + player.level().addFreshEntity(new ItemEntity(player.level(), player.getX(), player.getY(), player.getZ(), result)); + } + villager.notifyTrade(offer); + if (offer.shouldRewardExp()) { + spawnXp(player, offer.getXp()); + } + } + return new Result(performed, false); + } + + private static void spawnXp(ServerPlayer player, int xp) { + player.level().addFreshEntity(new ExperienceOrb(player.level(), player.getX(), player.getY(), player.getZ(), xp)); + } + + static int count(ServerPlayer player, ItemStack cost) { + int have = 0; + for (ItemStack stack : MainSlots.of(player.getInventory())) { + if (ItemStack.isSameItemSameComponents(stack, cost)) { + have += stack.getCount(); + } + } + return have; + } + + private static void remove(ServerPlayer player, ItemStack cost, int amount) { + for (ItemStack stack : MainSlots.of(player.getInventory())) { + if (amount <= 0) { + return; + } + if (!ItemStack.isSameItemSameComponents(stack, cost)) { + continue; + } + int take = Math.min(amount, stack.getCount()); + stack.shrink(take); + amount -= take; + } + } +} diff --git a/src/main/java/net/modcrafters/minecraft/villagermarket/trade/TradeGroups.java b/src/main/java/net/modcrafters/minecraft/villagermarket/trade/TradeGroups.java new file mode 100644 index 0000000..9ba5195 --- /dev/null +++ b/src/main/java/net/modcrafters/minecraft/villagermarket/trade/TradeGroups.java @@ -0,0 +1,13 @@ +package net.modcrafters.minecraft.villagermarket.trade; + +public final class TradeGroups { + private TradeGroups() { + } + + public static String groupKey(String customName, String professionId) { + if (customName != null && !customName.isBlank()) { + return customName; + } + return professionId; + } +} diff --git a/src/main/java/net/modcrafters/minecraft/villagermarket/trade/TradeMath.java b/src/main/java/net/modcrafters/minecraft/villagermarket/trade/TradeMath.java new file mode 100644 index 0000000..30052c7 --- /dev/null +++ b/src/main/java/net/modcrafters/minecraft/villagermarket/trade/TradeMath.java @@ -0,0 +1,15 @@ +package net.modcrafters.minecraft.villagermarket.trade; + +public final class TradeMath { + private TradeMath() { + } + + public static int affordableUses(int haveA, int perA, int haveB, int perB, boolean hasSecond, int remainingUses) { + if (perA <= 0 || remainingUses <= 0 || (hasSecond && perB <= 0)) { + return 0; + } + int usesA = Math.max(haveA, 0) / perA; + int usesB = hasSecond ? Math.max(haveB, 0) / perB : Integer.MAX_VALUE; + return Math.min(usesA, Math.min(usesB, remainingUses)); + } +} diff --git a/src/main/java/net/ndrei/villagermarket/Constants.java b/src/main/java/net/ndrei/villagermarket/Constants.java deleted file mode 100644 index f1320d0..0000000 --- a/src/main/java/net/ndrei/villagermarket/Constants.java +++ /dev/null @@ -1,16 +0,0 @@ -package net.ndrei.villagermarket; - -/** - * Created by CF on 2018-02-25. - */ -public final class Constants { - private Constants() { } - - public static final String MOD_ID = "@MOD-ID@"; - public static final String MOD_NAME = "@MOD-NAME@"; - public static final String MOD_VERSION = "@MOD-VERSION@"; - public static final String MOD_MC_VERSION = "@MOD-MC-VERSION@"; - public static final String MOD_DEPENDENCIES = "required-after:forge@[@FORGE-VERSION@,);"; - - public static final String MOD_SIGN_FINGERPRINT = "@FINGERPRINT@"; -} diff --git a/src/main/java/net/ndrei/villagermarket/VillagerMarketBlock.java b/src/main/java/net/ndrei/villagermarket/VillagerMarketBlock.java deleted file mode 100644 index f415009..0000000 --- a/src/main/java/net/ndrei/villagermarket/VillagerMarketBlock.java +++ /dev/null @@ -1,69 +0,0 @@ -package net.ndrei.villagermarket; - -import net.minecraft.block.Block; -import net.minecraft.block.material.MapColor; -import net.minecraft.block.material.Material; -import net.minecraft.block.state.IBlockState; -import net.minecraft.client.renderer.block.model.ModelResourceLocation; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.Item; -import net.minecraft.item.ItemBlock; -import net.minecraft.util.EnumFacing; -import net.minecraft.util.EnumHand; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.World; -import net.minecraftforge.client.model.ModelLoader; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; -import net.minecraftforge.registries.IForgeRegistry; - -/** - * Created by CF on 2017-02-21. - */ -public class VillagerMarketBlock extends Block { - public VillagerMarketBlock() { - super(Material.WOOD, MapColor.BROWN); - } - - void registerBlock(IForgeRegistry<Block> registry) { - this.setRegistryName(Constants.MOD_ID, "villager_market"); - this.setUnlocalizedName(Constants.MOD_ID + "_villager_market"); - this.setHarvestLevel("axe", 0); - this.setHardness(3.0f); - - registry.register(this); -// registry.register(new ItemBlock(this), this.getRegistryName()); - -// CraftingManager.getInstance().addRecipe(new ShapedOreRecipe(new ItemStack(Item.getItemFromBlock(this)), -// "xxx", "xex", "xxx", -// 'x', Blocks.PLANKS, -// 'e', Blocks.EMERALD_BLOCK)); - } - - void registerItem(IForgeRegistry<Item> registry) { - registry.register(new ItemBlock(this).setRegistryName(this.getRegistryName())); - } - - @SideOnly(Side.CLIENT) - void registerRenderer() { - ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(this) - , 0 - , new ModelResourceLocation(this.getRegistryName(), "inventory") - ); - } - - public boolean onBlockActivated(World worldIn, BlockPos pos, IBlockState state, EntityPlayer playerIn, EnumHand hand, EnumFacing facing, float hitX, float hitY, float hitZ) { - if (!worldIn.isRemote) { - playerIn.openGui(VillagerMarketMod.instance, 5, worldIn, pos.getX(), pos.getY(), pos.getZ()); - } - -// if (!worldIn.isRemote && (playerIn instanceof EntityPlayerMP)) { -// VillagerMarketContainer container = new VillagerMarketContainer(worldIn, pos, playerIn); -// NBTTagCompound message = container.getNBTForMessage(); -// -// VillagerMarketMod.sendMessageToClient(message, (EntityPlayerMP) playerIn); -// } - - return true; - } -} diff --git a/src/main/java/net/ndrei/villagermarket/VillagerMarketContainer.java b/src/main/java/net/ndrei/villagermarket/VillagerMarketContainer.java deleted file mode 100644 index e8eaca5..0000000 --- a/src/main/java/net/ndrei/villagermarket/VillagerMarketContainer.java +++ /dev/null @@ -1,307 +0,0 @@ -package net.ndrei.villagermarket; - -import com.google.common.collect.Lists; -import net.minecraft.entity.Entity; -import net.minecraft.entity.item.EntityItem; -import net.minecraft.entity.item.EntityXPOrb; -import net.minecraft.entity.passive.EntityVillager; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.entity.player.EntityPlayerMP; -import net.minecraft.entity.player.InventoryPlayer; -import net.minecraft.inventory.Container; -import net.minecraft.inventory.InventoryHelper; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.nbt.NBTTagList; -import net.minecraft.util.math.AxisAlignedBB; -import net.minecraft.util.math.BlockPos; -import net.minecraft.village.MerchantRecipe; -import net.minecraft.village.MerchantRecipeList; -import net.minecraft.village.Village; -import net.minecraft.world.World; -import net.minecraftforge.common.util.Constants; -import net.minecraftforge.items.ItemHandlerHelper; - -import javax.swing.*; -import java.util.List; -import java.util.Objects; - -/** - * Created by CF on 2017-02-21. - */ -public class VillagerMarketContainer extends Container { - private EntityPlayer player; - - private List<EntityVillager> villagers = null; - private List<VillagerInfo> villagerInfos = null; - private List<String> villagerTypes; - - VillagerMarketContainer(World world, BlockPos pos, EntityPlayer player) { - this.player = player; - - int radius = 16; - Village village = world.getVillageCollection().getNearestVillage(pos, radius); - if (village != null) { - pos = village.getCenter(); - radius = village.getVillageRadius(); - } - AxisAlignedBB bb = new AxisAlignedBB( - pos.east(radius).south(radius).down(radius), - pos.west(radius).north(radius).up(radius)); - - this.villagers = Lists.newArrayList(); - this.villagerTypes = Lists.newArrayList(); - for(EntityVillager villager : world.getEntitiesWithinAABB(EntityVillager.class, bb)) { - String villagerName = villager.getDisplayName().getFormattedText(); - if (!this.villagerTypes.contains(villagerName)) { - this.villagerTypes.add(villagerName); - } - // VillagerMarketMod.logger.info(villagerName + ": " + String.valueOf(villager.getEntityId() + " - " + villager.getProfessionForge().getRegistryName().toString())); - this.villagers.add(villager); - } - this.villagerTypes.sort(String::compareTo); - } - - VillagerMarketContainer(EntityPlayer player) { - this.player = player; - this.villagerInfos = Lists.newArrayList(); - this.villagerTypes = Lists.newArrayList(); - - NBTTagCompound message = new NBTTagCompound(); - message.setInteger("LOAD", 42); - VillagerMarketMod.sendMessageToServer(message); - } - - void readServerCompound(NBTTagCompound compound) { - NBTTagList list = compound.getTagList("villagers", Constants.NBT.TAG_COMPOUND); - final List<VillagerInfo> infos = Lists.newArrayList(); - final List<String> types = Lists.newArrayList(); - for(int index = 0; index < list.tagCount(); index++) { - NBTTagCompound v = list.getCompoundTagAt(index); - - String profession = v.getString("profession"); - int villagerId = v.getInteger("entityId"); - MerchantRecipeList recipes = new MerchantRecipeList(v.getCompoundTag("recipes")); - - if (!types.contains(profession)) { - types.add(profession); - } - - infos.add(new VillagerInfo(profession, villagerId, recipes)); - } - this.villagerInfos = infos; - this.villagerTypes = types; - } - - @Override - public boolean canInteractWith(@SuppressWarnings("NullableProblems") EntityPlayer playerIn) { - return (playerIn == this.player); - } - - String[] getVillagerTypes() { - return (this.villagerTypes == null) ? null : this.villagerTypes.toArray(new String[0]); - } - - MerchantRecipeInfo[] getRecipes(String villagerTypeFilter) { - List<MerchantRecipeInfo> recipes = Lists.newArrayList(); - - if (this.villagers != null) { - for (EntityVillager villager : this.villagers) { - if ((villagerTypeFilter == null) || (villagerTypeFilter.length() == 0) - || (Objects.equals(villager.getDisplayName().getFormattedText(), villagerTypeFilter))) { - int index = 0; - for (MerchantRecipe recipe : Objects.requireNonNull(villager.getRecipes(this.player)).toArray(new MerchantRecipe[0])) { - recipes.add(new MerchantRecipeInfo(villager, villager.getEntityId(), recipe, index++, this)); - } - } - } - } - else if (this.villagerInfos != null) { - for (VillagerInfo villager : this.villagerInfos) { - if ((villagerTypeFilter == null) || (villagerTypeFilter.length() == 0) - || (Objects.equals(villager.profession, villagerTypeFilter))) { - int index = 0; - for (MerchantRecipe recipe : villager.recipes) { - recipes.add(new MerchantRecipeInfo(null, villager.villagerId, recipe, index++, this)); - } - } - } - } - - return recipes.toArray(new MerchantRecipeInfo[0]); - } - - List<ItemStack> getPlayerInventory() { - return VillagerMarketMod.getCombinedInventory(this.player.inventory); - } - - void processMessageFromClient(NBTTagCompound compound) { - int uses = compound.getInteger("uses"); - int villagerId = compound.getInteger("villagerId"); - int recipeId = compound.getInteger("recipeId"); - - Entity raw = this.player.world.getEntityByID(villagerId); - if ((raw != null) && (raw instanceof EntityVillager)) { - EntityVillager villager = (EntityVillager)raw; - - MerchantRecipe recipe = villager.getRecipes(this.player).get(recipeId); - new MerchantRecipeInfo(villager, villager.getEntityId(), recipe, recipeId, this).useRecipe(uses); - } - } - - NBTTagCompound getNBTForMessage() { - NBTTagCompound nbt = new NBTTagCompound(); - - NBTTagList list = new NBTTagList(); - for(EntityVillager villager : this.villagers) { - NBTTagCompound v = new NBTTagCompound(); - - v.setString("profession", villager.getDisplayName().getFormattedText()); - v.setInteger("entityId", villager.getEntityId()); - - v.setTag("recipes", villager.getRecipes(this.player).getRecipiesAsTags()); - - list.appendTag(v); - } - nbt.setTag("villagers", list); - - return nbt; - } - - private class VillagerInfo { - final int villagerId; - final MerchantRecipeList recipes; - final String profession; - - VillagerInfo(String profession, int villagerId, MerchantRecipeList recipes) { - this.profession = profession; - this.villagerId = villagerId; - this.recipes = recipes; - } - } - - class MerchantRecipeInfo { - private final EntityVillager villager; - final int villagerId; - final MerchantRecipe recipe; - final VillagerMarketContainer container; - final int recipeIndex; - - MerchantRecipeInfo(EntityVillager villager, int villagerId, MerchantRecipe recipe, int recipeIndex, VillagerMarketContainer container) { - this.villager = villager; - this.villagerId = villagerId; - this.recipe = recipe; - this.recipeIndex = recipeIndex; - this.container = container; - } - - int getUses(List<ItemStack> inventory, boolean isCombined) { - if (this.recipe.isRecipeDisabled() || (this.recipe.getMaxTradeUses() == 0)) { - return 0; - } - - int uses = VillagerMarketMod.getAmountOf(inventory, this.recipe.getItemToBuy(), true, isCombined); - if (recipe.hasSecondItemToBuy()) { - uses = Math.min(uses, - VillagerMarketMod.getAmountOf(inventory, this.recipe.getSecondItemToBuy(), true, isCombined)); - } - - return uses; - } - - int getMaxUses() { - if (this.recipe.isRecipeDisabled()) { - return 0; - } - - return Math.max(0, this.recipe.getMaxTradeUses() - this.recipe.getToolUses()); - } - - void useRecipe(int uses) { - List<ItemStack> inventory = this.container.getPlayerInventory(); - - uses = Math.min(uses, this.getUses(inventory, true)); - if (uses == 0) { - return; - } - - ItemStack item1 = this.recipe.getItemToBuy(); - int item1Size = item1.getCount() * uses; - - ItemStack item2 = this.recipe.getSecondItemToBuy(); - int item2Size = 0; - if (!item2.isEmpty()) { - item2Size = item2.getCount() * uses; - } - - int item1Extracted = VillagerMarketMod.extractFromCombinedInventory(this.container.player.inventory, item1, item1Size); - if (item1Extracted != item1Size) { - VillagerMarketMod.logger.warn("Could not extract " + String.valueOf(item1Size) + " of " + item1.getDisplayName() + " from player inventory."); - } - if (item2Size > 0) { - int item2Extracted = VillagerMarketMod.extractFromCombinedInventory(this.container.player.inventory, item2, item2Size); - if (item2Extracted != item2Size) { - VillagerMarketMod.logger.warn("Could not extract " + String.valueOf(item2Size) + " of " + item2.getDisplayName() + " from player inventory."); - } - } - - for(int use = 0; use < uses; use++) { - ItemStack result = this.recipe.getItemToSell().copy(); - - // try to merge result into existing slots - int emptySlot = -1; - for(int index = 0; index < this.container.player.inventory.getSizeInventory(); index++) { - if (!this.container.player.inventory.isItemValidForSlot(index, result)) { - // TODO: find a way to ignore armor slots for non-armor items - return; - } - - ItemStack inv = this.container.player.inventory.getStackInSlot(index); - if (inv.isEmpty() && (emptySlot == -1)) { - emptySlot = index; - } - else if (!inv.isEmpty() && inv.isItemEqual(result)) { - int max = inv.getMaxStackSize(); - int canInsert = Math.min(Math.min(max, result.getCount()), max - inv.getCount()); - if (canInsert > 0) { - inv.setCount(inv.getCount() + canInsert); - this.container.player.inventory.setInventorySlotContents(index, inv); - - result.shrink(canInsert); - } - } - - if (result.isEmpty()) { - break; - } - } - - if (!result.isEmpty()) { - if (emptySlot >= 0) { - this.container.player.inventory.setInventorySlotContents(emptySlot, result); - } - else { - BlockPos pos = this.container.player.getPosition(); - InventoryHelper.spawnItemStack(this.container.player.world, - pos.getX(), pos.getY(), pos.getZ(), - result.copy()); - VillagerMarketMod.logger.info("Spawned at " + pos.toString() + " : " + result.toString()); - } - } - - this.villager.useRecipe(this.recipe); - } - - BlockPos villagerPos = this.villager.getPos(); - AxisAlignedBB aabb = new AxisAlignedBB(villagerPos.south().east().down(), villagerPos.north().west().up()); - for (EntityXPOrb xp: this.villager.getWorld().getEntitiesWithinAABB(EntityXPOrb.class, aabb)) { - xp.setPosition(this.container.player.posX, this.container.player.posY, this.container.player.posZ); - } - - this.container.player.inventory.markDirty(); - this.container.player.inventoryContainer.detectAndSendChanges(); - ((EntityPlayerMP)this.container.player).sendContainerToPlayer(this.container.player.inventoryContainer); - VillagerMarketMod.sendMessageToClient(container.getNBTForMessage(), (EntityPlayerMP) this.container.player); - } - } -} diff --git a/src/main/java/net/ndrei/villagermarket/VillagerMarketEvents.java b/src/main/java/net/ndrei/villagermarket/VillagerMarketEvents.java deleted file mode 100644 index cdf7193..0000000 --- a/src/main/java/net/ndrei/villagermarket/VillagerMarketEvents.java +++ /dev/null @@ -1,31 +0,0 @@ -package net.ndrei.villagermarket; - -import net.minecraft.block.Block; -import net.minecraft.item.Item; -import net.minecraftforge.client.event.ModelRegistryEvent; -import net.minecraftforge.event.RegistryEvent; -import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; - -/** - * Created by CF on 2017-07-09. - */ -public class VillagerMarketEvents { - @SubscribeEvent - public void registerBlocks(RegistryEvent.Register<Block> ev) { - VillagerMarketMod.villagerMarket.registerBlock(ev.getRegistry()); - VillagerMarketMod.villagerMarket.setCreativeTab(VillagerMarketMod.creativeTab); - } - - @SubscribeEvent - public void registerItems(RegistryEvent.Register<Item> ev) { - VillagerMarketMod.villagerMarket.registerItem(ev.getRegistry()); - } - - @SubscribeEvent - @SideOnly(Side.CLIENT) - public void registerModels(ModelRegistryEvent ev) { - VillagerMarketMod.villagerMarket.registerRenderer(); - } -} diff --git a/src/main/java/net/ndrei/villagermarket/VillagerMarketGuiHandler.java b/src/main/java/net/ndrei/villagermarket/VillagerMarketGuiHandler.java deleted file mode 100644 index cee78a4..0000000 --- a/src/main/java/net/ndrei/villagermarket/VillagerMarketGuiHandler.java +++ /dev/null @@ -1,42 +0,0 @@ -package net.ndrei.villagermarket; - -import net.minecraft.block.state.IBlockState; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.World; -import net.minecraftforge.fml.common.network.IGuiHandler; - -import javax.annotation.Nullable; - -/** - * Created by CF on 2017-02-21. - */ -public class VillagerMarketGuiHandler implements IGuiHandler { - private VillagerMarketContainer getContainer(EntityPlayer player, World world, BlockPos pos) { - return new VillagerMarketContainer(world, pos, player); - } - - @Nullable - @Override - public Object getServerGuiElement(int id, EntityPlayer player, World world, int x, int y, int z) { - BlockPos pos = new BlockPos(x, y, z); - IBlockState state = world.getBlockState(pos); - if (state.getBlock() == VillagerMarketMod.villagerMarket) { - return this.getContainer(player, world, pos); - } - - return null; - } - - @Nullable - @Override - public Object getClientGuiElement(int id, EntityPlayer player, World world, int x, int y, int z) { - BlockPos pos = new BlockPos(x, y, z); - IBlockState state = world.getBlockState(pos); - if (state.getBlock() == VillagerMarketMod.villagerMarket) { - return new VillagerMarketScreen(new VillagerMarketContainer(player)); - } - - return null; - } -} diff --git a/src/main/java/net/ndrei/villagermarket/VillagerMarketMod.java b/src/main/java/net/ndrei/villagermarket/VillagerMarketMod.java deleted file mode 100644 index a7fe83a..0000000 --- a/src/main/java/net/ndrei/villagermarket/VillagerMarketMod.java +++ /dev/null @@ -1,150 +0,0 @@ -package net.ndrei.villagermarket; - -import java.util.List; -import com.google.common.collect.Lists; -import org.apache.logging.log4j.Logger; -import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.entity.player.EntityPlayerMP; -import net.minecraft.inventory.IInventory; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraftforge.common.MinecraftForge; -import net.minecraftforge.fml.common.Mod; -import net.minecraftforge.fml.common.event.FMLPreInitializationEvent; -import net.minecraftforge.fml.common.network.NetworkRegistry; -import net.minecraftforge.fml.common.network.simpleimpl.SimpleNetworkWrapper; -import net.minecraftforge.fml.relauncher.Side; - -@Mod(modid = Constants.MOD_ID, version = Constants.MOD_VERSION, name = Constants.MOD_NAME, - acceptedMinecraftVersions = Constants.MOD_MC_VERSION, - dependencies = Constants.MOD_DEPENDENCIES, - certificateFingerprint = Constants.MOD_SIGN_FINGERPRINT, - useMetadata = true) -public class VillagerMarketMod { - @Mod.Instance - @SuppressWarnings("unused") - public static VillagerMarketMod instance; - - public static Logger logger; - - public static CreativeTabs creativeTab = new CreativeTabs("villager_market") { - @Override - public ItemStack getIconItemStack() { - return new ItemStack(Item.getItemFromBlock(VillagerMarketMod.villagerMarket)); - } - - @Override - public ItemStack getTabIconItem() { - return this.getIconItemStack(); - } - }; - - private SimpleNetworkWrapper networkWrapper; - - public static VillagerMarketBlock villagerMarket; - - @Mod.EventHandler - @SuppressWarnings("unused") - public void preInit(FMLPreInitializationEvent event) { - VillagerMarketMod.logger = event.getModLog(); - MinecraftForge.EVENT_BUS.register(new VillagerMarketEvents()); - VillagerMarketMod.villagerMarket = new VillagerMarketBlock(); - -// VillagerMarketMod.villagerMarket = new VillagerMarketBlock(); -// VillagerMarketMod.villagerMarket.register(); -// VillagerMarketMod.villagerMarket.setCreativeTab(VillagerMarketMod.creativeTab); -// -// if (event.getSide() == Side.CLIENT) { -// VillagerMarketMod.villagerMarket.registerRenderer(); -// } - - NetworkRegistry.INSTANCE.registerGuiHandler(VillagerMarketMod.instance, new VillagerMarketGuiHandler()); - - this.networkWrapper = new SimpleNetworkWrapper("VM|GUI"); - this.networkWrapper.registerMessage(VillagerMarketNetwork.ClientHandler.class, VillagerMarketPacketClient.class, 0, Side.CLIENT); - this.networkWrapper.registerMessage(VillagerMarketNetwork.ServerHandler.class, VillagerMarketPacketServer.class, 1, Side.SERVER); - } - - static List<ItemStack> getCombinedInventory(IInventory inventory) { - List<ItemStack> list = Lists.newArrayList(); - for (int i = 0; i < inventory.getSizeInventory(); i++) { - ItemStack stack = inventory.getStackInSlot(i); - if (stack.isEmpty()) { - continue; - } - - ItemStack match = null; - for (ItemStack existing : list) { - if (existing.getItem() == stack.getItem()) { - match = existing; - break; - } - } - if (match == null) { - list.add(stack.copy()); - } else { - match.setCount(match.getCount() + stack.getCount()); - } - } - return list; - } - - static int extractFromCombinedInventory(IInventory inventory, ItemStack stack, int amount) { - if (stack.isEmpty()) { - return 0; - } - - int taken = 0; - for (int i = 0; i < inventory.getSizeInventory(); i++) { - ItemStack temp = inventory.getStackInSlot(i); - if (temp.isEmpty() || (temp.getItem() != stack.getItem())) { - continue; - } - - ItemStack takenStack; - if (temp.getCount() == amount) { - takenStack = inventory.removeStackFromSlot(i); - } else { - takenStack = inventory.decrStackSize(i, Math.min(amount, temp.getCount())); - } - - taken += takenStack.getCount(); - amount -= takenStack.getCount(); - if (amount <= 0) { - break; - } - } - return taken; - } - - static int getAmountOf(List<ItemStack> stacks, ItemStack stack, boolean fullCount, boolean isCombined) { - int amount = 0; - if (!stack.isEmpty() && (stacks != null)) { - for (ItemStack s : stacks) { - if (s.isItemEqual(stack)) { - amount += s.getCount(); - if (isCombined) { - break; - } - } - } - } - if (fullCount && !stack.isEmpty()) { - amount /= stack.getCount(); - } - return amount; - } - - static void sendMessageToServer(NBTTagCompound message) { - VillagerMarketMod.instance.networkWrapper.sendToServer(new VillagerMarketPacketServer(message)); - } - - static void sendMessageToClient(NBTTagCompound message, EntityPlayerMP player) { - VillagerMarketMod.instance.networkWrapper.sendTo(new VillagerMarketPacketClient(message), player); - } - - static void sendMessageToClient(VillagerMarketPacketClient message, EntityPlayerMP player) { - VillagerMarketMod.instance.networkWrapper.sendTo(message, player); - } -} diff --git a/src/main/java/net/ndrei/villagermarket/VillagerMarketNetwork.java b/src/main/java/net/ndrei/villagermarket/VillagerMarketNetwork.java deleted file mode 100644 index 4a19f11..0000000 --- a/src/main/java/net/ndrei/villagermarket/VillagerMarketNetwork.java +++ /dev/null @@ -1,42 +0,0 @@ -package net.ndrei.villagermarket; - -import net.minecraft.client.Minecraft; -import net.minecraftforge.common.util.Constants; -import net.minecraftforge.fml.common.FMLCommonHandler; -import net.minecraftforge.fml.common.network.simpleimpl.IMessage; -import net.minecraftforge.fml.common.network.simpleimpl.IMessageHandler; -import net.minecraftforge.fml.common.network.simpleimpl.MessageContext; - -/** - * Created by CF on 2017-02-22. - */ -public class VillagerMarketNetwork { - public static class ServerHandler implements IMessageHandler<VillagerMarketPacketServer, IMessage> { - @Override - public IMessage onMessage(VillagerMarketPacketServer message, MessageContext ctx) { - FMLCommonHandler.instance().getMinecraftServerInstance().addScheduledTask(() -> { - if ((message != null) && (ctx.getServerHandler().player.openContainer instanceof VillagerMarketContainer)) { - if (message.getCompound().hasKey("LOAD", Constants.NBT.TAG_INT)) { - VillagerMarketContainer container = (VillagerMarketContainer) ctx.getServerHandler().player.openContainer; - VillagerMarketMod.sendMessageToClient(container.getNBTForMessage(), ctx.getServerHandler().player); - } else { - ((VillagerMarketContainer) ctx.getServerHandler().player.openContainer).processMessageFromClient(message.getCompound()); - } - } - }); - - return null; - } - } - - public static class ClientHandler implements IMessageHandler<VillagerMarketPacketClient, IMessage> { - @Override - public IMessage onMessage(VillagerMarketPacketClient message, MessageContext ctx) { - if (Minecraft.getMinecraft().currentScreen instanceof VillagerMarketScreen) { - ((VillagerMarketScreen) Minecraft.getMinecraft().currentScreen).readServerCompound(message.getCompound()); - } - - return null; - } - } -} diff --git a/src/main/java/net/ndrei/villagermarket/VillagerMarketPacket.java b/src/main/java/net/ndrei/villagermarket/VillagerMarketPacket.java deleted file mode 100644 index 2391893..0000000 --- a/src/main/java/net/ndrei/villagermarket/VillagerMarketPacket.java +++ /dev/null @@ -1,25 +0,0 @@ -package net.ndrei.villagermarket; - -import io.netty.buffer.ByteBuf; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraftforge.fml.common.network.ByteBufUtils; -import net.minecraftforge.fml.common.network.simpleimpl.IMessage; - -/** - * Created by CF on 2017-02-22. - */ -public abstract class VillagerMarketPacket implements IMessage { - public NBTTagCompound compound; - - public NBTTagCompound getCompound() { return this.compound; } - - @Override - public void fromBytes(ByteBuf buf) { - this.compound = ByteBufUtils.readTag(buf); - } - - @Override - public void toBytes(ByteBuf buf) { - ByteBufUtils.writeTag(buf, (this.compound != null) ? this.compound : new NBTTagCompound()); - } -} diff --git a/src/main/java/net/ndrei/villagermarket/VillagerMarketPacketClient.java b/src/main/java/net/ndrei/villagermarket/VillagerMarketPacketClient.java deleted file mode 100644 index 2c1f90f..0000000 --- a/src/main/java/net/ndrei/villagermarket/VillagerMarketPacketClient.java +++ /dev/null @@ -1,13 +0,0 @@ -package net.ndrei.villagermarket; - -import net.minecraft.nbt.NBTTagCompound; - -public class VillagerMarketPacketClient extends VillagerMarketPacket { - @SuppressWarnings("unused") - public VillagerMarketPacketClient() { } - - public VillagerMarketPacketClient (NBTTagCompound compound) { - this.compound = compound; - } - -} diff --git a/src/main/java/net/ndrei/villagermarket/VillagerMarketPacketServer.java b/src/main/java/net/ndrei/villagermarket/VillagerMarketPacketServer.java deleted file mode 100644 index 6a7f819..0000000 --- a/src/main/java/net/ndrei/villagermarket/VillagerMarketPacketServer.java +++ /dev/null @@ -1,12 +0,0 @@ -package net.ndrei.villagermarket; - -import net.minecraft.nbt.NBTTagCompound; - -public class VillagerMarketPacketServer extends VillagerMarketPacket { - @SuppressWarnings("unused") - public VillagerMarketPacketServer() { } - - public VillagerMarketPacketServer (NBTTagCompound compound) { - this.compound = compound; - } -} diff --git a/src/main/java/net/ndrei/villagermarket/VillagerMarketScreen.java b/src/main/java/net/ndrei/villagermarket/VillagerMarketScreen.java deleted file mode 100644 index 35b181a..0000000 --- a/src/main/java/net/ndrei/villagermarket/VillagerMarketScreen.java +++ /dev/null @@ -1,396 +0,0 @@ -package net.ndrei.villagermarket; - -import com.google.common.collect.Lists; -import net.minecraft.client.gui.GuiButton; -import net.minecraft.client.gui.GuiListButton; -import net.minecraft.client.gui.GuiPageButtonList; -import net.minecraft.client.gui.inventory.GuiContainer; -import net.minecraft.client.renderer.GlStateManager; -import net.minecraft.client.renderer.RenderHelper; -import net.minecraft.client.renderer.Tessellator; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.ResourceLocation; -import net.minecraft.village.MerchantRecipe; -import net.minecraftforge.fml.client.GuiScrollingList; -import org.lwjgl.input.Mouse; - -import java.io.IOException; -import java.util.List; - -/** - * Created by CF on 2017-02-21. - */ -public class VillagerMarketScreen extends GuiContainer { - public static final ResourceLocation BACKGROUND = new ResourceLocation(Constants.MOD_ID, "textures/gui/gui.png"); - - private VillagerMarketContainer container; - - private GuiScrollingList list; - private GuiScrollingList listRecipes; - - private GuiListButton btn; - - private String selectedVillagerType = ""; - private boolean showAllRecipes = true; - - private VillagerMarketContainer.MerchantRecipeInfo currentRecipe; - private GuiButton btnOnce, btnMax; - - private List<ItemStackSlotInfo> drawnStacks; - private class ItemStackSlotInfo { - final ItemStack stack; - final int x; - final int y; - - ItemStackSlotInfo(ItemStack s, int x, int y) { - this.stack = s; - this.x = x; - this.y = y; - } - - int r() { - return this.x + 16; - } - - int b() { - return this.y + 16; - } - } - - public VillagerMarketScreen(VillagerMarketContainer container) { - super(container); - - this.container = container; - - super.xSize = 256; - super.ySize = 209; - } - - void readServerCompound(NBTTagCompound compound) { - this.container.readServerCompound(compound); - - if (this.currentRecipe != null) { - // update current recipe - VillagerMarketContainer.MerchantRecipeInfo info = this.currentRecipe; - this.setCurrentRecipe(null); - for(VillagerMarketContainer.MerchantRecipeInfo mri : this.container.getRecipes("")) { - if ((mri.villagerId == info.villagerId) && (mri.recipeIndex == info.recipeIndex)) { - if (!mri.recipe.isRecipeDisabled() && (mri.getMaxUses() > 0)) { - this.setCurrentRecipe(mri); - } - break; - } - } - } - } - - @Override - public void initGui() { - super.initGui(); - - int guiWidth = super.xSize; - int guiHeight = super.ySize; - - int guiTop = super.guiTop; // (this.height - guiHeight) / 2; - int guiLeft = super.guiLeft; // (this.width - guiWidth) / 2; - - this.list = new GuiScrollingList(this.mc, 88, 140, guiTop + 5 + 1, guiTop + 140 + 5 + 1, guiLeft + 5 + 1, this.fontRenderer.FONT_HEIGHT + 2, this.width, this.height) { - private int selected = 0; - - @Override - protected int getSize() { - String[] types = VillagerMarketScreen.this.container.getVillagerTypes(); - return 1 + ((types == null) ? 0 : types.length); - } - - @Override - protected void elementClicked(int index, boolean doubleClick) { - this.selected = index; - String[] types = VillagerMarketScreen.this.container.getVillagerTypes(); - if ((types != null) && (index > 0) && (index <= types.length)) { - VillagerMarketScreen.this.selectedVillagerType = types[index - 1]; - } else { - VillagerMarketScreen.this.selectedVillagerType = ""; - } - } - - @Override - protected boolean isSelected(int index) { - return (this.selected == index); - } - - @Override - protected void drawBackground() { - } - - @Override - protected void drawSlot(int slotIdx, int entryRight, int slotTop, int slotBuffer, Tessellator tess) { - if (slotIdx == this.selectedIndex) { - GlStateManager.color(0.4f, 0.4f, 0.4f); - } else { - GlStateManager.color(1.0f, 1.0f, 1.0f); - } - - String[] types = VillagerMarketScreen.this.container.getVillagerTypes(); - if ((types != null) && (slotIdx > 0) && (slotIdx <= types.length)) { - VillagerMarketScreen.this.drawString(VillagerMarketScreen.this.fontRenderer, - types[slotIdx - 1], this.left + 1, slotTop, 0xFFFFFF); - } else { - VillagerMarketScreen.this.drawString(VillagerMarketScreen.this.fontRenderer, - "[ ALL ]", this.left + 1, slotTop, 0xFFFFFF); - } - - if (slotIdx == this.selectedIndex) { - // reset color change - GlStateManager.color(1.0f, 1.0f, 1.0f); - } - } - }; - this.listRecipes = new GuiScrollingList(this.mc, 149, 165, guiTop + 5 + 1, guiTop + 165 + 5 + 1, guiLeft + 90 + 5 + 5 + 1, 28, this.width, this.height) { - @Override - protected int getSize() { - List<VillagerMarketContainer.MerchantRecipeInfo> recipes = VillagerMarketScreen.this.getRecipes(); - return (recipes == null) ? 0 : recipes.size(); - } - - @Override - protected void elementClicked(int index, boolean doubleClick) { - List<VillagerMarketContainer.MerchantRecipeInfo> recipes = VillagerMarketScreen.this.getRecipes(); - if ((recipes != null) && (index >= 0) && (index < recipes.size())) { - VillagerMarketScreen.this.setCurrentRecipe(recipes.get(index)); - } - else { - VillagerMarketScreen.this.setCurrentRecipe(null); - } - } - - @Override - protected boolean isSelected(int index) { - return false; - } - - @Override - protected void drawBackground() { - } - - @Override - protected void drawSlot(int slotIdx, int entryRight, int slotTop, int slotBuffer, Tessellator tess) { - if (slotIdx == this.selectedIndex) { - GlStateManager.color(0.4f, 0.4f, 0.4f); - } else { - GlStateManager.color(1.0f, 1.0f, 1.0f); - } - - VillagerMarketScreen.this.mc.getTextureManager().bindTexture(VillagerMarketScreen.BACKGROUND); - VillagerMarketScreen.this.drawTexturedModalRect(this.left, slotTop, 2, 226, 151, 28); - - List<VillagerMarketContainer.MerchantRecipeInfo> recipes = VillagerMarketScreen.this.getRecipes(); - List<ItemStack> inventory = VillagerMarketScreen.this.container.getPlayerInventory(); - if ((recipes != null) && (slotIdx >= 0) && (slotIdx < recipes.size())) { - VillagerMarketContainer.MerchantRecipeInfo recipeInfo = recipes.get(slotIdx); - MerchantRecipe recipe = recipeInfo.recipe; - - RenderHelper.enableGUIStandardItemLighting(); - GlStateManager.pushMatrix(); - GlStateManager.enableDepth(); - - VillagerMarketScreen.this.drawItemStack(recipe.getItemToBuy(), this.left + 5, slotTop + 5); - VillagerMarketScreen.this.drawItemStack(recipe.getSecondItemToBuy(), this.left + 30, slotTop + 5); - VillagerMarketScreen.this.drawItemStack(recipe.getItemToSell(), this.left + 73, slotTop + 5); - - GlStateManager.popMatrix(); - RenderHelper.disableStandardItemLighting(); - - int times = VillagerMarketMod.getAmountOf(inventory, recipe.getItemToBuy(), true, true); - if (recipe.hasSecondItemToBuy()) { - times = Math.min(times, VillagerMarketMod.getAmountOf(inventory, recipe.getSecondItemToBuy(), true, true)); - } - - VillagerMarketScreen.this.drawString(VillagerMarketScreen.this.fontRenderer, - "[" + String.valueOf(times) + " / " + String.valueOf(recipeInfo.getMaxUses()) + "]", - this.left + 1 + 100, slotTop + (this.slotHeight - VillagerMarketScreen.this.fontRenderer.FONT_HEIGHT) / 2, 0xFFFFFF); - } - - if (slotIdx == this.selectedIndex) { - // reset color change - GlStateManager.color(1.0f, 1.0f, 1.0f); - } - } - }; - - this.btn = new GuiListButton(new GuiPageButtonList.GuiResponder() { - @Override - public void setEntryValue(int id, boolean value) { - if (id == 42) { - /*VillagerMarketScreen.this.btn.setValue(*/VillagerMarketScreen.this.showAllRecipes = value/*)*/; - } - } - - @Override - public void setEntryValue(int id, float value) { - } - - @Override - public void setEntryValue(int id, String value) { - } - }, 42, guiLeft + 5, guiTop + 152, "Show All", true); - this.btn.setWidth(90); - this.addButton(this.btn); - - this.btnOnce = new GuiButton(4201, guiLeft + 156, guiTop + 180, 35, 20, "x 1"); - this.btnOnce.visible = false; - this.addButton(this.btnOnce); - - this.btnMax = new GuiButton(4202, guiLeft + 196, guiTop + 180, 35, 20, "x 10"); - this.btnMax.visible = false; - this.addButton(this.btnMax); - -// this.guiLeft = guiLeft; -// this.guiTop = guiTop; - } - - @Override - protected void actionPerformed(GuiButton button) throws IOException { - if ((button == null) || (this.currentRecipe == null)) { - return; - } - - MerchantRecipe recipe = this.currentRecipe.recipe; - List<ItemStack> inventory = this.container.getPlayerInventory(); - NBTTagCompound compound = new NBTTagCompound(); - if (button.id == 4201) { - // handle 'once' click - // this.currentRecipe.useRecipe(1); - compound.setInteger("uses", 1); - } - else if (button.id == 4202) { - // handle 'max' click - // this.currentRecipe.useRecipe(this.currentRecipe.getMaxUses()); - compound.setInteger("uses", this.currentRecipe.getMaxUses()); - } - - if (compound.getSize() > 0) { - compound.setInteger("villagerId", this.currentRecipe.villagerId); - compound.setInteger("recipeId", this.currentRecipe.recipeIndex); - VillagerMarketMod.sendMessageToServer(compound); - } - } - - private void setCurrentRecipe(VillagerMarketContainer.MerchantRecipeInfo recipeInfo) { - if (null != (this.currentRecipe = recipeInfo)) { - this.btnOnce.visible = true; - this.btnMax.visible = true; - } - else { - this.btnOnce.visible = false; - this.btnMax.visible = false; - } - } - - private List<VillagerMarketContainer.MerchantRecipeInfo> getRecipes() { - List<VillagerMarketContainer.MerchantRecipeInfo> recipes = Lists.newArrayList(); - - List<ItemStack> inventory = this.container.getPlayerInventory(); - for(VillagerMarketContainer.MerchantRecipeInfo recipe : this.container.getRecipes(this.selectedVillagerType)) { - if (!this.showAllRecipes && (0 == recipe.getUses(inventory, true))) { - continue; - } - - recipes.add(recipe); - } - - return recipes; - } - - @Override - protected void drawGuiContainerBackgroundLayer(float partialTicks, int mouseX, int mouseY) { - GlStateManager.color(1.0f, 1.0f, 1.0f, 1.0f); - - this.mc.getTextureManager().bindTexture(VillagerMarketScreen.BACKGROUND); - this.drawTexturedModalRect(this.guiLeft, this.guiTop, 0, 0, 256, 209); - - this.drawnStacks = Lists.newArrayList(); - this.list.drawScreen(mouseX, mouseY, partialTicks); - this.listRecipes.drawScreen(mouseX, mouseY, partialTicks); - - // GuiOptionButton btn = new GuiOptionButton(42, 0, 0, 20, 100, "only available"); - this.btn.drawButton(this.mc, mouseX, mouseY, partialTicks); - - if (this.currentRecipe != null) { - List<ItemStack> inventory = VillagerMarketScreen.this.container.getPlayerInventory(); - MerchantRecipe recipe = this.currentRecipe.recipe; - - RenderHelper.enableGUIStandardItemLighting(); - GlStateManager.pushMatrix(); - GlStateManager.enableDepth(); - - int left = this.guiLeft + 5; - int top = this.guiTop + 176; - - this.drawItemStack(recipe.getItemToBuy(), left + 5, top + 5); - this.drawItemStack(recipe.getSecondItemToBuy(), left + 30, top + 5); - this.drawItemStack(recipe.getItemToSell(), left + 73, top + 5); - - GlStateManager.popMatrix(); - RenderHelper.disableStandardItemLighting(); - - int times = VillagerMarketMod.getAmountOf(inventory, recipe.getItemToBuy(), true, true); - if (recipe.hasSecondItemToBuy()) { - times = Math.min(times, VillagerMarketMod.getAmountOf(inventory, recipe.getSecondItemToBuy(), true, true)); - } - - String maxUses = "-1"; - if (this.currentRecipe != null) { - maxUses = String.valueOf(this.currentRecipe.getMaxUses()); - } - - VillagerMarketScreen.this.drawString(VillagerMarketScreen.this.fontRenderer, - "[" + String.valueOf(times) + " / " + maxUses + "]", - left + 1 + 100, top + (28 - VillagerMarketScreen.this.fontRenderer.FONT_HEIGHT) / 2, 0xFFFFFF); - - int uses = Math.min(this.currentRecipe.getUses(inventory, true), this.currentRecipe.getMaxUses()); - this.btnMax.displayString = "x " + String.valueOf(uses); - this.btnOnce.enabled = (uses > 0); - this.btnMax.enabled = (uses > 0); - - this.btnOnce.drawButton(this.mc, mouseX, mouseY, partialTicks); - this.btnMax.drawButton(this.mc, mouseX, mouseY, partialTicks); - } - } - - @Override - protected void drawGuiContainerForegroundLayer(int mouseX, int mouseY) { - if (this.drawnStacks != null) { - for(ItemStackSlotInfo info : this.drawnStacks) { - if (!info.stack.isEmpty() && (mouseX >= info.x) && (mouseX <= info.r()) && (mouseY >= info.y) && (mouseY <= info.b())) { - super.renderToolTip(info.stack, mouseX - this.getGuiLeft(), mouseY - this.getGuiTop()); - break; - } - } - } - } - - private void drawItemStack(ItemStack stack, int left, int top) { - VillagerMarketScreen.this.itemRender.renderItemIntoGUI( - stack, left, top); - VillagerMarketScreen.this.itemRender.renderItemOverlays(VillagerMarketScreen.this.fontRenderer, - stack, left, top); - - if (this.drawnStacks != null) { - this.drawnStacks.add(new ItemStackSlotInfo(stack, left, top)); - } - } - - @Override - public void handleMouseInput() throws IOException { - int mouseX = Mouse.getEventX() * this.width / this.mc.displayWidth; - int mouseY = this.height - Mouse.getEventY() * this.height / this.mc.displayHeight - 1; - - super.handleMouseInput(); - if (this.list != null) - this.list.handleMouseInput(mouseX, mouseY); - if (this.listRecipes != null) - this.listRecipes.handleMouseInput(mouseX, mouseY); - } -} diff --git a/src/main/resources/assets/villagermarket/blockstates/villager_market.json b/src/main/resources/assets/villagermarket/blockstates/villager_market.json index e9787db..10ad5a2 100644 --- a/src/main/resources/assets/villagermarket/blockstates/villager_market.json +++ b/src/main/resources/assets/villagermarket/blockstates/villager_market.json @@ -1,18 +1,5 @@ { - "forge_marker": 1, - "defaults": { - "model": "villagermarket:villager_market" - }, "variants": { - "normal": [{}], - "inventory": [{}], - "facing": { - "north": {}, - "south": {"y": 180}, - "west": {"y": 270}, - "east": {"y": 90}, - "up": {"x": -90}, - "down": {"x": 90} - } + "": { "model": "villagermarket:block/villager_market" } } -} \ No newline at end of file +} diff --git a/src/main/resources/assets/villagermarket/items/villager_market.json b/src/main/resources/assets/villagermarket/items/villager_market.json new file mode 100644 index 0000000..312d310 --- /dev/null +++ b/src/main/resources/assets/villagermarket/items/villager_market.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "villagermarket:item/villager_market" + } +} diff --git a/src/main/resources/assets/villagermarket/lang/en_US.lang b/src/main/resources/assets/villagermarket/lang/en_US.lang deleted file mode 100644 index f80979d..0000000 --- a/src/main/resources/assets/villagermarket/lang/en_US.lang +++ /dev/null @@ -1,2 +0,0 @@ -tile.villagermarket_villager_market.name=Villager Market -itemGroup.villager_market=Villager Market \ No newline at end of file diff --git a/src/main/resources/assets/villagermarket/lang/en_us.json b/src/main/resources/assets/villagermarket/lang/en_us.json new file mode 100644 index 0000000..7c2ad59 --- /dev/null +++ b/src/main/resources/assets/villagermarket/lang/en_us.json @@ -0,0 +1,7 @@ +{ + "block.villagermarket.villager_market": "Villager Market", + "itemGroup.villagermarket": "Villager Market", + "gui.villagermarket.all": "[ ALL ]", + "gui.villagermarket.show_all": "Show All", + "gui.villagermarket.once": "x 1" +} diff --git a/src/main/resources/assets/villagermarket/models/block/villager_market.json b/src/main/resources/assets/villagermarket/models/block/villager_market.json index 40c475c..53a8f2d 100644 --- a/src/main/resources/assets/villagermarket/models/block/villager_market.json +++ b/src/main/resources/assets/villagermarket/models/block/villager_market.json @@ -1,5 +1,5 @@ { - "parent": "block/cube", + "parent": "minecraft:block/cube", "textures": { "particle": "villagermarket:blocks/crate", "north": "villagermarket:blocks/crate-villager", @@ -9,4 +9,4 @@ "up": "villagermarket:blocks/crate", "down": "villagermarket:blocks/crate" } -} \ No newline at end of file +} diff --git a/src/main/resources/assets/villagermarket/models/item/villager_market.json b/src/main/resources/assets/villagermarket/models/item/villager_market.json new file mode 100644 index 0000000..7c37393 --- /dev/null +++ b/src/main/resources/assets/villagermarket/models/item/villager_market.json @@ -0,0 +1,3 @@ +{ + "parent": "villagermarket:block/villager_market" +} diff --git a/src/main/resources/assets/villagermarket/recipes/villager_market.json b/src/main/resources/assets/villagermarket/recipes/villager_market.json deleted file mode 100644 index 67dc022..0000000 --- a/src/main/resources/assets/villagermarket/recipes/villager_market.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "type": "forge:ore_shaped", - "group": "village.market", - "result": { "item": "villagermarket:villager_market" }, - "pattern": [ - "xxx", - "xex", - "xxx" - ], - "key": { - "x": { "type": "forge:ore_dict", "ore": "plankWood" }, - "e": { "type": "forge:ore_dict", "ore": "blockEmerald" } - } -} \ No newline at end of file diff --git a/src/main/resources/data/minecraft/tags/block/mineable/axe.json b/src/main/resources/data/minecraft/tags/block/mineable/axe.json new file mode 100644 index 0000000..f6a8957 --- /dev/null +++ b/src/main/resources/data/minecraft/tags/block/mineable/axe.json @@ -0,0 +1,4 @@ +{ + "replace": false, + "values": ["villagermarket:villager_market"] +} diff --git a/src/main/resources/data/villagermarket/loot_table/blocks/villager_market.json b/src/main/resources/data/villagermarket/loot_table/blocks/villager_market.json new file mode 100644 index 0000000..0b7aff1 --- /dev/null +++ b/src/main/resources/data/villagermarket/loot_table/blocks/villager_market.json @@ -0,0 +1,10 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1, + "entries": [{ "type": "minecraft:item", "name": "villagermarket:villager_market" }], + "conditions": [{ "condition": "minecraft:survives_explosion" }] + } + ] +} diff --git a/src/main/resources/data/villagermarket/recipe/villager_market.json b/src/main/resources/data/villagermarket/recipe/villager_market.json new file mode 100644 index 0000000..de2a6e5 --- /dev/null +++ b/src/main/resources/data/villagermarket/recipe/villager_market.json @@ -0,0 +1,13 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "misc", + "pattern": ["xxx", "xex", "xxx"], + "key": { + "x": "#minecraft:planks", + "e": "minecraft:emerald_block" + }, + "result": { + "id": "villagermarket:villager_market", + "count": 1 + } +} diff --git a/src/main/resources/data/villagermarket/structure/empty.nbt b/src/main/resources/data/villagermarket/structure/empty.nbt new file mode 100644 index 0000000000000000000000000000000000000000..2b102ceaa137d18c489c6746912265edd2afb1d8 GIT binary patch literal 110 zcmb2|=3oE;rvIj=Hu5<*2(&yD6qga4=e{=V)$}zfkKdiR8#Yf)@Tf@qv-OQKXFa@( zkE^&d>`F<T6f@_sZR5ZBu9cILL)XctiJozpcd?3dkK3&hh0YBcV&!Y9s}{S9vWtrT O>yci|pY^B+XbS+0?=0g0 literal 0 HcmV?d00001 diff --git a/src/main/resources/mcmod.info b/src/main/resources/mcmod.info deleted file mode 100644 index f081367..0000000 --- a/src/main/resources/mcmod.info +++ /dev/null @@ -1,16 +0,0 @@ -[ -{ - "modid": "villagermarket", - "name": "Villager Market", - "description": "A villager market mod.", - "version": "${version}", - "mcversion": "${mcversion}", - "url": "", - "updateUrl": "", - "authorList": ["Face_of_Cat"], - "credits": "The Forge and FML guys, SDUBZ and my mom", - "logoFile": "", - "screenshots": [], - "dependencies": [] -} -] diff --git a/src/main/resources/pack.mcmeta b/src/main/resources/pack.mcmeta new file mode 100644 index 0000000..c58d147 --- /dev/null +++ b/src/main/resources/pack.mcmeta @@ -0,0 +1,7 @@ +{ + "pack": { + "description": "${mod_name}", + "min_format": [97, 0], + "max_format": [121, 1] + } +} diff --git a/src/main/resources/villagermarket.mixins.json b/src/main/resources/villagermarket.mixins.json new file mode 100644 index 0000000..dc6f927 --- /dev/null +++ b/src/main/resources/villagermarket.mixins.json @@ -0,0 +1,11 @@ +{ + "required": true, + "minVersion": "0.8", + "package": "net.modcrafters.minecraft.villagermarket.mixin", + "compatibilityLevel": "JAVA_${java_version}", + "mixins": [], + "client": [], + "server": [], + "injectors": { "defaultRequire": 1 }, + "overwrites": { "requireAnnotations": true } +} diff --git a/src/test/java/net/modcrafters/minecraft/villagermarket/trade/TradeGroupsTest.java b/src/test/java/net/modcrafters/minecraft/villagermarket/trade/TradeGroupsTest.java new file mode 100644 index 0000000..27608f2 --- /dev/null +++ b/src/test/java/net/modcrafters/minecraft/villagermarket/trade/TradeGroupsTest.java @@ -0,0 +1,22 @@ +package net.modcrafters.minecraft.villagermarket.trade; + +import org.junit.jupiter.api.Test; + +import static org.junit.jupiter.api.Assertions.assertEquals; + +class TradeGroupsTest { + @Test + void aCustomNameWins() { + assertEquals("Steve", TradeGroups.groupKey("Steve", "minecraft:farmer")); + } + + @Test + void aMissingNameUsesTheProfession() { + assertEquals("minecraft:farmer", TradeGroups.groupKey(null, "minecraft:farmer")); + } + + @Test + void aBlankNameUsesTheProfession() { + assertEquals("minecraft:farmer", TradeGroups.groupKey(" ", "minecraft:farmer")); + } +} diff --git a/src/test/java/net/modcrafters/minecraft/villagermarket/trade/TradeMathTest.java b/src/test/java/net/modcrafters/minecraft/villagermarket/trade/TradeMathTest.java new file mode 100644 index 0000000..cb85751 --- /dev/null +++ b/src/test/java/net/modcrafters/minecraft/villagermarket/trade/TradeMathTest.java @@ -0,0 +1,47 @@ +package net.modcrafters.minecraft.villagermarket.trade; + +import org.junit.jupiter.api.Test; + +import static org.junit.jupiter.api.Assertions.assertEquals; + +class TradeMathTest { + @Test + void dividesTheFirstCostAndCapsAtRemainingUses() { + assertEquals(3, TradeMath.affordableUses(10, 3, 0, 1, false, 5)); + } + + @Test + void theSecondCostCanBeTheLimit() { + assertEquals(2, TradeMath.affordableUses(10, 3, 4, 2, true, 100)); + } + + @Test + void remainingUsesCapTheResult() { + assertEquals(1, TradeMath.affordableUses(64, 1, 64, 1, true, 1)); + } + + @Test + void aMissingSecondCostIsIgnored() { + assertEquals(3, TradeMath.affordableUses(10, 3, 0, 0, false, 5)); + } + + @Test + void aZeroFirstCostPaysForNothing() { + assertEquals(0, TradeMath.affordableUses(10, 0, 0, 1, false, 5)); + } + + @Test + void aZeroSecondCostPaysForNothing() { + assertEquals(0, TradeMath.affordableUses(10, 3, 4, 0, true, 5)); + } + + @Test + void aNegativeCountIsEmpty() { + assertEquals(0, TradeMath.affordableUses(-1, 1, 0, 1, false, 5)); + } + + @Test + void noUsesLeftPaysForNothing() { + assertEquals(0, TradeMath.affordableUses(10, 3, 0, 1, false, 0)); + } +} diff --git a/stonecutter.gradle.kts b/stonecutter.gradle.kts new file mode 100644 index 0000000..b9e70b3 --- /dev/null +++ b/stonecutter.gradle.kts @@ -0,0 +1,81 @@ +plugins { + id("dev.kikugie.stonecutter") + // see https://maven.fabricmc.net/fabric-loom/fabric-loom.gradle.plugin/maven-metadata.xml for new versions + id("net.fabricmc.fabric-loom") version "1.18.1" apply false + // see https://projects.neoforged.net/neoforged/moddevgradle for new versions + id("net.neoforged.moddev") version "2.0.147" apply false +} + +stonecutter active "26.3" + +// Lets code check the loader with `//? if fabric` or `//? if neoforge`. +stonecutter parameters { + constants.match(branch.id.ifEmpty { "common" }, "common", "fabric", "neoforge") + + // The source is written for 26.3; older versions get the old names back. Each replacement turns the + // first name into the second at and after its version, and back again before it. The version thresholds + // are only checked against 1.21.1 and 26.3: confirm them before adding a version in between. + replacements { + string(current.parsed >= "1.21.11") { + replace("ResourceLocation", "Identifier") + // ResourceKey.location() was renamed with it. Other classes still have a location() on 26.3; CI's + // switch round trip fails if shared code ever calls one. + replace(".location()", ".identifier()") + } + string(current.parsed >= "26.1") { + replace("net.minecraft.world.entity.npc.Villager;", "net.minecraft.world.entity.npc.villager.Villager;") + // The EntityType constants moved to EntityTypes. The import keeps a marker so it can turn back. + replace("import net.minecraft.world.entity.EntityType /* EntityTypes */;", "import net.minecraft.world.entity.EntityTypes;") + } + regex(current.parsed >= "26.1") { + replace( + """\bEntityType\.(?!(?:CODEC|STREAM_CODEC|NO_UPDATE_INTERVAL)\b)([A-Z][A-Z0-9_]*)\b""", "EntityTypes.\$1", + """\bEntityTypes\.([A-Z][A-Z0-9_]*)\b""", "EntityType.\$1" + ) + } + } +} + +// Decompiling Minecraft for several versions at once can run the machine out of memory, so MDG does one at a time. +interface MinecraftArtifactsMutex : BuildService<BuildServiceParameters.None> + +val mutex = gradle.sharedServices.registerIfAbsent("createMinecraftArtifactsMutex", MinecraftArtifactsMutex::class.java) { + maxParallelUsages.set(1) +} + +// Version projects share names across branches (:26.3, :fabric:26.3) and Gradle tells projects apart by +// group and name, so each branch's versions get their own group before anything resolves them. +subprojects { + if (parent != rootProject) group = "${rootProject.group}.${parent!!.name}" + else if (name.first().isDigit()) group = "${rootProject.group}.common" + + tasks.matching { it.name == "createMinecraftArtifacts" }.configureEach { + usesService(mutex) + } + + // The active version's merge writes this branch's shared sources. Other versions read those folders + // while generating, so they have to wait for that write. Their own merge is not a dependency: running + // it would copy the inactive version back over the shared sources. + if (parent != null) { + val activeNode = parent!!.project("26.3") + if (path != activeNode.path) { + val activeMerge = activeNode.tasks.named("stonecutterMerge") + val activeTestMerge = activeNode.tasks.named("stonecutterMergeTest") + tasks.matching { it.name == "stonecutterPrepare" || it.name == "stonecutterGenerate" }.configureEach { + dependsOn(activeMerge) + } + tasks.matching { it.name == "stonecutterPrepareTest" || it.name == "stonecutterGenerateTest" }.configureEach { + dependsOn(activeTestMerge) + } + } + } +} + +// Builds every loader jar and copies them to build/libs/<mod version>/ (the common jars aren't mods). +tasks.register<Copy>("collectJars") { + group = "build" + val jars = stonecutter.tasks.named<Jar>("jar") { branch.id.isNotEmpty() } + dependsOn(jars.map { it.values }) + from(jars.map { it.values.map { jar -> jar.flatMap(Jar::getArchiveFile) } }) + into(layout.buildDirectory.dir("libs/${project.version}")) +} diff --git a/versions/1.21.1/gradle.properties b/versions/1.21.1/gradle.properties new file mode 100644 index 0000000..18c60b5 --- /dev/null +++ b/versions/1.21.1/gradle.properties @@ -0,0 +1,5 @@ +minecraft_version=1.21.1 +minecraft_version_range=[1.21.1, 1.21.2) +java_version=21 +## https://projects.neoforged.net/neoforged/neoform +neo_form_version=1.21.1-20240808.144430 diff --git a/versions/1.21.1/src/main/java/net/modcrafters/minecraft/villagermarket/client/VillagerMarketScreen.java b/versions/1.21.1/src/main/java/net/modcrafters/minecraft/villagermarket/client/VillagerMarketScreen.java new file mode 100644 index 0000000..fbbbc95 --- /dev/null +++ b/versions/1.21.1/src/main/java/net/modcrafters/minecraft/villagermarket/client/VillagerMarketScreen.java @@ -0,0 +1,146 @@ +package net.modcrafters.minecraft.villagermarket.client; + +import net.modcrafters.minecraft.villagermarket.menu.VillagerMarketMenu; +import net.modcrafters.minecraft.villagermarket.network.MarketPayloads; +import net.modcrafters.minecraft.villagermarket.platform.Services; +import net.modcrafters.minecraft.villagermarket.trade.ListedOffer; +import net.minecraft.client.Minecraft; +import net.minecraft.client.gui.GuiGraphics; +import net.minecraft.client.gui.screens.inventory.AbstractContainerScreen; +import net.minecraft.network.chat.Component; +import net.minecraft.resources.ResourceLocation; +import net.minecraft.world.entity.player.Inventory; +import net.minecraft.world.item.ItemStack; + +import java.util.List; + +// 1.21.1 still draws with GuiGraphics. The 26.3 screen is the shared file. +public class VillagerMarketScreen extends AbstractContainerScreen<VillagerMarketMenu> { + private static final ResourceLocation TEXTURE = ResourceLocation.fromNamespaceAndPath("villagermarket", "textures/gui/gui.png"); + private static final int TEXT = 0xFFFFFFFF; + private static final int SELECTED = 0x886B4A2A; + private final MarketScreenLogic logic = new MarketScreenLogic(); + private ItemStack hovered = ItemStack.EMPTY; + + public VillagerMarketScreen(VillagerMarketMenu menu, Inventory inventory, Component title) { + super(menu, inventory, title); + this.imageWidth = MarketScreenLogic.WIDTH; + this.imageHeight = MarketScreenLogic.HEIGHT; + } + + public void onOffers(List<ListedOffer> offers) { + logic.onOffers(offers); + } + + public static void apply(MarketPayloads.Offers payload) { + if (Minecraft.getInstance().screen instanceof VillagerMarketScreen screen) { + screen.getMenu().replace(payload.offers()); + screen.onOffers(payload.offers()); + } + } + + @Override + protected void renderBg(GuiGraphics graphics, float partialTick, int mouseX, int mouseY) { + int left = this.leftPos; + int top = this.topPos; + graphics.blit(TEXTURE, left, top, 0, 0, this.imageWidth, this.imageHeight); + int row = this.font.lineHeight + 2; + List<String> groups = logic.groups(this.menu.offers()); + drawGroup(graphics, left, top, row, 0, logic.selectedGroup.isEmpty(), Component.translatable("gui.villagermarket.all")); + for (int i = 0; i < groups.size(); i++) { + drawGroup(graphics, left, top, row, i + 1, groups.get(i).equals(logic.selectedGroup), groupLabel(groups.get(i))); + } + hovered = ItemStack.EMPTY; + List<ListedOffer> shown = logic.visible(this.menu.offers(), this.minecraft.player.getInventory()); + for (int i = logic.offerScroll; i < shown.size(); i++) { + int y = top + MarketScreenLogic.OFFER_Y + (i - logic.offerScroll) * MarketScreenLogic.OFFER_ROW; + if (y + MarketScreenLogic.OFFER_ROW > top + MarketScreenLogic.OFFER_Y + MarketScreenLogic.OFFER_H) { + break; + } + ListedOffer offer = shown.get(i); + if (logic.selected != null && logic.selected.villagerId() == offer.villagerId() && logic.selected.offerIndex() == offer.offerIndex()) { + graphics.fill(left + MarketScreenLogic.OFFER_X, y, left + MarketScreenLogic.OFFER_X + MarketScreenLogic.OFFER_W, y + MarketScreenLogic.OFFER_ROW, SELECTED); + } + drawOffer(graphics, offer, left + MarketScreenLogic.OFFER_X, y, mouseX, mouseY); + } + graphics.fill(left + MarketScreenLogic.SHOW_X, top + MarketScreenLogic.SHOW_Y, + left + MarketScreenLogic.SHOW_X + MarketScreenLogic.SHOW_W, top + MarketScreenLogic.SHOW_Y + MarketScreenLogic.SHOW_H, + logic.showAll ? SELECTED : 0x66000000); + graphics.drawString(this.font, Component.translatable("gui.villagermarket.show_all"), left + MarketScreenLogic.SHOW_X + 4, top + MarketScreenLogic.SHOW_Y + 6, TEXT, false); + if (logic.selected != null) { + drawOffer(graphics, logic.selected, left + 5, top + MarketScreenLogic.SELECTED_Y, mouseX, mouseY); + int affordable = logic.affordable(logic.selected, this.minecraft.player.getInventory()); + drawButton(graphics, left + MarketScreenLogic.ONCE_X, top + MarketScreenLogic.BUTTON_Y, Component.translatable("gui.villagermarket.once"), affordable > 0); + drawButton(graphics, left + MarketScreenLogic.MAX_X, top + MarketScreenLogic.BUTTON_Y, Component.literal("x " + affordable), affordable > 0); + } + if (!hovered.isEmpty()) { + graphics.renderTooltip(this.font, hovered, mouseX, mouseY); + } + } + + private void drawGroup(GuiGraphics graphics, int left, int top, int row, int index, boolean selected, Component label) { + int y = top + MarketScreenLogic.GROUP_Y + (index - logic.groupScroll) * row; + if (y < top + MarketScreenLogic.GROUP_Y || y + row > top + MarketScreenLogic.GROUP_Y + MarketScreenLogic.GROUP_H) { + return; + } + if (selected) { + graphics.fill(left + MarketScreenLogic.GROUP_X, y, left + MarketScreenLogic.GROUP_X + MarketScreenLogic.GROUP_W, y + row, SELECTED); + } + graphics.drawString(this.font, label, left + MarketScreenLogic.GROUP_X + 2, y + 1, TEXT, false); + } + + private void drawOffer(GuiGraphics graphics, ListedOffer offer, int x, int y, int mouseX, int mouseY) { + drawStack(graphics, offer.costA(), x + 5, y + 5, mouseX, mouseY); + drawStack(graphics, offer.costB(), x + 30, y + 5, mouseX, mouseY); + drawStack(graphics, offer.result(), x + 73, y + 5, mouseX, mouseY); + int affordable = logic.affordable(offer, this.minecraft.player.getInventory()); + graphics.drawString(this.font, "[" + affordable + " / " + offer.usesLeft() + "]", x + 101, y + 10, TEXT, false); + } + + private void drawStack(GuiGraphics graphics, ItemStack stack, int x, int y, int mouseX, int mouseY) { + if (stack.isEmpty()) { + return; + } + graphics.renderItem(stack, x, y); + graphics.renderItemDecorations(this.font, stack, x, y); + if (mouseX >= x && mouseX < x + 16 && mouseY >= y && mouseY < y + 16) { + hovered = stack; + } + } + + private void drawButton(GuiGraphics graphics, int x, int y, Component label, boolean enabled) { + graphics.fill(x, y, x + MarketScreenLogic.BUTTON_W, y + MarketScreenLogic.BUTTON_H, enabled ? SELECTED : 0x66000000); + graphics.drawString(this.font, label, x + 4, y + 6, TEXT, false); + } + + @Override + public boolean mouseClicked(double mouseX, double mouseY, int button) { + Inventory inventory = this.minecraft.player.getInventory(); + MarketScreenLogic.Click click = logic.click(mouseX, mouseY, this.leftPos, this.topPos, this.font.lineHeight + 2, this.menu.offers(), inventory); + if (click == MarketScreenLogic.Click.ONCE && logic.selected != null) { + send(1); + } else if (click == MarketScreenLogic.Click.MAX && logic.selected != null) { + send(logic.affordable(logic.selected, inventory)); + } + return click != MarketScreenLogic.Click.NONE || super.mouseClicked(mouseX, mouseY, button); + } + + @Override + public boolean mouseScrolled(double mouseX, double mouseY, double scrollX, double scrollY) { + List<ListedOffer> shown = logic.visible(this.menu.offers(), this.minecraft.player.getInventory()); + logic.scroll(mouseX, mouseY, this.leftPos, this.topPos, scrollY, this.font.lineHeight + 2, shown.size(), logic.groups(this.menu.offers()).size()); + return true; + } + + private void send(int uses) { + Services.PLATFORM.sendToServer(new MarketPayloads.Trade(logic.selected.villagerId(), logic.selected.offerIndex(), uses)); + } + + static Component groupLabel(String groupKey) { + int colon = groupKey.indexOf(':'); + if (colon > 0 && groupKey.indexOf(' ') < 0) { + return Component.translatable("entity.minecraft.villager." + groupKey.substring(colon + 1)); + } + return Component.literal(groupKey); + } +} diff --git a/versions/1.21.1/src/main/resources/assets/villagermarket/models/item/villager_market.json b/versions/1.21.1/src/main/resources/assets/villagermarket/models/item/villager_market.json new file mode 100644 index 0000000..7c37393 --- /dev/null +++ b/versions/1.21.1/src/main/resources/assets/villagermarket/models/item/villager_market.json @@ -0,0 +1,3 @@ +{ + "parent": "villagermarket:block/villager_market" +} diff --git a/versions/1.21.1/src/main/resources/data/villagermarket/recipe/villager_market.json b/versions/1.21.1/src/main/resources/data/villagermarket/recipe/villager_market.json new file mode 100644 index 0000000..1349d0f --- /dev/null +++ b/versions/1.21.1/src/main/resources/data/villagermarket/recipe/villager_market.json @@ -0,0 +1,13 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "misc", + "pattern": ["xxx", "xex", "xxx"], + "key": { + "x": { "tag": "minecraft:planks" }, + "e": { "item": "minecraft:emerald_block" } + }, + "result": { + "id": "villagermarket:villager_market", + "count": 1 + } +} diff --git a/versions/26.3/gradle.properties b/versions/26.3/gradle.properties new file mode 100644 index 0000000..4acc35e --- /dev/null +++ b/versions/26.3/gradle.properties @@ -0,0 +1,4 @@ +minecraft_version=26.3 +minecraft_version_range=[26.3, 26.4) +java_version=25 +neo_form_version=26.3-1 From 89a2a3f34e97016166b435e458b8b3298c9c2002 Mon Sep 17 00:00:00 2001 From: Face o' Cat <face@modcrafters.net> Date: Mon, 2 Nov 2026 20:23:22 +0200 Subject: [PATCH 2/3] Mark the Gradle wrapper and release scripts executable. CI invokes ./gradlew, and a Windows checkout had committed it without the executable bit. --- .github/scripts/discord-merge-message.sh | 0 .github/scripts/release-bump.sh | 0 .github/scripts/release-changelog.sh | 0 .github/scripts/release-commit.sh | 0 .github/scripts/release-publish.sh | 0 .github/scripts/release-version.sh | 0 gradlew | 0 7 files changed, 0 insertions(+), 0 deletions(-) mode change 100644 => 100755 .github/scripts/discord-merge-message.sh mode change 100644 => 100755 .github/scripts/release-bump.sh mode change 100644 => 100755 .github/scripts/release-changelog.sh mode change 100644 => 100755 .github/scripts/release-commit.sh mode change 100644 => 100755 .github/scripts/release-publish.sh mode change 100644 => 100755 .github/scripts/release-version.sh mode change 100644 => 100755 gradlew diff --git a/.github/scripts/discord-merge-message.sh b/.github/scripts/discord-merge-message.sh old mode 100644 new mode 100755 diff --git a/.github/scripts/release-bump.sh b/.github/scripts/release-bump.sh old mode 100644 new mode 100755 diff --git a/.github/scripts/release-changelog.sh b/.github/scripts/release-changelog.sh old mode 100644 new mode 100755 diff --git a/.github/scripts/release-commit.sh b/.github/scripts/release-commit.sh old mode 100644 new mode 100755 diff --git a/.github/scripts/release-publish.sh b/.github/scripts/release-publish.sh old mode 100644 new mode 100755 diff --git a/.github/scripts/release-version.sh b/.github/scripts/release-version.sh old mode 100644 new mode 100755 diff --git a/gradlew b/gradlew old mode 100644 new mode 100755 From bc6ad30406f2f2edb2ecf6485e2ab8d349ead6ee Mon Sep 17 00:00:00 2001 From: Face o' Cat <face@modcrafters.net> Date: Mon, 2 Nov 2026 20:29:14 +0200 Subject: [PATCH 3/3] Treat Paint.NET files as binary so CI checkout does not rewrite them. art/ui.pdn is stored with its own line endings. Marking every file as text made a fresh checkout change it, and the source check then failed. --- .gitattributes | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitattributes b/.gitattributes index 71e4432..4632464 100644 --- a/.gitattributes +++ b/.gitattributes @@ -4,6 +4,7 @@ *.java text eol=lf *.gradle text eol=crlf *.png binary +*.pdn binary *.gif binary *.exe binary *.dll binary