From 6661384dfd96ff752b58d67ba9c0e2a689174e52 Mon Sep 17 00:00:00 2001 From: GearShocky Date: Mon, 20 Jan 2025 15:06:40 +0500 Subject: [PATCH 1/7] add a few pixels on upgrade textures --- .../textures/item/machine_upgrade_creative.png | Bin 249 -> 480 bytes .../textures/item/machine_upgrade_tier0.png | Bin 239 -> 474 bytes .../textures/item/machine_upgrade_tier1.png | Bin 248 -> 484 bytes .../textures/item/machine_upgrade_tier2.png | Bin 248 -> 484 bytes .../textures/item/machine_upgrade_tier3.png | Bin 248 -> 484 bytes .../textures/item/machine_upgrade_tier4.png | Bin 248 -> 484 bytes 6 files changed, 0 insertions(+), 0 deletions(-) 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 56a36411a8632970f2489866ae92dbb8c1319afc..651dcbcaffe52224e04337043d762874bed3fed6 100644 GIT binary patch literal 480 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJV{wqX6T`Z5GB1G~mUKs7M+SzC z{oH>NS%G}%0G|-oThoO%qzad4u>Ak~;P2OXJ_{kq1o{6rfYJ=sb}jZminAohFZe$c zFa-No2!R9(JR*x382I*sFrx))unJI6qQo_#Bsf2-bh7@5K1OhC3FBNNzXQ9yQP zI}2Dm3&;k6-ZDmp7eEigXf#V1fKn6K8CZZS4UCKp7#BcH1=+~D0AkV8xiAi zkyD{UQDD)c)<|yg?;kW&-0t+eczD6dKB?-He&S`}u1HUfUq`sR&VKk}oAfuvRZe4r c(dQRY41PZanHPSV{1xmLPgg&ebxsLQ0L}JwBme*a delta 192 zcmaFB{F8BlW4&B}Pl)S=RN?=BAKaQQ{P$~oi3W?QsVSd@kYs}V{~HWI5H(Mh8Ax%J z1o;L3hXIC7XLQa3ML7#RB8wRq`1XS^qXlcQ3Q*9`)5S4FBRKcGw^)M$heKeU=bQS& zj72?GHtI#GN;mWkeuy-*oH!x3F~`zE^hmO)^WDvr%~>BZoU>VWMsfP8ELiVRb1wXz hP|nI%vgtE#GK(!|31E1uW(YKz!PC{xWt~$(69DEVNUHz< 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 c9cf18e417237063bf037f86c1739b2c0fb5b488..4e5cf2a92086322959114d8d16fbca9040a18592 100644 GIT binary patch delta 372 zcmaFQc#C<0n|wh*L118@n3!07eZ8rvDW8RqWP<$v8w^0;P-oXXF;%x-qQo_#Bsf2< zq&%@Gl_4N8Gp|I?&oxBBRL@Y)==UDxZ9ui#QX@RmJUz7-IDi~h1}R2X21X#u3y7tm z>>wapgOM35&IDu|GBPm;0O=?o&TMA^i)R7ZAkbUJ$nb(0Lf3;BXtpu{g(k2wumF`B z7#SNdE`S&dvXXTH#HcAiHV7~Q4Q2wX46?KUvY@&Q4GciCo&0y5>)7@P1DU>_E{-7@ z!E?_$avd<>aJd*LZT;Q8@UendZ^_N+y)`W=57;>jZ#;`r6yUx1@M_|U1l!Z+AJ}#~ w#cOh1UtrKR&n|qA-S%)k)^%t0yw;h-|6mjI))Sjftp?fR>FVdQ&MBb@0HyO;?EnA( delta 135 zcmV;20C@k}1MdNlMjug8QGb7baBy%I78W%%H4Zou8DJm(*Z=?k0RHLeu#sggT}Vkp zK~yMHozFoI03iqjK@er<|1Vb5xTEo8bE}XL1V;kd3ecppq&8qRfqI2?q@5W+UBNQd pfy4rM#p1cP^49^y-M^RupaPUl16K-?Gfw~j002ovPDHLkV1mXnHCzAy 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 2922b8866dd04b9c077c618ca9954f61464340f7..3504a84cbee46b3f60d69325cafae342b7b8560c 100644 GIT binary patch delta 380 zcmeyt_=I_an`%KpL118@n3!07eZAi_gP8RerlzKR7DAE<^8arz070vC)trgh`t=ee zt`Q}{`DrEPiAAXl0g0J;C3=3YAqu8?hI&T7_b_h*s@;|v;hE;?sl~tnhSil>sO; zft`T`sMNs7*nn{X#8{A(tP3DUO#!k&fC*?Y6If-Cr3H`$)n#a40Fv$Gzw2DbwnrGq z^!Ide4ABUld)|@nfC7h0phI-wyZQ&GJba=aZ932UGqJI$*}=nAd^5+|_?6pv*7LZs zoSj+6c6z47w^ZrFu?ABPU4Gql^!c?@?Tm--rte{Vz?h!PvUM3xauvuPPgg&ebxsLQ E0D5m-%>V!Z delta 142 zcmaFD{DX0Vn`&TSV10eP-!y}m^%i1cVg&^SrlzKR7DAE<^8arz0D=GH-A5*7>&JO| zx;Tbt1kXKhD0D!9!zIvUMauj71lO4BP_m1^LVy2die=-h{Rkm;VTelF{r5}E)7mp4`b 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 760cf737e2fea500a9b3a4587420a873403b570d..cb7e8d43507b5740bcda1f85ea1913556b5213d1 100644 GIT binary patch delta 380 zcmeyt_=I_an`%KpL118@n3!07ef`?GKF79%o0^*PSqMoc$p62=00d3f?FA-g>(@(^ zxJHx&=ckpFCl;kL1SDqWmFW4ohA5co8R{AR-ov~NsCHXwglC$krxpVTki*I##mLIQ z2xNHyu{4w&1Y~P4GK0mLfNVoXCI$f@9RMddnCYUNA%GdJqH6RtBKZ z1a<}%pi%=PV*|zo5Mx1BvMzuaH3i590VbfqOkkBkmKH!3RF|QF0Z6u!|E_Z#+a6&c z)8Es@F+?MH?s-SP0}322fez7y@9H0%^6-gzwCOzW&&0;2W(N;f@y#4-<5zCySRo4$wf0b_bD%hqK)$yFeGJYD@<);T3K F0RZNxUe5pk delta 142 zcmaFD{DX0Vn`&TSV10f4+POZ*wuFm`i4_zSn3|gMSqMoc$p62=00jMN|5GPs>&JO| zx;Tbt1kXKhD0D!9!zIvUMauj71lO4BP_m1^LVy2die=-h{Rkm;VTelF{r5}E*T%{U$a 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 ffef41a20c4cc460ba12954b52acf4765f5f29a8..18bbe3659634682cca607bd43db8f1e5282746ab 100644 GIT binary patch delta 380 zcmeyt_=I_an`%KpL118@n3!07ef>OB)9rS4rlzKR7DAE<^8arz0D-F9(H|4D_3I@{ zTq80rK(-+x6N3PdjsoJ$b{4RB7LW}By=9CHFPI^8J&1v3D+5qy z0y_f>P^p2Du>s=(h_N6mSr{&803_SVf7iK=ZI3XJ z>F?>{7@`q8_q-$D0R;}1K!@nUcl8fWdH6&<+H{`xXJTVhvxA4L_-2l^@hi9UtmkoM zIXknC?et8EZ>iFUV-2Ppy8OE9=<{o*+8GbuP2a=#fH6InW$QAYzopr E0JM5t`v3p{ delta 142 zcmaFD{DX0Vn`&TSV10f4JX6!{c6MT7Vg&^SrlzKR7DAE<^8arz0KtOeN8~4F>&JO| zx;Tbt1kXKhD0D!9!zIvUMauj71lO4BP_m1^LVy2die=-h{Rkm;VTelF{r5}E+;*Eb^o 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 de42fdf3800b878872fdd49075bce40d0c302e10..7f9c9dc00f13d5ea3ddbe66a55907bbb4507c2f7 100644 GIT binary patch delta 380 zcmeyt_=I_an`%KpL118@n3!07ef?DL?HeL)n3|gMSqMoc$p62=00a*ElhY<<>(@(^ zxJHx&=ckpFCl;kL1SDqWmFW4ohA5co8R{AR-ov~NsCHXwglC$krxpVTki*I##mLIQ z2xNHyu{4w&1Y~P4GK0mLfNVoXCI$f@9RMddnCYUNA%GdJqH6RtBKZ z1a<}%pi%=PV*|zo5Mx1BvMzuaH3i590VbfqOkkBkmKH!3RF|QF0Z6u!|E_Z#+a6&c z)8Es@F+?MH?s-SP0}322fez7y@9H0%^6-gzwCOzW&&0;2W(N;f@y#4-<5zCySRo4$wf0b_bD%hqK)$yFeGJYD@<);T3K F0RSaFUjG09 delta 142 zcmV;90CE511NZ@uMkP^EQGb7bl}op Date: Mon, 20 Jan 2025 15:07:25 +0500 Subject: [PATCH 2/7] Armor assembly --- .../mc/otm/datagen/items/ItemModels.kt | 1 + .../dbotthepony/mc/otm/datagen/lang/English.kt | 2 ++ .../dbotthepony/mc/otm/datagen/lang/Russian.kt | 2 ++ .../otm/datagen/recipes/CraftingTableRecipes.kt | 15 +++++++++++---- .../ru/dbotthepony/mc/otm/registry/MItems.kt | 3 +++ .../ru/dbotthepony/mc/otm/registry/MNames.kt | 1 + .../textures/item/component/armor_assembly.png | Bin 0 -> 485 bytes 7 files changed, 20 insertions(+), 4 deletions(-) create mode 100644 src/main/resources/assets/overdrive_that_matters/textures/item/component/armor_assembly.png 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 08b1c75a6..a5ef25c53 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 @@ -56,6 +56,7 @@ fun addItemModels(provider: MatteryItemModelProvider) { provider.generated(MItems.PILL_HUMANE) provider.generated(MItems.PILL_OBLIVION) provider.generated(MItems.PILL_HEAL) + provider.generated(MItems.PILL_NOT_NORMAL) provider.generated(MItems.NUTRIENT_PASTE) provider.generated(MItems.ESSENCE_DRIVE) 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 ff508b9cb..f472dd36e 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 @@ -73,6 +73,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") @@ -750,6 +751,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 4a059c766..48a589b7a 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.block, "desc", "Для длительного наблюдения за звёздами.") add(MRegistry.TRITANIUM_STAIRS.getBlock(color), "$name тритановые ступеньки") add(MRegistry.TRITANIUM_SLAB.getBlock(color), "$nameF тритановая плита") add(MRegistry.TRITANIUM_WALL.getBlock(color), "$nameF тритановая ограда") @@ -752,6 +753,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 fcdfced16..ca6258771 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 @@ -245,6 +245,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) @@ -263,7 +270,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) @@ -272,7 +279,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) @@ -283,7 +290,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, MItemTags.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) @@ -293,7 +300,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/main/kotlin/ru/dbotthepony/mc/otm/registry/MItems.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/registry/MItems.kt index 10c1b182f..37e8e3186 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/registry/MItems.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/registry/MItems.kt @@ -530,6 +530,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() } val QUANTUM_TRANSCEIVER: Item by registry.register(MNames.QUANTUM_TRANSCEIVER) { Item(DEFAULT_PROPERTIES) } @@ -566,6 +567,7 @@ object MItems { ::MIRROR, ::CARBON_MESH, + ::ARMOR_ASSEMBLY, ::REINFORCED_TRITANIUM_PLATE, MachineUpgrades.Basic::BLANK, @@ -597,6 +599,7 @@ object MItems { ::MIRROR, ::CARBON_MESH, + ::ARMOR_ASSEMBLY, ::REINFORCED_TRITANIUM_PLATE, ) 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 004adbe1d..1156f4c48 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/registry/MNames.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/registry/MNames.kt @@ -184,6 +184,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/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 0000000000000000000000000000000000000000..76d98ee6a021456c39d5812a71176f89d403eedb GIT binary patch literal 485 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJV{wqX6T`Z5GB1G~mUKs7M+SzC z{oH>NS%G~10G|-oz`#IlZSDH{dNDCEpjgrYb8#TWS`y?J{2vGyesALg8N^xO5n0T@ zz_%ZS87)|YRe*vLC9V-A!TD(=<%vb93;~Imc_n&&t|1DhdWL#NzxOb21FG4U8sVAd z>8ZuQ0Wy|BijkFp5yEndJ`quf=%^N1R=sbxKt7VQP&#dr0Zx z+25H>Gc_vTQ;m=c9xmxRC%YaPx%06^Cg=zRrACI9D~j= mSmY)=U{t?(o#&fr?lb1Z?@Whw-&l1QWWT4YpUXO@geCw(m2+MI literal 0 HcmV?d00001 From 15417e65aa8d509f5eefc6d5cd163f041c36d8d4 Mon Sep 17 00:00:00 2001 From: GearShocky Date: Tue, 21 Jan 2025 17:00:22 +0500 Subject: [PATCH 3/7] p --- .../kotlin/ru/dbotthepony/mc/otm/datagen/lang/Russian.kt | 2 +- .../mc/otm/datagen/recipes/CraftingTableRecipes.kt | 2 +- .../ru/dbotthepony/mc/otm/block/decorative/StarChairBlock.kt | 5 +++++ 3 files changed, 7 insertions(+), 2 deletions(-) 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 48a589b7a..92c311dfc 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,7 +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.block, "desc", "Для длительного наблюдения за звёздами.") + 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 тритановая ограда") 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 ca6258771..d58b93dcf 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 @@ -290,7 +290,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.MItems.ARMOR_ASSEMBLY, 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) 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 81b1b94b8..d4726c9b8 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 @@ -12,6 +12,7 @@ import net.minecraft.world.phys.BlockHitResult import net.minecraft.world.phys.shapes.CollisionContext import net.minecraft.world.phys.shapes.VoxelShape import ru.dbotthepony.mc.otm.block.RotatableMatteryBlock +import ru.dbotthepony.mc.otm.block.addSimpleDescription import ru.dbotthepony.mc.otm.block.getShapeForEachState import ru.dbotthepony.mc.otm.core.AABB import ru.dbotthepony.mc.otm.core.get @@ -21,6 +22,10 @@ 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)) { + init { + addSimpleDescription() + } + override fun rotationFreedom(): BlockRotationFreedom = BlockRotationFreedom.HORIZONTAL private val shapes = getShapeForEachState(rotationProperty) { BlockShapes.STAR_CHAIR.rotateFromNorth(it[rotationProperty]).computeShape() } From 975b540fe4a2c32d433d668c3b28c3f04b599eb8 Mon Sep 17 00:00:00 2001 From: YuRaNnNzZZ Date: Tue, 21 Jan 2025 16:42:38 +0300 Subject: [PATCH 4/7] Deepslate Dilithium Kot --- .../mc/otm/datagen/blocks/BlockModels.kt | 4 ++++ .../mc/otm/datagen/blocks/BlockStates.kt | 4 ++++ .../mc/otm/datagen/items/ItemModels.kt | 15 +++++++++++---- .../block/resource/deepslate_dilithium_ore.png | Bin 0 -> 2437 bytes .../block/resource/dilithium_crystal_block.png | Bin 0 -> 2437 bytes .../textures/block/resource/dilithium_ore.png | Bin 0 -> 2437 bytes .../item/resources/dilithium_crystal.png | Bin 0 -> 2437 bytes 7 files changed, 19 insertions(+), 4 deletions(-) create mode 100644 src/main/resources/assets/overdrive_that_matters/textures/block/resource/deepslate_dilithium_ore.png create mode 100644 src/main/resources/assets/overdrive_that_matters/textures/block/resource/dilithium_crystal_block.png create mode 100644 src/main/resources/assets/overdrive_that_matters/textures/block/resource/dilithium_ore.png create mode 100644 src/main/resources/assets/overdrive_that_matters/textures/item/resources/dilithium_crystal.png 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..27b244d8b 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) @@ -87,6 +92,8 @@ fun addItemModels(provider: MatteryItemModelProvider) { provider.component(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/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 0000000000000000000000000000000000000000..d36635b4d3d72a5dd2644f4bd55341d6da866d5b GIT binary patch literal 2437 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 Date: Tue, 21 Jan 2025 16:46:22 +0300 Subject: [PATCH 5/7] resources not components --- .../dbotthepony/mc/otm/datagen/items/ItemModels.kt | 6 +++--- .../{component => resources}/tritanium_dust.png | Bin .../{component => resources}/tritanium_ingot.png | Bin .../{component => resources}/tritanium_nugget.png | Bin 4 files changed, 3 insertions(+), 3 deletions(-) rename src/main/resources/assets/overdrive_that_matters/textures/item/{component => resources}/tritanium_dust.png (100%) rename src/main/resources/assets/overdrive_that_matters/textures/item/{component => resources}/tritanium_ingot.png (100%) rename src/main/resources/assets/overdrive_that_matters/textures/item/{component => resources}/tritanium_nugget.png (100%) 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 27b244d8b..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 @@ -87,9 +87,9 @@ 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) 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 From d03439b0768118847eff50bf8c3936d13cc776d8 Mon Sep 17 00:00:00 2001 From: YuRaNnNzZZ Date: Tue, 21 Jan 2025 17:03:51 +0300 Subject: [PATCH 6/7] missing tags for dilithium crystal block --- .../kotlin/ru/dbotthepony/mc/otm/datagen/tags/MineableTags.kt | 1 + .../kotlin/ru/dbotthepony/mc/otm/datagen/tags/ResourceTags.kt | 3 +++ 2 files changed, 4 insertions(+) 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) } From 99ebeddae4a5b55a33fc366f15f44661efbc86fc Mon Sep 17 00:00:00 2001 From: GearShocky Date: Tue, 21 Jan 2025 23:04:17 +0500 Subject: [PATCH 7/7] m --- .../ru/dbotthepony/mc/otm/block/decorative/StarChairBlock.kt | 3 --- src/main/kotlin/ru/dbotthepony/mc/otm/registry/game/MItems.kt | 3 +++ 2 files changed, 3 insertions(+), 3 deletions(-) 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 e1ac771a3..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,9 +22,6 @@ 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)) { - init { - addSimpleDescription() - } override fun rotationFreedom(): BlockRotationFreedom = BlockRotationFreedom.HORIZONTAL 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, )