mirror of
https://github.com/Creators-of-Create/Create.git
synced 2024-11-13 05:21:46 +01:00
Asset Break
- Implemented reworked chute models by Kryppers - Implemented new basin model by Kryppers - Chutes now have proper selection bounds - Some minor texture & model touch-ups - Fixed symmetry wand position in its GUI
This commit is contained in:
simibubi
parent
2040d66c3e
commit
a4b4c770be
42 changed files with 550 additions and 637 deletions
|
|
@ -41,7 +41,7 @@ e81608346d43406ee72cae0f78b8bcfb37ba2d75 assets/create/blockstates/brown_seat.js
|
|||
2ca82a3c4bf7ba1a9cf3bb674e786d9b23b020a4 assets/create/blockstates/chiseled_limestone.json
|
||||
cbcdab42d01f8085db9e5f8db884f8adf7f17625 assets/create/blockstates/chiseled_scoria.json
|
||||
291952556c52fba2af5bbd793c71af81abd27e71 assets/create/blockstates/chiseled_weathered_limestone.json
|
||||
99def0a786714a337e2b1b17db844e4d1aee6234 assets/create/blockstates/chute.json
|
||||
b59324f051f21d8ce1a48a08f4721a61a3c414d6 assets/create/blockstates/chute.json
|
||||
4947c261310445fa55b92038326ac82967d192dd assets/create/blockstates/clockwork_bearing.json
|
||||
1f33834c685e3243882acfe20183fe64dfa872be assets/create/blockstates/clutch.json
|
||||
e5e3757e99c139d67b2a70288466d8a74d818841 assets/create/blockstates/cogwheel.json
|
||||
|
|
@ -129,7 +129,7 @@ de8a40b7daf1497d5aecee47a43b3e0b1d030b00 assets/create/blockstates/fancy_scoria_
|
|||
fc9ac0a7e7191b93516719455a17177fa6524ecc assets/create/blockstates/fancy_weathered_limestone_bricks_slab.json
|
||||
b2a7c321b1795f20e7433f81a55ce4683de081b8 assets/create/blockstates/fancy_weathered_limestone_bricks_stairs.json
|
||||
6372fe02ba0065acb0758121c45a15a1a8fdc5de assets/create/blockstates/fancy_weathered_limestone_bricks_wall.json
|
||||
3d97226b5e8d8f70ed08e45e78db1faf78d5e28b assets/create/blockstates/fluid_pipe.json
|
||||
fe9169716dd21a81a3710a89f0a9b7ea4dcd4d51 assets/create/blockstates/fluid_pipe.json
|
||||
f0eaab18e16c4f3f65ebf3b55b08f0dc445720fe assets/create/blockstates/fluid_tank.json
|
||||
e9da1794b6ece7f9aa8bcb43d42c23a55446133b assets/create/blockstates/flywheel.json
|
||||
ac00d40e1ef50a37041c0481afa1a23a14dea78e assets/create/blockstates/framed_glass.json
|
||||
|
|
@ -358,15 +358,15 @@ a3a11524cd3515fc01d905767b4b7ea782adaf03 assets/create/blockstates/yellow_seat.j
|
|||
7f39521b211441f5c3e06d60c5978cebe16cacfb assets/create/blockstates/zinc_block.json
|
||||
b7181bcd8182b2f17088e5aa881f374c9c65470c assets/create/blockstates/zinc_ore.json
|
||||
a9bcfd546e95865633a97e4b29e39c4aec940338 assets/create/lang/en_ud.json
|
||||
aa14daef8d31ca69ace4e643ffdc5cc9aba22818 assets/create/lang/en_us.json
|
||||
b4435a02a94ae72032f3ffb8f9282e41b1dca953 assets/create/lang/unfinished/de_de.json
|
||||
4f9cc39db1e0de14e9aeabea93676b8fa8ba58ec assets/create/lang/unfinished/fr_fr.json
|
||||
a5a1d2d2e6154c07be187dfe2e33c203db1dd678 assets/create/lang/unfinished/it_it.json
|
||||
022fee71a855d3cd206c2c1d5c36c38f089f8120 assets/create/lang/unfinished/ja_jp.json
|
||||
07da262b3005fd53abd22b5da558e3494bbefa90 assets/create/lang/unfinished/ko_kr.json
|
||||
f1a7c021d2a48a56141ffe70ddec7128c5ad7261 assets/create/lang/unfinished/nl_nl.json
|
||||
5e10814eb0606a6bd20097067394a93842ef7957 assets/create/lang/unfinished/pt_br.json
|
||||
f1367be00730002ee0f233dfebb5e920eed56900 assets/create/lang/unfinished/ru_ru.json
|
||||
8e6187bfc654637c05fd80adaec3c60e6739705a assets/create/lang/en_us.json
|
||||
2426fd815d49680600f1b69e936915413020d117 assets/create/lang/unfinished/de_de.json
|
||||
a287218c649de21c20e43db160ad862dec493103 assets/create/lang/unfinished/fr_fr.json
|
||||
4bfe784a61dac2afb024c4030162c6b1b62ac80d assets/create/lang/unfinished/it_it.json
|
||||
e2b77bb3274597ce3752fae2e93f207f8837e191 assets/create/lang/unfinished/ja_jp.json
|
||||
bebccb9ae6b0d00bf651fa73ac4945f06b57fac2 assets/create/lang/unfinished/ko_kr.json
|
||||
1c158b2b894f9092a4da2d12a8379da7cfcfe3bc assets/create/lang/unfinished/nl_nl.json
|
||||
3610f9f37483efe94c591b96e946f93091f56773 assets/create/lang/unfinished/pt_br.json
|
||||
1d0b24b5dc447e1306a779e1a510411b9ce3c44d assets/create/lang/unfinished/ru_ru.json
|
||||
76928b7d9f7f41f4fa622824a872bec8e5635cea assets/create/lang/unfinished/zh_cn.json
|
||||
846200eb548d3bfa2e77b41039de159b4b6cfb45 assets/create/models/block/acacia_window.json
|
||||
1930fa3a3c98d53dd19e4ee7f55bc27fd47aa281 assets/create/models/block/acacia_window_pane_noside.json
|
||||
|
|
|
|||
|
|
@ -1,39 +1,39 @@
|
|||
{
|
||||
"variants": {
|
||||
"facing=down,shape=start": {
|
||||
"model": "create:block/chute/block_windowed"
|
||||
"facing=down,shape=intersection": {
|
||||
"model": "create:block/chute/block_intersection"
|
||||
},
|
||||
"facing=north,shape=start": {
|
||||
"model": "create:block/chute/block_diagonal_start",
|
||||
"facing=north,shape=intersection": {
|
||||
"model": "create:block/chute/block_diagonal_intersection",
|
||||
"y": 180
|
||||
},
|
||||
"facing=south,shape=start": {
|
||||
"model": "create:block/chute/block_diagonal_start"
|
||||
"facing=south,shape=intersection": {
|
||||
"model": "create:block/chute/block_diagonal_intersection"
|
||||
},
|
||||
"facing=west,shape=start": {
|
||||
"model": "create:block/chute/block_diagonal_start",
|
||||
"facing=west,shape=intersection": {
|
||||
"model": "create:block/chute/block_diagonal_intersection",
|
||||
"y": 90
|
||||
},
|
||||
"facing=east,shape=start": {
|
||||
"model": "create:block/chute/block_diagonal_start",
|
||||
"facing=east,shape=intersection": {
|
||||
"model": "create:block/chute/block_diagonal_intersection",
|
||||
"y": 270
|
||||
},
|
||||
"facing=down,shape=window_straight": {
|
||||
"facing=down,shape=window": {
|
||||
"model": "create:block/chute/block_windowed"
|
||||
},
|
||||
"facing=north,shape=window_straight": {
|
||||
"model": "create:block/chute/block_diagonal_straight",
|
||||
"facing=north,shape=window": {
|
||||
"model": "create:block/chute/block_diagonal",
|
||||
"y": 180
|
||||
},
|
||||
"facing=south,shape=window_straight": {
|
||||
"model": "create:block/chute/block_diagonal_straight"
|
||||
"facing=south,shape=window": {
|
||||
"model": "create:block/chute/block_diagonal"
|
||||
},
|
||||
"facing=west,shape=window_straight": {
|
||||
"model": "create:block/chute/block_diagonal_straight",
|
||||
"facing=west,shape=window": {
|
||||
"model": "create:block/chute/block_diagonal",
|
||||
"y": 90
|
||||
},
|
||||
"facing=east,shape=window_straight": {
|
||||
"model": "create:block/chute/block_diagonal_straight",
|
||||
"facing=east,shape=window": {
|
||||
"model": "create:block/chute/block_diagonal",
|
||||
"y": 270
|
||||
},
|
||||
"facing=down,shape=normal": {
|
||||
|
|
|
|||
|
|
@ -303,8 +303,8 @@
|
|||
{
|
||||
"when": {
|
||||
"west": "false",
|
||||
"down": "false",
|
||||
"east": "true",
|
||||
"down": "false",
|
||||
"up": "true"
|
||||
},
|
||||
"apply": {
|
||||
|
|
@ -314,8 +314,8 @@
|
|||
{
|
||||
"when": {
|
||||
"west": "true",
|
||||
"down": "false",
|
||||
"east": "false",
|
||||
"down": "false",
|
||||
"up": "true"
|
||||
},
|
||||
"apply": {
|
||||
|
|
@ -325,8 +325,8 @@
|
|||
{
|
||||
"when": {
|
||||
"west": "false",
|
||||
"down": "true",
|
||||
"east": "true",
|
||||
"down": "true",
|
||||
"up": "false"
|
||||
},
|
||||
"apply": {
|
||||
|
|
@ -336,8 +336,8 @@
|
|||
{
|
||||
"when": {
|
||||
"west": "true",
|
||||
"down": "true",
|
||||
"east": "false",
|
||||
"down": "true",
|
||||
"up": "false"
|
||||
},
|
||||
"apply": {
|
||||
|
|
@ -347,8 +347,8 @@
|
|||
{
|
||||
"when": {
|
||||
"west": "false",
|
||||
"down": "true",
|
||||
"east": "false",
|
||||
"down": "true",
|
||||
"up": "true"
|
||||
},
|
||||
"apply": {
|
||||
|
|
@ -358,8 +358,8 @@
|
|||
{
|
||||
"when": {
|
||||
"west": "false",
|
||||
"down": "false",
|
||||
"east": "false",
|
||||
"down": "false",
|
||||
"up": "true"
|
||||
},
|
||||
"apply": {
|
||||
|
|
@ -369,8 +369,8 @@
|
|||
{
|
||||
"when": {
|
||||
"west": "false",
|
||||
"down": "true",
|
||||
"east": "false",
|
||||
"down": "true",
|
||||
"up": "false"
|
||||
},
|
||||
"apply": {
|
||||
|
|
@ -380,8 +380,8 @@
|
|||
{
|
||||
"when": {
|
||||
"west": "true",
|
||||
"down": "false",
|
||||
"east": "true",
|
||||
"down": "false",
|
||||
"up": "false"
|
||||
},
|
||||
"apply": {
|
||||
|
|
@ -391,8 +391,8 @@
|
|||
{
|
||||
"when": {
|
||||
"west": "false",
|
||||
"down": "false",
|
||||
"east": "true",
|
||||
"down": "false",
|
||||
"up": "false"
|
||||
},
|
||||
"apply": {
|
||||
|
|
@ -402,8 +402,8 @@
|
|||
{
|
||||
"when": {
|
||||
"west": "true",
|
||||
"down": "false",
|
||||
"east": "false",
|
||||
"down": "false",
|
||||
"up": "false"
|
||||
},
|
||||
"apply": {
|
||||
|
|
@ -413,8 +413,8 @@
|
|||
{
|
||||
"when": {
|
||||
"west": "false",
|
||||
"down": "false",
|
||||
"east": "false",
|
||||
"down": "false",
|
||||
"up": "false"
|
||||
},
|
||||
"apply": {
|
||||
|
|
|
|||
|
|
@ -462,7 +462,7 @@
|
|||
"advancement.create.electron_tube": "Beep boop",
|
||||
"advancement.create.electron_tube.desc": "Make some Electron Tubes, useful in crafting less primitive machinery.",
|
||||
"advancement.create.mechanical_saw": "Stationary Chopping",
|
||||
"advancement.create.mechanical_saw.desc": "Place and power a Mechanical mechanical_saw",
|
||||
"advancement.create.mechanical_saw.desc": "Place and power a Mechanical Saw",
|
||||
"advancement.create.basin": "Basin Operation",
|
||||
"advancement.create.basin.desc": "Place a basin and try throwing items into it.",
|
||||
"advancement.create.mixer": "Mixin' it Up",
|
||||
|
|
@ -520,7 +520,7 @@
|
|||
"death.attack.create.fan_fire": "%1$s was burned to death by hot air",
|
||||
"death.attack.create.fan_lava": "%1$s was burned to death by lava fan",
|
||||
"death.attack.create.mechanical_drill": "%1$s was impaled by Mechanical mechanical_drill",
|
||||
"death.attack.create.mechanical_saw": "%1$s got cut in half by Mechanical mechanical_saw",
|
||||
"death.attack.create.mechanical_saw": "%1$s got cut in half by Mechanical Saw",
|
||||
"death.attack.create.cuckoo_clock_explosion": "%1$s was blown up by tampered cuckoo clock",
|
||||
|
||||
"create.block.deployer.damage_source_name": "a rogue Deployer",
|
||||
|
|
@ -537,7 +537,7 @@
|
|||
"create.recipe.pressing": "Pressing",
|
||||
"create.recipe.mixing": "Mixing",
|
||||
"create.recipe.packing": "Compacting",
|
||||
"create.recipe.mechanical_sawing": "mechanical_sawing",
|
||||
"create.recipe.mechanical_sawing": "Sawing",
|
||||
"create.recipe.mechanical_crafting": "Mechanical Crafting",
|
||||
"create.recipe.block_cutting": "Block Cutting",
|
||||
"create.recipe.blockzapper_upgrade": "Handheld Blockzapper",
|
||||
|
|
|
|||
|
|
@ -463,7 +463,7 @@
|
|||
"advancement.create.electron_tube": "UNLOCALIZED: Beep boop",
|
||||
"advancement.create.electron_tube.desc": "UNLOCALIZED: Make some Electron Tubes, useful in crafting less primitive machinery.",
|
||||
"advancement.create.mechanical_saw": "UNLOCALIZED: Stationary Chopping",
|
||||
"advancement.create.mechanical_saw.desc": "UNLOCALIZED: Place and power a Mechanical mechanical_saw",
|
||||
"advancement.create.mechanical_saw.desc": "UNLOCALIZED: Place and power a Mechanical Saw",
|
||||
"advancement.create.basin": "UNLOCALIZED: Basin Operation",
|
||||
"advancement.create.basin.desc": "UNLOCALIZED: Place a basin and try throwing items into it.",
|
||||
"advancement.create.mixer": "UNLOCALIZED: Mixin' it Up",
|
||||
|
|
@ -521,7 +521,7 @@
|
|||
"death.attack.create.fan_fire": "%1$s hat heiße Luft eingeatmet",
|
||||
"death.attack.create.fan_lava": "%1$s wurde von Lava verweht",
|
||||
"death.attack.create.mechanical_drill": "%1$s wurde von einem Bohrer durchlöchert",
|
||||
"death.attack.create.mechanical_saw": "UNLOCALIZED: %1$s got cut in half by Mechanical mechanical_saw",
|
||||
"death.attack.create.mechanical_saw": "UNLOCALIZED: %1$s got cut in half by Mechanical Saw",
|
||||
"death.attack.create.cuckoo_clock_explosion": "UNLOCALIZED: %1$s was blown up by tampered cuckoo clock",
|
||||
|
||||
"create.block.deployer.damage_source_name": "UNLOCALIZED: a rogue Deployer",
|
||||
|
|
@ -538,7 +538,7 @@
|
|||
"create.recipe.pressing": "Mechanische Presse",
|
||||
"create.recipe.mixing": "UNLOCALIZED: Mixing",
|
||||
"create.recipe.packing": "UNLOCALIZED: Compacting",
|
||||
"create.recipe.mechanical_sawing": "UNLOCALIZED: mechanical_sawing",
|
||||
"create.recipe.mechanical_sawing": "UNLOCALIZED: Sawing",
|
||||
"create.recipe.mechanical_crafting": "UNLOCALIZED: Mechanical Crafting",
|
||||
"create.recipe.block_cutting": "UNLOCALIZED: Block Cutting",
|
||||
"create.recipe.blockzapper_upgrade": "Blockpistole",
|
||||
|
|
|
|||
|
|
@ -463,7 +463,7 @@
|
|||
"advancement.create.electron_tube": "UNLOCALIZED: Beep boop",
|
||||
"advancement.create.electron_tube.desc": "UNLOCALIZED: Make some Electron Tubes, useful in crafting less primitive machinery.",
|
||||
"advancement.create.mechanical_saw": "UNLOCALIZED: Stationary Chopping",
|
||||
"advancement.create.mechanical_saw.desc": "UNLOCALIZED: Place and power a Mechanical mechanical_saw",
|
||||
"advancement.create.mechanical_saw.desc": "UNLOCALIZED: Place and power a Mechanical Saw",
|
||||
"advancement.create.basin": "UNLOCALIZED: Basin Operation",
|
||||
"advancement.create.basin.desc": "UNLOCALIZED: Place a basin and try throwing items into it.",
|
||||
"advancement.create.mixer": "UNLOCALIZED: Mixin' it Up",
|
||||
|
|
|
|||
|
|
@ -463,7 +463,7 @@
|
|||
"advancement.create.electron_tube": "UNLOCALIZED: Beep boop",
|
||||
"advancement.create.electron_tube.desc": "UNLOCALIZED: Make some Electron Tubes, useful in crafting less primitive machinery.",
|
||||
"advancement.create.mechanical_saw": "UNLOCALIZED: Stationary Chopping",
|
||||
"advancement.create.mechanical_saw.desc": "UNLOCALIZED: Place and power a Mechanical mechanical_saw",
|
||||
"advancement.create.mechanical_saw.desc": "UNLOCALIZED: Place and power a Mechanical Saw",
|
||||
"advancement.create.basin": "UNLOCALIZED: Basin Operation",
|
||||
"advancement.create.basin.desc": "UNLOCALIZED: Place a basin and try throwing items into it.",
|
||||
"advancement.create.mixer": "UNLOCALIZED: Mixin' it Up",
|
||||
|
|
|
|||
|
|
@ -463,7 +463,7 @@
|
|||
"advancement.create.electron_tube": "UNLOCALIZED: Beep boop",
|
||||
"advancement.create.electron_tube.desc": "UNLOCALIZED: Make some Electron Tubes, useful in crafting less primitive machinery.",
|
||||
"advancement.create.mechanical_saw": "UNLOCALIZED: Stationary Chopping",
|
||||
"advancement.create.mechanical_saw.desc": "UNLOCALIZED: Place and power a Mechanical mechanical_saw",
|
||||
"advancement.create.mechanical_saw.desc": "UNLOCALIZED: Place and power a Mechanical Saw",
|
||||
"advancement.create.basin": "UNLOCALIZED: Basin Operation",
|
||||
"advancement.create.basin.desc": "UNLOCALIZED: Place a basin and try throwing items into it.",
|
||||
"advancement.create.mixer": "UNLOCALIZED: Mixin' it Up",
|
||||
|
|
|
|||
|
|
@ -463,7 +463,7 @@
|
|||
"advancement.create.electron_tube": "UNLOCALIZED: Beep boop",
|
||||
"advancement.create.electron_tube.desc": "UNLOCALIZED: Make some Electron Tubes, useful in crafting less primitive machinery.",
|
||||
"advancement.create.mechanical_saw": "UNLOCALIZED: Stationary Chopping",
|
||||
"advancement.create.mechanical_saw.desc": "UNLOCALIZED: Place and power a Mechanical mechanical_saw",
|
||||
"advancement.create.mechanical_saw.desc": "UNLOCALIZED: Place and power a Mechanical Saw",
|
||||
"advancement.create.basin": "UNLOCALIZED: Basin Operation",
|
||||
"advancement.create.basin.desc": "UNLOCALIZED: Place a basin and try throwing items into it.",
|
||||
"advancement.create.mixer": "UNLOCALIZED: Mixin' it Up",
|
||||
|
|
|
|||
|
|
@ -463,7 +463,7 @@
|
|||
"advancement.create.electron_tube": "UNLOCALIZED: Beep boop",
|
||||
"advancement.create.electron_tube.desc": "UNLOCALIZED: Make some Electron Tubes, useful in crafting less primitive machinery.",
|
||||
"advancement.create.mechanical_saw": "UNLOCALIZED: Stationary Chopping",
|
||||
"advancement.create.mechanical_saw.desc": "UNLOCALIZED: Place and power a Mechanical mechanical_saw",
|
||||
"advancement.create.mechanical_saw.desc": "UNLOCALIZED: Place and power a Mechanical Saw",
|
||||
"advancement.create.basin": "UNLOCALIZED: Basin Operation",
|
||||
"advancement.create.basin.desc": "UNLOCALIZED: Place a basin and try throwing items into it.",
|
||||
"advancement.create.mixer": "UNLOCALIZED: Mixin' it Up",
|
||||
|
|
@ -521,7 +521,7 @@
|
|||
"death.attack.create.fan_fire": "%1$s is verbrand door hete lucht",
|
||||
"death.attack.create.fan_lava": "%1$s is verbrand door een lava ventilator",
|
||||
"death.attack.create.mechanical_drill": "%1$s is gespietst door een mechanische boor",
|
||||
"death.attack.create.mechanical_saw": "UNLOCALIZED: %1$s got cut in half by Mechanical mechanical_saw",
|
||||
"death.attack.create.mechanical_saw": "UNLOCALIZED: %1$s got cut in half by Mechanical Saw",
|
||||
"death.attack.create.cuckoo_clock_explosion": "UNLOCALIZED: %1$s was blown up by tampered cuckoo clock",
|
||||
|
||||
"create.block.deployer.damage_source_name": "UNLOCALIZED: a rogue Deployer",
|
||||
|
|
|
|||
|
|
@ -463,7 +463,7 @@
|
|||
"advancement.create.electron_tube": "UNLOCALIZED: Beep boop",
|
||||
"advancement.create.electron_tube.desc": "UNLOCALIZED: Make some Electron Tubes, useful in crafting less primitive machinery.",
|
||||
"advancement.create.mechanical_saw": "UNLOCALIZED: Stationary Chopping",
|
||||
"advancement.create.mechanical_saw.desc": "UNLOCALIZED: Place and power a Mechanical mechanical_saw",
|
||||
"advancement.create.mechanical_saw.desc": "UNLOCALIZED: Place and power a Mechanical Saw",
|
||||
"advancement.create.basin": "UNLOCALIZED: Basin Operation",
|
||||
"advancement.create.basin.desc": "UNLOCALIZED: Place a basin and try throwing items into it.",
|
||||
"advancement.create.mixer": "UNLOCALIZED: Mixin' it Up",
|
||||
|
|
@ -521,7 +521,7 @@
|
|||
"death.attack.create.fan_fire": "%1$s foi queimado por ar quente",
|
||||
"death.attack.create.fan_lava": "%1$s foi queimado pelo ventilador de lava",
|
||||
"death.attack.create.mechanical_drill": "%1$s foi empalado pela Furadeira Mecânica",
|
||||
"death.attack.create.mechanical_saw": "UNLOCALIZED: %1$s got cut in half by Mechanical mechanical_saw",
|
||||
"death.attack.create.mechanical_saw": "UNLOCALIZED: %1$s got cut in half by Mechanical Saw",
|
||||
"death.attack.create.cuckoo_clock_explosion": "UNLOCALIZED: %1$s was blown up by tampered cuckoo clock",
|
||||
|
||||
"create.block.deployer.damage_source_name": "UNLOCALIZED: a rogue Deployer",
|
||||
|
|
@ -538,7 +538,7 @@
|
|||
"create.recipe.pressing": "Prensa Mecânica",
|
||||
"create.recipe.mixing": "UNLOCALIZED: Mixing",
|
||||
"create.recipe.packing": "UNLOCALIZED: Compacting",
|
||||
"create.recipe.mechanical_sawing": "UNLOCALIZED: mechanical_sawing",
|
||||
"create.recipe.mechanical_sawing": "UNLOCALIZED: Sawing",
|
||||
"create.recipe.mechanical_crafting": "UNLOCALIZED: Mechanical Crafting",
|
||||
"create.recipe.block_cutting": "UNLOCALIZED: Block Cutting",
|
||||
"create.recipe.blockzapper_upgrade": "Blockzapper Portátil",
|
||||
|
|
|
|||
|
|
@ -463,7 +463,7 @@
|
|||
"advancement.create.electron_tube": "UNLOCALIZED: Beep boop",
|
||||
"advancement.create.electron_tube.desc": "UNLOCALIZED: Make some Electron Tubes, useful in crafting less primitive machinery.",
|
||||
"advancement.create.mechanical_saw": "UNLOCALIZED: Stationary Chopping",
|
||||
"advancement.create.mechanical_saw.desc": "UNLOCALIZED: Place and power a Mechanical mechanical_saw",
|
||||
"advancement.create.mechanical_saw.desc": "UNLOCALIZED: Place and power a Mechanical Saw",
|
||||
"advancement.create.basin": "UNLOCALIZED: Basin Operation",
|
||||
"advancement.create.basin.desc": "UNLOCALIZED: Place a basin and try throwing items into it.",
|
||||
"advancement.create.mixer": "UNLOCALIZED: Mixin' it Up",
|
||||
|
|
@ -521,7 +521,7 @@
|
|||
"death.attack.create.fan_fire": "%1$s сгорел заживо от горячего воздуха.",
|
||||
"death.attack.create.fan_lava": "%1$s сгорел заживо от лавового вентилятора",
|
||||
"death.attack.create.mechanical_drill": "%1$s был проколот механическим буром",
|
||||
"death.attack.create.mechanical_saw": "UNLOCALIZED: %1$s got cut in half by Mechanical mechanical_saw",
|
||||
"death.attack.create.mechanical_saw": "UNLOCALIZED: %1$s got cut in half by Mechanical Saw",
|
||||
"death.attack.create.cuckoo_clock_explosion": "UNLOCALIZED: %1$s was blown up by tampered cuckoo clock",
|
||||
|
||||
"create.block.deployer.damage_source_name": "UNLOCALIZED: a rogue Deployer",
|
||||
|
|
@ -538,7 +538,7 @@
|
|||
"create.recipe.pressing": "Механический пресс",
|
||||
"create.recipe.mixing": "UNLOCALIZED: Mixing",
|
||||
"create.recipe.packing": "UNLOCALIZED: Compacting",
|
||||
"create.recipe.mechanical_sawing": "UNLOCALIZED: mechanical_sawing",
|
||||
"create.recipe.mechanical_sawing": "UNLOCALIZED: Sawing",
|
||||
"create.recipe.mechanical_crafting": "UNLOCALIZED: Mechanical Crafting",
|
||||
"create.recipe.block_cutting": "UNLOCALIZED: Block Cutting",
|
||||
"create.recipe.blockzapper_upgrade": "Портативный размещатель блоков",
|
||||
|
|
|
|||
|
|
@ -6,6 +6,7 @@ import static net.minecraft.util.Direction.UP;
|
|||
|
||||
import java.util.function.BiFunction;
|
||||
|
||||
import com.simibubi.create.content.logistics.block.chute.ChuteShapes;
|
||||
import com.simibubi.create.foundation.utility.VoxelShaper;
|
||||
|
||||
import net.minecraft.block.Block;
|
||||
|
|
@ -111,14 +112,16 @@ public class AllShapes {
|
|||
// Static Block Shapes
|
||||
public static final VoxelShape
|
||||
|
||||
BASIN_BLOCK_SHAPE = shape(0, 2, 0, 16, 13, 16).erase(2, 5, 2, 14, 14, 14)
|
||||
BASIN_BLOCK_SHAPE = shape(0, 2, 0, 16, 16, 16).erase(2, 2, 2, 14, 16, 14)
|
||||
.add(2, 0, 2, 14, 2, 14)
|
||||
.build(), HEATER_BLOCK_SHAPE =
|
||||
shape(2, 0, 2, 14, 14, 14).add(0, 0, 0, 16, 4, 16)
|
||||
.build(), BASIN_COLLISION_SHAPE =
|
||||
shape(0, 2, 0, 16, 16, 16).erase(2, 5, 2, 14, 16, 14)
|
||||
.add(2, 0, 2, 14, 2, 14)
|
||||
.build(),
|
||||
HEATER_BLOCK_SHAPE = shape(2, 0, 2, 14, 14, 14).add(0, 0, 0, 16, 4, 16)
|
||||
.build(),
|
||||
HEATER_BLOCK_SPECIAL_COLLISION_SHAPE = shape(0, 0, 0, 16, 4, 16).build(),
|
||||
CRUSHING_WHEEL_COLLISION_SHAPE = cuboid(0, 0, 0, 16, 22, 16),
|
||||
SEAT = cuboid(0, 0, 0, 16, 8, 16),
|
||||
CRUSHING_WHEEL_COLLISION_SHAPE = cuboid(0, 0, 0, 16, 22, 16), SEAT = cuboid(0, 0, 0, 16, 8, 16),
|
||||
SEAT_COLLISION = cuboid(0, 0, 0, 16, 6, 16),
|
||||
MECHANICAL_PROCESSOR_SHAPE = shape(VoxelShapes.fullCube()).erase(4, 0, 4, 12, 16, 12)
|
||||
.build(),
|
||||
|
|
@ -171,7 +174,8 @@ public class AllShapes {
|
|||
LOGISTICS_TABLE = shape(TABLE_POLE_SHAPE).add(LOGISTICS_TABLE_SLOPE)
|
||||
.forHorizontal(SOUTH),
|
||||
SCHEMATICS_TABLE = shape(TABLE_POLE_SHAPE).add(SCHEMATICS_TABLE_SLOPE)
|
||||
.forDirectional(SOUTH)
|
||||
.forDirectional(SOUTH),
|
||||
CHUTE_SLOPE = shape(ChuteShapes.createSlope()).forHorizontal(SOUTH)
|
||||
|
||||
;
|
||||
|
||||
|
|
|
|||
|
|
@ -103,11 +103,15 @@ public class BasinBlock extends Block implements ITE<BasinTileEntity>, IWrenchab
|
|||
}
|
||||
|
||||
@Override
|
||||
public void onReplaced(BlockState state, World worldIn, BlockPos pos, BlockState newState, boolean isMoving) {
|
||||
if (!state.hasTileEntity() || state.getBlock() == newState.getBlock()) {
|
||||
return;
|
||||
}
|
||||
public VoxelShape getCollisionShape(BlockState p_220071_1_, IBlockReader p_220071_2_, BlockPos p_220071_3_,
|
||||
ISelectionContext p_220071_4_) {
|
||||
return AllShapes.BASIN_COLLISION_SHAPE;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onReplaced(BlockState state, World worldIn, BlockPos pos, BlockState newState, boolean isMoving) {
|
||||
if (!state.hasTileEntity() || state.getBlock() == newState.getBlock())
|
||||
return;
|
||||
withTileEntityDo(worldIn, pos, te -> {
|
||||
ItemHelper.dropContents(worldIn, pos, te.inputItemInventory);
|
||||
ItemHelper.dropContents(worldIn, pos, te.outputItemInventory);
|
||||
|
|
|
|||
|
|
@ -5,13 +5,11 @@ import java.util.Collections;
|
|||
import java.util.LinkedList;
|
||||
import java.util.List;
|
||||
|
||||
import com.simibubi.create.content.contraptions.base.KineticTileEntity;
|
||||
import org.apache.commons.lang3.mutable.MutableInt;
|
||||
|
||||
import com.simibubi.create.AllBlocks;
|
||||
import com.simibubi.create.AllItems;
|
||||
import com.simibubi.create.AllTileEntities;
|
||||
import com.simibubi.create.content.contraptions.base.HorizontalKineticBlock;
|
||||
import com.simibubi.create.content.contraptions.base.KineticTileEntity;
|
||||
import com.simibubi.create.content.contraptions.relays.belt.BeltTileEntity.CasingType;
|
||||
import com.simibubi.create.content.contraptions.relays.belt.transport.BeltMovementHandler.TransportedEntityInfo;
|
||||
import com.simibubi.create.content.logistics.block.belts.tunnel.BeltTunnelBlock;
|
||||
|
|
@ -19,6 +17,7 @@ import com.simibubi.create.content.schematics.ISpecialBlockItemRequirement;
|
|||
import com.simibubi.create.content.schematics.ItemRequirement;
|
||||
import com.simibubi.create.content.schematics.ItemRequirement.ItemUseType;
|
||||
import com.simibubi.create.foundation.block.ITE;
|
||||
import com.simibubi.create.foundation.utility.BlockHelper;
|
||||
import com.simibubi.create.foundation.utility.Iterate;
|
||||
|
||||
import net.minecraft.block.Block;
|
||||
|
|
@ -26,7 +25,6 @@ import net.minecraft.block.BlockRenderType;
|
|||
import net.minecraft.block.BlockState;
|
||||
import net.minecraft.block.Blocks;
|
||||
import net.minecraft.block.material.Material;
|
||||
import net.minecraft.client.particle.DiggingParticle;
|
||||
import net.minecraft.client.particle.ParticleManager;
|
||||
import net.minecraft.entity.Entity;
|
||||
import net.minecraft.entity.MobEntity;
|
||||
|
|
@ -52,7 +50,6 @@ import net.minecraft.util.NonNullList;
|
|||
import net.minecraft.util.Rotation;
|
||||
import net.minecraft.util.math.BlockPos;
|
||||
import net.minecraft.util.math.BlockRayTraceResult;
|
||||
import net.minecraft.util.math.MathHelper;
|
||||
import net.minecraft.util.math.RayTraceResult;
|
||||
import net.minecraft.util.math.shapes.ISelectionContext;
|
||||
import net.minecraft.util.math.shapes.VoxelShape;
|
||||
|
|
@ -327,40 +324,7 @@ public class BeltBlock extends HorizontalKineticBlock implements ITE<BeltTileEnt
|
|||
@Override
|
||||
@OnlyIn(Dist.CLIENT)
|
||||
public boolean addDestroyEffects(BlockState state, World world, BlockPos pos, ParticleManager manager) {
|
||||
// From Particle Manager, but reduced density for belts with lots of boxes
|
||||
VoxelShape voxelshape = state.getShape(world, pos);
|
||||
MutableInt amtBoxes = new MutableInt(0);
|
||||
voxelshape.forEachBox((x1, y1, z1, x2, y2, z2) -> amtBoxes.increment());
|
||||
double chance = 1d / amtBoxes.getValue();
|
||||
|
||||
voxelshape.forEachBox((x1, y1, z1, x2, y2, z2) -> {
|
||||
double d1 = Math.min(1.0D, x2 - x1);
|
||||
double d2 = Math.min(1.0D, y2 - y1);
|
||||
double d3 = Math.min(1.0D, z2 - z1);
|
||||
int i = Math.max(2, MathHelper.ceil(d1 / 0.25D));
|
||||
int j = Math.max(2, MathHelper.ceil(d2 / 0.25D));
|
||||
int k = Math.max(2, MathHelper.ceil(d3 / 0.25D));
|
||||
|
||||
for (int l = 0; l < i; ++l) {
|
||||
for (int i1 = 0; i1 < j; ++i1) {
|
||||
for (int j1 = 0; j1 < k; ++j1) {
|
||||
if (world.rand.nextDouble() > chance)
|
||||
continue;
|
||||
|
||||
double d4 = ((double) l + 0.5D) / (double) i;
|
||||
double d5 = ((double) i1 + 0.5D) / (double) j;
|
||||
double d6 = ((double) j1 + 0.5D) / (double) k;
|
||||
double d7 = d4 * d1 + x1;
|
||||
double d8 = d5 * d2 + y1;
|
||||
double d9 = d6 * d3 + z1;
|
||||
manager
|
||||
.addEffect((new DiggingParticle(world, (double) pos.getX() + d7, (double) pos.getY() + d8,
|
||||
(double) pos.getZ() + d9, d4 - 0.5D, d5 - 0.5D, d6 - 0.5D, state)).setBlockPos(pos));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
});
|
||||
BlockHelper.addReducedDestroyEffects(state, world, pos, manager);
|
||||
return true;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -115,7 +115,7 @@ public class SymmetryWandScreen extends AbstractSimiScreen {
|
|||
renderBlock();
|
||||
|
||||
GuiGameElement.of(wand)
|
||||
.at(guiLeft + 220, guiTop + 220)
|
||||
.at(guiLeft + 200, guiTop + 170)
|
||||
.scale(4)
|
||||
.rotate(-70, 20, 20)
|
||||
.render();
|
||||
|
|
|
|||
|
|
@ -3,17 +3,18 @@ package com.simibubi.create.content.logistics.block.chute;
|
|||
import java.util.HashMap;
|
||||
import java.util.Map;
|
||||
|
||||
import com.simibubi.create.AllShapes;
|
||||
import com.simibubi.create.AllTileEntities;
|
||||
import com.simibubi.create.content.contraptions.wrench.IWrenchable;
|
||||
import com.simibubi.create.foundation.block.ITE;
|
||||
import com.simibubi.create.foundation.tileEntity.TileEntityBehaviour;
|
||||
import com.simibubi.create.foundation.tileEntity.behaviour.belt.DirectBeltInputBehaviour;
|
||||
import com.simibubi.create.foundation.utility.BlockHelper;
|
||||
import com.simibubi.create.foundation.utility.Iterate;
|
||||
import com.simibubi.create.foundation.utility.Lang;
|
||||
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.block.BlockState;
|
||||
import net.minecraft.client.particle.ParticleManager;
|
||||
import net.minecraft.entity.Entity;
|
||||
import net.minecraft.entity.item.ItemEntity;
|
||||
import net.minecraft.entity.player.PlayerEntity;
|
||||
|
|
@ -38,13 +39,15 @@ import net.minecraft.world.IBlockReader;
|
|||
import net.minecraft.world.IWorld;
|
||||
import net.minecraft.world.IWorldReader;
|
||||
import net.minecraft.world.World;
|
||||
import net.minecraftforge.api.distmarker.Dist;
|
||||
import net.minecraftforge.api.distmarker.OnlyIn;
|
||||
|
||||
public class ChuteBlock extends Block implements IWrenchable, ITE<ChuteTileEntity> {
|
||||
public static final IProperty<Shape> SHAPE = EnumProperty.create("shape", Shape.class);
|
||||
public static final DirectionProperty FACING = BlockStateProperties.FACING_EXCEPT_UP;
|
||||
|
||||
public enum Shape implements IStringSerializable {
|
||||
START(), WINDOW_STRAIGHT(), NORMAL();
|
||||
INTERSECTION, WINDOW, NORMAL;
|
||||
|
||||
@Override
|
||||
public String getName() {
|
||||
|
|
@ -170,14 +173,15 @@ public class ChuteBlock extends Block implements IWrenchable, ITE<ChuteTileEntit
|
|||
Map<Direction, Boolean> connections = new HashMap<>();
|
||||
int amtConnections = 0;
|
||||
Direction facing = state.get(FACING);
|
||||
boolean vertical = facing == Direction.DOWN;
|
||||
|
||||
if (facing == Direction.DOWN)
|
||||
return state;
|
||||
BlockState target = world.getBlockState(pos.down()
|
||||
.offset(facing.getOpposite()));
|
||||
if (!(target.getBlock() instanceof ChuteBlock))
|
||||
return state.with(FACING, Direction.DOWN)
|
||||
.with(SHAPE, Shape.NORMAL);
|
||||
if (!vertical) {
|
||||
BlockState target = world.getBlockState(pos.down()
|
||||
.offset(facing.getOpposite()));
|
||||
if (!(target.getBlock() instanceof ChuteBlock))
|
||||
return state.with(FACING, Direction.DOWN)
|
||||
.with(SHAPE, Shape.NORMAL);
|
||||
}
|
||||
|
||||
for (Direction direction : Iterate.horizontalDirections) {
|
||||
BlockState diagonalInputChute = world.getBlockState(pos.up()
|
||||
|
|
@ -189,31 +193,51 @@ public class ChuteBlock extends Block implements IWrenchable, ITE<ChuteTileEntit
|
|||
amtConnections++;
|
||||
}
|
||||
|
||||
if (amtConnections == 0)
|
||||
return state.with(SHAPE, Shape.START);
|
||||
boolean noConnections = amtConnections == 0;
|
||||
if (vertical)
|
||||
return state.with(SHAPE,
|
||||
noConnections ? state.get(SHAPE) == Shape.WINDOW ? Shape.WINDOW : Shape.NORMAL : Shape.INTERSECTION);
|
||||
if (noConnections)
|
||||
return state.with(SHAPE, Shape.INTERSECTION);
|
||||
if (connections.get(Direction.NORTH) && connections.get(Direction.SOUTH))
|
||||
return state.with(SHAPE, Shape.START);
|
||||
return state.with(SHAPE, Shape.INTERSECTION);
|
||||
if (connections.get(Direction.EAST) && connections.get(Direction.WEST))
|
||||
return state.with(SHAPE, Shape.START);
|
||||
return state.with(SHAPE, Shape.INTERSECTION);
|
||||
if (amtConnections == 1 && connections.get(facing)
|
||||
&& !(above.getBlock() instanceof ChuteBlock && above.get(FACING) == Direction.DOWN))
|
||||
return state.with(SHAPE, Shape.WINDOW_STRAIGHT);
|
||||
return state.with(SHAPE, Shape.NORMAL);
|
||||
return state.with(SHAPE, Shape.NORMAL);
|
||||
return state.with(SHAPE, Shape.INTERSECTION);
|
||||
}
|
||||
|
||||
@Override
|
||||
public ActionResultType onWrenched(BlockState state, ItemUseContext context) {
|
||||
if (!context.getWorld().isRemote && state.get(FACING) == Direction.DOWN)
|
||||
Shape shape = state.get(SHAPE);
|
||||
boolean down = state.get(FACING) == Direction.DOWN;
|
||||
if (!context.getWorld().isRemote && down && shape != Shape.INTERSECTION) {
|
||||
context.getWorld()
|
||||
.setBlockState(context.getPos(), state.with(SHAPE,
|
||||
state.get(SHAPE) == Shape.WINDOW_STRAIGHT ? Shape.NORMAL : Shape.WINDOW_STRAIGHT));
|
||||
.setBlockState(context.getPos(),
|
||||
state.with(SHAPE, shape == Shape.WINDOW ? Shape.NORMAL : Shape.WINDOW));
|
||||
}
|
||||
return ActionResultType.SUCCESS;
|
||||
}
|
||||
|
||||
@Override
|
||||
public VoxelShape getShape(BlockState p_220053_1_, IBlockReader p_220053_2_, BlockPos p_220053_3_,
|
||||
ISelectionContext p_220053_4_) {
|
||||
return AllShapes.CHUTE;
|
||||
return ChuteShapes.getShape(p_220053_1_);
|
||||
}
|
||||
|
||||
@Override
|
||||
@OnlyIn(Dist.CLIENT)
|
||||
public boolean addDestroyEffects(BlockState state, World world, BlockPos pos, ParticleManager manager) {
|
||||
BlockHelper.addReducedDestroyEffects(state, world, pos, manager);
|
||||
return true;
|
||||
}
|
||||
|
||||
@Override
|
||||
public VoxelShape getCollisionShape(BlockState p_220071_1_, IBlockReader p_220071_2_, BlockPos p_220071_3_,
|
||||
ISelectionContext p_220071_4_) {
|
||||
return ChuteShapes.getCollisionShape(p_220071_1_);
|
||||
}
|
||||
|
||||
@Override
|
||||
|
|
|
|||
|
|
@ -31,11 +31,10 @@ public class ChuteGenerator extends SpecialBlockStateGen {
|
|||
|
||||
if (!horizontal)
|
||||
return shape == Shape.NORMAL ? AssetLookup.partialBaseModel(ctx, prov)
|
||||
: AssetLookup.partialBaseModel(ctx, prov, "windowed");
|
||||
|
||||
return shape == Shape.NORMAL ? AssetLookup.partialBaseModel(ctx, prov, "diagonal")
|
||||
: shape == Shape.START ? AssetLookup.partialBaseModel(ctx, prov, "diagonal", "start")
|
||||
: AssetLookup.partialBaseModel(ctx, prov, "diagonal", "straight");
|
||||
: shape == Shape.INTERSECTION ? AssetLookup.partialBaseModel(ctx, prov, "intersection")
|
||||
: AssetLookup.partialBaseModel(ctx, prov, "windowed");
|
||||
return shape == Shape.INTERSECTION ? AssetLookup.partialBaseModel(ctx, prov, "diagonal", "intersection")
|
||||
: AssetLookup.partialBaseModel(ctx, prov, "diagonal");
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -27,7 +27,7 @@ public class ChuteRenderer extends SafeTileEntityRenderer<ChuteTileEntity> {
|
|||
BlockState blockState = te.getBlockState();
|
||||
if (blockState.get(ChuteBlock.FACING) != Direction.DOWN)
|
||||
return;
|
||||
if (blockState.get(ChuteBlock.SHAPE) != Shape.WINDOW_STRAIGHT)
|
||||
if (blockState.get(ChuteBlock.SHAPE) != Shape.WINDOW)
|
||||
return;
|
||||
|
||||
ItemRenderer itemRenderer = Minecraft.getInstance()
|
||||
|
|
|
|||
|
|
@ -0,0 +1,66 @@
|
|||
package com.simibubi.create.content.logistics.block.chute;
|
||||
|
||||
import java.util.HashMap;
|
||||
import java.util.Map;
|
||||
|
||||
import com.simibubi.create.AllShapes;
|
||||
import com.simibubi.create.content.logistics.block.chute.ChuteBlock.Shape;
|
||||
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.block.BlockState;
|
||||
import net.minecraft.util.Direction;
|
||||
import net.minecraft.util.math.shapes.IBooleanFunction;
|
||||
import net.minecraft.util.math.shapes.VoxelShape;
|
||||
import net.minecraft.util.math.shapes.VoxelShapes;
|
||||
|
||||
public class ChuteShapes {
|
||||
|
||||
static Map<BlockState, VoxelShape> cache = new HashMap<>();
|
||||
static Map<BlockState, VoxelShape> collisionCache = new HashMap<>();
|
||||
|
||||
public static final VoxelShape INTERSECTION_MASK = Block.makeCuboidShape(0, -16, 0, 16, 16, 16);
|
||||
public static final VoxelShape COLLISION_MASK = Block.makeCuboidShape(0, 0, 0, 16, 24, 16);
|
||||
|
||||
public static VoxelShape createShape(BlockState state) {
|
||||
Direction direction = state.get(ChuteBlock.FACING);
|
||||
Shape shape = state.get(ChuteBlock.SHAPE);
|
||||
|
||||
boolean intersection = shape == Shape.INTERSECTION;
|
||||
if (direction == Direction.DOWN)
|
||||
return intersection ? VoxelShapes.fullCube() : AllShapes.CHUTE;
|
||||
|
||||
VoxelShape combineWith = intersection ? VoxelShapes.fullCube() : VoxelShapes.empty();
|
||||
VoxelShape result = VoxelShapes.or(combineWith, AllShapes.CHUTE_SLOPE.get(direction));
|
||||
if (intersection)
|
||||
result = VoxelShapes.combine(INTERSECTION_MASK, result, IBooleanFunction.AND);
|
||||
return result;
|
||||
}
|
||||
|
||||
public static VoxelShape getShape(BlockState state) {
|
||||
if (cache.containsKey(state))
|
||||
return cache.get(state);
|
||||
VoxelShape createdShape = createShape(state);
|
||||
cache.put(state, createdShape);
|
||||
return createdShape;
|
||||
}
|
||||
|
||||
public static VoxelShape getCollisionShape(BlockState state) {
|
||||
if (collisionCache.containsKey(state))
|
||||
return collisionCache.get(state);
|
||||
VoxelShape createdShape = VoxelShapes.combine(COLLISION_MASK, getShape(state), IBooleanFunction.AND);
|
||||
collisionCache.put(state, createdShape);
|
||||
return createdShape;
|
||||
}
|
||||
|
||||
public static final VoxelShape PANEL = Block.makeCuboidShape(1, -15, 0, 15, 4, 1);
|
||||
|
||||
public static VoxelShape createSlope() {
|
||||
VoxelShape shape = VoxelShapes.empty();
|
||||
for (int i = 0; i < 16; i++) {
|
||||
float offset = i / 16f;
|
||||
shape = VoxelShapes.combineAndSimplify(shape, PANEL.withOffset(0, offset, offset), IBooleanFunction.OR);
|
||||
}
|
||||
return shape;
|
||||
}
|
||||
|
||||
}
|
||||
|
|
@ -79,7 +79,7 @@ public class ChuteTileEntity extends SmartTileEntity implements IHaveGoggleInfor
|
|||
return false;
|
||||
if (getItemMotion() > 0 && getInputChutes().isEmpty())
|
||||
return false;
|
||||
return blockState.get(ChuteBlock.FACING) == Direction.DOWN || blockState.get(ChuteBlock.SHAPE) == Shape.START;
|
||||
return blockState.get(ChuteBlock.FACING) == Direction.DOWN || blockState.get(ChuteBlock.SHAPE) == Shape.INTERSECTION;
|
||||
}
|
||||
|
||||
@Override
|
||||
|
|
|
|||
|
|
@ -2,8 +2,12 @@ package com.simibubi.create.foundation.utility;
|
|||
|
||||
import java.util.function.Consumer;
|
||||
|
||||
import org.apache.commons.lang3.mutable.MutableInt;
|
||||
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.block.BlockState;
|
||||
import net.minecraft.client.particle.DiggingParticle;
|
||||
import net.minecraft.client.particle.ParticleManager;
|
||||
import net.minecraft.entity.player.PlayerEntity;
|
||||
import net.minecraft.fluid.IFluidState;
|
||||
import net.minecraft.item.Item;
|
||||
|
|
@ -12,18 +16,59 @@ import net.minecraft.state.properties.BlockStateProperties;
|
|||
import net.minecraft.state.properties.SlabType;
|
||||
import net.minecraft.tileentity.TileEntity;
|
||||
import net.minecraft.util.math.BlockPos;
|
||||
import net.minecraft.util.math.MathHelper;
|
||||
import net.minecraft.util.math.shapes.VoxelShape;
|
||||
import net.minecraft.world.GameRules;
|
||||
import net.minecraft.world.World;
|
||||
import net.minecraft.world.server.ServerWorld;
|
||||
import net.minecraftforge.api.distmarker.Dist;
|
||||
import net.minecraftforge.api.distmarker.OnlyIn;
|
||||
|
||||
public class BlockHelper {
|
||||
|
||||
@OnlyIn(Dist.CLIENT)
|
||||
public static void addReducedDestroyEffects(BlockState state, World world, BlockPos pos, ParticleManager manager) {
|
||||
VoxelShape voxelshape = state.getShape(world, pos);
|
||||
MutableInt amtBoxes = new MutableInt(0);
|
||||
voxelshape.forEachBox((x1, y1, z1, x2, y2, z2) -> amtBoxes.increment());
|
||||
double chance = 1d / amtBoxes.getValue();
|
||||
|
||||
voxelshape.forEachBox((x1, y1, z1, x2, y2, z2) -> {
|
||||
double d1 = Math.min(1.0D, x2 - x1);
|
||||
double d2 = Math.min(1.0D, y2 - y1);
|
||||
double d3 = Math.min(1.0D, z2 - z1);
|
||||
int i = Math.max(2, MathHelper.ceil(d1 / 0.25D));
|
||||
int j = Math.max(2, MathHelper.ceil(d2 / 0.25D));
|
||||
int k = Math.max(2, MathHelper.ceil(d3 / 0.25D));
|
||||
|
||||
for (int l = 0; l < i; ++l) {
|
||||
for (int i1 = 0; i1 < j; ++i1) {
|
||||
for (int j1 = 0; j1 < k; ++j1) {
|
||||
if (world.rand.nextDouble() > chance)
|
||||
continue;
|
||||
|
||||
double d4 = ((double) l + 0.5D) / (double) i;
|
||||
double d5 = ((double) i1 + 0.5D) / (double) j;
|
||||
double d6 = ((double) j1 + 0.5D) / (double) k;
|
||||
double d7 = d4 * d1 + x1;
|
||||
double d8 = d5 * d2 + y1;
|
||||
double d9 = d6 * d3 + z1;
|
||||
manager
|
||||
.addEffect((new DiggingParticle(world, (double) pos.getX() + d7, (double) pos.getY() + d8,
|
||||
(double) pos.getZ() + d9, d4 - 0.5D, d5 - 0.5D, d6 - 0.5D, state)).setBlockPos(pos));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
});
|
||||
}
|
||||
|
||||
public static int findAndRemoveInInventory(BlockState block, PlayerEntity player, int amount) {
|
||||
int amountFound = 0;
|
||||
Item required = getRequiredItem(block).getItem();
|
||||
|
||||
boolean needsTwo = block.has(BlockStateProperties.SLAB_TYPE)
|
||||
&& block.get(BlockStateProperties.SLAB_TYPE) == SlabType.DOUBLE;
|
||||
boolean needsTwo =
|
||||
block.has(BlockStateProperties.SLAB_TYPE) && block.get(BlockStateProperties.SLAB_TYPE) == SlabType.DOUBLE;
|
||||
|
||||
if (needsTwo)
|
||||
amount *= 2;
|
||||
|
|
@ -36,7 +81,7 @@ public class BlockHelper {
|
|||
if (itemstack.getItem() == required && count > 0) {
|
||||
int taken = Math.min(count, amount - amountFound);
|
||||
player.inventory.setInventorySlotContents(preferredSlot,
|
||||
new ItemStack(itemstack.getItem(), count - taken));
|
||||
new ItemStack(itemstack.getItem(), count - taken));
|
||||
amountFound += taken;
|
||||
}
|
||||
}
|
||||
|
|
@ -75,14 +120,15 @@ public class BlockHelper {
|
|||
}
|
||||
|
||||
public static void destroyBlock(World world, BlockPos pos, float effectChance,
|
||||
Consumer<ItemStack> droppedItemCallback) {
|
||||
Consumer<ItemStack> droppedItemCallback) {
|
||||
IFluidState ifluidstate = world.getFluidState(pos);
|
||||
BlockState state = world.getBlockState(pos);
|
||||
if (world.rand.nextFloat() < effectChance)
|
||||
world.playEvent(2001, pos, Block.getStateId(state));
|
||||
TileEntity tileentity = state.hasTileEntity() ? world.getTileEntity(pos) : null;
|
||||
|
||||
if (world.getGameRules().getBoolean(GameRules.DO_TILE_DROPS) && !world.restoringBlockSnapshots) {
|
||||
if (world.getGameRules()
|
||||
.getBoolean(GameRules.DO_TILE_DROPS) && !world.restoringBlockSnapshots) {
|
||||
for (ItemStack itemStack : Block.getDrops(state, (ServerWorld) world, pos, tileentity))
|
||||
droppedItemCallback.accept(itemStack);
|
||||
state.spawnAdditionalDrops(world, pos, ItemStack.EMPTY);
|
||||
|
|
|
|||
|
|
@ -10,13 +10,13 @@
|
|||
{
|
||||
"name": "Side1",
|
||||
"from": [0, 2, 0],
|
||||
"to": [2, 13, 16],
|
||||
"to": [2, 16, 16],
|
||||
"rotation": {"angle": 0, "axis": "y", "origin": [8, 24, 8]},
|
||||
"faces": {
|
||||
"north": {"uv": [14, 3, 16, 14], "texture": "#1"},
|
||||
"east": {"uv": [0, 3, 16, 14], "texture": "#1"},
|
||||
"south": {"uv": [0, 3, 2, 14], "texture": "#1"},
|
||||
"west": {"uv": [0, 3, 16, 14], "texture": "#1"},
|
||||
"north": {"uv": [14, 0, 16, 14], "texture": "#1"},
|
||||
"east": {"uv": [0, 0, 16, 14], "texture": "#1"},
|
||||
"south": {"uv": [0, 0, 2, 14], "texture": "#1"},
|
||||
"west": {"uv": [0, 0, 16, 14], "texture": "#1"},
|
||||
"up": {"uv": [0, 0, 2, 16], "texture": "#12"},
|
||||
"down": {"uv": [0, 0, 2, 16], "texture": "#12"}
|
||||
}
|
||||
|
|
@ -38,11 +38,11 @@
|
|||
{
|
||||
"name": "Side4",
|
||||
"from": [2, 2, 0],
|
||||
"to": [14, 13, 2],
|
||||
"to": [14, 16, 2],
|
||||
"rotation": {"angle": 0, "axis": "y", "origin": [8, 24, 8]},
|
||||
"faces": {
|
||||
"north": {"uv": [2, 3, 14, 14], "texture": "#1"},
|
||||
"south": {"uv": [2, 3, 14, 14], "texture": "#1"},
|
||||
"north": {"uv": [2, 0, 14, 14], "texture": "#1"},
|
||||
"south": {"uv": [2, 0, 14, 14], "texture": "#1"},
|
||||
"up": {"uv": [2, 0, 14, 2], "texture": "#12"},
|
||||
"down": {"uv": [2, 14, 14, 16], "texture": "#12"}
|
||||
}
|
||||
|
|
@ -50,11 +50,11 @@
|
|||
{
|
||||
"name": "Side2",
|
||||
"from": [2, 2, 14],
|
||||
"to": [14, 13, 16],
|
||||
"to": [14, 16, 16],
|
||||
"rotation": {"angle": 0, "axis": "y", "origin": [8, 24, 8]},
|
||||
"faces": {
|
||||
"north": {"uv": [2, 3, 14, 14], "texture": "#1"},
|
||||
"south": {"uv": [2, 3, 14, 14], "texture": "#1"},
|
||||
"north": {"uv": [2, 0, 14, 14], "texture": "#1"},
|
||||
"south": {"uv": [2, 0, 14, 14], "texture": "#1"},
|
||||
"up": {"uv": [2, 14, 14, 16], "texture": "#12"},
|
||||
"down": {"uv": [2, 0, 14, 2], "texture": "#12"}
|
||||
}
|
||||
|
|
@ -62,13 +62,13 @@
|
|||
{
|
||||
"name": "Side3",
|
||||
"from": [14, 2, 0],
|
||||
"to": [16, 13, 16],
|
||||
"to": [16, 16, 16],
|
||||
"rotation": {"angle": 0, "axis": "y", "origin": [8, 40, 8]},
|
||||
"faces": {
|
||||
"north": {"uv": [0, 3, 2, 14], "texture": "#1"},
|
||||
"east": {"uv": [0, 3, 16, 14], "texture": "#1"},
|
||||
"south": {"uv": [14, 3, 16, 14], "texture": "#1"},
|
||||
"west": {"uv": [0, 3, 16, 14], "texture": "#1"},
|
||||
"north": {"uv": [0, 0, 2, 14], "texture": "#1"},
|
||||
"east": {"uv": [0, 0, 16, 14], "texture": "#1"},
|
||||
"south": {"uv": [14, 0, 16, 14], "texture": "#1"},
|
||||
"west": {"uv": [0, 0, 16, 14], "texture": "#1"},
|
||||
"up": {"uv": [14, 0, 16, 16], "texture": "#12"},
|
||||
"down": {"uv": [14, 0, 16, 16], "texture": "#12"}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2,151 +2,56 @@
|
|||
"credit": "Made with Blockbench",
|
||||
"parent": "block/block",
|
||||
"textures": {
|
||||
"2": "create:block/chute_diagonal",
|
||||
"13": "create:block/chute",
|
||||
"particle": "block/hopper_outside"
|
||||
"0": "create:block/chute",
|
||||
"1": "create:block/chute_diagonal",
|
||||
"particle": "block/hopper_inside"
|
||||
},
|
||||
"elements": [
|
||||
{
|
||||
"from": [2, 8, 2],
|
||||
"to": [14, 16, 14],
|
||||
"from": [1.1, -11, 2],
|
||||
"to": [14.9, 0, 16],
|
||||
"rotation": {"angle": 45, "axis": "x", "origin": [8, 0, 16]},
|
||||
"faces": {
|
||||
"north": {"uv": [9, 4, 15, 8], "rotation": 180, "texture": "#13"},
|
||||
"east": {"uv": [9, 4, 15, 8], "rotation": 180, "texture": "#13"},
|
||||
"south": {"uv": [9, 4, 15, 8], "rotation": 180, "texture": "#13"},
|
||||
"west": {"uv": [9, 4, 15, 8], "rotation": 180, "texture": "#13"},
|
||||
"up": {"uv": [5, 10, 11, 16], "texture": "#2"},
|
||||
"down": {"uv": [9, 11, 15, 15], "texture": "#13"}
|
||||
"north": {"uv": [8.5, 8.5, 15.5, 14], "texture": "#1"},
|
||||
"east": {"uv": [8.5, 8.5, 15.5, 14], "texture": "#1"},
|
||||
"south": {"uv": [8.5, 8.5, 15.5, 14], "texture": "#1"},
|
||||
"west": {"uv": [8.5, 8.5, 15.5, 14], "texture": "#1"},
|
||||
"up": {"uv": [8.5, 8.5, 15.5, 15.5], "rotation": 180, "texture": "#0"},
|
||||
"down": {"uv": [8.5, 8.5, 15.5, 15.5], "rotation": 180, "texture": "#0"}
|
||||
}
|
||||
},
|
||||
{
|
||||
"from": [2, 5.5, 2],
|
||||
"to": [14, 8, 14],
|
||||
"from": [4, -16, -2],
|
||||
"to": [12, -4.4, 0],
|
||||
"rotation": {"angle": 45, "axis": "x", "origin": [8, -16, 0]},
|
||||
"faces": {
|
||||
"north": {"uv": [9, 10.5, 15, 14.5], "rotation": 180, "texture": "#13"},
|
||||
"east": {"uv": [14.25, 5, 15.5, 11], "rotation": 270, "texture": "#2"},
|
||||
"south": {"uv": [14.25, 5, 15.5, 11], "rotation": 270, "texture": "#2"},
|
||||
"west": {"uv": [14.25, 5, 15.5, 11], "rotation": 270, "texture": "#2"},
|
||||
"up": {"uv": [9, 9.5, 15, 15.5], "texture": "#13"},
|
||||
"down": {"uv": [9, 11, 15, 15], "texture": "#13"}
|
||||
"east": {"uv": [6, 8.5, 7, 14.5], "texture": "#1"},
|
||||
"south": {"uv": [2, 8.5, 6, 14.5], "texture": "#1"},
|
||||
"west": {"uv": [1, 8.5, 2, 14.5], "texture": "#1"},
|
||||
"down": {"uv": [0, 0, 8, 2], "rotation": 180, "texture": "#1"}
|
||||
}
|
||||
},
|
||||
{
|
||||
"from": [1.9, -12, 7.9],
|
||||
"to": [14.1, 10.666, 14.1],
|
||||
"rotation": {"angle": 45, "axis": "x", "origin": [8, 8, 8]},
|
||||
"from": [2.1, -16, -7],
|
||||
"to": [13.9, -4.4, -2],
|
||||
"rotation": {"angle": 45, "axis": "x", "origin": [8, -16, 0]},
|
||||
"faces": {
|
||||
"north": {"uv": [0, 10, 11, 16], "rotation": 270, "texture": "#2"},
|
||||
"east": {"uv": [13, 11, 16, 0], "texture": "#2"},
|
||||
"south": {"uv": [0, 10, 11, 16], "rotation": 270, "texture": "#2"},
|
||||
"west": {"uv": [13, 0, 16, 11], "rotation": 180, "texture": "#2"},
|
||||
"up": {"uv": [5, 10, 11, 13], "rotation": 180, "texture": "#2"}
|
||||
"east": {"uv": [9, 1, 11.5, 7], "texture": "#1"},
|
||||
"south": {"uv": [9, 1, 15, 7], "texture": "#1"},
|
||||
"west": {"uv": [12.5, 1, 15, 7], "texture": "#1"},
|
||||
"down": {"uv": [9, 12.5, 15, 15], "rotation": 180, "texture": "#0"}
|
||||
}
|
||||
},
|
||||
{
|
||||
"from": [3, 13, 3],
|
||||
"to": [13, 14, 13],
|
||||
"from": [2.1, -16, -13],
|
||||
"to": [13.9, -4.4, -7],
|
||||
"rotation": {"angle": 45, "axis": "x", "origin": [8, -16, 0]},
|
||||
"faces": {
|
||||
"up": {"uv": [11, 11, 16, 16], "rotation": 180, "texture": "#2"}
|
||||
"north": {"uv": [9, 1, 15, 7], "texture": "#1"},
|
||||
"east": {"uv": [11.5, 1, 15, 7], "texture": "#1"},
|
||||
"west": {"uv": [9, 1, 12.5, 7], "texture": "#1"},
|
||||
"down": {"uv": [9, 9, 15, 12], "rotation": 180, "texture": "#0"}
|
||||
}
|
||||
},
|
||||
{
|
||||
"from": [1.1, -12, 1.9],
|
||||
"to": [14.9, 10.666, 8.1],
|
||||
"rotation": {"angle": 45, "axis": "x", "origin": [8, 8, 8]},
|
||||
"faces": {
|
||||
"north": {"uv": [0, 3, 11, 10], "rotation": 90, "texture": "#2"},
|
||||
"east": {"uv": [0, 0, 11, 3], "rotation": 270, "texture": "#2"},
|
||||
"south": {"uv": [0, 3, 11, 10], "rotation": 90, "texture": "#2"},
|
||||
"west": {"uv": [0, 0, 11, 3], "rotation": 90, "texture": "#2"},
|
||||
"up": {"uv": [8.5, 0, 15.5, 3], "rotation": 180, "texture": "#13"}
|
||||
}
|
||||
}
|
||||
],
|
||||
"display": {
|
||||
"thirdperson_righthand": {
|
||||
"rotation": [75, 45, 0],
|
||||
"translation": [0, 2.5, 0],
|
||||
"scale": [0.375, 0.375, 0.375]
|
||||
},
|
||||
"thirdperson_lefthand": {
|
||||
"rotation": [75, 45, 0],
|
||||
"translation": [0, 2.5, 0],
|
||||
"scale": [0.375, 0.375, 0.375]
|
||||
},
|
||||
"firstperson_righthand": {
|
||||
"rotation": [0, 45, 0],
|
||||
"scale": [0.4, 0.4, 0.4]
|
||||
},
|
||||
"firstperson_lefthand": {
|
||||
"rotation": [0, 225, 0],
|
||||
"scale": [0.4, 0.4, 0.4]
|
||||
},
|
||||
"ground": {
|
||||
"translation": [0, 3.25, 0],
|
||||
"scale": [0.25, 0.25, 0.25]
|
||||
},
|
||||
"gui": {
|
||||
"rotation": [30, 225, 0],
|
||||
"translation": [0, 1, 0],
|
||||
"scale": [0.5, 0.5, 0.5]
|
||||
},
|
||||
"head": {
|
||||
"rotation": [0, 90, 0]
|
||||
},
|
||||
"fixed": {
|
||||
"rotation": [0, 90, 0],
|
||||
"translation": [0, 1.5, 0],
|
||||
"scale": [0.5, 0.5, 0.5]
|
||||
}
|
||||
},
|
||||
"groups": [
|
||||
{
|
||||
"name": "group",
|
||||
"origin": [8, 24, -24],
|
||||
"children": [0]
|
||||
},
|
||||
{
|
||||
"name": "alt_block_diagonal_start",
|
||||
"origin": [8, 8, 8],
|
||||
"children": [
|
||||
{
|
||||
"name": "group",
|
||||
"origin": [8, 56, -56],
|
||||
"children": [1]
|
||||
},
|
||||
{
|
||||
"name": "alt_block_diagonal_straight",
|
||||
"origin": [8, 8, 8],
|
||||
"children": [
|
||||
{
|
||||
"name": "group",
|
||||
"origin": [8, 8, -8],
|
||||
"children": [2]
|
||||
},
|
||||
{
|
||||
"name": "group",
|
||||
"origin": [8, 8, -8],
|
||||
"children": []
|
||||
}
|
||||
]
|
||||
}, 3]
|
||||
},
|
||||
{
|
||||
"name": "alt_block_diagonal_straight",
|
||||
"origin": [8, 8, 8],
|
||||
"children": [
|
||||
{
|
||||
"name": "group",
|
||||
"origin": [8, 8, -8],
|
||||
"children": [4]
|
||||
},
|
||||
{
|
||||
"name": "group",
|
||||
"origin": [8, 8, -8],
|
||||
"children": []
|
||||
}
|
||||
]
|
||||
}
|
||||
]
|
||||
}
|
||||
|
|
@ -0,0 +1,121 @@
|
|||
{
|
||||
"credit": "Made with Blockbench",
|
||||
"parent": "block/block",
|
||||
"textures": {
|
||||
"0": "create:block/chute",
|
||||
"1": "create:block/chute_diagonal",
|
||||
"particle": "block/hopper_inside"
|
||||
},
|
||||
"elements": [
|
||||
{
|
||||
"from": [1.1, -11, 2],
|
||||
"to": [14.9, 0, 16],
|
||||
"rotation": {"angle": 45, "axis": "x", "origin": [8, 0, 16]},
|
||||
"faces": {
|
||||
"north": {"uv": [8.5, 8.5, 15.5, 14], "texture": "#1"},
|
||||
"east": {"uv": [8.5, 8.5, 15.5, 14], "texture": "#1"},
|
||||
"south": {"uv": [8.5, 8.5, 15.5, 14], "texture": "#1"},
|
||||
"west": {"uv": [8.5, 8.5, 15.5, 14], "texture": "#1"},
|
||||
"up": {"uv": [8.5, 8.5, 15.5, 15.5], "rotation": 180, "texture": "#0"},
|
||||
"down": {"uv": [8.5, 8.5, 15.5, 15.5], "rotation": 180, "texture": "#0"}
|
||||
}
|
||||
},
|
||||
{
|
||||
"from": [4, -16, -2],
|
||||
"to": [12, -4.4, 0],
|
||||
"rotation": {"angle": 45, "axis": "x", "origin": [8, -16, 0]},
|
||||
"faces": {
|
||||
"east": {"uv": [6, 8.5, 7, 14.5], "texture": "#1"},
|
||||
"south": {"uv": [2, 8.5, 6, 14.5], "texture": "#1"},
|
||||
"west": {"uv": [1, 8.5, 2, 14.5], "texture": "#1"},
|
||||
"down": {"uv": [0, 0, 8, 2], "rotation": 180, "texture": "#1"}
|
||||
}
|
||||
},
|
||||
{
|
||||
"from": [2.1, -16, -7],
|
||||
"to": [13.9, -4.4, -2],
|
||||
"rotation": {"angle": 45, "axis": "x", "origin": [8, -16, 0]},
|
||||
"faces": {
|
||||
"east": {"uv": [9, 1, 11.5, 7], "texture": "#1"},
|
||||
"south": {"uv": [9, 1, 15, 7], "texture": "#1"},
|
||||
"west": {"uv": [12.5, 1, 15, 7], "texture": "#1"},
|
||||
"down": {"uv": [9, 12.5, 15, 15], "rotation": 180, "texture": "#0"}
|
||||
}
|
||||
},
|
||||
{
|
||||
"from": [2.1, -16, -13],
|
||||
"to": [13.9, -4.4, -7],
|
||||
"rotation": {"angle": 45, "axis": "x", "origin": [8, -16, 0]},
|
||||
"faces": {
|
||||
"north": {"uv": [9, 1, 15, 7], "texture": "#1"},
|
||||
"east": {"uv": [11.5, 1, 15, 7], "texture": "#1"},
|
||||
"west": {"uv": [9, 1, 12.5, 7], "texture": "#1"},
|
||||
"down": {"uv": [9, 9, 15, 12], "rotation": 180, "texture": "#0"}
|
||||
}
|
||||
},
|
||||
{
|
||||
"from": [0, 0, 0],
|
||||
"to": [3, 16, 16],
|
||||
"faces": {
|
||||
"north": {"uv": [6.5, 0, 8, 8], "texture": "#1"},
|
||||
"east": {"uv": [8, 0, 16, 8], "texture": "#0"},
|
||||
"south": {"uv": [0, 0, 1.5, 8], "texture": "#1"},
|
||||
"west": {"uv": [0, 0, 8, 8], "texture": "#1"},
|
||||
"up": {"uv": [8, 8, 9.5, 16], "texture": "#0"},
|
||||
"down": {"uv": [14.5, 8, 16, 16], "rotation": 180, "texture": "#0"}
|
||||
}
|
||||
},
|
||||
{
|
||||
"from": [13, 0, 0],
|
||||
"to": [16, 16, 16],
|
||||
"faces": {
|
||||
"north": {"uv": [0, 0, 1.5, 8], "texture": "#1"},
|
||||
"east": {"uv": [0, 0, 8, 8], "texture": "#1"},
|
||||
"south": {"uv": [6.5, 0, 8, 8], "texture": "#1"},
|
||||
"west": {"uv": [8, 0, 16, 8], "texture": "#0"},
|
||||
"up": {"uv": [8, 8, 9.5, 16], "rotation": 180, "texture": "#0"},
|
||||
"down": {"uv": [14.5, 8, 16, 16], "texture": "#0"}
|
||||
}
|
||||
},
|
||||
{
|
||||
"from": [3, 0, 0],
|
||||
"to": [13, 16, 3],
|
||||
"faces": {
|
||||
"north": {"uv": [1.5, 0, 6.5, 8], "texture": "#1"},
|
||||
"east": {"uv": [6.5, 0, 8, 8], "texture": "#1"},
|
||||
"south": {"uv": [9.5, 0, 14.5, 8], "texture": "#0"},
|
||||
"west": {"uv": [0, 0, 1.5, 8], "texture": "#1"},
|
||||
"up": {"uv": [14.5, 9.5, 16, 14.5], "rotation": 270, "texture": "#0"},
|
||||
"down": {"uv": [14.5, 9.5, 16, 14.5], "rotation": 90, "texture": "#0"}
|
||||
}
|
||||
},
|
||||
{
|
||||
"from": [3, 0, 13],
|
||||
"to": [13, 16, 16],
|
||||
"faces": {
|
||||
"north": {"uv": [9.5, 0, 14.5, 8], "texture": "#0"},
|
||||
"east": {"uv": [0, 0, 1.5, 8], "texture": "#1"},
|
||||
"south": {"uv": [1.5, 0, 6.5, 8], "texture": "#1"},
|
||||
"west": {"uv": [6.5, 0, 8, 8], "texture": "#1"},
|
||||
"up": {"uv": [14.5, 9.5, 16, 14.5], "rotation": 90, "texture": "#0"},
|
||||
"down": {"uv": [14.5, 9.5, 16, 14.5], "rotation": 270, "texture": "#0"}
|
||||
}
|
||||
},
|
||||
{
|
||||
"from": [3, 8, 3],
|
||||
"to": [13, 14, 13],
|
||||
"rotation": {"angle": 0, "axis": "y", "origin": [11, -6, 11]},
|
||||
"faces": {
|
||||
"up": {"uv": [9.5, 9.5, 14.5, 14.5], "texture": "#0"},
|
||||
"down": {"uv": [9.5, 9.5, 14.5, 14.5], "texture": "#0"}
|
||||
}
|
||||
}
|
||||
],
|
||||
"groups": [0, 1, 2, 3,
|
||||
{
|
||||
"name": "intersection",
|
||||
"origin": [8, 8, 8],
|
||||
"children": [4, 5, 6, 7, 8]
|
||||
}
|
||||
]
|
||||
}
|
||||
|
|
@ -1,156 +0,0 @@
|
|||
{
|
||||
"credit": "Made with Blockbench",
|
||||
"parent": "block/block",
|
||||
"textures": {
|
||||
"2": "create:block/chute_diagonal",
|
||||
"13": "create:block/chute",
|
||||
"particle": "block/hopper_outside"
|
||||
},
|
||||
"elements": [
|
||||
{
|
||||
"from": [3, 8, 13],
|
||||
"to": [13, 16, 15],
|
||||
"faces": {
|
||||
"north": {"uv": [9.5, 0, 14.5, 4], "texture": "#13"},
|
||||
"south": {"uv": [9.5, 0, 14.5, 4], "texture": "#13"},
|
||||
"up": {"uv": [1, 0, 6, 1], "rotation": 180, "texture": "#13"},
|
||||
"down": {"uv": [1, 6, 6, 7], "rotation": 180, "texture": "#13"}
|
||||
}
|
||||
},
|
||||
{
|
||||
"from": [3, 8, 1],
|
||||
"to": [13, 16, 3],
|
||||
"faces": {
|
||||
"north": {"uv": [9.5, 0, 14.5, 4], "texture": "#13"},
|
||||
"south": {"uv": [9.5, 0, 14.5, 4], "texture": "#13"},
|
||||
"up": {"uv": [1, 0, 6, 1], "texture": "#13"},
|
||||
"down": {"uv": [1, 6, 6, 7], "texture": "#13"}
|
||||
}
|
||||
},
|
||||
{
|
||||
"from": [13, 8, 1],
|
||||
"to": [15, 16, 15],
|
||||
"faces": {
|
||||
"north": {"uv": [8.5, 0, 9.5, 4], "texture": "#13"},
|
||||
"east": {"uv": [8.5, 0, 15.5, 4], "texture": "#13"},
|
||||
"south": {"uv": [14.5, 0, 15.5, 4], "texture": "#13"},
|
||||
"west": {"uv": [8.5, 0, 15.5, 4], "texture": "#13"},
|
||||
"up": {"uv": [0, 0, 1, 7], "rotation": 180, "texture": "#13"},
|
||||
"down": {"uv": [0, 0, 1, 7], "rotation": 180, "texture": "#13"}
|
||||
}
|
||||
},
|
||||
{
|
||||
"from": [1, 8, 1],
|
||||
"to": [3, 16, 15],
|
||||
"faces": {
|
||||
"north": {"uv": [14.5, 0, 15.5, 4], "texture": "#13"},
|
||||
"east": {"uv": [8.5, 0, 15.5, 4], "texture": "#13"},
|
||||
"south": {"uv": [8.5, 0, 9.5, 4], "texture": "#13"},
|
||||
"west": {"uv": [8.5, 0, 15.5, 4], "texture": "#13"},
|
||||
"up": {"uv": [0, 0, 1, 7], "texture": "#13"},
|
||||
"down": {"uv": [0, 0, 1, 7], "texture": "#13"}
|
||||
}
|
||||
},
|
||||
{
|
||||
"from": [2, 5.5, 2],
|
||||
"to": [14, 8, 14],
|
||||
"faces": {
|
||||
"north": {"uv": [9, 10.5, 15, 14.5], "rotation": 180, "texture": "#13"},
|
||||
"east": {"uv": [14.25, 5, 15.5, 11], "rotation": 270, "texture": "#2"},
|
||||
"south": {"uv": [14.25, 5, 15.5, 11], "rotation": 270, "texture": "#2"},
|
||||
"west": {"uv": [14.25, 5, 15.5, 11], "rotation": 270, "texture": "#2"},
|
||||
"up": {"uv": [9, 9.5, 15, 15.5], "texture": "#13"},
|
||||
"down": {"uv": [9, 11, 15, 15], "texture": "#13"}
|
||||
}
|
||||
},
|
||||
{
|
||||
"from": [1.9, -12, 7.9],
|
||||
"to": [14.1, 10.666, 14.1],
|
||||
"rotation": {"angle": 45, "axis": "x", "origin": [8, 8, 8]},
|
||||
"faces": {
|
||||
"north": {"uv": [0, 10, 11, 16], "rotation": 270, "texture": "#2"},
|
||||
"east": {"uv": [13, 11, 16, 0], "texture": "#2"},
|
||||
"south": {"uv": [0, 10, 11, 16], "rotation": 270, "texture": "#2"},
|
||||
"west": {"uv": [13, 0, 16, 11], "rotation": 180, "texture": "#2"},
|
||||
"up": {"uv": [5, 10, 11, 13], "rotation": 180, "texture": "#2"}
|
||||
}
|
||||
},
|
||||
{
|
||||
"from": [1.1, -12, 1.9],
|
||||
"to": [14.9, 8.666, 8.1],
|
||||
"rotation": {"angle": 45, "axis": "x", "origin": [8, 8, 8]},
|
||||
"faces": {
|
||||
"north": {"uv": [1, 3, 11, 10], "rotation": 90, "texture": "#2"},
|
||||
"east": {"uv": [0, 0, 10, 3], "rotation": 270, "texture": "#2"},
|
||||
"south": {"uv": [1, 3, 11, 10], "rotation": 90, "texture": "#2"},
|
||||
"west": {"uv": [1, 0, 11, 3], "rotation": 90, "texture": "#2"}
|
||||
}
|
||||
},
|
||||
{
|
||||
"from": [3, 13, 3],
|
||||
"to": [13, 14, 13],
|
||||
"faces": {
|
||||
"up": {"uv": [9.5, 9.5, 14.5, 14.5], "rotation": 180, "texture": "#13"}
|
||||
}
|
||||
}
|
||||
],
|
||||
"display": {
|
||||
"thirdperson_righthand": {
|
||||
"rotation": [75, 45, 0],
|
||||
"translation": [0, 2.5, 0],
|
||||
"scale": [0.375, 0.375, 0.375]
|
||||
},
|
||||
"thirdperson_lefthand": {
|
||||
"rotation": [75, 45, 0],
|
||||
"translation": [0, 2.5, 0],
|
||||
"scale": [0.375, 0.375, 0.375]
|
||||
},
|
||||
"firstperson_righthand": {
|
||||
"rotation": [0, 45, 0],
|
||||
"scale": [0.4, 0.4, 0.4]
|
||||
},
|
||||
"firstperson_lefthand": {
|
||||
"rotation": [0, 225, 0],
|
||||
"scale": [0.4, 0.4, 0.4]
|
||||
},
|
||||
"ground": {
|
||||
"translation": [0, 3.25, 0],
|
||||
"scale": [0.25, 0.25, 0.25]
|
||||
},
|
||||
"gui": {
|
||||
"rotation": [30, 225, 0],
|
||||
"translation": [0, 1, 0],
|
||||
"scale": [0.5, 0.5, 0.5]
|
||||
},
|
||||
"head": {
|
||||
"rotation": [0, 90, 0]
|
||||
},
|
||||
"fixed": {
|
||||
"rotation": [0, 90, 0],
|
||||
"translation": [0, 1.5, 0],
|
||||
"scale": [0.5, 0.5, 0.5]
|
||||
}
|
||||
},
|
||||
"groups": [
|
||||
{
|
||||
"name": "group",
|
||||
"origin": [8, 56, -56],
|
||||
"children": [0, 1, 2, 3, 4]
|
||||
},
|
||||
{
|
||||
"name": "alt_block_diagonal_straight",
|
||||
"origin": [8, 8, 8],
|
||||
"children": [
|
||||
{
|
||||
"name": "group",
|
||||
"origin": [8, 8, -8],
|
||||
"children": [5, 6]
|
||||
},
|
||||
{
|
||||
"name": "group",
|
||||
"origin": [8, 8, -8],
|
||||
"children": []
|
||||
}
|
||||
]
|
||||
}, 7]
|
||||
}
|
||||
|
|
@ -1,82 +0,0 @@
|
|||
{
|
||||
"credit": "Made with Blockbench",
|
||||
"parent": "block/block",
|
||||
"textures": {
|
||||
"2": "create:block/chute_diagonal",
|
||||
"13": "create:block/chute",
|
||||
"particle": "block/hopper_outside"
|
||||
},
|
||||
"elements": [
|
||||
{
|
||||
"from": [1.9, -12, 7.9],
|
||||
"to": [14.1, 10.666, 14.1],
|
||||
"rotation": {"angle": 45, "axis": "x", "origin": [8, 8, 8]},
|
||||
"faces": {
|
||||
"north": {"uv": [6, 10, 9, 16], "rotation": 90, "texture": "#13"},
|
||||
"east": {"uv": [13, 11, 16, 0], "texture": "#2"},
|
||||
"south": {"uv": [0, 10, 11, 16], "rotation": 270, "texture": "#2"},
|
||||
"west": {"uv": [13, 0, 16, 11], "rotation": 180, "texture": "#2"}
|
||||
}
|
||||
},
|
||||
{
|
||||
"from": [1.1, -12, 1.9],
|
||||
"to": [14.9, 10.666, 8.1],
|
||||
"rotation": {"angle": 45, "axis": "x", "origin": [8, 8, 8]},
|
||||
"faces": {
|
||||
"north": {"uv": [0, 3, 11, 10], "rotation": 90, "texture": "#2"},
|
||||
"east": {"uv": [0, 0, 11, 3], "rotation": 270, "texture": "#2"},
|
||||
"south": {"uv": [0, 3, 11, 10], "rotation": 90, "texture": "#2"},
|
||||
"west": {"uv": [0, 0, 11, 3], "rotation": 90, "texture": "#2"}
|
||||
}
|
||||
}
|
||||
],
|
||||
"display": {
|
||||
"thirdperson_righthand": {
|
||||
"rotation": [75, 45, 0],
|
||||
"translation": [0, 2.5, 0],
|
||||
"scale": [0.375, 0.375, 0.375]
|
||||
},
|
||||
"thirdperson_lefthand": {
|
||||
"rotation": [75, 45, 0],
|
||||
"translation": [0, 2.5, 0],
|
||||
"scale": [0.375, 0.375, 0.375]
|
||||
},
|
||||
"firstperson_righthand": {
|
||||
"rotation": [0, 45, 0],
|
||||
"scale": [0.4, 0.4, 0.4]
|
||||
},
|
||||
"firstperson_lefthand": {
|
||||
"rotation": [0, 225, 0],
|
||||
"scale": [0.4, 0.4, 0.4]
|
||||
},
|
||||
"ground": {
|
||||
"translation": [0, 3.25, 0],
|
||||
"scale": [0.25, 0.25, 0.25]
|
||||
},
|
||||
"gui": {
|
||||
"rotation": [30, 225, 0],
|
||||
"translation": [0, 1, 0],
|
||||
"scale": [0.5, 0.5, 0.5]
|
||||
},
|
||||
"head": {
|
||||
"rotation": [0, 90, 0]
|
||||
},
|
||||
"fixed": {
|
||||
"rotation": [0, 90, 0],
|
||||
"translation": [0, 1.5, 0],
|
||||
"scale": [0.5, 0.5, 0.5]
|
||||
}
|
||||
},
|
||||
"groups": [
|
||||
{
|
||||
"name": "group",
|
||||
"origin": [8, 8, -8],
|
||||
"children": [0, 1]
|
||||
},
|
||||
{
|
||||
"name": "group",
|
||||
"origin": [8, 8, -8],
|
||||
"children": []
|
||||
}
|
||||
]
|
||||
}
|
||||
|
|
@ -0,0 +1,67 @@
|
|||
{
|
||||
"credit": "Made with Blockbench",
|
||||
"textures": {
|
||||
"0": "create:block/chute",
|
||||
"1": "create:block/chute_diagonal",
|
||||
"particle": "block/hopper_inside"
|
||||
},
|
||||
"elements": [
|
||||
{
|
||||
"from": [0, 0, 0],
|
||||
"to": [3, 16, 16],
|
||||
"faces": {
|
||||
"north": {"uv": [6.5, 0, 8, 8], "texture": "#1"},
|
||||
"east": {"uv": [8, 0, 16, 8], "texture": "#0"},
|
||||
"south": {"uv": [0, 0, 1.5, 8], "texture": "#1"},
|
||||
"west": {"uv": [0, 0, 8, 8], "texture": "#1"},
|
||||
"up": {"uv": [8, 8, 9.5, 16], "texture": "#0"},
|
||||
"down": {"uv": [14.5, 8, 16, 16], "rotation": 180, "texture": "#0"}
|
||||
}
|
||||
},
|
||||
{
|
||||
"from": [13, 0, 0],
|
||||
"to": [16, 16, 16],
|
||||
"faces": {
|
||||
"north": {"uv": [0, 0, 1.5, 8], "texture": "#1"},
|
||||
"east": {"uv": [0, 0, 8, 8], "texture": "#1"},
|
||||
"south": {"uv": [6.5, 0, 8, 8], "texture": "#1"},
|
||||
"west": {"uv": [8, 0, 16, 8], "texture": "#0"},
|
||||
"up": {"uv": [8, 8, 9.5, 16], "rotation": 180, "texture": "#0"},
|
||||
"down": {"uv": [14.5, 8, 16, 16], "texture": "#0"}
|
||||
}
|
||||
},
|
||||
{
|
||||
"from": [3, 0, 0],
|
||||
"to": [13, 16, 3],
|
||||
"faces": {
|
||||
"north": {"uv": [1.5, 0, 6.5, 8], "texture": "#1"},
|
||||
"east": {"uv": [6.5, 0, 8, 8], "texture": "#1"},
|
||||
"south": {"uv": [9.5, 0, 14.5, 8], "texture": "#0"},
|
||||
"west": {"uv": [0, 0, 1.5, 8], "texture": "#1"},
|
||||
"up": {"uv": [14.5, 9.5, 16, 14.5], "rotation": 270, "texture": "#0"},
|
||||
"down": {"uv": [14.5, 9.5, 16, 14.5], "rotation": 90, "texture": "#0"}
|
||||
}
|
||||
},
|
||||
{
|
||||
"from": [3, 0, 13],
|
||||
"to": [13, 16, 16],
|
||||
"faces": {
|
||||
"north": {"uv": [9.5, 0, 14.5, 8], "texture": "#0"},
|
||||
"east": {"uv": [0, 0, 1.5, 8], "texture": "#1"},
|
||||
"south": {"uv": [1.5, 0, 6.5, 8], "texture": "#1"},
|
||||
"west": {"uv": [6.5, 0, 8, 8], "texture": "#1"},
|
||||
"up": {"uv": [14.5, 9.5, 16, 14.5], "rotation": 90, "texture": "#0"},
|
||||
"down": {"uv": [14.5, 9.5, 16, 14.5], "rotation": 270, "texture": "#0"}
|
||||
}
|
||||
},
|
||||
{
|
||||
"from": [3, 8, 3],
|
||||
"to": [13, 14, 13],
|
||||
"rotation": {"angle": 0, "axis": "y", "origin": [11, -6, 11]},
|
||||
"faces": {
|
||||
"up": {"uv": [9.5, 9.5, 14.5, 14.5], "texture": "#0"},
|
||||
"down": {"uv": [9.5, 9.5, 14.5, 14.5], "texture": "#0"}
|
||||
}
|
||||
}
|
||||
]
|
||||
}
|
||||
|
|
@ -42,11 +42,11 @@
|
|||
"to": [11, 11, 13],
|
||||
"faces": {
|
||||
"north": {"uv": [14, 4, 20, 10], "texture": "#6"},
|
||||
"east": {"uv": [10, 6, 16, 10], "rotation": 90, "texture": "#6"},
|
||||
"east": {"uv": [10, 6, 16, 10], "rotation": 270, "texture": "#6"},
|
||||
"south": {"uv": [10, 0, 16, 6], "texture": "#6"},
|
||||
"west": {"uv": [10, 6, 16, 10], "rotation": 270, "texture": "#6"},
|
||||
"up": {"uv": [10, 6, 16, 10], "texture": "#6"},
|
||||
"down": {"uv": [10, 6, 16, 10], "rotation": 180, "texture": "#6"}
|
||||
"west": {"uv": [10, 6, 16, 10], "rotation": 90, "texture": "#6"},
|
||||
"up": {"uv": [10, 6, 16, 10], "rotation": 180, "texture": "#6"},
|
||||
"down": {"uv": [10, 6, 16, 10], "texture": "#6"}
|
||||
}
|
||||
},
|
||||
{
|
||||
|
|
@ -63,14 +63,14 @@
|
|||
{
|
||||
"name": "Body",
|
||||
"from": [4, 4, 2],
|
||||
"to": [12, 12, 10],
|
||||
"to": [12, 12, 11],
|
||||
"faces": {
|
||||
"north": {"uv": [0, 4, 8, 14], "rotation": 180, "texture": "#5"},
|
||||
"east": {"uv": [4, 3, 12, 13], "rotation": 180, "texture": "#5"},
|
||||
"east": {"uv": [4, 3, 12, 12], "rotation": 270, "texture": "#5"},
|
||||
"south": {"uv": [3, 3, 11, 11], "rotation": 180, "texture": "#5"},
|
||||
"west": {"uv": [4, 3, 12, 13], "rotation": 180, "texture": "#5"},
|
||||
"up": {"uv": [4, 3, 12, 13], "rotation": 180, "texture": "#5"},
|
||||
"down": {"uv": [4, 3, 12, 13], "rotation": 180, "texture": "#5"}
|
||||
"west": {"uv": [4, 3, 12, 12], "rotation": 90, "texture": "#5"},
|
||||
"up": {"uv": [4, 3, 12, 12], "rotation": 180, "texture": "#5"},
|
||||
"down": {"uv": [4, 3, 12, 12], "rotation": 180, "texture": "#5"}
|
||||
}
|
||||
},
|
||||
{
|
||||
|
|
|
|||
|
|
@ -10,19 +10,6 @@
|
|||
"particle": "#5"
|
||||
},
|
||||
"elements": [
|
||||
{
|
||||
"name": "Back",
|
||||
"from": [3, 0.1, 3],
|
||||
"to": [13, 2.1, 13],
|
||||
"faces": {
|
||||
"north": {"uv": [3, 0, 13, 2], "rotation": 180, "texture": "#5"},
|
||||
"east": {"uv": [3, 0, 13, 2], "rotation": 180, "texture": "#5"},
|
||||
"south": {"uv": [3, 0, 13, 2], "rotation": 180, "texture": "#5"},
|
||||
"west": {"uv": [3, 0, 13, 2], "rotation": 180, "texture": "#5"},
|
||||
"up": {"uv": [0, 0, 10, 10], "texture": "#6"},
|
||||
"down": {"uv": [0, 0, 10, 10], "rotation": 180, "texture": "#6"}
|
||||
}
|
||||
},
|
||||
{
|
||||
"name": "Back",
|
||||
"from": [3, 12, 3],
|
||||
|
|
@ -51,8 +38,9 @@
|
|||
},
|
||||
{
|
||||
"name": "Between Rims",
|
||||
"from": [3.5, 3, 3.5],
|
||||
"to": [12.5, 6, 12.5],
|
||||
"from": [3.5, 5, 3.5],
|
||||
"to": [12.5, 8, 12.5],
|
||||
"rotation": {"angle": 0, "axis": "y", "origin": [8, 10, 8]},
|
||||
"faces": {
|
||||
"north": {"uv": [3, 10, 12, 13], "texture": "#6"},
|
||||
"east": {"uv": [3, 10, 12, 13], "texture": "#6"},
|
||||
|
|
@ -63,110 +51,74 @@
|
|||
{
|
||||
"name": "Body",
|
||||
"from": [4, 2, 4],
|
||||
"to": [12, 10, 12],
|
||||
"to": [12, 11, 12],
|
||||
"faces": {
|
||||
"north": {"uv": [4, 3, 12, 13], "texture": "#5"},
|
||||
"east": {"uv": [4, 3, 12, 13], "rotation": 270, "texture": "#5"},
|
||||
"south": {"uv": [4, 3, 12, 13], "rotation": 180, "texture": "#5"},
|
||||
"west": {"uv": [4, 3, 12, 13], "rotation": 90, "texture": "#5"},
|
||||
"north": {"uv": [4, 3, 12, 12], "texture": "#5"},
|
||||
"east": {"uv": [4, 3, 12, 12], "texture": "#5"},
|
||||
"south": {"uv": [4, 3, 12, 12], "texture": "#5"},
|
||||
"west": {"uv": [4, 3, 12, 12], "texture": "#5"},
|
||||
"up": {"uv": [3, 3, 11, 11], "rotation": 180, "texture": "#5"},
|
||||
"down": {"uv": [0, 4, 8, 14], "texture": "#5"}
|
||||
}
|
||||
},
|
||||
{
|
||||
"from": [12, 1, 2],
|
||||
"to": [14, 15, 4],
|
||||
"faces": {
|
||||
"north": {"uv": [1, 0, 15, 2], "rotation": 270, "texture": "#7"},
|
||||
"east": {"uv": [14, 1, 16, 15], "texture": "#7"},
|
||||
"south": {"uv": [1, 14, 15, 16], "rotation": 90, "texture": "#7"},
|
||||
"west": {"uv": [0, 1, 2, 15], "rotation": 180, "texture": "#7"},
|
||||
"up": {"uv": [14, 10, 16, 12], "texture": "#6"},
|
||||
"down": {"uv": [14, 10, 16, 12], "rotation": 270, "texture": "#6"}
|
||||
}
|
||||
},
|
||||
{
|
||||
"from": [12, 1, 12],
|
||||
"to": [14, 15, 14],
|
||||
"faces": {
|
||||
"north": {"uv": [1, 16, 15, 14], "rotation": 90, "texture": "#7"},
|
||||
"east": {"uv": [16, 1, 14, 15], "texture": "#7"},
|
||||
"south": {"uv": [1, 2, 15, 0], "rotation": 270, "texture": "#7"},
|
||||
"west": {"uv": [2, 1, 0, 15], "rotation": 180, "texture": "#7"},
|
||||
"up": {"uv": [14, 12, 16, 10], "texture": "#6"},
|
||||
"down": {"uv": [16, 10, 14, 12], "rotation": 270, "texture": "#6"}
|
||||
}
|
||||
},
|
||||
{
|
||||
"from": [2, 1, 2],
|
||||
"to": [4, 15, 4],
|
||||
"faces": {
|
||||
"north": {"uv": [1, 2, 15, 0], "rotation": 270, "texture": "#7"},
|
||||
"east": {"uv": [2, 1, 0, 15], "rotation": 180, "texture": "#7"},
|
||||
"south": {"uv": [1, 16, 15, 14], "rotation": 90, "texture": "#7"},
|
||||
"west": {"uv": [16, 1, 14, 15], "texture": "#7"},
|
||||
"up": {"uv": [16, 10, 14, 12], "texture": "#6"},
|
||||
"down": {"uv": [14, 12, 16, 10], "rotation": 270, "texture": "#6"}
|
||||
}
|
||||
},
|
||||
{
|
||||
"from": [2, 1, 12],
|
||||
"from": [2, 0, 12],
|
||||
"to": [4, 15, 14],
|
||||
"faces": {
|
||||
"north": {"uv": [1, 14, 15, 16], "rotation": 90, "texture": "#7"},
|
||||
"east": {"uv": [0, 1, 2, 15], "rotation": 180, "texture": "#7"},
|
||||
"south": {"uv": [1, 0, 15, 2], "rotation": 270, "texture": "#7"},
|
||||
"west": {"uv": [14, 1, 16, 15], "texture": "#7"},
|
||||
"north": {"uv": [1, 14, 16, 16], "rotation": 90, "texture": "#7"},
|
||||
"east": {"uv": [0, 0, 2, 15], "rotation": 180, "texture": "#7"},
|
||||
"south": {"uv": [0, 0, 15, 2], "rotation": 270, "texture": "#7"},
|
||||
"west": {"uv": [14, 1, 16, 16], "texture": "#7"},
|
||||
"up": {"uv": [16, 12, 14, 10], "texture": "#6"},
|
||||
"down": {"uv": [16, 12, 14, 10], "rotation": 270, "texture": "#6"}
|
||||
}
|
||||
},
|
||||
{
|
||||
"from": [11, 0, 11],
|
||||
"to": [15, 4, 15],
|
||||
"from": [2, 0, 2],
|
||||
"to": [4, 15, 4],
|
||||
"faces": {
|
||||
"north": {"uv": [8, 0, 12, 4], "texture": "#9"},
|
||||
"east": {"uv": [0, 0, 4, 4], "texture": "#9"},
|
||||
"south": {"uv": [8, 0, 12, 4], "texture": "#9"},
|
||||
"west": {"uv": [1, 0, 5, 4], "texture": "#9"},
|
||||
"up": {"uv": [1, 4, 5, 8], "rotation": 90, "texture": "#8"},
|
||||
"down": {"uv": [3, 3, 7, 7], "rotation": 180, "texture": "#8"}
|
||||
"north": {"uv": [0, 2, 15, 0], "rotation": 270, "texture": "#7"},
|
||||
"east": {"uv": [2, 0, 0, 15], "rotation": 180, "texture": "#7"},
|
||||
"south": {"uv": [1, 16, 16, 14], "rotation": 90, "texture": "#7"},
|
||||
"west": {"uv": [16, 1, 14, 16], "texture": "#7"},
|
||||
"up": {"uv": [16, 10, 14, 12], "texture": "#6"},
|
||||
"down": {"uv": [14, 12, 16, 10], "rotation": 270, "texture": "#6"}
|
||||
}
|
||||
},
|
||||
{
|
||||
"from": [11, 0, 1],
|
||||
"to": [15, 4, 5],
|
||||
"from": [12, 0, 12],
|
||||
"to": [14, 15, 14],
|
||||
"faces": {
|
||||
"north": {"uv": [12, 0, 8, 4], "texture": "#9"},
|
||||
"east": {"uv": [4, 0, 0, 4], "texture": "#9"},
|
||||
"south": {"uv": [12, 0, 8, 4], "texture": "#9"},
|
||||
"west": {"uv": [5, 0, 1, 4], "texture": "#9"},
|
||||
"up": {"uv": [5, 4, 1, 8], "rotation": 90, "texture": "#8"},
|
||||
"down": {"uv": [3, 7, 7, 3], "rotation": 180, "texture": "#8"}
|
||||
"north": {"uv": [1, 16, 16, 14], "rotation": 90, "texture": "#7"},
|
||||
"east": {"uv": [16, 1, 14, 16], "texture": "#7"},
|
||||
"south": {"uv": [0, 2, 15, 0], "rotation": 270, "texture": "#7"},
|
||||
"west": {"uv": [2, 0, 0, 15], "rotation": 180, "texture": "#7"},
|
||||
"up": {"uv": [14, 12, 16, 10], "texture": "#6"},
|
||||
"down": {"uv": [16, 10, 14, 12], "rotation": 270, "texture": "#6"}
|
||||
}
|
||||
},
|
||||
{
|
||||
"from": [1, 0, 11],
|
||||
"to": [5, 4, 15],
|
||||
"from": [12, 0, 2],
|
||||
"to": [14, 15, 4],
|
||||
"faces": {
|
||||
"north": {"uv": [12, 0, 8, 4], "texture": "#9"},
|
||||
"east": {"uv": [5, 0, 1, 4], "texture": "#9"},
|
||||
"south": {"uv": [12, 0, 8, 4], "texture": "#9"},
|
||||
"west": {"uv": [4, 0, 0, 4], "texture": "#9"},
|
||||
"up": {"uv": [1, 8, 5, 4], "rotation": 90, "texture": "#8"},
|
||||
"down": {"uv": [7, 3, 3, 7], "rotation": 180, "texture": "#8"}
|
||||
"north": {"uv": [0, 0, 15, 2], "rotation": 270, "texture": "#7"},
|
||||
"east": {"uv": [14, 1, 16, 16], "texture": "#7"},
|
||||
"south": {"uv": [1, 14, 16, 16], "rotation": 90, "texture": "#7"},
|
||||
"west": {"uv": [0, 0, 2, 15], "rotation": 180, "texture": "#7"},
|
||||
"up": {"uv": [14, 10, 16, 12], "texture": "#6"},
|
||||
"down": {"uv": [14, 10, 16, 12], "rotation": 270, "texture": "#6"}
|
||||
}
|
||||
},
|
||||
{
|
||||
"from": [1, 0, 1],
|
||||
"to": [5, 4, 5],
|
||||
"from": [3, 0.2, 3],
|
||||
"to": [13, 4, 13],
|
||||
"faces": {
|
||||
"north": {"uv": [8, 0, 12, 4], "texture": "#9"},
|
||||
"east": {"uv": [1, 0, 5, 4], "texture": "#9"},
|
||||
"south": {"uv": [8, 0, 12, 4], "texture": "#9"},
|
||||
"west": {"uv": [0, 0, 4, 4], "texture": "#9"},
|
||||
"up": {"uv": [5, 8, 1, 4], "rotation": 90, "texture": "#8"},
|
||||
"down": {"uv": [7, 7, 3, 3], "rotation": 180, "texture": "#8"}
|
||||
"north": {"uv": [8, 0, 18, 4], "texture": "#9"},
|
||||
"east": {"uv": [1, 0, 11, 4], "texture": "#9"},
|
||||
"south": {"uv": [8, 0, 18, 4], "texture": "#9"},
|
||||
"west": {"uv": [0, 0, 10, 4], "texture": "#9"},
|
||||
"up": {"uv": [11, 14, 1, 4], "rotation": 90, "texture": "#8"},
|
||||
"down": {"uv": [10, 10, 0, 0], "rotation": 180, "texture": "#6"}
|
||||
}
|
||||
}
|
||||
]
|
||||
|
|
|
|||
|
|
@ -65,14 +65,14 @@
|
|||
{
|
||||
"name": "Body",
|
||||
"from": [4, 4, 2],
|
||||
"to": [12, 12, 10],
|
||||
"to": [12, 12, 11],
|
||||
"faces": {
|
||||
"north": {"uv": [0, 4, 8, 14], "rotation": 180, "texture": "#5"},
|
||||
"east": {"uv": [4, 3, 12, 13], "rotation": 180, "texture": "#5"},
|
||||
"east": {"uv": [4, 3, 12, 12], "rotation": 90, "texture": "#5"},
|
||||
"south": {"uv": [3, 3, 11, 11], "rotation": 180, "texture": "#5"},
|
||||
"west": {"uv": [4, 3, 12, 13], "rotation": 180, "texture": "#5"},
|
||||
"up": {"uv": [4, 3, 12, 13], "rotation": 180, "texture": "#5"},
|
||||
"down": {"uv": [4, 3, 12, 13], "rotation": 180, "texture": "#5"}
|
||||
"west": {"uv": [4, 3, 12, 12], "rotation": 90, "texture": "#5"},
|
||||
"up": {"uv": [4, 3, 12, 12], "rotation": 180, "texture": "#5"},
|
||||
"down": {"uv": [4, 3, 12, 12], "rotation": 180, "texture": "#5"}
|
||||
}
|
||||
},
|
||||
{
|
||||
|
|
@ -151,18 +151,17 @@
|
|||
}
|
||||
}
|
||||
],
|
||||
"display": {
|
||||
"gui": {
|
||||
"rotation": [30, 45, 0],
|
||||
"scale": [0.625, 0.625, 0.625]
|
||||
}
|
||||
},
|
||||
"groups": [0, 1, 2, 3, 4, 5, 6, 7, 8, 9,
|
||||
{
|
||||
"name": "shaft",
|
||||
"origin": [8, 8, 8],
|
||||
"children": [10]
|
||||
}
|
||||
],
|
||||
"display": {
|
||||
"gui": {
|
||||
"rotation": [ 30, 45, 0 ],
|
||||
"translation": [ 0, 0, 0],
|
||||
"scale":[ 0.625, 0.625, 0.625 ]
|
||||
}
|
||||
}
|
||||
]
|
||||
}
|
||||
Binary file not shown.
|
Before Width: | Height: | Size: 551 B After Width: | Height: | Size: 529 B |
Binary file not shown.
|
Before Width: | Height: | Size: 489 B After Width: | Height: | Size: 460 B |
Binary file not shown.
|
Before Width: | Height: | Size: 466 B After Width: | Height: | Size: 1.7 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 471 B After Width: | Height: | Size: 1.8 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 1.2 KiB After Width: | Height: | Size: 1.2 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 858 B After Width: | Height: | Size: 1.1 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 1.4 KiB After Width: | Height: | Size: 7.8 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 1.3 KiB After Width: | Height: | Size: 1.4 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 588 B After Width: | Height: | Size: 477 B |
Binary file not shown.
|
Before Width: | Height: | Size: 1.6 KiB After Width: | Height: | Size: 1.6 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 402 B After Width: | Height: | Size: 467 B |
Loading…
Reference in a new issue