From 4a16be41c9a7634c330ffafc1689d6b8444ef15b Mon Sep 17 00:00:00 2001 From: Mrbysco Date: Mon, 4 Mar 2024 22:42:23 +0100 Subject: [PATCH] Don't register DungeonLoot to the event bus --- .../actuallyadditions/models/item/canola_oil_bucket.json | 4 ++-- .../models/item/crystallized_oil_bucket.json | 4 ++-- .../actuallyadditions/models/item/empowered_oil_bucket.json | 4 ++-- .../models/item/refined_canola_oil_bucket.json | 4 ++-- .../actuallyadditions/advancements/craft_phantom_face.json | 4 ---- .../resources/data/actuallyadditions/advancements/root.json | 4 ---- .../de/ellpeck/actuallyadditions/mod/ActuallyAdditions.java | 2 +- 7 files changed, 9 insertions(+), 17 deletions(-) diff --git a/src/generated/resources/assets/actuallyadditions/models/item/canola_oil_bucket.json b/src/generated/resources/assets/actuallyadditions/models/item/canola_oil_bucket.json index 49db370d0..dc902098b 100644 --- a/src/generated/resources/assets/actuallyadditions/models/item/canola_oil_bucket.json +++ b/src/generated/resources/assets/actuallyadditions/models/item/canola_oil_bucket.json @@ -1,5 +1,5 @@ { - "parent": "forge:item/bucket", + "parent": "neoforge:item/bucket", "fluid": "actuallyadditions:canola_oil", - "loader": "forge:fluid_container" + "loader": "neoforge:fluid_container" } \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/crystallized_oil_bucket.json b/src/generated/resources/assets/actuallyadditions/models/item/crystallized_oil_bucket.json index a266d57c1..35758fbda 100644 --- a/src/generated/resources/assets/actuallyadditions/models/item/crystallized_oil_bucket.json +++ b/src/generated/resources/assets/actuallyadditions/models/item/crystallized_oil_bucket.json @@ -1,5 +1,5 @@ { - "parent": "forge:item/bucket", + "parent": "neoforge:item/bucket", "fluid": "actuallyadditions:crystallized_oil", - "loader": "forge:fluid_container" + "loader": "neoforge:fluid_container" } \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/empowered_oil_bucket.json b/src/generated/resources/assets/actuallyadditions/models/item/empowered_oil_bucket.json index c5175d1ff..f2431158b 100644 --- a/src/generated/resources/assets/actuallyadditions/models/item/empowered_oil_bucket.json +++ b/src/generated/resources/assets/actuallyadditions/models/item/empowered_oil_bucket.json @@ -1,5 +1,5 @@ { - "parent": "forge:item/bucket", + "parent": "neoforge:item/bucket", "fluid": "actuallyadditions:empowered_oil", - "loader": "forge:fluid_container" + "loader": "neoforge:fluid_container" } \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/refined_canola_oil_bucket.json b/src/generated/resources/assets/actuallyadditions/models/item/refined_canola_oil_bucket.json index ccd277ac4..bfe311f35 100644 --- a/src/generated/resources/assets/actuallyadditions/models/item/refined_canola_oil_bucket.json +++ b/src/generated/resources/assets/actuallyadditions/models/item/refined_canola_oil_bucket.json @@ -1,5 +1,5 @@ { - "parent": "forge:item/bucket", + "parent": "neoforge:item/bucket", "fluid": "actuallyadditions:refined_canola_oil", - "loader": "forge:fluid_container" + "loader": "neoforge:fluid_container" } \ No newline at end of file diff --git a/src/generated/resources/data/actuallyadditions/advancements/craft_phantom_face.json b/src/generated/resources/data/actuallyadditions/advancements/craft_phantom_face.json index b0c24fd04..2106632d2 100644 --- a/src/generated/resources/data/actuallyadditions/advancements/craft_phantom_face.json +++ b/src/generated/resources/data/actuallyadditions/advancements/craft_phantom_face.json @@ -15,17 +15,13 @@ } }, "display": { - "announce_to_chat": true, "background": "minecraft:textures/blocks/stone.png", "description": { "translate": "achievement.actuallyadditions.craftPhantomface.desc" }, - "frame": "task", - "hidden": false, "icon": { "item": "actuallyadditions:phantom_itemface" }, - "show_toast": true, "title": { "translate": "achievement.actuallyadditions.craftPhantomface" } diff --git a/src/generated/resources/data/actuallyadditions/advancements/root.json b/src/generated/resources/data/actuallyadditions/advancements/root.json index 69b86f24c..b17e36c0b 100644 --- a/src/generated/resources/data/actuallyadditions/advancements/root.json +++ b/src/generated/resources/data/actuallyadditions/advancements/root.json @@ -5,17 +5,13 @@ } }, "display": { - "announce_to_chat": true, "background": "minecraft:textures/gui/advancements/backgrounds/stone.png", "description": { "translate": "achievement.actuallyadditions.openBooklet.desc" }, - "frame": "task", - "hidden": false, "icon": { "item": "actuallyadditions:booklet" }, - "show_toast": true, "title": { "translate": "achievement.actuallyadditions.openBooklet" } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/ActuallyAdditions.java b/src/main/java/de/ellpeck/actuallyadditions/mod/ActuallyAdditions.java index 8427bd3a8..53c3bc765 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/ActuallyAdditions.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/ActuallyAdditions.java @@ -106,7 +106,7 @@ public class ActuallyAdditions { NeoForge.EVENT_BUS.addListener(this::serverStarted); NeoForge.EVENT_BUS.addListener(this::serverStopped); NeoForge.EVENT_BUS.register(new CommonEvents()); - NeoForge.EVENT_BUS.register(new DungeonLoot()); +// NeoForge.EVENT_BUS.register(new DungeonLoot()); NeoForge.EVENT_BUS.addListener(ActuallyAdditions::reloadEvent); NeoForge.EVENT_BUS.addListener(Worm::onHoe); InitFluids.init(eventBus);