diff --git a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/blocks/BlockModels.kt b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/blocks/BlockModels.kt index 02e15fc2b..d26e76d66 100644 --- a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/blocks/BlockModels.kt +++ b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/blocks/BlockModels.kt @@ -10,6 +10,10 @@ fun addBlockModels(provider: MatteryBlockModelProvider) { resourceCubeAll(MBlocks.DEEPSLATE_TRITANIUM_ORE) resourceCubeAll(MBlocks.TRITANIUM_INGOT_BLOCK) + resourceCubeAll(MBlocks.DILITHIUM_ORE) + resourceCubeAll(MBlocks.DEEPSLATE_DILITHIUM_ORE) + resourceCubeAll(MBlocks.DILITHIUM_CRYSTAL_BLOCK) + cable("crude_energy_cable", "block/power_cable_0", powered = true) cable("regular_energy_cable", "block/power_cable_1", powered = true) cable("advanced_energy_cable", "block/power_cable_2", powered = true) diff --git a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/blocks/BlockStates.kt b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/blocks/BlockStates.kt index 365dd358c..ea7f3a860 100644 --- a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/blocks/BlockStates.kt +++ b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/blocks/BlockStates.kt @@ -31,6 +31,10 @@ fun addBlockStates(provider: MatteryBlockStateProvider) { provider.block(MBlocks.TRITANIUM_INGOT_BLOCK) provider.block(MBlocks.METAL_MESH) + provider.ore(MBlocks.DILITHIUM_ORE) + provider.ore(MBlocks.DEEPSLATE_DILITHIUM_ORE) + provider.block(MBlocks.DILITHIUM_CRYSTAL_BLOCK) + provider.block(MBlocks.CHEMICAL_GENERATOR.values) provider.block(MBlocks.MATTER_SCANNER.values) provider.block(MBlocks.ITEM_MONITOR.values) diff --git a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/items/ItemModels.kt b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/items/ItemModels.kt index 297c75ff0..f386dcd52 100644 --- a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/items/ItemModels.kt +++ b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/items/ItemModels.kt @@ -24,15 +24,20 @@ fun addItemModels(provider: MatteryItemModelProvider) { provider.block(MItems.METAL_MESH) provider.generatedTranslucent(MItems.TRITANIUM_BARS, modLocation("block/decorative/tritanium_bars")) provider.generatedTranslucent(MItems.METAL_RAILING, modLocation("block/decorative/metal_railing")) - provider.block(MItems.DEEPSLATE_TRITANIUM_ORE) - provider.block(MItems.TRITANIUM_ORE) provider.blocks(MItems.TRITANIUM_STRIPED_BLOCK.values) - provider.block(MItems.TRITANIUM_RAW_BLOCK) - provider.block(MItems.TRITANIUM_INGOT_BLOCK) provider.coloredWithBaseBlock(MItems.ITEM_MONITOR, "item_monitor") provider.block(MItems.PHANTOM_ATTRACTOR) provider.block(MItems.HOLO_SIGN) + provider.block(MItems.TRITANIUM_ORE) + provider.block(MItems.DEEPSLATE_TRITANIUM_ORE) + provider.block(MItems.TRITANIUM_RAW_BLOCK) + provider.block(MItems.TRITANIUM_INGOT_BLOCK) + + provider.block(MItems.DILITHIUM_ORE) + provider.block(MItems.DEEPSLATE_DILITHIUM_ORE) + provider.block(MItems.DILITHIUM_CRYSTAL_BLOCK) + MRegistry.VENT.allItems.values.forEach(provider::block) MRegistry.VENT_ALTERNATIVE.allItems.values.forEach(provider::block) MRegistry.TRITANIUM_BLOCK.allItems.values.forEach(provider::block) @@ -82,11 +87,13 @@ fun addItemModels(provider: MatteryItemModelProvider) { provider.generated(MItems.ExopackUpgrades.SMELTING_UPGRADE) provider.generated(MItems.ExopackUpgrades.ENDER_UPGRADE) - provider.component(MItems.TRITANIUM_DUST) - provider.component(MItems.TRITANIUM_INGOT) - provider.component(MItems.TRITANIUM_NUGGET) + provider.resource(MItems.TRITANIUM_DUST) + provider.resource(MItems.TRITANIUM_INGOT) + provider.resource(MItems.TRITANIUM_NUGGET) provider.resource(MItems.TRITANIUM_ORE_CLUMP) + provider.resource(MItems.DILITHIUM_CRYSTAL) + provider.generated(MItems.EXOPACK_PROBE) provider.handheld(MItems.TRITANIUM_TOOLS) diff --git a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/lang/English.kt b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/lang/English.kt index b9bef7c20..df516019e 100644 --- a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/lang/English.kt +++ b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/lang/English.kt @@ -78,6 +78,7 @@ private fun decoratives(provider: MatteryLanguageProvider) { add(MRegistry.CARGO_CRATES.block, "Cargo Crate") add(MRegistry.COMPUTER_TERMINAL.block, "Computer Terminal") add(MRegistry.STAR_CHAIR.block, "Star Chair") + add(MRegistry.STAR_CHAIR.block, "desc", "For extensive stargazing.") add(MRegistry.TRITANIUM_BLOCK.block, "Tritanium Block") add(MRegistry.TRITANIUM_STAIRS.block, "Tritanium Stairs") add(MRegistry.TRITANIUM_SLAB.block, "Tritanium Slab") @@ -760,6 +761,7 @@ private fun items(provider: MatteryLanguageProvider) { add(MItems.MIRROR, "desc", "I can clearly see my own reflection in this mirror") add(MItems.REINFORCED_TRITANIUM_PLATE, "Reinforced Tritanium Plate") add(MItems.REINFORCED_TRITANIUM_PLATE, "desc", "An armor plate, reinforced to withstand great kinetic forces") + add(MItems.ARMOR_ASSEMBLY, "Armor assembly") add(MItems.CARBON_MESH, "Carbon Mesh") add(MItems.GRAVITATIONAL_DISRUPTOR, "Spacetime Equalizer") diff --git a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/lang/Russian.kt b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/lang/Russian.kt index 84fe6eb74..7d045f457 100644 --- a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/lang/Russian.kt +++ b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/lang/Russian.kt @@ -24,6 +24,7 @@ private fun decoratives(provider: MatteryLanguageProvider) { add(MRegistry.TRITANIUM_BLOCK.getBlock(color), "$name тритановый блок") add(MRegistry.COMPUTER_TERMINAL.getBlock(color), "$name компьютерный терминал") add(MRegistry.STAR_CHAIR.getBlock(color), "$name звезданутый стул") + add(MRegistry.STAR_CHAIR.getBlock(color), "desc", "Для длительного наблюдения за звёздами.") add(MRegistry.TRITANIUM_STAIRS.getBlock(color), "$name тритановые ступеньки") add(MRegistry.TRITANIUM_SLAB.getBlock(color), "$nameF тритановая плита") add(MRegistry.TRITANIUM_WALL.getBlock(color), "$nameF тритановая ограда") @@ -756,6 +757,7 @@ private fun items(provider: MatteryLanguageProvider) { add(MItems.MIRROR, "desc", "Я могу очень отчётливо видеть своё отражение в этом зеркале") add(MItems.REINFORCED_TRITANIUM_PLATE, "Укреплённая тритановая пластина") add(MItems.REINFORCED_TRITANIUM_PLATE, "desc", "Бронированная пластина, усиленная чтобы выдержать большие кинетические силы") + add(MItems.ARMOR_ASSEMBLY, "Стройка брони") add(MItems.CARBON_MESH, "Углеродная сетка") add(MItems.GRAVITATIONAL_DISRUPTOR, "Маяк уравнения пространства-времени") 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 02591340a..f6dca2fe7 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 @@ -270,6 +270,13 @@ fun addCraftingTableRecipes(consumer: RecipeOutput) { .rowB(MItemTags.CARBON_PLATES) .unlockedBy(MItemTags.TRITANIUM_PLATES) .build(consumer) + MatteryRecipe(MItems.ARMOR_ASSEMBLY, category = RecipeCategory.MISC) + .row(MItemTags.CARBON_PLATES, MItemTags.IRON_PLATES, MItemTags.CARBON_PLATES) + .row(MItemTags.IRON_PLATES, Items.DIAMOND, MItemTags.IRON_PLATES) + .row(MItemTags.CARBON_PLATES, MItemTags.IRON_PLATES, MItemTags.CARBON_PLATES) + .unlockedBy(MItemTags.IRON_PLATES) + .unlockedBy(MItemTags.CARBON_PLATES) + .build(consumer) MatteryRecipe(MItems.CARBON_FIBRE_BLOCK, category = RecipeCategory.BUILDING_BLOCKS) .rowAB(MItemTags.CARBON_PLATES, MItemTags.CARBON_PLATES) @@ -288,7 +295,7 @@ fun addCraftingTableRecipes(consumer: RecipeOutput) { .setUpgradeSource(Items.LEATHER_HELMET) .addUpgradeOps(UpgradeRecipe.CopyEnchantments) .addUpgradeOps(UpgradeRecipe.CopyComponent(DataComponents.CUSTOM_NAME)) - .row(MItemTags.REINFORCED_TRITANIUM_PLATES, MItemTags.REINFORCED_TRITANIUM_PLATES, MItemTags.REINFORCED_TRITANIUM_PLATES) + .row(MItemTags.REINFORCED_TRITANIUM_PLATES, MItems.ARMOR_ASSEMBLY, MItemTags.REINFORCED_TRITANIUM_PLATES) .row(MItemTags.REINFORCED_TRITANIUM_PLATES, Items.LEATHER_HELMET, MItemTags.REINFORCED_TRITANIUM_PLATES) .unlockedBy(MItemTags.REINFORCED_TRITANIUM_PLATES) .build(consumer) @@ -297,7 +304,7 @@ fun addCraftingTableRecipes(consumer: RecipeOutput) { .setUpgradeSource(Items.LEATHER_LEGGINGS) .addUpgradeOps(UpgradeRecipe.CopyEnchantments) .addUpgradeOps(UpgradeRecipe.CopyComponent(DataComponents.CUSTOM_NAME)) - .row(MItemTags.REINFORCED_TRITANIUM_PLATES, MItemTags.REINFORCED_TRITANIUM_PLATES, MItemTags.REINFORCED_TRITANIUM_PLATES) + .row(MItemTags.REINFORCED_TRITANIUM_PLATES, MItems.ARMOR_ASSEMBLY, MItemTags.REINFORCED_TRITANIUM_PLATES) .row(MItemTags.REINFORCED_TRITANIUM_PLATES, Items.LEATHER_LEGGINGS, MItemTags.REINFORCED_TRITANIUM_PLATES) .rowAC(MItemTags.REINFORCED_TRITANIUM_PLATES, MItemTags.REINFORCED_TRITANIUM_PLATES) .unlockedBy(MItemTags.REINFORCED_TRITANIUM_PLATES) @@ -308,7 +315,7 @@ fun addCraftingTableRecipes(consumer: RecipeOutput) { .addUpgradeOps(UpgradeRecipe.CopyEnchantments) .addUpgradeOps(UpgradeRecipe.CopyComponent(DataComponents.CUSTOM_NAME)) .row(MItemTags.REINFORCED_TRITANIUM_PLATES, Items.LEATHER_CHESTPLATE, MItemTags.REINFORCED_TRITANIUM_PLATES) - .row(MItemTags.REINFORCED_TRITANIUM_PLATES, MItemTags.REINFORCED_TRITANIUM_PLATES, MItemTags.REINFORCED_TRITANIUM_PLATES) + .row(MItemTags.REINFORCED_TRITANIUM_PLATES, MItems.ARMOR_ASSEMBLY, MItemTags.REINFORCED_TRITANIUM_PLATES) .row(MItemTags.REINFORCED_TRITANIUM_PLATES, MItemTags.REINFORCED_TRITANIUM_PLATES, MItemTags.REINFORCED_TRITANIUM_PLATES) .unlockedBy(MItemTags.REINFORCED_TRITANIUM_PLATES) .build(consumer) @@ -318,7 +325,7 @@ fun addCraftingTableRecipes(consumer: RecipeOutput) { .addUpgradeOps(UpgradeRecipe.CopyEnchantments) .addUpgradeOps(UpgradeRecipe.CopyComponent(DataComponents.CUSTOM_NAME)) .row(MItemTags.REINFORCED_TRITANIUM_PLATES, Items.LEATHER_BOOTS, MItemTags.REINFORCED_TRITANIUM_PLATES) - .rowAC(MItemTags.REINFORCED_TRITANIUM_PLATES, MItemTags.REINFORCED_TRITANIUM_PLATES) + .row(MItemTags.REINFORCED_TRITANIUM_PLATES, MItems.ARMOR_ASSEMBLY, MItemTags.REINFORCED_TRITANIUM_PLATES) .unlockedBy(MItemTags.REINFORCED_TRITANIUM_PLATES) .build(consumer) diff --git a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/tags/MineableTags.kt b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/tags/MineableTags.kt index 0fa3d2356..302f9349b 100644 --- a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/tags/MineableTags.kt +++ b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/tags/MineableTags.kt @@ -72,6 +72,7 @@ fun addMineableTags(tagsProvider: TagsProvider) { tagsProvider.requiresPickaxe(listOf( MBlocks.DILITHIUM_ORE, MBlocks.DEEPSLATE_DILITHIUM_ORE, + MBlocks.DILITHIUM_CRYSTAL_BLOCK, MBlocks.GRAVITATION_STABILIZER, MBlocks.GRAVITATION_STABILIZER_LENS, diff --git a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/tags/ResourceTags.kt b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/tags/ResourceTags.kt index e8feeb75d..e4412cc17 100644 --- a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/tags/ResourceTags.kt +++ b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/tags/ResourceTags.kt @@ -47,6 +47,9 @@ fun addResourceTags(tagsProvider: TagsProvider) { tagsProvider.gems.add(MItems.DILITHIUM_CRYSTAL) + tagsProvider.storageBlocksAsItem.add("dilithium", MItems.DILITHIUM_CRYSTAL_BLOCK) + tagsProvider.storageBlocksAsBlock.add("dilithium", MBlocks.DILITHIUM_CRYSTAL_BLOCK) + tagsProvider.items.forge("gems/dilithium").add(MItems.DILITHIUM_CRYSTAL) } diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/block/decorative/StarChairBlock.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/block/decorative/StarChairBlock.kt index 9ca6bd29d..1485e73b5 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/block/decorative/StarChairBlock.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/block/decorative/StarChairBlock.kt @@ -22,6 +22,7 @@ import ru.dbotthepony.mc.otm.entity.RideableDummy import ru.dbotthepony.mc.otm.shapes.BlockShapes class StarChairBlock(val color: DyeColor?) : RotatableMatteryBlock(DEFAULT_PROPERTIES.mapColor(color?.mapColor ?: MapColor.COLOR_LIGHT_BLUE)) { + override fun rotationFreedom(): BlockRotationFreedom = BlockRotationFreedom.HORIZONTAL init { diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/registry/MNames.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/registry/MNames.kt index fbc24523a..080cd5bbe 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/registry/MNames.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/registry/MNames.kt @@ -188,6 +188,7 @@ object MNames { const val MATTER_TRANSFORM_MATRIX = "matter_transform_matrix" const val CARBON_MESH = "carbon_mesh" + const val ARMOR_ASSEMBLY = "armor_assembly" const val REINFORCED_TRITANIUM_PLATE = "reinforced_tritanium_plate" const val QUANTUM_TRANSCEIVER = "quantum_transceiver" diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/registry/game/MItems.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/registry/game/MItems.kt index 7374b4899..4b13cbb79 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/registry/game/MItems.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/registry/game/MItems.kt @@ -556,6 +556,7 @@ object MItems { val ADVANCED_CONTROL_CIRCUIT: Item by registry.register(MNames.ADVANCED_CONTROL_CIRCUIT) { Item(DEFAULT_PROPERTIES) } val MATTER_CAPACITOR_PARTS: Item by registry.register(MNames.MATTER_CAPACITOR_PARTS) { Item(DEFAULT_PROPERTIES) } val CARBON_MESH: Item by registry.register(MNames.CARBON_MESH) { Item(DEFAULT_PROPERTIES) } + val ARMOR_ASSEMBLY: Item by registry.register(MNames.ARMOR_ASSEMBLY) { Item(DEFAULT_PROPERTIES) } val REINFORCED_TRITANIUM_PLATE: Item by registry.register(MNames.REINFORCED_TRITANIUM_PLATE) { MatteryItem( DEFAULT_PROPERTIES ).addSimpleDescription() } @@ -594,6 +595,7 @@ object MItems { MItems::MIRROR, MItems::CARBON_MESH, + MItems::ARMOR_ASSEMBLY, MItems::REINFORCED_TRITANIUM_PLATE, MachineUpgrades.Basic::BLANK, @@ -625,6 +627,7 @@ object MItems { MItems::MIRROR, MItems::CARBON_MESH, + MItems::ARMOR_ASSEMBLY, MItems::REINFORCED_TRITANIUM_PLATE, ) diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/resource/deepslate_dilithium_ore.png b/src/main/resources/assets/overdrive_that_matters/textures/block/resource/deepslate_dilithium_ore.png new file mode 100644 index 000000000..d36635b4d Binary files /dev/null and b/src/main/resources/assets/overdrive_that_matters/textures/block/resource/deepslate_dilithium_ore.png differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/resource/dilithium_crystal_block.png b/src/main/resources/assets/overdrive_that_matters/textures/block/resource/dilithium_crystal_block.png new file mode 100644 index 000000000..d36635b4d Binary files /dev/null and b/src/main/resources/assets/overdrive_that_matters/textures/block/resource/dilithium_crystal_block.png differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/resource/dilithium_ore.png b/src/main/resources/assets/overdrive_that_matters/textures/block/resource/dilithium_ore.png new file mode 100644 index 000000000..d36635b4d Binary files /dev/null and b/src/main/resources/assets/overdrive_that_matters/textures/block/resource/dilithium_ore.png differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/item/component/armor_assembly.png b/src/main/resources/assets/overdrive_that_matters/textures/item/component/armor_assembly.png new file mode 100644 index 000000000..76d98ee6a Binary files /dev/null and b/src/main/resources/assets/overdrive_that_matters/textures/item/component/armor_assembly.png differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/item/machine_upgrade_creative.png b/src/main/resources/assets/overdrive_that_matters/textures/item/machine_upgrade_creative.png index 56a36411a..651dcbcaf 100644 Binary files a/src/main/resources/assets/overdrive_that_matters/textures/item/machine_upgrade_creative.png and b/src/main/resources/assets/overdrive_that_matters/textures/item/machine_upgrade_creative.png differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/item/machine_upgrade_tier0.png b/src/main/resources/assets/overdrive_that_matters/textures/item/machine_upgrade_tier0.png index c9cf18e41..4e5cf2a92 100644 Binary files a/src/main/resources/assets/overdrive_that_matters/textures/item/machine_upgrade_tier0.png and b/src/main/resources/assets/overdrive_that_matters/textures/item/machine_upgrade_tier0.png differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/item/machine_upgrade_tier1.png b/src/main/resources/assets/overdrive_that_matters/textures/item/machine_upgrade_tier1.png index 2922b8866..3504a84cb 100644 Binary files a/src/main/resources/assets/overdrive_that_matters/textures/item/machine_upgrade_tier1.png and b/src/main/resources/assets/overdrive_that_matters/textures/item/machine_upgrade_tier1.png differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/item/machine_upgrade_tier2.png b/src/main/resources/assets/overdrive_that_matters/textures/item/machine_upgrade_tier2.png index 760cf737e..cb7e8d435 100644 Binary files a/src/main/resources/assets/overdrive_that_matters/textures/item/machine_upgrade_tier2.png and b/src/main/resources/assets/overdrive_that_matters/textures/item/machine_upgrade_tier2.png differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/item/machine_upgrade_tier3.png b/src/main/resources/assets/overdrive_that_matters/textures/item/machine_upgrade_tier3.png index ffef41a20..18bbe3659 100644 Binary files a/src/main/resources/assets/overdrive_that_matters/textures/item/machine_upgrade_tier3.png and b/src/main/resources/assets/overdrive_that_matters/textures/item/machine_upgrade_tier3.png differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/item/machine_upgrade_tier4.png b/src/main/resources/assets/overdrive_that_matters/textures/item/machine_upgrade_tier4.png index de42fdf38..7f9c9dc00 100644 Binary files a/src/main/resources/assets/overdrive_that_matters/textures/item/machine_upgrade_tier4.png and b/src/main/resources/assets/overdrive_that_matters/textures/item/machine_upgrade_tier4.png differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/item/resources/dilithium_crystal.png b/src/main/resources/assets/overdrive_that_matters/textures/item/resources/dilithium_crystal.png new file mode 100644 index 000000000..d36635b4d Binary files /dev/null and b/src/main/resources/assets/overdrive_that_matters/textures/item/resources/dilithium_crystal.png differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/item/component/tritanium_dust.png b/src/main/resources/assets/overdrive_that_matters/textures/item/resources/tritanium_dust.png similarity index 100% rename from src/main/resources/assets/overdrive_that_matters/textures/item/component/tritanium_dust.png rename to src/main/resources/assets/overdrive_that_matters/textures/item/resources/tritanium_dust.png diff --git a/src/main/resources/assets/overdrive_that_matters/textures/item/component/tritanium_ingot.png b/src/main/resources/assets/overdrive_that_matters/textures/item/resources/tritanium_ingot.png similarity index 100% rename from src/main/resources/assets/overdrive_that_matters/textures/item/component/tritanium_ingot.png rename to src/main/resources/assets/overdrive_that_matters/textures/item/resources/tritanium_ingot.png diff --git a/src/main/resources/assets/overdrive_that_matters/textures/item/component/tritanium_nugget.png b/src/main/resources/assets/overdrive_that_matters/textures/item/resources/tritanium_nugget.png similarity index 100% rename from src/main/resources/assets/overdrive_that_matters/textures/item/component/tritanium_nugget.png rename to src/main/resources/assets/overdrive_that_matters/textures/item/resources/tritanium_nugget.png