diff --git a/.forgejo/workflows/build-jar.yaml b/.forgejo/workflows/build-jar.yaml index 8e6d84d..0919cf2 100644 --- a/.forgejo/workflows/build-jar.yaml +++ b/.forgejo/workflows/build-jar.yaml @@ -1,4 +1,4 @@ -name: Build TurnBasedMC and store Artifact +name: Build TurnBasedMC and create Release on: push: tags: @@ -24,6 +24,7 @@ jobs: \"name\": \"TurnBasedMinecraftMod version ${GITHUB_REF_NAME}\", \"body\": \"See the [Changelog](https://git.seodisparate.com/stephenseo/TurnBasedMinecraftMod/src/branch/neoforge/Changelog.md) + (Using OpenJDK Java.) $(javac --version) $(find TurnBasedMinecraftMod/build/libs -regex '.*all.jar$' -exec sha256sum '{}' ';')\", \"tag_name\": \"${GITHUB_REF_NAME}\" diff --git a/Changelog.md b/Changelog.md index 2881d8d..bef3c63 100644 --- a/Changelog.md +++ b/Changelog.md @@ -1,5 +1,15 @@ # Upcoming changes +NeoForge: Will incorporate same changes as Forge-1.25.0. + +# Version Forge-1.25.0 + +Remove usage of "shadow jar" in build.gradle, and use jarJar instead. + +Add new dependency `j-ogg-vorbis`. + +Implement playing Vorbis encoded .ogg files for battle/silly music. + # Version NeoForge-1.24.0 Update to NeoForge 1.20.2-20.2.88. diff --git a/README.md b/README.md index bf67e84..762f471 100644 --- a/README.md +++ b/README.md @@ -65,7 +65,7 @@ configured for them.) # Building Simply invoke `./gradlew build` in the mod directory and after some time the -finished jar will be saved at "build/libs/TurnBasedMinecraft-NeoForge-1.24.0-all.jar" +finished jar will be saved at "build/libs/TurnBasedMinecraft-NeoForge-1.25.0-all.jar" # Reproducibility @@ -74,6 +74,10 @@ more details. # Other notes +This mod uses [j-ogg-vorbis](https://github.com/stephengold/j-ogg-all) +available from [http://www.j-ogg.de](http://www.j-ogg.de) and copyrighted by +Tor-Einar Jarnbjo. + This mod also uses [JavaMP3](https://github.com/kevinstadler/JavaMP3) which is licensed under the [MIT License](https://github.com/kevinstadler/JavaMP3/blob/master/LICENSE). diff --git a/Reproducibility.md b/Reproducibility.md index b4a1afa..70540f4 100644 --- a/Reproducibility.md +++ b/Reproducibility.md @@ -4,6 +4,19 @@ Starting with version 1.24.0 of this mod, this file will list what version of Java was used to compile the jars. In theory, using the same version of Java should result in an identical jar due to reproducible builds. +## Forge 1.25.0 + + $ java --version + openjdk 17.0.9 2023-10-17 + OpenJDK Runtime Environment (build 17.0.9+8) + OpenJDK 64-Bit Server VM (build 17.0.9+8, mixed mode) + + $ javac --version + javac 17.0.9 + + $ sha256sum build/libs/TurnBasedMinecraft-Forge-1.25.0-all.jar + 51ef854552b180df68969f4cec6fdc8716ef519b947948b9e5f4ce9953d00162 build/libs/TurnBasedMinecraft-Forge-1.25.0-all.jar + ## NeoForge 1.24.0 $ java --version diff --git a/build.gradle b/build.gradle index cc0c972..d764fab 100644 --- a/build.gradle +++ b/build.gradle @@ -5,7 +5,7 @@ plugins { id 'net.neoforged.gradle.userdev' version '7.0.57' } -version = "1.24.0" +version = "1.25.0" group = "com.burnedkirby.TurnBasedMinecraft" archivesBaseName = "TurnBasedMinecraft-NeoForge" @@ -81,9 +81,13 @@ dependencies { // implementation files('libs/javamp3-1.0.3.jar') implementation 'fr.delthas:javamp3:1.0.3' + implementation 'com.github.stephengold:j-ogg-vorbis:1.0.4' + jarJar(group: 'fr.delthas', name: 'javamp3', version: '[1.0.0,2.0.0)') { jarJar.pin(it, '1.0.3') } + + jarJar(group: 'com.github.stephengold', name: 'j-ogg-vorbis', version: '[1.0.4,2.0.0)') } // This block of code expands all declared replace properties in the specified resource targets. diff --git a/gradle.properties b/gradle.properties index 6da0fe5..45e661c 100644 --- a/gradle.properties +++ b/gradle.properties @@ -10,7 +10,7 @@ minecraft_version=1.20.2 # as they do not follow standard versioning conventions. minecraft_version_range=[1.20.2,1.21) # The Neo version must agree with the Minecraft version to get a valid artifact -neo_version=20.2.86 +neo_version=20.2.88 # The Neo version range can use any version of Neo as bounds or match the loader version range neo_version_range=[20.2,) # The loader version range can only use the major version of Neo/FML as bounds @@ -26,7 +26,7 @@ mod_name=TurnBasedMinecraftMod # The license of the mod. Review your options at https://choosealicense.com/. All Rights Reserved is the default. mod_license=MIT # The mod version. See https://semver.org/ -mod_version=1.24.0 +mod_version=1.25.0 # The group ID for the mod. It is only important when publishing as an artifact to a Maven repository. # This should match the base package used for the mod sources. # See https://maven.apache.org/guides/mini/guide-naming-conventions.html diff --git a/src/main/java/com/burnedkirby/TurnBasedMinecraft/common/TurnBasedMinecraftMod.java b/src/main/java/com/burnedkirby/TurnBasedMinecraft/common/TurnBasedMinecraftMod.java index 6b412ce..bcf99c1 100644 --- a/src/main/java/com/burnedkirby/TurnBasedMinecraft/common/TurnBasedMinecraftMod.java +++ b/src/main/java/com/burnedkirby/TurnBasedMinecraft/common/TurnBasedMinecraftMod.java @@ -40,7 +40,7 @@ import org.apache.logging.log4j.Logger; public class TurnBasedMinecraftMod { public static final String MODID = "com_burnedkirby_turnbasedminecraft"; public static final String NAME = "Turn Based Minecraft Mod"; - public static final String VERSION = "1.24.0"; + public static final String VERSION = "1.25.0"; public static final String CONFIG_FILENAME = "TBM_Config.toml"; public static final String DEFAULT_CONFIG_FILENAME = "TBM_Config_DEFAULT.toml"; public static final String CONFIG_DIRECTORY = "config/TurnBasedMinecraft/"; diff --git a/src/main/resources/mcmod.info b/src/main/resources/mcmod.info index f66983a..88511a4 100644 --- a/src/main/resources/mcmod.info +++ b/src/main/resources/mcmod.info @@ -3,7 +3,7 @@ "modid": "com_burnedkirby_turnbasedminecraft", "name": "Turn Based Minecraft", "description": "Changes battles to be turn-based.", - "version": "1.24.0", + "version": "1.25.0", "mcversion": "1.20.1", "url": "", "updateUrl": "",