diff --git a/.github/ISSUE_TEMPLATE/10-bug-report.yaml b/.github/ISSUE_TEMPLATE/10-bug-report.yaml index 32c7e16c950..f125429aa26 100644 --- a/.github/ISSUE_TEMPLATE/10-bug-report.yaml +++ b/.github/ISSUE_TEMPLATE/10-bug-report.yaml @@ -1,6 +1,5 @@ name: Bug Report description: If you have a reproducible in-game issue -title: "[BUG] " labels: [Bug] body: - type: checkboxes @@ -8,19 +7,25 @@ body: label: Is there an existing issue for this? description: Please search to see if an issue already exists for the bug you encountered. options: - - label: I have searched the existing issues + - label: I have searched the existing issues. required: true - type: checkboxes attributes: label: Are you using the latest MineColonies Version? - description: Please check to see if any newer version fixes the issue you're experiencing. + description: | + Please check to see if any newer version fixes the issue you're experiencing. + [List of all MineColonies versions](https://www.curseforge.com/minecraft/mc-mods/minecolonies/files/all) + [List of all Structurize versions](https://www.curseforge.com/minecraft/mc-mods/structurize/files/all) + [List of all BlockUI versions](https://www.curseforge.com/minecraft/mc-mods/blockui/files/all) options: - - label: I am running the latest **beta** version of MineColonies for my Minecraft version. + - label: | + I am running the latest **beta/release** version of MineColonies for my Minecraft version. + I am also running the latest versions of other mods that are part of my problem. required: true - type: checkboxes attributes: label: Did you check on the Wiki? or ask on Discord? - description: Please check on our wiki (https://wiki.minecolonies.ldtteam.com/) or ask on discord (https://discord.minecolonies.com/) if your issue is covered there. + description: Please check on our [wiki](https://wiki.minecolonies.ldtteam.com/) or ask on [discord](https://discord.minecolonies.com/) if your issue is covered there. options: - label: I checked the MineColonies Wiki and made sure my issue is not covered there. Or I was sent from discord to open an issue here. required: true @@ -31,16 +36,16 @@ body: - label: Single Player - label: Multi Player - type: dropdown + id: mc_version attributes: label: Minecraft Version - description: Minecraft Version - options: [1.19.2, 1.20.1] + options: ["1.20", "1.21"] validations: required: true - type: input attributes: label: MineColonies Version - description: MineColonies Version + description: Exact MineColonies version either from file name or in-game mod list. placeholder: 1.xx.xx-XXXX validations: required: true @@ -87,7 +92,7 @@ body: - type: input attributes: label: Logs - description: Please provide your latest.log related to the time during which you experienced the issue. Upload to gist (https://gist.github.com/) or pastebin (https://pastebin.com/) and paste the link here. + description: Please provide your latest.log related to the time during which you experienced the issue. Upload to eg. [gist](https://gist.github.com/) or [pastebin](https://pastebin.com/) and paste the link here. validations: required: true - type: textarea @@ -95,14 +100,15 @@ body: label: Anything else? description: | Links? References? Anything that will give us more context about the issue you are encountering! - - Tip: You can attach images or log files by clicking this area to highlight it and then dragging files in. + Tip: You can attach images or log files by clicking any text area to highlight it and then dragging files in. + - type: textarea + attributes: + label: "Footer" + description: This is issue footer. Please leave this text as is. value: | - - - - + --- + ## Viewers * Add a thumbs-up to the bug report if you are also affected. This helps the bug report become more visible to the team and doesn't clutter the comments. * Add a comment if you have any insights or background information that isn't already part of the conversation. validations: - required: false + required: true \ No newline at end of file diff --git a/.github/ISSUE_TEMPLATE/11-log-report.yaml b/.github/ISSUE_TEMPLATE/11-log-report.yaml index 11000198cf8..6e854ca07fd 100644 --- a/.github/ISSUE_TEMPLATE/11-log-report.yaml +++ b/.github/ISSUE_TEMPLATE/11-log-report.yaml @@ -1,6 +1,6 @@ name: Log Report description: If the console log told you to report sth to the Developers. -title: "[BUG] <title>" +title: AI log upload labels: [Bug, AI log] body: - type: checkboxes @@ -8,33 +8,39 @@ body: label: Is there an existing issue for this? description: Please search to see if an issue already exists for the bug you encountered. options: - - label: I have searched the existing issues + - label: I have searched the existing issues. required: true - type: checkboxes attributes: label: Are you using the latest MineColonies Version? - description: Please check to see if any newer version fixes the issue you're experiencing. + description: | + Please check to see if any newer version fixes the issue you're experiencing. + [List of all MineColonies versions](https://www.curseforge.com/minecraft/mc-mods/minecolonies/files/all) + [List of all Structurize versions](https://www.curseforge.com/minecraft/mc-mods/structurize/files/all) + [List of all BlockUI versions](https://www.curseforge.com/minecraft/mc-mods/blockui/files/all) options: - - label: I am running the latest **beta** version of MineColonies for my Minecraft version. + - label: | + I am running the latest **beta/release** version of MineColonies for my Minecraft version. + I am also running the latest versions of other mods that are part of my problem. required: true - type: checkboxes attributes: label: Did you check on the Wiki? or ask on Discord? - description: Please check on our wiki (https://wiki.minecolonies.ldtteam.com/) or ask on discord (https://discord.minecolonies.com/) if your issue is covered there. + description: Please check on our [wiki](https://wiki.minecolonies.ldtteam.com/) or ask on [discord](https://discord.minecolonies.com/) if your issue is covered there. options: - label: I checked the MineColonies Wiki and made sure my issue is not covered there. Or I was sent from discord to open an issue here. required: true - type: dropdown + id: mc_version attributes: label: Minecraft Version - description: Minecraft Version - options: [1.19.2, 1.20.1] + options: ["1.20", "1.21"] validations: required: true - type: input attributes: label: MineColonies Version - description: MineColonies Version + description: Exact MineColonies version either from file name or in-game mod list. placeholder: 1.xx.xx-XXXX validations: required: true @@ -69,7 +75,7 @@ body: - type: input attributes: label: Logs - description: Please provide your latest.log related to the time during which you experienced the issue. Upload to gist (https://gist.github.com/) or pastebin (https://pastebin.com/) and paste the link here. + description: Please provide your latest.log related to the time during which you experienced the issue. Upload to eg. [gist](https://gist.github.com/) or [pastebin](https://pastebin.com/) and paste the link here. validations: required: true - type: textarea @@ -77,14 +83,15 @@ body: label: Anything else? description: | Links? References? Anything that will give us more context about the issue you are encountering! - - Tip: You can attach images or log files by clicking this area to highlight it and then dragging files in. + Tip: You can attach images or log files by clicking any text area to highlight it and then dragging files in. + - type: textarea + attributes: + label: "Footer" + description: This is issue footer. Please leave this text as is. value: | - - - - + --- + ## Viewers * Add a thumbs-up to the bug report if you are also affected. This helps the bug report become more visible to the team and doesn't clutter the comments. * Add a comment if you have any insights or background information that isn't already part of the conversation. validations: - required: false + required: true diff --git a/.github/PULL_REQUEST_TEMPLATE b/.github/PULL_REQUEST_TEMPLATE index 1511ee2501a..152bd98969c 100755 --- a/.github/PULL_REQUEST_TEMPLATE +++ b/.github/PULL_REQUEST_TEMPLATE @@ -1,14 +1,12 @@ Closes # Closes # -Closes # -# Changes proposed in this pull request: -- +# Changes proposed in this pull request - - +## Testing +- [ ] Yes I tested this before submitting it. +- [ ] I also did a multiplayer test. -[ ] Yes I tested this before submitting it. -[ ] I also did a multiplayer test. - -Review please +Review please \ No newline at end of file diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index e97360cb102..f5effbb6221 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -1,31 +1,28 @@ -name: Build and Test PRs or General Branches +name: Build and Pre-release on: pull_request: types: - - synchronize - opened - - ready_for_review - - reopened - push: - branches: - - 'feature/**' - - 'bugfix/**' - - 'hotfix/**' - - 'fix/**' - - 'features/**' + - synchronize + - labeled + - unlabeled workflow_dispatch: permissions: - contents: write + contents: read statuses: write packages: write jobs: - release: + build: uses: ldtteam/operapublicacreator/.github/workflows/gradle.build.yaml@ng7 with: java: 21 - secrets: - CROWDIN_API_KEY: ${{ secrets.CROWDIN_API_KEY }} - GRADLE_ENCRYPTION_KEY: ${{ secrets.GRADLE_ENCRYPTION_KEY }} \ No newline at end of file + secrets: inherit + pre-release: + uses: ldtteam/operapublicacreator/.github/workflows/gradle.prerelease.yaml@ng7 + if: github.event_name == 'pull_request' && github.event.pull_request.head.repo.full_name == github.repository && contains( github.event.pull_request.labels.*.name, 'Pre-release') + with: + java: 21 + secrets: inherit \ No newline at end of file diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml new file mode 100644 index 00000000000..913d9a0edae --- /dev/null +++ b/.github/workflows/release.yaml @@ -0,0 +1,20 @@ +name: Release + +on: + push: + branches: + - "version/*" + - "release/*" + - "testing/*" + +permissions: + contents: write + statuses: write + +jobs: + release: + uses: ldtteam/operapublicacreator/.github/workflows/gradle.publish.yaml@ng7 + with: + java: 21 + curse_release_type: ${{ contains(github.ref, 'release') && 'release' || 'beta' }} + secrets: inherit diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml deleted file mode 100644 index 4c5b568d783..00000000000 --- a/.github/workflows/release.yml +++ /dev/null @@ -1,27 +0,0 @@ -name: Release - -on: - push: - branches: [ - "version/*", - "release/*", - "testing/*", - ] - -permissions: - contents: write - statuses: write - -jobs: - release: - uses: ldtteam/operapublicacreator/.github/workflows/gradle.publish.yaml@ng7 - with: - java: 21 - curse_release_type: ${{ contains(github.ref, 'release') && 'release' || 'beta' }} - secrets: - DISCORD_WEBHOOK: ${{ secrets.DISCORD_WEBHOOK }} - MAVEN_USER: ${{ secrets.MAVEN_USER }} - MAVEN_PASSWORD: ${{ secrets.MAVEN_PASSWORD }} - CROWDIN_API_KEY: ${{ secrets.CROWDIN_API_KEY }} - CURSE_API_KEY: ${{ secrets.CURSE_API_KEY }} - GRADLE_ENCRYPTION_KEY: ${{ secrets.GRADLE_ENCRYPTION_KEY }} \ No newline at end of file diff --git a/build.gradle b/build.gradle index 9533ff9dfbc..e8165701a8f 100755 --- a/build.gradle +++ b/build.gradle @@ -2,17 +2,4 @@ plugins { id "org.sonarqube" version "3.0" } -apply from: 'https://raw.githubusercontent.com/ldtteam/OperaPublicaCreator/ng7/gradle/mod.gradle' - -idea { - module { - downloadSources = true - downloadJavadoc = true - } -} - -afterEvaluate { - tasks.withType(JavaCompile) { - options.compilerArgs << "-Xmaxerrs" << "5000" - } -} \ No newline at end of file +apply from: 'https://raw.githubusercontent.com/ldtteam/OperaPublicaCreator/ng7/gradle/mod.gradle' \ No newline at end of file diff --git a/gradle.properties b/gradle.properties index be36983659f..fccc9168493 100755 --- a/gradle.properties +++ b/gradle.properties @@ -1,10 +1,13 @@ org.gradle.jvmargs=-Xmx3G -org.gradle.daemon=false +org.gradle.daemon=true +org.gradle.parallel=true +org.gradle.caching=true +org.gradle.configuration-cache=false +#TODO: config-cache requires update of language merging task in OPC modId=minecolonies modGroup=com.ldtteam -modVersion=0.0.11-LOCAL -modBaseName=minecolonies +modVersion=0.0.11 javaVersion=21 useJavaToolChains=true @@ -24,10 +27,10 @@ additionalMinecraftVersions=1.21 minecraft_range=[1.21, 1.22) dataGeneratorsVersion=1.20.4-0.1.57-ALPHA -blockUI_version=1.21.1-1.0.182-beta -structurize_version=1.0.750-1.21.1-beta -domumOrnamentumVersion=1.21.1-1.0.200-BETA -multiPistonVersion=1.21-1.2.47-BETA +blockUI_version=1.0.188-1.21.1-snapshot +structurize_version=1.0.751-1.21.1-snapshot +domumOrnamentumVersion=1.0.203-1.21.1-snapshot +multiPistonVersion=1.2.50-1.21.1-snapshot jei_mcversion=1.21.1 jei_version=19.8.4.116 @@ -60,8 +63,6 @@ useDefaultTestSystem=false runtimeSourceSets=main librarySourceSets=main;datagen; projectHasApi=false -primaryJarClassifier= -isFMLLibrary=false extendDefaultSourceSetConfiguration=true mainExcludedResources=assets/minecolonies/lang/manual_en_us.json;assets/minecolonies/lang/default.json;assets/minecolonies/lang/quests.json diff --git a/gradle/dependencies.gradle b/gradle/dependencies.gradle index 7f42f5e4cff..53cb7f096f0 100644 --- a/gradle/dependencies.gradle +++ b/gradle/dependencies.gradle @@ -1,6 +1,4 @@ repositories { - mavenLocal() - mavenCentral() maven { name "JEI" url 'https://maven.blamejared.com/' @@ -13,10 +11,6 @@ repositories { name "Rei" url "https://maven.shedaniel.me/" } - maven { - name 'LDTTeam - Modding' - url 'https://ldtteam.jfrog.io/ldtteam/modding/' - } } dependencies { diff --git a/gradle/util.gradle b/gradle/util.gradle index b36e8b98253..e742eb8c95b 100644 --- a/gradle/util.gradle +++ b/gradle/util.gradle @@ -1,7 +1,14 @@ +idea { + module { + downloadSources = true + downloadJavadoc = true + } +} + // Allow more than 400 errors. gradle.projectsEvaluated { tasks.withType(JavaCompile) { - options.compilerArgs << "-Xmaxerrs" << "1000" + options.compilerArgs << "-Xmaxerrs" << "5000" } }