Merge remote-tracking branch 'origin/master' into master

src/data/kotlin/ru/dbotthepony/mc/otm/datagen/items/ItemModels.kt

@@ -70,6 +70,7 @@ fun addItemModels(provider: MatteryItemModelProvider) {
 	provider.generated(MItems.ExosuitUpgrades.INVENTORY_UPGRADE_CREATIVE)
 	provider.generated(MItems.ExosuitUpgrades.CRAFTING_UPGRADE)
 
+	provider.component(MItems.TRITANIUM_DUST)
 	provider.component(MItems.TRITANIUM_INGOT)
 	provider.resource(MItems.TRITANIUM_ORE_CLUMP)
 

src/data/kotlin/ru/dbotthepony/mc/otm/datagen/lang/English.kt

@@ -462,6 +462,7 @@ private fun items(provider: MatteryLanguageProvider) {
 		add(MItems.TRITANIUM_PANTS, "Tritanium Leggings")
 		add(MItems.TRITANIUM_BOOTS, "Tritanium Boots")
 
+		add(MItems.TRITANIUM_DUST, "Tritanium Dust")
 		add(MItems.TRITANIUM_INGOT, "Tritanium Ingot")
 		add(MItems.MATTER_IO_PORT, "Matter IO Port")
 		add(MItems.MATTER_TRANSFORM_MATRIX, "Matter Transformation Matrix")

src/data/kotlin/ru/dbotthepony/mc/otm/datagen/recipes/OreRecipes.kt

@@ -15,4 +15,7 @@ fun addOreSmeltingRecipes(consumer: Consumer<FinishedRecipe>) {
 
 	SimpleCookingRecipeBuilder.blasting(Ingredient.of(MItemTags.TRITANIUM_ORE_CLUMPS), MItems.TRITANIUM_INGOT, 1f, 100).unlockedBy(MItemTags.TRITANIUM_ORE_CLUMPS).save(consumer, ResourceLocation(OverdriveThatMatters.MOD_ID, "smelting/tritanium_ingot_from_raw_ore"))
 	SimpleCookingRecipeBuilder.smelting(Ingredient.of(MItemTags.TRITANIUM_ORE_CLUMPS), MItems.TRITANIUM_INGOT, 1f, 200).unlockedBy(MItemTags.TRITANIUM_ORE_CLUMPS).save(consumer, ResourceLocation(OverdriveThatMatters.MOD_ID, "blasting/tritanium_ingot_from_raw_ore"))
+
+	SimpleCookingRecipeBuilder.blasting(Ingredient.of(MItemTags.TRITANIUM_DUSTS), MItems.TRITANIUM_INGOT, 0f, 100).unlockedBy(MItemTags.TRITANIUM_DUSTS).save(consumer, ResourceLocation(OverdriveThatMatters.MOD_ID, "smelting/tritanium_ingot_from_dust"))
+	SimpleCookingRecipeBuilder.smelting(Ingredient.of(MItemTags.TRITANIUM_DUSTS), MItems.TRITANIUM_INGOT, 0f, 200).unlockedBy(MItemTags.TRITANIUM_DUSTS).save(consumer, ResourceLocation(OverdriveThatMatters.MOD_ID, "blasting/tritanium_ingot_from_dust"))
 }

src/data/kotlin/ru/dbotthepony/mc/otm/datagen/recipes/PlatePressRecipes.kt

@@ -1,8 +1,8 @@
 package ru.dbotthepony.mc.otm.datagen.recipes
 
 fun addPlatePressRecipes(provider: MatteryRecipeProvider) {
-	val baselineMetals = arrayOf("iron", "silver", "bronze", "lead", "constantan")
+	val baselineMetals = arrayOf("iron", "silver", "bronze", "lead", "constantan", "brass")
-	val softMetals = arrayOf("gold", "aluminum", "aluminium", "brass", "copper", "electrum")
+	val softMetals = arrayOf("gold", "aluminum", "aluminium", "copper", "electrum", "zinc")
 	val hardMetals = arrayOf("tritanium", "steel", "tungsten", "uranium")
 
 	for (thing in baselineMetals) {

src/data/kotlin/ru/dbotthepony/mc/otm/datagen/tags/Tags.kt

@@ -18,6 +18,7 @@ fun addTags(tagsProvider: TagsProvider) {
 	tagsProvider.circuits.add("basic", MItems.BASIC_CONTROL_CIRCUIT)
 	tagsProvider.circuits.add("advanced", MItems.ADVANCED_CONTROL_CIRCUIT)
 
+	tagsProvider.dusts.add("tritanium", MItems.TRITANIUM_DUST)
 	tagsProvider.ingots.add("tritanium", MItems.TRITANIUM_INGOT)
 
 	tagsProvider.plates.add("tritanium", MItems.TRITANIUM_PLATE)

src/data/kotlin/ru/dbotthepony/mc/otm/datagen/tags/TagsProvider.kt

@@ -220,6 +220,7 @@ class TagsProvider(
 	}
 
 	val circuits = items.forge("circuits")
+	val dusts = items.forge("dusts")
 	val ingots = items.forge("ingots")
 	val itemOres = items.forge("ores")
 	val blockOres = blocks.forge("ores")

src/main/kotlin/ru/dbotthepony/mc/otm/registry/MItems.kt

@@ -121,6 +121,7 @@ object MItems {
 	val MATTER_DUST: Item by registry.register(MNames.MATTER_DUST) { MatterDustItem() }
 
 	val TRITANIUM_ORE_CLUMP: Item by registry.register(MNames.TRITANIUM_ORE_CLUMP) { Item(DEFAULT_PROPERTIES) }
+	val TRITANIUM_DUST: Item by registry.register(MNames.TRITANIUM_DUST) { Item(DEFAULT_PROPERTIES) }
 	val TRITANIUM_INGOT: Item by registry.register(MNames.TRITANIUM_INGOT) { Item(DEFAULT_PROPERTIES) }
 	val TRITANIUM_INGOT_BLOCK: Item by registry.register(MNames.TRITANIUM_INGOT_BLOCK) { BlockItem(MBlocks.TRITANIUM_INGOT_BLOCK, DEFAULT_PROPERTIES) }
 

src/main/kotlin/ru/dbotthepony/mc/otm/registry/MNames.kt

@@ -133,6 +133,7 @@ object MNames {
 	const val PLASMA_RIFLE = "plasma_rifle"
 
 	// items: crafting components
+	const val TRITANIUM_DUST = "tritanium_dust"
 	const val TRITANIUM_INGOT = "tritanium_ingot"
 	const val TRITANIUM_INGOT_BLOCK = "tritanium_ingot_block"
 

src/main/kotlin/ru/dbotthepony/mc/otm/registry/Tags.kt

@@ -15,6 +15,7 @@ object MItemTags {
 	val TRITANIUM_INGOTS: TagKey<Item> = ItemTags.create(ResourceLocation("forge", "ingots/tritanium"))
 	val TRITANIUM_INGOTS_STORAGE: TagKey<Item> = ItemTags.create(ResourceLocation("forge", "storage_blocks/tritanium"))
 	val TRITANIUM_PLATES: TagKey<Item> = ItemTags.create(ResourceLocation("forge", "plates/tritanium"))
+	val TRITANIUM_DUSTS: TagKey<Item> = ItemTags.create(ResourceLocation("forge", "dusts/tritanium"))
 	val IRON_PLATES: TagKey<Item> = ItemTags.create(ResourceLocation("forge", "plates/iron"))
 	val GOLD_PLATES: TagKey<Item> = ItemTags.create(ResourceLocation("forge", "plates/gold"))
 	val CARGO_CRATES: TagKey<Item> = ItemTags.create(ResourceLocation(OverdriveThatMatters.MOD_ID, "cargo_crates"))

src/main/resources/data/overdrive_that_matters/tags/worldgen/biome/cargo_container.json

@@ -0,0 +1,7 @@
+{
+  "replace": false,
+  "values": [
+	"#forge:is_desert",
+	"minecraft:beach"
+  ]
+}

src/main/resources/data/overdrive_that_matters/tags/worldgen/biome/ocean_container.json

@@ -0,0 +1,12 @@
+{
+  "replace": false,
+  "values": [
+	"minecraft:ocean",
+	"minecraft:deep_ocean",
+	"minecraft:cold_ocean",
+	"minecraft:deep_cold_ocean"
+	"minecraft:frozen_ocean",
+	"minecraft:deep_frozen_ocean",
+	"minecraft:deep_lukewarm_ocean"
+  ]
+}

src/main/resources/data/overdrive_that_matters/worldgen/structure/cargo_container.json

@@ -0,0 +1,16 @@
+{
+  "type": "minecraft:jigsaw",
+  "start_pool": "overdrive_that_matters:cargo_container",
+  "biomes": "#overdrive_that_matters:cargo_container",
+  "project_start_to_heightmap": "OCEAN_FLOOR_WG",
+  "start_height": {
+	  "absolute": 0
+  },
+  "max_distance_from_center": 4,
+  "size": 2,
+  "spawn_overrides": {
+  },
+  "step": "surface_structures",
+  "terrain_adaption": "bury",
+  "use_expansion_hack": false
+}

src/main/resources/data/overdrive_that_matters/worldgen/structure/frigate.json

@@ -20,13 +20,13 @@
           "type": "minecraft:pillager",
           "weight": 1,
           "minCount": 1,
-          "maxCount": 2
+          "maxCount": 1
         }
       ]
     }
   },
   "start_jigsaw_name": "overdrive_that_matters:frigate_anchor",
-  "start_pool": "overdrive_that_matters:frigate",
+  "start_pool": "overdrive_that_matters:frigate/frigate_front",
   "step": "surface_structures",
   "terrain_adaption": "beard_box",
   "use_expansion_hack": false

src/main/resources/data/overdrive_that_matters/worldgen/structure/ocean_container.json

@@ -0,0 +1,16 @@
+{
+  "type": "minecraft:jigsaw",
+  "start_pool": "overdrive_that_matters:ocean_container",
+  "biomes": "#overdrive_that_matters:ocean_container",
+  "project_start_to_heightmap": "OCEAN_FLOOR_WG",
+  "start_height": {
+	  "absolute": 0
+  },
+  "max_distance_from_center": 4,
+  "size": 2,
+  "spawn_overrides": {
+  },
+  "step": "surface_structures",
+  "terrain_adaption": "bury",
+  "use_expansion_hack": false
+}

src/main/resources/data/overdrive_that_matters/worldgen/structure_set/cargo_container.json

@@ -0,0 +1,14 @@
+{
+  "structures":[
+    {
+      "structure": "overdrive_that_matters:cargo_container",
+      "weight": 1
+    }
+  ],
+  "placement": {
+	  "type": "minecraft:random_spread",
+	  "spacing": 120,
+	  "separation": 1,
+	  "salt": 10387312
+  }
+}

src/main/resources/data/overdrive_that_matters/worldgen/structure_set/field_research_pod.json

@@ -11,8 +11,8 @@
   ],
   "placement": {
 	  "type": "minecraft:random_spread",
-	  "spacing": 16,
+	  "spacing": 120,
-	  "separation": 4,
+	  "separation": 1,
 	  "salt": 10387312
   }
 }

src/main/resources/data/overdrive_that_matters/worldgen/structure_set/frigate.json

@@ -3,7 +3,7 @@
     "type": "minecraft:random_spread",
     "salt": 20072342,
     "separation": 8,
-    "spacing": 24
+    "spacing":256
   },
   "structures": [
     {

src/main/resources/data/overdrive_that_matters/worldgen/structure_set/ocean_container.json

@@ -0,0 +1,14 @@
+{
+  "structures":[
+    {
+      "structure": "overdrive_that_matters:ocean_container",
+      "weight": 1
+    }
+  ],
+  "placement": {
+	  "type": "minecraft:random_spread",
+	  "spacing": 60,
+	  "separation": 1,
+	  "salt": 20072342
+  }
+}

src/main/resources/data/overdrive_that_matters/worldgen/template_pool/cargo_container.json

@@ -0,0 +1,24 @@
+{
+  "name": "overdrive_that_matters:cargo_container",
+  "fallback": "minecraft:empty",
+  "elements": [
+    {
+      "element": {
+        "element_type": "minecraft:single_pool_element",
+        "location": "overdrive_that_matters:abandoned_cargo_a",
+        "processors": "minecraft:empty",
+        "projection": "rigid"
+      },
+      "weight": 1
+    },
+	{
+      "element": {
+        "element_type": "minecraft:single_pool_element",
+        "location": "overdrive_that_matters:abandoned_cargo_b",
+        "processors": "minecraft:empty",
+        "projection": "rigid"
+      },
+      "weight": 1
+    }
+  ]
+}

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

@@ -1,33 +0,0 @@
-{
-  "name": "overdrive_that_matters:frigate",
-  "fallback": "minecraft:empty",
-  "elements": [
-    {
-      "element": {
-		"element_type": "minecraft:single_pool_element",
-		"location": "overdrive_that_matters:frigate/frigate_front_a",
-        "processors": "minecraft:empty",
-		"projection": "rigid"
-      },
-	  "weight": 1
-    },
-	{
-      "element": {
-		"element_type": "minecraft:single_pool_element",
-		"location": "overdrive_that_matters:frigate/frigate_front_b",
-        "processors": "minecraft:empty",
-		"projection": "rigid"
-      },
-	  "weight": 1
-    },
-	{
-      "element": {
-		"element_type": "minecraft:single_pool_element",
-		"location": "overdrive_that_matters:frigate/frigate_back_a",
-        "processors": "minecraft:empty",
-		"projection": "rigid"
-      },
-	  "weight": 1
-    }
-  ]
-}

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

@@ -0,0 +1,15 @@
+{
+  "name": "overdrive_that_matters:frigate_back",
+  "fallback": "minecraft:empty",
+  "elements": [
+	{
+      "element": {
+		"element_type": "minecraft:single_pool_element",
+		"location": "overdrive_that_matters:frigate/back/frigate_back_a",
+        "processors": "minecraft:empty",
+		"projection": "rigid"
+      },
+	  "weight": 1
+    }
+  ]
+}

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

@@ -0,0 +1,24 @@
+{
+  "name": "overdrive_that_matters:frigate_front",
+  "fallback": "minecraft:empty",
+  "elements": [
+    {
+      "element": {
+		"element_type": "minecraft:single_pool_element",
+		"location": "overdrive_that_matters:frigate/front/frigate_front_a",
+        "processors": "minecraft:empty",
+		"projection": "rigid"
+      },
+	  "weight": 1
+    },
+	{
+      "element": {
+		"element_type": "minecraft:single_pool_element",
+		"location": "overdrive_that_matters:frigate/front/frigate_front_b",
+        "processors": "minecraft:empty",
+		"projection": "rigid"
+      },
+	  "weight": 1
+    }
+  ]
+}

src/main/resources/data/overdrive_that_matters/worldgen/template_pool/ocean_container.json

@@ -0,0 +1,15 @@
+{
+  "name": "overdrive_that_matters:ocean_container",
+  "fallback": "minecraft:empty",
+  "elements": [
+    {
+      "element": {
+        "element_type": "minecraft:single_pool_element",
+        "location": "overdrive_that_matters:abandoned_cargo_ocean",
+        "processors": "minecraft:empty",
+        "projection": "rigid"
+      },
+      "weight": 1
+    }
+  ]
+}