Update .github, gradle.props, mods.toml, hopefully will build correctly?

.github/ISSUE_TEMPLATE/10-bug-report.yaml

@@ -19,7 +19,7 @@ body:
         [List of all MineColonies versions](https://www.curseforge.com/minecraft/mc-mods/minecolonies/files/all)
       options:
         - label: |
-            I am running the latest **alpha** version of Structurize for my Minecraft version.
+            I am running the latest **beta/release** version of Structurize for my Minecraft version.
             I am also running the latest versions of other mods that are part of my problem.
           required: true
   - type: checkboxes
@@ -33,7 +33,7 @@ body:
     id: mc_version
     attributes:
       label: Minecraft Version
-      options: ["1.18", "1.19", "1.20"]
+      options: ["1.20", "1.21"]
     validations:
       required: true
   - type: input

.github/ISSUE_TEMPLATE/20-optifine-shaders-compatibility.yaml

@@ -1,28 +1,27 @@
-name: Optifine/Shaders Compatibility
-description: If the structure preview has a problem with OptiFine/shaders
+name: Shader mods/Shaders Compatibility
+description: If the structure preview has a problem with a shader mod or shaders
 labels: ["Compatibility: Optifine / Shaders"]
 assignees: Nightenom
 body:
   - type: checkboxes
     attributes:
-      label: Is there an existing OptiFine issue for this?
-      description: Please search to see if an issue already exists for the OptiFine bug you encountered.
+      label: Is there an existing shader issue for this?
+      description: Please search to see if an issue already exists for the shader bug you encountered.
       options:
         - label: I have searched the existing issues.
           required: true
   - type: checkboxes
     attributes:
-      label: Are you using the latest Structurize, OptiFine and shader Version?
+      label: Are you using the latest Structurize and shader Version?
       description: |
         Please check to see if any newer version fixes the issue you're experiencing.
         Please note that we support latest **stable** version of OptiFine, bugs encountered in previews may remain open till next stable version.
-        [List of all OptiFine versions](https://optifine.net/downloads)
         [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)
         [List of all MineColonies versions](https://www.curseforge.com/minecraft/mc-mods/minecolonies/files/all)
       options:
         - label: |
-            I am running the latest **alpha** version of Structurize for my Minecraft version.
+            I am running the latest **beta/release** version of Structurize for my Minecraft version.
             I am also running the latest versions of other mods and shaders that are part of my problem.
           required: true
   - type: checkboxes
@@ -35,7 +34,7 @@ body:
     id: mc_version
     attributes:
       label: Minecraft Version
-      options: ["1.18", "1.19", "1.20"]
+      options: ["1.20", "1.21"]
     validations:
       required: true
   - type: input
@@ -47,9 +46,8 @@ body:
       required: true
   - type: input
     attributes:
-      label: OptiFine Version
-      description: Exact OptiFine version either from file name or in-game mod list.
-      placeholder: HD U H4
+      label: Shader mod Version
+      description: Exact shader mod version either from file name or in-game mod list.
     validations:
       required: true
   - type: textarea

.github/ISSUE_TEMPLATE/30-feature-request.yaml

@@ -19,7 +19,7 @@ body:
         [List of all MineColonies versions](https://www.curseforge.com/minecraft/mc-mods/minecolonies/files/all)
       options:
         - label: |
-            I am running the latest **alpha** version of Structurize for my Minecraft version.
+            I am running the latest **beta/release** version of Structurize for my Minecraft version.
             I am also running the latest versions of other mods that are part of my problem.
           required: true
   - type: checkboxes
@@ -32,7 +32,7 @@ body:
     id: mc_version
     attributes:
       label: Minecraft Version
-      options: ["1.18", "1.19", "1.20"]
+      options: ["1.20", "1.21"]
     validations:
       required: true
   - type: input

.github/ISSUE_TEMPLATE/40-enhancement-or-change-request.yaml

@@ -19,7 +19,7 @@ body:
         [List of all MineColonies versions](https://www.curseforge.com/minecraft/mc-mods/minecolonies/files/all)
       options:
         - label: |
-            I am running the latest **alpha** version of Structurize for my Minecraft version.
+            I am running the latest **beta/release** version of Structurize for my Minecraft version.
             I am also running the latest versions of other mods that are part of my problem.
           required: true
   - type: checkboxes
@@ -32,7 +32,7 @@ body:
     id: mc_version
     attributes:
       label: Minecraft Version
-      options: ["1.18", "1.19", "1.20"]
+      options: ["1.20", "1.21"]
     validations:
       required: true
   - type: input

.github/ISSUE_TEMPLATE/50-mod-compatibility.yaml

@@ -19,7 +19,7 @@ body:
         [List of all MineColonies versions](https://www.curseforge.com/minecraft/mc-mods/minecolonies/files/all)
       options:
         - label: |
-            I am running the latest **alpha** version of Structurize for my Minecraft version.
+            I am running the latest **beta/release** version of Structurize for my Minecraft version.
             I am also running the latest versions of other mods that are part of my problem.
           required: true
   - type: checkboxes
@@ -32,7 +32,7 @@ body:
     id: mc_version
     attributes:
       label: Minecraft Version
-      options: ["1.18", "1.19", "1.20"]
+      options: ["1.20", "1.21"]
     validations:
       required: true
   - type: input

.github/ISSUE_TEMPLATE/60-anything-else.yaml

@@ -18,7 +18,7 @@ body:
         [List of all MineColonies versions](https://www.curseforge.com/minecraft/mc-mods/minecolonies/files/all)
       options:
         - label: |
-            I am running the latest **alpha** version of Structurize for my Minecraft version.
+            I am running the latest **beta/release** version of Structurize for my Minecraft version.
             I am also running the latest versions of other mods that are part of my problem.
           required: true
   - type: checkboxes
@@ -32,7 +32,7 @@ body:
     id: mc_version
     attributes:
       label: Minecraft Version
-      options: ["1.18", "1.19", "1.20"]
+      options: ["1.20", "1.21"]
     validations:
       required: true
   - type: input

.github/PULL_REQUEST_TEMPLATE

@@ -1,10 +1,12 @@
 Closes #
 Closes #
-Closes #
 
-# Changes proposed in this pull request:
--
+# Changes proposed in this pull request
 -
 -
 
-Review please
+## Testing
+- [ ] Yes I tested this before submitting it.
+- [ ] I also did a multiplayer test.
+
+Review please

.github/workflows/build.yaml

@@ -1,30 +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 }}
+    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

.github/workflows/release.yml

@@ -2,11 +2,11 @@ name: Release
 
 on:
   push:
-    branches: [
-      "version/*",
-      "release/*",
-      "testing/*",
-    ]
+    branches:
+      - "version/*"
+      - "release/*"
+      - "testing/*"
+  workflow_dispatch:
 
 permissions:
   contents: write
@@ -18,10 +18,4 @@ jobs:
     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 }}
+    secrets: inherit

gradle.properties

@@ -1,34 +1,32 @@
 org.gradle.jvmargs=-Xmx3G
-org.gradle.daemon=false
+org.gradle.daemon=true
+org.gradle.parallel=true
+org.gradle.caching=true
+org.gradle.configuration-cache=true
 
 modId=structurize
 modGroup=com.ldtteam
-modVersion=0.0.1-LOCAL
-modBaseName=structurize
+modVersion=0.0.1
 
 javaVersion=21
 useJavaToolChains=true
 
 #The currently running forge.
 forgeVersion=21.1.4
-#The minimal needed forge, as marked in metadata and curseforge.
-forgeMinVersion=21.0.143
+
 fmlRange=[4,)
 forgeRange=[21.0.143,)
+minecraftRange=[1.21, 1.22)
 
 #The version for forge (dependency)
 exactMinecraftVersion=1.21.1
-minecraftRange=[1.21, 1.22)
 #The main version on curseforge
 minecraftVersion=1.21.1
 #Comma seperated list of mc versions, which are marked as compatible on curseforge
 additionalMinecraftVersions=1.21
 
-blockUiVersion=1.21.1-1.0.172-BETA
-blockUiRange=[1.21.1-1.0.172-BETA,)
-
-domumOrnamentumVersion=1.21.1-1.0.200-BETA
-domumOrnamentumRange=[1.21.1-1.0.200-BETA,)
+blockUiVersion=1.0.188-1.21.1-snapshot
+domumOrnamentumVersion=1.0.203-1.21.1-snapshot
 
 githubUrl=https://github.com/ldtteam/Structurize
 gitUrl=https://github.com/ldtteam/Structurize.git
@@ -53,5 +51,4 @@ requiredCurseDependencies=domum-ornamentum;blockui
 
 useDefaultTestSystem=true
 runtimeSourceSets=main
-librarySourceSets=main;datagen;
 projectHasApi=false

settings.gradle

@@ -1,15 +1,5 @@
-pluginManagement {
-    repositories {
-        gradlePluginPortal()
-        maven {
-            name = 'MinecraftForge'
-            url = 'https://maven.minecraftforge.net/'
-        }
-    }
-}
-
 plugins {
-    id 'org.gradle.toolchains.foojay-resolver-convention' version '0.5.0'
+    id 'org.gradle.toolchains.foojay-resolver-convention' version '0.8.0'
 }
 
 gradle.startParameter.setProjectProperties(new HashMap<>(gradle.startParameter.getProjectProperties()))

src/main/resources/META-INF/neoforge.mods.toml

@@ -34,12 +34,12 @@ Allows you to:
 [[dependencies.structurize]]
     modId="blockui"
     type="required"
-    versionRange="${blockUiRange}"
+    versionRange="[${blockUiVersion}, )"
     ordering="AFTER"
     side="BOTH"
 [[dependencies.structurize]]
     modId="domum_ornamentum"
     type="required"
-    versionRange="${domumOrnamentumRange}"
+    versionRange="[${domumOrnamentumVersion}, )"
     ordering="AFTER"
     side="BOTH"