Compare commits

...

2 Commits

19 changed files with 183 additions and 286 deletions

View File

@ -14,6 +14,7 @@ fun addBlockModels(provider: MatteryBlockModelProvider) {
cable("regular_energy_cable", "block/power_cable_1")
cable("advanced_energy_cable", "block/power_cable_2")
cable("superconductor_energy_cable", "block/power_cable_3")
cable("matter_cable", "block/matter_cable", thin = true)
cable("storage_cable", "block/storage_cable")
colored(MBlocks.COBBLESTONE_GENERATOR, listOf("0", "particle"))

View File

@ -143,15 +143,17 @@ class MatteryBlockModelProvider(event: GatherDataEvent) : BlockModelProvider(eve
}
}
fun cable(modelName: String, textureName: String) {
fun cable(modelName: String, textureName: String, thin: Boolean = false) {
val baseName = if (thin) "base_cable_thin" else "base_cable"
exec {
withExistingParent("block/${modelName}_core", modLocation("block/base_cable_core"))
withExistingParent("block/${modelName}_core", modLocation("block/${baseName}_core"))
.texture("0", textureName)
withExistingParent("block/${modelName}_connection", modLocation("block/base_cable_connection"))
withExistingParent("block/${modelName}_connection", modLocation("block/${baseName}_connection"))
.texture("0", textureName)
withExistingParent("item/${modelName}", modLocation("item/base_cable"))
withExistingParent("item/${modelName}", modLocation("item/${baseName}"))
.texture("0", textureName)
}
}

View File

@ -35,16 +35,6 @@ fun addCraftingTableRecipes(consumer: RecipeOutput) {
.save(consumer, "${crate.registryName}_alt")
}
ShapelessRecipeBuilder(RecipeCategory.BUILDING_BLOCKS, MItems.TRITANIUM_INGOT_BLOCK, 1)
.requires(Ingredient.of(MItemTags.TRITANIUM_INGOTS), 9)
.unlockedBy(MItemTags.TRITANIUM_INGOTS)
.save(consumer)
ShapelessRecipeBuilder(RecipeCategory.MISC, MItems.TRITANIUM_INGOT, 9)
.requires(Ingredient.of(MItemTags.TRITANIUM_INGOTS_STORAGE))
.unlockedBy(MItemTags.TRITANIUM_INGOTS_STORAGE)
.save(consumer, modLocation("tritanium_ingot_from_storage"))
MItems.ENERGY_COUNTER.values.forEach {
ShapelessRecipeBuilder(machinesCategory, it, 1)
.requires(it)
@ -57,6 +47,52 @@ fun addCraftingTableRecipes(consumer: RecipeOutput) {
.unlockedBy(MItems.HOLO_SIGN)
.save(consumer, modLocation("holo_sign_reset"))
MatteryRecipe(MBlocks.DRIVE_VIEWER[null]!!, category = machinesCategory)
.rowAC(MItemTags.IRON_PLATES, MItemTags.IRON_PLATES)
.row(Tags.Items.DUSTS_GLOWSTONE, MItems.MACHINE_FRAME, Tags.Items.GLASS_BLOCKS)
.row(MItemTags.BASIC_CIRCUIT, MItems.MATTER_IO_PORT, MItemTags.BASIC_CIRCUIT)
.unlockedBy(MItems.MATTER_IO_PORT)
.build(consumer)
MatteryRecipe(MBlocks.MATTER_BOTTLER[null]!!, category = machinesCategory)
.row(MItems.MATTER_CAPACITOR_PARTS, MItems.MATTER_IO_PORT, MItems.MATTER_CAPACITOR_PARTS)
.row(Tags.Items.GLASS_BLOCKS, MItems.MACHINE_FRAME, Tags.Items.GLASS_BLOCKS)
.rowAC(MItems.MATTER_CABLE, MItems.MATTER_CABLE)
.unlockedBy(MItems.MATTER_CAPACITOR_PARTS)
.unlockedBy(MItems.MATTER_IO_PORT)
.build(consumer)
MatteryRecipe(MBlocks.MATTER_DECOMPOSER[null]!!, category = machinesCategory)
.row(MItems.MATTER_TRANSFORM_MATRIX, MItemTags.BASIC_CIRCUIT, MItems.MATTER_IO_PORT)
.row(MItemTags.TRITANIUM_PLATES, MItems.MACHINE_FRAME, MItemTags.TRITANIUM_PLATES)
.row(MItems.MATTER_CABLE, MItems.MATTER_CAPACITOR_PARTS, MItems.MATTER_CABLE)
.unlockedBy(MItems.MATTER_CAPACITOR_PARTS)
.unlockedBy(MItems.MATTER_IO_PORT)
.build(consumer)
MatteryRecipe(MBlocks.MATTER_PANEL[null]!!, category = machinesCategory)
.row(MItems.ELECTRIC_PARTS, MItemTags.TRITANIUM_PLATES, Tags.Items.GLASS_BLOCKS)
.row(MItems.MATTER_CABLE, Tags.Items.DUSTS_GLOWSTONE, Tags.Items.GLASS_BLOCKS)
.row(MItemTags.ADVANCED_CIRCUIT, MItemTags.TRITANIUM_PLATES, Tags.Items.GLASS_BLOCKS)
.unlockedBy(Tags.Items.GLASS_BLOCKS)
.build(consumer)
MatteryRecipe(MBlocks.MATTER_REPLICATOR[null]!!, category = machinesCategory)
.row(MItems.MATTER_IO_PORT, MItemTags.ADVANCED_CIRCUIT, MItems.MATTER_TRANSFORM_MATRIX)
.row(Tags.Items.GEMS_DIAMOND, MItems.MACHINE_FRAME, Tags.Items.GEMS_DIAMOND)
.row(MItems.MATTER_CABLE, MItems.MATTER_CAPACITOR_PARTS, MItems.MATTER_CABLE)
.unlockedBy(MItems.MATTER_CAPACITOR_PARTS)
.unlockedBy(MItems.MATTER_IO_PORT)
.unlockedBy(MItems.MATTER_TRANSFORM_MATRIX)
.build(consumer)
MatteryRecipe(MBlocks.PATTERN_STORAGE, category = machinesCategory)
.row(Tags.Items.GLASS_BLOCKS, Tags.Items.GLASS_BLOCKS, Tags.Items.GLASS_BLOCKS)
.row(MItemTags.IRON_PLATES, MItems.MACHINE_FRAME, MItemTags.IRON_PLATES)
.row(MItems.MATTER_CABLE, MItemTags.BASIC_CIRCUIT, MItems.MATTER_CABLE)
.unlockedBy(MItemTags.IRON_PLATES)
.build(consumer)
MatteryRecipe(MBlocks.ENERGY_COUNTER[null]!!, category = machinesCategory)
.row(MItemTags.TRITANIUM_PLATES, MItems.ENERGY_BUS, MItemTags.TRITANIUM_PLATES)
.row(MItemTags.BASIC_CIRCUIT, Tags.Items.DUSTS_GLOWSTONE, MItemTags.HARDENED_GLASS_PANES_COLORLESS)
@ -94,6 +130,14 @@ fun addCraftingTableRecipes(consumer: RecipeOutput) {
.unlockedBy(MItemTags.ADVANCED_CIRCUIT)
.build(consumer)
MatteryRecipe(MItems.MATTER_CABLE, category = machinesCategory)
.row(MItemTags.TRITANIUM_PLATES, MItemTags.TRITANIUM_PLATES, MItemTags.TRITANIUM_PLATES)
.row(Items.REDSTONE, MItemTags.COPPER_WIRES, Items.REDSTONE)
.row(MItemTags.TRITANIUM_PLATES, MItemTags.TRITANIUM_PLATES, MItemTags.TRITANIUM_PLATES)
.unlockedBy(MItemTags.TRITANIUM_PLATES)
.unlockedBy(MItemTags.COPPER_WIRES)
.build(consumer)
// Машины
MatteryRecipe(MItems.MATTER_RECYCLER[null]!!, category = machinesCategory)
.row(MItems.MATTER_CAPACITOR_PARTS, Items.HOPPER, MItemTags.BASIC_CIRCUIT)
@ -331,18 +375,6 @@ fun addCraftingTableRecipes(consumer: RecipeOutput) {
.rowB(MItemTags.REINFORCED_TRITANIUM_PLATES)
.build(consumer)
ShapelessRecipeBuilder(RecipeCategory.MISC, MItems.TRITANIUM_NUGGET, 9)
.requires(MItemTags.TRITANIUM_INGOTS)
.unlockedBy(MItemTags.TRITANIUM_INGOTS)
.unlockedBy(MItemTags.TRITANIUM_NUGGETS)
.save(consumer)
ShapelessRecipeBuilder(RecipeCategory.MISC, MItems.TRITANIUM_INGOT, 1)
.requires(Ingredient.of(MItemTags.TRITANIUM_NUGGETS), 9)
.unlockedBy(MItemTags.TRITANIUM_INGOTS)
.unlockedBy(MItemTags.TRITANIUM_NUGGETS)
.save(consumer, modLocation("ingot_from_nuggets"))
MatteryRecipe(MItems.ESSENCE_STORAGE[null]!!, category = machinesCategory)
.row(MItems.MATTER_CAPACITOR_PARTS, Items.ENDER_EYE, MItemTags.ADVANCED_CIRCUIT)
.row(MItemTags.TRITANIUM_PLATES, MItems.MACHINE_FRAME, MItemTags.TRITANIUM_PLATES)

View File

@ -58,6 +58,38 @@ fun addShapelessRecipes(consumer: RecipeOutput) {
.unlockedBy(MRegistry.CARGO_CRATES.item)
.save(consumer)
ShapelessRecipeBuilder(RecipeCategory.BUILDING_BLOCKS, MItems.TRITANIUM_INGOT_BLOCK, 1)
.requires(Ingredient.of(MItemTags.TRITANIUM_INGOTS), 9)
.unlockedBy(MItemTags.TRITANIUM_INGOTS)
.save(consumer)
ShapelessRecipeBuilder(RecipeCategory.BUILDING_BLOCKS, MItems.TRITANIUM_RAW_BLOCK, 1)
.requires(Ingredient.of(MItemTags.TRITANIUM_ORE_CLUMPS), 9)
.unlockedBy(MItemTags.TRITANIUM_ORE_CLUMPS)
.save(consumer)
ShapelessRecipeBuilder(RecipeCategory.MISC, MItems.TRITANIUM_ORE_CLUMP, 9)
.requires(Ingredient.of(MItemTags.RAW_TRITANIUM_STORAGE))
.unlockedBy(MItemTags.RAW_TRITANIUM_STORAGE)
.save(consumer, modLocation("raw_tritanium_from_storage"))
ShapelessRecipeBuilder(RecipeCategory.MISC, MItems.TRITANIUM_INGOT, 9)
.requires(Ingredient.of(MItemTags.TRITANIUM_INGOTS_STORAGE))
.unlockedBy(MItemTags.TRITANIUM_INGOTS_STORAGE)
.save(consumer, modLocation("tritanium_ingot_from_storage"))
ShapelessRecipeBuilder(RecipeCategory.MISC, MItems.TRITANIUM_NUGGET, 9)
.requires(MItemTags.TRITANIUM_INGOTS)
.unlockedBy(MItemTags.TRITANIUM_INGOTS)
.unlockedBy(MItemTags.TRITANIUM_NUGGETS)
.save(consumer)
ShapelessRecipeBuilder(RecipeCategory.MISC, MItems.TRITANIUM_INGOT, 1)
.requires(Ingredient.of(MItemTags.TRITANIUM_NUGGETS), 9)
.unlockedBy(MItemTags.TRITANIUM_INGOTS)
.unlockedBy(MItemTags.TRITANIUM_NUGGETS)
.save(consumer, modLocation("ingot_from_nuggets"))
hammerRecipe(MItems.TRITANIUM_PLATE, MItemTags.TRITANIUM_INGOTS, consumer)
hammerRecipe(MItems.IRON_PLATE, Tags.Items.INGOTS_IRON, consumer)
hammerRecipe(MItems.GOLD_PLATE, Tags.Items.INGOTS_GOLD, consumer)

View File

@ -15,6 +15,7 @@ object MItemTags {
val TRITANIUM_NUGGETS: TagKey<Item> = ItemTags.create(ResourceLocation("c", "nuggets/tritanium"))
val NUGGETS: TagKey<Item> = ItemTags.create(ResourceLocation("c", "nuggets"))
val TRITANIUM_INGOTS_STORAGE: TagKey<Item> = ItemTags.create(ResourceLocation("c", "storage_blocks/tritanium"))
val RAW_TRITANIUM_STORAGE: TagKey<Item> = ItemTags.create(ResourceLocation("c", "storage_blocks/raw_tritanium"))
val TRITANIUM_PLATES: TagKey<Item> = ItemTags.create(ResourceLocation("c", "plates/tritanium"))
val CARBON_PLATES: TagKey<Item> = ItemTags.create(ResourceLocation("c", "plates/carbon"))
val REINFORCED_TRITANIUM_PLATES: TagKey<Item> = ItemTags.create(ResourceLocation("c", "reinforced_tritanium"))

View File

@ -0,0 +1,19 @@
{
"parent": "block/block",
"texture_size": [16, 16],
"textures": {
"particle": "#0"
},
"elements": [
{
"from": [ 6, 6, 10 ],
"to": [ 10, 10, 16 ],
"faces": {
"east": {"uv": [10, 0, 16, 4], "texture": "#0"},
"west": {"uv": [ 4, 0, 10, 4], "texture": "#0"},
"up": {"uv": [ 4, 0, 10, 4], "rotation": 90, "texture": "#0"},
"down": {"uv": [10, 0, 16, 4], "rotation": 90, "texture": "#0"}
}
}
]
}

View File

@ -0,0 +1,21 @@
{
"parent": "block/block",
"texture_size": [16, 16],
"textures": {
"particle": "#0"
},
"elements": [
{
"from": [ 6, 6, 6 ],
"to": [ 10, 10, 10 ],
"faces": {
"down": {"uv": [0, 0, 4, 4], "texture": "#0" },
"up": {"uv": [0, 0, 4, 4], "texture": "#0" },
"north": {"uv": [0, 0, 4, 4], "texture": "#0" },
"south": {"uv": [0, 0, 4, 4], "texture": "#0" },
"west": {"uv": [0, 0, 4, 4], "texture": "#0" },
"east": {"uv": [0, 0, 4, 4], "texture": "#0" }
}
}
]
}

View File

@ -1,20 +0,0 @@
{
"parent": "block/block",
"texture_size": [16, 16],
"textures": {
"connection": "overdrive_that_matters:block/matter_cable",
"particle": "overdrive_that_matters:block/matter_cable"
},
"elements": [
{
"from": [ 6, 6, 10 ],
"to": [ 10, 10, 16 ],
"faces": {
"down": {"uv": [4, 0, 16, 4],"rotation": 90, "texture": "#connection" },
"up": {"uv": [4, 0, 16, 4],"rotation": 90, "texture": "#connection" },
"west": {"uv": [4, 0, 16, 4], "texture": "#connection" },
"east": {"uv": [4, 0, 16, 4], "texture": "#connection" }
}
}
]
}

View File

@ -1,22 +0,0 @@
{
"parent": "block/block",
"texture_size": [16, 16],
"textures": {
"core": "overdrive_that_matters:block/matter_cable",
"particle": "overdrive_that_matters:block/matter_cable"
},
"elements": [
{
"from": [ 6, 6, 6 ],
"to": [ 10, 10, 10 ],
"faces": {
"down": {"uv": [0, 0, 4, 4], "texture": "#core" },
"up": {"uv": [0, 0, 4, 4], "texture": "#core" },
"north": {"uv": [0, 0, 4, 4], "texture": "#core" },
"south": {"uv": [0, 0, 4, 4], "texture": "#core" },
"west": {"uv": [0, 0, 4, 4], "texture": "#core" },
"east": {"uv": [0, 0, 4, 4], "texture": "#core" }
}
}
]
}

View File

@ -0,0 +1,49 @@
{
"parent": "block/block",
"texture_size": [16, 16],
"textures": {
"particle": "#0"
},
"elements": [
{
"from": [6, 6, 6],
"to": [10, 10, 10],
"faces": {
"north": {"uv": [0, 0, 4, 4], "texture": "#0"},
"south": {"uv": [0, 0, 4, 4], "texture": "#0"},
"up": {"uv": [0, 0, 4, 4], "rotation": 180, "texture": "#0"},
"down": {"uv": [0, 0, 4, 4], "rotation": 180, "texture": "#0"}
}
},
{
"from": [0, 6, 6],
"to": [6, 10, 10],
"faces": {
"north": {"uv": [4, 0, 10, 4], "texture": "#0"},
"south": {"uv": [4, 4, 10, 0], "rotation": 180, "texture": "#0"},
"west": {"uv": [0, 0, 4, 4], "texture": "#0"},
"up": {"uv": [4, 0, 10, 4], "rotation": 180, "texture": "#0"},
"down": {"uv": [4, 0, 10, 4], "rotation": 180, "texture": "#0"}
}
},
{
"from": [10, 6, 6],
"to": [16, 10, 10],
"faces": {
"north": {"uv": [10, 0, 16, 4], "texture": "#0"},
"east": {"uv": [0, 0, 4, 4], "texture": "#0"},
"south": {"uv": [10, 4, 16, 0], "rotation": 180, "texture": "#0"},
"up": {"uv": [10, 0, 16, 4], "rotation": 180, "texture": "#0"},
"down": {"uv": [10, 0, 16, 4], "rotation": 180, "texture": "#0"}
}
}
],
"gui_light": "front",
"display": {
"gui": {
"rotation": [0, 0, 0],
"translation": [0, 0, 0],
"scale": [1, 1, 1]
}
}
}

View File

@ -1,28 +0,0 @@
{
"type": "minecraft:crafting_shaped",
"pattern": [
"###",
"RCR",
"###"
],
"key": {
"#": {
"tag": "forge:plates/tritanium"
},
"C": {
"tag": "forge:wires/copper"
},
"R": {
"tag": "forge:dusts/redstone"
}
},
"result": {
"item": "overdrive_that_matters:matter_cable",
"count": 16
}
}

View File

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

View File

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

View File

@ -1,23 +0,0 @@
{
"type": "minecraft:crafting_shaped",
"pattern": [
"P P",
"DFG",
"CIC"
],
"key": {
"P": {"tag": "forge:plates/iron"},
"D": {"tag": "forge:dusts/glowstone"},
"C": {"tag": "forge:circuits/basic"},
"G": {"tag": "forge:glass"},
"I": {"item": "overdrive_that_matters:matter_io_port"},
"F": {"item": "overdrive_that_matters:machine_frame"}
},
"result": {
"item": "overdrive_that_matters:drive_viewer",
"count": 1
}
}

View File

@ -1,22 +0,0 @@
{
"type": "minecraft:crafting_shaped",
"pattern": [
"PIP",
"GFG",
"- -"
],
"key": {
"F": {"item": "overdrive_that_matters:machine_frame"},
"I": {"item": "overdrive_that_matters:matter_io_port"},
"-": {"item": "overdrive_that_matters:matter_cable"},
"G": {"tag": "forge:glass"},
"P": {"item": "overdrive_that_matters:matter_capacitor_parts"}
},
"result": {
"item": "overdrive_that_matters:matter_bottler",
"count": 1
}
}

View File

@ -1,24 +0,0 @@
{
"type": "minecraft:crafting_shaped",
"pattern": [
"MCI",
"TFT",
"-P-"
],
"key": {
"M": {"item": "overdrive_that_matters:matter_transform_matrix"},
"I": {"item": "overdrive_that_matters:matter_io_port"},
"F": {"item": "overdrive_that_matters:machine_frame"},
"P": {"item": "overdrive_that_matters:matter_capacitor_parts"},
"-": {"item": "overdrive_that_matters:matter_cable"},
"T": {"tag": "forge:plates/tritanium"},
"C": {"tag": "forge:circuits/basic"}
},
"result": {
"item": "overdrive_that_matters:matter_decomposer",
"count": 1
}
}

View File

@ -1,23 +0,0 @@
{
"type": "minecraft:crafting_shaped",
"pattern": [
"ETP",
"-GP",
"CTP"
],
"key": {
"P": {"tag": "forge:glass_panes"},
"G": {"tag": "forge:dusts/glowstone"},
"T": {"tag": "forge:plates/tritanium"},
"C": {"tag": "forge:circuits/advanced"},
"E": {"item": "overdrive_that_matters:electric_parts"},
"-": {"item": "overdrive_that_matters:matter_cable"}
},
"result": {
"item": "overdrive_that_matters:matter_panel",
"count": 1
}
}

View File

@ -1,24 +0,0 @@
{
"type": "minecraft:crafting_shaped",
"pattern": [
"ICM",
"DFD",
"-P-"
],
"key": {
"M": {"item": "overdrive_that_matters:matter_transform_matrix"},
"I": {"item": "overdrive_that_matters:matter_io_port"},
"F": {"item": "overdrive_that_matters:machine_frame"},
"P": {"item": "overdrive_that_matters:matter_capacitor_parts"},
"-": {"item": "overdrive_that_matters:matter_cable"},
"D": {"tag": "forge:gems/diamond"},
"C": {"tag": "forge:circuits/advanced"}
},
"result": {
"item": "overdrive_that_matters:matter_replicator",
"count": 1
}
}

View File

@ -1,22 +0,0 @@
{
"type": "minecraft:crafting_shaped",
"pattern": [
"GGG",
"TFT",
"-C-"
],
"key": {
"G": {"tag": "forge:glass"},
"F": {"item": "overdrive_that_matters:machine_frame"},
"-": {"item": "overdrive_that_matters:matter_cable"},
"T": {"tag": "forge:plates/iron"},
"C": {"tag": "forge:circuits/basic"}
},
"result": {
"item": "overdrive_that_matters:pattern_storage",
"count": 1
}
}