Bump version, use jarJar instead of shadow jar

Also add "j-ogg-vorbis" dependency.

diff --git a/Changelog.md b/Changelog.md
index 2881d8d8cb9d4a0bbd5c212e50c98f826ecda6bc..6cd81089026df2a94ce6f772aa35321003ab701b 100644 (file)
--- a/Changelog.md
+++ b/Changelog.md
@@ -1,5 +1,7 @@
 # Upcoming changes
 
+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 93fefa274623241096d7d54e42967e7934202fb8..8aea1ab0628daa4b9c4af8e1ca7ea9d35730ede6 100644 (file)
--- 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-Forge-1.24.0.jar"
+finished jar will be saved at "build/libs/TurnBasedMinecraft-Forge-1.25.0.jar"
 
 # Reproducibility
 

diff --git a/build.gradle b/build.gradle
index 2a18382ce4840b0594842bbabbcdf041250a7007..bb87e1ab24a16cd535dcbd689fb8edf878ceef2c 100644 (file)
--- a/build.gradle
+++ b/build.gradle
@@ -3,16 +3,17 @@ plugins {
     id 'idea'
     id 'maven-publish'
     id 'net.minecraftforge.gradle' version '[6.0.16,6.2)'
-    id 'com.github.johnrengelman.shadow' version '8.1.1'
 }
 
-version = "1.24.0"
+version = "1.25.0"
 group = "com.burnedkirby.TurnBasedMinecraft"
 archivesBaseName = "TurnBasedMinecraft-Forge"
 
 java.toolchain.languageVersion = JavaLanguageVersion.of(17)
 println('Java: ' + System.getProperty('java.version') + ' JVM: ' + System.getProperty('java.vm.version') + '(' + System.getProperty('java.vendor') + ') Arch: ' + System.getProperty('os.arch'))
 
+jarJar.enable()
+
 minecraft {
     // The mappings can be changed at any time, and must be in the following format.
     // snapshot_YYYYMMDD   Snapshot are built nightly.
@@ -137,11 +138,10 @@ sourceSets.main.resources { srcDir 'src/generated/resources' }
 //    }
 //}
 
-apply plugin: 'com.github.johnrengelman.shadow'
-
-configurations {
-    shade
-    impelmentation.extendsFrom shade
+repositories {
+    flatDir {
+        dir 'libs'
+    }
 }
 
 dependencies {
@@ -161,9 +161,16 @@ dependencies {
     // For more info...
     // http://www.gradle.org/docs/current/userguide/artifact_dependencies_tutorial.html
     // http://www.gradle.org/docs/current/userguide/dependency_management.html
-    implementation files('libs/javamp3-1.0.3.jar')
+    //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')
+    }
 
-    shade files('libs/javamp3-1.0.3.jar')
+    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.
@@ -203,20 +210,6 @@ jar {
     }
 }
 
-shadowJar {
-    archiveClassifier = ''
-    //project.configurations.shadow.setTransitive(true);
-    configurations = [project.configurations.shade]
-    relocate 'fr.delthas', 'com.burnedkirby.tbm_repack.fr.delthas'
-    finalizedBy 'reobfShadowJar'
-}
-
-assemble.dependsOn shadowJar
-
-reobf {
-    shadowJar {} // reobfuscate the shadowed jar
-}
-
 // Reproducible Builds
 tasks.withType(AbstractArchiveTask).configureEach {
     preserveFileTimestamps = false

diff --git a/gradle.properties b/gradle.properties
index 18acd8296b1b35d7c71c26927946315864282023..f80c5e129df7543ea77ff7702ab99e0f508b28ba 100644 (file)
--- a/gradle.properties
+++ b/gradle.properties
@@ -44,7 +44,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 0f1fbb44c74909e4f0e1cfd1b95b300b6e445680..b09e0a52d3c6e5bb88ddce87729b91c8c7552a28 100644 (file)
--- a/src/main/java/com/burnedkirby/TurnBasedMinecraft/common/TurnBasedMinecraftMod.java
+++ b/src/main/java/com/burnedkirby/TurnBasedMinecraft/common/TurnBasedMinecraftMod.java
@@ -37,7 +37,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 14d0b277059cc3e5f26edda694f8010dd8b7c96f..54b05bcc3f3dd06b27e02b1541ce6a5c8af4c8e6 100644 (file)
--- 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.2",
   "url": "",
   "updateUrl": "",