firstdarkdev/Hyper-Lighting2
1
0
Fork 0
Code Issues 1 Pull Requests Activity

Fix Merge Conflicts with Zenith's commit

Browse Source
This commit is contained in:
HypherionSA
2022-08-27 20:47:48 +02:00
parent e1b7ae442c
commit 7dc5e660e7
2 changed files with 7 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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.ModuleConfig;
import me.hypherionmc.craterlib.common.config.annotations.SubConfig; import me.hypherionmc.craterlib.common.config.annotations.SubConfig;
@@ -24,16 +24,13 @@ public class HyperLightingClientConfig extends ModuleConfig {
@SubConfig @SubConfig
public CampfireConfig campfireConfig = new CampfireConfig(); public CampfireConfig campfireConfig = new CampfireConfig();
public HyperLightingClientConfig() {
super(Constants.MOD_ID, "hyperlighting-client");
@Path("candleConfig") @Path("candleConfig")
@SpecComment("Candle Configuration") @SpecComment("Candle Configuration")
@SubConfig @SubConfig
public CandleConfig candleConfig = new CandleConfig(); public CandleConfig candleConfig = new CandleConfig();
public HyperLightingConfig() { public HyperLightingClientConfig() {
super(Constants.MOD_ID, "hyperlighting-common"); super(Constants.MOD_ID, "hyperlighting-client");
registerAndSetup(this);
} }
@Override @Override

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

@@ -71,7 +71,7 @@ public class AdvancedCandleBlock extends HorizontalDirectionalBlock implements D
public AdvancedCandleBlock(String name, DyeColor color, CreativeModeTab tab) { public AdvancedCandleBlock(String name, DyeColor color, CreativeModeTab tab) {
super(Properties.of(Material.WOOD).noCollission().instabreak().lightLevel(BlockStateUtils.createLightLevelFromLitBlockState(15))); 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; this.color = color;
HLItems.register(name, () -> new BlockItemDyable(this, new Item.Properties().tab(tab))); HLItems.register(name, () -> new BlockItemDyable(this, new Item.Properties().tab(tab)));
@@ -101,7 +101,7 @@ public class AdvancedCandleBlock extends HorizontalDirectionalBlock implements D
} else { } else {
state = state.setValue(ATTACH_FACE, AttachFace.WALL).setValue(FACING, direction); 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 @Override
@@ -160,7 +160,7 @@ public class AdvancedCandleBlock extends HorizontalDirectionalBlock implements D
player.setItemInHand(handIn, stack); player.setItemInHand(handIn, stack);
} }
return InteractionResult.CONSUME; return InteractionResult.CONSUME;
} else if (!CommonRegistration.config.torchConfig.requiresTool) { } else if (!CommonRegistration.config.candleConfig.requiresTool) {
state = state.cycle(LIT); state = state.cycle(LIT);
level.setBlock(pos, state, 3); level.setBlock(pos, state, 3);
level.sendBlockUpdated(pos, state, state, 3); level.sendBlockUpdated(pos, state, state, 3);
@@ -214,4 +214,4 @@ public class AdvancedCandleBlock extends HorizontalDirectionalBlock implements D
public List<ItemStack> getDrops(BlockState blockState, LootContext.Builder lootBuilder) { public List<ItemStack> getDrops(BlockState blockState, LootContext.Builder lootBuilder) {
return List.of(StackUtil.getColorStack(this, blockState.getValue(COLOR))); return List.of(StackUtil.getColorStack(this, blockState.getValue(COLOR)));
} }
} }