From 6bee0784d3ec88f29a525c9c6740287c9bf86d27 Mon Sep 17 00:00:00 2001 From: GearShocky Date: Mon, 1 Jan 2024 16:42:47 +0600 Subject: [PATCH 1/5] Texture adjustments --- .../ru/dbotthepony/mc/otm/registry/MBlocks.kt | 14 ++------------ .../textures/block/powered_smoker_base.png | Bin 0 -> 463 bytes .../block/powered_smoker_interior_0.png | Bin 0 -> 441 bytes .../block/powered_smoker_interior_1.png | Bin 0 -> 452 bytes .../textures/block/storage_cable — копия.png | Bin 0 -> 199 bytes .../item/component/gravitation_field_sensor.png | Bin 277 -> 297 bytes .../textures/item/component/mirror.png | Bin 246 -> 220 bytes .../textures/item/component/mirror_compound.png | Bin 245 -> 227 bytes 8 files changed, 2 insertions(+), 12 deletions(-) create mode 100644 src/main/resources/assets/overdrive_that_matters/textures/block/powered_smoker_base.png create mode 100644 src/main/resources/assets/overdrive_that_matters/textures/block/powered_smoker_interior_0.png create mode 100644 src/main/resources/assets/overdrive_that_matters/textures/block/powered_smoker_interior_1.png create mode 100644 src/main/resources/assets/overdrive_that_matters/textures/block/storage_cable — копия.png diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/registry/MBlocks.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/registry/MBlocks.kt index bb75430c5..efc9f60e2 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/registry/MBlocks.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/registry/MBlocks.kt @@ -12,17 +12,7 @@ import net.minecraft.world.item.ItemStack import net.minecraft.world.item.TooltipFlag import net.minecraft.world.item.crafting.RecipeType import net.minecraft.world.level.BlockGetter -import net.minecraft.world.level.block.AnvilBlock -import net.minecraft.world.level.block.Block -import net.minecraft.world.level.block.DoorBlock -import net.minecraft.world.level.block.DropExperienceBlock -import net.minecraft.world.level.block.IronBarsBlock -import net.minecraft.world.level.block.LiquidBlock -import net.minecraft.world.level.block.SlabBlock -import net.minecraft.world.level.block.SoundType -import net.minecraft.world.level.block.StairBlock -import net.minecraft.world.level.block.TrapDoorBlock -import net.minecraft.world.level.block.WallBlock +import net.minecraft.world.level.block.* import net.minecraft.world.level.block.state.BlockBehaviour import net.minecraft.world.level.block.state.BlockState import net.minecraft.world.level.block.state.properties.BlockSetType @@ -200,7 +190,7 @@ object MBlocks { val LABORATORY_LAMP_INVERTED: Block by registry.register(MNames.LABORATORY_LAMP_INVERTED) { LaboratoryLamp(true) } val LABORATORY_LAMP_LIGHT: Block by registry.register(MNames.LABORATORY_LAMP_LIGHT) { LaboratoryLampLight() } val DANGER_STRIPE_BLOCK: Block by registry.register(MNames.DANGER_STRIPE_BLOCK) { Block(BlockBehaviour.Properties.of().mapColor(MapColor.COLOR_GRAY).explosionResistance(6f).destroyTime(1.5f).requiresCorrectToolForDrops()) } - val METAL_BEAM: Block by registry.register(MNames.METAL_BEAM) { Block(BlockBehaviour.Properties.of().mapColor(MapColor.COLOR_GRAY).sound(SoundType.METAL).explosionResistance(14f).destroyTime(2.5f).requiresCorrectToolForDrops()) } + val METAL_BEAM: Block by registry.register(MNames.METAL_BEAM) { RotatedPillarBlock(BlockBehaviour.Properties.of().mapColor(MapColor.COLOR_GRAY).sound(SoundType.METAL).explosionResistance(14f).destroyTime(2.5f).requiresCorrectToolForDrops()) } val ENGINE: Block by registry.register(MNames.ENGINE) { EngineBlock() } val HOLO_SIGN: Block by registry.register(MNames.HOLO_SIGN) { HoloSignBlock() } diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/powered_smoker_base.png b/src/main/resources/assets/overdrive_that_matters/textures/block/powered_smoker_base.png new file mode 100644 index 0000000000000000000000000000000000000000..28561cce075c939aed61ee866cfc87120aeaa97e GIT binary patch literal 463 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCik#1AIbUWAm%#nVPPh>(jepd*iGXVq#*sP5p9ma%yU7At50}MMY_qE&u=j zH#IfY*49o)NC4^!jXtv-NC}n%`2_=|PymDK+L=i}NzMX~$YKTtzQZ8Qcszea3eYhe zo-U3d7XDKwcTPK`z~h=3X=T#(@c;g@I3cOs3!a||)i%4%F2s{REp(mXF_FoQg*=M! z98cL=-X6cH@TJCvYhS`4vw(xI|LR(7XPKYGVk7h_Zom4Q()k>5|0g)aoo`{O;);9U z(z0A&&pc+K4cp5fvIrHl8i@Rz>Hp~l3+tiROZ`JCA|qS41mP9~l;!nq z8AeOaGPaTh<;h&fA4<5qy}&6dWqu%6Ye|S#^3thF^F@*(jV7yzsLW`1sA%CV5qw6d zz&m{T8KHl=0-}ewC!dhM=&~SwxzTH-xsyKlb1mkwz>% literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/powered_smoker_interior_0.png b/src/main/resources/assets/overdrive_that_matters/textures/block/powered_smoker_interior_0.png new file mode 100644 index 0000000000000000000000000000000000000000..7bbb062caaa8ed79bd3757f36bd1ae6adb05d064 GIT binary patch literal 441 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCilI0(?STdsl34oV6misb5=L+tk!lO-(JWvLz%WBq1RoHorH zcvvU*yHnlLT7l7{vrp1XQzTvEsq_!w@~gpO*6s4DExGeII;`F5 zJ$a|boi{T&86C3Usw=da9$;p$xaO^~gw5(@CBOPyafQ8NKMXXUFjyGz+|+CQpT^Q~ zkohs|jq?tTjNxw?=FDN7_=TyNy@NsEB%i0;)D!z$-!l~$Geo{+C~)7y@$2>0`N^yc zavCH`g(VE9GFLE%eB3Q@N%uAoHRvch)(@>bX;ri--+#L(`808oaY>abKG`-+@zIw-tU5qcc9?)-g z;%iVoJmIZSg}E{VkDP@0fjTxW9*ZpYD^ZdHp85tA4IB&;-%NNC)cGd%iynhH^MtE> z4D&n09sgIpe;&c8A+6wcm&MKJDf6C%iq)5Wx3rxq=-DN)W2US;bA9WzPTpH*o0k2R d`RlXDylK98dENQY6TlE+@O1TaS?83{1OQE>u3`WH literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/storage_cable — копия.png b/src/main/resources/assets/overdrive_that_matters/textures/block/storage_cable — копия.png new file mode 100644 index 0000000000000000000000000000000000000000..70af311858fadd4cb99fc07287c546218ac4778c GIT binary patch literal 199 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sBufG}g$wN6f;V2r1WV~B-+vWcnb-}4QuEPsD6raoj(VBWK5 zkAz*_9}ckx&!4B?*p@5ptTsXS{M;iC|>M%$%Fg?j&W8A=a pVwPi05W~?%3of^V2@E_u49C_hUesDNF#u=}gQu&X%Q~loCIH)rJV^im literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/overdrive_that_matters/textures/item/component/gravitation_field_sensor.png b/src/main/resources/assets/overdrive_that_matters/textures/item/component/gravitation_field_sensor.png index a887f70407ec30ce61d30bae1a1c0db8eea92c83..0e67a500b2d9684b190a37a165b5cb48a67af025 100644 GIT binary patch delta 240 zcmbQrw32CpW4&&GPl&6UnwqJpX<%TWn3!07eZ97}_W%F?85kJk@xe*#mxqgw=&1O>zmC;s4=SM0~R?YUC^ zQndnJy)4a&?rRKX$?M&7b0Ti)OiW<(c`n*|sP0hZqolmjP4!1!96rkOJHhwii-SfV b-M+H89c8P1x93F%&{_shS3j3^P6d<}C1tEM{Qf+YiEw7OcT4K*2Om7sn8d;Mg8+z5@yz&e~Uh z?)={ve&EQ?c9%-cq`x~_mx;L6xP}@&OyfSgL{h2URV+ET-_bDVJ3`31=5Ebxdd zW?8r)ToVBw~ zIvkk9)AJ$Y(XO{n*5^DQ?|SyeV{hEcpi}lC0ZlSoR*G)^5=v%Yq8ZO^DVk^qG?l^A L)z4*}Q$iB}1ff5L delta 189 zcmcb^_>FObW4&mAPl&6Sn3%S}LKRvQrhH=S|H%8(Eacw7q+0REvN>~(rxnhfbF@PLOZSNt l4DX}6cD?hzKaZh;@!(u$ojL#Wb^`5S@O1TaS?83{1OQ}!N@oB7 diff --git a/src/main/resources/assets/overdrive_that_matters/textures/item/component/mirror_compound.png b/src/main/resources/assets/overdrive_that_matters/textures/item/component/mirror_compound.png index 52bb150ecb8a4cb582e34d2ccba60e2aef0c008e..2cb48fd634e3e7584427b18fc52b875393c0cb2d 100644 GIT binary patch delta 170 zcmey$_?U5mV?9rRPl#)MeSJYefvKq}0|SHe_9`_X#ZnUF7ySSKe+CDwm0y5-&H|6f zVg?4j{UFR}!5XXr6b$fmaSYK2u07`{)?mQle30S${$ghiotP7=w|y25y^>zX^lS%X z$Az0SpO}2%u@vdMHLd0>mjZuo+bg3Cwe^99!STv7m44Yr_^^u=JL~Gd39;o_%=nG% SbkRJZ;S8RxelF{r5}E*73p@1y delta 188 zcmaFN_?2;jW4&mAPl&6Sn3%SB^POiE0|HSMo3l8!9nz*o0 zEJ=3G1t#gQI=`BqN6RPn^@S$2>1GI)x0r7JAFWxg{W9lZifN_#silW>UDQ@g73pF9 h5p@0U$+t`g*su68M}D(kodC3g!PC{xWt~$(695i|M2G+Y From ffa94d190d932ab650564b36efc65cc371de87f2 Mon Sep 17 00:00:00 2001 From: GearShocky Date: Mon, 1 Jan 2024 23:16:59 +0600 Subject: [PATCH 2/5] Microwave --- .../mc/otm/datagen/blocks/BlockStates.kt | 2 + .../mc/otm/datagen/items/ItemModels.kt | 2 + .../models/block/powered_smoker_error.json | 158 ++++++++++++++++++ .../models/block/powered_smoker_idle.json | 158 ++++++++++++++++++ .../models/block/powered_smoker_working.json | 158 ++++++++++++++++++ .../textures/block/power_cable_0.png | Bin 0 -> 208 bytes .../textures/block/power_cable_1.png | Bin 0 -> 217 bytes .../textures/block/power_cable_2.png | Bin 0 -> 217 bytes .../textures/block/power_cable_3.png | Bin 0 -> 212 bytes .../block/powered_smoker_interior_2.png | Bin 0 -> 446 bytes .../textures/block/storage_cable — копия.png | Bin 199 -> 0 bytes 11 files changed, 478 insertions(+) create mode 100644 src/main/resources/assets/overdrive_that_matters/models/block/powered_smoker_error.json create mode 100644 src/main/resources/assets/overdrive_that_matters/models/block/powered_smoker_idle.json create mode 100644 src/main/resources/assets/overdrive_that_matters/models/block/powered_smoker_working.json create mode 100644 src/main/resources/assets/overdrive_that_matters/textures/block/power_cable_0.png create mode 100644 src/main/resources/assets/overdrive_that_matters/textures/block/power_cable_1.png create mode 100644 src/main/resources/assets/overdrive_that_matters/textures/block/power_cable_2.png create mode 100644 src/main/resources/assets/overdrive_that_matters/textures/block/power_cable_3.png create mode 100644 src/main/resources/assets/overdrive_that_matters/textures/block/powered_smoker_interior_2.png delete mode 100644 src/main/resources/assets/overdrive_that_matters/textures/block/storage_cable — копия.png 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 780b7f7ac..6412255fd 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 @@ -97,8 +97,10 @@ fun addBlockStates(provider: MatteryBlockStateProvider) { provider.block(MBlocks.TWIN_PLATE_PRESS) provider.block(MBlocks.GRAVITATION_STABILIZER) provider.block(MBlocks.GRAVITATION_STABILIZER_LENS) + provider.block(MBlocks.POWERED_BLAST_FURNACE) provider.block(MBlocks.POWERED_FURNACE) + provider.block(MBlocks.POWERED_SMOKER) provider.block(MBlocks.STORAGE_POWER_SUPPLIER) provider.block(MBlocks.MATTER_RECYCLER) 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 e29bed539..4598b73c2 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 @@ -174,8 +174,10 @@ fun addItemModels(provider: MatteryItemModelProvider) { provider.block(MItems.ENERGY_SERVO, "energy_servo") provider.block(MItems.ESSENCE_STORAGE, "essence_storage") provider.block(MItems.MATTER_RECONSTRUCTOR, "matter_reconstructor") + provider.block(MItems.POWERED_BLAST_FURNACE, "powered_blast_furnace_working") provider.block(MItems.POWERED_FURNACE, "powered_furnace_working") + provider.block(MItems.POWERED_SMOKER, "powered_smoker_working") provider.block(MItems.PLATE_PRESS, "plate_press_idle") provider.block(MItems.TWIN_PLATE_PRESS, "twin_plate_press_idle") diff --git a/src/main/resources/assets/overdrive_that_matters/models/block/powered_smoker_error.json b/src/main/resources/assets/overdrive_that_matters/models/block/powered_smoker_error.json new file mode 100644 index 000000000..664623d15 --- /dev/null +++ b/src/main/resources/assets/overdrive_that_matters/models/block/powered_smoker_error.json @@ -0,0 +1,158 @@ +{ + "credit": "Made with Blockbench", + "render_type": "translucent", + "texture_size": [32, 32], + "textures": { + "0": "overdrive_that_matters:block/powered_smoker_base", + "1": "overdrive_that_matters:block/powered_smoker_interior_2", + "particle": "overdrive_that_matters:block/powered_smoker_base" + }, + "elements": [ + { + "name": "body2", + "from": [1, 0, 8], + "to": [15, 4, 15], + "faces": { + "east": {"uv": [0, 14, 4, 16], "texture": "#1"}, + "south": {"uv": [0, 14, 7, 16], "texture": "#1"}, + "west": {"uv": [3, 14, 7, 16], "texture": "#1"}, + "down": {"uv": [0.5, 4, 7.5, 7.5], "rotation": 180, "texture": "#0"} + } + }, + { + "name": "body", + "from": [0, 0, 0], + "to": [16, 4, 8], + "faces": { + "north": {"uv": [8, 6, 16, 8], "texture": "#0"}, + "east": {"uv": [12, 14, 8, 16], "texture": "#0"}, + "south": {"uv": [0, 0, 8, 2], "texture": "#0"}, + "west": {"uv": [8, 14, 12, 16], "texture": "#0"}, + "down": {"uv": [0, 0, 8, 4], "rotation": 180, "texture": "#0"} + } + }, + { + "name": "body", + "from": [0, 4, 0], + "to": [5, 16, 16], + "faces": { + "north": {"uv": [13.5, 6, 16, 12], "texture": "#1"}, + "east": {"uv": [0, 0, 8, 6], "texture": "#1"}, + "south": {"uv": [8, 0, 10.5, 6], "texture": "#1"}, + "west": {"uv": [8, 8, 16, 14], "texture": "#0"}, + "up": {"uv": [5.5, 8, 8, 16], "rotation": 180, "texture": "#0"}, + "down": {"uv": [0, 8, 2.5, 0.5], "texture": "#0"} + } + }, + { + "name": "body", + "from": [5, 4, 0], + "to": [16, 5, 16], + "faces": { + "north": {"uv": [8, 5.5, 13.5, 6], "texture": "#0"}, + "east": {"uv": [16, 13.5, 8, 14], "texture": "#0"}, + "south": {"uv": [10.5, 5.5, 16, 6], "texture": "#1"}, + "west": {"uv": [0, 0, 8, 1], "texture": "#missing"}, + "up": {"uv": [0, 6, 5.5, 14], "rotation": 180, "texture": "#1"}, + "down": {"uv": [2.5, 8, 8, 0.5], "texture": "#0"} + } + }, + { + "name": "body", + "from": [5, 14, 0], + "to": [16, 16, 16], + "faces": { + "north": {"uv": [8, 0, 13.5, 1], "texture": "#0"}, + "east": {"uv": [16, 8, 8, 9], "texture": "#0"}, + "south": {"uv": [10.5, 0, 16, 1], "texture": "#1"}, + "up": {"uv": [0, 8, 5.5, 16], "rotation": 180, "texture": "#0"}, + "down": {"uv": [0, 14, 5.5, 6], "rotation": 180, "texture": "#1"} + } + }, + { + "name": "body", + "from": [5, 5, 15], + "to": [16, 14, 16], + "faces": { + "north": {"uv": [5.5, 6, 11, 10], "texture": "#1"}, + "east": {"uv": [16, 9, 15.5, 13.5], "texture": "#0"}, + "south": {"uv": [10.5, 1, 16, 5.5], "texture": "#1"}, + "up": {"uv": [0, 0, 5.5, 1], "texture": "#missing"} + } + }, + { + "name": "body", + "from": [15, 5, 0], + "to": [16, 14, 15], + "faces": { + "north": {"uv": [8, 1, 8.5, 5.5], "texture": "#0"}, + "east": {"uv": [15.5, 9, 8, 13.5], "texture": "#0"}, + "west": {"uv": [8, 1, 0.5, 5.5], "texture": "#1"}, + "up": {"uv": [0.5, 0, 0.5, 15], "texture": "#missing"} + } + }, + { + "name": "plate", + "from": [6, 5, 4], + "to": [14, 6, 12], + "faces": { + "north": {"uv": [12, 15.5, 16, 16], "texture": "#1"}, + "east": {"uv": [12, 15.5, 16, 16], "texture": "#1"}, + "south": {"uv": [12, 15.5, 16, 16], "texture": "#1"}, + "west": {"uv": [12, 15.5, 16, 16], "texture": "#1"}, + "up": {"uv": [12, 12, 16, 16], "texture": "#1"} + } + }, + { + "name": "screen", + "from": [5, 5, 1], + "to": [15, 14, 1], + "faces": { + "north": {"uv": [8.5, 1, 13.5, 5.5], "texture": "#0"}, + "south": {"uv": [13.5, 1, 8.5, 5.5], "texture": "#0"} + } + }, + { + "name": "heater", + "from": [5, 11, 8], + "to": [6, 14, 13], + "faces": { + "north": {"uv": [9, 11, 9.5, 12.5], "texture": "#1"}, + "east": {"uv": [6.5, 11, 9, 12.5], "texture": "#1"}, + "south": {"uv": [6, 11, 6.5, 12.5], "texture": "#1"}, + "down": {"uv": [6.5, 12.5, 9, 13], "rotation": 90, "texture": "#1"} + } + } + ], + "display": { + "thirdperson_righthand": { + "rotation": [75, 45, 0], + "translation": [0, 2.5, 0], + "scale": [0.375, 0.375, 0.375] + }, + "thirdperson_lefthand": { + "rotation": [75, 45, 0], + "translation": [0, 2.5, 0], + "scale": [0.375, 0.375, 0.375] + }, + "firstperson_righthand": { + "rotation": [0, 45, 0], + "scale": [0.4, 0.4, 0.4] + }, + "firstperson_lefthand": { + "rotation": [0, 225, 0], + "scale": [0.4, 0.4, 0.4] + }, + "ground": { + "translation": [0, 3, 0], + "scale": [0.25, 0.25, 0.25] + }, + "gui": { + "rotation": [30, 225, 0], + "scale": [0.625, 0.625, 0.625] + }, + "fixed": { + "scale": [0.5, 0.5, 0.5] + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/overdrive_that_matters/models/block/powered_smoker_idle.json b/src/main/resources/assets/overdrive_that_matters/models/block/powered_smoker_idle.json new file mode 100644 index 000000000..1c72c38f6 --- /dev/null +++ b/src/main/resources/assets/overdrive_that_matters/models/block/powered_smoker_idle.json @@ -0,0 +1,158 @@ +{ + "credit": "Made with Blockbench", + "render_type": "translucent", + "texture_size": [32, 32], + "textures": { + "0": "overdrive_that_matters:block/powered_smoker_base", + "1": "overdrive_that_matters:block/powered_smoker_interior_0", + "particle": "overdrive_that_matters:block/powered_smoker_base" + }, + "elements": [ + { + "name": "body2", + "from": [1, 0, 8], + "to": [15, 4, 15], + "faces": { + "east": {"uv": [0, 14, 4, 16], "texture": "#1"}, + "south": {"uv": [0, 14, 7, 16], "texture": "#1"}, + "west": {"uv": [3, 14, 7, 16], "texture": "#1"}, + "down": {"uv": [0.5, 4, 7.5, 7.5], "rotation": 180, "texture": "#0"} + } + }, + { + "name": "body", + "from": [0, 0, 0], + "to": [16, 4, 8], + "faces": { + "north": {"uv": [8, 6, 16, 8], "texture": "#0"}, + "east": {"uv": [12, 14, 8, 16], "texture": "#0"}, + "south": {"uv": [0, 0, 8, 2], "texture": "#0"}, + "west": {"uv": [8, 14, 12, 16], "texture": "#0"}, + "down": {"uv": [0, 0, 8, 4], "rotation": 180, "texture": "#0"} + } + }, + { + "name": "body", + "from": [0, 4, 0], + "to": [5, 16, 16], + "faces": { + "north": {"uv": [13.5, 6, 16, 12], "texture": "#1"}, + "east": {"uv": [0, 0, 8, 6], "texture": "#1"}, + "south": {"uv": [8, 0, 10.5, 6], "texture": "#1"}, + "west": {"uv": [8, 8, 16, 14], "texture": "#0"}, + "up": {"uv": [5.5, 8, 8, 16], "rotation": 180, "texture": "#0"}, + "down": {"uv": [0, 8, 2.5, 0.5], "texture": "#0"} + } + }, + { + "name": "body", + "from": [5, 4, 0], + "to": [16, 5, 16], + "faces": { + "north": {"uv": [8, 5.5, 13.5, 6], "texture": "#0"}, + "east": {"uv": [16, 13.5, 8, 14], "texture": "#0"}, + "south": {"uv": [10.5, 5.5, 16, 6], "texture": "#1"}, + "west": {"uv": [0, 0, 8, 1], "texture": "#missing"}, + "up": {"uv": [0, 6, 5.5, 14], "rotation": 180, "texture": "#1"}, + "down": {"uv": [2.5, 8, 8, 0.5], "texture": "#0"} + } + }, + { + "name": "body", + "from": [5, 14, 0], + "to": [16, 16, 16], + "faces": { + "north": {"uv": [8, 0, 13.5, 1], "texture": "#0"}, + "east": {"uv": [16, 8, 8, 9], "texture": "#0"}, + "south": {"uv": [10.5, 0, 16, 1], "texture": "#1"}, + "up": {"uv": [0, 8, 5.5, 16], "rotation": 180, "texture": "#0"}, + "down": {"uv": [0, 14, 5.5, 6], "rotation": 180, "texture": "#1"} + } + }, + { + "name": "body", + "from": [5, 5, 15], + "to": [16, 14, 16], + "faces": { + "north": {"uv": [5.5, 6, 11, 10], "texture": "#1"}, + "east": {"uv": [16, 9, 15.5, 13.5], "texture": "#0"}, + "south": {"uv": [10.5, 1, 16, 5.5], "texture": "#1"}, + "up": {"uv": [0, 0, 5.5, 1], "texture": "#missing"} + } + }, + { + "name": "body", + "from": [15, 5, 0], + "to": [16, 14, 15], + "faces": { + "north": {"uv": [8, 1, 8.5, 5.5], "texture": "#0"}, + "east": {"uv": [15.5, 9, 8, 13.5], "texture": "#0"}, + "west": {"uv": [8, 1, 0.5, 5.5], "texture": "#1"}, + "up": {"uv": [0.5, 0, 0.5, 15], "texture": "#missing"} + } + }, + { + "name": "plate", + "from": [6, 5, 4], + "to": [14, 6, 12], + "faces": { + "north": {"uv": [12, 15.5, 16, 16], "texture": "#1"}, + "east": {"uv": [12, 15.5, 16, 16], "texture": "#1"}, + "south": {"uv": [12, 15.5, 16, 16], "texture": "#1"}, + "west": {"uv": [12, 15.5, 16, 16], "texture": "#1"}, + "up": {"uv": [12, 12, 16, 16], "texture": "#1"} + } + }, + { + "name": "screen", + "from": [5, 5, 1], + "to": [15, 14, 1], + "faces": { + "north": {"uv": [8.5, 1, 13.5, 5.5], "texture": "#0"}, + "south": {"uv": [13.5, 1, 8.5, 5.5], "texture": "#0"} + } + }, + { + "name": "heater", + "from": [5, 11, 8], + "to": [6, 14, 13], + "faces": { + "north": {"uv": [9, 11, 9.5, 12.5], "texture": "#1"}, + "east": {"uv": [6.5, 11, 9, 12.5], "texture": "#1"}, + "south": {"uv": [6, 11, 6.5, 12.5], "texture": "#1"}, + "down": {"uv": [6.5, 12.5, 9, 13], "rotation": 90, "texture": "#1"} + } + } + ], + "display": { + "thirdperson_righthand": { + "rotation": [75, 45, 0], + "translation": [0, 2.5, 0], + "scale": [0.375, 0.375, 0.375] + }, + "thirdperson_lefthand": { + "rotation": [75, 45, 0], + "translation": [0, 2.5, 0], + "scale": [0.375, 0.375, 0.375] + }, + "firstperson_righthand": { + "rotation": [0, 45, 0], + "scale": [0.4, 0.4, 0.4] + }, + "firstperson_lefthand": { + "rotation": [0, 225, 0], + "scale": [0.4, 0.4, 0.4] + }, + "ground": { + "translation": [0, 3, 0], + "scale": [0.25, 0.25, 0.25] + }, + "gui": { + "rotation": [30, 225, 0], + "scale": [0.625, 0.625, 0.625] + }, + "fixed": { + "scale": [0.5, 0.5, 0.5] + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/overdrive_that_matters/models/block/powered_smoker_working.json b/src/main/resources/assets/overdrive_that_matters/models/block/powered_smoker_working.json new file mode 100644 index 000000000..a515ccd1a --- /dev/null +++ b/src/main/resources/assets/overdrive_that_matters/models/block/powered_smoker_working.json @@ -0,0 +1,158 @@ +{ + "credit": "Made with Blockbench", + "render_type": "translucent", + "texture_size": [32, 32], + "textures": { + "0": "overdrive_that_matters:block/powered_smoker_base", + "1": "overdrive_that_matters:block/powered_smoker_interior_1", + "particle": "overdrive_that_matters:block/powered_smoker_base" + }, + "elements": [ + { + "name": "body2", + "from": [1, 0, 8], + "to": [15, 4, 15], + "faces": { + "east": {"uv": [0, 14, 4, 16], "texture": "#1"}, + "south": {"uv": [0, 14, 7, 16], "texture": "#1"}, + "west": {"uv": [3, 14, 7, 16], "texture": "#1"}, + "down": {"uv": [0.5, 4, 7.5, 7.5], "rotation": 180, "texture": "#0"} + } + }, + { + "name": "body", + "from": [0, 0, 0], + "to": [16, 4, 8], + "faces": { + "north": {"uv": [8, 6, 16, 8], "texture": "#0"}, + "east": {"uv": [12, 14, 8, 16], "texture": "#0"}, + "south": {"uv": [0, 0, 8, 2], "texture": "#0"}, + "west": {"uv": [8, 14, 12, 16], "texture": "#0"}, + "down": {"uv": [0, 0, 8, 4], "rotation": 180, "texture": "#0"} + } + }, + { + "name": "body", + "from": [0, 4, 0], + "to": [5, 16, 16], + "faces": { + "north": {"uv": [13.5, 6, 16, 12], "texture": "#1"}, + "east": {"uv": [0, 0, 8, 6], "texture": "#1"}, + "south": {"uv": [8, 0, 10.5, 6], "texture": "#1"}, + "west": {"uv": [8, 8, 16, 14], "texture": "#0"}, + "up": {"uv": [5.5, 8, 8, 16], "rotation": 180, "texture": "#0"}, + "down": {"uv": [0, 8, 2.5, 0.5], "texture": "#0"} + } + }, + { + "name": "body", + "from": [5, 4, 0], + "to": [16, 5, 16], + "faces": { + "north": {"uv": [8, 5.5, 13.5, 6], "texture": "#0"}, + "east": {"uv": [16, 13.5, 8, 14], "texture": "#0"}, + "south": {"uv": [10.5, 5.5, 16, 6], "texture": "#1"}, + "west": {"uv": [0, 0, 8, 1], "texture": "#missing"}, + "up": {"uv": [0, 6, 5.5, 14], "rotation": 180, "texture": "#1"}, + "down": {"uv": [2.5, 8, 8, 0.5], "texture": "#0"} + } + }, + { + "name": "body", + "from": [5, 14, 0], + "to": [16, 16, 16], + "faces": { + "north": {"uv": [8, 0, 13.5, 1], "texture": "#0"}, + "east": {"uv": [16, 8, 8, 9], "texture": "#0"}, + "south": {"uv": [10.5, 0, 16, 1], "texture": "#1"}, + "up": {"uv": [0, 8, 5.5, 16], "rotation": 180, "texture": "#0"}, + "down": {"uv": [0, 14, 5.5, 6], "rotation": 180, "texture": "#1"} + } + }, + { + "name": "body", + "from": [5, 5, 15], + "to": [16, 14, 16], + "faces": { + "north": {"uv": [5.5, 6, 11, 10], "texture": "#1"}, + "east": {"uv": [16, 9, 15.5, 13.5], "texture": "#0"}, + "south": {"uv": [10.5, 1, 16, 5.5], "texture": "#1"}, + "up": {"uv": [0, 0, 5.5, 1], "texture": "#missing"} + } + }, + { + "name": "body", + "from": [15, 5, 0], + "to": [16, 14, 15], + "faces": { + "north": {"uv": [8, 1, 8.5, 5.5], "texture": "#0"}, + "east": {"uv": [15.5, 9, 8, 13.5], "texture": "#0"}, + "west": {"uv": [8, 1, 0.5, 5.5], "texture": "#1"}, + "up": {"uv": [0.5, 0, 0.5, 15], "texture": "#missing"} + } + }, + { + "name": "plate", + "from": [6, 5, 4], + "to": [14, 6, 12], + "faces": { + "north": {"uv": [12, 15.5, 16, 16], "texture": "#1"}, + "east": {"uv": [12, 15.5, 16, 16], "texture": "#1"}, + "south": {"uv": [12, 15.5, 16, 16], "texture": "#1"}, + "west": {"uv": [12, 15.5, 16, 16], "texture": "#1"}, + "up": {"uv": [12, 12, 16, 16], "texture": "#1"} + } + }, + { + "name": "screen", + "from": [5, 5, 1], + "to": [15, 14, 1], + "faces": { + "north": {"uv": [8.5, 1, 13.5, 5.5], "texture": "#0"}, + "south": {"uv": [13.5, 1, 8.5, 5.5], "texture": "#0"} + } + }, + { + "name": "heater", + "from": [5, 11, 8], + "to": [6, 14, 13], + "faces": { + "north": {"uv": [9, 11, 9.5, 12.5], "texture": "#1"}, + "east": {"uv": [6.5, 11, 9, 12.5], "texture": "#1"}, + "south": {"uv": [6, 11, 6.5, 12.5], "texture": "#1"}, + "down": {"uv": [6.5, 12.5, 9, 13], "rotation": 90, "texture": "#1"} + } + } + ], + "display": { + "thirdperson_righthand": { + "rotation": [75, 45, 0], + "translation": [0, 2.5, 0], + "scale": [0.375, 0.375, 0.375] + }, + "thirdperson_lefthand": { + "rotation": [75, 45, 0], + "translation": [0, 2.5, 0], + "scale": [0.375, 0.375, 0.375] + }, + "firstperson_righthand": { + "rotation": [0, 45, 0], + "scale": [0.4, 0.4, 0.4] + }, + "firstperson_lefthand": { + "rotation": [0, 225, 0], + "scale": [0.4, 0.4, 0.4] + }, + "ground": { + "translation": [0, 3, 0], + "scale": [0.25, 0.25, 0.25] + }, + "gui": { + "rotation": [30, 225, 0], + "scale": [0.625, 0.625, 0.625] + }, + "fixed": { + "scale": [0.5, 0.5, 0.5] + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/power_cable_0.png b/src/main/resources/assets/overdrive_that_matters/textures/block/power_cable_0.png new file mode 100644 index 0000000000000000000000000000000000000000..005a11637f65b47daad9d71a32ae28cdf0e17c47 GIT binary patch literal 208 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJV{wqX6T`Z5GB1G~mUKs7M+SzC z{oH>NS%G}f0G|+7Q&ZFW`uc)`f(bq4{~vh%zX6nBa7f9T38dIdg8YL2g8_q-H?td1 zh_k>WvY3H^Z$Ah#TCfJI00j*_T^vI+f|C!h^!WJn@c8tcQIPU5Fkr}3V-pLLVBum| oD)FF3Oeg9BqqLO75~iFShC}i!kuJ^6SwPJUp00i_>zopr0Nczq>i_@% literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/power_cable_1.png b/src/main/resources/assets/overdrive_that_matters/textures/block/power_cable_1.png new file mode 100644 index 0000000000000000000000000000000000000000..b062ae995f4249260d99063b5688e169c5f0cfc0 GIT binary patch literal 217 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJV{wqX6T`Z5GB1G~mUKs7M+SzC z{oH>NS%G}%0G|+7Q&ZFW`uc)`0>5bnG3zagwp#sv;Q9XsP?}-W!s$nW6lY10U+{k@ zUVo0hS&gpB|nwI%{;!Bs4WLo=8th wNN#srz!1R6Jm-9yE4S4H2j=FGhGu4lfNS%G}%0G|+7Q&ZFW`uc)`g0*vfj%^7)yDRkn1JD0AfYJ;sN7AK%6lY10U+{k@ zUVo0hS&gpB|nwI%{;!Bs4WLo=8th wNN#srz!1R6Jm-9yE4S4H2j=FGhGu4lf4LV`5C&kyB9|bU6xie!SP>Qp_BeIx*f$snaGiF`uS#)OtgMz`+)z4*}Q$iB}NIk4k literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/storage_cable — копия.png b/src/main/resources/assets/overdrive_that_matters/textures/block/storage_cable — копия.png deleted file mode 100644 index 70af311858fadd4cb99fc07287c546218ac4778c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 199 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sBufG}g$wN6f;V2r1WV~B-+vWcnb-}4QuEPsD6raoj(VBWK5 zkAz*_9}ckx&!4B?*p@5ptTsXS{M;iC|>M%$%Fg?j&W8A=a pVwPi05W~?%3of^V2@E_u49C_hUesDNF#u=}gQu&X%Q~loCIH)rJV^im From ea448c5262bc46b064d3fa73c896124ceabc6f8c Mon Sep 17 00:00:00 2001 From: GearShocky Date: Mon, 1 Jan 2024 23:51:32 +0600 Subject: [PATCH 3/5] More texture adjustments --- .../textures/item/component/energy_bus.png | Bin 306 -> 281 bytes .../component/gravitation_field_limiter.png | Bin 259 -> 315 bytes .../item/component/matter_capacitor_parts.png | Bin 282 -> 274 bytes 3 files changed, 0 insertions(+), 0 deletions(-) diff --git a/src/main/resources/assets/overdrive_that_matters/textures/item/component/energy_bus.png b/src/main/resources/assets/overdrive_that_matters/textures/item/component/energy_bus.png index 01ab3a204ce9b5b9c36e244a5acac007a79ed1ce..0377d0c14a7b9d0d80d20deb96f5d277f091a59c 100644 GIT binary patch delta 224 zcmdnQG?Qt9W4(HSPl&6UnwprHn5n7h&6_s^0|RHdY5YF2<5d0E6udr8b}hXMsm#F#`kNeh_A~U=3CQ3MP5FIEH8hhxP~Z zH5hO>Yx>PS_4j->x5}<>?KW`{k!ga7ToxKEY3CMXHuXjx$l{UmQ#R&$B4i!CV46h) zqyFK7P4n9F{0<+Trubm~Lo@CZ8W+s-%pC2T+G87(1Z>kk>Hl}xBfE*kwx~Ys63{vZ MPgg&ebxsLQ03d!=IRF3v delta 249 zcmbQqw25hgW4&&GPl&6wwzis@nwXeaU|?WH8Y?g`Foe6L%K|C>k|4j}|0sar%AFYtfl{0W9+AZi41D`Rn9+hYSOq9p?CIhd zq7j_if03_6frn-L)Kv?<{kJdrzHDCHnWL2qWt$oo{dw%m;S*+&>1FDAGT`$Z5#!_B zKV`a(TC6+pjC)adv(2iDg0o-hEO;utz4VAgd2^NNlF~m?yFaSz{4n?Fiq2z}(|+RZe)TiU>RYFtVPX#c5onVm#cHqE;cz}h`Gmo?rX0@4UycafSsux5d@*wF z`3H_0uJs7~cYJk{cU9cU^_-3!a&wwe6~AmPzSpaMoo$<}#kn%(Z;PX3*>dDVs?RTH bI3TW)z)^5Tjw21|GzL#sHb0kjP6qW_DeCo2U+eNwKji9_Cgrq6my+~Ywrud`x!l=cym7mS|D3HE@*k&kL@iI> dz3=@$rurb3C4wPpr9i70JYD@<);T3K0RX4WO7Z{z diff --git a/src/main/resources/assets/overdrive_that_matters/textures/item/component/matter_capacitor_parts.png b/src/main/resources/assets/overdrive_that_matters/textures/item/component/matter_capacitor_parts.png index 3fbd5030b1c25a9a31f9e14b5441de9653c1a263..393933848e221f5f7974ca322fae9ae18f1726c0 100644 GIT binary patch delta 127 zcmV-_0D%9R0+Irdns{SLL_t(2Q+>}t5`Z8KL(w*+XnX$y+khhD!oPgO5Rep6(FC*t zvcSw5;Qi=_w+9?Xum$HA6hVju6)$bui5Wpf Date: Tue, 2 Jan 2024 00:15:39 +0600 Subject: [PATCH 4/5] Update the texture for metal beams and lamps --- .../block/decorative/laboratory_lamp_front.png | Bin 307 -> 220 bytes .../decorative/laboratory_lamp_front_off.png | Bin 303 -> 220 bytes .../block/decorative/metal_beam_side.png | Bin 225 -> 231 bytes .../block/decorative/metal_beam_top.png | Bin 229 -> 241 bytes 4 files changed, 0 insertions(+), 0 deletions(-) diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/decorative/laboratory_lamp_front.png b/src/main/resources/assets/overdrive_that_matters/textures/block/decorative/laboratory_lamp_front.png index be33b5c4d17e4590cf54f8b3718ab2a1eed23118..e7c40f48d7abaee95c226d45a09d646d2bba6b1c 100644 GIT binary patch delta 176 zcmdnYbcb<*1SbnK0|Ud`yN`k@%diPBSUXQ- ZWXO6d$6(9wSP*D9gQu&X%Q~loCIITyFdhH^ delta 243 zcmVqX9{rGkzW{pfJsC_ zR47wjkJ}EzFbG3kOfu4Dy=?#guQOSssXH$bu>k`tW~7(u$a4P~(z55rlm$_6+#NQCPF)5K&9zhC#@cVN tp=U6|`5(R9kGp_Z*WqV*uVn8Q7e0kw2KqbiZqWb$002ovPDHLkV1nt>VBi1% diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/decorative/laboratory_lamp_front_off.png b/src/main/resources/assets/overdrive_that_matters/textures/block/decorative/laboratory_lamp_front_off.png index 3aaa9fa92794eb062d449f7eefd2d6a348cde27c..adc42ea4ba34ba8cc526d808909480422ee38678 100644 GIT binary patch delta 176 zcmZ3_bcb<*1SbnK0|Ud`yN`kaiu!O zC;}C77I;J!GcfS&2Vq7F)?gK&V1TEKV~E7%2T-XL#5I1k>4=XLNA3afI+1iwUxJa0oXuoZ(_)7h`9aVH04mcAm({ Yko8oK!It5%Akc6IPgg&ebxsLQ0Q6ESYXATM delta 239 zcmVtIXO2sHxaZebdg^ee}73tK~yMH zU60`sgD?n#BcYYrIo;m>VGXr+JNNzR(F6#&m~q-D>KDGQ?D{dCwEI&~Q|G}lf&#@ajB&@-6f p_>W$m$DP2Z>+qv|H?sE=6&Eb{229uy7@YtB002ovPDHLkV1mQ)TGRjl diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/decorative/metal_beam_side.png b/src/main/resources/assets/overdrive_that_matters/textures/block/decorative/metal_beam_side.png index f82330696db10952b5c8b91a401daf949abe5652..a7b40c72a960fcf9e7609291926715c9ace37e43 100644 GIT binary patch delta 145 zcmV;C0B--`0p|gbNfRq8D_~$?H8nLJ9v&7J7VMGR){$Hob6!bAK~xyiO^(qCz#t4n z4>yqLzbnX1AT$FAX8%=s)>4|UNAi*jke>ot_lRW)V2zkmhdsiW(2RAm3kLgTMc~FV z)&>oH0q`YD(7ednFyyj)>;Ho%LRlvi?;9C6%Fh&l)y!L_00000NkvXXu0mjfdtp3V delta 139 zcmV;60CfN70pS6VNfR|SH69)w78VvOD=T1NV0X(-Y>`|TZCFV}K~xyiMULAIfG`L} zsc`^m7@$(R062i)2Hk%c)0p7jN$wL$?`En9H5N#Pofh~F(;u^o223Glj{%!{2=xY= t36`)1hjBr+^M{nuobfEoi5&fID888i6YU*`L2v*7002ovPDHLkV1f;QHQ4|F diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/decorative/metal_beam_top.png b/src/main/resources/assets/overdrive_that_matters/textures/block/decorative/metal_beam_top.png index 3264c1033baa2c18f14578d6cd1530f4185f3c6e..e49817f8fd512363871c1f8562ca2613e1eeea66 100644 GIT binary patch delta 158 zcmV;P0Ac^-0r3HlMiyXTU^O*0D=RA=9v)FqQ5F^!hru{Skz5#kXh}ptR2b7Wj?oQ( zAPhuLVE{`Qzy|myi2n#ofcx)aG2uR%%WJMzz+55*bnjXwVEeBPzRHgMj{Hy Date: Tue, 2 Jan 2024 11:53:52 +0700 Subject: [PATCH 5/5] Add microwave oven block shape --- .../ru/dbotthepony/mc/otm/shapes/BlockShapes.java | 12 ++++++++++++ .../kotlin/ru/dbotthepony/mc/otm/registry/MBlocks.kt | 2 +- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/src/main/java/ru/dbotthepony/mc/otm/shapes/BlockShapes.java b/src/main/java/ru/dbotthepony/mc/otm/shapes/BlockShapes.java index dc64f03ec..6a1851dab 100644 --- a/src/main/java/ru/dbotthepony/mc/otm/shapes/BlockShapes.java +++ b/src/main/java/ru/dbotthepony/mc/otm/shapes/BlockShapes.java @@ -785,4 +785,16 @@ public class BlockShapes { new SimpleCuboid(0.3125d, 1.000625d, 0.125d, 0.6875d, 1.000625d, 0.1875d) ); + public static final BlockShape POWERED_SMOKER_IDLE = new BlockShape( + new SimpleCuboid(0.0625d, 0d, 0.5d, 0.9375d, 0.25d, 0.9375d), + new SimpleCuboid(0d, 0d, 0d, 1d, 0.25d, 0.5d), + new SimpleCuboid(0d, 0.25d, 0d, 0.3125d, 1d, 1d), + new SimpleCuboid(0.3125d, 0.25d, 0d, 1d, 0.3125d, 1d), + new SimpleCuboid(0.3125d, 0.875d, 0d, 1d, 1d, 1d), + new SimpleCuboid(0.3125d, 0.3125d, 0.9375d, 1d, 0.875d, 1d), + new SimpleCuboid(0.9375d, 0.3125d, 0d, 1d, 0.875d, 0.9375d), + new SimpleCuboid(0.375d, 0.3125d, 0.25d, 0.875d, 0.375d, 0.75d), + new SimpleCuboid(0.3125d, 0.3125d, 0.0625d, 0.9375d, 0.875d, 0.0625d), + new SimpleCuboid(0.3125d, 0.6875d, 0.5d, 0.375d, 0.875d, 0.8125d) + ); } diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/registry/MBlocks.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/registry/MBlocks.kt index 97cef1dfb..b3adfeb0e 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/registry/MBlocks.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/registry/MBlocks.kt @@ -98,7 +98,7 @@ object MBlocks { val TWIN_PLATE_PRESS: Block by registry.register(MNames.TWIN_PLATE_PRESS) { PlatePressBlock(isTwin = true) } val POWERED_FURNACE: PoweredFurnaceBlock by registry.register(MNames.POWERED_FURNACE) { PoweredFurnaceBlock(MBlockEntities::POWERED_FURNACE, RecipeType.SMELTING, null, MachinesConfig.POWERED_FURNACE, BlockShapes.POWERED_FURNACE) } val POWERED_BLAST_FURNACE: PoweredFurnaceBlock by registry.register(MNames.POWERED_BLAST_FURNACE) { PoweredFurnaceBlock(MBlockEntities::POWERED_BLAST_FURNACE, RecipeType.BLASTING, null, MachinesConfig.POWERED_BLAST_FURNACE, BlockShapes.POWERED_BLAST_FURNACE) } - val POWERED_SMOKER: PoweredFurnaceBlock by registry.register(MNames.POWERED_SMOKER) { PoweredFurnaceBlock(MBlockEntities::POWERED_SMOKER, RecipeType.SMOKING, MRecipes::MICROWAVE, MachinesConfig.POWERED_SMOKER, null) } + val POWERED_SMOKER: PoweredFurnaceBlock by registry.register(MNames.POWERED_SMOKER) { PoweredFurnaceBlock(MBlockEntities::POWERED_SMOKER, RecipeType.SMOKING, MRecipes::MICROWAVE, MachinesConfig.POWERED_SMOKER, BlockShapes.POWERED_SMOKER_IDLE) } val MATTER_RECYCLER: Block by registry.register(MNames.MATTER_RECYCLER) { MatterRecyclerBlock() } val ENERGY_SERVO: Block by registry.register(MNames.ENERGY_SERVO) { EnergyServoBlock() } val COBBLESTONE_GENERATOR: Block by registry.register(MNames.COBBLESTONE_GENERATOR) { CobblerBlock() }