From 113219604fd2a46a81dc4b19caae3d7bfbafd2cc Mon Sep 17 00:00:00 2001 From: HypherionSA Date: Sun, 2 Apr 2023 17:57:09 +0200 Subject: [PATCH] [FEAT] Re-Add Jack-o-Lantern Trios --- .../config/HyperLightingClientConfig.java | 19 +++ .../common/blocks/PumpkinTrioBlock.java | 73 ++++++++ .../hyperlighting/common/init/HLBlocks.java | 3 +- .../blockstates/pumpkin_trio.json | 12 ++ .../blockstates/pumpkin_trio_inverted.json | 12 ++ .../assets/hyperlighting/lang/en_us.json | 2 + .../models/block/carved_pumpkin_trio.json | 107 ++++++++++++ .../block/carved_pumpkin_trio_inverted.json | 108 ++++++++++++ .../models/block/jack_o_lantern_trio.json | 159 ++++++++++++++++++ .../block/jack_o_lantern_trio_inverted.json | 108 ++++++++++++ .../models/item/pumpkin_trio.json | 3 + .../models/item/pumpkin_trio_inverted.json | 3 + .../textures/block/small_carved_pumpkin.png | Bin 0 -> 877 bytes .../textures/block/small_jack_o_lantern.png | Bin 0 -> 1298 bytes 14 files changed, 608 insertions(+), 1 deletion(-) create mode 100644 Common/src/main/java/me/hypherionmc/hyperlighting/common/blocks/PumpkinTrioBlock.java create mode 100644 Common/src/main/resources/assets/hyperlighting/blockstates/pumpkin_trio.json create mode 100644 Common/src/main/resources/assets/hyperlighting/blockstates/pumpkin_trio_inverted.json create mode 100644 Common/src/main/resources/assets/hyperlighting/models/block/carved_pumpkin_trio.json create mode 100644 Common/src/main/resources/assets/hyperlighting/models/block/carved_pumpkin_trio_inverted.json create mode 100644 Common/src/main/resources/assets/hyperlighting/models/block/jack_o_lantern_trio.json create mode 100644 Common/src/main/resources/assets/hyperlighting/models/block/jack_o_lantern_trio_inverted.json create mode 100644 Common/src/main/resources/assets/hyperlighting/models/item/pumpkin_trio.json create mode 100644 Common/src/main/resources/assets/hyperlighting/models/item/pumpkin_trio_inverted.json create mode 100644 Common/src/main/resources/assets/hyperlighting/textures/block/small_carved_pumpkin.png create mode 100644 Common/src/main/resources/assets/hyperlighting/textures/block/small_jack_o_lantern.png diff --git a/Common/src/main/java/me/hypherionmc/hyperlighting/client/config/HyperLightingClientConfig.java b/Common/src/main/java/me/hypherionmc/hyperlighting/client/config/HyperLightingClientConfig.java index 900523d..df1c3e4 100644 --- a/Common/src/main/java/me/hypherionmc/hyperlighting/client/config/HyperLightingClientConfig.java +++ b/Common/src/main/java/me/hypherionmc/hyperlighting/client/config/HyperLightingClientConfig.java @@ -29,6 +29,11 @@ public class HyperLightingClientConfig extends ModuleConfig { @SubConfig public CandleConfig candleConfig = new CandleConfig(); + @Path("pumpkinTrioConfig") + @SpecComment("Pumpkin Trio Configuration") + @SubConfig + public PumpkinTrioConfig pumpkinTrioConfig = new PumpkinTrioConfig(); + public HyperLightingClientConfig() { super(Constants.MOD_ID, "hyperlighting-client"); registerAndSetup(this); @@ -94,4 +99,18 @@ public class HyperLightingClientConfig extends ModuleConfig { @SpecComment("Should Candles emit colored Lighting when SHIMMER is installed") public boolean coloredLighting = true; } + + public static class PumpkinTrioConfig { + @Path("litByDefault") + @SpecComment("Should Pumpkin Trios be lit by default when placed") + public boolean litByDefault = false; + + @Path("requiresTool") + @SpecComment("Is the Torch Lighter tool needed to light Pumpkin Trios") + public boolean requiresTool = true; + + @Path("coloredLighting") + @SpecComment("Should Pumpkin Trios emit colored Lighting when SHIMMER is installed") + public boolean coloredLighting = true; + } } diff --git a/Common/src/main/java/me/hypherionmc/hyperlighting/common/blocks/PumpkinTrioBlock.java b/Common/src/main/java/me/hypherionmc/hyperlighting/common/blocks/PumpkinTrioBlock.java new file mode 100644 index 0000000..8cc57fd --- /dev/null +++ b/Common/src/main/java/me/hypherionmc/hyperlighting/common/blocks/PumpkinTrioBlock.java @@ -0,0 +1,73 @@ +package me.hypherionmc.hyperlighting.common.blocks; + +import me.hypherionmc.craterlib.systems.internal.CreativeTabRegistry; +import me.hypherionmc.craterlib.util.BlockStateUtils; +import me.hypherionmc.hyperlighting.api.LightableBlock; +import me.hypherionmc.hyperlighting.common.init.CommonRegistration; +import me.hypherionmc.hyperlighting.common.init.HLItems; +import me.hypherionmc.hyperlighting.common.init.HLSounds; +import net.minecraft.core.BlockPos; +import net.minecraft.core.Direction; +import net.minecraft.sounds.SoundEvents; +import net.minecraft.sounds.SoundSource; +import net.minecraft.world.item.BlockItem; +import net.minecraft.world.item.Item; +import net.minecraft.world.item.context.BlockPlaceContext; +import net.minecraft.world.level.BlockGetter; +import net.minecraft.world.level.Level; +import net.minecraft.world.level.block.Block; +import net.minecraft.world.level.block.SoundType; +import net.minecraft.world.level.block.state.BlockState; +import net.minecraft.world.level.block.state.StateDefinition; +import net.minecraft.world.level.block.state.properties.BlockStateProperties; +import net.minecraft.world.level.block.state.properties.BooleanProperty; +import net.minecraft.world.level.block.state.properties.DirectionProperty; +import net.minecraft.world.level.material.Material; +import net.minecraft.world.phys.shapes.CollisionContext; +import net.minecraft.world.phys.shapes.VoxelShape; +import org.jetbrains.annotations.Nullable; + +public class PumpkinTrioBlock extends Block implements LightableBlock { + + public static final BooleanProperty LIT = BlockStateProperties.LIT; + public static final DirectionProperty FACING = BlockStateProperties.HORIZONTAL_FACING; + private static final VoxelShape BOUNDING_BOX = Block.box(0, 0, 0, 16, 0.256, 16); + + public PumpkinTrioBlock(String name) { + super(Properties.of(Material.VEGETABLE).sound(SoundType.LILY_PAD).lightLevel(BlockStateUtils.createLightLevelFromLitBlockState(10))); + this.registerDefaultState(this.defaultBlockState().setValue(LIT, CommonRegistration.config.pumpkinTrioConfig.litByDefault).setValue(FACING, Direction.NORTH)); + + CreativeTabRegistry.setCreativeTab(CommonRegistration.LIGHTS_TAB, HLItems.register(name, () -> new BlockItem(this, new Item.Properties()))); + } + + @Override + public void toggleLight(Level worldIn, BlockState state, BlockPos pos) { + state = state.setValue(LIT, !state.getValue(LIT)); + worldIn.setBlock(pos, state, 2); + if (!state.getValue(LIT)) { + worldIn.playSound(null, pos, SoundEvents.FIRE_EXTINGUISH, SoundSource.BLOCKS, 0.3f, 1.0f); + } else { + worldIn.playSound(null, pos, HLSounds.TORCH_IGNITE.get(), SoundSource.BLOCKS, 0.3f, 1.0f); + } + worldIn.blockUpdated(pos, this); + } + + + @Override + protected void createBlockStateDefinition(StateDefinition.Builder builder) { + builder.add(FACING, LIT); + super.createBlockStateDefinition(builder); + } + + @Override + public VoxelShape getShape(BlockState state, BlockGetter worldIn, BlockPos pos, CollisionContext context) { + return BOUNDING_BOX; + } + + @Nullable + @Override + public BlockState getStateForPlacement(BlockPlaceContext context) { + Direction face = context.getPlayer().getDirection(); + return this.defaultBlockState().setValue(FACING, face).setValue(LIT, CommonRegistration.config.pumpkinTrioConfig.litByDefault); + } +} diff --git a/Common/src/main/java/me/hypherionmc/hyperlighting/common/init/HLBlocks.java b/Common/src/main/java/me/hypherionmc/hyperlighting/common/init/HLBlocks.java index 6d9c03a..9224458 100644 --- a/Common/src/main/java/me/hypherionmc/hyperlighting/common/init/HLBlocks.java +++ b/Common/src/main/java/me/hypherionmc/hyperlighting/common/init/HLBlocks.java @@ -32,7 +32,8 @@ public class HLBlocks { /* Other */ public static BlockRegistryObject BATTERY_NEON = register("battery_neon", () -> new BatteryNeon("battery_neon")); - + public static BlockRegistryObject PUMPKIN_TRIO = register("pumpkin_trio", () -> new PumpkinTrioBlock("pumpkin_trio")); + public static BlockRegistryObject PUMPKIN_TRIO_INVERTED = register("pumpkin_trio_inverted", () -> new PumpkinTrioBlock("pumpkin_trio_inverted")); public static void loadAll() {} diff --git a/Common/src/main/resources/assets/hyperlighting/blockstates/pumpkin_trio.json b/Common/src/main/resources/assets/hyperlighting/blockstates/pumpkin_trio.json new file mode 100644 index 0000000..7e8f5e6 --- /dev/null +++ b/Common/src/main/resources/assets/hyperlighting/blockstates/pumpkin_trio.json @@ -0,0 +1,12 @@ +{ + "variants": { + "facing=north,lit=true": { "model": "hyperlighting:block/jack_o_lantern_trio", "y": 180 }, + "facing=south,lit=true": { "model": "hyperlighting:block/jack_o_lantern_trio" }, + "facing=east,lit=true": { "model": "hyperlighting:block/jack_o_lantern_trio", "y": 270 }, + "facing=west,lit=true": { "model": "hyperlighting:block/jack_o_lantern_trio", "y": 90 }, + "facing=north,lit=false": { "model": "hyperlighting:block/carved_pumpkin_trio", "y": 180 }, + "facing=south,lit=false": { "model": "hyperlighting:block/carved_pumpkin_trio" }, + "facing=east,lit=false": { "model": "hyperlighting:block/carved_pumpkin_trio", "y": 270 }, + "facing=west,lit=false": { "model": "hyperlighting:block/carved_pumpkin_trio", "y": 90 } + } +} diff --git a/Common/src/main/resources/assets/hyperlighting/blockstates/pumpkin_trio_inverted.json b/Common/src/main/resources/assets/hyperlighting/blockstates/pumpkin_trio_inverted.json new file mode 100644 index 0000000..0a8a9ca --- /dev/null +++ b/Common/src/main/resources/assets/hyperlighting/blockstates/pumpkin_trio_inverted.json @@ -0,0 +1,12 @@ +{ + "variants": { + "facing=north,lit=true": { "model": "hyperlighting:block/jack_o_lantern_trio_inverted", "y": 180 }, + "facing=south,lit=true": { "model": "hyperlighting:block/jack_o_lantern_trio_inverted" }, + "facing=east,lit=true": { "model": "hyperlighting:block/jack_o_lantern_trio_inverted", "y": 270 }, + "facing=west,lit=true": { "model": "hyperlighting:block/jack_o_lantern_trio_inverted", "y": 90 }, + "facing=north,lit=false": { "model": "hyperlighting:block/carved_pumpkin_trio_inverted", "y": 180 }, + "facing=south,lit=false": { "model": "hyperlighting:block/carved_pumpkin_trio_inverted" }, + "facing=east,lit=false": { "model": "hyperlighting:block/carved_pumpkin_trio_inverted", "y": 270 }, + "facing=west,lit=false": { "model": "hyperlighting:block/carved_pumpkin_trio_inverted", "y": 90 } + } +} diff --git a/Common/src/main/resources/assets/hyperlighting/lang/en_us.json b/Common/src/main/resources/assets/hyperlighting/lang/en_us.json index 564c891..56268fd 100644 --- a/Common/src/main/resources/assets/hyperlighting/lang/en_us.json +++ b/Common/src/main/resources/assets/hyperlighting/lang/en_us.json @@ -5,6 +5,8 @@ "block.hyperlighting.advanced_campfire": "Advanced Campfire (%s)", "block.hyperlighting.solar_panel": "Solar Panel", "block.hyperlighting.battery_neon": "Battery Fluorescent Light", + "block.hyperlighting.pumpkin_trio": "Jack-o'-Lantern Trio", + "block.hyperlighting.pumpkin_trio_inverted": "Jack-o'-Lantern Trio (Inverted)", "item.hyperlighting.lighter_tool": "Torch Lighter Tool", "item.hyperlighting.wireless_battery": "Wireless Battery", diff --git a/Common/src/main/resources/assets/hyperlighting/models/block/carved_pumpkin_trio.json b/Common/src/main/resources/assets/hyperlighting/models/block/carved_pumpkin_trio.json new file mode 100644 index 0000000..fc64156 --- /dev/null +++ b/Common/src/main/resources/assets/hyperlighting/models/block/carved_pumpkin_trio.json @@ -0,0 +1,107 @@ +{ + "credit": "Made with Blockbench", + "texture_size": [32, 32], + "textures": { + "1": "minecraft:block/oak_planks", + "2": "hyperlighting:block/small_carved_pumpkin", + "3": "minecraft:block/hay_block_top", + "particle": "minecraft:block/hay_block_top" + }, + "elements": [ + { + "name": "Left Pumpkin", + "from": [8, 1, 2], + "to": [14, 7, 8], + "faces": { + "north": {"uv": [0, 0, 6, 6], "texture": "#2"}, + "east": {"uv": [6, 0, 12, 6], "texture": "#2"}, + "south": {"uv": [6, 0, 12, 6], "texture": "#2"}, + "west": {"uv": [6, 0, 12, 6], "texture": "#2"}, + "up": {"uv": [0, 6, 6, 12], "texture": "#2"}, + "down": {"uv": [6, 6, 12, 12], "texture": "#2"} + } + }, + { + "name": "Right Pumpkin", + "from": [2, 1, 6], + "to": [8, 7, 12], + "rotation": {"angle": 45, "axis": "y", "origin": [5, 0, 9]}, + "faces": { + "north": {"uv": [0, 0, 6, 6], "texture": "#2"}, + "east": {"uv": [6, 0, 12, 6], "texture": "#2"}, + "south": {"uv": [6, 0, 12, 6], "texture": "#2"}, + "west": {"uv": [6, 0, 12, 6], "texture": "#2"}, + "up": {"uv": [0, 6, 6, 12], "texture": "#2"}, + "down": {"uv": [6, 6, 12, 12], "texture": "#2"} + } + }, + { + "name": "Top Pumpkin", + "from": [7, 7, 7], + "to": [13, 13, 13], + "rotation": {"angle": 22.5, "axis": "y", "origin": [10, 6, 10]}, + "faces": { + "north": {"uv": [0, 0, 6, 6], "texture": "#2"}, + "east": {"uv": [6, 0, 12, 6], "texture": "#2"}, + "south": {"uv": [6, 0, 12, 6], "texture": "#2"}, + "west": {"uv": [6, 0, 12, 6], "texture": "#2"}, + "up": {"uv": [0, 6, 6, 12], "texture": "#2"}, + "down": {"uv": [0, 6, 6, 12], "texture": "#2"} + } + }, + { + "name": "Stand", + "from": [9, 1, 10], + "to": [12, 7, 13], + "rotation": {"angle": 0, "axis": "y", "origin": [9, 0, 10]}, + "faces": { + "north": {"uv": [13, 3, 16, 9], "texture": "#1"}, + "east": {"uv": [4, 3, 7, 9], "texture": "#1"}, + "south": {"uv": [10, 3, 13, 9], "texture": "#1"}, + "west": {"uv": [0, 3, 3, 9], "texture": "#1"}, + "up": {"uv": [0, 0, 3, 3], "texture": "#1"}, + "down": {"uv": [0, 0, 3, 3], "texture": "#1"} + } + }, + { + "name": "Straw", + "from": [0, 0, 0], + "to": [16, 1, 16], + "faces": { + "north": {"uv": [0, 15, 16, 16], "texture": "#3"}, + "east": {"uv": [0, 15, 16, 16], "texture": "#3"}, + "south": {"uv": [0, 15, 16, 16], "texture": "#3"}, + "west": {"uv": [0, 15, 16, 16], "texture": "#3"}, + "up": {"uv": [0, 0, 16, 16], "texture": "#3"}, + "down": {"uv": [0, 0, 16, 16], "texture": "#3"} + } + } + ], + "display": { + "thirdperson_righthand": { + "rotation": [75, 45, 0], + "translation": [0, 2.5, 0], + "scale": [0.375, 0.375, 0.375] + }, + "thirdperson_lefthand": { + "rotation": [75, 45, 0], + "translation": [0, 2.5, 0], + "scale": [0.375, 0.375, 0.375] + }, + "firstperson_righthand": { + "rotation": [0, 45, 0], + "scale": [0.4, 0.4, 0.4] + }, + "firstperson_lefthand": { + "rotation": [0, 225, 0], + "scale": [0.4, 0.4, 0.4] + }, + "ground": { + "translation": [0, 3, 0], + "scale": [0.25, 0.25, 0.25] + }, + "gui": { + "rotation": [0, 180, 0] + } + } +} diff --git a/Common/src/main/resources/assets/hyperlighting/models/block/carved_pumpkin_trio_inverted.json b/Common/src/main/resources/assets/hyperlighting/models/block/carved_pumpkin_trio_inverted.json new file mode 100644 index 0000000..78c98b5 --- /dev/null +++ b/Common/src/main/resources/assets/hyperlighting/models/block/carved_pumpkin_trio_inverted.json @@ -0,0 +1,108 @@ +{ + "credit": "Made with Blockbench", + "texture_size": [32, 32], + "textures": { + "1": "minecraft:block/oak_planks", + "2": "hyperlighting:block/small_carved_pumpkin", + "3": "minecraft:block/hay_block_top", + "particle": "block/hay_block_top" + }, + "elements": [ + { + "name": "Left Pumpkin", + "from": [8, 1, 2], + "to": [14, 7, 8], + "rotation": {"angle": -45, "axis": "y", "origin": [5, 0, 9]}, + "faces": { + "north": {"uv": [0, 0, 6, 6], "texture": "#2"}, + "east": {"uv": [6, 0, 12, 6], "texture": "#2"}, + "south": {"uv": [6, 0, 12, 6], "texture": "#2"}, + "west": {"uv": [6, 0, 12, 6], "texture": "#2"}, + "up": {"uv": [0, 6, 6, 12], "texture": "#2"}, + "down": {"uv": [6, 6, 12, 12], "texture": "#2"} + } + }, + { + "name": "Right Pumpkin", + "from": [2, 1, 6], + "to": [8, 7, 12], + "rotation": {"angle": 0, "axis": "y", "origin": [5, 0, 9]}, + "faces": { + "north": {"uv": [0, 0, 6, 6], "texture": "#2"}, + "east": {"uv": [6, 0, 12, 6], "texture": "#2"}, + "south": {"uv": [6, 0, 12, 6], "texture": "#2"}, + "west": {"uv": [6, 0, 12, 6], "texture": "#2"}, + "up": {"uv": [0, 6, 6, 12], "texture": "#2"}, + "down": {"uv": [6, 6, 12, 12], "texture": "#2"} + } + }, + { + "name": "Top Pumpkin", + "from": [7, 7, 7], + "to": [13, 13, 13], + "rotation": {"angle": -22.5, "axis": "y", "origin": [10, 6, 10]}, + "faces": { + "north": {"uv": [0, 0, 6, 6], "texture": "#2"}, + "east": {"uv": [6, 0, 12, 6], "texture": "#2"}, + "south": {"uv": [6, 0, 12, 6], "texture": "#2"}, + "west": {"uv": [6, 0, 12, 6], "texture": "#2"}, + "up": {"uv": [0, 6, 6, 12], "texture": "#2"}, + "down": {"uv": [0, 6, 6, 12], "texture": "#2"} + } + }, + { + "name": "Stand", + "from": [9, 1, 10], + "to": [12, 7, 13], + "rotation": {"angle": -45, "axis": "y", "origin": [9, 0, 10]}, + "faces": { + "north": {"uv": [13, 3, 16, 9], "texture": "#1"}, + "east": {"uv": [4, 3, 7, 9], "texture": "#1"}, + "south": {"uv": [10, 3, 13, 9], "texture": "#1"}, + "west": {"uv": [0, 3, 3, 9], "texture": "#1"}, + "up": {"uv": [0, 0, 3, 3], "texture": "#1"}, + "down": {"uv": [0, 0, 3, 3], "texture": "#1"} + } + }, + { + "name": "Straw", + "from": [0, 0, 0], + "to": [16, 1, 16], + "faces": { + "north": {"uv": [0, 15, 16, 16], "texture": "#3"}, + "east": {"uv": [0, 15, 16, 16], "texture": "#3"}, + "south": {"uv": [0, 15, 16, 16], "texture": "#3"}, + "west": {"uv": [0, 15, 16, 16], "texture": "#3"}, + "up": {"uv": [0, 0, 16, 16], "texture": "#3"}, + "down": {"uv": [0, 0, 16, 16], "texture": "#3"} + } + } + ], + "display": { + "thirdperson_righthand": { + "rotation": [75, 45, 0], + "translation": [0, 2.5, 0], + "scale": [0.375, 0.375, 0.375] + }, + "thirdperson_lefthand": { + "rotation": [75, 45, 0], + "translation": [0, 2.5, 0], + "scale": [0.375, 0.375, 0.375] + }, + "firstperson_righthand": { + "rotation": [0, 45, 0], + "scale": [0.4, 0.4, 0.4] + }, + "firstperson_lefthand": { + "rotation": [0, 225, 0], + "scale": [0.4, 0.4, 0.4] + }, + "ground": { + "translation": [0, 3, 0], + "scale": [0.25, 0.25, 0.25] + }, + "gui": { + "rotation": [0, 180, 0] + } + } +} diff --git a/Common/src/main/resources/assets/hyperlighting/models/block/jack_o_lantern_trio.json b/Common/src/main/resources/assets/hyperlighting/models/block/jack_o_lantern_trio.json new file mode 100644 index 0000000..6581260 --- /dev/null +++ b/Common/src/main/resources/assets/hyperlighting/models/block/jack_o_lantern_trio.json @@ -0,0 +1,159 @@ +{ + "credit": "Made with Blockbench", + "texture_size": [32, 32], + "textures": { + "1": "minecraft:block/oak_planks", + "2": "hyperlighting:block/small_jack_o_lantern", + "3": "minecraft:block/hay_block_top", + "particle": "minecraft:block/hay_block_top" + }, + "elements": [ + { + "name": "Left Pumpkin", + "from": [8, 1, 2], + "to": [14, 7, 8], + "faces": { + "north": {"uv": [0, 0, 6, 6], "texture": "#2"}, + "east": {"uv": [6, 0, 12, 6], "texture": "#2"}, + "south": {"uv": [6, 0, 12, 6], "texture": "#2"}, + "west": {"uv": [6, 0, 12, 6], "texture": "#2"}, + "up": {"uv": [0, 6, 6, 12], "texture": "#2"}, + "down": {"uv": [6, 6, 12, 12], "texture": "#2"} + } + }, + { + "name": "Right Pumpkin", + "from": [2, 1, 6], + "to": [8, 7, 12], + "rotation": {"angle": 45, "axis": "y", "origin": [5, 0, 9]}, + "faces": { + "north": {"uv": [0, 0, 6, 6], "texture": "#2"}, + "east": {"uv": [6, 0, 12, 6], "texture": "#2"}, + "south": {"uv": [6, 0, 12, 6], "texture": "#2"}, + "west": {"uv": [6, 0, 12, 6], "texture": "#2"}, + "up": {"uv": [0, 6, 6, 12], "texture": "#2"}, + "down": {"uv": [6, 6, 12, 12], "texture": "#2"} + } + }, + { + "name": "Top Pumpkin", + "from": [7, 7, 7], + "to": [13, 13, 13], + "rotation": {"angle": 22.5, "axis": "y", "origin": [10, 6, 10]}, + "faces": { + "north": {"uv": [0, 0, 6, 6], "texture": "#2"}, + "east": {"uv": [6, 0, 12, 6], "texture": "#2"}, + "south": {"uv": [6, 0, 12, 6], "texture": "#2"}, + "west": {"uv": [6, 0, 12, 6], "texture": "#2"}, + "up": {"uv": [0, 6, 6, 12], "texture": "#2"}, + "down": {"uv": [0, 6, 6, 12], "texture": "#2"} + } + }, + { + "name": "Stand", + "from": [9, 1, 10], + "to": [12, 7, 13], + "rotation": {"angle": 0, "axis": "y", "origin": [9, 0, 10]}, + "faces": { + "north": {"uv": [13, 3, 16, 9], "texture": "#1"}, + "east": {"uv": [4, 3, 7, 9], "texture": "#1"}, + "south": {"uv": [10, 3, 13, 9], "texture": "#1"}, + "west": {"uv": [0, 3, 3, 9], "texture": "#1"}, + "up": {"uv": [0, 0, 3, 3], "texture": "#1"}, + "down": {"uv": [0, 0, 3, 3], "texture": "#1"} + } + }, + { + "name": "Straw", + "from": [0, 0, 0], + "to": [16, 1, 16], + "faces": { + "north": {"uv": [0, 15, 16, 16], "texture": "#3"}, + "east": {"uv": [0, 15, 16, 16], "texture": "#3"}, + "south": {"uv": [0, 15, 16, 16], "texture": "#3"}, + "west": {"uv": [0, 15, 16, 16], "texture": "#3"}, + "up": {"uv": [0, 0, 16, 16], "texture": "#3"}, + "down": {"uv": [0, 0, 16, 16], "texture": "#3"} + } + } + ], + "display": { + "thirdperson_righthand": { + "rotation": [ + 75, + 45, + 0 + ], + "translation": [ + 0, + 2.5, + 0 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + }, + "thirdperson_lefthand": { + "rotation": [ + 75, + 45, + 0 + ], + "translation": [ + 0, + 2.5, + 0 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + }, + "firstperson_righthand": { + "rotation": [ + 0, + 45, + 0 + ], + "scale": [ + 0.4, + 0.4, + 0.4 + ] + }, + "firstperson_lefthand": { + "rotation": [ + 0, + 225, + 0 + ], + "scale": [ + 0.4, + 0.4, + 0.4 + ] + }, + "ground": { + "translation": [ + 0, + 3, + 0 + ], + "scale": [ + 0.25, + 0.25, + 0.25 + ] + }, + "gui": { + "rotation": [ + 0, + 180, + 0 + ] + } + } +} diff --git a/Common/src/main/resources/assets/hyperlighting/models/block/jack_o_lantern_trio_inverted.json b/Common/src/main/resources/assets/hyperlighting/models/block/jack_o_lantern_trio_inverted.json new file mode 100644 index 0000000..1f1775b --- /dev/null +++ b/Common/src/main/resources/assets/hyperlighting/models/block/jack_o_lantern_trio_inverted.json @@ -0,0 +1,108 @@ +{ + "credit": "Made with Blockbench", + "texture_size": [32, 32], + "textures": { + "1": "minecraft:block/oak_planks", + "2": "hyperlighting:block/small_jack_o_lantern", + "3": "minecraft:block/hay_block_top", + "particle": "minecraft:block/hay_block_top" + }, + "elements": [ + { + "name": "Left Pumpkin", + "from": [8, 1, 2], + "to": [14, 7, 8], + "rotation": {"angle": -45, "axis": "y", "origin": [5, 0, 9]}, + "faces": { + "north": {"uv": [0, 0, 6, 6], "texture": "#2"}, + "east": {"uv": [6, 0, 12, 6], "texture": "#2"}, + "south": {"uv": [6, 0, 12, 6], "texture": "#2"}, + "west": {"uv": [6, 0, 12, 6], "texture": "#2"}, + "up": {"uv": [0, 6, 6, 12], "texture": "#2"}, + "down": {"uv": [6, 6, 12, 12], "texture": "#2"} + } + }, + { + "name": "Right Pumpkin", + "from": [2, 1, 6], + "to": [8, 7, 12], + "rotation": {"angle": 0, "axis": "y", "origin": [5, 0, 9]}, + "faces": { + "north": {"uv": [0, 0, 6, 6], "texture": "#2"}, + "east": {"uv": [6, 0, 12, 6], "texture": "#2"}, + "south": {"uv": [6, 0, 12, 6], "texture": "#2"}, + "west": {"uv": [6, 0, 12, 6], "texture": "#2"}, + "up": {"uv": [0, 6, 6, 12], "texture": "#2"}, + "down": {"uv": [6, 6, 12, 12], "texture": "#2"} + } + }, + { + "name": "Top Pumpkin", + "from": [7, 7, 7], + "to": [13, 13, 13], + "rotation": {"angle": -22.5, "axis": "y", "origin": [10, 6, 10]}, + "faces": { + "north": {"uv": [0, 0, 6, 6], "texture": "#2"}, + "east": {"uv": [6, 0, 12, 6], "texture": "#2"}, + "south": {"uv": [6, 0, 12, 6], "texture": "#2"}, + "west": {"uv": [6, 0, 12, 6], "texture": "#2"}, + "up": {"uv": [0, 6, 6, 12], "texture": "#2"}, + "down": {"uv": [0, 6, 6, 12], "texture": "#2"} + } + }, + { + "name": "Stand", + "from": [9, 1, 10], + "to": [12, 7, 13], + "rotation": {"angle": -45, "axis": "y", "origin": [9, 0, 10]}, + "faces": { + "north": {"uv": [13, 3, 16, 9], "texture": "#1"}, + "east": {"uv": [4, 3, 7, 9], "texture": "#1"}, + "south": {"uv": [10, 3, 13, 9], "texture": "#1"}, + "west": {"uv": [0, 3, 3, 9], "texture": "#1"}, + "up": {"uv": [0, 0, 3, 3], "texture": "#1"}, + "down": {"uv": [0, 0, 3, 3], "texture": "#1"} + } + }, + { + "name": "Straw", + "from": [0, 0, 0], + "to": [16, 1, 16], + "faces": { + "north": {"uv": [0, 15, 16, 16], "texture": "#3"}, + "east": {"uv": [0, 15, 16, 16], "texture": "#3"}, + "south": {"uv": [0, 15, 16, 16], "texture": "#3"}, + "west": {"uv": [0, 15, 16, 16], "texture": "#3"}, + "up": {"uv": [0, 0, 16, 16], "texture": "#3"}, + "down": {"uv": [0, 0, 16, 16], "texture": "#3"} + } + } + ], + "display": { + "thirdperson_righthand": { + "rotation": [75, 45, 0], + "translation": [0, 2.5, 0], + "scale": [0.375, 0.375, 0.375] + }, + "thirdperson_lefthand": { + "rotation": [75, 45, 0], + "translation": [0, 2.5, 0], + "scale": [0.375, 0.375, 0.375] + }, + "firstperson_righthand": { + "rotation": [0, 45, 0], + "scale": [0.4, 0.4, 0.4] + }, + "firstperson_lefthand": { + "rotation": [0, 225, 0], + "scale": [0.4, 0.4, 0.4] + }, + "ground": { + "translation": [0, 3, 0], + "scale": [0.25, 0.25, 0.25] + }, + "gui": { + "rotation": [0, 180, 0] + } + } +} diff --git a/Common/src/main/resources/assets/hyperlighting/models/item/pumpkin_trio.json b/Common/src/main/resources/assets/hyperlighting/models/item/pumpkin_trio.json new file mode 100644 index 0000000..9cd5f9b --- /dev/null +++ b/Common/src/main/resources/assets/hyperlighting/models/item/pumpkin_trio.json @@ -0,0 +1,3 @@ +{ + "parent": "hyperlighting:block/jack_o_lantern_trio" +} diff --git a/Common/src/main/resources/assets/hyperlighting/models/item/pumpkin_trio_inverted.json b/Common/src/main/resources/assets/hyperlighting/models/item/pumpkin_trio_inverted.json new file mode 100644 index 0000000..d52bff2 --- /dev/null +++ b/Common/src/main/resources/assets/hyperlighting/models/item/pumpkin_trio_inverted.json @@ -0,0 +1,3 @@ +{ + "parent": "hyperlighting:block/jack_o_lantern_trio_inverted" +} diff --git a/Common/src/main/resources/assets/hyperlighting/textures/block/small_carved_pumpkin.png b/Common/src/main/resources/assets/hyperlighting/textures/block/small_carved_pumpkin.png new file mode 100644 index 0000000000000000000000000000000000000000..7d8b9a44546ab117c839e655bd0431ebe7fe8fcc GIT binary patch literal 877 zcmV-z1CsoSP)cGASK)HBGxpxoejf8UXP&+9X4|)7-mvT|XVl2M=J z)DO=mVDxu0Jm35XP^E}&!`)j8eDg&~8$P<1=k>4e_4@U1?^(Y+&tOk#N0IY>n86Pv z{V+3I2K+#B_tpY~q2$rMJpEnuVWeMQo5v5Nj!HSq9E&hspYK=`Sie25qywo&>;$Yu zb(phSz*>~}I})d%MJPD2OLtMCP(F_vWk8hvdQK)iE#IIi9TD0Mec8Gz#3@+`ZHiWQA=b0#A3au*T4u z@S+XPm8>2p!nPT7yO-%30K;u}bb9?z^1BZoTkz~__0s9CpW$KoFUVRI6Sv*LX%raj zNnW%MprxF5b`EqY+}`MF2mq?f0}nrxG*_~`Y^%-YiW-!nY9ee~W#PxOe=sggKvY!* zApVhfvUWp1C{YQV+QpvPnF+YP5l*83wfd<|=Cqoc5|YCwk_X)`PNRU^8(m5IuW^lQTm#@=+s$2!bMrxVihah{SV^P!YZ1<~+RjzK4@H;7gSBveP;VWwUB0KQKl;Or09i*{LfNH|h1)%5Rq)RzSF=3Gi@ zpX`1dlEjG-CQFTFN>qtTH6^pZeIsAKSt{buN7Ds`ic!x!;N!PqoL-f2nCF&~o z-+4O5*r?Y%7=yNZ*L@y#(_fLCCSFBvG_}Ysbg#kjSyRhy z!O1#=ZY|B$z9heFpJBk$5p-ps=Mp*=y{x{^IlO`Ns{Eo0*xrFbx!=9?2@*JH5)NC- zD*ylh32;bRa{vGf5&!@T5&_cPe*6Fc14~InK~z{r?N&W#Q&AK?d405$phIbt*r(}` zQKS?x7OfP5?O=zx2nC@I4ld%LRNMrI&hA}YlxE71f(8N|S|uW-h-0XYjTTfo6hcTT z*7KeF?#oR~`);6Jqz7(t?>Xn4@BH2KUSxT;f1j92l^P|zUTlTTv)(uHHdud9>4P8b z>7jVcX?hm?d#|gJz-XI|lQ`E)SendpD?fduj}rZ?&x>631atsit=Ipta~QCeIdtX{ zVa+_4rfZW^Rx(sxE2?hhzNkR>CZkO1KJfusqg>zWqO>nV{m}HX8kvIo6-wn+I8yMej<>Mo5B zcM||LkOqfi;Nd@vBm)?k`MYmve59KS3pq5C7JR38|1Mj6h}ZXRg~TuC`c zs5>~3tP)MtX`U~}*q|E>6zG+UMa#JC)to|hDM&A({Zb;jm?V1fM7`;PuD5ux*uyq7 zU1>gc0_jB-=Ck}V=L~?BHui#2NUt0N$sCX_=Liuk(!QYPlI%fpQ@8}ulo>A35t0kz zQU)gdA%OPEs^;p0GR&RkhFtX zCX>+e6>AF)z2Jky96oxFi~tzt<4Auej-KeAWZ)zN|8EBV0!d|bkF-oPz5oCK07*qo IM6N<$f`y1>JOBUy literal 0 HcmV?d00001