From 097803020c26346cba99a949157939fcef69ade8 Mon Sep 17 00:00:00 2001
From: Flanks255 <32142731+Flanks255@users.noreply.github.com>
Date: Fri, 12 May 2023 21:20:26 -0500
Subject: [PATCH] Fixed worms.

---
 .../actuallyadditions/mod/ActuallyAdditions.java     |  2 ++
 .../actuallyadditions/mod/items/ItemWorm.java        | 12 ++----------
 .../assets/actuallyadditions/lang/en_us.json         |  2 +-
 3 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/ActuallyAdditions.java b/src/main/java/de/ellpeck/actuallyadditions/mod/ActuallyAdditions.java
index c24cfcd68..3cd865d02 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/mod/ActuallyAdditions.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/mod/ActuallyAdditions.java
@@ -26,6 +26,7 @@ import de.ellpeck.actuallyadditions.mod.fluids.InitFluids;
 import de.ellpeck.actuallyadditions.mod.inventory.ActuallyContainers;
 import de.ellpeck.actuallyadditions.mod.items.ActuallyItems;
 import de.ellpeck.actuallyadditions.mod.items.ItemCoffee;
+import de.ellpeck.actuallyadditions.mod.items.ItemWorm;
 import de.ellpeck.actuallyadditions.mod.misc.BannerHelper;
 import de.ellpeck.actuallyadditions.mod.misc.DungeonLoot;
 import de.ellpeck.actuallyadditions.mod.misc.apiimpl.LaserRelayConnectionHandler;
@@ -108,6 +109,7 @@ public class ActuallyAdditions {
         MinecraftForge.EVENT_BUS.register(new CommonEvents());
         MinecraftForge.EVENT_BUS.register(new DungeonLoot());
         MinecraftForge.EVENT_BUS.addListener(ActuallyAdditions::reloadEvent);
+        MinecraftForge.EVENT_BUS.addListener(ItemWorm::onHoe);
         InitFluids.init(eventBus);
 
         eventBus.addListener(this::setup);
diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemWorm.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemWorm.java
index e9120baa6..8762ab727 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemWorm.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemWorm.java
@@ -17,21 +17,14 @@ import de.ellpeck.actuallyadditions.mod.items.base.ItemBase;
 import net.minecraft.block.BlockState;
 import net.minecraft.block.Blocks;
 import net.minecraft.entity.item.ItemEntity;
-import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.item.ItemStack;
 import net.minecraft.item.ItemUseContext;
-import net.minecraft.util.ActionResult;
 import net.minecraft.util.ActionResultType;
-import net.minecraft.util.Hand;
-import net.minecraft.util.Util;
 import net.minecraft.util.math.AxisAlignedBB;
 import net.minecraft.util.math.BlockPos;
-import net.minecraft.util.text.StringTextComponent;
 import net.minecraft.world.World;
 import net.minecraftforge.event.entity.player.UseHoeEvent;
 import net.minecraftforge.eventbus.api.Event;
-import net.minecraftforge.eventbus.api.EventPriority;
-import net.minecraftforge.eventbus.api.SubscribeEvent;
 
 import java.util.List;
 
@@ -64,15 +57,14 @@ public class ItemWorm extends ItemBase {
         return super.useOn(context);
     }
 
-    @SubscribeEvent(priority = EventPriority.LOW)
-    public void onHoe(UseHoeEvent event) {
+    public static void onHoe(UseHoeEvent event) {
         if (CommonConfig.Other.WORMS.get() && event.getResult() != Event.Result.DENY) {
             World world = event.getEntity().level;
             if (!world.isClientSide) {
                 BlockPos pos = event.getContext().getClickedPos();
                 if (world.isEmptyBlock(pos.above())) {
                     BlockState state = world.getBlockState(pos);
-                    if (state.getBlock() == Blocks.GRASS && world.random.nextFloat() >= 0.95F) {
+                    if (state.getBlock() == Blocks.GRASS_BLOCK && world.random.nextFloat() >= 0.95F) {
                         ItemStack stack = new ItemStack(ActuallyItems.WORM.get(), world.random.nextInt(2) + 1);
                         ItemEntity item = new ItemEntity(world, pos.getX() + 0.5, pos.getY() + 1, pos.getZ() + 0.5, stack);
                         world.addFreshEntity(item);
diff --git a/src/main/resources/assets/actuallyadditions/lang/en_us.json b/src/main/resources/assets/actuallyadditions/lang/en_us.json
index 50b913c30..b134beaf4 100644
--- a/src/main/resources/assets/actuallyadditions/lang/en_us.json
+++ b/src/main/resources/assets/actuallyadditions/lang/en_us.json
@@ -377,7 +377,7 @@
   "item.actuallyadditions.biomass": "Biomass (wip)",
   "item.actuallyadditions.biocoal": "Bio Coal (wip)",
   "item.actuallyadditions.player_probe": "Player Probe (wip)",
-  "item.actuallyadditions.worm": "Worm (wip)",
+  "item.actuallyadditions.worm": "Worm",
   "item.actuallyadditions.travelers_sack": "Traveler's Sack (wip)",
   "item.actuallyadditions.bag.storage": "filled slots (wip)",
   "item.actuallyadditions.void_sack": "Void Sack (wip)",