soulbound tags

Author: cassiancc

gradle.properties

@@ -4,7 +4,7 @@ loom.platform = forge
 org.gradle.vfs.watch=true
 
 # Mod properties
-mod_version = 1.11-pre2
+mod_version = 1.11-pre3
 maven_group = cc.cassian.raspberry
 archives_name = raspberry_core
 

src/main/java/cc/cassian/raspberry/mixin/RaspberryMixinPlugin.java

@@ -34,6 +34,9 @@ else if (checkMixin("architects_palette", mixinClassName)){
         else if (checkMixin("aquaculture", mixinClassName)){
             return false;
         }
+        else if (checkMixin("buzzier_bees", mixinClassName)){
+            return false;
+        }
         else if (checkMixin("brewinandchewin", mixinClassName)){
             return false;
         }
@@ -64,6 +67,9 @@ else if (checkMixin("dynamiccrosshair", mixinClassName)){
         else if (checkMixin("endergetic", mixinClassName)){
             return false;
         }
+        else if (checkMixin("ensorcellation", mixinClassName)){
+            return false;
+        }
         else if (checkMixin("emi", mixinClassName)){
             return false;
         }

src/main/java/cc/cassian/raspberry/mixin/ensorcellation/SoulboundEnchantmentMixin.java

@@ -0,0 +1,22 @@
+package cc.cassian.raspberry.mixin.ensorcellation;
+
+import cc.cassian.raspberry.registry.RaspberryTags;
+import cofh.ensorcellation.enchantment.SoulboundEnchantment;
+import cofh.lib.enchantment.EnchantmentCoFH;
+import net.minecraft.world.item.ItemStack;
+import net.minecraft.world.item.enchantment.Enchantment;
+import net.minecraft.world.item.enchantment.EnchantmentCategory;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
+
+@Mixin(EnchantmentCoFH.class)
+public class SoulboundEnchantmentMixin {
+    @Inject(method = "canApplyAtEnchantingTable", remap = false, at = @At(value = "HEAD"), cancellable = true)
+    private void mixin(ItemStack stack, CallbackInfoReturnable<Boolean> cir) {
+        var enchantment = (EnchantmentCoFH) (Object) this;
+        if (enchantment instanceof SoulboundEnchantment && stack.is(RaspberryTags.ENCHANTABLE_SOULBOUND))
+            cir.setReturnValue(true);
+    }
+}

src/main/java/cc/cassian/raspberry/mixin/ensorcellation/SoulboundEventsMixin.java

@@ -11,7 +11,7 @@
 public class SoulboundEventsMixin {
 	@Inject(
 			method = "handlePlayerCloneEvent", remap = false, at = @At(value = "HEAD"), cancellable = true)
-	private static void raspberry$disableCuring(PlayerEvent.Clone event, CallbackInfo ci) {
+	private static void raspberry$disableDuping(PlayerEvent.Clone event, CallbackInfo ci) {
 		ci.cancel();
 	}
 }

src/main/java/cc/cassian/raspberry/registry/RaspberryTags.java

@@ -17,6 +17,7 @@ public class RaspberryTags {
 
     public static final TagKey<Item> ENCHANTABLE_WEAPON = createItemTag("enchantable/weapon");
     public static final TagKey<Item> ENCHANTABLE_HEARTFELT = createItemTag("enchantable/heartfelt");
+    public static final TagKey<Item> ENCHANTABLE_SOULBOUND = createItemTag("enchantable/soulbound");
 
     public static final TagKey<Item> COPPER_ARMOR = createItemTag("copper_armor");
 

src/main/resources/data/raspberry/tags/items/enchantable/soulbound.json

@@ -0,0 +1,17 @@
+{
+  "values": [
+    "#forge:armors",
+    "#forge:tools",
+    "minecraft:elytra",
+    "minecraft:shield",
+    "minecraft:bow",
+    "minecraft:crossbow",
+    "minecraft:trident",
+    "minecraft:flint_and_steel",
+    "minecraft:shears",
+    "minecraft:brush",
+    "minecraft:fishing_rod",
+    "minecraft:carrot_on_a_stick",
+    "minecraft:warped_fungus_on_a_stick"
+  ]
+}

src/main/resources/raspberry.mixins.json

@@ -64,6 +64,7 @@
     "emi.EmiRecipesMixin",
     "endergetic.EnderWallTorchMixin",
     "endermanoverhaul.ReplacedEndermanMixin",
+    "ensorcellation.SoulboundEnchantmentMixin",
     "ensorcellation.SoulboundEventsMixin",
     "environmental.AbstractSkeletonMixin",
     "environmental.ArmorItemMixin",