DBot/overdrive_that_matters
DBot/overdrive_that_matters
3
1
Fork 0
Code Issues 63 Pull Requests Packages Releases Wiki Activity

Rename tag constants names to something better

Browse Source
This commit is contained in:
DBotThePony 2022-09-25 18:43:19 +07:00
parent 46819e82c6
commit 35ee672696
Signed by: DBot
GPG Key ID: DCC23B5715498507
5 changed files with 85 additions and 85 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/data/kotlin/ru/dbotthepony/mc/otm/datagen/ResearchData.kt
View File

@ -26,7 +26,7 @@ fun addResearchData(serializer: Consumer<AndroidResearchType>, lang: MatteryLang
.withDescription() .withDescription()
.withIcon(ResearchIcons.ICON_AIR_BAGS) .withIcon(ResearchIcons.ICON_AIR_BAGS)
.addItem(Tags.Items.GLASS_PANES, 6) .addItem(Tags.Items.GLASS_PANES, 6)
.addItem(MItemTags.PLATE_IRON) .addItem(MItemTags.IRON_PLATES)
.build() .build()
serializer.accept(AIR_BAGS) serializer.accept(AIR_BAGS)
@ -35,8 +35,8 @@ fun addResearchData(serializer: Consumer<AndroidResearchType>, lang: MatteryLang
.withExperience(20) .withExperience(20)
.withDescription() .withDescription()
.withIcon(ResearchIcons.ICON_EXTENDED_REACH) .withIcon(ResearchIcons.ICON_EXTENDED_REACH)
.addItem(MItemTags.PLATE_TRITANIUM, 3) .addItem(MItemTags.TRITANIUM_PLATES, 3)
.addItem(MItemTags.PLATE_IRON, 2) .addItem(MItemTags.IRON_PLATES, 2)
.addItem(MItemTags.GOLD_WIRES, 4) .addItem(MItemTags.GOLD_WIRES, 4)
.build() .build()
@ -49,7 +49,7 @@ fun addResearchData(serializer: Consumer<AndroidResearchType>, lang: MatteryLang
.withIcon(ResearchIcons.ICON_STEP_ASSIST) .withIcon(ResearchIcons.ICON_STEP_ASSIST)
.addPrerequisite(IMPROVED_LIMBS) .addPrerequisite(IMPROVED_LIMBS)
.addItem(MItemTags.PISTONS, 2) .addItem(MItemTags.PISTONS, 2)
.addItem(MItemTags.PLATE_TRITANIUM, 4) .addItem(MItemTags.TRITANIUM_PLATES, 4)
.addItem(MItemTags.COPPER_WIRES, 6) .addItem(MItemTags.COPPER_WIRES, 6)
.build() .build()
@ -62,7 +62,7 @@ fun addResearchData(serializer: Consumer<AndroidResearchType>, lang: MatteryLang
.withDescription() .withDescription()
.withIcon(ResearchIcons.ICON_EXTENDED_REACH) .withIcon(ResearchIcons.ICON_EXTENDED_REACH)
.addItem(MItemTags.PISTONS, 2) .addItem(MItemTags.PISTONS, 2)
.addItem(MItemTags.PLATE_TRITANIUM, 4) .addItem(MItemTags.TRITANIUM_PLATES, 4)
.addItem(MItemTags.GOLD_WIRES, 6) .addItem(MItemTags.GOLD_WIRES, 6)
.addItem(MItems.QUANTUM_TRANSCEIVER) .addItem(MItems.QUANTUM_TRANSCEIVER)
.build() .build()
@ -76,7 +76,7 @@ fun addResearchData(serializer: Consumer<AndroidResearchType>, lang: MatteryLang
.addFeatureResult(AndroidFeatures.NIGHT_VISION) .addFeatureResult(AndroidFeatures.NIGHT_VISION)
.addItem(Tags.Items.GLASS_PANES_COLORLESS, 4) .addItem(Tags.Items.GLASS_PANES_COLORLESS, 4)
.addItem(Tags.Items.DUSTS_REDSTONE, 4) .addItem(Tags.Items.DUSTS_REDSTONE, 4)
.addItem(MItemTags.PLATE_TRITANIUM, 2) .addItem(MItemTags.TRITANIUM_PLATES, 2)
.addItem(MItems.ELECTRIC_PARTS, 3) .addItem(MItems.ELECTRIC_PARTS, 3)
.addItem(MItemTags.ADVANCED_CIRCUIT) .addItem(MItemTags.ADVANCED_CIRCUIT)
.addItem(Items.ENDER_EYE, 2) .addItem(Items.ENDER_EYE, 2)
@ -99,7 +99,7 @@ fun addResearchData(serializer: Consumer<AndroidResearchType>, lang: MatteryLang
.addFeatureResult(OverdriveThatMatters.loc(MNames.NANOBOTS_ARMOR)) .addFeatureResult(OverdriveThatMatters.loc(MNames.NANOBOTS_ARMOR))
.withIcon(ResearchIcons.ICON_ARMOR) .withIcon(ResearchIcons.ICON_ARMOR)
.addBlocker(OverdriveThatMatters.loc(MNames.ATTACK_BOOST_1), rigid = true) .addBlocker(OverdriveThatMatters.loc(MNames.ATTACK_BOOST_1), rigid = true)
.addItem(MItemTags.PLATE_TRITANIUM, 4) .addItem(MItemTags.TRITANIUM_PLATES, 4)
.addItem(MItemTags.COPPER_WIRES, 8) .addItem(MItemTags.COPPER_WIRES, 8)
.build() .build()
@ -208,7 +208,7 @@ fun addResearchData(serializer: Consumer<AndroidResearchType>, lang: MatteryLang
(i + 1) * 6 (i + 1) * 6
) )
) )
.addItem(MItemTags.PLATE_TRITANIUM, 2 + i * 2) .addItem(MItemTags.TRITANIUM_PLATES, 2 + i * 2)
.addItem(Items.SUGAR, 1 + i) .addItem(Items.SUGAR, 1 + i)
.addFeatureResult(AndroidFeatures.NANOBOTS_ARMOR, 0, .addFeatureResult(AndroidFeatures.NANOBOTS_ARMOR, 0,
transformersUp = listOf(NanobotsArmorFeature.STRENGTH_TRANSFORMER_UP.bind(level)), transformersUp = listOf(NanobotsArmorFeature.STRENGTH_TRANSFORMER_UP.bind(level)),
@ -262,7 +262,7 @@ fun addResearchData(serializer: Consumer<AndroidResearchType>, lang: MatteryLang
.addItem(Tags.Items.ENDER_PEARLS) .addItem(Tags.Items.ENDER_PEARLS)
.addItem(Tags.Items.DUSTS_REDSTONE, 2) .addItem(Tags.Items.DUSTS_REDSTONE, 2)
.addItem(MItemTags.GOLD_WIRES, 4) .addItem(MItemTags.GOLD_WIRES, 4)
.addItem(MItemTags.PLATE_GOLD, 2) .addItem(MItemTags.GOLD_PLATES, 2)
.build() .build()
val ITEM_MAGNET = val ITEM_MAGNET =

116
src/data/kotlin/ru/dbotthepony/mc/otm/datagen/recipes/CraftingTableRecipes.kt
View File

@ -18,12 +18,12 @@ import java.util.function.Consumer
fun addCraftingTableRecipes(consumer: Consumer<FinishedRecipe>) { fun addCraftingTableRecipes(consumer: Consumer<FinishedRecipe>) {
for ((dye, crate) in MRegistry.CARGO_CRATES.blocks) { for ((dye, crate) in MRegistry.CARGO_CRATES.blocks) {
ShapedRecipeBuilder(crate, 1) ShapedRecipeBuilder(crate, 1)
.define('P', MItemTags.PLATE_TRITANIUM) .define('P', MItemTags.TRITANIUM_PLATES)
.define('C', Tags.Items.CHESTS) .define('C', Tags.Items.CHESTS)
.define('D', dye.tag) .define('D', dye.tag)
.pattern(" D ").pattern("PCP") .pattern(" D ").pattern("PCP")
// .unlockedBy("has_dye", has(dye.tag)) // .unlockedBy("has_dye", has(dye.tag))
.unlockedBy("has_tritanium_plate", has(MItemTags.PLATE_TRITANIUM)) .unlockedBy("has_tritanium_plate", has(MItemTags.TRITANIUM_PLATES))
.unlockedBy("has_chest", has(Tags.Items.CHESTS)) .unlockedBy("has_chest", has(Tags.Items.CHESTS))
.save(consumer) .save(consumer)
@ -35,63 +35,63 @@ fun addCraftingTableRecipes(consumer: Consumer<FinishedRecipe>) {
} }
ShapedRecipeBuilder(MRegistry.CARGO_CRATES.item, 1) ShapedRecipeBuilder(MRegistry.CARGO_CRATES.item, 1)
.define('P', MItemTags.PLATE_TRITANIUM) .define('P', MItemTags.TRITANIUM_PLATES)
.define('C', Tags.Items.CHESTS) .define('C', Tags.Items.CHESTS)
.pattern("PCP") .pattern("PCP")
.unlockedBy("has_tritanium_plate", has(MItemTags.PLATE_TRITANIUM)) .unlockedBy("has_tritanium_plate", has(MItemTags.TRITANIUM_PLATES))
.unlockedBy("has_chest", has(Tags.Items.CHESTS)) .unlockedBy("has_chest", has(Tags.Items.CHESTS))
.save(consumer) .save(consumer)
MatteryRecipe(MBlocks.PLATE_PRESS) MatteryRecipe(MBlocks.PLATE_PRESS)
.row(MItems.ELECTRIC_PARTS, MItems.ENERGY_BUS, MItems.ELECTRIC_PARTS) .row(MItems.ELECTRIC_PARTS, MItems.ENERGY_BUS, MItems.ELECTRIC_PARTS)
.row(MItemTags.INGOT_TRITANIUM, Items.BLAST_FURNACE, MItemTags.INGOT_TRITANIUM) .row(MItemTags.TRITANIUM_INGOTS, Items.BLAST_FURNACE, MItemTags.TRITANIUM_INGOTS)
.row(MItemTags.PISTONS, MItemTags.INGOT_TRITANIUM, MItemTags.PISTONS) .row(MItemTags.PISTONS, MItemTags.TRITANIUM_INGOTS, MItemTags.PISTONS)
.unlockedBy(MItemTags.INGOT_TRITANIUM) .unlockedBy(MItemTags.TRITANIUM_INGOTS)
.unlockedBy(MItems.ELECTRIC_PARTS) .unlockedBy(MItems.ELECTRIC_PARTS)
.build(consumer) .build(consumer)
MatteryRecipe(MBlocks.PLATE_PRESS) MatteryRecipe(MBlocks.PLATE_PRESS)
.rowB(MItemTags.BASIC_CIRCUIT) .rowB(MItemTags.BASIC_CIRCUIT)
.row(MItemTags.PLATE_TRITANIUM, MItems.MACHINE_FRAME, MItemTags.PLATE_TRITANIUM) .row(MItemTags.TRITANIUM_PLATES, MItems.MACHINE_FRAME, MItemTags.TRITANIUM_PLATES)
.rowAC(MItemTags.PISTONS, MItemTags.PISTONS) .rowAC(MItemTags.PISTONS, MItemTags.PISTONS)
.unlockedBy(MItemTags.INGOT_TRITANIUM) .unlockedBy(MItemTags.TRITANIUM_INGOTS)
.unlockedBy(MItems.ELECTRIC_PARTS) .unlockedBy(MItems.ELECTRIC_PARTS)
.build(consumer, "advanced") .build(consumer, "advanced")
MatteryRecipe(MBlocks.TRITANIUM_STRIPED_BLOCK, 24) MatteryRecipe(MBlocks.TRITANIUM_STRIPED_BLOCK, 24)
.rowB(MItemTags.PLATE_TRITANIUM) .rowB(MItemTags.TRITANIUM_PLATES)
.row(MItemTags.PLATE_TRITANIUM, COBBLESTONE, MItemTags.PLATE_TRITANIUM) .row(MItemTags.TRITANIUM_PLATES, COBBLESTONE, MItemTags.TRITANIUM_PLATES)
.rowAB(Tags.Items.DYES_YELLOW, MItemTags.PLATE_TRITANIUM) .rowAB(Tags.Items.DYES_YELLOW, MItemTags.TRITANIUM_PLATES)
.unlockedBy(MItemTags.PLATE_TRITANIUM) .unlockedBy(MItemTags.TRITANIUM_PLATES)
.unlockedBy(Tags.Items.DYES_YELLOW) .unlockedBy(Tags.Items.DYES_YELLOW)
.build(consumer) .build(consumer)
MatteryRecipe(MRegistry.TRITANIUM_BLOCK.item, 24) MatteryRecipe(MRegistry.TRITANIUM_BLOCK.item, 24)
.rowB(MItemTags.PLATE_TRITANIUM) .rowB(MItemTags.TRITANIUM_PLATES)
.row(MItemTags.PLATE_TRITANIUM, COBBLESTONE, MItemTags.PLATE_TRITANIUM) .row(MItemTags.TRITANIUM_PLATES, COBBLESTONE, MItemTags.TRITANIUM_PLATES)
.rowB(MItemTags.PLATE_TRITANIUM) .rowB(MItemTags.TRITANIUM_PLATES)
.unlockedBy(MItemTags.PLATE_TRITANIUM) .unlockedBy(MItemTags.TRITANIUM_PLATES)
.build(consumer) .build(consumer)
// Машины // Машины
MatteryRecipe(MItems.MATTER_RECYCLER) MatteryRecipe(MItems.MATTER_RECYCLER)
.row(MItems.MATTER_CAPACITOR_PARTS, Items.HOPPER, MItemTags.BASIC_CIRCUIT) .row(MItems.MATTER_CAPACITOR_PARTS, Items.HOPPER, MItemTags.BASIC_CIRCUIT)
.row(MItemTags.PLATE_TRITANIUM, MItems.MACHINE_FRAME, MItemTags.PLATE_TRITANIUM) .row(MItemTags.TRITANIUM_PLATES, MItems.MACHINE_FRAME, MItemTags.TRITANIUM_PLATES)
.row(MItems.MATTER_CABLE, MItems.MATTER_IO_PORT, MItems.MATTER_CABLE) .row(MItems.MATTER_CABLE, MItems.MATTER_IO_PORT, MItems.MATTER_CABLE)
.unlockedBy(MItems.MATTER_CABLE) .unlockedBy(MItems.MATTER_CABLE)
.build(consumer) .build(consumer)
// Блоки // Блоки
MatteryRecipe(MItems.MATTER_CAPACITOR_BANK) MatteryRecipe(MItems.MATTER_CAPACITOR_BANK)
.row(Tags.Items.GLASS, MItemTags.PLATE_IRON, Tags.Items.GLASS) .row(Tags.Items.GLASS, MItemTags.IRON_PLATES, Tags.Items.GLASS)
.row(MItemTags.PLATE_IRON, MItems.MACHINE_FRAME, MItemTags.PLATE_IRON) .row(MItemTags.IRON_PLATES, MItems.MACHINE_FRAME, MItemTags.IRON_PLATES)
.row(MItems.MATTER_CABLE, MItems.MATTER_IO_PORT, MItems.MATTER_CABLE) .row(MItems.MATTER_CABLE, MItems.MATTER_IO_PORT, MItems.MATTER_CABLE)
.unlockedBy(MItems.MATTER_CABLE) .unlockedBy(MItems.MATTER_CABLE)
.build(consumer) .build(consumer)
MatteryRecipe(MItems.BATTERY_BANK) MatteryRecipe(MItems.BATTERY_BANK)
.row(Tags.Items.GLASS, MItemTags.PLATE_IRON, Tags.Items.GLASS) .row(Tags.Items.GLASS, MItemTags.IRON_PLATES, Tags.Items.GLASS)
.row(MItemTags.PLATE_IRON, MItems.MACHINE_FRAME, MItemTags.PLATE_IRON) .row(MItemTags.IRON_PLATES, MItems.MACHINE_FRAME, MItemTags.IRON_PLATES)
.row(MItems.ELECTRIC_PARTS, MItems.ENERGY_BUS, MItems.ELECTRIC_PARTS) .row(MItems.ELECTRIC_PARTS, MItems.ENERGY_BUS, MItems.ELECTRIC_PARTS)
.unlockedBy(MItems.ENERGY_BUS) .unlockedBy(MItems.ENERGY_BUS)
.build(consumer) .build(consumer)
@ -99,44 +99,44 @@ fun addCraftingTableRecipes(consumer: Consumer<FinishedRecipe>) {
MatteryRecipe(MItems.GRAVITATION_STABILIZER) MatteryRecipe(MItems.GRAVITATION_STABILIZER)
.row(MItemTags.ADVANCED_CIRCUIT, MItems.GRAVITATION_FIELD_SENSOR, MItemTags.ADVANCED_CIRCUIT) .row(MItemTags.ADVANCED_CIRCUIT, MItems.GRAVITATION_FIELD_SENSOR, MItemTags.ADVANCED_CIRCUIT)
.row(MItems.MATTER_TRANSFORM_MATRIX, MItems.MACHINE_FRAME, MItems.MATTER_TRANSFORM_MATRIX) .row(MItems.MATTER_TRANSFORM_MATRIX, MItems.MACHINE_FRAME, MItems.MATTER_TRANSFORM_MATRIX)
.row(MItemTags.PLATE_TRITANIUM, MItems.GRAVITATION_FIELD_LIMITER, MItemTags.PLATE_TRITANIUM) .row(MItemTags.TRITANIUM_PLATES, MItems.GRAVITATION_FIELD_LIMITER, MItemTags.TRITANIUM_PLATES)
.unlockedBy(MItems.GRAVITATION_FIELD_LIMITER) .unlockedBy(MItems.GRAVITATION_FIELD_LIMITER)
.unlockedBy(MItems.GRAVITATION_FIELD_SENSOR) .unlockedBy(MItems.GRAVITATION_FIELD_SENSOR)
.build(consumer) .build(consumer)
MatteryRecipe(MItems.PORTABLE_GRAVITATION_STABILIZER) MatteryRecipe(MItems.PORTABLE_GRAVITATION_STABILIZER)
.rowB(MItemTags.PLATE_TRITANIUM) .rowB(MItemTags.TRITANIUM_PLATES)
.row(MItemTags.PLATE_TRITANIUM, MItems.GRAVITATION_FIELD_SENSOR, MItemTags.PLATE_TRITANIUM) .row(MItemTags.TRITANIUM_PLATES, MItems.GRAVITATION_FIELD_SENSOR, MItemTags.TRITANIUM_PLATES)
.row(MItemTags.PLATE_TRITANIUM, MItems.GRAVITATION_FIELD_LIMITER, MItemTags.PLATE_TRITANIUM) .row(MItemTags.TRITANIUM_PLATES, MItems.GRAVITATION_FIELD_LIMITER, MItemTags.TRITANIUM_PLATES)
.unlockedBy(MItems.GRAVITATION_FIELD_LIMITER) .unlockedBy(MItems.GRAVITATION_FIELD_LIMITER)
.unlockedBy(MItems.GRAVITATION_FIELD_SENSOR) .unlockedBy(MItems.GRAVITATION_FIELD_SENSOR)
.build(consumer) .build(consumer)
MatteryRecipe(MItems.GRAVITATION_FIELD_SENSOR) MatteryRecipe(MItems.GRAVITATION_FIELD_SENSOR)
.rowB(MItemTags.BASIC_CIRCUIT) .rowB(MItemTags.BASIC_CIRCUIT)
.row(MItemTags.PLATE_TRITANIUM, MItems.QUANTUM_TRANSCEIVER, MItemTags.PLATE_TRITANIUM) .row(MItemTags.TRITANIUM_PLATES, MItems.QUANTUM_TRANSCEIVER, MItemTags.TRITANIUM_PLATES)
.rowB(MItemTags.PLATE_IRON) .rowB(MItemTags.IRON_PLATES)
.unlockedBy(MItems.QUANTUM_TRANSCEIVER) .unlockedBy(MItems.QUANTUM_TRANSCEIVER)
.build(consumer) .build(consumer)
MatteryRecipe(MItems.GRAVITATION_FIELD_LIMITER) MatteryRecipe(MItems.GRAVITATION_FIELD_LIMITER)
.row(Tags.Items.ENDER_PEARLS, MItemTags.ADVANCED_CIRCUIT, Tags.Items.ENDER_PEARLS) .row(Tags.Items.ENDER_PEARLS, MItemTags.ADVANCED_CIRCUIT, Tags.Items.ENDER_PEARLS)
.row(MItemTags.GOLD_WIRES, MItems.QUANTUM_TRANSCEIVER, MItemTags.GOLD_WIRES) .row(MItemTags.GOLD_WIRES, MItems.QUANTUM_TRANSCEIVER, MItemTags.GOLD_WIRES)
.rowB(MItemTags.PLATE_TRITANIUM) .rowB(MItemTags.TRITANIUM_PLATES)
.unlockedBy(MItems.QUANTUM_TRANSCEIVER) .unlockedBy(MItems.QUANTUM_TRANSCEIVER)
.build(consumer) .build(consumer)
MatteryRecipe(MItems.BLACK_HOLE_SCANNER) MatteryRecipe(MItems.BLACK_HOLE_SCANNER)
.row(MItemTags.PLATE_IRON, Tags.Items.GLASS_PANES_COLORLESS, MItemTags.PLATE_IRON) .row(MItemTags.IRON_PLATES, Tags.Items.GLASS_PANES_COLORLESS, MItemTags.IRON_PLATES)
.row(MItemTags.GOLD_WIRES, MItems.GRAVITATION_FIELD_SENSOR, MItemTags.ADVANCED_CIRCUIT) .row(MItemTags.GOLD_WIRES, MItems.GRAVITATION_FIELD_SENSOR, MItemTags.ADVANCED_CIRCUIT)
.rowAC(Tags.Items.DUSTS_GLOWSTONE, MItemTags.PLATE_TRITANIUM) .rowAC(Tags.Items.DUSTS_GLOWSTONE, MItemTags.TRITANIUM_PLATES)
.unlockedBy(MItems.GRAVITATION_FIELD_SENSOR) .unlockedBy(MItems.GRAVITATION_FIELD_SENSOR)
.build(consumer) .build(consumer)
MatteryRecipe(MItems.PHANTOM_ATTRACTOR) MatteryRecipe(MItems.PHANTOM_ATTRACTOR)
.row(Tags.Items.DUSTS_REDSTONE, Tags.Items.GLASS_COLORLESS, Tags.Items.DUSTS_REDSTONE) .row(Tags.Items.DUSTS_REDSTONE, Tags.Items.GLASS_COLORLESS, Tags.Items.DUSTS_REDSTONE)
.row(MItemTags.PLATE_TRITANIUM, MItems.QUANTUM_TRANSCEIVER, MItemTags.PLATE_TRITANIUM) .row(MItemTags.TRITANIUM_PLATES, MItems.QUANTUM_TRANSCEIVER, MItemTags.TRITANIUM_PLATES)
.row(MItemTags.PLATE_TRITANIUM, ItemTags.BEDS, MItemTags.PLATE_TRITANIUM) .row(MItemTags.TRITANIUM_PLATES, ItemTags.BEDS, MItemTags.TRITANIUM_PLATES)
.unlockedBy(MItems.QUANTUM_TRANSCEIVER) .unlockedBy(MItems.QUANTUM_TRANSCEIVER)
.build(consumer) .build(consumer)
@ -148,36 +148,36 @@ fun addCraftingTableRecipes(consumer: Consumer<FinishedRecipe>) {
.build(consumer) .build(consumer)
MatteryRecipe(MItems.ENERGY_SERVO) MatteryRecipe(MItems.ENERGY_SERVO)
.row(MItemTags.PLATE_TRITANIUM, MItems.MACHINE_FRAME, MItemTags.PLATE_TRITANIUM) .row(MItemTags.TRITANIUM_PLATES, MItems.MACHINE_FRAME, MItemTags.TRITANIUM_PLATES)
.row(MItemTags.PLATE_TRITANIUM, MItems.ENERGY_BUS, MItemTags.PLATE_TRITANIUM) .row(MItemTags.TRITANIUM_PLATES, MItems.ENERGY_BUS, MItemTags.TRITANIUM_PLATES)
.unlockedBy(Tags.Items.ENDER_PEARLS) .unlockedBy(Tags.Items.ENDER_PEARLS)
.build(consumer) .build(consumer)
// броня // броня
MatteryRecipe(MItems.TRITANIUM_HELMET) MatteryRecipe(MItems.TRITANIUM_HELMET)
.row(MItemTags.PLATE_TRITANIUM, MItemTags.PLATE_TRITANIUM, MItemTags.PLATE_TRITANIUM) .row(MItemTags.TRITANIUM_PLATES, MItemTags.TRITANIUM_PLATES, MItemTags.TRITANIUM_PLATES)
.row(MItemTags.PLATE_TRITANIUM, MItemTags.PLATE_IRON, MItemTags.PLATE_TRITANIUM) .row(MItemTags.TRITANIUM_PLATES, MItemTags.IRON_PLATES, MItemTags.TRITANIUM_PLATES)
.unlockedBy(MItemTags.PLATE_TRITANIUM) .unlockedBy(MItemTags.TRITANIUM_PLATES)
.build(consumer) .build(consumer)
MatteryRecipe(MItems.TRITANIUM_PANTS) MatteryRecipe(MItems.TRITANIUM_PANTS)
.row(MItemTags.PLATE_TRITANIUM, MItemTags.PLATE_TRITANIUM, MItemTags.PLATE_TRITANIUM) .row(MItemTags.TRITANIUM_PLATES, MItemTags.TRITANIUM_PLATES, MItemTags.TRITANIUM_PLATES)
.row(MItemTags.PLATE_TRITANIUM, MItemTags.PLATE_IRON, MItemTags.PLATE_TRITANIUM) .row(MItemTags.TRITANIUM_PLATES, MItemTags.IRON_PLATES, MItemTags.TRITANIUM_PLATES)
.rowAC(MItemTags.PLATE_TRITANIUM, MItemTags.PLATE_TRITANIUM) .rowAC(MItemTags.TRITANIUM_PLATES, MItemTags.TRITANIUM_PLATES)
.unlockedBy(MItemTags.PLATE_TRITANIUM) .unlockedBy(MItemTags.TRITANIUM_PLATES)
.build(consumer) .build(consumer)
MatteryRecipe(MItems.TRITANIUM_CHESTPLATE) MatteryRecipe(MItems.TRITANIUM_CHESTPLATE)
.row(MItemTags.PLATE_TRITANIUM, MItemTags.PLATE_IRON, MItemTags.PLATE_TRITANIUM) .row(MItemTags.TRITANIUM_PLATES, MItemTags.IRON_PLATES, MItemTags.TRITANIUM_PLATES)
.row(MItemTags.PLATE_TRITANIUM, MItemTags.PLATE_TRITANIUM, MItemTags.PLATE_TRITANIUM) .row(MItemTags.TRITANIUM_PLATES, MItemTags.TRITANIUM_PLATES, MItemTags.TRITANIUM_PLATES)
.row(MItemTags.PLATE_TRITANIUM, MItemTags.PLATE_TRITANIUM, MItemTags.PLATE_TRITANIUM) .row(MItemTags.TRITANIUM_PLATES, MItemTags.TRITANIUM_PLATES, MItemTags.TRITANIUM_PLATES)
.unlockedBy(MItemTags.PLATE_TRITANIUM) .unlockedBy(MItemTags.TRITANIUM_PLATES)
.build(consumer) .build(consumer)
MatteryRecipe(MItems.TRITANIUM_BOOTS) MatteryRecipe(MItems.TRITANIUM_BOOTS)
.rowAC(MItemTags.PLATE_TRITANIUM, MItemTags.PLATE_TRITANIUM) .rowAC(MItemTags.TRITANIUM_PLATES, MItemTags.TRITANIUM_PLATES)
.row(MItemTags.PLATE_TRITANIUM, MItemTags.PLATE_IRON, MItemTags.PLATE_TRITANIUM) .row(MItemTags.TRITANIUM_PLATES, MItemTags.IRON_PLATES, MItemTags.TRITANIUM_PLATES)
.unlockedBy(MItemTags.PLATE_TRITANIUM) .unlockedBy(MItemTags.TRITANIUM_PLATES)
.build(consumer) .build(consumer)
// простые батарейки // простые батарейки
@ -190,45 +190,45 @@ fun addCraftingTableRecipes(consumer: Consumer<FinishedRecipe>) {
MatteryRecipe(MItems.BATTERY_BASIC) MatteryRecipe(MItems.BATTERY_BASIC)
.rowAC(Tags.Items.DUSTS_REDSTONE, Tags.Items.DUSTS_REDSTONE) .rowAC(Tags.Items.DUSTS_REDSTONE, Tags.Items.DUSTS_REDSTONE)
.rowB(MItems.ELECTRIC_PARTS) .rowB(MItems.ELECTRIC_PARTS)
.rowB(MItemTags.PLATE_IRON) .rowB(MItemTags.IRON_PLATES)
.build(consumer) .build(consumer)
MatteryRecipe(MItems.BATTERY_NORMAL) MatteryRecipe(MItems.BATTERY_NORMAL)
.rowB(MItems.ELECTRIC_PARTS) .rowB(MItems.ELECTRIC_PARTS)
.row(MItemTags.COPPER_WIRES, MItemTags.PLATE_IRON, MItemTags.COPPER_WIRES) .row(MItemTags.COPPER_WIRES, MItemTags.IRON_PLATES, MItemTags.COPPER_WIRES)
.row(Tags.Items.DUSTS_REDSTONE, Tags.Items.DUSTS_REDSTONE, Tags.Items.DUSTS_REDSTONE) .row(Tags.Items.DUSTS_REDSTONE, Tags.Items.DUSTS_REDSTONE, Tags.Items.DUSTS_REDSTONE)
.build(consumer) .build(consumer)
MatteryRecipe(MItems.BATTERY_DENSE) MatteryRecipe(MItems.BATTERY_DENSE)
.row(Tags.Items.DUSTS_REDSTONE, MItems.ENERGY_BUS, Tags.Items.DUSTS_REDSTONE) .row(Tags.Items.DUSTS_REDSTONE, MItems.ENERGY_BUS, Tags.Items.DUSTS_REDSTONE)
.row(MItemTags.GOLD_WIRES, MItemTags.PLATE_TRITANIUM, MItemTags.GOLD_WIRES) .row(MItemTags.GOLD_WIRES, MItemTags.TRITANIUM_PLATES, MItemTags.GOLD_WIRES)
.row(Tags.Items.DUSTS_REDSTONE, Tags.Items.DUSTS_REDSTONE, Tags.Items.DUSTS_REDSTONE) .row(Tags.Items.DUSTS_REDSTONE, Tags.Items.DUSTS_REDSTONE, Tags.Items.DUSTS_REDSTONE)
.build(consumer) .build(consumer)
MatteryRecipe(MItems.BATTERY_CAPACITOR) MatteryRecipe(MItems.BATTERY_CAPACITOR)
.row(Tags.Items.DUSTS_REDSTONE, MItems.ENERGY_BUS, Tags.Items.DUSTS_REDSTONE) .row(Tags.Items.DUSTS_REDSTONE, MItems.ENERGY_BUS, Tags.Items.DUSTS_REDSTONE)
.row(MItemTags.GOLD_WIRES, MItemTags.PLATE_TRITANIUM, MItemTags.GOLD_WIRES) .row(MItemTags.GOLD_WIRES, MItemTags.TRITANIUM_PLATES, MItemTags.GOLD_WIRES)
.row(MItemTags.GOLD_WIRES, Tags.Items.DUSTS_REDSTONE, MItemTags.GOLD_WIRES) .row(MItemTags.GOLD_WIRES, Tags.Items.DUSTS_REDSTONE, MItemTags.GOLD_WIRES)
.build(consumer) .build(consumer)
// накопители материи // накопители материи
MatteryRecipe(MItems.MATTER_CAPACITOR_DENSE) MatteryRecipe(MItems.MATTER_CAPACITOR_DENSE)
.row(MItems.MATTER_CAPACITOR_PARTS, Tags.Items.GLASS, MItems.MATTER_CAPACITOR_PARTS) .row(MItems.MATTER_CAPACITOR_PARTS, Tags.Items.GLASS, MItems.MATTER_CAPACITOR_PARTS)
.row(MItemTags.PLATE_TRITANIUM, Tags.Items.ENDER_PEARLS, MItemTags.PLATE_TRITANIUM) .row(MItemTags.TRITANIUM_PLATES, Tags.Items.ENDER_PEARLS, MItemTags.TRITANIUM_PLATES)
.rowAC(Tags.Items.GEMS_DIAMOND, Tags.Items.GEMS_DIAMOND) .rowAC(Tags.Items.GEMS_DIAMOND, Tags.Items.GEMS_DIAMOND)
.build(consumer) .build(consumer)
// станция андроида // станция андроида
MatteryRecipe(MItems.ANDROID_STATION) MatteryRecipe(MItems.ANDROID_STATION)
.row(MItems.ELECTRIC_PARTS, MItemTags.ADVANCED_CIRCUIT, MItems.ELECTRIC_PARTS) .row(MItems.ELECTRIC_PARTS, MItemTags.ADVANCED_CIRCUIT, MItems.ELECTRIC_PARTS)
.row(MItemTags.PLATE_TRITANIUM, MItems.MACHINE_FRAME, MItemTags.PLATE_TRITANIUM) .row(MItemTags.TRITANIUM_PLATES, MItems.MACHINE_FRAME, MItemTags.TRITANIUM_PLATES)
.row(MItemTags.PLATE_TRITANIUM, MItems.ELECTRIC_PARTS, MItemTags.PLATE_TRITANIUM) .row(MItemTags.TRITANIUM_PLATES, MItems.ELECTRIC_PARTS, MItemTags.TRITANIUM_PLATES)
.build(consumer) .build(consumer)
// Энерго меч // Энерго меч
MatteryRecipe(MItems.ENERGY_SWORD) MatteryRecipe(MItems.ENERGY_SWORD)
.rowBC(MItemTags.PLATE_TRITANIUM, MItemTags.GOLD_WIRES) .rowBC(MItemTags.TRITANIUM_PLATES, MItemTags.GOLD_WIRES)
.rowBC(MItemTags.PLATE_TRITANIUM, MItemTags.GOLD_WIRES) .rowBC(MItemTags.TRITANIUM_PLATES, MItemTags.GOLD_WIRES)
.row(MItems.BATTERY_CAPACITOR, MItems.TRITANIUM_SWORD, MItemTags.ADVANCED_CIRCUIT) .row(MItems.BATTERY_CAPACITOR, MItems.TRITANIUM_SWORD, MItemTags.ADVANCED_CIRCUIT)
.unlockedBy(MItems.BATTERY_CAPACITOR) .unlockedBy(MItems.BATTERY_CAPACITOR)
.buildEnergetic(consumer) .buildEnergetic(consumer)

26
src/data/kotlin/ru/dbotthepony/mc/otm/datagen/recipes/DecorativesRecipes.kt
View File

@ -51,10 +51,10 @@ fun addDecorativesRecipes(provider: MatteryRecipeProvider, consumer: Consumer<Fi
} }
MatteryRecipe(MRegistry.VENT.item, 24) MatteryRecipe(MRegistry.VENT.item, 24)
.rowB(MItemTags.PLATE_TRITANIUM) .rowB(MItemTags.TRITANIUM_PLATES)
.row(MItemTags.PLATE_TRITANIUM, Items.IRON_BARS, MItemTags.PLATE_TRITANIUM) .row(MItemTags.TRITANIUM_PLATES, Items.IRON_BARS, MItemTags.TRITANIUM_PLATES)
.rowB(MItemTags.PLATE_TRITANIUM) .rowB(MItemTags.TRITANIUM_PLATES)
.unlockedBy(MItemTags.PLATE_TRITANIUM) .unlockedBy(MItemTags.TRITANIUM_PLATES)
.build(consumer) .build(consumer)
for ((color, item) in MRegistry.VENT.items) { for ((color, item) in MRegistry.VENT.items) {
@ -62,7 +62,7 @@ fun addDecorativesRecipes(provider: MatteryRecipeProvider, consumer: Consumer<Fi
.row(MRegistry.VENT.item, MRegistry.VENT.item, MRegistry.VENT.item) .row(MRegistry.VENT.item, MRegistry.VENT.item, MRegistry.VENT.item)
.row(MRegistry.VENT.item, color.tag, MRegistry.VENT.item) .row(MRegistry.VENT.item, color.tag, MRegistry.VENT.item)
.row(MRegistry.VENT.item, MRegistry.VENT.item, MRegistry.VENT.item) .row(MRegistry.VENT.item, MRegistry.VENT.item, MRegistry.VENT.item)
.unlockedBy(MItemTags.PLATE_TRITANIUM) .unlockedBy(MItemTags.TRITANIUM_PLATES)
.unlockedBy(color.tag) .unlockedBy(color.tag)
.build(consumer) .build(consumer)
} }
@ -75,10 +75,10 @@ fun addDecorativesRecipes(provider: MatteryRecipeProvider, consumer: Consumer<Fi
} }
MatteryRecipe(MRegistry.DECORATIVE_CRATE.item, 24) MatteryRecipe(MRegistry.DECORATIVE_CRATE.item, 24)
.rowB(MItemTags.PLATE_IRON) .rowB(MItemTags.IRON_PLATES)
.row(MItemTags.PLATE_IRON, Tags.Items.COBBLESTONE, MItemTags.PLATE_IRON) .row(MItemTags.IRON_PLATES, Tags.Items.COBBLESTONE, MItemTags.IRON_PLATES)
.rowB(MItemTags.PLATE_IRON) .rowB(MItemTags.IRON_PLATES)
.unlockedBy(MItemTags.PLATE_IRON) .unlockedBy(MItemTags.IRON_PLATES)
.build(consumer) .build(consumer)
for ((color, crate) in MRegistry.DECORATIVE_CRATE.items) { for ((color, crate) in MRegistry.DECORATIVE_CRATE.items) {
@ -102,8 +102,8 @@ fun addDecorativesRecipes(provider: MatteryRecipeProvider, consumer: Consumer<Fi
ShapelessRecipeBuilder(MRegistry.INDUSTRIAL_GLASS.item, 8) ShapelessRecipeBuilder(MRegistry.INDUSTRIAL_GLASS.item, 8)
.requires(Items.GLASS, 8) .requires(Items.GLASS, 8)
.requires(MItemTags.PLATE_TRITANIUM) .requires(MItemTags.TRITANIUM_PLATES)
.unlockedBy("has_plate", has(MItemTags.PLATE_TRITANIUM)) .unlockedBy("has_plate", has(MItemTags.TRITANIUM_PLATES))
.unlockedBy("has_glass", has(Items.GLASS)) .unlockedBy("has_glass", has(Items.GLASS))
.save(consumer) .save(consumer)
@ -147,8 +147,8 @@ fun addDecorativesRecipes(provider: MatteryRecipeProvider, consumer: Consumer<Fi
// апгрейд ванильного крашенного стекла // апгрейд ванильного крашенного стекла
ShapelessRecipeBuilder(item, 8) ShapelessRecipeBuilder(item, 8)
.requires(mappedVanilla, 8) .requires(mappedVanilla, 8)
.requires(MItemTags.PLATE_TRITANIUM) .requires(MItemTags.TRITANIUM_PLATES)
.unlockedBy("has_plate", has(MItemTags.PLATE_TRITANIUM)) .unlockedBy("has_plate", has(MItemTags.TRITANIUM_PLATES))
.unlockedBy("has_colored_glass", has(mappedVanilla)) .unlockedBy("has_colored_glass", has(mappedVanilla))
.save(consumer, ResourceLocation(DataGen.MOD_ID, "${item.registryName!!.path}_upgrade")) .save(consumer, ResourceLocation(DataGen.MOD_ID, "${item.registryName!!.path}_upgrade"))

2
src/main/kotlin/ru/dbotthepony/mc/otm/item/TritaniumArmorItem.kt
View File

@ -42,7 +42,7 @@ private object TritaniumArmorMaterial : ArmorMaterial {
override fun getEnchantmentValue() = 9 override fun getEnchantmentValue() = 9
override fun getEquipSound(): SoundEvent = SoundEvents.ARMOR_EQUIP_IRON override fun getEquipSound(): SoundEvent = SoundEvents.ARMOR_EQUIP_IRON
override fun getRepairIngredient(): Ingredient = Ingredient.of(MItemTags.INGOT_TRITANIUM) override fun getRepairIngredient(): Ingredient = Ingredient.of(MItemTags.TRITANIUM_INGOTS)
const val ID = "${OverdriveThatMatters.MOD_ID}:tritanium_armor" const val ID = "${OverdriveThatMatters.MOD_ID}:tritanium_armor"

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

@ -7,10 +7,10 @@ import net.minecraft.world.item.Item
import ru.dbotthepony.mc.otm.OverdriveThatMatters import ru.dbotthepony.mc.otm.OverdriveThatMatters
object MItemTags { object MItemTags {
val INGOT_TRITANIUM: TagKey<Item> = ItemTags.create(ResourceLocation("forge", "ingots/tritanium")) val TRITANIUM_INGOTS: TagKey<Item> = ItemTags.create(ResourceLocation("forge", "ingots/tritanium"))
val PLATE_TRITANIUM: TagKey<Item> = ItemTags.create(ResourceLocation("forge", "plates/tritanium")) val TRITANIUM_PLATES: TagKey<Item> = ItemTags.create(ResourceLocation("forge", "plates/tritanium"))
val PLATE_IRON: TagKey<Item> = ItemTags.create(ResourceLocation("forge", "plates/iron")) val IRON_PLATES: TagKey<Item> = ItemTags.create(ResourceLocation("forge", "plates/iron"))
val PLATE_GOLD: TagKey<Item> = ItemTags.create(ResourceLocation("forge", "plates/gold")) val GOLD_PLATES: TagKey<Item> = ItemTags.create(ResourceLocation("forge", "plates/gold"))
val TRITANIUM_CRATES: TagKey<Item> = ItemTags.create(ResourceLocation(OverdriveThatMatters.MOD_ID, "tritanium_crates")) val TRITANIUM_CRATES: TagKey<Item> = ItemTags.create(ResourceLocation(OverdriveThatMatters.MOD_ID, "tritanium_crates"))
val INDUSTRIAL_GLASS: TagKey<Item> = ItemTags.create(ResourceLocation(OverdriveThatMatters.MOD_ID, "industrial_glass")) val INDUSTRIAL_GLASS: TagKey<Item> = ItemTags.create(ResourceLocation(OverdriveThatMatters.MOD_ID, "industrial_glass"))