From 18519ce93fa790f058350b440b674828d73680de Mon Sep 17 00:00:00 2001
From: unilock <unilock@fennet.rentals>
Date: Wed, 31 Jan 2024 17:06:46 -0500
Subject: [PATCH] Re-implement Portal Radio conversion

Signed-off-by: unilock <unilock@fennet.rentals>
---
 .../gg/moonflower/etched/core/Etched.java     | 49 ++++++-------------
 1 file changed, 16 insertions(+), 33 deletions(-)

diff --git a/src/main/java/gg/moonflower/etched/core/Etched.java b/src/main/java/gg/moonflower/etched/core/Etched.java
index eacb5c81..18d60add 100644
--- a/src/main/java/gg/moonflower/etched/core/Etched.java
+++ b/src/main/java/gg/moonflower/etched/core/Etched.java
@@ -13,6 +13,10 @@
 import gg.moonflower.etched.core.registry.EtchedSounds;
 import gg.moonflower.etched.core.registry.EtchedVillagers;
 import net.fabricmc.api.ModInitializer;
+import net.fabricmc.fabric.api.entity.event.v1.ServerEntityWorldChangeEvents;
+import net.minecraft.world.entity.item.ItemEntity;
+import net.minecraft.world.item.ItemStack;
+import net.minecraft.world.level.Level;
 import net.minecraftforge.common.ForgeConfigSpec;
 import net.minecraftforge.fml.config.ModConfig;
 import org.apache.commons.lang3.tuple.Pair;
@@ -56,41 +60,20 @@ public void onInitialize() {
 
         SoundSourceManager.registerSource(new SoundCloudSource());
         SoundSourceManager.registerSource(new BandcampSource());
-    }
-
-    /* TODO
-    private static void onGrindstoneChange(GrindstoneEvent.OnPlaceItem event) {
-        ItemStack top = event.getTopItem();
-        ItemStack bottom = event.getBottomItem();
-
-        if (top.isEmpty() == bottom.isEmpty()) {
-            return;
-        }
 
-        ItemStack stack = top.isEmpty() ? bottom : top;
-        if (AlbumCoverItem.getCoverStack(stack).isPresent()) {
-            ItemStack result = stack.copy();
-            result.setCount(1);
-            AlbumCoverItem.setCover(result, ItemStack.EMPTY);
-            event.setOutput(result);
-        }
-    }
-     */
-
-    /* TODO
-    private static void onItemChangedDimension(EntityTravelToDimensionEvent event) {
-        if (event.getEntity() instanceof ItemEntity entity) {
-            if (event.getDimension() == Level.NETHER) {
-                ItemStack oldStack = entity.getItem();
-                if (oldStack.getItem() != EtchedBlocks.RADIO.get().asItem()) {
-                    return;
+        ServerEntityWorldChangeEvents.AFTER_ENTITY_CHANGE_WORLD.register((originalEntity, newEntity, origin, destination) -> {
+            if (newEntity instanceof ItemEntity entity) {
+                if (destination.dimension() == Level.NETHER) {
+                    ItemStack oldStack = entity.getItem();
+                    if (oldStack.getItem() != EtchedBlocks.RADIO.asItem()) {
+                        return;
+                    }
+
+                    ItemStack newStack = new ItemStack(EtchedBlocks.PORTAL_RADIO_ITEM, oldStack.getCount());
+                    newStack.setTag(oldStack.getTag());
+                    entity.setItem(newStack);
                 }
-
-                ItemStack newStack = new ItemStack(EtchedBlocks.PORTAL_RADIO_ITEM.get(), oldStack.getCount());
-                newStack.setTag(oldStack.getTag());
-                entity.setItem(newStack);
             }
-        }
+        });
     }
-     */
 }