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 a983cda45..f0c645148 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 @@ -20,7 +20,9 @@ fun addChestLootTables(loot: LootTables) { 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.ELECTRIC_PARTS) { setCount(minimal = 2, maximal = 3) } + item(MItems.MECHANICAL_PARTS) { setCount(minimal = 2, maximal = 3) } + item(MItems.CIRCUIT_PLATING) { setCount(minimal = 1, maximal = 3) } item(MItems.METAL_JUNK) { setCount(minimal = 3, maximal = 5) } item(Items.COPPER_INGOT) { setCount(minimal = 1, maximal = 3) } @@ -34,7 +36,11 @@ fun addChestLootTables(loot: LootTables) { lootPool { item(Items.IRON_INGOT) { setCount(minimal = 1, maximal = 3) } item(Items.GOLD_INGOT) { setCount(minimal = 1, maximal = 3) } + item(Items.EMERALD) { setCount(minimal = 1, maximal = 3) } + item(MItems.TRITANIUM_INGOT) { setCount(minimal = 1, maximal = 3) } + item(MItems.MECHANICAL_PARTS) { setCount(minimal = 2, maximal = 3) } + item(MItems.CIRCUIT_PLATING) { setCount(minimal = 2, maximal = 3) } item(Items.SADDLE) { setCount(minimal = 0, maximal = 1) } item(Items.DIAMOND) { setCount(minimal = 0, maximal = 3) } diff --git a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/recipes/DecorativesRecipes.kt b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/recipes/DecorativesRecipes.kt index a89cd8f1a..328ee8ca2 100644 --- a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/recipes/DecorativesRecipes.kt +++ b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/recipes/DecorativesRecipes.kt @@ -388,6 +388,14 @@ fun addDecorativesRecipes(provider: MatteryRecipeProvider, consumer: RecipeOutpu .unlockedBy(Items.IRON_BARS) .build(consumer, modLocation("decorative/metal_mesh")) + MatteryRecipe(MItems.METAL_RAILING, count = 16, category = RecipeCategory.BUILDING_BLOCKS) + .row(MItems.METAL_MESH, MItems.METAL_MESH, MItems.METAL_MESH) + .row(MItems.METAL_MESH, MItems.METAL_MESH, MItems.METAL_MESH) + .unlockedBy(Items.IRON_BARS) + .unlockedBy(Tags.Items.NUGGETS_IRON) + .unlockedBy(MItems.METAL_MESH) + .build(consumer, modLocation("decorative/metal_railing")) + // Голо табличка MatteryRecipe(MItems.HOLO_SIGN, category = RecipeCategory.DECORATIONS) .row(MItemTags.BASIC_CIRCUIT, MItemTags.TRITANIUM_PLATES, MItemTags.HARDENED_GLASS_PANES_COLORLESS) diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/registry/game/MBlocks.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/registry/game/MBlocks.kt index 88dbfb52e..07d17b8ed 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/registry/game/MBlocks.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/registry/game/MBlocks.kt @@ -167,11 +167,17 @@ object MBlocks { }) val FLYWHEEL_BATTERY by registry.register(MNames.FLYWHEEL_BATTERY) { FlywheelBatteryBlock() } - val FLYWHEEL_BEARING by registry.register(MNames.FLYWHEEL_BEARING) { MatteryBlock().addSimpleDescription() } val FLYWHEEL_SHAFT by registry.register(MNames.FLYWHEEL_SHAFT) { MatteryBlock().addSimpleDescription() } val FLYWHEEL_HOUSING by registry.register(MNames.FLYWHEEL_HOUSING) { MatteryBlock().addSimpleDescription() } - val GENERATOR_BLOCK by registry.register(MNames.GENERATOR_BLOCK) { MatteryBlock().addSimpleDescription() } + val FLYWHEEL_BEARING by registry.register(MNames.FLYWHEEL_BEARING) { + MatteryBlock(BlockBehaviour.Properties.of().sound(SoundType.NETHERITE_BLOCK).mapColor(MapColor.COLOR_GRAY)) + .addSimpleDescription() + } + val GENERATOR_BLOCK by registry.register(MNames.GENERATOR_BLOCK) { + MatteryBlock(BlockBehaviour.Properties.of().sound(SoundType.NETHERITE_BLOCK).mapColor(MapColor.COLOR_GRAY)) + .addSimpleDescription() + } val STORAGE_BUS: Block by registry.register(MNames.STORAGE_BUS, ::StorageBusBlock) val STORAGE_IMPORTER: Block by registry.register(MNames.STORAGE_IMPORTER, ::StorageImporterBlock) diff --git a/src/main/resources/data/overdrive_that_matters/structure/frigate/back_details/back_shield.nbt b/src/main/resources/data/overdrive_that_matters/structure/frigate/back_details/back_shield.nbt index c24a79775..07375fbed 100644 Binary files a/src/main/resources/data/overdrive_that_matters/structure/frigate/back_details/back_shield.nbt and b/src/main/resources/data/overdrive_that_matters/structure/frigate/back_details/back_shield.nbt differ diff --git a/src/main/resources/data/overdrive_that_matters/structure/frigate/bows/bow_breaker.nbt b/src/main/resources/data/overdrive_that_matters/structure/frigate/bows/bow_breaker.nbt new file mode 100644 index 000000000..9ceaa0f50 Binary files /dev/null and b/src/main/resources/data/overdrive_that_matters/structure/frigate/bows/bow_breaker.nbt differ diff --git a/src/main/resources/data/overdrive_that_matters/structure/frigate/frigate_back.nbt b/src/main/resources/data/overdrive_that_matters/structure/frigate/frigate_back.nbt index 45128b479..131dd15c1 100644 Binary files a/src/main/resources/data/overdrive_that_matters/structure/frigate/frigate_back.nbt and b/src/main/resources/data/overdrive_that_matters/structure/frigate/frigate_back.nbt differ diff --git a/src/main/resources/data/overdrive_that_matters/structure/frigate/frigate_front.nbt b/src/main/resources/data/overdrive_that_matters/structure/frigate/frigate_front.nbt index d507eb6f9..3042bbd09 100644 Binary files a/src/main/resources/data/overdrive_that_matters/structure/frigate/frigate_front.nbt and b/src/main/resources/data/overdrive_that_matters/structure/frigate/frigate_front.nbt differ diff --git a/src/main/resources/data/overdrive_that_matters/structure/frigate/icons/icon_antimatter.nbt b/src/main/resources/data/overdrive_that_matters/structure/frigate/icons/icon_antimatter.nbt new file mode 100644 index 000000000..887f91c2d Binary files /dev/null and b/src/main/resources/data/overdrive_that_matters/structure/frigate/icons/icon_antimatter.nbt differ diff --git a/src/main/resources/data/overdrive_that_matters/structure/frigate/icons/icon_cargo.nbt b/src/main/resources/data/overdrive_that_matters/structure/frigate/icons/icon_cargo.nbt new file mode 100644 index 000000000..95d377b9f Binary files /dev/null and b/src/main/resources/data/overdrive_that_matters/structure/frigate/icons/icon_cargo.nbt differ diff --git a/src/main/resources/data/overdrive_that_matters/structure/frigate/icons/icon_corporate.nbt b/src/main/resources/data/overdrive_that_matters/structure/frigate/icons/icon_corporate.nbt new file mode 100644 index 000000000..48d6e73d8 Binary files /dev/null and b/src/main/resources/data/overdrive_that_matters/structure/frigate/icons/icon_corporate.nbt differ diff --git a/src/main/resources/data/overdrive_that_matters/structure/frigate/icons/icon_creeper.nbt b/src/main/resources/data/overdrive_that_matters/structure/frigate/icons/icon_creeper.nbt new file mode 100644 index 000000000..7412d3b9c Binary files /dev/null and b/src/main/resources/data/overdrive_that_matters/structure/frigate/icons/icon_creeper.nbt differ diff --git a/src/main/resources/data/overdrive_that_matters/structure/frigate/icons/icon_dive.nbt b/src/main/resources/data/overdrive_that_matters/structure/frigate/icons/icon_dive.nbt new file mode 100644 index 000000000..46b9b90f6 Binary files /dev/null and b/src/main/resources/data/overdrive_that_matters/structure/frigate/icons/icon_dive.nbt differ diff --git a/src/main/resources/data/overdrive_that_matters/structure/frigate/icons/icon_ender.nbt b/src/main/resources/data/overdrive_that_matters/structure/frigate/icons/icon_ender.nbt new file mode 100644 index 000000000..64c3aaba0 Binary files /dev/null and b/src/main/resources/data/overdrive_that_matters/structure/frigate/icons/icon_ender.nbt differ diff --git a/src/main/resources/data/overdrive_that_matters/structure/frigate/icons/icon_hazard.nbt b/src/main/resources/data/overdrive_that_matters/structure/frigate/icons/icon_hazard.nbt new file mode 100644 index 000000000..f764bbd62 Binary files /dev/null and b/src/main/resources/data/overdrive_that_matters/structure/frigate/icons/icon_hazard.nbt differ diff --git a/src/main/resources/data/overdrive_that_matters/structure/frigate/icons/icon_industry.nbt b/src/main/resources/data/overdrive_that_matters/structure/frigate/icons/icon_industry.nbt new file mode 100644 index 000000000..8a3f4aa3c Binary files /dev/null and b/src/main/resources/data/overdrive_that_matters/structure/frigate/icons/icon_industry.nbt differ diff --git a/src/main/resources/data/overdrive_that_matters/structure/frigate/icons/icon_line.nbt b/src/main/resources/data/overdrive_that_matters/structure/frigate/icons/icon_line.nbt new file mode 100644 index 000000000..fb7ef19b3 Binary files /dev/null and b/src/main/resources/data/overdrive_that_matters/structure/frigate/icons/icon_line.nbt differ diff --git a/src/main/resources/data/overdrive_that_matters/structure/frigate/icons/icon_shapes.nbt b/src/main/resources/data/overdrive_that_matters/structure/frigate/icons/icon_shapes.nbt new file mode 100644 index 000000000..5691bc6c0 Binary files /dev/null and b/src/main/resources/data/overdrive_that_matters/structure/frigate/icons/icon_shapes.nbt differ diff --git a/src/main/resources/data/overdrive_that_matters/structure/frigate/icons/icon_stellar.nbt b/src/main/resources/data/overdrive_that_matters/structure/frigate/icons/icon_stellar.nbt new file mode 100644 index 000000000..af3829add Binary files /dev/null and b/src/main/resources/data/overdrive_that_matters/structure/frigate/icons/icon_stellar.nbt differ diff --git a/src/main/resources/data/overdrive_that_matters/structure/frigate/icons/icon_wither.nbt b/src/main/resources/data/overdrive_that_matters/structure/frigate/icons/icon_wither.nbt new file mode 100644 index 000000000..d0657f455 Binary files /dev/null and b/src/main/resources/data/overdrive_that_matters/structure/frigate/icons/icon_wither.nbt differ diff --git a/src/main/resources/data/overdrive_that_matters/structure/frigate/rooms/frigate_room_a.nbt b/src/main/resources/data/overdrive_that_matters/structure/frigate/rooms/frigate_room_a.nbt index b5ec2b9e2..478c171a7 100644 Binary files a/src/main/resources/data/overdrive_that_matters/structure/frigate/rooms/frigate_room_a.nbt and b/src/main/resources/data/overdrive_that_matters/structure/frigate/rooms/frigate_room_a.nbt differ diff --git a/src/main/resources/data/overdrive_that_matters/structure/frigate/rooms/frigate_room_b.nbt b/src/main/resources/data/overdrive_that_matters/structure/frigate/rooms/frigate_room_b.nbt index 83985bda2..98e586f0d 100644 Binary files a/src/main/resources/data/overdrive_that_matters/structure/frigate/rooms/frigate_room_b.nbt and b/src/main/resources/data/overdrive_that_matters/structure/frigate/rooms/frigate_room_b.nbt differ diff --git a/src/main/resources/data/overdrive_that_matters/structure/frigate/rooms/frigate_room_c.nbt b/src/main/resources/data/overdrive_that_matters/structure/frigate/rooms/frigate_room_c.nbt index 48c9b5ade..a0cd64d4b 100644 Binary files a/src/main/resources/data/overdrive_that_matters/structure/frigate/rooms/frigate_room_c.nbt and b/src/main/resources/data/overdrive_that_matters/structure/frigate/rooms/frigate_room_c.nbt differ diff --git a/src/main/resources/data/overdrive_that_matters/structure/frigate/rooms/frigate_room_d.nbt b/src/main/resources/data/overdrive_that_matters/structure/frigate/rooms/frigate_room_d.nbt index b8871754e..eea9ee537 100644 Binary files a/src/main/resources/data/overdrive_that_matters/structure/frigate/rooms/frigate_room_d.nbt and b/src/main/resources/data/overdrive_that_matters/structure/frigate/rooms/frigate_room_d.nbt differ diff --git a/src/main/resources/data/overdrive_that_matters/structure/frigate/rooms/frigate_room_e.nbt b/src/main/resources/data/overdrive_that_matters/structure/frigate/rooms/frigate_room_e.nbt new file mode 100644 index 000000000..516fa0596 Binary files /dev/null and b/src/main/resources/data/overdrive_that_matters/structure/frigate/rooms/frigate_room_e.nbt differ diff --git a/src/main/resources/data/overdrive_that_matters/structure/frigate/rooms/frigate_room_f.nbt b/src/main/resources/data/overdrive_that_matters/structure/frigate/rooms/frigate_room_f.nbt new file mode 100644 index 000000000..bab3d0454 Binary files /dev/null and b/src/main/resources/data/overdrive_that_matters/structure/frigate/rooms/frigate_room_f.nbt differ diff --git a/src/main/resources/data/overdrive_that_matters/structure/fuel_base/feature_plate.nbt b/src/main/resources/data/overdrive_that_matters/structure/fuel_base/feature_plate.nbt new file mode 100644 index 000000000..9d3c08436 Binary files /dev/null and b/src/main/resources/data/overdrive_that_matters/structure/fuel_base/feature_plate.nbt differ diff --git a/src/main/resources/data/overdrive_that_matters/structure/fuel_base/features/cabin.nbt b/src/main/resources/data/overdrive_that_matters/structure/fuel_base/features/cabin.nbt new file mode 100644 index 000000000..6eebcebc8 Binary files /dev/null and b/src/main/resources/data/overdrive_that_matters/structure/fuel_base/features/cabin.nbt differ diff --git a/src/main/resources/data/overdrive_that_matters/structure/fuel_base/features/fuel_tank.nbt b/src/main/resources/data/overdrive_that_matters/structure/fuel_base/features/fuel_tank.nbt new file mode 100644 index 000000000..7664a0b3b Binary files /dev/null and b/src/main/resources/data/overdrive_that_matters/structure/fuel_base/features/fuel_tank.nbt differ diff --git a/src/main/resources/data/overdrive_that_matters/structure/fuel_base/fuel_base.nbt b/src/main/resources/data/overdrive_that_matters/structure/fuel_base/fuel_base.nbt new file mode 100644 index 000000000..7c469cfe8 Binary files /dev/null and b/src/main/resources/data/overdrive_that_matters/structure/fuel_base/fuel_base.nbt differ diff --git a/src/main/resources/data/overdrive_that_matters/tags/worldgen/biome/fuel_base.json b/src/main/resources/data/overdrive_that_matters/tags/worldgen/biome/fuel_base.json new file mode 100644 index 000000000..67ecd95f9 --- /dev/null +++ b/src/main/resources/data/overdrive_that_matters/tags/worldgen/biome/fuel_base.json @@ -0,0 +1,11 @@ +{ + "values": [ + "minecraft:beach", + "minecraft:desert", + "minecraft:plains", + "minecraft:savanna", + "minecraft:snowy_plains", + "minecraft:taiga", + "minecraft:grove" + ] +} \ No newline at end of file diff --git a/src/main/resources/data/overdrive_that_matters/worldgen/structure/fuel_base.json b/src/main/resources/data/overdrive_that_matters/worldgen/structure/fuel_base.json new file mode 100644 index 000000000..2c2ca0ca8 --- /dev/null +++ b/src/main/resources/data/overdrive_that_matters/worldgen/structure/fuel_base.json @@ -0,0 +1,28 @@ +{ + "type": "minecraft:jigsaw", + "biomes": "#overdrive_that_matters:fuel_base", + "max_distance_from_center": 100, + "project_start_to_heightmap": "WORLD_SURFACE_WG", + "size": 7, + "spawn_overrides": { + "monster": { + "bounding_box": "full", + "spawns": [ + { + "type": "minecraft:pillager", + "maxCount": 1, + "minCount": 1, + "weight": 1 + } + ] + } + }, + "start_height": { + "absolute": 0 + }, + "start_jigsaw_name": "overdrive_that_matters:fuel_base", + "start_pool": "overdrive_that_matters:fuel_base/center", + "step": "surface_structures", + "terrain_adaptation": "beard_thin", + "use_expansion_hack": true +} \ No newline at end of file diff --git a/src/main/resources/data/overdrive_that_matters/worldgen/structure_set/fuel_base.json b/src/main/resources/data/overdrive_that_matters/worldgen/structure_set/fuel_base.json new file mode 100644 index 000000000..f271127b5 --- /dev/null +++ b/src/main/resources/data/overdrive_that_matters/worldgen/structure_set/fuel_base.json @@ -0,0 +1,20 @@ +{ + "placement": { + "type": "minecraft:random_spread", + "exclusion_zone": { + "chunk_count": 5, + "other_set": "minecraft:villages" + }, + "frequency": 0.2, + "frequency_reduction_method": "legacy_type_1", + "salt": 14890747, + "separation": 8, + "spacing": 32 + }, + "structures": [ + { + "structure": "overdrive_that_matters:fuel_base", + "weight": 1 + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/overdrive_that_matters/worldgen/template_pool/frigate/bows.json b/src/main/resources/data/overdrive_that_matters/worldgen/template_pool/frigate/bows.json index a9115f219..d9b17d8e9 100644 --- a/src/main/resources/data/overdrive_that_matters/worldgen/template_pool/frigate/bows.json +++ b/src/main/resources/data/overdrive_that_matters/worldgen/template_pool/frigate/bows.json @@ -28,12 +28,21 @@ "projection": "rigid" }, "weight": 1 + }, + { + "element": { + "element_type": "minecraft:single_pool_element", + "location": "overdrive_that_matters:frigate/bows/bow_breaker", + "processors": "minecraft:empty", + "projection": "rigid" + }, + "weight": 1 }, { "element": { "element_type": "minecraft:empty_pool_element" }, - "weight": 2 + "weight": 3 } ] } \ No newline at end of file diff --git a/src/main/resources/data/overdrive_that_matters/worldgen/template_pool/frigate/rooms.json b/src/main/resources/data/overdrive_that_matters/worldgen/template_pool/frigate/rooms.json index 6e6d1f518..4fbb927e5 100644 --- a/src/main/resources/data/overdrive_that_matters/worldgen/template_pool/frigate/rooms.json +++ b/src/main/resources/data/overdrive_that_matters/worldgen/template_pool/frigate/rooms.json @@ -37,6 +37,24 @@ "projection": "rigid" }, "weight": 1 + }, + { + "element": { + "element_type": "minecraft:single_pool_element", + "location": "overdrive_that_matters:frigate/rooms/frigate_room_e", + "processors": "minecraft:empty", + "projection": "rigid" + }, + "weight": 1 + }, + { + "element": { + "element_type": "minecraft:single_pool_element", + "location": "overdrive_that_matters:frigate/rooms/frigate_room_f", + "processors": "minecraft:empty", + "projection": "rigid" + }, + "weight": 1 } ] } \ No newline at end of file diff --git a/src/main/resources/data/overdrive_that_matters/worldgen/template_pool/fuel_base/center.json b/src/main/resources/data/overdrive_that_matters/worldgen/template_pool/fuel_base/center.json new file mode 100644 index 000000000..5c0c491c6 --- /dev/null +++ b/src/main/resources/data/overdrive_that_matters/worldgen/template_pool/fuel_base/center.json @@ -0,0 +1,15 @@ +{ + "name": "overdrive_that_matters:center", + "fallback": "minecraft:empty", + "elements": [ + { + "element": { + "element_type": "minecraft:single_pool_element", + "location": "overdrive_that_matters:fuel_base/fuel_base", + "processors": "minecraft:empty", + "projection": "rigid" + }, + "weight": 1 + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/overdrive_that_matters/worldgen/template_pool/fuel_base/feature_plates.json b/src/main/resources/data/overdrive_that_matters/worldgen/template_pool/fuel_base/feature_plates.json new file mode 100644 index 000000000..87ea0f379 --- /dev/null +++ b/src/main/resources/data/overdrive_that_matters/worldgen/template_pool/fuel_base/feature_plates.json @@ -0,0 +1,17 @@ +{ + "name": "overdrive_that_matters:feature_plates", + "fallback": "minecraft:empty", + "elements": [ + { + "element": { + "element_type": "minecraft:single_pool_element", + "location": "overdrive_that_matters:fuel_base/feature_plate", + "processors": { + "processors": [] + }, + "projection": "terrain_matching" + }, + "weight": 1 + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/overdrive_that_matters/worldgen/template_pool/fuel_base/features.json b/src/main/resources/data/overdrive_that_matters/worldgen/template_pool/fuel_base/features.json new file mode 100644 index 000000000..599eb5a8b --- /dev/null +++ b/src/main/resources/data/overdrive_that_matters/worldgen/template_pool/fuel_base/features.json @@ -0,0 +1,24 @@ +{ + "name": "overdrive_that_matters:features", + "fallback": "minecraft:empty", + "elements": [ + { + "element": { + "element_type": "minecraft:single_pool_element", + "location": "overdrive_that_matters:fuel_base/features/cabin", + "processors": "minecraft:empty", + "projection": "rigid" + }, + "weight": 1 + }, + { + "element": { + "element_type": "minecraft:single_pool_element", + "location": "overdrive_that_matters:fuel_base/features/fuel_tank", + "processors": "minecraft:empty", + "projection": "rigid" + }, + "weight": 3 + } + ] +} \ No newline at end of file