1.0.3-rc2 - fix: ender eggs being able to be placed - fix: item frames staying glowing after taking out special item

gradle.properties

···
 fabric_kotlin_version=1.13.4+kotlin.2.2.0
 
 # Mod Properties
-mod_version=1.0.3-rc1
+mod_version=1.0.3-rc2
 maven_group=net.radsteve.islanders
 archives_base_name=islanders-smp
 

src/main/java/net/radsteve/islanders/mixin/AbstractDecorationEntityMixin.java

···
+package net.radsteve.islanders.mixin;
+
+import com.llamalad7.mixinextras.sugar.Local;
+import net.minecraft.entity.ItemEntity;
+import net.minecraft.entity.decoration.AbstractDecorationEntity;
+import net.minecraft.item.ItemStack;
+import net.minecraft.server.world.ServerWorld;
+import net.radsteve.islanders.SpecialItem;
+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(AbstractDecorationEntity.class)
+public class AbstractDecorationEntityMixin {
+  @Inject(method = "dropStack", at = @At(value = "INVOKE", target = "Lnet/minecraft/world/World;spawnEntity(Lnet/minecraft/entity/Entity;)Z"))
+  private void islanders$dropStack(ServerWorld world, ItemStack stack, float yOffset, CallbackInfoReturnable<ItemEntity> cir, @Local ItemEntity entity) {
+    final SpecialItem item = SpecialItem.Companion.find(stack);
+    if (item == null) {
+      return;
+    }
+
+    entity.getWorld().getScoreboard().addScoreHolderToTeam(entity.getNameForScoreboard(), item.getTeam());
+    entity.setGlowing(true);
+  }
+}

src/main/java/net/radsteve/islanders/mixin/AnvilScreenHandlerMixin.java

···
 public class AnvilScreenHandlerMixin {
   @Inject(method = "onTakeOutput", at = @At("HEAD"), cancellable = true)
   private void islanders$onTakeOutput(PlayerEntity player, ItemStack stack, CallbackInfo ci) {
-    if (stack.getItem().equals(Items.POPPED_CHORUS_FRUIT) || stack.getItem().equals(Items.MACE)) {
+    if (stack.isOf(Items.POPPED_CHORUS_FRUIT) || stack.isOf(Items.MACE)) {
       ci.cancel();
     }
   }

src/main/java/net/radsteve/islanders/mixin/BlockItemMixin.java

···
 public class BlockItemMixin {
   @WrapMethod(method = "getPlacementState")
   private BlockState islanders$getPlacementState(ItemPlacementContext context, Operation<BlockState> original) {
-    if (context.getStack().getItem().equals(Items.DRAGON_EGG)) {
-      return null;
-    } else {
+//    if (context.getStack().getItem().equals(Items.DRAGON_EGG)) {
+//      return null;
+//    } else {
       return original.call(context);
-    }
+//    }
   }
 }

src/main/java/net/radsteve/islanders/mixin/DecoratedPotBlockMixin.java

···
       return;
     }
 
-    cir.cancel();
+    cir.setReturnValue(ActionResult.FAIL);
   }
 }

src/main/java/net/radsteve/islanders/mixin/ItemFrameEntityMixin.java

···
 package net.radsteve.islanders.mixin;
 
 import net.minecraft.entity.Entity;
-import net.minecraft.entity.LivingEntity;
 import net.minecraft.entity.damage.DamageSource;
 import net.minecraft.entity.decoration.ItemFrameEntity;
 import net.minecraft.entity.player.PlayerEntity;
···
     }
 
     entity.setGlowing(false);
-    item.pickedUp((ServerPlayerEntity) source.getAttacker());
   }
 }

src/main/java/net/radsteve/islanders/mixin/ItemPlacementContextMixin.java

···
-package net.radsteve.islanders.mixin;
-
-import com.llamalad7.mixinextras.injector.wrapmethod.WrapMethod;
-import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
-import net.minecraft.item.ItemPlacementContext;
-import net.minecraft.item.ItemUsageContext;
-import net.minecraft.item.Items;
-import org.spongepowered.asm.mixin.Mixin;
-
-@Mixin(ItemPlacementContext.class)
-public class ItemPlacementContextMixin {
-  @WrapMethod(method = "canPlace")
-  private boolean islanders$canPlace(Operation<Boolean> original) {
-//    if (ItemUsageContext.class.cast(this).getStack().getItem().equals(Items.DRAGON_EGG)) {
-//      return false;
-//    } else {
-      return original.call();
-//    }
-  }
-}

src/main/java/net/radsteve/islanders/mixin/PlayerEntityMixin.java

···
 import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.entity.player.PlayerInventory;
 import net.minecraft.item.ItemStack;
-import net.minecraft.item.Items;
 import net.minecraft.scoreboard.Scoreboard;
 import net.minecraft.server.world.ServerWorld;
-import net.minecraft.util.math.BlockPos;
-import net.minecraft.util.math.Direction;
 import net.radsteve.islanders.Islanders;
 import net.radsteve.islanders.ItemEffects;
 import net.radsteve.islanders.SpecialItem;
···
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
-import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
 
 @Mixin(PlayerEntity.class)
 public abstract class PlayerEntityMixin {
···
         getScoreboard().removeScoreHolderFromTeam(getNameForScoreboard(), item.getTeam());
       }
     });
-  }
-
-  @Inject(method = "canPlaceOn", at = @At("HEAD"), cancellable = true)
-  private void islanders$canPlaceOn(BlockPos pos, Direction facing, ItemStack stack, CallbackInfoReturnable<Boolean> cir) {
-    if (stack.getItem().equals(Items.DRAGON_EGG)) {
-      cir.setReturnValue(false);
-    }
   }
 }

src/main/java/net/radsteve/islanders/mixin/ServerPlayerInteractionManagerMixin.java

···
-package net.radsteve.islanders.mixin;
-
-import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
-import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation;
-import net.minecraft.item.ItemStack;
-import net.minecraft.item.ItemUsageContext;
-import net.minecraft.item.Items;
-import net.minecraft.server.network.ServerPlayerEntity;
-import net.minecraft.server.network.ServerPlayerInteractionManager;
-import net.minecraft.util.ActionResult;
-import net.minecraft.util.Hand;
-import net.minecraft.util.hit.BlockHitResult;
-import net.minecraft.world.World;
-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(ServerPlayerInteractionManager.class)
-public class ServerPlayerInteractionManagerMixin {
-  @Inject(method = "interactBlock", at = @At(value = "INVOKE", target = "Lnet/minecraft/item/ItemStack;useOnBlock(Lnet/minecraft/item/ItemUsageContext;)Lnet/minecraft/util/ActionResult;", ordinal = 1), cancellable = true)
-  private void islanders$interactBlock(ServerPlayerEntity player, World world, ItemStack stack, Hand hand, BlockHitResult hitResult, CallbackInfoReturnable<ActionResult> cir) {
-//    if (stack.getItem().equals(Items.DRAGON_EGG)) {
-//      cir.setReturnValue(ActionResult.FAIL);
-//    }
-  }
-}

src/main/kotlin/net/radsteve/islanders/Helpers.kt

···
 
 import net.minecraft.component.DataComponentTypes
 import net.minecraft.component.type.LoreComponent
+import net.minecraft.component.type.TooltipDisplayComponent
 import net.minecraft.enchantment.Enchantment
 import net.minecraft.item.ItemStack
 import net.minecraft.registry.RegistryKey
···
 
 public fun ItemStack.withName(name: MutableText): ItemStack {
   set(DataComponentTypes.CUSTOM_NAME, name.styled { style -> style.withItalic(false) })
+  return this
+}
+
+public fun ItemStack.withHideEnchantments(): ItemStack {
+  set(DataComponentTypes.TOOLTIP_DISPLAY, TooltipDisplayComponent(false, LinkedHashSet(setOf(DataComponentTypes.ENCHANTMENTS))))
   return this
 }
 

src/main/kotlin/net/radsteve/islanders/Islanders.kt

···
 import net.fabricmc.fabric.api.command.v2.CommandRegistrationCallback
 import net.fabricmc.fabric.api.event.lifecycle.v1.ServerLifecycleEvents
 import net.fabricmc.fabric.api.event.lifecycle.v1.ServerTickEvents
+import net.fabricmc.fabric.api.event.player.UseBlockCallback
+import net.fabricmc.fabric.api.event.player.UseItemCallback
 import net.mcbrawls.scheduler.AbsoluteScheduler
 import net.mcbrawls.scheduler.Scheduler
+import net.mcbrawls.scheduler.duration.TickDuration.ticks
+import net.minecraft.entity.player.PlayerEntity
+import net.minecraft.item.Items
 import net.minecraft.server.MinecraftServer
+import net.minecraft.util.ActionResult
+import net.minecraft.util.Hand
+import net.minecraft.util.hit.BlockHitResult
+import net.minecraft.world.World
 import net.radsteve.islanders.command.animationCommand
 import net.radsteve.islanders.crown.CrownAnimation
 import net.radsteve.islanders.mace.MaceAnimation
···
 import org.slf4j.Logger
 import org.slf4j.LoggerFactory
 
-public object Islanders : ModInitializer, ServerTickEvents.EndTick {
+public object Islanders : ModInitializer, ServerTickEvents.EndTick, UseBlockCallback {
   @JvmStatic
   public val logger: Logger = LoggerFactory.getLogger("islanders")
   public lateinit var server: MinecraftServer
···
     ServerLifecycleEvents.SERVER_STARTED.register { server -> Islanders.server = server }
 
     ServerTickEvents.END_SERVER_TICK.register(this)
+    UseBlockCallback.EVENT.register(this)
 
     RuleHandlers
     ItemEffects
···
 
   override fun onEndTick(server: MinecraftServer) {
     scheduler.processTick()
+  }
+
+  override fun interact(player: PlayerEntity, world: World, hand: Hand, hitResult: BlockHitResult): ActionResult {
+    return if (player.getStackInHand(hand).isOf(Items.DRAGON_EGG)) {
+      scheduler.schedule(1.ticks) {
+        player.playerScreenHandler.syncState() // thank you ebic
+      }
+      ActionResult.FAIL
+    } else {
+      ActionResult.PASS
+    }
   }
 }

src/main/kotlin/net/radsteve/islanders/SpecialItem.kt

···
   }
 
   public fun decorateItemStack(itemStack: ItemStack): ItemStack {
+    val effectLines = listOf(
+      Text.literal("Effect:").formatted(Formatting.GRAY),
+      Text.literal("  $description").formatted(color)
+    )
+    val lines = if (this != DragonEgg) {
+      listOf(Text.empty()) + effectLines // cursed
+    } else {
+      effectLines
+    }
+
     return itemStack
       .withName(Text.literal(displayName).formatted(color))
-      .withLore(
-        Text.literal("Effect:").formatted(Formatting.GRAY),
-        Text.literal("  $description").formatted(color)
-      )
+      .withLore(*lines.toTypedArray())
   }
 
   public companion object {

src/main/resources/islanders.mixins.json

···
     "CraftingScreenHandlerAccessor",
     "CraftingScreenHandlerMixin",
     "DecoratedPotBlockMixin",
+    "AbstractDecorationEntityMixin",
     "GrindstoneScreenHandlerMixin",
     "HopperBlockEntityMixin",
     "ItemEntityMixin",
     "ItemFrameEntityMixin",
-    "ItemPlacementContextMixin",
     "ItemStackMixin",
     "LivingEntityAccessor",
     "LivingEntityMixin",
···
     "PlayerInventoryAccessor",
     "PlayerInventoryMixin",
     "ScreenHandlerMixin",
-    "ServerPlayerInteractionManagerMixin",
     "ShapelessRecipeAccessor"
   ],
   "injectors": {