Merge pull request #4 from MightyKnight/master

Update to 1.21.2-1.21.4; update Gradle and adress deprecation warnings

Author: capitalistspz

build.gradle

@@ -1,15 +1,15 @@
 plugins {
-    id 'fabric-loom' version '1.6-SNAPSHOT'
+    id 'fabric-loom' version '1.9-SNAPSHOT'
     id 'maven-publish'
 }
 
-sourceCompatibility = JavaVersion.VERSION_21
-targetCompatibility = JavaVersion.VERSION_21
-
-archivesBaseName = project.archives_base_name
 version = project.mod_version
 group = project.maven_group
 
+base {
+    archivesName = project.archives_base_name
+}
+
 repositories {
     // Add repositories to retrieve artifacts from in here.
     // You should only use this when depending on other mods because
@@ -18,6 +18,18 @@ repositories {
     // for more information about repositories.
 }
 
+loom {
+    splitEnvironmentSourceSets()
+
+    mods {
+        "modid" {
+            sourceSet sourceSets.main
+            sourceSet sourceSets.client
+        }
+    }
+
+}
+
 dependencies {
     minecraft "com.mojang:minecraft:${project.minecraft_version}"
     mappings "net.fabricmc:yarn:${project.yarn_mappings}:v2"
@@ -30,20 +42,21 @@ processResources {
     filesMatching("fabric.mod.json") {
         expand "version": project.version
     }
-
 }
-// Loom will automatically attach sourcesJar to a RemapSourcesJar task and to the "build" task
-// if it is present.
-// If you remove this task, sources will not be generated.
+
 tasks.withType(JavaCompile).configureEach {
     // Minecraft 1.20.5 upwards uses Java 21.
     it.options.release = 21
 }
+
 java {
     // Loom will automatically attach sourcesJar to a RemapSourcesJar task and to the "build" task
     // if it is present.
     // If you remove this line, sources will not be generated.
     withSourcesJar()
+
+    sourceCompatibility = JavaVersion.VERSION_21
+    targetCompatibility = JavaVersion.VERSION_21
 }
 
 loom {
@@ -52,17 +65,18 @@ loom {
 
 jar {
     from("LICENSE") {
-        rename { "${it}_${project.archivesBaseName}"}
+        rename { "${it}_${project.base.archivesName.get()}"}
     }
 }
 
 // configure the maven publication
 publishing {
-    publications {
-        mavenJava(MavenPublication) {
-            from components.java
-        }
-    }
+	publications {
+		create("mavenJava", MavenPublication) {
+			artifactId = project.archives_base_name
+			from components.java
+		}
+	}
 
     // See https://docs.gradle.org/current/userguide/publishing_maven.html for information on how to set up publishing.
     repositories {

gradle.properties

@@ -3,10 +3,10 @@ org.gradle.jvmargs=-Xmx1G
 # Fabric Properties
 # check these on https://modmuss50.me/fabric.html
 
-minecraft_version=1.21
-yarn_mappings=1.21+build.9
-loader_version=0.16.3
+minecraft_version=1.21.4
+yarn_mappings=1.21.4+build.7
+loader_version=0.16.9
 # Mod Properties
-mod_version=1.3-1.21
+mod_version=1.3-1.21.4
 maven_group=capitalistspz
 archives_base_name=snowballkb

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.11-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

src/main/java/capitalistspz/test/config/Config.java

@@ -3,6 +3,7 @@
 import capitalistspz.test.SnowballKB;
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
+import com.google.gson.Strictness;
 import org.apache.logging.log4j.Level;
 
 import java.io.File;
@@ -20,7 +21,7 @@ public class Config{
     public float fishingRodPullMultiplier = 0.1f;
 
     private static final File configFile = new File("config" + File.separator + "snowballkb.json");
-    private static final Gson gson = new GsonBuilder().setPrettyPrinting().setLenient().create();
+    private static final Gson gson = new GsonBuilder().setPrettyPrinting().setStrictness(Strictness.LENIENT).create();
 
     public static boolean save(Config config) {
         try {

src/main/java/capitalistspz/test/mixin/EggEntityMxn.java

@@ -6,6 +6,7 @@
 import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.entity.projectile.thrown.EggEntity;
 import net.minecraft.entity.projectile.thrown.ThrownItemEntity;
+import net.minecraft.server.world.ServerWorld;
 import net.minecraft.util.hit.EntityHitResult;
 import net.minecraft.util.math.MathHelper;
 import net.minecraft.world.World;
@@ -36,7 +37,11 @@ protected void onHitPlayer(EntityHitResult entityHitResult, CallbackInfo ci) {
                 player.setVelocity(player.getVelocity().add(this.getVelocity().normalize().multiply(SnowballKB.config.eggKbMultiplier)));
                 player.velocityModified = true;
             }
-            entity.damage(this.getDamageSources().thrown(this, this.getOwner()), SnowballKB.config.eggDamage);
+
+            if (entity.getWorld() instanceof ServerWorld world) {
+                entity.damage(world, this.getDamageSources().thrown(this, this.getOwner()),
+                        SnowballKB.config.eggDamage);
+            }
         }
 
     }

src/main/java/capitalistspz/test/mixin/SnowballEntityMxn.java

@@ -6,6 +6,7 @@
 import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.entity.projectile.thrown.SnowballEntity;
 import net.minecraft.entity.projectile.thrown.ThrownItemEntity;
+import net.minecraft.server.world.ServerWorld;
 import net.minecraft.util.hit.EntityHitResult;
 import net.minecraft.util.math.MathHelper;
 import net.minecraft.world.World;
@@ -36,7 +37,11 @@ protected void onHitPlayer(EntityHitResult entityHitResult, CallbackInfo ci, Ent
                 entity.setVelocity(entity.getVelocity().add(this.getVelocity().normalize().multiply(SnowballKB.config.snowKbMultiplier)));
                 entity.velocityModified = true;
             }
-            entity.damage(this.getDamageSources().thrown(this, this.getOwner()), SnowballKB.config.snowDamage);
+
+            if (entity.getWorld() instanceof ServerWorld world) {
+                entity.damage(world, this.getDamageSources().thrown(this, this.getOwner()),
+                        SnowballKB.config.snowDamage);
+            }
         }
 
     }

src/main/resources/fabric.mod.json

@@ -21,6 +21,6 @@
   "accessWidener" : "snowballkb.accesswidener",
   "depends": {
     "fabricloader": ">=0.15.11",
-    "minecraft": ">=1.21"
+    "minecraft": ">=1.21.2"
   }
 }