From f57b171bc93cd5221ac05418c8983c09817778d7 Mon Sep 17 00:00:00 2001 From: GearShocky Date: Wed, 26 Feb 2025 01:29:12 +0500 Subject: [PATCH 01/15] forsenbread (2) --- src/bb/bread_monster.bbmodel | 1 + .../models/bread_monster.java | 49 ++++++++++++++++++ .../models/bread_monster/bread_monster.png | Bin 0 -> 1160 bytes 3 files changed, 50 insertions(+) create mode 100644 src/bb/bread_monster.bbmodel create mode 100644 src/main/resources/assets/overdrive_that_matters/models/bread_monster.java create mode 100644 src/main/resources/assets/overdrive_that_matters/textures/models/bread_monster/bread_monster.png diff --git a/src/bb/bread_monster.bbmodel b/src/bb/bread_monster.bbmodel new file mode 100644 index 000000000..1a63f3215 --- /dev/null +++ b/src/bb/bread_monster.bbmodel @@ -0,0 +1 @@ +{"meta":{"format_version":"4.10","model_format":"modded_entity","box_uv":true},"name":"bread_monster","model_identifier":"","modded_entity_entity_class":"","modded_entity_version":"1.17","modded_entity_flip_y":true,"visible_box":[1,1,0],"variable_placeholders":"","variable_placeholder_buttons":[],"timeline_setups":[],"unhandled_root_fields":{},"resolution":{"width":64,"height":64},"elements":[{"name":"cube","box_uv":true,"rescale":false,"locked":false,"light_emission":0,"render_order":"default","allow_mirror_modeling":true,"from":[-4,0,-5],"to":[4,6,1],"autouv":0,"color":3,"origin":[0,0,0],"faces":{"north":{"uv":[6,6,14,12],"texture":0},"east":{"uv":[0,6,6,12],"texture":0},"south":{"uv":[20,6,28,12],"texture":0},"west":{"uv":[14,6,20,12],"texture":0},"up":{"uv":[14,6,6,0],"texture":0},"down":{"uv":[22,0,14,6],"texture":0}},"type":"cube","uuid":"fa4523a4-8d01-c733-0b32-e6e9110d7e28"},{"name":"cube","box_uv":true,"rescale":false,"locked":false,"light_emission":0,"render_order":"default","allow_mirror_modeling":true,"from":[-4,0,-7],"to":[4,3,-3],"autouv":0,"color":4,"inflate":0.1,"origin":[0,-2,-5],"uv_offset":[26,24],"faces":{"north":{"uv":[30,28,38,31],"texture":0},"east":{"uv":[26,28,30,31],"texture":0},"south":{"uv":[42,28,50,31],"texture":0},"west":{"uv":[38,28,42,31],"texture":0},"up":{"uv":[38,28,30,24],"texture":0},"down":{"uv":[46,24,38,28],"texture":0}},"type":"cube","uuid":"88abdc70-43b2-eae1-76fc-438ae188e456"},{"name":"cube","box_uv":true,"rescale":false,"locked":false,"light_emission":0,"render_order":"default","allow_mirror_modeling":true,"from":[-4,3,-7],"to":[4,6,-2],"autouv":0,"color":4,"inflate":0.1,"origin":[0,1,-5],"uv_offset":[0,24],"faces":{"north":{"uv":[5,29,13,32],"texture":0},"east":{"uv":[0,29,5,32],"texture":0},"south":{"uv":[18,29,26,32],"texture":0},"west":{"uv":[13,29,18,32],"texture":0},"up":{"uv":[13,29,5,24],"texture":0},"down":{"uv":[21,24,13,29],"texture":0}},"type":"cube","uuid":"4045e434-568f-31c9-42c3-5129a8a4e558"},{"name":"cube","box_uv":true,"rescale":false,"locked":false,"light_emission":0,"render_order":"default","allow_mirror_modeling":true,"from":[-4,0,0.9],"to":[4,6,6.9],"autouv":0,"color":3,"inflate":-0.1,"origin":[0,0,4.9],"uv_offset":[0,12],"faces":{"north":{"uv":[6,18,14,24],"texture":0},"east":{"uv":[0,18,6,24],"texture":0},"south":{"uv":[20,18,28,24],"texture":0},"west":{"uv":[14,18,20,24],"texture":0},"up":{"uv":[14,18,6,12],"texture":0},"down":{"uv":[22,12,14,18],"texture":0}},"type":"cube","uuid":"578bc61b-3bb2-8b53-b3e6-153dd51261bd"}],"outliner":[{"name":"root","origin":[0,0,0],"color":0,"uuid":"5859ff96-7f22-f022-5634-74e9ddbda30f","export":true,"mirror_uv":false,"isOpen":true,"locked":false,"visibility":true,"autouv":0,"selected":false,"children":[{"name":"Body","origin":[0,3,0],"color":0,"uuid":"88720699-c6d7-c408-8ec2-c5ddd7227f0b","export":true,"mirror_uv":false,"isOpen":true,"locked":false,"visibility":true,"autouv":0,"selected":false,"children":["fa4523a4-8d01-c733-0b32-e6e9110d7e28",{"name":"Ljaw","origin":[0,1,-3],"color":0,"uuid":"2232c700-b7a6-4729-b081-78ff34dfbc41","export":true,"mirror_uv":false,"isOpen":true,"locked":false,"visibility":true,"autouv":0,"selected":false,"children":["88abdc70-43b2-eae1-76fc-438ae188e456"]},{"name":"UJaw","origin":[0,4,-3],"color":0,"uuid":"51b17377-4d34-1e21-ed59-71314a4858c4","export":true,"mirror_uv":false,"isOpen":true,"locked":false,"visibility":true,"autouv":0,"selected":false,"children":["4045e434-568f-31c9-42c3-5129a8a4e558"]},{"name":"tail","origin":[0,3,1],"color":0,"uuid":"6502f144-0905-ef6d-77a4-4d6f6c832582","export":true,"mirror_uv":false,"isOpen":true,"locked":false,"visibility":true,"autouv":0,"selected":false,"children":["578bc61b-3bb2-8b53-b3e6-153dd51261bd"]}]}]}],"textures":[{"path":"L:\\overdrive_that_matters\\src\\main\\resources\\assets\\overdrive_that_matters\\textures\\models\\bread_monster\\bread_monster.png","name":"bread_monster.png","folder":"block","namespace":"","id":"0","group":"","width":64,"height":64,"uv_width":64,"uv_height":64,"particle":false,"use_as_default":false,"layers_enabled":false,"sync_to_project":"","render_mode":"default","render_sides":"auto","pbr_channel":"color","frame_time":1,"frame_order_type":"loop","frame_order":"","frame_interpolate":false,"visible":true,"internal":true,"saved":true,"uuid":"ab77f55b-7cd7-1d48-08ad-38d2efaed5e6","relative_path":"../main/resources/assets/overdrive_that_matters/textures/models/bread_monster/bread_monster.png","source":"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAEAAAABACAYAAACqaXHeAAAAAXNSR0IArs4c6QAABEBJREFUeF7tWU1IVFEUPoM2Uv5U/uJfGYRK1Coso4WCRUIEYYuIwGxRyxYRSKtoFUa0aJmLzJ2L3ISl1SKLyJI2Bv4ROOXP4E/+a2jFxHeHM13H+2Ye41XeHd/ZzJt55913zne+e+5373jIwt40lARwKz0lMeThO5xKhfuTaa5lhBr7liltctXqcWpsG/dY3nTQDcsgGQAGYXrxjwj7w44EOnI0jV7eH4qYhvEANN8+GJj4qa5wdoaX3vcsKAGYz/IKZhgPgGoKcMZgQ8u72fhnQKQMrRjAzxjPgGhToM2/YtkEMQ1amobNaIJM9bHZv5S3J4HwCcP8HxhdoemF4He29NQEKslPIvQBGD+TUp1JaV0zUfv7qfoBRwHjkbs9J48sQPG+kWDnD7fzx5NDADAIso88jvw7wDICAFT/Y/8yjc8JKbDOcnZ76ETprjUsCAcgfAUBYxwJQLevKjD8fYkW26dC1MeFHQDgx4kxAPIUkkGB31CWl+7c7HXWFGjtLBdl/vplnpL7F0Mxd4yt0K9h9RTYWZhIZ/KShC/3AjlZlX5YKk0RLo4D4O7DQwIATh6ND10cNj21ug4EJJ+eGbxf5rVfTMcCoJzkRARgIHmtOruVEIobJYjeAHBetPrpXNL/SvOeIO6VIDdH9AYZADE1toMURnNE8id/B4UQb4tlBjDdVdMo7qUw7wWsQDAeAChE+TCEq4xDETTGuOkBrANw0sOCCIrNjvH+wY4vfObL91JNRZf9tdPuwBvwE3sBBAZDZXHNS18kTR/rOx23F8C216riAMBK04cDEA5W+Jh8v/beN2cxAADIyXDgkTQ9/OHH54O8j4jGCoB56/EPZwHw4Pq+EACs67FpkeVxeGLsh4QgceU9BHxVv/EYjgPg2tmcAA44NmrYQ7AVVGUoAYSP05ZHJR2tlkAWQVvRyFAYBlSlNXQBaQmArP44kK0GAEzq7VlQnj1uOgAqEcT7gK1gwMW6whADVP9AbSoAEEfQAjII8j9DW3GowQCoktd56qycAlZnAVj2DkyuUixrOZbbDl8B1V2podPVN8R7X7c/CuAan37/KNVebRDXfL/5SX1gYHCUSqgrpnfaaexrToWhArEDhKkOQxgAHlgWO9GmBRqr0BbFFyg3N5/edn4mn29EAILkYR2vPonvMP5taOa52JFGG99OsiqfEABIbrA7m4qKCqiy4lgoCDmopqetawKmwWdCEMGiBSj//8A6g0HGu3nbLRcBbLM7/oYA4MqAgqAdKsSUZKrKFOXry5cqA8VlE5taoVgTs/uco2Sp3aB1+rkA6ETTxLFcBphYNZ0xuwzQiaaJY7kMMLFqOmN2GaATTRPHchlgYtV0xuwyQCeaJo7lMsDEqumM2WWATjRNHMtlgIlV0xmzywCdaJo4lssAE6umM2aXATrRNHEslwEmVk1nzC4DdKJp4ljbngH/AP1vPl/ahKvIAAAAAElFTkSuQmCC"}],"animations":[{"uuid":"d7bf1cb6-1a54-3b38-f7f3-f6cbfa366f4b","name":"idle","loop":"loop","override":false,"length":1.44,"snapping":25,"selected":false,"anim_time_update":"","blend_weight":"","start_delay":"","loop_delay":"","animators":{"88720699-c6d7-c408-8ec2-c5ddd7227f0b":{"name":"Body","type":"bone","keyframes":[{"channel":"rotation","data_points":[{"x":"0","y":"-2.5","z":"0"}],"uuid":"5a668d16-f5c6-8e39-03af-670568968123","time":0,"color":-1,"interpolation":"linear"},{"channel":"rotation","data_points":[{"x":"0","y":"3.33","z":"0"}],"uuid":"6f8863cd-46f7-50cb-d5ae-ad498c99f650","time":0.72,"color":-1,"interpolation":"linear"},{"channel":"rotation","data_points":[{"x":"0","y":"-2.5","z":"0"}],"uuid":"0432cfdd-65d3-56ec-d02e-92f96e3ca66c","time":1.44,"color":-1,"interpolation":"linear"}]},"2232c700-b7a6-4729-b081-78ff34dfbc41":{"name":"Ljaw","type":"bone","keyframes":[{"channel":"rotation","data_points":[{"x":"2.5","y":"0","z":"0"}],"uuid":"69d0bbcc-3b05-3660-2cff-5364785da4c7","time":0,"color":-1,"interpolation":"linear"},{"channel":"rotation","data_points":[{"x":"5","y":"0","z":"0"}],"uuid":"b146f64a-62d8-3799-587c-08b0388298b8","time":0.72,"color":-1,"interpolation":"linear"},{"channel":"rotation","data_points":[{"x":"2.5","y":"0","z":"0"}],"uuid":"ce4020e4-c2ce-c65f-d716-b92f8b196ad3","time":1.44,"color":-1,"interpolation":"linear"}]},"51b17377-4d34-1e21-ed59-71314a4858c4":{"name":"UJaw","type":"bone","keyframes":[{"channel":"rotation","data_points":[{"x":"-2.5","y":"0","z":"0"}],"uuid":"a12df9b3-1bb5-f85f-cd29-c1d833a4083b","time":0,"color":-1,"interpolation":"linear"},{"channel":"rotation","data_points":[{"x":"-5","y":"0","z":"0"}],"uuid":"2caeda6c-3904-7e9a-ac45-278c455a00b8","time":0.72,"color":-1,"interpolation":"linear"},{"channel":"rotation","data_points":[{"x":"-2.5","y":"0","z":"0"}],"uuid":"7b2a6773-0830-e658-b98f-a24f691d59cf","time":1.44,"color":-1,"interpolation":"linear"}]},"6502f144-0905-ef6d-77a4-4d6f6c832582":{"name":"tail","type":"bone","keyframes":[{"channel":"rotation","data_points":[{"x":"0","y":"5","z":"0"}],"uuid":"de793c8b-db32-6813-ab51-c0da733c8178","time":0,"color":-1,"interpolation":"linear"},{"channel":"rotation","data_points":[{"x":"0","y":"5","z":"0"}],"uuid":"d8ac39a5-dc82-fc1b-a448-88ffe3fbf45a","time":1.44,"color":-1,"interpolation":"linear"},{"channel":"rotation","data_points":[{"x":"0","y":"-7.5","z":"0"}],"uuid":"5e01c8c4-d7a6-98c8-d3e7-d99930c8a74e","time":0.72,"color":-1,"interpolation":"linear"}]}}},{"uuid":"6b67c492-b0cc-1672-3b1c-5de6c2d23e77","name":"move","loop":"loop","override":false,"length":1.44,"snapping":25,"selected":true,"anim_time_update":"","blend_weight":"","start_delay":"","loop_delay":"","animators":{"5859ff96-7f22-f022-5634-74e9ddbda30f":{"name":"root","type":"bone","keyframes":[{"channel":"position","data_points":[{"x":"1","y":"0","z":"2"}],"uuid":"8cda900f-d10c-7618-92f5-c1cd6c9ae5c4","time":0,"color":-1,"interpolation":"linear"},{"channel":"position","data_points":[{"x":"0","y":"5","z":"-1"}],"uuid":"b6463f24-0648-6ae0-88b7-e841c01b730d","time":0.12,"color":-1,"interpolation":"linear"},{"channel":"position","data_points":[{"x":"-1","y":"0","z":"-1"}],"uuid":"86a97c35-5faa-d7ef-982b-d7ca7b8c177d","time":0.24,"color":-1,"interpolation":"linear"},{"channel":"position","data_points":[{"x":"-2","y":"0","z":"2"}],"uuid":"2fd43a6d-c710-e031-9732-94d86746502b","time":0.72,"color":-1,"interpolation":"linear"},{"channel":"position","data_points":[{"x":"0","y":"5","z":"-1"}],"uuid":"57b6a1ef-0c55-269c-1f00-afdc0918b181","time":0.84,"color":-1,"interpolation":"linear"},{"channel":"position","data_points":[{"x":"1","y":"0","z":"-1"}],"uuid":"2dd5e925-6cb6-8d81-4f8d-48f65b4ec006","time":0.96,"color":-1,"interpolation":"linear"},{"channel":"position","data_points":[{"x":"1","y":"0","z":"2"}],"uuid":"63c9dfd6-9898-8511-9473-954817e9cf8e","time":1.44,"color":-1,"interpolation":"linear"}]},"88720699-c6d7-c408-8ec2-c5ddd7227f0b":{"name":"Body","type":"bone","keyframes":[{"channel":"rotation","data_points":[{"x":"7.5283207965","y":"4.95711679","z":"0.6542642739"}],"uuid":"1671ea6a-b095-a26b-7304-e5df39c97022","time":0.12,"color":-1,"interpolation":"linear"},{"channel":"rotation","data_points":[{"x":"0","y":"0","z":"0"}],"uuid":"ca91aedc-1796-55d6-b2b9-9c32f9b90934","time":0,"color":-1,"interpolation":"linear"},{"channel":"rotation","data_points":[{"x":"7.5283207965","y":"-4.95711679","z":"-0.6542642739"}],"uuid":"5808eaf7-4d3b-f0d2-f00e-51494ef2132c","time":0.84,"color":-1,"interpolation":"linear"},{"channel":"rotation","data_points":[{"x":"0","y":"0","z":"0"}],"uuid":"0404b1b0-0255-0e90-f33f-ab06776eec70","time":0.24,"color":-1,"interpolation":"linear"},{"channel":"rotation","data_points":[{"x":"0","y":"0","z":"0"}],"uuid":"4114f4e6-ce10-38c8-4935-20c25720bdf7","time":0.72,"color":-1,"interpolation":"linear"},{"channel":"rotation","data_points":[{"x":"0","y":"0","z":"0"}],"uuid":"c34130e9-1ac6-c643-efdb-50f8fc31a6fb","time":0.96,"color":-1,"interpolation":"linear"},{"channel":"rotation","data_points":[{"x":"12.5094402655","y":"1.6523722633","z":"0.2180880913"}],"uuid":"4f1744db-52a0-7b22-e54d-ecd7f53af326","time":0.2,"color":-1,"interpolation":"linear"},{"channel":"rotation","data_points":[{"x":"15.018880531","y":"-3.3047445267","z":"-0.4361761826"}],"uuid":"4320bd01-5d42-6eae-aa32-d7df4dbf25d3","time":0.92,"color":-1,"interpolation":"linear"}]},"2232c700-b7a6-4729-b081-78ff34dfbc41":{"name":"Ljaw","type":"bone","keyframes":[{"channel":"rotation","data_points":[{"x":"25","y":"0","z":"0"}],"uuid":"cca380c4-1702-bbf4-ec96-384d19a85ea0","time":0.12,"color":-1,"interpolation":"linear"},{"channel":"rotation","data_points":[{"x":"0","y":"0","z":"0"}],"uuid":"311d826c-e7ad-1d2f-3c1c-64d7982f2300","time":0,"color":-1,"interpolation":"linear"},{"channel":"rotation","data_points":[{"x":"0","y":"0","z":"0"}],"uuid":"a2222357-8425-ae5f-c8da-bea86f996c53","time":0.32,"color":-1,"interpolation":"linear"},{"channel":"rotation","data_points":[{"x":"0","y":"0","z":"0"}],"uuid":"ef6ef43f-85be-8663-357d-8c206c2ac565","time":0.72,"color":-1,"interpolation":"linear"},{"channel":"rotation","data_points":[{"x":"0","y":"0","z":"0"}],"uuid":"1d9ce2b8-a33f-fad7-a9be-735d10333cf9","time":1.04,"color":-1,"interpolation":"linear"},{"channel":"rotation","data_points":[{"x":"25","y":"0","z":"0"}],"uuid":"9263e391-0ad4-6cfc-2b49-800ae8ed7cf4","time":0.84,"color":-1,"interpolation":"linear"}]},"51b17377-4d34-1e21-ed59-71314a4858c4":{"name":"UJaw","type":"bone","keyframes":[{"channel":"rotation","data_points":[{"x":"-25","y":"0","z":"0"}],"uuid":"15c13b71-07df-b6b2-5591-7093cd4b061e","time":0.12,"color":-1,"interpolation":"linear"},{"channel":"rotation","data_points":[{"x":"0","y":"0","z":"0"}],"uuid":"c17e2a73-a449-1cb7-d681-cd72470f7221","time":0,"color":-1,"interpolation":"linear"},{"channel":"rotation","data_points":[{"x":"0","y":"0","z":"0"}],"uuid":"585b7866-7eba-d2bb-88d9-deae443066e3","time":0.32,"color":-1,"interpolation":"linear"},{"channel":"rotation","data_points":[{"x":"0","y":"0","z":"0"}],"uuid":"0355a961-3968-b49a-b1ce-bf4454ca53c5","time":0.72,"color":-1,"interpolation":"linear"},{"channel":"rotation","data_points":[{"x":"0","y":"0","z":"0"}],"uuid":"cc959d9d-4c32-f5c4-a0ec-42643ea67784","time":1.04,"color":-1,"interpolation":"linear"},{"channel":"rotation","data_points":[{"x":"-30","y":"0","z":"0"}],"uuid":"8f37bb68-e309-6fa3-7b6d-a103f9422944","time":0.84,"color":-1,"interpolation":"linear"}]},"6502f144-0905-ef6d-77a4-4d6f6c832582":{"name":"tail","type":"bone","keyframes":[{"channel":"rotation","data_points":[{"x":"-10.0374230459","y":"-4.9238497548","z":"0.870384675"}],"uuid":"b62ac8a4-efef-23b6-71bd-ecbfd6c13431","time":0.12,"color":-1,"interpolation":"linear"},{"channel":"rotation","data_points":[{"x":"0","y":"0","z":"0"}],"uuid":"303a465c-d181-26bc-48d3-a41ff92f8c26","time":0,"color":-1,"interpolation":"linear"},{"channel":"rotation","data_points":[{"x":"-12.5462389525","y":"4.8811889482","z":"-1.08482395"}],"uuid":"0e612eb6-23db-4b47-8412-eb2785018bd7","time":0.84,"color":-1,"interpolation":"linear"},{"channel":"rotation","data_points":[{"x":"0","y":"0","z":"0"}],"uuid":"fed0b380-5b3c-0864-56c1-75b377c7395b","time":0.24,"color":-1,"interpolation":"linear"},{"channel":"rotation","data_points":[{"x":"0","y":"0","z":"0"}],"uuid":"b5f10a67-6e22-19d1-25b6-ca94d7613fec","time":0.72,"color":-1,"interpolation":"linear"},{"channel":"rotation","data_points":[{"x":"0","y":"0","z":"0"}],"uuid":"9a91e2da-a5a3-8d02-b1a3-82bd0ba78809","time":0.96,"color":-1,"interpolation":"linear"}]}}}]} \ No newline at end of file diff --git a/src/main/resources/assets/overdrive_that_matters/models/bread_monster.java b/src/main/resources/assets/overdrive_that_matters/models/bread_monster.java new file mode 100644 index 000000000..68d1a5f1f --- /dev/null +++ b/src/main/resources/assets/overdrive_that_matters/models/bread_monster.java @@ -0,0 +1,49 @@ +// Made with Blockbench 4.12.3 +// Exported for Minecraft version 1.17 or later with Mojang mappings +// Paste this class into your mod and generate all required imports + + +public class bread_monster extends EntityModel { + // This layer location should be baked with EntityRendererProvider.Context in the entity renderer and passed into this model's constructor + public static final ModelLayerLocation LAYER_LOCATION = new ModelLayerLocation(new ResourceLocation("modid", "bread_monster"), "main"); + private final ModelPart root; + private final ModelPart Body; + private final ModelPart Ljaw; + private final ModelPart UJaw; + private final ModelPart tail; + + public bread_monster(ModelPart root) { + this.root = root.getChild("root"); + this.Body = this.root.getChild("Body"); + this.Ljaw = this.Body.getChild("Ljaw"); + this.UJaw = this.Body.getChild("UJaw"); + this.tail = this.Body.getChild("tail"); + } + + public static LayerDefinition createBodyLayer() { + MeshDefinition meshdefinition = new MeshDefinition(); + PartDefinition partdefinition = meshdefinition.getRoot(); + + PartDefinition root = partdefinition.addOrReplaceChild("root", CubeListBuilder.create(), PartPose.offset(0.0F, 24.0F, 0.0F)); + + PartDefinition Body = root.addOrReplaceChild("Body", CubeListBuilder.create().texOffs(0, 0).addBox(-4.0F, -3.0F, -5.0F, 8.0F, 6.0F, 6.0F, new CubeDeformation(0.0F)), PartPose.offset(0.0F, -3.0F, 0.0F)); + + PartDefinition Ljaw = Body.addOrReplaceChild("Ljaw", CubeListBuilder.create().texOffs(26, 24).addBox(-4.0F, -2.0F, -4.0F, 8.0F, 3.0F, 4.0F, new CubeDeformation(0.1F)), PartPose.offset(0.0F, 2.0F, -3.0F)); + + PartDefinition UJaw = Body.addOrReplaceChild("UJaw", CubeListBuilder.create().texOffs(0, 24).addBox(-4.0F, -2.0F, -4.0F, 8.0F, 3.0F, 5.0F, new CubeDeformation(0.1F)), PartPose.offset(0.0F, -1.0F, -3.0F)); + + PartDefinition tail = Body.addOrReplaceChild("tail", CubeListBuilder.create().texOffs(0, 12).addBox(-4.0F, -3.0F, -0.1F, 8.0F, 6.0F, 6.0F, new CubeDeformation(-0.1F)), PartPose.offset(0.0F, 0.0F, 1.0F)); + + return LayerDefinition.create(meshdefinition, 64, 64); + } + + @Override + public void setupAnim(Entity entity, float limbSwing, float limbSwingAmount, float ageInTicks, float netHeadYaw, float headPitch) { + + } + + @Override + public void renderToBuffer(PoseStack poseStack, VertexConsumer vertexConsumer, int packedLight, int packedOverlay, float red, float green, float blue, float alpha) { + root.render(poseStack, vertexConsumer, packedLight, packedOverlay, red, green, blue, alpha); + } +} \ No newline at end of file diff --git a/src/main/resources/assets/overdrive_that_matters/textures/models/bread_monster/bread_monster.png b/src/main/resources/assets/overdrive_that_matters/textures/models/bread_monster/bread_monster.png new file mode 100644 index 0000000000000000000000000000000000000000..5409452a514051d225a868bcf07c4c7213c9a5bb GIT binary patch literal 1160 zcmV;31b6$1P)Px(LPzH}|8q#LP>UGRK z+~6!9I*4P9IuuF=^ixW0LnFyMzR@m7sqKb8_{H_Kqjm=x0ea&BAT96V`Fj0Y-`F|8 zz{%tEZ{j%UjJH}g(E#7dv9|=%Z7`Rw)Xlt}-(S48Tps%G&|gmF*vH>>LyZM%Lcdwe z`r0MUMUV3$K*+3>0RXFE5#ARi`aqR9u%j7FO|X4RpIQCMD50e~8xmiM5B zMTELU6aegIYMs#0BOufz;;)K^OCsm!@NNdnjQrD$v)Z|fl4WL}dsZ}UC)=azYk{xh zpP;ALi$xEQkWZjjBiyD0ZHpn2AM`Zi1UF&nfXrGM%S$ST_Nz78Uw`i=#b<@(be57^ z@a8M{$K)ANfzoEhb=98{+iGyI+h5oIa?oFs7~O0<0C4k9V;TVT^m>t5E2EU$YFe^V z8QdglEQt7U%2B(6Af>jU#)8PKl@Dijw2SKcMw_(K${%R}f$r92vOXfJx{tdU%|>D4~?xGVNo;iKh>^SQyUO+ z`3mjl&F^9vfY)GH`Hau>T_+->- zFti<~I@hk8(8#@+)@W6&VW|Y|PJY`(_vf8QF0?EiU={)GtOL}ri2we5b>zQe>Hsws ztc!p`=>Ub&LEBGt%x1rpHHfJLmX}oO1ajfckyigZhU1+dPHE#~Bicf8nyzhfzmS~P z?)-dR)3?pdX1FWE-y?GVOI$wh$IQbGj$CuInU>`sfgFqD&CHV%qDIERAa)uh#%O@Y zSAFYH6d4Q2Y3<3=KQViI9t+87O;Kb3!1&k*bpmM}68bkQ7&_vkbgBgVPk)0S?QsUQfXRutrYJJ*-haYP zPQ*0;xH^^K#>Ymq)0c7>+HWj#o%RnA27|$1Fc=I5gTY`h7z_r3!C){L3 Date: Wed, 26 Feb 2025 01:33:39 +0500 Subject: [PATCH 02/15] I don't know if this is relevant, the modded entity does not contain animation data and this one might be specific to blockbench --- .../models/bread_monster.animation.json | 98 +++++++++++++++++++ 1 file changed, 98 insertions(+) create mode 100644 src/main/resources/assets/overdrive_that_matters/models/bread_monster.animation.json diff --git a/src/main/resources/assets/overdrive_that_matters/models/bread_monster.animation.json b/src/main/resources/assets/overdrive_that_matters/models/bread_monster.animation.json new file mode 100644 index 000000000..5f5ed8ce2 --- /dev/null +++ b/src/main/resources/assets/overdrive_that_matters/models/bread_monster.animation.json @@ -0,0 +1,98 @@ +{ + "format_version": "1.8.0", + "animations": { + "idle": { + "loop": true, + "animation_length": 1.44, + "bones": { + "Body": { + "rotation": { + "0.0": [0, -2.5, 0], + "0.72": [0, 3.33, 0], + "1.44": [0, -2.5, 0] + } + }, + "Ljaw": { + "rotation": { + "0.0": [2.5, 0, 0], + "0.72": [5, 0, 0], + "1.44": [2.5, 0, 0] + } + }, + "UJaw": { + "rotation": { + "0.0": [-2.5, 0, 0], + "0.72": [-5, 0, 0], + "1.44": [-2.5, 0, 0] + } + }, + "tail": { + "rotation": { + "0.0": [0, 5, 0], + "0.72": [0, -7.5, 0], + "1.44": [0, 5, 0] + } + } + } + }, + "move": { + "loop": true, + "animation_length": 1.44, + "bones": { + "root": { + "position": { + "0.0": [1, 0, 2], + "0.12": [0, 5, -1], + "0.24": [-1, 0, -1], + "0.72": [-2, 0, 2], + "0.84": [0, 5, -1], + "0.96": [1, 0, -1], + "1.44": [1, 0, 2] + } + }, + "Body": { + "rotation": { + "0.0": [0, 0, 0], + "0.12": [7.52832, 4.95712, 0.65426], + "0.2": [12.50944, 1.65237, 0.21809], + "0.24": [0, 0, 0], + "0.72": [0, 0, 0], + "0.84": [7.52832, -4.95712, -0.65426], + "0.92": [15.01888, -3.30474, -0.43618], + "0.96": [0, 0, 0] + } + }, + "Ljaw": { + "rotation": { + "0.0": [0, 0, 0], + "0.12": [25, 0, 0], + "0.32": [0, 0, 0], + "0.72": [0, 0, 0], + "0.84": [25, 0, 0], + "1.04": [0, 0, 0] + } + }, + "UJaw": { + "rotation": { + "0.0": [0, 0, 0], + "0.12": [-25, 0, 0], + "0.32": [0, 0, 0], + "0.72": [0, 0, 0], + "0.84": [-30, 0, 0], + "1.04": [0, 0, 0] + } + }, + "tail": { + "rotation": { + "0.0": [0, 0, 0], + "0.12": [-10.03742, -4.92385, 0.87038], + "0.24": [0, 0, 0], + "0.72": [0, 0, 0], + "0.84": [-12.54624, 4.88119, -1.08482], + "0.96": [0, 0, 0] + } + } + } + } + } +} \ No newline at end of file From e3efc88d83746f0b82324be938ffb7d8e3754479 Mon Sep 17 00:00:00 2001 From: GearShocky Date: Wed, 26 Feb 2025 05:08:14 +0500 Subject: [PATCH 03/15] Hull --- .../mc/otm/datagen/blocks/BlockModels.kt | 15 +++++++++++---- .../mc/otm/datagen/blocks/BlockStates.kt | 6 ++++++ .../mc/otm/datagen/items/ItemModels.kt | 6 ++++++ .../dbotthepony/mc/otm/datagen/lang/English.kt | 1 + .../mc/otm/datagen/loot/DecorativeLoot.kt | 2 ++ .../mc/otm/datagen/loot/MachineLoot.kt | 1 + .../mc/otm/datagen/tags/MineableTags.kt | 1 + .../otm/block/tech/BlackHoleGeneratorBlock.kt | 3 ++- .../dbotthepony/mc/otm/block/tech/HatchBlock.kt | 4 +++- .../ru/dbotthepony/mc/otm/registry/MNames.kt | 1 + .../dbotthepony/mc/otm/registry/game/MBlocks.kt | 15 ++++++++++++--- .../mc/otm/registry/game/MCreativeTabs.kt | 1 + .../dbotthepony/mc/otm/registry/game/MItems.kt | 1 + .../textures/block/energy_input_hatch.png | Bin 492 -> 489 bytes .../textures/block/energy_output_hatch.png | Bin 499 -> 496 bytes .../textures/block/item_input_hatch.png | Bin 0 -> 476 bytes .../textures/block/item_output_hatch.png | Bin 0 -> 476 bytes .../textures/block/matter_input_hatch.png | Bin 492 -> 489 bytes .../textures/block/matter_output_hatch.png | Bin 499 -> 497 bytes .../block/{hatch.png => tritanium_hull.png} | Bin 460 -> 462 bytes .../textures/item/salvaged_android_arm.png | Bin 0 -> 585 bytes 21 files changed, 48 insertions(+), 9 deletions(-) create mode 100644 src/main/resources/assets/overdrive_that_matters/textures/block/item_input_hatch.png create mode 100644 src/main/resources/assets/overdrive_that_matters/textures/block/item_output_hatch.png rename src/main/resources/assets/overdrive_that_matters/textures/block/{hatch.png => tritanium_hull.png} (70%) create mode 100644 src/main/resources/assets/overdrive_that_matters/textures/item/salvaged_android_arm.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 28e75c3a4..3e5ae73c2 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 @@ -23,16 +23,23 @@ fun addBlockModels(provider: MatteryBlockModelProvider) { cubeAll(MBlocks.FLYWHEEL_HOUSING) column(MBlocks.FLYWHEEL_BEARING, "block/flywheel_bearing","block/flywheel_bearing_top") column(MBlocks.FLYWHEEL_SHAFT, "block/flywheel_shaft","block/flywheel_shaft_top") + orientable(MBlocks.FLYWHEEL_BATTERY,"block/flywheel_housing","block/flywheel_controller") column(MBlocks.GENERATOR_BLOCK, "block/generator_block","block/generator_block_top") + cubeAll(MBlocks.ENERGY_INPUT_INTERFACE) cubeAll(MBlocks.ENERGY_OUTPUT_INTERFACE) - orientable(MBlocks.MATTER_INPUT_HATCH,"block/hatch","block/matter_input_hatch") - orientable(MBlocks.MATTER_OUTPUT_HATCH,"block/hatch","block/matter_output_hatch") + cubeAll(MBlocks.TRITANIUM_HULL) - orientable(MBlocks.ENERGY_INPUT_HATCH,"block/hatch","block/energy_input_hatch") - orientable(MBlocks.ENERGY_OUTPUT_HATCH,"block/hatch","block/energy_output_hatch") + orientable(MBlocks.MATTER_INPUT_HATCH,"block/tritanium_hull","block/matter_input_hatch") + orientable(MBlocks.MATTER_OUTPUT_HATCH,"block/tritanium_hull","block/matter_output_hatch") + + orientable(MBlocks.ENERGY_INPUT_HATCH,"block/tritanium_hull","block/energy_input_hatch") + orientable(MBlocks.ENERGY_OUTPUT_HATCH,"block/tritanium_hull","block/energy_output_hatch") + + orientable(MBlocks.ITEM_INPUT_HATCH,"block/tritanium_hull","block/item_input_hatch") + orientable(MBlocks.ITEM_OUTPUT_HATCH,"block/tritanium_hull","block/item_output_hatch") cable("crude_energy_cable", "block/power_cable_0", powered = true) cable("regular_energy_cable", "block/power_cable_1", 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 480e06e0e..020ff3dcb 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 @@ -338,14 +338,20 @@ fun addBlockStates(provider: MatteryBlockStateProvider) { provider.block(MBlocks.FLYWHEEL_HOUSING) provider.block(MBlocks.FLYWHEEL_BEARING) provider.block(MBlocks.FLYWHEEL_SHAFT) + provider.block(MBlocks.FLYWHEEL_BATTERY) provider.block(MBlocks.GENERATOR_BLOCK) provider.block(MBlocks.ENERGY_INPUT_INTERFACE) provider.block(MBlocks.ENERGY_OUTPUT_INTERFACE) + provider.block(MBlocks.TRITANIUM_HULL) + provider.block(MBlocks.ENERGY_INPUT_HATCH) provider.block(MBlocks.ENERGY_OUTPUT_HATCH) provider.block(MBlocks.MATTER_INPUT_HATCH) provider.block(MBlocks.MATTER_OUTPUT_HATCH) + + provider.block(MBlocks.ITEM_INPUT_HATCH) + provider.block(MBlocks.ITEM_OUTPUT_HATCH) } 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 497866bfb..7bb327323 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 @@ -237,6 +237,9 @@ fun addItemModels(provider: MatteryItemModelProvider) { provider.block(MItems.FLYWHEEL_HOUSING) provider.block(MItems.FLYWHEEL_BEARING) provider.block(MItems.FLYWHEEL_SHAFT) + provider.block(MItems.FLYWHEEL_BATTERY) + + provider.block(MItems.TRITANIUM_HULL) provider.block(MItems.GENERATOR_BLOCK) provider.block(MItems.ENERGY_INPUT_INTERFACE) @@ -248,6 +251,9 @@ fun addItemModels(provider: MatteryItemModelProvider) { provider.block(MItems.MATTER_INPUT_HATCH) provider.block(MItems.MATTER_OUTPUT_HATCH) + provider.block(MItems.ITEM_INPUT_HATCH) + provider.block(MItems.ITEM_OUTPUT_HATCH) + MItems.TRITANIUM_ANVIL.values.forEach { provider.blocks(it) } for ((color, item) in MItems.CARGO_CRATE_MINECARTS) { 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 45f548eb3..fbc70d0f5 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 @@ -550,6 +550,7 @@ private fun blocks(provider: MatteryLanguageProvider) { add(MBlocks.BLACK_HOLE, "Local Anomalous Spacetime Dilation Singular Point") add(MBlocks.BLACK_HOLE_GENERATOR, "Matter Acceleration Power Generator") + add(MBlocks.TRITANIUM_HULL, "Tritanium Hull") add(MBlocks.FLYWHEEL_SHAFT, "Flywheel Shaft") add(MBlocks.FLYWHEEL_SHAFT, "desc", "Placed between bearings, safe for decoration") 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 53b969cc1..1a8f5a75b 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 @@ -35,6 +35,8 @@ fun addDecorativeLoot(lootTables: LootTables) { lootTables.dropsSelf(MBlocks.METAL_MESH) { condition(ExplosionCondition.survivesExplosion()) } lootTables.dropsSelf(MBlocks.METAL_RAILING) { condition(ExplosionCondition.survivesExplosion()) } + lootTables.dropsSelf(MBlocks.METAL_JUNK) { 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/data/kotlin/ru/dbotthepony/mc/otm/datagen/loot/MachineLoot.kt b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/loot/MachineLoot.kt index f82416f55..f16a422bd 100644 --- a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/loot/MachineLoot.kt +++ b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/loot/MachineLoot.kt @@ -58,6 +58,7 @@ fun addMachineLoot(lootTables: LootTables) { lootTables.tile(MBlocks.MATTER_CAPACITOR_BANK.values) lootTables.tile(MBlocks.MATTER_BOTTLER.values) + lootTables.tile(MBlocks.TRITANIUM_HULL) lootTables.tile(MBlocks.BLACK_HOLE_GENERATOR) lootTables.tile(MBlocks.FLYWHEEL_BATTERY) 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 48cd4aada..3c073cf2c 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 @@ -64,6 +64,7 @@ fun addMineableTags(tagsProvider: TagsProvider) { MBlocks.FLUID_TANK, *MBlocks.ANDROID_CHARGER.values.toTypedArray(), + MBlocks.TRITANIUM_HULL, MBlocks.BLACK_HOLE_GENERATOR, MBlocks.MATTER_INJECTOR, MBlocks.ANTIMATTER_INJECTOR, diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/block/tech/BlackHoleGeneratorBlock.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/block/tech/BlackHoleGeneratorBlock.kt index 857f013a5..b52cd2e81 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/block/tech/BlackHoleGeneratorBlock.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/block/tech/BlackHoleGeneratorBlock.kt @@ -5,6 +5,7 @@ import net.minecraft.core.SectionPos import net.minecraft.world.item.context.BlockPlaceContext import net.minecraft.world.level.Level import net.minecraft.world.level.block.EntityBlock +import net.minecraft.world.level.block.SoundType import net.minecraft.world.level.block.entity.BlockEntity import net.minecraft.world.level.block.entity.BlockEntityTicker import net.minecraft.world.level.block.entity.BlockEntityType @@ -17,7 +18,7 @@ import ru.dbotthepony.mc.otm.core.math.BlockRotationFreedom import ru.dbotthepony.mc.otm.core.math.plus import ru.dbotthepony.mc.otm.core.math.times -class BlackHoleGeneratorBlock : RotatableMatteryBlock(Properties.of().mapColor(MapColor.METAL).requiresCorrectToolForDrops().destroyTime(2.5f).explosionResistance(160.0f)), EntityBlock { +class BlackHoleGeneratorBlock : RotatableMatteryBlock(Properties.of().mapColor(MapColor.METAL).sound(SoundType.NETHERITE_BLOCK).requiresCorrectToolForDrops().destroyTime(2.5f).explosionResistance(160.0f)), EntityBlock { override fun newBlockEntity(blockPos: BlockPos, blockState: BlockState): BlockEntity { return BlackHoleGeneratorBlockEntity(blockPos, blockState) } diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/block/tech/HatchBlock.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/block/tech/HatchBlock.kt index 6a9871af4..d0b1cd89c 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/block/tech/HatchBlock.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/block/tech/HatchBlock.kt @@ -5,6 +5,7 @@ import net.minecraft.core.BlockPos import net.minecraft.world.item.context.BlockPlaceContext import net.minecraft.world.level.Level import net.minecraft.world.level.block.EntityBlock +import net.minecraft.world.level.block.SoundType import net.minecraft.world.level.block.entity.BlockEntity import net.minecraft.world.level.block.entity.BlockEntityTicker import net.minecraft.world.level.block.entity.BlockEntityType @@ -14,7 +15,8 @@ import ru.dbotthepony.mc.otm.block.RotatableMatteryBlock import ru.dbotthepony.mc.otm.block.entity.MatteryBlockEntity import ru.dbotthepony.mc.otm.core.TranslatableComponent -class HatchBlock(val factory: BlockEntityType.BlockEntitySupplier, val needsTicking: Boolean = false) : RotatableMatteryBlock(Properties.of().mapColor(MapColor.METAL).requiresCorrectToolForDrops().destroyTime(2.5f).explosionResistance(80.0f)), EntityBlock { +class HatchBlock(val factory: BlockEntityType.BlockEntitySupplier, val needsTicking: Boolean = false) : RotatableMatteryBlock(Properties.of().mapColor(MapColor.METAL).sound( + SoundType.VAULT).requiresCorrectToolForDrops().destroyTime(2.5f).explosionResistance(80.0f)), EntityBlock { override fun newBlockEntity(blockPos: BlockPos, blockState: BlockState): BlockEntity { return factory.create(blockPos, blockState) } 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 12b1734de..471998b09 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/registry/MNames.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/registry/MNames.kt @@ -32,6 +32,7 @@ object MNames { const val MATTER_OUTPUT_HATCH = "matter_output_hatch" const val PAINTER = "painter" const val MATTER_ENTANGLER = "matter_entangler" + const val TRITANIUM_HULL = "tritanium_hull" // blocks const val ANDROID_STATION = "android_station" 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 1fd3cd3fd..607306746 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 @@ -214,9 +214,18 @@ object MBlocks { val DEV_CHEST: DevChestBlock by registry.register(MNames.DEV_CHEST) { DevChestBlock() } val BLACK_HOLE_GENERATOR by registry.register(MNames.BLACK_HOLE_GENERATOR) { BlackHoleGeneratorBlock() } - val MATTER_INJECTOR by registry.register(MNames.MATTER_INJECTOR) { RotatableMatteryBlock(BlockBehaviour.Properties.of().mapColor(MapColor.METAL).requiresCorrectToolForDrops().destroyTime(2.5f).explosionResistance(160.0f)) } - val ANTIMATTER_INJECTOR by registry.register(MNames.ANTIMATTER_INJECTOR) { RotatableMatteryBlock(BlockBehaviour.Properties.of().mapColor(MapColor.METAL).requiresCorrectToolForDrops().destroyTime(2.5f).explosionResistance(160.0f)) } - val HIGH_ENERGY_PARTICLE_COLLECTOR by registry.register(MNames.HIGH_ENERGY_PARTICLE_COLLECTOR) { RotatableMatteryBlock(BlockBehaviour.Properties.of().mapColor(MapColor.METAL).requiresCorrectToolForDrops().destroyTime(2.5f).explosionResistance(160.0f)) } + + val TRITANIUM_HULL by registry.register(MNames.TRITANIUM_HULL) { Block( + BlockBehaviour.Properties.of() + .mapColor(MapColor.COLOR_LIGHT_BLUE) + .sound(SoundType.VAULT) + .requiresCorrectToolForDrops() + .explosionResistance(80f) + .destroyTime(2.5f) + ) } + val MATTER_INJECTOR by registry.register(MNames.MATTER_INJECTOR) { RotatableMatteryBlock(BlockBehaviour.Properties.of().mapColor(MapColor.METAL).sound(SoundType.NETHERITE_BLOCK).requiresCorrectToolForDrops().destroyTime(2.5f).explosionResistance(160.0f)) } + val ANTIMATTER_INJECTOR by registry.register(MNames.ANTIMATTER_INJECTOR) { RotatableMatteryBlock(BlockBehaviour.Properties.of().mapColor(MapColor.METAL).sound(SoundType.NETHERITE_BLOCK).requiresCorrectToolForDrops().destroyTime(2.5f).explosionResistance(160.0f)) } + val HIGH_ENERGY_PARTICLE_COLLECTOR by registry.register(MNames.HIGH_ENERGY_PARTICLE_COLLECTOR) { RotatableMatteryBlock(BlockBehaviour.Properties.of().mapColor(MapColor.METAL).sound(SoundType.NETHERITE_BLOCK).requiresCorrectToolForDrops().destroyTime(2.5f).explosionResistance(160.0f)) } val ITEM_INPUT_HATCH by registry.register(MNames.ITEM_INPUT_HATCH) { HatchBlock(ItemHatchBlockEntity::input) } val ITEM_OUTPUT_HATCH by registry.register(MNames.ITEM_OUTPUT_HATCH) { HatchBlock(ItemHatchBlockEntity::output) } val ENERGY_INPUT_HATCH by registry.register(MNames.ENERGY_INPUT_HATCH) { HatchBlock(EnergyHatchBlockEntity::input, true) } diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/registry/game/MCreativeTabs.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/registry/game/MCreativeTabs.kt index 5e979ea79..d9e992463 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/registry/game/MCreativeTabs.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/registry/game/MCreativeTabs.kt @@ -185,6 +185,7 @@ private fun addMainCreativeTabItems(consumer: CreativeModeTab.Output) { accept(MItems.GENERATOR_BLOCK) + accept(MItems.TRITANIUM_HULL) accept(MItems.BLACK_HOLE_GENERATOR) accept(MItems.MATTER_INJECTOR) accept(MItems.ANTIMATTER_INJECTOR) 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 4719fdd34..6fa3d2410 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 @@ -158,6 +158,7 @@ object MItems { val PAINTER: BlockItem by registry.register(MNames.PAINTER) { BlockItem(MBlocks.PAINTER, DEFAULT_PROPERTIES) } val MATTER_ENTANGLER: BlockItem by registry.register(MNames.MATTER_ENTANGLER) { BlockItem(MBlocks.MATTER_ENTANGLER, DEFAULT_PROPERTIES) } + val TRITANIUM_HULL by registry.register(MNames.TRITANIUM_HULL) { BlockItem(MBlocks.TRITANIUM_HULL, DEFAULT_PROPERTIES) } val BLACK_HOLE_GENERATOR by registry.register(MNames.BLACK_HOLE_GENERATOR) { BlockItem(MBlocks.BLACK_HOLE_GENERATOR, DEFAULT_PROPERTIES) } val MATTER_INJECTOR by registry.register(MNames.MATTER_INJECTOR) { BlockItem(MBlocks.MATTER_INJECTOR, DEFAULT_PROPERTIES) } val ANTIMATTER_INJECTOR by registry.register(MNames.ANTIMATTER_INJECTOR) { BlockItem(MBlocks.ANTIMATTER_INJECTOR, DEFAULT_PROPERTIES) } diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/energy_input_hatch.png b/src/main/resources/assets/overdrive_that_matters/textures/block/energy_input_hatch.png index 1c015fbd753f3d811c990a5516725d767bfb9585..c147872cc468dd4e84fe583a6636232bd384a6e8 100644 GIT binary patch delta 133 zcmV;00DAxI1L*^>Yyo{}Nkl2GXwHjMeo!A0000s0ZvlUANkls-gSM;OSA@N{tuk+__kAR>~IARr>bki@3ODxjJ1MoLO5 zi6>>oR7S^*3e642duAG2M@vYuEDB>h805y*mLZU=&CD#^valiHz|sd@4{x#RUT%C~ huu0UwTk)KL2m=GVlzQAv4u=$weV(pYyo{}Nkl2GXwHjMeo!A0000s0ZvlUANkl)`iNkl)=eNkl0#q7lSa?0ZF5fYO$k08f0s%EfzO#g#B@D{zvl- Z>I8e96ebayS<3(b002ovPDHLkV1iW8Fed;2 diff --git a/src/main/resources/assets/overdrive_that_matters/textures/item/salvaged_android_arm.png b/src/main/resources/assets/overdrive_that_matters/textures/item/salvaged_android_arm.png new file mode 100644 index 0000000000000000000000000000000000000000..4735392b4e2d59c730287ff7d1f1f07a6cc0da7a GIT binary patch literal 585 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJV{wqX6T`Z5GB1G~mUKs7M+SzC z{oH>NS%G|;0G|-ogoK3p`uf=XD!IesvJDxTz@ZQYWM{UsfW@nsj7&tH* z%~A%S)C6`07NAN4BVz-`1rSp~HnJ{&m^1~*1_36ZxlCY{L6#Ok7F3s^fdNQ%xyHVA zzeNwe0Wv3ex;Tbt1l#sAiXB$qaCSV}R=RHSo&W2&-4iR?#x-zri{maROYchc=su{;>~%H=zU^dkG7t_!y3`2#QtGk z0(YqHnl8@9jm_bcR?H1vCzBgqVbK_Av30i_i>;7Y-~*Kf=KoWUO@HySYgQaXoa*#* ae;A%U;})6zbIJseJ3U?fT-G@yGywpOc&mH> literal 0 HcmV?d00001 From 3fd06889da41659fb0730ca6812c149cf282f4ff Mon Sep 17 00:00:00 2001 From: GearShocky Date: Wed, 26 Feb 2025 15:41:57 +0500 Subject: [PATCH 04/15] regen essence storage colored textures --- color datagen/essence_storage.sh | 3 +++ .../otm/datagen/recipes/MultiblockRecipes.kt | 6 ++++++ .../textures/block/essence_storage/black.png | Bin 1331 -> 1941 bytes .../textures/block/essence_storage/blue.png | Bin 1331 -> 1941 bytes .../textures/block/essence_storage/brown.png | Bin 1331 -> 1941 bytes .../textures/block/essence_storage/cyan.png | Bin 1331 -> 1941 bytes .../textures/block/essence_storage/gray.png | Bin 1331 -> 1941 bytes .../textures/block/essence_storage/green.png | Bin 1331 -> 1941 bytes .../block/essence_storage/light_blue.png | Bin 1331 -> 1941 bytes .../block/essence_storage/light_gray.png | Bin 1331 -> 1941 bytes .../textures/block/essence_storage/lime.png | Bin 1331 -> 1941 bytes .../block/essence_storage/magenta.png | Bin 1331 -> 1941 bytes .../textures/block/essence_storage/orange.png | Bin 1331 -> 1941 bytes .../textures/block/essence_storage/pink.png | Bin 1331 -> 1941 bytes .../textures/block/essence_storage/purple.png | Bin 1331 -> 1941 bytes .../textures/block/essence_storage/red.png | Bin 1331 -> 1941 bytes .../textures/block/essence_storage/white.png | Bin 1326 -> 1936 bytes .../textures/block/essence_storage/yellow.png | Bin 1331 -> 1941 bytes 18 files changed, 9 insertions(+) create mode 100644 color datagen/essence_storage.sh diff --git a/color datagen/essence_storage.sh b/color datagen/essence_storage.sh new file mode 100644 index 000000000..bc868578e --- /dev/null +++ b/color datagen/essence_storage.sh @@ -0,0 +1,3 @@ +#!/bin/bash + +node ./base_with_mask.js block/essence_storage block/essence_storage_mask essence_storage diff --git a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/recipes/MultiblockRecipes.kt b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/recipes/MultiblockRecipes.kt index 224df8dea..9ba54c635 100644 --- a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/recipes/MultiblockRecipes.kt +++ b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/recipes/MultiblockRecipes.kt @@ -123,6 +123,12 @@ fun addMultiblockRecipes(consumer: RecipeOutput) { .row(MItems.MATTER_CAPACITOR_PARTS, Tags.Items.GEMS_DIAMOND, MItems.MATTER_CAPACITOR_PARTS) .build(consumer) + MatteryRecipe(MItems.TRITANIUM_HULL, count = 4, category = machinesCategory) + .row(MItemTags.TRITANIUM_PLATES, MItemTags.IRON_PLATES, MItemTags.TRITANIUM_PLATES) + .row(MItemTags.IRON_PLATES, MItems.MECHANICAL_PARTS, MItemTags.IRON_PLATES) + .row(MItemTags.TRITANIUM_PLATES, MItemTags.IRON_PLATES, MItemTags.TRITANIUM_PLATES) + .build(consumer) + MatteryRecipe(MItems.MATTER_INJECTOR, category = machinesCategory) .row(MItemTags.ADVANCED_CIRCUIT, MItems.MATTER_TRANSFORM_MATRIX, MItemTags.ADVANCED_CIRCUIT) .row(MItemTags.DILITHIUM_GEMS, MItems.MACHINE_FRAME, MItemTags.DILITHIUM_GEMS) diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/essence_storage/black.png b/src/main/resources/assets/overdrive_that_matters/textures/block/essence_storage/black.png index 0c76753ceec6ee199d190e44c99870d17ac3b2e0..4a94e8d1ef962464feca93130155367d8407808c 100644 GIT binary patch literal 1941 zcmZ{l4Ny~87ROJ5F@lO%F-4G%DkAbBFCmE#SfG~FB!&YEtdrf|wq3@T}<*-F-MsGbu?0>W(Ca~hr|}%w@g8 z+H;mUm+AZPPi$()akA+%*P4Plhkvn5=GQtwy+T;j%Z0%Jr!f1;pBK&#|6(QIRMeL7 zw}>WFy=8gIc=DGoHZmoj;XF+On+e2MrF{7LEb#kvrYFy({ITzxxMij`y}AZfT4>Cfkz6Kjw!C~y8OuDwEJzBlK%a3 z6&`~V=c-$rlLHE%bg+J(L%Eq5aP_P3Wh%zh5x=U0xc`W{E~LkmV$ewBdA7p*IYixsz8oIvT*f z(euOg^NZkyqtAJEUSxKdrpKdwPH$#DFQY!|n?pSZsWYCq(9~xY(oG zL0^X5be>6KE`te9#BV01FP=4>&mghwQWLZBzj~!cpGB`$h*e&K)!fxQASY=R8)gv& z#S5kw))!rE1k3uOQw@o27nAg1PAlU>LrC-s#ihte3s4!>w_$Jc-oqqZL5nxiX&PE9 zN;PVU10HD|NCgLSLsVR$h);>QJb#K3QPfF>xb!zbrXfwQ+i3#?ffO&0D^PJM5uY#O zhrR&HzKg0LfbYx`Xnm$Oht_0f&oDgUG{Y6~gfEyK&EbxOS!iRl1$v$6HN$p;F(F%% zss-+XI;NBq7tIvKL=mgg64xFxc*<;_PW@xKbp>Dx7{hC0jXFK-M&`6 F_x~Y?-!=dM delta 1247 zcmZ{ic}&v>6vyAM&>RYl*;6ae^~~L4pI7flST7YB4BYywxn(vOo6nO9c7C((_){X#oC2Of_n5C{4LI~1Aklu^ngNrt!L|2ZY z`h1!{LwC{&Wvo2}tDVtTT9EB^DW9{wztnPMIXv0*^NW7`|#5WH*QN`DkRSbuy zCQH6nOEk>A5-!^>V~M5AVjwRkiJ5kf9VE_;@H4Er-*4y?GQ zo|$7caSIYx+Ix?*n47JytxA6JE}ih1IGsFgNw*SR<(bhHTYZ}aiMDyfi6^hz14T!x z3NK4+idT5~?CNjqku9zgT?=(GAO|dZ43*tPM0!t0_U80{D$N`+cO=>P2g0uGZ1qgV zW&^^^d}(3UYGdNgq>LEX#`M~1Z`7X@MG!eGc5*-Rj@~`7>`JHR-99A=0yVriKb+sTH3oiZ8q-vk8 zemc12psM*Hzns~!H$~WC*E%fgKcF7_LK?ko+0hq~6KjVH7QT#>&uShI9K89*p1$Dm z+~3o@G%oj)wa<*gW*#l|N|Ci63oZX8D7hMLkR~OUTplT_N3{8qj?`o8ZZv$F9+XVx zzLCCGZ<}21BVteQv`roD7!`h~?0nhCnwq(;%`cHhevtc1Eb5IE%^8Dgx>Q>!-G|9# z_pJovnaEq|pGN8yX33qkHI&&T_vdr-M=v`Mb%-rWtQl$L_xhHof>iS+U-(@3f;>e$D z-On!*2lB=7G2#SH-0lS30yol)y^3V%#AA7K$j@3qk{puUUoL;~A3&HIpR_&m{{h-v wKbLSF;rdU6I7yfw62}PB{)OCmEEb1Na@@$jQ#c%})j9^afuR9SeuBe)0nwl;YXATM diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/essence_storage/blue.png b/src/main/resources/assets/overdrive_that_matters/textures/block/essence_storage/blue.png index 90cc6fa92a3b12c84c07db7b33cf066fd788d08e..9d8f5d85f28cdeb0dba48d64238000db5c13b902 100644 GIT binary patch literal 1941 zcmZ{l3s6(n7KT@XF@lO%kx~@279#?YlaNFR6sRRN!4LwZ_yU^%iG&KlaCms}O7Kx0 z@+zg82$qzAwg^(Bj#?fH*lMel3tn5nmKLugQg5wRt?e!1x;xl1)6VqFth3f$>;Kl- zXYV=t6e|^L=Q_AK0Ki1t8%deQ0kSB7 z+iC!@8Q|HB+K%X800v(vS4oIKC=~km__(;Za5x;J(daL%@#9tG=jZ!!_pS8KQ>j#H zwR$u9x2#E-B2>(RLM|c%s2SO#n8wgtvN)WOU!VnAy2?*~YoIo%mXb>_H zS`dyQL?KuaP9bz4)FA{T1R+=uP9rQskRz-`cpo7YL5lEYaa#vjH3l7{h=s7RA)RfI zxNdE@qoJFMA_Myj>BdX|$39|b8FT#edP$N^%OWN0@0o56D;MQOU9|$(xyr&{Qc2J6 ztG3^KjdC^BJTx6pv_?et?p6({TC#69c((_>TU3+D7Ox(;{s^(}{_;p}S;fTt$~|3^ z{hrVCwLi1J^vxrE;jaoKFQ!;ZJvE*_t}m22ohvDAJ0uBjKhhswm2BDRV$Ye)dY-kb zgE^b&b?-$sHRw3e@TpsMZjHm&ER*@=c2F-D74-06z}G3re&W~pbA!KFAutuRq<#|8 zV5+sekT_Plb?GZ^VG)Y@Dt~iPhJH1}?LsRjVx}UDEgucgqYIDmyU40>=i}G@EFN?2V?NL4(qSJ>J#$J;= zMp{)?O_{DZ+-6Bb>gq23Yy0Q7?3G?F!*`o9btXxMvlw&CB7HEl~(x-)A(0OG47RX znw09W2Fsa65i^3X1kJ2JU+5Wn|FyziDL6A=@LVkSQ10SU#pS#U_Z?2U-*7GJ+dEs~ zF))6*s>wOQHy4TrYWFylnwh?rz6oBYVoVP=qg_P(mtT1z-LI$% za&I2^Z2iK{j(=C2OAcODx^F)nzRz#6&q_JPi8KL+Oy#(y;Ob6M-?*|8&A4QUg8 zIo_S+-M^&17E$+~OIw6PfdRp(6O%nb9$hZqeo&IcE|?r^c=Sk+;@j%DZ*{73`Pnw3 zam?eLtlGhdwM7?dO1mC3=G>jv|E%BR?4v8-=;saBo?Co(*N{HwV0r99(}gX5kAKzQ zePG0O7ymMEw0hIE4{rTPz8W~8-5}G+WZp1~3|QdCU;%?f5yTe#9^1}A zFNWPzo=IXJg9%Q=Zz85IoH3P8C9&;N6SMJuc%??4POnl(R7-`cc&qq8PSQ#?%peMi z?@uwTPrKR(mi1|;Y7*NnCh5bRQpN-Zkmz@cN0E~jpggE|{qBU_2T8b`mTaJtHMCZo zWYiJ|eA1dr`Ez*zDxOFzpu{}B4@HS7>NrDE{3jsIkgV73umM6Y#pm*bDjp>k2*iTG zr$EUMVPypHntlSUPt#`7nzW2*hA*08cw)ZjDYLyX*pV>vZHzWouM@v)*k&-sW@wVM zz?)aYl#$|s>7s-vqI9}UEe$+MMEl)2P09=ZRF2acGxdh_sRb(u6WIPZOQr>~bXsdP zWN3|=MEy2Bz2lEwf`D(GN^TRW`?NIHprdm%MlJkhPpY(8=|nj7l2a3=Q?k+$(>3~S z;=gv6r6+51f$WFw%zGxn_)ItdduDq2Wam7t{Li+%t~TuNrZdrHcY^Q0+{#NqEDu{$d=&&m9*RH} zwA6waf$2!0u$Bl66(=|&7$i9GF_D28SS<#{7k4#Fw(O7HoaE-*6^+|!n7vr~>1 z#yfmB_yRN((LP2~ix+=IFpD?Nks4+tD{r~0l+Wi2g+fF;@8R*IA|wal0zx%HETtjF^s6{A7IEZixp$y?1f*2tWAp@ZX;Q+!;gcO7*gd~JL2qg%02yF-|1O-Ap zLOQ~B1TK2>q-a%$a2cTmArs*$LNHndqD>IeFCxSs>_s?@5Q}gEL5^@1L5Uzh2t!&n z!X`9LM&O}cFxu`$&?0mqTtP@hh(kDz(2CH35Q(5hxQWn(5Q4N2q<16u;Ns0FHI$=h zK3`{TLdrn#(G>tdNWw!mfzRlJ?Vn9d@OppqEcM1%gE5itHUyYFCyZz=w&9&jX8=kM z&)=6Hc_Y9A0;mHsM^oI^NGkK09aj zE46t!*^xPAU3rK5{I{}5(#^wcfC9;Nl&~dYVm}31EaH40$NMI~UPxmEbT_%vsFj6{ zf}dJ!i5QuOY<^f_meGa2`~J&(*!`7}w~bl_-%3@2+8!dPrGPbk$=;zVd!26h3@wA% zLG7K88`0htT#9tl2xg*e4li7BHmYLGsXWkl_13%1jnC|Jyxa$3$|AM2=^ASNjAe&s z#?z|Uxd|)gc@H&OG1gaCB)xc-M)-`JNt(2w+lsI98FbZF-v(iVLk@BB*(>(|@v(~h zD^mMHS1+Gky>(rRFDt~?LKm8leb!y3>P{j&t*b3_b6PKzW(65L67AOpz^=?p?UZb@ z3Bj;(%s;rwoVYWtAcpnP-46O2#SIhlGiQPE&lyeytQmS2Q-6N4^}48rV>IHK&RF|! zi>D0Qt0w5f%k#(Ig?U*fz?N#FO(jkGb@;8Ief6CqT4qz{nvc~k)?{7YMQwAM1{J*rv`@c~M{Qer>_x=Ln!&t9FC&!Gy2pKoZvL^SCwMsf z_f#*P^F4L-m|57=BS)`fMeFg<(qDp-D&YocQFPh)k-Bn7pF6&QdVJlD+E0`H((&v! z^4HpJDA!7@Ys^#)>HS)|Twf;Nhe;*( zZG~ic#I3YXLl+kvR66OaDAS4V&u3;ox#Bd?Cb2HEW2Tng>sg{v8Y@)aSq|6<2Nzh( ztMOKIxR#}n?}G^zYiBmIy`ockc&^C*{JHMt!KW{Ez48T}x;Oo!F7J(Uoj0&Yj{eCp z{QOc$fIt!#Es5vG?v6Jsa3kF~D@nFNe6}Z-{47_JFWnh385b9s=Cp_{OI@K&5 diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/essence_storage/brown.png b/src/main/resources/assets/overdrive_that_matters/textures/block/essence_storage/brown.png index 3bfde41bf6420ec879ff4efc5e5d06be36f6efc7..1a84c2a7c66031e0c2aceac7169c3185d416b80b 100644 GIT binary patch literal 1941 zcmZ{l4Nz0p62~{e7(qp>NO>qoEh6$EHzA1-C{RmEf*}M*@e6DMB$7NK7%m?^tpq>H zhXE<2nh2IW2KtI1Md~OOP{3AOtrUDt1z%~gj!12-R;}$T;`RhBGwn>z%--Fz`~U4d z_nx`umda((a~<3q0AQ{}9F;)4C$Y#`cH}CR@2#~Z(!>d|0RQp^Fzx~Pjiij@0J#*v zZ6$!v4Dft*?Wy=M00vhsRfvdy&*%I3`MJ2bczb&r$cXmQtzK4GSg3kw>BbOGg+ifJ zDiea-5pj5U_+37~I3VC;c=);FYmXk5RuqMAMJPwuk6=I$A;=Ka2<-^<2-OJN5p)PU z5Q-4?AfzGC2%8b!L3j&cBZ3k^j*yI?LD-4#HbOJPVT2Nd8iaI&bqMotrT`%y;Q&Gt zLNUS?gd+&S2tf!T2&o832yY-1BD{vM4WSa@O@vJdWe9l)kqCN(6omH>P9T^OR0uf; zEeOXD;t;F|9SElo>JY*ZLJ=$orxBJSND-nD{(}&KAVx5C{6^j)Fz5tXB1Dc2X>60! zHPKOy`fe(YOzgA8>vI4c`-q)o%n91wOOk9_5-VbV$8>X8v1ohTRV#pV39hA!iMLirC@OKKepZInD+_2A=^Nd9;x{t#f zjJ1{*Q^!o3JzsT;jFHt>1({32&2vg-N~F~no+PDt9@Y(6)-YSvNi&X(?_`P(ZoF5- zQm@WFek1;K^C+7s1$O$JjKM)wU($vy@8vPKK5D#Kx4!Lx^}$z{b5j`~34D46lIw5T z{a4v;v5bG`^v{wXno2j-{d9c=^gRw#np^H^>Wdj&l#i2pd2;4oF|2Sf`NNT)%Ueg!jvd*o&zuO% z_wB6c{zdnCOx?GaHt~l-g2QwZlRcpxT`ph0UzWx$njC9*^oW=4}6?=bU7UTtl`=}7T?`Dqzye-k+{%!VN>AaU$u81 z7;w$Fbn+OqWG3@lPi}Z}wMIYj&2FnVoV}iTv;PA$KN_h!Sybo+{T(;+3P(o#*;l)N zx^iX#Ty^w5!_JGy4pnt~w9e|u%;)NAv%cBiy^rcxg7b~NRslVEvFWagnK0hN$#UK&C!jtJ!7)_yH6*fWudCC?St01?)n`q;u(C*=?T@o$S|G`y)dqdG z+Mr6+Zqd@){^-RE{@SVRHj%ndOB3}PI$vc_!(aBKN}ZcUgi{YWwO~3UH#0R$rQIU@ zYj;Ujy1D?!erV3TXC#c@bo0Mwrk784&g07eZQJW=!~SkL6J2&Ehz2AgSybz4<*wfW Dd`#km delta 1247 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 AI{*Lx delta 1247 zcmZ{idrXrD6vgjX=nyIe%FDNPD&VX83I(NXrXZ;06~u}~=2o79SOi-@e6}i@TB~TlU9pPI7Z@^2^Cd?inkM#i=Eh zraQcYyaDP8XrCgfg^Ru-n1!2W%Zy{2CTAq23j_j@NQ8)G?(RP-1G5n>B2*&eAcP_{ z3}G+A4TNh5)d+SXzP#kO9)X2=?G^Kq7hCYC=kvgs1Sq*AxO(Y z*o@{$2z;~;K)XE%I)rwFs|d*mF$lQ`O$eKpfk+EPdM5%87i~eAu^dG^ zeVwrxDS0Vw%K?Cph6Zm2-tz}>(n+%L`$RGA`vKCrRnc(9VO0ZH?Ly_+dwIRMbf+}9dbDCN#!7nfn+GkZ73xnH4+LsQ z3cl9K^sIClpW~Cd*jCBt&CX0z(vw0nOU4v%!r0Ri&kM=VG`ZM&-**|0-B%ud$D~R4txPSf?k4;jkFzE(J2+Nkt=A8orDZT% zsXe0#6WY7um&0AP!l?+`Lkm`(k0^cNbZ(>Rnr(Nl)jxB{_H^ryDhb!oCab8mQ&z1W z8BZ&s=ftm^>or(!W4)oWH1XB@6oNN=HgVjRZYQ}eu%@fGdDn^J9kYp(&tALvNsgB0 zU6ncHukhsU>Z$2aepxEH5xl^R>}7PAYubs>l#XWkmXsbU%?2`dBsi?|gI#jDZlZXL z8DVX+B=5lLnMBu!k{B{Xb~+l`3hPGa$!CD+&lyg~SyS{5rlD-S>87}fV>0ZKYQ65^ zR*zz6sTidXEzcWyAL3~h4_hmVX0t$QdeV%4W7iJNCP3@Cf{>z;n0h}gdL=&P{dwFAc%j)kcv^^bcG-uff0J76g5 z_he7K^F2-F3yYA6M@u}Dlufz8MZfqbmO~q9S#ZVqk*0jmkTWu$n!CQO`tx|7Y$WTg z;*DRs2iJOL;0#(>Y)jAoY%0gY2+NYx{3?+)an0WfW zorpXac01+s;H8BJR8EEp%4CAu%c)sUt~&KMOBn_B%;chb-HWvFSltA2aYz=1oSJIWUiewulV0&=MX{{hhE=leyQoZ^QAl@C55SQ`)0PU`i v^ClzV@=t^`K^!ZQMv9aFh1>*eHkU(kUCF;wxLmu{Mh5tP!M?RVqQidy#PTbp diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/essence_storage/gray.png b/src/main/resources/assets/overdrive_that_matters/textures/block/essence_storage/gray.png index 5f74405fa3d8bce73618f29d62a2efc7530dd7d1..71bdbe0e92f9776d8b8ef2988aa24412f08b4521 100644 GIT binary patch literal 1941 zcmZ{l4OEk56vyv|bApPfNQ8oBh{%V$8{34j0F~*6V+>gM1-1d3jD+EM`7lj}UwjBi zM7jya;(&!9A$imU6tJ{33CxpVQJ6<0%QQ9nK)gM};+#6i_niCQ``r8g-S>H)=e*Bb zsF1ImYUg4H08^!suxR4v5euDUL+&!g?kZ~{Q4$>i@P-F~aTmZ}BxM{1$fN-7r~rf} zfEUuMPDhCV7+i%+DJB9wpYQGM?d0U-;o)I07=o9r2z+H}Zf-6=K*Zq(D3wZ;O6B9n zMa2I8{&)HOd|%&_!NKQ`uReN6R+<;Q8KDGWAA$ivj37tQAhaOVAXFf1MMy!|hLDG_ z3n3AKM%ak(4#Haq>k(843WPWWEy8w$w-Fi;4j~jER3aoHtU;KD69ov_2>TK05%Li> zAsj&nK=4NhL`Xo0MR*e-7vWWeEeK@@dk{7t6d`0Ggd*q>;t>uboIo%ks1Y&{8WD~m zL?T!aP9dB|s74SW1R)Y$=VD6`z~VV7*qVWc9JBUmPUx#KQdkH7R}xodCdY~<17tZs+3&VU17Wa zI^}Gvd}Q1&Zwim<+@b7KHfG(a^=b)xub?u6EnG5i<1u2_g9Q=3CHqDmlm}Cq)6B_C z&-<^isb2e$+D~07aw_evhJ zIbo=HR)dxg03fiDpTWqZB0I-jq-GGEs3jH;#N8tqSE^1hEAg_T2fw8 zK^d>w-C;?BtE(@4x%u|e zM{g%5xb$qBt}WlcXzgHd2yad^-5`mm2)8V~neDWBuFoYeg+(^OIQ(^Dv}@V2dW9;q z)_it$_yp0_poujX^4&uoyq4c70Y?V(o{#Z8m@{Wker4;$2X-f2Z#oxr?V2oi>lr>% zUhf$1lLLi4RXgp9O-!H5--_ld8KVci%3`8^61HA=^65)1w3DFw%8I9wz4GcH*M^?Y zR?liZ-F!;f@bv-L)?+=%hMAAzSp%2f+24Bo7g26++(!eyl{5{W8#=O4pE}}~?bTY^ z{(H)6;nhD}-oWn*3=pM^jCKUMwK;wFK~W+*Z*-{k@nc@HPm}%bB`J=j=b8ZhKgleQ#R#3w}?sjxL0wpVwZ0an8N%eY&6nr7^RN7dQAl`9pW_p#fJ7 z%SMkuV`?0~>Eybn*DCcR-|w_|z_}Z#x4J(>)8m2alXvA zGfB*0Fu{TNb;NY}6UOo>B(`2EVpjfNuTbmK=*4oeavpy%XE7JZNm|B+2}D70{V9g! zSywB;vOMclL1OF0Bz>4;%ILrV68%GQD00#Qlm>OK-Vwj!00|e+;x%-Vn$`#t4I1Kr zOIrI<{=S?5B}X9SQ9=&ao1%mib(|qC{11?-Pts|(SOLB-#r5Uzl^jaQ;|Y0z&w!$z zLrVzYIsOD%m#WF2)v4*@3|BD5aD-gJGiGz0$eu9Mt&Ao|rxh;OZ_*oL($$F?;7qGz zN=b3%cu`Cgky>qrh6WBLp#AQiA>~>BDaUFI89II1*n$;>@~nTHx#I$98m%$t(=`Tl zf^L(J-tuoRUch$_MR$nQbzB;w*V5T)g9iS$C*_*VG$I^($*~F3$(gAMX=>dj;s3i! z(~>kfK=wm>_OOvK-s8=m&x}u>?3~-xKdsyAY{i~8osl-16GQ`2u{^A4nQF)1Y#!h8 delta 1247 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 DYJ%ah delta 1247 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 AivR!s delta 1247 zcmZ{idrXrD6vgjX=nx9!{qTX-sen_vuTW6RW_YUQ6~qEX=2l(`)*{%VqG&--P*Frs zlu`@g1g0Z}!dfCQ6rA9UK#<@7bs|GEuv!d?FYaoVY}p^XImykr$uB1-xo6B(Ca0E~ z8E*3l@d2nWqV>j+HAVk=Wa2lZ&p%p=iAV;V} zNJrR;z(Fsr6fFx7t{^lcWFcHb2tvyZXdQ_3O9*iYdl1eb#3P(QkRhB$P$2LT!jP7O zunCP*5V&X?gf_bnGzgstR}oSX5)kqcS`gY1q7hUGHxarJf{_-C^lk)iTpWQ?eL0Hy z({;`!qzIfxz6St85+1qK5@7UjWN*5}}*30YZrQ7A9HItRY3FeZMU*B&-HD7zWWGGlY zQTUZcs%7qxa@oG=ORVKq{khr6%+x-1pd=^U*SPXtud#bjF1Nc;lT=oxO7wM+IpjLL zRGFS5+q0&vD(-Ne{Z<-Hy1JVTQXr+461GH4?4v-lS%S~QM4yyb3uzVs-HmQEYDGZ< z|EFdfBCf=}WIBCu z$aq{CKQC$Je6QgKON;eY<-+H0(+Kaev%)EBx{df6&w{Sp>{BmDvd<+>K6&XDAU;xl z?5fnRV1=jmj^5fX`RC>0>!Ayc$bPFXV^t>+p4Qcx6_M6UrCCD8wq!fM0N9b0rI{{? zFd{50mmbSpZA#pkkQ1Z2*lv4WM^XLcf~+}U_;ZHSapo+&i=n$P)pA2r%{CbGNVo7C ziSj6cw#rHR=oiN(-iCRaCqYyd(W;aRe;s|pZ(DQckcQFNx%NYqixpXW^vVx)>XxaB z@qwrV>iQ9WF|%P$il}vN)fZRdTJ6j{a~qQio7L1wD^}mVFh%MW`$RrAE+vZb$Jtx)ckcFH6N!2q!T%> zWv?__CYF1P*;Cu?cRp%;Bzj-k_M(zQJNg^kHSE7D_E9uH!MY8nbu{=2BC#@h!4oU7SRy_X?AljLbyfx$h0oq+( v=Z$*8<(~*ivM5n3i4~>(3%T)FEDoFGxRQUTa5y%r^$c(WLjCJ}1&96u&s{AN diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/essence_storage/lime.png b/src/main/resources/assets/overdrive_that_matters/textures/block/essence_storage/lime.png index be42ad657302ea632b4c6f5d6c7b854f41c9a2da..3cab89547d5c2856d91de2429b047c980423e498 100644 GIT binary patch literal 1941 zcmZ{l4Ny~87ROJ5F@lOvF{LQ@QAFfJUP2Nfus|)*1VadrA}VMCBobB#hR27iE5R>5 z1f&!-5tJ+g-6BYlb^HPpaMi6=7OYdjEiKj&sjbzjwcSNLdxMo3JJUCF-Z}T2|L?r} z?wxmEu|mFTrk#r&0L+w1!efYEKrC#U4Y|t{duptSWJydUz+XH7jJpB;M^eU7fNToj zfeJum0(d*K=3I0z0E4HHDaAw}5D2`zy*V6?hlhv3V9>WaZ#vG&&(GgznG=6two<87 zsZ@%+j)*uoICxYbDD?F`9TIZ+LKK1p;S9n#gj$4PgdhYn!g+*62r`6K2!BTiMUWuWA5C3OR*gZ&$YUXFWI$^j zB&}W*Zm;j8qR7BDQ?fP-z`lprMaB&OZQUfvrlpZ$_IFGdyQOotMcuLh*f>kW-&0Di z?5VO{f17ePRzEWyl($4gckfgVD4TO0)O)oB{;jAwi!E9{bmuu@&y&TGzGeHzo>c7W z81Hp|tEcU)eWf2B>k0or5P2=tTt*hm?x?LixODAsNGN|^E8QfCtctL_cQ==_WxmffFNH-m#W?z9a*S)m zibjPhtloTKZp4(}n?Y0St`xe5KG|5t6*gQZmL5dsW0ne=lmk^5W7$7n&pNy|MD8WS_h? z$hE2OUu)*HpKCp%Z2Iz$Yx{}5RKx6NiL9aP2M)I1{xLYeKj9xkKbN%(UmQ8MNuNIE zm+RGD-uX+~#)#T)uWt|x1O^1Bjg5B&xpi>9{-h+CT`)dU|NJ>W)u+XN&+;^<@{6qo z!-(6_?3(_FRYg~;OFN!6Q(d;i`4FKe_)S`D);lCSIzQO1)qj8L+^G!2$+}B8biXEw-M6 zo(!9bJd?y+1``~JUq?(=IAtQAMq=xwB4*`Zdxct;K`)bwl?w#RxXXAzPSOfCOd$%2 z=T9*#uew?ZmgQBaDiT{SCh5bRP{srXkmxsxOOcZnpggF1&CbM~he)`X7RS>mYFZ;o zHfV?g9%=1M`TKGMlw6^RPl>oZZ;BF8)JcZ8_zfUkpQ6)lwE_ZPis#D}D7ln~&lm9n zUjZdQgq0D%bMgtaE?tvFtJ5|SIm}%V0*$iS{Y5APAhs}zgcgH%~U6A zfIF+2DJ8|(lSMI6L}|5I8XCBikoJ3co|NajQI69XvUK{4i3KYO<6HkY^Ctz;3|eE* zXKD=UB;95mz4di3e!$lbB@c+yby6Cu*V4Iag9d)LCzYD)3?iI($%zTmsoCjC8EV~T z(eJxUGg35pK=wm>;bS9VyeFIgF*7-RvU6@X|7+b|XDjwc(;4fqIYl%e70bh0R;YIV EA4rtrE&u=k delta 1247 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 E1C$Nqy#N3J delta 1247 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 F{{v0{<*5Jw delta 1247 zcmZ{idrXrD6vgjX=nyL94Zf`d0jG9fp`et_0D@9p0jyYL&hiw*BG{s$Xi=CbpvX(q zwiJX2Oh*dEwM1YjIKdIYAVI;$M5bn7wHOp%+?6cZvOjinlACjrUrtVP%gj_JryWcU zcX$VT12h)WK1EZDmVHeyio)hg^m9Lf-m~45$KweE0z|BEbNfjil!I^qp&B6TJPAzVSILnuPXL^zF5j&L49gm3~O1ECh-Ai_?B-3U<#$q0K9iV^A&+7Ofoa)bti zbc6&14tjDWXizqwUk-cAJ4*-NXJY*AiJ-e4MYhnU7`p!L~3X9bnBQZDF&*%kVKy$VZ?_xLsQ2MyO z-aP-CCrfGDhe`7eX>*zF>Sm78naZ*8^n6}(OBPZ$Q8f~0CO-A;y>?XdwZ)~wLF)0s zZ!{7ubDxCE_DQ$5l3Nbs97$rP-eCubv%`IitM2w2y9MTOdzv+g=NnYu+LH|Pi=ENT!&)HBQ>*LjzkHuYc#WM&p0uJ{i>~s_>B_C%je$~M&%0$;fmKc!(mfgmxE+RawyDe*TT0fO$0U0}zY}fn2uB~x()jT4Kq=78ZZ8IJkP8G1KES25XoU0BOD7;{fIU;ki> zdnvS6P0&Zb${T+l>S2}$TdIjRr6l>c(RcjzwY^6*jOMO&pQ@cL$@&wQer!;;PF6k} z+;T|W_<&!+Y}%J1Y@6RaEbl+4dGducYTNQ-FC)g*4WC&0Dnc=>eKc_B#vgn80!Ood zPxa6`-BDFPHwm43=-`neZ#^DT@@qhHC3KReg_oQjswzixx#Nqe$2WA=eV!bYjAy@< zzR_$OU*RQUPwuqa{kZM1@MC%Vt9sVN)OB5Mp(5g=V!gz&)-6im|T3< zT0owSxS95Oq-JTR!ckX6nND(jF*EP+Wyhg5v1OqRBempCpS@aPC|7=OHe@3hUTnIs z)>Fmin3Y6+2qc)yo!N|bS(oJS0-+%BCRuv%SneEhRx3%8Ly`wd6fge+2zSRNC1m_RK)dbZ u6s9Mf|A`PM3FAfLXkqHVkSmYH;;>1M3;A~nhhx1)&j8mi#J9mmaP%+wuq>kh diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/essence_storage/pink.png b/src/main/resources/assets/overdrive_that_matters/textures/block/essence_storage/pink.png index 1e0559b7f9df65b2763b7dfe8b1e7edbc20345b0..404d83077e57aed3632a9f963535b43e32d89b40 100644 GIT binary patch literal 1941 zcmZ`)4OCNg6u%qJ2`XYD5ek|iA|LWLwh4oPl;wtF3|RODwgH=rWW(|JFinPEdV321A-Dkju4NaLD+%tCPE{^5rhJSN`z#DwFt9tssJGy;UGdiLO#M~ zga(8F1b>7;ghYfmgf|d!5ne&qicp5I7hxkp5keM17=j)l0pVSQ69^^*6+#9=6T&fs zC;Eks|gFOc%SQ^R`7@vjEsQOTu4Lh%fA^u-$N- zayC{zG#->SM?`n+RP-yFvhLJ+wFbUZP?^CNE+4${2(kOY;z-|;{bLWxcD0Z9xIfd~ z`pmxK0}b8buka%;rI?G|Rqo!-FBChRFDh<1EDCRJ=m{@RHg9*b^_b3jp0(pNb2`)W z{)=p?&wi}-6PJpdO1rOFM$^hxP%akab#kEB$05je?DyF-gFj!wGv+m=ejHM3tTMll zI9$AG;ma;z5wew}r76cob}+?Q zzZw0xX^72~0y}v|N?)I~(W)O24{lh0_UJRMw1;%k<>l}?9f-GI!{Wt7H<%S$RK z<5jymEOAJ6^`$Sie0JMb?&&mO?zT;+Gwh9vwCOw?1<}Sj?tVw(?!p;nc_)*-$Wrz2 z&6Gr!-tDtBemX~g3J8fCubID6?kxns=e3caATDGEIt_-U+ zpPd&mCHQL4)S3(V?x7D}&F>O}BLn)*$NC=5nLi}EvhCsnyOXXroeR2mPnWs%j+`m4 zcTDiffx_OZU3SGLrqAVXf)^lc49y%TL7nWYs~gjlG|) zncH@{<&>iFt3$4B$9hu?a~>wJ1~0#Lu4K}5S%(T-WlZ9?)2^ZMM>k9a9Q&Gvhir#hCNYcUvx-QLcu z>Wf%aaIvzueY7t7-mIQy{T^o>T>?ixtG)i*{Chk4wLynUW9J$#ZuEQnyY}9w0auSm z$B#i%T0Fn`dOkqYqrvKvdAaV;bLv)B?%<#g`&!2@SI^FY zYxW*z*;%3KL8=b7=4qX2+1%7B-FN#t_ED!6;A~@;ML>^Vs=rsbE>i_X_l~zYDlZg}y`O7%VxIj+QGB!*h42tVdF)UB3 zS`{qI(@GTtTQ4T5!<=Bo1O^cFw~9lNlNO*fsB6v6gq?>7Tuh7B(#a}XEle_~i32Vv z?MwOlasm__fsjWDIb3gw5>nK0hN$pgf;4@yR&6c`gd!m_b)u?l{8sSR)X1yUcU6rH;&a6tN zge2!oCPjo1rO{-lY2Z)-+VAcelAimobe!6dq1EdqHmoR&XZ_p!)40pB_l-62%hNouTKLuacDYWUAg%GH@VLY#QXiH7Nv%(O(EO1oM3-|7-w yvN{LIJTzzDH4=^YWbyykOtw!Z=XUiE>v)~5vj1ymtlj1W;ebRW3vXVb-1!$m%;#_b delta 1247 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 delta 1247 zcmZ{ieK6Ds7{{OAvL`m{o!(nlp|`!?vXph#AgV=1+E}@+^%`kKyOQ3PxKxz9rCQsP zCS1-e%k7$QiY_`6jf{?7E;-C$wHl>2&#k$cySYE^neWUq-)H7C-}%lwg(ga)iz|)w z_jzph0I12KeF~%I+I~eaa(670=qB2>aPRUg9*-vw2oUj_v-6KKzYK)y2xSPF2!Tiq zLO6nO2caIJ0wEXSIKoAQB8005B80ODDG22V#}M`-97G63h(kDxkcUu-(1f5skRenf zBq2m2aL|n_L9=XxTL=vZsR*|be9>$hTKFLS20}POGD0Cj1j2a)DZ&*5IRYOc0BPw6 zJJB#6fs0nYXn6=hjnIZrg^+*{iEsv?5upVk1VM>#51}2w4{3f#??7-z+g&Kpm7}QU zuJd*xf&M$eefUZAoC){c>NP)2xg$bn48+{+-Ug$D9?iiru#I64K2Z2gUvsOOMp`U0;St+MoF3?DSo*lz(AhVG+fk>ExmvA^@^p|c$XM`N zIsY=*k~(c((#aY9ttfYQlQlI&Xk zPYsqtc!6`ll7Q?qz3V-Xy;i%kdP_nc=r!`cl_>ZXU4&0V7IWsNwM}XI7R}%#S_-3u z+C47SqrJeLrr6r!fhlvAr`O`~~QgoYVN>}Xms1d~2WDpl#y>{{zoi09C zC9%$4>*{`>yRu#OWwGdv|1txz$GqK8*+v8=wl}5jO6;c6%phf7to3GZIFOpEo-WvB zK$x1XJa>Gd1HolPlR^^r>)<X%ATv@9C^@3`DTfExsjqKsaH*xYKx>tFfQ-0 zrGUH~bU*R)z>Vd{<#yUq%1o@&=th?mM(46yzL!!_@I|*znwMo{hw^z z&#w}D^Tm;2;wVnUp(xz~N79kKo@D97W4Un1Ijtp04oM!(mrwi$5FU(-jZXQ0fcDVS veus{5_$NXfD~u9}!-NU{LQXsui^C>4j^y7d9FFA%9Rpl%f3Ip!!KuFh(6uY$ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/essence_storage/red.png b/src/main/resources/assets/overdrive_that_matters/textures/block/essence_storage/red.png index f6fa2764b3325afc60cc6011474677c5d0841aa8..1c92eb73cc618138e3f5c6fe75c6161435ce6101 100644 GIT binary patch literal 1941 zcmZ{l4OEk56vyv|bApPPhy;Q}h{%V$8{33IK*n;zF$OIB0^5L1M#6Bse3&M~FFph$ zBHaXIaiBtwkUVMv3Yc1&1m;PwD9j_0WqxKKh_`2GoKxrYo^#)OpL_qm`#$gUocDQ) z<+9~7ZJcZXV5USI5lg%qvG8eD404 z10flKMp%#VF2dUgYY~(Pa)bl~4Z>E0cMzHo4j>dER3oGytU{QDQw0dQ2zwD45egAD zARI&pL5)nQ?IEr9IP$6U?G$R~F zh(<6Y97i~TP>T?P5R70#IEmnnAVpY?@F7ANf*9dmN9QiGY79D776;)Y0~*U9X~psg zTU{p=O$OGP;?-FIwmrm7GiC&A?j}h#Er}Abe_}e>EOy=;eZ>r5O!ii)I;UrkT!g z7n4Rx*So#y6doz7s|+v}g&JoRO_fNi&OeDyb~}(ZU|PX!UL{REJi3)B-naH{0ZY9s z^T_p>FO9=&rWDvIGgABeRXy=*Iy@Ie-u$%TM(yg>2j&OgUCK^kd@Atj>Px7*Y4x?T z&14$=$?lD!UmAAMZmSaD@p z6=k?=bBiSot*yQA)y6MwTFbp022DNIi4FQ)@ljS?`=cSo(7@eeZ`e^h!zAxwvfa%! z58p{ma_ZYMTT{7r@#^8wFy8!Dx=9>W6={C?dalF91-=)&To|r@7o-6x$aohvtzorB|Pbcgt#nU7Gqn zUpcq^MC)-y(>MEE+7I`o>gPO6WDQ+>cW?XEUqkZy6FwRGt*mAE^vJ>Wy7V#sT<`Ys z&fn8skF5Ri;yV67P+&;f*mzg4Ylp-4AC)At3&uz4A3frw`nK5aT$*NIe!5k!A8~yz zyQV*KdC~dm(vAlWxp!vu&hvkqb7&D9`l9~o^Yia)9nc2vE03FNIKR&S@gLed5A?WV zR62ebn$r{bEyvb8xl*kg`(eA;6HZ@CztQ_K8XpbS9xKTAfZpRba`K0UeA!nz?_EAM z2d>z9o?_>OWd^G{U0bGgrRQ?fYBGM<)47{Ez5r(%y3GQ5{6gcM(oX)zLVJVe_NXpb z(HVC4_Qj^(ihrLqT(#!vM>l^ZUkw~puaama5^tDB1}t!5uz*3LNMg>=qQzr6hB(_{iVix`%FIQ6r!NG0Tjdh zw5x?+nV)v5BC+LSl0M7{Wo%F&iJnm$ik!3n<-y%6w)7J%H`B|d?uU!KQlRfvU9GN|FmqcqXqlF>5O$)9VHr&h-48h%aq&x20r`Z AqW}N^ delta 1247 zcmZ{idrXrD6vgjX=nyL94ZgrS6>w_z6$(n(3?L{4B#0G@%&oi>#PYC3MbQ>vA`e9# zirUtK7=h_Xp}3X^47E;hMleWl;A0{KGO$_SVH>{OD$dWCBZ1&I9FnvLWYafWdV=J69@!|c+Sh~M@3j3!g+)mgnWcZ zq(&j^L%4=;1)&b16d@bo1VSakSp*S60YVl+Ey4kWod{_NF$gILdl1SH>Ji!yR0s-$ z282w6?Fbz7PetIOLnzwsM$jVY5H2I6BP1XkMQBCnK!`?ABiuyjL?_Naq#sWy>MF|UN=!am|!J7{`G@))bRCX6$4?K z@sh8!57Cw(>hr- z(zoTHrtu-aoY}NDRoFJSc|g%~K>PGFShL@w$?(`nAxYL%M6vWeV9^q z-(EnTj=Gicaqz;zY^AHAnlhd2IW{xr$z|96HnDAq10%isUiV^+(o~`P)~eq@FyL%C zzt&gH=2(?SzY8Up%$>Q6cDYV+Xr3_e+}W-x15aP*dt}Z!{p-FF_je}wZW~y`-~Y)r z{`^vL5MP`SD^BFZ?@lx>@E|?dD@m47JeD_y{G{b1$sx)8<;v&(0fcD@$=kF3AE4b0 vaNB4k-2aIXCkqor;#gt&zmO-7#p19@jtBX73WsCA%E$mWC_JzsKydgk#Ahpm diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/essence_storage/white.png b/src/main/resources/assets/overdrive_that_matters/textures/block/essence_storage/white.png index 79a8ae9ec113040be880ab873945fbec4bbd0a74..e89d0cf812f5c4a542dcf757948094890a97b21e 100644 GIT binary patch literal 1936 zcmZ{l4Nz0p62~`@fY>1TL7tVO;9yV?NH9SN45UbgL?Oly5MxyWBorD*NPnckVbyJz?R+k5Ug zbI&c2h@+im%%1@OP9kBHlz0zf{OQxkJx20=oh^|fl*R(Q%LFhM0sKZ%#s>g7EP#he z0K7v0|I*gAtqlX91W00J0wUmYxxT)>3$-7LLyNP{Dp)b$BM3N2$QLMn>2kQJ8OWpF<+%^MDV~C>OlnMX)ewE{f zA=W%&?Jtc-E1RUU77y1T*XDYjwNx!$a_{@E3;SbpTPJX&e128@T=E5Ci=Z* zcb}=)wWs{UZhkyB_6B$3L9acjw3MP*-HGM167;)-V(uYf#j?tgMK5H)2`{Eguszh!W_v5#BN_`$<3;wYvbd`~CVJV0r%@+5 z#_2s@P=$S~Wlx!Nt~>0eWP6vCNC(rnlrz@i10Qp`N-q~NcAv5s)gRLqCQ2A~(QXSa z?{Vz(?6TAHnMQ`jovA*ySbwI8-mpRb^04C_XZve@^%iE?JC#)WRf~L>?Zj|fZ>`=^ zQv6jzO~&5W7dB8mzCh}+%QG}bk(|Rb?pM^<5$}|L;jZQOr_#tE7*LyhT z@kM*QVgm;6hL3RGXmM&6##XH|zd4%5$X=+v<1aDC*ctzKGezoN7HO3v@lPBcaa%E8;!U8iVLt_Kojd$(grIUDxD1Ugo-UQ?7l&x1I&@bq~Am zNl(f*Z>jH%Z0d_0$agiYSSKIOX#e?zK!5egtrcxMoNJpqKRV~$@wN5Gw*KMfZA;sC zugL#Wd;jj^+#H}|LGYdQNGKkGZ3yY*Ifw6D9T zPeI_*YX^rfMg(u}m_Br_0nRcjGt#sjzbhmLEEh994m1Cv_A@@i^pP}r3gy?0%U4Z(^Yvkfa}K!^kZ{nY!;8h;c-G<0i{3k z_Yz>q)DsNpnM%Duk*S?x0)r+QHZL&f6_b55Y$jo5*%;;4bQN!K zIbEG@$osPwCwSPU^dXVDPf6o6DnqV9r-Z-lNrf^eiwGxQa&p3kw{tR+vlQuS-ru{6 zvQm{>f$WFslVe80_)azdXJ%^pWak##9Jg)nJR9~;)A_w)+IgY@kw6@EDl%!u{{aLs B+kpT8 delta 1187 zcmZ{jdo zhWY~BJ5O7PrIy>Tr`VM97$hQ+Bsn!TH9S1b=ktX^;Uy1`J9XSs2v-okM>vD93#pL^ z*$5p73WP?4as)9#8N#;+H3%69MF=?vHxTj=5)r;Zh(bt0$U>+oQJum@o$(oQ0T zqfrV%5Yj`?G994>;Ss`Zgj9q$ghGS|2r7iV2=@`x2pR+~(zs~agW!Yq5lAkL(@}nM z4Z~5VvxBk#0F=yKVd3C2{WAU&h(ZGW^<(2(jxB*fW>9E=!S57Znv3PGM|REtI(DH4 zp)SIES_{=P&eNxN)u36WLl&+9JW<5TqpfzyoXUOfvV2uuog^-A%rx?jm?>+C$NYG<^}d&7(A(+6#S zkv~pr$gp8TntNjKU;XE4y8bDx+v`#%n(Ke-{<@+t?>(|_Nn_Xz7k^^&e zpX9-rH(``W!JxF8qG{H%Y`C~7U%YI>XwyRjRzjh1*--|Q{ZZ$#E|m^8DILB>K(H zQhD0^yTvnaQ!*I=4YpnVcGbrhW^-~rt}cpqe37pxnRy;C>=d)U=bh3mDM6Kx8Bt#` zJvT!9n^swV%%t!`);Ml%7xc6A|2fC?urqDyxqDJrrEb4E!j1I!^#|`2%2K6lX4bJs zHuK6lHFwlX{W^L3l`S^WA=|!^x|S?@FQ#R;2cGDg(FV;k->wO%PH)?QHpUvh{~awP~3LF7v7-%4NoZ%pfV=1I-;t(`u%H}ctRjyu8GKzwdgR KFn^h!@Wg-2?Gp9? diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/essence_storage/yellow.png b/src/main/resources/assets/overdrive_that_matters/textures/block/essence_storage/yellow.png index 66005cda3d45ce7404badf8a5c525470bb4dfdc8..d6a428eb5715c7e7791bd132f0008b0b83854153 100644 GIT binary patch literal 1941 zcmZ{l3s6&M7ROJ5F@lO%k+LZGC?fKZn~+2ZEKo~of*}M*@dY*k5(yQ8;qq{GCHN>0 zd6iO41SMslEe|PDt5iS%TV1uX;5r3tX>lD9-CC_$+Fii2U$AASo#~x9_nhyX|L@%I ze&5{h7RY5A=G!>g0Kj~SI5dj*<-|hfSdqI_eyGZlNDxPb1N_Ymz;F=YeDh!OhK0uh&mrcD>)WA}1$jpkdjS6V3{S zLa9`KTIz&|LqkI+`20L?@3TQcmridwd0bkO8?+0d7@-tFk03&jA*c~r5o!=B5cVJ> zBkV=UML39%fIuVcKzI+~9fWNNN(4DVEP@7MAHur`jR?mP@)0T#5)n2dEWp_Uge-(3 z2=xeg2s;rP5d08)5&RM25n>Sjj*x@!2EuNHGK9Agwj&fGWFmwh=n&!%K0r8wU_?+M zq$4yToI;2|Fe9`foI|Ka2t)`#Fd>{rScxD-*nsdMLNJ0DVQtx=ak6R*I!YD|A)|vD z%OHN^hEQ8wClx^k)@kA`=>WDp#4a-C`R?f^Nj5DB7qRa%oov=D*%L8f2C#CJgubc} zUp`b}z3mp|XsCQvFFLEaPQ*Mi6>2T3I4LzZ6@WZbqnTlLhuAYvs6xm%WENVF>3T zYwlV7OWA5Njor69d9;1VDw{tFzty$+%G8ZCKhh+M0 zgEUH9UR*&LZrVIxiG!-Eul;k^m3!85cZVTUk9Ay~{_U7>tFB`a5NW96mf9N*7R)or zyO`{i=Bj7!CdE7T?OmuTKeA@aNKi0uX$##b4zCC^zj`OjVb?ORYaVj5be3W4tAr@$ zvi0?HWk{{*!jiCAfj0wY*IdqX4Sw=wUbh(R8PIJy)ODoOQnAnBQ}7 zuFR!x?0k8>eVkV|6!cXcuqiS!y{>-~xKhEGI_6Op9r+(&`{l_mRyffPg5DdiKNlaC zRR=gX_Wfhi;`VbbZHmUPjykuW>PyludKSkTzW&~k_FF#$=JdyYGW=6<^T@@~h8?<; z37;&F_L9z@liv)h{`d9m{6T-ez~qUkt^k(~hi^YBOkn3ujn34JWVE-ulbZNBah~0Y^)s7aOi__nG`f z`{=12H;zfCPC-*jEWi2e*5?D2x{2=&nBCyw?UcK{AER-6xcY2vjw|%G-ObDy9`<4n zbpCkr!Xg;3b-TdM3{DGBb-Faq=}O7sCRe3?SK4`)YFma24c%q|J$0@AQBf!VW1+o4 z^KeX;rRWTP{P23?PX#|O7^&EL>!W)=kgo>Ls5eVA5{U=QAp;gTF<8JLQ5dl$zs8nx z(4Ap5ooAAm!(f6P@mq;$^JY!wlSyp3l*BCjZ(gp_rqXL=BE@q4TFzQ7kdw5G4YP=X z;`&ky^NX$)f@OZuse;6oi%I%0rMVF}6?6v@WZ;I>9;VU?lkjE49 z{9gct--i?vz64vvx%pqq_BvXyKby`(ht(OP0f|T!+Pq%5 F|NkI6=1Kqn delta 1247 zcmZ{idrXrD6vgjX=nyKUynUf{DB#rYD-@Kn89-3VD~J_}%&oi>#PYC3MbV<52%?Cf zsHGId2uw!`g|$Rrs8zuk!63nb%0z}{V6_+&MY*e4vSokl<|H@gCcm7V zZoJJW#0Q|Ei1smtTDCga1Egup%$SSAq(LoLK(t&1TjKBLMB2D!ajuU2&o9s2+0V$5KbY~A+#YV5#$K< z2pI@l5xD5ZlcHrI!exXOglvSX2tjBWfYyOXzlacvup8ktLL9JaZYA8oh zf4E?S}!9(IIO(ZMU+Ct8}4qZN0pnU%XQuT034f7;hmt@$JKQR10*cN(X|~ zV@2O+q&n7aDUaiu;b<+l>difv#7eu*36$i7`!(0U9VN_BOzfpVi+Q}ylLViXHw$SD|E?xC8nv>p zQSft%4G~-FUb-Nx@SxF!-UoimyxDz~QFn}51>Z@Pg4%8(u;mzQ>XMy(Rn9uy@EKYr zvxC|*E;FLNJ9a6`RV|o_wmz_M#kuJ6=T2t>j8|{I*WCEbF4xnoKejANLz}9h*3VdU zcw|1Uikp|XV!qd4qa|Z~b$Rm3_vwW9$eH8`Yr2j2DxX1DZuV&qCfer`C!W1_^A{f} zFSsJLD_rjBy`!hDQ~qVS_*&>f6SCK;(^RD;!qYq3vNxsoP-&Ksxh=_Vtv~F@&elwp zZZaVlmP-n(B(eN30V{zh@b_=4lYbq4Cum=N_mGC!q+Ro|+Qo{j%fI|%y}EUx za)GezEdG_>SaU~(ngAkB*|J3m%c4(jv99H>Xv-KhOE(I*|t zc`JLP*)q1wTg;i*Zl5~THYA!ZYkyV89-q9f&nr?yOe@w(t!m7a4HfZK^x_mIoa}HsT9R8DI z`1z$0e}N=EMv}md+nHck;7Yo3R+4Ok_-qd@`B}?Jl1q|%OB65v1Bg=NleT95KR~%750xcn0#NfIT9B{8D3e<3$Mo6Y5rTvzh%6fW0hm4N}Cf2d!*ukg@cOF1sC From ba2048849b407b9b4acef801baf106bf9ec2c75c Mon Sep 17 00:00:00 2001 From: GearShocky Date: Wed, 26 Feb 2025 15:45:14 +0500 Subject: [PATCH 05/15] reduce empty space on bread monster texture --- src/bb/bread_monster.bbmodel | 2 +- .../models/bread_monster.java | 2 +- .../models/bread_monster/bread_monster.png | Bin 1160 -> 812 bytes 3 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/bb/bread_monster.bbmodel b/src/bb/bread_monster.bbmodel index 1a63f3215..8d914607a 100644 --- a/src/bb/bread_monster.bbmodel +++ b/src/bb/bread_monster.bbmodel @@ -1 +1 @@ -{"meta":{"format_version":"4.10","model_format":"modded_entity","box_uv":true},"name":"bread_monster","model_identifier":"","modded_entity_entity_class":"","modded_entity_version":"1.17","modded_entity_flip_y":true,"visible_box":[1,1,0],"variable_placeholders":"","variable_placeholder_buttons":[],"timeline_setups":[],"unhandled_root_fields":{},"resolution":{"width":64,"height":64},"elements":[{"name":"cube","box_uv":true,"rescale":false,"locked":false,"light_emission":0,"render_order":"default","allow_mirror_modeling":true,"from":[-4,0,-5],"to":[4,6,1],"autouv":0,"color":3,"origin":[0,0,0],"faces":{"north":{"uv":[6,6,14,12],"texture":0},"east":{"uv":[0,6,6,12],"texture":0},"south":{"uv":[20,6,28,12],"texture":0},"west":{"uv":[14,6,20,12],"texture":0},"up":{"uv":[14,6,6,0],"texture":0},"down":{"uv":[22,0,14,6],"texture":0}},"type":"cube","uuid":"fa4523a4-8d01-c733-0b32-e6e9110d7e28"},{"name":"cube","box_uv":true,"rescale":false,"locked":false,"light_emission":0,"render_order":"default","allow_mirror_modeling":true,"from":[-4,0,-7],"to":[4,3,-3],"autouv":0,"color":4,"inflate":0.1,"origin":[0,-2,-5],"uv_offset":[26,24],"faces":{"north":{"uv":[30,28,38,31],"texture":0},"east":{"uv":[26,28,30,31],"texture":0},"south":{"uv":[42,28,50,31],"texture":0},"west":{"uv":[38,28,42,31],"texture":0},"up":{"uv":[38,28,30,24],"texture":0},"down":{"uv":[46,24,38,28],"texture":0}},"type":"cube","uuid":"88abdc70-43b2-eae1-76fc-438ae188e456"},{"name":"cube","box_uv":true,"rescale":false,"locked":false,"light_emission":0,"render_order":"default","allow_mirror_modeling":true,"from":[-4,3,-7],"to":[4,6,-2],"autouv":0,"color":4,"inflate":0.1,"origin":[0,1,-5],"uv_offset":[0,24],"faces":{"north":{"uv":[5,29,13,32],"texture":0},"east":{"uv":[0,29,5,32],"texture":0},"south":{"uv":[18,29,26,32],"texture":0},"west":{"uv":[13,29,18,32],"texture":0},"up":{"uv":[13,29,5,24],"texture":0},"down":{"uv":[21,24,13,29],"texture":0}},"type":"cube","uuid":"4045e434-568f-31c9-42c3-5129a8a4e558"},{"name":"cube","box_uv":true,"rescale":false,"locked":false,"light_emission":0,"render_order":"default","allow_mirror_modeling":true,"from":[-4,0,0.9],"to":[4,6,6.9],"autouv":0,"color":3,"inflate":-0.1,"origin":[0,0,4.9],"uv_offset":[0,12],"faces":{"north":{"uv":[6,18,14,24],"texture":0},"east":{"uv":[0,18,6,24],"texture":0},"south":{"uv":[20,18,28,24],"texture":0},"west":{"uv":[14,18,20,24],"texture":0},"up":{"uv":[14,18,6,12],"texture":0},"down":{"uv":[22,12,14,18],"texture":0}},"type":"cube","uuid":"578bc61b-3bb2-8b53-b3e6-153dd51261bd"}],"outliner":[{"name":"root","origin":[0,0,0],"color":0,"uuid":"5859ff96-7f22-f022-5634-74e9ddbda30f","export":true,"mirror_uv":false,"isOpen":true,"locked":false,"visibility":true,"autouv":0,"selected":false,"children":[{"name":"Body","origin":[0,3,0],"color":0,"uuid":"88720699-c6d7-c408-8ec2-c5ddd7227f0b","export":true,"mirror_uv":false,"isOpen":true,"locked":false,"visibility":true,"autouv":0,"selected":false,"children":["fa4523a4-8d01-c733-0b32-e6e9110d7e28",{"name":"Ljaw","origin":[0,1,-3],"color":0,"uuid":"2232c700-b7a6-4729-b081-78ff34dfbc41","export":true,"mirror_uv":false,"isOpen":true,"locked":false,"visibility":true,"autouv":0,"selected":false,"children":["88abdc70-43b2-eae1-76fc-438ae188e456"]},{"name":"UJaw","origin":[0,4,-3],"color":0,"uuid":"51b17377-4d34-1e21-ed59-71314a4858c4","export":true,"mirror_uv":false,"isOpen":true,"locked":false,"visibility":true,"autouv":0,"selected":false,"children":["4045e434-568f-31c9-42c3-5129a8a4e558"]},{"name":"tail","origin":[0,3,1],"color":0,"uuid":"6502f144-0905-ef6d-77a4-4d6f6c832582","export":true,"mirror_uv":false,"isOpen":true,"locked":false,"visibility":true,"autouv":0,"selected":false,"children":["578bc61b-3bb2-8b53-b3e6-153dd51261bd"]}]}]}],"textures":[{"path":"L:\\overdrive_that_matters\\src\\main\\resources\\assets\\overdrive_that_matters\\textures\\models\\bread_monster\\bread_monster.png","name":"bread_monster.png","folder":"block","namespace":"","id":"0","group":"","width":64,"height":64,"uv_width":64,"uv_height":64,"particle":false,"use_as_default":false,"layers_enabled":false,"sync_to_project":"","render_mode":"default","render_sides":"auto","pbr_channel":"color","frame_time":1,"frame_order_type":"loop","frame_order":"","frame_interpolate":false,"visible":true,"internal":true,"saved":true,"uuid":"ab77f55b-7cd7-1d48-08ad-38d2efaed5e6","relative_path":"../main/resources/assets/overdrive_that_matters/textures/models/bread_monster/bread_monster.png","source":"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAEAAAABACAYAAACqaXHeAAAAAXNSR0IArs4c6QAABEBJREFUeF7tWU1IVFEUPoM2Uv5U/uJfGYRK1Coso4WCRUIEYYuIwGxRyxYRSKtoFUa0aJmLzJ2L3ISl1SKLyJI2Bv4ROOXP4E/+a2jFxHeHM13H+2Ye41XeHd/ZzJt55913zne+e+5373jIwt40lARwKz0lMeThO5xKhfuTaa5lhBr7liltctXqcWpsG/dY3nTQDcsgGQAGYXrxjwj7w44EOnI0jV7eH4qYhvEANN8+GJj4qa5wdoaX3vcsKAGYz/IKZhgPgGoKcMZgQ8u72fhnQKQMrRjAzxjPgGhToM2/YtkEMQ1amobNaIJM9bHZv5S3J4HwCcP8HxhdoemF4He29NQEKslPIvQBGD+TUp1JaV0zUfv7qfoBRwHjkbs9J48sQPG+kWDnD7fzx5NDADAIso88jvw7wDICAFT/Y/8yjc8JKbDOcnZ76ETprjUsCAcgfAUBYxwJQLevKjD8fYkW26dC1MeFHQDgx4kxAPIUkkGB31CWl+7c7HXWFGjtLBdl/vplnpL7F0Mxd4yt0K9h9RTYWZhIZ/KShC/3AjlZlX5YKk0RLo4D4O7DQwIATh6ND10cNj21ug4EJJ+eGbxf5rVfTMcCoJzkRARgIHmtOruVEIobJYjeAHBetPrpXNL/SvOeIO6VIDdH9AYZADE1toMURnNE8id/B4UQb4tlBjDdVdMo7qUw7wWsQDAeAChE+TCEq4xDETTGuOkBrANw0sOCCIrNjvH+wY4vfObL91JNRZf9tdPuwBvwE3sBBAZDZXHNS18kTR/rOx23F8C216riAMBK04cDEA5W+Jh8v/beN2cxAADIyXDgkTQ9/OHH54O8j4jGCoB56/EPZwHw4Pq+EACs67FpkeVxeGLsh4QgceU9BHxVv/EYjgPg2tmcAA44NmrYQ7AVVGUoAYSP05ZHJR2tlkAWQVvRyFAYBlSlNXQBaQmArP44kK0GAEzq7VlQnj1uOgAqEcT7gK1gwMW6whADVP9AbSoAEEfQAjII8j9DW3GowQCoktd56qycAlZnAVj2DkyuUixrOZbbDl8B1V2podPVN8R7X7c/CuAan37/KNVebRDXfL/5SX1gYHCUSqgrpnfaaexrToWhArEDhKkOQxgAHlgWO9GmBRqr0BbFFyg3N5/edn4mn29EAILkYR2vPonvMP5taOa52JFGG99OsiqfEABIbrA7m4qKCqiy4lgoCDmopqetawKmwWdCEMGiBSj//8A6g0HGu3nbLRcBbLM7/oYA4MqAgqAdKsSUZKrKFOXry5cqA8VlE5taoVgTs/uco2Sp3aB1+rkA6ETTxLFcBphYNZ0xuwzQiaaJY7kMMLFqOmN2GaATTRPHchlgYtV0xuwyQCeaJo7lMsDEqumM2WWATjRNHMtlgIlV0xmzywCdaJo4lssAE6umM2aXATrRNHEslwEmVk1nzC4DdKJp4ljbngH/AP1vPl/ahKvIAAAAAElFTkSuQmCC"}],"animations":[{"uuid":"d7bf1cb6-1a54-3b38-f7f3-f6cbfa366f4b","name":"idle","loop":"loop","override":false,"length":1.44,"snapping":25,"selected":false,"anim_time_update":"","blend_weight":"","start_delay":"","loop_delay":"","animators":{"88720699-c6d7-c408-8ec2-c5ddd7227f0b":{"name":"Body","type":"bone","keyframes":[{"channel":"rotation","data_points":[{"x":"0","y":"-2.5","z":"0"}],"uuid":"5a668d16-f5c6-8e39-03af-670568968123","time":0,"color":-1,"interpolation":"linear"},{"channel":"rotation","data_points":[{"x":"0","y":"3.33","z":"0"}],"uuid":"6f8863cd-46f7-50cb-d5ae-ad498c99f650","time":0.72,"color":-1,"interpolation":"linear"},{"channel":"rotation","data_points":[{"x":"0","y":"-2.5","z":"0"}],"uuid":"0432cfdd-65d3-56ec-d02e-92f96e3ca66c","time":1.44,"color":-1,"interpolation":"linear"}]},"2232c700-b7a6-4729-b081-78ff34dfbc41":{"name":"Ljaw","type":"bone","keyframes":[{"channel":"rotation","data_points":[{"x":"2.5","y":"0","z":"0"}],"uuid":"69d0bbcc-3b05-3660-2cff-5364785da4c7","time":0,"color":-1,"interpolation":"linear"},{"channel":"rotation","data_points":[{"x":"5","y":"0","z":"0"}],"uuid":"b146f64a-62d8-3799-587c-08b0388298b8","time":0.72,"color":-1,"interpolation":"linear"},{"channel":"rotation","data_points":[{"x":"2.5","y":"0","z":"0"}],"uuid":"ce4020e4-c2ce-c65f-d716-b92f8b196ad3","time":1.44,"color":-1,"interpolation":"linear"}]},"51b17377-4d34-1e21-ed59-71314a4858c4":{"name":"UJaw","type":"bone","keyframes":[{"channel":"rotation","data_points":[{"x":"-2.5","y":"0","z":"0"}],"uuid":"a12df9b3-1bb5-f85f-cd29-c1d833a4083b","time":0,"color":-1,"interpolation":"linear"},{"channel":"rotation","data_points":[{"x":"-5","y":"0","z":"0"}],"uuid":"2caeda6c-3904-7e9a-ac45-278c455a00b8","time":0.72,"color":-1,"interpolation":"linear"},{"channel":"rotation","data_points":[{"x":"-2.5","y":"0","z":"0"}],"uuid":"7b2a6773-0830-e658-b98f-a24f691d59cf","time":1.44,"color":-1,"interpolation":"linear"}]},"6502f144-0905-ef6d-77a4-4d6f6c832582":{"name":"tail","type":"bone","keyframes":[{"channel":"rotation","data_points":[{"x":"0","y":"5","z":"0"}],"uuid":"de793c8b-db32-6813-ab51-c0da733c8178","time":0,"color":-1,"interpolation":"linear"},{"channel":"rotation","data_points":[{"x":"0","y":"5","z":"0"}],"uuid":"d8ac39a5-dc82-fc1b-a448-88ffe3fbf45a","time":1.44,"color":-1,"interpolation":"linear"},{"channel":"rotation","data_points":[{"x":"0","y":"-7.5","z":"0"}],"uuid":"5e01c8c4-d7a6-98c8-d3e7-d99930c8a74e","time":0.72,"color":-1,"interpolation":"linear"}]}}},{"uuid":"6b67c492-b0cc-1672-3b1c-5de6c2d23e77","name":"move","loop":"loop","override":false,"length":1.44,"snapping":25,"selected":true,"anim_time_update":"","blend_weight":"","start_delay":"","loop_delay":"","animators":{"5859ff96-7f22-f022-5634-74e9ddbda30f":{"name":"root","type":"bone","keyframes":[{"channel":"position","data_points":[{"x":"1","y":"0","z":"2"}],"uuid":"8cda900f-d10c-7618-92f5-c1cd6c9ae5c4","time":0,"color":-1,"interpolation":"linear"},{"channel":"position","data_points":[{"x":"0","y":"5","z":"-1"}],"uuid":"b6463f24-0648-6ae0-88b7-e841c01b730d","time":0.12,"color":-1,"interpolation":"linear"},{"channel":"position","data_points":[{"x":"-1","y":"0","z":"-1"}],"uuid":"86a97c35-5faa-d7ef-982b-d7ca7b8c177d","time":0.24,"color":-1,"interpolation":"linear"},{"channel":"position","data_points":[{"x":"-2","y":"0","z":"2"}],"uuid":"2fd43a6d-c710-e031-9732-94d86746502b","time":0.72,"color":-1,"interpolation":"linear"},{"channel":"position","data_points":[{"x":"0","y":"5","z":"-1"}],"uuid":"57b6a1ef-0c55-269c-1f00-afdc0918b181","time":0.84,"color":-1,"interpolation":"linear"},{"channel":"position","data_points":[{"x":"1","y":"0","z":"-1"}],"uuid":"2dd5e925-6cb6-8d81-4f8d-48f65b4ec006","time":0.96,"color":-1,"interpolation":"linear"},{"channel":"position","data_points":[{"x":"1","y":"0","z":"2"}],"uuid":"63c9dfd6-9898-8511-9473-954817e9cf8e","time":1.44,"color":-1,"interpolation":"linear"}]},"88720699-c6d7-c408-8ec2-c5ddd7227f0b":{"name":"Body","type":"bone","keyframes":[{"channel":"rotation","data_points":[{"x":"7.5283207965","y":"4.95711679","z":"0.6542642739"}],"uuid":"1671ea6a-b095-a26b-7304-e5df39c97022","time":0.12,"color":-1,"interpolation":"linear"},{"channel":"rotation","data_points":[{"x":"0","y":"0","z":"0"}],"uuid":"ca91aedc-1796-55d6-b2b9-9c32f9b90934","time":0,"color":-1,"interpolation":"linear"},{"channel":"rotation","data_points":[{"x":"7.5283207965","y":"-4.95711679","z":"-0.6542642739"}],"uuid":"5808eaf7-4d3b-f0d2-f00e-51494ef2132c","time":0.84,"color":-1,"interpolation":"linear"},{"channel":"rotation","data_points":[{"x":"0","y":"0","z":"0"}],"uuid":"0404b1b0-0255-0e90-f33f-ab06776eec70","time":0.24,"color":-1,"interpolation":"linear"},{"channel":"rotation","data_points":[{"x":"0","y":"0","z":"0"}],"uuid":"4114f4e6-ce10-38c8-4935-20c25720bdf7","time":0.72,"color":-1,"interpolation":"linear"},{"channel":"rotation","data_points":[{"x":"0","y":"0","z":"0"}],"uuid":"c34130e9-1ac6-c643-efdb-50f8fc31a6fb","time":0.96,"color":-1,"interpolation":"linear"},{"channel":"rotation","data_points":[{"x":"12.5094402655","y":"1.6523722633","z":"0.2180880913"}],"uuid":"4f1744db-52a0-7b22-e54d-ecd7f53af326","time":0.2,"color":-1,"interpolation":"linear"},{"channel":"rotation","data_points":[{"x":"15.018880531","y":"-3.3047445267","z":"-0.4361761826"}],"uuid":"4320bd01-5d42-6eae-aa32-d7df4dbf25d3","time":0.92,"color":-1,"interpolation":"linear"}]},"2232c700-b7a6-4729-b081-78ff34dfbc41":{"name":"Ljaw","type":"bone","keyframes":[{"channel":"rotation","data_points":[{"x":"25","y":"0","z":"0"}],"uuid":"cca380c4-1702-bbf4-ec96-384d19a85ea0","time":0.12,"color":-1,"interpolation":"linear"},{"channel":"rotation","data_points":[{"x":"0","y":"0","z":"0"}],"uuid":"311d826c-e7ad-1d2f-3c1c-64d7982f2300","time":0,"color":-1,"interpolation":"linear"},{"channel":"rotation","data_points":[{"x":"0","y":"0","z":"0"}],"uuid":"a2222357-8425-ae5f-c8da-bea86f996c53","time":0.32,"color":-1,"interpolation":"linear"},{"channel":"rotation","data_points":[{"x":"0","y":"0","z":"0"}],"uuid":"ef6ef43f-85be-8663-357d-8c206c2ac565","time":0.72,"color":-1,"interpolation":"linear"},{"channel":"rotation","data_points":[{"x":"0","y":"0","z":"0"}],"uuid":"1d9ce2b8-a33f-fad7-a9be-735d10333cf9","time":1.04,"color":-1,"interpolation":"linear"},{"channel":"rotation","data_points":[{"x":"25","y":"0","z":"0"}],"uuid":"9263e391-0ad4-6cfc-2b49-800ae8ed7cf4","time":0.84,"color":-1,"interpolation":"linear"}]},"51b17377-4d34-1e21-ed59-71314a4858c4":{"name":"UJaw","type":"bone","keyframes":[{"channel":"rotation","data_points":[{"x":"-25","y":"0","z":"0"}],"uuid":"15c13b71-07df-b6b2-5591-7093cd4b061e","time":0.12,"color":-1,"interpolation":"linear"},{"channel":"rotation","data_points":[{"x":"0","y":"0","z":"0"}],"uuid":"c17e2a73-a449-1cb7-d681-cd72470f7221","time":0,"color":-1,"interpolation":"linear"},{"channel":"rotation","data_points":[{"x":"0","y":"0","z":"0"}],"uuid":"585b7866-7eba-d2bb-88d9-deae443066e3","time":0.32,"color":-1,"interpolation":"linear"},{"channel":"rotation","data_points":[{"x":"0","y":"0","z":"0"}],"uuid":"0355a961-3968-b49a-b1ce-bf4454ca53c5","time":0.72,"color":-1,"interpolation":"linear"},{"channel":"rotation","data_points":[{"x":"0","y":"0","z":"0"}],"uuid":"cc959d9d-4c32-f5c4-a0ec-42643ea67784","time":1.04,"color":-1,"interpolation":"linear"},{"channel":"rotation","data_points":[{"x":"-30","y":"0","z":"0"}],"uuid":"8f37bb68-e309-6fa3-7b6d-a103f9422944","time":0.84,"color":-1,"interpolation":"linear"}]},"6502f144-0905-ef6d-77a4-4d6f6c832582":{"name":"tail","type":"bone","keyframes":[{"channel":"rotation","data_points":[{"x":"-10.0374230459","y":"-4.9238497548","z":"0.870384675"}],"uuid":"b62ac8a4-efef-23b6-71bd-ecbfd6c13431","time":0.12,"color":-1,"interpolation":"linear"},{"channel":"rotation","data_points":[{"x":"0","y":"0","z":"0"}],"uuid":"303a465c-d181-26bc-48d3-a41ff92f8c26","time":0,"color":-1,"interpolation":"linear"},{"channel":"rotation","data_points":[{"x":"-12.5462389525","y":"4.8811889482","z":"-1.08482395"}],"uuid":"0e612eb6-23db-4b47-8412-eb2785018bd7","time":0.84,"color":-1,"interpolation":"linear"},{"channel":"rotation","data_points":[{"x":"0","y":"0","z":"0"}],"uuid":"fed0b380-5b3c-0864-56c1-75b377c7395b","time":0.24,"color":-1,"interpolation":"linear"},{"channel":"rotation","data_points":[{"x":"0","y":"0","z":"0"}],"uuid":"b5f10a67-6e22-19d1-25b6-ca94d7613fec","time":0.72,"color":-1,"interpolation":"linear"},{"channel":"rotation","data_points":[{"x":"0","y":"0","z":"0"}],"uuid":"9a91e2da-a5a3-8d02-b1a3-82bd0ba78809","time":0.96,"color":-1,"interpolation":"linear"}]}}}]} \ No newline at end of file +{"meta":{"format_version":"4.10","model_format":"modded_entity","box_uv":true},"name":"bread_monster","model_identifier":"","modded_entity_entity_class":"","modded_entity_version":"1.17","modded_entity_flip_y":true,"visible_box":[1,1,0],"variable_placeholders":"","variable_placeholder_buttons":[],"timeline_setups":[],"unhandled_root_fields":{},"resolution":{"width":64,"height":32},"elements":[{"name":"cube","box_uv":true,"rescale":false,"locked":false,"light_emission":0,"render_order":"default","allow_mirror_modeling":true,"from":[-4,0,-5],"to":[4,6,1],"autouv":0,"color":3,"origin":[0,0,0],"faces":{"north":{"uv":[6,6,14,12],"texture":0},"east":{"uv":[0,6,6,12],"texture":0},"south":{"uv":[20,6,28,12],"texture":0},"west":{"uv":[14,6,20,12],"texture":0},"up":{"uv":[14,6,6,0],"texture":0},"down":{"uv":[22,0,14,6],"texture":0}},"type":"cube","uuid":"fa4523a4-8d01-c733-0b32-e6e9110d7e28"},{"name":"cube","box_uv":true,"rescale":false,"locked":false,"light_emission":0,"render_order":"default","allow_mirror_modeling":true,"from":[-4,0,-7],"to":[4,3,-3],"autouv":0,"color":4,"inflate":0.1,"origin":[0,-2,-5],"uv_offset":[26,24],"faces":{"north":{"uv":[30,28,38,31],"texture":0},"east":{"uv":[26,28,30,31],"texture":0},"south":{"uv":[42,28,50,31],"texture":0},"west":{"uv":[38,28,42,31],"texture":0},"up":{"uv":[38,28,30,24],"texture":0},"down":{"uv":[46,24,38,28],"texture":0}},"type":"cube","uuid":"88abdc70-43b2-eae1-76fc-438ae188e456"},{"name":"cube","box_uv":true,"rescale":false,"locked":false,"light_emission":0,"render_order":"default","allow_mirror_modeling":true,"from":[-4,3,-7],"to":[4,6,-2],"autouv":0,"color":4,"inflate":0.1,"origin":[0,1,-5],"uv_offset":[0,24],"faces":{"north":{"uv":[5,29,13,32],"texture":0},"east":{"uv":[0,29,5,32],"texture":0},"south":{"uv":[18,29,26,32],"texture":0},"west":{"uv":[13,29,18,32],"texture":0},"up":{"uv":[13,29,5,24],"texture":0},"down":{"uv":[21,24,13,29],"texture":0}},"type":"cube","uuid":"4045e434-568f-31c9-42c3-5129a8a4e558"},{"name":"cube","box_uv":true,"rescale":false,"locked":false,"light_emission":0,"render_order":"default","allow_mirror_modeling":true,"from":[-4,0,0.9],"to":[4,6,6.9],"autouv":0,"color":3,"inflate":-0.1,"origin":[0,0,4.9],"uv_offset":[0,12],"faces":{"north":{"uv":[6,18,14,24],"texture":0},"east":{"uv":[0,18,6,24],"texture":0},"south":{"uv":[20,18,28,24],"texture":0},"west":{"uv":[14,18,20,24],"texture":0},"up":{"uv":[14,18,6,12],"texture":0},"down":{"uv":[22,12,14,18],"texture":0}},"type":"cube","uuid":"578bc61b-3bb2-8b53-b3e6-153dd51261bd"}],"outliner":[{"name":"root","origin":[0,0,0],"color":0,"uuid":"5859ff96-7f22-f022-5634-74e9ddbda30f","export":true,"mirror_uv":false,"isOpen":true,"locked":false,"visibility":true,"autouv":0,"selected":false,"children":[{"name":"Body","origin":[0,3,0],"color":0,"uuid":"88720699-c6d7-c408-8ec2-c5ddd7227f0b","export":true,"mirror_uv":false,"isOpen":true,"locked":false,"visibility":true,"autouv":0,"selected":false,"children":["fa4523a4-8d01-c733-0b32-e6e9110d7e28",{"name":"Ljaw","origin":[0,1,-3],"color":0,"uuid":"2232c700-b7a6-4729-b081-78ff34dfbc41","export":true,"mirror_uv":false,"isOpen":true,"locked":false,"visibility":true,"autouv":0,"selected":false,"children":["88abdc70-43b2-eae1-76fc-438ae188e456"]},{"name":"UJaw","origin":[0,4,-3],"color":0,"uuid":"51b17377-4d34-1e21-ed59-71314a4858c4","export":true,"mirror_uv":false,"isOpen":true,"locked":false,"visibility":true,"autouv":0,"selected":false,"children":["4045e434-568f-31c9-42c3-5129a8a4e558"]},{"name":"tail","origin":[0,3,1],"color":0,"uuid":"6502f144-0905-ef6d-77a4-4d6f6c832582","export":true,"mirror_uv":false,"isOpen":true,"locked":false,"visibility":true,"autouv":0,"selected":false,"children":["578bc61b-3bb2-8b53-b3e6-153dd51261bd"]}]}]}],"textures":[{"path":"L:\\overdrive_that_matters\\src\\main\\resources\\assets\\overdrive_that_matters\\textures\\models\\bread_monster\\bread_monster.png","name":"bread_monster.png","folder":"block","namespace":"","id":"0","group":"","width":64,"height":32,"uv_width":64,"uv_height":64,"particle":false,"use_as_default":false,"layers_enabled":false,"sync_to_project":"","render_mode":"default","render_sides":"auto","pbr_channel":"color","frame_time":1,"frame_order_type":"loop","frame_order":"","frame_interpolate":false,"visible":true,"internal":true,"saved":true,"uuid":"ab77f55b-7cd7-1d48-08ad-38d2efaed5e6","relative_path":"../main/resources/assets/overdrive_that_matters/textures/models/bread_monster/bread_monster.png","source":"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAEAAAAAgCAYAAACinX6EAAAAAXNSR0IArs4c6QAAA8ZJREFUaEPlWU1IVFEUPoM2QzlajX/4VwahErUKy2ihYJEQQdgiIjBd1LJFBNIqWoURLVrmInPnIjdhOdUii8iSNgb+ETg16uBP/mtoxYvvDud1fd4785jR4c10NvPm3fPuu+c7P/c797lII69byg0M+bzppkbgcCaV7M+ghY4xah1cpazpdd3j1No16dIOOmhAu0gGgEGYXf4tlv1+RxodOZpFL+6NRjQj6QFov3XQmPqh9nBetpve9S8pAVjMdYvISHoAVCnAFiMaOt7Op34ERLJQFwH8TNJHQLQU6AqtaYsg0qCjLZgcRZBDfWL+DxXuSSP8QpD/w+NrNLsU/s/iy0yj8iIPoQ5A+BlvXQ5l9c5Fre+nmocdBYxLrvZsPKxAiA+OhSu/Vc4fzzABYBBkHXke+T7ASgoA4P0PQ6s0uSCowCbJ3+2iExW7NkSBFQDrDoKIcSQAfYFaI/hthZa7Z8zQx4UdAKDHhjEAcgrJoEBvNNdNt28MOCsFOnuqhJu/fF6kjKFlc83+iTX6GVSnwM6SdDpT6BG6XAtkY1X8YaXCK1QcB8CdB4cEAGw8Ch+qOGR2Zn0TCDDelxMer3Tbd6ZjAVAmOREBGFBeXWXXEaGUYYKoDQDneWeIznn+eZp7gpRnglwcURtkAERq/A9UGMURxp/8FSZC3BbLEcDhrkqjlKfC3AvoQEh6AMAQ5cMQ9jIORVAYU6YGMA/ASQ8TIjA2O8L9gx1d6CxW7aX66l77e6fdiePQE70AFgaBZ3HNW18kTh/rOx3XC6Dt1XkcAOg4vRUAK1jWOXm84e5XZ0UAAJCN4YVH4vTQhx6fD3IfES0qAObNR9+dBcD9a/tMAJjXo2mR6bHVMNaDQaC4cg8BXdU9nsNxAFw9m2/ggCNeQQ/BUlybrQQQOk7bHpXhqNsCmQQlopDBMQyoimtsFZBaAGT2xwtJNACIpIH+JeXZ47YDoCJB3AckIgIuNpaYEaD6ArWtAIAcgQvIIMhfhhJxqMEAqIzfylNnZQrozgKw7R2YXqdY9nJst/5AMTVeqafTddfFe191PzRwjd9QaJwamlrENY+3P242hkfGqZx6Y3qnncK+4VQYLBAdIER1GMIA8MQy2YmWFiisgluUXaCCgiJ60/OJAoExAQiMh/hffhT/IXxvdO6Z6EijzW/HWJWOCQCMG+nLo9LSYqqpPmYuQl5U25PODQumkaeCEEGiLVD+/sA8g0HGu7ntlp2AaLM7f1wAsGcQggg7eIhDkkNVDlG+vnypxiirnNpWD8VqmN3n/gLOMT4/WuItIgAAAABJRU5ErkJggg=="}],"animations":[{"uuid":"d7bf1cb6-1a54-3b38-f7f3-f6cbfa366f4b","name":"idle","loop":"loop","override":false,"length":1.44,"snapping":25,"selected":false,"anim_time_update":"","blend_weight":"","start_delay":"","loop_delay":"","animators":{"88720699-c6d7-c408-8ec2-c5ddd7227f0b":{"name":"Body","type":"bone","keyframes":[{"channel":"rotation","data_points":[{"x":"0","y":"-2.5","z":"0"}],"uuid":"5a668d16-f5c6-8e39-03af-670568968123","time":0,"color":-1,"interpolation":"linear"},{"channel":"rotation","data_points":[{"x":"0","y":"3.33","z":"0"}],"uuid":"6f8863cd-46f7-50cb-d5ae-ad498c99f650","time":0.72,"color":-1,"interpolation":"linear"},{"channel":"rotation","data_points":[{"x":"0","y":"-2.5","z":"0"}],"uuid":"0432cfdd-65d3-56ec-d02e-92f96e3ca66c","time":1.44,"color":-1,"interpolation":"linear"}]},"2232c700-b7a6-4729-b081-78ff34dfbc41":{"name":"Ljaw","type":"bone","keyframes":[{"channel":"rotation","data_points":[{"x":"2.5","y":"0","z":"0"}],"uuid":"69d0bbcc-3b05-3660-2cff-5364785da4c7","time":0,"color":-1,"interpolation":"linear"},{"channel":"rotation","data_points":[{"x":"5","y":"0","z":"0"}],"uuid":"b146f64a-62d8-3799-587c-08b0388298b8","time":0.72,"color":-1,"interpolation":"linear"},{"channel":"rotation","data_points":[{"x":"2.5","y":"0","z":"0"}],"uuid":"ce4020e4-c2ce-c65f-d716-b92f8b196ad3","time":1.44,"color":-1,"interpolation":"linear"}]},"51b17377-4d34-1e21-ed59-71314a4858c4":{"name":"UJaw","type":"bone","keyframes":[{"channel":"rotation","data_points":[{"x":"-2.5","y":"0","z":"0"}],"uuid":"a12df9b3-1bb5-f85f-cd29-c1d833a4083b","time":0,"color":-1,"interpolation":"linear"},{"channel":"rotation","data_points":[{"x":"-5","y":"0","z":"0"}],"uuid":"2caeda6c-3904-7e9a-ac45-278c455a00b8","time":0.72,"color":-1,"interpolation":"linear"},{"channel":"rotation","data_points":[{"x":"-2.5","y":"0","z":"0"}],"uuid":"7b2a6773-0830-e658-b98f-a24f691d59cf","time":1.44,"color":-1,"interpolation":"linear"}]},"6502f144-0905-ef6d-77a4-4d6f6c832582":{"name":"tail","type":"bone","keyframes":[{"channel":"rotation","data_points":[{"x":"0","y":"5","z":"0"}],"uuid":"de793c8b-db32-6813-ab51-c0da733c8178","time":0,"color":-1,"interpolation":"linear"},{"channel":"rotation","data_points":[{"x":"0","y":"5","z":"0"}],"uuid":"d8ac39a5-dc82-fc1b-a448-88ffe3fbf45a","time":1.44,"color":-1,"interpolation":"linear"},{"channel":"rotation","data_points":[{"x":"0","y":"-7.5","z":"0"}],"uuid":"5e01c8c4-d7a6-98c8-d3e7-d99930c8a74e","time":0.72,"color":-1,"interpolation":"linear"}]}}},{"uuid":"6b67c492-b0cc-1672-3b1c-5de6c2d23e77","name":"move","loop":"loop","override":false,"length":1.44,"snapping":25,"selected":false,"anim_time_update":"","blend_weight":"","start_delay":"","loop_delay":"","animators":{"5859ff96-7f22-f022-5634-74e9ddbda30f":{"name":"root","type":"bone","keyframes":[{"channel":"position","data_points":[{"x":"1","y":"0","z":"2"}],"uuid":"8cda900f-d10c-7618-92f5-c1cd6c9ae5c4","time":0,"color":-1,"interpolation":"linear"},{"channel":"position","data_points":[{"x":"0","y":"5","z":"-1"}],"uuid":"b6463f24-0648-6ae0-88b7-e841c01b730d","time":0.12,"color":-1,"interpolation":"linear"},{"channel":"position","data_points":[{"x":"-1","y":"0","z":"-1"}],"uuid":"86a97c35-5faa-d7ef-982b-d7ca7b8c177d","time":0.24,"color":-1,"interpolation":"linear"},{"channel":"position","data_points":[{"x":"-2","y":"0","z":"2"}],"uuid":"2fd43a6d-c710-e031-9732-94d86746502b","time":0.72,"color":-1,"interpolation":"linear"},{"channel":"position","data_points":[{"x":"0","y":"5","z":"-1"}],"uuid":"57b6a1ef-0c55-269c-1f00-afdc0918b181","time":0.84,"color":-1,"interpolation":"linear"},{"channel":"position","data_points":[{"x":"1","y":"0","z":"-1"}],"uuid":"2dd5e925-6cb6-8d81-4f8d-48f65b4ec006","time":0.96,"color":-1,"interpolation":"linear"},{"channel":"position","data_points":[{"x":"1","y":"0","z":"2"}],"uuid":"63c9dfd6-9898-8511-9473-954817e9cf8e","time":1.44,"color":-1,"interpolation":"linear"}]},"88720699-c6d7-c408-8ec2-c5ddd7227f0b":{"name":"Body","type":"bone","keyframes":[{"channel":"rotation","data_points":[{"x":"7.5283207965","y":"4.95711679","z":"0.6542642739"}],"uuid":"1671ea6a-b095-a26b-7304-e5df39c97022","time":0.12,"color":-1,"interpolation":"linear"},{"channel":"rotation","data_points":[{"x":"0","y":"0","z":"0"}],"uuid":"ca91aedc-1796-55d6-b2b9-9c32f9b90934","time":0,"color":-1,"interpolation":"linear"},{"channel":"rotation","data_points":[{"x":"7.5283207965","y":"-4.95711679","z":"-0.6542642739"}],"uuid":"5808eaf7-4d3b-f0d2-f00e-51494ef2132c","time":0.84,"color":-1,"interpolation":"linear"},{"channel":"rotation","data_points":[{"x":"0","y":"0","z":"0"}],"uuid":"0404b1b0-0255-0e90-f33f-ab06776eec70","time":0.24,"color":-1,"interpolation":"linear"},{"channel":"rotation","data_points":[{"x":"0","y":"0","z":"0"}],"uuid":"4114f4e6-ce10-38c8-4935-20c25720bdf7","time":0.72,"color":-1,"interpolation":"linear"},{"channel":"rotation","data_points":[{"x":"0","y":"0","z":"0"}],"uuid":"c34130e9-1ac6-c643-efdb-50f8fc31a6fb","time":0.96,"color":-1,"interpolation":"linear"},{"channel":"rotation","data_points":[{"x":"12.5094402655","y":"1.6523722633","z":"0.2180880913"}],"uuid":"4f1744db-52a0-7b22-e54d-ecd7f53af326","time":0.2,"color":-1,"interpolation":"linear"},{"channel":"rotation","data_points":[{"x":"15.018880531","y":"-3.3047445267","z":"-0.4361761826"}],"uuid":"4320bd01-5d42-6eae-aa32-d7df4dbf25d3","time":0.92,"color":-1,"interpolation":"linear"}]},"2232c700-b7a6-4729-b081-78ff34dfbc41":{"name":"Ljaw","type":"bone","keyframes":[{"channel":"rotation","data_points":[{"x":"25","y":"0","z":"0"}],"uuid":"cca380c4-1702-bbf4-ec96-384d19a85ea0","time":0.12,"color":-1,"interpolation":"linear"},{"channel":"rotation","data_points":[{"x":"0","y":"0","z":"0"}],"uuid":"311d826c-e7ad-1d2f-3c1c-64d7982f2300","time":0,"color":-1,"interpolation":"linear"},{"channel":"rotation","data_points":[{"x":"0","y":"0","z":"0"}],"uuid":"a2222357-8425-ae5f-c8da-bea86f996c53","time":0.32,"color":-1,"interpolation":"linear"},{"channel":"rotation","data_points":[{"x":"0","y":"0","z":"0"}],"uuid":"ef6ef43f-85be-8663-357d-8c206c2ac565","time":0.72,"color":-1,"interpolation":"linear"},{"channel":"rotation","data_points":[{"x":"0","y":"0","z":"0"}],"uuid":"1d9ce2b8-a33f-fad7-a9be-735d10333cf9","time":1.04,"color":-1,"interpolation":"linear"},{"channel":"rotation","data_points":[{"x":"25","y":"0","z":"0"}],"uuid":"9263e391-0ad4-6cfc-2b49-800ae8ed7cf4","time":0.84,"color":-1,"interpolation":"linear"}]},"51b17377-4d34-1e21-ed59-71314a4858c4":{"name":"UJaw","type":"bone","keyframes":[{"channel":"rotation","data_points":[{"x":"-25","y":"0","z":"0"}],"uuid":"15c13b71-07df-b6b2-5591-7093cd4b061e","time":0.12,"color":-1,"interpolation":"linear"},{"channel":"rotation","data_points":[{"x":"0","y":"0","z":"0"}],"uuid":"c17e2a73-a449-1cb7-d681-cd72470f7221","time":0,"color":-1,"interpolation":"linear"},{"channel":"rotation","data_points":[{"x":"0","y":"0","z":"0"}],"uuid":"585b7866-7eba-d2bb-88d9-deae443066e3","time":0.32,"color":-1,"interpolation":"linear"},{"channel":"rotation","data_points":[{"x":"0","y":"0","z":"0"}],"uuid":"0355a961-3968-b49a-b1ce-bf4454ca53c5","time":0.72,"color":-1,"interpolation":"linear"},{"channel":"rotation","data_points":[{"x":"0","y":"0","z":"0"}],"uuid":"cc959d9d-4c32-f5c4-a0ec-42643ea67784","time":1.04,"color":-1,"interpolation":"linear"},{"channel":"rotation","data_points":[{"x":"-30","y":"0","z":"0"}],"uuid":"8f37bb68-e309-6fa3-7b6d-a103f9422944","time":0.84,"color":-1,"interpolation":"linear"}]},"6502f144-0905-ef6d-77a4-4d6f6c832582":{"name":"tail","type":"bone","keyframes":[{"channel":"rotation","data_points":[{"x":"-10.0374230459","y":"-4.9238497548","z":"0.870384675"}],"uuid":"b62ac8a4-efef-23b6-71bd-ecbfd6c13431","time":0.12,"color":-1,"interpolation":"linear"},{"channel":"rotation","data_points":[{"x":"0","y":"0","z":"0"}],"uuid":"303a465c-d181-26bc-48d3-a41ff92f8c26","time":0,"color":-1,"interpolation":"linear"},{"channel":"rotation","data_points":[{"x":"-12.5462389525","y":"4.8811889482","z":"-1.08482395"}],"uuid":"0e612eb6-23db-4b47-8412-eb2785018bd7","time":0.84,"color":-1,"interpolation":"linear"},{"channel":"rotation","data_points":[{"x":"0","y":"0","z":"0"}],"uuid":"fed0b380-5b3c-0864-56c1-75b377c7395b","time":0.24,"color":-1,"interpolation":"linear"},{"channel":"rotation","data_points":[{"x":"0","y":"0","z":"0"}],"uuid":"b5f10a67-6e22-19d1-25b6-ca94d7613fec","time":0.72,"color":-1,"interpolation":"linear"},{"channel":"rotation","data_points":[{"x":"0","y":"0","z":"0"}],"uuid":"9a91e2da-a5a3-8d02-b1a3-82bd0ba78809","time":0.96,"color":-1,"interpolation":"linear"}]}}}]} \ No newline at end of file diff --git a/src/main/resources/assets/overdrive_that_matters/models/bread_monster.java b/src/main/resources/assets/overdrive_that_matters/models/bread_monster.java index 68d1a5f1f..5926248d2 100644 --- a/src/main/resources/assets/overdrive_that_matters/models/bread_monster.java +++ b/src/main/resources/assets/overdrive_that_matters/models/bread_monster.java @@ -34,7 +34,7 @@ public class bread_monster extends EntityModel { PartDefinition tail = Body.addOrReplaceChild("tail", CubeListBuilder.create().texOffs(0, 12).addBox(-4.0F, -3.0F, -0.1F, 8.0F, 6.0F, 6.0F, new CubeDeformation(-0.1F)), PartPose.offset(0.0F, 0.0F, 1.0F)); - return LayerDefinition.create(meshdefinition, 64, 64); + return LayerDefinition.create(meshdefinition, 64, 32); } @Override diff --git a/src/main/resources/assets/overdrive_that_matters/textures/models/bread_monster/bread_monster.png b/src/main/resources/assets/overdrive_that_matters/textures/models/bread_monster/bread_monster.png index 5409452a514051d225a868bcf07c4c7213c9a5bb..ba0c4d3c5010327fbcf0729aac24467dd55c2e78 100644 GIT binary patch literal 812 zcmeAS@N?(olHy`uVBq!ia0vp^4nVBH!3-p)I`?e@QjEnx?oJHr&dIz4a#+$GeH|GX zHuiJ>Nn{1`jRSl_T=#UUpPQ<^?x4l#2hQOMvZ>zUjeS~+Dph*YcOWHL666>B9}O_5uAP|#l;kY%h%9Dc;5!V$jK}j=qyPma zN?apKg7ec#$`gxH83GbB^GfvmTtgI0^$hile(zxhxp-S@glC$krxpVTki*I##mLIQ z2xNHyu{4wo@~H+RGgzDn$TnnTVh{k*Q9zv8&H@(C0jH>LQ-Ev`U;>)M1XdYjX#r$Gbr~8MfMj1@{bq6MR!$Yrwt7z& z#}E(irJ;$_n-zFgiypi?<>UYQw@Y)&p5L2o^X$_>N8hBz7fUQ%mStXwyd>1|isK(o ziqJ`~zt7oHOQ%d&t}UCud08c~U@3Fcuh-rW)RwL2W7r+OWJ>8y#?w&-fmfKGlqA|@ z|2@vwe5kAU#7m_YuXTCyt~G_$*e0`WcKV;sFw=ULquO%rz_SYX4?p0WdGJfNobibZ z`kFfr+p11yW8;0KUi`YUYyR_ud7D{3Rtcq>HtR21bMqcs$pHY~|qpg^K)(q+~REeq%K=L2&UmUll_o>?b<$w4YNl>zaS%b8PcU_Lj@c84vhun`^{2B(q=M>F8CH z-ZHX9xV16Ae<1d0VUxJ5zr~e!#;{z`+^W@EbJP8+`mfb7T010F-`Q|S9uzH}u6{1- HoD!MPx(LPZdKqN|)^>40c}M>Nn;vjhkvD$H<`@n{qQ z`p@?jO9ucjU4H@q5a|?cLtPDvtr=Y#;7GR57ORK`csk>`dZi)uD+|SYA>AfEu5c_n?MFgt|l&0PJRJozT%E zAk-z|uZo6CBIoGvZU)PY{L_uI+PRC8WoDmyRy1uV+oS7ifv@AApr_Z1MGudVPoP&L z+@=I=i+>@KAM`Zi1UF&nfXrGM%S$ST_Nz78Uw`i=#b<@(be57^@a8M{$K)ANfzoEh zb=98{+iGyI+h5oIa?oFs7~O0<0C4k9V;TVT^m>t5E2EU$YFe^V8QdglEQt7U%2B(6 zAf>jU#)8PKl@Dijw2SKcMw9meDy*Jy#H5 z7#tb6-GE8xFM4>KyC|WQ+%oNB#EGg=&<`roDI!~}9_scmUsD?pa`_7F=gse88GzSd zSow_4^j#++q~$$Y-xFsT4Kkv4n!bi0bf58=IzivZDVS#D$B6;W?l80+r#jcJoY2U< znSa)3RjpyE1no|K+eP>1okuRTEFEAL0qv{<)Ub&E{(W`izhmkEH5ROkfI{g2h0;OW zPj$>@zm+wJsRNdmRO$qB;mwg&|2u}`ogYqV<6|S*LUNj}ZF0YmoYwCAd|lJG&CO=G zE5qL-a{fzPKJUlO!wrsHbF-P2}68bkQ7&_vkbgBgVPk)0S?QsUQfXRutrYJJ*-haYPPQ*0;xH^^K z#>Ymq)0c7>+HWj#o%RnA27|$1Fc=I5gTY`h7z_r3!C){L3 Date: Wed, 26 Feb 2025 23:27:44 +0500 Subject: [PATCH 06/15] Matter entangler model --- .../mc/otm/datagen/blocks/BlockStates.kt | 1 + .../mc/otm/datagen/items/ItemModels.kt | 1 + .../otm/block/matter/MatterEntanglerBlock.kt | 8 + .../models/block/matter_entangler.json | 452 ++++++++++++++++++ .../models/block/matter_entangler_error.json | 7 + .../models/block/matter_entangler_idle.json | 7 + .../block/matter_entangler_working.json | 7 + .../models/block/matter_replicator.json | 32 +- .../textures/block/matter_entangler.png | Bin 0 -> 637 bytes .../block/matter_entangler_details.png | Bin 0 -> 788 bytes .../textures/block/matter_reconstructor.png | Bin 750 -> 980 bytes .../textures/block/matter_replicator.png | Bin 739 -> 743 bytes .../block/matter_replicator/black.png | Bin 1189 -> 1194 bytes .../textures/block/matter_replicator/blue.png | Bin 1189 -> 1194 bytes .../block/matter_replicator/brown.png | Bin 1189 -> 1194 bytes .../textures/block/matter_replicator/cyan.png | Bin 1189 -> 1194 bytes .../textures/block/matter_replicator/gray.png | Bin 1189 -> 1194 bytes .../block/matter_replicator/green.png | Bin 1189 -> 1194 bytes .../block/matter_replicator/light_blue.png | Bin 1189 -> 1194 bytes .../block/matter_replicator/light_gray.png | Bin 1189 -> 1194 bytes .../textures/block/matter_replicator/lime.png | Bin 1189 -> 1194 bytes .../block/matter_replicator/magenta.png | Bin 1189 -> 1194 bytes .../block/matter_replicator/orange.png | Bin 1189 -> 1194 bytes .../textures/block/matter_replicator/pink.png | Bin 1189 -> 1194 bytes .../block/matter_replicator/purple.png | Bin 1189 -> 1194 bytes .../textures/block/matter_replicator/red.png | Bin 1189 -> 1194 bytes .../block/matter_replicator/white.png | Bin 1189 -> 1194 bytes .../block/matter_replicator/yellow.png | Bin 1189 -> 1194 bytes .../block/matter_replicator_base/black.png | Bin 1177 -> 1177 bytes .../block/matter_replicator_base/blue.png | Bin 1177 -> 1177 bytes .../block/matter_replicator_base/brown.png | Bin 1177 -> 1177 bytes .../block/matter_replicator_base/cyan.png | Bin 1177 -> 1177 bytes .../block/matter_replicator_base/gray.png | Bin 1177 -> 1177 bytes .../block/matter_replicator_base/green.png | Bin 1177 -> 1177 bytes .../matter_replicator_base/light_blue.png | Bin 1177 -> 1177 bytes .../matter_replicator_base/light_gray.png | Bin 1177 -> 1177 bytes .../block/matter_replicator_base/lime.png | Bin 1177 -> 1177 bytes .../block/matter_replicator_base/magenta.png | Bin 1177 -> 1177 bytes .../block/matter_replicator_base/orange.png | Bin 1177 -> 1177 bytes .../block/matter_replicator_base/pink.png | Bin 1177 -> 1177 bytes .../block/matter_replicator_base/purple.png | Bin 1177 -> 1177 bytes .../block/matter_replicator_base/red.png | Bin 1177 -> 1177 bytes .../block/matter_replicator_base/white.png | Bin 1177 -> 1177 bytes .../block/matter_replicator_base/yellow.png | Bin 1177 -> 1177 bytes .../textures/block/screen_status_error.png | Bin 0 -> 370 bytes .../textures/block/screen_status_offline.png | Bin 0 -> 350 bytes .../textures/block/screen_status_ok.png | Bin 0 -> 372 bytes 47 files changed, 499 insertions(+), 16 deletions(-) create mode 100644 src/main/resources/assets/overdrive_that_matters/models/block/matter_entangler.json create mode 100644 src/main/resources/assets/overdrive_that_matters/models/block/matter_entangler_error.json create mode 100644 src/main/resources/assets/overdrive_that_matters/models/block/matter_entangler_idle.json create mode 100644 src/main/resources/assets/overdrive_that_matters/models/block/matter_entangler_working.json create mode 100644 src/main/resources/assets/overdrive_that_matters/textures/block/matter_entangler.png create mode 100644 src/main/resources/assets/overdrive_that_matters/textures/block/matter_entangler_details.png create mode 100644 src/main/resources/assets/overdrive_that_matters/textures/block/screen_status_error.png create mode 100644 src/main/resources/assets/overdrive_that_matters/textures/block/screen_status_offline.png create mode 100644 src/main/resources/assets/overdrive_that_matters/textures/block/screen_status_ok.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 020ff3dcb..09bd938aa 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 @@ -105,6 +105,7 @@ fun addBlockStates(provider: MatteryBlockStateProvider) { provider.block(MBlocks.MATTER_DECOMPOSER.values) provider.block(MBlocks.MATTER_REPLICATOR.values) + provider.block(MBlocks.MATTER_ENTANGLER) provider.block(MBlocks.PLATE_PRESS.values) provider.block(MBlocks.TWIN_PLATE_PRESS.values) provider.block(MBlocks.GRAVITATION_STABILIZER) 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 7bb327323..c461cc161 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 @@ -192,6 +192,7 @@ fun addItemModels(provider: MatteryItemModelProvider) { provider.coloredWithBaseBlock(MItems.MATTER_BOTTLER, "matter_bottler", "_idle") provider.coloredWithBaseBlock(MItems.MATTER_SCANNER, "matter_scanner", "_idle") provider.coloredWithBaseBlock(MItems.MATTER_REPLICATOR, "matter_replicator", "_idle") + provider.block(MItems.MATTER_ENTANGLER, "matter_entangler_idle") provider.coloredWithBaseBlock(MItems.DRIVE_VIEWER, "drive_viewer", "_idle") provider.coloredWithBaseBlock(MItems.MATTER_DECOMPOSER, "matter_decomposer", "_idle") provider.coloredWithBaseBlock(MItems.ENERGY_SERVO, "energy_servo") diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/block/matter/MatterEntanglerBlock.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/block/matter/MatterEntanglerBlock.kt index 9ba4d4452..2f727c31e 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/block/matter/MatterEntanglerBlock.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/block/matter/MatterEntanglerBlock.kt @@ -2,12 +2,15 @@ package ru.dbotthepony.mc.otm.block.matter import net.minecraft.core.BlockPos import net.minecraft.world.level.Level +import net.minecraft.world.level.block.Block import net.minecraft.world.level.block.EntityBlock import net.minecraft.world.level.block.entity.BlockEntity import net.minecraft.world.level.block.entity.BlockEntityTicker import net.minecraft.world.level.block.entity.BlockEntityType import net.minecraft.world.level.block.state.BlockState +import net.minecraft.world.level.block.state.StateDefinition import ru.dbotthepony.mc.otm.block.RotatableMatteryBlock +import ru.dbotthepony.mc.otm.block.entity.WorkerState import ru.dbotthepony.mc.otm.block.entity.matter.MatterEntanglerBlockEntity class MatterEntanglerBlock : RotatableMatteryBlock(DEFAULT_MACHINE_PROPERTIES), EntityBlock { @@ -20,6 +23,11 @@ class MatterEntanglerBlock : RotatableMatteryBlock(DEFAULT_MACHINE_PROPERTIES), return MatterEntanglerBlockEntity(blockPos, blockState) } + override fun createBlockStateDefinition(builder: StateDefinition.Builder) { + super.createBlockStateDefinition(builder) + builder.add(WorkerState.WORKER_STATE) + } + override fun getTicker(p_153212_: Level, p_153213_: BlockState, p_153214_: BlockEntityType): BlockEntityTicker? { if (p_153212_.isClientSide) return null return BlockEntityTicker { _, _, _, tile -> if (tile is MatterEntanglerBlockEntity) tile.tick() } diff --git a/src/main/resources/assets/overdrive_that_matters/models/block/matter_entangler.json b/src/main/resources/assets/overdrive_that_matters/models/block/matter_entangler.json new file mode 100644 index 000000000..c387d07f8 --- /dev/null +++ b/src/main/resources/assets/overdrive_that_matters/models/block/matter_entangler.json @@ -0,0 +1,452 @@ +{ + "texture_size": [32, 32], + "parent": "block/block", + "render_type": "cutout", + "textures": { + "0": "overdrive_that_matters:block/machine_base", + "1": "overdrive_that_matters:block/matter_entangler", + "2": "overdrive_that_matters:block/matter_entangler_details", + "status": "overdrive_that_matters:block/screen_status_ok", + "particle": "overdrive_that_matters:block/matter_entangler" + }, + "elements": [ + { + "name": "base", + "from": [0, 0, 0], + "to": [16, 5, 14], + "faces": { + "north": {"uv": [8, 9, 16, 11.5], "texture": "#1"}, + "east": {"uv": [1, 1, 8, 3.5], "texture": "#1"}, + "south": {"uv": [0, 8.5, 8, 11], "texture": "#1"}, + "west": {"uv": [0, 1, 7, 3.5], "texture": "#1"}, + "up": {"uv": [8, 0, 16, 8], "texture": "#1"}, + "down": {"uv": [0, 2, 16, 16], "texture": "#0"} + } + }, + { + "name": "base", + "from": [0, 0, 14], + "to": [2, 5, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [0, 0, 14]}, + "faces": { + "east": {"uv": [0, 1, 1, 3.5], "texture": "#1"}, + "south": {"uv": [0, 8.5, 1, 11], "texture": "#1"}, + "west": {"uv": [7, 1, 8, 3.5], "texture": "#1"}, + "down": {"uv": [0, 0, 2, 2], "texture": "#0"} + } + }, + { + "name": "base", + "from": [14, 0, 14], + "to": [16, 5, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [14, 0, 14]}, + "faces": { + "east": {"uv": [0, 1, 1, 3.5], "texture": "#1"}, + "south": {"uv": [0, 8.5, 1, 11], "texture": "#1"}, + "west": {"uv": [7, 1, 8, 3.5], "texture": "#1"}, + "down": {"uv": [14, 0, 16, 2], "texture": "#0"} + } + }, + { + "name": "chamber", + "from": [3, 6, 3], + "to": [13, 16, 13], + "rotation": {"angle": 0, "axis": "y", "origin": [7, 6, 7]}, + "faces": { + "north": {"uv": [0, 5, 5, 10], "texture": "#2"}, + "east": {"uv": [5, 5, 10, 10], "texture": "#2"}, + "south": {"uv": [5, 0, 10, 5], "texture": "#2"}, + "west": {"uv": [5, 5, 10, 10], "texture": "#2"}, + "up": {"uv": [0, 0, 5, 5], "rotation": 180, "texture": "#2"}, + "down": {"uv": [5, 5, 10, 10], "texture": "#2"} + } + }, + { + "name": "chamber", + "from": [13, 6, 3], + "to": [3, 16, 13], + "rotation": {"angle": 0, "axis": "y", "origin": [17, 6, 7]}, + "faces": { + "north": {"uv": [0, 5, 5, 10], "texture": "#2"}, + "east": {"uv": [5, 5, 10, 10], "texture": "#2"}, + "south": {"uv": [5, 0, 10, 5], "texture": "#2"}, + "west": {"uv": [5, 5, 10, 10], "texture": "#2"}, + "up": {"uv": [0, 0, 5, 5], "rotation": 180, "texture": "#2"}, + "down": {"uv": [5, 5, 10, 10], "texture": "#2"} + } + }, + { + "name": "base", + "from": [0, 7, 4], + "to": [2, 15, 12], + "rotation": {"angle": 0, "axis": "y", "origin": [0, 5, 4]}, + "faces": { + "north": {"uv": [4, 4.5, 8, 5.5], "rotation": 90, "texture": "#1"}, + "east": {"uv": [0, 3.5, 4, 7.5], "texture": "#1"}, + "south": {"uv": [4, 4.5, 8, 5.5], "rotation": 90, "texture": "#1"}, + "west": {"uv": [0, 3.5, 4, 7.5], "texture": "#1"}, + "up": {"uv": [4, 3.5, 8, 4.5], "rotation": 90, "texture": "#1"} + } + }, + { + "from": [2, 8, 5], + "to": [3, 14, 11], + "rotation": {"angle": 0, "axis": "y", "origin": [1, 5, 4]}, + "faces": { + "north": {"uv": [0.5, 4, 1, 7], "texture": "#1"}, + "south": {"uv": [0.5, 4, 1, 7], "texture": "#1"}, + "up": {"uv": [0.5, 4, 1, 7], "texture": "#1"}, + "down": {"uv": [0.5, 4, 1, 7], "texture": "#1"} + } + }, + { + "from": [13, 8, 5], + "to": [14, 14, 11], + "rotation": {"angle": 0, "axis": "y", "origin": [12, 4, 4]}, + "faces": { + "north": {"uv": [0.5, 4, 1, 7], "texture": "#1"}, + "south": {"uv": [0.5, 4, 1, 7], "texture": "#1"}, + "up": {"uv": [0.5, 4, 1, 7], "texture": "#1"}, + "down": {"uv": [0.5, 4, 1, 7], "texture": "#1"} + } + }, + { + "name": "base", + "from": [14, 7, 4], + "to": [16, 15, 12], + "rotation": {"angle": 0, "axis": "y", "origin": [14, 5, 4]}, + "faces": { + "north": {"uv": [4, 4.5, 8, 5.5], "rotation": 90, "texture": "#1"}, + "east": {"uv": [0, 3.5, 4, 7.5], "texture": "#1"}, + "south": {"uv": [4, 4.5, 8, 5.5], "rotation": 90, "texture": "#1"}, + "west": {"uv": [0, 3.5, 4, 7.5], "texture": "#1"}, + "up": {"uv": [4, 3.5, 8, 4.5], "rotation": 90, "texture": "#1"} + } + }, + { + "name": "base", + "from": [0, 5, 14], + "to": [16, 7, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [0, 5, 14]}, + "faces": { + "north": {"uv": [8, 7, 16, 8], "texture": "#1"}, + "east": {"uv": [0, 0, 1, 1], "texture": "#1"}, + "south": {"uv": [0, 7.5, 8, 8.5], "texture": "#1"}, + "west": {"uv": [7, 0, 8, 1], "texture": "#1"}, + "up": {"uv": [8, 7, 16, 8], "texture": "#1"}, + "down": {"uv": [0, 7.5, 8, 8.5], "rotation": 180, "texture": "#1"} + } + }, + { + "name": "base", + "from": [0, 5, 0], + "to": [16, 7, 2], + "rotation": {"angle": 0, "axis": "y", "origin": [0, 5, 0]}, + "faces": { + "north": {"uv": [8, 8, 16, 9], "texture": "#1"}, + "east": {"uv": [7, 0, 8, 1], "texture": "#1"}, + "south": {"uv": [8, 7, 16, 8], "texture": "#1"}, + "west": {"uv": [0, 0, 1, 1], "texture": "#1"}, + "up": {"uv": [8, 0, 16, 1], "texture": "#1"} + } + }, + { + "name": "base", + "from": [0, 5, 2], + "to": [2, 7, 14], + "rotation": {"angle": 0, "axis": "y", "origin": [0, 5, 2]}, + "faces": { + "east": {"uv": [9, 7, 15, 8], "texture": "#1"}, + "west": {"uv": [1, 0, 7, 1], "texture": "#1"}, + "up": {"uv": [8, 1, 9, 7], "texture": "#1"} + } + }, + { + "name": "base", + "from": [14, 5, 2], + "to": [16, 7, 14], + "rotation": {"angle": 0, "axis": "y", "origin": [14, 5, 2]}, + "faces": { + "east": {"uv": [1, 0, 7, 1], "texture": "#1"}, + "west": {"uv": [9, 7, 15, 8], "texture": "#1"}, + "up": {"uv": [15, 1, 16, 7], "texture": "#1"} + } + }, + { + "name": "keyboard", + "from": [2, 7, -1], + "to": [10, 8, 2], + "rotation": {"angle": -45, "axis": "x", "origin": [6, 7.5, 0.5]}, + "faces": { + "north": {"uv": [5, 15.5, 9, 16], "texture": "#2"}, + "east": {"uv": [4.5, 14, 5, 15.5], "rotation": 90, "texture": "#2"}, + "south": {"uv": [5, 13.5, 9, 14], "texture": "#2"}, + "west": {"uv": [9, 14, 9.5, 15.5], "rotation": 90, "texture": "#2"}, + "up": {"uv": [5, 14, 9, 15.5], "rotation": 180, "texture": "#2"}, + "down": {"uv": [0, 14.5, 4, 16], "texture": "#2"} + } + }, + { + "name": "screen", + "from": [11, 6, 0], + "to": [15, 10, 1], + "rotation": {"angle": 45, "axis": "x", "origin": [12.5, 7.5, 0.5]}, + "faces": { + "north": {"uv": [0, 10, 2, 12], "rotation": 180, "texture": "#2"}, + "east": {"uv": [2, 12, 4, 12.5], "rotation": 90, "texture": "#2"}, + "south": {"uv": [2, 12.5, 4, 14.5], "texture": "#2"}, + "west": {"uv": [2, 12, 4, 12.5], "rotation": 270, "texture": "#2"}, + "up": {"uv": [2, 12, 4, 12.5], "texture": "#2"}, + "down": {"uv": [2, 12, 4, 12.5], "rotation": 180, "texture": "#2"} + } + }, + { + "name": "screen_glow", + "from": [11, 6.05, -0.05], + "to": [15, 10.05, -0.05], + "rotation": {"angle": 45, "axis": "x", "origin": [12.5, 7.5, 0.5]}, + "faces": { + "north": {"uv": [0, 0, 16, 16], "texture": "#status", "neoforge_data": {"block_light": 15}} + } + }, + { + "name": "shield", + "from": [0, 8, 12], + "to": [16, 14, 14], + "rotation": {"angle": 0, "axis": "y", "origin": [0, 11, 12]}, + "faces": { + "east": {"uv": [8, 11.5, 7, 14.5], "texture": "#1"}, + "south": {"uv": [8, 11.5, 16, 14.5], "texture": "#1"}, + "west": {"uv": [7, 11.5, 8, 14.5], "texture": "#1"} + } + }, + { + "name": "shield", + "from": [0, 14, 12], + "to": [16, 8, 14], + "rotation": {"angle": 0, "axis": "y", "origin": [0, 17, 12]}, + "faces": { + "east": {"uv": [8, 11.5, 7, 14.5], "texture": "#1"}, + "south": {"uv": [8, 11.5, 16, 14.5], "texture": "#1"}, + "west": {"uv": [7, 11.5, 8, 14.5], "texture": "#1"} + } + }, + { + "name": "lower", + "from": [6.91342, 11.3806, 9.3], + "to": [8.91342, 15.3806, 10], + "rotation": {"angle": 22.5, "axis": "z", "origin": [8, 12, 9.675]}, + "faces": { + "north": {"uv": [13.5, 6.5, 15.5, 7.5], "rotation": 90, "texture": "#2"}, + "east": {"uv": [13.5, 7.5, 15.5, 8], "rotation": 270, "texture": "#2"}, + "south": {"uv": [13.5, 6.5, 15.5, 7.5], "rotation": 270, "texture": "#2"}, + "west": {"uv": [13.5, 6, 15.5, 6.5], "rotation": 270, "texture": "#2"}, + "up": {"uv": [13, 6.5, 13.5, 7.5], "rotation": 270, "texture": "#2"}, + "down": {"uv": [13, 6.5, 13.5, 7.5], "rotation": 270, "texture": "#2"} + } + }, + { + "name": "lower", + "from": [6.24264, 8.58579, 5.9], + "to": [10.24264, 10.58579, 6.6], + "rotation": {"angle": -45, "axis": "z", "origin": [10, 9, 6.275]}, + "faces": { + "north": {"uv": [13.5, 6.5, 15.5, 7.5], "texture": "#2"}, + "east": {"uv": [13, 6.5, 13.5, 7.5], "texture": "#2"}, + "south": {"uv": [13.5, 6.5, 15.5, 7.5], "texture": "#2"}, + "west": {"uv": [13, 6.5, 13.5, 7.5], "texture": "#2"}, + "up": {"uv": [13.5, 6, 15.5, 6.5], "texture": "#2"}, + "down": {"uv": [13.5, 7.5, 15.5, 8], "texture": "#2"} + } + }, + { + "name": "joint", + "from": [2, 11, 8.7], + "to": [4, 13, 10.7], + "rotation": {"angle": -22.5, "axis": "z", "origin": [3, 12, 9.675]}, + "faces": { + "north": {"uv": [11, 5, 12, 6], "texture": "#2"}, + "east": {"uv": [10, 5, 11, 6], "texture": "#2"}, + "south": {"uv": [11, 5, 12, 6], "texture": "#2"}, + "west": {"uv": [10, 5, 11, 6], "texture": "#2"}, + "up": {"uv": [10, 5, 11, 6], "texture": "#2"}, + "down": {"uv": [10, 5, 11, 6], "texture": "#2"} + } + }, + { + "name": "joint", + "from": [12, 12, 5.3], + "to": [14, 14, 7.3], + "rotation": {"angle": 45, "axis": "z", "origin": [13, 13, 6.275]}, + "faces": { + "north": {"uv": [11, 5, 12, 6], "texture": "#2"}, + "east": {"uv": [10, 5, 11, 6], "texture": "#2"}, + "south": {"uv": [11, 5, 12, 6], "texture": "#2"}, + "west": {"uv": [10, 5, 11, 6], "texture": "#2"}, + "up": {"uv": [10, 5, 11, 6], "texture": "#2"}, + "down": {"uv": [10, 5, 11, 6], "texture": "#2"} + } + }, + { + "name": "upper", + "from": [3, 12, 9.2], + "to": [8, 14, 10.2], + "rotation": {"angle": -22.5, "axis": "z", "origin": [3, 12, 9.675]}, + "faces": { + "north": {"uv": [10.5, 6.5, 13, 7.5], "texture": "#2"}, + "east": {"uv": [10, 6.5, 10.5, 7.5], "texture": "#2"}, + "south": {"uv": [10.5, 6.5, 13, 7.5], "texture": "#2"}, + "west": {"uv": [10, 6.5, 10.5, 7.5], "texture": "#2"}, + "up": {"uv": [10.5, 6, 13, 6.5], "texture": "#2"}, + "down": {"uv": [10.5, 7.5, 13, 8], "texture": "#2"} + } + }, + { + "name": "upper", + "from": [11, 8, 5.8], + "to": [13, 13, 6.8], + "rotation": {"angle": -22.5, "axis": "z", "origin": [13, 13, 6.275]}, + "faces": { + "north": {"uv": [10.5, 6.5, 13, 7.5], "rotation": 90, "texture": "#2"}, + "east": {"uv": [10.5, 7.5, 13, 8], "rotation": 270, "texture": "#2"}, + "south": {"uv": [10.5, 6.5, 13, 7.5], "rotation": 270, "texture": "#2"}, + "west": {"uv": [10.5, 6, 13, 6.5], "rotation": 270, "texture": "#2"}, + "up": {"uv": [10, 6.5, 10.5, 7.5], "rotation": 270, "texture": "#2"}, + "down": {"uv": [10, 6.5, 10.5, 7.5], "rotation": 270, "texture": "#2"} + } + }, + { + "name": "upper", + "from": [6.77817, 6.87868, 5.8], + "to": [8.77817, 11.87868, 6.8], + "rotation": {"angle": -22.5, "axis": "z", "origin": [8, 12, 6.275]}, + "faces": { + "north": {"uv": [10.5, 6.5, 13, 7.5], "rotation": 90, "texture": "#2"}, + "east": {"uv": [10.5, 7.5, 13, 8], "rotation": 270, "texture": "#2"}, + "south": {"uv": [10.5, 6.5, 13, 7.5], "rotation": 270, "texture": "#2"}, + "west": {"uv": [10.5, 6, 13, 6.5], "rotation": 270, "texture": "#2"}, + "up": {"uv": [10, 6.5, 10.5, 7.5], "rotation": 270, "texture": "#2"}, + "down": {"uv": [10, 6.5, 10.5, 7.5], "rotation": 270, "texture": "#2"} + } + }, + { + "name": "upper", + "from": [6.68925, 14.22628, 9.2], + "to": [11.68925, 16.22628, 10.2], + "rotation": {"angle": -45, "axis": "z", "origin": [7, 15, 9.675]}, + "faces": { + "north": {"uv": [10.5, 6.5, 13, 7.5], "texture": "#2"}, + "east": {"uv": [10, 6.5, 10.5, 7.5], "texture": "#2"}, + "south": {"uv": [10.5, 6.5, 13, 7.5], "texture": "#2"}, + "west": {"uv": [10, 6.5, 10.5, 7.5], "texture": "#2"}, + "up": {"uv": [10.5, 6, 13, 6.5], "texture": "#2"}, + "down": {"uv": [10.5, 7.5, 13, 8], "texture": "#2"} + } + }, + { + "name": "pointer", + "from": [9.22628, 10.55339, 9.3], + "to": [10.22628, 11.55339, 10.1], + "rotation": {"angle": 0, "axis": "y", "origin": [10, 12, 9.675]}, + "faces": { + "north": {"uv": [10.5, 8.5, 11, 9], "texture": "#2"}, + "east": {"uv": [10, 8.5, 10.4, 9], "texture": "#2"}, + "south": {"uv": [10.5, 8.5, 11, 9], "texture": "#2"}, + "west": {"uv": [10, 8.5, 10.4, 9], "texture": "#2"}, + "up": {"uv": [10.5, 8, 11, 8.4], "texture": "#2"} + } + }, + { + "name": "pointer_glow", + "from": [9.22628, 9.55339, 9.3], + "to": [10.22628, 10.55339, 10.1], + "rotation": {"angle": 0, "axis": "y", "origin": [10, 12, 9.675]}, + "faces": { + "north": {"uv": [10.5, 9, 11, 9.5], "texture": "#2", "neoforge_data": {"block_light": 15}}, + "east": {"uv": [10, 9, 10.4, 9.5], "texture": "#2", "neoforge_data": {"block_light": 15}}, + "south": {"uv": [10.5, 9, 11, 9.5], "texture": "#2", "neoforge_data": {"block_light": 15}}, + "west": {"uv": [10, 9, 10.4, 9.5], "texture": "#2", "neoforge_data": {"block_light": 15}}, + "down": {"uv": [10.5, 9.5, 11, 9.9], "texture": "#2", "neoforge_data": {"block_light": 15}} + } + }, + { + "name": "pointer", + "from": [7.77817, 5.87868, 5.9], + "to": [8.77817, 6.87868, 6.7], + "rotation": {"angle": -22.5, "axis": "z", "origin": [8, 12, 6.275]}, + "faces": { + "north": {"uv": [10.5, 8.5, 11, 9], "texture": "#2"}, + "east": {"uv": [10, 8.5, 10.4, 9], "texture": "#2"}, + "south": {"uv": [10.5, 8.5, 11, 9], "texture": "#2"}, + "west": {"uv": [10, 8.5, 10.4, 9], "texture": "#2"}, + "up": {"uv": [10.5, 8, 11, 8.4], "texture": "#2"} + } + }, + { + "name": "pointer_glow", + "from": [7.77817, 4.87868, 5.9], + "to": [8.77817, 5.87868, 6.7], + "rotation": {"angle": -22.5, "axis": "z", "origin": [8, 12, 6.275]}, + "faces": { + "north": {"uv": [10.5, 9, 11, 9.5], "texture": "#2", "neoforge_data": {"block_light": 15}}, + "east": {"uv": [10, 9, 10.4, 9.5], "texture": "#2", "neoforge_data": {"block_light": 15}}, + "south": {"uv": [10.5, 9, 11, 9.5], "texture": "#2", "neoforge_data": {"block_light": 15}}, + "west": {"uv": [10, 9, 10.4, 9.5], "texture": "#2", "neoforge_data": {"block_light": 15}}, + "down": {"uv": [10.5, 9.5, 11, 9.9], "texture": "#2", "neoforge_data": {"block_light": 15}} + } + }, + { + "name": "canister", + "from": [2, 1, 13.5], + "to": [3, 4, 15.5], + "rotation": {"angle": 0, "axis": "y", "origin": [2, 2, 13.5]}, + "faces": { + "south": {"uv": [4.5, 12, 5, 13.5], "texture": "#2"}, + "up": {"uv": [4.5, 11, 5, 12], "texture": "#2"}, + "down": {"uv": [4.5, 12, 5, 11], "texture": "#2"} + } + }, + { + "name": "canister", + "from": [13, 1, 13.5], + "to": [14, 4, 15.5], + "rotation": {"angle": 0, "axis": "y", "origin": [13, 2, 13.5]}, + "faces": { + "south": {"uv": [10, 12, 10.5, 13.5], "texture": "#2"}, + "up": {"uv": [10, 11, 10.5, 12], "texture": "#2"}, + "down": {"uv": [10, 12, 10.5, 11], "texture": "#2"} + } + }, + { + "name": "canister_glow", + "from": [3, 1, 13.5], + "to": [13, 4, 15.5], + "rotation": {"angle": 0, "axis": "y", "origin": [2, 2, 13.5]}, + "faces": { + "south": {"uv": [5, 12, 10, 13.5], "texture": "#2", "neoforge_data": {"block_light": 15}}, + "up": {"uv": [5, 11, 10, 12], "texture": "#2", "neoforge_data": {"block_light": 15}}, + "down": {"uv": [5, 13.5, 10, 12.5], "texture": "#2", "neoforge_data": {"block_light": 15}} + } + }, + { + "name": "wires", + "from": [15, 9, 11], + "to": [15, 17, 17], + "rotation": {"angle": 22.5, "axis": "y", "origin": [15, 13, 12]}, + "faces": { + "east": {"uv": [10.5, 12, 13.5, 16], "texture": "#2"}, + "west": {"uv": [13.5, 12, 10.5, 16], "texture": "#2"} + } + }, + { + "name": "wires", + "from": [15, 10, 11], + "to": [15, 18, 17], + "rotation": {"angle": 0, "axis": "y", "origin": [15, 14, 12]}, + "faces": { + "east": {"uv": [11, 8, 14, 12], "texture": "#2"}, + "west": {"uv": [14, 8, 11, 12], "texture": "#2"} + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/overdrive_that_matters/models/block/matter_entangler_error.json b/src/main/resources/assets/overdrive_that_matters/models/block/matter_entangler_error.json new file mode 100644 index 000000000..fd3dc6733 --- /dev/null +++ b/src/main/resources/assets/overdrive_that_matters/models/block/matter_entangler_error.json @@ -0,0 +1,7 @@ +{ + "parent": "overdrive_that_matters:block/matter_entangler, + "texture_size": [32, 32], + "textures": { + "status": "overdrive_that_matters:block/screen_status_error" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/overdrive_that_matters/models/block/matter_entangler_idle.json b/src/main/resources/assets/overdrive_that_matters/models/block/matter_entangler_idle.json new file mode 100644 index 000000000..4ea3ac6cf --- /dev/null +++ b/src/main/resources/assets/overdrive_that_matters/models/block/matter_entangler_idle.json @@ -0,0 +1,7 @@ +{ + "parent": "overdrive_that_matters:block/matter_entangler", + "texture_size": [32, 32], + "textures": { + "status": "overdrive_that_matters:block/screen_status_offline" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/overdrive_that_matters/models/block/matter_entangler_working.json b/src/main/resources/assets/overdrive_that_matters/models/block/matter_entangler_working.json new file mode 100644 index 000000000..1db035e11 --- /dev/null +++ b/src/main/resources/assets/overdrive_that_matters/models/block/matter_entangler_working.json @@ -0,0 +1,7 @@ +{ + "parent": "overdrive_that_matters:block/matter_entangler", + "texture_size": [32, 32], + "textures": { + "status": "overdrive_that_matters:block/screen_status_ok" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/overdrive_that_matters/models/block/matter_replicator.json b/src/main/resources/assets/overdrive_that_matters/models/block/matter_replicator.json index 6aa7e9bd7..d0d75728d 100644 --- a/src/main/resources/assets/overdrive_that_matters/models/block/matter_replicator.json +++ b/src/main/resources/assets/overdrive_that_matters/models/block/matter_replicator.json @@ -185,9 +185,9 @@ "from": [5, 11, 11], "to": [14, 15, 15], "faces": { - "north": {"uv": [11, 0, 15.5, 2], "rotation": 180, "texture": "#texture", "neoforge_data": {"block_light": 15}}, - "south": {"uv": [11, 0, 15.5, 2], "texture": "#texture", "neoforge_data": {"block_light": 15}}, - "up": {"uv": [11, 0, 15.5, 2], "texture": "#texture", "neoforge_data": {"block_light": 15}} + "north": {"uv": [11, 0, 15.5, 2], "rotation": 180, "texture": "#texture"}, + "south": {"uv": [11, 0, 15.5, 2], "texture": "#texture"}, + "up": {"uv": [11, 0, 15.5, 2], "texture": "#texture"} } }, { @@ -195,9 +195,9 @@ "from": [5, 11, 6], "to": [14, 15, 10], "faces": { - "south": {"uv": [11, 0, 15.5, 2], "texture": "#texture", "neoforge_data": {"block_light": 15}}, - "up": {"uv": [11, 0, 15.5, 2], "texture": "#texture", "neoforge_data": {"block_light": 15}}, - "down": {"uv": [0, 0, 6, 1], "texture": "#missing", "neoforge_data": {"block_light": 15}} + "south": {"uv": [11, 0, 15.5, 2], "texture": "#texture"}, + "up": {"uv": [11, 0, 15.5, 2], "texture": "#texture"}, + "down": {"uv": [0, 0, 6, 1], "texture": "#missing"} } }, { @@ -292,11 +292,11 @@ }, { "name": "monitor", - "from": [9, 8, 0], - "to": [15, 13, 0], - "rotation": {"angle": 0, "axis": "y", "origin": [13, 11, -2]}, + "from": [9, 8, -0.1], + "to": [15, 13, -0.1], + "rotation": {"angle": 0, "axis": "y", "origin": [13, 11, -2.05]}, "faces": { - "north": {"uv": [0, 3.2, 9.56, 11.14], "texture": "#status", "neoforge_data": {"block_light": 15}} + "north": {"uv": [0, 3.2, 9.56, 11.14], "texture": "#status"} } }, { @@ -305,7 +305,7 @@ "to": [13, 5, 16.1], "rotation": {"angle": 0, "axis": "y", "origin": [7, 7, 14.05]}, "faces": { - "south": {"uv": [0, 0, 16, 1.62], "texture": "#status", "neoforge_data": {"block_light": 15}} + "south": {"uv": [0, 0, 16, 1.62], "texture": "#status"} } }, { @@ -314,7 +314,7 @@ "to": [12.5, 2.05, 4.5], "rotation": {"angle": 0, "axis": "y", "origin": [6.5, 5, 3.5]}, "faces": { - "up": {"uv": [13.2, 3.9, 15.3, 6], "texture": "#status", "neoforge_data": {"block_light": 15}} + "up": {"uv": [13.2, 3.9, 15.3, 6], "texture": "#status"} } }, { @@ -323,7 +323,7 @@ "to": [4.5, 2.05, 4.5], "rotation": {"angle": 0, "axis": "y", "origin": [-1.5, 5, 3.5]}, "faces": { - "up": {"uv": [13.2, 3.9, 15.3, 6], "texture": "#status", "neoforge_data": {"block_light": 15}} + "up": {"uv": [13.2, 3.9, 15.3, 6], "texture": "#status"} } }, { @@ -332,7 +332,7 @@ "to": [4.5, 2.05, 12.5], "rotation": {"angle": 0, "axis": "y", "origin": [-1.5, 5, 11.5]}, "faces": { - "up": {"uv": [13.2, 3.9, 15.3, 6], "texture": "#status", "neoforge_data": {"block_light": 15}} + "up": {"uv": [13.2, 3.9, 15.3, 6], "texture": "#status"} } }, { @@ -341,7 +341,7 @@ "to": [12.5, 2.05, 12.5], "rotation": {"angle": 0, "axis": "y", "origin": [6.5, 5, 11.5]}, "faces": { - "up": {"uv": [13.2, 3.9, 15.3, 6], "texture": "#status", "neoforge_data": {"block_light": 15}} + "up": {"uv": [13.2, 3.9, 15.3, 6], "texture": "#status"} } }, { @@ -350,7 +350,7 @@ "to": [13, 7, 16.1], "rotation": {"angle": 0, "axis": "y", "origin": [7, 9, 14.05]}, "faces": { - "south": {"uv": [0, 0, 16, 1.62], "texture": "#status", "neoforge_data": {"block_light": 15}} + "south": {"uv": [0, 0, 16, 1.62], "texture": "#status"} } } ] diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/matter_entangler.png b/src/main/resources/assets/overdrive_that_matters/textures/block/matter_entangler.png new file mode 100644 index 0000000000000000000000000000000000000000..8ee48bedc29e94d2404658f260152573b866ba40 GIT binary patch literal 637 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCilo1AIbUbDR1@QgUPStI{f4w6(QOO-;qb#6m(s)YQ}x5)vXKBjx1efNBGz z!rXuqZ%L3}@P8!0VEaO;4Jg4`;1OBOz`(a3gc&VZgH?cn5+$w?CBgY=CFO}lsSE*$ znRz98ey$-3rh0~YM!)wkZv(2?mKx!i=IN=$zyaj2GDtD9GB5&JUO+4jWrKXC!N?32 zX9BVf8JQRafOHfPXSTC|#j}8H5a=yqWOxA#02qyCDFaYy0y_f>P^E#9u>s=(h^ZhO zSr{&803_SVf7iK=ZI3XJ`M}e~F~q|E=p=8x!wNhu z2d|h4ysN+0*W3DI$*D!%`!qNwwHtm^dE?^X^6Nq>Pp0xdnQiJU6Z{=M%rj`LmY$L! z8gO74r^!85rJGWlzMWBOU*Ius!ltbq3$Fxuu~xjy5;c%9YX0NPz`n0&pM=_qE{=`Y zdA6+J>E>xP+a)|jZ^cke-LRa+m&HdOOm jomMYkBm3z|xMQ|_RiM=3I6s*eAb)$h`njxgN@xNAJ-E0z literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/matter_entangler_details.png b/src/main/resources/assets/overdrive_that_matters/textures/block/matter_entangler_details.png new file mode 100644 index 0000000000000000000000000000000000000000..82d71662fd9fef4f72f7d5b07b28855f2ab329a7 GIT binary patch literal 788 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCijA1AIbUw{PD*ZQ8Wkw{QRd|KHTqbj6AlYHDhck&y`r3CFgC%gM>Do$J%r zXcrO^;{JcPn3&lA8w~#+c$y!Zu$6(~KLbO3ef@SjyLqOj?Yg?wrlvqs?X+7#PLeJO z@(Tu{28%NR*@lcv z3<5wp3Wzh?S-|31KsE^UmN7EC00tb4MzfRwC^dndfd#12z{uEuaRJ0skd3ShASO)# zvO$0eXf6|2Wss!>kOkFcXkY-6?c~4fT*tOY7#KD7o-U3d7XGc1IExM|@VMSgnUbLH zH+SjPzx+|29Ky5AYUh3Ix%gQ5z&rCld=rZmTO^Wt{14knhAOC9HCV|XSnl~#@kUOf zfRcD5N4=Uy=#p~IL%&%>bGCh`Z(7*&Hp%0LWQ(7dSE)HGg>#^Fa|ArbnZ-5 zWccrUnQffYyKBp%_^X}lYPT$(S8Q6vRJQQmly4q+yYp`Ie*C5t60sxh>jn3R|6Uy0 zwwJ4X(eZR)oyIRk5|U{L3qA!Ye*VAce8vv_X69K7TlccB-mFkRJL22+nHO6Zvb$BQ Z{9=b$b#xJG%x_kF4x$%?ziZ{H$Zj#o-U3d9^SoE8_PCcm1F_{b15;i delta 22 ecmcb@{*HCRUamt7419+eMK!z{Hm_w=X956U6bDKG diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/matter_replicator.png b/src/main/resources/assets/overdrive_that_matters/textures/block/matter_replicator.png index d61b67e7ea63a199322527e59f3637a9e5ade2cf..526989bde563d73b1e3c756364172def1552629c 100644 GIT binary patch delta 412 zcmV;N0b~B-1?L5jK_fFzOjJcwR8(MKV1IvqH8nMIa&kxiyEn#=Sy@>oCMEy?0Fhx8 zAu4=G0{{R35p+^cQ~&?}|NsC0|NsC0|NsC0{{SVenPRb)2LXTCcE%tGgh6aWHQW0? zZHLADrpZOeoMUu80T&`-VkSCMMWj^v`p#D2o0ba@710k+h!*oF0EF@k{J56%pD8#1 zPX8fV5)dnf1j?V$WeRS+_tx4<=r3Vn09j;f++$dqKE)|;>`J&r>T5p;lo>Y*u2 zU|9}a7R>H*AwOi3XA-H!RPCtkx_A2mg5*&fK|L@~OjJcwR8(MKV1IvqH8nMIa&kxiyEn#=Sy@>oCMITigl&S4 zU2l3878b^|S1T(k0000Qji=WD000n?ffEG);3Hibv6=?~f9saRAP9s(+zlF&y#L#F zxY(L)e(a>@P?=A`3lT9f6J4nyQY!uY=2zjHwl^Ruq933TZRRfk2;~)s{1)M%1V=u@ zwcaC+jWCTUoJZ{8TKmh8xlT<^aH52xL2zaAc>*@6u(Q$7TRWs z38)(2J~IF;LANHY&!Pz^R>(IcadzJ;aK0%SY~KVvNIgtIaR>O+f!i*!MD%Dbw4Q_Y z<+<>4u$<&0uqfZ+KY;MFheae6h43f+Cm`F i0*0t8kd#yBPc!vFvP07*qoM6N<$ Ef|(|?^@R5;6pl8bW1AP7VS zv6YgW>qeocKM8w2QltNh~7y9~+Q4)5cdI6#$dILF8_5BF|p*#aW zP4#06?f|DxssV_bA%Ws2rjdee+cq$sa)2`4IUR%a9SM{?kgfvjGAS0Teb=F*rIhH99jhD=;uR nFfapui@cL110WPOR53U@GB-LhH7hVMIxsN*4P78Vx9v{x%DEC2uh>AJT2k&hJx5S6kG zERm@oe;5lgCsy6U0RR92CrLy>R5;6pk_nQ;AP7YTaYjfdx&LkFqnK!K^G%g0e6mR* zVqzvrp)8UM{rtu%38zrK08tUWft;xN`2>Jao`G(!A471rbNZyX%Hqk8K=BjX2*I{( zo0&bx{4WH<0Ae#^qgEJs{p3Js0A#dZqRn8Me>2(uuv}t$1rX%+(12|Pj$`()A5VbU zvClai03I{&Fx8emw>FR}fJG=$&-0X11RLPQFlYz{T+>O!-iM0Urjb`XY00kQt*(6@ zF2H*xyH5qaT~a#-u>i%Lw`gSmBt2*cvQSuasw2bzP#J)JjirqoElGNwSp!gbpgv5} zJ$v`+fvE<-z6NmTFaX6HU}*!EDk8+_UAVjZa5ZmK@!ZL`z&rg5EIBMUOKCyA0FllI z&wp2D5AnB{PkFNj0uTWdG*mG$IxsdmGczkNFgh?Wuo0&9lPUus6f{&ZF*-FcIx{&d RFfckWFh4y6VY6NXOabKWt=0el diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/matter_replicator/blue.png b/src/main/resources/assets/overdrive_that_matters/textures/block/matter_replicator/blue.png index 500bd685a3b18c3821a8fa6a2e58fdacffadffe9..e81f098606db396b2618caead334c22126f78820 100644 GIT binary patch delta 445 zcmV;u0Yd(z391Q@PysfPQ6e?~001m5hA%OXC@Omv78b^|S1T(k|Ns99LaH|a0004W zQchC^@R5;6pl8bW1AP7VS zv6YgW>qeocKM8w2QltNh~7y9~+Q4)5cdI6#$dILF8_5BF|p*#aW zP4#06?f|DxssV_bA%Ws2rjdee+cq$sa)2`4IUR%a9SM{?kgfvjGAS0Teb=F*rIhH99jhD=;uR nFfapui@cL110WPOR53U@GB-LhG%GMLIxsLEE`~2Lk0>g878Vx9v{x%DEC2uh)cP@+k&hJx5S6kG zERm@oe;5lgCsy6U0RR92CrLy>R5;6pk_nQ;AP7YTaYjfdx&LkFqnK!K^G%g0e6mR* zVqzvrp)8UM{rtu%38zrK08tUWft;xN`2>Jao`G(!A471rbNZyX%Hqk8K=BjX2*I{( zo0&bx{4WH<0Ae#^qgEJs{p3Js0A#dZqRn8Me>2(uuv}t$1rX%+(12|Pj$`()A5VbU zvClai03I{&Fx8emw>FR}fJG=$&-0X11RLPQFlYz{T+>O!-iM0Urjb`XY00kQt*(6@ zF2H*xyH5qaT~a#-u>i%Lw`gSmBt2*cvQSuasw2bzP#J)JjirqoElGNwSp!gbpgv5} zJ$v`+fvE<-z6NmTFaX6HU}*!EDk8+_UAVjZa5ZmK@!ZL`z&rg5EIBMUOKCyA0FllI z&wp2D5AnB{PkFNj0uTWdG*mG$IxsdmGczkNFgh?Wuo0&9lPUus6f{&ZF*-FcIx{&d RFfckWFh4y6VY6NXOaWe*uDbvL diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/matter_replicator/brown.png b/src/main/resources/assets/overdrive_that_matters/textures/block/matter_replicator/brown.png index 80f9f49fe6c9d7c11379fc196a5c6efe15f78b3b..81819efd1520fa03a5d85bd4e2db1195abf1b89e 100644 GIT binary patch delta 445 zcmV;u0Yd(z391Q@PysfPQ6e?~003e=BWgk=S~wsU78b^|S1T(k|NsB;ah;q10004W zQchC^@R5;6pl8bW1AP7VS zv6YgW>qeocKM8w2QltNh~7y9~+Q4)5cdI6#$dILF8_5BF|p*#aW zP4#06?f|DxssV_bA%Ws2rjdee+cq$sa)2`4IUR%a9SM{?kgfvjGAS0Teb=F*rIhH99jhD=;uR nFfapui@cL110WPOR53U@GB-LhH7hVMIxsN*)JtJyDC0aNj78Vx9v{x%DEC2uhFUbZmk&hJx5S6kG zERm@oe;5lgCsy6U0RR92CrLy>R5;6pk_nQ;AP7YTaYjfdx&LkFqnK!K^G%g0e6mR* zVqzvrp)8UM{rtu%38zrK08tUWft;xN`2>Jao`G(!A471rbNZyX%Hqk8K=BjX2*I{( zo0&bx{4WH<0Ae#^qgEJs{p3Js0A#dZqRn8Me>2(uuv}t$1rX%+(12|Pj$`()A5VbU zvClai03I{&Fx8emw>FR}fJG=$&-0X11RLPQFlYz{T+>O!-iM0Urjb`XY00kQt*(6@ zF2H*xyH5qaT~a#-u>i%Lw`gSmBt2*cvQSuasw2bzP#J)JjirqoElGNwSp!gbpgv5} zJ$v`+fvE<-z6NmTFaX6HU}*!EDk8+_UAVjZa5ZmK@!ZL`z&rg5EIBMUOKCyA0FllI z&wp2D5AnB{PkFNj0uTWdG*mG$IxsdmGczkNFgh?Wuo0&9lPUus6f{&ZF*-FcIx{&d RFfckWFh4y6VY6NXOaZVXtoi@| diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/matter_replicator/cyan.png b/src/main/resources/assets/overdrive_that_matters/textures/block/matter_replicator/cyan.png index 1430faf97e80e3ef0de1c1c0e83fd21682891b8c..5db7745c3ec471a18718b3b967e2402cafe8ddb1 100644 GIT binary patch delta 445 zcmV;u0Yd(z391Q@PysfPQ6e?~000woeH46#5o&W578b^|S1T(k|NsB)rj|AU0004W zQchC^@R5;6pl8bW1AP7VS zv6YgW>qeocKM8w2QltNh~7y9~+Q4)5cdI6#$dILF8_5BF|p*#aW zP4#06?f|DxssV_bA%Ws2rjdee+cq$sa)2`4IUR%a9SM{?kgfvjGAS0Teb=F*rIhH99jhD=;uR nFfapui@cL110WPOR53U@GB-LhG%GMLIxsLR5;6pk_nQ;AP7YTaYjfdx&LkFqnK!K^G%g0e6mR* zVqzvrp)8UM{rtu%38zrK08tUWft;xN`2>Jao`G(!A471rbNZyX%Hqk8K=BjX2*I{( zo0&bx{4WH<0Ae#^qgEJs{p3Js0A#dZqRn8Me>2(uuv}t$1rX%+(12|Pj$`()A5VbU zvClai03I{&Fx8emw>FR}fJG=$&-0X11RLPQFlYz{T+>O!-iM0Urjb`XY00kQt*(6@ zF2H*xyH5qaT~a#-u>i%Lw`gSmBt2*cvQSuasw2bzP#J)JjirqoElGNwSp!gbpgv5} zJ$v`+fvE<-z6NmTFaX6HU}*!EDk8+_UAVjZa5ZmK@!ZL`z&rg5EIBMUOKCyA0FllI z&wp2D5AnB{PkFNj0uTWdG*mG$IxsdmGczkNFgh?Wuo0&9lPUus6f{&ZF*-FcIx{&d RFfckWFh4y6VY6NXOaYN-t%m>r diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/matter_replicator/gray.png b/src/main/resources/assets/overdrive_that_matters/textures/block/matter_replicator/gray.png index 8abb7268c54a0be949b0383941fc8843c757bc27..2423c7938044e307ceff8d57acd0e39b63ba1508 100644 GIT binary patch delta 445 zcmV;u0Yd(z391Q@PysfPQ6e?~001>PJUKl^@R5;6pl8bW1AP7VS zv6YgW>qeocKM8w2QltNh~7y9~+Q4)5cdI6#$dILF8_5BF|p*#aW zP4#06?f|DxssV_bA%Ws2rjdee+cq$sa)2`4IUR%a9SM{?kgfvjGAS0Teb=F*rIhH99jhD=;uR nFfapui@cL110WPOR53U@GB-LhG%GMLIxsLNIXpQ%K`}Hp78Vx9v{x%DEC2uhslJBik&hJx5S6kG zERm@oe;5lgCsy6U0RR92CrLy>R5;6pk_nQ;AP7YTaYjfdx&LkFqnK!K^G%g0e6mR* zVqzvrp)8UM{rtu%38zrK08tUWft;xN`2>Jao`G(!A471rbNZyX%Hqk8K=BjX2*I{( zo0&bx{4WH<0Ae#^qgEJs{p3Js0A#dZqRn8Me>2(uuv}t$1rX%+(12|Pj$`()A5VbU zvClai03I{&Fx8emw>FR}fJG=$&-0X11RLPQFlYz{T+>O!-iM0Urjb`XY00kQt*(6@ zF2H*xyH5qaT~a#-u>i%Lw`gSmBt2*cvQSuasw2bzP#J)JjirqoElGNwSp!gbpgv5} zJ$v`+fvE<-z6NmTFaX6HU}*!EDk8+_UAVjZa5ZmK@!ZL`z&rg5EIBMUOKCyA0FllI z&wp2D5AnB{PkFNj0uTWdG*mG$IxsdmGczkNFgh?Wuo0&9lPUus6f{&ZF*-FcIx{&d RFfckWFh4y6VY6NXOaZ$$u2%p6 diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/matter_replicator/green.png b/src/main/resources/assets/overdrive_that_matters/textures/block/matter_replicator/green.png index 6a9dbbaff4084f93478ac3f3fb1b72a3fe2fdea6..f974ee543eb5d306b5a449b9392c9270b5f35c33 100644 GIT binary patch delta 445 zcmV;u0Yd(z391Q@PysfPQ6e?~002l{7*1sxLsk|R78b^|S1T(k|Ns9^^tg`z0004W zQchC^@R5;6pl8bW1AP7VS zv6YgW>qeocKM8w2QltNh~7y9~+Q4)5cdI6#$dILF8_5BF|p*#aW zP4#06?f|DxssV_bA%Ws2rjdee+cq$sa)2`4IUR%a9SM{?kgfvjGAS0Teb=F*rIhH99jhD=;uR nFfapui@cL110WPOR53U@GB-LhG%GMLIxsLgUKmbg8bekV78Vx9v{x%DEC2uhlT0Hbk&hJx5S6kG zERm@oe;5lgCsy6U0RR92CrLy>R5;6pk_nQ;AP7YTaYjfdx&LkFqnK!K^G%g0e6mR* zVqzvrp)8UM{rtu%38zrK08tUWft;xN`2>Jao`G(!A471rbNZyX%Hqk8K=BjX2*I{( zo0&bx{4WH<0Ae#^qgEJs{p3Js0A#dZqRn8Me>2(uuv}t$1rX%+(12|Pj$`()A5VbU zvClai03I{&Fx8emw>FR}fJG=$&-0X11RLPQFlYz{T+>O!-iM0Urjb`XY00kQt*(6@ zF2H*xyH5qaT~a#-u>i%Lw`gSmBt2*cvQSuasw2bzP#J)JjirqoElGNwSp!gbpgv5} zJ$v`+fvE<-z6NmTFaX6HU}*!EDk8+_UAVjZa5ZmK@!ZL`z&rg5EIBMUOKCyA0FllI z&wp2D5AnB{PkFNj0uTWdG*mG$IxsdmGczkNFgh?Wuo0&9lPUus6f{&ZF*-FcIx{&d RFfckWFh4y6VY6NXOaYE0tmFUy diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/matter_replicator/light_blue.png b/src/main/resources/assets/overdrive_that_matters/textures/block/matter_replicator/light_blue.png index 519ea8f83e53890dce3d15babe5ffa94a95c62c1..2e5df520452788e1da5c0870195b35cda0a76aea 100644 GIT binary patch delta 445 zcmV;u0Yd(z391Q@PysfPQ6e?~001+ay*H=JFORJj78b^|S1T(k|NsBGCmh%S0004W zQchC^@R5;6pl8bW1AP7VS zv6YgW>qeocKM8w2QltNh~7y9~+Q4)5cdI6#$dILF8_5BF|p*#aW zP4#06?f|DxssV_bA%Ws2rjdee+cq$sa)2`4IUR%a9SM{?kgfvjGAS0Teb=F*rIhH99jhD=;uR nFfapui@cL110WPOR53U@GB-LhG%GMLIxsLLo4q%u%P)_u78Vx9v{x%DEC2uhXP<|4k&hJx5S6kG zERm@oe;5lgCsy6U0RR92CrLy>R5;6pk_nQ;AP7YTaYjfdx&LkFqnK!K^G%g0e6mR* zVqzvrp)8UM{rtu%38zrK08tUWft;xN`2>Jao`G(!A471rbNZyX%Hqk8K=BjX2*I{( zo0&bx{4WH<0Ae#^qgEJs{p3Js0A#dZqRn8Me>2(uuv}t$1rX%+(12|Pj$`()A5VbU zvClai03I{&Fx8emw>FR}fJG=$&-0X11RLPQFlYz{T+>O!-iM0Urjb`XY00kQt*(6@ zF2H*xyH5qaT~a#-u>i%Lw`gSmBt2*cvQSuasw2bzP#J)JjirqoElGNwSp!gbpgv5} zJ$v`+fvE<-z6NmTFaX6HU}*!EDk8+_UAVjZa5ZmK@!ZL`z&rg5EIBMUOKCyA0FllI z&wp2D5AnB{PkFNj0uTWdG*mG$IxsdmGczkNFgh?Wuo0&9lPUus6f{&ZF*-FcIx{&d RFfckWFh4y6VY6NXOaZGXuqOZj diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/matter_replicator/light_gray.png b/src/main/resources/assets/overdrive_that_matters/textures/block/matter_replicator/light_gray.png index 0eda21fc4af20739934dfa0359e0add81bec7b7d..ac441bb24b5bbce84d61281ed1db9cc7962c94ac 100644 GIT binary patch delta 445 zcmV;u0Yd(z391Q@PysfPQ6e?~004P;ae{(*Z*OQ878b^|S1T(k|Ns9wx|h`e0004W zQchC^@R5;6pl8bW1AP7VS zv6YgW>qeocKM8w2QltNh~7y9~+Q4)5cdI6#$dILF8_5BF|p*#aW zP4#06?f|DxssV_bA%Ws2rjdee+cq$sa)2`4IUR%a9SM{?kgfvjGAS0Teb=F*rIhH99jhD=;uR nFfapui@cL110WPOR53U@GB-LhG%GMLIxsL6Pk&hJx5S6kG zERm@oe;5lgCsy6U0RR92CrLy>R5;6pk_nQ;AP7YTaYjfdx&LkFqnK!K^G%g0e6mR* zVqzvrp)8UM{rtu%38zrK08tUWft;xN`2>Jao`G(!A471rbNZyX%Hqk8K=BjX2*I{( zo0&bx{4WH<0Ae#^qgEJs{p3Js0A#dZqRn8Me>2(uuv}t$1rX%+(12|Pj$`()A5VbU zvClai03I{&Fx8emw>FR}fJG=$&-0X11RLPQFlYz{T+>O!-iM0Urjb`XY00kQt*(6@ zF2H*xyH5qaT~a#-u>i%Lw`gSmBt2*cvQSuasw2bzP#J)JjirqoElGNwSp!gbpgv5} zJ$v`+fvE<-z6NmTFaX6HU}*!EDk8+_UAVjZa5ZmK@!ZL`z&rg5EIBMUOKCyA0FllI z&wp2D5AnB{PkFNj0uTWdG*mG$IxsdmGczkNFgh?Wuo0&9lPUus6f{&ZF*-FcIx{&d RFfckWFh4y6VY6NXOaTh8qds0004W zQchC^@R5;6pl8bW1AP7VS zv6YgW>qeocKM8w2QltNh~7y9~+Q4)5cdI6#$dILF8_5BF|p*#aW zP4#06?f|DxssV_bA%Ws2rjdee+cq$sa)2`4IUR%a9SM{?kgfvjGAS0Teb=F*rIhH99jhD=;uR nFfapui@cL110WPOR53U@GB-LhG%GMLIxsL&p%rJX7Fd)M78Vx9v{x%DEC2uhX;Cl@k&hJx5S6kG zERm@oe;5lgCsy6U0RR92CrLy>R5;6pk_nQ;AP7YTaYjfdx&LkFqnK!K^G%g0e6mR* zVqzvrp)8UM{rtu%38zrK08tUWft;xN`2>Jao`G(!A471rbNZyX%Hqk8K=BjX2*I{( zo0&bx{4WH<0Ae#^qgEJs{p3Js0A#dZqRn8Me>2(uuv}t$1rX%+(12|Pj$`()A5VbU zvClai03I{&Fx8emw>FR}fJG=$&-0X11RLPQFlYz{T+>O!-iM0Urjb`XY00kQt*(6@ zF2H*xyH5qaT~a#-u>i%Lw`gSmBt2*cvQSuasw2bzP#J)JjirqoElGNwSp!gbpgv5} zJ$v`+fvE<-z6NmTFaX6HU}*!EDk8+_UAVjZa5ZmK@!ZL`z&rg5EIBMUOKCyA0FllI z&wp2D5AnB{PkFNj0uTWdG*mG$IxsdmGczkNFgh?Wuo0&9lPUus6f{&ZF*-FcIx{&d RFfckWFh4y6VY6NXOabX2t-JsL diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/matter_replicator/magenta.png b/src/main/resources/assets/overdrive_that_matters/textures/block/matter_replicator/magenta.png index 500baf8e69a615daa1a939c4378605dffcd86308..dffac3307df24b1c0acdccc0485c641945e1b93f 100644 GIT binary patch delta 445 zcmV;u0Yd(z391Q@PysfPQ6e?~005vim#jLXlQN4I78b^|S1T(k|Ns9<^ky6Y0004W zQchC^@R5;6pl8bW1AP7VS zv6YgW>qeocKM8w2QltNh~7y9~+Q4)5cdI6#$dILF8_5BF|p*#aW zP4#06?f|DxssV_bA%Ws2rjdee+cq$sa)2`4IUR%a9SM{?kgfvjGAS0Teb=F*rIhH99jhD=;uR nFfapui@cL110WPOR53U@GB-LhG%GMLIxsLR5;6pk_nQ;AP7YTaYjfdx&LkFqnK!K^G%g0e6mR* zVqzvrp)8UM{rtu%38zrK08tUWft;xN`2>Jao`G(!A471rbNZyX%Hqk8K=BjX2*I{( zo0&bx{4WH<0Ae#^qgEJs{p3Js0A#dZqRn8Me>2(uuv}t$1rX%+(12|Pj$`()A5VbU zvClai03I{&Fx8emw>FR}fJG=$&-0X11RLPQFlYz{T+>O!-iM0Urjb`XY00kQt*(6@ zF2H*xyH5qaT~a#-u>i%Lw`gSmBt2*cvQSuasw2bzP#J)JjirqoElGNwSp!gbpgv5} zJ$v`+fvE<-z6NmTFaX6HU}*!EDk8+_UAVjZa5ZmK@!ZL`z&rg5EIBMUOKCyA0FllI z&wp2D5AnB{PkFNj0uTWdG*mG$IxsdmGczkNFgh?Wuo0&9lPUus6f{&ZF*-FcIx{&d RFfckWFh4y6VY6NXOabw`uvq{A diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/matter_replicator/orange.png b/src/main/resources/assets/overdrive_that_matters/textures/block/matter_replicator/orange.png index 48112da375c9d87a69e251d3f4f18eb139c892bf..648e672fc4479cfb3ab801709c0a004e41577386 100644 GIT binary patch delta 445 zcmV;u0Yd(z391Q@PysfPQ6e?~007fu4&!SN!dwj&78b^|S1T(k|NsBtr?sg70004W zQchC^@R5;6pl8bW1AP7VS zv6YgW>qeocKM8w2QltNh~7y9~+Q4)5cdI6#$dILF8_5BF|p*#aW zP4#06?f|DxssV_bA%Ws2rjdee+cq$sa)2`4IUR%a9SM{?kgfvjGAS0Teb=F*rIhH99jhD=;uR nFfapui@cL110WPOR53U@GB-LhH7hVMIxsN*R5;6pk_nQ;AP7YTaYjfdx&LkFqnK!K^G%g0e6mR* zVqzvrp)8UM{rtu%38zrK08tUWft;xN`2>Jao`G(!A471rbNZyX%Hqk8K=BjX2*I{( zo0&bx{4WH<0Ae#^qgEJs{p3Js0A#dZqRn8Me>2(uuv}t$1rX%+(12|Pj$`()A5VbU zvClai03I{&Fx8emw>FR}fJG=$&-0X11RLPQFlYz{T+>O!-iM0Urjb`XY00kQt*(6@ zF2H*xyH5qaT~a#-u>i%Lw`gSmBt2*cvQSuasw2bzP#J)JjirqoElGNwSp!gbpgv5} zJ$v`+fvE<-z6NmTFaX6HU}*!EDk8+_UAVjZa5ZmK@!ZL`z&rg5EIBMUOKCyA0FllI z&wp2D5AnB{PkFNj0uTWdG*mG$IxsdmGczkNFgh?Wuo0&9lPUus6f{&ZF*-FcIx{&d RFfckWFh4y6VY6NXOaUuAt>6Fv diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/matter_replicator/pink.png b/src/main/resources/assets/overdrive_that_matters/textures/block/matter_replicator/pink.png index 9fa3116c1422d71605f45d7b31addf0aaa98bb3c..048c8e6925006d3b2d789832851e4e5c281738b9 100644 GIT binary patch delta 445 zcmV;u0Yd(z391Q@PysfPQ6e?~007c>li`7#z;1^Y78b^|S1T(k|Ns9;6@L%_0004W zQchC^@R5;6pl8bW1AP7VS zv6YgW>qeocKM8w2QltNh~7y9~+Q4)5cdI6#$dILF8_5BF|p*#aW zP4#06?f|DxssV_bA%Ws2rjdee+cq$sa)2`4IUR%a9SM{?kgfvjGAS0Teb=F*rIhH99jhD=;uR nFfapui@cL110WPOR53U@GB-LhG%GMLIxsLR5;6pk_nQ;AP7YTaYjfdx&LkFqnK!K^G%g0e6mR* zVqzvrp)8UM{rtu%38zrK08tUWft;xN`2>Jao`G(!A471rbNZyX%Hqk8K=BjX2*I{( zo0&bx{4WH<0Ae#^qgEJs{p3Js0A#dZqRn8Me>2(uuv}t$1rX%+(12|Pj$`()A5VbU zvClai03I{&Fx8emw>FR}fJG=$&-0X11RLPQFlYz{T+>O!-iM0Urjb`XY00kQt*(6@ zF2H*xyH5qaT~a#-u>i%Lw`gSmBt2*cvQSuasw2bzP#J)JjirqoElGNwSp!gbpgv5} zJ$v`+fvE<-z6NmTFaX6HU}*!EDk8+_UAVjZa5ZmK@!ZL`z&rg5EIBMUOKCyA0FllI z&wp2D5AnB{PkFNj0uTWdG*mG$IxsdmGczkNFgh?Wuo0&9lPUus6f{&ZF*-FcIx{&d RFfckWFh4y6VY6NXOaX(bvHAc2 diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/matter_replicator/purple.png b/src/main/resources/assets/overdrive_that_matters/textures/block/matter_replicator/purple.png index 8c0e6dbe7f03fa4684de7e2ab05828f3d6a34601..490bd51805bf219d38b7c49358b2fcc140b089b3 100644 GIT binary patch delta 445 zcmV;u0Yd(z391Q@PysfPQ6e?~003kml4~QJTporN78b^|S1T(k|NsAhtHDG70004W zQchC^@R5;6pl8bW1AP7VS zv6YgW>qeocKM8w2QltNh~7y9~+Q4)5cdI6#$dILF8_5BF|p*#aW zP4#06?f|DxssV_bA%Ws2rjdee+cq$sa)2`4IUR%a9SM{?kgfvjGAS0Teb=F*rIhH99jhD=;uR nFfapui@cL110WPOR53U@GB-LhG%GMLIxsL+A(Cq&oLnA;78Vx9v{x%DEC2uhT@zaAk&hJx5S6kG zERm@oe;5lgCsy6U0RR92CrLy>R5;6pk_nQ;AP7YTaYjfdx&LkFqnK!K^G%g0e6mR* zVqzvrp)8UM{rtu%38zrK08tUWft;xN`2>Jao`G(!A471rbNZyX%Hqk8K=BjX2*I{( zo0&bx{4WH<0Ae#^qgEJs{p3Js0A#dZqRn8Me>2(uuv}t$1rX%+(12|Pj$`()A5VbU zvClai03I{&Fx8emw>FR}fJG=$&-0X11RLPQFlYz{T+>O!-iM0Urjb`XY00kQt*(6@ zF2H*xyH5qaT~a#-u>i%Lw`gSmBt2*cvQSuasw2bzP#J)JjirqoElGNwSp!gbpgv5} zJ$v`+fvE<-z6NmTFaX6HU}*!EDk8+_UAVjZa5ZmK@!ZL`z&rg5EIBMUOKCyA0FllI z&wp2D5AnB{PkFNj0uTWdG*mG$IxsdmGczkNFgh?Wuo0&9lPUus6f{&ZF*-FcIx{&d RFfckWFh4y6VY6NXOaTVKu6h6f diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/matter_replicator/red.png b/src/main/resources/assets/overdrive_that_matters/textures/block/matter_replicator/red.png index f2a5ae0d77b0732f7ed5d52eb9b3d2d8353997a6..839c8f7b9fa744cb415d27a7f5143ff8c34ee3f9 100644 GIT binary patch delta 445 zcmV;u0Yd(z391Q@PysfPQ6e?~004&|9grd)d>tDW78b^|S1T(k|NsBlWT@c)0004W zQchC^@R5;6pl8bW1AP7VS zv6YgW>qeocKM8w2QltNh~7y9~+Q4)5cdI6#$dILF8_5BF|p*#aW zP4#06?f|DxssV_bA%Ws2rjdee+cq$sa)2`4IUR%a9SM{?kgfvjGAS0Teb=F*rIhH99jhD=;uR nFfapui@cL110WPOR53U@GB-LhH7hVMIxsN*R5;6pk_nQ;AP7YTaYjfdx&LkFqnK!K^G%g0e6mR* zVqzvrp)8UM{rtu%38zrK08tUWft;xN`2>Jao`G(!A471rbNZyX%Hqk8K=BjX2*I{( zo0&bx{4WH<0Ae#^qgEJs{p3Js0A#dZqRn8Me>2(uuv}t$1rX%+(12|Pj$`()A5VbU zvClai03I{&Fx8emw>FR}fJG=$&-0X11RLPQFlYz{T+>O!-iM0Urjb`XY00kQt*(6@ zF2H*xyH5qaT~a#-u>i%Lw`gSmBt2*cvQSuasw2bzP#J)JjirqoElGNwSp!gbpgv5} zJ$v`+fvE<-z6NmTFaX6HU}*!EDk8+_UAVjZa5ZmK@!ZL`z&rg5EIBMUOKCyA0FllI z&wp2D5AnB{PkFNj0uTWdG*mG$IxsdmGczkNFgh?Wuo0&9lPUus6f{&ZF*-FcIx{&d RFfckWFh4y6VY6NXOacF2tu6on diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/matter_replicator/white.png b/src/main/resources/assets/overdrive_that_matters/textures/block/matter_replicator/white.png index b790bb1c4732d9fb99723ae9c648d93a0787d7d9..2b44db7d8c995403d47d5df83c2cc20695503e48 100644 GIT binary patch delta 445 zcmV;u0Yd(z391Q@PysfPQ6e?~007I&%h}o4y1Kd+78b^|S1T(k|NsAfei^y|0004W zQchC^@R5;6pl8bW1AP7VS zv6YgW>qeocKM8w2QltNh~7y9~+Q4)5cdI6#$dILF8_5BF|p*#aW zP4#06?f|DxssV_bA%Ws2rjdee+cq$sa)2`4IUR%a9SM{?kgfvjGAS0Teb=F*rIhH99jhD=;uR nFfapui@cL110WPOR53U@GB-LhH7hVMIxsN**}A&A78Vx9v{x%DEC2uhqsD?4k&hJx5S6kG zERm@oe;5lgCsy6U0RR92CrLy>R5;6pk_nQ;AP7YTaYjfdx&LkFqnK!K^G%g0e6mR* zVqzvrp)8UM{rtu%38zrK08tUWft;xN`2>Jao`G(!A471rbNZyX%Hqk8K=BjX2*I{( zo0&bx{4WH<0Ae#^qgEJs{p3Js0A#dZqRn8Me>2(uuv}t$1rX%+(12|Pj$`()A5VbU zvClai03I{&Fx8emw>FR}fJG=$&-0X11RLPQFlYz{T+>O!-iM0Urjb`XY00kQt*(6@ zF2H*xyH5qaT~a#-u>i%Lw`gSmBt2*cvQSuasw2bzP#J)JjirqoElGNwSp!gbpgv5} zJ$v`+fvE<-z6NmTFaX6HU}*!EDk8+_UAVjZa5ZmK@!ZL`z&rg5EIBMUOKCyA0FllI z&wp2D5AnB{PkFNj0uTWdG*mG$IxsdmGczkNFgh?Wuo0&9lPUus6f{&ZF*-FcIx{&d RFfckWFh4y6VY6NXOaY(6vZ4S0 diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/matter_replicator/yellow.png b/src/main/resources/assets/overdrive_that_matters/textures/block/matter_replicator/yellow.png index 77a982df8c213250ece4b97ec09dcac328e8f534..691a12a03de881502196f30f628bbd5ce8b35252 100644 GIT binary patch delta 445 zcmV;u0Yd(z391Q@PysfPQ6e?~007ynAL+Ou$etY*78b^|S1T(k|Ns9{b`!P$0004W zQchC^@R5;6pl8bW1AP7VS zv6YgW>qeocKM8w2QltNh~7y9~+Q4)5cdI6#$dILF8_5BF|p*#aW zP4#06?f|DxssV_bA%Ws2rjdee+cq$sa)2`4IUR%a9SM{?kgfvjGAS0Teb=F*rIhH99jhD=;uR nFfapui@cL110WPOR53U@GB-LhH7hVMIxsN*R5;6pk_nQ;AP7YTaYjfdx&LkFqnK!K^G%g0e6mR* zVqzvrp)8UM{rtu%38zrK08tUWft;xN`2>Jao`G(!A471rbNZyX%Hqk8K=BjX2*I{( zo0&bx{4WH<0Ae#^qgEJs{p3Js0A#dZqRn8Me>2(uuv}t$1rX%+(12|Pj$`()A5VbU zvClai03I{&Fx8emw>FR}fJG=$&-0X11RLPQFlYz{T+>O!-iM0Urjb`XY00kQt*(6@ zF2H*xyH5qaT~a#-u>i%Lw`gSmBt2*cvQSuasw2bzP#J)JjirqoElGNwSp!gbpgv5} zJ$v`+fvE<-z6NmTFaX6HU}*!EDk8+_UAVjZa5ZmK@!ZL`z&rg5EIBMUOKCyA0FllI z&wp2D5AnB{PkFNj0uTWdG*mG$IxsdmGczkNFgh?Wuo0&9lPUus6f{&ZF*-FcIx{&d RFfckWFh4y6VY6NXOaUF}uxtPT diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/matter_replicator_base/black.png b/src/main/resources/assets/overdrive_that_matters/textures/block/matter_replicator_base/black.png index 8a13286cee624092b98859c1543b006f17a3896b..2e6512a82246dc7a9ab6387747425244390cc7a0 100644 GIT binary patch delta 45 zcmbQqIg@k384f8SX$e_og~c1Mq%w(^g&0~`8JSxdnP?jrSQ!{ZPIB?v?91%K2ml~Q B3=;qV delta 45 zcmbQqIg@k384d|;a-7@5K1AomzDGBF4M=_nx1 zY-a(BX93wD&|AjH@PZjZqgl!Tl$yW}_M3r`u>s=(h^ZhOSrbP0l+XkKf1^Vb literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/screen_status_offline.png b/src/main/resources/assets/overdrive_that_matters/textures/block/screen_status_offline.png new file mode 100644 index 0000000000000000000000000000000000000000..9e2ad804b025ebc53822d8b12aff91b15d338dc3 GIT binary patch literal 350 zcmeAS@N?(olHy`uVBq!ia0vp^EFjFm1|(O0oL2{=7>k44ofy`glX(e}Nq6*hWMJ6X z&;2Kn70Bl-@Q5sCVBp&i!i*NI!74yOi4xa{lHmNblJdl&REB`W%)AmkKi3ciQ$0gH zqu+a&w*l2`OO5bM^YqkW-~e)18Kf9l85n^qFCdnNvO%uVU}Of1GXdF#j7$syKspMD zGuv6f;#oj82=taQGQ40$&}f!20Hr3dgZ*Y;WNg5=0Aec0M%D!olcs=-0RkqVxlCY{ zL6#Ok7F3s^fdNRilmD)B9orsZAd}bA#W6%8Jb8fxSjvTgabHZ~E07{jS3j3^P6;a-7@5K1AomzDGBF4M=_nx1 zY-a(BX93wD&|AjH@PZjZqgl!Tl$yW}_M3r`u>s=(h^ZhOSr#>OVW&ND+n#N*lV cG8IWSHin>Y+}%C~k?A0zopr0NkWQBme*a literal 0 HcmV?d00001 From 5e3520de55cbe2bb4ea0a79f68df70b798fa34bd Mon Sep 17 00:00:00 2001 From: GearShocky Date: Wed, 26 Feb 2025 23:58:22 +0500 Subject: [PATCH 07/15] shapegen --- .../mc/otm/shapes/BlockShapes.java | 41 +++++++++++++----- .../otm/block/matter/MatterEntanglerBlock.kt | 18 ++++++++ .../models/block/matter_entangler.json | 11 ++--- .../models/block/matter_replicator.json | 26 +++++------ .../block/matter_entangler_details.png | Bin 788 -> 786 bytes 5 files changed, 67 insertions(+), 29 deletions(-) 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 93243d876..e2e199955 100644 --- a/src/main/java/ru/dbotthepony/mc/otm/shapes/BlockShapes.java +++ b/src/main/java/ru/dbotthepony/mc/otm/shapes/BlockShapes.java @@ -99,16 +99,6 @@ public class BlockShapes { public static final BlockShape MATTER_REPLICATOR = new BlockShape( new SimpleCuboid(0.9375d, 0d, 0d, 1d, 0.6875d, 1d), new SimpleCuboid(0d, 0d, 0d, 0.0625d, 0.6875d, 1d), - new SimpleCuboid(0d, 0.6875d, 0.0625d, 0.5d, 1d, 0.375d), - new SimpleCuboid(0.5d, 0.6875d, 0d, 1d, 1d, 0.375d), - new SimpleCuboid(0.1875d, 0.6875d, 0.6875d, 0.9375d, 0.9375d, 0.9375d), - new SimpleCuboid(0.1875d, 0.6875d, 0.375d, 0.9375d, 0.9375d, 0.625d), - new SimpleCuboid(0.0625d, 0.6875d, 0.4375d, 0.1875d, 0.875d, 0.5625d), - new SimpleCuboid(0.0625d, 0.6875d, 0.75d, 0.1875d, 0.875d, 0.875d), - new SimpleCuboid(0d, 0.6875d, 0.9375d, 0.03125d, 1d, 1d), - new SimpleCuboid(0.96875d, 0.6875d, 0.9375d, 1d, 1d, 1d), - new SimpleCuboid(0.96875d, 0.9375d, 0.375d, 1d, 1d, 0.9375d), - new SimpleCuboid(0d, 0.9375d, 0.375d, 0.03125d, 1d, 0.9375d), new SimpleCuboid(0.0625d, 0d, 0d, 0.9375d, 0.0625d, 1d), new SimpleCuboid(0.5d, 0.4375d, 0d, 0.9375d, 0.6875d, 0.0625d), new SimpleCuboid(0.0625d, 0.5625d, 0d, 0.5d, 0.6875d, 0.0625d), @@ -117,7 +107,36 @@ public class BlockShapes { new SimpleCuboid(0.125d, 0.0625d, 0d, 0.875d, 0.125d, 0.0625d), new SimpleCuboid(0.0625d, 0.625d, 0.0625d, 0.9375d, 0.6875d, 0.9375d), new SimpleCuboid(0.0625d, 0.0625d, 0.9375d, 0.9375d, 0.6875d, 1d), - new SimpleCuboid(0.1875d, 0.0625d, 0.1875d, 0.8125d, 0.125d, 0.8125d) + new SimpleCuboid(0.15625d, 0.0625d, 0.15625d, 0.84375d, 0.125d, 0.84375d), + new SimpleCuboid(0.15625d, 0.5625d, 0.15625d, 0.84375d, 0.625d, 0.84375d), + new SimpleCuboid(0.5d, 0.6875d, 0d, 1d, 1d, 0.375d), + new SimpleCuboid(0d, 0.6875d, 0.0625d, 0.5d, 1d, 0.375d), + new SimpleCuboid(0d, 0.6875d, 0.375d, 1d, 1d, 1d), + new SimpleCuboid(0.5625d, 0.5d, -0.00625d, 0.9375d, 0.8125d, -0.00625d), + new SimpleCuboid(0.1875d, 0.25d, 1.00625d, 0.8125d, 0.3125d, 1.00625d), + new SimpleCuboid(0.71875d, 0.128125d, 0.21875d, 0.78125d, 0.128125d, 0.28125d), + new SimpleCuboid(0.21875d, 0.128125d, 0.21875d, 0.28125d, 0.128125d, 0.28125d), + new SimpleCuboid(0.21875d, 0.128125d, 0.71875d, 0.28125d, 0.128125d, 0.78125d), + new SimpleCuboid(0.71875d, 0.128125d, 0.71875d, 0.78125d, 0.128125d, 0.78125d), + new SimpleCuboid(0.1875d, 0.375d, 1.00625d, 0.8125d, 0.4375d, 1.00625d) + ); + + public static final BlockShape MATTER_ENTANGLER = new BlockShape( + new SimpleCuboid(0d, 0d, 0d, 1d, 0.3125d, 0.875d), + new SimpleCuboid(0d, 0d, 0.875d, 0.125d, 0.3125d, 1d), + new SimpleCuboid(0.875d, 0d, 0.875d, 1d, 0.3125d, 1d), + new SimpleCuboid(0.1875d, 0.375d, 0.1875d, 0.8125d, 1d, 0.8125d), + new SimpleCuboid(0d, 0.4375d, 0.25d, 0.125d, 0.9375d, 0.75d), + new SimpleCuboid(0.125d, 0.5d, 0.3125d, 0.1875d, 0.875d, 0.6875d), + new SimpleCuboid(0.8125d, 0.5d, 0.3125d, 0.875d, 0.875d, 0.6875d), + new SimpleCuboid(0.875d, 0.4375d, 0.25d, 1d, 0.9375d, 0.75d), + new SimpleCuboid(0d, 0.3125d, 0.875d, 1d, 0.4375d, 1d), + new SimpleCuboid(0d, 0.3125d, 0d, 1d, 0.4375d, 0.125d), + new SimpleCuboid(0d, 0.3125d, 0.125d, 0.125d, 0.4375d, 0.875d), + new SimpleCuboid(0.875d, 0.3125d, 0.125d, 1d, 0.4375d, 0.875d), + new SimpleCuboid(0.125d, 0.0625d, 0.84375d, 0.1875d, 0.25d, 0.96875d), + new SimpleCuboid(0.8125d, 0.0625d, 0.84375d, 0.875d, 0.25d, 0.96875d), + new SimpleCuboid(0.1875d, 0.0625d, 0.84375d, 0.8125d, 0.25d, 0.96875d) ); public static final BlockShape MATTER_DECOMPOSER = new BlockShape( diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/block/matter/MatterEntanglerBlock.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/block/matter/MatterEntanglerBlock.kt index 2f727c31e..9c7d9bbf5 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/block/matter/MatterEntanglerBlock.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/block/matter/MatterEntanglerBlock.kt @@ -1,6 +1,7 @@ package ru.dbotthepony.mc.otm.block.matter import net.minecraft.core.BlockPos +import net.minecraft.world.level.BlockGetter import net.minecraft.world.level.Level import net.minecraft.world.level.block.Block import net.minecraft.world.level.block.EntityBlock @@ -9,9 +10,14 @@ import net.minecraft.world.level.block.entity.BlockEntityTicker import net.minecraft.world.level.block.entity.BlockEntityType import net.minecraft.world.level.block.state.BlockState import net.minecraft.world.level.block.state.StateDefinition +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.entity.WorkerState import ru.dbotthepony.mc.otm.block.entity.matter.MatterEntanglerBlockEntity +import ru.dbotthepony.mc.otm.block.getShapeForEachState +import ru.dbotthepony.mc.otm.core.get +import ru.dbotthepony.mc.otm.shapes.BlockShapes class MatterEntanglerBlock : RotatableMatteryBlock(DEFAULT_MACHINE_PROPERTIES), EntityBlock { init { @@ -32,4 +38,16 @@ class MatterEntanglerBlock : RotatableMatteryBlock(DEFAULT_MACHINE_PROPERTIES), if (p_153212_.isClientSide) return null return BlockEntityTicker { _, _, _, tile -> if (tile is MatterEntanglerBlockEntity) tile.tick() } } + + private val shapes = getShapeForEachState(rotationProperty) { BlockShapes.MATTER_ENTANGLER.rotateFromNorth(it[rotationProperty]).computeShape() } + + @Suppress("override_deprecation") + override fun getShape( + state: BlockState, + blockGetter: BlockGetter, + pos: BlockPos, + context: CollisionContext + ): VoxelShape { + return shapes[state]!! + } } diff --git a/src/main/resources/assets/overdrive_that_matters/models/block/matter_entangler.json b/src/main/resources/assets/overdrive_that_matters/models/block/matter_entangler.json index c387d07f8..286480624 100644 --- a/src/main/resources/assets/overdrive_that_matters/models/block/matter_entangler.json +++ b/src/main/resources/assets/overdrive_that_matters/models/block/matter_entangler.json @@ -1,13 +1,14 @@ { - "texture_size": [32, 32], + "credit": "Made with Blockbench", "parent": "block/block", "render_type": "cutout", + "texture_size": [32, 32], "textures": { "0": "overdrive_that_matters:block/machine_base", "1": "overdrive_that_matters:block/matter_entangler", "2": "overdrive_that_matters:block/matter_entangler_details", - "status": "overdrive_that_matters:block/screen_status_ok", - "particle": "overdrive_that_matters:block/matter_entangler" + "particle": "overdrive_that_matters:block/matter_entangler", + "status": "overdrive_that_matters:block/screen_status_ok" }, "elements": [ { @@ -58,7 +59,7 @@ "south": {"uv": [5, 0, 10, 5], "texture": "#2"}, "west": {"uv": [5, 5, 10, 10], "texture": "#2"}, "up": {"uv": [0, 0, 5, 5], "rotation": 180, "texture": "#2"}, - "down": {"uv": [5, 5, 10, 10], "texture": "#2"} + "down": {"uv": [10, 0, 15, 5], "texture": "#2"} } }, { @@ -72,7 +73,7 @@ "south": {"uv": [5, 0, 10, 5], "texture": "#2"}, "west": {"uv": [5, 5, 10, 10], "texture": "#2"}, "up": {"uv": [0, 0, 5, 5], "rotation": 180, "texture": "#2"}, - "down": {"uv": [5, 5, 10, 10], "texture": "#2"} + "down": {"uv": [10, 0, 15, 5], "texture": "#2"} } }, { diff --git a/src/main/resources/assets/overdrive_that_matters/models/block/matter_replicator.json b/src/main/resources/assets/overdrive_that_matters/models/block/matter_replicator.json index d0d75728d..5dfb18b6e 100644 --- a/src/main/resources/assets/overdrive_that_matters/models/block/matter_replicator.json +++ b/src/main/resources/assets/overdrive_that_matters/models/block/matter_replicator.json @@ -185,9 +185,9 @@ "from": [5, 11, 11], "to": [14, 15, 15], "faces": { - "north": {"uv": [11, 0, 15.5, 2], "rotation": 180, "texture": "#texture"}, - "south": {"uv": [11, 0, 15.5, 2], "texture": "#texture"}, - "up": {"uv": [11, 0, 15.5, 2], "texture": "#texture"} + "north": {"uv": [11, 0, 15.5, 2], "rotation": 180, "texture": "#texture", "neoforge_data": {"block_light": 15}}, + "south": {"uv": [11, 0, 15.5, 2], "texture": "#texture", "neoforge_data": {"block_light": 15}}, + "up": {"uv": [11, 0, 15.5, 2], "texture": "#texture", "neoforge_data": {"block_light": 15}} } }, { @@ -195,9 +195,9 @@ "from": [5, 11, 6], "to": [14, 15, 10], "faces": { - "south": {"uv": [11, 0, 15.5, 2], "texture": "#texture"}, - "up": {"uv": [11, 0, 15.5, 2], "texture": "#texture"}, - "down": {"uv": [0, 0, 6, 1], "texture": "#missing"} + "south": {"uv": [11, 0, 15.5, 2], "texture": "#texture", "neoforge_data": {"block_light": 15}}, + "up": {"uv": [11, 0, 15.5, 2], "texture": "#texture", "neoforge_data": {"block_light": 15}}, + "down": {"uv": [0, 0, 6, 1], "texture": "#missing", "neoforge_data": {"block_light": 15}} } }, { @@ -296,7 +296,7 @@ "to": [15, 13, -0.1], "rotation": {"angle": 0, "axis": "y", "origin": [13, 11, -2.05]}, "faces": { - "north": {"uv": [0, 3.2, 9.56, 11.14], "texture": "#status"} + "north": {"uv": [0, 3.2, 9.56, 11.14], "texture": "#status", "neoforge_data": {"block_light": 15}} } }, { @@ -305,7 +305,7 @@ "to": [13, 5, 16.1], "rotation": {"angle": 0, "axis": "y", "origin": [7, 7, 14.05]}, "faces": { - "south": {"uv": [0, 0, 16, 1.62], "texture": "#status"} + "south": {"uv": [0, 0, 16, 1.62], "texture": "#status", "neoforge_data": {"block_light": 15}} } }, { @@ -314,7 +314,7 @@ "to": [12.5, 2.05, 4.5], "rotation": {"angle": 0, "axis": "y", "origin": [6.5, 5, 3.5]}, "faces": { - "up": {"uv": [13.2, 3.9, 15.3, 6], "texture": "#status"} + "up": {"uv": [13.2, 3.9, 15.3, 6], "texture": "#status", "neoforge_data": {"block_light": 15}} } }, { @@ -323,7 +323,7 @@ "to": [4.5, 2.05, 4.5], "rotation": {"angle": 0, "axis": "y", "origin": [-1.5, 5, 3.5]}, "faces": { - "up": {"uv": [13.2, 3.9, 15.3, 6], "texture": "#status"} + "up": {"uv": [13.2, 3.9, 15.3, 6], "texture": "#status", "neoforge_data": {"block_light": 15}} } }, { @@ -332,7 +332,7 @@ "to": [4.5, 2.05, 12.5], "rotation": {"angle": 0, "axis": "y", "origin": [-1.5, 5, 11.5]}, "faces": { - "up": {"uv": [13.2, 3.9, 15.3, 6], "texture": "#status"} + "up": {"uv": [13.2, 3.9, 15.3, 6], "texture": "#status", "neoforge_data": {"block_light": 15}} } }, { @@ -341,7 +341,7 @@ "to": [12.5, 2.05, 12.5], "rotation": {"angle": 0, "axis": "y", "origin": [6.5, 5, 11.5]}, "faces": { - "up": {"uv": [13.2, 3.9, 15.3, 6], "texture": "#status"} + "up": {"uv": [13.2, 3.9, 15.3, 6], "texture": "#status", "neoforge_data": {"block_light": 15}} } }, { @@ -350,7 +350,7 @@ "to": [13, 7, 16.1], "rotation": {"angle": 0, "axis": "y", "origin": [7, 9, 14.05]}, "faces": { - "south": {"uv": [0, 0, 16, 1.62], "texture": "#status"} + "south": {"uv": [0, 0, 16, 1.62], "texture": "#status", "neoforge_data": {"block_light": 15}} } } ] diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/matter_entangler_details.png b/src/main/resources/assets/overdrive_that_matters/textures/block/matter_entangler_details.png index 82d71662fd9fef4f72f7d5b07b28855f2ab329a7..404ba6c621fe6a9f6c1c6b2b57e7b0439927bac0 100644 GIT binary patch delta 381 zcmV-@0fPRN29gGlTNPAPRA69WSy@@ev{xP;9<7~Bj)6Xra3=(4ZHIcXnWJH3~q|Van{s*ljgb7{J=NZo!J$(drzu|X?oC_hu5Mz8=_Q_}h zDbWG6egK~q<(pvL!X!j4vJn1Ekg7s9J3JSCLG5lcc?*IMhE zb18Ww1W8b#cv=OL4LL!6b&MeZ&la~q^?U@btX>dR{w6M=$br!g{(JE#PVVZ%_ b8Hv6C6o53Xp_?RF00000NkvXXu0mjfZ)T={ delta 383 zcmV-_0f7FJ29ySnTNPPZSzusb#WRzehPMxLI{SR762ost%eV*}*(c>e)?l=4nk#ix07-Ec1!#){R zASF70Iv>ENN%07g-2@CP-DJcL~D#1Ql$y@PC4#g6(2R*cpUQN*U`Y3%;F$ z_m~ke=gcc$uA?k~^$-DYl69wl40I5Pb>xI5a6&px(=nkhh3iG?EIcLT#1T_MnCDW; z%!}pR6M`hDkUh-;$%339R~=&r083qB0ZMg}@Vxt_Ho5RFhz`YsetxhRa5~X}sLU$Z z>;Y1t;?B%^Sy%hsX@&`xi+y)m4|_sBeYB^Zb2WMbcA?&s_DF8KZrcr3@%AcISh!yG z&`06^=)$(W3U{K%XA>-e^l}&(X2EdsQX%vIqR(i!FM|V`p@qE%tFs_~n^^X@nbC!z d2S$4&`UW0nG``S^PIdqQ002ovPDHLkV1jKbtbG6g From 1c7f11650259e37e0e27b4eeba95060fdc03da0a Mon Sep 17 00:00:00 2001 From: GearShocky Date: Thu, 27 Feb 2025 00:03:55 +0500 Subject: [PATCH 08/15] g --- .../textures/block/matter_entangler_details.png | Bin 786 -> 797 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/matter_entangler_details.png b/src/main/resources/assets/overdrive_that_matters/textures/block/matter_entangler_details.png index 404ba6c621fe6a9f6c1c6b2b57e7b0439927bac0..f4bea2d0b7f0e674e3e48f2b7a0cc0c0c2c8ea07 100644 GIT binary patch delta 406 zcmV;H0crk{2Au|wK^jz0OjJd;x3`v-mfPFg|Ns9rH8rTHsNOyQkyt+nV!8+j0000S zk)Iw0{{R=V;@6SF{(nSCL_t(IPkoV#Zo?o9MR~bkT9UO(ADjRGKWBpprK@@(MG8K? z7-HUGcZiH}&Uxp(e_FOdX#!Qe0ciaIHXI^zcoDQ)2vU!+37(5AxGCX95aVNl@HwFh z+AT~&zD-c7pr@D;b|zsELc+Gng6;QUEoMZ_Ir9#f+A0g6Gk*)ESBX05B~#Oi%6~Gynhq07*qoM6N<$g5)f^ AV*mgE delta 421 zcmbQsHi>P5qj+F|Pl)UG?c1kKn|Ay5?f?J(o0^)gSg~Saw7qslZhI921A}x)kY6xR z0taAFH{mv&cbxX z^-T+#<|cXFnAzg!C3#zmd*A)$?-2qUryR0Q$Xl(`a8`h^U}Eibruq_rj?yPBdIe5a zdZ!H+uAllk^p%c{>Xajb-cAwMqh8M{)~r-v@eEj45yd)**V3`Bv`3NQ$u?IuueF{P zcC~rVX?Cm^7tS(x$G?ejxv*@<{u8)(zaN{U|9o@p`;x;gr;qMquWhqcoPY24 z<##(Jl^60X%+LB`H!uNiO++p9gA=kdu`r_lo+|wM&e619@ z+a^!vl6*Up_j_i6gZY*X=MzfBc5J_>mBy1etMQ^_=RO9J29vc5XRAa2gPg(B)z4*} HQ$iB}^2NyA From cba52d8a66bdcb4d8e2325c3a9797010eab360fd Mon Sep 17 00:00:00 2001 From: GearShocky Date: Thu, 27 Feb 2025 04:38:29 +0500 Subject: [PATCH 09/15] =?UTF-8?q?=D1=81=D0=BC=D0=BE=D0=B4=D1=83=D0=BB?= =?UTF-8?q?=D0=B8=D1=80=D1=83=D0=B9=20=D0=BC=D0=BD=D0=B5=20=D1=8D=D1=82?= =?UTF-8?q?=D0=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mc/otm/datagen/blocks/BlockStates.kt | 9 ++++++-- .../mc/otm/datagen/items/ItemModels.kt | 3 +++ .../mc/otm/datagen/lang/English.kt | 12 ++++++---- .../mc/otm/datagen/lang/Russian.kt | 13 +++++++---- .../mc/otm/datagen/loot/DecorativeLoot.kt | 5 +++++ .../mc/otm/datagen/loot/MachineLoot.kt | 5 ++++- .../mc/otm/datagen/tags/MineableTags.kt | 4 ++++ .../ru/dbotthepony/mc/otm/registry/MNames.kt | 3 +++ .../mc/otm/registry/game/MBlocks.kt | 21 ++++++++++-------- .../mc/otm/registry/game/MCreativeTabs.kt | 2 ++ .../mc/otm/registry/game/MItems.kt | 3 +++ .../textures/block/heavy_modular_frame.png | Bin 0 -> 496 bytes .../textures/block/modular_frame.png | Bin 0 -> 476 bytes 13 files changed, 60 insertions(+), 20 deletions(-) create mode 100644 src/main/resources/assets/overdrive_that_matters/textures/block/heavy_modular_frame.png create mode 100644 src/main/resources/assets/overdrive_that_matters/textures/block/modular_frame.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 09bd938aa..7716ea4ce 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 @@ -336,17 +336,21 @@ fun addBlockStates(provider: MatteryBlockStateProvider) { return@forAllStates generated.toTypedArray() } } + + provider.block(MBlocks.TRITANIUM_HULL) + provider.block(MBlocks.FLYWHEEL_HOUSING) provider.block(MBlocks.FLYWHEEL_BEARING) provider.block(MBlocks.FLYWHEEL_SHAFT) provider.block(MBlocks.FLYWHEEL_BATTERY) provider.block(MBlocks.GENERATOR_BLOCK) + provider.block(MBlocks.MODULAR_FRAME) + provider.block(MBlocks.HEAVY_MODULAR_FRAME) + provider.block(MBlocks.ENERGY_INPUT_INTERFACE) provider.block(MBlocks.ENERGY_OUTPUT_INTERFACE) - provider.block(MBlocks.TRITANIUM_HULL) - provider.block(MBlocks.ENERGY_INPUT_HATCH) provider.block(MBlocks.ENERGY_OUTPUT_HATCH) @@ -355,4 +359,5 @@ fun addBlockStates(provider: MatteryBlockStateProvider) { provider.block(MBlocks.ITEM_INPUT_HATCH) provider.block(MBlocks.ITEM_OUTPUT_HATCH) + } 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 c461cc161..87984511b 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 @@ -255,6 +255,9 @@ fun addItemModels(provider: MatteryItemModelProvider) { provider.block(MItems.ITEM_INPUT_HATCH) provider.block(MItems.ITEM_OUTPUT_HATCH) + provider.block(MItems.MODULAR_FRAME) + provider.block(MItems.HEAVY_MODULAR_FRAME) + MItems.TRITANIUM_ANVIL.values.forEach { provider.blocks(it) } for ((color, item) in MItems.CARGO_CRATE_MINECARTS) { 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 fbc70d0f5..65f84bf30 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 @@ -549,14 +549,12 @@ private fun blocks(provider: MatteryLanguageProvider) { addBlock(MBlocks.DRIVE_VIEWER.values, "Drive Viewer") add(MBlocks.BLACK_HOLE, "Local Anomalous Spacetime Dilation Singular Point") - add(MBlocks.BLACK_HOLE_GENERATOR, "Matter Acceleration Power Generator") - add(MBlocks.TRITANIUM_HULL, "Tritanium Hull") add(MBlocks.FLYWHEEL_SHAFT, "Flywheel Shaft") add(MBlocks.FLYWHEEL_SHAFT, "desc", "Placed between bearings, safe for decoration") add(MBlocks.FLYWHEEL_BEARING, "Flywheel Bearing") - add(MBlocks.FLYWHEEL_BEARING, "desc", "Replaces center block of housing at bottom and top, safe for decoration") + add(MBlocks.FLYWHEEL_BEARING, "desc", "Replaces top and bottom housing blocks in the center, safe for decoration") add(MBlocks.FLYWHEEL_BATTERY, "Flywheel Controller") add(MBlocks.FLYWHEEL_BATTERY, "desc", "Multiblock controller, requires housing, bearing, shaft, generator and core material of choice") @@ -571,7 +569,10 @@ private fun blocks(provider: MatteryLanguageProvider) { add(MBlocks.FLYWHEEL_HOUSING, "desc", "5xNx5 multiblock casing, safe for decoration") add(MBlocks.GENERATOR_BLOCK, "Generator Block") - add(MBlocks.GENERATOR_BLOCK, "desc", "Part of multiblock, safe for decoration") + add(MBlocks.GENERATOR_BLOCK, "desc", "Part of a multiblock, safe for decoration") + + add(MBlocks.MODULAR_FRAME, "Modular Frame") + add(MBlocks.HEAVY_MODULAR_FRAME, "Heavy Modular Frame") add(MBlocks.ENERGY_INPUT_INTERFACE, "Energy Input Interface") add(MBlocks.ENERGY_OUTPUT_INTERFACE, "Energy Output Interface") @@ -583,6 +584,9 @@ private fun blocks(provider: MatteryLanguageProvider) { add(MBlocks.ITEM_OUTPUT_HATCH, "Item Output Hatch") add(MBlocks.MATTER_OUTPUT_HATCH, "Matter Output Hatch") + add(MBlocks.BLACK_HOLE_GENERATOR, "Matter Acceleration Power Generator") + add(MBlocks.TRITANIUM_HULL, "Tritanium Hull") + add(MBlocks.TRITANIUM_HULL, "desc", "A sturdy part of a multiblock, safe for decoration") add(MBlocks.MATTER_INJECTOR, "Matter Injector") add(MBlocks.ANTIMATTER_INJECTOR, "Antimatter Injector") add(MBlocks.HIGH_ENERGY_PARTICLE_COLLECTOR, "High Energy Particle Collector") 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 5aa057e8f..a7f1ae945 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 @@ -555,13 +555,12 @@ private fun blocks(provider: MatteryLanguageProvider) { add(MBlocks.INFINITE_WATER_SOURCE, "desc", "Выталкивает воду в соседние блоки автоматически") add(MBlocks.BLACK_HOLE, "Локализированная сингулярная точка аномального искажения пространства-времени") - add(MBlocks.BLACK_HOLE_GENERATOR, "Генератор энергии ускорением материи") add(MBlocks.FLYWHEEL_SHAFT, "Маховый вал") add(MBlocks.FLYWHEEL_SHAFT, "desc", "Устанавливается между подшипников") add(MBlocks.FLYWHEEL_BEARING, "Маховый подшипник") - add(MBlocks.FLYWHEEL_BEARING, "desc", "Заменяет центральный блок корпуса снизу и сверху") + add(MBlocks.FLYWHEEL_BEARING, "desc", "Заменяет центральный блок корпуса сверху и снизу") add(MBlocks.FLYWHEEL_BATTERY, "Блок управления маховым хранилищем энергии") add(MBlocks.FLYWHEEL_BATTERY, "desc", "Мультиблок, который требует подшипники, корпус, вал, блоки генераторов и ядро из материала на ваше усмотрение") @@ -575,8 +574,11 @@ private fun blocks(provider: MatteryLanguageProvider) { add(MBlocks.FLYWHEEL_HOUSING, "Корпус махового хранилища энергии") add(MBlocks.FLYWHEEL_HOUSING, "desc", "Мультиблок структура с размерностью 5xNx5") - add(MBlocks.GENERATOR_BLOCK, "Generator Block") - add(MBlocks.GENERATOR_BLOCK, "desc", "Part of multiblock, safe for decoration") + add(MBlocks.GENERATOR_BLOCK, "Генераторный блок") + add(MBlocks.GENERATOR_BLOCK, "desc", "Часть мультиблока, безопасна в качестве декорации") + + add(MBlocks.MODULAR_FRAME, "Модульный каркас") + add(MBlocks.HEAVY_MODULAR_FRAME, "Тяжёлый модульный каркас") add(MBlocks.ENERGY_INPUT_INTERFACE, "Входной энергетический интерфейс") add(MBlocks.ENERGY_OUTPUT_INTERFACE, "Выходной энергетический интерфейс") @@ -588,6 +590,9 @@ private fun blocks(provider: MatteryLanguageProvider) { add(MBlocks.ITEM_OUTPUT_HATCH, "Выходной предметный клапан") add(MBlocks.MATTER_OUTPUT_HATCH, "Выходной клапан материи") + add(MBlocks.BLACK_HOLE_GENERATOR, "Генератор энергии ускорением материи") + add(MBlocks.TRITANIUM_HULL, "Тритановый корпус") + add(MBlocks.TRITANIUM_HULL, "desc", "Прочная часть мультиблока, безопасна в качестве декорации") add(MBlocks.MATTER_INJECTOR, "Инжектор материи") add(MBlocks.ANTIMATTER_INJECTOR, "Инжектор анти-материи") add(MBlocks.HIGH_ENERGY_PARTICLE_COLLECTOR, "Коллектор высокоэнергичных частиц") 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 1a8f5a75b..4fe3eb50b 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 @@ -50,7 +50,12 @@ fun addDecorativeLoot(lootTables: LootTables) { lootTables.dropsSelf(MBlocks.TRITANIUM_INGOT_BLOCK) { condition(ExplosionCondition.survivesExplosion()) } lootTables.dropsSelf(MBlocks.TRITANIUM_BARS) { condition(ExplosionCondition.survivesExplosion()) } + lootTables.dropsSelf(MBlocks.TRITANIUM_HULL) { condition(ExplosionCondition.survivesExplosion()) } + lootTables.dropsSelf(MBlocks.GENERATOR_BLOCK) { condition(ExplosionCondition.survivesExplosion()) } + lootTables.dropsSelf(MBlocks.MODULAR_FRAME) { condition(ExplosionCondition.survivesExplosion()) } + lootTables.dropsSelf(MBlocks.HEAVY_MODULAR_FRAME) { condition(ExplosionCondition.survivesExplosion()) } + lootTables.dropsSelf(MBlocks.FLYWHEEL_SHAFT) { condition(ExplosionCondition.survivesExplosion()) } lootTables.dropsSelf(MBlocks.FLYWHEEL_HOUSING) { condition(ExplosionCondition.survivesExplosion()) } lootTables.dropsSelf(MBlocks.FLYWHEEL_BEARING) { condition(ExplosionCondition.survivesExplosion()) } diff --git a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/loot/MachineLoot.kt b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/loot/MachineLoot.kt index f16a422bd..f0b185bf4 100644 --- a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/loot/MachineLoot.kt +++ b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/loot/MachineLoot.kt @@ -58,8 +58,8 @@ fun addMachineLoot(lootTables: LootTables) { lootTables.tile(MBlocks.MATTER_CAPACITOR_BANK.values) lootTables.tile(MBlocks.MATTER_BOTTLER.values) - lootTables.tile(MBlocks.TRITANIUM_HULL) lootTables.tile(MBlocks.BLACK_HOLE_GENERATOR) + lootTables.tile(MBlocks.FLYWHEEL_BATTERY) lootTables.dropsSelf(listOf( @@ -70,10 +70,13 @@ fun addMachineLoot(lootTables: LootTables) { lootTables.tile(MBlocks.ITEM_INPUT_HATCH) lootTables.tile(MBlocks.ITEM_OUTPUT_HATCH) + lootTables.tile(MBlocks.ENERGY_INPUT_HATCH) lootTables.tile(MBlocks.ENERGY_OUTPUT_HATCH) + lootTables.tile(MBlocks.MATTER_INPUT_HATCH) lootTables.tile(MBlocks.MATTER_OUTPUT_HATCH) + lootTables.tile(MBlocks.ENERGY_INPUT_INTERFACE) lootTables.tile(MBlocks.ENERGY_OUTPUT_INTERFACE) } 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 3c073cf2c..f89bde310 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 @@ -69,6 +69,7 @@ fun addMineableTags(tagsProvider: TagsProvider) { MBlocks.MATTER_INJECTOR, MBlocks.ANTIMATTER_INJECTOR, MBlocks.HIGH_ENERGY_PARTICLE_COLLECTOR, + MBlocks.ITEM_INPUT_HATCH, MBlocks.ITEM_OUTPUT_HATCH, MBlocks.ENERGY_INPUT_HATCH, @@ -82,7 +83,10 @@ fun addMineableTags(tagsProvider: TagsProvider) { MBlocks.FLYWHEEL_BEARING, MBlocks.FLYWHEEL_HOUSING, MBlocks.FLYWHEEL_BATTERY, + MBlocks.GENERATOR_BLOCK, + MBlocks.MODULAR_FRAME, + MBlocks.HEAVY_MODULAR_FRAME, MBlocks.REINFORCED_REDSTONE_LAMP, MBlocks.REINFORCED_REDSTONE_LAMP_INVERTED, 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 471998b09..e92f94346 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/registry/MNames.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/registry/MNames.kt @@ -66,7 +66,10 @@ object MNames { const val FLYWHEEL_BEARING = "flywheel_bearing" const val FLYWHEEL_SHAFT = "flywheel_shaft" const val FLYWHEEL_HOUSING = "flywheel_housing" + const val GENERATOR_BLOCK = "generator_block" + const val MODULAR_FRAME = "modular_frame" + const val HEAVY_MODULAR_FRAME = "heavy_modular_frame" const val STORAGE_CABLE = "storage_cable" // нужен рецепт const val STORAGE_POWER_SUPPLIER = "storage_power_supplier" // нужен рецепт 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 607306746..5df204d9a 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 @@ -188,10 +188,17 @@ object MBlocks { 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).explosionResistance(30f).mapColor(MapColor.COLOR_GRAY).destroyTime(2.5f).requiresCorrectToolForDrops()) .addSimpleDescription() } + val MODULAR_FRAME by registry.register(MNames.MODULAR_FRAME) { TransparentBlock( + BlockBehaviour.Properties.of().mapColor(MapColor.COLOR_GRAY).noOcclusion().sound(SoundType.METAL).requiresCorrectToolForDrops().explosionResistance(30f).destroyTime(2f) + )} + val HEAVY_MODULAR_FRAME by registry.register(MNames.HEAVY_MODULAR_FRAME) { TransparentBlock( + BlockBehaviour.Properties.of().mapColor(MapColor.COLOR_GRAY).noOcclusion().sound(SoundType.NETHERITE_BLOCK).requiresCorrectToolForDrops().explosionResistance(60f).destroyTime(2.5f) + )} val STORAGE_BUS: Block by registry.register(MNames.STORAGE_BUS, ::StorageBusBlock) val STORAGE_IMPORTER: Block by registry.register(MNames.STORAGE_IMPORTER, ::StorageImporterBlock) @@ -214,18 +221,14 @@ object MBlocks { val DEV_CHEST: DevChestBlock by registry.register(MNames.DEV_CHEST) { DevChestBlock() } val BLACK_HOLE_GENERATOR by registry.register(MNames.BLACK_HOLE_GENERATOR) { BlackHoleGeneratorBlock() } - - val TRITANIUM_HULL by registry.register(MNames.TRITANIUM_HULL) { Block( - BlockBehaviour.Properties.of() - .mapColor(MapColor.COLOR_LIGHT_BLUE) - .sound(SoundType.VAULT) - .requiresCorrectToolForDrops() - .explosionResistance(80f) - .destroyTime(2.5f) - ) } + val TRITANIUM_HULL by registry.register(MNames.TRITANIUM_HULL) { + MatteryBlock(BlockBehaviour.Properties.of().sound(SoundType.VAULT).explosionResistance(80f).mapColor(MapColor.COLOR_LIGHT_BLUE).destroyTime(2.5f).requiresCorrectToolForDrops()) + .addSimpleDescription() + } val MATTER_INJECTOR by registry.register(MNames.MATTER_INJECTOR) { RotatableMatteryBlock(BlockBehaviour.Properties.of().mapColor(MapColor.METAL).sound(SoundType.NETHERITE_BLOCK).requiresCorrectToolForDrops().destroyTime(2.5f).explosionResistance(160.0f)) } val ANTIMATTER_INJECTOR by registry.register(MNames.ANTIMATTER_INJECTOR) { RotatableMatteryBlock(BlockBehaviour.Properties.of().mapColor(MapColor.METAL).sound(SoundType.NETHERITE_BLOCK).requiresCorrectToolForDrops().destroyTime(2.5f).explosionResistance(160.0f)) } val HIGH_ENERGY_PARTICLE_COLLECTOR by registry.register(MNames.HIGH_ENERGY_PARTICLE_COLLECTOR) { RotatableMatteryBlock(BlockBehaviour.Properties.of().mapColor(MapColor.METAL).sound(SoundType.NETHERITE_BLOCK).requiresCorrectToolForDrops().destroyTime(2.5f).explosionResistance(160.0f)) } + val ITEM_INPUT_HATCH by registry.register(MNames.ITEM_INPUT_HATCH) { HatchBlock(ItemHatchBlockEntity::input) } val ITEM_OUTPUT_HATCH by registry.register(MNames.ITEM_OUTPUT_HATCH) { HatchBlock(ItemHatchBlockEntity::output) } val ENERGY_INPUT_HATCH by registry.register(MNames.ENERGY_INPUT_HATCH) { HatchBlock(EnergyHatchBlockEntity::input, true) } diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/registry/game/MCreativeTabs.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/registry/game/MCreativeTabs.kt index d9e992463..0b762632e 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/registry/game/MCreativeTabs.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/registry/game/MCreativeTabs.kt @@ -184,6 +184,8 @@ private fun addMainCreativeTabItems(consumer: CreativeModeTab.Output) { accept(MItems.FLYWHEEL_BEARING) accept(MItems.GENERATOR_BLOCK) + accept(MItems.MODULAR_FRAME) + accept(MItems.HEAVY_MODULAR_FRAME) accept(MItems.TRITANIUM_HULL) accept(MItems.BLACK_HOLE_GENERATOR) 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 6fa3d2410..8a07647ce 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 @@ -153,6 +153,8 @@ object MItems { val FLYWHEEL_HOUSING by registry.register(MNames.FLYWHEEL_HOUSING) { BlockItem(MBlocks.FLYWHEEL_HOUSING, DEFAULT_PROPERTIES) } val GENERATOR_BLOCK by registry.register(MNames.GENERATOR_BLOCK) { BlockItem(MBlocks.GENERATOR_BLOCK, DEFAULT_PROPERTIES) } + val MODULAR_FRAME by registry.register(MNames.MODULAR_FRAME) { BlockItem(MBlocks.MODULAR_FRAME, DEFAULT_PROPERTIES) } + val HEAVY_MODULAR_FRAME by registry.register(MNames.HEAVY_MODULAR_FRAME) { BlockItem(MBlocks.HEAVY_MODULAR_FRAME, DEFAULT_PROPERTIES) } val DEV_CHEST: BlockItem by registry.register(MNames.DEV_CHEST) { BlockItem(MBlocks.DEV_CHEST, DEFAULT_PROPERTIES) } val PAINTER: BlockItem by registry.register(MNames.PAINTER) { BlockItem(MBlocks.PAINTER, DEFAULT_PROPERTIES) } @@ -162,6 +164,7 @@ object MItems { val BLACK_HOLE_GENERATOR by registry.register(MNames.BLACK_HOLE_GENERATOR) { BlockItem(MBlocks.BLACK_HOLE_GENERATOR, DEFAULT_PROPERTIES) } val MATTER_INJECTOR by registry.register(MNames.MATTER_INJECTOR) { BlockItem(MBlocks.MATTER_INJECTOR, DEFAULT_PROPERTIES) } val ANTIMATTER_INJECTOR by registry.register(MNames.ANTIMATTER_INJECTOR) { BlockItem(MBlocks.ANTIMATTER_INJECTOR, DEFAULT_PROPERTIES) } + val HIGH_ENERGY_PARTICLE_COLLECTOR by registry.register(MNames.HIGH_ENERGY_PARTICLE_COLLECTOR) { BlockItem(MBlocks.HIGH_ENERGY_PARTICLE_COLLECTOR, DEFAULT_PROPERTIES) } val ITEM_INPUT_HATCH by registry.register(MNames.ITEM_INPUT_HATCH) { BlockItem(MBlocks.ITEM_INPUT_HATCH, DEFAULT_PROPERTIES) } val ITEM_OUTPUT_HATCH by registry.register(MNames.ITEM_OUTPUT_HATCH) { BlockItem(MBlocks.ITEM_OUTPUT_HATCH, DEFAULT_PROPERTIES) } diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/heavy_modular_frame.png b/src/main/resources/assets/overdrive_that_matters/textures/block/heavy_modular_frame.png new file mode 100644 index 0000000000000000000000000000000000000000..fbfa9954f5c3679c5d07c5008156ad3cc836ab43 GIT binary patch literal 496 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJV{wqX6T`Z5GB1G~mUKs7M+SzC z{oH>NS%G}%0G|-ogoK2^z(7xPvuGFRWG_!`ZEZO@Ia5-L15RjOeSEA?V8lqsTXQ*fN zdk^zApqg!|5uRzDo>~kXKn^Q|6eBAGBar0<#L`eU$R`?%%wTaQAls0U3GA~dAUm_2 z1uUKgWP?C&86(3Bpod{JnxzatsR`^1EI^e8M#ct=3m~R~Y-C*kF=+~r4FXI+bD6*@ zgDfq8ET}F+0|St3C;wgNI<`H+KxVS1i(`mJaB9D|&;bPwXJ@5HfBj<)_*t)wJn`hC zAcKTy)S{)i3d=s}COoqX&)zk=@e7B3{KOU$Wu6mW%sNtptSxgQu&X%Q~loCIBDab+-Tj literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/modular_frame.png b/src/main/resources/assets/overdrive_that_matters/textures/block/modular_frame.png new file mode 100644 index 0000000000000000000000000000000000000000..8709ae471cabec48c3cae45cc8dbfd7e53c4afa1 GIT binary patch literal 476 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJV{wqX6T`Z5GB1G~mUKs7M+SzC z{oH>NS%G|^0G|-ogoFfBQ&VkiZ8B9|RaS?_aVXD8gCb z5n0T@zz1aW?Ps)L4ORgPN|d-plmzFem6RtIr7{F0X6BXX`MHKDnCcno8U5bFybY*k zTWW-7ny0500|$`9${@wa$^f##3y7tmY>?|U7@5K1OhC3FBNNy+Q9yQPI}2Dm3&;k6 z-ZDmp7eG(KXf#V1fKn6K8CZZS4UCKp7#BcH1=+~D0AkV Date: Thu, 27 Feb 2025 06:32:15 +0500 Subject: [PATCH 10/15] attempt --- .../ru/dbotthepony/mc/otm/datagen/DataGen.kt | 5 +++ .../mc/otm/datagen/DecorativeData.kt | 1 + .../mc/otm/datagen/blocks/BlockModels.kt | 3 ++ .../mc/otm/datagen/blocks/BlockStates.kt | 1 - .../datagen/models/MatteryModelProvider.kt | 25 ++++++++++++++ .../models/block/frame_block.json | 32 ++++++++++++++++++ .../models/block/metal_mesh.json | 7 ---- .../textures/block/heavy_modular_frame.png | Bin 496 -> 496 bytes 8 files changed, 66 insertions(+), 8 deletions(-) create mode 100644 src/main/resources/assets/overdrive_that_matters/models/block/frame_block.json delete mode 100644 src/main/resources/assets/overdrive_that_matters/models/block/metal_mesh.json diff --git a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/DataGen.kt b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/DataGen.kt index ef839348e..37cd0efe8 100644 --- a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/DataGen.kt +++ b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/DataGen.kt @@ -93,6 +93,11 @@ object DataGen { blockStateProvider.simpleBlockM(*blocks) } + fun decorativeCubeAllCutout(vararg blocks: Block) { + blockModelProvider.decorativeCubeAllCutout(*blocks) + blockStateProvider.simpleBlockM(*blocks) + } + fun decorativeCubeAll(subdir: String, vararg blocks: Block) { blockModelProvider.decorativeCubeAll(subdir, *blocks) blockStateProvider.simpleBlockM(*blocks) diff --git a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/DecorativeData.kt b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/DecorativeData.kt index 886c9ce79..44f383f0f 100644 --- a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/DecorativeData.kt +++ b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/DecorativeData.kt @@ -35,6 +35,7 @@ fun addDecorativeData(blockStateProvider: MatteryBlockStateProvider, itemModelPr } DataGen.decorativeCubeAll(MBlocks.CARBON_FIBRE_BLOCK) + DataGen.decorativeCubeAllCutout(MBlocks.METAL_MESH) DataGen.decoratives(MRegistry.TRITANIUM_BLOCK) 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 3e5ae73c2..2bf209a12 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 @@ -27,6 +27,9 @@ fun addBlockModels(provider: MatteryBlockModelProvider) { column(MBlocks.GENERATOR_BLOCK, "block/generator_block","block/generator_block_top") + cubeAllCutout(MBlocks.MODULAR_FRAME) + cubeAllCutout(MBlocks.HEAVY_MODULAR_FRAME) + cubeAll(MBlocks.ENERGY_INPUT_INTERFACE) cubeAll(MBlocks.ENERGY_OUTPUT_INTERFACE) 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 7716ea4ce..597b94ab4 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,7 +31,6 @@ fun addBlockStates(provider: MatteryBlockStateProvider) { provider.ore(MBlocks.TRITANIUM_ORE) provider.ore(MBlocks.TRITANIUM_RAW_BLOCK) provider.block(MBlocks.TRITANIUM_INGOT_BLOCK) - provider.block(MBlocks.METAL_MESH) provider.ore(MBlocks.DILITHIUM_ORE) provider.ore(MBlocks.DEEPSLATE_DILITHIUM_ORE) diff --git a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/models/MatteryModelProvider.kt b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/models/MatteryModelProvider.kt index 645325e3a..773bad392 100644 --- a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/models/MatteryModelProvider.kt +++ b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/models/MatteryModelProvider.kt @@ -34,6 +34,23 @@ class MatteryBlockModelProvider(event: GatherDataEvent) : BlockModelProvider(eve } } + fun cubeAllCutout(vararg blocks: Block) { + for (block in blocks) { + exec { + cubeAll(block.registryName!!.path, modLocation("block/${block.registryName!!.path}")).renderType("cutout_mipped") + } + } + } + + fun cubeallFramed(vararg blocks: Block) { + for (block in blocks) { + exec { + //cubeAll(block.registryName!!.path, modLocation("block/${block.registryName!!.path}")).renderType("cutout_mipped") + withExistingParent(block.registryName!!.path, modLocation("block/frame_block")).renderType("cutout_mipped") + } + } + } + fun decorativeGlassAll(blocks: Collection) { for (block in blocks) { exec { @@ -58,6 +75,14 @@ class MatteryBlockModelProvider(event: GatherDataEvent) : BlockModelProvider(eve } } + fun decorativeCubeAllCutout(vararg blocks: Block) { + for (block in blocks) { + exec { + cubeAll(block.registryName!!.path, modLocation("block/decorative/${block.registryName!!.path}")).renderType("cutout_mipped") + } + } + } + fun decorativeCubeAll(subdir: String, vararg blocks: Block) { for (block in blocks) { exec { diff --git a/src/main/resources/assets/overdrive_that_matters/models/block/frame_block.json b/src/main/resources/assets/overdrive_that_matters/models/block/frame_block.json new file mode 100644 index 000000000..d207d3e77 --- /dev/null +++ b/src/main/resources/assets/overdrive_that_matters/models/block/frame_block.json @@ -0,0 +1,32 @@ +{ + "textures": { + "particle": "#texture", + }, + "elements": [ + { + "from": [0, 0, 0], + "to": [16, 16, 16], + "faces": { + "north": {"uv": [0, 0, 16, 16], "texture": "#texture"}, + "east": {"uv": [0, 0, 16, 16], "texture": "#texture"}, + "south": {"uv": [0, 0, 16, 16], "texture": "#texture"}, + "west": {"uv": [0, 0, 16, 16], "texture": "#texture"}, + "up": {"uv": [0, 0, 16, 16], "texture": "#texture"}, + "down": {"uv": [0, 0, 16, 16], "texture": "#texture"} + } + }, + { + "from": [15.999, 15.999, 15.999], + "to": [0.001, 0.001, 0.001], + "rotation": {"angle": 0, "axis": "y", "origin": [16, 16, 16]}, + "faces": { + "north": {"uv": [0, 0, 16, 16], "texture": "#texture"}, + "east": {"uv": [0, 0, 16, 16], "texture": "#texture"}, + "south": {"uv": [0, 0, 16, 16], "texture": "#texture"}, + "west": {"uv": [0, 0, 16, 16], "texture": "#texture"}, + "up": {"uv": [0, 0, 16, 16], "texture": "#texture"}, + "down": {"uv": [0, 0, 16, 16], "texture": "#texture"} + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/overdrive_that_matters/models/block/metal_mesh.json b/src/main/resources/assets/overdrive_that_matters/models/block/metal_mesh.json deleted file mode 100644 index b18a8d695..000000000 --- a/src/main/resources/assets/overdrive_that_matters/models/block/metal_mesh.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "minecraft:block/cube_all", - "render_type": "cutout", - "textures": { - "all": "overdrive_that_matters:block/decorative/metal_mesh" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/heavy_modular_frame.png b/src/main/resources/assets/overdrive_that_matters/textures/block/heavy_modular_frame.png index fbfa9954f5c3679c5d07c5008156ad3cc836ab43..b9f799747197f6d2e34b7e73b6b1578b9c0845b2 100644 GIT binary patch delta 119 zcmV--0Eqwa1MmZ|fdOwp62Kq`14AO<|6g3hPCKnR7+4emfKj6*TBQxdQk@H!xyLPc zGmxI?v$ULq6qy-wwn-R@DrKzPLj!}+#iA8(gH4t{pkKY9E^N}^-}LzQ80;ARSnj(% ZZ~=BM1fiMyx1j(4002ovPDHLkV1f;QG~)mO delta 119 zcmV--0Eqwa1MmZ|fdOwz62Kq`Lqj6s{ZCxLPCKnx$mH=602nn|qNQyhrt&Rd<~~`_zyk4Jr+AwKaTsJ Z4_uF~1kt|AsZsy{002ovPDHLkV1f-*GE@Kn From b5e2b24dd54a98066abbda143454ff9d5d41036c Mon Sep 17 00:00:00 2001 From: GearShocky Date: Thu, 27 Feb 2025 15:53:59 +0500 Subject: [PATCH 11/15] Good morning --- .../mc/otm/datagen/blocks/BlockModels.kt | 5 ++- .../datagen/models/MatteryModelProvider.kt | 11 +++---- .../models/block/frame_block.json | 31 ++++++++++--------- 3 files changed, 23 insertions(+), 24 deletions(-) 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 2bf209a12..bbf8da1e4 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 @@ -26,9 +26,8 @@ fun addBlockModels(provider: MatteryBlockModelProvider) { orientable(MBlocks.FLYWHEEL_BATTERY,"block/flywheel_housing","block/flywheel_controller") column(MBlocks.GENERATOR_BLOCK, "block/generator_block","block/generator_block_top") - - cubeAllCutout(MBlocks.MODULAR_FRAME) - cubeAllCutout(MBlocks.HEAVY_MODULAR_FRAME) + cubeAllFramed("modular_frame", "block/modular_frame") + cubeAllFramed("heavy_modular_frame", "block/heavy_modular_frame") cubeAll(MBlocks.ENERGY_INPUT_INTERFACE) cubeAll(MBlocks.ENERGY_OUTPUT_INTERFACE) diff --git a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/models/MatteryModelProvider.kt b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/models/MatteryModelProvider.kt index 773bad392..29d81d18d 100644 --- a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/models/MatteryModelProvider.kt +++ b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/models/MatteryModelProvider.kt @@ -42,12 +42,11 @@ class MatteryBlockModelProvider(event: GatherDataEvent) : BlockModelProvider(eve } } - fun cubeallFramed(vararg blocks: Block) { - for (block in blocks) { - exec { - //cubeAll(block.registryName!!.path, modLocation("block/${block.registryName!!.path}")).renderType("cutout_mipped") - withExistingParent(block.registryName!!.path, modLocation("block/frame_block")).renderType("cutout_mipped") - } + fun cubeAllFramed(modelName: String, textureName: String) { + exec { + withExistingParent(modelName, modLocation("block/frame_block")) + .texture("texture", textureName) + .renderType("cutout_mipped") } } diff --git a/src/main/resources/assets/overdrive_that_matters/models/block/frame_block.json b/src/main/resources/assets/overdrive_that_matters/models/block/frame_block.json index d207d3e77..bb93e21d1 100644 --- a/src/main/resources/assets/overdrive_that_matters/models/block/frame_block.json +++ b/src/main/resources/assets/overdrive_that_matters/models/block/frame_block.json @@ -1,31 +1,32 @@ { + "parent": "block/block", "textures": { - "particle": "#texture", + "particle": "#texture" }, "elements": [ { "from": [0, 0, 0], "to": [16, 16, 16], "faces": { - "north": {"uv": [0, 0, 16, 16], "texture": "#texture"}, - "east": {"uv": [0, 0, 16, 16], "texture": "#texture"}, - "south": {"uv": [0, 0, 16, 16], "texture": "#texture"}, - "west": {"uv": [0, 0, 16, 16], "texture": "#texture"}, - "up": {"uv": [0, 0, 16, 16], "texture": "#texture"}, - "down": {"uv": [0, 0, 16, 16], "texture": "#texture"} + "north": {"uv": [0, 0, 16, 16], "texture": "#texture", "cullface": "north"}, + "east": {"uv": [0, 0, 16, 16], "texture": "#texture", "cullface": "east"}, + "south": {"uv": [0, 0, 16, 16], "texture": "#texture", "cullface": "south"}, + "west": {"uv": [0, 0, 16, 16], "texture": "#texture", "cullface": "west"}, + "up": {"uv": [0, 0, 16, 16], "texture": "#texture", "cullface": "up"}, + "down": {"uv": [0, 0, 16, 16], "texture": "#texture", "cullface": "down"} } }, { - "from": [15.999, 15.999, 15.999], - "to": [0.001, 0.001, 0.001], + "from": [15.9994, 15.9994, 15.9994], + "to": [0.0004, 0.0004, 0.0004], "rotation": {"angle": 0, "axis": "y", "origin": [16, 16, 16]}, "faces": { - "north": {"uv": [0, 0, 16, 16], "texture": "#texture"}, - "east": {"uv": [0, 0, 16, 16], "texture": "#texture"}, - "south": {"uv": [0, 0, 16, 16], "texture": "#texture"}, - "west": {"uv": [0, 0, 16, 16], "texture": "#texture"}, - "up": {"uv": [0, 0, 16, 16], "texture": "#texture"}, - "down": {"uv": [0, 0, 16, 16], "texture": "#texture"} + "north": {"uv": [0, 0, 16, 16], "texture": "#texture", "cullface": "south"}, + "east": {"uv": [0, 0, 16, 16], "texture": "#texture", "cullface": "west"}, + "south": {"uv": [0, 0, 16, 16], "texture": "#texture", "cullface": "north"}, + "west": {"uv": [0, 0, 16, 16], "texture": "#texture", "cullface": "east"}, + "up": {"uv": [0, 0, 16, 16], "texture": "#texture", "cullface": "down"}, + "down": {"uv": [0, 0, 16, 16], "texture": "#texture", "cullface": "up"} } } ] From 6689bdfd19dbe2978feba1bdb955194ee4d49661 Mon Sep 17 00:00:00 2001 From: GearShocky Date: Thu, 27 Feb 2025 16:06:09 +0500 Subject: [PATCH 12/15] texture consistency --- .../models/block/frame_block.json | 4 ++-- .../textures/block/generator_block.png | Bin 484 -> 492 bytes .../textures/block/generator_block_top.png | Bin 483 -> 490 bytes .../textures/block/heavy_modular_frame.png | Bin 496 -> 491 bytes 4 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/resources/assets/overdrive_that_matters/models/block/frame_block.json b/src/main/resources/assets/overdrive_that_matters/models/block/frame_block.json index bb93e21d1..bbdeb0ca9 100644 --- a/src/main/resources/assets/overdrive_that_matters/models/block/frame_block.json +++ b/src/main/resources/assets/overdrive_that_matters/models/block/frame_block.json @@ -17,8 +17,8 @@ } }, { - "from": [15.9994, 15.9994, 15.9994], - "to": [0.0004, 0.0004, 0.0004], + "from": [15.99999, 15.99999, 15.99999], + "to": [0.00001, 0.00001, 0.00001], "rotation": {"angle": 0, "axis": "y", "origin": [16, 16, 16]}, "faces": { "north": {"uv": [0, 0, 16, 16], "texture": "#texture", "cullface": "south"}, diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/generator_block.png b/src/main/resources/assets/overdrive_that_matters/textures/block/generator_block.png index 61e59a0ffd89b9b59fad274e9f4484988b1d81cc..73e183d31db8e6a50639f3754bc1fe34680e0981 100644 GIT binary patch delta 158 zcmV;P0Ac^+1MCBkK@loYOjJctQBgHDHAy!%TSP;VPaXs)aIXxJasGN`NkluJ=ty**DsxgCeI!I)h34>EM zNaUIdgA+tV1&fGt7FfiD!8oF0=FC}3jTw}pz~(3+tbkhzafTuT0IB&g07X@*Hvj+t M07*qoM6N<$f;AC7KL7v# delta 176 zcmV;h08jty1LOmcK`l4lyp4gTb76>9MQlSg zY)LmwF(``PQ6rIb{&iqUL_t&-(_>%|G6n)g1`tC@3B(X|aSaU(aS>!tax1T>=$xX& zVC*$>=Iq@^j2Vo>Kq6C(8H}PpB1e@Oj36S)SVW8?!6HCi?&TdFol}e%lsv)aC?TwX eTMBW8A_D*yJS%L9(C7gG0000DwOMyYyN&|NklFXU$qwYRurAFOV07*qoM6N<$f^dODM*si- delta 175 zcmV;g08szx1LFgbK`J3oOjJctQBgHDHAy!%V@gRYD=Quz9;S0)yp4f~Rz++{Hzp<~ z)S|MKQZ%jaH`Y0_E2(6I1g(1lFq*3|fh zGi#z}swlm&Tq~-qAbN7v=H`}#MV(te>G1Zf(3|y3KssmBBj#V%xbJN6Z2rIa`1a!o i-`>ACUUdI!Blm@P=FDX`YnXvfVDNPHb6Mw<&;$UWD^0%u delta 188 zcmaFO{DFCbqos6!Pl#(mLPB6*pr^T6w2O1Hm#4P2ww#=tsi`Rg0|RTw6E+~lSrX(I z{2vM!g8eImCYJrHNcMDb4ABTq?ROM9puoZGtn}c2e9RF)>$R2=5h9EYfs0k6mhv76 zn#(<7=W*R~;|cR#Zr(DdMP#OA@itG1F0Irxcbu7P-3o From 5e24fe2c85fab5c924e35e5cd16cd69c6af7687e Mon Sep 17 00:00:00 2001 From: GearShocky Date: Thu, 27 Feb 2025 16:44:03 +0500 Subject: [PATCH 13/15] Iron --- .../mc/otm/datagen/lang/English.kt | 2 ++ .../mc/otm/datagen/lang/Russian.kt | 2 ++ .../datagen/recipes/CraftingTableRecipes.kt | 18 +++++++++++++----- .../otm/datagen/recipes/MultiblockRecipes.kt | 12 ++++++++++++ .../ru/dbotthepony/mc/otm/registry/MNames.kt | 1 + .../mc/otm/registry/game/MItems.kt | 4 ++++ .../models/block/frame_block.json | 4 ++-- .../item/component/reinforced_iron_plate.png | Bin 0 -> 500 bytes .../component/reinforced_tritanium_plate.png | Bin 277 -> 507 bytes 9 files changed, 36 insertions(+), 7 deletions(-) create mode 100644 src/main/resources/assets/overdrive_that_matters/textures/item/component/reinforced_iron_plate.png 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 65f84bf30..b60fdaff0 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 @@ -814,6 +814,8 @@ 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.REINFORCED_IRON_PLATE, "Reinforced Iron Plate") + add(MItems.REINFORCED_IRON_PLATE, "desc", "A sturdier and more durable Iron Plate") add(MItems.ARMOR_ASSEMBLY, "Armor assembly") add(MItems.CARBON_MESH, "Carbon Mesh") 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 a7f1ae945..d4867917a 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 @@ -807,6 +807,8 @@ private fun items(provider: MatteryLanguageProvider) { add(MItems.MIRROR, "desc", "Я могу очень отчётливо видеть своё отражение в этом зеркале") add(MItems.REINFORCED_TRITANIUM_PLATE, "Укреплённая тритановая пластина") add(MItems.REINFORCED_TRITANIUM_PLATE, "desc", "Бронированная пластина, усиленная чтобы выдержать большие кинетические силы") + add(MItems.REINFORCED_IRON_PLATE, "Укреплённая железная пластина") + add(MItems.REINFORCED_IRON_PLATE, "desc", "Более надёжная и прочная железная пластина") add(MItems.ARMOR_ASSEMBLY, "Стройка брони") add(MItems.CARBON_MESH, "Углеродная сетка") 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 5ba4a2ce6..2389b6cb9 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 @@ -262,11 +262,19 @@ fun addCraftingTableRecipes(consumer: RecipeOutput) { .build(consumer) MatteryRecipe(MItems.REINFORCED_TRITANIUM_PLATE, category = RecipeCategory.MISC) - .rowB(MItemTags.CARBON_PLATES) - .row(MItemTags.CARBON_PLATES, MItemTags.TRITANIUM_PLATES, MItemTags.CARBON_PLATES) - .rowB(MItemTags.CARBON_PLATES) - .unlockedBy(MItemTags.TRITANIUM_PLATES) - .build(consumer) + .rowB(MItemTags.CARBON_PLATES) + .row(MItemTags.CARBON_PLATES, MItemTags.TRITANIUM_PLATES, MItemTags.CARBON_PLATES) + .rowB(MItemTags.CARBON_PLATES) + .unlockedBy(MItemTags.TRITANIUM_PLATES) + .build(consumer) + + MatteryRecipe(MItems.REINFORCED_IRON_PLATE, category = RecipeCategory.MISC) + .rowB(MItemTags.CARBON_PLATES) + .row(MItemTags.CARBON_PLATES, MItemTags.IRON_PLATES, MItemTags.CARBON_PLATES) + .rowB(MItemTags.CARBON_PLATES) + .unlockedBy(MItemTags.IRON_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) diff --git a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/recipes/MultiblockRecipes.kt b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/recipes/MultiblockRecipes.kt index 9ba54c635..aa26f9d42 100644 --- a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/recipes/MultiblockRecipes.kt +++ b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/recipes/MultiblockRecipes.kt @@ -116,6 +116,18 @@ fun addMultiblockRecipes(consumer: RecipeOutput) { .row(MItems.ELECTRIC_PARTS, MItems.ELECTROMOTOR, MItems.ELECTRIC_PARTS) .build(consumer) + MatteryRecipe(MItems.MODULAR_FRAME, category = machinesCategory) + .row(MItemTags.IRON_PLATES, Tags.Items.INGOTS_IRON, MItemTags.IRON_PLATES) + .rowAC(Tags.Items.INGOTS_IRON, Tags.Items.INGOTS_IRON) + .row(MItemTags.IRON_PLATES, Tags.Items.INGOTS_IRON, MItemTags.IRON_PLATES) + .build(consumer) + + MatteryRecipe(MItems.HEAVY_MODULAR_FRAME, category = machinesCategory) + .rowB(MItems.REINFORCED_IRON_PLATE) + .row(MItems.REINFORCED_IRON_PLATE, MItems.MODULAR_FRAME, MItems.REINFORCED_IRON_PLATE) + .rowB(MItems.REINFORCED_IRON_PLATE) + .build(consumer) + // blackhole generator MatteryRecipe(MItems.BLACK_HOLE_GENERATOR, category = machinesCategory) .row(MItemTags.ADVANCED_CIRCUIT, MItems.BLACK_HOLE_SCANNER, MItemTags.ADVANCED_CIRCUIT) 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 e92f94346..5a4218d0a 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/registry/MNames.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/registry/MNames.kt @@ -204,6 +204,7 @@ object MNames { const val CARBON_MESH = "carbon_mesh" const val ARMOR_ASSEMBLY = "armor_assembly" const val REINFORCED_TRITANIUM_PLATE = "reinforced_tritanium_plate" + const val REINFORCED_IRON_PLATE = "reinforced_iron_plate" const val QUANTUM_TRANSCEIVER = "quantum_transceiver" const val ELECTROMAGNET = "electromagnet" 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 8a07647ce..b200f0536 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 @@ -539,6 +539,9 @@ object MItems { val REINFORCED_TRITANIUM_PLATE: Item by registry.register(MNames.REINFORCED_TRITANIUM_PLATE) { MatteryItem( DEFAULT_PROPERTIES ).addSimpleDescription() } + val REINFORCED_IRON_PLATE: Item by registry.register(MNames.REINFORCED_IRON_PLATE) { MatteryItem( + DEFAULT_PROPERTIES + ).addSimpleDescription() } val QUANTUM_TRANSCEIVER: Item by registry.register(MNames.QUANTUM_TRANSCEIVER) { Item(DEFAULT_PROPERTIES) } val ELECTROMAGNET: Item by registry.register(MNames.ELECTROMAGNET) { Item(DEFAULT_PROPERTIES) } @@ -612,6 +615,7 @@ object MItems { MItems::CARBON_MESH, MItems::ARMOR_ASSEMBLY, MItems::REINFORCED_TRITANIUM_PLATE, + MItems::REINFORCED_IRON_PLATE, ) val CARGO_CRATE_MINECARTS = registry.coloredWithBase(MNames.MINECART_CARGO_CRATE, ::MinecartCargoCrateItem) diff --git a/src/main/resources/assets/overdrive_that_matters/models/block/frame_block.json b/src/main/resources/assets/overdrive_that_matters/models/block/frame_block.json index bbdeb0ca9..5aea3aa89 100644 --- a/src/main/resources/assets/overdrive_that_matters/models/block/frame_block.json +++ b/src/main/resources/assets/overdrive_that_matters/models/block/frame_block.json @@ -17,8 +17,8 @@ } }, { - "from": [15.99999, 15.99999, 15.99999], - "to": [0.00001, 0.00001, 0.00001], + "from": [15.99995, 15.99995, 15.99995], + "to": [0.00005, 0.00005, 0.00005], "rotation": {"angle": 0, "axis": "y", "origin": [16, 16, 16]}, "faces": { "north": {"uv": [0, 0, 16, 16], "texture": "#texture", "cullface": "south"}, diff --git a/src/main/resources/assets/overdrive_that_matters/textures/item/component/reinforced_iron_plate.png b/src/main/resources/assets/overdrive_that_matters/textures/item/component/reinforced_iron_plate.png new file mode 100644 index 0000000000000000000000000000000000000000..928758f1bded1afd7d71b2028c3d4341ed15abae GIT binary patch literal 500 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJV{wqX6T`Z5GB1G~mUKs7M+SzC z{oH>NS%G}%0G|-oxVX6g|NpO8vEt^inAohFBqr> z3>bp_D}+FT1s;*b3=DkxL735kHCP2GC{f}XQ4*Y=R#Ki=l*$m0n3-3i=jR%tV5(=R zXY_jy^ERNGZK)BSX`Y^13>-iXD}xjxD+42tvp@3Xlx~Oh9v) zz$$|*Er2YjE<*zYkZdRaUFSNsJ;Fd{x~Gd{h(>U1A0yuZ1rFxbP9Oj4$2D3`HkI1D zxHIX05$mri76Z4t@w#)0Rj=r6F%wv4YMje3H)_4%fwxi}j`p&f=QIbhIW=2voH literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/overdrive_that_matters/textures/item/component/reinforced_tritanium_plate.png b/src/main/resources/assets/overdrive_that_matters/textures/item/component/reinforced_tritanium_plate.png index 5e41fa12500a60a4ded4fce29bfbe4eecc3432c9..165517bc50d6dcb783ea5b793b236e722ec91039 100644 GIT binary patch delta 398 zcmbQr^qYBtk4$b;f8(qbvH4Zn+S-1x>2h*%Vq#(p3=E!^F7Z#y(5sgyag8Vm&QB{T zPb^Ah2uRG#E79|F4N)-FGt@Ksy@z=lQ0=zV2+uT6Pb~%xAcvJfijkFp5yX6s4hbT1CVSd|6S)gwmrf?W|pUmV~9p@ zY#%q*0R>R%i_7$idc|<{W<3A^ delta 166 zcmV;X09pV01C;`hOdL*KXKjLyftsjYZ+a^$D;^#m78Vu&006)q`&^M|E`MrCL_t(2 zQ(cZx4uCKSLn{mz_rI_mpe8n1#(VSwMD1~4wU zW%wE3Ml&%JAY6`N$H?M{T}Fr|?tzTc8QejU)fwzN*kKA=u(M+qj$o(POp7;}HwHHb U3Dm$FfB*mh07*qoM6N<$g5I}5xc~qF From 6b68e74b76ed0efc3d6d0308ddcb96748af4300c Mon Sep 17 00:00:00 2001 From: GearShocky Date: Thu, 27 Feb 2025 16:49:59 +0500 Subject: [PATCH 14/15] m --- .../dbotthepony/mc/otm/datagen/recipes/MultiblockRecipes.kt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/recipes/MultiblockRecipes.kt b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/recipes/MultiblockRecipes.kt index aa26f9d42..1b6627841 100644 --- a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/recipes/MultiblockRecipes.kt +++ b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/recipes/MultiblockRecipes.kt @@ -116,13 +116,13 @@ fun addMultiblockRecipes(consumer: RecipeOutput) { .row(MItems.ELECTRIC_PARTS, MItems.ELECTROMOTOR, MItems.ELECTRIC_PARTS) .build(consumer) - MatteryRecipe(MItems.MODULAR_FRAME, category = machinesCategory) + MatteryRecipe(MItems.MODULAR_FRAME, count = 4, category = machinesCategory) .row(MItemTags.IRON_PLATES, Tags.Items.INGOTS_IRON, MItemTags.IRON_PLATES) .rowAC(Tags.Items.INGOTS_IRON, Tags.Items.INGOTS_IRON) .row(MItemTags.IRON_PLATES, Tags.Items.INGOTS_IRON, MItemTags.IRON_PLATES) .build(consumer) - MatteryRecipe(MItems.HEAVY_MODULAR_FRAME, category = machinesCategory) + MatteryRecipe(MItems.HEAVY_MODULAR_FRAME, count = 2, category = machinesCategory) .rowB(MItems.REINFORCED_IRON_PLATE) .row(MItems.REINFORCED_IRON_PLATE, MItems.MODULAR_FRAME, MItems.REINFORCED_IRON_PLATE) .rowB(MItems.REINFORCED_IRON_PLATE) From 8f2f4f10626b2d2d990f4afed12f8e0ba88055ee Mon Sep 17 00:00:00 2001 From: GearShocky Date: Thu, 27 Feb 2025 16:52:27 +0500 Subject: [PATCH 15/15] What about this --- .../ru/dbotthepony/mc/otm/datagen/recipes/MultiblockRecipes.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/recipes/MultiblockRecipes.kt b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/recipes/MultiblockRecipes.kt index 1b6627841..433218a58 100644 --- a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/recipes/MultiblockRecipes.kt +++ b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/recipes/MultiblockRecipes.kt @@ -137,7 +137,7 @@ fun addMultiblockRecipes(consumer: RecipeOutput) { MatteryRecipe(MItems.TRITANIUM_HULL, count = 4, category = machinesCategory) .row(MItemTags.TRITANIUM_PLATES, MItemTags.IRON_PLATES, MItemTags.TRITANIUM_PLATES) - .row(MItemTags.IRON_PLATES, MItems.MECHANICAL_PARTS, MItemTags.IRON_PLATES) + .row(MItemTags.IRON_PLATES, MItems.MODULAR_FRAME, MItemTags.IRON_PLATES) .row(MItemTags.TRITANIUM_PLATES, MItemTags.IRON_PLATES, MItemTags.TRITANIUM_PLATES) .build(consumer)