Skip to content

Fix Framed Blocks conflict when other mods are present #91

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 #91

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
3 changes: 2 additions & 1 deletion src/main/java/voltaic/common/block/BlockCustomGlass.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,12 @@
import net.minecraft.world.phys.shapes.VoxelShape;
import net.neoforged.api.distmarker.Dist;
import net.neoforged.api.distmarker.OnlyIn;
import voltaic.common.block.states.VoltaicMaterials;

public class BlockCustomGlass extends Block {

public BlockCustomGlass(float hardness, float resistance) {
super(Blocks.GLASS.properties().requiresCorrectToolForDrops().strength(hardness, resistance).isRedstoneConductor((x, y, z) -> false).noOcclusion());
super(VoltaicMaterials.glass().requiresCorrectToolForDrops().strength(hardness, resistance).isRedstoneConductor((x, y, z) -> false).noOcclusion());
}

@Override
Expand Down
3 changes: 2 additions & 1 deletion src/main/java/voltaic/common/block/BlockMultiSubnode.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,13 +22,14 @@
import net.neoforged.api.distmarker.OnlyIn;
import voltaic.api.multiblock.subnodebased.TileMultiSubnode;
import voltaic.api.multiblock.subnodebased.child.IMultiblockChildBlock;
import voltaic.common.block.states.VoltaicMaterials;
import voltaic.prefab.block.GenericEntityBlock;
import voltaic.prefab.tile.GenericTile;

public class BlockMultiSubnode extends GenericEntityBlock implements IMultiblockChildBlock {

public BlockMultiSubnode() {
super(Blocks.GLASS.properties().strength(3.5F).sound(SoundType.METAL).isRedstoneConductor((a, b, c) -> false).noOcclusion());
super(VoltaicMaterials.glass().strength(3.5F).sound(SoundType.METAL).isRedstoneConductor((a, b, c) -> false).noOcclusion());
}

@Override
Expand Down
3 changes: 2 additions & 1 deletion src/main/java/voltaic/prefab/block/GenericMachineBlock.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
import net.minecraft.world.phys.shapes.CollisionContext;
import net.minecraft.world.phys.shapes.VoxelShape;
import voltaic.common.block.states.VoltaicBlockStates;
import voltaic.common.block.states.VoltaicMaterials;
import voltaic.common.block.voxelshapes.VoxelShapeProvider;

public class GenericMachineBlock extends GenericEntityBlockWaterloggable {
Expand All @@ -34,7 +35,7 @@ public class GenericMachineBlock extends GenericEntityBlockWaterloggable {
public static HashMap<BlockPos, LivingEntity> IPLAYERSTORABLE_MAP = new HashMap<>();

public GenericMachineBlock(BlockEntitySupplier<BlockEntity> blockEntitySupplier, VoxelShapeProvider provider) {
super(Blocks.IRON_BLOCK.properties().strength(3.5F).sound(SoundType.METAL).noOcclusion().requiresCorrectToolForDrops());
super(VoltaicMaterials.metal().strength(3.5F).sound(SoundType.METAL).noOcclusion().requiresCorrectToolForDrops());
registerDefaultState(stateDefinition.any().setValue(VoltaicBlockStates.FACING, Direction.NORTH));
this.blockEntitySupplier = blockEntitySupplier;
this.shapeProvider = provider;
Expand Down