Add viral taters

Author: haykam821

src/main/java/xyz/nucleoid/extras/lobby/NEBlocks.java

@@ -145,6 +145,7 @@ public class NEBlocks {
     }, "ewogICJ0aW1lc3RhbXAiIDogMTY0MDYyMDQyODY1MiwKICAicHJvZmlsZUlkIiA6ICJmODJmNTQ1MDIzZDA0MTFkYmVlYzU4YWI4Y2JlMTNjNyIsCiAgInByb2ZpbGVOYW1lIiA6ICJSZXNwb25kZW50cyIsCiAgInNpZ25hdHVyZVJlcXVpcmVkIiA6IHRydWUsCiAgInRleHR1cmVzIiA6IHsKICAgICJTS0lOIiA6IHsKICAgICAgInVybCIgOiAiaHR0cDovL3RleHR1cmVzLm1pbmVjcmFmdC5uZXQvdGV4dHVyZS8zMmI3Y2QyYzVkNzBjYWI0NzZjZTk1MWUyYzUyMGM5YjM1NzkyNTBhZDkwMDE2NGQ2YzIzMjFjN2Y0M2Q2ZGM3IiwKICAgICAgIm1ldGFkYXRhIiA6IHsKICAgICAgICAibW9kZWwiIDogInNsaW0iCiAgICAgIH0KICAgIH0KICB9Cn0=");
 
     public static final Block WARDEN_TATER = createWardenTaterBlock("ewogICJ0aW1lc3RhbXAiIDogMTY0MDgxMTgxMjYwNCwKICAicHJvZmlsZUlkIiA6ICJkODAwZDI4MDlmNTE0ZjkxODk4YTU4MWYzODE0Yzc5OSIsCiAgInByb2ZpbGVOYW1lIiA6ICJ0aGVCTFJ4eCIsCiAgInNpZ25hdHVyZVJlcXVpcmVkIiA6IHRydWUsCiAgInRleHR1cmVzIiA6IHsKICAgICJTS0lOIiA6IHsKICAgICAgInVybCIgOiAiaHR0cDovL3RleHR1cmVzLm1pbmVjcmFmdC5uZXQvdGV4dHVyZS81MmU0MTFhYTE1MDFjNzJkOTlkNzM4Y2IzOGUyNTBhMzk1YzY2MDRiOGJjY2M5ZjI5ZDdmMjZlOWNhY2Q4ZDZmIiwKICAgICAgIm1ldGFkYXRhIiA6IHsKICAgICAgICAibW9kZWwiIDogInNsaW0iCiAgICAgIH0KICAgIH0KICB9Cn0=");
+    public static final Block VIRAL_TATER = createTaterBlock(ParticleTypes.SCRAPE, "ewogICJ0aW1lc3RhbXAiIDogMTY2MjEyODQxMTQ5NCwKICAicHJvZmlsZUlkIiA6ICIyNDEzZGZhMzk0NGQ0NDZhYTFiZjY3N2YwOThiNzhlZiIsCiAgInByb2ZpbGVOYW1lIiA6ICJBenp6dXJhIiwKICAic2lnbmF0dXJlUmVxdWlyZWQiIDogdHJ1ZSwKICAidGV4dHVyZXMiIDogewogICAgIlNLSU4iIDogewogICAgICAidXJsIiA6ICJodHRwOi8vdGV4dHVyZXMubWluZWNyYWZ0Lm5ldC90ZXh0dXJlL2IxMmY3NzBjNDU0MmM5ZjI2YmEwM2FhZWU2ODZlMDk0NjY5OGQzOTRhOGU3NDVkM2VhYzYwMTMzODNkY2ZmMjkiLAogICAgICAibWV0YWRhdGEiIDogewogICAgICAgICJtb2RlbCIgOiAic2xpbSIKICAgICAgfQogICAgfQogIH0KfQ");
     public static final Block DICE_TATER = createDiceTaterBlock();
     public static final Block TATEROID = createTateroidBlock(SoundEvents.BLOCK_NOTE_BLOCK_BELL, "ewogICJ0aW1lc3RhbXAiIDogMTYzNDQ5MjYzNjAzNiwKICAicHJvZmlsZUlkIiA6ICI2MDBjMDE4YmM4ZmM0NGQ1YWJkYjUyODc5ZGUyY2Q0MSIsCiAgInByb2ZpbGVOYW1lIiA6ICJzb2NrZnJpZW5kcyIsCiAgInNpZ25hdHVyZVJlcXVpcmVkIiA6IHRydWUsCiAgInRleHR1cmVzIiA6IHsKICAgICJTS0lOIiA6IHsKICAgICAgInVybCIgOiAiaHR0cDovL3RleHR1cmVzLm1pbmVjcmFmdC5uZXQvdGV4dHVyZS84ZDUzMWQ0MGQwOWVmZDNhOWE1ODViNTVlNjZhOWE2ZjA0YzczYWY4NGQ5NGQ3YzU2NTU0OWJmMjdiOGIyNmJkIiwKICAgICAgIm1ldGFkYXRhIiA6IHsKICAgICAgICAibW9kZWwiIDogInNsaW0iCiAgICAgIH0KICAgIH0KICB9Cn0=");
     public static final Block RED_TATEROID = createTateroidBlock(SoundEvents.BLOCK_NOTE_BLOCK_GUITAR, "ewogICJ0aW1lc3RhbXAiIDogMTYzNDU2OTEyODY5NywKICAicHJvZmlsZUlkIiA6ICI2MDBjMDE4YmM4ZmM0NGQ1YWJkYjUyODc5ZGUyY2Q0MSIsCiAgInByb2ZpbGVOYW1lIiA6ICJzb2NrZnJpZW5kcyIsCiAgInNpZ25hdHVyZVJlcXVpcmVkIiA6IHRydWUsCiAgInRleHR1cmVzIiA6IHsKICAgICJTS0lOIiA6IHsKICAgICAgInVybCIgOiAiaHR0cDovL3RleHR1cmVzLm1pbmVjcmFmdC5uZXQvdGV4dHVyZS8yYmU1MWIyMjczNjBhYjY1Nzc2NzI1YTkxY2RlZDg0YjU2ZjY5MjBlZWMwZDZmYjVhNTdkNWYxYWRhMTQ3YWE2IiwKICAgICAgIm1ldGFkYXRhIiA6IHsKICAgICAgICAibW9kZWwiIDogInNsaW0iCiAgICAgIH0KICAgIH0KICB9Cn0=");
@@ -524,6 +525,7 @@ public static void register() {
         register("demisexual_tater", DEMISEXUAL_TATER);
 
         register("warden_tater", WARDEN_TATER);
+        register("viral_tater", VIRAL_TATER);
         register("dice_tater", DICE_TATER);
         register("tateroid", TATEROID);
         register("red_tateroid", RED_TATEROID);

src/main/java/xyz/nucleoid/extras/lobby/NEItems.java

@@ -2,16 +2,24 @@
 
 import eu.pb4.polymer.api.block.PolymerHeadBlock;
 import eu.pb4.polymer.api.item.PolymerItemGroup;
+import net.fabricmc.fabric.api.event.player.UseEntityCallback;
 import net.fabricmc.fabric.api.networking.v1.PacketSender;
 import net.fabricmc.fabric.api.networking.v1.ServerPlayConnectionEvents;
 import net.minecraft.block.Block;
+import net.minecraft.entity.Entity;
+import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import net.minecraft.item.Items;
 import net.minecraft.server.MinecraftServer;
 import net.minecraft.server.network.ServerPlayNetworkHandler;
 import net.minecraft.text.Text;
+import net.minecraft.util.ActionResult;
+import net.minecraft.util.Hand;
+import net.minecraft.util.hit.EntityHitResult;
+import net.minecraft.util.math.Vec3d;
 import net.minecraft.util.registry.Registry;
+import net.minecraft.world.World;
 import xyz.nucleoid.extras.NucleoidExtras;
 import xyz.nucleoid.extras.NucleoidExtrasConfig;
 import xyz.nucleoid.extras.lobby.item.*;
@@ -80,6 +88,7 @@ public class NEItems {
     public static final Item NONBINARY_TATER = createHead(NEBlocks.NONBINARY_TATER);
     public static final Item PAN_TATER = createHead(NEBlocks.PAN_TATER);
     public static final Item WARDEN_TATER = createHead(NEBlocks.WARDEN_TATER);
+    public static final Item VIRAL_TATER = createHead(NEBlocks.VIRAL_TATER);
     public static final Item TATEROID = createHead(NEBlocks.TATEROID);
     public static final Item RED_TATEROID = createHead(NEBlocks.RED_TATEROID);
     public static final Item ORANGE_TATEROID = createHead(NEBlocks.ORANGE_TATEROID);
@@ -405,6 +414,7 @@ public static void register() {
         register("nonbinary_tater", NONBINARY_TATER);
         register("pan_tater", PAN_TATER);
         register("warden_tater", WARDEN_TATER);
+        register("viral_tater", VIRAL_TATER);
         register("tateroid", TATEROID);
         register("red_tateroid", RED_TATEROID);
         register("orange_tateroid", ORANGE_TATEROID);
@@ -666,6 +676,8 @@ public static void register() {
 
         ServerPlayConnectionEvents.JOIN.register(NEItems::onPlayerJoin);
 
+        UseEntityCallback.EVENT.register(NEItems::onUseEntity);
+
         ITEM_GROUP.setIcon(NUCLEOID_LOGO.getDefaultStack());
     }
 
@@ -699,6 +711,20 @@ private static void onPlayerJoin(ServerPlayNetworkHandler handler, PacketSender
         });
     }
 
+    private static ActionResult onUseEntity(PlayerEntity player, World world, Hand hand, Entity entity, EntityHitResult hitResult) {
+        if (!player.getWorld().isClient() && hitResult != null) {
+            ItemStack stack = player.getStackInHand(hand);
+            if (stack.getItem() instanceof TaterBoxItem taterBox) {
+                Vec3d hitPos = hitResult.getPos().subtract(entity.getPos());
+                ActionResult result = taterBox.tryAdd(entity, hitPos, stack, player);
+
+                return result.isAccepted() ? result : ActionResult.FAIL;
+            }
+        }
+
+        return ActionResult.PASS;
+    }
+
     private static <T extends Item> T register(String id, T item) {
         return Registry.register(Registry.ITEM, NucleoidExtras.identifier(id), item);
     }

src/main/java/xyz/nucleoid/extras/lobby/item/TaterBoxItem.java

@@ -34,6 +34,7 @@
 import net.minecraft.nbt.NbtList;
 import net.minecraft.nbt.NbtString;
 import net.minecraft.server.network.ServerPlayerEntity;
+import net.minecraft.tag.TagKey;
 import net.minecraft.text.MutableText;
 import net.minecraft.text.Text;
 import net.minecraft.util.ActionResult;
@@ -51,6 +52,7 @@
 import net.minecraft.world.World;
 
 import org.jetbrains.annotations.Nullable;
+import xyz.nucleoid.extras.NucleoidExtras;
 import xyz.nucleoid.extras.lobby.NECriteria;
 import xyz.nucleoid.extras.lobby.NEItems;
 import xyz.nucleoid.extras.lobby.block.TinyPotatoBlock;
@@ -66,6 +68,9 @@ public class TaterBoxItem extends ArmorItem implements PolymerItem {
     private static final String SELECTED_TATER_KEY = "SelectedTater";
     private static final int COLOR = 0xCEADAA;
 
+    private static final Identifier VIRAL_TATERS_ID = NucleoidExtras.identifier("viral_taters");
+    private static final TagKey<Block> VIRAL_TATERS = TagKey.of(Registry.BLOCK_KEY, VIRAL_TATERS_ID);
+
     public TaterBoxItem(Settings settings) {
         super(ArmorMaterials.LEATHER, EquipmentSlot.HEAD, settings);
     }
@@ -192,6 +197,16 @@ public ActionResult tryAdd(Entity entity, Vec3d hitPos, ItemStack stack, PlayerE
         if (entity instanceof ArmorStandEntity armorStand) {
             EquipmentSlot slot = ((ArmorStandEntityAccessor) (Object) armorStand).callSlotFromPosition(hitPos);
             return this.tryAdd(armorStand.getEquippedStack(slot), stack, player);
+        } else if (entity instanceof PlayerEntity targetPlayer) {
+            ItemStack targetStack = targetPlayer.getEquippedStack(EquipmentSlot.HEAD);
+            
+            if (targetStack.getItem() instanceof TaterBoxItem) {
+                Block targetTater = TaterBoxItem.getSelectedTater(targetStack);
+
+                if (targetTater != null && targetTater.getDefaultState().isIn(VIRAL_TATERS)) {
+                    return this.tryAdd(targetTater, stack, player);
+                }
+            }
         }
 
         return ActionResult.PASS;

src/main/java/xyz/nucleoid/extras/mixin/lobby/ArmorStandEntityMixin.java

@@ -73,6 +73,7 @@
   "block.nucleoid_extras.genderfluid_tater": "Genderfluid Pride Tater",
   "block.nucleoid_extras.demisexual_tater": "Demisexual Pride Tater",
   "block.nucleoid_extras.warden_tater": "Warden Tater",
+  "block.nucleoid_extras.viral_tater": "Viral Tater",
   "block.nucleoid_extras.tateroid": "Tateroid",
   "block.nucleoid_extras.red_tateroid": "Red Tateroid",
   "block.nucleoid_extras.orange_tateroid": "Orange Tateroid",

src/main/resources/data/nucleoid_extras/lang/en_us.json

@@ -0,0 +1,5 @@
+{
+  "values": [
+    "nucleoid_extras:viral_tater"
+  ]
+}

src/main/resources/data/nucleoid_extras/tags/blocks/viral_taters.json

@@ -9,7 +9,6 @@
     "ServerEntityManagerAccessor",
     "ServerWorldAccessor",
     "lobby.ArmorStandEntityAccessor",
-    "lobby.ArmorStandEntityMixin",
     "lobby.ServerPlayerEntityMixin",
     "patches.EntityMixin",
     "patches.StatusEffectMixin",