mirrors/Flywheel
0
0
Fork 0
mirror of https://github.com/Jozufozu/Flywheel.git synced 2024-11-14 22:43:56 +01:00
Code Issues Packages Projects Releases Wiki Activity

Port new changes

Browse Source
This commit is contained in:
simibubi 2021-01-13 15:24:48 +01:00
parent db3a579b21
commit 27b5f5b479
9 changed files with 12963 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

425
src/generated/resources/assets/create/blockstates/fluid_pipe.json Normal file
View File

@ -0,0 +1,425 @@
{
"multipart": [
{
"when": {
"down": "true"
},
"apply": {
"model": "create:block/fluid_pipe/block_end",
"x": 180,
"y": 90
}
},
{
"when": {
"up": "true"
},
"apply": {
"model": "create:block/fluid_pipe/block_end",
"y": 90
}
},
{
"when": {
"north": "true"
},
"apply": {
"model": "create:block/fluid_pipe/block_end",
"x": 90
}
},
{
"when": {
"south": "true"
},
"apply": {
"model": "create:block/fluid_pipe/block_end",
"x": 90,
"y": 180
}
},
{
"when": {
"west": "true"
},
"apply": {
"model": "create:block/fluid_pipe/block_end",
"x": 90,
"y": 270
}
},
{
"when": {
"east": "true"
},
"apply": {
"model": "create:block/fluid_pipe/block_end",
"x": 90,
"y": 90
}
},
{
"when": {
"up": "true",
"down": "false",
"south": "false",
"north": "true"
},
"apply": {
"model": "create:block/fluid_pipe/lu_x"
}
},
{
"when": {
"up": "true",
"down": "false",
"south": "true",
"north": "false"
},
"apply": {
"model": "create:block/fluid_pipe/ru_x"
}
},
{
"when": {
"up": "false",
"down": "true",
"south": "false",
"north": "true"
},
"apply": {
"model": "create:block/fluid_pipe/ld_x"
}
},
{
"when": {
"up": "false",
"down": "true",
"south": "true",
"north": "false"
},
"apply": {
"model": "create:block/fluid_pipe/rd_x"
}
},
{
"when": {
"up": "true",
"down": "true",
"south": "false",
"north": "false"
},
"apply": {
"model": "create:block/fluid_pipe/ud_x"
}
},
{
"when": {
"up": "true",
"down": "false",
"south": "false",
"north": "false"
},
"apply": {
"model": "create:block/fluid_pipe/ud_x"
}
},
{
"when": {
"up": "false",
"down": "true",
"south": "false",
"north": "false"
},
"apply": {
"model": "create:block/fluid_pipe/ud_x"
}
},
{
"when": {
"up": "false",
"down": "false",
"south": "true",
"north": "true"
},
"apply": {
"model": "create:block/fluid_pipe/lr_x"
}
},
{
"when": {
"up": "false",
"down": "false",
"south": "false",
"north": "true"
},
"apply": {
"model": "create:block/fluid_pipe/lr_x"
}
},
{
"when": {
"up": "false",
"down": "false",
"south": "true",
"north": "false"
},
"apply": {
"model": "create:block/fluid_pipe/lr_x"
}
},
{
"when": {
"up": "false",
"down": "false",
"south": "false",
"north": "false"
},
"apply": {
"model": "create:block/fluid_pipe/none_x"
}
},
{
"when": {
"west": "true",
"south": "true",
"north": "false",
"east": "false"
},
"apply": {
"model": "create:block/fluid_pipe/lu_y"
}
},
{
"when": {
"west": "false",
"south": "true",
"north": "false",
"east": "true"
},
"apply": {
"model": "create:block/fluid_pipe/ru_y"
}
},
{
"when": {
"west": "true",
"south": "false",
"north": "true",
"east": "false"
},
"apply": {
"model": "create:block/fluid_pipe/ld_y"
}
},
{
"when": {
"west": "false",
"south": "false",
"north": "true",
"east": "true"
},
"apply": {
"model": "create:block/fluid_pipe/rd_y"
}
},
{
"when": {
"west": "false",
"south": "true",
"north": "true",
"east": "false"
},
"apply": {
"model": "create:block/fluid_pipe/ud_y"
}
},
{
"when": {
"west": "false",
"south": "true",
"north": "false",
"east": "false"
},
"apply": {
"model": "create:block/fluid_pipe/ud_y"
}
},
{
"when": {
"west": "false",
"south": "false",
"north": "true",
"east": "false"
},
"apply": {
"model": "create:block/fluid_pipe/ud_y"
}
},
{
"when": {
"west": "true",
"south": "false",
"north": "false",
"east": "true"
},
"apply": {
"model": "create:block/fluid_pipe/lr_y"
}
},
{
"when": {
"west": "true",
"south": "false",
"north": "false",
"east": "false"
},
"apply": {
"model": "create:block/fluid_pipe/lr_y"
}
},
{
"when": {
"west": "false",
"south": "false",
"north": "false",
"east": "true"
},
"apply": {
"model": "create:block/fluid_pipe/lr_y"
}
},
{
"when": {
"west": "false",
"south": "false",
"north": "false",
"east": "false"
},
"apply": {
"model": "create:block/fluid_pipe/none_y"
}
},
{
"when": {
"up": "true",
"west": "false",
"down": "false",
"east": "true"
},
"apply": {
"model": "create:block/fluid_pipe/lu_z"
}
},
{
"when": {
"up": "true",
"west": "true",
"down": "false",
"east": "false"
},
"apply": {
"model": "create:block/fluid_pipe/ru_z"
}
},
{
"when": {
"up": "false",
"west": "false",
"down": "true",
"east": "true"
},
"apply": {
"model": "create:block/fluid_pipe/ld_z"
}
},
{
"when": {
"up": "false",
"west": "true",
"down": "true",
"east": "false"
},
"apply": {
"model": "create:block/fluid_pipe/rd_z"
}
},
{
"when": {
"up": "true",
"west": "false",
"down": "true",
"east": "false"
},
"apply": {
"model": "create:block/fluid_pipe/ud_z"
}
},
{
"when": {
"up": "true",
"west": "false",
"down": "false",
"east": "false"
},
"apply": {
"model": "create:block/fluid_pipe/ud_z"
}
},
{
"when": {
"up": "false",
"west": "false",
"down": "true",
"east": "false"
},
"apply": {
"model": "create:block/fluid_pipe/ud_z"
}
},
{
"when": {
"up": "false",
"west": "true",
"down": "false",
"east": "true"
},
"apply": {
"model": "create:block/fluid_pipe/lr_z"
}
},
{
"when": {
"up": "false",
"west": "false",
"down": "false",
"east": "true"
},
"apply": {
"model": "create:block/fluid_pipe/lr_z"
}
},
{
"when": {
"up": "false",
"west": "true",
"down": "false",
"east": "false"
},
"apply": {
"model": "create:block/fluid_pipe/lr_z"
}
},
{
"when": {
"up": "false",
"west": "false",
"down": "false",
"east": "false"
},
"apply": {
"model": "create:block/fluid_pipe/none_z"
}
}
]
}

1791
src/generated/resources/assets/create/lang/unfinished/de_de.json Normal file
View File

File diff suppressed because it is too large Load Diff

1791
src/generated/resources/assets/create/lang/unfinished/fr_fr.json Normal file
View File

File diff suppressed because it is too large Load Diff

1791
src/generated/resources/assets/create/lang/unfinished/it_it.json Normal file
View File

File diff suppressed because it is too large Load Diff

1791
src/generated/resources/assets/create/lang/unfinished/ja_jp.json Normal file
View File

File diff suppressed because it is too large Load Diff

1791
src/generated/resources/assets/create/lang/unfinished/nl_nl.json Normal file
View File

File diff suppressed because it is too large Load Diff

1791
src/generated/resources/assets/create/lang/unfinished/pt_br.json Normal file
View File

File diff suppressed because it is too large Load Diff

1791
src/generated/resources/assets/create/lang/unfinished/ru_ru.json Normal file
View File

File diff suppressed because it is too large Load Diff

2
src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/Contraption.java
View File

@ -828,7 +828,7 @@ public abstract class Contraption {
} }
for (BlockInfo block : blocks.values()) { for (BlockInfo block : blocks.values()) {
BlockPos targetPos = transform.apply(block.pos); BlockPos targetPos = transform.apply(block.pos);
world.markAndNotifyBlock(targetPos, null, block.state, block.state, BlockFlags.IS_MOVING | BlockFlags.DEFAULT); world.markAndNotifyBlock(targetPos, world.getChunkAt(targetPos), block.state, block.state, BlockFlags.IS_MOVING | BlockFlags.DEFAULT, 512);
} }
for (int i = 0; i < inventory.getSlots(); i++) for (int i = 0; i < inventory.getSlots(); i++)