Skip to content

Commit 3c8c12f

Browse files
committed
fixes
1 parent 7d3be82 commit 3c8c12f

File tree

5 files changed

+25
-7
lines changed

5 files changed

+25
-7
lines changed

src/main/java/com/mrh0/createaddition/CreateAddition.java

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@
2929
import net.neoforged.fml.ModList;
3030
import net.neoforged.fml.common.Mod;
3131
import net.neoforged.fml.config.ModConfig;
32+
import net.neoforged.fml.event.config.ModConfigEvent;
3233
import net.neoforged.fml.event.lifecycle.FMLClientSetupEvent;
3334
import net.neoforged.fml.event.lifecycle.FMLLoadCompleteEvent;
3435
import net.neoforged.fml.loading.FMLPaths;
@@ -98,7 +99,7 @@ public CreateAddition(IEventBus eventBus, ModContainer container) {
9899
//MinecraftForge.EVENT_BUS.register(this);
99100

100101
container.registerConfig(ModConfig.Type.COMMON, CommonConfig.COMMON_CONFIG);
101-
CommonConfig.loadConfig(CommonConfig.COMMON_CONFIG, FMLPaths.CONFIGDIR.get().resolve("createaddition-common.toml"));
102+
//
102103

103104
IE_ACTIVE = ModList.get().isLoaded("immersiveengineering");
104105
CC_ACTIVE = ModList.get().isLoaded("computercraft");
@@ -161,6 +162,11 @@ public void onRegisterCommandEvent(RegisterCommandsEvent event) {
161162
CCApiCommand.register(dispather);
162163
}
163164

165+
@SubscribeEvent
166+
public static void onLoad(ModConfigEvent.Loading event) {
167+
CommonConfig.loadConfig(CommonConfig.COMMON_CONFIG, FMLPaths.CONFIGDIR.get().resolve("createaddition-common.toml"));
168+
}
169+
164170
private static final String PROTOCOL = "1";
165171
@SubscribeEvent
166172
public static void register(final RegisterPayloadHandlersEvent event) {

src/main/java/com/mrh0/createaddition/blocks/liquid_blaze_burner/LiquidBlazeBurnerBlock.java

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,20 @@ protected MapCodec<? extends HorizontalDirectionalBlock> codec() {
5757
return CODEC;
5858
}
5959

60+
public static BlazeBurnerBlock.HeatLevel getHeatLevelOf(BlockState blockState) {
61+
return blockState.hasProperty(HEAT_LEVEL) ? blockState.getValue(HEAT_LEVEL)
62+
: BlazeBurnerBlock.HeatLevel.NONE;
63+
}
64+
65+
public static int getLight(BlockState state) {
66+
BlazeBurnerBlock.HeatLevel level = state.getValue(HEAT_LEVEL);
67+
return switch (level) {
68+
case NONE -> 0;
69+
case SMOULDERING -> 8;
70+
default -> 15;
71+
};
72+
}
73+
6074
@Override
6175
protected void createBlockStateDefinition(Builder<Block, BlockState> builder) {
6276
super.createBlockStateDefinition(builder);

src/main/java/com/mrh0/createaddition/config/CommonConfig.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@
33
import com.electronwill.nightconfig.core.file.CommentedFileConfig;
44
import com.electronwill.nightconfig.core.io.WritingMode;
55

6+
import net.neoforged.fml.ModLoadingContext;
7+
import net.neoforged.fml.config.ModConfig;
68
import net.neoforged.neoforge.common.ModConfigSpec;
79

810
public class CommonConfig {
@@ -231,7 +233,6 @@ public class CommonConfig {
231233
COMMON_CONFIG = COMMON_BUILDER.build();
232234
}
233235

234-
235236
// What does this do? Just Load? If yes why not use onLoad event
236237
public static void loadConfig(ModConfigSpec spec, java.nio.file.Path path) {
237238
final CommentedFileConfig configData = CommentedFileConfig.builder(path)

src/main/java/com/mrh0/createaddition/index/CABlocks.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,7 @@ public class CABlocks {
166166
public static final BlockEntry<LiquidBlazeBurnerBlock> LIQUID_BLAZE_BURNER = CreateAddition.REGISTRATE.block("liquid_blaze_burner", LiquidBlazeBurnerBlock::new)
167167
.initialProperties(SharedProperties::softMetal)
168168
.properties(p -> p.mapColor(DyeColor.GRAY))
169-
.properties(p -> p.lightLevel(BlazeBurnerBlock::getLight))
169+
.properties(p -> p.lightLevel(LiquidBlazeBurnerBlock::getLight))
170170
.transform(pickaxeOnly())
171171
.addLayer(() -> RenderType::cutoutMipped)
172172
.blockstate((c, p) -> p.simpleBlock(c.getEntry(), AssetLookup.partialBaseModel(c, p)))

src/main/java/com/mrh0/createaddition/item/DiamondGritSandpaper.java

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,16 +14,13 @@
1414

1515

1616
public class DiamondGritSandpaper extends SandPaperItem {
17-
18-
private static final int USES = CommonConfig.DIAMOND_GRIT_SANDPAPER_USES.get();
19-
2017
public DiamondGritSandpaper(Properties properties) {
2118
super(properties);
2219
}
2320

2421
@Override
2522
public int getMaxDamage(ItemStack stack) {
26-
return USES;
23+
return CommonConfig.DIAMOND_GRIT_SANDPAPER_USES.get();
2724
}
2825

2926
// This needs to be redone OnlyIn is never recommended

0 commit comments

Comments
 (0)