From 6715cbeb85aa732ce01b30d2153c79d039b51971 Mon Sep 17 00:00:00 2001 From: Sean <38871906+seancrain@users.noreply.github.com> Date: Sun, 5 Apr 2026 14:13:43 -0500 Subject: [PATCH] Fix for Framed Blocks --- .../common/block/BlockElectromagneticBooster.java | 4 ++-- .../common/block/BlockElectromagneticDiode.java | 4 ++-- .../common/block/BlockElectromagneticSwitch.java | 4 ++-- .../java/nuclearscience/common/block/BlockMeltedReactor.java | 4 ++-- src/main/java/nuclearscience/common/block/BlockPlasma.java | 4 ++-- .../java/nuclearscience/common/block/BlockRadioactiveAir.java | 3 ++- src/main/java/nuclearscience/common/block/BlockTurbine.java | 4 ++-- .../common/block/connect/BlockMoltenSaltPipe.java | 4 ++-- .../common/block/connect/BlockReactorLogisticsCable.java | 4 ++-- 9 files changed, 18 insertions(+), 17 deletions(-) diff --git a/src/main/java/nuclearscience/common/block/BlockElectromagneticBooster.java b/src/main/java/nuclearscience/common/block/BlockElectromagneticBooster.java index 67b68463..3aee019e 100644 --- a/src/main/java/nuclearscience/common/block/BlockElectromagneticBooster.java +++ b/src/main/java/nuclearscience/common/block/BlockElectromagneticBooster.java @@ -8,7 +8,6 @@ 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.Blocks; import net.minecraft.world.level.block.Mirror; import net.minecraft.world.level.block.Rotation; import net.minecraft.world.level.block.state.BlockState; @@ -19,13 +18,14 @@ import nuclearscience.common.block.states.NuclearScienceBlockStates; import nuclearscience.common.block.states.facing.FacingDirection; import voltaic.common.block.states.VoltaicBlockStates; +import voltaic.common.block.states.VoltaicMaterials; import voltaic.prefab.tile.IWrenchable; public class BlockElectromagneticBooster extends Block implements IWrenchable { public BlockElectromagneticBooster() { - super(Blocks.GLASS.properties().strength(3.5f, 20).requiresCorrectToolForDrops().noOcclusion().isRedstoneConductor((x, y, z) -> false)); + super(VoltaicMaterials.glass().strength(3.5f, 20).requiresCorrectToolForDrops().noOcclusion().isRedstoneConductor((x, y, z) -> false)); registerDefaultState(stateDefinition.any().setValue(VoltaicBlockStates.FACING, Direction.NORTH).setValue(NuclearScienceBlockStates.FACINGDIRECTION, FacingDirection.NONE)); } diff --git a/src/main/java/nuclearscience/common/block/BlockElectromagneticDiode.java b/src/main/java/nuclearscience/common/block/BlockElectromagneticDiode.java index c821f187..7130dc4c 100644 --- a/src/main/java/nuclearscience/common/block/BlockElectromagneticDiode.java +++ b/src/main/java/nuclearscience/common/block/BlockElectromagneticDiode.java @@ -10,7 +10,6 @@ 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.Blocks; import net.minecraft.world.level.block.Mirror; import net.minecraft.world.level.block.Rotation; import net.minecraft.world.level.block.state.BlockState; @@ -19,6 +18,7 @@ import net.minecraft.world.phys.shapes.Shapes; import net.minecraft.world.phys.shapes.VoxelShape; import voltaic.common.block.states.VoltaicBlockStates; +import voltaic.common.block.states.VoltaicMaterials; import voltaic.prefab.tile.IWrenchable; public class BlockElectromagneticDiode extends Block implements IWrenchable { @@ -26,7 +26,7 @@ public class BlockElectromagneticDiode extends Block implements IWrenchable { private static final VoxelShape SHAPE = Shapes.box(0, 0, 0, 1.0, 2.0 / 16.0, 1.0); public BlockElectromagneticDiode() { - super(Blocks.IRON_BLOCK.properties().strength(3.5f, 20).requiresCorrectToolForDrops().noOcclusion().isRedstoneConductor((p1, p2, p3) -> false)); + super(VoltaicMaterials.metal().strength(3.5f, 20).requiresCorrectToolForDrops().noOcclusion().isRedstoneConductor((p1, p2, p3) -> false)); registerDefaultState(stateDefinition.any().setValue(VoltaicBlockStates.FACING, Direction.NORTH)); } diff --git a/src/main/java/nuclearscience/common/block/BlockElectromagneticSwitch.java b/src/main/java/nuclearscience/common/block/BlockElectromagneticSwitch.java index b59874dc..a14fccf3 100644 --- a/src/main/java/nuclearscience/common/block/BlockElectromagneticSwitch.java +++ b/src/main/java/nuclearscience/common/block/BlockElectromagneticSwitch.java @@ -6,11 +6,11 @@ import net.minecraft.world.level.BlockGetter; import net.minecraft.world.level.block.BaseEntityBlock; import net.minecraft.world.level.block.Block; -import net.minecraft.world.level.block.Blocks; import net.minecraft.world.level.block.state.BlockState; import net.minecraft.world.phys.shapes.CollisionContext; import net.minecraft.world.phys.shapes.Shapes; import net.minecraft.world.phys.shapes.VoxelShape; +import voltaic.common.block.states.VoltaicMaterials; public class BlockElectromagneticSwitch extends Block { private static final VoxelShape SHAPE = Shapes.box(0, 0, 0, 1.0, 2.0 / 16.0, 1.0); @@ -21,7 +21,7 @@ public VoxelShape getShape(BlockState state, BlockGetter worldIn, BlockPos pos, } public BlockElectromagneticSwitch() { - super(Blocks.IRON_BLOCK.properties().strength(3.5f, 20).requiresCorrectToolForDrops().noOcclusion().isRedstoneConductor((p1, p2, p3) -> false)); + super(VoltaicMaterials.metal().strength(3.5f, 20).requiresCorrectToolForDrops().noOcclusion().isRedstoneConductor((p1, p2, p3) -> false)); } @Override diff --git a/src/main/java/nuclearscience/common/block/BlockMeltedReactor.java b/src/main/java/nuclearscience/common/block/BlockMeltedReactor.java index 4fcfb329..e5e407a0 100644 --- a/src/main/java/nuclearscience/common/block/BlockMeltedReactor.java +++ b/src/main/java/nuclearscience/common/block/BlockMeltedReactor.java @@ -4,17 +4,17 @@ import net.minecraft.core.BlockPos; import net.minecraft.world.level.block.BaseEntityBlock; -import net.minecraft.world.level.block.Blocks; import net.minecraft.world.level.block.SoundType; import net.minecraft.world.level.block.entity.BlockEntity; import net.minecraft.world.level.block.state.BlockState; import nuclearscience.common.tile.reactor.fission.TileMeltedReactor; +import voltaic.common.block.states.VoltaicMaterials; import voltaic.prefab.block.GenericEntityBlockWaterloggable; public class BlockMeltedReactor extends GenericEntityBlockWaterloggable { public BlockMeltedReactor() { - super(Blocks.IRON_BLOCK.properties().strength(250.0f, 999.0f).sound(SoundType.METAL).requiresCorrectToolForDrops().noOcclusion()); + super(VoltaicMaterials.metal().strength(250.0f, 999.0f).sound(SoundType.METAL).requiresCorrectToolForDrops().noOcclusion()); } @Override diff --git a/src/main/java/nuclearscience/common/block/BlockPlasma.java b/src/main/java/nuclearscience/common/block/BlockPlasma.java index 42fa6cac..146e4a92 100644 --- a/src/main/java/nuclearscience/common/block/BlockPlasma.java +++ b/src/main/java/nuclearscience/common/block/BlockPlasma.java @@ -8,7 +8,6 @@ import net.minecraft.world.level.BlockGetter; import net.minecraft.world.level.Level; import net.minecraft.world.level.block.BaseEntityBlock; -import net.minecraft.world.level.block.Blocks; import net.minecraft.world.level.block.SoundType; import net.minecraft.world.level.block.entity.BlockEntity; import net.minecraft.world.level.block.state.BlockState; @@ -17,12 +16,13 @@ import net.minecraft.world.phys.shapes.VoxelShape; import nuclearscience.common.tile.reactor.fusion.TilePlasma; import nuclearscience.registers.NuclearScienceDamageTypes; +import voltaic.common.block.states.VoltaicMaterials; import voltaic.prefab.block.GenericEntityBlock; public class BlockPlasma extends GenericEntityBlock { public BlockPlasma() { - super(Blocks.NETHER_PORTAL.properties().noCollission().randomTicks().strength(-1.0F).sound(SoundType.GLASS)); + super(VoltaicMaterials.portal().noCollission().randomTicks().strength(-1.0F).sound(SoundType.GLASS)); } @Override diff --git a/src/main/java/nuclearscience/common/block/BlockRadioactiveAir.java b/src/main/java/nuclearscience/common/block/BlockRadioactiveAir.java index 0471c399..1ea29dec 100644 --- a/src/main/java/nuclearscience/common/block/BlockRadioactiveAir.java +++ b/src/main/java/nuclearscience/common/block/BlockRadioactiveAir.java @@ -11,12 +11,13 @@ import net.minecraft.world.level.block.state.BlockState; import voltaic.api.radiation.RadiationSystem; import voltaic.api.radiation.util.IRadiationRecipient; +import voltaic.common.block.states.VoltaicMaterials; import voltaic.registers.VoltaicCapabilities; public class BlockRadioactiveAir extends AirBlock { public BlockRadioactiveAir() { - super(Blocks.AIR.properties().noCollission().air().randomTicks()); + super(VoltaicMaterials.air().noCollission().air().randomTicks()); } @Override diff --git a/src/main/java/nuclearscience/common/block/BlockTurbine.java b/src/main/java/nuclearscience/common/block/BlockTurbine.java index 68c6b629..ffa2b09e 100644 --- a/src/main/java/nuclearscience/common/block/BlockTurbine.java +++ b/src/main/java/nuclearscience/common/block/BlockTurbine.java @@ -9,7 +9,6 @@ import net.minecraft.world.level.BlockGetter; import net.minecraft.world.level.block.BaseEntityBlock; import net.minecraft.world.level.block.Block; -import net.minecraft.world.level.block.Blocks; import net.minecraft.world.level.block.RenderShape; import net.minecraft.world.level.block.SoundType; import net.minecraft.world.level.block.entity.BlockEntity; @@ -20,6 +19,7 @@ import net.minecraft.world.phys.shapes.Shapes; import net.minecraft.world.phys.shapes.VoxelShape; import nuclearscience.common.tile.TileTurbine; +import voltaic.common.block.states.VoltaicMaterials; import voltaic.prefab.block.GenericEntityBlockWaterloggable; public class BlockTurbine extends GenericEntityBlockWaterloggable { @@ -45,7 +45,7 @@ public class BlockTurbine extends GenericEntityBlockWaterloggable { public static final BooleanProperty RENDER = BooleanProperty.create("render"); public BlockTurbine() { - super(Blocks.IRON_BLOCK.properties().strength(3.5F).sound(SoundType.METAL).requiresCorrectToolForDrops().noOcclusion()); + super(VoltaicMaterials.metal().strength(3.5F).sound(SoundType.METAL).requiresCorrectToolForDrops().noOcclusion()); registerDefaultState(stateDefinition.any().setValue(RENDER, true)); } diff --git a/src/main/java/nuclearscience/common/block/connect/BlockMoltenSaltPipe.java b/src/main/java/nuclearscience/common/block/connect/BlockMoltenSaltPipe.java index 14a23b32..925e5eab 100644 --- a/src/main/java/nuclearscience/common/block/connect/BlockMoltenSaltPipe.java +++ b/src/main/java/nuclearscience/common/block/connect/BlockMoltenSaltPipe.java @@ -8,7 +8,6 @@ import net.minecraft.core.Direction; import net.minecraft.world.level.block.BaseEntityBlock; import net.minecraft.world.level.block.Block; -import net.minecraft.world.level.block.Blocks; import net.minecraft.world.level.block.SoundType; import net.minecraft.world.level.block.entity.BlockEntity; import net.minecraft.world.level.block.state.BlockState; @@ -18,6 +17,7 @@ import nuclearscience.common.tile.reactor.moltensalt.TileMoltenSaltPipe; import voltaic.common.block.connect.AbstractRefreshingConnectBlock; import voltaic.common.block.connect.EnumConnectType; +import voltaic.common.block.states.VoltaicMaterials; public class BlockMoltenSaltPipe extends AbstractRefreshingConnectBlock { @@ -26,7 +26,7 @@ public class BlockMoltenSaltPipe extends AbstractRefreshingConnectBlock { @@ -27,7 +27,7 @@ public class BlockReactorLogisticsCable extends AbstractRefreshingConnectBlock