[FEAT] Add Pumpkin Trio recipes

Common/src/main/java/me/hypherionmc/hyperlighting/client/config/HyperLightingClientConfig.java

@@ -4,8 +4,8 @@ import me.hypherionmc.craterlib.common.config.ModuleConfig;
 import me.hypherionmc.craterlib.common.config.annotations.SubConfig;
 import me.hypherionmc.hyperlighting.Constants;
 import me.hypherionmc.hyperlighting.common.init.CommonRegistration;
-import me.hypherionmc.moonconfig.core.conversion.Path;
+import shadow.hypherionmc.moonconfig.core.conversion.Path;
-import me.hypherionmc.moonconfig.core.conversion.SpecComment;
+import shadow.hypherionmc.moonconfig.core.conversion.SpecComment;
 
 public class HyperLightingClientConfig extends ModuleConfig {
 
@@ -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;
+    }
 }

Common/src/main/java/me/hypherionmc/hyperlighting/common/blockentities/BatteryNeonBlockEntity.java

@@ -108,7 +108,7 @@ public class BatteryNeonBlockEntity extends CraterBlockEntity implements ITickab
 
         if (level.getGameTime() % 40L == 0L) {
             if (level.getBlockState(blockPos).getValue(BatteryNeon.LIT)) {
-                this.energyStorage.extractEnergy(1, false);
+                this.energyStorage.extractEnergyInternal(1, false);
             }
         }
         this.sendUpdates();

Common/src/main/java/me/hypherionmc/hyperlighting/common/blocks/AdvancedCampfire.java

@@ -169,7 +169,7 @@ public class AdvancedCampfire extends BaseEntityBlock implements DyableBlock, Li
         LevelAccessor levelAccessor = blockPlaceContext.getLevel();
         BlockPos blockPos = blockPlaceContext.getClickedPos();
         boolean bl = levelAccessor.getFluidState(blockPos).getType() == Fluids.WATER;
-        return this.defaultBlockState().setValue(SIGNAL_FIRE, this.isSmokeSource(levelAccessor.getBlockState(blockPos.below()))).setValue(LIT, !bl).setValue(FACING, blockPlaceContext.getHorizontalDirection());
+        return this.defaultBlockState().setValue(SIGNAL_FIRE, this.isSmokeSource(levelAccessor.getBlockState(blockPos.below()))).setValue(LIT, !bl && CommonRegistration.config.campfireConfig.litByDefault).setValue(FACING, blockPlaceContext.getHorizontalDirection());
     }
 
     @Override

Common/src/main/java/me/hypherionmc/hyperlighting/common/blocks/AdvancedCandleBlock.java

@@ -1,7 +1,5 @@
 package me.hypherionmc.hyperlighting.common.blocks;
 
-import com.google.common.collect.ImmutableMap;
-import com.google.common.collect.Maps;
 import me.hypherionmc.craterlib.api.inventory.CraterCreativeModeTab;
 import me.hypherionmc.craterlib.api.rendering.DyableBlock;
 import me.hypherionmc.craterlib.common.item.BlockItemDyable;
@@ -33,10 +31,8 @@ import net.minecraft.world.level.Level;
 import net.minecraft.world.level.LevelAccessor;
 import net.minecraft.world.level.block.Block;
 import net.minecraft.world.level.block.Blocks;
-import net.minecraft.world.level.block.HorizontalDirectionalBlock;
 import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.world.level.block.state.StateDefinition;
-import net.minecraft.world.level.block.state.properties.AttachFace;
 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.EnumProperty;
@@ -48,33 +44,24 @@ import net.minecraft.world.phys.shapes.VoxelShape;
 import org.jetbrains.annotations.NotNull;
 
 import java.util.List;
-import java.util.Map;
+import java.util.stream.Stream;
 
-public class AdvancedCandleBlock extends HorizontalDirectionalBlock implements DyableBlock, LightableBlock {
+public class AdvancedCandleBlock extends Block implements DyableBlock, LightableBlock {
 
     //region Properties
     public static final BooleanProperty LIT = BlockStateProperties.LIT;
     public static final EnumProperty<DyeColor> COLOR = EnumProperty.create("color", DyeColor.class);
-        public static final EnumProperty<AttachFace> ATTACH_FACE = EnumProperty.create("face", AttachFace.class, AttachFace.FLOOR, AttachFace.WALL);
     //endregion
 
     //region Bounding Boxes
-        private static final Map<Direction, VoxelShape> SHAPES = Maps.newEnumMap(
+    VoxelShape BOUNDING_BOX = Block.box(4, 0, 4, 11, 10, 11);
-                ImmutableMap.of(
-                        Direction.NORTH, Block.box(5.5D, 2.0D, 11.0D, 10.5D, 12.0D, 16.0D),
-                        Direction.SOUTH, Block.box(5.5D, 2.0D, 0.0D, 10.5D, 12.0D, 5.0D),
-                        Direction.WEST, Block.box(11.0D, 2.0D, 5.5D, 16.0D, 12.0D, 10.5D),
-                        Direction.EAST, Block.box(0.0D, 2.0D, 5.5D, 5.0D, 12.0D, 10.5D),
-                        Direction.UP, Block.box(6.0D, 0.0D, 6.0D, 10.0D, 10.0D, 10.0D)
-                )
-        );
     //endregion
 
     private DyeColor color;
 
     public AdvancedCandleBlock(String name, DyeColor color, CraterCreativeModeTab tab) {
         super(Properties.of(Material.WOOD).noCollission().instabreak().lightLevel(BlockStateUtils.createLightLevelFromLitBlockState(15)));
-            this.registerDefaultState(this.defaultBlockState().setValue(FACING, Direction.NORTH).setValue(LIT, CommonRegistration.config.candleConfig.litByDefault).setValue(COLOR, color));
+        this.registerDefaultState(this.defaultBlockState().setValue(LIT, CommonRegistration.config.candleConfig.litByDefault).setValue(COLOR, color));
         this.color = color;
 
         CreativeTabRegistry.setCreativeTab(tab, HLItems.register(name, () -> new BlockItemDyable(this, new Item.Properties())));
@@ -82,28 +69,18 @@ public class AdvancedCandleBlock extends HorizontalDirectionalBlock implements D
 
     @Override
     public VoxelShape getShape(BlockState blockState, BlockGetter level, BlockPos pos, CollisionContext context) {
-            return switch (blockState.getValue(ATTACH_FACE)) {
+        return BOUNDING_BOX;
-                case FLOOR -> SHAPES.get(Direction.UP);
-                case WALL -> SHAPES.get(blockState.getValue(FACING));
-                case CEILING -> null;
-            };
     }
 
     @Override
     protected void createBlockStateDefinition(StateDefinition.Builder<Block, BlockState> builder) {
-            builder.add(LIT, ATTACH_FACE, FACING, COLOR);
+        builder.add(LIT, COLOR);
         super.createBlockStateDefinition(builder);
     }
 
     @Override
     public BlockState getStateForPlacement(BlockPlaceContext context) {
-            Direction direction = context.getClickedFace();
         BlockState state = this.defaultBlockState();
-            if (direction == Direction.UP) {
-                state = state.setValue(ATTACH_FACE, AttachFace.FLOOR);
-            } else {
-                state = state.setValue(ATTACH_FACE, AttachFace.WALL).setValue(FACING, direction);
-            }
         return state.setValue(LIT, CommonRegistration.config.candleConfig.litByDefault);
     }
 
@@ -190,21 +167,11 @@ public class AdvancedCandleBlock extends HorizontalDirectionalBlock implements D
         if (stateIn.getValue(LIT)) {
             DyeColor color = stateIn.getValue(COLOR);
 
-                if (stateIn.getValue(ATTACH_FACE) == AttachFace.FLOOR) {
+            double d0 = (double) pos.getX() + 0.48D;
-                    double d0 = (double) pos.getX() + 0.5D;
+            double d1 = (double) pos.getY() + 0.79D;
-                    double d1 = (double) pos.getY() + 0.7D;
+            double d2 = (double) pos.getZ() + 0.45D;
-                    double d2 = (double) pos.getZ() + 0.5D;
             levelIn.addParticle(ParticleTypes.SMOKE, d0, d1, d2, 0.0D, 0.0D, 0.0D);
             levelIn.addParticle(FlameParticles.getParticleByColor(color).get(), d0, d1, d2, 0D, 0D, 0D);
-                } else {
-                    Direction direction = stateIn.getValue(FACING);
-                    double d0 = (double) pos.getX() + 0.5D;
-                    double d1 = (double) pos.getY() + 0.7D;
-                    double d2 = (double) pos.getZ() + 0.5D;
-                    Direction direction1 = direction.getOpposite();
-                    levelIn.addParticle(ParticleTypes.SMOKE, d0 + 0.37D * (double) direction1.getStepX(), d1 + 0.15D, d2 + 0.37D * (double) direction1.getStepZ(), 0.0D, 0.0D, 0.0D);
-                    levelIn.addParticle(FlameParticles.getParticleByColor(color).get(), d0 + 0.37D * (double) direction1.getStepX(), d1 + 0.15D, d2 + 0.37D * (double) direction1.getStepZ(), 0D, 0D, 0D);
-                }
         }
     }
 

Common/src/main/java/me/hypherionmc/hyperlighting/common/blocks/AdvancedTorchBlock.java

@@ -31,9 +31,8 @@ import net.minecraft.world.item.context.BlockPlaceContext;
 import net.minecraft.world.level.BlockGetter;
 import net.minecraft.world.level.Level;
 import net.minecraft.world.level.LevelAccessor;
-import net.minecraft.world.level.block.Block;
+import net.minecraft.world.level.LevelReader;
-import net.minecraft.world.level.block.Blocks;
+import net.minecraft.world.level.block.*;
-import net.minecraft.world.level.block.HorizontalDirectionalBlock;
 import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.world.level.block.state.StateDefinition;
 import net.minecraft.world.level.block.state.properties.AttachFace;
@@ -81,7 +80,7 @@ public class AdvancedTorchBlock extends HorizontalDirectionalBlock implements Dy
     }
 
     @Override
-    public VoxelShape getShape(BlockState blockState, BlockGetter level, BlockPos pos, CollisionContext context) {
+    public @NotNull VoxelShape getShape(BlockState blockState, @NotNull BlockGetter level, @NotNull BlockPos pos, @NotNull CollisionContext context) {
         return switch (blockState.getValue(ATTACH_FACE)) {
             case FLOOR -> SHAPES.get(Direction.UP);
             case WALL -> SHAPES.get(blockState.getValue(FACING));
@@ -89,6 +88,54 @@ public class AdvancedTorchBlock extends HorizontalDirectionalBlock implements Dy
         };
     }
 
+    @Override
+    public @NotNull BlockState updateShape(@NotNull BlockState stateIn, @NotNull Direction facing, @NotNull BlockState neighbourState, @NotNull LevelAccessor levelIn, @NotNull BlockPos currentPos, @NotNull BlockPos newPos) {
+        AttachFace attachFace = stateIn.getValue(ATTACH_FACE);
+
+        if (attachFace == AttachFace.FLOOR) {
+            return facing == Direction.DOWN && !this.canSurvive(stateIn, levelIn, currentPos) ? Blocks.AIR.defaultBlockState() : super.updateShape(stateIn, facing, neighbourState, levelIn, currentPos, newPos);
+        }
+
+        return facing.getOpposite() == stateIn.getValue(FACING) && !stateIn.canSurvive(levelIn, currentPos) ? Blocks.AIR.defaultBlockState() : stateIn;
+    }
+
+    @Override
+    public boolean canSurvive(BlockState stateIn, @NotNull LevelReader levelIn, @NotNull BlockPos currentPos) {
+        AttachFace attachFace = stateIn.getValue(ATTACH_FACE);
+
+        if (attachFace == AttachFace.FLOOR) {
+            return canSupportCenter(levelIn, currentPos.below(), Direction.UP);
+        }
+
+        Direction direction = stateIn.getValue(FACING);
+        BlockPos neighbourPos = currentPos.relative(direction.getOpposite());
+        BlockState currentState = levelIn.getBlockState(neighbourPos);
+        return currentState.isFaceSturdy(levelIn, neighbourPos, direction);
+    }
+
+    @Override
+    public void animateTick(BlockState stateIn, @NotNull Level levelIn, @NotNull BlockPos pos, @NotNull RandomSource random) {
+        if (stateIn.getValue(LIT)) {
+            DyeColor color = stateIn.getValue(COLOR);
+
+            if (stateIn.getValue(ATTACH_FACE) == AttachFace.FLOOR) {
+                double d0 = (double) pos.getX() + 0.5D;
+                double d1 = (double) pos.getY() + 0.7D;
+                double d2 = (double) pos.getZ() + 0.5D;
+                levelIn.addParticle(ParticleTypes.SMOKE, d0, d1, d2, 0.0D, 0.0D, 0.0D);
+                levelIn.addParticle(FlameParticles.getParticleByColor(color).get(), d0, d1, d2, 0D, 0D, 0D);
+            } else {
+                Direction direction = stateIn.getValue(FACING);
+                double d0 = (double) pos.getX() + 0.5D;
+                double d1 = (double) pos.getY() + 0.7D;
+                double d2 = (double) pos.getZ() + 0.5D;
+                Direction direction1 = direction.getOpposite();
+                levelIn.addParticle(ParticleTypes.SMOKE, d0 + 0.37D * (double) direction1.getStepX(), d1 + 0.15D, d2 + 0.37D * (double) direction1.getStepZ(), 0.0D, 0.0D, 0.0D);
+                levelIn.addParticle(FlameParticles.getParticleByColor(color).get(), d0 + 0.37D * (double) direction1.getStepX(), d1 + 0.15D, d2 + 0.37D * (double) direction1.getStepZ(), 0D, 0D, 0D);
+            }
+        }
+    }
+
     @Override
     protected void createBlockStateDefinition(StateDefinition.Builder<Block, BlockState> builder) {
         builder.add(LIT, ATTACH_FACE, FACING, COLOR);
@@ -107,17 +154,6 @@ public class AdvancedTorchBlock extends HorizontalDirectionalBlock implements Dy
         return state.setValue(LIT, CommonRegistration.config.torchConfig.litByDefault);
     }
 
-    @Override
-    public BlockState updateShape(BlockState stateIn, Direction facing, BlockState neighbourState, LevelAccessor levelIn, BlockPos currentPos, BlockPos newPos) {
-        if (facing == Direction.DOWN && !this.isValidPosition(stateIn, levelIn, currentPos, facing)) {
-            return Blocks.AIR.defaultBlockState();
-        }
-        return super.updateShape(stateIn, facing, neighbourState, levelIn, currentPos, newPos);
-    }
-
-    public boolean isValidPosition(BlockState state, LevelAccessor levelAccessor, BlockPos pos, Direction direction) {
-        return canSupportCenter(levelAccessor, pos, direction);
-    }
 
     @Override
     public void toggleLight(Level worldIn, BlockState state, BlockPos pos) {
@@ -185,29 +221,6 @@ public class AdvancedTorchBlock extends HorizontalDirectionalBlock implements Dy
         super.appendHoverText(stack, level, tooltip, options);
     }
 
-    @Override
-    public void animateTick(BlockState stateIn, Level levelIn, BlockPos pos, RandomSource random) {
-        if (stateIn.getValue(LIT)) {
-            DyeColor color = stateIn.getValue(COLOR);
-
-            if (stateIn.getValue(ATTACH_FACE) == AttachFace.FLOOR) {
-                double d0 = (double) pos.getX() + 0.5D;
-                double d1 = (double) pos.getY() + 0.7D;
-                double d2 = (double) pos.getZ() + 0.5D;
-                levelIn.addParticle(ParticleTypes.SMOKE, d0, d1, d2, 0.0D, 0.0D, 0.0D);
-                levelIn.addParticle(FlameParticles.getParticleByColor(color).get(), d0, d1, d2, 0D, 0D, 0D);
-            } else {
-                Direction direction = stateIn.getValue(FACING);
-                double d0 = (double) pos.getX() + 0.5D;
-                double d1 = (double) pos.getY() + 0.7D;
-                double d2 = (double) pos.getZ() + 0.5D;
-                Direction direction1 = direction.getOpposite();
-                levelIn.addParticle(ParticleTypes.SMOKE, d0 + 0.37D * (double) direction1.getStepX(), d1 + 0.15D, d2 + 0.37D * (double) direction1.getStepZ(), 0.0D, 0.0D, 0.0D);
-                levelIn.addParticle(FlameParticles.getParticleByColor(color).get(), d0 + 0.37D * (double) direction1.getStepX(), d1 + 0.15D, d2 + 0.37D * (double) direction1.getStepZ(), 0D, 0D, 0D);
-            }
-        }
-    }
-
     @Override
     public @NotNull ItemStack getCloneItemStack(@NotNull BlockGetter level, @NotNull BlockPos pos, @NotNull BlockState state) {
         return StackUtil.getColorStack(this, state.getValue(COLOR));

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<Block, BlockState> 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);
+    }
+}

Common/src/main/java/me/hypherionmc/hyperlighting/common/init/HLBlocks.java

@@ -32,7 +32,8 @@ public class HLBlocks {
 
     /* Other */
     public static BlockRegistryObject<Block> BATTERY_NEON = register("battery_neon", () -> new BatteryNeon("battery_neon"));
-
+    public static BlockRegistryObject<Block> PUMPKIN_TRIO = register("pumpkin_trio", () -> new PumpkinTrioBlock("pumpkin_trio"));
+    public static BlockRegistryObject<Block> PUMPKIN_TRIO_INVERTED = register("pumpkin_trio_inverted", () -> new PumpkinTrioBlock("pumpkin_trio_inverted"));
 
     public static void loadAll() {}
 

Common/src/main/resources/assets/hyperlighting/blockstates/advanced_candle.json

@@ -1,131 +1,35 @@
 {
   "variants": {
-    "facing=east,lit=true,color=white": {"model": "hyperlighting:block/candle/white_candle"},
+    "lit=true,color=white": {"model": "hyperlighting:block/candle/white_candle"},
-    "facing=east,lit=false,color=white": {"model": "hyperlighting:block/candle/white_candle"},
+    "lit=false,color=white": {"model": "hyperlighting:block/candle/white_candle"},
-    "facing=south,lit=true,color=white": {"model": "hyperlighting:block/candle/white_candle", "y":  90},
+    "lit=true,color=orange": {"model": "hyperlighting:block/candle/orange_candle"},
-    "facing=south,lit=false,color=white": {"model": "hyperlighting:block/candle/white_candle", "y":  90},
+    "lit=false,color=orange": {"model": "hyperlighting:block/candle/orange_candle"},
-    "facing=west,lit=true,color=white": {"model": "hyperlighting:block/candle/white_candle", "y": 180},
+    "lit=true,color=magenta": {"model": "hyperlighting:block/candle/magenta_candle"},
-    "facing=west,lit=false,color=white": {"model": "hyperlighting:block/candle/white_candle", "y": 180},
+    "lit=false,color=magenta": {"model": "hyperlighting:block/candle/magenta_candle"},
-    "facing=north,lit=true,color=white": {"model": "hyperlighting:block/candle/white_candle", "y": 270},
+    "lit=true,color=light_blue": {"model": "hyperlighting:block/candle/light_blue_candle"},
-    "facing=north,lit=false,color=white": {"model": "hyperlighting:block/candle/white_candle", "y": 270},
+    "lit=false,color=light_blue": {"model": "hyperlighting:block/candle/light_blue_candle"},
-    "facing=east,lit=true,color=orange": {"model": "hyperlighting:block/candle/orange_candle"},
+    "lit=true,color=yellow": {"model": "hyperlighting:block/candle/yellow_candle"},
-    "facing=east,lit=false,color=orange": {"model": "hyperlighting:block/candle/orange_candle"},
+    "lit=false,color=yellow": {"model": "hyperlighting:block/candle/yellow_candle"},
-    "facing=south,lit=true,color=orange": {"model": "hyperlighting:block/candle/orange_candle", "y":  90},
+    "lit=true,color=lime": {"model": "hyperlighting:block/candle/lime_candle"},
-    "facing=south,lit=false,color=orange": {"model": "hyperlighting:block/candle/orange_candle", "y":  90},
+    "lit=false,color=lime": {"model": "hyperlighting:block/candle/lime_candle"},
-    "facing=west,lit=true,color=orange": {"model": "hyperlighting:block/candle/orange_candle", "y": 180},
+    "lit=true,color=pink": {"model": "hyperlighting:block/candle/pink_candle"},
-    "facing=west,lit=false,color=orange": {"model": "hyperlighting:block/candle/orange_candle", "y": 180},
+    "lit=false,color=pink": {"model": "hyperlighting:block/candle/pink_candle"},
-    "facing=north,lit=true,color=orange": {"model": "hyperlighting:block/candle/orange_candle", "y": 270},
+    "lit=true,color=gray": {"model": "hyperlighting:block/candle/gray_candle"},
-    "facing=north,lit=false,color=orange": {"model": "hyperlighting:block/candle/orange_candle", "y": 270},
+    "lit=false,color=gray": {"model": "hyperlighting:block/candle/gray_candle"},
-    "facing=east,lit=true,color=magenta": {"model": "hyperlighting:block/candle/magenta_candle"},
+    "lit=true,color=light_gray": {"model": "hyperlighting:block/candle/light_gray_candle"},
-    "facing=east,lit=false,color=magenta": {"model": "hyperlighting:block/candle/magenta_candle"},
+    "lit=false,color=light_gray": {"model": "hyperlighting:block/candle/light_gray_candle"},
-    "facing=south,lit=true,color=magenta": {"model": "hyperlighting:block/candle/magenta_candle", "y":  90},
+    "lit=true,color=cyan": {"model": "hyperlighting:block/candle/cyan_candle"},
-    "facing=south,lit=false,color=magenta": {"model": "hyperlighting:block/candle/magenta_candle", "y":  90},
+    "lit=false,color=cyan": {"model": "hyperlighting:block/candle/cyan_candle"},
-    "facing=west,lit=true,color=magenta": {"model": "hyperlighting:block/candle/magenta_candle", "y": 180},
+    "lit=true,color=purple": {"model": "hyperlighting:block/candle/purple_candle"},
-    "facing=west,lit=false,color=magenta": {"model": "hyperlighting:block/candle/magenta_candle", "y": 180},
+    "lit=false,color=purple": {"model": "hyperlighting:block/candle/purple_candle"},
-    "facing=north,lit=true,color=magenta": {"model": "hyperlighting:block/candle/magenta_candle", "y": 270},
+    "lit=true,color=blue": {"model": "hyperlighting:block/candle/blue_candle"},
-    "facing=north,lit=false,color=magenta": {"model": "hyperlighting:block/candle/magenta_candle", "y": 270},
+    "lit=false,color=blue": {"model": "hyperlighting:block/candle/blue_candle"},
-    "facing=east,lit=true,color=light_blue": {"model": "hyperlighting:block/candle/light_blue_candle"},
+    "lit=true,color=brown": {"model": "hyperlighting:block/candle/brown_candle"},
-    "facing=east,lit=false,color=light_blue": {"model": "hyperlighting:block/candle/light_blue_candle"},
+    "lit=false,color=brown": {"model": "hyperlighting:block/candle/brown_candle"},
-    "facing=south,lit=true,color=light_blue": {"model": "hyperlighting:block/candle/light_blue_candle", "y":  90},
+    "lit=true,color=green": {"model": "hyperlighting:block/candle/green_candle"},
-    "facing=south,lit=false,color=light_blue": {"model": "hyperlighting:block/candle/light_blue_candle", "y":  90},
+    "lit=false,color=green": {"model": "hyperlighting:block/candle/green_candle"},
-    "facing=west,lit=true,color=light_blue": {"model": "hyperlighting:block/candle/light_blue_candle", "y": 180},
+    "lit=true,color=red": {"model": "hyperlighting:block/candle/red_candle"},
-    "facing=west,lit=false,color=light_blue": {"model": "hyperlighting:block/candle/light_blue_candle", "y": 180},
+    "lit=false,color=red": {"model": "hyperlighting:block/candle/red_candle"},
-    "facing=north,lit=true,color=light_blue": {"model": "hyperlighting:block/candle/light_blue_candle", "y": 270},
+    "lit=true,color=black": {"model": "hyperlighting:block/candle/black_candle"},
-    "facing=north,lit=false,color=light_blue": {"model": "hyperlighting:block/candle/light_blue_candle", "y": 270},
+    "lit=false,color=black": {"model": "hyperlighting:block/candle/black_candle"}  }
-    "facing=east,lit=true,color=yellow": {"model": "hyperlighting:block/candle/yellow_candle"},
-    "facing=east,lit=false,color=yellow": {"model": "hyperlighting:block/candle/yellow_candle"},
-    "facing=south,lit=true,color=yellow": {"model": "hyperlighting:block/candle/yellow_candle", "y":  90},
-    "facing=south,lit=false,color=yellow": {"model": "hyperlighting:block/candle/yellow_candle", "y":  90},
-    "facing=west,lit=true,color=yellow": {"model": "hyperlighting:block/candle/yellow_candle", "y": 180},
-    "facing=west,lit=false,color=yellow": {"model": "hyperlighting:block/candle/yellow_candle", "y": 180},
-    "facing=north,lit=true,color=yellow": {"model": "hyperlighting:block/candle/yellow_candle", "y": 270},
-    "facing=north,lit=false,color=yellow": {"model": "hyperlighting:block/candle/yellow_candle", "y": 270},
-    "facing=east,lit=true,color=lime": {"model": "hyperlighting:block/candle/lime_candle"},
-    "facing=east,lit=false,color=lime": {"model": "hyperlighting:block/candle/lime_candle"},
-    "facing=south,lit=true,color=lime": {"model": "hyperlighting:block/candle/lime_candle", "y":  90},
-    "facing=south,lit=false,color=lime": {"model": "hyperlighting:block/candle/lime_candle", "y":  90},
-    "facing=west,lit=true,color=lime": {"model": "hyperlighting:block/candle/lime_candle", "y": 180},
-    "facing=west,lit=false,color=lime": {"model": "hyperlighting:block/candle/lime_candle", "y": 180},
-    "facing=north,lit=true,color=lime": {"model": "hyperlighting:block/candle/lime_candle", "y": 270},
-    "facing=north,lit=false,color=lime": {"model": "hyperlighting:block/candle/lime_candle", "y": 270},
-    "facing=east,lit=true,color=pink": {"model": "hyperlighting:block/candle/pink_candle"},
-    "facing=east,lit=false,color=pink": {"model": "hyperlighting:block/candle/pink_candle"},
-    "facing=south,lit=true,color=pink": {"model": "hyperlighting:block/candle/pink_candle", "y":  90},
-    "facing=south,lit=false,color=pink": {"model": "hyperlighting:block/candle/pink_candle", "y":  90},
-    "facing=west,lit=true,color=pink": {"model": "hyperlighting:block/candle/pink_candle", "y": 180},
-    "facing=west,lit=false,color=pink": {"model": "hyperlighting:block/candle/pink_candle", "y": 180},
-    "facing=north,lit=true,color=pink": {"model": "hyperlighting:block/candle/pink_candle", "y": 270},
-    "facing=north,lit=false,color=pink": {"model": "hyperlighting:block/candle/pink_candle", "y": 270},
-    "facing=east,lit=true,color=gray": {"model": "hyperlighting:block/candle/gray_candle"},
-    "facing=east,lit=false,color=gray": {"model": "hyperlighting:block/candle/gray_candle"},
-    "facing=south,lit=true,color=gray": {"model": "hyperlighting:block/candle/gray_candle", "y":  90},
-    "facing=south,lit=false,color=gray": {"model": "hyperlighting:block/candle/gray_candle", "y":  90},
-    "facing=west,lit=true,color=gray": {"model": "hyperlighting:block/candle/gray_candle", "y": 180},
-    "facing=west,lit=false,color=gray": {"model": "hyperlighting:block/candle/gray_candle", "y": 180},
-    "facing=north,lit=true,color=gray": {"model": "hyperlighting:block/candle/gray_candle", "y": 270},
-    "facing=north,lit=false,color=gray": {"model": "hyperlighting:block/candle/gray_candle", "y": 270},
-    "facing=east,lit=true,color=light_gray": {"model": "hyperlighting:block/candle/light_gray_candle"},
-    "facing=east,lit=false,color=light_gray": {"model": "hyperlighting:block/candle/light_gray_candle"},
-    "facing=south,lit=true,color=light_gray": {"model": "hyperlighting:block/candle/light_gray_candle", "y":  90},
-    "facing=south,lit=false,color=light_gray": {"model": "hyperlighting:block/candle/light_gray_candle", "y":  90},
-    "facing=west,lit=true,color=light_gray": {"model": "hyperlighting:block/candle/light_gray_candle", "y": 180},
-    "facing=west,lit=false,color=light_gray": {"model": "hyperlighting:block/candle/light_gray_candle", "y": 180},
-    "facing=north,lit=true,color=light_gray": {"model": "hyperlighting:block/candle/light_gray_candle", "y": 270},
-    "facing=north,lit=false,color=light_gray": {"model": "hyperlighting:block/candle/light_gray_candle", "y": 270},
-    "facing=east,lit=true,color=cyan": {"model": "hyperlighting:block/candle/cyan_candle"},
-    "facing=east,lit=false,color=cyan": {"model": "hyperlighting:block/candle/cyan_candle"},
-    "facing=south,lit=true,color=cyan": {"model": "hyperlighting:block/candle/cyan_candle", "y":  90},
-    "facing=south,lit=false,color=cyan": {"model": "hyperlighting:block/candle/cyan_candle", "y":  90},
-    "facing=west,lit=true,color=cyan": {"model": "hyperlighting:block/candle/cyan_candle", "y": 180},
-    "facing=west,lit=false,color=cyan": {"model": "hyperlighting:block/candle/cyan_candle", "y": 180},
-    "facing=north,lit=true,color=cyan": {"model": "hyperlighting:block/candle/cyan_candle", "y": 270},
-    "facing=north,lit=false,color=cyan": {"model": "hyperlighting:block/candle/cyan_candle", "y": 270},
-    "facing=east,lit=true,color=purple": {"model": "hyperlighting:block/candle/purple_candle"},
-    "facing=east,lit=false,color=purple": {"model": "hyperlighting:block/candle/purple_candle"},
-    "facing=south,lit=true,color=purple": {"model": "hyperlighting:block/candle/purple_candle", "y":  90},
-    "facing=south,lit=false,color=purple": {"model": "hyperlighting:block/candle/purple_candle", "y":  90},
-    "facing=west,lit=true,color=purple": {"model": "hyperlighting:block/candle/purple_candle", "y": 180},
-    "facing=west,lit=false,color=purple": {"model": "hyperlighting:block/candle/purple_candle", "y": 180},
-    "facing=north,lit=true,color=purple": {"model": "hyperlighting:block/candle/purple_candle", "y": 270},
-    "facing=north,lit=false,color=purple": {"model": "hyperlighting:block/candle/purple_candle", "y": 270},
-    "facing=east,lit=true,color=blue": {"model": "hyperlighting:block/candle/blue_candle"},
-    "facing=east,lit=false,color=blue": {"model": "hyperlighting:block/candle/blue_candle"},
-    "facing=south,lit=true,color=blue": {"model": "hyperlighting:block/candle/blue_candle", "y":  90},
-    "facing=south,lit=false,color=blue": {"model": "hyperlighting:block/candle/blue_candle", "y":  90},
-    "facing=west,lit=true,color=blue": {"model": "hyperlighting:block/candle/blue_candle", "y": 180},
-    "facing=west,lit=false,color=blue": {"model": "hyperlighting:block/candle/blue_candle", "y": 180},
-    "facing=north,lit=true,color=blue": {"model": "hyperlighting:block/candle/blue_candle", "y": 270},
-    "facing=north,lit=false,color=blue": {"model": "hyperlighting:block/candle/blue_candle", "y": 270},
-    "facing=east,lit=true,color=brown": {"model": "hyperlighting:block/candle/brown_candle"},
-    "facing=east,lit=false,color=brown": {"model": "hyperlighting:block/candle/brown_candle"},
-    "facing=south,lit=true,color=brown": {"model": "hyperlighting:block/candle/brown_candle", "y":  90},
-    "facing=south,lit=false,color=brown": {"model": "hyperlighting:block/candle/brown_candle", "y":  90},
-    "facing=west,lit=true,color=brown": {"model": "hyperlighting:block/candle/brown_candle", "y": 180},
-    "facing=west,lit=false,color=brown": {"model": "hyperlighting:block/candle/brown_candle", "y": 180},
-    "facing=north,lit=true,color=brown": {"model": "hyperlighting:block/candle/brown_candle", "y": 270},
-    "facing=north,lit=false,color=brown": {"model": "hyperlighting:block/candle/brown_candle", "y": 270},
-    "facing=east,lit=true,color=green": {"model": "hyperlighting:block/candle/green_candle"},
-    "facing=east,lit=false,color=green": {"model": "hyperlighting:block/candle/green_candle"},
-    "facing=south,lit=true,color=green": {"model": "hyperlighting:block/candle/green_candle", "y":  90},
-    "facing=south,lit=false,color=green": {"model": "hyperlighting:block/candle/green_candle", "y":  90},
-    "facing=west,lit=true,color=green": {"model": "hyperlighting:block/candle/green_candle", "y": 180},
-    "facing=west,lit=false,color=green": {"model": "hyperlighting:block/candle/green_candle", "y": 180},
-    "facing=north,lit=true,color=green": {"model": "hyperlighting:block/candle/green_candle", "y": 270},
-    "facing=north,lit=false,color=green": {"model": "hyperlighting:block/candle/green_candle", "y": 270},
-    "facing=east,lit=true,color=red": {"model": "hyperlighting:block/candle/red_candle"},
-    "facing=east,lit=false,color=red": {"model": "hyperlighting:block/candle/red_candle"},
-    "facing=south,lit=true,color=red": {"model": "hyperlighting:block/candle/red_candle", "y":  90},
-    "facing=south,lit=false,color=red": {"model": "hyperlighting:block/candle/red_candle", "y":  90},
-    "facing=west,lit=true,color=red": {"model": "hyperlighting:block/candle/red_candle", "y": 180},
-    "facing=west,lit=false,color=red": {"model": "hyperlighting:block/candle/red_candle", "y": 180},
-    "facing=north,lit=true,color=red": {"model": "hyperlighting:block/candle/red_candle", "y": 270},
-    "facing=north,lit=false,color=red": {"model": "hyperlighting:block/candle/red_candle", "y": 270},
-    "facing=east,lit=true,color=black": {"model": "hyperlighting:block/candle/black_candle"},
-    "facing=east,lit=false,color=black": {"model": "hyperlighting:block/candle/black_candle"},
-    "facing=south,lit=true,color=black": {"model": "hyperlighting:block/candle/black_candle", "y":  90},
-    "facing=south,lit=false,color=black": {"model": "hyperlighting:block/candle/black_candle", "y":  90},
-    "facing=west,lit=true,color=black": {"model": "hyperlighting:block/candle/black_candle", "y": 180},
-    "facing=west,lit=false,color=black": {"model": "hyperlighting:block/candle/black_candle", "y": 180},
-    "facing=north,lit=true,color=black": {"model": "hyperlighting:block/candle/black_candle", "y": 270},
-    "facing=north,lit=false,color=black": {"model": "hyperlighting:block/candle/black_candle", "y": 270}  }
 }

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 }
+  }
+}

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 }
+  }
+}

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",

Common/src/main/resources/assets/hyperlighting/models/block/advanced_candle_base.json

@@ -178,6 +178,33 @@
 			}
 		}
 	],
+	"display": {
+		"thirdperson_righthand": {
+			"translation": [0, 3, 1],
+			"scale": [0.55, 0.55, 0.55]
+		},
+		"thirdperson_lefthand": {
+			"translation": [0, 3, 1],
+			"scale": [0.55, 0.55, 0.55]
+		},
+		"firstperson_righthand": {
+			"rotation": [0, -90, 25],
+			"translation": [1.13, 3.2, 1.13],
+			"scale": [0.68, 0.68, 0.68]
+		},
+		"firstperson_lefthand": {
+			"rotation": [0, -90, 25],
+			"translation": [1.13, 3.2, 1.13],
+			"scale": [0.68, 0.68, 0.68]
+		},
+		"ground": {
+			"translation": [0, 3, 0],
+			"scale": [0.25, 0.25, 0.25]
+		},
+		"fixed": {
+			"rotation": [0, 180, 0]
+		}
+	},
 	"groups": [
 		{
 			"name": "candle_body",

Common/src/main/resources/assets/hyperlighting/models/block/advanced_candle_base_lit.json

@@ -1,203 +0,0 @@
-{
-	"credit": "Made with Blockbench",
-	"textures": {
-		"0": "advanced_candle_lit",
-		"particle": "advanced_candle_lit"
-	},
-	"elements": [
-		{
-			"from": [6, 0, 5],
-			"to": [9, 10, 6],
-			"faces": {
-				"north": {"uv": [7, 0, 10, 10], "texture": "#0"},
-				"east": {"uv": [6, 0, 7, 10], "texture": "#0"},
-				"south": {"uv": [7, 0, 10, 10], "texture": "#0"},
-				"west": {"uv": [5, 0, 6, 10], "texture": "#0"},
-				"up": {"uv": [11, 0, 14, 1], "texture": "#0"},
-				"down": {"uv": [0, 11, 3, 12], "texture": "#0"}
-			}
-		},
-		{
-			"from": [6, 0, 9],
-			"to": [9, 10, 10],
-			"faces": {
-				"north": {"uv": [7, 0, 10, 10], "texture": "#0"},
-				"east": {"uv": [5, 0, 6, 10], "texture": "#0"},
-				"south": {"uv": [7, 0, 10, 10], "texture": "#0"},
-				"west": {"uv": [6, 0, 7, 10], "texture": "#0"},
-				"up": {"uv": [11, 4, 14, 5], "texture": "#0"},
-				"down": {"uv": [0, 11, 3, 12], "texture": "#0"}
-			}
-		},
-		{
-			"from": [6, 0, 6],
-			"to": [9, 10, 9],
-			"faces": {
-				"north": {"uv": [7, 0, 10, 10], "texture": "#0"},
-				"east": {"uv": [2, 0, 5, 10], "texture": "#0"},
-				"south": {"uv": [7, 0, 10, 10], "texture": "#0"},
-				"west": {"uv": [2, 0, 5, 10], "texture": "#0"},
-				"up": {"uv": [11, 1, 14, 4], "texture": "#0"},
-				"down": {"uv": [0, 11, 3, 14], "texture": "#0"}
-			}
-		},
-		{
-			"from": [5, 0, 6],
-			"to": [6, 10, 9],
-			"faces": {
-				"north": {"uv": [1, 0, 2, 10], "texture": "#0"},
-				"east": {"uv": [2, 0, 5, 10], "texture": "#0"},
-				"south": {"uv": [0, 0, 1, 10], "texture": "#0"},
-				"west": {"uv": [2, 0, 5, 10], "texture": "#0"},
-				"up": {"uv": [10, 4, 11, 1], "rotation": 180, "texture": "#0"},
-				"down": {"uv": [0, 11, 1, 14], "texture": "#0"}
-			}
-		},
-		{
-			"from": [9, 0, 6],
-			"to": [10, 10, 9],
-			"faces": {
-				"north": {"uv": [0, 0, 1, 10], "texture": "#0"},
-				"east": {"uv": [2, 0, 5, 10], "texture": "#0"},
-				"south": {"uv": [1, 0, 2, 10], "texture": "#0"},
-				"west": {"uv": [2, 0, 5, 10], "texture": "#0"},
-				"up": {"uv": [14, 1, 15, 4], "texture": "#0"},
-				"down": {"uv": [0, 11, 1, 14], "texture": "#0"}
-			}
-		},
-		{
-			"from": [10, 0, 6],
-			"to": [11, 1, 10],
-			"faces": {
-				"north": {"uv": [0, 10, 1, 11], "texture": "#0"},
-				"east": {"uv": [0, 10, 4, 11], "texture": "#0"},
-				"south": {"uv": [0, 10, 1, 11], "texture": "#0"},
-				"west": {"uv": [0, 10, 4, 11], "texture": "#0"},
-				"up": {"uv": [0, 10, 1, 14], "texture": "#0"},
-				"down": {"uv": [0, 10, 1, 14], "texture": "#0"}
-			}
-		},
-		{
-			"from": [4, 0, 5],
-			"to": [5, 1, 7],
-			"faces": {
-				"north": {"uv": [1, 11, 2, 12], "texture": "#0"},
-				"east": {"uv": [1, 11, 3, 12], "texture": "#0"},
-				"south": {"uv": [1, 11, 2, 12], "texture": "#0"},
-				"west": {"uv": [1, 11, 3, 12], "texture": "#0"},
-				"up": {"uv": [1, 11, 2, 13], "texture": "#0"},
-				"down": {"uv": [1, 11, 2, 13], "texture": "#0"}
-			}
-		},
-		{
-			"from": [7, 0, 10],
-			"to": [10, 1, 11],
-			"faces": {
-				"north": {"uv": [4, 10, 7, 11], "texture": "#0"},
-				"east": {"uv": [4, 10, 5, 11], "texture": "#0"},
-				"south": {"uv": [4, 10, 7, 11], "texture": "#0"},
-				"west": {"uv": [4, 10, 5, 11], "texture": "#0"},
-				"up": {"uv": [4, 10, 7, 11], "texture": "#0"},
-				"down": {"uv": [4, 10, 7, 11], "texture": "#0"}
-			}
-		},
-		{
-			"from": [5, 0, 4],
-			"to": [7, 1, 5],
-			"faces": {
-				"north": {"uv": [7, 10, 9, 11], "texture": "#0"},
-				"east": {"uv": [7, 10, 8, 11], "texture": "#0"},
-				"south": {"uv": [7, 10, 9, 11], "texture": "#0"},
-				"west": {"uv": [7, 10, 8, 11], "texture": "#0"},
-				"up": {"uv": [7, 10, 9, 11], "texture": "#0"},
-				"down": {"uv": [7, 10, 9, 11], "texture": "#0"}
-			}
-		},
-		{
-			"from": [9, 0, 5],
-			"to": [10, 1, 6],
-			"faces": {
-				"north": {"uv": [9, 10, 10, 11], "texture": "#0"},
-				"east": {"uv": [9, 10, 10, 11], "texture": "#0"},
-				"south": {"uv": [9, 10, 10, 11], "texture": "#0"},
-				"west": {"uv": [9, 10, 10, 11], "texture": "#0"},
-				"up": {"uv": [9, 10, 10, 11], "texture": "#0"},
-				"down": {"uv": [9, 10, 10, 11], "texture": "#0"}
-			}
-		},
-		{
-			"from": [5, 0, 5],
-			"to": [6, 1, 6],
-			"faces": {
-				"north": {"uv": [0, 11, 1, 12], "texture": "#0"},
-				"east": {"uv": [0, 11, 1, 12], "texture": "#0"},
-				"south": {"uv": [0, 11, 1, 12], "texture": "#0"},
-				"west": {"uv": [0, 11, 1, 12], "texture": "#0"},
-				"up": {"uv": [0, 11, 1, 12], "texture": "#0"},
-				"down": {"uv": [0, 11, 1, 12], "texture": "#0"}
-			}
-		},
-		{
-			"from": [9, 0, 9],
-			"to": [10, 1, 10],
-			"faces": {
-				"north": {"uv": [0, 13, 1, 14], "texture": "#0"},
-				"east": {"uv": [0, 13, 1, 14], "texture": "#0"},
-				"south": {"uv": [0, 13, 1, 14], "texture": "#0"},
-				"west": {"uv": [0, 13, 1, 14], "texture": "#0"},
-				"up": {"uv": [0, 13, 1, 14], "texture": "#0"},
-				"down": {"uv": [0, 13, 1, 14], "texture": "#0"}
-			}
-		},
-		{
-			"name": "wick",
-			"from": [7.5, 10, 7],
-			"to": [7.5, 12, 8],
-			"rotation": {"angle": 45, "axis": "y", "origin": [7.5, 0, 7.5]},
-			"faces": {
-				"north": {"uv": [4, 11, 4, 13], "texture": "#0"},
-				"east": {"uv": [3, 11, 4, 13], "texture": "#0"},
-				"south": {"uv": [4, 11, 4, 13], "texture": "#0"},
-				"west": {"uv": [3, 11, 4, 13], "texture": "#0"},
-				"up": {"uv": [3, 13, 4, 13], "texture": "#0"},
-				"down": {"uv": [3, 13, 4, 13], "texture": "#0"}
-			}
-		},
-		{
-			"name": "wick",
-			"from": [7.5, 10, 7],
-			"to": [7.5, 12, 8],
-			"rotation": {"angle": -45, "axis": "y", "origin": [7.5, 0, 7.5]},
-			"faces": {
-				"north": {"uv": [4, 11, 4, 13], "texture": "#0"},
-				"east": {"uv": [3, 11, 4, 13], "texture": "#0"},
-				"south": {"uv": [4, 11, 4, 13], "texture": "#0"},
-				"west": {"uv": [3, 11, 4, 13], "texture": "#0"},
-				"up": {"uv": [3, 13, 4, 13], "texture": "#0"},
-				"down": {"uv": [3, 13, 4, 13], "texture": "#0"}
-			}
-		}
-	],
-	"groups": [
-		{
-			"name": "candle_body",
-			"origin": [0, 0, 0],
-			"color": 0,
-			"children": [
-				0,
-				1,
-				2,
-				3,
-				4,
-				{
-					"name": "dripped_wax",
-					"origin": [0, 0, 0],
-					"color": 0,
-					"children": [5, 6, 7, 8, 9, 10, 11]
-				}
-			]
-		},
-		12,
-		13
-	]
-}

Common/src/main/resources/assets/hyperlighting/models/block/campfire/black_campfire_lit.json

@@ -1,5 +1,5 @@
 {
-  "parent": "hyperlighting:block/advanced_campfire_base",
+  "parent": "hyperlighting:block/campfire_base",
   "textures": {
     "0": "hyperlighting:block/campfire/black_campfire_log_lit",
     "1": "hyperlighting:block/campfire/black_campfire_log",

Common/src/main/resources/assets/hyperlighting/models/block/campfire/black_campfire_unlit.json

@@ -1,5 +1,5 @@
 {
-  "parent": "hyperlighting:block/advanced_campfire_base_off",
+  "parent": "hyperlighting:block/campfire_base_unlit",
   "textures": {
     "0": "hyperlighting:block/campfire/black_campfire_log",
     "particle": "hyperlighting:block/campfire/black_campfire_log"

Common/src/main/resources/assets/hyperlighting/models/block/campfire/blue_campfire_lit.json

@@ -1,5 +1,5 @@
 {
-  "parent": "hyperlighting:block/advanced_campfire_base",
+  "parent": "hyperlighting:block/campfire_base",
   "textures": {
     "0": "hyperlighting:block/campfire/blue_campfire_log_lit",
     "1": "hyperlighting:block/campfire/blue_campfire_log",

Common/src/main/resources/assets/hyperlighting/models/block/campfire/blue_campfire_unlit.json

@@ -1,5 +1,5 @@
 {
-  "parent": "hyperlighting:block/advanced_campfire_base_off",
+  "parent": "hyperlighting:block/campfire_base_unlit",
   "textures": {
     "0": "hyperlighting:block/campfire/blue_campfire_log",
     "particle": "hyperlighting:block/campfire/blue_campfire_log"

Common/src/main/resources/assets/hyperlighting/models/block/campfire/brown_campfire_lit.json

@@ -1,5 +1,5 @@
 {
-  "parent": "hyperlighting:block/advanced_campfire_base",
+  "parent": "hyperlighting:block/campfire_base",
   "textures": {
     "0": "hyperlighting:block/campfire/brown_campfire_log_lit",
     "1": "hyperlighting:block/campfire/brown_campfire_log",

Common/src/main/resources/assets/hyperlighting/models/block/campfire/brown_campfire_unlit.json

@@ -1,5 +1,5 @@
 {
-  "parent": "hyperlighting:block/advanced_campfire_base_off",
+  "parent": "hyperlighting:block/campfire_base_unlit",
   "textures": {
     "0": "hyperlighting:block/campfire/brown_campfire_log",
     "particle": "hyperlighting:block/campfire/brown_campfire_log"

Common/src/main/resources/assets/hyperlighting/models/block/campfire/cyan_campfire_lit.json

@@ -1,5 +1,5 @@
 {
-  "parent": "hyperlighting:block/advanced_campfire_base",
+  "parent": "hyperlighting:block/campfire_base",
   "textures": {
     "0": "hyperlighting:block/campfire/cyan_campfire_log_lit",
     "1": "hyperlighting:block/campfire/cyan_campfire_log",

Common/src/main/resources/assets/hyperlighting/models/block/campfire/cyan_campfire_unlit.json

@@ -1,5 +1,5 @@
 {
-  "parent": "hyperlighting:block/advanced_campfire_base_off",
+  "parent": "hyperlighting:block/campfire_base_unlit",
   "textures": {
     "0": "hyperlighting:block/campfire/cyan_campfire_log",
     "particle": "hyperlighting:block/campfire/cyan_campfire_log"

Common/src/main/resources/assets/hyperlighting/models/block/campfire/gray_campfire_lit.json

@@ -1,5 +1,5 @@
 {
-  "parent": "hyperlighting:block/advanced_campfire_base",
+  "parent": "hyperlighting:block/campfire_base",
   "textures": {
     "0": "hyperlighting:block/campfire/gray_campfire_log_lit",
     "1": "hyperlighting:block/campfire/gray_campfire_log",

Common/src/main/resources/assets/hyperlighting/models/block/campfire/gray_campfire_unlit.json

@@ -1,5 +1,5 @@
 {
-  "parent": "hyperlighting:block/advanced_campfire_base_off",
+  "parent": "hyperlighting:block/campfire_base_unlit",
   "textures": {
     "0": "hyperlighting:block/campfire/gray_campfire_log",
     "particle": "hyperlighting:block/campfire/gray_campfire_log"

Common/src/main/resources/assets/hyperlighting/models/block/campfire/green_campfire_lit.json

@@ -1,5 +1,5 @@
 {
-  "parent": "hyperlighting:block/advanced_campfire_base",
+  "parent": "hyperlighting:block/campfire_base",
   "textures": {
     "0": "hyperlighting:block/campfire/green_campfire_log_lit",
     "1": "hyperlighting:block/campfire/green_campfire_log",

Common/src/main/resources/assets/hyperlighting/models/block/campfire/green_campfire_unlit.json

@@ -1,5 +1,5 @@
 {
-  "parent": "hyperlighting:block/advanced_campfire_base_off",
+  "parent": "hyperlighting:block/campfire_base_unlit",
   "textures": {
     "0": "hyperlighting:block/campfire/green_campfire_log",
     "particle": "hyperlighting:block/campfire/green_campfire_log"

Common/src/main/resources/assets/hyperlighting/models/block/campfire/light_blue_campfire_lit.json

@@ -1,5 +1,5 @@
 {
-  "parent": "hyperlighting:block/advanced_campfire_base",
+  "parent": "hyperlighting:block/campfire_base",
   "textures": {
     "0": "hyperlighting:block/campfire/light_blue_campfire_log_lit",
     "1": "hyperlighting:block/campfire/light_blue_campfire_log",

Common/src/main/resources/assets/hyperlighting/models/block/campfire/light_blue_campfire_unlit.json

@@ -1,5 +1,5 @@
 {
-  "parent": "hyperlighting:block/advanced_campfire_base_off",
+  "parent": "hyperlighting:block/campfire_base_unlit",
   "textures": {
     "0": "hyperlighting:block/campfire/light_blue_campfire_log",
     "particle": "hyperlighting:block/campfire/light_blue_campfire_log"

Common/src/main/resources/assets/hyperlighting/models/block/campfire/light_gray_campfire_lit.json

@@ -1,5 +1,5 @@
 {
-  "parent": "hyperlighting:block/advanced_campfire_base",
+  "parent": "hyperlighting:block/campfire_base",
   "textures": {
     "0": "hyperlighting:block/campfire/light_gray_campfire_log_lit",
     "1": "hyperlighting:block/campfire/light_gray_campfire_log",

Common/src/main/resources/assets/hyperlighting/models/block/campfire/light_gray_campfire_unlit.json

@@ -1,5 +1,5 @@
 {
-  "parent": "hyperlighting:block/advanced_campfire_base_off",
+  "parent": "hyperlighting:block/campfire_base_unlit",
   "textures": {
     "0": "hyperlighting:block/campfire/light_gray_campfire_log",
     "particle": "hyperlighting:block/campfire/light_gray_campfire_log"

Common/src/main/resources/assets/hyperlighting/models/block/campfire/lime_campfire_lit.json

@@ -1,5 +1,5 @@
 {
-  "parent": "hyperlighting:block/advanced_campfire_base",
+  "parent": "hyperlighting:block/campfire_base",
   "textures": {
     "0": "hyperlighting:block/campfire/lime_campfire_log_lit",
     "1": "hyperlighting:block/campfire/lime_campfire_log",

Common/src/main/resources/assets/hyperlighting/models/block/campfire/lime_campfire_unlit.json

@@ -1,5 +1,5 @@
 {
-  "parent": "hyperlighting:block/advanced_campfire_base_off",
+  "parent": "hyperlighting:block/campfire_base_unlit",
   "textures": {
     "0": "hyperlighting:block/campfire/lime_campfire_log",
     "particle": "hyperlighting:block/campfire/lime_campfire_log"

Common/src/main/resources/assets/hyperlighting/models/block/campfire/magenta_campfire_lit.json

@@ -1,5 +1,5 @@
 {
-  "parent": "hyperlighting:block/advanced_campfire_base",
+  "parent": "hyperlighting:block/campfire_base",
   "textures": {
     "0": "hyperlighting:block/campfire/magenta_campfire_log_lit",
     "1": "hyperlighting:block/campfire/magenta_campfire_log",

Common/src/main/resources/assets/hyperlighting/models/block/campfire/magenta_campfire_unlit.json

@@ -1,5 +1,5 @@
 {
-  "parent": "hyperlighting:block/advanced_campfire_base_off",
+  "parent": "hyperlighting:block/campfire_base_unlit",
   "textures": {
     "0": "hyperlighting:block/campfire/magenta_campfire_log",
     "particle": "hyperlighting:block/campfire/magenta_campfire_log"

Common/src/main/resources/assets/hyperlighting/models/block/campfire/orange_campfire_lit.json

@@ -1,5 +1,5 @@
 {
-  "parent": "hyperlighting:block/advanced_campfire_base",
+  "parent": "hyperlighting:block/campfire_base",
   "textures": {
     "0": "hyperlighting:block/campfire/orange_campfire_log_lit",
     "1": "hyperlighting:block/campfire/orange_campfire_log",

Common/src/main/resources/assets/hyperlighting/models/block/campfire/orange_campfire_unlit.json

@@ -1,5 +1,5 @@
 {
-  "parent": "hyperlighting:block/advanced_campfire_base_off",
+  "parent": "hyperlighting:block/campfire_base_unlit",
   "textures": {
     "0": "hyperlighting:block/campfire/orange_campfire_log",
     "particle": "hyperlighting:block/campfire/orange_campfire_log"

Common/src/main/resources/assets/hyperlighting/models/block/campfire/pink_campfire_lit.json

@@ -1,5 +1,5 @@
 {
-  "parent": "hyperlighting:block/advanced_campfire_base",
+  "parent": "hyperlighting:block/campfire_base",
   "textures": {
     "0": "hyperlighting:block/campfire/pink_campfire_log_lit",
     "1": "hyperlighting:block/campfire/pink_campfire_log",

Common/src/main/resources/assets/hyperlighting/models/block/campfire/pink_campfire_unlit.json

@@ -1,5 +1,5 @@
 {
-  "parent": "hyperlighting:block/advanced_campfire_base_off",
+  "parent": "hyperlighting:block/campfire_base_unlit",
   "textures": {
     "0": "hyperlighting:block/campfire/pink_campfire_log",
     "particle": "hyperlighting:block/campfire/pink_campfire_log"

Common/src/main/resources/assets/hyperlighting/models/block/campfire/purple_campfire_lit.json

@@ -1,5 +1,5 @@
 {
-  "parent": "hyperlighting:block/advanced_campfire_base",
+  "parent": "hyperlighting:block/campfire_base",
   "textures": {
     "0": "hyperlighting:block/campfire/purple_campfire_log_lit",
     "1": "hyperlighting:block/campfire/purple_campfire_log",

Common/src/main/resources/assets/hyperlighting/models/block/campfire/purple_campfire_unlit.json

@@ -1,5 +1,5 @@
 {
-  "parent": "hyperlighting:block/advanced_campfire_base_off",
+  "parent": "hyperlighting:block/campfire_base_unlit",
   "textures": {
     "0": "hyperlighting:block/campfire/purple_campfire_log",
     "particle": "hyperlighting:block/campfire/purple_campfire_log"

Common/src/main/resources/assets/hyperlighting/models/block/campfire/red_campfire_lit.json

@@ -1,5 +1,5 @@
 {
-  "parent": "hyperlighting:block/advanced_campfire_base",
+  "parent": "hyperlighting:block/campfire_base",
   "textures": {
     "0": "hyperlighting:block/campfire/red_campfire_log_lit",
     "1": "hyperlighting:block/campfire/red_campfire_log",

Common/src/main/resources/assets/hyperlighting/models/block/campfire/red_campfire_unlit.json

@@ -1,5 +1,5 @@
 {
-  "parent": "hyperlighting:block/advanced_campfire_base_off",
+  "parent": "hyperlighting:block/campfire_base_unlit",
   "textures": {
     "0": "hyperlighting:block/campfire/red_campfire_log",
     "particle": "hyperlighting:block/campfire/red_campfire_log"

Common/src/main/resources/assets/hyperlighting/models/block/campfire/white_campfire_lit.json

@@ -1,5 +1,5 @@
 {
-  "parent": "hyperlighting:block/advanced_campfire_base",
+  "parent": "hyperlighting:block/campfire_base",
   "textures": {
     "0": "hyperlighting:block/campfire/white_campfire_log_lit",
     "1": "hyperlighting:block/campfire/white_campfire_log",

Common/src/main/resources/assets/hyperlighting/models/block/campfire/white_campfire_unlit.json

@@ -1,5 +1,5 @@
 {
-  "parent": "hyperlighting:block/advanced_campfire_base_off",
+  "parent": "hyperlighting:block/campfire_base_unlit",
   "textures": {
     "0": "hyperlighting:block/campfire/white_campfire_log",
     "particle": "hyperlighting:block/campfire/white_campfire_log"

Common/src/main/resources/assets/hyperlighting/models/block/campfire/yellow_campfire_lit.json

@@ -1,5 +1,5 @@
 {
-  "parent": "hyperlighting:block/advanced_campfire_base",
+  "parent": "hyperlighting:block/campfire_base",
   "textures": {
     "0": "hyperlighting:block/campfire/yellow_campfire_log_lit",
     "1": "hyperlighting:block/campfire/yellow_campfire_log",

Common/src/main/resources/assets/hyperlighting/models/block/campfire/yellow_campfire_unlit.json

@@ -1,5 +1,5 @@
 {
-  "parent": "hyperlighting:block/advanced_campfire_base_off",
+  "parent": "hyperlighting:block/campfire_base_unlit",
   "textures": {
     "0": "hyperlighting:block/campfire/yellow_campfire_log",
     "particle": "hyperlighting:block/campfire/yellow_campfire_log"

Common/src/main/resources/assets/hyperlighting/models/block/campfire_base.json

@@ -96,5 +96,29 @@
 				"down": {"uv": [0, 0, 16, 0], "rotation": 90, "texture": "#2"}
 			}
 		}
-	]
+	],
+	"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]
+		}
+	}
 }

Common/src/main/resources/assets/hyperlighting/models/block/campfire_base_unlit.json

@@ -68,5 +68,29 @@
 				"down": {"uv": [0, 0, 16, 6], "rotation": 90, "texture": "#1"}
 			}
 		}
-	]
+	],
+	"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]
+		}
+	}
 }

Common/src/main/resources/assets/hyperlighting/models/block/candle/gray_candle.json

@@ -3,3 +3,4 @@
   "textures": {
     "0": "hyperlighting:block/candle/base/gray_advanced_candle"
   }
+}

Common/src/main/resources/assets/hyperlighting/models/block/candle/gray_candle_lit.json

@@ -3,3 +3,4 @@
   "textures": {
     "0": "hyperlighting:block/candle/lit/gray_advanced_candle_lit"
   }
+}

Common/src/main/resources/assets/hyperlighting/models/block/carved_pumpkin_trio.json

@@ -2,10 +2,10 @@
 	"credit": "Made with Blockbench",
 	"texture_size": [32, 32],
 	"textures": {
-		"1": "block/oak_planks",
+		"1": "minecraft:block/oak_planks",
 		"2": "hyperlighting:block/small_carved_pumpkin",
-		"3": "block/hay_block_top",
+		"3": "minecraft:block/hay_block_top",
-		"particle": "block/hay_block_top"
+		"particle": "minecraft:block/hay_block_top"
 	},
 	"elements": [
 		{
@@ -76,5 +76,32 @@
 				"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]
+		}
+	}
 }

Common/src/main/resources/assets/hyperlighting/models/block/carved_pumpkin_trio_inverted.json

@@ -2,9 +2,9 @@
 	"credit": "Made with Blockbench",
 	"texture_size": [32, 32],
 	"textures": {
-		"1": "block/oak_planks",
+		"1": "minecraft:block/oak_planks",
 		"2": "hyperlighting:block/small_carved_pumpkin",
-		"3": "block/hay_block_top",
+		"3": "minecraft:block/hay_block_top",
 		"particle": "block/hay_block_top"
 	},
 	"elements": [
@@ -12,6 +12,7 @@
 			"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"},
@@ -25,7 +26,7 @@
 			"name": "Right Pumpkin",
 			"from": [2, 1, 6],
 			"to": [8, 7, 12],
-			"rotation": {"angle": 45, "axis": "y", "origin": [5, 0, 9]},
+			"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"},
@@ -39,7 +40,7 @@
 			"name": "Top Pumpkin",
 			"from": [7, 7, 7],
 			"to": [13, 13, 13],
-			"rotation": {"angle": 22.5, "axis": "y", "origin": [10, 6, 10]},
+			"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"},
@@ -53,7 +54,7 @@
 			"name": "Stand",
 			"from": [9, 1, 10],
 			"to": [12, 7, 13],
-			"rotation": {"angle": 0, "axis": "y", "origin": [9, 0, 10]},
+			"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"},
@@ -76,5 +77,32 @@
 				"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]
+		}
+	}
 }

Common/src/main/resources/assets/hyperlighting/models/block/hanging_fire.json

@@ -1,427 +0,0 @@
-{
-	"credit": "Made with Blockbench",
-	"textures": {
-		"2": "block/cauldron_top",
-		"3": "block/cauldron_side",
-		"4": "block/cauldron_inner",
-		"5": "block/campfire_log",
-		"6": "hyperlighting:block/campfire/ashes",
-		"7": "block/chain",
-		"8": "hyperlighting:block/campfire/black_campfire_fire",
-		"particle": "block/cauldron_side"
-	},
-	"elements": [
-		{
-			"from": [2, -5, 2],
-			"to": [14, -4, 14],
-			"rotation": {"angle": 0, "axis": "y", "origin": [0, -5, 0]},
-			"faces": {
-				"north": {"uv": [0, 0, 16, 1], "texture": "#missing"},
-				"east": {"uv": [0, 0, 16, 1], "texture": "#missing"},
-				"south": {"uv": [0, 0, 16, 1], "texture": "#missing"},
-				"west": {"uv": [0, 0, 16, 1], "texture": "#missing"},
-				"up": {"uv": [0, 0, 16, 16], "texture": "#6"},
-				"down": {"uv": [2, 2, 14, 14], "texture": "#4"}
-			}
-		},
-		{
-			"from": [0, -5, 0],
-			"to": [16, 2, 2],
-			"rotation": {"angle": 0, "axis": "y", "origin": [0, -5, 0]},
-			"faces": {
-				"north": {"uv": [0, 0, 16, 7], "texture": "#3"},
-				"east": {"uv": [14, 0, 16, 7], "texture": "#3"},
-				"south": {"uv": [0, 0, 16, 7], "texture": "#3"},
-				"west": {"uv": [0, 0, 2, 7], "texture": "#3"},
-				"up": {"uv": [0, 0, 16, 2], "texture": "#2"},
-				"down": {"uv": [0, 14, 16, 16], "texture": "#4"}
-			}
-		},
-		{
-			"from": [0, -5, 14],
-			"to": [16, 2, 16],
-			"rotation": {"angle": 0, "axis": "y", "origin": [0, -5, 0]},
-			"faces": {
-				"north": {"uv": [0, 0, 16, 7], "texture": "#3"},
-				"east": {"uv": [0, 0, 2, 7], "texture": "#3"},
-				"south": {"uv": [0, 0, 16, 7], "texture": "#3"},
-				"west": {"uv": [14, 0, 16, 7], "texture": "#3"},
-				"up": {"uv": [0, 14, 16, 16], "texture": "#2"},
-				"down": {"uv": [0, 0, 16, 2], "texture": "#4"}
-			}
-		},
-		{
-			"from": [0, -5, 2],
-			"to": [2, 2, 14],
-			"rotation": {"angle": 0, "axis": "y", "origin": [0, -5, 0]},
-			"faces": {
-				"north": {"uv": [0, 0, 1, 6], "texture": "#missing"},
-				"east": {"uv": [2, 0, 14, 7], "texture": "#3"},
-				"south": {"uv": [0, 0, 1, 6], "texture": "#missing"},
-				"west": {"uv": [2, 0, 14, 7], "texture": "#3"},
-				"up": {"uv": [0, 2, 2, 14], "texture": "#2"},
-				"down": {"uv": [0, 2, 2, 16], "texture": "#4"}
-			}
-		},
-		{
-			"from": [14, -5, 2],
-			"to": [16, 2, 14],
-			"rotation": {"angle": 0, "axis": "y", "origin": [0, -5, 0]},
-			"faces": {
-				"north": {"uv": [0, 0, 1, 5], "texture": "#missing"},
-				"east": {"uv": [2, 0, 14, 7], "texture": "#3"},
-				"south": {"uv": [0, 0, 1, 5], "texture": "#missing"},
-				"west": {"uv": [2, 0, 14, 7], "texture": "#3"},
-				"up": {"uv": [14, 2, 16, 14], "texture": "#2"},
-				"down": {"uv": [14, 2, 16, 14], "texture": "#4"}
-			}
-		},
-		{
-			"from": [3, -4, 2],
-			"to": [6, -1, 14],
-			"rotation": {"angle": 0, "axis": "y", "origin": [0, -5, 0]},
-			"faces": {
-				"north": {"uv": [0, 0, 3, 3], "texture": "#missing"},
-				"east": {"uv": [0, 0, 12, 3], "texture": "#5"},
-				"south": {"uv": [0, 0, 3, 3], "texture": "#missing"},
-				"west": {"uv": [0, 0, 12, 3], "texture": "#5"},
-				"up": {"uv": [4, 0, 16, 3], "rotation": 90, "texture": "#5"},
-				"down": {"uv": [0, 0, 3, 12], "texture": "#missing"}
-			}
-		},
-		{
-			"from": [10, -4, 2],
-			"to": [13, -1, 14],
-			"rotation": {"angle": 0, "axis": "y", "origin": [0, -5, 0]},
-			"faces": {
-				"north": {"uv": [0, 0, 3, 3], "texture": "#missing"},
-				"east": {"uv": [0, 0, 12, 3], "texture": "#5"},
-				"south": {"uv": [0, 0, 3, 3], "texture": "#missing"},
-				"west": {"uv": [0, 0, 12, 3], "texture": "#5"},
-				"up": {"uv": [4, 0, 16, 3], "rotation": 90, "texture": "#5"},
-				"down": {"uv": [0, 0, 3, 12], "texture": "#missing"}
-			}
-		},
-		{
-			"from": [2, -2, 3],
-			"to": [14, 1, 6],
-			"rotation": {"angle": 0, "axis": "y", "origin": [0, -5, 0]},
-			"faces": {
-				"north": {"uv": [4, 1, 16, 4], "texture": "#5"},
-				"east": {"uv": [0, 0, 3, 3], "texture": "#missing"},
-				"south": {"uv": [0, 0, 12, 3], "texture": "#5"},
-				"west": {"uv": [0, 0, 3, 3], "texture": "#missing"},
-				"up": {"uv": [0, 1, 11, 4], "texture": "#5"},
-				"down": {"uv": [0, 0, 12, 3], "texture": "#missing"}
-			}
-		},
-		{
-			"from": [2, -2, 10],
-			"to": [14, 1, 13],
-			"rotation": {"angle": 0, "axis": "y", "origin": [0, -5, 0]},
-			"faces": {
-				"north": {"uv": [1, 0, 13, 3], "texture": "#5"},
-				"east": {"uv": [0, 0, 3, 3], "texture": "#missing"},
-				"south": {"uv": [4, 1, 16, 4], "texture": "#5"},
-				"west": {"uv": [0, 0, 3, 3], "texture": "#missing"},
-				"up": {"uv": [0, 1, 11, 4], "texture": "#5"},
-				"down": {"uv": [0, 0, 12, 3], "texture": "#missing"}
-			}
-		},
-		{
-			"from": [1, 2, -0.41421],
-			"to": [1, 14, 2.58579],
-			"rotation": {"angle": -45, "axis": "y", "origin": [1, -5, 1]},
-			"faces": {
-				"north": {"uv": [0, 0, 0, 16], "texture": "#missing"},
-				"east": {"uv": [0, 4, 3, 16], "texture": "#7"},
-				"south": {"uv": [0, 0, 0, 16], "texture": "#missing"},
-				"west": {"uv": [0, 4, 3, 16], "texture": "#7"},
-				"up": {"uv": [0, 0, 0, 16], "texture": "#missing"},
-				"down": {"uv": [0, 0, 0, 16], "texture": "#missing"}
-			}
-		},
-		{
-			"from": [1, 2, -0.41421],
-			"to": [1, 14, 2.58579],
-			"rotation": {"angle": 45, "axis": "y", "origin": [1, -5, 1]},
-			"faces": {
-				"north": {"uv": [0, 0, 0, 16], "texture": "#missing"},
-				"east": {"uv": [3, 4, 6, 16], "texture": "#7"},
-				"south": {"uv": [0, 0, 0, 16], "texture": "#missing"},
-				"west": {"uv": [3, 4, 6, 16], "texture": "#7"},
-				"up": {"uv": [0, 0, 0, 16], "texture": "#missing"},
-				"down": {"uv": [0, 0, 0, 16], "texture": "#missing"}
-			}
-		},
-		{
-			"from": [15, 2, -0.41421],
-			"to": [15, 14, 2.58579],
-			"rotation": {"angle": 45, "axis": "y", "origin": [15, -6, 1]},
-			"faces": {
-				"north": {"uv": [0, 0, 0, 16], "texture": "#missing"},
-				"east": {"uv": [0, 4, 3, 16], "texture": "#7"},
-				"south": {"uv": [0, 0, 0, 16], "texture": "#missing"},
-				"west": {"uv": [0, 4, 3, 16], "texture": "#7"},
-				"up": {"uv": [0, 0, 0, 16], "texture": "#missing"},
-				"down": {"uv": [0, 0, 0, 16], "texture": "#missing"}
-			}
-		},
-		{
-			"from": [15, 2, -0.41421],
-			"to": [15, 14, 2.58579],
-			"rotation": {"angle": -45, "axis": "y", "origin": [15, -6, 1]},
-			"faces": {
-				"north": {"uv": [0, 0, 0, 16], "texture": "#missing"},
-				"east": {"uv": [3, 4, 6, 16], "texture": "#7"},
-				"south": {"uv": [0, 0, 0, 16], "texture": "#missing"},
-				"west": {"uv": [3, 4, 6, 16], "texture": "#7"},
-				"up": {"uv": [0, 0, 0, 16], "texture": "#missing"},
-				"down": {"uv": [0, 0, 0, 16], "texture": "#missing"}
-			}
-		},
-		{
-			"from": [15, 2, 13.58579],
-			"to": [15, 14, 16.58579],
-			"rotation": {"angle": -45, "axis": "y", "origin": [15, -5, 15]},
-			"faces": {
-				"north": {"uv": [0, 0, 0, 16], "texture": "#missing"},
-				"east": {"uv": [0, 4, 3, 16], "texture": "#7"},
-				"south": {"uv": [0, 0, 0, 16], "texture": "#missing"},
-				"west": {"uv": [0, 4, 3, 16], "texture": "#7"},
-				"up": {"uv": [0, 0, 0, 16], "texture": "#missing"},
-				"down": {"uv": [0, 0, 0, 16], "texture": "#missing"}
-			}
-		},
-		{
-			"from": [15, 2, 13.58579],
-			"to": [15, 14, 16.58579],
-			"rotation": {"angle": 45, "axis": "y", "origin": [15, -5, 15]},
-			"faces": {
-				"north": {"uv": [0, 0, 0, 16], "texture": "#missing"},
-				"east": {"uv": [3, 4, 6, 16], "texture": "#7"},
-				"south": {"uv": [0, 0, 0, 16], "texture": "#missing"},
-				"west": {"uv": [3, 4, 6, 16], "texture": "#7"},
-				"up": {"uv": [0, 0, 0, 16], "texture": "#missing"},
-				"down": {"uv": [0, 0, 0, 16], "texture": "#missing"}
-			}
-		},
-		{
-			"from": [1, 2, 13.58579],
-			"to": [1, 14, 16.58579],
-			"rotation": {"angle": 45, "axis": "y", "origin": [1, -6, 15]},
-			"faces": {
-				"north": {"uv": [0, 0, 0, 16], "texture": "#missing"},
-				"east": {"uv": [0, 4, 3, 16], "texture": "#7"},
-				"south": {"uv": [0, 0, 0, 16], "texture": "#missing"},
-				"west": {"uv": [0, 4, 3, 16], "texture": "#7"},
-				"up": {"uv": [0, 0, 0, 16], "texture": "#missing"},
-				"down": {"uv": [0, 0, 0, 16], "texture": "#missing"}
-			}
-		},
-		{
-			"from": [1, 2, 13.58579],
-			"to": [1, 14, 16.58579],
-			"rotation": {"angle": -45, "axis": "y", "origin": [1, -6, 15]},
-			"faces": {
-				"north": {"uv": [0, 0, 0, 16], "texture": "#missing"},
-				"east": {"uv": [3, 4, 6, 16], "texture": "#7"},
-				"south": {"uv": [0, 0, 0, 16], "texture": "#missing"},
-				"west": {"uv": [3, 4, 6, 16], "texture": "#7"},
-				"up": {"uv": [0, 0, 0, 16], "texture": "#missing"},
-				"down": {"uv": [0, 0, 0, 16], "texture": "#missing"}
-			}
-		},
-		{
-			"name": "fire",
-			"from": [0, -4, 8],
-			"to": [16, 12, 8],
-			"rotation": {"angle": -45, "axis": "y", "origin": [8, -5, 8]},
-			"faces": {
-				"north": {"uv": [0, 0, 16, 16], "texture": "#8"},
-				"east": {"uv": [0, 0, 0, 16], "texture": "#missing"},
-				"south": {"uv": [16, 0, 0, 16], "texture": "#8"},
-				"west": {"uv": [0, 0, 0, 16], "texture": "#missing"},
-				"up": {"uv": [0, 0, 16, 0], "texture": "#missing"},
-				"down": {"uv": [0, 0, 16, 0], "texture": "#missing"}
-			}
-		},
-		{
-			"name": "fire",
-			"from": [8, -4, 0],
-			"to": [8, 12, 16],
-			"rotation": {"angle": -45, "axis": "y", "origin": [8, -5, 8]},
-			"faces": {
-				"north": {"uv": [0, 0, 0, 16], "texture": "#missing"},
-				"east": {"uv": [16, 0, 0, 16], "texture": "#8"},
-				"south": {"uv": [0, 0, 0, 16], "texture": "#8"},
-				"west": {"uv": [0, 0, 16, 16], "texture": "#8"},
-				"up": {"uv": [0, 0, 16, 0], "rotation": 90, "texture": "#missing"},
-				"down": {"uv": [0, 0, 16, 0], "rotation": 270, "texture": "#missing"}
-			}
-		},
-		{
-			"from": [0, 14, 0],
-			"to": [16, 16, 2],
-			"rotation": {"angle": 0, "axis": "y", "origin": [0, -5, 0]},
-			"faces": {
-				"north": {"uv": [0, 0, 16, 2], "texture": "#3"},
-				"east": {"uv": [0, 0, 2, 2], "texture": "#3"},
-				"south": {"uv": [0, 0, 16, 2], "texture": "#3"},
-				"west": {"uv": [14, 0, 16, 2], "texture": "#3"},
-				"up": {"uv": [0, 0, 16, 2], "texture": "#2"},
-				"down": {"uv": [0, 0, 16, 2], "rotation": 180, "texture": "#4"}
-			}
-		},
-		{
-			"from": [0, 14, 14],
-			"to": [16, 16, 16],
-			"rotation": {"angle": 0, "axis": "y", "origin": [0, -5, 0]},
-			"faces": {
-				"north": {"uv": [0, 0, 16, 2], "texture": "#3"},
-				"east": {"uv": [14, 0, 16, 2], "texture": "#3"},
-				"south": {"uv": [0, 0, 16, 2], "texture": "#3"},
-				"west": {"uv": [0, 0, 2, 2], "texture": "#3"},
-				"up": {"uv": [0, 14, 16, 16], "texture": "#2"},
-				"down": {"uv": [0, 0, 16, 2], "texture": "#4"}
-			}
-		},
-		{
-			"from": [0, 14, 2],
-			"to": [2, 16, 14],
-			"rotation": {"angle": 0, "axis": "y", "origin": [0, -5, 0]},
-			"faces": {
-				"north": {"uv": [0, 0, 2, 2], "texture": "#missing"},
-				"east": {"uv": [2, 0, 14, 2], "texture": "#3"},
-				"south": {"uv": [0, 0, 2, 2], "texture": "#missing"},
-				"west": {"uv": [2, 0, 14, 2], "texture": "#3"},
-				"up": {"uv": [0, 2, 2, 14], "texture": "#2"},
-				"down": {"uv": [0, 2, 2, 14], "texture": "#4"}
-			}
-		},
-		{
-			"from": [14, 14, 2],
-			"to": [16, 16, 14],
-			"rotation": {"angle": 0, "axis": "y", "origin": [0, -5, 0]},
-			"faces": {
-				"north": {"uv": [0, 0, 2, 2], "texture": "#missing"},
-				"east": {"uv": [2, 0, 14, 2], "texture": "#3"},
-				"south": {"uv": [0, 0, 2, 2], "texture": "#missing"},
-				"west": {"uv": [2, 0, 14, 2], "texture": "#3"},
-				"up": {"uv": [14, 2, 16, 14], "texture": "#2"},
-				"down": {"uv": [14, 2, 16, 14], "texture": "#4"}
-			}
-		},
-		{
-			"from": [-1, 14.001, 7],
-			"to": [17, 15.999, 9],
-			"rotation": {"angle": -45, "axis": "y", "origin": [8, -5, 8]},
-			"faces": {
-				"north": {"uv": [0, 4, 16, 6], "texture": "#3"},
-				"east": {"uv": [14, 4, 16, 6], "texture": "#3"},
-				"south": {"uv": [0, 4, 16, 6], "texture": "#3"},
-				"west": {"uv": [0, 4, 2, 6], "texture": "#3"},
-				"up": {"uv": [0, 4, 16, 6], "texture": "#3"},
-				"down": {"uv": [0, 4, 16, 6], "texture": "#3"}
-			}
-		},
-		{
-			"from": [-1, 14.002, 7],
-			"to": [17, 15.998, 9],
-			"rotation": {"angle": 45, "axis": "y", "origin": [8, -5, 8]},
-			"faces": {
-				"north": {"uv": [0, 4, 16, 6], "texture": "#3"},
-				"east": {"uv": [14, 4, 16, 6], "texture": "#3"},
-				"south": {"uv": [0, 4, 16, 6], "texture": "#3"},
-				"west": {"uv": [0, 4, 2, 6], "texture": "#3"},
-				"up": {"uv": [0, 4, 16, 6], "texture": "#3"},
-				"down": {"uv": [0, 4, 16, 6], "texture": "#3"}
-			}
-		}
-	],
-	"display": {
-		"thirdperson_righthand": {
-			"translation": [0, 1.5, -1],
-			"scale": [0.3, 0.3, 0.3]
-		},
-		"thirdperson_lefthand": {
-			"translation": [0, 1.5, -1],
-			"scale": [0.3, 0.3, 0.3]
-		},
-		"firstperson_righthand": {
-			"scale": [0.6, 0.6, 0.6]
-		},
-		"firstperson_lefthand": {
-			"scale": [0.6, 0.6, 0.6]
-		},
-		"ground": {
-			"scale": [0.3, 0.3, 0.3]
-		},
-		"gui": {
-			"rotation": [30, 45, 0],
-			"translation": [0, 1, 0],
-			"scale": [0.5, 0.5, 0.5]
-		},
-		"fixed": {
-			"translation": [0, 1.75, 0],
-			"scale": [0.6, 0.6, 0.6]
-		}
-	},
-	"groups": [
-		{
-			"name": "cup",
-			"origin": [8, 8, 8],
-			"color": 0,
-			"children": [0, 1, 2, 3, 4]
-		},
-		{
-			"name": "wood",
-			"origin": [0, 0, 0],
-			"color": 0,
-			"children": [5, 6, 7, 8]
-		},
-		{
-			"name": "chains",
-			"origin": [8, 8, 8],
-			"color": 0,
-			"children": [
-				{
-					"name": "NW",
-					"origin": [1, 0, 1],
-					"color": 0,
-					"children": [9, 10]
-				},
-				{
-					"name": "NE",
-					"origin": [15, -1, 1],
-					"color": 0,
-					"children": [11, 12]
-				},
-				{
-					"name": "SE",
-					"origin": [1, 0, 1],
-					"color": 0,
-					"children": [13, 14]
-				},
-				{
-					"name": "SW",
-					"origin": [15, -1, 1],
-					"color": 0,
-					"children": [15, 16]
-				}
-			]
-		},
-		{
-			"name": "fire",
-			"origin": [0, 0, 0],
-			"color": 0,
-			"children": [17, 18]
-		},
-		{
-			"name": "frame",
-			"origin": [8, 8, 8],
-			"color": 0,
-			"children": [19, 20, 21, 22, 23, 24]
-		}
-	]
-}

Common/src/main/resources/assets/hyperlighting/models/block/hanging_fire_off.json

@@ -1,392 +0,0 @@
-{
-	"credit": "Made with Blockbench",
-	"textures": {
-		"2": "block/cauldron_top",
-		"3": "block/cauldron_side",
-		"4": "block/cauldron_inner",
-		"5": "block/campfire_log",
-		"6": "hyperlighting:block/campfire_ashes",
-		"7": "block/chain",
-		"particle": "block/cauldron_side"
-	},
-	"elements": [
-		{
-			"from": [2, -5, 2],
-			"to": [14, -4, 14],
-			"rotation": {"angle": 0, "axis": "y", "origin": [0, -5, 0]},
-			"faces": {
-				"north": {"uv": [0, 0, 16, 1], "texture": "#missing"},
-				"east": {"uv": [0, 0, 16, 1], "texture": "#missing"},
-				"south": {"uv": [0, 0, 16, 1], "texture": "#missing"},
-				"west": {"uv": [0, 0, 16, 1], "texture": "#missing"},
-				"up": {"uv": [0, 0, 16, 16], "texture": "#6"},
-				"down": {"uv": [2, 2, 14, 14], "texture": "#4"}
-			}
-		},
-		{
-			"from": [0, -5, 0],
-			"to": [16, 2, 2],
-			"rotation": {"angle": 0, "axis": "y", "origin": [0, -5, 0]},
-			"faces": {
-				"north": {"uv": [0, 0, 16, 7], "texture": "#3"},
-				"east": {"uv": [14, 0, 16, 7], "texture": "#3"},
-				"south": {"uv": [0, 0, 16, 7], "texture": "#3"},
-				"west": {"uv": [0, 0, 2, 7], "texture": "#3"},
-				"up": {"uv": [0, 0, 16, 2], "texture": "#2"},
-				"down": {"uv": [0, 14, 16, 16], "texture": "#4"}
-			}
-		},
-		{
-			"from": [0, -5, 14],
-			"to": [16, 2, 16],
-			"rotation": {"angle": 0, "axis": "y", "origin": [0, -5, 0]},
-			"faces": {
-				"north": {"uv": [0, 0, 16, 7], "texture": "#3"},
-				"east": {"uv": [0, 0, 2, 7], "texture": "#3"},
-				"south": {"uv": [0, 0, 16, 7], "texture": "#3"},
-				"west": {"uv": [14, 0, 16, 7], "texture": "#3"},
-				"up": {"uv": [0, 14, 16, 16], "texture": "#2"},
-				"down": {"uv": [0, 0, 16, 2], "texture": "#4"}
-			}
-		},
-		{
-			"from": [0, -5, 2],
-			"to": [2, 2, 14],
-			"rotation": {"angle": 0, "axis": "y", "origin": [0, -5, 0]},
-			"faces": {
-				"north": {"uv": [0, 0, 1, 6], "texture": "#missing"},
-				"east": {"uv": [2, 0, 14, 7], "texture": "#3"},
-				"south": {"uv": [0, 0, 1, 6], "texture": "#missing"},
-				"west": {"uv": [2, 0, 14, 7], "texture": "#3"},
-				"up": {"uv": [0, 2, 2, 14], "texture": "#2"},
-				"down": {"uv": [0, 2, 2, 16], "texture": "#4"}
-			}
-		},
-		{
-			"from": [14, -5, 2],
-			"to": [16, 2, 14],
-			"rotation": {"angle": 0, "axis": "y", "origin": [0, -5, 0]},
-			"faces": {
-				"north": {"uv": [0, 0, 1, 5], "texture": "#missing"},
-				"east": {"uv": [2, 0, 14, 7], "texture": "#3"},
-				"south": {"uv": [0, 0, 1, 5], "texture": "#missing"},
-				"west": {"uv": [2, 0, 14, 7], "texture": "#3"},
-				"up": {"uv": [14, 2, 16, 14], "texture": "#2"},
-				"down": {"uv": [14, 2, 16, 14], "texture": "#4"}
-			}
-		},
-		{
-			"from": [3, -4, 2],
-			"to": [6, -1, 14],
-			"rotation": {"angle": 0, "axis": "y", "origin": [0, -5, 0]},
-			"faces": {
-				"north": {"uv": [0, 0, 3, 3], "texture": "#missing"},
-				"east": {"uv": [0, 0, 12, 3], "texture": "#5"},
-				"south": {"uv": [0, 0, 3, 3], "texture": "#missing"},
-				"west": {"uv": [0, 0, 12, 3], "texture": "#5"},
-				"up": {"uv": [4, 0, 16, 3], "rotation": 90, "texture": "#5"},
-				"down": {"uv": [0, 0, 3, 12], "texture": "#missing"}
-			}
-		},
-		{
-			"from": [10, -4, 2],
-			"to": [13, -1, 14],
-			"rotation": {"angle": 0, "axis": "y", "origin": [0, -5, 0]},
-			"faces": {
-				"north": {"uv": [0, 0, 3, 3], "texture": "#missing"},
-				"east": {"uv": [0, 0, 12, 3], "texture": "#5"},
-				"south": {"uv": [0, 0, 3, 3], "texture": "#missing"},
-				"west": {"uv": [0, 0, 12, 3], "texture": "#5"},
-				"up": {"uv": [4, 0, 16, 3], "rotation": 90, "texture": "#5"},
-				"down": {"uv": [0, 0, 3, 12], "texture": "#missing"}
-			}
-		},
-		{
-			"from": [2, -2, 3],
-			"to": [14, 1, 6],
-			"rotation": {"angle": 0, "axis": "y", "origin": [0, -5, 0]},
-			"faces": {
-				"north": {"uv": [4, 1, 16, 4], "texture": "#5"},
-				"east": {"uv": [0, 0, 3, 3], "texture": "#missing"},
-				"south": {"uv": [0, 0, 12, 3], "texture": "#5"},
-				"west": {"uv": [0, 0, 3, 3], "texture": "#missing"},
-				"up": {"uv": [0, 1, 11, 4], "texture": "#5"},
-				"down": {"uv": [0, 0, 12, 3], "texture": "#missing"}
-			}
-		},
-		{
-			"from": [2, -2, 10],
-			"to": [14, 1, 13],
-			"rotation": {"angle": 0, "axis": "y", "origin": [0, -5, 0]},
-			"faces": {
-				"north": {"uv": [1, 0, 13, 3], "texture": "#5"},
-				"east": {"uv": [0, 0, 3, 3], "texture": "#missing"},
-				"south": {"uv": [4, 1, 16, 4], "texture": "#5"},
-				"west": {"uv": [0, 0, 3, 3], "texture": "#missing"},
-				"up": {"uv": [0, 1, 11, 4], "texture": "#5"},
-				"down": {"uv": [0, 0, 12, 3], "texture": "#missing"}
-			}
-		},
-		{
-			"from": [1, 2, -0.41421],
-			"to": [1, 14, 2.58579],
-			"rotation": {"angle": -45, "axis": "y", "origin": [1, -5, 1]},
-			"faces": {
-				"north": {"uv": [0, 0, 0, 16], "texture": "#missing"},
-				"east": {"uv": [0, 4, 3, 16], "texture": "#7"},
-				"south": {"uv": [0, 0, 0, 16], "texture": "#missing"},
-				"west": {"uv": [0, 4, 3, 16], "texture": "#7"},
-				"up": {"uv": [0, 0, 0, 16], "texture": "#missing"},
-				"down": {"uv": [0, 0, 0, 16], "texture": "#missing"}
-			}
-		},
-		{
-			"from": [1, 2, -0.41421],
-			"to": [1, 14, 2.58579],
-			"rotation": {"angle": 45, "axis": "y", "origin": [1, -5, 1]},
-			"faces": {
-				"north": {"uv": [0, 0, 0, 16], "texture": "#missing"},
-				"east": {"uv": [3, 4, 6, 16], "texture": "#7"},
-				"south": {"uv": [0, 0, 0, 16], "texture": "#missing"},
-				"west": {"uv": [3, 4, 6, 16], "texture": "#7"},
-				"up": {"uv": [0, 0, 0, 16], "texture": "#missing"},
-				"down": {"uv": [0, 0, 0, 16], "texture": "#missing"}
-			}
-		},
-		{
-			"from": [15, 2, -0.41421],
-			"to": [15, 14, 2.58579],
-			"rotation": {"angle": 45, "axis": "y", "origin": [15, -6, 1]},
-			"faces": {
-				"north": {"uv": [0, 0, 0, 16], "texture": "#missing"},
-				"east": {"uv": [0, 4, 3, 16], "texture": "#7"},
-				"south": {"uv": [0, 0, 0, 16], "texture": "#missing"},
-				"west": {"uv": [0, 4, 3, 16], "texture": "#7"},
-				"up": {"uv": [0, 0, 0, 16], "texture": "#missing"},
-				"down": {"uv": [0, 0, 0, 16], "texture": "#missing"}
-			}
-		},
-		{
-			"from": [15, 2, -0.41421],
-			"to": [15, 14, 2.58579],
-			"rotation": {"angle": -45, "axis": "y", "origin": [15, -6, 1]},
-			"faces": {
-				"north": {"uv": [0, 0, 0, 16], "texture": "#missing"},
-				"east": {"uv": [3, 4, 6, 16], "texture": "#7"},
-				"south": {"uv": [0, 0, 0, 16], "texture": "#missing"},
-				"west": {"uv": [3, 4, 6, 16], "texture": "#7"},
-				"up": {"uv": [0, 0, 0, 16], "texture": "#missing"},
-				"down": {"uv": [0, 0, 0, 16], "texture": "#missing"}
-			}
-		},
-		{
-			"from": [15, 2, 13.58579],
-			"to": [15, 14, 16.58579],
-			"rotation": {"angle": -45, "axis": "y", "origin": [15, -5, 15]},
-			"faces": {
-				"north": {"uv": [0, 0, 0, 16], "texture": "#missing"},
-				"east": {"uv": [0, 4, 3, 16], "texture": "#7"},
-				"south": {"uv": [0, 0, 0, 16], "texture": "#missing"},
-				"west": {"uv": [0, 4, 3, 16], "texture": "#7"},
-				"up": {"uv": [0, 0, 0, 16], "texture": "#missing"},
-				"down": {"uv": [0, 0, 0, 16], "texture": "#missing"}
-			}
-		},
-		{
-			"from": [15, 2, 13.58579],
-			"to": [15, 14, 16.58579],
-			"rotation": {"angle": 45, "axis": "y", "origin": [15, -5, 15]},
-			"faces": {
-				"north": {"uv": [0, 0, 0, 16], "texture": "#missing"},
-				"east": {"uv": [3, 4, 6, 16], "texture": "#7"},
-				"south": {"uv": [0, 0, 0, 16], "texture": "#missing"},
-				"west": {"uv": [3, 4, 6, 16], "texture": "#7"},
-				"up": {"uv": [0, 0, 0, 16], "texture": "#missing"},
-				"down": {"uv": [0, 0, 0, 16], "texture": "#missing"}
-			}
-		},
-		{
-			"from": [1, 2, 13.58579],
-			"to": [1, 14, 16.58579],
-			"rotation": {"angle": 45, "axis": "y", "origin": [1, -6, 15]},
-			"faces": {
-				"north": {"uv": [0, 0, 0, 16], "texture": "#missing"},
-				"east": {"uv": [0, 4, 3, 16], "texture": "#7"},
-				"south": {"uv": [0, 0, 0, 16], "texture": "#missing"},
-				"west": {"uv": [0, 4, 3, 16], "texture": "#7"},
-				"up": {"uv": [0, 0, 0, 16], "texture": "#missing"},
-				"down": {"uv": [0, 0, 0, 16], "texture": "#missing"}
-			}
-		},
-		{
-			"from": [1, 2, 13.58579],
-			"to": [1, 14, 16.58579],
-			"rotation": {"angle": -45, "axis": "y", "origin": [1, -6, 15]},
-			"faces": {
-				"north": {"uv": [0, 0, 0, 16], "texture": "#missing"},
-				"east": {"uv": [3, 4, 6, 16], "texture": "#7"},
-				"south": {"uv": [0, 0, 0, 16], "texture": "#missing"},
-				"west": {"uv": [3, 4, 6, 16], "texture": "#7"},
-				"up": {"uv": [0, 0, 0, 16], "texture": "#missing"},
-				"down": {"uv": [0, 0, 0, 16], "texture": "#missing"}
-			}
-		},
-		{
-			"from": [0, 14, 0],
-			"to": [16, 16, 2],
-			"rotation": {"angle": 0, "axis": "y", "origin": [0, -5, 0]},
-			"faces": {
-				"north": {"uv": [0, 0, 16, 2], "texture": "#3"},
-				"east": {"uv": [0, 0, 2, 2], "texture": "#3"},
-				"south": {"uv": [0, 0, 16, 2], "texture": "#3"},
-				"west": {"uv": [14, 0, 16, 2], "texture": "#3"},
-				"up": {"uv": [0, 0, 16, 2], "texture": "#2"},
-				"down": {"uv": [0, 0, 16, 2], "rotation": 180, "texture": "#4"}
-			}
-		},
-		{
-			"from": [0, 14, 14],
-			"to": [16, 16, 16],
-			"rotation": {"angle": 0, "axis": "y", "origin": [0, -5, 0]},
-			"faces": {
-				"north": {"uv": [0, 0, 16, 2], "texture": "#3"},
-				"east": {"uv": [14, 0, 16, 2], "texture": "#3"},
-				"south": {"uv": [0, 0, 16, 2], "texture": "#3"},
-				"west": {"uv": [0, 0, 2, 2], "texture": "#3"},
-				"up": {"uv": [0, 14, 16, 16], "texture": "#2"},
-				"down": {"uv": [0, 0, 16, 2], "texture": "#4"}
-			}
-		},
-		{
-			"from": [0, 14, 2],
-			"to": [2, 16, 14],
-			"rotation": {"angle": 0, "axis": "y", "origin": [0, -5, 0]},
-			"faces": {
-				"north": {"uv": [0, 0, 2, 2], "texture": "#missing"},
-				"east": {"uv": [2, 0, 14, 2], "texture": "#3"},
-				"south": {"uv": [0, 0, 2, 2], "texture": "#missing"},
-				"west": {"uv": [2, 0, 14, 2], "texture": "#3"},
-				"up": {"uv": [0, 2, 2, 14], "texture": "#2"},
-				"down": {"uv": [0, 2, 2, 14], "texture": "#4"}
-			}
-		},
-		{
-			"from": [14, 14, 2],
-			"to": [16, 16, 14],
-			"rotation": {"angle": 0, "axis": "y", "origin": [0, -5, 0]},
-			"faces": {
-				"north": {"uv": [0, 0, 2, 2], "texture": "#missing"},
-				"east": {"uv": [2, 0, 14, 2], "texture": "#3"},
-				"south": {"uv": [0, 0, 2, 2], "texture": "#missing"},
-				"west": {"uv": [2, 0, 14, 2], "texture": "#3"},
-				"up": {"uv": [14, 2, 16, 14], "texture": "#2"},
-				"down": {"uv": [14, 2, 16, 14], "texture": "#4"}
-			}
-		},
-		{
-			"from": [-1, 14.001, 7],
-			"to": [17, 15.999, 9],
-			"rotation": {"angle": -45, "axis": "y", "origin": [8, -5, 8]},
-			"faces": {
-				"north": {"uv": [0, 4, 16, 6], "texture": "#3"},
-				"east": {"uv": [14, 4, 16, 6], "texture": "#3"},
-				"south": {"uv": [0, 4, 16, 6], "texture": "#3"},
-				"west": {"uv": [0, 4, 2, 6], "texture": "#3"},
-				"up": {"uv": [0, 4, 16, 6], "texture": "#3"},
-				"down": {"uv": [0, 4, 16, 6], "texture": "#3"}
-			}
-		},
-		{
-			"from": [-1, 14.002, 7],
-			"to": [17, 15.998, 9],
-			"rotation": {"angle": 45, "axis": "y", "origin": [8, -5, 8]},
-			"faces": {
-				"north": {"uv": [0, 4, 16, 6], "texture": "#3"},
-				"east": {"uv": [14, 4, 16, 6], "texture": "#3"},
-				"south": {"uv": [0, 4, 16, 6], "texture": "#3"},
-				"west": {"uv": [0, 4, 2, 6], "texture": "#3"},
-				"up": {"uv": [0, 4, 16, 6], "texture": "#3"},
-				"down": {"uv": [0, 4, 16, 6], "texture": "#3"}
-			}
-		}
-	],
-	"display": {
-		"thirdperson_righthand": {
-			"translation": [0, 1.5, -1],
-			"scale": [0.3, 0.3, 0.3]
-		},
-		"thirdperson_lefthand": {
-			"translation": [0, 1.5, -1],
-			"scale": [0.3, 0.3, 0.3]
-		},
-		"firstperson_righthand": {
-			"scale": [0.6, 0.6, 0.6]
-		},
-		"firstperson_lefthand": {
-			"scale": [0.6, 0.6, 0.6]
-		},
-		"ground": {
-			"scale": [0.3, 0.3, 0.3]
-		},
-		"gui": {
-			"rotation": [30, 45, 0],
-			"translation": [0, 1, 0],
-			"scale": [0.5, 0.5, 0.5]
-		},
-		"fixed": {
-			"translation": [0, 1.75, 0],
-			"scale": [0.6, 0.6, 0.6]
-		}
-	},
-	"groups": [
-		{
-			"name": "cup",
-			"origin": [8, 8, 8],
-			"color": 0,
-			"children": [0, 1, 2, 3, 4]
-		},
-		{
-			"name": "wood",
-			"origin": [0, 0, 0],
-			"color": 0,
-			"children": [5, 6, 7, 8]
-		},
-		{
-			"name": "chains",
-			"origin": [8, 8, 8],
-			"color": 0,
-			"children": [
-				{
-					"name": "NW",
-					"origin": [1, 0, 1],
-					"color": 0,
-					"children": [9, 10]
-				},
-				{
-					"name": "NE",
-					"origin": [15, -1, 1],
-					"color": 0,
-					"children": [11, 12]
-				},
-				{
-					"name": "SE",
-					"origin": [1, 0, 1],
-					"color": 0,
-					"children": [13, 14]
-				},
-				{
-					"name": "SW",
-					"origin": [15, -1, 1],
-					"color": 0,
-					"children": [15, 16]
-				}
-			]
-		},
-		{
-			"name": "frame",
-			"origin": [8, 8, 8],
-			"color": 0,
-			"children": [17, 18, 19, 20, 21, 22]
-		}
-	]
-}

Common/src/main/resources/assets/hyperlighting/models/block/jack_o_lantern_trio.json

@@ -2,10 +2,10 @@
 	"credit": "Made with Blockbench",
 	"texture_size": [32, 32],
 	"textures": {
-		"1": "block/oak_planks",
+		"1": "minecraft:block/oak_planks",
 		"2": "hyperlighting:block/small_jack_o_lantern",
-		"3": "block/hay_block_top",
+		"3": "minecraft:block/hay_block_top",
-		"particle": "block/hay_block_top"
+		"particle": "minecraft:block/hay_block_top"
 	},
 	"elements": [
 		{
@@ -76,5 +76,84 @@
 				"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
 			]
 		}
+	}
+}

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]
+    }
+  }
+}

Common/src/main/resources/assets/hyperlighting/models/block/lantern_basic.json

@@ -2,11 +2,11 @@
 	"credit": "Made with Blockbench",
 	"textures": {
 		"1": "hyperlighting:block/grayscale_glass",
-		"2": "block/anvil",
+		"2": "minecraft:block/anvil",
-		"3": "block/anvil_top",
+		"3": "minecraft:block/anvil_top",
-		"5": "block/coal_block",
+		"5": "minecraft:block/coal_block",
-		"6": "block/candle",
+		"6": "minecraft:block/candle",
-		"particle": "block/coal_block"
+		"particle": "minecraft:block/coal_block"
 	},
 	"elements": [
 		{
@@ -313,6 +313,30 @@
 			}
 		}
 	],
+	"display": {
+		"thirdperson_righthand": {
+			"translation": [0, 3, 1],
+			"scale": [0.55, 0.55, 0.55]
+		},
+		"thirdperson_lefthand": {
+			"translation": [0, 3, 1],
+			"scale": [0.55, 0.55, 0.55]
+		},
+		"firstperson_righthand": {
+			"rotation": [0, -90, 25],
+			"translation": [1.13, 3.2, 1.13],
+			"scale": [0.68, 0.68, 0.68]
+		},
+		"firstperson_lefthand": {
+			"rotation": [0, -90, 25],
+			"translation": [1.13, 3.2, 1.13],
+			"scale": [0.68, 0.68, 0.68]
+		},
+		"ground": {
+			"translation": [0, 3, 0],
+			"scale": [0.25, 0.25, 0.25]
+		}
+	},
 	"groups": [
 		{
 			"name": "lantern",

Common/src/main/resources/assets/hyperlighting/models/block/lantern_basic_ceiling.json

@@ -2,11 +2,11 @@
 	"credit": "Made with Blockbench",
 	"textures": {
 		"1": "hyperlighting:block/grayscale_glass",
-		"2": "block/anvil",
+		"2": "minecraft:block/anvil",
-		"3": "block/anvil_top",
+		"3": "minecraft:block/anvil_top",
-		"5": "block/coal_block",
+		"5": "minecraft:block/coal_block",
-		"6": "block/candle",
+		"6": "minecraft:block/candle",
-		"particle": "block/coal_block"
+		"particle": "minecraft:block/coal_block"
 	},
 	"elements": [
 		{
@@ -313,6 +313,30 @@
 			}
 		}
 	],
+	"display": {
+		"thirdperson_righthand": {
+			"translation": [0, 3, 1],
+			"scale": [0.55, 0.55, 0.55]
+		},
+		"thirdperson_lefthand": {
+			"translation": [0, 3, 1],
+			"scale": [0.55, 0.55, 0.55]
+		},
+		"firstperson_righthand": {
+			"rotation": [0, -90, 25],
+			"translation": [1.13, 3.2, 1.13],
+			"scale": [0.68, 0.68, 0.68]
+		},
+		"firstperson_lefthand": {
+			"rotation": [0, -90, 25],
+			"translation": [1.13, 3.2, 1.13],
+			"scale": [0.68, 0.68, 0.68]
+		},
+		"ground": {
+			"translation": [0, 3, 0],
+			"scale": [0.25, 0.25, 0.25]
+		}
+	},
 	"groups": [
 		{
 			"name": "lantern",

Common/src/main/resources/assets/hyperlighting/models/block/solar_fence.json

@@ -1,85 +0,0 @@
-{
-	"credit": "Made with Blockbench",
-	"textures": {
-		"0": "block/oak_planks",
-		"1": "hyperlighting:block/solar_top",
-		"2": "hyperlighting:block/solar_bottom",
-		"particle": "block/oak_planks"
-	},
-	"elements": [
-		{
-			"from": [6, 0, 6],
-			"to": [10, 16, 10],
-			"rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]},
-			"faces": {
-				"north": {"uv": [6, 0, 10, 16], "texture": "#0"},
-				"east": {"uv": [6, 0, 10, 16], "texture": "#0"},
-				"south": {"uv": [6, 0, 10, 16], "texture": "#0"},
-				"west": {"uv": [6, 0, 10, 16], "texture": "#0"},
-				"up": {"uv": [6, 6, 10, 10], "texture": "#0"},
-				"down": {"uv": [6, 6, 10, 10], "texture": "#0"}
-			}
-		},
-		{
-			"from": [5, 16, 5],
-			"to": [11, 17, 11],
-			"rotation": {"angle": 0, "axis": "y", "origin": [8, 16, 8]},
-			"faces": {
-				"north": {"uv": [0, 0, 6, 1], "rotation": 180, "texture": "#1"},
-				"east": {"uv": [5, 0, 6, 6], "rotation": 90, "texture": "#1"},
-				"south": {"uv": [0, 5, 6, 6], "texture": "#1"},
-				"west": {"uv": [0, 0, 1, 6], "rotation": 270, "texture": "#1"},
-				"up": {"uv": [0, 0, 6, 6], "texture": "#1"},
-				"down": {"uv": [0, 0, 6, 6], "texture": "#1"}
-			}
-		},
-		{
-			"from": [4, 15, 4],
-			"to": [11, 16, 5],
-			"faces": {
-				"north": {"uv": [0, 0, 7, 1], "texture": "#2"},
-				"east": {"uv": [0, 1, 1, 3], "texture": "#2"},
-				"south": {"uv": [0, 0, 7, 1], "texture": "#2"},
-				"west": {"uv": [0, 1, 1, 3], "texture": "#2"},
-				"up": {"uv": [0, 0, 7, 1], "texture": "#2"},
-				"down": {"uv": [0, 0, 7, 1], "texture": "#2"}
-			}
-		},
-		{
-			"from": [4, 15, 11],
-			"to": [12, 16, 12],
-			"faces": {
-				"north": {"uv": [0, 15, 8, 16], "texture": "#1"},
-				"east": {"uv": [7, 15, 8, 16], "texture": "#1"},
-				"south": {"uv": [0, 15, 8, 16], "texture": "#1"},
-				"west": {"uv": [0, 15, 1, 16], "texture": "#1"},
-				"up": {"uv": [0, 15, 8, 16], "texture": "#1"},
-				"down": {"uv": [0, 15, 8, 16], "texture": "#1"}
-			}
-		},
-		{
-			"from": [4, 15, 5],
-			"to": [5, 16, 11],
-			"faces": {
-				"north": {"uv": [0, 0, 1, 2], "texture": "#2"},
-				"east": {"uv": [1, 0, 7, 1], "texture": "#2"},
-				"south": {"uv": [0, 0, 1, 2], "texture": "#2"},
-				"west": {"uv": [1, 0, 7, 1], "texture": "#2"},
-				"up": {"uv": [0, 2, 1, 8], "texture": "#2"},
-				"down": {"uv": [0, 2, 1, 8], "texture": "#2"}
-			}
-		},
-		{
-			"from": [11, 15, 4],
-			"to": [12, 16, 11],
-			"faces": {
-				"north": {"uv": [15, 0, 16, 1], "texture": "#1"},
-				"east": {"uv": [15, 0, 16, 7], "rotation": 90, "texture": "#1"},
-				"south": {"uv": [15, 6, 16, 7], "texture": "#1"},
-				"west": {"uv": [15, 0, 16, 7], "rotation": 270, "texture": "#1"},
-				"up": {"uv": [15, 0, 16, 7], "texture": "#1"},
-				"down": {"uv": [15, 0, 16, 7], "rotation": 180, "texture": "#1"}
-			}
-		}
-	]
-}

Common/src/main/resources/assets/hyperlighting/models/block/solar_neon.json

@@ -46,10 +46,33 @@
 			}
 		}
 	],
+	"display": {
+		"thirdperson_righthand": {
+			"translation": [0, 3, 1],
+			"scale": [0.55, 0.55, 0.55]
+		},
+		"thirdperson_lefthand": {
+			"translation": [0, 3, 1],
+			"scale": [0.55, 0.55, 0.55]
+		},
+		"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]
+		}
+	},
 	"groups": [
 		{
 			"name": "group",
 			"origin": [10, 9, 15],
+			"color": 0,
 			"children": [0, 1, 2]
 		}
 	]

Common/src/main/resources/assets/hyperlighting/models/block/solar_panel.json

@@ -18,5 +18,32 @@
 				"down": {"uv": [0, 8, 16, 16], "texture": "#0"}
 			}
 		}
-	]
+	],
+	"display": {
+		"thirdperson_righthand": {
+			"translation": [0, 3.75, 0],
+			"scale": [0.5, 0.5, 0.5]
+		},
+		"thirdperson_lefthand": {
+			"translation": [0, 3.75, 0],
+			"scale": [0.5, 0.5, 0.5]
+		},
+		"firstperson_righthand": {
+			"rotation": [56, 0, 0]
+		},
+		"firstperson_lefthand": {
+			"rotation": [56, 0, 0]
+		},
+		"ground": {
+			"translation": [0, 3, 0],
+			"scale": [0.25, 0.25, 0.25]
+		},
+		"gui": {
+			"rotation": [90, 0, 0]
+		},
+		"fixed": {
+			"rotation": [-90, 0, 0],
+			"translation": [0, 0, -7.5]
+		}
+	}
 }

Common/src/main/resources/assets/hyperlighting/models/block/tiki_stick.json

@@ -1,21 +0,0 @@
-{
-	"credit": "Made with Blockbench",
-	"textures": {
-		"0": "block/bamboo_block",
-		"particle": "block/bamboo_block"
-	},
-	"elements": [
-		{
-			"from": [7, 0, 7],
-			"to": [9, 16, 9],
-			"faces": {
-				"north": {"uv": [0, 0, 2, 16], "texture": "#0"},
-				"east": {"uv": [2, 0, 4, 16], "texture": "#0"},
-				"south": {"uv": [4, 0, 6, 16], "texture": "#0"},
-				"west": {"uv": [6, 0, 8, 16], "texture": "#0"},
-				"up": {"uv": [0, 0, 2, 2], "texture": "#0"},
-				"down": {"uv": [0, 0, 2, 2], "texture": "#0"}
-			}
-		}
-	]
-}

Common/src/main/resources/assets/hyperlighting/models/block/tiki_torch.json

@@ -1,96 +0,0 @@
-{
-	"credit": "Made with Blockbench",
-	"textures": {
-		"0": "block/bamboo_block",
-		"1": "block/stripped_bamboo_block",
-		"2": "block/coal_block",
-		"3": "block/bamboo_large_leaves",
-		"particle": "block/bamboo_block"
-	},
-	"elements": [
-		{
-			"from": [7, 0, 7],
-			"to": [9, 5, 9],
-			"faces": {
-				"north": {"uv": [0, 9, 2, 16], "texture": "#0"},
-				"east": {"uv": [2, 9, 4, 16], "texture": "#0"},
-				"south": {"uv": [4, 9, 6, 16], "texture": "#0"},
-				"west": {"uv": [6, 9, 8, 16], "texture": "#0"},
-				"up": {"uv": [0, 0, 2, 2], "texture": "#0"},
-				"down": {"uv": [0, 0, 2, 2], "texture": "#0"}
-			}
-		},
-		{
-			"from": [6, 7, 6],
-			"to": [10, 10, 10],
-			"faces": {
-				"north": {"uv": [0, 0, 4, 3], "texture": "#2"},
-				"east": {"uv": [0, 0, 4, 3], "texture": "#2"},
-				"south": {"uv": [0, 0, 4, 3], "texture": "#2"},
-				"west": {"uv": [0, 0, 4, 3], "texture": "#2"},
-				"up": {"uv": [0, 0, 4, 4], "texture": "#2"},
-				"down": {"uv": [0, 0, 4, 4], "texture": "#2"}
-			}
-		},
-		{
-			"from": [6, 11, 6],
-			"to": [10, 12, 10],
-			"faces": {
-				"north": {"uv": [0, 0, 4, 1], "texture": "#2"},
-				"east": {"uv": [0, 0, 4, 1], "texture": "#2"},
-				"south": {"uv": [0, 0, 4, 1], "texture": "#2"},
-				"west": {"uv": [0, 0, 4, 1], "texture": "#2"},
-				"up": {"uv": [0, 0, 4, 4], "texture": "#2"},
-				"down": {"uv": [0, 0, 4, 4], "texture": "#2"}
-			}
-		},
-		{
-			"from": [6, 6, 6],
-			"to": [10, 7, 10],
-			"faces": {
-				"north": {"uv": [2, 1, 6, 2], "texture": "#3"},
-				"east": {"uv": [6, 1, 10, 2], "texture": "#3"},
-				"south": {"uv": [2, 2, 6, 3], "texture": "#3"},
-				"west": {"uv": [6, 2, 10, 3], "texture": "#3"},
-				"up": {"uv": [2, 5, 6, 9], "texture": "#3"},
-				"down": {"uv": [2, 5, 6, 9], "texture": "#3"}
-			}
-		},
-		{
-			"from": [6, 10, 6],
-			"to": [10, 11, 10],
-			"faces": {
-				"north": {"uv": [2, 1, 6, 2], "texture": "#3"},
-				"east": {"uv": [6, 1, 10, 2], "texture": "#3"},
-				"south": {"uv": [2, 2, 6, 3], "texture": "#3"},
-				"west": {"uv": [6, 2, 10, 3], "texture": "#3"},
-				"up": {"uv": [2, 5, 6, 9], "texture": "#3"},
-				"down": {"uv": [2, 5, 6, 9], "texture": "#3"}
-			}
-		},
-		{
-			"from": [7, 12, 7],
-			"to": [9, 13, 9],
-			"faces": {
-				"north": {"uv": [0, 0, 2, 1], "texture": "#1"},
-				"east": {"uv": [0, 0, 2, 1], "texture": "#1"},
-				"south": {"uv": [0, 0, 2, 1], "texture": "#1"},
-				"west": {"uv": [0, 0, 2, 1], "texture": "#1"},
-				"up": {"uv": [0, 0, 2, 2], "texture": "#1"},
-				"down": {"uv": [0, 0, 2, 2], "texture": "#1"}
-			}
-		},
-		{
-			"from": [7, 5, 7],
-			"to": [9, 6, 9],
-			"faces": {
-				"north": {"uv": [8, 1, 10, 2], "texture": "#3"},
-				"east": {"uv": [6, 1, 8, 2], "texture": "#3"},
-				"south": {"uv": [4, 1, 6, 2], "texture": "#3"},
-				"west": {"uv": [2, 1, 4, 2], "texture": "#3"},
-				"up": {"uv": [2, 2, 4, 4], "texture": "#3"},
-				"down": {"uv": [2, 2, 4, 4], "texture": "#3"}
-			}
-		}
-	]
-}

Common/src/main/resources/assets/hyperlighting/models/block/torch_base.json

@@ -31,5 +31,29 @@
 				"down": {"uv": [7, 14, 9, 16], "texture": "#1"}
 			}
 		}
-	]
+	],
+	"display": {
+		"thirdperson_righthand": {
+			"translation": [0, 3, 1],
+			"scale": [0.55, 0.55, 0.55]
+		},
+		"thirdperson_lefthand": {
+			"translation": [0, 3, 1],
+			"scale": [0.55, 0.55, 0.55]
+		},
+		"firstperson_righthand": {
+			"rotation": [0, -90, 25],
+			"translation": [1.13, 3.2, 1.13],
+			"scale": [0.68, 0.68, 0.68]
+		},
+		"firstperson_lefthand": {
+			"rotation": [0, -90, 25],
+			"translation": [1.13, 3.2, 1.13],
+			"scale": [0.68, 0.68, 0.68]
+		},
+		"ground": {
+			"translation": [0, 3, 0],
+			"scale": [0.25, 0.25, 0.25]
+		}
+	}
 }

Common/src/main/resources/assets/hyperlighting/models/item/advanced_candle.json

@@ -1,5 +1,5 @@
 {
-  "parent": "hyperlighting:block/candle_base",
+  "parent": "hyperlighting:block/advanced_candle_base",
   "overrides": [
     { "predicate": { "color": 0 }, "model": "hyperlighting:block/candle/white_candle" },
     { "predicate": { "color": 1 }, "model": "hyperlighting:block/candle/orange_candle" },

Common/src/main/resources/assets/hyperlighting/models/item/pumpkin_trio.json

@@ -0,0 +1,3 @@
+{
+  "parent": "hyperlighting:block/jack_o_lantern_trio"
+}

Common/src/main/resources/assets/hyperlighting/models/item/pumpkin_trio_inverted.json

@@ -0,0 +1,3 @@
+{
+  "parent": "hyperlighting:block/jack_o_lantern_trio_inverted"
+}

Common/src/main/resources/data/hyperlighting/recipes/advanced_candle.json

@@ -0,0 +1,22 @@
+{
+  "type": "minecraft:crafting_shaped",
+  "category": "misc",
+  "key": {
+    "H": {
+      "item": "minecraft:honeycomb"
+    },
+    "S": {
+      "item": "minecraft:string"
+    }
+  },
+  "pattern": [
+    "S",
+    "H",
+    "H"
+  ],
+  "result": {
+    "item": "hyperlighting:advanced_candle",
+    "count": 2
+  },
+  "show_notification": true
+}

Common/src/main/resources/data/hyperlighting/recipes/pumpkin_trio.json

@@ -0,0 +1,21 @@
+{
+  "type": "minecraft:crafting_shaped",
+  "key": {
+    "C": {
+      "item": "minecraft:hay_block"
+    },
+    "Y": {
+      "item": "minecraft:pumpkin"
+    }
+  },
+  "pattern": [
+    "Y Y",
+    " Y ",
+    "CCC"
+  ],
+  "result": {
+    "item": "hyperlighting:pumpkin_trio",
+    "count": 3
+  },
+  "show_notification": true
+}

Common/src/main/resources/data/hyperlighting/recipes/pumpkin_trio_inverted.json

@@ -0,0 +1,21 @@
+{
+  "type": "minecraft:crafting_shaped",
+  "key": {
+    "C": {
+      "item": "minecraft:hay_block"
+    },
+    "Y": {
+      "item": "minecraft:pumpkin"
+    }
+  },
+  "pattern": [
+    "CCC",
+    " Y ",
+    "Y Y"
+  ],
+  "result": {
+    "item": "hyperlighting:pumpkin_trio_inverted",
+    "count": 3
+  },
+  "show_notification": true
+}

Forge/src/main/java/me/hypherionmc/hyperlighting/common/integration/top/overrides/TOPCampfireInfoProvider.java

@@ -43,7 +43,7 @@ public class TOPCampfireInfoProvider implements IBlockDisplayOverride {
                                 .item(stack)
                                 .horizontal()
                                 .progress(
-                                        (int) ((float) tileCampFire.cookingTime[i] / tileCampFire.cookingProgress[i] * 100),
+                                        (int) ((float) tileCampFire.cookingProgress[i] / tileCampFire.cookingTime[i] * 100),
                                         100,
                                         iProbeInfo.defaultProgressStyle().suffix(" %").alignment(ElementAlignment.ALIGN_TOPLEFT));
                     }

gradle.properties

@@ -28,7 +28,7 @@ org.gradle.jvmargs=-Xmx3G
 org.gradle.daemon=false
 
 #dependencies
-craterlib_version=0.0.6d
+craterlib_version=0.0.9d
 mod_menu_version=6.1.0-rc.4
 //shimmer_version=0.1.12
 //sodium_version=3957319