From 5d3f0639ab4296997895a41551dbd442040bb730 Mon Sep 17 00:00:00 2001 From: 17146 <1714673995@qq.com> Date: Fri, 4 Apr 2025 16:02:34 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9GLM?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../superbwarfare/init/ModLootModifier.java | 50 ------------------- .../loot_modifiers/global_loot_modifiers.json | 25 ---------- .../loot_modifiers/global_loot_modifiers.json | 9 ++++ .../loot_modifiers/ancient_cpu_chest.json | 4 +- .../loot_modifiers/common_chest.json | 33 ++++++++++-- .../loot_modifiers/common_chest_2.json | 10 ---- .../loot_modifiers/common_chest_3.json | 10 ---- .../loot_modifiers/common_chest_4.json | 10 ---- .../loot_modifiers/common_chest_5.json | 10 ---- .../loot_modifiers/common_chest_6.json | 10 ---- .../loot_modifiers/epic_chest.json | 25 ++++++++-- .../loot_modifiers/epic_chest_2.json | 10 ---- .../loot_modifiers/epic_chest_3.json | 10 ---- .../loot_modifiers/epic_chest_4.json | 10 ---- .../loot_modifiers/rare_chest.json | 45 +++++++++++++++-- .../loot_modifiers/rare_chest_2.json | 10 ---- .../loot_modifiers/rare_chest_3.json | 10 ---- .../loot_modifiers/rare_chest_4.json | 10 ---- .../loot_modifiers/rare_chest_5.json | 10 ---- .../loot_modifiers/rare_chest_6.json | 10 ---- .../loot_modifiers/rare_chest_7.json | 10 ---- .../loot_modifiers/rare_chest_8.json | 10 ---- .../loot_modifiers/rare_chest_9.json | 10 ---- .../chests/ancient_cpu.json | 0 .../chests/blue_print_common.json | 0 .../chests/blue_print_epic.json | 0 .../chests/blue_print_rare.json | 0 27 files changed, 102 insertions(+), 249 deletions(-) delete mode 100644 src/main/java/com/atsuishio/superbwarfare/init/ModLootModifier.java delete mode 100644 src/main/resources/data/forge/loot_modifiers/global_loot_modifiers.json create mode 100644 src/main/resources/data/neoforge/loot_modifiers/global_loot_modifiers.json delete mode 100644 src/main/resources/data/superbwarfare/loot_modifiers/common_chest_2.json delete mode 100644 src/main/resources/data/superbwarfare/loot_modifiers/common_chest_3.json delete mode 100644 src/main/resources/data/superbwarfare/loot_modifiers/common_chest_4.json delete mode 100644 src/main/resources/data/superbwarfare/loot_modifiers/common_chest_5.json delete mode 100644 src/main/resources/data/superbwarfare/loot_modifiers/common_chest_6.json delete mode 100644 src/main/resources/data/superbwarfare/loot_modifiers/epic_chest_2.json delete mode 100644 src/main/resources/data/superbwarfare/loot_modifiers/epic_chest_3.json delete mode 100644 src/main/resources/data/superbwarfare/loot_modifiers/epic_chest_4.json delete mode 100644 src/main/resources/data/superbwarfare/loot_modifiers/rare_chest_2.json delete mode 100644 src/main/resources/data/superbwarfare/loot_modifiers/rare_chest_3.json delete mode 100644 src/main/resources/data/superbwarfare/loot_modifiers/rare_chest_4.json delete mode 100644 src/main/resources/data/superbwarfare/loot_modifiers/rare_chest_5.json delete mode 100644 src/main/resources/data/superbwarfare/loot_modifiers/rare_chest_6.json delete mode 100644 src/main/resources/data/superbwarfare/loot_modifiers/rare_chest_7.json delete mode 100644 src/main/resources/data/superbwarfare/loot_modifiers/rare_chest_8.json delete mode 100644 src/main/resources/data/superbwarfare/loot_modifiers/rare_chest_9.json rename src/main/resources/data/superbwarfare/{loot_tables => loot_table}/chests/ancient_cpu.json (100%) rename src/main/resources/data/superbwarfare/{loot_tables => loot_table}/chests/blue_print_common.json (100%) rename src/main/resources/data/superbwarfare/{loot_tables => loot_table}/chests/blue_print_epic.json (100%) rename src/main/resources/data/superbwarfare/{loot_tables => loot_table}/chests/blue_print_rare.json (100%) diff --git a/src/main/java/com/atsuishio/superbwarfare/init/ModLootModifier.java b/src/main/java/com/atsuishio/superbwarfare/init/ModLootModifier.java deleted file mode 100644 index de517072b..000000000 --- a/src/main/java/com/atsuishio/superbwarfare/init/ModLootModifier.java +++ /dev/null @@ -1,50 +0,0 @@ -package com.atsuishio.superbwarfare.init; - -import com.atsuishio.superbwarfare.Mod; -import com.mojang.serialization.MapCodec; -import net.neoforged.bus.api.SubscribeEvent; -import net.neoforged.fml.common.EventBusSubscriber; -import net.neoforged.fml.event.lifecycle.FMLConstructModEvent; -import net.neoforged.neoforge.common.loot.IGlobalLootModifier; -import net.neoforged.neoforge.registries.DeferredRegister; -import net.neoforged.neoforge.registries.NeoForgeRegistries; - -@EventBusSubscriber(modid = Mod.MODID, bus = EventBusSubscriber.Bus.MOD) -public class ModLootModifier { - // TODO loot table modifier -// public static class TargetModLootTableModifier extends LootModifier { -// public static final Supplier> CODEC = Suppliers -// .memoize(() -> RecordCodecBuilder.create(instance -> codecStart(instance).and(ResourceLocation.CODEC.fieldOf("lootTable").forGetter(m -> m.lootTable)).apply(instance, TargetModLootTableModifier::new))); -// private final ResourceLocation lootTable; -// -// public TargetModLootTableModifier(LootItemCondition[] conditions, ResourceLocation lootTable) { -// super(conditions); -// this.lootTable = lootTable; -// } -// -// @Override -// protected ObjectArrayList doApply(ObjectArrayList generatedLoot, LootContext context) { -// context.getResolver().getLootTable(lootTable).getRandomItemsRaw(context, generatedLoot::add); -// return generatedLoot; -// } -// -// @Override -// public MapCodec codec() { -// return CODEC; -// } -// -//// @Override -//// public Codec codec() { -//// return CODEC.get(); -//// } -// } - - public static final DeferredRegister> LOOT_MODIFIERS = DeferredRegister.create(NeoForgeRegistries.Keys.GLOBAL_LOOT_MODIFIER_SERIALIZERS, Mod.MODID); -// public static final DeferredHolder, Codec> LOOT_MODIFIER = LOOT_MODIFIERS.register(ModUtils.MODID + "_loot_modifier", TargetModLootTableModifier.CODEC); - - @SubscribeEvent - public static void register(FMLConstructModEvent event) { -// IEventBus bus = FMLJavaModLoadingContext.get().getModEventBus(); -// event.enqueueWork(() -> LOOT_MODIFIERS.register(bus)); - } -} diff --git a/src/main/resources/data/forge/loot_modifiers/global_loot_modifiers.json b/src/main/resources/data/forge/loot_modifiers/global_loot_modifiers.json deleted file mode 100644 index 81d790dce..000000000 --- a/src/main/resources/data/forge/loot_modifiers/global_loot_modifiers.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "entries": [ - "superbwarfare:common_chest", - "superbwarfare:common_chest_2", - "superbwarfare:common_chest_3", - "superbwarfare:common_chest_4", - "superbwarfare:common_chest_5", - "superbwarfare:rare_chest", - "superbwarfare:rare_chest_2", - "superbwarfare:common_chest_6", - "superbwarfare:rare_chest_3", - "superbwarfare:rare_chest_4", - "superbwarfare:rare_chest_5", - "superbwarfare:rare_chest_6", - "superbwarfare:rare_chest_7", - "superbwarfare:rare_chest_8", - "superbwarfare:rare_chest_9", - "superbwarfare:epic_chest", - "superbwarfare:epic_chest_2", - "superbwarfare:epic_chest_3", - "superbwarfare:epic_chest_4", - "superbwarfare:ancient_cpu_chest" - ], - "replace": false -} \ No newline at end of file diff --git a/src/main/resources/data/neoforge/loot_modifiers/global_loot_modifiers.json b/src/main/resources/data/neoforge/loot_modifiers/global_loot_modifiers.json new file mode 100644 index 000000000..6ce350673 --- /dev/null +++ b/src/main/resources/data/neoforge/loot_modifiers/global_loot_modifiers.json @@ -0,0 +1,9 @@ +{ + "entries": [ + "superbwarfare:common_chest", + "superbwarfare:rare_chest", + "superbwarfare:epic_chest", + "superbwarfare:ancient_cpu_chest" + ], + "replace": false +} \ No newline at end of file diff --git a/src/main/resources/data/superbwarfare/loot_modifiers/ancient_cpu_chest.json b/src/main/resources/data/superbwarfare/loot_modifiers/ancient_cpu_chest.json index c49425b03..f7900b4a1 100644 --- a/src/main/resources/data/superbwarfare/loot_modifiers/ancient_cpu_chest.json +++ b/src/main/resources/data/superbwarfare/loot_modifiers/ancient_cpu_chest.json @@ -1,10 +1,10 @@ { - "type": "superbwarfare:superbwarfare_loot_modifier", + "type": "neoforge:add_table", "conditions": [ { "condition": "neoforge:loot_table_id", "loot_table_id": "minecraft:chests/ancient_city" } ], - "lootTable": "superbwarfare:chests/ancient_cpu" + "table": "superbwarfare:chests/ancient_cpu" } \ No newline at end of file diff --git a/src/main/resources/data/superbwarfare/loot_modifiers/common_chest.json b/src/main/resources/data/superbwarfare/loot_modifiers/common_chest.json index 2dd3ed7fa..044f4de61 100644 --- a/src/main/resources/data/superbwarfare/loot_modifiers/common_chest.json +++ b/src/main/resources/data/superbwarfare/loot_modifiers/common_chest.json @@ -1,10 +1,35 @@ { - "type": "superbwarfare:superbwarfare_loot_modifier", + "type": "neoforge:add_table", "conditions": [ { - "condition": "neoforge:loot_table_id", - "loot_table_id": "minecraft:chests/simple_dungeon" + "condition": "minecraft:any_of", + "terms": [ + { + "condition": "neoforge:loot_table_id", + "loot_table_id": "minecraft:chests/simple_dungeon" + }, + { + "condition": "neoforge:loot_table_id", + "loot_table_id": "minecraft:chests/abandoned_mineshaft" + }, + { + "condition": "neoforge:loot_table_id", + "loot_table_id": "minecraft:chests/shipwreck_map" + }, + { + "condition": "neoforge:loot_table_id", + "loot_table_id": "minecraft:chests/shipwreck_supply" + }, + { + "condition": "neoforge:loot_table_id", + "loot_table_id": "minecraft:chests/shipwreck_treasure" + }, + { + "condition": "neoforge:loot_table_id", + "loot_table_id": "minecraft:chests/ruined_portal" + } + ] } ], - "lootTable": "superbwarfare:chests/blue_print_common" + "table": "superbwarfare:chests/blue_print_common" } \ No newline at end of file diff --git a/src/main/resources/data/superbwarfare/loot_modifiers/common_chest_2.json b/src/main/resources/data/superbwarfare/loot_modifiers/common_chest_2.json deleted file mode 100644 index 5818a6913..000000000 --- a/src/main/resources/data/superbwarfare/loot_modifiers/common_chest_2.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "type": "superbwarfare:superbwarfare_loot_modifier", - "conditions": [ - { - "condition": "neoforge:loot_table_id", - "loot_table_id": "minecraft:chests/abandoned_mineshaft" - } - ], - "lootTable": "superbwarfare:chests/blue_print_common" -} \ No newline at end of file diff --git a/src/main/resources/data/superbwarfare/loot_modifiers/common_chest_3.json b/src/main/resources/data/superbwarfare/loot_modifiers/common_chest_3.json deleted file mode 100644 index 856b2e2c7..000000000 --- a/src/main/resources/data/superbwarfare/loot_modifiers/common_chest_3.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "type": "superbwarfare:superbwarfare_loot_modifier", - "conditions": [ - { - "condition": "neoforge:loot_table_id", - "loot_table_id": "minecraft:chests/shipwreck_map" - } - ], - "lootTable": "superbwarfare:chests/blue_print_common" -} \ No newline at end of file diff --git a/src/main/resources/data/superbwarfare/loot_modifiers/common_chest_4.json b/src/main/resources/data/superbwarfare/loot_modifiers/common_chest_4.json deleted file mode 100644 index bfdffe88d..000000000 --- a/src/main/resources/data/superbwarfare/loot_modifiers/common_chest_4.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "type": "superbwarfare:superbwarfare_loot_modifier", - "conditions": [ - { - "condition": "neoforge:loot_table_id", - "loot_table_id": "minecraft:chests/shipwreck_supply" - } - ], - "lootTable": "superbwarfare:chests/blue_print_common" -} \ No newline at end of file diff --git a/src/main/resources/data/superbwarfare/loot_modifiers/common_chest_5.json b/src/main/resources/data/superbwarfare/loot_modifiers/common_chest_5.json deleted file mode 100644 index 6c182b4bd..000000000 --- a/src/main/resources/data/superbwarfare/loot_modifiers/common_chest_5.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "type": "superbwarfare:superbwarfare_loot_modifier", - "conditions": [ - { - "condition": "neoforge:loot_table_id", - "loot_table_id": "minecraft:chests/shipwreck_treasure" - } - ], - "lootTable": "superbwarfare:chests/blue_print_common" -} \ No newline at end of file diff --git a/src/main/resources/data/superbwarfare/loot_modifiers/common_chest_6.json b/src/main/resources/data/superbwarfare/loot_modifiers/common_chest_6.json deleted file mode 100644 index f423ed607..000000000 --- a/src/main/resources/data/superbwarfare/loot_modifiers/common_chest_6.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "type": "superbwarfare:superbwarfare_loot_modifier", - "conditions": [ - { - "condition": "neoforge:loot_table_id", - "loot_table_id": "minecraft:chests/ruined_portal" - } - ], - "lootTable": "superbwarfare:chests/blue_print_common" -} \ No newline at end of file diff --git a/src/main/resources/data/superbwarfare/loot_modifiers/epic_chest.json b/src/main/resources/data/superbwarfare/loot_modifiers/epic_chest.json index 9c5d87cae..ea0197a74 100644 --- a/src/main/resources/data/superbwarfare/loot_modifiers/epic_chest.json +++ b/src/main/resources/data/superbwarfare/loot_modifiers/epic_chest.json @@ -1,10 +1,27 @@ { - "type": "superbwarfare:superbwarfare_loot_modifier", + "type": "neoforge:add_table", "conditions": [ { - "condition": "neoforge:loot_table_id", - "loot_table_id": "minecraft:chests/pillager_outpost" + "condition": "minecraft:any_of", + "terms": [ + { + "condition": "neoforge:loot_table_id", + "loot_table_id": "minecraft:chests/pillager_outpost" + }, + { + "condition": "neoforge:loot_table_id", + "loot_table_id": "minecraft:chests/stronghold_library" + }, + { + "condition": "neoforge:loot_table_id", + "loot_table_id": "minecraft:chests/woodland_mansion" + }, + { + "condition": "neoforge:loot_table_id", + "loot_table_id": "minecraft:chests/end_city_treasure" + } + ] } ], - "lootTable": "superbwarfare:chests/blue_print_epic" + "table": "superbwarfare:chests/blue_print_epic" } \ No newline at end of file diff --git a/src/main/resources/data/superbwarfare/loot_modifiers/epic_chest_2.json b/src/main/resources/data/superbwarfare/loot_modifiers/epic_chest_2.json deleted file mode 100644 index 0c93e242f..000000000 --- a/src/main/resources/data/superbwarfare/loot_modifiers/epic_chest_2.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "type": "superbwarfare:superbwarfare_loot_modifier", - "conditions": [ - { - "condition": "neoforge:loot_table_id", - "loot_table_id": "minecraft:chests/stronghold_library" - } - ], - "lootTable": "superbwarfare:chests/blue_print_epic" -} \ No newline at end of file diff --git a/src/main/resources/data/superbwarfare/loot_modifiers/epic_chest_3.json b/src/main/resources/data/superbwarfare/loot_modifiers/epic_chest_3.json deleted file mode 100644 index bd305bd57..000000000 --- a/src/main/resources/data/superbwarfare/loot_modifiers/epic_chest_3.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "type": "superbwarfare:superbwarfare_loot_modifier", - "conditions": [ - { - "condition": "neoforge:loot_table_id", - "loot_table_id": "minecraft:chests/woodland_mansion" - } - ], - "lootTable": "superbwarfare:chests/blue_print_epic" -} \ No newline at end of file diff --git a/src/main/resources/data/superbwarfare/loot_modifiers/epic_chest_4.json b/src/main/resources/data/superbwarfare/loot_modifiers/epic_chest_4.json deleted file mode 100644 index 33b6c47d4..000000000 --- a/src/main/resources/data/superbwarfare/loot_modifiers/epic_chest_4.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "type": "superbwarfare:superbwarfare_loot_modifier", - "conditions": [ - { - "condition": "neoforge:loot_table_id", - "loot_table_id": "minecraft:chests/end_city_treasure" - } - ], - "lootTable": "superbwarfare:chests/blue_print_epic" -} \ No newline at end of file diff --git a/src/main/resources/data/superbwarfare/loot_modifiers/rare_chest.json b/src/main/resources/data/superbwarfare/loot_modifiers/rare_chest.json index 9083df0a1..3655ab1f0 100644 --- a/src/main/resources/data/superbwarfare/loot_modifiers/rare_chest.json +++ b/src/main/resources/data/superbwarfare/loot_modifiers/rare_chest.json @@ -1,10 +1,47 @@ { - "type": "superbwarfare:superbwarfare_loot_modifier", + "type": "neoforge:add_table", "conditions": [ { - "condition": "neoforge:loot_table_id", - "loot_table_id": "minecraft:chests/ancient_city" + "condition": "minecraft:any_of", + "terms": [ + { + "condition": "neoforge:loot_table_id", + "loot_table_id": "minecraft:chests/ancient_city" + }, + { + "condition": "neoforge:loot_table_id", + "loot_table_id": "minecraft:chests/ancient_city_ice_box" + }, + { + "condition": "neoforge:loot_table_id", + "loot_table_id": "minecraft:chests/bastion_bridge" + }, + { + "condition": "neoforge:loot_table_id", + "loot_table_id": "minecraft:chests/bastion_hoglin_stable" + }, + { + "condition": "neoforge:loot_table_id", + "loot_table_id": "minecraft:chests/bastion_other" + }, + { + "condition": "neoforge:loot_table_id", + "loot_table_id": "minecraft:chests/buried_treasure" + }, + { + "condition": "neoforge:loot_table_id", + "loot_table_id": "minecraft:chests/desert_pyramid" + }, + { + "condition": "neoforge:loot_table_id", + "loot_table_id": "minecraft:chests/igloo" + }, + { + "condition": "neoforge:loot_table_id", + "loot_table_id": "minecraft:chests/jungle_temple" + } + ] } ], - "lootTable": "superbwarfare:chests/blue_print_rare" + "table": "superbwarfare:chests/blue_print_rare" } \ No newline at end of file diff --git a/src/main/resources/data/superbwarfare/loot_modifiers/rare_chest_2.json b/src/main/resources/data/superbwarfare/loot_modifiers/rare_chest_2.json deleted file mode 100644 index e16fabf68..000000000 --- a/src/main/resources/data/superbwarfare/loot_modifiers/rare_chest_2.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "type": "superbwarfare:superbwarfare_loot_modifier", - "conditions": [ - { - "condition": "neoforge:loot_table_id", - "loot_table_id": "minecraft:chests/ancient_city_ice_box" - } - ], - "lootTable": "superbwarfare:chests/blue_print_rare" -} \ No newline at end of file diff --git a/src/main/resources/data/superbwarfare/loot_modifiers/rare_chest_3.json b/src/main/resources/data/superbwarfare/loot_modifiers/rare_chest_3.json deleted file mode 100644 index e3fa7c765..000000000 --- a/src/main/resources/data/superbwarfare/loot_modifiers/rare_chest_3.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "type": "superbwarfare:superbwarfare_loot_modifier", - "conditions": [ - { - "condition": "neoforge:loot_table_id", - "loot_table_id": "minecraft:chests/bastion_bridge" - } - ], - "lootTable": "superbwarfare:chests/blue_print_rare" -} \ No newline at end of file diff --git a/src/main/resources/data/superbwarfare/loot_modifiers/rare_chest_4.json b/src/main/resources/data/superbwarfare/loot_modifiers/rare_chest_4.json deleted file mode 100644 index 9ed5a592c..000000000 --- a/src/main/resources/data/superbwarfare/loot_modifiers/rare_chest_4.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "type": "superbwarfare:superbwarfare_loot_modifier", - "conditions": [ - { - "condition": "neoforge:loot_table_id", - "loot_table_id": "minecraft:chests/bastion_hoglin_stable" - } - ], - "lootTable": "superbwarfare:chests/blue_print_rare" -} \ No newline at end of file diff --git a/src/main/resources/data/superbwarfare/loot_modifiers/rare_chest_5.json b/src/main/resources/data/superbwarfare/loot_modifiers/rare_chest_5.json deleted file mode 100644 index 8be406ce1..000000000 --- a/src/main/resources/data/superbwarfare/loot_modifiers/rare_chest_5.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "type": "superbwarfare:superbwarfare_loot_modifier", - "conditions": [ - { - "condition": "neoforge:loot_table_id", - "loot_table_id": "minecraft:chests/bastion_other" - } - ], - "lootTable": "superbwarfare:chests/blue_print_rare" -} \ No newline at end of file diff --git a/src/main/resources/data/superbwarfare/loot_modifiers/rare_chest_6.json b/src/main/resources/data/superbwarfare/loot_modifiers/rare_chest_6.json deleted file mode 100644 index 043188154..000000000 --- a/src/main/resources/data/superbwarfare/loot_modifiers/rare_chest_6.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "type": "superbwarfare:superbwarfare_loot_modifier", - "conditions": [ - { - "condition": "neoforge:loot_table_id", - "loot_table_id": "minecraft:chests/buried_treasure" - } - ], - "lootTable": "superbwarfare:chests/blue_print_rare" -} \ No newline at end of file diff --git a/src/main/resources/data/superbwarfare/loot_modifiers/rare_chest_7.json b/src/main/resources/data/superbwarfare/loot_modifiers/rare_chest_7.json deleted file mode 100644 index d7756ac2f..000000000 --- a/src/main/resources/data/superbwarfare/loot_modifiers/rare_chest_7.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "type": "superbwarfare:superbwarfare_loot_modifier", - "conditions": [ - { - "condition": "neoforge:loot_table_id", - "loot_table_id": "minecraft:chests/desert_pyramid" - } - ], - "lootTable": "superbwarfare:chests/blue_print_rare" -} \ No newline at end of file diff --git a/src/main/resources/data/superbwarfare/loot_modifiers/rare_chest_8.json b/src/main/resources/data/superbwarfare/loot_modifiers/rare_chest_8.json deleted file mode 100644 index 01cc84914..000000000 --- a/src/main/resources/data/superbwarfare/loot_modifiers/rare_chest_8.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "type": "superbwarfare:superbwarfare_loot_modifier", - "conditions": [ - { - "condition": "neoforge:loot_table_id", - "loot_table_id": "minecraft:chests/igloo" - } - ], - "lootTable": "superbwarfare:chests/blue_print_rare" -} \ No newline at end of file diff --git a/src/main/resources/data/superbwarfare/loot_modifiers/rare_chest_9.json b/src/main/resources/data/superbwarfare/loot_modifiers/rare_chest_9.json deleted file mode 100644 index d99f37b5d..000000000 --- a/src/main/resources/data/superbwarfare/loot_modifiers/rare_chest_9.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "type": "superbwarfare:superbwarfare_loot_modifier", - "conditions": [ - { - "condition": "neoforge:loot_table_id", - "loot_table_id": "minecraft:chests/jungle_temple" - } - ], - "lootTable": "superbwarfare:chests/blue_print_rare" -} \ No newline at end of file diff --git a/src/main/resources/data/superbwarfare/loot_tables/chests/ancient_cpu.json b/src/main/resources/data/superbwarfare/loot_table/chests/ancient_cpu.json similarity index 100% rename from src/main/resources/data/superbwarfare/loot_tables/chests/ancient_cpu.json rename to src/main/resources/data/superbwarfare/loot_table/chests/ancient_cpu.json diff --git a/src/main/resources/data/superbwarfare/loot_tables/chests/blue_print_common.json b/src/main/resources/data/superbwarfare/loot_table/chests/blue_print_common.json similarity index 100% rename from src/main/resources/data/superbwarfare/loot_tables/chests/blue_print_common.json rename to src/main/resources/data/superbwarfare/loot_table/chests/blue_print_common.json diff --git a/src/main/resources/data/superbwarfare/loot_tables/chests/blue_print_epic.json b/src/main/resources/data/superbwarfare/loot_table/chests/blue_print_epic.json similarity index 100% rename from src/main/resources/data/superbwarfare/loot_tables/chests/blue_print_epic.json rename to src/main/resources/data/superbwarfare/loot_table/chests/blue_print_epic.json diff --git a/src/main/resources/data/superbwarfare/loot_tables/chests/blue_print_rare.json b/src/main/resources/data/superbwarfare/loot_table/chests/blue_print_rare.json similarity index 100% rename from src/main/resources/data/superbwarfare/loot_tables/chests/blue_print_rare.json rename to src/main/resources/data/superbwarfare/loot_table/chests/blue_print_rare.json