diff --git a/build.gradle.kts b/build.gradle.kts index 1a17cde..e58e19c 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -6,9 +6,10 @@ plugins { dependencies { modImplementation("io.gitlab.jfronny.libjf:libjf-config-core-v1:${prop("libjf_version")}") + modImplementation(fabricApi.module("fabric-api-base", prop("fabric_version"))) // Dev env modLocalRuntime("io.gitlab.jfronny.libjf:libjf-config-ui-tiny-v1:${prop("libjf_version")}") modLocalRuntime("io.gitlab.jfronny.libjf:libjf-devutil:${prop("libjf_version")}") - modLocalRuntime("com.terraformersmc:modmenu:5.0.2") + modLocalRuntime("com.terraformersmc:modmenu:6.1.0-rc.1") } diff --git a/gradle.properties b/gradle.properties index 895c5d0..f9f2451 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,7 +1,7 @@ # https://fabricmc.net/develop/ -minecraft_version=1.19.3 -yarn_mappings=build.5 -loader_version=0.14.12 +minecraft_version=1.19.4 +yarn_mappings=build.1 +loader_version=0.14.17 maven_group=io.gitlab.jfronny archives_base_name=combit @@ -13,5 +13,5 @@ curseforge_id=561742 curseforge_required_dependencies=libjf curseforge_optional_dependencies=modmenu, cloth-config -fabric_version=0.70.0+1.19.3 -libjf_version=3.4.1 +fabric_version=0.75.3+1.19.4 +libjf_version=3.6.0 diff --git a/src/main/java/io/gitlab/jfronny/combit/Combit.java b/src/main/java/io/gitlab/jfronny/combit/Combit.java index cfc8179..cf63f43 100644 --- a/src/main/java/io/gitlab/jfronny/combit/Combit.java +++ b/src/main/java/io/gitlab/jfronny/combit/Combit.java @@ -1,13 +1,13 @@ package io.gitlab.jfronny.combit; import io.gitlab.jfronny.combit.events.*; -import net.fabricmc.api.*; +import net.fabricmc.api.ModInitializer; import net.minecraft.entity.*; -import net.minecraft.entity.player.*; -import net.minecraft.text.*; -import net.minecraft.util.*; +import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.text.Text; +import net.minecraft.util.ActionResult; -import java.util.*; +import java.util.Set; public class Combit implements ModInitializer { @Override diff --git a/src/main/java/io/gitlab/jfronny/combit/CombitConfig.java b/src/main/java/io/gitlab/jfronny/combit/CombitConfig.java index 01d0bf9..1776bce 100644 --- a/src/main/java/io/gitlab/jfronny/combit/CombitConfig.java +++ b/src/main/java/io/gitlab/jfronny/combit/CombitConfig.java @@ -65,6 +65,7 @@ public class CombitConfig { damageSourceWhitelist.add("cactus"); damageSourceWhitelist.add("outOfWorld"); damageSourceWhitelist.add("sweetBerryBush"); + damageSourceWhitelist.add("dryout"); } if (entityHealthBlacklist == null) { entityHealthBlacklist = new HashSet<>(); diff --git a/src/main/java/io/gitlab/jfronny/combit/mixin/EggEntityMixin.java b/src/main/java/io/gitlab/jfronny/combit/mixin/EggEntityMixin.java index b12de4e..b1cd771 100644 --- a/src/main/java/io/gitlab/jfronny/combit/mixin/EggEntityMixin.java +++ b/src/main/java/io/gitlab/jfronny/combit/mixin/EggEntityMixin.java @@ -3,7 +3,6 @@ package io.gitlab.jfronny.combit.mixin; import io.gitlab.jfronny.combit.CombitConfig; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityType; -import net.minecraft.entity.damage.DamageSource; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.entity.projectile.thrown.EggEntity; import net.minecraft.entity.projectile.thrown.ThrownItemEntity; @@ -29,7 +28,7 @@ public abstract class EggEntityMixin extends ThrownItemEntity { e.velocityModified = true; } if (CombitConfig.eggDamage > 0) { - e.damage(DamageSource.thrownProjectile(this, this.getOwner()), CombitConfig.eggDamage); + e.damage(getDamageSources().thrown(this, this.getOwner()), CombitConfig.eggDamage); } } } diff --git a/src/main/java/io/gitlab/jfronny/combit/mixin/SnowballEntityMixin.java b/src/main/java/io/gitlab/jfronny/combit/mixin/SnowballEntityMixin.java index 9d31bb3..77e2798 100644 --- a/src/main/java/io/gitlab/jfronny/combit/mixin/SnowballEntityMixin.java +++ b/src/main/java/io/gitlab/jfronny/combit/mixin/SnowballEntityMixin.java @@ -3,7 +3,6 @@ package io.gitlab.jfronny.combit.mixin; import io.gitlab.jfronny.combit.CombitConfig; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityType; -import net.minecraft.entity.damage.DamageSource; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.entity.projectile.thrown.SnowballEntity; import net.minecraft.entity.projectile.thrown.ThrownItemEntity; @@ -29,7 +28,7 @@ public abstract class SnowballEntityMixin extends ThrownItemEntity { e.velocityModified = true; } if (CombitConfig.snowballDamage > 0) { - e.damage(DamageSource.thrownProjectile(this, this.getOwner()), CombitConfig.snowballDamage); + e.damage(getDamageSources().thrown(this, this.getOwner()), CombitConfig.snowballDamage); } } }