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

Tritanium Ingots Block as storage

Browse Source 
Fixes #108
This commit is contained in:
DBotThePony 2022-10-05 00:49:53 +07:00
parent 4685c4ecd3
commit 5c1d32c9c5
Signed by: DBot
GPG Key ID: DCC23B5715498507
8 changed files with 24 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -319,6 +319,8 @@ private fun blocks(provider: MatteryLanguageProvider) {
add(MBlocks.DRIVE_VIEWER, "Drive Viewer")
add(MBlocks.BLACK_HOLE, "Local Anomalous Singular Gravitation Field")
add(MBlocks.TRITANIUM_INGOT_BLOCK, "Tritanium Plating Block")
add(MBlocks.ENERGY_COUNTER, "Energy Counter")
add(MBlocks.ENERGY_COUNTER, "facing", "Input facing: %s")
add(MBlocks.ENERGY_COUNTER, "switch", "Switch input facing")

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

@ -14,6 +14,7 @@ import ru.dbotthepony.mc.otm.registry.MItemTags
import ru.dbotthepony.mc.otm.registry.MItems
import ru.dbotthepony.mc.otm.registry.MRegistry
import ru.dbotthepony.mc.otm.core.registryName
import ru.dbotthepony.mc.otm.datagen.modLocation
import java.util.function.Consumer
fun addCraftingTableRecipes(consumer: Consumer<FinishedRecipe>) {
@ -35,6 +36,16 @@ fun addCraftingTableRecipes(consumer: Consumer<FinishedRecipe>) {
.save(consumer, "${crate.registryName}_alt")
}
ShapelessRecipeBuilder(MItems.TRITANIUM_INGOT_BLOCK, 1)
.requires(Ingredient.of(MItemTags.TRITANIUM_INGOTS), 9)
.unlockedBy(MItemTags.TRITANIUM_INGOTS)
.save(consumer)
ShapelessRecipeBuilder(MItems.TRITANIUM_INGOT, 9)
.requires(Ingredient.of(MItemTags.TRITANIUM_INGOTS_STORAGE))
.unlockedBy(MItemTags.TRITANIUM_INGOTS_STORAGE)
.save(consumer, modLocation("tritanium_ingot_from_storage"))
ShapedRecipeBuilder(MRegistry.CARGO_CRATES.item, 1)
.define('P', MItemTags.TRITANIUM_PLATES)
.define('C', Tags.Items.CHESTS)

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

@ -4,7 +4,6 @@ import net.minecraft.tags.BlockTags
import net.minecraft.tags.ItemTags
import net.minecraft.world.effect.MobEffects
import net.minecraft.world.item.BlockItem
import net.minecraft.world.item.DyeColor
import net.minecraft.world.item.Items
import net.minecraft.world.item.Tiers
import ru.dbotthepony.mc.otm.registry.MBlockTags
@ -12,7 +11,6 @@ import ru.dbotthepony.mc.otm.registry.MBlocks
import ru.dbotthepony.mc.otm.registry.MItemTags
import ru.dbotthepony.mc.otm.registry.MItems
import ru.dbotthepony.mc.otm.registry.MRegistry
import ru.dbotthepony.mc.otm.registry.MSoundEvents
fun addTags(tagsProvider: TagsProvider) {
tagsProvider.items.forge("pistons").add(Items.PISTON)
@ -25,6 +23,9 @@ fun addTags(tagsProvider: TagsProvider) {
tagsProvider.plates.add("iron", MItems.IRON_PLATE)
tagsProvider.plates.add("gold", MItems.GOLD_PLATE)
tagsProvider.storageBlocksAsItem.add("tritanium", MItems.TRITANIUM_INGOT_BLOCK)
tagsProvider.storageBlocksAsBlock.add("tritanium", MBlocks.TRITANIUM_INGOT_BLOCK)
tagsProvider.ore("tritanium", MBlocks.TRITANIUM_ORE)
tagsProvider.ore("tritanium", MBlocks.DEEPSLATE_TRITANIUM_ORE)
tagsProvider.clump("tritanium", MItems.TRITANIUM_ORE_CLUMP, MBlocks.TRITANIUM_RAW_BLOCK)
@ -104,6 +105,7 @@ fun addTags(tagsProvider: TagsProvider) {
MBlocks.TRITANIUM_DOOR,
MBlocks.TRITANIUM_TRAPDOOR,
MBlocks.TRITANIUM_PRESSURE_PLATE,
MBlocks.TRITANIUM_INGOT_BLOCK,
), Tiers.IRON)
tagsProvider.requiresPickaxe(MBlocks.TRITANIUM_ORE, Tiers.IRON)

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

@ -10,7 +10,6 @@ import net.minecraft.world.item.Item
import net.minecraft.world.item.Tier
import net.minecraft.world.item.Tiers
import net.minecraft.world.level.block.Block
import net.minecraft.world.level.gameevent.GameEvent
import net.minecraftforge.data.event.GatherDataEvent
import ru.dbotthepony.mc.otm.capability.MatteryPlayerCapability
import ru.dbotthepony.mc.otm.datagen.DataGen

4
src/main/kotlin/ru/dbotthepony/mc/otm/registry/MBlocks.kt
View File

@ -103,6 +103,10 @@ object MBlocks {
UniformInt.of(0, 3)
) }
val TRITANIUM_INGOT_BLOCK: Block by registry.register(MNames.TRITANIUM_INGOT_BLOCK) {
Block(BlockBehaviour.Properties.of(Material.METAL, MaterialColor.COLOR_BLUE).explosionResistance(400f).destroyTime(3f).requiresCorrectToolForDrops())
}
val DEEPSLATE_TRITANIUM_ORE: Block by registry.register(MNames.DEEPSLATE_TRITANIUM_ORE) { DropExperienceBlock(
BlockBehaviour.Properties.of(Material.STONE)
.strength(4.75f, 6.5f)

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

@ -124,6 +124,7 @@ object MItems {
val TRITANIUM_ORE_CLUMP: Item by registry.register(MNames.TRITANIUM_ORE_CLUMP) { 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) }
val TRITANIUM_COMPONENT: ForgeTier = ForgeTier(
Tiers.IRON.level,

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

@ -128,6 +128,7 @@ object MNames {
// items: crafting components
const val TRITANIUM_INGOT = "tritanium_ingot"
const val TRITANIUM_INGOT_BLOCK = "tritanium_ingot_block"
const val MATTER_IO_PORT = "matter_io_port"
const val MATTER_TRANSFORM_MATRIX = "matter_transform_matrix"

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

@ -13,6 +13,7 @@ object MItemTags {
val TRITANIUM_ORES: TagKey<Item> = ItemTags.create(ResourceLocation("forge", "ores/tritanium"))
val TRITANIUM_ORE_CLUMPS: TagKey<Item> = ItemTags.create(ResourceLocation("forge", "raw_materials/tritanium"))
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 IRON_PLATES: TagKey<Item> = ItemTags.create(ResourceLocation("forge", "plates/iron"))
val GOLD_PLATES: TagKey<Item> = ItemTags.create(ResourceLocation("forge", "plates/gold"))