Skip to content

Fix Framed Blocks conflict when other mods are present #186

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
seancrain wants to merge 1 commit into
base: 1.21.1
Choose a base branch
from
Open

Fix Framed Blocks conflict when other mods are present #186

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/main/java/nuclearscience/common/block/BlockElectromagneticBooster.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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));
}

Expand Down
4 changes: 2 additions & 2 deletions src/main/java/nuclearscience/common/block/BlockElectromagneticDiode.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -19,14 +18,15 @@
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 {

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));
}

Expand Down
4 changes: 2 additions & 2 deletions src/main/java/nuclearscience/common/block/BlockElectromagneticSwitch.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand All @@ -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
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/nuclearscience/common/block/BlockMeltedReactor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/nuclearscience/common/block/BlockPlasma.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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
Expand Down
3 changes: 2 additions & 1 deletion src/main/java/nuclearscience/common/block/BlockRadioactiveAir.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/nuclearscience/common/block/BlockTurbine.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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 {
Expand All @@ -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));
}

Expand Down
4 changes: 2 additions & 2 deletions src/main/java/nuclearscience/common/block/connect/BlockMoltenSaltPipe.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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<TileMoltenSaltPipe> {

Expand All @@ -26,7 +26,7 @@ public class BlockMoltenSaltPipe extends AbstractRefreshingConnectBlock<TileMolt
public final SubtypeMoltenSaltPipe pipe;

public BlockMoltenSaltPipe(SubtypeMoltenSaltPipe pipe) {
super(Blocks.IRON_BLOCK.properties().sound(SoundType.METAL).strength(0.15f).dynamicShape(), 3);
super(VoltaicMaterials.metal().sound(SoundType.METAL).strength(0.15f).dynamicShape(), 3);
this.pipe = pipe;
PIPESET.add(this);
}
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/nuclearscience/common/block/connect/BlockReactorLogisticsCable.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,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;
Expand All @@ -19,6 +18,7 @@
import nuclearscience.common.tile.reactor.logisticsnetwork.TileReactorLogisticsCable;
import voltaic.common.block.connect.AbstractRefreshingConnectBlock;
import voltaic.common.block.connect.EnumConnectType;
import voltaic.common.block.states.VoltaicMaterials;

public class BlockReactorLogisticsCable extends AbstractRefreshingConnectBlock<TileReactorLogisticsCable> {

Expand All @@ -27,7 +27,7 @@ public class BlockReactorLogisticsCable extends AbstractRefreshingConnectBlock<T
public final SubtypeReactorLogisticsCable cable;

public BlockReactorLogisticsCable(SubtypeReactorLogisticsCable cable) {
super(Blocks.IRON_BLOCK.properties().sound(SoundType.METAL).strength(0.15f).dynamicShape(), 5);
super(VoltaicMaterials.metal().sound(SoundType.METAL).strength(0.15f).dynamicShape(), 5);
this.cable = cable;
PIPESET.add(this);
}
Expand Down