Update to 1.21.3

Author: Patbox

.github/workflows/build.yml

@@ -37,7 +37,7 @@ jobs:
         run: ./gradlew build
       - name: capture build artifacts
         if: ${{ runner.os == 'Linux' && matrix.java == '21' }} # Only upload artifacts built from LTS java on one OS
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v4
         with:
           name: Artifacts
           path: build/libs/

.github/workflows/release.yml

@@ -38,7 +38,7 @@ jobs:
           CHANGELOG: ${{ github.event.release.body }}
           RELEASE: true
       - name: Upload GitHub release
-        uses: AButler/upload-release-assets@v2.0
+        uses: AButler/upload-release-assets@v3.0
         with:
           files: 'build/libs/*.jar;!build/libs/*-sources.jar;!build/libs/*-dev.jar'
           repo-token: ${{ secrets.GITHUB_TOKEN }}

build.gradle

@@ -1,18 +1,6 @@
-/*buildscript {
-	dependencies {
-		classpath "de.guntram.mcmod:crowdin-translate:1.4+1.19.3"
-	}
-	repositories {
-		maven {
-			name = 'CrowdinTranslate source'
-			url = "https://minecraft.guntram.de/maven/"
-		}
-	}
-}*/
-
 
 plugins {
-	id 'fabric-loom' version '1.6.+'
+	id 'fabric-loom' version '1.7.+'
 	id "com.modrinth.minotaur" version "2.+"
 	id 'maven-publish'
 }
@@ -23,13 +11,6 @@ targetCompatibility = JavaVersion.VERSION_21
 
 archivesBaseName = project.archives_base_name
 group = project.maven_group
-/*
-apply plugin: 'de.guntram.mcmod.crowdin-translate'
-crowdintranslate.crowdinProjectName = 'patbox-mods'
-crowdintranslate.jsonSourceName = 'polydecorations'
-crowdintranslate.minecraftProjectName = 'polydecorations'
-crowdintranslate.verbose = false
-*/
 
 if (System.getenv("CI") != null) {
 	if (System.getenv("RELEASE") != null) {
@@ -80,9 +61,9 @@ dependencies {
 
 	// Fabric API. This is technically optional, but you probably want it anyway.
 	modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}"
-	modImplementation include('eu.pb4:polymer-virtual-entity:0.9.2+1.21')
-	modImplementation include("eu.pb4:placeholder-api:2.4.0+1.21")
-	modImplementation include('eu.pb4:predicate-api:0.5.2+1.21')
+	modImplementation include('eu.pb4:polymer-virtual-entity:0.10.0+1.21.2')
+	modImplementation include("eu.pb4:placeholder-api:2.5.0+1.21.2")
+	modImplementation include('eu.pb4:predicate-api:0.6.0+1.21.2')
 }
 
 processResources {

gradle.properties

@@ -4,14 +4,14 @@ org.gradle.parallel=true
 
 # Fabric Properties
 	# check these on https://fabricmc.net/develop
-	minecraft_version=1.21
-	yarn_mappings=1.21+build.1
-	loader_version=0.15.11
+	minecraft_version=1.21.3
+	yarn_mappings=1.21.3+build.1
+	loader_version=0.16.7
 
 # Mod Properties
-	mod_version = 1.1.0
+	mod_version = 1.2.0
 	maven_group = eu.pb4
 	archives_base_name = ouch
 
 # Dependencies
-	fabric_version=0.100.1+1.21
+	fabric_version=0.106.1+1.21.3

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 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.8-bin.zip
 networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

src/main/java/eu/pb4/ouch/DamageDisplayLogic.java

@@ -58,7 +58,7 @@ public record DamageDisplayLogic(Optional<RegistryEntryList<DamageType>> type,
 
 
     public static DamageDisplayLogic of(RegistryWrapper.WrapperLookup wrapper, String format, FloatRange range, float chance, MinecraftPredicate victimPredicate, MinecraftPredicate sourcePredicate, MinecraftPredicate attackerPredicate, RegistryKey<DamageType>... type) {
-        var x = wrapper.getWrapperOrThrow(RegistryKeys.DAMAGE_TYPE);
+        var x = wrapper.getOrThrow(RegistryKeys.DAMAGE_TYPE);
         return new DamageDisplayLogic(Optional.of(RegistryEntryList.of(Arrays.stream(type).map(x::getOrThrow).toList())),
                 victimPredicate,
                 attackerPredicate,
@@ -70,7 +70,7 @@ public static DamageDisplayLogic of(RegistryWrapper.WrapperLookup wrapper, Strin
         );
     }
     public static DamageDisplayLogic of(RegistryWrapper.WrapperLookup wrapper, String format, FloatRange range, float chance, MinecraftPredicate victimPredicate, MinecraftPredicate sourcePredicate, MinecraftPredicate attackerPredicate, TagKey<DamageType> tag) {
-        return new DamageDisplayLogic(Optional.of(wrapper.getWrapperOrThrow(RegistryKeys.DAMAGE_TYPE).getOrThrow(tag)),
+        return new DamageDisplayLogic(Optional.of(wrapper.getOrThrow(RegistryKeys.DAMAGE_TYPE).getOrThrow(tag)),
                 victimPredicate,
                 attackerPredicate,
                 sourcePredicate,

src/main/java/eu/pb4/ouch/mixin/ArmorStandEntityMixin.java

@@ -28,19 +28,19 @@ private void onDamageApplied(ServerWorld world, DamageSource source, float amoun
     }
 
     @Inject(method = "damage", at = @At(value = "INVOKE", target = "Lnet/minecraft/entity/decoration/ArmorStandEntity;emitGameEvent(Lnet/minecraft/registry/entry/RegistryEntry;Lnet/minecraft/entity/Entity;)V"))
-    private void onDamageApplied2(DamageSource source, float amount, CallbackInfoReturnable<Boolean> cir) {
+    private void onDamageApplied2(ServerWorld world, DamageSource source, float amount, CallbackInfoReturnable<Boolean> cir) {
         this.createText(source, amount);
     }
 
-    @Inject(method = "damage", at = @At(value = "INVOKE", target = "Lnet/minecraft/entity/decoration/ArmorStandEntity;kill()V"))
-    private void onDamageApplied3(DamageSource source, float amount, CallbackInfoReturnable<Boolean> cir) {
+    @Inject(method = "damage", at = @At(value = "INVOKE", target = "Lnet/minecraft/entity/decoration/ArmorStandEntity;kill(Lnet/minecraft/server/world/ServerWorld;)V"))
+    private void onDamageApplied3(ServerWorld world, DamageSource source, float amount, CallbackInfoReturnable<Boolean> cir) {
         this.createText(source, amount);
     }
 
     @Unique
     private void createText(DamageSource source, float amount) {
         if (!this.getWorld().isClient) {
-            amount = DamageUtil.getDamageLeft(this, amount, source, (float) this.getArmor(), (float) this.getAttributeValue(EntityAttributes.GENERIC_ARMOR_TOUGHNESS));
+            amount = DamageUtil.getDamageLeft(this, amount, source, (float) this.getArmor(), (float) this.getAttributeValue(EntityAttributes.ARMOR_TOUGHNESS));
             FloatingText.createDamage(this, source, amount);
         }
     }

src/main/java/eu/pb4/ouch/mixin/LivingEntityMixin.java

@@ -6,6 +6,7 @@
 import net.minecraft.entity.EntityType;
 import net.minecraft.entity.LivingEntity;
 import net.minecraft.entity.damage.DamageSource;
+import net.minecraft.server.world.ServerWorld;
 import net.minecraft.world.World;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
@@ -22,7 +23,7 @@ public LivingEntityMixin(EntityType<?> type, World world) {
     }
 
     @Inject(method = "applyDamage", at = @At(value = "INVOKE", target = "Lnet/minecraft/entity/LivingEntity;emitGameEvent(Lnet/minecraft/registry/entry/RegistryEntry;)V"))
-    private void onDamageApplied(DamageSource source, float amount, CallbackInfo ci) {
+    private void onDamageApplied(ServerWorld world, DamageSource source, float amount, CallbackInfo ci) {
         if (!this.getWorld().isClient) {
             FloatingText.createDamage((LivingEntity) (Object) this, source, amount);
         }

src/main/java/eu/pb4/ouch/mixin/PlayerEntityMixin.java

@@ -7,6 +7,7 @@
 import net.minecraft.entity.LivingEntity;
 import net.minecraft.entity.damage.DamageSource;
 import net.minecraft.entity.player.PlayerEntity;
+import net.minecraft.server.world.ServerWorld;
 import net.minecraft.world.World;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
@@ -21,7 +22,7 @@ public PlayerEntityMixin(EntityType<?> type, World world) {
     }
 
     @Inject(method = "applyDamage", at = @At(value = "INVOKE", target = "Lnet/minecraft/entity/player/PlayerEntity;emitGameEvent(Lnet/minecraft/registry/entry/RegistryEntry;)V"))
-    private void onDamageApplied(DamageSource source, float amount, CallbackInfo ci) {
+    private void onDamageApplied(ServerWorld world, DamageSource source, float amount, CallbackInfo ci) {
         if (!this.getWorld().isClient) {
             FloatingText.createDamage((LivingEntity) (Object) this, source, amount);
         }