From c3979610a9d92509396bde566f71629b508e9335 Mon Sep 17 00:00:00 2001 From: drcrazy Date: Fri, 10 Aug 2018 15:32:17 +0300 Subject: [PATCH 1/3] Removed unused imports --- .../java/techreborn/packets/PacketAutoCraftingTableLock.java | 2 -- .../java/techreborn/tiles/tier1/TileAutoCraftingTable.java | 3 --- 2 files changed, 5 deletions(-) diff --git a/src/main/java/techreborn/packets/PacketAutoCraftingTableLock.java b/src/main/java/techreborn/packets/PacketAutoCraftingTableLock.java index be1aa3adf..11fca1afa 100644 --- a/src/main/java/techreborn/packets/PacketAutoCraftingTableLock.java +++ b/src/main/java/techreborn/packets/PacketAutoCraftingTableLock.java @@ -30,8 +30,6 @@ import net.minecraftforge.fml.common.network.simpleimpl.MessageContext; import reborncore.common.network.ExtendedPacketBuffer; import reborncore.common.network.INetworkPacket; import techreborn.tiles.tier1.TileAutoCraftingTable; -import techreborn.tiles.tier1.TileRollingMachine; - import java.io.IOException; public class PacketAutoCraftingTableLock implements INetworkPacket { diff --git a/src/main/java/techreborn/tiles/tier1/TileAutoCraftingTable.java b/src/main/java/techreborn/tiles/tier1/TileAutoCraftingTable.java index 438574853..4e46c5abf 100644 --- a/src/main/java/techreborn/tiles/tier1/TileAutoCraftingTable.java +++ b/src/main/java/techreborn/tiles/tier1/TileAutoCraftingTable.java @@ -34,7 +34,6 @@ import net.minecraft.item.crafting.IRecipe; import net.minecraft.item.crafting.Ingredient; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.EnumFacing; -import net.minecraft.util.ResourceLocation; import net.minecraft.util.SoundCategory; import org.apache.commons.lang3.tuple.Pair; import reborncore.api.IToolDrop; @@ -42,7 +41,6 @@ import reborncore.api.tile.IInventoryProvider; import reborncore.common.powerSystem.TilePowerAcceptor; import reborncore.common.registration.RebornRegistry; import reborncore.common.registration.impl.ConfigRegistry; -import reborncore.common.tile.SlotConfiguration; import reborncore.common.util.Inventory; import reborncore.common.util.ItemUtils; import techreborn.client.container.IContainerProvider; @@ -55,7 +53,6 @@ import techreborn.lib.ModInfo; import javax.annotation.Nullable; import java.util.ArrayList; import java.util.List; -import java.util.Objects; /** * Created by modmuss50 on 20/06/2017. From d37f52a0ceb7f28bcb02c73bd661926862d08003 Mon Sep 17 00:00:00 2001 From: drcrazy Date: Fri, 10 Aug 2018 15:33:59 +0300 Subject: [PATCH 2/3] Less chance for overworld TR loot and made in configurable. CLoses #1572 --- .../techreborn/config/ConfigTechReborn.java | 7 +++++ src/main/java/techreborn/init/ModLoot.java | 31 ++++++++++++------- .../chests/abandoned_mineshaft.json | 29 ++++++++--------- .../loot_tables/chests/desert_pyramid.json | 29 ++++++++--------- .../loot_tables/chests/end_city_treasure.json | 2 +- .../loot_tables/chests/igloo_chest.json | 29 ++++++++--------- .../loot_tables/chests/jungle_temple.json | 29 ++++++++--------- .../loot_tables/chests/nether_bridge.json | 2 +- .../loot_tables/chests/simple_dungeon.json | 29 ++++++++--------- .../chests/stronghold_corridor.json | 2 +- .../chests/stronghold_crossing.json | 2 +- .../chests/stronghold_library.json | 2 +- .../chests/village_blacksmith.json | 29 ++++++++--------- .../loot_tables/chests/woodland_mansion.json | 2 +- 14 files changed, 110 insertions(+), 114 deletions(-) diff --git a/src/main/java/techreborn/config/ConfigTechReborn.java b/src/main/java/techreborn/config/ConfigTechReborn.java index 9acce9fd8..65dc1d51e 100644 --- a/src/main/java/techreborn/config/ConfigTechReborn.java +++ b/src/main/java/techreborn/config/ConfigTechReborn.java @@ -123,5 +123,12 @@ public class ConfigTechReborn { @ConfigRegistry(config = "generators", category = "solarPanelQuantum", key = "quantumNightRate", comment = "Generation rate during night for Quantum Solar Panel (Value in EU)") public static int quantumGenerationRateN = 64; + @ConfigRegistry(config = "worlds", category = "loot", key = "enableOverworldLoot", comment = "When true TechReborn will add ingots, machine frames and circuits to OverWorld loot chests.") + public static boolean enableOverworldLoot = true; + @ConfigRegistry(config = "worlds", category = "loot", key = "enableNetherLoot", comment = "When true TechReborn will add ingots, machine frames and circuits to Nether loot chests.") + public static boolean enableNetherLoot = true; + + @ConfigRegistry(config = "worlds", category = "loot", key = "enableEndLoot", comment = "When true TechReborn will add ingots, machine frames and circuits to The End loot chests.") + public static boolean enableEndLoot = true; } diff --git a/src/main/java/techreborn/init/ModLoot.java b/src/main/java/techreborn/init/ModLoot.java index be8a03212..a2bf5c02d 100644 --- a/src/main/java/techreborn/init/ModLoot.java +++ b/src/main/java/techreborn/init/ModLoot.java @@ -37,6 +37,7 @@ import net.minecraft.world.storage.loot.conditions.LootCondition; import net.minecraftforge.event.LootTableLoadEvent; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import techreborn.Core; +import techreborn.config.ConfigTechReborn; import techreborn.lib.ModInfo; public class ModLoot { @@ -44,18 +45,24 @@ public class ModLoot { public static List lootTables = new ArrayList(); public static void init() { - lootTables.add(new ResourceLocation(ModInfo.MOD_ID, "chests/abandoned_mineshaft")); - lootTables.add(new ResourceLocation(ModInfo.MOD_ID, "chests/desert_pyramid")); - lootTables.add(new ResourceLocation(ModInfo.MOD_ID, "chests/end_city_treasure")); - lootTables.add(new ResourceLocation(ModInfo.MOD_ID, "chests/igloo_chest")); - lootTables.add(new ResourceLocation(ModInfo.MOD_ID, "chests/jungle_temple")); - lootTables.add(new ResourceLocation(ModInfo.MOD_ID, "chests/nether_bridge")); - lootTables.add(new ResourceLocation(ModInfo.MOD_ID, "chests/simple_dungeon")); - lootTables.add(new ResourceLocation(ModInfo.MOD_ID, "chests/stronghold_corridor")); - lootTables.add(new ResourceLocation(ModInfo.MOD_ID, "chests/stronghold_crossing")); - lootTables.add(new ResourceLocation(ModInfo.MOD_ID, "chests/stronghold_library")); - lootTables.add(new ResourceLocation(ModInfo.MOD_ID, "chests/village_blacksmith")); - lootTables.add(new ResourceLocation(ModInfo.MOD_ID, "chests/woodland_mansion")); + if (ConfigTechReborn.enableOverworldLoot) { + lootTables.add(new ResourceLocation(ModInfo.MOD_ID, "chests/abandoned_mineshaft")); + lootTables.add(new ResourceLocation(ModInfo.MOD_ID, "chests/desert_pyramid")); + lootTables.add(new ResourceLocation(ModInfo.MOD_ID, "chests/igloo_chest")); + lootTables.add(new ResourceLocation(ModInfo.MOD_ID, "chests/jungle_temple")); + lootTables.add(new ResourceLocation(ModInfo.MOD_ID, "chests/simple_dungeon")); + lootTables.add(new ResourceLocation(ModInfo.MOD_ID, "chests/stronghold_corridor")); + lootTables.add(new ResourceLocation(ModInfo.MOD_ID, "chests/stronghold_crossing")); + lootTables.add(new ResourceLocation(ModInfo.MOD_ID, "chests/stronghold_library")); + lootTables.add(new ResourceLocation(ModInfo.MOD_ID, "chests/village_blacksmith")); + lootTables.add(new ResourceLocation(ModInfo.MOD_ID, "chests/woodland_mansion")); + } + if (ConfigTechReborn.enableNetherLoot) { + lootTables.add(new ResourceLocation(ModInfo.MOD_ID, "chests/nether_bridge")); + } + if (ConfigTechReborn.enableEndLoot) { + lootTables.add(new ResourceLocation(ModInfo.MOD_ID, "chests/end_city_treasure")); + } for (ResourceLocation lootTable : lootTables) { LootTableList.register(lootTable); 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 index e9aec259d..047e3ca90 100644 --- a/src/main/resources/assets/techreborn/loot_tables/chests/abandoned_mineshaft.json +++ b/src/main/resources/assets/techreborn/loot_tables/chests/abandoned_mineshaft.json @@ -2,16 +2,13 @@ "pools": [ { "name": "techreborn", - "rolls": { - "min": 1, - "max": 3 - }, + "rolls": 1, "entries": [ { "type": "item", "name": "techreborn:ingot", "entryName": "bronze_ingot", - "weight": 10, + "weight": 5, "functions": [ { "function": "set_count", @@ -30,7 +27,7 @@ "type": "item", "name": "techreborn:ingot", "entryName": "copper_ingot", - "weight": 10, + "weight": 5, "functions": [ { "function": "set_count", @@ -49,7 +46,7 @@ "type": "item", "name": "techreborn:ingot", "entryName": "lead_ingot", - "weight": 10, + "weight": 5, "functions": [ { "function": "set_count", @@ -68,7 +65,7 @@ "type": "item", "name": "techreborn:ingot", "entryName": "silver_ingot", - "weight": 10, + "weight": 5, "functions": [ { "function": "set_count", @@ -87,7 +84,7 @@ "type": "item", "name": "techreborn:ingot", "entryName": "tin_ingot", - "weight": 10, + "weight": 5, "functions": [ { "function": "set_count", @@ -106,7 +103,7 @@ "type": "item", "name": "techreborn:ingot", "entryName": "refined_iron_ingot", - "weight": 10, + "weight": 5, "functions": [ { "function": "set_count", @@ -125,7 +122,7 @@ "type": "item", "name": "techreborn:ingot", "entryName": "advanced_alloy_ingot", - "weight": 10, + "weight": 5, "functions": [ { "function": "set_count", @@ -144,7 +141,7 @@ "type": "item", "name": "techreborn:ingot", "entryName": "mixed_metal_ingot", - "weight": 10, + "weight": 5, "functions": [ { "function": "set_count", @@ -163,7 +160,7 @@ "type": "item", "name": "techreborn:machine_frame", "entryName": "basic_frame", - "weight": 30, + "weight": 5, "functions": [ { "function": "set_data", @@ -173,9 +170,9 @@ }, { "type": "item", - "name": "techreborn:machine_frame", + "name": "techreborn:part", "entryName": "basic_circuit", - "weight": 30, + "weight": 5, "functions": [ { "function": "set_data", @@ -185,7 +182,7 @@ }, { "type": "empty", - "weight": 20 + "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 index e9aec259d..047e3ca90 100644 --- a/src/main/resources/assets/techreborn/loot_tables/chests/desert_pyramid.json +++ b/src/main/resources/assets/techreborn/loot_tables/chests/desert_pyramid.json @@ -2,16 +2,13 @@ "pools": [ { "name": "techreborn", - "rolls": { - "min": 1, - "max": 3 - }, + "rolls": 1, "entries": [ { "type": "item", "name": "techreborn:ingot", "entryName": "bronze_ingot", - "weight": 10, + "weight": 5, "functions": [ { "function": "set_count", @@ -30,7 +27,7 @@ "type": "item", "name": "techreborn:ingot", "entryName": "copper_ingot", - "weight": 10, + "weight": 5, "functions": [ { "function": "set_count", @@ -49,7 +46,7 @@ "type": "item", "name": "techreborn:ingot", "entryName": "lead_ingot", - "weight": 10, + "weight": 5, "functions": [ { "function": "set_count", @@ -68,7 +65,7 @@ "type": "item", "name": "techreborn:ingot", "entryName": "silver_ingot", - "weight": 10, + "weight": 5, "functions": [ { "function": "set_count", @@ -87,7 +84,7 @@ "type": "item", "name": "techreborn:ingot", "entryName": "tin_ingot", - "weight": 10, + "weight": 5, "functions": [ { "function": "set_count", @@ -106,7 +103,7 @@ "type": "item", "name": "techreborn:ingot", "entryName": "refined_iron_ingot", - "weight": 10, + "weight": 5, "functions": [ { "function": "set_count", @@ -125,7 +122,7 @@ "type": "item", "name": "techreborn:ingot", "entryName": "advanced_alloy_ingot", - "weight": 10, + "weight": 5, "functions": [ { "function": "set_count", @@ -144,7 +141,7 @@ "type": "item", "name": "techreborn:ingot", "entryName": "mixed_metal_ingot", - "weight": 10, + "weight": 5, "functions": [ { "function": "set_count", @@ -163,7 +160,7 @@ "type": "item", "name": "techreborn:machine_frame", "entryName": "basic_frame", - "weight": 30, + "weight": 5, "functions": [ { "function": "set_data", @@ -173,9 +170,9 @@ }, { "type": "item", - "name": "techreborn:machine_frame", + "name": "techreborn:part", "entryName": "basic_circuit", - "weight": 30, + "weight": 5, "functions": [ { "function": "set_data", @@ -185,7 +182,7 @@ }, { "type": "empty", - "weight": 20 + "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 index b1743f46a..8d2051f63 100644 --- 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 @@ -173,7 +173,7 @@ }, { "type": "item", - "name": "techreborn:machine_frame", + "name": "techreborn:part", "entryName": "energy_flow_circuit", "weight": 30, "functions": [ 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 index e9aec259d..047e3ca90 100644 --- a/src/main/resources/assets/techreborn/loot_tables/chests/igloo_chest.json +++ b/src/main/resources/assets/techreborn/loot_tables/chests/igloo_chest.json @@ -2,16 +2,13 @@ "pools": [ { "name": "techreborn", - "rolls": { - "min": 1, - "max": 3 - }, + "rolls": 1, "entries": [ { "type": "item", "name": "techreborn:ingot", "entryName": "bronze_ingot", - "weight": 10, + "weight": 5, "functions": [ { "function": "set_count", @@ -30,7 +27,7 @@ "type": "item", "name": "techreborn:ingot", "entryName": "copper_ingot", - "weight": 10, + "weight": 5, "functions": [ { "function": "set_count", @@ -49,7 +46,7 @@ "type": "item", "name": "techreborn:ingot", "entryName": "lead_ingot", - "weight": 10, + "weight": 5, "functions": [ { "function": "set_count", @@ -68,7 +65,7 @@ "type": "item", "name": "techreborn:ingot", "entryName": "silver_ingot", - "weight": 10, + "weight": 5, "functions": [ { "function": "set_count", @@ -87,7 +84,7 @@ "type": "item", "name": "techreborn:ingot", "entryName": "tin_ingot", - "weight": 10, + "weight": 5, "functions": [ { "function": "set_count", @@ -106,7 +103,7 @@ "type": "item", "name": "techreborn:ingot", "entryName": "refined_iron_ingot", - "weight": 10, + "weight": 5, "functions": [ { "function": "set_count", @@ -125,7 +122,7 @@ "type": "item", "name": "techreborn:ingot", "entryName": "advanced_alloy_ingot", - "weight": 10, + "weight": 5, "functions": [ { "function": "set_count", @@ -144,7 +141,7 @@ "type": "item", "name": "techreborn:ingot", "entryName": "mixed_metal_ingot", - "weight": 10, + "weight": 5, "functions": [ { "function": "set_count", @@ -163,7 +160,7 @@ "type": "item", "name": "techreborn:machine_frame", "entryName": "basic_frame", - "weight": 30, + "weight": 5, "functions": [ { "function": "set_data", @@ -173,9 +170,9 @@ }, { "type": "item", - "name": "techreborn:machine_frame", + "name": "techreborn:part", "entryName": "basic_circuit", - "weight": 30, + "weight": 5, "functions": [ { "function": "set_data", @@ -185,7 +182,7 @@ }, { "type": "empty", - "weight": 20 + "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 index e9aec259d..047e3ca90 100644 --- a/src/main/resources/assets/techreborn/loot_tables/chests/jungle_temple.json +++ b/src/main/resources/assets/techreborn/loot_tables/chests/jungle_temple.json @@ -2,16 +2,13 @@ "pools": [ { "name": "techreborn", - "rolls": { - "min": 1, - "max": 3 - }, + "rolls": 1, "entries": [ { "type": "item", "name": "techreborn:ingot", "entryName": "bronze_ingot", - "weight": 10, + "weight": 5, "functions": [ { "function": "set_count", @@ -30,7 +27,7 @@ "type": "item", "name": "techreborn:ingot", "entryName": "copper_ingot", - "weight": 10, + "weight": 5, "functions": [ { "function": "set_count", @@ -49,7 +46,7 @@ "type": "item", "name": "techreborn:ingot", "entryName": "lead_ingot", - "weight": 10, + "weight": 5, "functions": [ { "function": "set_count", @@ -68,7 +65,7 @@ "type": "item", "name": "techreborn:ingot", "entryName": "silver_ingot", - "weight": 10, + "weight": 5, "functions": [ { "function": "set_count", @@ -87,7 +84,7 @@ "type": "item", "name": "techreborn:ingot", "entryName": "tin_ingot", - "weight": 10, + "weight": 5, "functions": [ { "function": "set_count", @@ -106,7 +103,7 @@ "type": "item", "name": "techreborn:ingot", "entryName": "refined_iron_ingot", - "weight": 10, + "weight": 5, "functions": [ { "function": "set_count", @@ -125,7 +122,7 @@ "type": "item", "name": "techreborn:ingot", "entryName": "advanced_alloy_ingot", - "weight": 10, + "weight": 5, "functions": [ { "function": "set_count", @@ -144,7 +141,7 @@ "type": "item", "name": "techreborn:ingot", "entryName": "mixed_metal_ingot", - "weight": 10, + "weight": 5, "functions": [ { "function": "set_count", @@ -163,7 +160,7 @@ "type": "item", "name": "techreborn:machine_frame", "entryName": "basic_frame", - "weight": 30, + "weight": 5, "functions": [ { "function": "set_data", @@ -173,9 +170,9 @@ }, { "type": "item", - "name": "techreborn:machine_frame", + "name": "techreborn:part", "entryName": "basic_circuit", - "weight": 30, + "weight": 5, "functions": [ { "function": "set_data", @@ -185,7 +182,7 @@ }, { "type": "empty", - "weight": 20 + "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 index 5e7840300..de5faca12 100644 --- a/src/main/resources/assets/techreborn/loot_tables/chests/nether_bridge.json +++ b/src/main/resources/assets/techreborn/loot_tables/chests/nether_bridge.json @@ -166,7 +166,7 @@ }, { "type": "item", - "name": "techreborn:machine_frame", + "name": "techreborn:part", "entryName": "data_storage_circuit", "weight": 15, "functions": [ 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 index e9aec259d..047e3ca90 100644 --- a/src/main/resources/assets/techreborn/loot_tables/chests/simple_dungeon.json +++ b/src/main/resources/assets/techreborn/loot_tables/chests/simple_dungeon.json @@ -2,16 +2,13 @@ "pools": [ { "name": "techreborn", - "rolls": { - "min": 1, - "max": 3 - }, + "rolls": 1, "entries": [ { "type": "item", "name": "techreborn:ingot", "entryName": "bronze_ingot", - "weight": 10, + "weight": 5, "functions": [ { "function": "set_count", @@ -30,7 +27,7 @@ "type": "item", "name": "techreborn:ingot", "entryName": "copper_ingot", - "weight": 10, + "weight": 5, "functions": [ { "function": "set_count", @@ -49,7 +46,7 @@ "type": "item", "name": "techreborn:ingot", "entryName": "lead_ingot", - "weight": 10, + "weight": 5, "functions": [ { "function": "set_count", @@ -68,7 +65,7 @@ "type": "item", "name": "techreborn:ingot", "entryName": "silver_ingot", - "weight": 10, + "weight": 5, "functions": [ { "function": "set_count", @@ -87,7 +84,7 @@ "type": "item", "name": "techreborn:ingot", "entryName": "tin_ingot", - "weight": 10, + "weight": 5, "functions": [ { "function": "set_count", @@ -106,7 +103,7 @@ "type": "item", "name": "techreborn:ingot", "entryName": "refined_iron_ingot", - "weight": 10, + "weight": 5, "functions": [ { "function": "set_count", @@ -125,7 +122,7 @@ "type": "item", "name": "techreborn:ingot", "entryName": "advanced_alloy_ingot", - "weight": 10, + "weight": 5, "functions": [ { "function": "set_count", @@ -144,7 +141,7 @@ "type": "item", "name": "techreborn:ingot", "entryName": "mixed_metal_ingot", - "weight": 10, + "weight": 5, "functions": [ { "function": "set_count", @@ -163,7 +160,7 @@ "type": "item", "name": "techreborn:machine_frame", "entryName": "basic_frame", - "weight": 30, + "weight": 5, "functions": [ { "function": "set_data", @@ -173,9 +170,9 @@ }, { "type": "item", - "name": "techreborn:machine_frame", + "name": "techreborn:part", "entryName": "basic_circuit", - "weight": 30, + "weight": 5, "functions": [ { "function": "set_data", @@ -185,7 +182,7 @@ }, { "type": "empty", - "weight": 20 + "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 index 5e7840300..de5faca12 100644 --- a/src/main/resources/assets/techreborn/loot_tables/chests/stronghold_corridor.json +++ b/src/main/resources/assets/techreborn/loot_tables/chests/stronghold_corridor.json @@ -166,7 +166,7 @@ }, { "type": "item", - "name": "techreborn:machine_frame", + "name": "techreborn:part", "entryName": "data_storage_circuit", "weight": 15, "functions": [ 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 index 5e7840300..de5faca12 100644 --- a/src/main/resources/assets/techreborn/loot_tables/chests/stronghold_crossing.json +++ b/src/main/resources/assets/techreborn/loot_tables/chests/stronghold_crossing.json @@ -166,7 +166,7 @@ }, { "type": "item", - "name": "techreborn:machine_frame", + "name": "techreborn:part", "entryName": "data_storage_circuit", "weight": 15, "functions": [ 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 index 5e7840300..de5faca12 100644 --- a/src/main/resources/assets/techreborn/loot_tables/chests/stronghold_library.json +++ b/src/main/resources/assets/techreborn/loot_tables/chests/stronghold_library.json @@ -166,7 +166,7 @@ }, { "type": "item", - "name": "techreborn:machine_frame", + "name": "techreborn:part", "entryName": "data_storage_circuit", "weight": 15, "functions": [ 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 index e9aec259d..047e3ca90 100644 --- a/src/main/resources/assets/techreborn/loot_tables/chests/village_blacksmith.json +++ b/src/main/resources/assets/techreborn/loot_tables/chests/village_blacksmith.json @@ -2,16 +2,13 @@ "pools": [ { "name": "techreborn", - "rolls": { - "min": 1, - "max": 3 - }, + "rolls": 1, "entries": [ { "type": "item", "name": "techreborn:ingot", "entryName": "bronze_ingot", - "weight": 10, + "weight": 5, "functions": [ { "function": "set_count", @@ -30,7 +27,7 @@ "type": "item", "name": "techreborn:ingot", "entryName": "copper_ingot", - "weight": 10, + "weight": 5, "functions": [ { "function": "set_count", @@ -49,7 +46,7 @@ "type": "item", "name": "techreborn:ingot", "entryName": "lead_ingot", - "weight": 10, + "weight": 5, "functions": [ { "function": "set_count", @@ -68,7 +65,7 @@ "type": "item", "name": "techreborn:ingot", "entryName": "silver_ingot", - "weight": 10, + "weight": 5, "functions": [ { "function": "set_count", @@ -87,7 +84,7 @@ "type": "item", "name": "techreborn:ingot", "entryName": "tin_ingot", - "weight": 10, + "weight": 5, "functions": [ { "function": "set_count", @@ -106,7 +103,7 @@ "type": "item", "name": "techreborn:ingot", "entryName": "refined_iron_ingot", - "weight": 10, + "weight": 5, "functions": [ { "function": "set_count", @@ -125,7 +122,7 @@ "type": "item", "name": "techreborn:ingot", "entryName": "advanced_alloy_ingot", - "weight": 10, + "weight": 5, "functions": [ { "function": "set_count", @@ -144,7 +141,7 @@ "type": "item", "name": "techreborn:ingot", "entryName": "mixed_metal_ingot", - "weight": 10, + "weight": 5, "functions": [ { "function": "set_count", @@ -163,7 +160,7 @@ "type": "item", "name": "techreborn:machine_frame", "entryName": "basic_frame", - "weight": 30, + "weight": 5, "functions": [ { "function": "set_data", @@ -173,9 +170,9 @@ }, { "type": "item", - "name": "techreborn:machine_frame", + "name": "techreborn:part", "entryName": "basic_circuit", - "weight": 30, + "weight": 5, "functions": [ { "function": "set_data", @@ -185,7 +182,7 @@ }, { "type": "empty", - "weight": 20 + "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 index b1743f46a..8d2051f63 100644 --- a/src/main/resources/assets/techreborn/loot_tables/chests/woodland_mansion.json +++ b/src/main/resources/assets/techreborn/loot_tables/chests/woodland_mansion.json @@ -173,7 +173,7 @@ }, { "type": "item", - "name": "techreborn:machine_frame", + "name": "techreborn:part", "entryName": "energy_flow_circuit", "weight": 30, "functions": [ From f7df41c3797fe1148623ad28adbc6762d2e79fce Mon Sep 17 00:00:00 2001 From: drcrazy Date: Fri, 10 Aug 2018 15:38:46 +0300 Subject: [PATCH 3/3] Fix for typo in world config name. --- src/main/java/techreborn/config/ConfigTechReborn.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/techreborn/config/ConfigTechReborn.java b/src/main/java/techreborn/config/ConfigTechReborn.java index 65dc1d51e..b913c9922 100644 --- a/src/main/java/techreborn/config/ConfigTechReborn.java +++ b/src/main/java/techreborn/config/ConfigTechReborn.java @@ -123,12 +123,12 @@ public class ConfigTechReborn { @ConfigRegistry(config = "generators", category = "solarPanelQuantum", key = "quantumNightRate", comment = "Generation rate during night for Quantum Solar Panel (Value in EU)") public static int quantumGenerationRateN = 64; - @ConfigRegistry(config = "worlds", category = "loot", key = "enableOverworldLoot", comment = "When true TechReborn will add ingots, machine frames and circuits to OverWorld loot chests.") + @ConfigRegistry(config = "world", category = "loot", key = "enableOverworldLoot", comment = "When true TechReborn will add ingots, machine frames and circuits to OverWorld loot chests.") public static boolean enableOverworldLoot = true; - @ConfigRegistry(config = "worlds", category = "loot", key = "enableNetherLoot", comment = "When true TechReborn will add ingots, machine frames and circuits to Nether loot chests.") + @ConfigRegistry(config = "world", category = "loot", key = "enableNetherLoot", comment = "When true TechReborn will add ingots, machine frames and circuits to Nether loot chests.") public static boolean enableNetherLoot = true; - @ConfigRegistry(config = "worlds", category = "loot", key = "enableEndLoot", comment = "When true TechReborn will add ingots, machine frames and circuits to The End loot chests.") + @ConfigRegistry(config = "world", category = "loot", key = "enableEndLoot", comment = "When true TechReborn will add ingots, machine frames and circuits to The End loot chests.") public static boolean enableEndLoot = true; }