Skip to content
This repository was archived by the owner on May 13, 2021. It is now read-only.

Fix soulbound and update to 1.16.4/1.16.5 #8

Closed
Ninja202 wants to merge 1 commit into from
Closed

Fix soulbound and update to 1.16.4/1.16.5 #8

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,3 +24,4 @@

# Specific files
Thumbs.db
.DS_Store
14 changes: 9 additions & 5 deletions gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
trinkets_version=2.6.1

loader_version=0.10.8

#Fabric api
fabric_version=0.27.1+1.16
Empty file modified gradlew
100644 → 100755
View file
Open in desktop
Empty file.
2 changes: 1 addition & 1 deletion src/main/java/info/tehnut/soulbound/EnchantmentSoulbound.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
5 changes: 3 additions & 2 deletions src/main/java/info/tehnut/soulbound/core/mixin/MixinPlayerManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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<ServerPlayerEntity> 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<ServerPlayerEntity> callback, BlockPos blockPos, float hello, boolean forcedSpawn, ServerWorld oldWorld, Optional optional, ServerPlayerInteractionManager interactionManager, ServerWorld newWorld, ServerPlayerEntity newPlayer) {
if (dimensionChange)
return;

Expand Down