diff --git a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/loot/LootTablesChests.kt b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/loot/LootTablesChests.kt index a92056ba4..8ed1edeb1 100644 --- a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/loot/LootTablesChests.kt +++ b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/loot/LootTablesChests.kt @@ -15,4 +15,18 @@ fun addChestLootTables(loot: LootTables) { setRolls(3) } } + + loot.builder(LootContextParamSets.CHEST, modLootTable("salvage_crate")) { + lootPool { + item(MItems.MECHANICAL_PARTS) { setCount(minimal = 2, maximal = 3) } + item(MItems.IRON_PLATE) { setCount(minimal = 2, maximal = 3) } + item(MItems.ELECTRIC_PARTS) { setCount(minimal = 1, maximal = 2) } + + item(MItems.METAL_JUNK) { setCount(minimal = 3, maximal = 5) } + item(Items.COPPER_INGOT) { setCount(minimal = 1, maximal = 3) } + item(Items.EXPOSED_COPPER) { setCount(minimal = 1, maximal = 2) } + + setRolls(3) + } + } } diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/generator_block.png b/src/main/resources/assets/overdrive_that_matters/textures/block/generator_block.png index f32271606..61e59a0ff 100644 Binary files a/src/main/resources/assets/overdrive_that_matters/textures/block/generator_block.png and b/src/main/resources/assets/overdrive_that_matters/textures/block/generator_block.png differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/item/battery_creative.png b/src/main/resources/assets/overdrive_that_matters/textures/item/battery_creative.png index 958e60da8..b3b1283d7 100644 Binary files a/src/main/resources/assets/overdrive_that_matters/textures/item/battery_creative.png and b/src/main/resources/assets/overdrive_that_matters/textures/item/battery_creative.png differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/item/battery_tier0.png b/src/main/resources/assets/overdrive_that_matters/textures/item/battery_tier0.png index f5d03fb04..9892d8e51 100644 Binary files a/src/main/resources/assets/overdrive_that_matters/textures/item/battery_tier0.png and b/src/main/resources/assets/overdrive_that_matters/textures/item/battery_tier0.png differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/item/battery_tier1.png b/src/main/resources/assets/overdrive_that_matters/textures/item/battery_tier1.png index d879c3305..1fee5af1d 100644 Binary files a/src/main/resources/assets/overdrive_that_matters/textures/item/battery_tier1.png and b/src/main/resources/assets/overdrive_that_matters/textures/item/battery_tier1.png differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/item/battery_tier2.png b/src/main/resources/assets/overdrive_that_matters/textures/item/battery_tier2.png index 36a470314..d8fbe8ca0 100644 Binary files a/src/main/resources/assets/overdrive_that_matters/textures/item/battery_tier2.png and b/src/main/resources/assets/overdrive_that_matters/textures/item/battery_tier2.png differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/item/battery_tier3.png b/src/main/resources/assets/overdrive_that_matters/textures/item/battery_tier3.png index e286eedee..892c1097a 100644 Binary files a/src/main/resources/assets/overdrive_that_matters/textures/item/battery_tier3.png and b/src/main/resources/assets/overdrive_that_matters/textures/item/battery_tier3.png differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/item/battery_tier4.png b/src/main/resources/assets/overdrive_that_matters/textures/item/battery_tier4.png index 341f38822..54a0104ff 100644 Binary files a/src/main/resources/assets/overdrive_that_matters/textures/item/battery_tier4.png and b/src/main/resources/assets/overdrive_that_matters/textures/item/battery_tier4.png differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/item/component/advanced_control_circuit.png b/src/main/resources/assets/overdrive_that_matters/textures/item/component/advanced_control_circuit.png index 56ff1ff93..d95a9b102 100644 Binary files a/src/main/resources/assets/overdrive_that_matters/textures/item/component/advanced_control_circuit.png and b/src/main/resources/assets/overdrive_that_matters/textures/item/component/advanced_control_circuit.png differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/item/component/basic_control_circuit.png b/src/main/resources/assets/overdrive_that_matters/textures/item/component/basic_control_circuit.png index 3b6f12293..512cb6198 100644 Binary files a/src/main/resources/assets/overdrive_that_matters/textures/item/component/basic_control_circuit.png and b/src/main/resources/assets/overdrive_that_matters/textures/item/component/basic_control_circuit.png differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/item/component/circuit_plating.png b/src/main/resources/assets/overdrive_that_matters/textures/item/component/circuit_plating.png index 1bb745c67..5e33c6cb3 100644 Binary files a/src/main/resources/assets/overdrive_that_matters/textures/item/component/circuit_plating.png and b/src/main/resources/assets/overdrive_that_matters/textures/item/component/circuit_plating.png differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/item/component/electric_parts.png b/src/main/resources/assets/overdrive_that_matters/textures/item/component/electric_parts.png index 11a316761..9b531bd40 100644 Binary files a/src/main/resources/assets/overdrive_that_matters/textures/item/component/electric_parts.png and b/src/main/resources/assets/overdrive_that_matters/textures/item/component/electric_parts.png differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/item/component/mechanical_parts.png b/src/main/resources/assets/overdrive_that_matters/textures/item/component/mechanical_parts.png index d36635b4d..3a45ee8b4 100644 Binary files a/src/main/resources/assets/overdrive_that_matters/textures/item/component/mechanical_parts.png and b/src/main/resources/assets/overdrive_that_matters/textures/item/component/mechanical_parts.png differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/item/matter_capacitor_creative.png b/src/main/resources/assets/overdrive_that_matters/textures/item/matter_capacitor_creative.png index 169c44e16..fc24ceca2 100644 Binary files a/src/main/resources/assets/overdrive_that_matters/textures/item/matter_capacitor_creative.png and b/src/main/resources/assets/overdrive_that_matters/textures/item/matter_capacitor_creative.png differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/item/matter_capacitor_tier0.png b/src/main/resources/assets/overdrive_that_matters/textures/item/matter_capacitor_tier0.png index bcbe51ab4..2bb6e4571 100644 Binary files a/src/main/resources/assets/overdrive_that_matters/textures/item/matter_capacitor_tier0.png and b/src/main/resources/assets/overdrive_that_matters/textures/item/matter_capacitor_tier0.png differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/item/matter_capacitor_tier1.png b/src/main/resources/assets/overdrive_that_matters/textures/item/matter_capacitor_tier1.png index 895bfacb5..d19259474 100644 Binary files a/src/main/resources/assets/overdrive_that_matters/textures/item/matter_capacitor_tier1.png and b/src/main/resources/assets/overdrive_that_matters/textures/item/matter_capacitor_tier1.png differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/item/matter_capacitor_tier2.png b/src/main/resources/assets/overdrive_that_matters/textures/item/matter_capacitor_tier2.png index c597022bc..773c51f07 100644 Binary files a/src/main/resources/assets/overdrive_that_matters/textures/item/matter_capacitor_tier2.png and b/src/main/resources/assets/overdrive_that_matters/textures/item/matter_capacitor_tier2.png differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/item/matter_capacitor_tier3.png b/src/main/resources/assets/overdrive_that_matters/textures/item/matter_capacitor_tier3.png index 6c01eb10c..d12d5a1da 100644 Binary files a/src/main/resources/assets/overdrive_that_matters/textures/item/matter_capacitor_tier3.png and b/src/main/resources/assets/overdrive_that_matters/textures/item/matter_capacitor_tier3.png differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/item/matter_capacitor_tier4.png b/src/main/resources/assets/overdrive_that_matters/textures/item/matter_capacitor_tier4.png index 112e24523..f39082528 100644 Binary files a/src/main/resources/assets/overdrive_that_matters/textures/item/matter_capacitor_tier4.png and b/src/main/resources/assets/overdrive_that_matters/textures/item/matter_capacitor_tier4.png differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/item/pattern_drive_creative.png b/src/main/resources/assets/overdrive_that_matters/textures/item/pattern_drive_creative.png index 1d70c6409..1c28413aa 100644 Binary files a/src/main/resources/assets/overdrive_that_matters/textures/item/pattern_drive_creative.png and b/src/main/resources/assets/overdrive_that_matters/textures/item/pattern_drive_creative.png differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/item/pattern_drive_tier0.png b/src/main/resources/assets/overdrive_that_matters/textures/item/pattern_drive_tier0.png index d04d86a57..442e1a818 100644 Binary files a/src/main/resources/assets/overdrive_that_matters/textures/item/pattern_drive_tier0.png and b/src/main/resources/assets/overdrive_that_matters/textures/item/pattern_drive_tier0.png differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/item/pattern_drive_tier1.png b/src/main/resources/assets/overdrive_that_matters/textures/item/pattern_drive_tier1.png index a21794cb4..ffb753a56 100644 Binary files a/src/main/resources/assets/overdrive_that_matters/textures/item/pattern_drive_tier1.png and b/src/main/resources/assets/overdrive_that_matters/textures/item/pattern_drive_tier1.png differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/item/pattern_drive_tier2.png b/src/main/resources/assets/overdrive_that_matters/textures/item/pattern_drive_tier2.png index 3d76f653d..6d422b550 100644 Binary files a/src/main/resources/assets/overdrive_that_matters/textures/item/pattern_drive_tier2.png and b/src/main/resources/assets/overdrive_that_matters/textures/item/pattern_drive_tier2.png differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/item/pattern_drive_tier3.png b/src/main/resources/assets/overdrive_that_matters/textures/item/pattern_drive_tier3.png index 787485f42..9c24281ea 100644 Binary files a/src/main/resources/assets/overdrive_that_matters/textures/item/pattern_drive_tier3.png and b/src/main/resources/assets/overdrive_that_matters/textures/item/pattern_drive_tier3.png differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/item/pattern_drive_tier4.png b/src/main/resources/assets/overdrive_that_matters/textures/item/pattern_drive_tier4.png index 3bba36e8d..8290bfe22 100644 Binary files a/src/main/resources/assets/overdrive_that_matters/textures/item/pattern_drive_tier4.png and b/src/main/resources/assets/overdrive_that_matters/textures/item/pattern_drive_tier4.png differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/item/quantum_battery.png b/src/main/resources/assets/overdrive_that_matters/textures/item/quantum_battery.png index f8fde21e1..0c9f47982 100644 Binary files a/src/main/resources/assets/overdrive_that_matters/textures/item/quantum_battery.png and b/src/main/resources/assets/overdrive_that_matters/textures/item/quantum_battery.png differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/item/quantum_battery_creative.png b/src/main/resources/assets/overdrive_that_matters/textures/item/quantum_battery_creative.png index 81e836759..4dcc8459e 100644 Binary files a/src/main/resources/assets/overdrive_that_matters/textures/item/quantum_battery_creative.png and b/src/main/resources/assets/overdrive_that_matters/textures/item/quantum_battery_creative.png differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/item/quantum_capacitor.png b/src/main/resources/assets/overdrive_that_matters/textures/item/quantum_capacitor.png index 1d4f001f3..ac0dee6d9 100644 Binary files a/src/main/resources/assets/overdrive_that_matters/textures/item/quantum_capacitor.png and b/src/main/resources/assets/overdrive_that_matters/textures/item/quantum_capacitor.png differ diff --git a/src/main/resources/data/overdrive_that_matters/worldgen/structure/laboratory.json b/src/main/resources/data/overdrive_that_matters/worldgen/structure/laboratory.json index 193c4560e..48fb4c86c 100644 --- a/src/main/resources/data/overdrive_that_matters/worldgen/structure/laboratory.json +++ b/src/main/resources/data/overdrive_that_matters/worldgen/structure/laboratory.json @@ -2,6 +2,7 @@ "type": "minecraft:jigsaw", "biomes": "#overdrive_that_matters:laboratory", "max_distance_from_center": 100, + "liquid_settings": "ignore_waterlogging", "size": 7, "start_height": { "absolute": -13 @@ -22,6 +23,6 @@ "start_jigsaw_name": "overdrive_that_matters:laboratory_anchor", "start_pool": "overdrive_that_matters:laboratory/center", "step": "underground_decoration", - "terrain_adaption": "bury", + "terrain_adaption": "encapsulate", "use_expansion_hack": false } \ No newline at end of file