From 1afe1859e54914020b98b14382a1457960eeca4a Mon Sep 17 00:00:00 2001 From: GearShocky Date: Tue, 11 Feb 2025 19:46:53 +0500 Subject: [PATCH] teehee --- .../advancements/MachineAdvancementsData.kt | 9 ++++++ .../mc/otm/datagen/loot/DecorativeLoot.kt | 3 ++ .../mc/otm/block/decorative/EngineBlock.kt | 2 +- .../mc/otm/registry/game/MBlocks.kt | 26 +++++++++++++----- .../block/reinforced_redstone_lamp.png | Bin 2437 -> 470 bytes .../block/reinforced_redstone_lamp_on.png | Bin 2437 -> 462 bytes .../textures/item/chest_upgrader.png | Bin 550 -> 552 bytes .../textures/item/component/carbon_mesh.png | Bin 266 -> 496 bytes .../textures/item/component/electromagnet.png | Bin 505 -> 514 bytes 9 files changed, 32 insertions(+), 8 deletions(-) diff --git a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/advancements/MachineAdvancementsData.kt b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/advancements/MachineAdvancementsData.kt index f677bf2f5..2c816b4a3 100644 --- a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/advancements/MachineAdvancementsData.kt +++ b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/advancements/MachineAdvancementsData.kt @@ -215,6 +215,15 @@ fun addMachineAdvancements(serializer: Consumer, lang: Matter russianSuffix = "Смотрите, чтоб он не просыпался во все сундуки", englishSuffix = "Watch for not to spill it over all your chests").make(serializer, press, translation) + .also { + CraftEntry( + MItems.INFINITE_WATER_SOURCE, "We Got A Leak!", + russianName = "У нас утечка!", + russianSuffix = "Как это вообще возможно!?", + englishSuffix = "How is that even possible!?") + .make(serializer, it, translation) + } + CraftEntry( MItems.POWERED_FURNACE.values, "One Big Resistor", russianName = "Один большой резистор", diff --git a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/loot/DecorativeLoot.kt b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/loot/DecorativeLoot.kt index 76889d4c1..936449861 100644 --- a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/loot/DecorativeLoot.kt +++ b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/loot/DecorativeLoot.kt @@ -31,7 +31,10 @@ fun addDecorativeLoot(lootTables: LootTables) { lootTables.createSlabItemTable(MRegistry.FLOOR_TILES_SLAB.blocks.values) { condition(ExplosionCondition.survivesExplosion()) } lootTables.dropsSelf(MBlocks.CARBON_FIBRE_BLOCK) { condition(ExplosionCondition.survivesExplosion()) } + lootTables.dropsSelf(MBlocks.METAL_MESH) { condition(ExplosionCondition.survivesExplosion()) } + lootTables.dropsSelf(MBlocks.METAL_RAILING) { condition(ExplosionCondition.survivesExplosion()) } + lootTables.dropsSelf(MBlocks.TRITANIUM_RAW_BLOCK) { condition(ExplosionCondition.survivesExplosion()) } lootTables.dropsSelf(MBlocks.TRITANIUM_STRIPED_BLOCK.values) { condition(ExplosionCondition.survivesExplosion()) } lootTables.dropsSelf(MBlocks.TRITANIUM_STRIPED_WALL.values) { condition(ExplosionCondition.survivesExplosion()) } diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/block/decorative/EngineBlock.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/block/decorative/EngineBlock.kt index e9d6c839c..0e8270f7f 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/block/decorative/EngineBlock.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/block/decorative/EngineBlock.kt @@ -19,7 +19,7 @@ import ru.dbotthepony.mc.otm.core.get import ru.dbotthepony.mc.otm.core.math.BlockRotationFreedom import ru.dbotthepony.mc.otm.shapes.BlockShapes -class EngineBlock : RotatableMatteryBlock(Properties.of().mapColor(MapColor.COLOR_ORANGE).sound(SoundType.METAL).explosionResistance(14f).destroyTime(2.5f).requiresCorrectToolForDrops().pushReaction(PushReaction.NORMAL)) { +class EngineBlock : RotatableMatteryBlock(Properties.of().mapColor(MapColor.COLOR_ORANGE).sound(SoundType.VAULT).explosionResistance(14f).destroyTime(2.5f).requiresCorrectToolForDrops().pushReaction(PushReaction.NORMAL)) { override fun appendHoverText( itemStack: ItemStack, context: Item.TooltipContext, diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/registry/game/MBlocks.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/registry/game/MBlocks.kt index 07d17b8ed..5f5493ada 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/registry/game/MBlocks.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/registry/game/MBlocks.kt @@ -167,15 +167,24 @@ object MBlocks { }) val FLYWHEEL_BATTERY by registry.register(MNames.FLYWHEEL_BATTERY) { FlywheelBatteryBlock() } - val FLYWHEEL_SHAFT by registry.register(MNames.FLYWHEEL_SHAFT) { MatteryBlock().addSimpleDescription() } - val FLYWHEEL_HOUSING by registry.register(MNames.FLYWHEEL_HOUSING) { MatteryBlock().addSimpleDescription() } + + val FLYWHEEL_SHAFT by registry.register(MNames.FLYWHEEL_SHAFT) { + MatteryBlock(BlockBehaviour.Properties.of().sound(SoundType.METAL).explosionResistance(40f).mapColor(MapColor.COLOR_GRAY).destroyTime(2f).requiresCorrectToolForDrops()) + .addSimpleDescription() + } + + val FLYWHEEL_HOUSING by registry.register(MNames.FLYWHEEL_HOUSING) { + MatteryBlock(BlockBehaviour.Properties.of().sound(SoundType.METAL).explosionResistance(30f).mapColor(MapColor.COLOR_GRAY).destroyTime(2f).requiresCorrectToolForDrops()) + + .addSimpleDescription() + } val FLYWHEEL_BEARING by registry.register(MNames.FLYWHEEL_BEARING) { - MatteryBlock(BlockBehaviour.Properties.of().sound(SoundType.NETHERITE_BLOCK).mapColor(MapColor.COLOR_GRAY)) + MatteryBlock(BlockBehaviour.Properties.of().sound(SoundType.NETHERITE_BLOCK).explosionResistance(40f).mapColor(MapColor.COLOR_GRAY).destroyTime(2f).requiresCorrectToolForDrops()) .addSimpleDescription() } val GENERATOR_BLOCK by registry.register(MNames.GENERATOR_BLOCK) { - MatteryBlock(BlockBehaviour.Properties.of().sound(SoundType.NETHERITE_BLOCK).mapColor(MapColor.COLOR_GRAY)) + MatteryBlock(BlockBehaviour.Properties.of().sound(SoundType.NETHERITE_BLOCK).explosionResistance(30f).mapColor(MapColor.COLOR_GRAY).destroyTime(2.5f).requiresCorrectToolForDrops()) .addSimpleDescription() } @@ -235,7 +244,8 @@ object MBlocks { TransparentBlock(BlockBehaviour.Properties.of() .mapColor(MapColor.COLOR_GRAY) .noOcclusion() - .sound(SoundType.COPPER_GRATE).explosionResistance(30f) + .sound(SoundType.COPPER_GRATE) + .explosionResistance(30f) .destroyTime(2f).requiresCorrectToolForDrops()) } @@ -253,9 +263,9 @@ object MBlocks { IronBarsBlock(BlockBehaviour.Properties.of() .mapColor(MapColor.COLOR_GRAY) .sound(SoundType.COPPER_GRATE) - .explosionResistance(45f) + .explosionResistance(30f) .noOcclusion() - .destroyTime(2.5f) + .destroyTime(2f) .requiresCorrectToolForDrops()) } @@ -300,6 +310,7 @@ object MBlocks { val REINFORCED_REDSTONE_LAMP by registry.register(MNames.REINFORCED_REDSTONE_LAMP) { RedstoneLampBlock( BlockBehaviour.Properties.of() .mapColor(MapColor.COLOR_LIGHT_GRAY) + .sound(SoundType.GLASS) .explosionResistance(40f) .destroyTime(1.5f) .requiresCorrectToolForDrops() @@ -310,6 +321,7 @@ object MBlocks { val REINFORCED_REDSTONE_LAMP_INVERTED by registry.register(MNames.REINFORCED_REDSTONE_LAMP_INVERTED) { RedstoneLampBlock( BlockBehaviour.Properties.of() .mapColor(MapColor.COLOR_LIGHT_GRAY) + .sound(SoundType.GLASS) .explosionResistance(40f) .destroyTime(1.5f) .requiresCorrectToolForDrops() diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/reinforced_redstone_lamp.png b/src/main/resources/assets/overdrive_that_matters/textures/block/reinforced_redstone_lamp.png index d36635b4d3d72a5dd2644f4bd55341d6da866d5b..6f12842924e835d62902414a18de8f92f6dfc670 100644 GIT binary patch literal 470 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPFzyvgx39K^6(gMhW>M}Gi0LdzZJjkY>wb;}+i^bu_gMVX#MEe?A$v*Na(MM4QcKvNOrc zVt#pbv5sJ!F;>@gp66QYx>Ssko*|F+b~vfvjo)&zJV}yR)rwHAdF9Y#e=9J0gTAr@ zH)yX@#d@8fNU|s29e2Vu&SY6CxO_G}Rf^zIO2Kvf#!Z}3-{SXPyt}%bQ%d|+3tK9s zYfUNTRB)S1-?d!FF7bjJhzy=F&-0SJ==AzOJUbZwv<+sO=GpoAcxSKM>Bn&l zC_erC;cPZ1gx0$84G&PlV@rMa_I{q1Cl}|sCWdKHgjrXDQ&}Uie3t^a!=ZQk=qH}rKEJqtoB#aRCyR9gJbL}!<@Ex{ zfJIF<2x$kw>Dk%r8krNSX0~YpAIq_eB9Ee!(Ha2NH3M#oWyB3*dUE>Z*Z*O+j_%B6 zvvANd4C~qSY#m3VfAJW=7eyfi(m-&EGQ~w*sA>^s8Q2OBYrvyxN|wuYr9e?&ML97l zt*TO`X?%SAG)gvUq4@89^NwTtzyK)y+8Bo;<(=%B7aGmAs;pFk_@iEC*WyFp>51W&NQzpQa7f- zku1yb1;hhne`#5moG{<_vHHzdU-_QdYdN9glz^!yuU9GRF3sZg^}>?+&i=sl`FuVb zj|K-j+oH&1oj4K>Da$krA@RX}R8?Koy3|Mts??H+6e$pM9!x)eb_(b#31_ zObem}Xi)-E8ohSwjn`hN^JJ?(^aAhU7hkkOKlJ_Wf9*kDD#vsb3c9M0cHoKX!A+7= z+>27-AH08m`u(>p*B*r7{A&K>*=a`PaS4+Y;QhaN7>)l^I@H{iiV-(%;Vh)tumYZe;vYD4O z&lFU*$dWA2fNG~5T2ymgwnGnb@PmPbGnUEHe=IjmHl1C>Inh)>04}c9wJL}G&Rh52 z0A~zSY*uT_u)LO^7WsUgetUX3y;@x@mYkC;-!NtxASWk-w&y`wYvrLi_`WL*PHG+m zodObJImgqJ>GkHv`3AL3h1lKQ&$BA4;L#9DZrjf6eE#V8`+tA&==^w7O|Q88^LF@8ID1qdRv8-9ayCyJ$zGoQy{=-+M7h zV~AR&Rd2MtxLo9E5rn;(K=-Azd%fZA)zzZi^7p#I!4`nwd6cAS8U$_A^!R%Zei62O z!?HD_Uf92N=jgRpUfJE7kUV>E|BZJaf4mKRQU4$-;_y7@@mJqCmiz7F$2$jyagv}L z=saUYO-B8G+YUU-6wGtM9%|dJW!wCnH-F~(es^mSc0rs@(CYO2-SM#Z@=srotVWi? z0F3v9Fj1$-XrgF=a zf)mGTioviN>BSaT@2FXY^$@OX}UAr?J5J|b= zI9?F=t+Ys2i%Y1I;FuB!+%<5$f8&5gMHca2|LS$LJzAG|2R(sl&-e2p2d}O!&Uus> zS&8Y0Gk%VRC5|ifooK|KPnh8|jb& zuQ?YCs?K;6ML??;29F+o<|tUNQeDg!S6&FQ^5Zl%g+O!W=#I3qOzz?=f1}dyOxpvq zi?XT-N#g|Vn!oq^J7h6TonID#4y4khW)cmP2`LN{ zXPZS`gT_!UDs5@FOjTINa3+xIn`}3YiGXv!@@6RVFjCrK(CZLOP=E;ytBbr$DqX-8 z3?JCjdHxG~ee0%=&c@-a^EN6j7WHAE+-+mBgv|tTZ z0SZc#xJHx&=ckpFCl;kL1SDqWmFW4ohA5co8R{AR-ov~NsAgMgglC$krxpVTki*I# z#mLIQ2xNHyu{4woa+(GsGgzDn$TnnT0=qp5$j)qM0gGn=*&wj2jFI65&`U5H%~A%S z)C6`07NAN4BVz-`1rSp~HnJ{&m^1~*1_36ZxlCY{L6#Ok7F3s^fdNQ%fy|;^VJrtX z0-5oiE{-7*mu>ql@-`^&xb*K}U=?GKbl~A;NM+vjU&}1(NA=0CcSRSZ_$nO;*~cd* zR_DdNiL1%uyb|xv=5-rRS&G{5FFM6quxd9)>k3;g>r0PspTGX=YwQm7Z!f;HJ!EXV VCT_p8s?r=}t*5J>%Q~loCID`%abf@f delta 2432 zcmV-`34iv^1BDYIiBL{Q4GJ0x0000DNk~Le0000W0000W2m$~A0Q?y3qmdyXe+h6% zS#tmY4!{5a4!{9w)`zZJjkY>wb;}+i^bu_gMVX#MEe?A$v*Na(MM4QcKvNOrc zVt#pbv5sJ!F;>@gp66QYx>Ssko*|F+b~vfvjo)&zJV}yR)rwHAdF9Y#e=9J0gTAr@ zH)yX@#d@8fNU|s29e2Vu&SY6CxO_G}Rf^zIO2Kvf#!Z}3-{SXPyt}%bQ%d|+3tK9s zYfUNTRB)S1-?d!FF7bjJhzy=F&-0SJ==AzOJUbZwv<+sO=GpoAcxSKM>Bn&l zC_erC;cPZ1gx0$84G&PlV@rMa_I{q1Cl}|sCWdKHgjrXDQ&}Uie3t^a!=ZQk=qH}rKEJqtoB#aRCyR9gJbL}!<@Ex{ zfJIF<2x$kw>Dk%r8krNSX0~YpAIq_eB9Ee!(Ha2NH3M#oWyB3*dUE>Z*Z*O+j_%B6 zvvANd4C~qSY#m3VfAJW=7eyfi(m-&EGQ~w*sA>^s8Q2OBYrvyxN|wuYr9e?&ML97l zt*TO`X?%SAG)gvUq4@89^NwTtzyK)y+8Bo;<(=%B7aGmAs;pFk_@iEC*WyFp>51W&NQzpQa7f- zku1yb1;hhne`#5moG{<_vHHzdU-_QdYdN9glz^!yuU9GRF3sZg^}>?+&i=sl`FuVb zj|K-j+oH&1oj4K>Da$krA@RX}R8?Koy3|Mts??H+6e$pM9!x)eb_(b#31_ zObem}Xi)-E8ohSwjn`hN^JJ?(^aAhU7hkkOKlJ_Wf9*kDD#vsb3c9M0cHoKX!A+7= z+>27-AH08m`u(>p*B*r7{A&K>*=a`PaS4+Y;QhaN7>)l^I@H{iiV-(%;Vh)tumYZe;vYD4O z&lFU*$dWA2fNG~5T2ymgwnGnb@PmPbGnUEHe=IjmHl1C>Inh)>04}c9wJL}G&Rh52 z0A~zSY*uT_u)LO^7WsUgetUX3y;@x@mYkC;-!NtxASWk-w&y`wYvrLi_`WL*PHG+m zodObJImgqJ>GkHv`3AL3h1lKQ&$BA4;L#9DZrjf6eE#V8`+tA&==^w7O|Q88^LF@8ID1qdRv8-9ayCyJ$zGoQy{=-+M7h zV~AR&Rd2MtxLo9E5rn;(K=-Azd%fZA)zzZi^7p#I!4`nwd6cAS8U$_A^!R%Zei62O z!?HD_Uf92N=jgRpUfJE7kUV>E|BZJaf4mKRQU4$-;_y7@@mJqCmiz7F$2$jyagv}L z=saUYO-B8G+YUU-6wGtM9%|dJW!wCnH-F~(es^mSc0rs@(CYO2-SM#Z@=srotVWi? z0F3v9Fj1$-XrgF=a zf)mGTioviN>BSaT@2FXY^$@OX}UAr?J5J|b= zI9?F=t+Ys2i%Y1I;FuB!+%<5$f8&5gMHca2|LS$LJzAG|2R(sl&-e2p2d}O!&Uus> zS&8Y0Gk%VRC5|ifooK|KPnh8|jb& zuQ?YCs?K;6ML??;29F+o<|tUNQeDg!S6&FQ^5Zl%g+O!W=#I3qOzz?=f1}dyOxpvq zi?XT-N#g|Vn!oq^J7h6TonID#4y4khW)cmP2`LN{ zXPZS`gT_!UDs5@FOjTINa3+xIn`}3YiGXv!@@6RVFjCrK(CZLOP=E;ytBbr$DqX-8 z3?JCje|t$pK~yMHJN1KBeQ5e`!v)~^5n002ovPDHLk FV1kk7Q8xep delta 201 zcmV;)05<=q1f~R#PcDI)s4FWgH8nLJ9v+7+Enr|^PF-i7H8ovtdUA4de}8`_CMFgZ z761SM>5Z;Pv3(l>e|bqnK~yMHJkNIDyMRmg zOg@JKBB#VmPXOTpBp`#!&IMXGWC6IfR+uar+0_4F2KBG;k^=HlwSS{Sq*AvrH^97M z;tkIZbNFk|HS&fz2Elaq16C09-iXD}xjxD+42t zfltTM>b0?2~uGBhv%$u8H}x9+#-!8br= zzNd?0h(@q!Kc`UT0RG*_U{=a$2XGsPjeU zWyTv{7)`J(o_2bdq-ypg4hMe@38e>2#~d_+zQ1L7IrS~u{KXw6Tn)i5IYPUOn)7!> l1WA3@zrX0AbOiT?-wdwBOx3Hu_x6C?;pyt@RlYiR%g delta 179 zcmV;k08Ibz1BwEWMiv$p79JiRD=RB-aBxvkQ2+n{_12tDkz5^r!THv8AO3%zyI|?5 zT=SDWPo6h=8SJ(&z4a(*VOjZ4b(K-3dR7yDFv={~Sb>3o;r*4u z4?v2$B*-uLKO8W4`7?f+*!8b6#nZ(xL?bw~kCE?y0tfR-VbOp8ABdVQQ#SnAXXf}v zCWx~kKC?zuuVc%#ud5RlOg?{vWhYBzf}{3Co7|hT6*f