Merge branch '1.20.1' into 1.20.2

ZsoltMolnarrr · Sep 24, 2023 · 4d34764 · 4d34764
2 parents 7773273 + 73a9ca4
commit 4d34764
Show file tree

Hide file tree

Showing 12 changed files with 268 additions and 210 deletions.
diff --git a/build.gradle b/build.gradle
@@ -6,7 +6,7 @@ buildscript {
 
 plugins {
     id "architectury-plugin" version "3.4-SNAPSHOT"
-    id "dev.architectury.loom" version "0.12.0-SNAPSHOT" apply false
+    id "dev.architectury.loom" version "1.3-SNAPSHOT" apply false
     id "org.cadixdev.licenser" version "0.6.1"
     id "io.github.juuxel.loom-quiltflower" version "1.7.+" apply false
     id "me.shedaniel.unified-publishing" version "0.1.+" apply false

diff --git a/common/build.gradle b/common/build.gradle
@@ -21,7 +21,7 @@ dependencies {
         exclude(group: "net.fabricmc.fabric-api")
     }
 
-    modImplementation ("dev.kosmx.player-anim:player-animation-lib:${project.player_anim_version}")
+    modImplementation("dev.kosmx.player-anim:player-animation-lib-fabric:${project.player_anim_version}")
     // modImplementation(files("../fabric/run/mods/dev/player-animation-lib-fabric-${project.player_anim_version}.jar"))
     implementation ("com.github.ZsoltMolnarrr:TinyConfig:${project.tiny_config_version}")
 

diff --git a/common/src/main/java/net/bettercombat/api/AttributesContainer.java b/common/src/main/java/net/bettercombat/api/AttributesContainer.java
@@ -1,6 +1,7 @@
 package net.bettercombat.api;
 
-import javax.annotation.Nullable;
+import org.jetbrains.annotations.Nullable;
+
 import java.util.Objects;
 
 /**

diff --git a/common/src/main/java/net/bettercombat/api/WeaponAttributes.java b/common/src/main/java/net/bettercombat/api/WeaponAttributes.java
@@ -1,6 +1,7 @@
 package net.bettercombat.api;
 
-import javax.annotation.Nullable;
+import org.jetbrains.annotations.Nullable;
+
 import java.util.Objects;
 
 /**

diff --git a/common/src/main/java/net/bettercombat/client/animation/PoseSubStack.java b/common/src/main/java/net/bettercombat/client/animation/PoseSubStack.java
@@ -8,8 +8,8 @@
 import dev.kosmx.playerAnim.api.layered.modifier.MirrorModifier;
 import dev.kosmx.playerAnim.core.data.KeyframeAnimation;
 import dev.kosmx.playerAnim.core.util.Ease;
+import org.jetbrains.annotations.Nullable;
 
-import javax.annotation.Nullable;
 import java.util.function.Consumer;
 
 public class PoseSubStack {

diff --git a/common/src/main/java/net/bettercombat/logic/ItemStackNBTWeaponAttributes.java b/common/src/main/java/net/bettercombat/logic/ItemStackNBTWeaponAttributes.java
@@ -1,8 +1,7 @@
 package net.bettercombat.logic;
 
 import net.bettercombat.api.WeaponAttributes;
-
-import javax.annotation.Nullable;
+import org.jetbrains.annotations.Nullable;
 
 public interface ItemStackNBTWeaponAttributes {
     boolean hasInvalidAttributes();

diff --git a/fabric/build.gradle b/fabric/build.gradle
@@ -53,28 +53,28 @@ processResources {
 
 shadowJar {
     configurations = [project.configurations.shadowCommon]
-    classifier "dev-shadow"
+    archiveClassifier.set("dev-shadow")
     relocate 'net.tinyconfig', 'net.bettercombat.tinyconfig'
 }
 
 remapJar {
     input.set shadowJar.archiveFile
     dependsOn shadowJar
-    classifier null
+    archiveClassifier.set(null)
 }
 
 task renameJarForPublication(type: Zip, dependsOn: remapJar) {
     from remapJar.archiveFile.map { zipTree(it) }
-    extension "jar"
+    // extension "jar"
     metadataCharset "UTF-8"
     destinationDirectory = base.libsDirectory
-    classifier project.name
+    archiveClassifier.set(project.name)
 }
 
 assemble.dependsOn renameJarForPublication
 
 jar {
-    classifier "dev"
+    archiveClassifier.set("dev")
 }
 
 sourcesJar {

diff --git a/forge/build.gradle b/forge/build.gradle
@@ -52,23 +52,23 @@ processResources {
 
 shadowJar {
     configurations = [project.configurations.shadowCommon]
-    classifier "dev-shadow"
+    archiveClassifier.set("dev-shadow")
     relocate 'net.fabricmc', 'net.bettercombat.fabricmc'
     relocate 'net.tinyconfig', 'net.bettercombat.tinyconfig'
 }
 
 remapJar {
     input.set shadowJar.archiveFile
     dependsOn shadowJar
-    classifier null
+    archiveClassifier.set(null)
 }
 
 task renameJarForPublication(type: Zip, dependsOn: remapJar) {
     from remapJar.archiveFile.map { zipTree(it) }
-    extension "jar"
+    // extension "jar"
     metadataCharset "UTF-8"
     destinationDirectory = base.libsDirectory
-    classifier project.name
+    archiveClassifier.set(project.name)
 }
 
 assemble.dependsOn renameJarForPublication

diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists