diff --git a/src/main/java/com/thebrokenrail/energonrelics/block/DefensiveLaserBlock.java b/src/main/java/com/thebrokenrail/energonrelics/block/DefensiveLaserBlock.java index 6d73b0f..b00cecb 100644 --- a/src/main/java/com/thebrokenrail/energonrelics/block/DefensiveLaserBlock.java +++ b/src/main/java/com/thebrokenrail/energonrelics/block/DefensiveLaserBlock.java @@ -8,8 +8,7 @@ import net.fabricmc.api.Environment; import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings; import net.minecraft.block.Block; import net.minecraft.block.BlockState; -import net.minecraft.block.Material; -import net.minecraft.block.MaterialColor; +import net.minecraft.block.Blocks; import net.minecraft.block.entity.BlockEntity; import net.minecraft.block.entity.BlockEntityType; import net.minecraft.client.render.block.entity.BlockEntityRenderDispatcher; @@ -27,7 +26,7 @@ public class DefensiveLaserBlock extends EnergyProviderBlock { public static final BooleanProperty POWERED = Properties.POWERED; public DefensiveLaserBlock() { - super(FabricBlockSettings.of(Material.STONE, MaterialColor.BLACK).sounds(BlockSoundGroup.GLASS).requiresTool().strength(50.0F, 1200.0F).nonOpaque().allowsSpawning((state, world, pos, type) -> false).solidBlock((state, world, pos) -> false).suffocates((state, world, pos) -> false).lightLevel(state -> state.get(POWERED) ? 7 : 0)); + super(FabricBlockSettings.copy(Blocks.OBSIDIAN).sounds(BlockSoundGroup.GLASS).nonOpaque().allowsSpawning((state, world, pos, type) -> false).solidBlock((state, world, pos) -> false).suffocates((state, world, pos) -> false).lightLevel(state -> state.get(POWERED) ? 7 : 0)); setDefaultState(getDefaultState().with(POWERED, false)); } diff --git a/src/main/java/com/thebrokenrail/energonrelics/block/entity/reactor/ReactorControllerBlockEntity.java b/src/main/java/com/thebrokenrail/energonrelics/block/entity/reactor/ReactorControllerBlockEntity.java index 13be87f..a93a0fb 100644 --- a/src/main/java/com/thebrokenrail/energonrelics/block/entity/reactor/ReactorControllerBlockEntity.java +++ b/src/main/java/com/thebrokenrail/energonrelics/block/entity/reactor/ReactorControllerBlockEntity.java @@ -9,6 +9,7 @@ import com.thebrokenrail.energonrelics.energy.helper.EnergyGeneratorBlockEntity; import net.minecraft.block.BlockState; import net.minecraft.block.entity.BlockEntity; import net.minecraft.block.entity.BlockEntityType; +import net.minecraft.item.Item; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.Direction; @@ -35,17 +36,26 @@ public class ReactorControllerBlockEntity extends EnergyGeneratorBlockEntity { if (getCachedState().get(ReactorControllerBlock.POWERED)) { Reactor reactor = getReactor(); if (reactor != null && !reactor.core.isReacting()) { - boolean foundFuel = false; + int fuelMultiplier = 0; for (ReactorInputBlockEntity input : reactor.inputs) { + if (fuelMultiplier != 0) { + break; + } for (int i = 0; i < input.size(); i++) { - if (input.getStack(i).getItem() == EnergonRelics.VERIDIUM_INGOT_ITEM) { - foundFuel = true; + Item item = input.getStack(i).getItem(); + if (item == EnergonRelics.VERIDIUM_INGOT_ITEM) { + fuelMultiplier = 1; + } else if (item == EnergonRelics.VERIDIUM_BLOCK_BLOCK.asItem()) { + fuelMultiplier = 9; + } + if (fuelMultiplier != 0) { input.removeStack(i, 1); + break; } } } - if (foundFuel) { - reactor.core.startReaction(); + if (fuelMultiplier != 0) { + reactor.core.startReaction(fuelMultiplier); } } } diff --git a/src/main/java/com/thebrokenrail/energonrelics/block/entity/reactor/ReactorCoreBlockEntity.java b/src/main/java/com/thebrokenrail/energonrelics/block/entity/reactor/ReactorCoreBlockEntity.java index c61bdb2..610c361 100644 --- a/src/main/java/com/thebrokenrail/energonrelics/block/entity/reactor/ReactorCoreBlockEntity.java +++ b/src/main/java/com/thebrokenrail/energonrelics/block/entity/reactor/ReactorCoreBlockEntity.java @@ -31,8 +31,8 @@ public class ReactorCoreBlockEntity extends BlockEntity implements Tickable { return reactionTime > 0; } - void startReaction() { - reactionTime = HardcodedConfig.REACTOR_TIME; + void startReaction(int fuelMultiplier) { + reactionTime = HardcodedConfig.REACTOR_TIME * fuelMultiplier; } @Override