Skip to content

Commit

Permalink
Merge pull request #277 from nexusnode/bugfixes
Browse files Browse the repository at this point in the history
added traffic_signs_05 (rotated to left)
  • Loading branch information
9MaxR9 committed Mar 10, 2024
2 parents 713b829 + b1a868b commit 331a689
Show file tree
Hide file tree
Showing 63 changed files with 3,219 additions and 2 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -189,6 +189,26 @@ static void register() {
translucent(DecorationBlocks.R_TRAFFIC_SIGNS_RADIOACTIVE);
translucent(DecorationBlocks.R_TRAFFIC_SIGNS_RADIOACTIVE_DAMAGED);
translucent(DecorationBlocks.R_TRAFFIC_SIGNS_NOTSAFE);

translucent(DecorationBlocks.TRAFFIC_SIGNS_05);
translucent(DecorationBlocks.L_TRAFFIC_SIGNS_SPEED20);
translucent(DecorationBlocks.L_TRAFFIC_SIGNS_SPEED25);
translucent(DecorationBlocks.L_TRAFFIC_SIGNS_SPEED30);
translucent(DecorationBlocks.L_TRAFFIC_SIGNS_SPEED35);
translucent(DecorationBlocks.L_TRAFFIC_SIGNS_SPEED40);
translucent(DecorationBlocks.L_TRAFFIC_SIGNS_SPEED45);
translucent(DecorationBlocks.L_TRAFFIC_SIGNS_SPEED50);
translucent(DecorationBlocks.L_TRAFFIC_SIGNS_SPEED55);
translucent(DecorationBlocks.L_TRAFFIC_SIGNS_SPEED60);
translucent(DecorationBlocks.L_TRAFFIC_SIGNS_SPEED65);
translucent(DecorationBlocks.L_TRAFFIC_SIGNS_SPEED70);
translucent(DecorationBlocks.L_TRAFFIC_SIGNS_SPEED75);
translucent(DecorationBlocks.L_TRAFFIC_SIGNS_SPEED80);
translucent(DecorationBlocks.L_TRAFFIC_SIGNS_DAMAGED);
translucent(DecorationBlocks.L_TRAFFIC_SIGNS_DAMAGED_BULLET);
translucent(DecorationBlocks.L_TRAFFIC_SIGNS_RADIOACTIVE);
translucent(DecorationBlocks.L_TRAFFIC_SIGNS_RADIOACTIVE_DAMAGED);
translucent(DecorationBlocks.L_TRAFFIC_SIGNS_NOTSAFE);
}

private static void cutout(Supplier<? extends Block> block) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1450,6 +1450,101 @@ public ItemStack makeIcon() {
() -> new BlockItem(DecorationBlocks.R_TRAFFIC_SIGNS_RADIOACTIVE_DAMAGED.get(),
new Item.Properties().tab(TAB)));

public static final RegistryObject<Item> TRAFFIC_SIGNS_05 =
deferredRegister.register("traffic_signs_05",
() -> new BlockItem(DecorationBlocks.TRAFFIC_SIGNS_05.get(),
new Item.Properties().tab(TAB)));

public static final RegistryObject<Item> L_TRAFFIC_SIGNS_SPEED20 =
deferredRegister.register("l_traffic_signs_speed20",
() -> new BlockItem(DecorationBlocks.L_TRAFFIC_SIGNS_SPEED20.get(),
new Item.Properties().tab(TAB)));

public static final RegistryObject<Item> L_TRAFFIC_SIGNS_SPEED25 =
deferredRegister.register("l_traffic_signs_speed25",
() -> new BlockItem(DecorationBlocks.L_TRAFFIC_SIGNS_SPEED25.get(),
new Item.Properties().tab(TAB)));

public static final RegistryObject<Item> L_TRAFFIC_SIGNS_SPEED30 =
deferredRegister.register("l_traffic_signs_speed30",
() -> new BlockItem(DecorationBlocks.L_TRAFFIC_SIGNS_SPEED30.get(),
new Item.Properties().tab(TAB)));

public static final RegistryObject<Item> L_TRAFFIC_SIGNS_SPEED35 =
deferredRegister.register("l_traffic_signs_speed35",
() -> new BlockItem(DecorationBlocks.L_TRAFFIC_SIGNS_SPEED35.get(),
new Item.Properties().tab(TAB)));

public static final RegistryObject<Item> L_TRAFFIC_SIGNS_SPEED40 =
deferredRegister.register("l_traffic_signs_speed40",
() -> new BlockItem(DecorationBlocks.L_TRAFFIC_SIGNS_SPEED40.get(),
new Item.Properties().tab(TAB)));

public static final RegistryObject<Item> L_TRAFFIC_SIGNS_SPEED45 =
deferredRegister.register("l_traffic_signs_speed45",
() -> new BlockItem(DecorationBlocks.L_TRAFFIC_SIGNS_SPEED45.get(),
new Item.Properties().tab(TAB)));

public static final RegistryObject<Item> L_TRAFFIC_SIGNS_SPEED50 =
deferredRegister.register("l_traffic_signs_speed50",
() -> new BlockItem(DecorationBlocks.L_TRAFFIC_SIGNS_SPEED50.get(),
new Item.Properties().tab(TAB)));

public static final RegistryObject<Item> L_TRAFFIC_SIGNS_SPEED55 =
deferredRegister.register("l_traffic_signs_speed55",
() -> new BlockItem(DecorationBlocks.L_TRAFFIC_SIGNS_SPEED55.get(),
new Item.Properties().tab(TAB)));

public static final RegistryObject<Item> L_TRAFFIC_SIGNS_SPEED60 =
deferredRegister.register("l_traffic_signs_speed60",
() -> new BlockItem(DecorationBlocks.L_TRAFFIC_SIGNS_SPEED60.get(),
new Item.Properties().tab(TAB)));

public static final RegistryObject<Item> L_TRAFFIC_SIGNS_SPEED65 =
deferredRegister.register("l_traffic_signs_speed65",
() -> new BlockItem(DecorationBlocks.L_TRAFFIC_SIGNS_SPEED65.get(),
new Item.Properties().tab(TAB)));

public static final RegistryObject<Item> L_TRAFFIC_SIGNS_SPEED70 =
deferredRegister.register("l_traffic_signs_speed70",
() -> new BlockItem(DecorationBlocks.L_TRAFFIC_SIGNS_SPEED70.get(),
new Item.Properties().tab(TAB)));

public static final RegistryObject<Item> L_TRAFFIC_SIGNS_SPEED75 =
deferredRegister.register("l_traffic_signs_speed75",
() -> new BlockItem(DecorationBlocks.L_TRAFFIC_SIGNS_SPEED75.get(),
new Item.Properties().tab(TAB)));

public static final RegistryObject<Item> L_TRAFFIC_SIGNS_SPEED80 =
deferredRegister.register("l_traffic_signs_speed80",
() -> new BlockItem(DecorationBlocks.L_TRAFFIC_SIGNS_SPEED80.get(),
new Item.Properties().tab(TAB)));

public static final RegistryObject<Item> L_TRAFFIC_SIGNS_DAMAGED_BULLET =
deferredRegister.register("l_traffic_signs_damaged_bullet",
() -> new BlockItem(DecorationBlocks.L_TRAFFIC_SIGNS_DAMAGED_BULLET.get(),
new Item.Properties().tab(TAB)));

public static final RegistryObject<Item> L_TRAFFIC_SIGNS_DAMAGED =
deferredRegister.register("l_traffic_signs_damaged",
() -> new BlockItem(DecorationBlocks.L_TRAFFIC_SIGNS_DAMAGED.get(),
new Item.Properties().tab(TAB)));

public static final RegistryObject<Item> L_TRAFFIC_SIGNS_NOTSAFE =
deferredRegister.register("l_traffic_signs_notsafe",
() -> new BlockItem(DecorationBlocks.L_TRAFFIC_SIGNS_NOTSAFE.get(),
new Item.Properties().tab(TAB)));

public static final RegistryObject<Item> L_TRAFFIC_SIGNS_LADIOACTIVE =
deferredRegister.register("l_traffic_signs_radioactive",
() -> new BlockItem(DecorationBlocks.L_TRAFFIC_SIGNS_RADIOACTIVE.get(),
new Item.Properties().tab(TAB)));

public static final RegistryObject<Item> L_TRAFFIC_SIGNS_LADIOACTIVE_DAMAGED =
deferredRegister.register("l_traffic_signs_radioactive_damaged",
() -> new BlockItem(DecorationBlocks.L_TRAFFIC_SIGNS_RADIOACTIVE_DAMAGED.get(),
new Item.Properties().tab(TAB)));

//HL2Pack Items
public static final RegistryObject<Item> HEALTH_CHARGER =
deferredRegister.register("acacia_button",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -418,6 +418,9 @@ public class BlockShapes {
public static final Function<Direction, VoxelShape> TRAFFIC_SIGNS_R =
rotatedOrientableShape(Block.box(-13, -0.5, 7.5, 7.5, 29.5, 8.5));

public static final Function<Direction, VoxelShape> TRAFFIC_SIGNS_L =
rotatedOrientableShape(Block.box(7.5, -0.5, 7.5, 8.5, 29.5, 8.5));

public static final Function<Direction, VoxelShape> BLOCK =
unitOrientableShape(Shapes.block());

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2348,6 +2348,179 @@ public class DecorationBlocks {
.noCollission(),
BlockShapes.TRAFFIC_SIGNS_R));

public static final RegistryObject<Block> TRAFFIC_SIGNS_05 =
deferredRegister.register("traffic_signs_05",
() -> new OrientableBlock(
BlockBehaviour.Properties.of(Material.METAL)
.strength(1.0F)
.sound(SoundType.METAL)
.noOcclusion(),
BlockShapes.TRAFFIC_SIGNS_L));

public static final RegistryObject<Block> L_TRAFFIC_SIGNS_SPEED20 =
deferredRegister.register("l_traffic_signs_speed20",
() -> new OrientableBlock(
BlockBehaviour.Properties.of(Material.METAL)
.strength(1.0F)
.sound(SoundType.METAL)
.noOcclusion(),
BlockShapes.TRAFFIC_SIGNS_L));

public static final RegistryObject<Block> L_TRAFFIC_SIGNS_SPEED25 =
deferredRegister.register("l_traffic_signs_speed25",
() -> new OrientableBlock(
BlockBehaviour.Properties.of(Material.METAL)
.strength(1.0F)
.sound(SoundType.METAL)
.noOcclusion(),
BlockShapes.TRAFFIC_SIGNS_L));

public static final RegistryObject<Block> L_TRAFFIC_SIGNS_SPEED30 =
deferredRegister.register("l_traffic_signs_speed30",
() -> new OrientableBlock(
BlockBehaviour.Properties.of(Material.METAL)
.strength(1.0F)
.sound(SoundType.METAL)
.noOcclusion(),
BlockShapes.TRAFFIC_SIGNS_L));

public static final RegistryObject<Block> L_TRAFFIC_SIGNS_SPEED35 =
deferredRegister.register("l_traffic_signs_speed35",
() -> new OrientableBlock(
BlockBehaviour.Properties.of(Material.METAL)
.strength(1.0F)
.sound(SoundType.METAL)
.noOcclusion(),
BlockShapes.TRAFFIC_SIGNS_L));

public static final RegistryObject<Block> L_TRAFFIC_SIGNS_SPEED40 =
deferredRegister.register("l_traffic_signs_speed40",
() -> new OrientableBlock(
BlockBehaviour.Properties.of(Material.METAL)
.strength(1.0F)
.sound(SoundType.METAL)
.noOcclusion(),
BlockShapes.TRAFFIC_SIGNS_L));

public static final RegistryObject<Block> L_TRAFFIC_SIGNS_SPEED45 =
deferredRegister.register("l_traffic_signs_speed450",
() -> new OrientableBlock(
BlockBehaviour.Properties.of(Material.METAL)
.strength(1.0F)
.sound(SoundType.METAL)
.noOcclusion(),
BlockShapes.TRAFFIC_SIGNS_L));

public static final RegistryObject<Block> L_TRAFFIC_SIGNS_SPEED50 =
deferredRegister.register("l_traffic_signs_speed50",
() -> new OrientableBlock(
BlockBehaviour.Properties.of(Material.METAL)
.strength(1.0F)
.sound(SoundType.METAL)
.noOcclusion(),
BlockShapes.TRAFFIC_SIGNS_L));

public static final RegistryObject<Block> L_TRAFFIC_SIGNS_SPEED55 =
deferredRegister.register("l_traffic_signs_speed55",
() -> new OrientableBlock(
BlockBehaviour.Properties.of(Material.METAL)
.strength(1.0F)
.sound(SoundType.METAL)
.noOcclusion(),
BlockShapes.TRAFFIC_SIGNS_L));

public static final RegistryObject<Block> L_TRAFFIC_SIGNS_SPEED60 =
deferredRegister.register("l_traffic_signs_speed60",
() -> new OrientableBlock(
BlockBehaviour.Properties.of(Material.METAL)
.strength(1.0F)
.sound(SoundType.METAL)
.noOcclusion(),
BlockShapes.TRAFFIC_SIGNS_L));

public static final RegistryObject<Block> L_TRAFFIC_SIGNS_SPEED65 =
deferredRegister.register("l_traffic_signs_speed65",
() -> new OrientableBlock(
BlockBehaviour.Properties.of(Material.METAL)
.strength(1.0F)
.sound(SoundType.METAL)
.noOcclusion(),
BlockShapes.TRAFFIC_SIGNS_L));

public static final RegistryObject<Block> L_TRAFFIC_SIGNS_SPEED70 =
deferredRegister.register("l_traffic_signs_speed70",
() -> new OrientableBlock(
BlockBehaviour.Properties.of(Material.METAL)
.strength(1.0F)
.sound(SoundType.METAL)
.noOcclusion(),
BlockShapes.TRAFFIC_SIGNS_L));

public static final RegistryObject<Block> L_TRAFFIC_SIGNS_SPEED75 =
deferredRegister.register("l_traffic_signs_speed75",
() -> new OrientableBlock(
BlockBehaviour.Properties.of(Material.METAL)
.strength(1.0F)
.sound(SoundType.METAL)
.noOcclusion(),
BlockShapes.TRAFFIC_SIGNS_L));

public static final RegistryObject<Block> L_TRAFFIC_SIGNS_SPEED80 =
deferredRegister.register("l_traffic_signs_speed80",
() -> new OrientableBlock(
BlockBehaviour.Properties.of(Material.METAL)
.strength(1.0F)
.sound(SoundType.METAL)
.noOcclusion(),
BlockShapes.TRAFFIC_SIGNS_L));

public static final RegistryObject<Block> L_TRAFFIC_SIGNS_DAMAGED =
deferredRegister.register("l_traffic_signs_damaged",
() -> new OrientableBlock(
BlockBehaviour.Properties.of(Material.METAL)
.strength(1.0F)
.sound(SoundType.METAL)
.noOcclusion(),
BlockShapes.TRAFFIC_SIGNS_L));

public static final RegistryObject<Block> L_TRAFFIC_SIGNS_DAMAGED_BULLET =
deferredRegister.register("l_traffic_signs_damaged_bullet",
() -> new OrientableBlock(
BlockBehaviour.Properties.of(Material.METAL)
.strength(1.0F)
.sound(SoundType.METAL)
.noOcclusion(),
BlockShapes.TRAFFIC_SIGNS_L));

public static final RegistryObject<Block> L_TRAFFIC_SIGNS_NOTSAFE =
deferredRegister.register("l_traffic_signs_notsafe",
() -> new OrientableBlock(
BlockBehaviour.Properties.of(Material.METAL)
.strength(1.0F)
.sound(SoundType.METAL)
.noOcclusion(),
BlockShapes.TRAFFIC_SIGNS_L));

public static final RegistryObject<Block> L_TRAFFIC_SIGNS_RADIOACTIVE =
deferredRegister.register("l_traffic_signs_radioactive",
() -> new OrientableBlock(
BlockBehaviour.Properties.of(Material.METAL)
.strength(1.0F)
.sound(SoundType.METAL)
.noOcclusion()
.noCollission(),
BlockShapes.TRAFFIC_SIGNS_L));

public static final RegistryObject<Block> L_TRAFFIC_SIGNS_RADIOACTIVE_DAMAGED =
deferredRegister.register("l_traffic_signs_radioactive_damaged",
() -> new OrientableBlock(
BlockBehaviour.Properties.of(Material.METAL)
.strength(1.0F)
.sound(SoundType.METAL)
.noOcclusion()
.noCollission(),
BlockShapes.TRAFFIC_SIGNS_L));

// Items from HL2Pack
public static final RegistryObject<Block> HEALTH_CHARGER =
deferredRegister.register("acacia_button",
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{"variants": {"facing=east": {"model": "craftingdeaddecoration:block/l_traffic_signs_damaged", "y": 90}, "facing=north": {"model": "craftingdeaddecoration:block/l_traffic_signs_damaged"}, "facing=west": {"model": "craftingdeaddecoration:block/l_traffic_signs_damaged", "y": 270}, "facing=south": {"model": "craftingdeaddecoration:block/l_traffic_signs_damaged", "y": 180}}}
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{"variants": {"facing=east": {"model": "craftingdeaddecoration:block/l_traffic_signs_damaged_bullet", "y": 90}, "facing=north": {"model": "craftingdeaddecoration:block/l_traffic_signs_damaged_bullet"}, "facing=west": {"model": "craftingdeaddecoration:block/l_traffic_signs_damaged_bullet", "y": 270}, "facing=south": {"model": "craftingdeaddecoration:block/l_traffic_signs_damaged_bullet", "y": 180}}}
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{"variants": {"facing=east": {"model": "craftingdeaddecoration:block/l_traffic_signs_notsafe", "y": 90}, "facing=north": {"model": "craftingdeaddecoration:block/l_traffic_signs_notsafe"}, "facing=west": {"model": "craftingdeaddecoration:block/l_traffic_signs_notsafe", "y": 270}, "facing=south": {"model": "craftingdeaddecoration:block/l_traffic_signs_notsafe", "y": 180}}}
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{"variants": {"facing=east": {"model": "craftingdeaddecoration:block/l_traffic_signs_radioactive", "y": 90}, "facing=north": {"model": "craftingdeaddecoration:block/l_traffic_signs_radioactive"}, "facing=west": {"model": "craftingdeaddecoration:block/l_traffic_signs_radioactive", "y": 270}, "facing=south": {"model": "craftingdeaddecoration:block/l_traffic_signs_radioactive", "y": 180}}}
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{"variants": {"facing=east": {"model": "craftingdeaddecoration:block/l_traffic_signs_radioactive_damaged", "y": 90}, "facing=north": {"model": "craftingdeaddecoration:block/l_traffic_signs_radioactive_damaged"}, "facing=west": {"model": "craftingdeaddecoration:block/l_traffic_signs_radioactive_damaged", "y": 270}, "facing=south": {"model": "craftingdeaddecoration:block/l_traffic_signs_radioactive_damaged", "y": 180}}}
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{"variants": {"facing=east": {"model": "craftingdeaddecoration:block/l_traffic_signs_speed20", "y": 90}, "facing=north": {"model": "craftingdeaddecoration:block/l_traffic_signs_speed20"}, "facing=west": {"model": "craftingdeaddecoration:block/l_traffic_signs_speed20", "y": 270}, "facing=south": {"model": "craftingdeaddecoration:block/l_traffic_signs_speed20", "y": 180}}}
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{"variants": {"facing=east": {"model": "craftingdeaddecoration:block/l_traffic_signs_speed25", "y": 90}, "facing=north": {"model": "craftingdeaddecoration:block/l_traffic_signs_speed25"}, "facing=west": {"model": "craftingdeaddecoration:block/l_traffic_signs_speed25", "y": 270}, "facing=south": {"model": "craftingdeaddecoration:block/l_traffic_signs_speed25", "y": 180}}}
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{"variants": {"facing=east": {"model": "craftingdeaddecoration:block/l_traffic_signs_speed30", "y": 90}, "facing=north": {"model": "craftingdeaddecoration:block/l_traffic_signs_speed30"}, "facing=west": {"model": "craftingdeaddecoration:block/l_traffic_signs_speed30", "y": 270}, "facing=south": {"model": "craftingdeaddecoration:block/l_traffic_signs_speed30", "y": 180}}}
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{"variants": {"facing=east": {"model": "craftingdeaddecoration:block/l_traffic_signs_speed35", "y": 90}, "facing=north": {"model": "craftingdeaddecoration:block/l_traffic_signs_speed35"}, "facing=west": {"model": "craftingdeaddecoration:block/l_traffic_signs_speed35", "y": 270}, "facing=south": {"model": "craftingdeaddecoration:block/l_traffic_signs_speed35", "y": 180}}}
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{"variants": {"facing=east": {"model": "craftingdeaddecoration:block/l_traffic_signs_speed40", "y": 90}, "facing=north": {"model": "craftingdeaddecoration:block/l_traffic_signs_speed40"}, "facing=west": {"model": "craftingdeaddecoration:block/l_traffic_signs_speed40", "y": 270}, "facing=south": {"model": "craftingdeaddecoration:block/l_traffic_signs_speed40", "y": 180}}}
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{"variants": {"facing=east": {"model": "craftingdeaddecoration:block/l_traffic_signs_speed45", "y": 90}, "facing=north": {"model": "craftingdeaddecoration:block/l_traffic_signs_speed45"}, "facing=west": {"model": "craftingdeaddecoration:block/l_traffic_signs_speed45", "y": 270}, "facing=south": {"model": "craftingdeaddecoration:block/l_traffic_signs_speed45", "y": 180}}}
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{"variants": {"facing=east": {"model": "craftingdeaddecoration:block/l_traffic_signs_speed50", "y": 90}, "facing=north": {"model": "craftingdeaddecoration:block/l_traffic_signs_speed50"}, "facing=west": {"model": "craftingdeaddecoration:block/l_traffic_signs_speed50", "y": 270}, "facing=south": {"model": "craftingdeaddecoration:block/l_traffic_signs_speed50", "y": 180}}}

0 comments on commit 331a689

Please sign in to comment.