Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
19 changes: 6 additions & 13 deletions src/main/java/com/simibubi/create/AllBlocks.java
Original file line number Diff line number Diff line change
Expand Up @@ -2412,59 +2412,52 @@ public class AllBlocks {
});

public static final BlockEntry<SlidingDoorBlock> ANDESITE_DOOR =
REGISTRATE.block("andesite_door", p -> SlidingDoorBlock.metal(p, true))
REGISTRATE.block("andesite_door", p -> SlidingDoorBlock.stone(p, true))
.transform(BuilderTransformers.slidingDoor("andesite"))
.properties(p -> p.mapColor(MapColor.STONE)
.sound(SoundType.STONE)
.noOcclusion())
.register();

public static final BlockEntry<SlidingDoorBlock> BRASS_DOOR =
REGISTRATE.block("brass_door", p -> SlidingDoorBlock.metal(p, false))
REGISTRATE.block("brass_door", p -> SlidingDoorBlock.stone(p, false))
.transform(BuilderTransformers.slidingDoor("brass"))
.properties(p -> p.mapColor(MapColor.TERRACOTTA_YELLOW)
.sound(SoundType.STONE)
.noOcclusion())
.register();

public static final BlockEntry<SlidingDoorBlock> COPPER_DOOR =
REGISTRATE.block("copper_door", p -> SlidingDoorBlock.metal(p, true))
REGISTRATE.block("copper_door", p -> SlidingDoorBlock.stone(p, true))
.transform(BuilderTransformers.slidingDoor("copper"))
.properties(p -> p.mapColor(MapColor.COLOR_ORANGE)
.sound(SoundType.STONE)
.noOcclusion())
.register();

public static final BlockEntry<SlidingDoorBlock> TRAIN_DOOR =
REGISTRATE.block("train_door", p -> SlidingDoorBlock.metal(p, false))
.transform(BuilderTransformers.slidingDoor("train"))
.properties(p -> p.mapColor(MapColor.TERRACOTTA_CYAN)
.sound(SoundType.NETHERITE_BLOCK)
.noOcclusion())
.register();

public static final BlockEntry<TrainTrapdoorBlock> TRAIN_TRAPDOOR =
REGISTRATE.block("train_trapdoor", TrainTrapdoorBlock::new)
REGISTRATE.block("train_trapdoor", TrainTrapdoorBlock::metal)
.initialProperties(SharedProperties::softMetal)
.properties(p -> p.mapColor(MapColor.TERRACOTTA_CYAN)
.sound(SoundType.NETHERITE_BLOCK))
.properties(p -> p.mapColor(MapColor.TERRACOTTA_CYAN))
.transform(BuilderTransformers.trapdoor(true))
.register();

public static final BlockEntry<SlidingDoorBlock> FRAMED_GLASS_DOOR =
REGISTRATE.block("framed_glass_door", p -> SlidingDoorBlock.glass(p, false))
.transform(BuilderTransformers.slidingDoor("glass"))
.properties(p -> p.mapColor(MapColor.NONE)
.sound(SoundType.GLASS)
.noOcclusion())
.register();

public static final BlockEntry<TrainTrapdoorBlock> FRAMED_GLASS_TRAPDOOR =
REGISTRATE.block("framed_glass_trapdoor", TrainTrapdoorBlock::new)
REGISTRATE.block("framed_glass_trapdoor", TrainTrapdoorBlock::glass)
.initialProperties(SharedProperties::softMetal)
.transform(BuilderTransformers.trapdoor(false))
.properties(p -> p.mapColor(MapColor.NONE)
.sound(SoundType.GLASS)
.noOcclusion())
.onRegister(connectedTextures(TrapdoorCTBehaviour::new))
.addLayer(() -> RenderType::cutoutMipped)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,16 +11,30 @@
import net.minecraft.world.level.Level;
import net.minecraft.world.level.block.TrapDoorBlock;
import net.minecraft.world.level.block.state.BlockState;
import net.minecraft.world.level.block.state.properties.BlockSetType;
import net.minecraft.world.level.block.state.properties.Half;
import net.minecraft.world.level.material.Fluids;
import net.minecraft.world.phys.BlockHitResult;

public class TrainTrapdoorBlock extends TrapDoorBlock implements IWrenchable {

@Deprecated
public TrainTrapdoorBlock(Properties p_57526_) {
super(p_57526_, SlidingDoorBlock.TRAIN_SET_TYPE.get());
}

public TrainTrapdoorBlock(Properties properties, BlockSetType type) {
super(properties, type);
}

public static TrainTrapdoorBlock metal(Properties properties) {
return new TrainTrapdoorBlock(properties, SlidingDoorBlock.TRAIN_SET_TYPE.get());
}

public static TrainTrapdoorBlock glass(Properties properties) {
return new TrainTrapdoorBlock(properties, SlidingDoorBlock.GLASS_SET_TYPE.get());
}

public InteractionResult use(BlockState pState, Level pLevel, BlockPos pPos, Player pPlayer, InteractionHand pHand,
BlockHitResult pHit) {
pState = pState.cycle(OPEN);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -44,13 +44,19 @@
public class SlidingDoorBlock extends DoorBlock implements IWrenchable, IBE<SlidingDoorBlockEntity>, IHaveBigOutline {

public static final Supplier<BlockSetType> TRAIN_SET_TYPE =
() -> new BlockSetType("train", true, SoundType.NETHERITE_BLOCK, SoundEvents.IRON_DOOR_CLOSE,
() -> new BlockSetType("create:train", true, SoundType.NETHERITE_BLOCK, SoundEvents.IRON_DOOR_CLOSE,
SoundEvents.IRON_DOOR_OPEN, SoundEvents.IRON_TRAPDOOR_CLOSE, SoundEvents.IRON_TRAPDOOR_OPEN,
SoundEvents.METAL_PRESSURE_PLATE_CLICK_OFF, SoundEvents.METAL_PRESSURE_PLATE_CLICK_ON,
SoundEvents.STONE_BUTTON_CLICK_OFF, SoundEvents.STONE_BUTTON_CLICK_ON);

public static final Supplier<BlockSetType> GLASS_SET_TYPE =
() -> new BlockSetType("train", true, SoundType.NETHERITE_BLOCK, SoundEvents.IRON_DOOR_CLOSE,
() -> new BlockSetType("create:glass", true, SoundType.GLASS, SoundEvents.IRON_DOOR_CLOSE,
SoundEvents.IRON_DOOR_OPEN, SoundEvents.IRON_TRAPDOOR_CLOSE, SoundEvents.IRON_TRAPDOOR_OPEN,
SoundEvents.METAL_PRESSURE_PLATE_CLICK_OFF, SoundEvents.METAL_PRESSURE_PLATE_CLICK_ON,
SoundEvents.STONE_BUTTON_CLICK_OFF, SoundEvents.STONE_BUTTON_CLICK_ON);

public static final Supplier<BlockSetType> STONE_SET_TYPE =
() -> new BlockSetType("create:stone", true, SoundType.STONE, SoundEvents.IRON_DOOR_CLOSE,
SoundEvents.IRON_DOOR_OPEN, SoundEvents.IRON_TRAPDOOR_CLOSE, SoundEvents.IRON_TRAPDOOR_OPEN,
SoundEvents.METAL_PRESSURE_PLATE_CLICK_OFF, SoundEvents.METAL_PRESSURE_PLATE_CLICK_ON,
SoundEvents.STONE_BUTTON_CLICK_OFF, SoundEvents.STONE_BUTTON_CLICK_ON);
Expand All @@ -66,6 +72,10 @@ public static SlidingDoorBlock glass(Properties p_52737_, boolean folds) {
return new SlidingDoorBlock(p_52737_, GLASS_SET_TYPE.get(), folds);
}

public static SlidingDoorBlock stone(Properties p_52737_, boolean folds) {
return new SlidingDoorBlock(p_52737_, STONE_SET_TYPE.get(), folds);
}

public SlidingDoorBlock(Properties p_52737_, BlockSetType type, boolean folds) {
super(p_52737_, type);
this.folds = folds;
Expand Down