From 6c5c26f0be49c1cccd5d5083cdc80548a87c67e4 Mon Sep 17 00:00:00 2001 From: JFronny Date: Wed, 7 Dec 2022 22:40:06 +0100 Subject: [PATCH] Update to 1.19.3 --- build.gradle.kts | 2 +- gradle.properties | 8 ++++---- .../gitlab/jfronny/combit/mixin/MiningToolItemMixin.java | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index b23de15..2250432 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -12,5 +12,5 @@ dependencies { modLocalRuntime("io.gitlab.jfronny.libjf:libjf-config-reflect-v1:${prop("libjf_version")}") 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:4.1.1") + modLocalRuntime("com.terraformersmc:modmenu:5.0.0-alpha.4") } diff --git a/gradle.properties b/gradle.properties index 289768b..fddd821 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,6 +1,6 @@ # https://fabricmc.net/develop/ -minecraft_version=1.19.2 -yarn_mappings=build.24 +minecraft_version=1.19.3 +yarn_mappings=build.2 loader_version=0.14.11 maven_group=io.gitlab.jfronny @@ -13,5 +13,5 @@ curseforge_id=561742 curseforge_required_dependencies=libjf curseforge_optional_dependencies=modmenu, cloth-config -fabric_version=0.68.0+1.19.2 -libjf_version=3.2.1 +fabric_version=0.68.1+1.19.3 +libjf_version=3.3.1 diff --git a/src/main/java/io/gitlab/jfronny/combit/mixin/MiningToolItemMixin.java b/src/main/java/io/gitlab/jfronny/combit/mixin/MiningToolItemMixin.java index 94ef621..9bf5d39 100644 --- a/src/main/java/io/gitlab/jfronny/combit/mixin/MiningToolItemMixin.java +++ b/src/main/java/io/gitlab/jfronny/combit/mixin/MiningToolItemMixin.java @@ -8,7 +8,7 @@ import net.minecraft.entity.attribute.EntityAttribute; import net.minecraft.entity.attribute.EntityAttributeModifier; import net.minecraft.entity.attribute.EntityAttributes; import net.minecraft.item.*; -import net.minecraft.tag.TagKey; +import net.minecraft.registry.tag.TagKey; import org.spongepowered.asm.mixin.Final; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Mutable; @@ -26,7 +26,7 @@ public abstract class MiningToolItemMixin extends ToolItem { super(material, settings); } - @Inject(at = @At("RETURN"), method = "(FFLnet/minecraft/item/ToolMaterial;Lnet/minecraft/tag/TagKey;Lnet/minecraft/item/Item$Settings;)V") + @Inject(at = @At("RETURN"), method = "(FFLnet/minecraft/item/ToolMaterial;Lnet/minecraft/registry/tag/TagKey;Lnet/minecraft/item/Item$Settings;)V") private void modifyAttackDamage(float attackDamage, float attackSpeed, ToolMaterial material, TagKey effectiveBlocks, Settings settings, CallbackInfo ci) { double factor = ((MiningToolItem)(Object)this) instanceof AxeItem ? CombitConfig.axeAttackDamageFactor : CombitConfig.weaponAttackDamageFactor; if (factor >= 0) {