diff --git a/src/main/java/eu/midnightdust/motschen/decorative/DecorativeMain.java b/src/main/java/eu/midnightdust/motschen/decorative/DecorativeMain.java index ca446a1..ae87ad1 100755 --- a/src/main/java/eu/midnightdust/motschen/decorative/DecorativeMain.java +++ b/src/main/java/eu/midnightdust/motschen/decorative/DecorativeMain.java @@ -5,7 +5,6 @@ import eu.midnightdust.motschen.decorative.block.*; import eu.midnightdust.motschen.decorative.blockstates.CeilingFanStage; import eu.midnightdust.motschen.decorative.blockstates.Part; import eu.midnightdust.motschen.decorative.blockstates.PoolShape; -import eu.midnightdust.motschen.decorative.blockstates.Program; import eu.midnightdust.motschen.decorative.config.DecorativeConfig; import eu.midnightdust.motschen.decorative.init.*; import eu.midnightdust.motschen.decorative.polymer.PolymerSupport; @@ -13,11 +12,9 @@ import eu.midnightdust.motschen.decorative.polymer.TexturedSimpleBlock; import eu.midnightdust.motschen.decorative.sound.DecorativeSoundEvents; import eu.midnightdust.motschen.decorative.util.RegistryUtil; import eu.midnightdust.motschen.decorative.world.OreFeatures; -import eu.pb4.polymer.core.api.block.SimplePolymerBlock; import eu.pb4.polymer.core.api.item.PolymerItemGroupUtils; import net.fabricmc.api.ModInitializer; import net.fabricmc.fabric.api.itemgroup.v1.FabricItemGroup; -import net.minecraft.block.AbstractBlock; import net.minecraft.block.Block; import net.minecraft.block.Blocks; import net.minecraft.item.*; @@ -42,7 +39,6 @@ public class DecorativeMain implements ModInitializer { public static ItemGroup TrafficGroup; public static ItemGroup GardenGroup; public static ItemGroup PoolGroup; - public static final EnumProperty PROGRAM = EnumProperty.of("program", Program.class); public static final EnumProperty POOL_SHAPE = EnumProperty.of("shape", PoolShape.class); public static final EnumProperty PART = EnumProperty.of("part", Part.class); public static final EnumProperty STAGE = EnumProperty.of("stage", CeilingFanStage.class); diff --git a/src/main/java/eu/midnightdust/motschen/decorative/block/OldTelevision.java b/src/main/java/eu/midnightdust/motschen/decorative/block/OldTelevision.java index afb9a57..7414c4d 100755 --- a/src/main/java/eu/midnightdust/motschen/decorative/block/OldTelevision.java +++ b/src/main/java/eu/midnightdust/motschen/decorative/block/OldTelevision.java @@ -1,9 +1,9 @@ package eu.midnightdust.motschen.decorative.block; import com.mojang.serialization.MapCodec; -import eu.midnightdust.motschen.decorative.DecorativeMain; -import eu.midnightdust.motschen.decorative.blockstates.Program; +import eu.midnightdust.motschen.decorative.polymer.model.ItemDisplayTelevisionModel; import eu.pb4.factorytools.api.block.FactoryBlock; +import eu.pb4.polymer.virtualentity.api.ElementHolder; import net.minecraft.block.AbstractBlock; import net.minecraft.block.Block; import net.minecraft.block.BlockState; @@ -12,11 +12,14 @@ import net.minecraft.block.HorizontalFacingBlock; import net.minecraft.block.ShapeContext; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemPlacementContext; +import net.minecraft.server.network.ServerPlayerEntity; +import net.minecraft.server.world.ServerWorld; import net.minecraft.sound.BlockSoundGroup; import net.minecraft.sound.SoundCategory; import net.minecraft.sound.SoundEvents; import net.minecraft.state.StateManager; -import net.minecraft.state.property.EnumProperty; +import net.minecraft.state.property.BooleanProperty; +import net.minecraft.state.property.Properties; import net.minecraft.util.ActionResult; import net.minecraft.util.hit.BlockHitResult; import net.minecraft.util.math.BlockPos; @@ -26,8 +29,7 @@ import net.minecraft.util.shape.VoxelShapes; import net.minecraft.world.BlockView; import net.minecraft.world.World; import net.minecraft.world.WorldView; - -import java.util.function.ToIntFunction; +import org.jetbrains.annotations.Nullable; public class OldTelevision extends HorizontalFacingBlock implements FactoryBlock { @@ -35,16 +37,16 @@ public class OldTelevision extends HorizontalFacingBlock implements FactoryBlock private static final VoxelShape EAST_SHAPE; private static final VoxelShape SOUTH_SHAPE; private static final VoxelShape WEST_SHAPE; - private static final EnumProperty PROGRAM = DecorativeMain.PROGRAM; + public static final BooleanProperty POWERED = Properties.POWERED; public OldTelevision() { - super(AbstractBlock.Settings.copy(Blocks.BLACK_CONCRETE).nonOpaque().sounds(BlockSoundGroup.STONE).luminance(createLightLevelFromBlockState())); - this.setDefaultState(this.stateManager.getDefaultState().with(FACING, Direction.NORTH).with(PROGRAM, Program.OFF)); + super(AbstractBlock.Settings.copy(Blocks.BLACK_CONCRETE).nonOpaque().sounds(BlockSoundGroup.STONE).luminance((state) -> state.get(POWERED) ? 11 : 0)); + this.setDefaultState(this.stateManager.getDefaultState().with(FACING, Direction.NORTH).with(POWERED, false)); } @Override public ActionResult onUse(BlockState state, World world, BlockPos pos, PlayerEntity player, BlockHitResult hit) { - world.setBlockState(pos, state.with(PROGRAM, state.get(PROGRAM).next())); + world.setBlockState(pos, state.with(POWERED, !state.get(POWERED))); world.playSound(player, pos, SoundEvents.BLOCK_STONE_BUTTON_CLICK_ON, SoundCategory.BLOCKS, 0.2f, 1.5f); return ActionResult.SUCCESS; } @@ -52,14 +54,13 @@ public class OldTelevision extends HorizontalFacingBlock implements FactoryBlock @Override public BlockState getPlacementState(ItemPlacementContext itemPlacementContext) { return this.getDefaultState() - .with(FACING, itemPlacementContext.getHorizontalPlayerFacing().getOpposite()) - .with(PROGRAM, Program.OFF); + .with(FACING, itemPlacementContext.getHorizontalPlayerFacing().getOpposite()); } @Override protected void appendProperties(StateManager.Builder builder) { builder.add(FACING); - builder.add(PROGRAM); + builder.add(POWERED); } @Override public VoxelShape getOutlineShape(BlockState state, BlockView view, BlockPos pos, ShapeContext context) { @@ -95,17 +96,6 @@ public class OldTelevision extends HorizontalFacingBlock implements FactoryBlock return !worldView.isAir(pos.down()); } - private static ToIntFunction createLightLevelFromBlockState() { - return (blockState) -> { - if (blockState.get(PROGRAM) == Program.OFF) { - return 0; - } - else { - return 11; - } - }; - } - @Override protected MapCodec getCodec() { return null; @@ -116,4 +106,13 @@ public class OldTelevision extends HorizontalFacingBlock implements FactoryBlock public BlockState getPolymerBlockState(BlockState state) { return Blocks.BARRIER.getDefaultState(); } + @Override + public BlockState getPolymerBreakEventBlockState(BlockState state, ServerPlayerEntity player) { + return Blocks.GRAY_CONCRETE.getDefaultState(); + } + + @Override + public @Nullable ElementHolder createElementHolder(ServerWorld world, BlockPos pos, BlockState initialBlockState) { + return new ItemDisplayTelevisionModel(initialBlockState); + } } diff --git a/src/main/java/eu/midnightdust/motschen/decorative/block/Television.java b/src/main/java/eu/midnightdust/motschen/decorative/block/Television.java index 36d2186..03aa6d7 100755 --- a/src/main/java/eu/midnightdust/motschen/decorative/block/Television.java +++ b/src/main/java/eu/midnightdust/motschen/decorative/block/Television.java @@ -1,9 +1,9 @@ package eu.midnightdust.motschen.decorative.block; import com.mojang.serialization.MapCodec; -import eu.midnightdust.motschen.decorative.DecorativeMain; -import eu.midnightdust.motschen.decorative.blockstates.Program; +import eu.midnightdust.motschen.decorative.polymer.model.ItemDisplayTelevisionModel; import eu.pb4.factorytools.api.block.FactoryBlock; +import eu.pb4.polymer.virtualentity.api.ElementHolder; import net.minecraft.block.AbstractBlock; import net.minecraft.block.Block; import net.minecraft.block.BlockState; @@ -12,11 +12,14 @@ import net.minecraft.block.HorizontalFacingBlock; import net.minecraft.block.ShapeContext; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemPlacementContext; +import net.minecraft.server.network.ServerPlayerEntity; +import net.minecraft.server.world.ServerWorld; import net.minecraft.sound.BlockSoundGroup; import net.minecraft.sound.SoundCategory; import net.minecraft.sound.SoundEvents; import net.minecraft.state.StateManager; -import net.minecraft.state.property.EnumProperty; +import net.minecraft.state.property.BooleanProperty; +import net.minecraft.state.property.Properties; import net.minecraft.util.ActionResult; import net.minecraft.util.hit.BlockHitResult; import net.minecraft.util.math.BlockPos; @@ -26,9 +29,7 @@ import net.minecraft.util.shape.VoxelShapes; import net.minecraft.world.BlockView; import net.minecraft.world.World; import net.minecraft.world.WorldView; - -import java.util.Objects; -import java.util.function.ToIntFunction; +import org.jetbrains.annotations.Nullable; public class Television extends HorizontalFacingBlock implements FactoryBlock { @@ -36,16 +37,16 @@ public class Television extends HorizontalFacingBlock implements FactoryBlock { private static final VoxelShape EAST_SHAPE; private static final VoxelShape SOUTH_SHAPE; private static final VoxelShape WEST_SHAPE; - private static final EnumProperty PROGRAM = DecorativeMain.PROGRAM; + private static final BooleanProperty POWERED = Properties.POWERED; public Television() { - super(AbstractBlock.Settings.copy(Blocks.BLACK_CONCRETE).nonOpaque().sounds(BlockSoundGroup.STONE).luminance(createLightLevelFromBlockState())); - this.setDefaultState(this.stateManager.getDefaultState().with(FACING, Direction.NORTH).with(PROGRAM, Program.OFF)); + super(AbstractBlock.Settings.copy(Blocks.BLACK_CONCRETE).nonOpaque().sounds(BlockSoundGroup.STONE).luminance((state) -> state.get(POWERED) ? 11 : 0)); + this.setDefaultState(this.stateManager.getDefaultState().with(FACING, Direction.NORTH).with(POWERED, false)); } @Override public ActionResult onUse(BlockState state, World world, BlockPos pos, PlayerEntity player, BlockHitResult hit) { - world.setBlockState(pos, state.with(PROGRAM, state.get(PROGRAM).next())); + world.setBlockState(pos, state.with(POWERED, !state.get(POWERED))); world.playSound(player, pos, SoundEvents.BLOCK_STONE_BUTTON_CLICK_ON, SoundCategory.BLOCKS, 0.2f, 1.5f); return ActionResult.SUCCESS; } @@ -53,14 +54,13 @@ public class Television extends HorizontalFacingBlock implements FactoryBlock { @Override public BlockState getPlacementState(ItemPlacementContext itemPlacementContext) { return this.getDefaultState() - .with(FACING, itemPlacementContext.getHorizontalPlayerFacing().getOpposite()) - .with(PROGRAM, Program.OFF); + .with(FACING, itemPlacementContext.getHorizontalPlayerFacing().getOpposite()); } @Override protected void appendProperties(StateManager.Builder builder) { builder.add(FACING); - builder.add(PROGRAM); + builder.add(POWERED); } @Override public VoxelShape getOutlineShape(BlockState state, BlockView view, BlockPos pos, ShapeContext context) { @@ -96,17 +96,6 @@ public class Television extends HorizontalFacingBlock implements FactoryBlock { return !worldView.isAir(pos.down()); } - private static ToIntFunction createLightLevelFromBlockState() { - return (blockState) -> { - if (blockState.get(PROGRAM) == Program.OFF) { - return 0; - } - else { - return 11; - } - }; - } - @Override protected MapCodec getCodec() { return null; @@ -117,4 +106,13 @@ public class Television extends HorizontalFacingBlock implements FactoryBlock { public BlockState getPolymerBlockState(BlockState state) { return Blocks.BARRIER.getDefaultState(); } + @Override + public BlockState getPolymerBreakEventBlockState(BlockState state, ServerPlayerEntity player) { + return Blocks.BLACK_CONCRETE.getDefaultState(); + } + + @Override + public @Nullable ElementHolder createElementHolder(ServerWorld world, BlockPos pos, BlockState initialBlockState) { + return new ItemDisplayTelevisionModel(initialBlockState); + } } diff --git a/src/main/java/eu/midnightdust/motschen/decorative/blockstates/Program.java b/src/main/java/eu/midnightdust/motschen/decorative/blockstates/Program.java deleted file mode 100755 index 43d214c..0000000 --- a/src/main/java/eu/midnightdust/motschen/decorative/blockstates/Program.java +++ /dev/null @@ -1,30 +0,0 @@ -package eu.midnightdust.motschen.decorative.blockstates; - -import net.minecraft.util.StringIdentifiable; - -public enum Program implements StringIdentifiable { - OFF("off"), - NYANCAT("nyancat"), - CREEPER("creeper"), - CRABRAVE("crabrave"), - TATER("tater"); - - private final String name; - private static final Program[] vals = values(); - - Program(String name) { - this.name = name; - } - - public Program next() { - return vals[(this.ordinal() + 1) % vals.length]; - } - - public String toString() { - return this.name; - } - - public String asString() { - return this.name; - } -} diff --git a/src/main/java/eu/midnightdust/motschen/decorative/polymer/PolymerSupport.java b/src/main/java/eu/midnightdust/motschen/decorative/polymer/PolymerSupport.java index 2c59ee8..136d020 100644 --- a/src/main/java/eu/midnightdust/motschen/decorative/polymer/PolymerSupport.java +++ b/src/main/java/eu/midnightdust/motschen/decorative/polymer/PolymerSupport.java @@ -17,6 +17,7 @@ public class PolymerSupport { ItemDisplayPoolWallModel.initModels(); ItemDisplaySlidingDoorModel.initModels(); ItemDisplaySpringboardModel.initModels(); + ItemDisplayTelevisionModel.initModels(); ItemDisplayWallClockModel.initModels(); } } diff --git a/src/main/java/eu/midnightdust/motschen/decorative/polymer/model/ItemDisplaySpringboardModel.java b/src/main/java/eu/midnightdust/motschen/decorative/polymer/model/ItemDisplaySpringboardModel.java index ab6563d..a879163 100644 --- a/src/main/java/eu/midnightdust/motschen/decorative/polymer/model/ItemDisplaySpringboardModel.java +++ b/src/main/java/eu/midnightdust/motschen/decorative/polymer/model/ItemDisplaySpringboardModel.java @@ -12,7 +12,6 @@ import eu.pb4.polymer.virtualentity.api.elements.ItemDisplayElement; import net.minecraft.block.BlockState; import net.minecraft.item.ItemStack; import net.minecraft.util.math.RotationAxis; -import net.minecraft.util.math.Vec3d; import org.joml.Vector3f; import static eu.midnightdust.motschen.decorative.DecorativeMain.id; @@ -31,7 +30,6 @@ public class ItemDisplaySpringboardModel extends BlockModel { this.main = ItemDisplayElementUtil.createSimple(getModel(state)); this.main.setDisplaySize(1, 1); this.main.setScale(new Vector3f(1)); - //this.main.setOffset(new Vec3d(0d, 0.25d, 0d)); this.main.setRightRotation(RotationAxis.POSITIVE_Y.rotationDegrees(getRotation(state))); this.main.setViewRange(DecorativeConfig.viewDistance / 100f); this.addElement(this.main); @@ -48,7 +46,7 @@ public class ItemDisplaySpringboardModel extends BlockModel { } } public ItemStack getModel(BlockState state) { - return state.get(Springboard.PART) == Part.BACK ? BACK : FRONT; + return state.get(Springboard.PART) == Part.BACK ? BACK : FRONT; } public float getRotation(BlockState state) { return state.get(Springboard.FACING).getHorizontal() * -90 - 90; diff --git a/src/main/java/eu/midnightdust/motschen/decorative/polymer/model/ItemDisplayTelevisionModel.java b/src/main/java/eu/midnightdust/motschen/decorative/polymer/model/ItemDisplayTelevisionModel.java new file mode 100644 index 0000000..58d7be1 --- /dev/null +++ b/src/main/java/eu/midnightdust/motschen/decorative/polymer/model/ItemDisplayTelevisionModel.java @@ -0,0 +1,62 @@ +package eu.midnightdust.motschen.decorative.polymer.model; + +import eu.midnightdust.motschen.decorative.block.OldTelevision; +import eu.midnightdust.motschen.decorative.block.Television; +import eu.midnightdust.motschen.decorative.config.DecorativeConfig; +import eu.pb4.factorytools.api.resourcepack.BaseItemProvider; +import eu.pb4.factorytools.api.virtualentity.BlockModel; +import eu.pb4.factorytools.api.virtualentity.ItemDisplayElementUtil; +import eu.pb4.polymer.virtualentity.api.attachment.BlockAwareAttachment; +import eu.pb4.polymer.virtualentity.api.attachment.HolderAttachment; +import eu.pb4.polymer.virtualentity.api.elements.ItemDisplayElement; +import net.minecraft.block.BlockState; +import net.minecraft.item.ItemStack; +import net.minecraft.util.math.RotationAxis; +import org.joml.Vector3f; + +import static eu.midnightdust.motschen.decorative.DecorativeMain.id; + +public class ItemDisplayTelevisionModel extends BlockModel { + private final ItemDisplayElement main; + private static ItemStack MODERN; + private static ItemStack OLD_OFF; + private static ItemStack OLD_ON; + + public static void initModels() { + MODERN = BaseItemProvider.requestModel(id("block/television")); + OLD_OFF = BaseItemProvider.requestModel(id("block/old_television_off")); + OLD_ON = BaseItemProvider.requestModel(id("block/old_television_on")); + } + + public ItemDisplayTelevisionModel(BlockState state) { + this.main = ItemDisplayElementUtil.createSimple(getModel(state)); + this.main.setDisplaySize(1, 1); + this.main.setScale(new Vector3f(2)); + this.main.setRightRotation(RotationAxis.POSITIVE_Y.rotationDegrees(getRotation(state))); + this.main.setViewRange(DecorativeConfig.viewDistance / 100f); + this.addElement(this.main); + } + + @Override + public void notifyUpdate(HolderAttachment.UpdateType updateType) { + if (updateType == BlockAwareAttachment.BLOCK_STATE_UPDATE) { + var state = this.blockState(); + this.main.setItem(getModel(state)); + this.main.setRightRotation(RotationAxis.POSITIVE_Y.rotationDegrees(getRotation(state))); + + this.tick(); + } + } + public ItemStack getModel(BlockState state) { + return state.getBlock() instanceof OldTelevision ? + (state.get(OldTelevision.POWERED) ? OLD_ON : OLD_OFF) : + MODERN; + } + public float getRotation(BlockState state) { + return state.getBlock() instanceof OldTelevision ? + state.get(OldTelevision.FACING).getHorizontal() * -90 - 180 : + state.get(Television.FACING).getHorizontal() * -90 - 180; + } + +} + diff --git a/src/main/resources/assets/decorative/blockstates/television.json b/src/main/resources/assets/decorative/blockstates/television.json index dad3308..4f77612 100755 --- a/src/main/resources/assets/decorative/blockstates/television.json +++ b/src/main/resources/assets/decorative/blockstates/television.json @@ -1,28 +1,8 @@ { "variants": { - "facing=south,program=off": { "model": "decorative:block/television_off", "uvlock": true }, - "facing=west,program=off": { "model": "decorative:block/television_off", "uvlock": true, "y": 90 }, - "facing=north,program=off": { "model": "decorative:block/television_off", "uvlock": true, "y": 180 }, - "facing=east,program=off": { "model": "decorative:block/television_off", "uvlock": true, "y": 270 }, - - "facing=south,program=nyancat": { "model": "decorative:block/television_nyancat", "uvlock": true }, - "facing=west,program=nyancat": { "model": "decorative:block/television_nyancat", "uvlock": true, "y": 90 }, - "facing=north,program=nyancat": { "model": "decorative:block/television_nyancat", "uvlock": true, "y": 180 }, - "facing=east,program=nyancat": { "model": "decorative:block/television_nyancat", "uvlock": true, "y": 270 }, - - "facing=south,program=creeper": { "model": "decorative:block/television_creeper", "uvlock": true }, - "facing=west,program=creeper": { "model": "decorative:block/television_creeper", "uvlock": true, "y": 90 }, - "facing=north,program=creeper": { "model": "decorative:block/television_creeper", "uvlock": true, "y": 180 }, - "facing=east,program=creeper": { "model": "decorative:block/television_creeper", "uvlock": true, "y": 270 }, - - "facing=south,program=crabrave": { "model": "decorative:block/television_crabrave", "uvlock": true }, - "facing=west,program=crabrave": { "model": "decorative:block/television_crabrave", "uvlock": true, "y": 90 }, - "facing=north,program=crabrave": { "model": "decorative:block/television_crabrave", "uvlock": true, "y": 180 }, - "facing=east,program=crabrave": { "model": "decorative:block/television_crabrave", "uvlock": true, "y": 270 }, - - "facing=south,program=tater": { "model": "decorative:block/television_tater", "uvlock": true }, - "facing=west,program=tater": { "model": "decorative:block/television_tater", "uvlock": true, "y": 90 }, - "facing=north,program=tater": { "model": "decorative:block/television_tater", "uvlock": true, "y": 180 }, - "facing=east,program=tater": { "model": "decorative:block/television_tater", "uvlock": true, "y": 270 } + "facing=south": { "model": "decorative:block/television", "uvlock": true }, + "facing=west": { "model": "decorative:block/television", "uvlock": true, "y": 90 }, + "facing=north": { "model": "decorative:block/television", "uvlock": true, "y": 180 }, + "facing=east": { "model": "decorative:block/television", "uvlock": true, "y": 270 } } } diff --git a/src/main/resources/assets/decorative/models/block/old_television_crabrave.json b/src/main/resources/assets/decorative/models/block/old_television_crabrave.json deleted file mode 100755 index 9634374..0000000 --- a/src/main/resources/assets/decorative/models/block/old_television_crabrave.json +++ /dev/null @@ -1,222 +0,0 @@ -{ - "credit": "made by Motschen", - "parent": "block/block", - "ambientocclusion": false, - "textures": { - "2": "block/gray_concrete", - "3": "block/iron_block", - "4": "block/lime_terracotta", - "5": "block/light_gray_concrete", - "crabrave": "decorative:tv/crabrave", - "particle": "block/black_concrete", - "tv": "block/black_concrete" - }, - "elements": [ - { - "from": [2, 2, 12.7], - "to": [14, 12, 14], - "rotation": {"angle": 0, "axis": "y", "origin": [8.5, 18.5, 12.5]}, - "faces": { - "north": {"uv": [0, 1.6, 16, 14.4], "texture": "#tv"}, - "east": {"uv": [0, 1.6, 3.2, 14.4], "texture": "#tv"}, - "south": {"uv": [0.65, 2, 15.549, 13.15], "texture": "#crabrave"}, - "west": {"uv": [12.8, 1.6, 16, 14.4], "texture": "#tv"}, - "up": {"uv": [0, 1.6, 16, 4.8], "rotation": 180, "texture": "#tv"}, - "down": {"uv": [0, 11.2, 16, 14.4], "rotation": 180, "texture": "#tv"} - } - }, - { - "from": [0, 0, 2], - "to": [16, 2, 15], - "faces": { - "north": {"uv": [0, 0, 16, 2], "texture": "#2"}, - "east": {"uv": [0, 0, 13, 2], "texture": "#2"}, - "south": {"uv": [0, 0, 16, 2], "texture": "#2"}, - "west": {"uv": [0, 0, 13, 2], "texture": "#2"}, - "up": {"uv": [0, 0, 16, 13], "texture": "#2"}, - "down": {"uv": [0, 0, 16, 13], "texture": "#2"} - } - }, - { - "from": [0, 12, 2], - "to": [16, 14, 15], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 20, 8]}, - "faces": { - "north": {"uv": [0, 0, 16, 2], "texture": "#2"}, - "east": {"uv": [0, 0, 13, 2], "texture": "#2"}, - "south": {"uv": [0, 0, 16, 2], "texture": "#2"}, - "west": {"uv": [0, 0, 13, 2], "texture": "#2"}, - "up": {"uv": [0, 0, 16, 13], "texture": "#2"}, - "down": {"uv": [0, 0, 16, 13], "texture": "#2"} - } - }, - { - "from": [0, 2, 2], - "to": [2, 12, 15], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 10, 8]}, - "faces": { - "north": {"uv": [0, 0, 2, 10], "texture": "#2"}, - "east": {"uv": [0, 0, 13, 10], "texture": "#2"}, - "south": {"uv": [0, 0, 2, 10], "texture": "#2"}, - "west": {"uv": [0, 0, 13, 10], "texture": "#2"} - } - }, - { - "from": [14, 2, 2], - "to": [16, 12, 15], - "rotation": {"angle": 0, "axis": "y", "origin": [22, 10, 8]}, - "faces": { - "north": {"uv": [0, 0, 2, 10], "texture": "#2"}, - "east": {"uv": [0, 0, 13, 10], "texture": "#2"}, - "south": {"uv": [0, 0, 2, 10], "texture": "#2"}, - "west": {"uv": [0, 0, 13, 10], "texture": "#2"} - } - }, - { - "from": [2, 2, 3], - "to": [14, 12, 13], - "rotation": {"angle": 0, "axis": "y", "origin": [20, 10, 8]}, - "faces": { - "north": {"uv": [0, 0, 12, 10], "texture": "#2"}, - "east": {"uv": [0, 0, 10, 10], "texture": "#2"}, - "south": {"uv": [0, 0, 12, 10], "texture": "#2"}, - "west": {"uv": [0, 0, 10, 10], "texture": "#2"} - } - }, - { - "from": [11, 3, 2.5], - "to": [13, 4, 3.5], - "rotation": {"angle": 0, "axis": "y", "origin": [19, 11, 10]}, - "faces": { - "north": {"uv": [0, 0, 2, 1], "texture": "#tv"}, - "east": {"uv": [0, 0, 1, 1], "texture": "#tv"}, - "west": {"uv": [0, 0, 1, 1], "texture": "#tv"}, - "up": {"uv": [0, 0, 2, 1], "texture": "#tv"}, - "down": {"uv": [0, 0, 2, 1], "texture": "#tv"} - } - }, - { - "from": [8, 3, 2.5], - "to": [10, 4, 3.5], - "rotation": {"angle": 0, "axis": "y", "origin": [16, 11, 10]}, - "faces": { - "north": {"uv": [0, 0, 2, 1], "texture": "#tv"}, - "east": {"uv": [0, 0, 1, 1], "texture": "#tv"}, - "west": {"uv": [0, 0, 1, 1], "texture": "#tv"}, - "up": {"uv": [0, 0, 2, 1], "texture": "#tv"}, - "down": {"uv": [0, 0, 2, 1], "texture": "#tv"} - } - }, - { - "from": [3, 3, 2.5], - "to": [4, 4, 3.5], - "rotation": {"angle": 0, "axis": "y", "origin": [11, 11, 10]}, - "faces": { - "north": {"uv": [0, 0, 1, 1], "texture": "#tv"}, - "east": {"uv": [0, 0, 1, 1], "texture": "#tv"}, - "west": {"uv": [0, 0, 1, 1], "texture": "#tv"}, - "up": {"uv": [0, 0, 1, 1], "texture": "#tv"}, - "down": {"uv": [0, 0, 1, 1], "texture": "#tv"} - } - }, - { - "from": [3.5, 15.8, 12], - "to": [4.5, 19.8, 13], - "rotation": {"angle": 22.5, "axis": "z", "origin": [11, 24, 20]}, - "faces": { - "north": {"uv": [0, 0, 1, 4], "texture": "#3"}, - "east": {"uv": [0, 0, 1, 4], "texture": "#3"}, - "south": {"uv": [0, 0, 1, 4], "texture": "#3"}, - "west": {"uv": [0, 0, 1, 4], "texture": "#3"}, - "up": {"uv": [0, 0, 1, 1], "texture": "#3"} - } - }, - { - "from": [11.5, 15, 12], - "to": [12.5, 19, 13], - "rotation": {"angle": -22.5, "axis": "z", "origin": [4, 23, 20]}, - "faces": { - "north": {"uv": [0, 0, 1, 4], "texture": "#3"}, - "east": {"uv": [0, 0, 1, 4], "texture": "#3"}, - "south": {"uv": [0, 0, 1, 4], "texture": "#3"}, - "west": {"uv": [0, 0, 1, 4], "texture": "#3"}, - "up": {"uv": [0, 0, 1, 1], "rotation": 90, "texture": "#3"} - } - }, - { - "from": [1, 0.75, 15], - "to": [1.5, 1.25, 15.25], - "rotation": {"angle": 0, "axis": "y", "origin": [9, 9, 23]}, - "faces": { - "east": {"uv": [0, 0, 0.25, 0.5], "texture": "#4"}, - "south": {"uv": [0, 0, 0.5, 0.5], "texture": "#4"}, - "west": {"uv": [0, 0, 0.25, 0.5], "texture": "#4"}, - "up": {"uv": [0, 0, 0.5, 0.25], "texture": "#4"}, - "down": {"uv": [0, 0, 0.5, 0.25], "texture": "#4"} - } - }, - { - "from": [2, 0.75, 15], - "to": [2.5, 1.25, 15.25], - "rotation": {"angle": 0, "axis": "y", "origin": [10, 9, 23]}, - "faces": { - "east": {"uv": [0, 0, 0.25, 0.5], "texture": "#tv"}, - "south": {"uv": [0, 0, 0.5, 0.5], "texture": "#tv"}, - "west": {"uv": [0, 0, 0.25, 0.5], "texture": "#tv"}, - "up": {"uv": [0, 0, 0.5, 0.25], "texture": "#tv"}, - "down": {"uv": [0, 0, 0.5, 0.25], "texture": "#tv"} - } - }, - { - "from": [4, 6, 2.9], - "to": [12, 11, 3.9], - "rotation": {"angle": 0, "axis": "y", "origin": [12, 14, 10]}, - "faces": { - "north": {"uv": [0, 0, 8, 5], "texture": "#5"}, - "east": {"uv": [0, 0, 1, 5], "texture": "#5"}, - "west": {"uv": [0, 0, 1, 5], "texture": "#5"}, - "up": {"uv": [0, 0, 8, 1], "texture": "#5"}, - "down": {"uv": [0, 0, 8, 1], "texture": "#5"} - } - } - ], - "display": { - "thirdperson_righthand": { - "translation": [0, 4, 0], - "scale": [0.5, 0.5, 0.5] - }, - "thirdperson_lefthand": { - "translation": [0, 4, 0], - "scale": [0.5, 0.5, 0.5] - }, - "firstperson_righthand": { - "rotation": [0, -22, 0], - "translation": [0, 4.5, 0], - "scale": [0.35, 0.35, 0.35] - }, - "firstperson_lefthand": { - "rotation": [0, -19, 0], - "translation": [0, 4.5, 0], - "scale": [0.35, 0.35, 0.35] - }, - "ground": { - "translation": [0, 0.75, 0], - "scale": [0.5, 0.5, 0.5] - }, - "gui": { - "rotation": [15, -45, 0], - "translation": [0.25, 0.25, 0], - "scale": [0.75, 0.75, 0.61] - }, - "head": { - "rotation": [0, -180, 0], - "translation": [0, 10.25, 0], - "scale": [0.5, 0.5, 0.5] - }, - "fixed": { - "rotation": [0, -180, 0], - "translation": [0, 0, 2.5], - "scale": [0.75, 0.75, 0.75] - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/decorative/models/block/old_television_creeper.json b/src/main/resources/assets/decorative/models/block/old_television_creeper.json deleted file mode 100755 index d192c2f..0000000 --- a/src/main/resources/assets/decorative/models/block/old_television_creeper.json +++ /dev/null @@ -1,222 +0,0 @@ -{ - "credit": "made by Motschen", - "parent": "block/block", - "ambientocclusion": false, - "textures": { - "2": "block/gray_concrete", - "3": "block/iron_block", - "4": "block/lime_terracotta", - "5": "block/light_gray_concrete", - "creeper": "decorative:tv/creeper", - "particle": "block/black_concrete", - "tv": "block/black_concrete" - }, - "elements": [ - { - "from": [2, 2, 12.7], - "to": [14, 12, 14], - "rotation": {"angle": 0, "axis": "y", "origin": [8.5, 18.5, 12.5]}, - "faces": { - "north": {"uv": [0, 1.6, 16, 14.4], "texture": "#tv"}, - "east": {"uv": [0, 1.6, 3.2, 14.4], "texture": "#tv"}, - "south": {"uv": [0.65, 2, 15.549, 13.15], "texture": "#creeper"}, - "west": {"uv": [12.8, 1.6, 16, 14.4], "texture": "#tv"}, - "up": {"uv": [0, 1.6, 16, 4.8], "rotation": 180, "texture": "#tv"}, - "down": {"uv": [0, 11.2, 16, 14.4], "rotation": 180, "texture": "#tv"} - } - }, - { - "from": [0, 0, 2], - "to": [16, 2, 15], - "faces": { - "north": {"uv": [0, 0, 16, 2], "texture": "#2"}, - "east": {"uv": [0, 0, 13, 2], "texture": "#2"}, - "south": {"uv": [0, 0, 16, 2], "texture": "#2"}, - "west": {"uv": [0, 0, 13, 2], "texture": "#2"}, - "up": {"uv": [0, 0, 16, 13], "texture": "#2"}, - "down": {"uv": [0, 0, 16, 13], "texture": "#2"} - } - }, - { - "from": [0, 12, 2], - "to": [16, 14, 15], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 20, 8]}, - "faces": { - "north": {"uv": [0, 0, 16, 2], "texture": "#2"}, - "east": {"uv": [0, 0, 13, 2], "texture": "#2"}, - "south": {"uv": [0, 0, 16, 2], "texture": "#2"}, - "west": {"uv": [0, 0, 13, 2], "texture": "#2"}, - "up": {"uv": [0, 0, 16, 13], "texture": "#2"}, - "down": {"uv": [0, 0, 16, 13], "texture": "#2"} - } - }, - { - "from": [0, 2, 2], - "to": [2, 12, 15], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 10, 8]}, - "faces": { - "north": {"uv": [0, 0, 2, 10], "texture": "#2"}, - "east": {"uv": [0, 0, 13, 10], "texture": "#2"}, - "south": {"uv": [0, 0, 2, 10], "texture": "#2"}, - "west": {"uv": [0, 0, 13, 10], "texture": "#2"} - } - }, - { - "from": [14, 2, 2], - "to": [16, 12, 15], - "rotation": {"angle": 0, "axis": "y", "origin": [22, 10, 8]}, - "faces": { - "north": {"uv": [0, 0, 2, 10], "texture": "#2"}, - "east": {"uv": [0, 0, 13, 10], "texture": "#2"}, - "south": {"uv": [0, 0, 2, 10], "texture": "#2"}, - "west": {"uv": [0, 0, 13, 10], "texture": "#2"} - } - }, - { - "from": [2, 2, 3], - "to": [14, 12, 13], - "rotation": {"angle": 0, "axis": "y", "origin": [20, 10, 8]}, - "faces": { - "north": {"uv": [0, 0, 12, 10], "texture": "#2"}, - "east": {"uv": [0, 0, 10, 10], "texture": "#2"}, - "south": {"uv": [0, 0, 12, 10], "texture": "#2"}, - "west": {"uv": [0, 0, 10, 10], "texture": "#2"} - } - }, - { - "from": [11, 3, 2.5], - "to": [13, 4, 3.5], - "rotation": {"angle": 0, "axis": "y", "origin": [19, 11, 10]}, - "faces": { - "north": {"uv": [0, 0, 2, 1], "texture": "#tv"}, - "east": {"uv": [0, 0, 1, 1], "texture": "#tv"}, - "west": {"uv": [0, 0, 1, 1], "texture": "#tv"}, - "up": {"uv": [0, 0, 2, 1], "texture": "#tv"}, - "down": {"uv": [0, 0, 2, 1], "texture": "#tv"} - } - }, - { - "from": [8, 3, 2.5], - "to": [10, 4, 3.5], - "rotation": {"angle": 0, "axis": "y", "origin": [16, 11, 10]}, - "faces": { - "north": {"uv": [0, 0, 2, 1], "texture": "#tv"}, - "east": {"uv": [0, 0, 1, 1], "texture": "#tv"}, - "west": {"uv": [0, 0, 1, 1], "texture": "#tv"}, - "up": {"uv": [0, 0, 2, 1], "texture": "#tv"}, - "down": {"uv": [0, 0, 2, 1], "texture": "#tv"} - } - }, - { - "from": [3, 3, 2.5], - "to": [4, 4, 3.5], - "rotation": {"angle": 0, "axis": "y", "origin": [11, 11, 10]}, - "faces": { - "north": {"uv": [0, 0, 1, 1], "texture": "#tv"}, - "east": {"uv": [0, 0, 1, 1], "texture": "#tv"}, - "west": {"uv": [0, 0, 1, 1], "texture": "#tv"}, - "up": {"uv": [0, 0, 1, 1], "texture": "#tv"}, - "down": {"uv": [0, 0, 1, 1], "texture": "#tv"} - } - }, - { - "from": [3.5, 15.8, 12], - "to": [4.5, 19.8, 13], - "rotation": {"angle": 22.5, "axis": "z", "origin": [11, 24, 20]}, - "faces": { - "north": {"uv": [0, 0, 1, 4], "texture": "#3"}, - "east": {"uv": [0, 0, 1, 4], "texture": "#3"}, - "south": {"uv": [0, 0, 1, 4], "texture": "#3"}, - "west": {"uv": [0, 0, 1, 4], "texture": "#3"}, - "up": {"uv": [0, 0, 1, 1], "texture": "#3"} - } - }, - { - "from": [11.5, 15, 12], - "to": [12.5, 19, 13], - "rotation": {"angle": -22.5, "axis": "z", "origin": [4, 23, 20]}, - "faces": { - "north": {"uv": [0, 0, 1, 4], "texture": "#3"}, - "east": {"uv": [0, 0, 1, 4], "texture": "#3"}, - "south": {"uv": [0, 0, 1, 4], "texture": "#3"}, - "west": {"uv": [0, 0, 1, 4], "texture": "#3"}, - "up": {"uv": [0, 0, 1, 1], "rotation": 90, "texture": "#3"} - } - }, - { - "from": [1, 0.75, 15], - "to": [1.5, 1.25, 15.25], - "rotation": {"angle": 0, "axis": "y", "origin": [9, 9, 23]}, - "faces": { - "east": {"uv": [0, 0, 0.25, 0.5], "texture": "#4"}, - "south": {"uv": [0, 0, 0.5, 0.5], "texture": "#4"}, - "west": {"uv": [0, 0, 0.25, 0.5], "texture": "#4"}, - "up": {"uv": [0, 0, 0.5, 0.25], "texture": "#4"}, - "down": {"uv": [0, 0, 0.5, 0.25], "texture": "#4"} - } - }, - { - "from": [2, 0.75, 15], - "to": [2.5, 1.25, 15.25], - "rotation": {"angle": 0, "axis": "y", "origin": [10, 9, 23]}, - "faces": { - "east": {"uv": [0, 0, 0.25, 0.5], "texture": "#tv"}, - "south": {"uv": [0, 0, 0.5, 0.5], "texture": "#tv"}, - "west": {"uv": [0, 0, 0.25, 0.5], "texture": "#tv"}, - "up": {"uv": [0, 0, 0.5, 0.25], "texture": "#tv"}, - "down": {"uv": [0, 0, 0.5, 0.25], "texture": "#tv"} - } - }, - { - "from": [4, 6, 2.9], - "to": [12, 11, 3.9], - "rotation": {"angle": 0, "axis": "y", "origin": [12, 14, 10]}, - "faces": { - "north": {"uv": [0, 0, 8, 5], "texture": "#5"}, - "east": {"uv": [0, 0, 1, 5], "texture": "#5"}, - "west": {"uv": [0, 0, 1, 5], "texture": "#5"}, - "up": {"uv": [0, 0, 8, 1], "texture": "#5"}, - "down": {"uv": [0, 0, 8, 1], "texture": "#5"} - } - } - ], - "display": { - "thirdperson_righthand": { - "translation": [0, 4, 0], - "scale": [0.5, 0.5, 0.5] - }, - "thirdperson_lefthand": { - "translation": [0, 4, 0], - "scale": [0.5, 0.5, 0.5] - }, - "firstperson_righthand": { - "rotation": [0, -22, 0], - "translation": [0, 4.5, 0], - "scale": [0.35, 0.35, 0.35] - }, - "firstperson_lefthand": { - "rotation": [0, -19, 0], - "translation": [0, 4.5, 0], - "scale": [0.35, 0.35, 0.35] - }, - "ground": { - "translation": [0, 0.75, 0], - "scale": [0.5, 0.5, 0.5] - }, - "gui": { - "rotation": [15, -45, 0], - "translation": [0.25, 0.25, 0], - "scale": [0.75, 0.75, 0.61] - }, - "head": { - "rotation": [0, -180, 0], - "translation": [0, 10.25, 0], - "scale": [0.5, 0.5, 0.5] - }, - "fixed": { - "rotation": [0, -180, 0], - "translation": [0, 0, 2.5], - "scale": [0.75, 0.75, 0.75] - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/decorative/models/block/old_television_nyancat.json b/src/main/resources/assets/decorative/models/block/old_television_nyancat.json deleted file mode 100755 index be45223..0000000 --- a/src/main/resources/assets/decorative/models/block/old_television_nyancat.json +++ /dev/null @@ -1,222 +0,0 @@ -{ - "credit": "made by Motschen", - "parent": "block/block", - "ambientocclusion": false, - "textures": { - "2": "block/gray_concrete", - "3": "block/iron_block", - "4": "block/lime_terracotta", - "5": "block/light_gray_concrete", - "nyancat": "decorative:tv/nyancat", - "particle": "block/black_concrete", - "tv": "block/black_concrete" - }, - "elements": [ - { - "from": [2, 2, 12.7], - "to": [14, 12, 14], - "rotation": {"angle": 0, "axis": "y", "origin": [8.5, 18.5, 12.5]}, - "faces": { - "north": {"uv": [0, 1.6, 16, 14.4], "texture": "#tv"}, - "east": {"uv": [0, 1.6, 3.2, 14.4], "texture": "#tv"}, - "south": {"uv": [0.65, 2, 15.549, 13.15], "texture": "#nyancat"}, - "west": {"uv": [12.8, 1.6, 16, 14.4], "texture": "#tv"}, - "up": {"uv": [0, 1.6, 16, 4.8], "rotation": 180, "texture": "#tv"}, - "down": {"uv": [0, 11.2, 16, 14.4], "rotation": 180, "texture": "#tv"} - } - }, - { - "from": [0, 0, 2], - "to": [16, 2, 15], - "faces": { - "north": {"uv": [0, 0, 16, 2], "texture": "#2"}, - "east": {"uv": [0, 0, 13, 2], "texture": "#2"}, - "south": {"uv": [0, 0, 16, 2], "texture": "#2"}, - "west": {"uv": [0, 0, 13, 2], "texture": "#2"}, - "up": {"uv": [0, 0, 16, 13], "texture": "#2"}, - "down": {"uv": [0, 0, 16, 13], "texture": "#2"} - } - }, - { - "from": [0, 12, 2], - "to": [16, 14, 15], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 20, 8]}, - "faces": { - "north": {"uv": [0, 0, 16, 2], "texture": "#2"}, - "east": {"uv": [0, 0, 13, 2], "texture": "#2"}, - "south": {"uv": [0, 0, 16, 2], "texture": "#2"}, - "west": {"uv": [0, 0, 13, 2], "texture": "#2"}, - "up": {"uv": [0, 0, 16, 13], "texture": "#2"}, - "down": {"uv": [0, 0, 16, 13], "texture": "#2"} - } - }, - { - "from": [0, 2, 2], - "to": [2, 12, 15], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 10, 8]}, - "faces": { - "north": {"uv": [0, 0, 2, 10], "texture": "#2"}, - "east": {"uv": [0, 0, 13, 10], "texture": "#2"}, - "south": {"uv": [0, 0, 2, 10], "texture": "#2"}, - "west": {"uv": [0, 0, 13, 10], "texture": "#2"} - } - }, - { - "from": [14, 2, 2], - "to": [16, 12, 15], - "rotation": {"angle": 0, "axis": "y", "origin": [22, 10, 8]}, - "faces": { - "north": {"uv": [0, 0, 2, 10], "texture": "#2"}, - "east": {"uv": [0, 0, 13, 10], "texture": "#2"}, - "south": {"uv": [0, 0, 2, 10], "texture": "#2"}, - "west": {"uv": [0, 0, 13, 10], "texture": "#2"} - } - }, - { - "from": [2, 2, 3], - "to": [14, 12, 13], - "rotation": {"angle": 0, "axis": "y", "origin": [20, 10, 8]}, - "faces": { - "north": {"uv": [0, 0, 12, 10], "texture": "#2"}, - "east": {"uv": [0, 0, 10, 10], "texture": "#2"}, - "south": {"uv": [0, 0, 12, 10], "texture": "#2"}, - "west": {"uv": [0, 0, 10, 10], "texture": "#2"} - } - }, - { - "from": [11, 3, 2.5], - "to": [13, 4, 3.5], - "rotation": {"angle": 0, "axis": "y", "origin": [19, 11, 10]}, - "faces": { - "north": {"uv": [0, 0, 2, 1], "texture": "#tv"}, - "east": {"uv": [0, 0, 1, 1], "texture": "#tv"}, - "west": {"uv": [0, 0, 1, 1], "texture": "#tv"}, - "up": {"uv": [0, 0, 2, 1], "texture": "#tv"}, - "down": {"uv": [0, 0, 2, 1], "texture": "#tv"} - } - }, - { - "from": [8, 3, 2.5], - "to": [10, 4, 3.5], - "rotation": {"angle": 0, "axis": "y", "origin": [16, 11, 10]}, - "faces": { - "north": {"uv": [0, 0, 2, 1], "texture": "#tv"}, - "east": {"uv": [0, 0, 1, 1], "texture": "#tv"}, - "west": {"uv": [0, 0, 1, 1], "texture": "#tv"}, - "up": {"uv": [0, 0, 2, 1], "texture": "#tv"}, - "down": {"uv": [0, 0, 2, 1], "texture": "#tv"} - } - }, - { - "from": [3, 3, 2.5], - "to": [4, 4, 3.5], - "rotation": {"angle": 0, "axis": "y", "origin": [11, 11, 10]}, - "faces": { - "north": {"uv": [0, 0, 1, 1], "texture": "#tv"}, - "east": {"uv": [0, 0, 1, 1], "texture": "#tv"}, - "west": {"uv": [0, 0, 1, 1], "texture": "#tv"}, - "up": {"uv": [0, 0, 1, 1], "texture": "#tv"}, - "down": {"uv": [0, 0, 1, 1], "texture": "#tv"} - } - }, - { - "from": [3.5, 15.8, 12], - "to": [4.5, 19.8, 13], - "rotation": {"angle": 22.5, "axis": "z", "origin": [11, 24, 20]}, - "faces": { - "north": {"uv": [0, 0, 1, 4], "texture": "#3"}, - "east": {"uv": [0, 0, 1, 4], "texture": "#3"}, - "south": {"uv": [0, 0, 1, 4], "texture": "#3"}, - "west": {"uv": [0, 0, 1, 4], "texture": "#3"}, - "up": {"uv": [0, 0, 1, 1], "texture": "#3"} - } - }, - { - "from": [11.5, 15, 12], - "to": [12.5, 19, 13], - "rotation": {"angle": -22.5, "axis": "z", "origin": [4, 23, 20]}, - "faces": { - "north": {"uv": [0, 0, 1, 4], "texture": "#3"}, - "east": {"uv": [0, 0, 1, 4], "texture": "#3"}, - "south": {"uv": [0, 0, 1, 4], "texture": "#3"}, - "west": {"uv": [0, 0, 1, 4], "texture": "#3"}, - "up": {"uv": [0, 0, 1, 1], "rotation": 90, "texture": "#3"} - } - }, - { - "from": [1, 0.75, 15], - "to": [1.5, 1.25, 15.25], - "rotation": {"angle": 0, "axis": "y", "origin": [9, 9, 23]}, - "faces": { - "east": {"uv": [0, 0, 0.25, 0.5], "texture": "#4"}, - "south": {"uv": [0, 0, 0.5, 0.5], "texture": "#4"}, - "west": {"uv": [0, 0, 0.25, 0.5], "texture": "#4"}, - "up": {"uv": [0, 0, 0.5, 0.25], "texture": "#4"}, - "down": {"uv": [0, 0, 0.5, 0.25], "texture": "#4"} - } - }, - { - "from": [2, 0.75, 15], - "to": [2.5, 1.25, 15.25], - "rotation": {"angle": 0, "axis": "y", "origin": [10, 9, 23]}, - "faces": { - "east": {"uv": [0, 0, 0.25, 0.5], "texture": "#tv"}, - "south": {"uv": [0, 0, 0.5, 0.5], "texture": "#tv"}, - "west": {"uv": [0, 0, 0.25, 0.5], "texture": "#tv"}, - "up": {"uv": [0, 0, 0.5, 0.25], "texture": "#tv"}, - "down": {"uv": [0, 0, 0.5, 0.25], "texture": "#tv"} - } - }, - { - "from": [4, 6, 2.9], - "to": [12, 11, 3.9], - "rotation": {"angle": 0, "axis": "y", "origin": [12, 14, 10]}, - "faces": { - "north": {"uv": [0, 0, 8, 5], "texture": "#5"}, - "east": {"uv": [0, 0, 1, 5], "texture": "#5"}, - "west": {"uv": [0, 0, 1, 5], "texture": "#5"}, - "up": {"uv": [0, 0, 8, 1], "texture": "#5"}, - "down": {"uv": [0, 0, 8, 1], "texture": "#5"} - } - } - ], - "display": { - "thirdperson_righthand": { - "translation": [0, 4, 0], - "scale": [0.5, 0.5, 0.5] - }, - "thirdperson_lefthand": { - "translation": [0, 4, 0], - "scale": [0.5, 0.5, 0.5] - }, - "firstperson_righthand": { - "rotation": [0, -22, 0], - "translation": [0, 4.5, 0], - "scale": [0.35, 0.35, 0.35] - }, - "firstperson_lefthand": { - "rotation": [0, -19, 0], - "translation": [0, 4.5, 0], - "scale": [0.35, 0.35, 0.35] - }, - "ground": { - "translation": [0, 0.75, 0], - "scale": [0.5, 0.5, 0.5] - }, - "gui": { - "rotation": [15, -45, 0], - "translation": [0.25, 0.25, 0], - "scale": [0.75, 0.75, 0.61] - }, - "head": { - "rotation": [0, -180, 0], - "translation": [0, 10.25, 0], - "scale": [0.5, 0.5, 0.5] - }, - "fixed": { - "rotation": [0, -180, 0], - "translation": [0, 0, 2.5], - "scale": [0.75, 0.75, 0.75] - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/decorative/models/block/old_television_off.json b/src/main/resources/assets/decorative/models/block/old_television_off.json index af9d689..0add755 100755 --- a/src/main/resources/assets/decorative/models/block/old_television_off.json +++ b/src/main/resources/assets/decorative/models/block/old_television_off.json @@ -7,7 +7,7 @@ "3": "block/iron_block", "4": "block/red_terracotta", "5": "block/light_gray_concrete", - "black": "decorative:tv/black", + "black": "decorative:block/black", "particle": "block/black_concrete", "tv": "block/black_concrete" }, @@ -179,44 +179,5 @@ "down": {"uv": [0, 0, 8, 1], "texture": "#5"} } } - ], - "display": { - "thirdperson_righthand": { - "translation": [0, 4, 0], - "scale": [0.5, 0.5, 0.5] - }, - "thirdperson_lefthand": { - "translation": [0, 4, 0], - "scale": [0.5, 0.5, 0.5] - }, - "firstperson_righthand": { - "rotation": [0, -22, 0], - "translation": [0, 4.5, 0], - "scale": [0.35, 0.35, 0.35] - }, - "firstperson_lefthand": { - "rotation": [0, -19, 0], - "translation": [0, 4.5, 0], - "scale": [0.35, 0.35, 0.35] - }, - "ground": { - "translation": [0, 0.75, 0], - "scale": [0.5, 0.5, 0.5] - }, - "gui": { - "rotation": [15, -45, 0], - "translation": [0.25, 0.25, 0], - "scale": [0.75, 0.75, 0.61] - }, - "head": { - "rotation": [0, -180, 0], - "translation": [0, 10.25, 0], - "scale": [0.5, 0.5, 0.5] - }, - "fixed": { - "rotation": [0, -180, 0], - "translation": [0, 0, 2.5], - "scale": [0.75, 0.75, 0.75] - } - } + ] } \ No newline at end of file diff --git a/src/main/resources/assets/decorative/models/block/old_television_on.json b/src/main/resources/assets/decorative/models/block/old_television_on.json new file mode 100755 index 0000000..4255bda --- /dev/null +++ b/src/main/resources/assets/decorative/models/block/old_television_on.json @@ -0,0 +1,7 @@ +{ + "credit": "made by Motschen", + "parent": "decorative:block/old_television_off", + "textures": { + "4": "block/lime_terracotta" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/decorative/models/block/old_television_tater.json b/src/main/resources/assets/decorative/models/block/old_television_tater.json deleted file mode 100755 index 432f2b0..0000000 --- a/src/main/resources/assets/decorative/models/block/old_television_tater.json +++ /dev/null @@ -1,222 +0,0 @@ -{ - "credit": "made by Motschen", - "parent": "block/block", - "ambientocclusion": false, - "textures": { - "2": "block/gray_concrete", - "3": "block/iron_block", - "4": "block/lime_terracotta", - "5": "block/light_gray_concrete", - "tater": "decorative:tv/tater", - "particle": "block/black_concrete", - "tv": "block/black_concrete" - }, - "elements": [ - { - "from": [2, 2, 12.7], - "to": [14, 12, 14], - "rotation": {"angle": 0, "axis": "y", "origin": [8.5, 18.5, 12.5]}, - "faces": { - "north": {"uv": [0, 1.6, 16, 14.4], "texture": "#tv"}, - "east": {"uv": [0, 1.6, 3.2, 14.4], "texture": "#tv"}, - "south": {"uv": [0.65, 2, 15.549, 13.15], "texture": "#tater"}, - "west": {"uv": [12.8, 1.6, 16, 14.4], "texture": "#tv"}, - "up": {"uv": [0, 1.6, 16, 4.8], "rotation": 180, "texture": "#tv"}, - "down": {"uv": [0, 11.2, 16, 14.4], "rotation": 180, "texture": "#tv"} - } - }, - { - "from": [0, 0, 2], - "to": [16, 2, 15], - "faces": { - "north": {"uv": [0, 0, 16, 2], "texture": "#2"}, - "east": {"uv": [0, 0, 13, 2], "texture": "#2"}, - "south": {"uv": [0, 0, 16, 2], "texture": "#2"}, - "west": {"uv": [0, 0, 13, 2], "texture": "#2"}, - "up": {"uv": [0, 0, 16, 13], "texture": "#2"}, - "down": {"uv": [0, 0, 16, 13], "texture": "#2"} - } - }, - { - "from": [0, 12, 2], - "to": [16, 14, 15], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 20, 8]}, - "faces": { - "north": {"uv": [0, 0, 16, 2], "texture": "#2"}, - "east": {"uv": [0, 0, 13, 2], "texture": "#2"}, - "south": {"uv": [0, 0, 16, 2], "texture": "#2"}, - "west": {"uv": [0, 0, 13, 2], "texture": "#2"}, - "up": {"uv": [0, 0, 16, 13], "texture": "#2"}, - "down": {"uv": [0, 0, 16, 13], "texture": "#2"} - } - }, - { - "from": [0, 2, 2], - "to": [2, 12, 15], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 10, 8]}, - "faces": { - "north": {"uv": [0, 0, 2, 10], "texture": "#2"}, - "east": {"uv": [0, 0, 13, 10], "texture": "#2"}, - "south": {"uv": [0, 0, 2, 10], "texture": "#2"}, - "west": {"uv": [0, 0, 13, 10], "texture": "#2"} - } - }, - { - "from": [14, 2, 2], - "to": [16, 12, 15], - "rotation": {"angle": 0, "axis": "y", "origin": [22, 10, 8]}, - "faces": { - "north": {"uv": [0, 0, 2, 10], "texture": "#2"}, - "east": {"uv": [0, 0, 13, 10], "texture": "#2"}, - "south": {"uv": [0, 0, 2, 10], "texture": "#2"}, - "west": {"uv": [0, 0, 13, 10], "texture": "#2"} - } - }, - { - "from": [2, 2, 3], - "to": [14, 12, 13], - "rotation": {"angle": 0, "axis": "y", "origin": [20, 10, 8]}, - "faces": { - "north": {"uv": [0, 0, 12, 10], "texture": "#2"}, - "east": {"uv": [0, 0, 10, 10], "texture": "#2"}, - "south": {"uv": [0, 0, 12, 10], "texture": "#2"}, - "west": {"uv": [0, 0, 10, 10], "texture": "#2"} - } - }, - { - "from": [11, 3, 2.5], - "to": [13, 4, 3.5], - "rotation": {"angle": 0, "axis": "y", "origin": [19, 11, 10]}, - "faces": { - "north": {"uv": [0, 0, 2, 1], "texture": "#tv"}, - "east": {"uv": [0, 0, 1, 1], "texture": "#tv"}, - "west": {"uv": [0, 0, 1, 1], "texture": "#tv"}, - "up": {"uv": [0, 0, 2, 1], "texture": "#tv"}, - "down": {"uv": [0, 0, 2, 1], "texture": "#tv"} - } - }, - { - "from": [8, 3, 2.5], - "to": [10, 4, 3.5], - "rotation": {"angle": 0, "axis": "y", "origin": [16, 11, 10]}, - "faces": { - "north": {"uv": [0, 0, 2, 1], "texture": "#tv"}, - "east": {"uv": [0, 0, 1, 1], "texture": "#tv"}, - "west": {"uv": [0, 0, 1, 1], "texture": "#tv"}, - "up": {"uv": [0, 0, 2, 1], "texture": "#tv"}, - "down": {"uv": [0, 0, 2, 1], "texture": "#tv"} - } - }, - { - "from": [3, 3, 2.5], - "to": [4, 4, 3.5], - "rotation": {"angle": 0, "axis": "y", "origin": [11, 11, 10]}, - "faces": { - "north": {"uv": [0, 0, 1, 1], "texture": "#tv"}, - "east": {"uv": [0, 0, 1, 1], "texture": "#tv"}, - "west": {"uv": [0, 0, 1, 1], "texture": "#tv"}, - "up": {"uv": [0, 0, 1, 1], "texture": "#tv"}, - "down": {"uv": [0, 0, 1, 1], "texture": "#tv"} - } - }, - { - "from": [3.5, 15.8, 12], - "to": [4.5, 19.8, 13], - "rotation": {"angle": 22.5, "axis": "z", "origin": [11, 24, 20]}, - "faces": { - "north": {"uv": [0, 0, 1, 4], "texture": "#3"}, - "east": {"uv": [0, 0, 1, 4], "texture": "#3"}, - "south": {"uv": [0, 0, 1, 4], "texture": "#3"}, - "west": {"uv": [0, 0, 1, 4], "texture": "#3"}, - "up": {"uv": [0, 0, 1, 1], "texture": "#3"} - } - }, - { - "from": [11.5, 15, 12], - "to": [12.5, 19, 13], - "rotation": {"angle": -22.5, "axis": "z", "origin": [4, 23, 20]}, - "faces": { - "north": {"uv": [0, 0, 1, 4], "texture": "#3"}, - "east": {"uv": [0, 0, 1, 4], "texture": "#3"}, - "south": {"uv": [0, 0, 1, 4], "texture": "#3"}, - "west": {"uv": [0, 0, 1, 4], "texture": "#3"}, - "up": {"uv": [0, 0, 1, 1], "rotation": 90, "texture": "#3"} - } - }, - { - "from": [1, 0.75, 15], - "to": [1.5, 1.25, 15.25], - "rotation": {"angle": 0, "axis": "y", "origin": [9, 9, 23]}, - "faces": { - "east": {"uv": [0, 0, 0.25, 0.5], "texture": "#4"}, - "south": {"uv": [0, 0, 0.5, 0.5], "texture": "#4"}, - "west": {"uv": [0, 0, 0.25, 0.5], "texture": "#4"}, - "up": {"uv": [0, 0, 0.5, 0.25], "texture": "#4"}, - "down": {"uv": [0, 0, 0.5, 0.25], "texture": "#4"} - } - }, - { - "from": [2, 0.75, 15], - "to": [2.5, 1.25, 15.25], - "rotation": {"angle": 0, "axis": "y", "origin": [10, 9, 23]}, - "faces": { - "east": {"uv": [0, 0, 0.25, 0.5], "texture": "#tv"}, - "south": {"uv": [0, 0, 0.5, 0.5], "texture": "#tv"}, - "west": {"uv": [0, 0, 0.25, 0.5], "texture": "#tv"}, - "up": {"uv": [0, 0, 0.5, 0.25], "texture": "#tv"}, - "down": {"uv": [0, 0, 0.5, 0.25], "texture": "#tv"} - } - }, - { - "from": [4, 6, 2.9], - "to": [12, 11, 3.9], - "rotation": {"angle": 0, "axis": "y", "origin": [12, 14, 10]}, - "faces": { - "north": {"uv": [0, 0, 8, 5], "texture": "#5"}, - "east": {"uv": [0, 0, 1, 5], "texture": "#5"}, - "west": {"uv": [0, 0, 1, 5], "texture": "#5"}, - "up": {"uv": [0, 0, 8, 1], "texture": "#5"}, - "down": {"uv": [0, 0, 8, 1], "texture": "#5"} - } - } - ], - "display": { - "thirdperson_righthand": { - "translation": [0, 4, 0], - "scale": [0.5, 0.5, 0.5] - }, - "thirdperson_lefthand": { - "translation": [0, 4, 0], - "scale": [0.5, 0.5, 0.5] - }, - "firstperson_righthand": { - "rotation": [0, -22, 0], - "translation": [0, 4.5, 0], - "scale": [0.35, 0.35, 0.35] - }, - "firstperson_lefthand": { - "rotation": [0, -19, 0], - "translation": [0, 4.5, 0], - "scale": [0.35, 0.35, 0.35] - }, - "ground": { - "translation": [0, 0.75, 0], - "scale": [0.5, 0.5, 0.5] - }, - "gui": { - "rotation": [15, -45, 0], - "translation": [0.25, 0.25, 0], - "scale": [0.75, 0.75, 0.61] - }, - "head": { - "rotation": [0, -180, 0], - "translation": [0, 10.25, 0], - "scale": [0.5, 0.5, 0.5] - }, - "fixed": { - "rotation": [0, -180, 0], - "translation": [0, 0, 2.5], - "scale": [0.75, 0.75, 0.75] - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/decorative/models/block/television_off.json b/src/main/resources/assets/decorative/models/block/television.json similarity index 83% rename from src/main/resources/assets/decorative/models/block/television_off.json rename to src/main/resources/assets/decorative/models/block/television.json index e594f55..a46ed7c 100755 --- a/src/main/resources/assets/decorative/models/block/television_off.json +++ b/src/main/resources/assets/decorative/models/block/television.json @@ -3,7 +3,7 @@ "parent": "block/block", "ambientocclusion": false, "textures": { - "black": "decorative:tv/black", + "black": "decorative:block/black", "particle": "block/black_concrete", "tv": "block/black_concrete" }, @@ -116,43 +116,5 @@ "down": {"uv": [0, 0, 0.4, 0.2], "rotation": 180, "texture": "#tv"} } } - ], - "display": { - "thirdperson_righthand": { - "translation": [0, 4, 0], - "scale": [0.5, 0.5, 0.5] - }, - "thirdperson_lefthand": { - "translation": [0, 4, 0], - "scale": [0.5, 0.5, 0.5] - }, - "firstperson_righthand": { - "rotation": [0, -22, 0], - "translation": [0, 2.25, 0], - "scale": [0.35, 0.35, 0.35] - }, - "firstperson_lefthand": { - "rotation": [0, -19, 0], - "translation": [0, 2.5, 0], - "scale": [0.35, 0.35, 0.35] - }, - "ground": { - "scale": [0.5, 0.5, 0.5] - }, - "gui": { - "rotation": [15, -45, 0], - "translation": [0, -1.5, 0], - "scale": [0.5, 0.5, 0.5] - }, - "head": { - "rotation": [0, -180, 0], - "translation": [0, 10.25, 0], - "scale": [0.5, 0.5, 0.5] - }, - "fixed": { - "rotation": [0, -180, 0], - "translation": [0, -1.75, 0], - "scale": [0.5, 0.5, 0.5] - } - } + ] } \ No newline at end of file diff --git a/src/main/resources/assets/decorative/models/block/television_crabrave.json b/src/main/resources/assets/decorative/models/block/television_crabrave.json deleted file mode 100755 index 46fa443..0000000 --- a/src/main/resources/assets/decorative/models/block/television_crabrave.json +++ /dev/null @@ -1,158 +0,0 @@ -{ - "credit": "made by Motschen", - "parent": "block/block", - "ambientocclusion": false, - "textures": { - "crabrave": "decorative:tv/crabrave", - "particle": "block/black_concrete", - "tv": "block/black_concrete" - }, - "elements": [ - { - "from": [-5, 5, 7.1], - "to": [22, 20, 7.7], - "rotation": {"angle": 0, "axis": "y", "origin": [8.5, 20.5, 7.5]}, - "faces": { - "north": {"uv": [0, 0, 16, 15], "texture": "#tv"}, - "east": {"uv": [0, 0, 0.6, 15], "texture": "#tv"}, - "west": {"uv": [0, 0, 0.6, 15], "texture": "#tv"}, - "down": {"uv": [0, 0, 0.6, 16], "rotation": 270, "texture": "#tv"} - } - }, - { - "from": [-5, 19.8, 6.88], - "to": [22, 20.4, 7.88], - "rotation": {"angle": -45, "axis": "x", "origin": [8.5, 20.5, 7.5]}, - "faces": { - "east": {"uv": [0, 0, 1, 0.6], "texture": "#tv"}, - "west": {"uv": [0, 0, 1, 0.6], "texture": "#tv"}, - "up": {"uv": [0, 0, 1, 16], "rotation": 90, "texture": "#tv"} - } - }, - { - "from": [3, 0, 6], - "to": [13, 1, 11], - "rotation": {"angle": 0, "axis": "y", "origin": [8.5, 20.5, 7.5]}, - "faces": { - "north": {"uv": [6.4, 13.6, 9.6, 14.4], "texture": "#tv"}, - "east": {"uv": [3.2, 13.6, 6.4, 14.4], "texture": "#tv"}, - "south": {"uv": [0, 13.6, 3.2, 14.4], "texture": "#tv"}, - "west": {"uv": [9.6, 13.6, 12.8, 14.4], "texture": "#tv"}, - "up": {"uv": [6.4, 6.4, 9.6, 9.6], "rotation": 180, "texture": "#tv"}, - "down": {"uv": [5.6, 7.2, 8.8, 10.4], "rotation": 180, "texture": "#tv"} - } - }, - { - "from": [7, 1, 8], - "to": [9, 4, 9], - "rotation": {"angle": 0, "axis": "y", "origin": [8.5, 20.5, 7.5]}, - "faces": { - "north": {"uv": [3.2, 10.4, 4.8, 12.8], "texture": "#tv"}, - "east": {"uv": [2.4, 10.4, 4, 12.8], "texture": "#tv"}, - "south": {"uv": [0, 10.4, 1.6, 12.8], "texture": "#tv"}, - "west": {"uv": [5.6, 10.4, 7.2, 12.8], "texture": "#tv"}, - "up": {"uv": [7.2, 8, 8.8, 9.6], "rotation": 180, "texture": "#tv"}, - "down": {"uv": [8, 4.8, 9.6, 6.4], "rotation": 180, "texture": "#tv"} - } - }, - { - "from": [-6, 4, 7.7], - "to": [23, 22, 9], - "rotation": {"angle": 0, "axis": "y", "origin": [8.5, 20.5, 7.5]}, - "faces": { - "north": {"uv": [0, 1.6, 16, 14.4], "texture": "#tv"}, - "east": {"uv": [0, 1.6, 3.2, 14.4], "texture": "#tv"}, - "south": {"uv": [0, 2, 16, 13.45], "texture": "#crabrave"}, - "west": {"uv": [12.8, 1.6, 16, 14.4], "texture": "#tv"}, - "up": {"uv": [0, 1.6, 16, 4.8], "rotation": 180, "texture": "#tv"}, - "down": {"uv": [0, 11.2, 16, 14.4], "rotation": 180, "texture": "#tv"} - } - }, - { - "from": [-6, 4, 9], - "to": [23, 5.15, 9.2], - "rotation": {"angle": 0, "axis": "y", "origin": [8.5, 20.5, 7.5]}, - "faces": { - "east": {"uv": [0, 0, 0.2, 1], "texture": "#tv"}, - "south": {"uv": [0, 0, 16, 1], "texture": "#tv"}, - "west": {"uv": [0, 0, 0.2, 1], "texture": "#tv"}, - "up": {"uv": [0, 0, 16, 0.2], "rotation": 180, "texture": "#tv"}, - "down": {"uv": [0, 0, 16, 0.2], "rotation": 180, "texture": "#tv"} - } - }, - { - "from": [-6, 21.6, 9], - "to": [23, 22, 9.2], - "rotation": {"angle": 0, "axis": "y", "origin": [8.5, 20.5, 7.5]}, - "faces": { - "east": {"uv": [0, 0, 0.2, 0.4], "texture": "#tv"}, - "south": {"uv": [0, 0, 16, 0.4], "texture": "#tv"}, - "west": {"uv": [0, 0, 0.2, 0.4], "texture": "#tv"}, - "up": {"uv": [0, 0, 16, 0.2], "rotation": 180, "texture": "#tv"}, - "down": {"uv": [0, 0, 16, 0.2], "rotation": 180, "texture": "#tv"} - } - }, - { - "from": [-6, 5, 9], - "to": [-5.6, 21.6, 9.2], - "rotation": {"angle": 0, "axis": "y", "origin": [8.5, 20.5, 7.5]}, - "faces": { - "east": {"uv": [0, 0, 0.2, 14.6], "texture": "#tv"}, - "south": {"uv": [0, 0, 0.4, 14.6], "texture": "#tv"}, - "west": {"uv": [0, 0, 0.2, 14.6], "texture": "#tv"}, - "up": {"uv": [0, 0, 0.4, 0.2], "rotation": 180, "texture": "#tv"}, - "down": {"uv": [0, 0, 0.4, 0.2], "rotation": 180, "texture": "#tv"} - } - }, - { - "from": [22.6, 5, 9], - "to": [23, 21.6, 9.2], - "rotation": {"angle": 0, "axis": "y", "origin": [8.5, 20.5, 7.5]}, - "faces": { - "east": {"uv": [0, 0, 0.2, 14.6], "texture": "#tv"}, - "south": {"uv": [0, 0, 0.4, 14.6], "texture": "#tv"}, - "west": {"uv": [0, 0, 0.2, 14.6], "texture": "#tv"}, - "up": {"uv": [0, 0, 0.4, 0.2], "rotation": 180, "texture": "#tv"}, - "down": {"uv": [0, 0, 0.4, 0.2], "rotation": 180, "texture": "#tv"} - } - } - ], - "display": { - "thirdperson_righthand": { - "translation": [0, 4, 0], - "scale": [0.5, 0.5, 0.5] - }, - "thirdperson_lefthand": { - "translation": [0, 4, 0], - "scale": [0.5, 0.5, 0.5] - }, - "firstperson_righthand": { - "rotation": [0, -22, 0], - "translation": [0, 2.25, 0], - "scale": [0.35, 0.35, 0.35] - }, - "firstperson_lefthand": { - "rotation": [0, -19, 0], - "translation": [0, 2.5, 0], - "scale": [0.35, 0.35, 0.35] - }, - "ground": { - "scale": [0.5, 0.5, 0.5] - }, - "gui": { - "rotation": [15, -45, 0], - "translation": [0, -1.5, 0], - "scale": [0.5, 0.5, 0.5] - }, - "head": { - "rotation": [0, -180, 0], - "translation": [0, 10.25, 0], - "scale": [0.5, 0.5, 0.5] - }, - "fixed": { - "rotation": [0, -180, 0], - "translation": [0, -1.75, 0], - "scale": [0.5, 0.5, 0.5] - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/decorative/models/block/television_creeper.json b/src/main/resources/assets/decorative/models/block/television_creeper.json deleted file mode 100755 index 4e40b53..0000000 --- a/src/main/resources/assets/decorative/models/block/television_creeper.json +++ /dev/null @@ -1,158 +0,0 @@ -{ - "credit": "made by Motschen", - "parent": "block/block", - "ambientocclusion": false, - "textures": { - "creeper": "decorative:tv/creeper", - "particle": "block/black_concrete", - "tv": "block/black_concrete" - }, - "elements": [ - { - "from": [-5, 5, 7.1], - "to": [22, 20, 7.7], - "rotation": {"angle": 0, "axis": "y", "origin": [8.5, 20.5, 7.5]}, - "faces": { - "north": {"uv": [0, 0, 16, 15], "texture": "#tv"}, - "east": {"uv": [0, 0, 0.6, 15], "texture": "#tv"}, - "west": {"uv": [0, 0, 0.6, 15], "texture": "#tv"}, - "down": {"uv": [0, 0, 0.6, 16], "rotation": 270, "texture": "#tv"} - } - }, - { - "from": [-5, 19.8, 6.88], - "to": [22, 20.4, 7.88], - "rotation": {"angle": -45, "axis": "x", "origin": [8.5, 20.5, 7.5]}, - "faces": { - "east": {"uv": [0, 0, 1, 0.6], "texture": "#tv"}, - "west": {"uv": [0, 0, 1, 0.6], "texture": "#tv"}, - "up": {"uv": [0, 0, 1, 16], "rotation": 90, "texture": "#tv"} - } - }, - { - "from": [3, 0, 6], - "to": [13, 1, 11], - "rotation": {"angle": 0, "axis": "y", "origin": [8.5, 20.5, 7.5]}, - "faces": { - "north": {"uv": [6.4, 13.6, 9.6, 14.4], "texture": "#tv"}, - "east": {"uv": [3.2, 13.6, 6.4, 14.4], "texture": "#tv"}, - "south": {"uv": [0, 13.6, 3.2, 14.4], "texture": "#tv"}, - "west": {"uv": [9.6, 13.6, 12.8, 14.4], "texture": "#tv"}, - "up": {"uv": [6.4, 6.4, 9.6, 9.6], "rotation": 180, "texture": "#tv"}, - "down": {"uv": [5.6, 7.2, 8.8, 10.4], "rotation": 180, "texture": "#tv"} - } - }, - { - "from": [7, 1, 8], - "to": [9, 4, 9], - "rotation": {"angle": 0, "axis": "y", "origin": [8.5, 20.5, 7.5]}, - "faces": { - "north": {"uv": [3.2, 10.4, 4.8, 12.8], "texture": "#tv"}, - "east": {"uv": [2.4, 10.4, 4, 12.8], "texture": "#tv"}, - "south": {"uv": [0, 10.4, 1.6, 12.8], "texture": "#tv"}, - "west": {"uv": [5.6, 10.4, 7.2, 12.8], "texture": "#tv"}, - "up": {"uv": [7.2, 8, 8.8, 9.6], "rotation": 180, "texture": "#tv"}, - "down": {"uv": [8, 4.8, 9.6, 6.4], "rotation": 180, "texture": "#tv"} - } - }, - { - "from": [-6, 4, 7.7], - "to": [23, 22, 9], - "rotation": {"angle": 0, "axis": "y", "origin": [8.5, 20.5, 7.5]}, - "faces": { - "north": {"uv": [0, 1.6, 16, 14.4], "texture": "#tv"}, - "east": {"uv": [0, 1.6, 3.2, 14.4], "texture": "#tv"}, - "south": {"uv": [0, 2, 16, 13.45], "texture": "#creeper"}, - "west": {"uv": [12.8, 1.6, 16, 14.4], "texture": "#tv"}, - "up": {"uv": [0, 1.6, 16, 4.8], "rotation": 180, "texture": "#tv"}, - "down": {"uv": [0, 11.2, 16, 14.4], "rotation": 180, "texture": "#tv"} - } - }, - { - "from": [-6, 4, 9], - "to": [23, 5.15, 9.2], - "rotation": {"angle": 0, "axis": "y", "origin": [8.5, 20.5, 7.5]}, - "faces": { - "east": {"uv": [0, 0, 0.2, 1], "texture": "#tv"}, - "south": {"uv": [0, 0, 16, 1], "texture": "#tv"}, - "west": {"uv": [0, 0, 0.2, 1], "texture": "#tv"}, - "up": {"uv": [0, 0, 16, 0.2], "rotation": 180, "texture": "#tv"}, - "down": {"uv": [0, 0, 16, 0.2], "rotation": 180, "texture": "#tv"} - } - }, - { - "from": [-6, 21.6, 9], - "to": [23, 22, 9.2], - "rotation": {"angle": 0, "axis": "y", "origin": [8.5, 20.5, 7.5]}, - "faces": { - "east": {"uv": [0, 0, 0.2, 0.4], "texture": "#tv"}, - "south": {"uv": [0, 0, 16, 0.4], "texture": "#tv"}, - "west": {"uv": [0, 0, 0.2, 0.4], "texture": "#tv"}, - "up": {"uv": [0, 0, 16, 0.2], "rotation": 180, "texture": "#tv"}, - "down": {"uv": [0, 0, 16, 0.2], "rotation": 180, "texture": "#tv"} - } - }, - { - "from": [-6, 5, 9], - "to": [-5.6, 21.6, 9.2], - "rotation": {"angle": 0, "axis": "y", "origin": [8.5, 20.5, 7.5]}, - "faces": { - "east": {"uv": [0, 0, 0.2, 14.6], "texture": "#tv"}, - "south": {"uv": [0, 0, 0.4, 14.6], "texture": "#tv"}, - "west": {"uv": [0, 0, 0.2, 14.6], "texture": "#tv"}, - "up": {"uv": [0, 0, 0.4, 0.2], "rotation": 180, "texture": "#tv"}, - "down": {"uv": [0, 0, 0.4, 0.2], "rotation": 180, "texture": "#tv"} - } - }, - { - "from": [22.6, 5, 9], - "to": [23, 21.6, 9.2], - "rotation": {"angle": 0, "axis": "y", "origin": [8.5, 20.5, 7.5]}, - "faces": { - "east": {"uv": [0, 0, 0.2, 14.6], "texture": "#tv"}, - "south": {"uv": [0, 0, 0.4, 14.6], "texture": "#tv"}, - "west": {"uv": [0, 0, 0.2, 14.6], "texture": "#tv"}, - "up": {"uv": [0, 0, 0.4, 0.2], "rotation": 180, "texture": "#tv"}, - "down": {"uv": [0, 0, 0.4, 0.2], "rotation": 180, "texture": "#tv"} - } - } - ], - "display": { - "thirdperson_righthand": { - "translation": [0, 4, 0], - "scale": [0.5, 0.5, 0.5] - }, - "thirdperson_lefthand": { - "translation": [0, 4, 0], - "scale": [0.5, 0.5, 0.5] - }, - "firstperson_righthand": { - "rotation": [0, -22, 0], - "translation": [0, 2.25, 0], - "scale": [0.35, 0.35, 0.35] - }, - "firstperson_lefthand": { - "rotation": [0, -19, 0], - "translation": [0, 2.5, 0], - "scale": [0.35, 0.35, 0.35] - }, - "ground": { - "scale": [0.5, 0.5, 0.5] - }, - "gui": { - "rotation": [15, -45, 0], - "translation": [0, -1.5, 0], - "scale": [0.5, 0.5, 0.5] - }, - "head": { - "rotation": [0, -180, 0], - "translation": [0, 10.25, 0], - "scale": [0.5, 0.5, 0.5] - }, - "fixed": { - "rotation": [0, -180, 0], - "translation": [0, -1.75, 0], - "scale": [0.5, 0.5, 0.5] - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/decorative/models/block/television_nyancat.json b/src/main/resources/assets/decorative/models/block/television_nyancat.json deleted file mode 100755 index d5205c2..0000000 --- a/src/main/resources/assets/decorative/models/block/television_nyancat.json +++ /dev/null @@ -1,158 +0,0 @@ -{ - "credit": "made by Motschen", - "parent": "block/block", - "ambientocclusion": false, - "textures": { - "nyancat": "decorative:tv/nyancat", - "particle": "block/black_concrete", - "tv": "block/black_concrete" - }, - "elements": [ - { - "from": [-5, 5, 7.1], - "to": [22, 20, 7.7], - "rotation": {"angle": 0, "axis": "y", "origin": [8.5, 20.5, 7.5]}, - "faces": { - "north": {"uv": [0, 0, 16, 15], "texture": "#tv"}, - "east": {"uv": [0, 0, 0.6, 15], "texture": "#tv"}, - "west": {"uv": [0, 0, 0.6, 15], "texture": "#tv"}, - "down": {"uv": [0, 0, 0.6, 16], "rotation": 270, "texture": "#tv"} - } - }, - { - "from": [-5, 19.8, 6.88], - "to": [22, 20.4, 7.88], - "rotation": {"angle": -45, "axis": "x", "origin": [8.5, 20.5, 7.5]}, - "faces": { - "east": {"uv": [0, 0, 1, 0.6], "texture": "#tv"}, - "west": {"uv": [0, 0, 1, 0.6], "texture": "#tv"}, - "up": {"uv": [0, 0, 1, 16], "rotation": 90, "texture": "#tv"} - } - }, - { - "from": [3, 0, 6], - "to": [13, 1, 11], - "rotation": {"angle": 0, "axis": "y", "origin": [8.5, 20.5, 7.5]}, - "faces": { - "north": {"uv": [6.4, 13.6, 9.6, 14.4], "texture": "#tv"}, - "east": {"uv": [3.2, 13.6, 6.4, 14.4], "texture": "#tv"}, - "south": {"uv": [0, 13.6, 3.2, 14.4], "texture": "#tv"}, - "west": {"uv": [9.6, 13.6, 12.8, 14.4], "texture": "#tv"}, - "up": {"uv": [6.4, 6.4, 9.6, 9.6], "rotation": 180, "texture": "#tv"}, - "down": {"uv": [5.6, 7.2, 8.8, 10.4], "rotation": 180, "texture": "#tv"} - } - }, - { - "from": [7, 1, 8], - "to": [9, 4, 9], - "rotation": {"angle": 0, "axis": "y", "origin": [8.5, 20.5, 7.5]}, - "faces": { - "north": {"uv": [3.2, 10.4, 4.8, 12.8], "texture": "#tv"}, - "east": {"uv": [2.4, 10.4, 4, 12.8], "texture": "#tv"}, - "south": {"uv": [0, 10.4, 1.6, 12.8], "texture": "#tv"}, - "west": {"uv": [5.6, 10.4, 7.2, 12.8], "texture": "#tv"}, - "up": {"uv": [7.2, 8, 8.8, 9.6], "rotation": 180, "texture": "#tv"}, - "down": {"uv": [8, 4.8, 9.6, 6.4], "rotation": 180, "texture": "#tv"} - } - }, - { - "from": [-6, 4, 7.7], - "to": [23, 22, 9], - "rotation": {"angle": 0, "axis": "y", "origin": [8.5, 20.5, 7.5]}, - "faces": { - "north": {"uv": [0, 1.6, 16, 14.4], "texture": "#tv"}, - "east": {"uv": [0, 1.6, 3.2, 14.4], "texture": "#tv"}, - "south": {"uv": [0, 2, 16, 13.45], "texture": "#nyancat"}, - "west": {"uv": [12.8, 1.6, 16, 14.4], "texture": "#tv"}, - "up": {"uv": [0, 1.6, 16, 4.8], "rotation": 180, "texture": "#tv"}, - "down": {"uv": [0, 11.2, 16, 14.4], "rotation": 180, "texture": "#tv"} - } - }, - { - "from": [-6, 4, 9], - "to": [23, 5.15, 9.2], - "rotation": {"angle": 0, "axis": "y", "origin": [8.5, 20.5, 7.5]}, - "faces": { - "east": {"uv": [0, 0, 0.2, 1], "texture": "#tv"}, - "south": {"uv": [0, 0, 16, 1], "texture": "#tv"}, - "west": {"uv": [0, 0, 0.2, 1], "texture": "#tv"}, - "up": {"uv": [0, 0, 16, 0.2], "rotation": 180, "texture": "#tv"}, - "down": {"uv": [0, 0, 16, 0.2], "rotation": 180, "texture": "#tv"} - } - }, - { - "from": [-6, 21.6, 9], - "to": [23, 22, 9.2], - "rotation": {"angle": 0, "axis": "y", "origin": [8.5, 20.5, 7.5]}, - "faces": { - "east": {"uv": [0, 0, 0.2, 0.4], "texture": "#tv"}, - "south": {"uv": [0, 0, 16, 0.4], "texture": "#tv"}, - "west": {"uv": [0, 0, 0.2, 0.4], "texture": "#tv"}, - "up": {"uv": [0, 0, 16, 0.2], "rotation": 180, "texture": "#tv"}, - "down": {"uv": [0, 0, 16, 0.2], "rotation": 180, "texture": "#tv"} - } - }, - { - "from": [-6, 5, 9], - "to": [-5.6, 21.6, 9.2], - "rotation": {"angle": 0, "axis": "y", "origin": [8.5, 20.5, 7.5]}, - "faces": { - "east": {"uv": [0, 0, 0.2, 14.6], "texture": "#tv"}, - "south": {"uv": [0, 0, 0.4, 14.6], "texture": "#tv"}, - "west": {"uv": [0, 0, 0.2, 14.6], "texture": "#tv"}, - "up": {"uv": [0, 0, 0.4, 0.2], "rotation": 180, "texture": "#tv"}, - "down": {"uv": [0, 0, 0.4, 0.2], "rotation": 180, "texture": "#tv"} - } - }, - { - "from": [22.6, 5, 9], - "to": [23, 21.6, 9.2], - "rotation": {"angle": 0, "axis": "y", "origin": [8.5, 20.5, 7.5]}, - "faces": { - "east": {"uv": [0, 0, 0.2, 14.6], "texture": "#tv"}, - "south": {"uv": [0, 0, 0.4, 14.6], "texture": "#tv"}, - "west": {"uv": [0, 0, 0.2, 14.6], "texture": "#tv"}, - "up": {"uv": [0, 0, 0.4, 0.2], "rotation": 180, "texture": "#tv"}, - "down": {"uv": [0, 0, 0.4, 0.2], "rotation": 180, "texture": "#tv"} - } - } - ], - "display": { - "thirdperson_righthand": { - "translation": [0, 4, 0], - "scale": [0.5, 0.5, 0.5] - }, - "thirdperson_lefthand": { - "translation": [0, 4, 0], - "scale": [0.5, 0.5, 0.5] - }, - "firstperson_righthand": { - "rotation": [0, -22, 0], - "translation": [0, 2.25, 0], - "scale": [0.35, 0.35, 0.35] - }, - "firstperson_lefthand": { - "rotation": [0, -19, 0], - "translation": [0, 2.5, 0], - "scale": [0.35, 0.35, 0.35] - }, - "ground": { - "scale": [0.5, 0.5, 0.5] - }, - "gui": { - "rotation": [15, -45, 0], - "translation": [0, -1.5, 0], - "scale": [0.5, 0.5, 0.5] - }, - "head": { - "rotation": [0, -180, 0], - "translation": [0, 10.25, 0], - "scale": [0.5, 0.5, 0.5] - }, - "fixed": { - "rotation": [0, -180, 0], - "translation": [0, -1.75, 0], - "scale": [0.5, 0.5, 0.5] - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/decorative/models/block/television_tater.json b/src/main/resources/assets/decorative/models/block/television_tater.json deleted file mode 100755 index 958e24f..0000000 --- a/src/main/resources/assets/decorative/models/block/television_tater.json +++ /dev/null @@ -1,158 +0,0 @@ -{ - "credit": "made by Motschen", - "parent": "block/block", - "ambientocclusion": false, - "textures": { - "tater": "decorative:tv/tater", - "particle": "block/black_concrete", - "tv": "block/black_concrete" - }, - "elements": [ - { - "from": [-5, 5, 7.1], - "to": [22, 20, 7.7], - "rotation": {"angle": 0, "axis": "y", "origin": [8.5, 20.5, 7.5]}, - "faces": { - "north": {"uv": [0, 0, 16, 15], "texture": "#tv"}, - "east": {"uv": [0, 0, 0.6, 15], "texture": "#tv"}, - "west": {"uv": [0, 0, 0.6, 15], "texture": "#tv"}, - "down": {"uv": [0, 0, 0.6, 16], "rotation": 270, "texture": "#tv"} - } - }, - { - "from": [-5, 19.8, 6.88], - "to": [22, 20.4, 7.88], - "rotation": {"angle": -45, "axis": "x", "origin": [8.5, 20.5, 7.5]}, - "faces": { - "east": {"uv": [0, 0, 1, 0.6], "texture": "#tv"}, - "west": {"uv": [0, 0, 1, 0.6], "texture": "#tv"}, - "up": {"uv": [0, 0, 1, 16], "rotation": 90, "texture": "#tv"} - } - }, - { - "from": [3, 0, 6], - "to": [13, 1, 11], - "rotation": {"angle": 0, "axis": "y", "origin": [8.5, 20.5, 7.5]}, - "faces": { - "north": {"uv": [6.4, 13.6, 9.6, 14.4], "texture": "#tv"}, - "east": {"uv": [3.2, 13.6, 6.4, 14.4], "texture": "#tv"}, - "south": {"uv": [0, 13.6, 3.2, 14.4], "texture": "#tv"}, - "west": {"uv": [9.6, 13.6, 12.8, 14.4], "texture": "#tv"}, - "up": {"uv": [6.4, 6.4, 9.6, 9.6], "rotation": 180, "texture": "#tv"}, - "down": {"uv": [5.6, 7.2, 8.8, 10.4], "rotation": 180, "texture": "#tv"} - } - }, - { - "from": [7, 1, 8], - "to": [9, 4, 9], - "rotation": {"angle": 0, "axis": "y", "origin": [8.5, 20.5, 7.5]}, - "faces": { - "north": {"uv": [3.2, 10.4, 4.8, 12.8], "texture": "#tv"}, - "east": {"uv": [2.4, 10.4, 4, 12.8], "texture": "#tv"}, - "south": {"uv": [0, 10.4, 1.6, 12.8], "texture": "#tv"}, - "west": {"uv": [5.6, 10.4, 7.2, 12.8], "texture": "#tv"}, - "up": {"uv": [7.2, 8, 8.8, 9.6], "rotation": 180, "texture": "#tv"}, - "down": {"uv": [8, 4.8, 9.6, 6.4], "rotation": 180, "texture": "#tv"} - } - }, - { - "from": [-6, 4, 7.7], - "to": [23, 22, 9], - "rotation": {"angle": 0, "axis": "y", "origin": [8.5, 20.5, 7.5]}, - "faces": { - "north": {"uv": [0, 1.6, 16, 14.4], "texture": "#tv"}, - "east": {"uv": [0, 1.6, 3.2, 14.4], "texture": "#tv"}, - "south": {"uv": [0, 2, 16, 13.45], "texture": "#tater"}, - "west": {"uv": [12.8, 1.6, 16, 14.4], "texture": "#tv"}, - "up": {"uv": [0, 1.6, 16, 4.8], "rotation": 180, "texture": "#tv"}, - "down": {"uv": [0, 11.2, 16, 14.4], "rotation": 180, "texture": "#tv"} - } - }, - { - "from": [-6, 4, 9], - "to": [23, 5.15, 9.2], - "rotation": {"angle": 0, "axis": "y", "origin": [8.5, 20.5, 7.5]}, - "faces": { - "east": {"uv": [0, 0, 0.2, 1], "texture": "#tv"}, - "south": {"uv": [0, 0, 16, 1], "texture": "#tv"}, - "west": {"uv": [0, 0, 0.2, 1], "texture": "#tv"}, - "up": {"uv": [0, 0, 16, 0.2], "rotation": 180, "texture": "#tv"}, - "down": {"uv": [0, 0, 16, 0.2], "rotation": 180, "texture": "#tv"} - } - }, - { - "from": [-6, 21.6, 9], - "to": [23, 22, 9.2], - "rotation": {"angle": 0, "axis": "y", "origin": [8.5, 20.5, 7.5]}, - "faces": { - "east": {"uv": [0, 0, 0.2, 0.4], "texture": "#tv"}, - "south": {"uv": [0, 0, 16, 0.4], "texture": "#tv"}, - "west": {"uv": [0, 0, 0.2, 0.4], "texture": "#tv"}, - "up": {"uv": [0, 0, 16, 0.2], "rotation": 180, "texture": "#tv"}, - "down": {"uv": [0, 0, 16, 0.2], "rotation": 180, "texture": "#tv"} - } - }, - { - "from": [-6, 5, 9], - "to": [-5.6, 21.6, 9.2], - "rotation": {"angle": 0, "axis": "y", "origin": [8.5, 20.5, 7.5]}, - "faces": { - "east": {"uv": [0, 0, 0.2, 14.6], "texture": "#tv"}, - "south": {"uv": [0, 0, 0.4, 14.6], "texture": "#tv"}, - "west": {"uv": [0, 0, 0.2, 14.6], "texture": "#tv"}, - "up": {"uv": [0, 0, 0.4, 0.2], "rotation": 180, "texture": "#tv"}, - "down": {"uv": [0, 0, 0.4, 0.2], "rotation": 180, "texture": "#tv"} - } - }, - { - "from": [22.6, 5, 9], - "to": [23, 21.6, 9.2], - "rotation": {"angle": 0, "axis": "y", "origin": [8.5, 20.5, 7.5]}, - "faces": { - "east": {"uv": [0, 0, 0.2, 14.6], "texture": "#tv"}, - "south": {"uv": [0, 0, 0.4, 14.6], "texture": "#tv"}, - "west": {"uv": [0, 0, 0.2, 14.6], "texture": "#tv"}, - "up": {"uv": [0, 0, 0.4, 0.2], "rotation": 180, "texture": "#tv"}, - "down": {"uv": [0, 0, 0.4, 0.2], "rotation": 180, "texture": "#tv"} - } - } - ], - "display": { - "thirdperson_righthand": { - "translation": [0, 4, 0], - "scale": [0.5, 0.5, 0.5] - }, - "thirdperson_lefthand": { - "translation": [0, 4, 0], - "scale": [0.5, 0.5, 0.5] - }, - "firstperson_righthand": { - "rotation": [0, -22, 0], - "translation": [0, 2.25, 0], - "scale": [0.35, 0.35, 0.35] - }, - "firstperson_lefthand": { - "rotation": [0, -19, 0], - "translation": [0, 2.5, 0], - "scale": [0.35, 0.35, 0.35] - }, - "ground": { - "scale": [0.5, 0.5, 0.5] - }, - "gui": { - "rotation": [15, -45, 0], - "translation": [0, -1.5, 0], - "scale": [0.5, 0.5, 0.5] - }, - "head": { - "rotation": [0, -180, 0], - "translation": [0, 10.25, 0], - "scale": [0.5, 0.5, 0.5] - }, - "fixed": { - "rotation": [0, -180, 0], - "translation": [0, -1.75, 0], - "scale": [0.5, 0.5, 0.5] - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/decorative/models/item/beach_ball.json b/src/main/resources/assets/decorative/models/item/beach_ball.json index a6c5636..dc2c474 100755 --- a/src/main/resources/assets/decorative/models/item/beach_ball.json +++ b/src/main/resources/assets/decorative/models/item/beach_ball.json @@ -3,7 +3,7 @@ "parent": "block/block", "texture_size": [64, 64], "textures": { - "0": "decorative:entity/beach_ball" + "0": "decorative:item/entity/beach_ball" }, "elements": [ { diff --git a/src/main/resources/assets/decorative/models/item/duck_bath_tire.json b/src/main/resources/assets/decorative/models/item/duck_bath_tire.json index 0c4dfe0..0f5b164 100755 --- a/src/main/resources/assets/decorative/models/item/duck_bath_tire.json +++ b/src/main/resources/assets/decorative/models/item/duck_bath_tire.json @@ -2,7 +2,7 @@ "credit": "made by Motschen", "parent": "block/block", "textures": { - "0": "decorative:entity/duck_bath_tire" + "0": "decorative:item/entity/duck_bath_tire" }, "elements": [ { diff --git a/src/main/resources/assets/decorative/models/item/old_television.json b/src/main/resources/assets/decorative/models/item/old_television.json index 6a54f02..7a5f197 100755 --- a/src/main/resources/assets/decorative/models/item/old_television.json +++ b/src/main/resources/assets/decorative/models/item/old_television.json @@ -1,3 +1,222 @@ { - "parent": "decorative:block/old_television_nyancat" + "credit": "made by Motschen", + "parent": "block/block", + "ambientocclusion": false, + "textures": { + "2": "block/gray_concrete", + "3": "block/iron_block", + "4": "block/red_terracotta", + "5": "block/light_gray_concrete", + "black": "decorative:block/black", + "particle": "block/black_concrete", + "tv": "block/black_concrete" + }, + "elements": [ + { + "from": [2, 2, 12.7], + "to": [14, 12, 14], + "rotation": {"angle": 0, "axis": "y", "origin": [8.5, 18.5, 12.5]}, + "faces": { + "north": {"uv": [0, 1.6, 16, 14.4], "texture": "#tv"}, + "east": {"uv": [0, 1.6, 3.2, 14.4], "texture": "#tv"}, + "south": {"uv": [0.65, 2, 15.549, 13.15], "texture": "#black"}, + "west": {"uv": [12.8, 1.6, 16, 14.4], "texture": "#tv"}, + "up": {"uv": [0, 1.6, 16, 4.8], "rotation": 180, "texture": "#tv"}, + "down": {"uv": [0, 11.2, 16, 14.4], "rotation": 180, "texture": "#tv"} + } + }, + { + "from": [0, 0, 2], + "to": [16, 2, 15], + "faces": { + "north": {"uv": [0, 0, 16, 2], "texture": "#2"}, + "east": {"uv": [0, 0, 13, 2], "texture": "#2"}, + "south": {"uv": [0, 0, 16, 2], "texture": "#2"}, + "west": {"uv": [0, 0, 13, 2], "texture": "#2"}, + "up": {"uv": [0, 0, 16, 13], "texture": "#2"}, + "down": {"uv": [0, 0, 16, 13], "texture": "#2"} + } + }, + { + "from": [0, 12, 2], + "to": [16, 14, 15], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 20, 8]}, + "faces": { + "north": {"uv": [0, 0, 16, 2], "texture": "#2"}, + "east": {"uv": [0, 0, 13, 2], "texture": "#2"}, + "south": {"uv": [0, 0, 16, 2], "texture": "#2"}, + "west": {"uv": [0, 0, 13, 2], "texture": "#2"}, + "up": {"uv": [0, 0, 16, 13], "texture": "#2"}, + "down": {"uv": [0, 0, 16, 13], "texture": "#2"} + } + }, + { + "from": [0, 2, 2], + "to": [2, 12, 15], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 10, 8]}, + "faces": { + "north": {"uv": [0, 0, 2, 10], "texture": "#2"}, + "east": {"uv": [0, 0, 13, 10], "texture": "#2"}, + "south": {"uv": [0, 0, 2, 10], "texture": "#2"}, + "west": {"uv": [0, 0, 13, 10], "texture": "#2"} + } + }, + { + "from": [14, 2, 2], + "to": [16, 12, 15], + "rotation": {"angle": 0, "axis": "y", "origin": [22, 10, 8]}, + "faces": { + "north": {"uv": [0, 0, 2, 10], "texture": "#2"}, + "east": {"uv": [0, 0, 13, 10], "texture": "#2"}, + "south": {"uv": [0, 0, 2, 10], "texture": "#2"}, + "west": {"uv": [0, 0, 13, 10], "texture": "#2"} + } + }, + { + "from": [2, 2, 3], + "to": [14, 12, 13], + "rotation": {"angle": 0, "axis": "y", "origin": [20, 10, 8]}, + "faces": { + "north": {"uv": [0, 0, 12, 10], "texture": "#2"}, + "east": {"uv": [0, 0, 10, 10], "texture": "#2"}, + "south": {"uv": [0, 0, 12, 10], "texture": "#2"}, + "west": {"uv": [0, 0, 10, 10], "texture": "#2"} + } + }, + { + "from": [11, 3, 2.5], + "to": [13, 4, 3.5], + "rotation": {"angle": 0, "axis": "y", "origin": [19, 11, 10]}, + "faces": { + "north": {"uv": [0, 0, 2, 1], "texture": "#tv"}, + "east": {"uv": [0, 0, 1, 1], "texture": "#tv"}, + "west": {"uv": [0, 0, 1, 1], "texture": "#tv"}, + "up": {"uv": [0, 0, 2, 1], "texture": "#tv"}, + "down": {"uv": [0, 0, 2, 1], "texture": "#tv"} + } + }, + { + "from": [8, 3, 2.5], + "to": [10, 4, 3.5], + "rotation": {"angle": 0, "axis": "y", "origin": [16, 11, 10]}, + "faces": { + "north": {"uv": [0, 0, 2, 1], "texture": "#tv"}, + "east": {"uv": [0, 0, 1, 1], "texture": "#tv"}, + "west": {"uv": [0, 0, 1, 1], "texture": "#tv"}, + "up": {"uv": [0, 0, 2, 1], "texture": "#tv"}, + "down": {"uv": [0, 0, 2, 1], "texture": "#tv"} + } + }, + { + "from": [3, 3, 2.5], + "to": [4, 4, 3.5], + "rotation": {"angle": 0, "axis": "y", "origin": [11, 11, 10]}, + "faces": { + "north": {"uv": [0, 0, 1, 1], "texture": "#tv"}, + "east": {"uv": [0, 0, 1, 1], "texture": "#tv"}, + "west": {"uv": [0, 0, 1, 1], "texture": "#tv"}, + "up": {"uv": [0, 0, 1, 1], "texture": "#tv"}, + "down": {"uv": [0, 0, 1, 1], "texture": "#tv"} + } + }, + { + "from": [3.5, 15.8, 12], + "to": [4.5, 19.8, 13], + "rotation": {"angle": 22.5, "axis": "z", "origin": [11, 24, 20]}, + "faces": { + "north": {"uv": [0, 0, 1, 4], "texture": "#3"}, + "east": {"uv": [0, 0, 1, 4], "texture": "#3"}, + "south": {"uv": [0, 0, 1, 4], "texture": "#3"}, + "west": {"uv": [0, 0, 1, 4], "texture": "#3"}, + "up": {"uv": [0, 0, 1, 1], "texture": "#3"} + } + }, + { + "from": [11.5, 15, 12], + "to": [12.5, 19, 13], + "rotation": {"angle": -22.5, "axis": "z", "origin": [4, 23, 20]}, + "faces": { + "north": {"uv": [0, 0, 1, 4], "texture": "#3"}, + "east": {"uv": [0, 0, 1, 4], "texture": "#3"}, + "south": {"uv": [0, 0, 1, 4], "texture": "#3"}, + "west": {"uv": [0, 0, 1, 4], "texture": "#3"}, + "up": {"uv": [0, 0, 1, 1], "rotation": 90, "texture": "#3"} + } + }, + { + "from": [1, 0.75, 15], + "to": [1.5, 1.25, 15.25], + "rotation": {"angle": 0, "axis": "y", "origin": [9, 9, 23]}, + "faces": { + "east": {"uv": [0, 0, 0.25, 0.5], "texture": "#4"}, + "south": {"uv": [0, 0, 0.5, 0.5], "texture": "#4"}, + "west": {"uv": [0, 0, 0.25, 0.5], "texture": "#4"}, + "up": {"uv": [0, 0, 0.5, 0.25], "texture": "#4"}, + "down": {"uv": [0, 0, 0.5, 0.25], "texture": "#4"} + } + }, + { + "from": [2, 0.75, 15], + "to": [2.5, 1.25, 15.25], + "rotation": {"angle": 0, "axis": "y", "origin": [10, 9, 23]}, + "faces": { + "east": {"uv": [0, 0, 0.25, 0.5], "texture": "#tv"}, + "south": {"uv": [0, 0, 0.5, 0.5], "texture": "#tv"}, + "west": {"uv": [0, 0, 0.25, 0.5], "texture": "#tv"}, + "up": {"uv": [0, 0, 0.5, 0.25], "texture": "#tv"}, + "down": {"uv": [0, 0, 0.5, 0.25], "texture": "#tv"} + } + }, + { + "from": [4, 6, 2.9], + "to": [12, 11, 3.9], + "rotation": {"angle": 0, "axis": "y", "origin": [12, 14, 10]}, + "faces": { + "north": {"uv": [0, 0, 8, 5], "texture": "#5"}, + "east": {"uv": [0, 0, 1, 5], "texture": "#5"}, + "west": {"uv": [0, 0, 1, 5], "texture": "#5"}, + "up": {"uv": [0, 0, 8, 1], "texture": "#5"}, + "down": {"uv": [0, 0, 8, 1], "texture": "#5"} + } + } + ], + "display": { + "thirdperson_righthand": { + "translation": [0, 4, 0], + "scale": [0.5, 0.5, 0.5] + }, + "thirdperson_lefthand": { + "translation": [0, 4, 0], + "scale": [0.5, 0.5, 0.5] + }, + "firstperson_righthand": { + "rotation": [0, -22, 0], + "translation": [0, 4.5, 0], + "scale": [0.35, 0.35, 0.35] + }, + "firstperson_lefthand": { + "rotation": [0, -19, 0], + "translation": [0, 4.5, 0], + "scale": [0.35, 0.35, 0.35] + }, + "ground": { + "translation": [0, 0.75, 0], + "scale": [0.5, 0.5, 0.5] + }, + "gui": { + "rotation": [15, -45, 0], + "translation": [0.25, 0.25, 0], + "scale": [0.75, 0.75, 0.61] + }, + "head": { + "rotation": [0, -180, 0], + "translation": [0, 10.25, 0], + "scale": [0.5, 0.5, 0.5] + }, + "fixed": { + "rotation": [0, -180, 0], + "translation": [0, 0, 2.5], + "scale": [0.75, 0.75, 0.75] + } + } } \ No newline at end of file diff --git a/src/main/resources/assets/decorative/models/item/television.json b/src/main/resources/assets/decorative/models/item/television.json index d4b4292..e36e2b2 100755 --- a/src/main/resources/assets/decorative/models/item/television.json +++ b/src/main/resources/assets/decorative/models/item/television.json @@ -1,3 +1,158 @@ { - "parent": "decorative:block/television_nyancat" + "credit": "made by Motschen", + "parent": "block/block", + "ambientocclusion": false, + "textures": { + "black": "decorative:block/black", + "particle": "block/black_concrete", + "tv": "block/black_concrete" + }, + "elements": [ + { + "from": [-5, 5, 7.1], + "to": [22, 20, 7.7], + "rotation": {"angle": 0, "axis": "y", "origin": [8.5, 20.5, 7.5]}, + "faces": { + "north": {"uv": [0, 0, 16, 15], "texture": "#tv"}, + "east": {"uv": [0, 0, 0.6, 15], "texture": "#tv"}, + "west": {"uv": [0, 0, 0.6, 15], "texture": "#tv"}, + "down": {"uv": [0, 0, 0.6, 16], "rotation": 270, "texture": "#tv"} + } + }, + { + "from": [-5, 19.8, 6.88], + "to": [22, 20.4, 7.88], + "rotation": {"angle": -45, "axis": "x", "origin": [8.5, 20.5, 7.5]}, + "faces": { + "east": {"uv": [0, 0, 1, 0.6], "texture": "#tv"}, + "west": {"uv": [0, 0, 1, 0.6], "texture": "#tv"}, + "up": {"uv": [0, 0, 1, 16], "rotation": 90, "texture": "#tv"} + } + }, + { + "from": [3, 0, 6], + "to": [13, 1, 11], + "rotation": {"angle": 0, "axis": "y", "origin": [8.5, 20.5, 7.5]}, + "faces": { + "north": {"uv": [6.4, 13.6, 9.6, 14.4], "texture": "#tv"}, + "east": {"uv": [3.2, 13.6, 6.4, 14.4], "texture": "#tv"}, + "south": {"uv": [0, 13.6, 3.2, 14.4], "texture": "#tv"}, + "west": {"uv": [9.6, 13.6, 12.8, 14.4], "texture": "#tv"}, + "up": {"uv": [6.4, 6.4, 9.6, 9.6], "rotation": 180, "texture": "#tv"}, + "down": {"uv": [5.6, 7.2, 8.8, 10.4], "rotation": 180, "texture": "#tv"} + } + }, + { + "from": [7, 1, 8], + "to": [9, 4, 9], + "rotation": {"angle": 0, "axis": "y", "origin": [8.5, 20.5, 7.5]}, + "faces": { + "north": {"uv": [3.2, 10.4, 4.8, 12.8], "texture": "#tv"}, + "east": {"uv": [2.4, 10.4, 4, 12.8], "texture": "#tv"}, + "south": {"uv": [0, 10.4, 1.6, 12.8], "texture": "#tv"}, + "west": {"uv": [5.6, 10.4, 7.2, 12.8], "texture": "#tv"}, + "up": {"uv": [7.2, 8, 8.8, 9.6], "rotation": 180, "texture": "#tv"}, + "down": {"uv": [8, 4.8, 9.6, 6.4], "rotation": 180, "texture": "#tv"} + } + }, + { + "from": [-6, 4, 7.7], + "to": [23, 22, 9], + "rotation": {"angle": 0, "axis": "y", "origin": [8.5, 20.5, 7.5]}, + "faces": { + "north": {"uv": [0, 1.6, 16, 14.4], "texture": "#tv"}, + "east": {"uv": [0, 1.6, 3.2, 14.4], "texture": "#tv"}, + "south": {"uv": [0, 2, 16, 13.45], "texture": "#black"}, + "west": {"uv": [12.8, 1.6, 16, 14.4], "texture": "#tv"}, + "up": {"uv": [0, 1.6, 16, 4.8], "rotation": 180, "texture": "#tv"}, + "down": {"uv": [0, 11.2, 16, 14.4], "rotation": 180, "texture": "#tv"} + } + }, + { + "from": [-6, 4, 9], + "to": [23, 5.15, 9.2], + "rotation": {"angle": 0, "axis": "y", "origin": [8.5, 20.5, 7.5]}, + "faces": { + "east": {"uv": [0, 0, 0.2, 1], "texture": "#tv"}, + "south": {"uv": [0, 0, 16, 1], "texture": "#tv"}, + "west": {"uv": [0, 0, 0.2, 1], "texture": "#tv"}, + "up": {"uv": [0, 0, 16, 0.2], "rotation": 180, "texture": "#tv"}, + "down": {"uv": [0, 0, 16, 0.2], "rotation": 180, "texture": "#tv"} + } + }, + { + "from": [-6, 21.6, 9], + "to": [23, 22, 9.2], + "rotation": {"angle": 0, "axis": "y", "origin": [8.5, 20.5, 7.5]}, + "faces": { + "east": {"uv": [0, 0, 0.2, 0.4], "texture": "#tv"}, + "south": {"uv": [0, 0, 16, 0.4], "texture": "#tv"}, + "west": {"uv": [0, 0, 0.2, 0.4], "texture": "#tv"}, + "up": {"uv": [0, 0, 16, 0.2], "rotation": 180, "texture": "#tv"}, + "down": {"uv": [0, 0, 16, 0.2], "rotation": 180, "texture": "#tv"} + } + }, + { + "from": [-6, 5, 9], + "to": [-5.6, 21.6, 9.2], + "rotation": {"angle": 0, "axis": "y", "origin": [8.5, 20.5, 7.5]}, + "faces": { + "east": {"uv": [0, 0, 0.2, 14.6], "texture": "#tv"}, + "south": {"uv": [0, 0, 0.4, 14.6], "texture": "#tv"}, + "west": {"uv": [0, 0, 0.2, 14.6], "texture": "#tv"}, + "up": {"uv": [0, 0, 0.4, 0.2], "rotation": 180, "texture": "#tv"}, + "down": {"uv": [0, 0, 0.4, 0.2], "rotation": 180, "texture": "#tv"} + } + }, + { + "from": [22.6, 5, 9], + "to": [23, 21.6, 9.2], + "rotation": {"angle": 0, "axis": "y", "origin": [8.5, 20.5, 7.5]}, + "faces": { + "east": {"uv": [0, 0, 0.2, 14.6], "texture": "#tv"}, + "south": {"uv": [0, 0, 0.4, 14.6], "texture": "#tv"}, + "west": {"uv": [0, 0, 0.2, 14.6], "texture": "#tv"}, + "up": {"uv": [0, 0, 0.4, 0.2], "rotation": 180, "texture": "#tv"}, + "down": {"uv": [0, 0, 0.4, 0.2], "rotation": 180, "texture": "#tv"} + } + } + ], + "display": { + "thirdperson_righthand": { + "translation": [0, 4, 0], + "scale": [0.5, 0.5, 0.5] + }, + "thirdperson_lefthand": { + "translation": [0, 4, 0], + "scale": [0.5, 0.5, 0.5] + }, + "firstperson_righthand": { + "rotation": [0, -22, 0], + "translation": [0, 2.25, 0], + "scale": [0.35, 0.35, 0.35] + }, + "firstperson_lefthand": { + "rotation": [0, -19, 0], + "translation": [0, 2.5, 0], + "scale": [0.35, 0.35, 0.35] + }, + "ground": { + "scale": [0.5, 0.5, 0.5] + }, + "gui": { + "rotation": [15, -45, 0], + "translation": [0, -1.5, 0], + "scale": [0.5, 0.5, 0.5] + }, + "head": { + "rotation": [0, -180, 0], + "translation": [0, 10.25, 0], + "scale": [0.5, 0.5, 0.5] + }, + "fixed": { + "rotation": [0, -180, 0], + "translation": [0, -1.75, 0], + "scale": [0.5, 0.5, 0.5] + } + } } \ No newline at end of file diff --git a/src/main/resources/assets/decorative/textures/tv/black.png b/src/main/resources/assets/decorative/textures/block/black.png similarity index 100% rename from src/main/resources/assets/decorative/textures/tv/black.png rename to src/main/resources/assets/decorative/textures/block/black.png diff --git a/src/main/resources/assets/decorative/textures/block/kitchen_tiles (Kopieren).png b/src/main/resources/assets/decorative/textures/block/kitchen_tiles (Kopieren).png new file mode 100755 index 0000000..1091e62 Binary files /dev/null and b/src/main/resources/assets/decorative/textures/block/kitchen_tiles (Kopieren).png differ diff --git a/src/main/resources/assets/decorative/textures/item/entity/beach_ball.png b/src/main/resources/assets/decorative/textures/item/entity/beach_ball.png new file mode 100755 index 0000000..bf9568e Binary files /dev/null and b/src/main/resources/assets/decorative/textures/item/entity/beach_ball.png differ diff --git a/src/main/resources/assets/decorative/textures/item/entity/duck_bath_tire.png b/src/main/resources/assets/decorative/textures/item/entity/duck_bath_tire.png new file mode 100755 index 0000000..311e54b Binary files /dev/null and b/src/main/resources/assets/decorative/textures/item/entity/duck_bath_tire.png differ diff --git a/src/main/resources/assets/decorative/textures/tv/crabrave.png b/src/main/resources/assets/decorative/textures/tv/crabrave.png deleted file mode 100755 index 93156cc..0000000 Binary files a/src/main/resources/assets/decorative/textures/tv/crabrave.png and /dev/null differ diff --git a/src/main/resources/assets/decorative/textures/tv/crabrave.png.mcmeta b/src/main/resources/assets/decorative/textures/tv/crabrave.png.mcmeta deleted file mode 100755 index 7e77c64..0000000 --- a/src/main/resources/assets/decorative/textures/tv/crabrave.png.mcmeta +++ /dev/null @@ -1,5 +0,0 @@ -{ - "animation": { - "frametime": 2 - } -} \ No newline at end of file diff --git a/src/main/resources/assets/decorative/textures/tv/crabrave_e.png b/src/main/resources/assets/decorative/textures/tv/crabrave_e.png deleted file mode 100755 index 93156cc..0000000 Binary files a/src/main/resources/assets/decorative/textures/tv/crabrave_e.png and /dev/null differ diff --git a/src/main/resources/assets/decorative/textures/tv/crabrave_e.png.mcmeta b/src/main/resources/assets/decorative/textures/tv/crabrave_e.png.mcmeta deleted file mode 100755 index 7e77c64..0000000 --- a/src/main/resources/assets/decorative/textures/tv/crabrave_e.png.mcmeta +++ /dev/null @@ -1,5 +0,0 @@ -{ - "animation": { - "frametime": 2 - } -} \ No newline at end of file diff --git a/src/main/resources/assets/decorative/textures/tv/creeper.png b/src/main/resources/assets/decorative/textures/tv/creeper.png deleted file mode 100755 index 44bb522..0000000 Binary files a/src/main/resources/assets/decorative/textures/tv/creeper.png and /dev/null differ diff --git a/src/main/resources/assets/decorative/textures/tv/creeper.png.mcmeta b/src/main/resources/assets/decorative/textures/tv/creeper.png.mcmeta deleted file mode 100755 index c5d457f..0000000 --- a/src/main/resources/assets/decorative/textures/tv/creeper.png.mcmeta +++ /dev/null @@ -1,5 +0,0 @@ -{ - "animation": { - "frametime": 1 - } -} \ No newline at end of file diff --git a/src/main/resources/assets/decorative/textures/tv/creeper_e.png b/src/main/resources/assets/decorative/textures/tv/creeper_e.png deleted file mode 100755 index 44bb522..0000000 Binary files a/src/main/resources/assets/decorative/textures/tv/creeper_e.png and /dev/null differ diff --git a/src/main/resources/assets/decorative/textures/tv/creeper_e.png.mcmeta b/src/main/resources/assets/decorative/textures/tv/creeper_e.png.mcmeta deleted file mode 100755 index c5d457f..0000000 --- a/src/main/resources/assets/decorative/textures/tv/creeper_e.png.mcmeta +++ /dev/null @@ -1,5 +0,0 @@ -{ - "animation": { - "frametime": 1 - } -} \ No newline at end of file diff --git a/src/main/resources/assets/decorative/textures/tv/nyancat.png b/src/main/resources/assets/decorative/textures/tv/nyancat.png deleted file mode 100755 index 5c8cc6f..0000000 Binary files a/src/main/resources/assets/decorative/textures/tv/nyancat.png and /dev/null differ diff --git a/src/main/resources/assets/decorative/textures/tv/nyancat.png.mcmeta b/src/main/resources/assets/decorative/textures/tv/nyancat.png.mcmeta deleted file mode 100755 index c5d457f..0000000 --- a/src/main/resources/assets/decorative/textures/tv/nyancat.png.mcmeta +++ /dev/null @@ -1,5 +0,0 @@ -{ - "animation": { - "frametime": 1 - } -} \ No newline at end of file diff --git a/src/main/resources/assets/decorative/textures/tv/nyancat_e.png b/src/main/resources/assets/decorative/textures/tv/nyancat_e.png deleted file mode 100755 index 5c8cc6f..0000000 Binary files a/src/main/resources/assets/decorative/textures/tv/nyancat_e.png and /dev/null differ diff --git a/src/main/resources/assets/decorative/textures/tv/nyancat_e.png.mcmeta b/src/main/resources/assets/decorative/textures/tv/nyancat_e.png.mcmeta deleted file mode 100755 index c5d457f..0000000 --- a/src/main/resources/assets/decorative/textures/tv/nyancat_e.png.mcmeta +++ /dev/null @@ -1,5 +0,0 @@ -{ - "animation": { - "frametime": 1 - } -} \ No newline at end of file diff --git a/src/main/resources/assets/decorative/textures/tv/tater.png b/src/main/resources/assets/decorative/textures/tv/tater.png deleted file mode 100755 index 403f74f..0000000 Binary files a/src/main/resources/assets/decorative/textures/tv/tater.png and /dev/null differ diff --git a/src/main/resources/assets/decorative/textures/tv/tater.png.mcmeta b/src/main/resources/assets/decorative/textures/tv/tater.png.mcmeta deleted file mode 100755 index c5d457f..0000000 --- a/src/main/resources/assets/decorative/textures/tv/tater.png.mcmeta +++ /dev/null @@ -1,5 +0,0 @@ -{ - "animation": { - "frametime": 1 - } -} \ No newline at end of file diff --git a/src/main/resources/assets/decorative/textures/tv/tater_e.png b/src/main/resources/assets/decorative/textures/tv/tater_e.png deleted file mode 100755 index 403f74f..0000000 Binary files a/src/main/resources/assets/decorative/textures/tv/tater_e.png and /dev/null differ diff --git a/src/main/resources/assets/decorative/textures/tv/tater_e.png.mcmeta b/src/main/resources/assets/decorative/textures/tv/tater_e.png.mcmeta deleted file mode 100755 index c5d457f..0000000 --- a/src/main/resources/assets/decorative/textures/tv/tater_e.png.mcmeta +++ /dev/null @@ -1,5 +0,0 @@ -{ - "animation": { - "frametime": 1 - } -} \ No newline at end of file