Merge remote-tracking branch 'origin/master' into master
This commit is contained in:
commit
70edbb58f5
@ -84,6 +84,7 @@ fun addBlockStates(provider: MatteryBlockStateProvider) {
|
||||
|
||||
provider.block(MBlocks.STORAGE_POWER_SUPPLIER)
|
||||
provider.block(MBlocks.MATTER_RECYCLER)
|
||||
provider.block(MBlocks.ENERGY_SERVO)
|
||||
|
||||
provider.exec {
|
||||
for (crate in MRegistry.CARGO_CRATES.allBlocks.values) {
|
||||
|
@ -81,6 +81,8 @@ fun addItemModels(provider: MatteryItemModelProvider) {
|
||||
|
||||
provider.generated(MItems.MATTER_DUST)
|
||||
|
||||
provider.generated(MItems.TRITANIUM_DOOR)
|
||||
|
||||
for (item in MRegistry.CARGO_CRATES.allItems.values) {
|
||||
provider.block(item, "${item.registryName!!.path}_closed")
|
||||
}
|
||||
@ -90,6 +92,7 @@ fun addItemModels(provider: MatteryItemModelProvider) {
|
||||
provider.block(MItems.MATTER_BOTTLER, "matter_bottler_working")
|
||||
provider.block(MItems.MATTER_CABLE, "matter_cable_core")
|
||||
provider.block(MItems.MATTER_DECOMPOSER, "matter_decomposer_working")
|
||||
provider.block(MItems.ENERGY_SERVO, "energy_servo")
|
||||
|
||||
provider.block(MItems.PLATE_PRESS, "plate_press_idle")
|
||||
provider.block(MItems.STORAGE_POWER_SUPPLIER, "storage_power_supplier")
|
||||
|
@ -541,4 +541,32 @@ public class BlockShapes {
|
||||
new SimpleCuboid(0.875d, 1.25d, 0.3125d, 1d, 2d, 0.6875d),
|
||||
new SimpleCuboid(0d, 1.25d, 0.3125d, 0.125d, 2d, 0.6875d)
|
||||
);
|
||||
|
||||
public static final BlockShape ENERGY_SERVO = new BlockShape(
|
||||
new SimpleCuboid(0d, 0d, 0d, 1d, 0.625d, 0.6875d),
|
||||
new SimpleCuboid(0.25d, 0.625d, 0d, 0.75d, 1d, 0.4375d),
|
||||
new SimpleCuboid(0d, 0.625d, 0.4375d, 1d, 1d, 1d),
|
||||
new SimpleCuboid(0.3125d, 0.125d, 0.6875d, 0.6875d, 0.625d, 1d),
|
||||
new SimpleCuboid(0d, 0d, 0.6875d, 1d, 0.125d, 1d),
|
||||
new SimpleCuboid(0.0625d, 0.125d, 0.6875d, 0.3125d, 0.1875d, 0.9375d),
|
||||
new SimpleCuboid(0.0625d, 0.25d, 0.6875d, 0.3125d, 0.3125d, 0.9375d),
|
||||
new SimpleCuboid(0.0625d, 0.375d, 0.6875d, 0.3125d, 0.4375d, 0.9375d),
|
||||
new SimpleCuboid(0.0625d, 0.5d, 0.6875d, 0.3125d, 0.5625d, 0.9375d),
|
||||
new SimpleCuboid(0.6875d, 0.125d, 0.6875d, 0.9375d, 0.1875d, 0.9375d),
|
||||
new SimpleCuboid(0.6875d, 0.25d, 0.6875d, 0.9375d, 0.3125d, 0.9375d),
|
||||
new SimpleCuboid(0.6875d, 0.375d, 0.6875d, 0.9375d, 0.4375d, 0.9375d),
|
||||
new SimpleCuboid(0.6875d, 0.5d, 0.6875d, 0.9375d, 0.5625d, 0.9375d),
|
||||
new SimpleCuboid(0.125d, 0.125d, 0.75d, 0.25d, 0.625d, 0.875d),
|
||||
new SimpleCuboid(0.75d, 0.125d, 0.75d, 0.875d, 0.625d, 0.875d),
|
||||
new SimpleCuboid(0d, 0.625d, 0d, 0.0625d, 1d, 0.0625d),
|
||||
new SimpleCuboid(0.9375d, 0.625d, 0d, 1d, 1d, 0.0625d),
|
||||
new SimpleCuboid(0.95d, 0.6875d, 0.0625d, 0.98125d, 0.75d, 0.4375d),
|
||||
new SimpleCuboid(0.95d, 0.875d, 0.0625d, 0.98125d, 0.9375d, 0.4375d),
|
||||
new SimpleCuboid(0.01875d, 0.875d, 0.0625d, 0.05d, 0.9375d, 0.4375d),
|
||||
new SimpleCuboid(0.01875d, 0.6875d, 0.0625d, 0.05d, 0.75d, 0.4375d),
|
||||
new SimpleCuboid(0.09375d, 0.625d, 0.0625d, 0.28125d, 0.875d, 0.4375d),
|
||||
new SimpleCuboid(0.71875d, 0.625d, 0.0625d, 0.90625d, 0.875d, 0.4375d),
|
||||
new SimpleCuboid(0.03125d, 0.125d, 0.65625d, 0.34375d, 0.625d, 0.96875d),
|
||||
new SimpleCuboid(0.65625d, 0.125d, 0.65625d, 0.96875d, 0.625d, 0.96875d)
|
||||
);
|
||||
}
|
||||
|
@ -1,6 +1,8 @@
|
||||
package ru.dbotthepony.mc.otm.block
|
||||
|
||||
import net.minecraft.core.BlockPos
|
||||
import net.minecraft.core.Direction
|
||||
import net.minecraft.world.level.BlockGetter
|
||||
import net.minecraft.world.level.Level
|
||||
import net.minecraft.world.level.block.EntityBlock
|
||||
import net.minecraft.world.level.block.entity.BlockEntity
|
||||
@ -9,8 +11,11 @@ import net.minecraft.world.level.block.entity.BlockEntityType
|
||||
import net.minecraft.world.level.block.state.BlockState
|
||||
import net.minecraft.world.level.material.Material
|
||||
import net.minecraft.world.level.material.MaterialColor
|
||||
import net.minecraft.world.phys.shapes.CollisionContext
|
||||
import net.minecraft.world.phys.shapes.VoxelShape
|
||||
import ru.dbotthepony.mc.otm.block.entity.EnergyServoBlockEntity
|
||||
import ru.dbotthepony.mc.otm.registry.MBlockEntities
|
||||
import ru.dbotthepony.mc.otm.shapes.BlockShapes
|
||||
|
||||
class EnergyServoBlock : RotatableMatteryBlock(Properties.of(Material.METAL, MaterialColor.COLOR_BLUE).explosionResistance(12f).destroyTime(2f)), EntityBlock {
|
||||
override fun newBlockEntity(p_153215_: BlockPos, p_153216_: BlockState): BlockEntity {
|
||||
@ -28,4 +33,30 @@ class EnergyServoBlock : RotatableMatteryBlock(Properties.of(Material.METAL, Mat
|
||||
|
||||
return null
|
||||
}
|
||||
|
||||
override fun getShape(
|
||||
p_60555_: BlockState,
|
||||
p_60556_: BlockGetter,
|
||||
p_60557_: BlockPos,
|
||||
p_60558_: CollisionContext
|
||||
): VoxelShape {
|
||||
return SHAPES[p_60555_.getValue(FACING).ordinal]
|
||||
}
|
||||
|
||||
companion object {
|
||||
private val SHAPES: Array<VoxelShape>
|
||||
|
||||
init {
|
||||
val def = BlockShapes.ENERGY_SERVO.computeShape()
|
||||
|
||||
SHAPES = arrayOf(
|
||||
def,
|
||||
def,
|
||||
def,
|
||||
BlockShapes.ENERGY_SERVO.rotate(Direction.NORTH).computeShape(),
|
||||
BlockShapes.ENERGY_SERVO.rotate(Direction.WEST).computeShape(),
|
||||
BlockShapes.ENERGY_SERVO.rotate(Direction.EAST).computeShape()
|
||||
)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -0,0 +1,359 @@
|
||||
{
|
||||
"parent": "block/cube_all",
|
||||
"render_type": "translucent",
|
||||
"textures": {
|
||||
"0": "overdrive_that_matters:block/energy_servo",
|
||||
"1": "overdrive_that_matters:item/energy_sword_charge",
|
||||
"particle": "overdrive_that_matters:block/energy_servo"
|
||||
},
|
||||
"elements": [
|
||||
{
|
||||
"name": "body",
|
||||
"from": [0, 0, 0],
|
||||
"to": [16, 10, 11],
|
||||
"faces": {
|
||||
"north": {"uv": [0, 0, 8, 2.5], "texture": "#0"},
|
||||
"east": {"uv": [13.5, 0, 8, 2.5], "texture": "#0"},
|
||||
"south": {"uv": [0, 9.25, 8, 11.75], "texture": "#0"},
|
||||
"west": {"uv": [8, 0, 13.5, 2.5], "texture": "#0"},
|
||||
"up": {"uv": [0, 6.5, 8, 9.25], "texture": "#0"},
|
||||
"down": {"uv": [0, 2.5, 8, 5.25], "rotation": 180, "texture": "#0"}
|
||||
}
|
||||
},
|
||||
{
|
||||
"name": "body",
|
||||
"from": [4, 10, 0],
|
||||
"to": [12, 16, 7],
|
||||
"faces": {
|
||||
"north": {"uv": [8, 2.5, 12, 4], "texture": "#0"},
|
||||
"east": {"uv": [15.5, 2.5, 12, 4], "texture": "#0"},
|
||||
"south": {"uv": [0, 0, 3, 1.5], "texture": "#missing"},
|
||||
"west": {"uv": [12, 2.5, 15.5, 4], "texture": "#0"},
|
||||
"up": {"uv": [8, 4, 12, 5.75], "rotation": 180, "texture": "#0"},
|
||||
"down": {"uv": [0, 0, 3, 1.75], "texture": "#missing"}
|
||||
}
|
||||
},
|
||||
{
|
||||
"name": "body",
|
||||
"from": [0, 10, 7],
|
||||
"to": [16, 16, 16],
|
||||
"faces": {
|
||||
"north": {"uv": [0, 14, 8, 15.5], "texture": "#0"},
|
||||
"east": {"uv": [12.5, 14, 8, 15.5], "texture": "#0"},
|
||||
"south": {"uv": [8, 12.5, 16, 14], "texture": "#0"},
|
||||
"west": {"uv": [8, 14, 12.5, 15.5], "texture": "#0"},
|
||||
"up": {"uv": [0, 11.75, 8, 14], "rotation": 180, "texture": "#0"},
|
||||
"down": {"uv": [0, 9, 8, 11.25], "texture": "#0"}
|
||||
}
|
||||
},
|
||||
{
|
||||
"name": "body",
|
||||
"from": [5, 2, 11],
|
||||
"to": [11, 10, 16],
|
||||
"faces": {
|
||||
"north": {"uv": [0, 0, 3, 2], "texture": "#missing"},
|
||||
"east": {"uv": [0, 9.25, 2.5, 11.25], "texture": "#0"},
|
||||
"south": {"uv": [8, 10.5, 11, 12.5], "texture": "#0"},
|
||||
"west": {"uv": [5.5, 9.25, 8, 11.25], "texture": "#0"},
|
||||
"up": {"uv": [0, 0, 3, 1.25], "texture": "#missing"},
|
||||
"down": {"uv": [0, 0, 3, 1.25], "texture": "#missing"}
|
||||
}
|
||||
},
|
||||
{
|
||||
"name": "body",
|
||||
"from": [0, 0, 11],
|
||||
"to": [16, 2, 16],
|
||||
"faces": {
|
||||
"north": {"uv": [0, 0, 8, 0.5], "texture": "#missing"},
|
||||
"east": {"uv": [16, 2, 13.5, 2.5], "texture": "#0"},
|
||||
"south": {"uv": [0, 2, 8, 2.5], "texture": "#0"},
|
||||
"west": {"uv": [13.5, 2, 16, 2.5], "texture": "#0"},
|
||||
"up": {"uv": [0, 8, 8, 9.25], "texture": "#0"},
|
||||
"down": {"uv": [0, 5.25, 8, 6.5], "rotation": 180, "texture": "#0"}
|
||||
}
|
||||
},
|
||||
{
|
||||
"name": "coil",
|
||||
"from": [1, 2, 11],
|
||||
"to": [5, 3, 15],
|
||||
"faces": {
|
||||
"north": {"uv": [0, 0, 2, 0.25], "texture": "#missing"},
|
||||
"east": {"uv": [8, 5.75, 10, 6], "texture": "#0"},
|
||||
"south": {"uv": [8, 5.75, 10, 6], "texture": "#0"},
|
||||
"west": {"uv": [8, 5.75, 10, 6], "texture": "#0"},
|
||||
"up": {"uv": [8, 6, 10, 7], "texture": "#0"},
|
||||
"down": {"uv": [8, 6, 10, 7], "texture": "#0"}
|
||||
}
|
||||
},
|
||||
{
|
||||
"name": "coil",
|
||||
"from": [1, 4, 11],
|
||||
"to": [5, 5, 15],
|
||||
"faces": {
|
||||
"north": {"uv": [0, 0, 2, 0.25], "texture": "#missing"},
|
||||
"east": {"uv": [8, 5.75, 10, 6], "texture": "#0"},
|
||||
"south": {"uv": [8, 5.75, 10, 6], "texture": "#0"},
|
||||
"west": {"uv": [8, 5.75, 10, 6], "texture": "#0"},
|
||||
"up": {"uv": [8, 6, 10, 7], "texture": "#0"},
|
||||
"down": {"uv": [8, 6, 10, 7], "texture": "#0"}
|
||||
}
|
||||
},
|
||||
{
|
||||
"name": "coil",
|
||||
"from": [1, 6, 11],
|
||||
"to": [5, 7, 15],
|
||||
"faces": {
|
||||
"north": {"uv": [0, 0, 2, 0.25], "texture": "#missing"},
|
||||
"east": {"uv": [8, 5.75, 10, 6], "texture": "#0"},
|
||||
"south": {"uv": [8, 5.75, 10, 6], "texture": "#0"},
|
||||
"west": {"uv": [8, 5.75, 10, 6], "texture": "#0"},
|
||||
"up": {"uv": [8, 6, 10, 7], "texture": "#0"},
|
||||
"down": {"uv": [8, 6, 10, 7], "texture": "#0"}
|
||||
}
|
||||
},
|
||||
{
|
||||
"name": "coil",
|
||||
"from": [1, 8, 11],
|
||||
"to": [5, 9, 15],
|
||||
"faces": {
|
||||
"north": {"uv": [0, 0, 2, 0.25], "texture": "#missing"},
|
||||
"east": {"uv": [8, 5.75, 10, 6], "texture": "#0"},
|
||||
"south": {"uv": [8, 5.75, 10, 6], "texture": "#0"},
|
||||
"west": {"uv": [8, 5.75, 10, 6], "texture": "#0"},
|
||||
"up": {"uv": [8, 6, 10, 7], "texture": "#0"},
|
||||
"down": {"uv": [8, 6, 10, 7], "texture": "#0"}
|
||||
}
|
||||
},
|
||||
{
|
||||
"name": "coil",
|
||||
"from": [11, 2, 11],
|
||||
"to": [15, 3, 15],
|
||||
"faces": {
|
||||
"north": {"uv": [0, 0, 2, 0.25], "texture": "#missing"},
|
||||
"east": {"uv": [8, 5.75, 10, 6], "texture": "#0"},
|
||||
"south": {"uv": [8, 5.75, 10, 6], "texture": "#0"},
|
||||
"west": {"uv": [8, 5.75, 10, 6], "texture": "#0"},
|
||||
"up": {"uv": [8, 6, 10, 7], "texture": "#0"},
|
||||
"down": {"uv": [8, 6, 10, 7], "texture": "#0"}
|
||||
}
|
||||
},
|
||||
{
|
||||
"name": "coil",
|
||||
"from": [11, 4, 11],
|
||||
"to": [15, 5, 15],
|
||||
"faces": {
|
||||
"north": {"uv": [0, 0, 2, 0.25], "texture": "#missing"},
|
||||
"east": {"uv": [8, 5.75, 10, 6], "texture": "#0"},
|
||||
"south": {"uv": [8, 5.75, 10, 6], "texture": "#0"},
|
||||
"west": {"uv": [8, 5.75, 10, 6], "texture": "#0"},
|
||||
"up": {"uv": [8, 6, 10, 7], "texture": "#0"},
|
||||
"down": {"uv": [8, 6, 10, 7], "texture": "#0"}
|
||||
}
|
||||
},
|
||||
{
|
||||
"name": "coil",
|
||||
"from": [11, 6, 11],
|
||||
"to": [15, 7, 15],
|
||||
"faces": {
|
||||
"north": {"uv": [0, 0, 2, 0.25], "texture": "#missing"},
|
||||
"east": {"uv": [8, 5.75, 10, 6], "texture": "#0"},
|
||||
"south": {"uv": [8, 5.75, 10, 6], "texture": "#0"},
|
||||
"west": {"uv": [8, 5.75, 10, 6], "texture": "#0"},
|
||||
"up": {"uv": [8, 6, 10, 7], "texture": "#0"},
|
||||
"down": {"uv": [8, 6, 10, 7], "texture": "#0"}
|
||||
}
|
||||
},
|
||||
{
|
||||
"name": "coil",
|
||||
"from": [11, 8, 11],
|
||||
"to": [15, 9, 15],
|
||||
"faces": {
|
||||
"north": {"uv": [0, 0, 2, 0.25], "texture": "#missing"},
|
||||
"east": {"uv": [8, 5.75, 10, 6], "texture": "#0"},
|
||||
"south": {"uv": [8, 5.75, 10, 6], "texture": "#0"},
|
||||
"west": {"uv": [8, 5.75, 10, 6], "texture": "#0"},
|
||||
"up": {"uv": [8, 6, 10, 7], "texture": "#0"},
|
||||
"down": {"uv": [8, 6, 10, 7], "texture": "#0"}
|
||||
}
|
||||
},
|
||||
{
|
||||
"name": "coil",
|
||||
"from": [2, 2, 12],
|
||||
"to": [4, 10, 14],
|
||||
"faces": {
|
||||
"north": {"uv": [9, 8.5, 8, 10.5], "texture": "#0"},
|
||||
"east": {"uv": [8, 8.5, 9, 10.5], "texture": "#0"},
|
||||
"south": {"uv": [8, 8.5, 9, 10.5], "texture": "#0"},
|
||||
"west": {"uv": [8, 8.5, 9, 10.5], "texture": "#0"},
|
||||
"up": {"uv": [0, 0, 1, 0.5], "texture": "#missing"},
|
||||
"down": {"uv": [0, 0, 1, 0.5], "texture": "#missing"}
|
||||
}
|
||||
},
|
||||
{
|
||||
"name": "coil",
|
||||
"from": [12, 2, 12],
|
||||
"to": [14, 10, 14],
|
||||
"faces": {
|
||||
"north": {"uv": [9, 8.5, 8, 10.5], "texture": "#0"},
|
||||
"east": {"uv": [8, 8.5, 9, 10.5], "texture": "#0"},
|
||||
"south": {"uv": [8, 8.5, 9, 10.5], "texture": "#0"},
|
||||
"west": {"uv": [8, 8.5, 9, 10.5], "texture": "#0"},
|
||||
"up": {"uv": [0, 0, 1, 0.5], "texture": "#missing"},
|
||||
"down": {"uv": [0, 0, 1, 0.5], "texture": "#missing"}
|
||||
}
|
||||
},
|
||||
{
|
||||
"from": [0, 10, 0],
|
||||
"to": [1, 16, 1],
|
||||
"faces": {
|
||||
"north": {"uv": [13.5, 0.25, 14, 1.75], "texture": "#0"},
|
||||
"east": {"uv": [13.5, 0.25, 14, 1.75], "texture": "#0"},
|
||||
"south": {"uv": [13.5, 0.25, 14, 1.75], "texture": "#0"},
|
||||
"west": {"uv": [13.5, 0.25, 14, 1.75], "texture": "#0"},
|
||||
"up": {"uv": [13.5, 0, 14, 0.25], "texture": "#0"},
|
||||
"down": {"uv": [0, 0, 0.5, 0.25], "texture": "#missing"}
|
||||
}
|
||||
},
|
||||
{
|
||||
"from": [15, 10, 0],
|
||||
"to": [16, 16, 1],
|
||||
"faces": {
|
||||
"north": {"uv": [13.5, 0.25, 14, 1.75], "texture": "#0"},
|
||||
"east": {"uv": [13.5, 0.25, 14, 1.75], "texture": "#0"},
|
||||
"south": {"uv": [13.5, 0.25, 14, 1.75], "texture": "#0"},
|
||||
"west": {"uv": [13.5, 0.25, 14, 1.75], "texture": "#0"},
|
||||
"up": {"uv": [13.5, 0, 14, 0.25], "texture": "#0"},
|
||||
"down": {"uv": [0, 0, 0.5, 0.25], "texture": "#missing"}
|
||||
}
|
||||
},
|
||||
{
|
||||
"from": [15.2, 11, 1],
|
||||
"to": [15.7, 12, 7],
|
||||
"faces": {
|
||||
"north": {"uv": [0, 0, 0.25, 0.25], "texture": "#missing"},
|
||||
"east": {"uv": [14, 0, 14.5, 1.5], "rotation": 90, "texture": "#0"},
|
||||
"south": {"uv": [0, 0, 0.25, 0.25], "texture": "#missing"},
|
||||
"west": {"uv": [14, 0, 14.5, 1.5], "rotation": 90, "texture": "#0"},
|
||||
"up": {"uv": [14, 0, 14.25, 1.5], "texture": "#0"},
|
||||
"down": {"uv": [14, 0, 14.25, 1.5], "texture": "#0"}
|
||||
}
|
||||
},
|
||||
{
|
||||
"from": [15.2, 14, 1],
|
||||
"to": [15.7, 15, 7],
|
||||
"faces": {
|
||||
"north": {"uv": [0, 0, 0.25, 0.25], "texture": "#missing"},
|
||||
"east": {"uv": [14, 0, 14.5, 1.5], "rotation": 90, "texture": "#0"},
|
||||
"south": {"uv": [0, 0, 0.25, 0.25], "texture": "#missing"},
|
||||
"west": {"uv": [14, 0, 14.5, 1.5], "rotation": 90, "texture": "#0"},
|
||||
"up": {"uv": [14, 0, 14.25, 1.5], "texture": "#0"},
|
||||
"down": {"uv": [14, 0, 14.25, 1.5], "texture": "#0"}
|
||||
}
|
||||
},
|
||||
{
|
||||
"from": [0.3, 14, 1],
|
||||
"to": [0.8, 15, 7],
|
||||
"faces": {
|
||||
"north": {"uv": [0, 0, 0.25, 0.25], "texture": "#missing"},
|
||||
"east": {"uv": [14, 0, 14.5, 1.5], "rotation": 90, "texture": "#0"},
|
||||
"south": {"uv": [0, 0, 0.25, 0.25], "texture": "#missing"},
|
||||
"west": {"uv": [14, 0, 14.5, 1.5], "rotation": 90, "texture": "#0"},
|
||||
"up": {"uv": [14, 0, 14.25, 1.5], "texture": "#0"},
|
||||
"down": {"uv": [14, 0, 14.25, 1.5], "texture": "#0"}
|
||||
}
|
||||
},
|
||||
{
|
||||
"from": [0.3, 11, 1],
|
||||
"to": [0.8, 12, 7],
|
||||
"faces": {
|
||||
"north": {"uv": [0, 0, 0.25, 0.25], "texture": "#missing"},
|
||||
"east": {"uv": [14, 0, 14.5, 1.5], "rotation": 90, "texture": "#0"},
|
||||
"south": {"uv": [0, 0, 0.25, 0.25], "texture": "#missing"},
|
||||
"west": {"uv": [14, 0, 14.5, 1.5], "rotation": 90, "texture": "#0"},
|
||||
"up": {"uv": [14, 0, 14.25, 1.5], "texture": "#0"},
|
||||
"down": {"uv": [14, 0, 14.25, 1.5], "texture": "#0"}
|
||||
}
|
||||
},
|
||||
{
|
||||
"from": [1.5, 10, 1],
|
||||
"to": [4.5, 14, 7],
|
||||
"faces": {
|
||||
"north": {"uv": [10, 8.5, 11.5, 9.5], "texture": "#0"},
|
||||
"east": {"uv": [10, 7, 8, 8.5], "rotation": 90, "texture": "#0"},
|
||||
"south": {"uv": [0, 0, 1.5, 1], "texture": "#missing"},
|
||||
"west": {"uv": [10, 7, 8, 8.5], "rotation": 90, "texture": "#0"},
|
||||
"up": {"uv": [10, 7, 11.5, 8.5], "texture": "#0"},
|
||||
"down": {"uv": [0, 0, 1.5, 1.5], "texture": "#missing"}
|
||||
}
|
||||
},
|
||||
{
|
||||
"from": [11.5, 10, 1],
|
||||
"to": [14.5, 14, 7],
|
||||
"faces": {
|
||||
"north": {"uv": [10, 8.5, 11.5, 9.5], "texture": "#0"},
|
||||
"east": {"uv": [10, 7, 8, 8.5], "rotation": 90, "texture": "#0"},
|
||||
"south": {"uv": [0, 0, 1.5, 1], "texture": "#missing"},
|
||||
"west": {"uv": [10, 7, 8, 8.5], "rotation": 90, "texture": "#0"},
|
||||
"up": {"uv": [10, 7, 11.5, 8.5], "texture": "#0"},
|
||||
"down": {"uv": [0, 0, 1.5, 1.5], "texture": "#missing"}
|
||||
}
|
||||
},
|
||||
{
|
||||
"name": "effect",
|
||||
"from": [0.5, 2, 10.5],
|
||||
"to": [5.5, 10, 15.5],
|
||||
"faces": {
|
||||
"north": {"uv": [0, 0, 2.5, 2], "texture": "#missing"},
|
||||
"east": {"uv": [0, 0, 2.5, 2], "texture": "#missing"},
|
||||
"south": {"uv": [2.5, 8, 5, 12], "texture": "#1"},
|
||||
"west": {"uv": [0, 8, 2.5, 12], "texture": "#1"},
|
||||
"up": {"uv": [0, 0, 2.5, 1.25], "texture": "#missing"},
|
||||
"down": {"uv": [0, 0, 2.5, 1.25], "texture": "#missing"}
|
||||
}
|
||||
},
|
||||
{
|
||||
"name": "effect",
|
||||
"from": [10.5, 2, 10.5],
|
||||
"to": [15.5, 10, 15.5],
|
||||
"faces": {
|
||||
"north": {"uv": [0, 0, 2.5, 2], "texture": "#missing"},
|
||||
"east": {"uv": [2.5, 4, 5, 8], "texture": "#1"},
|
||||
"south": {"uv": [0, 4, 2.5, 8], "texture": "#1"},
|
||||
"west": {"uv": [2.5, 4, 5, 6], "texture": "#1"},
|
||||
"up": {"uv": [0, 0, 2.5, 1.25], "texture": "#missing"},
|
||||
"down": {"uv": [0, 0, 2.5, 1.25], "texture": "#missing"}
|
||||
}
|
||||
}
|
||||
],
|
||||
"display": {
|
||||
"thirdperson_righthand": {
|
||||
"rotation": [75, 45, 0],
|
||||
"translation": [0, 2.5, 0],
|
||||
"scale": [0.375, 0.375, 0.375]
|
||||
},
|
||||
"thirdperson_lefthand": {
|
||||
"rotation": [75, 45, 0],
|
||||
"translation": [0, 2.5, 0],
|
||||
"scale": [0.375, 0.375, 0.375]
|
||||
},
|
||||
"firstperson_righthand": {
|
||||
"rotation": [0, 45, 0],
|
||||
"scale": [0.4, 0.4, 0.4]
|
||||
},
|
||||
"firstperson_lefthand": {
|
||||
"rotation": [0, 225, 0],
|
||||
"scale": [0.4, 0.4, 0.4]
|
||||
},
|
||||
"ground": {
|
||||
"translation": [0, 3, 0],
|
||||
"scale": [0.25, 0.25, 0.25]
|
||||
},
|
||||
"gui": {
|
||||
"rotation": [30, 225, 0],
|
||||
"scale": [0.625, 0.625, 0.625]
|
||||
},
|
||||
"fixed": {
|
||||
"scale": [0.5, 0.5, 0.5]
|
||||
}
|
||||
}
|
||||
}
|
@ -172,5 +172,41 @@
|
||||
"down": {"uv": [7, 11, 10, 14], "texture": "#0"}
|
||||
}
|
||||
}
|
||||
]
|
||||
],
|
||||
"display": {
|
||||
"thirdperson_righthand": {
|
||||
"rotation": [75, 45, 0],
|
||||
"translation": [0, 2.5, 0],
|
||||
"scale": [0.375, 0.375, 0.375]
|
||||
},
|
||||
"thirdperson_lefthand": {
|
||||
"rotation": [75, 45, 0],
|
||||
"translation": [0, 2.5, 0],
|
||||
"scale": [0.375, 0.375, 0.375]
|
||||
},
|
||||
"firstperson_righthand": {
|
||||
"rotation": [0, 45, 0],
|
||||
"scale": [0.4, 0.4, 0.4]
|
||||
},
|
||||
"firstperson_lefthand": {
|
||||
"rotation": [0, 225, 0],
|
||||
"scale": [0.4, 0.4, 0.4]
|
||||
},
|
||||
"ground": {
|
||||
"translation": [0, 3, 0],
|
||||
"scale": [0.25, 0.25, 0.25]
|
||||
},
|
||||
"gui": {
|
||||
"rotation": [30, 225, 0],
|
||||
"translation": [0, -3, 0],
|
||||
"scale": [0.53, 0.53, 0.53]
|
||||
},
|
||||
"head": {
|
||||
"translation": [0, 13, 0]
|
||||
},
|
||||
"fixed": {
|
||||
"translation": [0, -3.25, 0],
|
||||
"scale": [0.5, 0.5, 0.5]
|
||||
}
|
||||
}
|
||||
}
|
Binary file not shown.
After Width: | Height: | Size: 470 B |
Binary file not shown.
Before Width: | Height: | Size: 2.4 KiB After Width: | Height: | Size: 2.5 KiB |
Loading…
Reference in New Issue
Block a user