Tritanium ore

shapenator.js

@@ -397,6 +397,8 @@ const facings = [
 		'crate_black',
 		'crate_pink',
 		'crate_purple',
+
+		'tritanium_raw_block',
 	]
 
 	for (const name of blocks) {
@@ -436,6 +438,52 @@ const facings = [
 	fs.writeFileSync(_root + 'blockstates/cargo_crate.json', JSON.stringify(blockstate, null, '\t'))
 }
 
+// Обычные блокстейты для ресурсов
+{
+	const blocks = [
+		'tritanium_ore',
+		'tritanium_raw_block',
+		'deepslate_tritanium_ore',
+	]
+
+	for (const name of blocks) {
+		const blockstate = {
+			"variants": {
+				"": [
+					{
+						"model": "overdrive_that_matters:block/" + name,
+						"weight": 10
+					},
+				]
+			}
+		}
+
+		for (const x of [0, 90, 180]) {
+			for (const y of [0, 90, 180, 270]) {
+				blockstate.variants[''].push({
+					"model": "overdrive_that_matters:block/" + name,
+					"weight": 1,
+					"x": x,
+					"y": y
+				})
+			}
+		}
+
+		fs.writeFileSync(_root + 'blockstates/' + name + '.json', JSON.stringify(blockstate, null, '\t'))
+
+		fs.writeFileSync(_root + 'models/item/' + name + '.json', JSON.stringify({
+			"parent": "overdrive_that_matters:block/" + name
+		}, null, '\t'))
+
+		fs.writeFileSync(_root + 'models/block/' + name + '.json', JSON.stringify({
+			"parent": "block/cube_all",
+			"textures": {
+				"all": "overdrive_that_matters:block/resource/" + name
+			}
+		}, null, '\t'))
+	}
+}
+
 // Обычные блокстейты
 {
 	const blocks = [

src/main/java/ru/dbotthepony/mc/otm/Registry.java

@@ -6,12 +6,14 @@ import net.minecraft.network.chat.TextComponent;
 import net.minecraft.network.chat.TranslatableComponent;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.stats.StatFormatter;
+import net.minecraft.util.valueproviders.UniformInt;
 import net.minecraft.world.damagesource.DamageSource;
 import net.minecraft.world.food.FoodProperties;
 import net.minecraft.world.inventory.MenuType;
 import net.minecraft.world.item.BlockItem;
 import net.minecraft.world.item.Item;
 import net.minecraft.world.level.block.Block;
+import net.minecraft.world.level.block.OreBlock;
 import net.minecraft.world.level.block.SoundType;
 import net.minecraft.world.level.block.entity.BlockEntityType;
 import net.minecraft.world.level.block.state.BlockBehaviour;
@@ -163,6 +165,11 @@ public class Registry {
 		public static final ResourceLocation BASIC_CONTROL_CIRCUIT = new ResourceLocation(OverdriveThatMatters.MOD_ID, "basic_control_circuit");
 		public static final ResourceLocation ADVANCED_CONTROL_CIRCUIT = new ResourceLocation(OverdriveThatMatters.MOD_ID, "advanced_control_circuit");
 
+		public static final ResourceLocation TRITANIUM_ORE = new ResourceLocation(OverdriveThatMatters.MOD_ID, "tritanium_ore");
+		public static final ResourceLocation DEEPSLATE_TRITANIUM_ORE = new ResourceLocation(OverdriveThatMatters.MOD_ID, "deepslate_tritanium_ore");
+		public static final ResourceLocation TRITANIUM_RAW_BLOCK = new ResourceLocation(OverdriveThatMatters.MOD_ID, "tritanium_raw_block");
+		public static final ResourceLocation TRITANIUM_ORE_CLUMP = new ResourceLocation(OverdriveThatMatters.MOD_ID, "tritanium_ore_clump");
+
 		// android features and research
 		public static final ResourceLocation AIR_BAGS = new ResourceLocation(OverdriveThatMatters.MOD_ID, "air_bags");
 
@@ -230,6 +237,26 @@ public class Registry {
 
 		public static final BlockBlackHole BLACK_HOLE = new BlockBlackHole();
 
+		public static final Block TRITANIUM_ORE = new OreBlock(
+			BlockBehaviour.Properties.of(Material.STONE)
+			.strength(3.25F, 6.0F)
+			.requiresCorrectToolForDrops(),
+			UniformInt.of(0, 3)
+		);
+
+		public static final Block DEEPSLATE_TRITANIUM_ORE = new OreBlock(
+			BlockBehaviour.Properties.of(Material.STONE)
+			.strength(4.75F, 6.5F)
+			.requiresCorrectToolForDrops(),
+			UniformInt.of(0, 3)
+		);
+
+		public static final Block TRITANIUM_RAW_BLOCK = new Block(
+			BlockBehaviour.Properties.of(Material.STONE)
+			.strength(8.0F, 10F)
+			.requiresCorrectToolForDrops()
+		);
+
 		public static final Block[] CRATES = new Block[Registry.CRATES.length];
 
 		public static final Block TRITANIUM_BLOCK = new Block(
@@ -266,6 +293,9 @@ public class Registry {
 				CRATES[i].setRegistryName(Registry.CRATES[i].name);
 			}
 
+			TRITANIUM_ORE.setRegistryName(Names.TRITANIUM_ORE);
+			DEEPSLATE_TRITANIUM_ORE.setRegistryName(Names.DEEPSLATE_TRITANIUM_ORE);
+			TRITANIUM_RAW_BLOCK.setRegistryName(Names.TRITANIUM_RAW_BLOCK);
 			ANDROID_STATION.setRegistryName(Names.ANDROID_STATION);
 			BATTERY_BANK.setRegistryName(Names.BATTERY_BANK);
 			MATTER_DECOMPOSER.setRegistryName(Names.MATTER_DECOMPOSER);
@@ -303,6 +333,9 @@ public class Registry {
 			event.getRegistry().register(CARBON_FIBRE_BLOCK);
 			event.getRegistry().register(BLACK_HOLE);
 			event.getRegistry().register(CARGO_CRATE);
+			event.getRegistry().register(TRITANIUM_ORE);
+			event.getRegistry().register(DEEPSLATE_TRITANIUM_ORE);
+			event.getRegistry().register(TRITANIUM_RAW_BLOCK);
 
 			for (var crate : CRATES) {
 				event.getRegistry().register(crate);
@@ -325,7 +358,11 @@ public class Registry {
 		public static final Item MATTER_BOTTLER = new BlockItem(Blocks.MATTER_BOTTLER, new Item.Properties().stacksTo(64).tab(OverdriveThatMatters.CREATIVE_TAB));
 		public static final Item DRIVE_VIEWER = new BlockItem(Blocks.DRIVE_VIEWER, new Item.Properties().stacksTo(64).tab(OverdriveThatMatters.CREATIVE_TAB));
 		public static final Item CARGO_CRATE = new BlockItem(Blocks.CARGO_CRATE, new Item.Properties().stacksTo(64).tab(OverdriveThatMatters.CREATIVE_TAB));
+		public static final Item TRITANIUM_ORE = new BlockItem(Blocks.TRITANIUM_ORE, new Item.Properties().stacksTo(64).tab(OverdriveThatMatters.CREATIVE_TAB));
+		public static final Item DEEPSLATE_TRITANIUM_ORE = new BlockItem(Blocks.DEEPSLATE_TRITANIUM_ORE, new Item.Properties().stacksTo(64).tab(OverdriveThatMatters.CREATIVE_TAB));
+		public static final Item TRITANIUM_RAW_BLOCK = new BlockItem(Blocks.TRITANIUM_RAW_BLOCK, new Item.Properties().stacksTo(64).tab(OverdriveThatMatters.CREATIVE_TAB));
 
+		public static final Item TRITANIUM_ORE_CLUMP = new Item(new Item.Properties().stacksTo(64).tab(OverdriveThatMatters.CREATIVE_TAB));
 		public static final Item TRITANIUM_INGOT = new Item(new Item.Properties().stacksTo(64).tab(OverdriveThatMatters.CREATIVE_TAB));
 		public static final Item MATTER_IO_PORT = new Item(new Item.Properties().stacksTo(64).tab(OverdriveThatMatters.CREATIVE_TAB));
 		public static final Item MATTER_TRANSFORM_MATRIX = new Item(new Item.Properties().stacksTo(64).tab(OverdriveThatMatters.CREATIVE_TAB));
@@ -394,6 +431,10 @@ public class Registry {
 			BLACK_HOLE.setRegistryName(Names.BLACK_HOLE);
 			CARGO_CRATE.setRegistryName(Names.CARGO_CRATE);
 
+			TRITANIUM_ORE.setRegistryName(Names.TRITANIUM_ORE);
+			DEEPSLATE_TRITANIUM_ORE.setRegistryName(Names.DEEPSLATE_TRITANIUM_ORE);
+			TRITANIUM_RAW_BLOCK.setRegistryName(Names.TRITANIUM_RAW_BLOCK);
+			TRITANIUM_ORE_CLUMP.setRegistryName(Names.TRITANIUM_ORE_CLUMP);
 			TRITANIUM_INGOT.setRegistryName(Names.TRITANIUM_INGOT);
 			MATTER_IO_PORT.setRegistryName(Names.MATTER_IO_PORT);
 			MATTER_TRANSFORM_MATRIX.setRegistryName(Names.MATTER_TRANSFORM_MATRIX);
@@ -453,6 +494,11 @@ public class Registry {
 			event.getRegistry().register(BLACK_HOLE);
 			event.getRegistry().register(CARGO_CRATE);
 
+			event.getRegistry().register(TRITANIUM_ORE);
+			event.getRegistry().register(DEEPSLATE_TRITANIUM_ORE);
+			event.getRegistry().register(TRITANIUM_RAW_BLOCK);
+
+			event.getRegistry().register(TRITANIUM_ORE_CLUMP);
 			event.getRegistry().register(TRITANIUM_INGOT);
 			event.getRegistry().register(MATTER_IO_PORT);
 			event.getRegistry().register(MATTER_TRANSFORM_MATRIX);

src/main/resources/assets/overdrive_that_matters/blockstates/.gitignore

@@ -0,0 +1,3 @@
+/deepslate_tritanium_ore.json
+/tritanium_ore.json
+/tritanium_raw_block.json

src/main/resources/assets/overdrive_that_matters/lang/en_us.json

@@ -155,6 +155,9 @@
 	"block.overdrive_that_matters.tritanium_block": "Tritanium Block",
 	"block.overdrive_that_matters.tritanium_striped_block": "Tritanium Striped Block",
 	"block.overdrive_that_matters.cargo_crate": "Cargo Crate",
+	"block.overdrive_that_matters.tritanium_ore": "Tritanium Ore",
+	"block.overdrive_that_matters.deepslate_tritanium_ore": "Deepslate Tritanium Ore",
+	"block.overdrive_that_matters.tritanium_raw_block": "Raw Tritanium Block",
 
 	"item.overdrive_that_matters.pill_android": "Android Pill",
 	"item.overdrive_that_matters.pill_humane": "Humane Pill",
@@ -177,6 +180,8 @@
 	"item.overdrive_that_matters.matter_capacitor_dense": "Dense Matter Capacitor",
 	"item.overdrive_that_matters.matter_capacitor_creative": "Creative Matter Capacitor",
 
+	"item.overdrive_that_matters.tritanium_ore_clump": "Raw Tritanium",
+
 	"item.overdrive_that_matters.tritanium_ingot": "Tritanium Ingot",
 	"item.overdrive_that_matters.matter_io_port": "Matter IO Port",
 	"item.overdrive_that_matters.matter_transform_matrix": "Matter Transformation Matrix",

src/main/resources/assets/overdrive_that_matters/models/block/.gitignore

@@ -0,0 +1,3 @@
+/deepslate_tritanium_ore.json
+/tritanium_ore.json
+/tritanium_raw_block.json

src/main/resources/assets/overdrive_that_matters/models/item/.gitignore

@@ -0,0 +1,3 @@
+/deepslate_tritanium_ore.json
+/tritanium_ore.json
+/tritanium_raw_block.json

src/main/resources/assets/overdrive_that_matters/models/item/tritanium_ore_clump.json

@@ -0,0 +1,6 @@
+{
+    "parent": "item/generated",
+    "textures": {
+        "layer0": "overdrive_that_matters:item/resources/tritanium_ore_clump"
+    }
+}

src/main/resources/data/forge/tags/blocks/ores/tritanium.json

@@ -0,0 +1,6 @@
+{
+	"replace": false,
+	"values": [
+		"overdrive_that_matters:tritanium_ore"
+	]
+}

src/main/resources/data/forge/tags/items/ores/tritanium.json

@@ -0,0 +1,7 @@
+{
+	"replace": false,
+	"values": [
+		"overdrive_that_matters:tritanium_ore",
+		"overdrive_that_matters:tritanium_ore_clump"
+	]
+}

src/main/resources/data/forge/tags/items/raw_blocks/tritanium.json

@@ -0,0 +1,6 @@
+{
+	"replace": false,
+	"values": [
+		"overdrive_that_matters:tritanium_raw_block"
+	]
+}

src/main/resources/data/forge/tags/items/raw_ores/tritanium.json

@@ -0,0 +1,6 @@
+{
+	"replace": false,
+	"values": [
+		"overdrive_that_matters:tritanium_ore_clump"
+	]
+}

src/main/resources/data/minecraft/tags/blocks/mineable/pickaxe.json

@@ -12,9 +12,11 @@
 		"overdrive_that_matters:matter_replicator",
 		"overdrive_that_matters:matter_bottler",
 		"overdrive_that_matters:drive_viewer",
+
 		"overdrive_that_matters:tritanium_block",
 		"overdrive_that_matters:tritanium_striped_block",
 		"overdrive_that_matters:carbon_fibre_block",
+
 		"overdrive_that_matters:crate_red",
 		"overdrive_that_matters:crate_blue",
 		"overdrive_that_matters:crate_yellow",
@@ -22,6 +24,10 @@
 		"overdrive_that_matters:crate_black",
 		"overdrive_that_matters:crate_pink",
 		"overdrive_that_matters:crate_purple",
-		"overdrive_that_matters:cargo_crate"
+		"overdrive_that_matters:cargo_crate",
+
+		"overdrive_that_matters:tritanium_ore",
+		"overdrive_that_matters:deepslate_tritanium_ore",
+		"overdrive_that_matters:tritanium_raw_block"
 	]
 }

src/main/resources/data/minecraft/tags/blocks/needs_iron_tool.json

@@ -0,0 +1,24 @@
+{
+	"replace": false,
+	"values": [
+		"overdrive_that_matters:android_station",
+		"overdrive_that_matters:battery_bank",
+		"overdrive_that_matters:matter_decomposer",
+		"overdrive_that_matters:matter_capacitor_bank",
+		"overdrive_that_matters:matter_cable",
+		"overdrive_that_matters:pattern_storage",
+		"overdrive_that_matters:matter_scanner",
+		"overdrive_that_matters:matter_panel",
+		"overdrive_that_matters:matter_replicator",
+		"overdrive_that_matters:matter_bottler",
+		"overdrive_that_matters:drive_viewer",
+
+		"overdrive_that_matters:tritanium_block",
+		"overdrive_that_matters:tritanium_striped_block",
+		"overdrive_that_matters:carbon_fibre_block",
+
+		"overdrive_that_matters:tritanium_ore",
+		"overdrive_that_matters:deepslate_tritanium_ore",
+		"overdrive_that_matters:tritanium_raw_block"
+	]
+}

src/main/resources/data/minecraft/tags/blocks/needs_stone_tool.json

@@ -0,0 +1,13 @@
+{
+	"replace": false,
+	"values": [
+		"overdrive_that_matters:crate_red",
+		"overdrive_that_matters:crate_blue",
+		"overdrive_that_matters:crate_yellow",
+		"overdrive_that_matters:crate_green",
+		"overdrive_that_matters:crate_black",
+		"overdrive_that_matters:crate_pink",
+		"overdrive_that_matters:crate_purple",
+		"overdrive_that_matters:cargo_crate"
+	]
+}

src/main/resources/data/overdrive_that_matters/loot_tables/blocks/.gitignore

@@ -0,0 +1 @@
+/tritanium_raw_block.json

src/main/resources/data/overdrive_that_matters/loot_tables/blocks/deepslate_tritanium_ore.json

@@ -0,0 +1,49 @@
+{
+	"type": "minecraft:block",
+	"pools": [
+		{
+			"rolls": 1,
+			"bonus_rolls": 0.0,
+			"entries": [
+				{
+					"type": "minecraft:alternatives",
+					"children": [
+						{
+							"type": "minecraft:item",
+							"conditions": [
+								{
+									"condition": "minecraft:match_tool",
+									"predicate": {
+										"enchantments": [
+											{
+												"enchantment": "minecraft:silk_touch",
+												"levels": {
+													"min": 1
+												}
+											}
+										]
+									}
+								}
+							],
+							"name": "overdrive_that_matters:deepslate_tritanium_ore"
+						},
+						{
+							"type": "minecraft:item",
+							"functions": [
+								{
+									"function": "minecraft:apply_bonus",
+									"enchantment": "minecraft:fortune",
+									"formula": "minecraft:ore_drops"
+								},
+								{
+									"function": "minecraft:explosion_decay"
+								}
+							],
+							"name": "overdrive_that_matters:tritanium_ore_clump"
+						}
+					]
+				}
+			]
+		}
+	]
+}

src/main/resources/data/overdrive_that_matters/loot_tables/blocks/tritanium_ore.json

@@ -0,0 +1,49 @@
+{
+	"type": "minecraft:block",
+	"pools": [
+		{
+			"rolls": 1,
+			"bonus_rolls": 0.0,
+			"entries": [
+				{
+					"type": "minecraft:alternatives",
+					"children": [
+						{
+							"type": "minecraft:item",
+							"conditions": [
+								{
+									"condition": "minecraft:match_tool",
+									"predicate": {
+										"enchantments": [
+											{
+												"enchantment": "minecraft:silk_touch",
+												"levels": {
+													"min": 1
+												}
+											}
+										]
+									}
+								}
+							],
+							"name": "overdrive_that_matters:tritanium_ore"
+						},
+						{
+							"type": "minecraft:item",
+							"functions": [
+								{
+									"function": "minecraft:apply_bonus",
+									"enchantment": "minecraft:fortune",
+									"formula": "minecraft:ore_drops"
+								},
+								{
+									"function": "minecraft:explosion_decay"
+								}
+							],
+							"name": "overdrive_that_matters:tritanium_ore_clump"
+						}
+					]
+				}
+			]
+		}
+	]
+}

src/main/resources/data/overdrive_that_matters/recipes/blasting/tritanium_ingot.json

@@ -0,0 +1,9 @@
+{
+	"type": "minecraft:blasting",
+	"ingredient": {
+		"tag": "forge:ores/tritanium"
+	},
+	"result": "overdrive_that_matters:tritanium_ingot",
+	"experience": 1,
+	"cookingtime": 100
+}

src/main/resources/data/overdrive_that_matters/recipes/blocks/raw_tritanium_block.json

@@ -0,0 +1,38 @@
+{
+	"type": "minecraft:crafting_shapeless",
+
+	"ingredients": [
+		{
+			"tag": "forge:raw_ores/tritanium"
+		},
+		{
+			"tag": "forge:raw_ores/tritanium"
+		},
+		{
+			"tag": "forge:raw_ores/tritanium"
+		},
+		{
+			"tag": "forge:raw_ores/tritanium"
+		},
+		{
+			"tag": "forge:raw_ores/tritanium"
+		},
+		{
+			"tag": "forge:raw_ores/tritanium"
+		},
+		{
+			"tag": "forge:raw_ores/tritanium"
+		},
+		{
+			"tag": "forge:raw_ores/tritanium"
+		},
+		{
+			"tag": "forge:raw_ores/tritanium"
+		}
+	],
+
+	"result": {
+		"item": "overdrive_that_matters:tritanium_raw_block",
+		"count": 1
+	}
+}

src/main/resources/data/overdrive_that_matters/recipes/blocks/raw_tritanium_block_inv.json

@@ -0,0 +1,14 @@
+{
+	"type": "minecraft:crafting_shapeless",
+
+	"ingredients": [
+		{
+			"tag": "forge:raw_blocks/tritanium"
+		}
+	],
+
+	"result": {
+		"item": "overdrive_that_matters:tritanium_ore_clump",
+		"count": 9
+	}
+}

src/main/resources/data/overdrive_that_matters/recipes/smelting/tritanium_ingot.json

@@ -0,0 +1,9 @@
+{
+	"type": "minecraft:smelting",
+	"ingredient": {
+		"tag": "forge:ores/tritanium"
+	},
+	"result": "overdrive_that_matters:tritanium_ingot",
+	"experience": 1,
+	"cookingtime": 200
+}