From ce87dc76cfbfd6a9bc5ce5495924b5beb6255a72 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ale=C5=A1=20Fabi=C3=A1nek?= Date: Mon, 4 Dec 2023 18:39:45 +0100 Subject: [PATCH] wip --- .../friendsandfoes/forge/FriendsAndFoesForge.java | 1 - .../neoforge/FriendsAndFoesNeoForge.java | 7 +++++++ .../{less_mooblooms.json => moobloom.json} | 4 ++-- .../forge/biome_modifier/more_mooblooms.json | 11 ----------- 4 files changed, 9 insertions(+), 14 deletions(-) rename neoforge/src/main/resources/data/friendsandfoes/forge/biome_modifier/{less_mooblooms.json => moobloom.json} (69%) delete mode 100644 neoforge/src/main/resources/data/friendsandfoes/forge/biome_modifier/more_mooblooms.json diff --git a/forge/src/main/java/com/faboslav/friendsandfoes/forge/FriendsAndFoesForge.java b/forge/src/main/java/com/faboslav/friendsandfoes/forge/FriendsAndFoesForge.java index cdd4866ce..dabc52856 100644 --- a/forge/src/main/java/com/faboslav/friendsandfoes/forge/FriendsAndFoesForge.java +++ b/forge/src/main/java/com/faboslav/friendsandfoes/forge/FriendsAndFoesForge.java @@ -124,7 +124,6 @@ private static void addItemsToTabs(BuildCreativeModeTabContentsEvent event) { }); } - private static void onAddReloadListeners(AddReloadListenerEvent event) { RegisterReloadListenerEvent.EVENT.invoke(new RegisterReloadListenerEvent((id, listener) -> event.addListener(listener))); } diff --git a/neoforge/src/main/java/com/faboslav/friendsandfoes/neoforge/FriendsAndFoesNeoForge.java b/neoforge/src/main/java/com/faboslav/friendsandfoes/neoforge/FriendsAndFoesNeoForge.java index 2ef625954..b912b270c 100644 --- a/neoforge/src/main/java/com/faboslav/friendsandfoes/neoforge/FriendsAndFoesNeoForge.java +++ b/neoforge/src/main/java/com/faboslav/friendsandfoes/neoforge/FriendsAndFoesNeoForge.java @@ -2,6 +2,7 @@ import com.faboslav.friendsandfoes.FriendsAndFoes; import com.faboslav.friendsandfoes.FriendsAndFoesClient; +import com.faboslav.friendsandfoes.events.lifecycle.RegisterReloadListenerEvent; import com.faboslav.friendsandfoes.init.FriendsAndFoesEntityTypes; import com.faboslav.friendsandfoes.init.FriendsAndFoesStructurePoolElements; import com.faboslav.friendsandfoes.network.neoforge.PacketHandler; @@ -26,6 +27,7 @@ import net.neoforged.fml.javafmlmod.FMLJavaModLoadingContext; import net.neoforged.fml.loading.FMLEnvironment; import net.neoforged.neoforge.common.NeoForge; +import net.neoforged.neoforge.event.AddReloadListenerEvent; import net.neoforged.neoforge.event.BuildCreativeModeTabContentsEvent; import net.neoforged.neoforge.event.entity.EntityAttributeCreationEvent; import net.neoforged.neoforge.event.level.LevelEvent; @@ -71,6 +73,7 @@ public FriendsAndFoesNeoForge() { var neoForgeBus = NeoForge.EVENT_BUS; neoForgeBus.addListener(FriendsAndFoesNeoForge::initSpawners); neoForgeBus.addListener(FriendsAndFoesNeoForge::onServerAboutToStartEvent); + neoForgeBus.addListener(FriendsAndFoesNeoForge::onAddReloadListeners); } private static void init(final FMLCommonSetupEvent event) { @@ -119,6 +122,10 @@ private static void addItemsToTabs(BuildCreativeModeTabContentsEvent event) { }); } + private static void onAddReloadListeners(AddReloadListenerEvent event) { + RegisterReloadListenerEvent.EVENT.invoke(new RegisterReloadListenerEvent((id, listener) -> event.addListener(listener))); + } + private static void initSpawners(final LevelEvent.Load event) { if ( event.getLevel().isClient() diff --git a/neoforge/src/main/resources/data/friendsandfoes/forge/biome_modifier/less_mooblooms.json b/neoforge/src/main/resources/data/friendsandfoes/forge/biome_modifier/moobloom.json similarity index 69% rename from neoforge/src/main/resources/data/friendsandfoes/forge/biome_modifier/less_mooblooms.json rename to neoforge/src/main/resources/data/friendsandfoes/forge/biome_modifier/moobloom.json index 7cb9998fe..cadd023c9 100644 --- a/neoforge/src/main/resources/data/friendsandfoes/forge/biome_modifier/less_mooblooms.json +++ b/neoforge/src/main/resources/data/friendsandfoes/forge/biome_modifier/moobloom.json @@ -1,11 +1,11 @@ { "type": "forge:add_spawns", - "biomes": "#friendsandfoes:has_less_mooblooms", + "biomes": "#friendsandfoes:has_moobloom/any", "spawners": { "type": "friendsandfoes:moobloom", "minCount": 2, "maxCount": 4, - "weight": 2 + "weight": 4 }, "category": "creature" } \ No newline at end of file diff --git a/neoforge/src/main/resources/data/friendsandfoes/forge/biome_modifier/more_mooblooms.json b/neoforge/src/main/resources/data/friendsandfoes/forge/biome_modifier/more_mooblooms.json deleted file mode 100644 index b1baff533..000000000 --- a/neoforge/src/main/resources/data/friendsandfoes/forge/biome_modifier/more_mooblooms.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "type": "forge:add_spawns", - "biomes": "#friendsandfoes:has_more_mooblooms", - "spawners": { - "type": "friendsandfoes:moobloom", - "minCount": 2, - "maxCount": 4, - "weight": 32 - }, - "category": "creature" -} \ No newline at end of file