diff --git a/README.md b/README.md index 248dad7..01ad8fd 100644 --- a/README.md +++ b/README.md @@ -8,7 +8,7 @@ library is distributed via [jitpack.io](https://jitpack.io/#CrimsonDawn45/Fabric #### put this in gradle.properties ```properties -fabric_shield_lib_version=1.7.2-1.21.1 +fabric_shield_lib_version=1.8.0-1.21.3 ``` #### build.gradle under repositories just above dependencies diff --git a/build.gradle b/build.gradle index f1555bd..c9090f8 100644 --- a/build.gradle +++ b/build.gradle @@ -39,7 +39,7 @@ dependencies { include "maven.modrinth:midnightlib:${project.midnightlib_version}" // Mixin Extras - include(implementation(annotationProcessor("io.github.llamalad7:mixinextras-fabric:${mixinextras_version}"))) +// include(implementation(annotationProcessor("io.github.llamalad7:mixinextras-fabric:${mixinextras_version}"))) } processResources { diff --git a/gradle.properties b/gradle.properties index e419cb9..b71fc15 100644 --- a/gradle.properties +++ b/gradle.properties @@ -14,7 +14,6 @@ maven_group=com.github.crimsondawn45 archives_base_name=FabricShieldLib # Dependencies -fabric_version=0.106.1+1.21.3 +fabric_version=0.114.0+1.21.3 mod_menu_version=12.0.0-beta.1 -midnightlib_version=1.5.8-fabric -mixinextras_version=0.4.1 +midnightlib_version=1.6.4-fabric \ No newline at end of file diff --git a/src/main/generated/.cache/50f19fade4190ed6a5a4f9c733c6c9946b1cb334 b/src/main/generated/.cache/50f19fade4190ed6a5a4f9c733c6c9946b1cb334 index 4508d8a..e5faaa5 100644 --- a/src/main/generated/.cache/50f19fade4190ed6a5a4f9c733c6c9946b1cb334 +++ b/src/main/generated/.cache/50f19fade4190ed6a5a4f9c733c6c9946b1cb334 @@ -1,2 +1,2 @@ -// 1.21 2024-08-17T22:36:15.9204123 Fabric Shield Lib/FabricShieldLibEnchantmentGenerator +// 1.21.3 2024-12-31T11:01:40.5595807 Fabric Shield Lib/FabricShieldLibEnchantmentGenerator a315763c245701a58241df5b075f5208c35d3829 data\fabricshieldlib\enchantment\reflect.json diff --git a/src/main/java/com/github/crimsondawn45/fabricshieldlib/mixin/LivingEntityMixin.java b/src/main/java/com/github/crimsondawn45/fabricshieldlib/mixin/LivingEntityMixin.java index 140ce3c..0e2516f 100644 --- a/src/main/java/com/github/crimsondawn45/fabricshieldlib/mixin/LivingEntityMixin.java +++ b/src/main/java/com/github/crimsondawn45/fabricshieldlib/mixin/LivingEntityMixin.java @@ -77,7 +77,7 @@ private boolean instanceOfShieldItem(boolean isVanillaShieldClass) { @ModifyExpressionValue( allow = 1, require = 1, - method = "blockedByShield(Lnet/minecraft/entity/damage/DamageSource;)V", + method = "blockedByShield(Lnet/minecraft/entity/damage/DamageSource;)Z", at = @At(value = "INVOKE", target = "Lnet/minecraft/item/ItemStack;getItem()Lnet/minecraft/item/Item;") ) private Item instanceOfShieldItem(Item item) { diff --git a/src/main/generated/data/fabricshieldlib/enchantment/reflect.json b/src/main/resources/data/fabricshieldlib/enchantment/reflect.json similarity index 100% rename from src/main/generated/data/fabricshieldlib/enchantment/reflect.json rename to src/main/resources/data/fabricshieldlib/enchantment/reflect.json diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index 13ba076..9d01fd1 100644 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -9,9 +9,9 @@ "CrimsonDawn45" ], "contributors":[ - "Rikka0w0", "LegibleSleet827", "CringeStar", + "Rikka0w0", "RDKRACZ", "Jamalam360", "NLxDodge", @@ -58,8 +58,8 @@ ], "depends": { "fabricloader": ">=0.14.8", - "fabric": "*", - "minecraft": ">=1.20.5", + "fabric-api": "*", + "minecraft": ">=1.21.2", "java": ">=17", "mm":">=2.3" }