version deez

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) }
@@ -29,4 +31,21 @@ fun addChestLootTables(loot: LootTables) {
 			setRolls(3)
 		}
 	}
+
+	loot.builder(LootContextParamSets.CHEST, modLootTable("frigate_cargo")) {
+		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) }
+
+			setRolls(3)
+		}
+	}
 }

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)

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)

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"
+  ]
+}

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
+}

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
+    }
+  ]
+}

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
     }
   ]
 }

src/main/resources/data/overdrive_that_matters/worldgen/template_pool/frigate/frigate_icons.json

@@ -0,0 +1,105 @@
+{
+  "name": "overdrive_that_matters:frigate_icons",
+  "fallback": "minecraft:empty",
+  "elements": [
+	{
+      "element": {
+		"element_type": "minecraft:single_pool_element",
+		"location": "overdrive_that_matters:frigate/icons/icon_antimatter",
+        "processors": "minecraft:empty",
+		"projection": "rigid"
+      },
+	  "weight": 1
+    },
+	{
+      "element": {
+		"element_type": "minecraft:single_pool_element",
+		"location": "overdrive_that_matters:frigate/icons/icon_cargo",
+        "processors": "minecraft:empty",
+		"projection": "rigid"
+      },
+	  "weight": 1
+    },
+	{
+      "element": {
+		"element_type": "minecraft:single_pool_element",
+		"location": "overdrive_that_matters:frigate/icons/icon_corporate",
+        "processors": "minecraft:empty",
+		"projection": "rigid"
+      },
+	  "weight": 1
+    },
+	{
+      "element": {
+		"element_type": "minecraft:single_pool_element",
+		"location": "overdrive_that_matters:frigate/icons/icon_dive",
+        "processors": "minecraft:empty",
+		"projection": "rigid"
+      },
+	  "weight": 1
+    },
+	{
+      "element": {
+		"element_type": "minecraft:single_pool_element",
+		"location": "overdrive_that_matters:frigate/icons/icon_ender",
+        "processors": "minecraft:empty",
+		"projection": "rigid"
+      },
+	  "weight": 1
+    },
+	{
+      "element": {
+		"element_type": "minecraft:single_pool_element",
+		"location": "overdrive_that_matters:frigate/icons/icon_hazard",
+        "processors": "minecraft:empty",
+		"projection": "rigid"
+      },
+	  "weight": 1
+    },
+	{
+      "element": {
+		"element_type": "minecraft:single_pool_element",
+		"location": "overdrive_that_matters:frigate/icons/icon_industry",
+        "processors": "minecraft:empty",
+		"projection": "rigid"
+      },
+	  "weight": 1
+    },
+	{
+      "element": {
+		"element_type": "minecraft:single_pool_element",
+		"location": "overdrive_that_matters:frigate/icons/icon_line",
+        "processors": "minecraft:empty",
+		"projection": "rigid"
+      },
+	  "weight": 1
+    },
+	{
+      "element": {
+		"element_type": "minecraft:single_pool_element",
+		"location": "overdrive_that_matters:frigate/icons/icon_shapes",
+        "processors": "minecraft:empty",
+		"projection": "rigid"
+      },
+	  "weight": 1
+	},
+	{
+      "element": {
+		"element_type": "minecraft:single_pool_element",
+		"location": "overdrive_that_matters:frigate/icons/icon_stellar",
+        "processors": "minecraft:empty",
+		"projection": "rigid"
+      },
+	  "weight": 1
+    },
+	{
+      "element": {
+		"element_type": "minecraft:single_pool_element",
+		"location": "overdrive_that_matters:frigate/icons/icon_wither",
+        "processors": "minecraft:empty",
+		"projection": "rigid"
+      },
+	  "weight": 1
+    }
+  ]
+}

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
     }
   ]
 }

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
+    }
+  ]
+}

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
+    }
+  ]
+}

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
+    }
+  ]
+}