mirror of
https://github.com/Creators-of-Create/Create.git
synced 2024-12-26 06:57:51 +01:00
Curse of the D'Arcy Junction
- Fixed trains not acting correctly on specific junction setups in specific chunk locations, causing bogeys to travel down separate paths - Both tunnel types can now provide both display link features - Changed the inner fluid tank texture to reduce contrast near the window - Kinetic Tile Instance safety check - Added the /c passenger command
This commit is contained in:
simibubi
parent
1f96e61c14
commit
58263f9c06
57 changed files with 285 additions and 124 deletions
|
|
@ -716,30 +716,30 @@ b2c528cfd24a5cb0cb96c45d0a914f1090f8c32b assets/create/models/block/copper_valve
|
|||
7635211e4d833748acaea37ea48b1f749c32ea5f assets/create/models/block/crate/creative/right.json
|
||||
a123e3c8a9e2ea1665f268cf3991aa7e4b3119c6 assets/create/models/block/crate/creative/single.json
|
||||
29ab5cfe7aed1271ede125e91bf78c1372b5f96e assets/create/models/block/crate/creative/top.json
|
||||
e04c4987746379ec24c63929abf0df4e41e13e6a assets/create/models/block/creative_bottom.json
|
||||
5b1f6d98adf1e92f678a59b7eef720deeeda2795 assets/create/models/block/creative_bottom_window.json
|
||||
6dd1cf78624d5ce69259fc723e9700bd842c94c8 assets/create/models/block/creative_bottom_window_ne.json
|
||||
c0dfda633c3158633814e9a6cd4f4dba793ad4c8 assets/create/models/block/creative_bottom_window_nw.json
|
||||
e30b13d2ae9a437664792c16be537cea73552cf8 assets/create/models/block/creative_bottom_window_se.json
|
||||
8d68f53dfa4d17f8193cd8df693e340ac7a1b92e assets/create/models/block/creative_bottom_window_sw.json
|
||||
77a84b8ca790ddef80e792beb79c2ae0db78005b assets/create/models/block/creative_middle.json
|
||||
179f6208a04832141d83f9a6bef96334cf4fe4aa assets/create/models/block/creative_middle_window.json
|
||||
cadd6df93f6ba708a3c92a958e88531cbc1d6ebf assets/create/models/block/creative_middle_window_ne.json
|
||||
75b37b07555312798a519bea3325d4af6a57eb86 assets/create/models/block/creative_middle_window_nw.json
|
||||
d9d6b61ba21270c83361b3ee2391161125dfc6f0 assets/create/models/block/creative_middle_window_se.json
|
||||
73696b00c063cdf6c5a492eac7e5e06062abad88 assets/create/models/block/creative_middle_window_sw.json
|
||||
3af304cfaa0cdba11c120e85cea88d96c986eebc assets/create/models/block/creative_single.json
|
||||
feed58a4ad7d7a9e855f0cd7b3fc720616120b4b assets/create/models/block/creative_single_window.json
|
||||
4f8753ba3a04853fb006be37e15d760cc154d937 assets/create/models/block/creative_single_window_ne.json
|
||||
39ee24e3b1e06d38bfa4ef36aa4f89577c7f6eab assets/create/models/block/creative_single_window_nw.json
|
||||
81250161ba79b846614859fe8c991c9e18bf77ba assets/create/models/block/creative_single_window_se.json
|
||||
0fdca0706c76794586199287f1e29c8e87ef6385 assets/create/models/block/creative_single_window_sw.json
|
||||
873b263b688f191a927a63b2d873a797eab801e1 assets/create/models/block/creative_top.json
|
||||
723c5db04011eeb1f2e0483f3466bf05432c5f4c assets/create/models/block/creative_top_window.json
|
||||
0994ef30adac0d9faa19d06fd933eb16b11d1ef3 assets/create/models/block/creative_top_window_ne.json
|
||||
59c43cc18525792ca96026c966076f52cf7ebef7 assets/create/models/block/creative_top_window_nw.json
|
||||
a6eea01609266b757342984889af16234ecd5189 assets/create/models/block/creative_top_window_se.json
|
||||
6e1d2fb66291f2a3e3a213f43b47fb9760cb959f assets/create/models/block/creative_top_window_sw.json
|
||||
6eb7b7126ed20b135a485459ea1156c739a16374 assets/create/models/block/creative_bottom.json
|
||||
688ab896cc22f0f77edad284052e0360eb23a051 assets/create/models/block/creative_bottom_window.json
|
||||
058ec08508af48b4a34f05be7365956adaea4558 assets/create/models/block/creative_bottom_window_ne.json
|
||||
e03d8b144c2c2d660c014d681592b2cd0f268894 assets/create/models/block/creative_bottom_window_nw.json
|
||||
a6124e88882a51f6d8d787719f5d0252c7a806b9 assets/create/models/block/creative_bottom_window_se.json
|
||||
0db2acbff12d45e78d234cf64fb447eaada676e3 assets/create/models/block/creative_bottom_window_sw.json
|
||||
b432c460546eac80a87ec7b362d0ae73a110d1a4 assets/create/models/block/creative_middle.json
|
||||
08ef6d91d68b700e1076623e6279bde73ab06e7e assets/create/models/block/creative_middle_window.json
|
||||
9ccf56c81101c3d02d9d65658e0bb5c7460fb184 assets/create/models/block/creative_middle_window_ne.json
|
||||
773f5181451f1d9d321d4a7cc3de3d86dfbbb967 assets/create/models/block/creative_middle_window_nw.json
|
||||
82e0fb1f849bb0a1e8fc5271f0e2275175256011 assets/create/models/block/creative_middle_window_se.json
|
||||
ee0b7a301471c670ec35e90d8c98071c63405fae assets/create/models/block/creative_middle_window_sw.json
|
||||
f95a49cae9790eb9eae2259f02c0f4c5470916a6 assets/create/models/block/creative_single.json
|
||||
d7d45ab1c926533163444ed7eacd72ca3fb3e9ab assets/create/models/block/creative_single_window.json
|
||||
ee5b4f8d131ad2619e89e18219acac23b0202053 assets/create/models/block/creative_single_window_ne.json
|
||||
6bb170fbb5f89e0daf9e805c2357d7a3e53b8a60 assets/create/models/block/creative_single_window_nw.json
|
||||
3908432ebae65c49cc27495b199fc0248100d82b assets/create/models/block/creative_single_window_se.json
|
||||
72741ede003624b0c807a26dbdb989e5ce945fe6 assets/create/models/block/creative_single_window_sw.json
|
||||
b4768e862b301187108afb3b7aae46225501afcf assets/create/models/block/creative_top.json
|
||||
15026aff02a2c39b457e5cfe0ed073c2a18a24c4 assets/create/models/block/creative_top_window.json
|
||||
9886e0cf6aa7b9f9e143244d3a8646544d971e76 assets/create/models/block/creative_top_window_ne.json
|
||||
bb8a304b450bce6bc2371dbad2a9424157ed265f assets/create/models/block/creative_top_window_nw.json
|
||||
8f25499c6dac9a144a2640714ed3774f268cfb0c assets/create/models/block/creative_top_window_se.json
|
||||
3370f17d6f1773d1d81849ef3fc30330d801d2be assets/create/models/block/creative_top_window_sw.json
|
||||
049054773bda458837111308ec2a8d8d08809b8f assets/create/models/block/crimsite.json
|
||||
3ad2613e9d29b1174b6829d28abb2dc0e7477e6b assets/create/models/block/crimsite_pillar.json
|
||||
e93336aeb8513d85d6bffd9ea520b0747731d55b assets/create/models/block/crimsite_pillar_horizontal.json
|
||||
|
|
@ -1696,7 +1696,7 @@ ecaea6626101acc4c655a33e2148c336bfde9895 assets/create/models/item/copper_shingl
|
|||
1f947dafff30da701b7675f5b026ccab3129b079 assets/create/models/item/crafting_blueprint.json
|
||||
db68f1fcc5b91f3ee0cc023538d965d76dd13506 assets/create/models/item/creative_blaze_cake.json
|
||||
7b333dea353afaa27b182aedc647c9e9e34e92ef assets/create/models/item/creative_crate.json
|
||||
f7d06c52c3ca8c22ad67f5741471f06ac22e7fcb assets/create/models/item/creative_fluid_tank.json
|
||||
146d28b21fa97c427ba39c48191f36218be96f49 assets/create/models/item/creative_fluid_tank.json
|
||||
5b39403f6c81f05e566b621b62e267267de47c41 assets/create/models/item/creative_motor.json
|
||||
aed654ee2b4ec44a9f7a67f39d03e03beb18ba69 assets/create/models/item/crimsite.json
|
||||
5522f0b31ee0c7b31cd6fd5f40316545eb6478f8 assets/create/models/item/crimsite_pillar.json
|
||||
|
|
|
|||
|
|
@ -4,7 +4,8 @@
|
|||
"0": "create:block/creative_casing",
|
||||
"1": "create:block/creative_fluid_tank",
|
||||
"3": "create:block/creative_fluid_tank_window",
|
||||
"4": "create:block/creative_fluid_tank_window_single",
|
||||
"4": "create:block/creative_casing",
|
||||
"5": "create:block/creative_fluid_tank_window_single",
|
||||
"particle": "create:block/creative_fluid_tank"
|
||||
}
|
||||
}
|
||||
|
|
@ -4,7 +4,8 @@
|
|||
"0": "create:block/creative_casing",
|
||||
"1": "create:block/creative_fluid_tank",
|
||||
"3": "create:block/creative_fluid_tank_window",
|
||||
"4": "create:block/creative_fluid_tank_window_single",
|
||||
"4": "create:block/creative_casing",
|
||||
"5": "create:block/creative_fluid_tank_window_single",
|
||||
"particle": "create:block/creative_fluid_tank"
|
||||
}
|
||||
}
|
||||
|
|
@ -4,7 +4,8 @@
|
|||
"0": "create:block/creative_casing",
|
||||
"1": "create:block/creative_fluid_tank",
|
||||
"3": "create:block/creative_fluid_tank_window",
|
||||
"4": "create:block/creative_fluid_tank_window_single",
|
||||
"4": "create:block/creative_casing",
|
||||
"5": "create:block/creative_fluid_tank_window_single",
|
||||
"particle": "create:block/creative_fluid_tank"
|
||||
}
|
||||
}
|
||||
|
|
@ -4,7 +4,8 @@
|
|||
"0": "create:block/creative_casing",
|
||||
"1": "create:block/creative_fluid_tank",
|
||||
"3": "create:block/creative_fluid_tank_window",
|
||||
"4": "create:block/creative_fluid_tank_window_single",
|
||||
"4": "create:block/creative_casing",
|
||||
"5": "create:block/creative_fluid_tank_window_single",
|
||||
"particle": "create:block/creative_fluid_tank"
|
||||
}
|
||||
}
|
||||
|
|
@ -4,7 +4,8 @@
|
|||
"0": "create:block/creative_casing",
|
||||
"1": "create:block/creative_fluid_tank",
|
||||
"3": "create:block/creative_fluid_tank_window",
|
||||
"4": "create:block/creative_fluid_tank_window_single",
|
||||
"4": "create:block/creative_casing",
|
||||
"5": "create:block/creative_fluid_tank_window_single",
|
||||
"particle": "create:block/creative_fluid_tank"
|
||||
}
|
||||
}
|
||||
|
|
@ -4,7 +4,8 @@
|
|||
"0": "create:block/creative_casing",
|
||||
"1": "create:block/creative_fluid_tank",
|
||||
"3": "create:block/creative_fluid_tank_window",
|
||||
"4": "create:block/creative_fluid_tank_window_single",
|
||||
"4": "create:block/creative_casing",
|
||||
"5": "create:block/creative_fluid_tank_window_single",
|
||||
"particle": "create:block/creative_fluid_tank"
|
||||
}
|
||||
}
|
||||
|
|
@ -4,7 +4,8 @@
|
|||
"0": "create:block/creative_casing",
|
||||
"1": "create:block/creative_fluid_tank",
|
||||
"3": "create:block/creative_fluid_tank_window",
|
||||
"4": "create:block/creative_fluid_tank_window_single",
|
||||
"4": "create:block/creative_casing",
|
||||
"5": "create:block/creative_fluid_tank_window_single",
|
||||
"particle": "create:block/creative_fluid_tank"
|
||||
}
|
||||
}
|
||||
|
|
@ -4,7 +4,8 @@
|
|||
"0": "create:block/creative_casing",
|
||||
"1": "create:block/creative_fluid_tank",
|
||||
"3": "create:block/creative_fluid_tank_window",
|
||||
"4": "create:block/creative_fluid_tank_window_single",
|
||||
"4": "create:block/creative_casing",
|
||||
"5": "create:block/creative_fluid_tank_window_single",
|
||||
"particle": "create:block/creative_fluid_tank"
|
||||
}
|
||||
}
|
||||
|
|
@ -4,7 +4,8 @@
|
|||
"0": "create:block/creative_casing",
|
||||
"1": "create:block/creative_fluid_tank",
|
||||
"3": "create:block/creative_fluid_tank_window",
|
||||
"4": "create:block/creative_fluid_tank_window_single",
|
||||
"4": "create:block/creative_casing",
|
||||
"5": "create:block/creative_fluid_tank_window_single",
|
||||
"particle": "create:block/creative_fluid_tank"
|
||||
}
|
||||
}
|
||||
|
|
@ -4,7 +4,8 @@
|
|||
"0": "create:block/creative_casing",
|
||||
"1": "create:block/creative_fluid_tank",
|
||||
"3": "create:block/creative_fluid_tank_window",
|
||||
"4": "create:block/creative_fluid_tank_window_single",
|
||||
"4": "create:block/creative_casing",
|
||||
"5": "create:block/creative_fluid_tank_window_single",
|
||||
"particle": "create:block/creative_fluid_tank"
|
||||
}
|
||||
}
|
||||
|
|
@ -4,7 +4,8 @@
|
|||
"0": "create:block/creative_casing",
|
||||
"1": "create:block/creative_fluid_tank",
|
||||
"3": "create:block/creative_fluid_tank_window",
|
||||
"4": "create:block/creative_fluid_tank_window_single",
|
||||
"4": "create:block/creative_casing",
|
||||
"5": "create:block/creative_fluid_tank_window_single",
|
||||
"particle": "create:block/creative_fluid_tank"
|
||||
}
|
||||
}
|
||||
|
|
@ -4,7 +4,8 @@
|
|||
"0": "create:block/creative_casing",
|
||||
"1": "create:block/creative_fluid_tank",
|
||||
"3": "create:block/creative_fluid_tank_window",
|
||||
"4": "create:block/creative_fluid_tank_window_single",
|
||||
"4": "create:block/creative_casing",
|
||||
"5": "create:block/creative_fluid_tank_window_single",
|
||||
"particle": "create:block/creative_fluid_tank"
|
||||
}
|
||||
}
|
||||
|
|
@ -4,7 +4,8 @@
|
|||
"0": "create:block/creative_casing",
|
||||
"1": "create:block/creative_fluid_tank",
|
||||
"3": "create:block/creative_fluid_tank_window",
|
||||
"4": "create:block/creative_fluid_tank_window_single",
|
||||
"4": "create:block/creative_casing",
|
||||
"5": "create:block/creative_fluid_tank_window_single",
|
||||
"particle": "create:block/creative_fluid_tank"
|
||||
}
|
||||
}
|
||||
|
|
@ -4,7 +4,8 @@
|
|||
"0": "create:block/creative_casing",
|
||||
"1": "create:block/creative_fluid_tank",
|
||||
"3": "create:block/creative_fluid_tank_window",
|
||||
"4": "create:block/creative_fluid_tank_window_single",
|
||||
"4": "create:block/creative_casing",
|
||||
"5": "create:block/creative_fluid_tank_window_single",
|
||||
"particle": "create:block/creative_fluid_tank"
|
||||
}
|
||||
}
|
||||
|
|
@ -4,7 +4,8 @@
|
|||
"0": "create:block/creative_casing",
|
||||
"1": "create:block/creative_fluid_tank",
|
||||
"3": "create:block/creative_fluid_tank_window",
|
||||
"4": "create:block/creative_fluid_tank_window_single",
|
||||
"4": "create:block/creative_casing",
|
||||
"5": "create:block/creative_fluid_tank_window_single",
|
||||
"particle": "create:block/creative_fluid_tank"
|
||||
}
|
||||
}
|
||||
|
|
@ -4,7 +4,8 @@
|
|||
"0": "create:block/creative_casing",
|
||||
"1": "create:block/creative_fluid_tank",
|
||||
"3": "create:block/creative_fluid_tank_window",
|
||||
"4": "create:block/creative_fluid_tank_window_single",
|
||||
"4": "create:block/creative_casing",
|
||||
"5": "create:block/creative_fluid_tank_window_single",
|
||||
"particle": "create:block/creative_fluid_tank"
|
||||
}
|
||||
}
|
||||
|
|
@ -4,7 +4,8 @@
|
|||
"0": "create:block/creative_casing",
|
||||
"1": "create:block/creative_fluid_tank",
|
||||
"3": "create:block/creative_fluid_tank_window",
|
||||
"4": "create:block/creative_fluid_tank_window_single",
|
||||
"4": "create:block/creative_casing",
|
||||
"5": "create:block/creative_fluid_tank_window_single",
|
||||
"particle": "create:block/creative_fluid_tank"
|
||||
}
|
||||
}
|
||||
|
|
@ -4,7 +4,8 @@
|
|||
"0": "create:block/creative_casing",
|
||||
"1": "create:block/creative_fluid_tank",
|
||||
"3": "create:block/creative_fluid_tank_window",
|
||||
"4": "create:block/creative_fluid_tank_window_single",
|
||||
"4": "create:block/creative_casing",
|
||||
"5": "create:block/creative_fluid_tank_window_single",
|
||||
"particle": "create:block/creative_fluid_tank"
|
||||
}
|
||||
}
|
||||
|
|
@ -4,7 +4,8 @@
|
|||
"0": "create:block/creative_casing",
|
||||
"1": "create:block/creative_fluid_tank",
|
||||
"3": "create:block/creative_fluid_tank_window",
|
||||
"4": "create:block/creative_fluid_tank_window_single",
|
||||
"4": "create:block/creative_casing",
|
||||
"5": "create:block/creative_fluid_tank_window_single",
|
||||
"particle": "create:block/creative_fluid_tank"
|
||||
}
|
||||
}
|
||||
|
|
@ -4,7 +4,8 @@
|
|||
"0": "create:block/creative_casing",
|
||||
"1": "create:block/creative_fluid_tank",
|
||||
"3": "create:block/creative_fluid_tank_window",
|
||||
"4": "create:block/creative_fluid_tank_window_single",
|
||||
"4": "create:block/creative_casing",
|
||||
"5": "create:block/creative_fluid_tank_window_single",
|
||||
"particle": "create:block/creative_fluid_tank"
|
||||
}
|
||||
}
|
||||
|
|
@ -4,7 +4,8 @@
|
|||
"0": "create:block/creative_casing",
|
||||
"1": "create:block/creative_fluid_tank",
|
||||
"3": "create:block/creative_fluid_tank_window",
|
||||
"4": "create:block/creative_fluid_tank_window_single",
|
||||
"4": "create:block/creative_casing",
|
||||
"5": "create:block/creative_fluid_tank_window_single",
|
||||
"particle": "create:block/creative_fluid_tank"
|
||||
}
|
||||
}
|
||||
|
|
@ -4,7 +4,8 @@
|
|||
"0": "create:block/creative_casing",
|
||||
"1": "create:block/creative_fluid_tank",
|
||||
"3": "create:block/creative_fluid_tank_window",
|
||||
"4": "create:block/creative_fluid_tank_window_single",
|
||||
"4": "create:block/creative_casing",
|
||||
"5": "create:block/creative_fluid_tank_window_single",
|
||||
"particle": "create:block/creative_fluid_tank"
|
||||
}
|
||||
}
|
||||
|
|
@ -4,7 +4,8 @@
|
|||
"0": "create:block/creative_casing",
|
||||
"1": "create:block/creative_fluid_tank",
|
||||
"3": "create:block/creative_fluid_tank_window",
|
||||
"4": "create:block/creative_fluid_tank_window_single",
|
||||
"4": "create:block/creative_casing",
|
||||
"5": "create:block/creative_fluid_tank_window_single",
|
||||
"particle": "create:block/creative_fluid_tank"
|
||||
}
|
||||
}
|
||||
|
|
@ -4,7 +4,8 @@
|
|||
"0": "create:block/creative_casing",
|
||||
"1": "create:block/creative_fluid_tank",
|
||||
"3": "create:block/creative_fluid_tank_window",
|
||||
"4": "create:block/creative_fluid_tank_window_single",
|
||||
"4": "create:block/creative_casing",
|
||||
"5": "create:block/creative_fluid_tank_window_single",
|
||||
"particle": "create:block/creative_fluid_tank"
|
||||
}
|
||||
}
|
||||
|
|
@ -3,6 +3,8 @@
|
|||
"textures": {
|
||||
"5": "create:block/creative_fluid_tank_window_single",
|
||||
"1": "create:block/creative_fluid_tank",
|
||||
"particle": "create:block/creative_fluid_tank",
|
||||
"4": "create:block/creative_casing",
|
||||
"0": "create:block/creative_casing"
|
||||
}
|
||||
}
|
||||
|
|
@ -935,6 +935,8 @@ public class AllBlocks {
|
|||
.model((c, p) -> p.withExistingParent(c.getName(), p.modLoc("block/fluid_tank/block_single_window"))
|
||||
.texture("5", p.modLoc("block/creative_fluid_tank_window_single"))
|
||||
.texture("1", p.modLoc("block/creative_fluid_tank"))
|
||||
.texture("particle", p.modLoc("block/creative_fluid_tank"))
|
||||
.texture("4", p.modLoc("block/creative_casing"))
|
||||
.texture("0", p.modLoc("block/creative_casing")))
|
||||
.build()
|
||||
.register();
|
||||
|
|
@ -1694,12 +1696,14 @@ public class AllBlocks {
|
|||
.properties(p -> p.color(MaterialColor.STONE))
|
||||
.transform(BuilderTransformers.beltTunnel("andesite", new ResourceLocation("block/polished_andesite")))
|
||||
.onRegister(assignDataBehaviour(new AccumulatedItemCountDisplaySource(), "accumulate_items"))
|
||||
.onRegister(assignDataBehaviour(new ItemThoughputDisplaySource(), "item_throughput"))
|
||||
.register();
|
||||
|
||||
public static final BlockEntry<BrassTunnelBlock> BRASS_TUNNEL =
|
||||
REGISTRATE.block("brass_tunnel", BrassTunnelBlock::new)
|
||||
.properties(p -> p.color(MaterialColor.TERRACOTTA_YELLOW))
|
||||
.transform(BuilderTransformers.beltTunnel("brass", Create.asResource("block/brass_block")))
|
||||
.onRegister(assignDataBehaviour(new AccumulatedItemCountDisplaySource(), "accumulate_items"))
|
||||
.onRegister(assignDataBehaviour(new ItemThoughputDisplaySource(), "item_throughput"))
|
||||
.onRegister(connectedTextures(BrassTunnelCTBehaviour::new))
|
||||
.register();
|
||||
|
|
|
|||
|
|
@ -57,6 +57,7 @@ public class AllSpriteShifts {
|
|||
|
||||
public static final CTSpriteShiftEntry BRASS_TUNNEL_TOP = vertical("brass_tunnel_top"),
|
||||
FLUID_TANK = getCT(CTType.RECTANGLE, "fluid_tank"), FLUID_TANK_TOP = getCT(CTType.RECTANGLE, "fluid_tank_top"),
|
||||
FLUID_TANK_INNER = getCT(CTType.RECTANGLE, "fluid_tank_inner"),
|
||||
CREATIVE_FLUID_TANK = getCT(CTType.CROSS, "creative_fluid_tank");
|
||||
|
||||
public static final Couple<CTSpriteShiftEntry> VAULT_TOP = vault("top"), VAULT_FRONT = vault("front"),
|
||||
|
|
|
|||
|
|
@ -10,6 +10,7 @@ import com.simibubi.create.content.contraptions.relays.elementary.ShaftBlock;
|
|||
import com.simibubi.create.foundation.render.AllMaterialSpecs;
|
||||
|
||||
import net.minecraft.core.Direction;
|
||||
import net.minecraft.core.Direction.Axis;
|
||||
import net.minecraft.world.level.block.state.BlockState;
|
||||
|
||||
public abstract class KineticTileInstance<T extends KineticTileEntity> extends BlockEntityInstance<T> {
|
||||
|
|
@ -18,8 +19,7 @@ public abstract class KineticTileInstance<T extends KineticTileEntity> extends B
|
|||
|
||||
public KineticTileInstance(MaterialManager modelManager, T tile) {
|
||||
super(modelManager, tile);
|
||||
|
||||
axis = ((IRotate) blockState.getBlock()).getRotationAxis(blockState);
|
||||
axis = (blockState.getBlock()instanceof IRotate irotate) ? irotate.getRotationAxis(blockState) : Axis.Y;
|
||||
}
|
||||
|
||||
protected final void updateRotation(RotatingData instance) {
|
||||
|
|
@ -36,9 +36,9 @@ public abstract class KineticTileInstance<T extends KineticTileEntity> extends B
|
|||
|
||||
protected final void updateRotation(RotatingData instance, Direction.Axis axis, float speed) {
|
||||
instance.setRotationAxis(axis)
|
||||
.setRotationOffset(getRotationOffset(axis))
|
||||
.setRotationalSpeed(speed)
|
||||
.setColor(blockEntity);
|
||||
.setRotationOffset(getRotationOffset(axis))
|
||||
.setRotationalSpeed(speed)
|
||||
.setColor(blockEntity);
|
||||
}
|
||||
|
||||
protected final RotatingData setup(RotatingData key) {
|
||||
|
|
@ -55,10 +55,10 @@ public abstract class KineticTileInstance<T extends KineticTileEntity> extends B
|
|||
|
||||
protected final RotatingData setup(RotatingData key, Direction.Axis axis, float speed) {
|
||||
key.setRotationAxis(axis)
|
||||
.setRotationalSpeed(speed)
|
||||
.setRotationOffset(getRotationOffset(axis))
|
||||
.setColor(blockEntity)
|
||||
.setPosition(getInstancePosition());
|
||||
.setRotationalSpeed(speed)
|
||||
.setRotationOffset(getRotationOffset(axis))
|
||||
.setColor(blockEntity)
|
||||
.setPosition(getInstancePosition());
|
||||
|
||||
return key;
|
||||
}
|
||||
|
|
@ -66,7 +66,7 @@ public abstract class KineticTileInstance<T extends KineticTileEntity> extends B
|
|||
protected float getRotationOffset(final Direction.Axis axis) {
|
||||
float offset = ICogWheel.isLargeCog(blockState) ? 11.25f : 0;
|
||||
double d = (((axis == Direction.Axis.X) ? 0 : pos.getX()) + ((axis == Direction.Axis.Y) ? 0 : pos.getY())
|
||||
+ ((axis == Direction.Axis.Z) ? 0 : pos.getZ())) % 2;
|
||||
+ ((axis == Direction.Axis.Z) ? 0 : pos.getZ())) % 2;
|
||||
if (d == 0) {
|
||||
offset = 22.5f;
|
||||
}
|
||||
|
|
@ -87,11 +87,11 @@ public abstract class KineticTileInstance<T extends KineticTileEntity> extends B
|
|||
|
||||
protected Material<RotatingData> getRotatingMaterial() {
|
||||
return materialManager.defaultSolid()
|
||||
.material(AllMaterialSpecs.ROTATING);
|
||||
.material(AllMaterialSpecs.ROTATING);
|
||||
}
|
||||
|
||||
public static BlockState shaft(Direction.Axis axis) {
|
||||
return AllBlocks.SHAFT.getDefaultState()
|
||||
.setValue(ShaftBlock.AXIS, axis);
|
||||
.setValue(ShaftBlock.AXIS, axis);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -4,15 +4,27 @@ import com.simibubi.create.api.connectivity.ConnectivityHandler;
|
|||
import com.simibubi.create.foundation.block.connected.CTSpriteShiftEntry;
|
||||
import com.simibubi.create.foundation.block.connected.HorizontalCTBehaviour;
|
||||
|
||||
import net.minecraft.client.renderer.texture.TextureAtlasSprite;
|
||||
import net.minecraft.core.BlockPos;
|
||||
import net.minecraft.core.Direction;
|
||||
import net.minecraft.core.Direction.Axis;
|
||||
import net.minecraft.world.level.BlockAndTintGetter;
|
||||
import net.minecraft.world.level.block.state.BlockState;
|
||||
|
||||
public class FluidTankCTBehaviour extends HorizontalCTBehaviour {
|
||||
|
||||
public FluidTankCTBehaviour(CTSpriteShiftEntry layerShift, CTSpriteShiftEntry topShift) {
|
||||
private CTSpriteShiftEntry innerShift;
|
||||
|
||||
public FluidTankCTBehaviour(CTSpriteShiftEntry layerShift, CTSpriteShiftEntry topShift, CTSpriteShiftEntry innerShift) {
|
||||
super(layerShift, topShift);
|
||||
this.innerShift = innerShift;
|
||||
}
|
||||
|
||||
@Override
|
||||
public CTSpriteShiftEntry get(BlockState state, Direction direction, TextureAtlasSprite sprite) {
|
||||
if (direction.getAxis() == Axis.Y && innerShift.getOriginal() == sprite)
|
||||
return innerShift;
|
||||
return super.get(state, direction, sprite);
|
||||
}
|
||||
|
||||
public boolean buildContextForOccludedDirections() {
|
||||
|
|
|
|||
|
|
@ -55,7 +55,8 @@ public class FluidTankGenerator extends SpecialBlockStateGen {
|
|||
.texture("0", prov.modLoc("block/" + prefix + "casing"))
|
||||
.texture("1", prov.modLoc("block/" + prefix + "fluid_tank"))
|
||||
.texture("3", prov.modLoc("block/" + prefix + "fluid_tank_window"))
|
||||
.texture("4", prov.modLoc("block/" + prefix + "fluid_tank_window_single"))
|
||||
.texture("4", prov.modLoc("block/" + prefix + "casing"))
|
||||
.texture("5", prov.modLoc("block/" + prefix + "fluid_tank_window_single"))
|
||||
.texture("particle", prov.modLoc("block/" + prefix + "fluid_tank"));
|
||||
|
||||
return AssetLookup.partialBaseModel(ctx, prov, modelName);
|
||||
|
|
|
|||
|
|
@ -27,22 +27,25 @@ public class FluidTankModel extends CTModel {
|
|||
protected static final ModelProperty<CullData> CULL_PROPERTY = new ModelProperty<>();
|
||||
|
||||
public static FluidTankModel standard(BakedModel originalModel) {
|
||||
return new FluidTankModel(originalModel, AllSpriteShifts.FLUID_TANK, AllSpriteShifts.FLUID_TANK_TOP);
|
||||
return new FluidTankModel(originalModel, AllSpriteShifts.FLUID_TANK, AllSpriteShifts.FLUID_TANK_TOP,
|
||||
AllSpriteShifts.FLUID_TANK_INNER);
|
||||
}
|
||||
|
||||
public static FluidTankModel creative(BakedModel originalModel) {
|
||||
return new FluidTankModel(originalModel, AllSpriteShifts.CREATIVE_FLUID_TANK, AllSpriteShifts.CREATIVE_CASING);
|
||||
return new FluidTankModel(originalModel, AllSpriteShifts.CREATIVE_FLUID_TANK, AllSpriteShifts.CREATIVE_CASING,
|
||||
AllSpriteShifts.CREATIVE_CASING);
|
||||
}
|
||||
|
||||
private FluidTankModel(BakedModel originalModel, CTSpriteShiftEntry side, CTSpriteShiftEntry top) {
|
||||
super(originalModel, new FluidTankCTBehaviour(side, top));
|
||||
private FluidTankModel(BakedModel originalModel, CTSpriteShiftEntry side, CTSpriteShiftEntry top,
|
||||
CTSpriteShiftEntry inner) {
|
||||
super(originalModel, new FluidTankCTBehaviour(side, top, inner));
|
||||
}
|
||||
|
||||
@Override
|
||||
protected Builder gatherModelData(Builder builder, BlockAndTintGetter world, BlockPos pos, BlockState state) {
|
||||
CullData cullData = new CullData();
|
||||
for (Direction d : Iterate.horizontalDirections)
|
||||
cullData.setCulled(d, ConnectivityHandler.isConnected(world, pos, pos.relative(d))); //FluidTankConnectivityHandler.isConnected(world, pos, pos.relative(d)));
|
||||
cullData.setCulled(d, ConnectivityHandler.isConnected(world, pos, pos.relative(d)));
|
||||
return super.gatherModelData(builder, world, pos, state).withInitial(CULL_PROPERTY, cullData);
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -135,6 +135,9 @@ public class TravellingPoint {
|
|||
if (!visiteds.get(j)
|
||||
.add(nextEdge))
|
||||
continue;
|
||||
if (!currentEntry.getValue()
|
||||
.canTravelTo(nextEdge))
|
||||
continue;
|
||||
|
||||
TrackNode nextNode = nextEntry.getKey();
|
||||
if (nextNode == target) {
|
||||
|
|
|
|||
|
|
@ -82,7 +82,7 @@ public class CTModel extends BakedModelWrapperWithData {
|
|||
for (int i = 0; i < quads.size(); i++) {
|
||||
BakedQuad quad = quads.get(i);
|
||||
|
||||
CTSpriteShiftEntry spriteShift = behaviour.get(state, quad.getDirection());
|
||||
CTSpriteShiftEntry spriteShift = behaviour.get(state, quad.getDirection(), quad.getSprite());
|
||||
if (spriteShift == null)
|
||||
continue;
|
||||
if (quad.getSprite() != spriteShift.getOriginal())
|
||||
|
|
|
|||
|
|
@ -2,6 +2,7 @@ package com.simibubi.create.foundation.block.connected;
|
|||
|
||||
import com.simibubi.create.foundation.block.connected.CTSpriteShifter.CTType;
|
||||
|
||||
import net.minecraft.client.renderer.texture.TextureAtlasSprite;
|
||||
import net.minecraft.core.BlockPos;
|
||||
import net.minecraft.core.Direction;
|
||||
import net.minecraft.core.Direction.Axis;
|
||||
|
|
@ -16,7 +17,13 @@ public abstract class ConnectedTextureBehaviour {
|
|||
boolean topLeft, topRight, bottomLeft, bottomRight;
|
||||
}
|
||||
|
||||
public abstract CTSpriteShiftEntry get(BlockState state, Direction direction);
|
||||
public CTSpriteShiftEntry get(BlockState state, Direction direction, TextureAtlasSprite sprite) {
|
||||
return get(state, direction);
|
||||
}
|
||||
|
||||
public CTSpriteShiftEntry get(BlockState state, Direction direction) {
|
||||
return null;
|
||||
}
|
||||
|
||||
protected boolean reverseUVs(BlockState state, Direction face) {
|
||||
return false;
|
||||
|
|
|
|||
|
|
@ -30,6 +30,7 @@ public class AllCommands {
|
|||
.then(FixLightingCommand.register())
|
||||
.then(HighlightCommand.register())
|
||||
.then(KillTrainCommand.register())
|
||||
.then(PassengerCommand.register())
|
||||
.then(CouplingCommand.register())
|
||||
.then(ConfigCommand.register())
|
||||
.then(PonderCommand.register())
|
||||
|
|
|
|||
|
|
@ -0,0 +1,53 @@
|
|||
package com.simibubi.create.foundation.command;
|
||||
|
||||
import com.mojang.brigadier.arguments.IntegerArgumentType;
|
||||
import com.mojang.brigadier.builder.ArgumentBuilder;
|
||||
import com.simibubi.create.content.contraptions.components.structureMovement.AbstractContraptionEntity;
|
||||
import com.simibubi.create.content.contraptions.components.structureMovement.ControlledContraptionEntity;
|
||||
import com.simibubi.create.content.logistics.trains.entity.CarriageContraptionEntity;
|
||||
|
||||
import net.minecraft.commands.CommandSourceStack;
|
||||
import net.minecraft.commands.Commands;
|
||||
import net.minecraft.commands.arguments.EntityArgument;
|
||||
import net.minecraft.world.entity.Entity;
|
||||
|
||||
public class PassengerCommand {
|
||||
|
||||
static ArgumentBuilder<CommandSourceStack, ?> register() {
|
||||
return Commands.literal("passenger")
|
||||
.requires(cs -> cs.hasPermission(2))
|
||||
.then(Commands.argument("rider", EntityArgument.entity())
|
||||
.then(Commands.argument("vehicle", EntityArgument.entity())
|
||||
.executes(ctx -> {
|
||||
run(ctx.getSource(), EntityArgument.getEntity(ctx, "vehicle"),
|
||||
EntityArgument.getEntity(ctx, "rider"), 0);
|
||||
return 1;
|
||||
})
|
||||
.then(Commands.argument("seatIndex", IntegerArgumentType.integer(0))
|
||||
.executes(ctx -> {
|
||||
run(ctx.getSource(), EntityArgument.getEntity(ctx, "vehicle"),
|
||||
EntityArgument.getEntity(ctx, "rider"),
|
||||
IntegerArgumentType.getInteger(ctx, "seatIndex"));
|
||||
return 1;
|
||||
}))));
|
||||
}
|
||||
|
||||
private static void run(CommandSourceStack source, Entity vehicle, Entity rider, int index) {
|
||||
if (vehicle == rider)
|
||||
return;
|
||||
if (rider instanceof CarriageContraptionEntity)
|
||||
return;
|
||||
if (rider instanceof ControlledContraptionEntity)
|
||||
return;
|
||||
|
||||
if (vehicle instanceof AbstractContraptionEntity ace) {
|
||||
if (ace.getContraption()
|
||||
.getSeats()
|
||||
.size() > index)
|
||||
ace.addSittingPassenger(rider, index);
|
||||
return;
|
||||
}
|
||||
|
||||
rider.startRiding(vehicle, true);
|
||||
}
|
||||
}
|
||||
|
|
@ -4,6 +4,7 @@
|
|||
"textures": {
|
||||
"0": "create:block/fluid_tank_top",
|
||||
"1": "create:block/fluid_tank",
|
||||
"4": "create:block/fluid_tank_inner",
|
||||
"particle": "create:block/fluid_tank"
|
||||
},
|
||||
"elements": [
|
||||
|
|
@ -17,7 +18,7 @@
|
|||
"east": {"uv": [0, 12, 16, 16], "texture": "#1", "cullface": "east"},
|
||||
"south": {"uv": [0, 12, 16, 16], "texture": "#1", "cullface": "south"},
|
||||
"west": {"uv": [0, 12, 16, 16], "texture": "#1", "cullface": "west"},
|
||||
"up": {"uv": [0, 0, 16, 16], "texture": "#0"},
|
||||
"up": {"uv": [0, 0, 16, 16], "texture": "#4"},
|
||||
"down": {"uv": [0, 0, 16, 16], "texture": "#0", "cullface": "down"}
|
||||
}
|
||||
},
|
||||
|
|
@ -66,6 +67,7 @@
|
|||
{
|
||||
"name": "tank",
|
||||
"origin": [8, 8, -23],
|
||||
"color": 0,
|
||||
"children": [0, 1, 2, 3, 4]
|
||||
}
|
||||
]
|
||||
|
|
|
|||
|
|
@ -5,6 +5,7 @@
|
|||
"0": "create:block/fluid_tank_top",
|
||||
"1": "create:block/fluid_tank",
|
||||
"3": "create:block/fluid_tank_window",
|
||||
"4": "create:block/fluid_tank_inner",
|
||||
"particle": "create:block/fluid_tank"
|
||||
},
|
||||
"elements": [
|
||||
|
|
@ -137,7 +138,7 @@
|
|||
"east": {"uv": [0, 12, 16, 16], "texture": "#1", "cullface": "east"},
|
||||
"south": {"uv": [0, 12, 16, 16], "texture": "#1", "cullface": "south"},
|
||||
"west": {"uv": [0, 12, 16, 16], "texture": "#1", "cullface": "west"},
|
||||
"up": {"uv": [0, 0, 16, 16], "texture": "#0"},
|
||||
"up": {"uv": [0, 0, 16, 16], "texture": "#4"},
|
||||
"down": {"uv": [0, 0, 16, 16], "texture": "#0", "cullface": "down"}
|
||||
}
|
||||
}
|
||||
|
|
@ -146,6 +147,7 @@
|
|||
{
|
||||
"name": "tank",
|
||||
"origin": [8, 8, -23],
|
||||
"color": 0,
|
||||
"children": [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12]
|
||||
}
|
||||
]
|
||||
|
|
|
|||
|
|
@ -5,6 +5,7 @@
|
|||
"0": "create:block/fluid_tank_top",
|
||||
"1": "create:block/fluid_tank",
|
||||
"3": "create:block/fluid_tank_window",
|
||||
"4": "create:block/fluid_tank_inner",
|
||||
"particle": "create:block/fluid_tank"
|
||||
},
|
||||
"elements": [
|
||||
|
|
@ -56,7 +57,7 @@
|
|||
"east": {"uv": [0, 12, 16, 16], "texture": "#1"},
|
||||
"south": {"uv": [0, 12, 16, 16], "texture": "#1"},
|
||||
"west": {"uv": [0, 12, 16, 16], "texture": "#1"},
|
||||
"up": {"uv": [0, 0, 16, 16], "texture": "#0"},
|
||||
"up": {"uv": [0, 0, 16, 16], "texture": "#4"},
|
||||
"down": {"uv": [0, 0, 16, 16], "texture": "#0", "cullface": "down"}
|
||||
}
|
||||
}
|
||||
|
|
@ -65,6 +66,7 @@
|
|||
{
|
||||
"name": "tank",
|
||||
"origin": [8, 8, -23],
|
||||
"color": 0,
|
||||
"children": [0, 1, 2, 3, 4]
|
||||
}
|
||||
]
|
||||
|
|
|
|||
|
|
@ -5,6 +5,7 @@
|
|||
"0": "create:block/fluid_tank_top",
|
||||
"1": "create:block/fluid_tank",
|
||||
"3": "create:block/fluid_tank_window",
|
||||
"4": "create:block/fluid_tank_inner",
|
||||
"particle": "create:block/fluid_tank"
|
||||
},
|
||||
"elements": [
|
||||
|
|
@ -56,7 +57,7 @@
|
|||
"east": {"uv": [0, 12, 16, 16], "texture": "#1"},
|
||||
"south": {"uv": [0, 12, 16, 16], "texture": "#1"},
|
||||
"west": {"uv": [0, 12, 16, 16], "texture": "#1"},
|
||||
"up": {"uv": [0, 0, 16, 16], "texture": "#0"},
|
||||
"up": {"uv": [0, 0, 16, 16], "texture": "#4"},
|
||||
"down": {"uv": [0, 0, 16, 16], "texture": "#0", "cullface": "down"}
|
||||
}
|
||||
}
|
||||
|
|
@ -65,6 +66,7 @@
|
|||
{
|
||||
"name": "tank",
|
||||
"origin": [8, 8, -23],
|
||||
"color": 0,
|
||||
"children": [0, 1, 2, 3, 4]
|
||||
}
|
||||
]
|
||||
|
|
|
|||
|
|
@ -5,6 +5,7 @@
|
|||
"0": "create:block/fluid_tank_top",
|
||||
"1": "create:block/fluid_tank",
|
||||
"3": "create:block/fluid_tank_window",
|
||||
"4": "create:block/fluid_tank_inner",
|
||||
"particle": "create:block/fluid_tank"
|
||||
},
|
||||
"elements": [
|
||||
|
|
@ -56,7 +57,7 @@
|
|||
"east": {"uv": [0, 12, 16, 16], "texture": "#1"},
|
||||
"south": {"uv": [0, 12, 16, 16], "texture": "#1"},
|
||||
"west": {"uv": [0, 12, 16, 16], "texture": "#1"},
|
||||
"up": {"uv": [0, 0, 16, 16], "texture": "#0"},
|
||||
"up": {"uv": [0, 0, 16, 16], "texture": "#4"},
|
||||
"down": {"uv": [0, 0, 16, 16], "texture": "#0", "cullface": "down"}
|
||||
}
|
||||
}
|
||||
|
|
@ -65,6 +66,7 @@
|
|||
{
|
||||
"name": "tank",
|
||||
"origin": [8, 8, -23],
|
||||
"color": 0,
|
||||
"children": [0, 1, 2, 3, 4]
|
||||
}
|
||||
]
|
||||
|
|
|
|||
|
|
@ -5,6 +5,7 @@
|
|||
"0": "create:block/fluid_tank_top",
|
||||
"1": "create:block/fluid_tank",
|
||||
"3": "create:block/fluid_tank_window",
|
||||
"4": "create:block/fluid_tank_inner",
|
||||
"particle": "create:block/fluid_tank"
|
||||
},
|
||||
"elements": [
|
||||
|
|
@ -56,7 +57,7 @@
|
|||
"east": {"uv": [0, 12, 16, 16], "texture": "#1"},
|
||||
"south": {"uv": [0, 12, 16, 16], "texture": "#1"},
|
||||
"west": {"uv": [0, 12, 16, 16], "texture": "#1"},
|
||||
"up": {"uv": [0, 0, 16, 16], "texture": "#0"},
|
||||
"up": {"uv": [0, 0, 16, 16], "texture": "#4"},
|
||||
"down": {"uv": [0, 0, 16, 16], "texture": "#0", "cullface": "down"}
|
||||
}
|
||||
}
|
||||
|
|
@ -65,6 +66,7 @@
|
|||
{
|
||||
"name": "tank",
|
||||
"origin": [8, 8, -23],
|
||||
"color": 0,
|
||||
"children": [0, 1, 2, 3, 4]
|
||||
}
|
||||
]
|
||||
|
|
|
|||
|
|
@ -4,6 +4,7 @@
|
|||
"textures": {
|
||||
"0": "create:block/fluid_tank_top",
|
||||
"1": "create:block/fluid_tank",
|
||||
"4": "create:block/fluid_tank_inner",
|
||||
"particle": "create:block/fluid_tank"
|
||||
},
|
||||
"elements": [
|
||||
|
|
@ -17,7 +18,7 @@
|
|||
"east": {"uv": [0, 12, 16, 16], "texture": "#1", "cullface": "east"},
|
||||
"south": {"uv": [0, 12, 16, 16], "texture": "#1", "cullface": "south"},
|
||||
"west": {"uv": [0, 12, 16, 16], "texture": "#1", "cullface": "west"},
|
||||
"up": {"uv": [0, 0, 16, 16], "texture": "#0"},
|
||||
"up": {"uv": [0, 0, 16, 16], "texture": "#4"},
|
||||
"down": {"uv": [0, 0, 16, 16], "texture": "#0", "cullface": "down"}
|
||||
}
|
||||
},
|
||||
|
|
@ -62,7 +63,7 @@
|
|||
"south": {"uv": [0, 0, 16, 4], "texture": "#1", "cullface": "south"},
|
||||
"west": {"uv": [0, 0, 16, 4], "texture": "#1", "cullface": "west"},
|
||||
"up": {"uv": [0, 0, 16, 16], "texture": "#0", "cullface": "up"},
|
||||
"down": {"uv": [0, 0, 16, 16], "texture": "#0"}
|
||||
"down": {"uv": [0, 0, 16, 16], "texture": "#4"}
|
||||
}
|
||||
},
|
||||
{
|
||||
|
|
@ -80,15 +81,18 @@
|
|||
{
|
||||
"name": "tank",
|
||||
"origin": [8, 8, -23],
|
||||
"color": 0,
|
||||
"children": []
|
||||
},
|
||||
{
|
||||
"name": "block_middle",
|
||||
"origin": [8, 8, 8],
|
||||
"color": 0,
|
||||
"children": [
|
||||
{
|
||||
"name": "tank",
|
||||
"origin": [8, 8, -23],
|
||||
"color": 0,
|
||||
"children": []
|
||||
}
|
||||
]
|
||||
|
|
@ -96,10 +100,12 @@
|
|||
{
|
||||
"name": "block_bottom",
|
||||
"origin": [8, 8, 8],
|
||||
"color": 0,
|
||||
"children": [
|
||||
{
|
||||
"name": "tank",
|
||||
"origin": [8, 8, -23],
|
||||
"color": 0,
|
||||
"children": [0, 1, 2, 3]
|
||||
}
|
||||
]
|
||||
|
|
@ -107,10 +113,12 @@
|
|||
{
|
||||
"name": "block_top",
|
||||
"origin": [8, 8, 8],
|
||||
"color": 0,
|
||||
"children": [
|
||||
{
|
||||
"name": "tank",
|
||||
"origin": [8, 8, -23],
|
||||
"color": 0,
|
||||
"children": [4, 5]
|
||||
}
|
||||
]
|
||||
|
|
|
|||
|
|
@ -4,8 +4,9 @@
|
|||
"textures": {
|
||||
"0": "create:block/fluid_tank_top",
|
||||
"1": "create:block/fluid_tank",
|
||||
"4": "create:block/fluid_tank_window_single",
|
||||
"particle": "#1"
|
||||
"4": "create:block/fluid_tank_inner",
|
||||
"5": "create:block/fluid_tank_window_single",
|
||||
"particle": "create:block/fluid_tank"
|
||||
},
|
||||
"elements": [
|
||||
{
|
||||
|
|
@ -19,7 +20,7 @@
|
|||
"south": {"uv": [0, 0, 16, 4], "texture": "#1", "cullface": "south"},
|
||||
"west": {"uv": [0, 0, 16, 4], "texture": "#1", "cullface": "west"},
|
||||
"up": {"uv": [0, 0, 16, 16], "texture": "#0", "cullface": "up"},
|
||||
"down": {"uv": [0, 0, 16, 16], "texture": "#0"}
|
||||
"down": {"uv": [0, 0, 16, 16], "texture": "#4"}
|
||||
}
|
||||
},
|
||||
{
|
||||
|
|
@ -69,8 +70,8 @@
|
|||
"to": [12, 12, 1],
|
||||
"rotation": {"angle": 0, "axis": "y", "origin": [8, 8, -23]},
|
||||
"faces": {
|
||||
"north": {"uv": [0, 0, 8, 8], "texture": "#4", "cullface": "north"},
|
||||
"south": {"uv": [0, 0, 8, 8], "texture": "#4", "cullface": "north"}
|
||||
"north": {"uv": [0, 0, 8, 8], "texture": "#5", "cullface": "north"},
|
||||
"south": {"uv": [0, 0, 8, 8], "texture": "#5", "cullface": "north"}
|
||||
}
|
||||
},
|
||||
{
|
||||
|
|
@ -78,8 +79,8 @@
|
|||
"from": [15, 4, 4],
|
||||
"to": [15, 12, 12],
|
||||
"faces": {
|
||||
"east": {"uv": [0, 0, 8, 8], "texture": "#4", "cullface": "east"},
|
||||
"west": {"uv": [0, 0, 8, 8], "texture": "#4", "cullface": "east"}
|
||||
"east": {"uv": [0, 0, 8, 8], "texture": "#5", "cullface": "east"},
|
||||
"west": {"uv": [0, 0, 8, 8], "texture": "#5", "cullface": "east"}
|
||||
}
|
||||
},
|
||||
{
|
||||
|
|
@ -87,8 +88,8 @@
|
|||
"from": [4, 4, 15],
|
||||
"to": [12, 12, 15],
|
||||
"faces": {
|
||||
"north": {"uv": [0, 0, 8, 8], "texture": "#4", "cullface": "south"},
|
||||
"south": {"uv": [0, 0, 8, 8], "texture": "#4", "cullface": "south"}
|
||||
"north": {"uv": [0, 0, 8, 8], "texture": "#5", "cullface": "south"},
|
||||
"south": {"uv": [0, 0, 8, 8], "texture": "#5", "cullface": "south"}
|
||||
}
|
||||
},
|
||||
{
|
||||
|
|
@ -96,8 +97,8 @@
|
|||
"from": [1, 4, 4],
|
||||
"to": [1, 12, 12],
|
||||
"faces": {
|
||||
"east": {"uv": [0, 0, 8, 8], "texture": "#4", "cullface": "west"},
|
||||
"west": {"uv": [0, 0, 8, 8], "texture": "#4", "cullface": "west"}
|
||||
"east": {"uv": [0, 0, 8, 8], "texture": "#5", "cullface": "west"},
|
||||
"west": {"uv": [0, 0, 8, 8], "texture": "#5", "cullface": "west"}
|
||||
}
|
||||
},
|
||||
{
|
||||
|
|
@ -151,7 +152,7 @@
|
|||
"east": {"uv": [0, 12, 16, 16], "texture": "#1", "cullface": "east"},
|
||||
"south": {"uv": [0, 12, 16, 16], "texture": "#1", "cullface": "south"},
|
||||
"west": {"uv": [0, 12, 16, 16], "texture": "#1", "cullface": "west"},
|
||||
"up": {"uv": [0, 0, 16, 16], "texture": "#0"},
|
||||
"up": {"uv": [0, 0, 16, 16], "texture": "#4"},
|
||||
"down": {"uv": [0, 0, 16, 16], "texture": "#0", "cullface": "down"}
|
||||
}
|
||||
}
|
||||
|
|
@ -160,6 +161,7 @@
|
|||
{
|
||||
"name": "tank",
|
||||
"origin": [8, 8, -23],
|
||||
"color": 0,
|
||||
"children": [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13]
|
||||
}
|
||||
]
|
||||
|
|
|
|||
|
|
@ -4,7 +4,8 @@
|
|||
"textures": {
|
||||
"0": "create:block/fluid_tank_top",
|
||||
"1": "create:block/fluid_tank",
|
||||
"4": "create:block/fluid_tank_window_single",
|
||||
"4": "create:block/fluid_tank_inner",
|
||||
"5": "create:block/fluid_tank_window_single",
|
||||
"particle": "create:block/fluid_tank"
|
||||
},
|
||||
"elements": [
|
||||
|
|
@ -25,8 +26,8 @@
|
|||
"to": [4, 12, 1],
|
||||
"rotation": {"angle": 0, "axis": "y", "origin": [8, 4, 8]},
|
||||
"faces": {
|
||||
"north": {"uv": [0, 0, 4, 8], "texture": "#4"},
|
||||
"south": {"uv": [4, 0, 8, 8], "texture": "#4"}
|
||||
"north": {"uv": [0, 0, 4, 8], "texture": "#5"},
|
||||
"south": {"uv": [4, 0, 8, 8], "texture": "#5"}
|
||||
}
|
||||
},
|
||||
{
|
||||
|
|
@ -35,8 +36,8 @@
|
|||
"to": [15, 12, 16],
|
||||
"rotation": {"angle": 0, "axis": "y", "origin": [8, 4, 8]},
|
||||
"faces": {
|
||||
"east": {"uv": [4, 0, 8, 8], "texture": "#4"},
|
||||
"west": {"uv": [0, 0, 4, 8], "texture": "#4"}
|
||||
"east": {"uv": [4, 0, 8, 8], "texture": "#5"},
|
||||
"west": {"uv": [0, 0, 4, 8], "texture": "#5"}
|
||||
}
|
||||
},
|
||||
{
|
||||
|
|
@ -61,7 +62,7 @@
|
|||
"south": {"uv": [0, 0, 16, 4], "texture": "#1"},
|
||||
"west": {"uv": [0, 0, 16, 4], "texture": "#1"},
|
||||
"up": {"uv": [0, 0, 16, 16], "texture": "#0", "cullface": "up"},
|
||||
"down": {"uv": [0, 0, 16, 16], "texture": "#0"}
|
||||
"down": {"uv": [0, 0, 16, 16], "texture": "#4"}
|
||||
}
|
||||
},
|
||||
{
|
||||
|
|
@ -74,7 +75,7 @@
|
|||
"east": {"uv": [0, 12, 16, 16], "texture": "#1"},
|
||||
"south": {"uv": [0, 12, 16, 16], "texture": "#1"},
|
||||
"west": {"uv": [0, 12, 16, 16], "texture": "#1"},
|
||||
"up": {"uv": [0, 0, 16, 16], "texture": "#0"},
|
||||
"up": {"uv": [0, 0, 16, 16], "texture": "#4"},
|
||||
"down": {"uv": [0, 0, 16, 16], "texture": "#0", "cullface": "down"}
|
||||
}
|
||||
}
|
||||
|
|
@ -83,15 +84,18 @@
|
|||
{
|
||||
"name": "tank",
|
||||
"origin": [8, 8, -23],
|
||||
"color": 0,
|
||||
"children": [0, 1, 2, 3, 4]
|
||||
},
|
||||
{
|
||||
"name": "block_bottom_centered_window",
|
||||
"origin": [8, 8, 8],
|
||||
"color": 0,
|
||||
"children": [
|
||||
{
|
||||
"name": "tank",
|
||||
"origin": [8, 8, -23],
|
||||
"color": 0,
|
||||
"children": [5]
|
||||
}
|
||||
]
|
||||
|
|
|
|||
|
|
@ -4,7 +4,8 @@
|
|||
"textures": {
|
||||
"0": "create:block/fluid_tank_top",
|
||||
"1": "create:block/fluid_tank",
|
||||
"4": "create:block/fluid_tank_window_single",
|
||||
"4": "create:block/fluid_tank_inner",
|
||||
"5": "create:block/fluid_tank_window_single",
|
||||
"particle": "create:block/fluid_tank"
|
||||
},
|
||||
"elements": [
|
||||
|
|
@ -25,8 +26,8 @@
|
|||
"to": [1, 12, 16],
|
||||
"rotation": {"angle": 0, "axis": "y", "origin": [8, 4, 8]},
|
||||
"faces": {
|
||||
"east": {"uv": [4, 0, 8, 8], "texture": "#4"},
|
||||
"west": {"uv": [0, 0, 4, 8], "texture": "#4"}
|
||||
"east": {"uv": [4, 0, 8, 8], "texture": "#5"},
|
||||
"west": {"uv": [0, 0, 4, 8], "texture": "#5"}
|
||||
}
|
||||
},
|
||||
{
|
||||
|
|
@ -35,8 +36,8 @@
|
|||
"to": [16, 12, 1],
|
||||
"rotation": {"angle": 0, "axis": "y", "origin": [8, 4, 8]},
|
||||
"faces": {
|
||||
"north": {"uv": [4, 0, 8, 8], "texture": "#4"},
|
||||
"south": {"uv": [0, 0, 4, 8], "texture": "#4"}
|
||||
"north": {"uv": [4, 0, 8, 8], "texture": "#5"},
|
||||
"south": {"uv": [0, 0, 4, 8], "texture": "#5"}
|
||||
}
|
||||
},
|
||||
{
|
||||
|
|
@ -61,7 +62,7 @@
|
|||
"south": {"uv": [0, 0, 16, 4], "texture": "#1"},
|
||||
"west": {"uv": [0, 0, 16, 4], "texture": "#1"},
|
||||
"up": {"uv": [0, 0, 16, 16], "texture": "#0", "cullface": "up"},
|
||||
"down": {"uv": [0, 0, 16, 16], "texture": "#0"}
|
||||
"down": {"uv": [0, 0, 16, 16], "texture": "#4"}
|
||||
}
|
||||
},
|
||||
{
|
||||
|
|
@ -74,7 +75,7 @@
|
|||
"east": {"uv": [0, 12, 16, 16], "texture": "#1"},
|
||||
"south": {"uv": [0, 12, 16, 16], "texture": "#1"},
|
||||
"west": {"uv": [0, 12, 16, 16], "texture": "#1"},
|
||||
"up": {"uv": [0, 0, 16, 16], "texture": "#0"},
|
||||
"up": {"uv": [0, 0, 16, 16], "texture": "#4"},
|
||||
"down": {"uv": [0, 0, 16, 16], "texture": "#0", "cullface": "down"}
|
||||
}
|
||||
}
|
||||
|
|
@ -83,15 +84,18 @@
|
|||
{
|
||||
"name": "tank",
|
||||
"origin": [8, 8, -23],
|
||||
"color": 0,
|
||||
"children": [0, 1, 2, 3, 4]
|
||||
},
|
||||
{
|
||||
"name": "block_bottom_centered_window",
|
||||
"origin": [8, 8, 8],
|
||||
"color": 0,
|
||||
"children": [
|
||||
{
|
||||
"name": "tank",
|
||||
"origin": [8, 8, -23],
|
||||
"color": 0,
|
||||
"children": [5]
|
||||
}
|
||||
]
|
||||
|
|
|
|||
|
|
@ -4,7 +4,8 @@
|
|||
"textures": {
|
||||
"0": "create:block/fluid_tank_top",
|
||||
"1": "create:block/fluid_tank",
|
||||
"4": "create:block/fluid_tank_window_single",
|
||||
"4": "create:block/fluid_tank_inner",
|
||||
"5": "create:block/fluid_tank_window_single",
|
||||
"particle": "create:block/fluid_tank"
|
||||
},
|
||||
"elements": [
|
||||
|
|
@ -25,8 +26,8 @@
|
|||
"to": [15, 12, 4],
|
||||
"rotation": {"angle": 0, "axis": "y", "origin": [8, 4, 8]},
|
||||
"faces": {
|
||||
"east": {"uv": [0, 0, 4, 8], "texture": "#4"},
|
||||
"west": {"uv": [4, 0, 8, 8], "texture": "#4"}
|
||||
"east": {"uv": [0, 0, 4, 8], "texture": "#5"},
|
||||
"west": {"uv": [4, 0, 8, 8], "texture": "#5"}
|
||||
}
|
||||
},
|
||||
{
|
||||
|
|
@ -35,8 +36,8 @@
|
|||
"to": [4, 12, 15],
|
||||
"rotation": {"angle": 0, "axis": "y", "origin": [8, 4, 8]},
|
||||
"faces": {
|
||||
"north": {"uv": [0, 0, 4, 8], "texture": "#4"},
|
||||
"south": {"uv": [4, 0, 8, 8], "texture": "#4"}
|
||||
"north": {"uv": [0, 0, 4, 8], "texture": "#5"},
|
||||
"south": {"uv": [4, 0, 8, 8], "texture": "#5"}
|
||||
}
|
||||
},
|
||||
{
|
||||
|
|
@ -61,7 +62,7 @@
|
|||
"south": {"uv": [0, 0, 16, 4], "texture": "#1"},
|
||||
"west": {"uv": [0, 0, 16, 4], "texture": "#1"},
|
||||
"up": {"uv": [0, 0, 16, 16], "texture": "#0", "cullface": "up"},
|
||||
"down": {"uv": [0, 0, 16, 16], "texture": "#0"}
|
||||
"down": {"uv": [0, 0, 16, 16], "texture": "#4"}
|
||||
}
|
||||
},
|
||||
{
|
||||
|
|
@ -74,7 +75,7 @@
|
|||
"east": {"uv": [0, 12, 16, 16], "texture": "#1"},
|
||||
"south": {"uv": [0, 12, 16, 16], "texture": "#1"},
|
||||
"west": {"uv": [0, 12, 16, 16], "texture": "#1"},
|
||||
"up": {"uv": [0, 0, 16, 16], "texture": "#0"},
|
||||
"up": {"uv": [0, 0, 16, 16], "texture": "#4"},
|
||||
"down": {"uv": [0, 0, 16, 16], "texture": "#0", "cullface": "down"}
|
||||
}
|
||||
}
|
||||
|
|
@ -83,15 +84,18 @@
|
|||
{
|
||||
"name": "tank",
|
||||
"origin": [8, 8, -23],
|
||||
"color": 0,
|
||||
"children": [0, 1, 2, 3, 4]
|
||||
},
|
||||
{
|
||||
"name": "block_bottom_centered_window",
|
||||
"origin": [8, 8, 8],
|
||||
"color": 0,
|
||||
"children": [
|
||||
{
|
||||
"name": "tank",
|
||||
"origin": [8, 8, -23],
|
||||
"color": 0,
|
||||
"children": [5]
|
||||
}
|
||||
]
|
||||
|
|
|
|||
|
|
@ -4,7 +4,8 @@
|
|||
"textures": {
|
||||
"0": "create:block/fluid_tank_top",
|
||||
"1": "create:block/fluid_tank",
|
||||
"4": "create:block/fluid_tank_window_single",
|
||||
"4": "create:block/fluid_tank_inner",
|
||||
"5": "create:block/fluid_tank_window_single",
|
||||
"particle": "create:block/fluid_tank"
|
||||
},
|
||||
"elements": [
|
||||
|
|
@ -25,8 +26,8 @@
|
|||
"to": [16, 12, 15],
|
||||
"rotation": {"angle": 0, "axis": "y", "origin": [8, 4, 8]},
|
||||
"faces": {
|
||||
"north": {"uv": [4, 0, 8, 8], "texture": "#4"},
|
||||
"south": {"uv": [0, 0, 4, 8], "texture": "#4"}
|
||||
"north": {"uv": [4, 0, 8, 8], "texture": "#5"},
|
||||
"south": {"uv": [0, 0, 4, 8], "texture": "#5"}
|
||||
}
|
||||
},
|
||||
{
|
||||
|
|
@ -35,8 +36,8 @@
|
|||
"to": [1, 12, 4],
|
||||
"rotation": {"angle": 0, "axis": "y", "origin": [8, 4, 8]},
|
||||
"faces": {
|
||||
"east": {"uv": [0, 0, 4, 8], "texture": "#4"},
|
||||
"west": {"uv": [4, 0, 8, 8], "texture": "#4"}
|
||||
"east": {"uv": [0, 0, 4, 8], "texture": "#5"},
|
||||
"west": {"uv": [4, 0, 8, 8], "texture": "#5"}
|
||||
}
|
||||
},
|
||||
{
|
||||
|
|
@ -61,7 +62,7 @@
|
|||
"south": {"uv": [0, 0, 16, 4], "texture": "#1"},
|
||||
"west": {"uv": [0, 0, 16, 4], "texture": "#1"},
|
||||
"up": {"uv": [0, 0, 16, 16], "texture": "#0", "cullface": "up"},
|
||||
"down": {"uv": [0, 0, 16, 16], "texture": "#0"}
|
||||
"down": {"uv": [0, 0, 16, 16], "texture": "#4"}
|
||||
}
|
||||
},
|
||||
{
|
||||
|
|
@ -74,7 +75,7 @@
|
|||
"east": {"uv": [0, 12, 16, 16], "texture": "#1"},
|
||||
"south": {"uv": [0, 12, 16, 16], "texture": "#1"},
|
||||
"west": {"uv": [0, 12, 16, 16], "texture": "#1"},
|
||||
"up": {"uv": [0, 0, 16, 16], "texture": "#0"},
|
||||
"up": {"uv": [0, 0, 16, 16], "texture": "#4"},
|
||||
"down": {"uv": [0, 0, 16, 16], "texture": "#0", "cullface": "down"}
|
||||
}
|
||||
}
|
||||
|
|
@ -83,15 +84,18 @@
|
|||
{
|
||||
"name": "tank",
|
||||
"origin": [8, 8, -23],
|
||||
"color": 0,
|
||||
"children": [0, 1, 2, 3, 4]
|
||||
},
|
||||
{
|
||||
"name": "block_bottom_centered_window",
|
||||
"origin": [8, 8, 8],
|
||||
"color": 0,
|
||||
"children": [
|
||||
{
|
||||
"name": "tank",
|
||||
"origin": [8, 8, -23],
|
||||
"color": 0,
|
||||
"children": [5]
|
||||
}
|
||||
]
|
||||
|
|
|
|||
|
|
@ -4,6 +4,7 @@
|
|||
"textures": {
|
||||
"0": "create:block/fluid_tank_top",
|
||||
"1": "create:block/fluid_tank",
|
||||
"4": "create:block/fluid_tank_inner",
|
||||
"particle": "create:block/fluid_tank"
|
||||
},
|
||||
"elements": [
|
||||
|
|
@ -18,7 +19,7 @@
|
|||
"south": {"uv": [0, 0, 16, 4], "texture": "#1", "cullface": "south"},
|
||||
"west": {"uv": [0, 0, 16, 4], "texture": "#1", "cullface": "west"},
|
||||
"up": {"uv": [0, 0, 16, 16], "texture": "#0", "cullface": "up"},
|
||||
"down": {"uv": [0, 0, 16, 16], "texture": "#0"}
|
||||
"down": {"uv": [0, 0, 16, 16], "texture": "#4"}
|
||||
}
|
||||
},
|
||||
{
|
||||
|
|
@ -63,6 +64,7 @@
|
|||
{
|
||||
"name": "tank",
|
||||
"origin": [8, 8, -23],
|
||||
"color": 0,
|
||||
"children": [0, 1, 2, 3, 4]
|
||||
}
|
||||
]
|
||||
|
|
|
|||
|
|
@ -5,6 +5,7 @@
|
|||
"0": "create:block/fluid_tank_top",
|
||||
"1": "create:block/fluid_tank",
|
||||
"3": "create:block/fluid_tank_window",
|
||||
"4": "create:block/fluid_tank_inner",
|
||||
"particle": "create:block/fluid_tank"
|
||||
},
|
||||
"elements": [
|
||||
|
|
@ -19,7 +20,7 @@
|
|||
"south": {"uv": [0, 0, 16, 4], "texture": "#1", "cullface": "south"},
|
||||
"west": {"uv": [0, 0, 16, 4], "texture": "#1", "cullface": "west"},
|
||||
"up": {"uv": [0, 0, 16, 16], "texture": "#0", "cullface": "up"},
|
||||
"down": {"uv": [0, 0, 16, 16], "texture": "#0"}
|
||||
"down": {"uv": [0, 0, 16, 16], "texture": "#4"}
|
||||
}
|
||||
},
|
||||
{
|
||||
|
|
@ -146,6 +147,7 @@
|
|||
{
|
||||
"name": "tank",
|
||||
"origin": [8, 8, -23],
|
||||
"color": 0,
|
||||
"children": [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12]
|
||||
}
|
||||
]
|
||||
|
|
|
|||
|
|
@ -5,6 +5,7 @@
|
|||
"0": "create:block/fluid_tank_top",
|
||||
"1": "create:block/fluid_tank",
|
||||
"3": "create:block/fluid_tank_window",
|
||||
"4": "create:block/fluid_tank_inner",
|
||||
"particle": "create:block/fluid_tank"
|
||||
},
|
||||
"elements": [
|
||||
|
|
@ -61,7 +62,7 @@
|
|||
"south": {"uv": [0, 0, 16, 4], "texture": "#1"},
|
||||
"west": {"uv": [0, 0, 16, 4], "texture": "#1"},
|
||||
"up": {"uv": [0, 0, 16, 16], "texture": "#0", "cullface": "up"},
|
||||
"down": {"uv": [0, 0, 16, 16], "texture": "#0"}
|
||||
"down": {"uv": [0, 0, 16, 16], "texture": "#4"}
|
||||
}
|
||||
}
|
||||
],
|
||||
|
|
@ -69,6 +70,7 @@
|
|||
{
|
||||
"name": "tank",
|
||||
"origin": [8, 8, -23],
|
||||
"color": 0,
|
||||
"children": [0, 1, 2, 3, 4]
|
||||
}
|
||||
]
|
||||
|
|
|
|||
|
|
@ -5,6 +5,7 @@
|
|||
"0": "create:block/fluid_tank_top",
|
||||
"1": "create:block/fluid_tank",
|
||||
"3": "create:block/fluid_tank_window",
|
||||
"4": "create:block/fluid_tank_inner",
|
||||
"particle": "create:block/fluid_tank"
|
||||
},
|
||||
"elements": [
|
||||
|
|
@ -61,7 +62,7 @@
|
|||
"south": {"uv": [0, 0, 16, 4], "texture": "#1"},
|
||||
"west": {"uv": [0, 0, 16, 4], "texture": "#1"},
|
||||
"up": {"uv": [0, 0, 16, 16], "texture": "#0", "cullface": "up"},
|
||||
"down": {"uv": [0, 0, 16, 16], "texture": "#0"}
|
||||
"down": {"uv": [0, 0, 16, 16], "texture": "#4"}
|
||||
}
|
||||
}
|
||||
],
|
||||
|
|
@ -69,6 +70,7 @@
|
|||
{
|
||||
"name": "tank",
|
||||
"origin": [8, 8, -23],
|
||||
"color": 0,
|
||||
"children": [0, 1, 2, 3, 4]
|
||||
}
|
||||
]
|
||||
|
|
|
|||
|
|
@ -5,6 +5,7 @@
|
|||
"0": "create:block/fluid_tank_top",
|
||||
"1": "create:block/fluid_tank",
|
||||
"3": "create:block/fluid_tank_window",
|
||||
"4": "create:block/fluid_tank_inner",
|
||||
"particle": "create:block/fluid_tank"
|
||||
},
|
||||
"elements": [
|
||||
|
|
@ -61,7 +62,7 @@
|
|||
"south": {"uv": [0, 0, 16, 4], "texture": "#1"},
|
||||
"west": {"uv": [0, 0, 16, 4], "texture": "#1"},
|
||||
"up": {"uv": [0, 0, 16, 16], "texture": "#0", "cullface": "up"},
|
||||
"down": {"uv": [0, 0, 16, 16], "texture": "#0"}
|
||||
"down": {"uv": [0, 0, 16, 16], "texture": "#4"}
|
||||
}
|
||||
}
|
||||
],
|
||||
|
|
@ -69,6 +70,7 @@
|
|||
{
|
||||
"name": "tank",
|
||||
"origin": [8, 8, -23],
|
||||
"color": 0,
|
||||
"children": [0, 1, 2, 3, 4]
|
||||
}
|
||||
]
|
||||
|
|
|
|||
|
|
@ -5,6 +5,7 @@
|
|||
"0": "create:block/fluid_tank_top",
|
||||
"1": "create:block/fluid_tank",
|
||||
"3": "create:block/fluid_tank_window",
|
||||
"4": "create:block/fluid_tank_inner",
|
||||
"particle": "create:block/fluid_tank"
|
||||
},
|
||||
"elements": [
|
||||
|
|
@ -61,7 +62,7 @@
|
|||
"south": {"uv": [0, 0, 16, 4], "texture": "#1"},
|
||||
"west": {"uv": [0, 0, 16, 4], "texture": "#1"},
|
||||
"up": {"uv": [0, 0, 16, 16], "texture": "#0", "cullface": "up"},
|
||||
"down": {"uv": [0, 0, 16, 16], "texture": "#0"}
|
||||
"down": {"uv": [0, 0, 16, 16], "texture": "#4"}
|
||||
}
|
||||
}
|
||||
],
|
||||
|
|
@ -69,6 +70,7 @@
|
|||
{
|
||||
"name": "tank",
|
||||
"origin": [8, 8, -23],
|
||||
"color": 0,
|
||||
"children": [0, 1, 2, 3, 4]
|
||||
}
|
||||
]
|
||||
|
|
|
|||
Binary file not shown.
|
After Width: | Height: | Size: 291 B |
Binary file not shown.
|
After Width: | Height: | Size: 3.2 KiB |
Loading…
Reference in a new issue