diff --git a/src/main/java/de/ellpeck/naturesaura/blocks/BlockGratedChute.java b/src/main/java/de/ellpeck/naturesaura/blocks/BlockGratedChute.java index e8eb784c..ac26d0af 100644 --- a/src/main/java/de/ellpeck/naturesaura/blocks/BlockGratedChute.java +++ b/src/main/java/de/ellpeck/naturesaura/blocks/BlockGratedChute.java @@ -4,6 +4,7 @@ import de.ellpeck.naturesaura.blocks.tiles.TileEntityGratedChute; import net.minecraft.block.*; import net.minecraft.block.material.Material; import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.item.BlockItemUseContext; import net.minecraft.item.ItemStack; import net.minecraft.state.DirectionProperty; import net.minecraft.state.StateContainer; @@ -16,12 +17,13 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.BlockRayTraceResult; import net.minecraft.util.math.MathHelper; import net.minecraft.util.math.shapes.VoxelShape; -import net.minecraft.world.IWorld; import net.minecraft.world.World; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; import net.minecraftforge.items.IItemHandler; +import javax.annotation.Nullable; + public class BlockGratedChute extends BlockContainerImpl { // TODO voxel shape stuff @@ -58,9 +60,10 @@ public class BlockGratedChute extends BlockContainerImpl { return true; } + @Nullable @Override - public BlockState getStateForPlacement(BlockState state, Direction facing, BlockState state2, IWorld world, BlockPos pos1, BlockPos pos2, Hand hand) { - Direction newFacing = facing.getOpposite(); + public BlockState getStateForPlacement(BlockItemUseContext context) { + Direction newFacing = context.getFace().getOpposite(); if (newFacing == Direction.UP) newFacing = Direction.DOWN; return this.getDefaultState().with(FACING, newFacing); diff --git a/src/main/resources/assets/naturesaura/blockstates/ancient_bark.json b/src/main/resources/assets/naturesaura/blockstates/ancient_bark.json index 7e234eee..ed288351 100644 --- a/src/main/resources/assets/naturesaura/blockstates/ancient_bark.json +++ b/src/main/resources/assets/naturesaura/blockstates/ancient_bark.json @@ -9,7 +9,6 @@ "transform": "forge:default-block" }, "variants": { - "": [{}], "axis": { "y": {}, "z": { @@ -18,8 +17,7 @@ "x": { "x": 90, "y": 90 - }, - "none": {} + } } } } \ No newline at end of file diff --git a/src/main/resources/assets/naturesaura/blockstates/ancient_leaves.json b/src/main/resources/assets/naturesaura/blockstates/ancient_leaves.json index 7f7fa064..284915e6 100644 --- a/src/main/resources/assets/naturesaura/blockstates/ancient_leaves.json +++ b/src/main/resources/assets/naturesaura/blockstates/ancient_leaves.json @@ -8,7 +8,6 @@ "transform": "forge:default-block" }, "variants": { - "": [{}], "persistent": { "true": {}, "false": {} diff --git a/src/main/resources/assets/naturesaura/blockstates/ancient_log.json b/src/main/resources/assets/naturesaura/blockstates/ancient_log.json index 6033cc3d..5d44cba1 100644 --- a/src/main/resources/assets/naturesaura/blockstates/ancient_log.json +++ b/src/main/resources/assets/naturesaura/blockstates/ancient_log.json @@ -9,7 +9,6 @@ "transform": "forge:default-block" }, "variants": { - "": [{}], "axis": { "y": {}, "z": { @@ -18,8 +17,7 @@ "x": { "x": 90, "y": 90 - }, - "none": {} + } } } } \ No newline at end of file diff --git a/src/main/resources/assets/naturesaura/blockstates/ancient_sapling.json b/src/main/resources/assets/naturesaura/blockstates/ancient_sapling.json index fb16489f..559a484f 100644 --- a/src/main/resources/assets/naturesaura/blockstates/ancient_sapling.json +++ b/src/main/resources/assets/naturesaura/blockstates/ancient_sapling.json @@ -8,16 +8,6 @@ "transform": "forge:default-block" }, "variants": { - "": [{}], - "inventory": [ - { - "model": "builtin/generated", - "transform": "forge:default-item", - "textures": { - "layer0": "naturesaura:blocks/ancient_sapling" - } - } - ], "stage": { "0": {}, "1": {} diff --git a/src/main/resources/assets/naturesaura/blockstates/ancient_slab.json b/src/main/resources/assets/naturesaura/blockstates/ancient_slab.json index f3132c78..269d9cc1 100644 --- a/src/main/resources/assets/naturesaura/blockstates/ancient_slab.json +++ b/src/main/resources/assets/naturesaura/blockstates/ancient_slab.json @@ -1,7 +1,7 @@ { "forge_marker": 1, "defaults": { - "model": "minecraft:block/half_slab", + "model": "minecraft:block/slab", "textures": { "bottom": "naturesaura:blocks/ancient_planks", "top": "naturesaura:blocks/ancient_planks", @@ -18,7 +18,10 @@ ], "type=bottom": [{}], "type=double": { - "model": "naturesaura:block/ancient_planks" + "model": "minecraft:block/cube_all", + "textures": { + "all": "naturesaura:blocks/ancient_planks" + } } } } diff --git a/src/main/resources/assets/naturesaura/blockstates/ancient_stairs.json b/src/main/resources/assets/naturesaura/blockstates/ancient_stairs.json index ae3d6463..2e0677f6 100644 --- a/src/main/resources/assets/naturesaura/blockstates/ancient_stairs.json +++ b/src/main/resources/assets/naturesaura/blockstates/ancient_stairs.json @@ -8,12 +8,6 @@ } }, "variants": { - "normal": { - "model": "minecraft:block/stairs" - }, - "inventory": { - "model": "minecraft:block/stairs" - }, "facing=east,half=bottom,shape=straight": { "model": "minecraft:block/stairs" }, diff --git a/src/main/resources/assets/naturesaura/blockstates/auto_crafter.json b/src/main/resources/assets/naturesaura/blockstates/auto_crafter.json index 29377dc7..6f1b8b7b 100644 --- a/src/main/resources/assets/naturesaura/blockstates/auto_crafter.json +++ b/src/main/resources/assets/naturesaura/blockstates/auto_crafter.json @@ -14,7 +14,6 @@ "transform": "forge:default-block" }, "variants": { - "": [{}], "facing": { "north": {}, "south": { diff --git a/src/main/resources/assets/naturesaura/blockstates/dimension_rail_end.json b/src/main/resources/assets/naturesaura/blockstates/dimension_rail_end.json index a05555e5..5c000063 100644 --- a/src/main/resources/assets/naturesaura/blockstates/dimension_rail_end.json +++ b/src/main/resources/assets/naturesaura/blockstates/dimension_rail_end.json @@ -8,20 +8,28 @@ "transform": "forge:default-block" }, "variants": { - "": [{}], - "inventory": [ - { - "model": "builtin/generated", - "textures": { - "layer0": "naturesaura:blocks/dimension_rail_end" - }, - "transform": "forge:default-item" - } - ], "shape": { "north_south": {}, "east_west": { "y": 90 + }, + "ascending_east": { + "y": 90 + }, + "ascending_west": { + "y": 90 + }, + "ascending_south": {}, + "ascending_north": {}, + "south_east": {}, + "south_west": { + "y": 90 + }, + "north_east": { + "y": 270 + }, + "north_west": { + "y": 180 } } } diff --git a/src/main/resources/assets/naturesaura/blockstates/dimension_rail_nether.json b/src/main/resources/assets/naturesaura/blockstates/dimension_rail_nether.json index 028a68c2..9f5daf5b 100644 --- a/src/main/resources/assets/naturesaura/blockstates/dimension_rail_nether.json +++ b/src/main/resources/assets/naturesaura/blockstates/dimension_rail_nether.json @@ -8,20 +8,28 @@ "transform": "forge:default-block" }, "variants": { - "": [{}], - "inventory": [ - { - "model": "builtin/generated", - "textures": { - "layer0": "naturesaura:blocks/dimension_rail_nether" - }, - "transform": "forge:default-item" - } - ], "shape": { "north_south": {}, "east_west": { "y": 90 + }, + "ascending_east": { + "y": 90 + }, + "ascending_west": { + "y": 90 + }, + "ascending_south": {}, + "ascending_north": {}, + "south_east": {}, + "south_west": { + "y": 90 + }, + "north_east": { + "y": 270 + }, + "north_west": { + "y": 180 } } } diff --git a/src/main/resources/assets/naturesaura/blockstates/dimension_rail_overworld.json b/src/main/resources/assets/naturesaura/blockstates/dimension_rail_overworld.json index 1a70e2f0..0549fc4c 100644 --- a/src/main/resources/assets/naturesaura/blockstates/dimension_rail_overworld.json +++ b/src/main/resources/assets/naturesaura/blockstates/dimension_rail_overworld.json @@ -8,20 +8,28 @@ "transform": "forge:default-block" }, "variants": { - "": [{}], - "inventory": [ - { - "model": "builtin/generated", - "textures": { - "layer0": "naturesaura:blocks/dimension_rail_overworld" - }, - "transform": "forge:default-item" - } - ], "shape": { "north_south": {}, "east_west": { "y": 90 + }, + "ascending_east": { + "y": 90 + }, + "ascending_west": { + "y": 90 + }, + "ascending_south": {}, + "ascending_north": {}, + "south_east": {}, + "south_west": { + "y": 90 + }, + "north_east": { + "y": 270 + }, + "north_west": { + "y": 180 } } } diff --git a/src/main/resources/assets/naturesaura/blockstates/end_flower.json b/src/main/resources/assets/naturesaura/blockstates/end_flower.json index f9ff9078..a4bb7412 100644 --- a/src/main/resources/assets/naturesaura/blockstates/end_flower.json +++ b/src/main/resources/assets/naturesaura/blockstates/end_flower.json @@ -8,15 +8,6 @@ "transform": "forge:default-block" }, "variants": { - "": [{}], - "inventory": [ - { - "model": "builtin/generated", - "textures": { - "layer0": "naturesaura:blocks/end_flower" - }, - "transform": "forge:default-item" - } - ] + "": [{}] } } \ No newline at end of file diff --git a/src/main/resources/assets/naturesaura/blockstates/furnace_heater.json b/src/main/resources/assets/naturesaura/blockstates/furnace_heater.json index b6dd1940..2d38ef31 100644 --- a/src/main/resources/assets/naturesaura/blockstates/furnace_heater.json +++ b/src/main/resources/assets/naturesaura/blockstates/furnace_heater.json @@ -9,7 +9,6 @@ "transform": "forge:default-block" }, "variants": { - "": [{}], "facing": { "down": { "x": 180 diff --git a/src/main/resources/assets/naturesaura/blockstates/gold_powder.json b/src/main/resources/assets/naturesaura/blockstates/gold_powder.json index 024d0518..c4defc0d 100644 --- a/src/main/resources/assets/naturesaura/blockstates/gold_powder.json +++ b/src/main/resources/assets/naturesaura/blockstates/gold_powder.json @@ -28,7 +28,7 @@ ] }, "apply": { - "model": "redstone_dust_dot" + "model": "minecraft:block/redstone_dust_dot" } }, { @@ -46,7 +46,7 @@ ] }, "apply": { - "model": "redstone_dust_side0" + "model": "minecraft:block/redstone_dust_side0" } }, { @@ -64,7 +64,7 @@ ] }, "apply": { - "model": "redstone_dust_side_alt0" + "model": "minecraft:block/redstone_dust_side_alt0" } }, { @@ -82,7 +82,7 @@ ] }, "apply": { - "model": "redstone_dust_side_alt1", + "model": "minecraft:block/redstone_dust_side_alt1", "y": 270 } }, @@ -101,7 +101,7 @@ ] }, "apply": { - "model": "redstone_dust_side1", + "model": "minecraft:block/redstone_dust_side1", "y": 270 } }, @@ -110,7 +110,7 @@ "north": "up" }, "apply": { - "model": "redstone_dust_up" + "model": "minecraft:block/redstone_dust_up" } }, { @@ -118,7 +118,7 @@ "east": "up" }, "apply": { - "model": "redstone_dust_up", + "model": "minecraft:block/redstone_dust_up", "y": 90 } }, @@ -127,7 +127,7 @@ "south": "up" }, "apply": { - "model": "redstone_dust_up", + "model": "minecraft:block/redstone_dust_up", "y": 180 } }, @@ -136,7 +136,7 @@ "west": "up" }, "apply": { - "model": "redstone_dust_up", + "model": "minecraft:block/redstone_dust_up", "y": 270 } } diff --git a/src/main/resources/assets/naturesaura/blockstates/golden_leaves.json b/src/main/resources/assets/naturesaura/blockstates/golden_leaves.json index cf3c1948..2572d833 100644 --- a/src/main/resources/assets/naturesaura/blockstates/golden_leaves.json +++ b/src/main/resources/assets/naturesaura/blockstates/golden_leaves.json @@ -3,12 +3,11 @@ "defaults": { "model": "minecraft:block/leaves", "textures": { - "all": "minecraft:blocks/leaves_oak" + "all": "minecraft:block/oak_leaves" }, "transform": "forge:default-block" }, "variants": { - "": [{}], "persistent": { "true": {}, "false": {} diff --git a/src/main/resources/assets/naturesaura/blockstates/grated_chute.json b/src/main/resources/assets/naturesaura/blockstates/grated_chute.json index 66375297..fcd77530 100644 --- a/src/main/resources/assets/naturesaura/blockstates/grated_chute.json +++ b/src/main/resources/assets/naturesaura/blockstates/grated_chute.json @@ -11,24 +11,25 @@ "transform": "forge:default-block" }, "variants": { - "": [{}], - "facing=down": { - "model": "naturesaura:grated_chute_down" - }, - "facing=north": { - "model": "naturesaura:grated_chute_side" - }, - "facing=south": { - "model": "naturesaura:grated_chute_side", - "y": 180 - }, - "facing=west": { - "model": "naturesaura:grated_chute_side", - "y": 270 - }, - "facing=east": { - "model": "naturesaura:grated_chute_side", - "y": 90 + "facing": { + "down": { + "model": "naturesaura:block/grated_chute_down" + }, + "north": { + "model": "naturesaura:block/grated_chute_side" + }, + "south": { + "model": "naturesaura:block/grated_chute_side", + "y": 180 + }, + "west": { + "model": "naturesaura:block/grated_chute_side", + "y": 270 + }, + "east": { + "model": "naturesaura:block/grated_chute_side", + "y": 90 + } } } } \ No newline at end of file diff --git a/src/main/resources/assets/naturesaura/blockstates/infused_brick_slab.json b/src/main/resources/assets/naturesaura/blockstates/infused_brick_slab.json index 9a2295fe..d00bbca2 100644 --- a/src/main/resources/assets/naturesaura/blockstates/infused_brick_slab.json +++ b/src/main/resources/assets/naturesaura/blockstates/infused_brick_slab.json @@ -1,7 +1,7 @@ { "forge_marker": 1, "defaults": { - "model": "minecraft:block/half_slab", + "model": "minecraft:block/slab", "textures": { "bottom": "naturesaura:blocks/infused_brick", "top": "naturesaura:blocks/infused_brick", @@ -18,7 +18,10 @@ ], "type=bottom": [{}], "type=double": { - "model": "naturesaura:block/infused_brick" + "model": "minecraft:block/cube_all", + "textures": { + "all": "naturesaura:blocks/infused_brick" + } } } } diff --git a/src/main/resources/assets/naturesaura/blockstates/infused_brick_stairs.json b/src/main/resources/assets/naturesaura/blockstates/infused_brick_stairs.json index 748ba55c..a3a083b4 100644 --- a/src/main/resources/assets/naturesaura/blockstates/infused_brick_stairs.json +++ b/src/main/resources/assets/naturesaura/blockstates/infused_brick_stairs.json @@ -8,12 +8,6 @@ } }, "variants": { - "normal": { - "model": "minecraft:block/stairs" - }, - "inventory": { - "model": "minecraft:block/stairs" - }, "facing=east,half=bottom,shape=straight": { "model": "minecraft:block/stairs" }, diff --git a/src/main/resources/assets/naturesaura/blockstates/infused_slab.json b/src/main/resources/assets/naturesaura/blockstates/infused_slab.json index 82470f1e..73c3c552 100644 --- a/src/main/resources/assets/naturesaura/blockstates/infused_slab.json +++ b/src/main/resources/assets/naturesaura/blockstates/infused_slab.json @@ -1,7 +1,7 @@ { "forge_marker": 1, "defaults": { - "model": "minecraft:block/half_slab", + "model": "minecraft:block/slab", "textures": { "bottom": "naturesaura:blocks/infused_stone", "top": "naturesaura:blocks/infused_stone", @@ -18,7 +18,10 @@ ], "type=bottom": [{}], "type=double": { - "model": "naturesaura:block/infused_stone" + "model": "minecraft:block/cube_all", + "textures": { + "all": "naturesaura:blocks/infused_stone" + } } } } diff --git a/src/main/resources/assets/naturesaura/blockstates/infused_stairs.json b/src/main/resources/assets/naturesaura/blockstates/infused_stairs.json index 4b35fe2e..bbfc8cd8 100644 --- a/src/main/resources/assets/naturesaura/blockstates/infused_stairs.json +++ b/src/main/resources/assets/naturesaura/blockstates/infused_stairs.json @@ -8,12 +8,6 @@ } }, "variants": { - "": { - "model": "minecraft:block/stairs" - }, - "inventory": { - "model": "minecraft:block/stairs" - }, "facing=east,half=bottom,shape=straight": { "model": "minecraft:block/stairs" }, diff --git a/src/main/resources/assets/naturesaura/blockstates/spawn_lamp.json b/src/main/resources/assets/naturesaura/blockstates/spawn_lamp.json index 41652624..cb98cfaa 100644 --- a/src/main/resources/assets/naturesaura/blockstates/spawn_lamp.json +++ b/src/main/resources/assets/naturesaura/blockstates/spawn_lamp.json @@ -4,6 +4,7 @@ "model": "naturesaura:block/spawn_lamp", "textures": { "0": "naturesaura:blocks/spawn_lamp", + "-1": "naturesaura:blocks/spawn_lamp", "particle": "#0" }, "transform": "forge:default-block" diff --git a/src/main/resources/assets/naturesaura/blockstates/wood_stand.json b/src/main/resources/assets/naturesaura/blockstates/wood_stand.json index ddf1c0fb..4fc62cfc 100644 --- a/src/main/resources/assets/naturesaura/blockstates/wood_stand.json +++ b/src/main/resources/assets/naturesaura/blockstates/wood_stand.json @@ -3,8 +3,8 @@ "defaults": { "model": "naturesaura:block/wood_stand", "textures": { - "texture": "minecraft:blocks/log_oak", - "top": "minecraft:blocks/log_oak_top", + "texture": "minecraft:block/stripped_oak_log", + "top": "minecraft:block/stripped_oak_log_top", "particle": "#texture" }, "transform": "forge:default-block" diff --git a/src/main/resources/assets/naturesaura/models/block/chunk_loader.json b/src/main/resources/assets/naturesaura/models/block/chunk_loader.json index bc8c422c..284a68d0 100644 --- a/src/main/resources/assets/naturesaura/models/block/chunk_loader.json +++ b/src/main/resources/assets/naturesaura/models/block/chunk_loader.json @@ -1,4 +1,5 @@ { + "parent": "minecraft:block/block", "elements": [ { "from": [4, 4, 4], diff --git a/src/main/resources/assets/naturesaura/models/block/field_creator.json b/src/main/resources/assets/naturesaura/models/block/field_creator.json index 63bc38f4..6789b8e8 100644 --- a/src/main/resources/assets/naturesaura/models/block/field_creator.json +++ b/src/main/resources/assets/naturesaura/models/block/field_creator.json @@ -1,4 +1,5 @@ { + "parent": "minecraft:block/block", "elements": [ { "from": [0, 0, 0], diff --git a/src/main/resources/assets/naturesaura/models/block/furnace_heater.json b/src/main/resources/assets/naturesaura/models/block/furnace_heater.json index 554964d3..a36f871a 100644 --- a/src/main/resources/assets/naturesaura/models/block/furnace_heater.json +++ b/src/main/resources/assets/naturesaura/models/block/furnace_heater.json @@ -1,4 +1,5 @@ { + "parent": "minecraft:block/block", "elements": [ { "from": [2, 0, 2], diff --git a/src/main/resources/assets/naturesaura/models/block/grated_chute_down.json b/src/main/resources/assets/naturesaura/models/block/grated_chute_down.json index 4ce5d645..938537a9 100644 --- a/src/main/resources/assets/naturesaura/models/block/grated_chute_down.json +++ b/src/main/resources/assets/naturesaura/models/block/grated_chute_down.json @@ -1,4 +1,5 @@ { + "parent": "minecraft:block/block", "ambientocclusion": false, "elements": [ { diff --git a/src/main/resources/assets/naturesaura/models/block/grated_chute_side.json b/src/main/resources/assets/naturesaura/models/block/grated_chute_side.json index 890ce5d8..c27d1597 100644 --- a/src/main/resources/assets/naturesaura/models/block/grated_chute_side.json +++ b/src/main/resources/assets/naturesaura/models/block/grated_chute_side.json @@ -1,4 +1,5 @@ { + "parent": "minecraft:block/block", "ambientocclusion": false, "elements": [ { diff --git a/src/main/resources/assets/naturesaura/models/block/nature_altar.json b/src/main/resources/assets/naturesaura/models/block/nature_altar.json index 04c3168f..426342d8 100644 --- a/src/main/resources/assets/naturesaura/models/block/nature_altar.json +++ b/src/main/resources/assets/naturesaura/models/block/nature_altar.json @@ -1,4 +1,5 @@ { + "parent": "minecraft:block/block", "elements": [ { "from": [0, 0, 0], diff --git a/src/main/resources/assets/naturesaura/models/block/offering_table.json b/src/main/resources/assets/naturesaura/models/block/offering_table.json index c37ca30f..1be61b55 100644 --- a/src/main/resources/assets/naturesaura/models/block/offering_table.json +++ b/src/main/resources/assets/naturesaura/models/block/offering_table.json @@ -1,4 +1,5 @@ { + "parent": "minecraft:block/block", "credit": "Made by bl4ckscor3", "elements": [ { @@ -6,12 +7,30 @@ "from": [2, 12, 2], "to": [14, 13, 14], "faces": { - "north": {"uv": [2, 3, 14, 4], "texture": "#0"}, - "east": {"uv": [2, 3, 14, 4], "texture": "#0"}, - "south": {"uv": [2, 3, 14, 4], "texture": "#0"}, - "west": {"uv": [2, 3, 14, 4], "texture": "#0"}, - "up": {"uv": [2, 2, 14, 14], "texture": "#1"}, - "down": {"uv": [2, 2, 14, 14], "texture": "#1"} + "north": { + "uv": [2, 3, 14, 4], + "texture": "#0" + }, + "east": { + "uv": [2, 3, 14, 4], + "texture": "#0" + }, + "south": { + "uv": [2, 3, 14, 4], + "texture": "#0" + }, + "west": { + "uv": [2, 3, 14, 4], + "texture": "#0" + }, + "up": { + "uv": [2, 2, 14, 14], + "texture": "#1" + }, + "down": { + "uv": [2, 2, 14, 14], + "texture": "#1" + } } }, { @@ -19,10 +38,22 @@ "from": [6, 3, 6], "to": [10, 12, 10], "faces": { - "north": {"uv": [6, 4, 10, 13], "texture": "#0"}, - "east": {"uv": [6, 4, 10, 13], "texture": "#0"}, - "south": {"uv": [6, 4, 10, 13], "texture": "#0"}, - "west": {"uv": [6, 4, 10, 13], "texture": "#0"} + "north": { + "uv": [6, 4, 10, 13], + "texture": "#0" + }, + "east": { + "uv": [6, 4, 10, 13], + "texture": "#0" + }, + "south": { + "uv": [6, 4, 10, 13], + "texture": "#0" + }, + "west": { + "uv": [6, 4, 10, 13], + "texture": "#0" + } } }, { @@ -30,12 +61,30 @@ "from": [3, 0, 3], "to": [13, 1, 13], "faces": { - "north": {"uv": [3, 15, 13, 16], "texture": "#0"}, - "east": {"uv": [3, 15, 13, 16], "texture": "#0"}, - "south": {"uv": [3, 15, 13, 16], "texture": "#0"}, - "west": {"uv": [3, 15, 13, 16], "texture": "#0"}, - "up": {"uv": [3, 3, 13, 13], "texture": "#1"}, - "down": {"uv": [3, 3, 13, 13], "texture": "#1"} + "north": { + "uv": [3, 15, 13, 16], + "texture": "#0" + }, + "east": { + "uv": [3, 15, 13, 16], + "texture": "#0" + }, + "south": { + "uv": [3, 15, 13, 16], + "texture": "#0" + }, + "west": { + "uv": [3, 15, 13, 16], + "texture": "#0" + }, + "up": { + "uv": [3, 3, 13, 13], + "texture": "#1" + }, + "down": { + "uv": [3, 3, 13, 13], + "texture": "#1" + } } }, { @@ -43,11 +92,26 @@ "from": [4, 1, 4], "to": [12, 2, 12], "faces": { - "north": {"uv": [4, 14, 12, 15], "texture": "#0"}, - "east": {"uv": [4, 14, 12, 15], "texture": "#0"}, - "south": {"uv": [4, 14, 12, 15], "texture": "#0"}, - "west": {"uv": [4, 14, 12, 15], "texture": "#0"}, - "up": {"uv": [4, 4, 12, 12], "texture": "#1"} + "north": { + "uv": [4, 14, 12, 15], + "texture": "#0" + }, + "east": { + "uv": [4, 14, 12, 15], + "texture": "#0" + }, + "south": { + "uv": [4, 14, 12, 15], + "texture": "#0" + }, + "west": { + "uv": [4, 14, 12, 15], + "texture": "#0" + }, + "up": { + "uv": [4, 4, 12, 12], + "texture": "#1" + } } }, { @@ -55,11 +119,26 @@ "from": [5, 2, 5], "to": [11, 3, 11], "faces": { - "north": {"uv": [5, 13, 11, 14], "texture": "#0"}, - "east": {"uv": [5, 13, 11, 14], "texture": "#0"}, - "south": {"uv": [5, 13, 11, 14], "texture": "#0"}, - "west": {"uv": [5, 13, 11, 14], "texture": "#0"}, - "up": {"uv": [5, 5, 11, 11], "texture": "#1"} + "north": { + "uv": [5, 13, 11, 14], + "texture": "#0" + }, + "east": { + "uv": [5, 13, 11, 14], + "texture": "#0" + }, + "south": { + "uv": [5, 13, 11, 14], + "texture": "#0" + }, + "west": { + "uv": [5, 13, 11, 14], + "texture": "#0" + }, + "up": { + "uv": [5, 5, 11, 11], + "texture": "#1" + } } }, { @@ -67,10 +146,22 @@ "from": [4, 13, 4], "to": [6, 14, 6], "faces": { - "north": {"uv": [10, 2, 12, 3], "texture": "#2"}, - "west": {"uv": [4, 2, 6, 3], "texture": "#2"}, - "up": {"uv": [4, 4, 6, 6], "texture": "#2"}, - "down": {"uv": [4, 4, 6, 6], "texture": "#2"} + "north": { + "uv": [10, 2, 12, 3], + "texture": "#2" + }, + "west": { + "uv": [4, 2, 6, 3], + "texture": "#2" + }, + "up": { + "uv": [4, 4, 6, 6], + "texture": "#2" + }, + "down": { + "uv": [4, 4, 6, 6], + "texture": "#2" + } } }, { @@ -78,10 +169,22 @@ "from": [4, 13, 10], "to": [6, 14, 12], "faces": { - "south": {"uv": [4, 2, 6, 3], "texture": "#2"}, - "west": {"uv": [10, 2, 12, 3], "texture": "#2"}, - "up": {"uv": [4, 10, 6, 12], "texture": "#2"}, - "down": {"uv": [4, 10, 6, 12], "texture": "#2"} + "south": { + "uv": [4, 2, 6, 3], + "texture": "#2" + }, + "west": { + "uv": [10, 2, 12, 3], + "texture": "#2" + }, + "up": { + "uv": [4, 10, 6, 12], + "texture": "#2" + }, + "down": { + "uv": [4, 10, 6, 12], + "texture": "#2" + } } }, { @@ -89,10 +192,22 @@ "from": [10, 13, 4], "to": [12, 14, 6], "faces": { - "north": {"uv": [4, 2, 6, 3], "texture": "#2"}, - "east": {"uv": [10, 2, 12, 3], "texture": "#2"}, - "up": {"uv": [10, 4, 12, 6], "texture": "#2"}, - "down": {"uv": [10, 4, 12, 6], "texture": "#2"} + "north": { + "uv": [4, 2, 6, 3], + "texture": "#2" + }, + "east": { + "uv": [10, 2, 12, 3], + "texture": "#2" + }, + "up": { + "uv": [10, 4, 12, 6], + "texture": "#2" + }, + "down": { + "uv": [10, 4, 12, 6], + "texture": "#2" + } } }, { @@ -100,10 +215,22 @@ "from": [10, 13, 10], "to": [12, 14, 12], "faces": { - "east": {"uv": [4, 2, 6, 3], "texture": "#2"}, - "south": {"uv": [10, 2, 12, 3], "texture": "#2"}, - "up": {"uv": [10, 10, 12, 12], "texture": "#2"}, - "down": {"uv": [10, 10, 12, 12], "texture": "#2"} + "east": { + "uv": [4, 2, 6, 3], + "texture": "#2" + }, + "south": { + "uv": [10, 2, 12, 3], + "texture": "#2" + }, + "up": { + "uv": [10, 10, 12, 12], + "texture": "#2" + }, + "down": { + "uv": [10, 10, 12, 12], + "texture": "#2" + } } }, { @@ -111,11 +238,26 @@ "from": [10, 13, 6], "to": [13, 14, 10], "faces": { - "north": {"uv": [3, 2, 6, 3], "texture": "#2"}, - "east": {"uv": [6, 2, 10, 3], "texture": "#2"}, - "south": {"uv": [10, 2, 13, 3], "texture": "#2"}, - "up": {"uv": [10, 6, 13, 10], "texture": "#2"}, - "down": {"uv": [10, 6, 13, 10], "texture": "#2"} + "north": { + "uv": [3, 2, 6, 3], + "texture": "#2" + }, + "east": { + "uv": [6, 2, 10, 3], + "texture": "#2" + }, + "south": { + "uv": [10, 2, 13, 3], + "texture": "#2" + }, + "up": { + "uv": [10, 6, 13, 10], + "texture": "#2" + }, + "down": { + "uv": [10, 6, 13, 10], + "texture": "#2" + } } }, { @@ -123,11 +265,26 @@ "from": [3, 13, 6], "to": [6, 14, 10], "faces": { - "north": {"uv": [10, 2, 13, 3], "texture": "#2"}, - "south": {"uv": [3, 2, 6, 3], "texture": "#2"}, - "west": {"uv": [6, 2, 10, 3], "texture": "#2"}, - "up": {"uv": [3, 6, 6, 10], "texture": "#2"}, - "down": {"uv": [3, 6, 6, 10], "texture": "#2"} + "north": { + "uv": [10, 2, 13, 3], + "texture": "#2" + }, + "south": { + "uv": [3, 2, 6, 3], + "texture": "#2" + }, + "west": { + "uv": [6, 2, 10, 3], + "texture": "#2" + }, + "up": { + "uv": [3, 6, 6, 10], + "texture": "#2" + }, + "down": { + "uv": [3, 6, 6, 10], + "texture": "#2" + } } }, { @@ -135,12 +292,30 @@ "from": [6, 13, 3], "to": [10, 14, 13], "faces": { - "north": {"uv": [6, 2, 10, 3], "texture": "#2"}, - "east": {"uv": [3, 1, 13, 2], "texture": "#2"}, - "south": {"uv": [6, 2, 10, 3], "texture": "#2"}, - "west": {"uv": [3, 1, 13, 2], "texture": "#2"}, - "up": {"uv": [6, 3, 10, 13], "texture": "#2"}, - "down": {"uv": [6, 3, 10, 13], "texture": "#2"} + "north": { + "uv": [6, 2, 10, 3], + "texture": "#2" + }, + "east": { + "uv": [3, 1, 13, 2], + "texture": "#2" + }, + "south": { + "uv": [6, 2, 10, 3], + "texture": "#2" + }, + "west": { + "uv": [3, 1, 13, 2], + "texture": "#2" + }, + "up": { + "uv": [6, 3, 10, 13], + "texture": "#2" + }, + "down": { + "uv": [6, 3, 10, 13], + "texture": "#2" + } } }, { @@ -148,12 +323,30 @@ "from": [6, 14, 13], "to": [10, 15, 14], "faces": { - "north": {"uv": [6, 1, 10, 2], "texture": "#2"}, - "east": {"uv": [2, 1, 3, 2], "texture": "#2"}, - "south": {"uv": [6, 1, 10, 2], "texture": "#2"}, - "west": {"uv": [13, 1, 14, 2], "texture": "#2"}, - "up": {"uv": [6, 13, 10, 14], "texture": "#2"}, - "down": {"uv": [6, 13, 10, 14], "texture": "#2"} + "north": { + "uv": [6, 1, 10, 2], + "texture": "#2" + }, + "east": { + "uv": [2, 1, 3, 2], + "texture": "#2" + }, + "south": { + "uv": [6, 1, 10, 2], + "texture": "#2" + }, + "west": { + "uv": [13, 1, 14, 2], + "texture": "#2" + }, + "up": { + "uv": [6, 13, 10, 14], + "texture": "#2" + }, + "down": { + "uv": [6, 13, 10, 14], + "texture": "#2" + } } }, { @@ -161,12 +354,30 @@ "from": [10, 14, 3], "to": [12, 15, 4], "faces": { - "north": {"uv": [4, 1, 6, 2], "texture": "#2"}, - "east": {"uv": [12, 1, 13, 2], "texture": "#2"}, - "south": {"uv": [4, 1, 6, 2], "texture": "#2"}, - "west": {"uv": [12, 1, 13, 2], "texture": "#2"}, - "up": {"uv": [10, 3, 12, 4], "texture": "#2"}, - "down": {"uv": [10, 3, 12, 4], "texture": "#2"} + "north": { + "uv": [4, 1, 6, 2], + "texture": "#2" + }, + "east": { + "uv": [12, 1, 13, 2], + "texture": "#2" + }, + "south": { + "uv": [4, 1, 6, 2], + "texture": "#2" + }, + "west": { + "uv": [12, 1, 13, 2], + "texture": "#2" + }, + "up": { + "uv": [10, 3, 12, 4], + "texture": "#2" + }, + "down": { + "uv": [10, 3, 12, 4], + "texture": "#2" + } } }, { @@ -174,12 +385,30 @@ "from": [4, 14, 12], "to": [6, 15, 13], "faces": { - "north": {"uv": [4, 1, 6, 2], "texture": "#2"}, - "east": {"uv": [12, 1, 13, 2], "texture": "#2"}, - "south": {"uv": [4, 1, 6, 2], "texture": "#2"}, - "west": {"uv": [12, 1, 13, 2], "texture": "#2"}, - "up": {"uv": [4, 12, 6, 13], "texture": "#2"}, - "down": {"uv": [4, 12, 6, 13], "texture": "#2"} + "north": { + "uv": [4, 1, 6, 2], + "texture": "#2" + }, + "east": { + "uv": [12, 1, 13, 2], + "texture": "#2" + }, + "south": { + "uv": [4, 1, 6, 2], + "texture": "#2" + }, + "west": { + "uv": [12, 1, 13, 2], + "texture": "#2" + }, + "up": { + "uv": [4, 12, 6, 13], + "texture": "#2" + }, + "down": { + "uv": [4, 12, 6, 13], + "texture": "#2" + } } }, { @@ -187,12 +416,30 @@ "from": [10, 14, 12], "to": [12, 15, 13], "faces": { - "north": {"uv": [10, 1, 12, 2], "texture": "#2"}, - "east": {"uv": [3, 1, 4, 2], "texture": "#2"}, - "south": {"uv": [10, 1, 12, 2], "texture": "#2"}, - "west": {"uv": [3, 1, 4, 2], "texture": "#2"}, - "up": {"uv": [10, 12, 12, 13], "texture": "#2"}, - "down": {"uv": [10, 12, 12, 13], "texture": "#2"} + "north": { + "uv": [10, 1, 12, 2], + "texture": "#2" + }, + "east": { + "uv": [3, 1, 4, 2], + "texture": "#2" + }, + "south": { + "uv": [10, 1, 12, 2], + "texture": "#2" + }, + "west": { + "uv": [3, 1, 4, 2], + "texture": "#2" + }, + "up": { + "uv": [10, 12, 12, 13], + "texture": "#2" + }, + "down": { + "uv": [10, 12, 12, 13], + "texture": "#2" + } } }, { @@ -200,12 +447,30 @@ "from": [4, 14, 3], "to": [6, 15, 4], "faces": { - "north": {"uv": [10, 1, 12, 2], "texture": "#2"}, - "east": {"uv": [3, 1, 4, 2], "texture": "#2"}, - "south": {"uv": [10, 1, 12, 2], "texture": "#2"}, - "west": {"uv": [3, 1, 4, 2], "texture": "#2"}, - "up": {"uv": [4, 3, 6, 4], "texture": "#2"}, - "down": {"uv": [4, 3, 6, 4], "texture": "#2"} + "north": { + "uv": [10, 1, 12, 2], + "texture": "#2" + }, + "east": { + "uv": [3, 1, 4, 2], + "texture": "#2" + }, + "south": { + "uv": [10, 1, 12, 2], + "texture": "#2" + }, + "west": { + "uv": [3, 1, 4, 2], + "texture": "#2" + }, + "up": { + "uv": [4, 3, 6, 4], + "texture": "#2" + }, + "down": { + "uv": [4, 3, 6, 4], + "texture": "#2" + } } }, { @@ -213,12 +478,30 @@ "from": [3, 14, 4], "to": [4, 15, 6], "faces": { - "north": {"uv": [12, 1, 13, 2], "texture": "#2"}, - "east": {"uv": [4, 1, 6, 2], "texture": "#2"}, - "south": {"uv": [12, 1, 13, 2], "texture": "#2"}, - "west": {"uv": [4, 1, 6, 2], "texture": "#2"}, - "up": {"uv": [3, 4, 4, 6], "texture": "#2"}, - "down": {"uv": [3, 4, 4, 6], "texture": "#2"} + "north": { + "uv": [12, 1, 13, 2], + "texture": "#2" + }, + "east": { + "uv": [4, 1, 6, 2], + "texture": "#2" + }, + "south": { + "uv": [12, 1, 13, 2], + "texture": "#2" + }, + "west": { + "uv": [4, 1, 6, 2], + "texture": "#2" + }, + "up": { + "uv": [3, 4, 4, 6], + "texture": "#2" + }, + "down": { + "uv": [3, 4, 4, 6], + "texture": "#2" + } } }, { @@ -226,12 +509,30 @@ "from": [3, 14, 10], "to": [4, 15, 12], "faces": { - "north": {"uv": [3, 1, 4, 2], "texture": "#2"}, - "east": {"uv": [10, 1, 12, 2], "texture": "#2"}, - "south": {"uv": [3, 1, 4, 2], "texture": "#2"}, - "west": {"uv": [10, 1, 12, 2], "texture": "#2"}, - "up": {"uv": [3, 10, 4, 12], "texture": "#2"}, - "down": {"uv": [3, 10, 4, 12], "texture": "#2"} + "north": { + "uv": [3, 1, 4, 2], + "texture": "#2" + }, + "east": { + "uv": [10, 1, 12, 2], + "texture": "#2" + }, + "south": { + "uv": [3, 1, 4, 2], + "texture": "#2" + }, + "west": { + "uv": [10, 1, 12, 2], + "texture": "#2" + }, + "up": { + "uv": [3, 10, 4, 12], + "texture": "#2" + }, + "down": { + "uv": [3, 10, 4, 12], + "texture": "#2" + } } }, { @@ -239,12 +540,30 @@ "from": [12, 14, 4], "to": [13, 15, 6], "faces": { - "north": {"uv": [3, 1, 4, 2], "texture": "#2"}, - "east": {"uv": [10, 1, 12, 2], "texture": "#2"}, - "south": {"uv": [3, 1, 4, 2], "texture": "#2"}, - "west": {"uv": [10, 1, 12, 2], "texture": "#2"}, - "up": {"uv": [12, 4, 13, 6], "texture": "#2"}, - "down": {"uv": [12, 4, 13, 6], "texture": "#2"} + "north": { + "uv": [3, 1, 4, 2], + "texture": "#2" + }, + "east": { + "uv": [10, 1, 12, 2], + "texture": "#2" + }, + "south": { + "uv": [3, 1, 4, 2], + "texture": "#2" + }, + "west": { + "uv": [10, 1, 12, 2], + "texture": "#2" + }, + "up": { + "uv": [12, 4, 13, 6], + "texture": "#2" + }, + "down": { + "uv": [12, 4, 13, 6], + "texture": "#2" + } } }, { @@ -252,12 +571,30 @@ "from": [12, 14, 10], "to": [13, 15, 12], "faces": { - "north": {"uv": [12, 1, 13, 2], "texture": "#2"}, - "east": {"uv": [4, 1, 6, 2], "texture": "#2"}, - "south": {"uv": [12, 1, 13, 2], "texture": "#2"}, - "west": {"uv": [4, 1, 6, 2], "texture": "#2"}, - "up": {"uv": [12, 10, 13, 12], "texture": "#2"}, - "down": {"uv": [12, 10, 13, 12], "texture": "#2"} + "north": { + "uv": [12, 1, 13, 2], + "texture": "#2" + }, + "east": { + "uv": [4, 1, 6, 2], + "texture": "#2" + }, + "south": { + "uv": [12, 1, 13, 2], + "texture": "#2" + }, + "west": { + "uv": [4, 1, 6, 2], + "texture": "#2" + }, + "up": { + "uv": [12, 10, 13, 12], + "texture": "#2" + }, + "down": { + "uv": [12, 10, 13, 12], + "texture": "#2" + } } }, { @@ -265,12 +602,30 @@ "from": [13, 14, 6], "to": [14, 15, 10], "faces": { - "north": {"uv": [2, 1, 3, 2], "texture": "#2"}, - "east": {"uv": [6, 1, 10, 2], "texture": "#2"}, - "south": {"uv": [13, 1, 14, 2], "texture": "#2"}, - "west": {"uv": [6, 1, 10, 2], "texture": "#2"}, - "up": {"uv": [13, 6, 14, 10], "texture": "#2"}, - "down": {"uv": [13, 6, 14, 10], "texture": "#2"} + "north": { + "uv": [2, 1, 3, 2], + "texture": "#2" + }, + "east": { + "uv": [6, 1, 10, 2], + "texture": "#2" + }, + "south": { + "uv": [13, 1, 14, 2], + "texture": "#2" + }, + "west": { + "uv": [6, 1, 10, 2], + "texture": "#2" + }, + "up": { + "uv": [13, 6, 14, 10], + "texture": "#2" + }, + "down": { + "uv": [13, 6, 14, 10], + "texture": "#2" + } } }, { @@ -278,12 +633,30 @@ "from": [2, 14, 6], "to": [3, 15, 10], "faces": { - "north": {"uv": [13, 1, 14, 2], "texture": "#2"}, - "east": {"uv": [6, 1, 10, 2], "texture": "#2"}, - "south": {"uv": [2, 1, 3, 2], "texture": "#2"}, - "west": {"uv": [6, 1, 10, 2], "texture": "#2"}, - "up": {"uv": [2, 6, 3, 10], "texture": "#2"}, - "down": {"uv": [2, 6, 3, 10], "texture": "#2"} + "north": { + "uv": [13, 1, 14, 2], + "texture": "#2" + }, + "east": { + "uv": [6, 1, 10, 2], + "texture": "#2" + }, + "south": { + "uv": [2, 1, 3, 2], + "texture": "#2" + }, + "west": { + "uv": [6, 1, 10, 2], + "texture": "#2" + }, + "up": { + "uv": [2, 6, 3, 10], + "texture": "#2" + }, + "down": { + "uv": [2, 6, 3, 10], + "texture": "#2" + } } }, { @@ -291,12 +664,30 @@ "from": [6, 14, 2], "to": [10, 15, 3], "faces": { - "north": {"uv": [6, 1, 10, 2], "texture": "#2"}, - "east": {"uv": [13, 1, 14, 2], "texture": "#2"}, - "south": {"uv": [6, 1, 10, 2], "texture": "#2"}, - "west": {"uv": [2, 1, 3, 2], "texture": "#2"}, - "up": {"uv": [6, 2, 10, 3], "texture": "#2"}, - "down": {"uv": [6, 2, 10, 3], "texture": "#2"} + "north": { + "uv": [6, 1, 10, 2], + "texture": "#2" + }, + "east": { + "uv": [13, 1, 14, 2], + "texture": "#2" + }, + "south": { + "uv": [6, 1, 10, 2], + "texture": "#2" + }, + "west": { + "uv": [2, 1, 3, 2], + "texture": "#2" + }, + "up": { + "uv": [6, 2, 10, 3], + "texture": "#2" + }, + "down": { + "uv": [6, 2, 10, 3], + "texture": "#2" + } } }, { @@ -304,12 +695,30 @@ "from": [6, 15, 14], "to": [10, 16, 15], "faces": { - "north": {"uv": [6, 0, 10, 1], "texture": "#2"}, - "east": {"uv": [1, 0, 2, 1], "texture": "#2"}, - "south": {"uv": [6, 0, 10, 1], "texture": "#2"}, - "west": {"uv": [14, 0, 15, 1], "texture": "#2"}, - "up": {"uv": [6, 14, 10, 15], "texture": "#2"}, - "down": {"uv": [6, 14, 10, 15], "texture": "#2"} + "north": { + "uv": [6, 0, 10, 1], + "texture": "#2" + }, + "east": { + "uv": [1, 0, 2, 1], + "texture": "#2" + }, + "south": { + "uv": [6, 0, 10, 1], + "texture": "#2" + }, + "west": { + "uv": [14, 0, 15, 1], + "texture": "#2" + }, + "up": { + "uv": [6, 14, 10, 15], + "texture": "#2" + }, + "down": { + "uv": [6, 14, 10, 15], + "texture": "#2" + } } }, { @@ -317,12 +726,30 @@ "from": [10, 15, 2], "to": [12, 16, 3], "faces": { - "north": {"uv": [4, 0, 6, 1], "texture": "#2"}, - "east": {"uv": [13, 0, 14, 1], "texture": "#2"}, - "south": {"uv": [4, 0, 6, 1], "texture": "#2"}, - "west": {"uv": [13, 0, 14, 1], "texture": "#2"}, - "up": {"uv": [10, 2, 12, 3], "texture": "#2"}, - "down": {"uv": [10, 2, 12, 3], "texture": "#2"} + "north": { + "uv": [4, 0, 6, 1], + "texture": "#2" + }, + "east": { + "uv": [13, 0, 14, 1], + "texture": "#2" + }, + "south": { + "uv": [4, 0, 6, 1], + "texture": "#2" + }, + "west": { + "uv": [13, 0, 14, 1], + "texture": "#2" + }, + "up": { + "uv": [10, 2, 12, 3], + "texture": "#2" + }, + "down": { + "uv": [10, 2, 12, 3], + "texture": "#2" + } } }, { @@ -330,12 +757,30 @@ "from": [4, 15, 13], "to": [6, 16, 14], "faces": { - "north": {"uv": [4, 0, 6, 1], "texture": "#2"}, - "east": {"uv": [13, 0, 14, 1], "texture": "#2"}, - "south": {"uv": [4, 0, 6, 1], "texture": "#2"}, - "west": {"uv": [13, 0, 14, 1], "texture": "#2"}, - "up": {"uv": [4, 13, 6, 14], "texture": "#2"}, - "down": {"uv": [4, 13, 6, 14], "texture": "#2"} + "north": { + "uv": [4, 0, 6, 1], + "texture": "#2" + }, + "east": { + "uv": [13, 0, 14, 1], + "texture": "#2" + }, + "south": { + "uv": [4, 0, 6, 1], + "texture": "#2" + }, + "west": { + "uv": [13, 0, 14, 1], + "texture": "#2" + }, + "up": { + "uv": [4, 13, 6, 14], + "texture": "#2" + }, + "down": { + "uv": [4, 13, 6, 14], + "texture": "#2" + } } }, { @@ -343,12 +788,30 @@ "from": [10, 15, 13], "to": [12, 16, 14], "faces": { - "north": {"uv": [10, 0, 12, 1], "texture": "#2"}, - "east": {"uv": [2, 0, 3, 1], "texture": "#2"}, - "south": {"uv": [10, 0, 12, 1], "texture": "#2"}, - "west": {"uv": [2, 0, 3, 1], "texture": "#2"}, - "up": {"uv": [10, 13, 12, 14], "texture": "#2"}, - "down": {"uv": [10, 13, 12, 14], "texture": "#2"} + "north": { + "uv": [10, 0, 12, 1], + "texture": "#2" + }, + "east": { + "uv": [2, 0, 3, 1], + "texture": "#2" + }, + "south": { + "uv": [10, 0, 12, 1], + "texture": "#2" + }, + "west": { + "uv": [2, 0, 3, 1], + "texture": "#2" + }, + "up": { + "uv": [10, 13, 12, 14], + "texture": "#2" + }, + "down": { + "uv": [10, 13, 12, 14], + "texture": "#2" + } } }, { @@ -356,12 +819,30 @@ "from": [4, 15, 2], "to": [6, 16, 3], "faces": { - "north": {"uv": [10, 0, 12, 1], "texture": "#2"}, - "east": {"uv": [2, 0, 3, 1], "texture": "#2"}, - "south": {"uv": [10, 0, 12, 1], "texture": "#2"}, - "west": {"uv": [2, 0, 3, 1], "texture": "#2"}, - "up": {"uv": [4, 2, 6, 3], "texture": "#2"}, - "down": {"uv": [4, 2, 6, 3], "texture": "#2"} + "north": { + "uv": [10, 0, 12, 1], + "texture": "#2" + }, + "east": { + "uv": [2, 0, 3, 1], + "texture": "#2" + }, + "south": { + "uv": [10, 0, 12, 1], + "texture": "#2" + }, + "west": { + "uv": [2, 0, 3, 1], + "texture": "#2" + }, + "up": { + "uv": [4, 2, 6, 3], + "texture": "#2" + }, + "down": { + "uv": [4, 2, 6, 3], + "texture": "#2" + } } }, { @@ -369,12 +850,30 @@ "from": [2, 15, 4], "to": [3, 16, 6], "faces": { - "north": {"uv": [13, 0, 14, 1], "texture": "#2"}, - "east": {"uv": [4, 0, 6, 1], "texture": "#2"}, - "south": {"uv": [13, 0, 14, 1], "texture": "#2"}, - "west": {"uv": [4, 0, 6, 1], "texture": "#2"}, - "up": {"uv": [2, 4, 3, 6], "texture": "#2"}, - "down": {"uv": [2, 4, 3, 6], "texture": "#2"} + "north": { + "uv": [13, 0, 14, 1], + "texture": "#2" + }, + "east": { + "uv": [4, 0, 6, 1], + "texture": "#2" + }, + "south": { + "uv": [13, 0, 14, 1], + "texture": "#2" + }, + "west": { + "uv": [4, 0, 6, 1], + "texture": "#2" + }, + "up": { + "uv": [2, 4, 3, 6], + "texture": "#2" + }, + "down": { + "uv": [2, 4, 3, 6], + "texture": "#2" + } } }, { @@ -382,12 +881,30 @@ "from": [2, 15, 10], "to": [3, 16, 12], "faces": { - "north": {"uv": [2, 0, 3, 1], "texture": "#2"}, - "east": {"uv": [10, 0, 12, 1], "texture": "#2"}, - "south": {"uv": [2, 0, 3, 1], "texture": "#2"}, - "west": {"uv": [10, 0, 12, 1], "texture": "#2"}, - "up": {"uv": [2, 10, 3, 12], "texture": "#2"}, - "down": {"uv": [2, 10, 3, 12], "texture": "#2"} + "north": { + "uv": [2, 0, 3, 1], + "texture": "#2" + }, + "east": { + "uv": [10, 0, 12, 1], + "texture": "#2" + }, + "south": { + "uv": [2, 0, 3, 1], + "texture": "#2" + }, + "west": { + "uv": [10, 0, 12, 1], + "texture": "#2" + }, + "up": { + "uv": [2, 10, 3, 12], + "texture": "#2" + }, + "down": { + "uv": [2, 10, 3, 12], + "texture": "#2" + } } }, { @@ -395,12 +912,30 @@ "from": [13, 15, 4], "to": [14, 16, 6], "faces": { - "north": {"uv": [2, 0, 3, 1], "texture": "#2"}, - "east": {"uv": [10, 0, 12, 1], "texture": "#2"}, - "south": {"uv": [2, 0, 3, 1], "texture": "#2"}, - "west": {"uv": [10, 0, 12, 1], "texture": "#2"}, - "up": {"uv": [13, 4, 14, 6], "texture": "#2"}, - "down": {"uv": [13, 4, 14, 6], "texture": "#2"} + "north": { + "uv": [2, 0, 3, 1], + "texture": "#2" + }, + "east": { + "uv": [10, 0, 12, 1], + "texture": "#2" + }, + "south": { + "uv": [2, 0, 3, 1], + "texture": "#2" + }, + "west": { + "uv": [10, 0, 12, 1], + "texture": "#2" + }, + "up": { + "uv": [13, 4, 14, 6], + "texture": "#2" + }, + "down": { + "uv": [13, 4, 14, 6], + "texture": "#2" + } } }, { @@ -408,12 +943,30 @@ "from": [13, 15, 10], "to": [14, 16, 12], "faces": { - "north": {"uv": [13, 0, 14, 1], "texture": "#2"}, - "east": {"uv": [4, 0, 6, 1], "texture": "#2"}, - "south": {"uv": [13, 0, 14, 1], "texture": "#2"}, - "west": {"uv": [4, 0, 6, 1], "texture": "#2"}, - "up": {"uv": [13, 10, 14, 12], "texture": "#2"}, - "down": {"uv": [13, 10, 14, 12], "texture": "#2"} + "north": { + "uv": [13, 0, 14, 1], + "texture": "#2" + }, + "east": { + "uv": [4, 0, 6, 1], + "texture": "#2" + }, + "south": { + "uv": [13, 0, 14, 1], + "texture": "#2" + }, + "west": { + "uv": [4, 0, 6, 1], + "texture": "#2" + }, + "up": { + "uv": [13, 10, 14, 12], + "texture": "#2" + }, + "down": { + "uv": [13, 10, 14, 12], + "texture": "#2" + } } }, { @@ -421,12 +974,30 @@ "from": [14, 15, 6], "to": [15, 16, 10], "faces": { - "north": {"uv": [1, 0, 2, 1], "texture": "#2"}, - "east": {"uv": [6, 0, 10, 1], "texture": "#2"}, - "south": {"uv": [14, 0, 15, 1], "texture": "#2"}, - "west": {"uv": [6, 0, 10, 1], "texture": "#2"}, - "up": {"uv": [14, 6, 15, 10], "texture": "#2"}, - "down": {"uv": [14, 6, 15, 10], "texture": "#2"} + "north": { + "uv": [1, 0, 2, 1], + "texture": "#2" + }, + "east": { + "uv": [6, 0, 10, 1], + "texture": "#2" + }, + "south": { + "uv": [14, 0, 15, 1], + "texture": "#2" + }, + "west": { + "uv": [6, 0, 10, 1], + "texture": "#2" + }, + "up": { + "uv": [14, 6, 15, 10], + "texture": "#2" + }, + "down": { + "uv": [14, 6, 15, 10], + "texture": "#2" + } } }, { @@ -434,12 +1005,30 @@ "from": [1, 15, 6], "to": [2, 16, 10], "faces": { - "north": {"uv": [14, 0, 15, 1], "texture": "#2"}, - "east": {"uv": [6, 0, 10, 1], "texture": "#2"}, - "south": {"uv": [1, 0, 2, 1], "texture": "#2"}, - "west": {"uv": [6, 0, 10, 1], "texture": "#2"}, - "up": {"uv": [1, 6, 2, 10], "texture": "#2"}, - "down": {"uv": [1, 6, 2, 10], "texture": "#2"} + "north": { + "uv": [14, 0, 15, 1], + "texture": "#2" + }, + "east": { + "uv": [6, 0, 10, 1], + "texture": "#2" + }, + "south": { + "uv": [1, 0, 2, 1], + "texture": "#2" + }, + "west": { + "uv": [6, 0, 10, 1], + "texture": "#2" + }, + "up": { + "uv": [1, 6, 2, 10], + "texture": "#2" + }, + "down": { + "uv": [1, 6, 2, 10], + "texture": "#2" + } } }, { @@ -447,12 +1036,30 @@ "from": [6, 15, 1], "to": [10, 16, 2], "faces": { - "north": {"uv": [6, 0, 10, 1], "texture": "#2"}, - "east": {"uv": [14, 0, 15, 1], "texture": "#2"}, - "south": {"uv": [6, 0, 10, 1], "texture": "#2"}, - "west": {"uv": [1, 0, 2, 1], "texture": "#2"}, - "up": {"uv": [6, 1, 10, 2], "texture": "#2"}, - "down": {"uv": [6, 1, 10, 2], "texture": "#2"} + "north": { + "uv": [6, 0, 10, 1], + "texture": "#2" + }, + "east": { + "uv": [14, 0, 15, 1], + "texture": "#2" + }, + "south": { + "uv": [6, 0, 10, 1], + "texture": "#2" + }, + "west": { + "uv": [1, 0, 2, 1], + "texture": "#2" + }, + "up": { + "uv": [6, 1, 10, 2], + "texture": "#2" + }, + "down": { + "uv": [6, 1, 10, 2], + "texture": "#2" + } } }, { @@ -460,12 +1067,30 @@ "from": [12, 15, 12], "to": [13, 16, 13], "faces": { - "north": {"uv": [12, 0, 13, 1], "texture": "#2"}, - "east": {"uv": [3, 0, 4, 1], "texture": "#2"}, - "south": {"uv": [12, 0, 13, 1], "texture": "#2"}, - "west": {"uv": [3, 0, 4, 1], "texture": "#2"}, - "up": {"uv": [12, 12, 13, 13], "texture": "#2"}, - "down": {"uv": [12, 12, 13, 13], "texture": "#2"} + "north": { + "uv": [12, 0, 13, 1], + "texture": "#2" + }, + "east": { + "uv": [3, 0, 4, 1], + "texture": "#2" + }, + "south": { + "uv": [12, 0, 13, 1], + "texture": "#2" + }, + "west": { + "uv": [3, 0, 4, 1], + "texture": "#2" + }, + "up": { + "uv": [12, 12, 13, 13], + "texture": "#2" + }, + "down": { + "uv": [12, 12, 13, 13], + "texture": "#2" + } } }, { @@ -473,12 +1098,30 @@ "from": [3, 15, 12], "to": [4, 16, 13], "faces": { - "north": {"uv": [3, 0, 4, 1], "texture": "#2"}, - "east": {"uv": [12, 0, 13, 1], "texture": "#2"}, - "south": {"uv": [3, 0, 4, 1], "texture": "#2"}, - "west": {"uv": [12, 0, 13, 1], "texture": "#2"}, - "up": {"uv": [3, 12, 4, 13], "texture": "#2"}, - "down": {"uv": [3, 12, 4, 13], "texture": "#2"} + "north": { + "uv": [3, 0, 4, 1], + "texture": "#2" + }, + "east": { + "uv": [12, 0, 13, 1], + "texture": "#2" + }, + "south": { + "uv": [3, 0, 4, 1], + "texture": "#2" + }, + "west": { + "uv": [12, 0, 13, 1], + "texture": "#2" + }, + "up": { + "uv": [3, 12, 4, 13], + "texture": "#2" + }, + "down": { + "uv": [3, 12, 4, 13], + "texture": "#2" + } } }, { @@ -486,12 +1129,30 @@ "from": [12, 15, 3], "to": [13, 16, 4], "faces": { - "north": {"uv": [3, 0, 4, 1], "texture": "#2"}, - "east": {"uv": [12, 0, 13, 1], "texture": "#2"}, - "south": {"uv": [3, 0, 4, 1], "texture": "#2"}, - "west": {"uv": [12, 0, 13, 1], "texture": "#2"}, - "up": {"uv": [12, 3, 13, 4], "texture": "#2"}, - "down": {"uv": [12, 3, 13, 4], "texture": "#2"} + "north": { + "uv": [3, 0, 4, 1], + "texture": "#2" + }, + "east": { + "uv": [12, 0, 13, 1], + "texture": "#2" + }, + "south": { + "uv": [3, 0, 4, 1], + "texture": "#2" + }, + "west": { + "uv": [12, 0, 13, 1], + "texture": "#2" + }, + "up": { + "uv": [12, 3, 13, 4], + "texture": "#2" + }, + "down": { + "uv": [12, 3, 13, 4], + "texture": "#2" + } } }, { @@ -499,12 +1160,30 @@ "from": [3, 15, 3], "to": [4, 16, 4], "faces": { - "north": {"uv": [12, 0, 13, 1], "texture": "#2"}, - "east": {"uv": [3, 0, 4, 1], "texture": "#2"}, - "south": {"uv": [12, 0, 13, 1], "texture": "#2"}, - "west": {"uv": [3, 0, 4, 1], "texture": "#2"}, - "up": {"uv": [3, 3, 4, 4], "texture": "#2"}, - "down": {"uv": [3, 3, 4, 4], "texture": "#2"} + "north": { + "uv": [12, 0, 13, 1], + "texture": "#2" + }, + "east": { + "uv": [3, 0, 4, 1], + "texture": "#2" + }, + "south": { + "uv": [12, 0, 13, 1], + "texture": "#2" + }, + "west": { + "uv": [3, 0, 4, 1], + "texture": "#2" + }, + "up": { + "uv": [3, 3, 4, 4], + "texture": "#2" + }, + "down": { + "uv": [3, 3, 4, 4], + "texture": "#2" + } } } ], diff --git a/src/main/resources/assets/naturesaura/models/block/powder_placer.json b/src/main/resources/assets/naturesaura/models/block/powder_placer.json index 6e750fa6..9122af64 100644 --- a/src/main/resources/assets/naturesaura/models/block/powder_placer.json +++ b/src/main/resources/assets/naturesaura/models/block/powder_placer.json @@ -1,4 +1,5 @@ { + "parent": "minecraft:block/block", "elements": [ { "from": [0, 0, 0], diff --git a/src/main/resources/assets/naturesaura/models/block/spawn_lamp.json b/src/main/resources/assets/naturesaura/models/block/spawn_lamp.json index b10ea493..9e0e2fea 100644 --- a/src/main/resources/assets/naturesaura/models/block/spawn_lamp.json +++ b/src/main/resources/assets/naturesaura/models/block/spawn_lamp.json @@ -1,5 +1,6 @@ { "__comment": "Model contributed by PolarizedIons <3", + "parent": "minecraft:block/block", "elements": [ { "name": "Base", diff --git a/src/main/resources/assets/naturesaura/models/block/wood_stand.json b/src/main/resources/assets/naturesaura/models/block/wood_stand.json index 3b757650..3ded5c48 100644 --- a/src/main/resources/assets/naturesaura/models/block/wood_stand.json +++ b/src/main/resources/assets/naturesaura/models/block/wood_stand.json @@ -1,4 +1,5 @@ { + "parent": "minecraft:block/block", "elements": [ { "from": [3, 0, 3], diff --git a/src/main/resources/assets/naturesaura/models/item/ancient_slab.json b/src/main/resources/assets/naturesaura/models/item/ancient_slab.json index 53c0b17a..58e26aa9 100644 --- a/src/main/resources/assets/naturesaura/models/item/ancient_slab.json +++ b/src/main/resources/assets/naturesaura/models/item/ancient_slab.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:block/half_slab", + "parent": "minecraft:block/slab", "textures": { "bottom": "naturesaura:blocks/ancient_planks", "top": "naturesaura:blocks/ancient_planks", diff --git a/src/main/resources/assets/naturesaura/models/item/decayed_leaves.json b/src/main/resources/assets/naturesaura/models/item/decayed_leaves.json index a4a000ae..cdb3c794 100644 --- a/src/main/resources/assets/naturesaura/models/item/decayed_leaves.json +++ b/src/main/resources/assets/naturesaura/models/item/decayed_leaves.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:model/leaves", + "parent": "minecraft:block/leaves", "textures": { "all": "naturesaura:blocks/decayed_leaves" } diff --git a/src/main/resources/assets/naturesaura/models/item/ender_crate.json b/src/main/resources/assets/naturesaura/models/item/ender_crate.json index 1ea1480d..03ac5b82 100644 --- a/src/main/resources/assets/naturesaura/models/item/ender_crate.json +++ b/src/main/resources/assets/naturesaura/models/item/ender_crate.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:blocks/cube", + "parent": "minecraft:block/cube", "textures": { "up": "naturesaura:blocks/ender_crate_top", "down": "naturesaura:blocks/ender_crate_bottom", diff --git a/src/main/resources/assets/naturesaura/models/item/golden_leaves.json b/src/main/resources/assets/naturesaura/models/item/golden_leaves.json index 6b2dd156..396ed04c 100644 --- a/src/main/resources/assets/naturesaura/models/item/golden_leaves.json +++ b/src/main/resources/assets/naturesaura/models/item/golden_leaves.json @@ -1,6 +1,6 @@ { "parent": "minecraft:block/leaves", "textures": { - "all": "minecraft:blocks/leaves_oak" + "all": "minecraft:block/oak_leaves" } } \ No newline at end of file diff --git a/src/main/resources/assets/naturesaura/models/item/infused_brick_slab.json b/src/main/resources/assets/naturesaura/models/item/infused_brick_slab.json index 47507d06..051095f2 100644 --- a/src/main/resources/assets/naturesaura/models/item/infused_brick_slab.json +++ b/src/main/resources/assets/naturesaura/models/item/infused_brick_slab.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:block/half_slab", + "parent": "minecraft:block/slab", "textures": { "bottom": "naturesaura:blocks/infused_brick", "top": "naturesaura:blocks/infused_brick", diff --git a/src/main/resources/assets/naturesaura/models/item/infused_slab.json b/src/main/resources/assets/naturesaura/models/item/infused_slab.json index 695e7685..d18b8350 100644 --- a/src/main/resources/assets/naturesaura/models/item/infused_slab.json +++ b/src/main/resources/assets/naturesaura/models/item/infused_slab.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:block/half_slab", + "parent": "minecraft:block/slab", "textures": { "bottom": "naturesaura:blocks/infused_stone", "top": "naturesaura:blocks/infused_stone", diff --git a/src/main/resources/assets/naturesaura/models/item/multiblock_maker.json b/src/main/resources/assets/naturesaura/models/item/multiblock_maker.json index cb73eabe..736a4269 100644 --- a/src/main/resources/assets/naturesaura/models/item/multiblock_maker.json +++ b/src/main/resources/assets/naturesaura/models/item/multiblock_maker.json @@ -1,6 +1,6 @@ { "parent": "item/generated", "textures": { - "layer0": "minecraft:items/stick" + "layer0": "minecraft:item/stick" } } \ No newline at end of file diff --git a/src/main/resources/assets/naturesaura/models/item/spawn_lamp.json b/src/main/resources/assets/naturesaura/models/item/spawn_lamp.json index 372a5a56..64c6d0e1 100644 --- a/src/main/resources/assets/naturesaura/models/item/spawn_lamp.json +++ b/src/main/resources/assets/naturesaura/models/item/spawn_lamp.json @@ -1,6 +1,7 @@ { "parent": "naturesaura:block/spawn_lamp", "textures": { - "0": "naturesaura:blocks/spawn_lamp" + "0": "naturesaura:blocks/spawn_lamp", + "-1": "naturesaura:blocks/spawn_lamp" } } \ No newline at end of file diff --git a/src/main/resources/assets/naturesaura/models/item/wood_stand.json b/src/main/resources/assets/naturesaura/models/item/wood_stand.json index 78519723..f7270cd8 100644 --- a/src/main/resources/assets/naturesaura/models/item/wood_stand.json +++ b/src/main/resources/assets/naturesaura/models/item/wood_stand.json @@ -1,7 +1,7 @@ { "parent": "naturesaura:block/wood_stand", "textures": { - "texture": "minecraft:blocks/log_oak", - "top": "minecraft:blocks/log_oak_top" + "texture": "minecraft:block/stripped_oak_log", + "top": "minecraft:block/stripped_oak_log_top" } } \ No newline at end of file