diff --git a/Common/src/main/java/me/hypherionmc/hyperlighting/client/config/HyperLightingClientConfig.java b/Common/src/main/java/me/hypherionmc/hyperlighting/client/config/HyperLightingClientConfig.java index 4391421..9c8732b 100644 --- a/Common/src/main/java/me/hypherionmc/hyperlighting/client/config/HyperLightingClientConfig.java +++ b/Common/src/main/java/me/hypherionmc/hyperlighting/client/config/HyperLightingClientConfig.java @@ -1,4 +1,4 @@ -package me.hypherionmc.hyperlighting.common.config; +package me.hypherionmc.hyperlighting.client.config; import me.hypherionmc.craterlib.common.config.ModuleConfig; import me.hypherionmc.craterlib.common.config.annotations.SubConfig; @@ -24,16 +24,13 @@ public class HyperLightingClientConfig extends ModuleConfig { @SubConfig public CampfireConfig campfireConfig = new CampfireConfig(); - public HyperLightingClientConfig() { - super(Constants.MOD_ID, "hyperlighting-client"); @Path("candleConfig") @SpecComment("Candle Configuration") @SubConfig public CandleConfig candleConfig = new CandleConfig(); - public HyperLightingConfig() { - super(Constants.MOD_ID, "hyperlighting-common"); - registerAndSetup(this); + public HyperLightingClientConfig() { + super(Constants.MOD_ID, "hyperlighting-client"); } @Override diff --git a/Common/src/main/java/me/hypherionmc/hyperlighting/common/blocks/AdvancedCandleBlock.java b/Common/src/main/java/me/hypherionmc/hyperlighting/common/blocks/AdvancedCandleBlock.java index 3b6cdfe..4295660 100644 --- a/Common/src/main/java/me/hypherionmc/hyperlighting/common/blocks/AdvancedCandleBlock.java +++ b/Common/src/main/java/me/hypherionmc/hyperlighting/common/blocks/AdvancedCandleBlock.java @@ -71,7 +71,7 @@ public class AdvancedCandleBlock extends HorizontalDirectionalBlock implements D public AdvancedCandleBlock(String name, DyeColor color, CreativeModeTab tab) { super(Properties.of(Material.WOOD).noCollission().instabreak().lightLevel(BlockStateUtils.createLightLevelFromLitBlockState(15))); - this.registerDefaultState(this.defaultBlockState().setValue(FACING, Direction.NORTH).setValue(LIT, CommonRegistration.config.torchConfig.litByDefault).setValue(COLOR, color)); + this.registerDefaultState(this.defaultBlockState().setValue(FACING, Direction.NORTH).setValue(LIT, CommonRegistration.config.candleConfig.litByDefault).setValue(COLOR, color)); this.color = color; HLItems.register(name, () -> new BlockItemDyable(this, new Item.Properties().tab(tab))); @@ -101,7 +101,7 @@ public class AdvancedCandleBlock extends HorizontalDirectionalBlock implements D } else { state = state.setValue(ATTACH_FACE, AttachFace.WALL).setValue(FACING, direction); } - return state.setValue(LIT, CommonRegistration.config.torchConfig.litByDefault); + return state.setValue(LIT, CommonRegistration.config.candleConfig.litByDefault); } @Override @@ -160,7 +160,7 @@ public class AdvancedCandleBlock extends HorizontalDirectionalBlock implements D player.setItemInHand(handIn, stack); } return InteractionResult.CONSUME; - } else if (!CommonRegistration.config.torchConfig.requiresTool) { + } else if (!CommonRegistration.config.candleConfig.requiresTool) { state = state.cycle(LIT); level.setBlock(pos, state, 3); level.sendBlockUpdated(pos, state, state, 3); @@ -214,4 +214,4 @@ public class AdvancedCandleBlock extends HorizontalDirectionalBlock implements D public List getDrops(BlockState blockState, LootContext.Builder lootBuilder) { return List.of(StackUtil.getColorStack(this, blockState.getValue(COLOR))); } -} \ No newline at end of file +}