1.20.2 Update

.github/workflows/release.yml

@@ -69,16 +69,11 @@ jobs:
           MAVEN_USER: ${{ secrets.MAVEN_USERNAME }}
           MAVEN_PASS: ${{ secrets.MAVEN_PASSWORD }}
 
-#      - name: Update Changelog
-#        uses: Team-Resourceful/[email protected]
-#        with:
-#          release_version: ${{ steps.version.outputs.version }}
-#          github_token: ${{ secrets.TEAM_RESOURCEFUL_BOT }}
-
       ### Need to duplicate this block for fabric
-      - name: Upload Forge Releases (Curse/Modrinth/Github)
-        if: contains(steps.props.outputs.enabledPlatforms, 'forge')
-        uses: Kir-Antipov/[email protected]
+      - name: Upload NeoForge Releases (Curse/Modrinth/Github)
+        id: forge_release
+        if: contains(steps.props.outputs.enabledPlatforms, 'neoforge')
+        uses: Kir-Antipov/[email protected]
         with:
           curseforge-id: ${{ vars.CURSE_ID }}
           curseforge-token: ${{ secrets.CURSE_API_KEY }}
@@ -89,17 +84,18 @@ jobs:
           github-tag: "v${{ steps.version.outputs.version }}"
           github-token: ${{ secrets.TEAM_RESOURCEFUL_BOT }}
 
-          files: ./forge/build/libs/!(*-@(dev|sources|dev-shadow)).jar
-          name: "[Forge] Highlight ${{ steps.version.outputs.version }}"
+          files: ./neoforge/build/libs/!(*-@(dev|sources|dev-shadow)).jar
+          name: "[NeoForge] Highlight ${{ steps.version.outputs.version }}"
           version: ${{ steps.version.outputs.version }}
           changelog-file: changelog.md
-          loaders: forge
+          loaders: neoforge
           game-versions: ${{ steps.props.outputs.minecraftVersion }}
           version-resolver: exact
 
       - name: Upload Fabric Releases (Curse/Modrinth/Github)
+        id: fabric_release
         if: contains(steps.props.outputs.enabledPlatforms, 'fabric')
-        uses: Kir-Antipov/mc-publish@v3.2
+        uses: Kir-Antipov/mc-publish@v3.3
         with:
           curseforge-id: ${{ vars.CURSE_ID }}
           curseforge-token: ${{ secrets.CURSE_API_KEY }}
@@ -120,6 +116,9 @@ jobs:
 
       - name: Create Discord Embed
         run: ./gradlew injectDiscordEmbed
+        env:
+          FORGE_RELEASE_URL: ${{ steps.forge_release.outputs.modrinth-version }}
+          FABRIC_RELEASE_URL: ${{ steps.fabric_release.outputs.modrinth-version }}
 
       - name: Send Discord Webhook
         uses: tsickert/[email protected]

build.gradle.kts

@@ -5,7 +5,7 @@ import net.fabricmc.loom.task.RemapJarTask
 plugins {
     java
     id("com.teamresourceful.resourcefulgradle")
-    id("dev.architectury.loom") version "1.2-SNAPSHOT" apply false
+    id("dev.architectury.loom") version "1.4-SNAPSHOT" apply false
     id("architectury-plugin") version "3.4-SNAPSHOT" apply false
 }
 
@@ -33,6 +33,7 @@ subprojects {
 
     repositories {
         maven(url = "https://nexus.resourcefulbees.com/repository/maven-public/")
+        maven(url = "https://maven.neoforged.net/releases/")
     }
 
     dependencies {
@@ -88,8 +89,8 @@ resourcefulGradle {
             injectedValues.set(mapOf(
                 "version" to version,
                 "mc_version" to minecraftVersion,
-                "forge_version" to "46.0.10",
-                "fabric_version" to "0.14.21"
+                "forge_version" to "20.2.56-beta",
+                "fabric_version" to "0.14.24"
             ))
         }
     }

changelog.md

@@ -1 +1 @@
-Fixed version numbers being incorrect.
+1.20.2 Update

common/src/main/resources/resourcepacks/highlight_extended/pack.mcmeta

@@ -1,6 +1,6 @@
 {
     "pack": {
-        "pack_format": 15,
+        "pack_format": 18,
         "description": "Gives 2+ tall or wide blocks a box that covers the whole block."
     }
 }

fabric/src/main/resources/fabric.mod.json

@@ -16,7 +16,7 @@
     "environment": "*",
     "depends": {
         "fabricloader": ">=0.14.21",
-        "minecraft": ">=1.20",
+        "minecraft": ">=1.20.2",
         "resourcefullib": "*"
     },
     "custom": {

gradle.properties

@@ -1,9 +1,9 @@
 org.gradle.jvmargs=-Xmx2G
 
-enabledPlatforms=fabric,forge
+enabledPlatforms=fabric,neoforge
 
 group=com.teamresourceful
 
-minecraftVersion=1.20
+minecraftVersion=1.20.2
 
-resourcefulLibVersion=2.0.7
+resourcefulLibVersion=2.2.1

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-bin.zip
 zipStoreBase=GRADLE_USER_HOME
-zipStorePath=wrapper/dists
+zipStorePath=wrapper/dists

neoforge/build.gradle.kts

@@ -0,0 +1,16 @@
+architectury {
+    neoForge()
+}
+
+dependencies {
+    val neoforgeVersion: String by project
+    neoForge(group = "net.neoforged", name = "neoforge", version = neoforgeVersion)
+}
+
+tasks.processResources {
+    inputs.property("version", version)
+
+    filesMatching("META-INF/mods.toml") {
+        expand("version" to version)
+    }
+}

neoforge/gradle.properties

@@ -0,0 +1,3 @@
+loom.platform=neoforge
+
+neoforgeVersion=20.2.56-beta

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

@@ -1,34 +1,34 @@
 modLoader = "lowcodefml"
-loaderVersion = "[46,)"
+loaderVersion = "[1,)"
 license = "MIT"
 issueTrackerURL="https://github.com/Team-Resourceful/Highlight/issues"
 
 [[mods]]
-modId = "highlight"
-version = "${version}"
-displayName = "Highlight"
-authors = "ThatGravyBoat"
-displayTest="IGNORE_ALL_VERSION"
-description = '''
-Highlight changes certain vanilla blocks from using ridgid selection/highlight shapes into have more defined ones with angles.
-'''
+    modId = "highlight"
+    version = "${version}"
+    displayName = "Highlight"
+    authors = "ThatGravyBoat"
+    displayTest="IGNORE_ALL_VERSION"
+    description = '''
+    Highlight changes certain vanilla blocks from using ridgid selection/highlight shapes into have more defined ones with angles.
+    '''
 
 [modproperties.highlight]
     'resourcefullib:resourcepack' = [
         { name="highlight_extended", description="Hightlight Extended" }
     ]
 
 [[dependencies.highlight]]
-    modId = "forge"
+    modId = "neoforge"
     mandatory = true
-    versionRange = "[46,)"
+    versionRange = "[20.2,)"
     ordering = "NONE"
     side = "BOTH"
 
 [[dependencies.highlight]]
     modId = "minecraft"
     mandatory = true
-    versionRange = "[1.20,)"
+    versionRange = "[1.20.2,)"
     ordering = "NONE"
     side = "BOTH"
 

neoforge/src/main/resources/pack.mcmeta

@@ -0,0 +1,6 @@
+{
+    "pack": {
+        "description": "highlight resources",
+        "pack_format": 18
+    }
+}

settings.gradle.kts

@@ -19,4 +19,4 @@ plugins {
 
 include("common")
 include("fabric")
-include("forge")
+include("neoforge")

templates/release_embed.json.template

@@ -2,6 +2,26 @@
   "username": "Beekeeper",
   "avatar_url": "https://cdn.discordapp.com/avatars/738571182101626930/72ad643b1ee4036cd79f8c457ed1d420.png",
   "content": "<@&1070878228924858370>",
+  "components": [
+      {
+          "type": 1,
+          "components": [
+              {
+                  "type": 2,
+                  "label": "Fabric",
+                  "style": 5,
+                  "url": "https://modrinth.com/mod/highlight/version/${fabric_link}"
+              },
+              {
+                  "type": 2,
+                  "label": "NeoForge",
+                  "style": 5,
+                  "url": "https://modrinth.com/mod/highlight/version/${forge_link}"
+              }
+          ]
+
+      }
+  ],
   "embeds": [
     {
       "title": "Highlight",
@@ -35,19 +55,14 @@
           "value": "${mc_version}"
         },
         {
-          "name": "Forge Version",
+          "name": "NeoForge Version",
           "value": "${forge_version}"
         },
         {
           "name": "Fabric Version",
           "value": "${fabric_version}"
-        },
-        {
-          "name": "Download",
-          "value": "[Curseforge](https://www.curseforge.com/minecraft/mc-mods/highlight)\\n[Modrinth](https://modrinth.com/mod/highlight)"
         }
       ]
     }
-  ],
-  "components": []
+  ]
 }

version.properties

@@ -2,6 +2,6 @@ patch=1
 buildTime=0
 build=0
 releaseType=release
-currentMCVersion=1.20
+currentMCVersion=1.20.2
 initialMCVersion=1.19.2
 version=2.0.1