Relocate EventsImplementedInJava contents to other classes

Author: Juuxel

forge/src/main/java/juuxel/adorn/platform/forge/Adorn.java

@@ -1,17 +1,26 @@
 package juuxel.adorn.platform.forge;
 
 import juuxel.adorn.AdornCommon;
+import juuxel.adorn.block.AdornBlockEntities;
+import juuxel.adorn.block.AdornBlocks;
 import juuxel.adorn.block.variant.BlockVariantSets;
 import juuxel.adorn.config.ConfigManager;
 import juuxel.adorn.criterion.AdornCriteria;
+import juuxel.adorn.entity.AdornEntities;
+import juuxel.adorn.item.AdornItems;
 import juuxel.adorn.item.group.AdornItemGroups;
+import juuxel.adorn.lib.AdornGameRules;
+import juuxel.adorn.lib.AdornSounds;
 import juuxel.adorn.lib.AdornStats;
+import juuxel.adorn.lib.AdornTags;
 import juuxel.adorn.lib.registry.Registrar;
 import juuxel.adorn.loot.AdornLootConditionTypes;
 import juuxel.adorn.loot.AdornLootFunctionTypes;
 import juuxel.adorn.menu.AdornMenus;
 import juuxel.adorn.platform.forge.client.AdornClient;
 import juuxel.adorn.platform.forge.compat.Compat;
+import juuxel.adorn.platform.forge.event.BlockEvents;
+import juuxel.adorn.platform.forge.event.EntityEvents;
 import juuxel.adorn.platform.forge.event.ItemEvents;
 import juuxel.adorn.platform.forge.networking.AdornNetworking;
 import juuxel.adorn.platform.forge.registrar.ForgeRegistrar;
@@ -30,19 +39,26 @@ public Adorn() {
         var modBus = ModLoadingContext.get().getActiveContainer().getEventBus();
         ConfigManager.get().init();
         modBus.addListener(this::init);
-        new EventsImplementedInJava().register(modBus);
+        register(AdornSounds.SOUNDS, modBus);
+        register(AdornBlocks.BLOCKS, modBus);
+        register(AdornBlocks.ITEMS, modBus);
+        register(AdornItems.ITEMS, modBus);
+        register(AdornEntities.ENTITIES, modBus);
+        register(AdornBlockEntities.BLOCK_ENTITIES, modBus);
         AdornItemGroups.init();
-        registerToBus(AdornItemGroups.ITEM_GROUPS, modBus);
+        register(AdornItemGroups.ITEM_GROUPS, modBus);
         AdornRecipes.init();
-        registerToBus(AdornMenus.MENUS, modBus);
-        registerToBus(AdornRecipes.RECIPE_SERIALIZERS, modBus);
-        registerToBus(AdornRecipes.RECIPE_TYPES, modBus);
-        registerToBus(AdornLootConditionTypes.LOOT_CONDITION_TYPES, modBus);
-        registerToBus(AdornLootFunctionTypes.LOOT_FUNCTION_TYPES, modBus);
+        register(AdornMenus.MENUS, modBus);
+        register(AdornRecipes.RECIPE_SERIALIZERS, modBus);
+        register(AdornRecipes.RECIPE_TYPES, modBus);
+        register(AdornLootConditionTypes.LOOT_CONDITION_TYPES, modBus);
+        register(AdornLootFunctionTypes.LOOT_FUNCTION_TYPES, modBus);
         modBus.addListener(AdornNetworking::register);
         AdornCriteria.init();
-        registerToBus(AdornCriteria.CRITERIA, modBus);
+        register(AdornCriteria.CRITERIA, modBus);
         ItemEvents.register(modBus);
+        BlockEvents.init();
+        EntityEvents.init();
         modBus.addListener(AdornCapabilities::register);
         Compat.init(modBus);
         BlockVariantSets.register();
@@ -53,11 +69,13 @@ public Adorn() {
         }
     }
 
-    private void registerToBus(Registrar<?> registrar, IEventBus modBus) {
+    private void register(Registrar<?> registrar, IEventBus modBus) {
         ((ForgeRegistrar<?>) registrar).hook(modBus);
     }
 
     private void init(FMLCommonSetupEvent event) {
+        AdornGameRules.init();
+        AdornTags.init();
         AdornStats.init();
         ConfigManager.get().finish();
     }

forge/src/main/java/juuxel/adorn/platform/forge/EventsImplementedInJava.java

@@ -0,0 +1,41 @@
+package juuxel.adorn.platform.forge.event;
+
+import juuxel.adorn.CommonEventHandlers;
+import juuxel.adorn.block.SneakClickHandler;
+import net.minecraft.util.ActionResult;
+import net.neoforged.neoforge.common.NeoForge;
+import net.neoforged.neoforge.event.entity.player.PlayerInteractEvent;
+
+public final class BlockEvents {
+    public static void init() {
+        NeoForge.EVENT_BUS.addListener(BlockEvents::handleCarpetedBlocks);
+        NeoForge.EVENT_BUS.addListener(BlockEvents::handleSneakClicks);
+    }
+
+    private static void handleCarpetedBlocks(PlayerInteractEvent.RightClickBlock event) {
+        ActionResult result = CommonEventHandlers.handleCarpets(event.getEntity(), event.getLevel(), event.getHand(), event.getHitVec());
+
+        if (result != ActionResult.PASS) {
+            event.setCancellationResult(result);
+            event.setCanceled(true);
+        }
+    }
+
+    private static void handleSneakClicks(PlayerInteractEvent.RightClickBlock event) {
+        var player = event.getEntity();
+        var state = event.getLevel().getBlockState(event.getPos());
+
+        // Check that:
+        // - the block is a sneak-click handler
+        // - the player is sneaking
+        // - the player isn't holding an item (for block item and bucket support)
+        if (state.getBlock() instanceof SneakClickHandler clickHandler && player.isSneaking() && player.getStackInHand(event.getHand()).isEmpty()) {
+            var result = clickHandler.onSneakClick(state, event.getLevel(), event.getPos(), player, event.getHand(), event.getHitVec());
+
+            if (result != ActionResult.PASS) {
+                event.setCancellationResult(result);
+                event.setCanceled(true);
+            }
+        }
+    }
+}

forge/src/main/java/juuxel/adorn/platform/forge/event/BlockEvents.java

@@ -0,0 +1,36 @@
+package juuxel.adorn.platform.forge.event;
+
+import juuxel.adorn.block.SofaBlock;
+import net.minecraft.util.math.BlockPos;
+import net.minecraft.world.World;
+import net.neoforged.bus.api.Event;
+import net.neoforged.neoforge.common.NeoForge;
+import net.neoforged.neoforge.event.entity.player.PlayerSetSpawnEvent;
+import net.neoforged.neoforge.event.entity.player.SleepingTimeCheckEvent;
+
+public final class EntityEvents {
+    public static void init() {
+        NeoForge.EVENT_BUS.addListener(EntityEvents::handleSofaSleepTime);
+        NeoForge.EVENT_BUS.addListener(EntityEvents::preventSofaSpawns);
+    }
+
+    private static void handleSofaSleepTime(SleepingTimeCheckEvent event) {
+        BlockPos sleepingPos = event.getSleepingLocation().orElse(null);
+        if (sleepingPos == null) return;
+        World world = event.getEntity().getWorld();
+
+        if (world.isDay() && world.getBlockState(sleepingPos).getBlock() instanceof SofaBlock) {
+            event.setResult(Event.Result.ALLOW);
+        }
+    }
+
+    private static void preventSofaSpawns(PlayerSetSpawnEvent event) {
+        BlockPos pos = event.getNewSpawn();
+
+        if (pos != null) {
+            if (!event.isForced() && event.getEntity().getWorld().getBlockState(pos).getBlock() instanceof SofaBlock) {
+                event.setCanceled(true);
+            }
+        }
+    }
+}