diff --git a/src/main/java/techreborn/TechReborn.java b/src/main/java/techreborn/TechReborn.java index c2cef6dde..0b0babc84 100644 --- a/src/main/java/techreborn/TechReborn.java +++ b/src/main/java/techreborn/TechReborn.java @@ -74,12 +74,10 @@ public class TechReborn implements ModInitializer { ModRegistry.setupShit(); RecipeCrafter.soundHanlder = new ModSounds.SoundHandler(); - + ModLoot.init(); + proxy.preInit(); - // Registers Chest Loot - ModLoot.init(); - // MinecraftForge.EVENT_BUS.register(new ModLoot()); // Client only init, needs to be done before parts system proxy.init(); diff --git a/src/main/java/techreborn/init/ModLoot.java b/src/main/java/techreborn/init/ModLoot.java index 26cc869c4..afc4de215 100644 --- a/src/main/java/techreborn/init/ModLoot.java +++ b/src/main/java/techreborn/init/ModLoot.java @@ -24,64 +24,141 @@ package techreborn.init; -import net.minecraft.util.Identifier; -import techreborn.TechReborn; +import net.fabricmc.fabric.api.loot.v1.FabricLootPoolBuilder; +import net.fabricmc.fabric.api.loot.v1.event.LootTableLoadingCallback; +import net.minecraft.item.ItemConvertible; +import net.minecraft.world.loot.LootPool; +import net.minecraft.world.loot.UniformLootTableRange; +import net.minecraft.world.loot.entry.ItemEntry; +import net.minecraft.world.loot.entry.LootEntry; +import net.minecraft.world.loot.function.SetCountLootFunction; import techreborn.config.ConfigTechReborn; - -import java.util.ArrayList; -import java.util.List; +import techreborn.init.TRContent.Ingots; +import techreborn.init.TRContent.Parts; public class ModLoot { - public static List lootTables = new ArrayList(); - public static void init() { - if (ConfigTechReborn.enableOverworldLoot) { - lootTables.add(new Identifier(TechReborn.MOD_ID, "chests/abandoned_mineshaft")); - lootTables.add(new Identifier(TechReborn.MOD_ID, "chests/desert_pyramid")); - lootTables.add(new Identifier(TechReborn.MOD_ID, "chests/igloo_chest")); - lootTables.add(new Identifier(TechReborn.MOD_ID, "chests/jungle_temple")); - lootTables.add(new Identifier(TechReborn.MOD_ID, "chests/simple_dungeon")); - lootTables.add(new Identifier(TechReborn.MOD_ID, "chests/stronghold_corridor")); - lootTables.add(new Identifier(TechReborn.MOD_ID, "chests/stronghold_crossing")); - lootTables.add(new Identifier(TechReborn.MOD_ID, "chests/stronghold_library")); - lootTables.add(new Identifier(TechReborn.MOD_ID, "chests/village_blacksmith")); - lootTables.add(new Identifier(TechReborn.MOD_ID, "chests/woodland_mansion")); - } - if (ConfigTechReborn.enableNetherLoot) { - lootTables.add(new Identifier(TechReborn.MOD_ID, "chests/nether_bridge")); - } - if (ConfigTechReborn.enableEndLoot) { - lootTables.add(new Identifier(TechReborn.MOD_ID, "chests/end_city_treasure")); - } - for (Identifier lootTable : lootTables) { - //LootTables.registerLootTable(lootTable); - } + LootEntry copperIngot = makeEntry(Ingots.COPPER); + LootEntry tinIngot = makeEntry(Ingots.TIN); + LootEntry leadIngot = makeEntry(Ingots.LEAD); + LootEntry silverIngot = makeEntry(Ingots.SILVER); + LootEntry refinedronIngot = makeEntry(Ingots.REFINED_IRON); + LootEntry advancedalloyIngot = makeEntry(Ingots.ADVANCED_ALLOY); + LootEntry basicFrame = makeEntry(TRContent.MachineBlocks.BASIC.frame.asItem()); + LootEntry basicCircuit = makeEntry(Parts.ELECTRONIC_CIRCUIT); + + LootEntry aluminumIngot = makeEntry(Ingots.ALUMINUM); + LootEntry electrumIngot = makeEntry(Ingots.ELECTRUM); + LootEntry invarIngot = makeEntry(Ingots.INVAR); + LootEntry nickelIngot = makeEntry(Ingots.NICKEL); + LootEntry steelIngot = makeEntry(Ingots.STEEL); + LootEntry zincIngot = makeEntry(Ingots.ZINC); + LootEntry advancedFrame = makeEntry(TRContent.MachineBlocks.ADVANCED.frame.asItem()); + LootEntry advancedCircuit = makeEntry(Parts.ADVANCED_CIRCUIT); + LootEntry dataStorageChip = makeEntry(Parts.DATA_STORAGE_CHIP); + + LootEntry chromeIngot = makeEntry(Ingots.CHROME); + LootEntry iridiumIngot = makeEntry(Ingots.IRIDIUM); + LootEntry platinumIngot = makeEntry(Ingots.PLATINUM); + LootEntry titaniumIngot = makeEntry(Ingots.TITANIUM); + LootEntry tungstenIngot = makeEntry(Ingots.TUNGSTEN); + LootEntry tungstensteelIngot = makeEntry(Ingots.TUNGSTENSTEEL); + LootEntry industrialFrame = makeEntry(TRContent.MachineBlocks.INDUSTRIAL.frame.asItem()); + LootEntry industrialCircuit = makeEntry(Parts.INDUSTRIAL_CIRCUIT); + LootEntry energyFlowChip = makeEntry(Parts.ENERGY_FLOW_CHIP); + + + + LootPool poolBasic = FabricLootPoolBuilder.builder().withEntry(copperIngot).withEntry(tinIngot) + .withEntry(leadIngot).withEntry(silverIngot).withEntry(refinedronIngot).withEntry(advancedalloyIngot) + .withEntry(basicFrame).withEntry(basicCircuit).withRolls(UniformLootTableRange.between(1.0f, 2.0f)) + .build(); + + LootPool poolAdvanced = FabricLootPoolBuilder.builder().withEntry(aluminumIngot).withEntry(electrumIngot) + .withEntry(invarIngot).withEntry(nickelIngot).withEntry(steelIngot).withEntry(zincIngot) + .withEntry(advancedFrame).withEntry(advancedCircuit).withEntry(dataStorageChip).withRolls(UniformLootTableRange.between(1.0f, 3.0f)) + .build(); + + LootPool poolIndustrial = FabricLootPoolBuilder.builder().withEntry(chromeIngot).withEntry(iridiumIngot) + .withEntry(platinumIngot).withEntry(titaniumIngot).withEntry(tungstenIngot).withEntry(tungstensteelIngot) + .withEntry(industrialFrame).withEntry(industrialCircuit).withEntry(energyFlowChip).withRolls(UniformLootTableRange.between(1.0f, 3.0f)) + .build(); + + LootTableLoadingCallback.EVENT.register((resourceManager, lootManager, ident, supplier, setter) -> { + String stringId = ident.toString(); + if (!stringId.startsWith("minecraft:chests")) { + return; + } + + if (ConfigTechReborn.enableOverworldLoot) { + switch (stringId) { + case "minecraft:chests/abandoned_mineshaft": + supplier.withPool(poolBasic); + break; + case "minecraft:chests/desert_pyramid": + supplier.withPool(poolBasic); + break; + case "minecraft:chests/igloo_chest": + supplier.withPool(poolBasic); + break; + case "minecraft:chests/jungle_temple": + supplier.withPool(poolBasic); + break; + case "minecraft:chests/simple_dungeon": + supplier.withPool(poolBasic); + break; + case "minecraft:chests/village/village_weaponsmith": + supplier.withPool(poolBasic); + break; + case "minecraft:chests/village/village_armorer": + supplier.withPool(poolBasic); + break; + case "minecraft:chests/village/village_toolsmith": + supplier.withPool(poolBasic); + break; + case "minecraft:chests/stronghold_corridor": + supplier.withPool(poolAdvanced); + break; + case "minecraft:chests/stronghold_crossing": + supplier.withPool(poolAdvanced); + break; + case "minecraft:chests/stronghold_library": + supplier.withPool(poolAdvanced); + break; + case "minecraft:chests/woodland_mansion": + supplier.withPool(poolIndustrial); + break; + } + } + + if (ConfigTechReborn.enableNetherLoot) { + if (stringId.equals("minecraft:chests/nether_bridge")) { + supplier.withPool(poolAdvanced); + } + } + + if (ConfigTechReborn.enableEndLoot) { + if (stringId.equals("minecraft:chests/end_city_treasure")) { + supplier.withPool(poolIndustrial); + } + } + + }); } -// @SubscribeEvent -// public void lootLoad(LootTableLoadEvent event) { -// if (!event.getName().getNamespace().equals("minecraft")) { -// return; -// } -// for (Identifier lootTable : lootTables) { -// if (event.getName().getNamespace().equals(lootTable.getPath())) { -// event.getTable().addPool(getLootPool(lootTable)); -// TechReborn.LOGGER.debug("Loot pool injected into " + lootTable.getPath()); -// } -// } -// } -// -// /** -// * Generates loot pool to be injected into vanilla loot pools -// * -// * @param lootTable ResourceLocation Loot table to inject -// * @return LootPool Loot pool to inject -// */ -// private LootPool getLootPool(Identifier lootTable) { -// LootEntry entry = new LootTableEntry(lootTable, 1, 0, new LootCondition[0], "lootEntry_" + lootTable.toString()); -// LootPool pool = new LootPool(new LootEntry[] { entry }, new LootCondition[0], new UniformLootTableRange(1), new UniformLootTableRange(0, 1), "lootPool_" + lootTable.toString()); -// return pool; -// } + /** + * Makes loot entry from item provided + * + * @param item Item to include into LootEntry + * @return LootEntry for item provided + */ + private static LootEntry makeEntry(ItemConvertible item) { + + return ItemEntry.builder(item).setWeight(5) + .withFunction(SetCountLootFunction.builder(UniformLootTableRange.between(1.0f, 2.0f))).build(); + } + + } diff --git a/src/main/resources/assets/techreborn/loot_tables/chests/abandoned_mineshaft.json b/src/main/resources/assets/techreborn/loot_tables/chests/abandoned_mineshaft.json deleted file mode 100644 index 90f6dba61..000000000 --- a/src/main/resources/assets/techreborn/loot_tables/chests/abandoned_mineshaft.json +++ /dev/null @@ -1,131 +0,0 @@ -{ - "pools": [ - { - "name": "techreborn", - "rolls": 1, - "entries": [ - { - "type": "item", - "name": "techreborn:bronze_ingot", - "entryName": "bronze_ingot", - "weight": 5, - "functions": [ - { - "function": "set_count", - "count": { - "min": 1, - "max": 2 - } - } - ] - }, - { - "type": "item", - "name": "techreborn:copper_ingot", - "entryName": "copper_ingot", - "weight": 5, - "functions": [ - { - "function": "set_count", - "count": { - "min": 1, - "max": 2 - } - } - ] - }, - { - "type": "item", - "name": "techreborn:lead_ingot", - "entryName": "lead_ingot", - "weight": 5, - "functions": [ - { - "function": "set_count", - "count": { - "min": 1, - "max": 2 - } - } - ] - }, - { - "type": "item", - "name": "techreborn:silver_ingot", - "entryName": "silver_ingot", - "weight": 5, - "functions": [ - { - "function": "set_count", - "count": { - "min": 1, - "max": 2 - } - } - ] - }, - { - "type": "item", - "name": "techreborn:tin_ingot", - "entryName": "tin_ingot", - "weight": 5, - "functions": [ - { - "function": "set_count", - "count": { - "min": 1, - "max": 2 - } - } - ] - }, - { - "type": "item", - "name": "techreborn:refined_iron_ingot", - "entryName": "refined_iron_ingot", - "weight": 5, - "functions": [ - { - "function": "set_count", - "count": { - "min": 1, - "max": 2 - } - } - ] - }, - { - "type": "item", - "name": "techreborn:advanced_alloy_ingot", - "entryName": "advanced_alloy_ingot", - "weight": 5, - "functions": [ - { - "function": "set_count", - "count": { - "min": 1, - "max": 2 - } - } - ] - }, - { - "type": "item", - "name": "techreborn:basic_machine_frame", - "entryName": "basic_frame", - "weight": 5 - }, - { - "type": "item", - "name": "techreborn:electronic_circuit", - "entryName": "basic_circuit", - "weight": 5 - }, - { - "type": "empty", - "weight": 50 - } - ] - } - ] -} diff --git a/src/main/resources/assets/techreborn/loot_tables/chests/desert_pyramid.json b/src/main/resources/assets/techreborn/loot_tables/chests/desert_pyramid.json deleted file mode 100644 index 90f6dba61..000000000 --- a/src/main/resources/assets/techreborn/loot_tables/chests/desert_pyramid.json +++ /dev/null @@ -1,131 +0,0 @@ -{ - "pools": [ - { - "name": "techreborn", - "rolls": 1, - "entries": [ - { - "type": "item", - "name": "techreborn:bronze_ingot", - "entryName": "bronze_ingot", - "weight": 5, - "functions": [ - { - "function": "set_count", - "count": { - "min": 1, - "max": 2 - } - } - ] - }, - { - "type": "item", - "name": "techreborn:copper_ingot", - "entryName": "copper_ingot", - "weight": 5, - "functions": [ - { - "function": "set_count", - "count": { - "min": 1, - "max": 2 - } - } - ] - }, - { - "type": "item", - "name": "techreborn:lead_ingot", - "entryName": "lead_ingot", - "weight": 5, - "functions": [ - { - "function": "set_count", - "count": { - "min": 1, - "max": 2 - } - } - ] - }, - { - "type": "item", - "name": "techreborn:silver_ingot", - "entryName": "silver_ingot", - "weight": 5, - "functions": [ - { - "function": "set_count", - "count": { - "min": 1, - "max": 2 - } - } - ] - }, - { - "type": "item", - "name": "techreborn:tin_ingot", - "entryName": "tin_ingot", - "weight": 5, - "functions": [ - { - "function": "set_count", - "count": { - "min": 1, - "max": 2 - } - } - ] - }, - { - "type": "item", - "name": "techreborn:refined_iron_ingot", - "entryName": "refined_iron_ingot", - "weight": 5, - "functions": [ - { - "function": "set_count", - "count": { - "min": 1, - "max": 2 - } - } - ] - }, - { - "type": "item", - "name": "techreborn:advanced_alloy_ingot", - "entryName": "advanced_alloy_ingot", - "weight": 5, - "functions": [ - { - "function": "set_count", - "count": { - "min": 1, - "max": 2 - } - } - ] - }, - { - "type": "item", - "name": "techreborn:basic_machine_frame", - "entryName": "basic_frame", - "weight": 5 - }, - { - "type": "item", - "name": "techreborn:electronic_circuit", - "entryName": "basic_circuit", - "weight": 5 - }, - { - "type": "empty", - "weight": 50 - } - ] - } - ] -} diff --git a/src/main/resources/assets/techreborn/loot_tables/chests/end_city_treasure.json b/src/main/resources/assets/techreborn/loot_tables/chests/end_city_treasure.json deleted file mode 100644 index 15fe3239c..000000000 --- a/src/main/resources/assets/techreborn/loot_tables/chests/end_city_treasure.json +++ /dev/null @@ -1,125 +0,0 @@ -{ - "pools": [ - { - "name": "techreborn", - "rolls": { - "min": 1, - "max": 3 - }, - "entries": [ - { - "type": "item", - "name": "techreborn:chrome_ingot", - "entryName": "chrome_ingot", - "weight": 10, - "functions": [ - { - "function": "set_count", - "count": { - "min": 1, - "max": 2 - } - } - ] - }, - { - "type": "item", - "name": "techreborn:iridium_ingot", - "entryName": "iridium_ingot", - "weight": 10, - "functions": [ - { - "function": "set_count", - "count": { - "min": 1, - "max": 2 - } - } - ] - }, - { - "type": "item", - "name": "techreborn:platinum_ingot", - "entryName": "platinum_ingot", - "weight": 10, - "functions": [ - { - "function": "set_count", - "count": { - "min": 1, - "max": 2 - } - } - ] - }, - { - "type": "item", - "name": "techreborn:titanium_ingot", - "entryName": "titanium_ingot", - "weight": 10, - "functions": [ - { - "function": "set_count", - "count": { - "min": 1, - "max": 2 - } - } - ] - }, - { - "type": "item", - "name": "techreborn:tungsten_ingot", - "entryName": "tungsten_ingot", - "weight": 10, - "functions": [ - { - "function": "set_count", - "count": { - "min": 1, - "max": 2 - } - } - ] - }, - { - "type": "item", - "name": "techreborn:tungstensteel_ingot", - "entryName": "tungstensteel_ingot", - "weight": 10, - "functions": [ - { - "function": "set_count", - "count": { - "min": 1, - "max": 2 - } - } - ] - }, - { - "type": "item", - "name": "techreborn:industrial_machine_frame", - "entryName": "tier3_machine_block", - "weight": 30 - }, - { - "type": "item", - "name": "techreborn:industrial_circuit", - "entryName": "tier3_electronic_circuit", - "weight": 30 - }, - { - "type": "item", - "name": "techreborn:energy_flow_chip", - "entryName": "tier2_data_circuit", - "weight": 15 - }, - { - "type": "empty", - "weight": 20 - } - ] - } - ] -} diff --git a/src/main/resources/assets/techreborn/loot_tables/chests/igloo_chest.json b/src/main/resources/assets/techreborn/loot_tables/chests/igloo_chest.json deleted file mode 100644 index 90f6dba61..000000000 --- a/src/main/resources/assets/techreborn/loot_tables/chests/igloo_chest.json +++ /dev/null @@ -1,131 +0,0 @@ -{ - "pools": [ - { - "name": "techreborn", - "rolls": 1, - "entries": [ - { - "type": "item", - "name": "techreborn:bronze_ingot", - "entryName": "bronze_ingot", - "weight": 5, - "functions": [ - { - "function": "set_count", - "count": { - "min": 1, - "max": 2 - } - } - ] - }, - { - "type": "item", - "name": "techreborn:copper_ingot", - "entryName": "copper_ingot", - "weight": 5, - "functions": [ - { - "function": "set_count", - "count": { - "min": 1, - "max": 2 - } - } - ] - }, - { - "type": "item", - "name": "techreborn:lead_ingot", - "entryName": "lead_ingot", - "weight": 5, - "functions": [ - { - "function": "set_count", - "count": { - "min": 1, - "max": 2 - } - } - ] - }, - { - "type": "item", - "name": "techreborn:silver_ingot", - "entryName": "silver_ingot", - "weight": 5, - "functions": [ - { - "function": "set_count", - "count": { - "min": 1, - "max": 2 - } - } - ] - }, - { - "type": "item", - "name": "techreborn:tin_ingot", - "entryName": "tin_ingot", - "weight": 5, - "functions": [ - { - "function": "set_count", - "count": { - "min": 1, - "max": 2 - } - } - ] - }, - { - "type": "item", - "name": "techreborn:refined_iron_ingot", - "entryName": "refined_iron_ingot", - "weight": 5, - "functions": [ - { - "function": "set_count", - "count": { - "min": 1, - "max": 2 - } - } - ] - }, - { - "type": "item", - "name": "techreborn:advanced_alloy_ingot", - "entryName": "advanced_alloy_ingot", - "weight": 5, - "functions": [ - { - "function": "set_count", - "count": { - "min": 1, - "max": 2 - } - } - ] - }, - { - "type": "item", - "name": "techreborn:basic_machine_frame", - "entryName": "basic_frame", - "weight": 5 - }, - { - "type": "item", - "name": "techreborn:electronic_circuit", - "entryName": "basic_circuit", - "weight": 5 - }, - { - "type": "empty", - "weight": 50 - } - ] - } - ] -} diff --git a/src/main/resources/assets/techreborn/loot_tables/chests/jungle_temple.json b/src/main/resources/assets/techreborn/loot_tables/chests/jungle_temple.json deleted file mode 100644 index 90f6dba61..000000000 --- a/src/main/resources/assets/techreborn/loot_tables/chests/jungle_temple.json +++ /dev/null @@ -1,131 +0,0 @@ -{ - "pools": [ - { - "name": "techreborn", - "rolls": 1, - "entries": [ - { - "type": "item", - "name": "techreborn:bronze_ingot", - "entryName": "bronze_ingot", - "weight": 5, - "functions": [ - { - "function": "set_count", - "count": { - "min": 1, - "max": 2 - } - } - ] - }, - { - "type": "item", - "name": "techreborn:copper_ingot", - "entryName": "copper_ingot", - "weight": 5, - "functions": [ - { - "function": "set_count", - "count": { - "min": 1, - "max": 2 - } - } - ] - }, - { - "type": "item", - "name": "techreborn:lead_ingot", - "entryName": "lead_ingot", - "weight": 5, - "functions": [ - { - "function": "set_count", - "count": { - "min": 1, - "max": 2 - } - } - ] - }, - { - "type": "item", - "name": "techreborn:silver_ingot", - "entryName": "silver_ingot", - "weight": 5, - "functions": [ - { - "function": "set_count", - "count": { - "min": 1, - "max": 2 - } - } - ] - }, - { - "type": "item", - "name": "techreborn:tin_ingot", - "entryName": "tin_ingot", - "weight": 5, - "functions": [ - { - "function": "set_count", - "count": { - "min": 1, - "max": 2 - } - } - ] - }, - { - "type": "item", - "name": "techreborn:refined_iron_ingot", - "entryName": "refined_iron_ingot", - "weight": 5, - "functions": [ - { - "function": "set_count", - "count": { - "min": 1, - "max": 2 - } - } - ] - }, - { - "type": "item", - "name": "techreborn:advanced_alloy_ingot", - "entryName": "advanced_alloy_ingot", - "weight": 5, - "functions": [ - { - "function": "set_count", - "count": { - "min": 1, - "max": 2 - } - } - ] - }, - { - "type": "item", - "name": "techreborn:basic_machine_frame", - "entryName": "basic_frame", - "weight": 5 - }, - { - "type": "item", - "name": "techreborn:electronic_circuit", - "entryName": "basic_circuit", - "weight": 5 - }, - { - "type": "empty", - "weight": 50 - } - ] - } - ] -} diff --git a/src/main/resources/assets/techreborn/loot_tables/chests/nether_bridge.json b/src/main/resources/assets/techreborn/loot_tables/chests/nether_bridge.json deleted file mode 100644 index 0c2e97b42..000000000 --- a/src/main/resources/assets/techreborn/loot_tables/chests/nether_bridge.json +++ /dev/null @@ -1,140 +0,0 @@ -{ - "pools": [ - { - "name": "techreborn", - "rolls": { - "min": 1, - "max": 3 - }, - "entries": [ - { - "type": "item", - "name": "techreborn:aluminum_ingot", - "entryName": "aluminium_ingot", - "weight": 10, - "functions": [ - { - "function": "set_count", - "count": { - "min": 1, - "max": 2 - } - } - ] - }, - { - "type": "item", - "name": "techreborn:brass_ingot", - "entryName": "brass_ingot", - "weight": 10, - "functions": [ - { - "function": "set_count", - "count": { - "min": 1, - "max": 2 - } - } - ] - }, - { - "type": "item", - "name": "techreborn:electrum_ingot", - "entryName": "electrum_ingot", - "weight": 10, - "functions": [ - { - "function": "set_count", - "count": { - "min": 1, - "max": 2 - } - } - ] - }, - { - "type": "item", - "name": "techreborn:invar_ingot", - "entryName": "invar_ingot", - "weight": 10, - "functions": [ - { - "function": "set_count", - "count": { - "min": 1, - "max": 2 - } - } - ] - }, - { - "type": "item", - "name": "techreborn:nickel_ingot", - "entryName": "nickel_ingot", - "weight": 10, - "functions": [ - { - "function": "set_count", - "count": { - "min": 1, - "max": 2 - } - } - ] - }, - { - "type": "item", - "name": "techreborn:steel_ingot", - "entryName": "steel_ingot", - "weight": 10, - "functions": [ - { - "function": "set_count", - "count": { - "min": 1, - "max": 2 - } - } - ] - }, - { - "type": "item", - "name": "techreborn:zinc_ingot", - "entryName": "zinc_ingot", - "weight": 10, - "functions": [ - { - "function": "set_count", - "count": { - "min": 1, - "max": 2 - } - } - ] - }, - { - "type": "item", - "name": "techreborn:advanced_machine_frame", - "entryName": "tier2_machine_block", - "weight": 30 - }, - { - "type": "item", - "name": "techreborn:advanced_circuit", - "entryName": "tier2_electronic_circuit", - "weight": 15 - }, - { - "type": "item", - "name": "techreborn:data_storage_chip", - "entryName": "tier1_data_circuit", - "weight": 15 - }, - { - "type": "empty", - "weight": 20 - } - ] - } - ] -} diff --git a/src/main/resources/assets/techreborn/loot_tables/chests/simple_dungeon.json b/src/main/resources/assets/techreborn/loot_tables/chests/simple_dungeon.json deleted file mode 100644 index 90f6dba61..000000000 --- a/src/main/resources/assets/techreborn/loot_tables/chests/simple_dungeon.json +++ /dev/null @@ -1,131 +0,0 @@ -{ - "pools": [ - { - "name": "techreborn", - "rolls": 1, - "entries": [ - { - "type": "item", - "name": "techreborn:bronze_ingot", - "entryName": "bronze_ingot", - "weight": 5, - "functions": [ - { - "function": "set_count", - "count": { - "min": 1, - "max": 2 - } - } - ] - }, - { - "type": "item", - "name": "techreborn:copper_ingot", - "entryName": "copper_ingot", - "weight": 5, - "functions": [ - { - "function": "set_count", - "count": { - "min": 1, - "max": 2 - } - } - ] - }, - { - "type": "item", - "name": "techreborn:lead_ingot", - "entryName": "lead_ingot", - "weight": 5, - "functions": [ - { - "function": "set_count", - "count": { - "min": 1, - "max": 2 - } - } - ] - }, - { - "type": "item", - "name": "techreborn:silver_ingot", - "entryName": "silver_ingot", - "weight": 5, - "functions": [ - { - "function": "set_count", - "count": { - "min": 1, - "max": 2 - } - } - ] - }, - { - "type": "item", - "name": "techreborn:tin_ingot", - "entryName": "tin_ingot", - "weight": 5, - "functions": [ - { - "function": "set_count", - "count": { - "min": 1, - "max": 2 - } - } - ] - }, - { - "type": "item", - "name": "techreborn:refined_iron_ingot", - "entryName": "refined_iron_ingot", - "weight": 5, - "functions": [ - { - "function": "set_count", - "count": { - "min": 1, - "max": 2 - } - } - ] - }, - { - "type": "item", - "name": "techreborn:advanced_alloy_ingot", - "entryName": "advanced_alloy_ingot", - "weight": 5, - "functions": [ - { - "function": "set_count", - "count": { - "min": 1, - "max": 2 - } - } - ] - }, - { - "type": "item", - "name": "techreborn:basic_machine_frame", - "entryName": "basic_frame", - "weight": 5 - }, - { - "type": "item", - "name": "techreborn:electronic_circuit", - "entryName": "basic_circuit", - "weight": 5 - }, - { - "type": "empty", - "weight": 50 - } - ] - } - ] -} diff --git a/src/main/resources/assets/techreborn/loot_tables/chests/stronghold_corridor.json b/src/main/resources/assets/techreborn/loot_tables/chests/stronghold_corridor.json deleted file mode 100644 index 0c2e97b42..000000000 --- a/src/main/resources/assets/techreborn/loot_tables/chests/stronghold_corridor.json +++ /dev/null @@ -1,140 +0,0 @@ -{ - "pools": [ - { - "name": "techreborn", - "rolls": { - "min": 1, - "max": 3 - }, - "entries": [ - { - "type": "item", - "name": "techreborn:aluminum_ingot", - "entryName": "aluminium_ingot", - "weight": 10, - "functions": [ - { - "function": "set_count", - "count": { - "min": 1, - "max": 2 - } - } - ] - }, - { - "type": "item", - "name": "techreborn:brass_ingot", - "entryName": "brass_ingot", - "weight": 10, - "functions": [ - { - "function": "set_count", - "count": { - "min": 1, - "max": 2 - } - } - ] - }, - { - "type": "item", - "name": "techreborn:electrum_ingot", - "entryName": "electrum_ingot", - "weight": 10, - "functions": [ - { - "function": "set_count", - "count": { - "min": 1, - "max": 2 - } - } - ] - }, - { - "type": "item", - "name": "techreborn:invar_ingot", - "entryName": "invar_ingot", - "weight": 10, - "functions": [ - { - "function": "set_count", - "count": { - "min": 1, - "max": 2 - } - } - ] - }, - { - "type": "item", - "name": "techreborn:nickel_ingot", - "entryName": "nickel_ingot", - "weight": 10, - "functions": [ - { - "function": "set_count", - "count": { - "min": 1, - "max": 2 - } - } - ] - }, - { - "type": "item", - "name": "techreborn:steel_ingot", - "entryName": "steel_ingot", - "weight": 10, - "functions": [ - { - "function": "set_count", - "count": { - "min": 1, - "max": 2 - } - } - ] - }, - { - "type": "item", - "name": "techreborn:zinc_ingot", - "entryName": "zinc_ingot", - "weight": 10, - "functions": [ - { - "function": "set_count", - "count": { - "min": 1, - "max": 2 - } - } - ] - }, - { - "type": "item", - "name": "techreborn:advanced_machine_frame", - "entryName": "tier2_machine_block", - "weight": 30 - }, - { - "type": "item", - "name": "techreborn:advanced_circuit", - "entryName": "tier2_electronic_circuit", - "weight": 15 - }, - { - "type": "item", - "name": "techreborn:data_storage_chip", - "entryName": "tier1_data_circuit", - "weight": 15 - }, - { - "type": "empty", - "weight": 20 - } - ] - } - ] -} diff --git a/src/main/resources/assets/techreborn/loot_tables/chests/stronghold_crossing.json b/src/main/resources/assets/techreborn/loot_tables/chests/stronghold_crossing.json deleted file mode 100644 index 0c2e97b42..000000000 --- a/src/main/resources/assets/techreborn/loot_tables/chests/stronghold_crossing.json +++ /dev/null @@ -1,140 +0,0 @@ -{ - "pools": [ - { - "name": "techreborn", - "rolls": { - "min": 1, - "max": 3 - }, - "entries": [ - { - "type": "item", - "name": "techreborn:aluminum_ingot", - "entryName": "aluminium_ingot", - "weight": 10, - "functions": [ - { - "function": "set_count", - "count": { - "min": 1, - "max": 2 - } - } - ] - }, - { - "type": "item", - "name": "techreborn:brass_ingot", - "entryName": "brass_ingot", - "weight": 10, - "functions": [ - { - "function": "set_count", - "count": { - "min": 1, - "max": 2 - } - } - ] - }, - { - "type": "item", - "name": "techreborn:electrum_ingot", - "entryName": "electrum_ingot", - "weight": 10, - "functions": [ - { - "function": "set_count", - "count": { - "min": 1, - "max": 2 - } - } - ] - }, - { - "type": "item", - "name": "techreborn:invar_ingot", - "entryName": "invar_ingot", - "weight": 10, - "functions": [ - { - "function": "set_count", - "count": { - "min": 1, - "max": 2 - } - } - ] - }, - { - "type": "item", - "name": "techreborn:nickel_ingot", - "entryName": "nickel_ingot", - "weight": 10, - "functions": [ - { - "function": "set_count", - "count": { - "min": 1, - "max": 2 - } - } - ] - }, - { - "type": "item", - "name": "techreborn:steel_ingot", - "entryName": "steel_ingot", - "weight": 10, - "functions": [ - { - "function": "set_count", - "count": { - "min": 1, - "max": 2 - } - } - ] - }, - { - "type": "item", - "name": "techreborn:zinc_ingot", - "entryName": "zinc_ingot", - "weight": 10, - "functions": [ - { - "function": "set_count", - "count": { - "min": 1, - "max": 2 - } - } - ] - }, - { - "type": "item", - "name": "techreborn:advanced_machine_frame", - "entryName": "tier2_machine_block", - "weight": 30 - }, - { - "type": "item", - "name": "techreborn:advanced_circuit", - "entryName": "tier2_electronic_circuit", - "weight": 15 - }, - { - "type": "item", - "name": "techreborn:data_storage_chip", - "entryName": "tier1_data_circuit", - "weight": 15 - }, - { - "type": "empty", - "weight": 20 - } - ] - } - ] -} diff --git a/src/main/resources/assets/techreborn/loot_tables/chests/stronghold_library.json b/src/main/resources/assets/techreborn/loot_tables/chests/stronghold_library.json deleted file mode 100644 index 0c2e97b42..000000000 --- a/src/main/resources/assets/techreborn/loot_tables/chests/stronghold_library.json +++ /dev/null @@ -1,140 +0,0 @@ -{ - "pools": [ - { - "name": "techreborn", - "rolls": { - "min": 1, - "max": 3 - }, - "entries": [ - { - "type": "item", - "name": "techreborn:aluminum_ingot", - "entryName": "aluminium_ingot", - "weight": 10, - "functions": [ - { - "function": "set_count", - "count": { - "min": 1, - "max": 2 - } - } - ] - }, - { - "type": "item", - "name": "techreborn:brass_ingot", - "entryName": "brass_ingot", - "weight": 10, - "functions": [ - { - "function": "set_count", - "count": { - "min": 1, - "max": 2 - } - } - ] - }, - { - "type": "item", - "name": "techreborn:electrum_ingot", - "entryName": "electrum_ingot", - "weight": 10, - "functions": [ - { - "function": "set_count", - "count": { - "min": 1, - "max": 2 - } - } - ] - }, - { - "type": "item", - "name": "techreborn:invar_ingot", - "entryName": "invar_ingot", - "weight": 10, - "functions": [ - { - "function": "set_count", - "count": { - "min": 1, - "max": 2 - } - } - ] - }, - { - "type": "item", - "name": "techreborn:nickel_ingot", - "entryName": "nickel_ingot", - "weight": 10, - "functions": [ - { - "function": "set_count", - "count": { - "min": 1, - "max": 2 - } - } - ] - }, - { - "type": "item", - "name": "techreborn:steel_ingot", - "entryName": "steel_ingot", - "weight": 10, - "functions": [ - { - "function": "set_count", - "count": { - "min": 1, - "max": 2 - } - } - ] - }, - { - "type": "item", - "name": "techreborn:zinc_ingot", - "entryName": "zinc_ingot", - "weight": 10, - "functions": [ - { - "function": "set_count", - "count": { - "min": 1, - "max": 2 - } - } - ] - }, - { - "type": "item", - "name": "techreborn:advanced_machine_frame", - "entryName": "tier2_machine_block", - "weight": 30 - }, - { - "type": "item", - "name": "techreborn:advanced_circuit", - "entryName": "tier2_electronic_circuit", - "weight": 15 - }, - { - "type": "item", - "name": "techreborn:data_storage_chip", - "entryName": "tier1_data_circuit", - "weight": 15 - }, - { - "type": "empty", - "weight": 20 - } - ] - } - ] -} diff --git a/src/main/resources/assets/techreborn/loot_tables/chests/village_blacksmith.json b/src/main/resources/assets/techreborn/loot_tables/chests/village_blacksmith.json deleted file mode 100644 index 90f6dba61..000000000 --- a/src/main/resources/assets/techreborn/loot_tables/chests/village_blacksmith.json +++ /dev/null @@ -1,131 +0,0 @@ -{ - "pools": [ - { - "name": "techreborn", - "rolls": 1, - "entries": [ - { - "type": "item", - "name": "techreborn:bronze_ingot", - "entryName": "bronze_ingot", - "weight": 5, - "functions": [ - { - "function": "set_count", - "count": { - "min": 1, - "max": 2 - } - } - ] - }, - { - "type": "item", - "name": "techreborn:copper_ingot", - "entryName": "copper_ingot", - "weight": 5, - "functions": [ - { - "function": "set_count", - "count": { - "min": 1, - "max": 2 - } - } - ] - }, - { - "type": "item", - "name": "techreborn:lead_ingot", - "entryName": "lead_ingot", - "weight": 5, - "functions": [ - { - "function": "set_count", - "count": { - "min": 1, - "max": 2 - } - } - ] - }, - { - "type": "item", - "name": "techreborn:silver_ingot", - "entryName": "silver_ingot", - "weight": 5, - "functions": [ - { - "function": "set_count", - "count": { - "min": 1, - "max": 2 - } - } - ] - }, - { - "type": "item", - "name": "techreborn:tin_ingot", - "entryName": "tin_ingot", - "weight": 5, - "functions": [ - { - "function": "set_count", - "count": { - "min": 1, - "max": 2 - } - } - ] - }, - { - "type": "item", - "name": "techreborn:refined_iron_ingot", - "entryName": "refined_iron_ingot", - "weight": 5, - "functions": [ - { - "function": "set_count", - "count": { - "min": 1, - "max": 2 - } - } - ] - }, - { - "type": "item", - "name": "techreborn:advanced_alloy_ingot", - "entryName": "advanced_alloy_ingot", - "weight": 5, - "functions": [ - { - "function": "set_count", - "count": { - "min": 1, - "max": 2 - } - } - ] - }, - { - "type": "item", - "name": "techreborn:basic_machine_frame", - "entryName": "basic_frame", - "weight": 5 - }, - { - "type": "item", - "name": "techreborn:electronic_circuit", - "entryName": "basic_circuit", - "weight": 5 - }, - { - "type": "empty", - "weight": 50 - } - ] - } - ] -} diff --git a/src/main/resources/assets/techreborn/loot_tables/chests/woodland_mansion.json b/src/main/resources/assets/techreborn/loot_tables/chests/woodland_mansion.json deleted file mode 100644 index 15fe3239c..000000000 --- a/src/main/resources/assets/techreborn/loot_tables/chests/woodland_mansion.json +++ /dev/null @@ -1,125 +0,0 @@ -{ - "pools": [ - { - "name": "techreborn", - "rolls": { - "min": 1, - "max": 3 - }, - "entries": [ - { - "type": "item", - "name": "techreborn:chrome_ingot", - "entryName": "chrome_ingot", - "weight": 10, - "functions": [ - { - "function": "set_count", - "count": { - "min": 1, - "max": 2 - } - } - ] - }, - { - "type": "item", - "name": "techreborn:iridium_ingot", - "entryName": "iridium_ingot", - "weight": 10, - "functions": [ - { - "function": "set_count", - "count": { - "min": 1, - "max": 2 - } - } - ] - }, - { - "type": "item", - "name": "techreborn:platinum_ingot", - "entryName": "platinum_ingot", - "weight": 10, - "functions": [ - { - "function": "set_count", - "count": { - "min": 1, - "max": 2 - } - } - ] - }, - { - "type": "item", - "name": "techreborn:titanium_ingot", - "entryName": "titanium_ingot", - "weight": 10, - "functions": [ - { - "function": "set_count", - "count": { - "min": 1, - "max": 2 - } - } - ] - }, - { - "type": "item", - "name": "techreborn:tungsten_ingot", - "entryName": "tungsten_ingot", - "weight": 10, - "functions": [ - { - "function": "set_count", - "count": { - "min": 1, - "max": 2 - } - } - ] - }, - { - "type": "item", - "name": "techreborn:tungstensteel_ingot", - "entryName": "tungstensteel_ingot", - "weight": 10, - "functions": [ - { - "function": "set_count", - "count": { - "min": 1, - "max": 2 - } - } - ] - }, - { - "type": "item", - "name": "techreborn:industrial_machine_frame", - "entryName": "tier3_machine_block", - "weight": 30 - }, - { - "type": "item", - "name": "techreborn:industrial_circuit", - "entryName": "tier3_electronic_circuit", - "weight": 30 - }, - { - "type": "item", - "name": "techreborn:energy_flow_chip", - "entryName": "tier2_data_circuit", - "weight": 15 - }, - { - "type": "empty", - "weight": 20 - } - ] - } - ] -}