Merge remote-tracking branch 'origin/1.19-forge' into 1.19-forge

# Conflicts:
#	src/main/java/dev/lambdaurora/lambdynlights/mixin/forge/WorldRendererMixin.java
#	src/main/resources/META-INF/mods.toml

.github/workflows/gradle_build.yml

@@ -1,6 +1,7 @@
 name: Gradle Build
 
 on:
+  workflow_dispatch:
   push:
     branches:
       - '*'
@@ -12,7 +13,7 @@ jobs:
   build:
     strategy:
       matrix:
-        java: [ 17, 19 ]
+        java: [ 20 ]
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
@@ -26,9 +27,12 @@ jobs:
           cache: 'gradle'
 
       - name: Build with Gradle
-        run: ./gradlew build --parallel --stacktrace
+        uses: gradle/gradle-build-action@v2
+        with:
+          arguments: build --parallel --stacktrace
+          cache-read-only: ${{ !startsWith(github.ref, 'refs/heads/1.') && !startsWith(github.ref, 'refs/heads/dev/') && !startsWith(github.ref, 'refs/tags/v') }}
 
-      - uses: actions/upload-artifact@v2
+      - uses: actions/upload-artifact@v3
         with:
           name: Artifacts
           path: ./build/libs/

.github/workflows/release.yml

@@ -1,30 +1,34 @@
-name: Release
+name: Publish Release
 
-on:
-  release:
-    types:
-      - published
+on: [workflow_dispatch] # Manual trigger
+
+permissions:
+  contents: write
 
 jobs:
-  build:
+  Build:
     runs-on: ubuntu-latest
+
     steps:
       - uses: actions/checkout@v3
-        with:
-          fetch-depth: 0
-      - name: Set up JDK 17
+      - name: Set up JDK 20
         uses: actions/setup-java@v3
         with:
-          java-version: 17
-          distribution: 'temurin'
-
-      - name: Build with Gradle
-        run: ./gradlew build modrinth curseforge --parallel --stacktrace
+          distribution: 'adopt'
+          java-version: 20
+      - name: Cache
+        uses: actions/cache@v3
+        with:
+          path: |
+            ~/.gradle/caches
+            ~/.gradle/wrapper
+            .gradle
+          key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties', 'build.gradle') }}
+      - uses: gradle/wrapper-validation-action@v1
+      - run: |
+          chmod +x gradlew
+          ./gradlew build publishCurseForge publish modrinth --stacktrace -Porg.gradle.parallel.threads=4
         env:
-          MODRINTH_TOKEN: ${{ secrets.MODRINTH_TOKEN }}
           CURSEFORGE_TOKEN: ${{ secrets.CURSEFORGE_TOKEN }}
-
-      - uses: actions/upload-artifact@v2
-        with:
-          name: Artifacts
-          path: ./build/libs/
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          MODRINTH_TOKEN: ${{ secrets.MODRINTH_TOKEN }}

CHANGELOG.md

@@ -1,141 +1,2 @@
-# LambDynamicLights changelog
-
-## 1.0.0
-
- - Initial release.
- - Added dynamic lighting to the game.
-
-## 1.1.0
-
- - Added item frame dynamic lighting.
- - Added API.
- - Added more options.
-   - Added entities dynamic lighting toggle.
-   - Added block entities dynamic lighting toggle.
- - Added block entity dynamic lighting.
-   - Allow dynamic lighting for block entities without block states.
-   - Should not be used in cases where block states can be used.
- - Added compatibility with [Lil Tater Reloaded](https://github.com/Yoghurt4C/LilTaterReloaded).
-   - Lil taters will light up the area if they hold an item emitting light.
- - Fixed light not moving when light source was moving too slow.
- - Fixed lighting errors with Sodium.
-
-## 1.2.0
-
- - Added water-sensitive check for items and light sources.
-   - Added data item tag `#lambdynlights:water_sensitive` which lists every item which can't light up in the water.
-   - Added an option to enable/disable the feature
- - Updated [SpruceUI] to 1.5.6 to fix latest snapshots issues.
- - Added "early/WIP" compatibility with [Canvas Renderer].
-   - Added a warning message about performance issues. 
- - Fixed a crash with [Sodium] rc7 with smooth lighting set to HIGH.
-
-### 1.2.1
-
- - Added TNT dynamic lighting.
- - Added lighting options for TNT and Creepers.
- - Added luminance value to Fire charge item.
- - Updated [SpruceUI] to 1.5.8
- - Fixed player dynamic lighting not getting tracked when changing dimensions.
-
-### 1.2.2
-
- - Changed video options dynamic lighting button to redirect to LambDynamicLights settings.
- - Fixed random crash.
-
-## 1.3.0
-
- - Added Simplified Chinese translations.
- - Added German translations.
- - Added Mexican Spanish translations ([#13](https://github.com/LambdAurora/LambDynamicLights/pull/13)).
- - Added Polish translations ([#15](https://github.com/LambdAurora/LambDynamicLights/pull/15)).
- - Added Russian translations ([#9](https://github.com/LambdAurora/LambDynamicLights/pull/9)).
- - Added spectral arrow as item emitting light ([#17](https://github.com/LambdAurora/LambDynamicLights/pull/17)).
- - Added dynamic lighting on glowing entities ([#17](https://github.com/LambdAurora/LambDynamicLights/pull/17)).
- - Updated to Minecraft 1.16.2
- - Updated [SpruceUI] to 1.6.2.
- - Fixed dynamic lighting update issues at chunk borders ([#12](https://github.com/LambdAurora/LambDynamicLights/issues/12)).
- - Fixed water-sensitive items lighting up in water on dedicated servers. ([#3](https://github.com/LambdAurora/LambDynamicLights/issues/3))
-    - Added new JSON API to add item luminance and water-sensitivity through resource packs.
-    - Added `DynamicLightHandler#isWaterSensitive` to make some entities water-sensitive like the blaze.
- - Fixed incompatibility with future [Sodium] versions. ([#6](https://github.com/LambdAurora/LambDynamicLights/issues/6))
-
-### 1.3.1
-
- - Fixed entity lighting issue with [Sodium] 0.1.0. ([#23](https://github.com/LambdAurora/LambDynamicLights/issues/23))
-
-### 1.3.2
-
- - Added entity lighting capabilities to minecarts.
- - Added `DynamicLightsInitializer` and `dynamiclights` entrypoint.
- - Added Brazilian Portuguese translations.
- - Added Estonian translations.
- - Added Hindi translations.
- - Added Turkish translations.
- - Updated French translations.
- - Fixed memory leak in dynamic light source tracking. ([#30](https://github.com/LambdAurora/LambDynamicLights/issues/30))
-
-### 1.3.3
-
- - Added Italian translations ([#40](https://github.com/LambdAurora/LambDynamicLights/pull/40)).
- - Optimized dynamic lighting update methods.
- - Fixed crash when leaving world with some minimaps mods. ([#37](https://github.com/LambdAurora/LambDynamicLights/issues/37), [#41](https://github.com/LambdAurora/LambDynamicLights/issues/41))
- - Fixed crash with Immersive Portals ([#39](https://github.com/LambdAurora/LambDynamicLights/issues/39)).
- - Updated [SpruceUI], and Fabric API dependencies.
-
-### 1.3.4
-
- - Fix ghost dynamic light source ([#47](https://github.com/LambdAurora/LambDynamicLights/issues/47)).
- - Fix missing background in settings screen.
- - Updated [SpruceUI].
-
-## 2.0.0
-
- - Updated to Minecraft 1.17.
- - Updated to Java 16.
- - Added dynamic lighting to the Glow Squid.
- - And more.
-
-### 2.0.1
-
- - Fixed mixin warnings ([#65](https://github.com/LambdAurora/LambDynamicLights/issues/65)).
- - Removed any usage of a library.
- - Updated [SpruceUI].
-
-### 2.0.2
-
- - Added Swedish translations ([#68](https://github.com/LambdAurora/LambDynamicLights/pull/68)).
- - Block items now respect the `BlockStateTag` in item's NBT ([#71](https://github.com/LambdAurora/LambDynamicLights/issues/71)).
- - Fixed glow item frames not emitting light ([#63](https://github.com/LambdAurora/LambDynamicLights/issues/63)).
- - Fixed minecart not emitting light when holding a light source ([#70](https://github.com/LambdAurora/LambDynamicLights/issues/70)).
- - Fixed glow berries not emitting light ([#72](https://github.com/LambdAurora/LambDynamicLights/issues/72)).
- - Fixed glow squids not dimming when attacked ([#75](https://github.com/LambdAurora/LambDynamicLights/issues/75)).
- - Fixed LambDynamicLights not rebuilding the correct chunks when at Y -18 or Y -50 ([#76](https://github.com/LambdAurora/LambDynamicLights/issues/76)).
-
-## 2.1.0
-
- - Added individual entity toggles ([#64](https://github.com/LambdAurora/LambDynamicLights/issues/64), [#79](https://github.com/LambdAurora/LambDynamicLights/issues/79)).
- - Optimized hot methods `maxDynamicLightLevel` and `updateTracking` ([#84](https://github.com/LambdAurora/LambDynamicLights/pull/84)).
- - Use `HashSet` for `dynamicLightSources` ([#85](https://github.com/LambdAurora/LambDynamicLights/pull/85)).
- - Cache config values for better performances ([#80](https://github.com/LambdAurora/LambDynamicLights/issues/80)).
-
-### 2.1.1
-
- - Updated to Minecraft 1.19.
- - Updated [SpruceUI].
- - Updated [pridelib].
-
-### 2.1.2
-
- - Fixed dependencies declaration.
-
-## 2.2.0
-
- - Added option to disable self dynamic lighting.
- - Updated Russian translations ([#116](https://github.com/LambdAurora/LambDynamicLights/pull/116), [#121](https://github.com/LambdAurora/LambDynamicLights/pull/121)).
- - Added Ukrainian translations ([#120](https://github.com/LambdAurora/LambDynamicLights/pull/120)).
-
-[SpruceUI]: https://github.com/LambdAurora/SpruceUI "SpruceUI page"
-[pridelib]: https://github.com/Queerbric/pridelib "Pridelib page"
-[Sodium]: https://modrinth.com/mod/sodium "Sodium Modrinth page"
-[Canvas Renderer]: https://www.curseforge.com/minecraft/mc-mods/canvas-renderer "Canvas Renderer CurseForge page"
+## Changelog
+- port to forge

build.gradle

@@ -3,9 +3,8 @@ plugins {
 	id 'io.github.juuxel.loom-vineflower' version '1.+'
 	id 'java-library'
 	id 'maven-publish'
-	id 'com.github.johnrengelman.shadow' version '7.1.2'
 	id 'com.modrinth.minotaur' version '2.+'
-	id 'com.matthewprenger.cursegradle' version '1.4.+'
+	id 'net.darkhax.curseforgegradle' version '1.+'
 }
 
 group = project.maven_group
@@ -84,6 +83,41 @@ jar {
 	}
 }
 
+modrinth {
+	token = System.getenv("MODRINTH_TOKEN")
+
+	projectId = "${project.modrinth_id}"
+	versionNumber = "${project.version}"
+	versionType = "beta"
+	changelog = file("CHANGELOG.md").getText('UTF-8')
+	uploadFile = remapJar
+	additionalFiles = [sourcesJar]
+	gameVersions = ["1.19", "1.19.1", "1.19.2"]
+	loaders = ["forge"]
+	dependencies {
+		required.project "obsidianui"
+	}
+}
+
+task publishCurseForge(type: net.darkhax.curseforgegradle.TaskPublishCurseForge) {
+	apiToken = System.getenv("CURSEFORGE_TOKEN")
+	disableVersionDetection()
+
+	def mainFile = upload(project.curseforge_id, remapJar)
+	mainFile.displayName = "${project.version}"
+	mainFile.releaseType = "beta"
+	mainFile.changelog = file("CHANGELOG.md")
+	mainFile.changelogType = "markdown"
+	mainFile.addModLoader("Forge")
+	mainFile.addJavaVersion("Java 17", "Java 18")
+	mainFile.addGameVersion("1.19", "1.19.1", "1.19.2")
+	mainFile.addRequirement("obsidianui")
+
+	def sourcesFile = mainFile.withAdditionalFile(sourcesJar)
+	sourcesFile.changelog = file("CHANGELOG.md")
+	sourcesFile.changelogType = "markdown"
+}
+
 // configure the maven publication
 publishing {
 	publications {

gradle.properties

@@ -8,11 +8,11 @@ quilt_mappings=1.19.2+build.21
 forge_version=1.19.2-43.2.23
 
 # Mod Properties
-mod_version = 0.1.0
+mod_version = 0.1.1
 maven_group = dev.lambdaurora
 archives_base_name = Ryoamiclights
-modrinth_id=yBW8D80W
-curseforge_id=393442
+modrinth_id=reCfnRvJ
+curseforge_id=913587
 
 # Dependencies
 architectury_version=6.5.85

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

@@ -26,7 +26,7 @@ side = "BOTH"
 [[dependencies.lambdynlights]]
 modId = "minecraft"
 mandatory = true
-versionRange = "[1.19,)"
+versionRange = "[1.19,1.19.2]"
 ordering = "NONE"
 side = "BOTH"
 
@@ -35,4 +35,11 @@ modId = "architectury"
 mandatory = true
 versionRange = "*"
 ordering = "NONE"
+side = "BOTH"
+
+[[dependencies.lambdynlights]]
+modId = "spruceui"
+mandatory = true
+versionRange = "*"
+ordering = "NONE"
 side = "BOTH"