diff --git a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/recipes/CraftingTableRecipes.kt b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/recipes/CraftingTableRecipes.kt index 5369c5c2a..a802aa028 100644 --- a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/recipes/CraftingTableRecipes.kt +++ b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/recipes/CraftingTableRecipes.kt @@ -171,9 +171,9 @@ fun addCraftingTableRecipes(consumer: Consumer) { .build(consumer) MatteryRecipe(MItems.REINFORCED_TRITANIUM_PLATE, category = RecipeCategory.MISC) - .rowB(MItems.CARBON_MESH) - .row(MItems.CARBON_MESH, MItemTags.TRITANIUM_PLATES, MItems.CARBON_MESH) - .rowB(MItems.CARBON_MESH) + .rowB(MItemTags.CARBON_PLATES) + .row(MItemTags.CARBON_PLATES, MItemTags.TRITANIUM_PLATES, MItemTags.CARBON_PLATES) + .rowB(MItemTags.CARBON_PLATES) .unlockedBy(MItemTags.TRITANIUM_PLATES) .build(consumer) diff --git a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/recipes/MatteryRecipeProvider.kt b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/recipes/MatteryRecipeProvider.kt index 9472720e7..2ca4c8940 100644 --- a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/recipes/MatteryRecipeProvider.kt +++ b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/recipes/MatteryRecipeProvider.kt @@ -92,9 +92,9 @@ class MatteryRecipeProvider(generatorIn: DataGenerator) : RecipeProvider(generat } } - fun plate(id: String, ingredient: Ingredient, result: Ingredient, count: Int = 1, workTicks: Int = 200) { + fun plate(id: String, ingredient: Ingredient, result: Ingredient, count: Int = 1, workTicks: Int = 200, experience: FloatProvider = ConstantFloat.ZERO) { exec { it, callback -> - callback.accept(PlatePressFinishedRecipe(PlatePressRecipe(ResourceLocation(DataGen.MOD_ID, "plate_$id"), ingredient, result, count, workTicks))) + callback.accept(PlatePressFinishedRecipe(PlatePressRecipe(ResourceLocation(DataGen.MOD_ID, "plate_$id"), ingredient, result, count, workTicks, experience = experience))) } } } diff --git a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/recipes/PlatePressRecipes.kt b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/recipes/PlatePressRecipes.kt index 40dc88454..6843c9c04 100644 --- a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/recipes/PlatePressRecipes.kt +++ b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/recipes/PlatePressRecipes.kt @@ -1,6 +1,9 @@ package ru.dbotthepony.mc.otm.datagen.recipes import net.minecraft.util.valueproviders.ConstantFloat +import net.minecraft.world.item.Items +import net.minecraft.world.item.crafting.Ingredient +import ru.dbotthepony.mc.otm.registry.MItemTags fun addPlatePressRecipes(provider: MatteryRecipeProvider) { val baselineMetals = arrayOf("iron" to 0.2f, "silver" to 0.3f, "bronze" to 0.3f, "lead" to 0.3f, "constantan" to 0.4f, "brass" to 0.3f) @@ -18,4 +21,6 @@ fun addPlatePressRecipes(provider: MatteryRecipeProvider) { for ((thing, exp) in hardMetals) { provider.plate(thing, workTicks = 240, experience = ConstantFloat.of(exp)) } + + provider.plate("carbon", result = Ingredient.of(MItemTags.CARBON_PLATES), ingredient = Ingredient.of(Items.COAL), workTicks = 140, experience = ConstantFloat.of(0.3f)) } diff --git a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/tags/Tags.kt b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/tags/Tags.kt index 0d51173e7..793ef9842 100644 --- a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/tags/Tags.kt +++ b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/tags/Tags.kt @@ -23,6 +23,7 @@ fun addTags(tagsProvider: TagsProvider) { tagsProvider.plates.add("tritanium", MItems.TRITANIUM_PLATE) tagsProvider.plates.add("iron", MItems.IRON_PLATE) tagsProvider.plates.add("gold", MItems.GOLD_PLATE) + tagsProvider.plates.add("carbon", MItems.CARBON_MESH) tagsProvider.items.forge("reinforced_tritanium").add(MItems.REINFORCED_TRITANIUM_PLATE) diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/registry/Tags.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/registry/Tags.kt index a294d403f..a7d5a8e79 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/registry/Tags.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/registry/Tags.kt @@ -17,6 +17,7 @@ object MItemTags { val NUGGETS: TagKey = ItemTags.create(ResourceLocation("forge", "nuggets")) val TRITANIUM_INGOTS_STORAGE: TagKey = ItemTags.create(ResourceLocation("forge", "storage_blocks/tritanium")) val TRITANIUM_PLATES: TagKey = ItemTags.create(ResourceLocation("forge", "plates/tritanium")) + val CARBON_PLATES: TagKey = ItemTags.create(ResourceLocation("forge", "plates/carbon")) val REINFORCED_TRITANIUM_PLATES: TagKey = ItemTags.create(ResourceLocation("forge", "reinforced_tritanium")) val TRITANIUM_DUSTS: TagKey = ItemTags.create(ResourceLocation("forge", "dusts/tritanium")) val IRON_PLATES: TagKey = ItemTags.create(ResourceLocation("forge", "plates/iron"))