diff --git a/.gitignore b/.gitignore index d4865f3..daf16bc 100644 --- a/.gitignore +++ b/.gitignore @@ -24,3 +24,4 @@ # Specific files Thumbs.db +.DS_Store diff --git a/gradle.properties b/gradle.properties index d7d9b32..2849624 100644 --- a/gradle.properties +++ b/gradle.properties @@ -3,9 +3,13 @@ package_group=info.tehnut.soulbound mod_version=1.1.1 curse_id=321602 -mc_version=1.16.1 -mappings_version=9 -loader_version=0.8.8+build.202 -api_version=0.14.0+build.371-1.16 +mc_version=1.16.4 +mappings_version=7 +api_version=0.27.1+1.16 -trinkets_version=2.6.1 \ No newline at end of file +trinkets_version=2.6.1 + +loader_version=0.10.8 + +#Fabric api +fabric_version=0.27.1+1.16 diff --git a/gradlew b/gradlew old mode 100644 new mode 100755 diff --git a/src/main/java/info/tehnut/soulbound/EnchantmentSoulbound.java b/src/main/java/info/tehnut/soulbound/EnchantmentSoulbound.java index 20f54d1..49d62ad 100644 --- a/src/main/java/info/tehnut/soulbound/EnchantmentSoulbound.java +++ b/src/main/java/info/tehnut/soulbound/EnchantmentSoulbound.java @@ -10,7 +10,7 @@ public class EnchantmentSoulbound extends Enchantment { public EnchantmentSoulbound() { // Anybody who directly checks the target field is bad - super(Rarity.VERY_RARE, EnchantmentTarget.BREAKABLE, EquipmentSlot.values()); + super(Rarity.RARE, EnchantmentTarget.BREAKABLE, EquipmentSlot.values()); } @Override diff --git a/src/main/java/info/tehnut/soulbound/core/mixin/MixinPlayerManager.java b/src/main/java/info/tehnut/soulbound/core/mixin/MixinPlayerManager.java index 8b8ee1c..9446cd2 100644 --- a/src/main/java/info/tehnut/soulbound/core/mixin/MixinPlayerManager.java +++ b/src/main/java/info/tehnut/soulbound/core/mixin/MixinPlayerManager.java @@ -11,6 +11,7 @@ import net.minecraft.server.PlayerManager; import net.minecraft.server.network.ServerPlayerEntity; import net.minecraft.server.network.ServerPlayerInteractionManager; +import net.minecraft.server.network.ServerPlayNetworkHandler; import net.minecraft.server.world.ServerWorld; import net.minecraft.util.math.BlockPos; import net.minecraft.world.dimension.DimensionType; @@ -33,8 +34,8 @@ public class MixinPlayerManager { @Final private MinecraftServer server; - @Inject(method = "respawnPlayer", at = @At(value = "INVOKE", target = "Lnet/minecraft/server/network/ServerPlayerEntity;setMainArm(Lnet/minecraft/util/Arm;)V"), locals = LocalCapture.CAPTURE_FAILEXCEPTION) - private void soulbound$respawnPlayer(ServerPlayerEntity oldPlayer, boolean dimensionChange, CallbackInfoReturnable callback, BlockPos blockPos, boolean forcedSpawn, ServerWorld oldWorld, Optional optional, ServerPlayerInteractionManager interactionManager, ServerWorld newWorld, ServerPlayerEntity newPlayer) { + @Inject(method = "respawnPlayer", at = @At(value = "INVOKE", target = "Lnet/minecraft/server/network/ServerPlayerEntity;setMainArm(Lnet/minecraft/util/Arm;)V"), locals = LocalCapture.CAPTURE_FAILHARD) + private void soulbound$respawnPlayer(ServerPlayerEntity oldPlayer, boolean dimensionChange, CallbackInfoReturnable callback, BlockPos blockPos, float hello, boolean forcedSpawn, ServerWorld oldWorld, Optional optional, ServerPlayerInteractionManager interactionManager, ServerWorld newWorld, ServerPlayerEntity newPlayer) { if (dimensionChange) return;