Compare commits

..

No commits in common. "3a6d800745e067151596eb37c44d0310e9300692" and "0d0c0ca08ca816bce82140394c37baad74718bd9" have entirely different histories.

4 changed files with 13 additions and 39 deletions

View file

@ -1,4 +1,4 @@
name: Build TurnBasedMC and create Release name: Build TurnBasedMC and store Artifact
on: on:
push: push:
tags: tags:
@ -10,7 +10,7 @@ jobs:
steps: steps:
- run: git clone --depth=1 --no-single-branch https://git.seodisparate.com/stephenseo/TurnBasedMinecraftMod.git TurnBasedMinecraftMod - run: git clone --depth=1 --no-single-branch https://git.seodisparate.com/stephenseo/TurnBasedMinecraftMod.git TurnBasedMinecraftMod
- run: cd TurnBasedMinecraftMod && git checkout ${GITHUB_REF_NAME} - run: cd TurnBasedMinecraftMod && git checkout ${GITHUB_REF_NAME}
- run: cd TurnBasedMinecraftMod && sed -i '/org.gradle.jvmargs/s/Xmx[0-9]\+m/Xmx1024m/' gradle.properties - run: cd TurnBasedMinecraftMod && sed -i '/org.gradle.jvmargs/s/Xmx[0-9]\+m/Xmx700m/' gradle.properties
- run: cd TurnBasedMinecraftMod && ./gradlew --console=plain build - run: cd TurnBasedMinecraftMod && ./gradlew --console=plain build
- run: cd TurnBasedMinecraftMod/build/libs && find . -type f -exec sha256sum '{}' ';' -exec bash -c 'sha256sum {} >> sha256sums.txt' ';' && java --version >> javaVersion.txt && javac --version >> javaVersion.txt - run: cd TurnBasedMinecraftMod/build/libs && find . -type f -exec sha256sum '{}' ';' -exec bash -c 'sha256sum {} >> sha256sums.txt' ';' && java --version >> javaVersion.txt && javac --version >> javaVersion.txt
- name: Create release and attach jar - name: Create release and attach jar
@ -24,7 +24,6 @@ jobs:
\"name\": \"TurnBasedMinecraftMod version ${GITHUB_REF_NAME}\", \"name\": \"TurnBasedMinecraftMod version ${GITHUB_REF_NAME}\",
\"body\": \"See the [Changelog](https://git.seodisparate.com/stephenseo/TurnBasedMinecraftMod/src/branch/master/Changelog.md) \"body\": \"See the [Changelog](https://git.seodisparate.com/stephenseo/TurnBasedMinecraftMod/src/branch/master/Changelog.md)
(Using OpenJDK Java.)
$(javac --version) $(javac --version)
$(find TurnBasedMinecraftMod/build/libs -regex '.*[0-9].jar$' -exec sha256sum '{}' ';')\", $(find TurnBasedMinecraftMod/build/libs -regex '.*[0-9].jar$' -exec sha256sum '{}' ';')\",
\"tag_name\": \"${GITHUB_REF_NAME}\" \"tag_name\": \"${GITHUB_REF_NAME}\"

View file

@ -1,11 +1,5 @@
# Upcoming changes # Upcoming changes
# 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. Implement playing Vorbis encoded .ogg files for battle/silly music.
# Version NeoForge-1.24.0 # Version NeoForge-1.24.0

View file

@ -45,18 +45,14 @@ When playing multiplayer, some configuration of the config on the server may be
between them between them
- Supports use of the vanilla Minecraft bow and arrows (have bow selected when - Supports use of the vanilla Minecraft bow and arrows (have bow selected when
in battle) in battle)
- Supports custom battle music to be played when fighting enemies. (They must - Supports custom battle music to be played when fighting enemies. (They must be
be placed in `.minecraft/config/TurnBasedMinecraft/Music/battle` or placed in `.minecraft/config/TurnBasedMinecraft/Music/battle` or
`.minecraft/config/TurnBasedMinecraft/Music/silly`. Client-side config `.minecraft/config/TurnBasedMinecraft/Music/silly`. Client-side config determines
determines which song plays in battle for the client. only `.wav`, which song plays in battle for the client. only `.wav`, ~~`.mid`~~, and `.mp3` files
~~`.mid`~~, `.mp3`, and `.ogg` files supported. ~~Only `.mid` files are not supported. ~~Only `.mid` files are not affected by volume options (master and
affected by volume options (master and music sliders))~~ Midi file playback music sliders))~~ Midi file playback has been disabled for now due to lack of volume
has been disabled for now due to lack of volume control issues. MP3 file control issues. MP3 file playback sometimes fails, but seems to work better when the
playback sometimes fails, but seems to work better when the file is as file is as "barebones" as possible (no album art metadata in the file).
"barebones" as possible (no album art metadata in the file). It is recommended
to use `.ogg` files for music. Note that ogg Vorbis is supported, and NOT ogg
Opus. One can convert to ogg Vorbis with ffmpeg like this: `ffmpeg -i
<my_music_file_to_convert> -map a:0 -c:a libvorbis output.ogg`.
- Config allows limiting number of combatants in turn-based battle. - Config allows limiting number of combatants in turn-based battle.
- Config can be modified (server-side) to add entries of mobs from other mods. - Config can be modified (server-side) to add entries of mobs from other mods.
(by default an unknown mob cannot enter turn-based battle, so the config must be (by default an unknown mob cannot enter turn-based battle, so the config must be
@ -69,8 +65,7 @@ configured for them.)
# Building # Building
Simply invoke `./gradlew build` in the mod directory and after some time the Simply invoke `./gradlew build` in the mod directory and after some time the
finished jar will be saved at finished jar will be saved at "build/libs/TurnBasedMinecraft-Forge-1.25.0.jar"
`build/libs/TurnBasedMinecraft-Forge-1.25.0-all.jar`
# Reproducibility # Reproducibility
@ -79,9 +74,8 @@ more details.
# Other notes # Other notes
This mod uses [j-ogg-vorbis](https://github.com/stephengold/j-ogg-all) available This mod uses [shadow](https://github.com/johnrengelman/shadow) which is
from [http://www.j-ogg.de](http://www.j-ogg.de) and copyrighted by Tor-Einar licenced under the [Apache License 2.0](https://github.com/johnrengelman/shadow/blob/master/LICENSE).
Jarnbjo.
This mod also uses [JavaMP3](https://github.com/kevinstadler/JavaMP3) 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). which is licensed under the [MIT License](https://github.com/kevinstadler/JavaMP3/blob/master/LICENSE).

View file

@ -4,19 +4,6 @@ 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 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. 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 ## NeoForge 1.24.0
$ java --version $ java --version