Skip to content

Commit

Permalink
Merge pull request #275 from nexusnode/bugfixes
Browse files Browse the repository at this point in the history 
added w_traffic_signs (w=wall)
  • Loading branch information
@9MaxR9
9MaxR9 committed Mar 8, 2024
2 parents 28f7dfb + 817e2a2 commit 496b95c
Show file tree
Hide file tree
Showing 62 changed files with 2,663 additions and 1 deletion.
20 changes: 20 additions & 0 deletions crafting-dead-decoration/src/main/java/com/craftingdead/decoration/client/RenderLayers.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -149,6 +149,26 @@ static void register() {
translucent(DecorationBlocks.TRAFFIC_SIGNS_RADIOACTIVE);
translucent(DecorationBlocks.TRAFFIC_SIGNS_RADIOACTIVE_DAMAGED);
translucent(DecorationBlocks.TRAFFIC_SIGNS_NOTSAFE);

translucent(DecorationBlocks.TRAFFIC_SIGNS_03);
translucent(DecorationBlocks.W_TRAFFIC_SIGNS_SPEED20);
translucent(DecorationBlocks.W_TRAFFIC_SIGNS_SPEED25);
translucent(DecorationBlocks.W_TRAFFIC_SIGNS_SPEED30);
translucent(DecorationBlocks.W_TRAFFIC_SIGNS_SPEED35);
translucent(DecorationBlocks.W_TRAFFIC_SIGNS_SPEED40);
translucent(DecorationBlocks.W_TRAFFIC_SIGNS_SPEED45);
translucent(DecorationBlocks.W_TRAFFIC_SIGNS_SPEED50);
translucent(DecorationBlocks.W_TRAFFIC_SIGNS_SPEED55);
translucent(DecorationBlocks.W_TRAFFIC_SIGNS_SPEED60);
translucent(DecorationBlocks.W_TRAFFIC_SIGNS_SPEED65);
translucent(DecorationBlocks.W_TRAFFIC_SIGNS_SPEED70);
translucent(DecorationBlocks.W_TRAFFIC_SIGNS_SPEED75);
translucent(DecorationBlocks.W_TRAFFIC_SIGNS_SPEED80);
translucent(DecorationBlocks.W_TRAFFIC_SIGNS_DAMAGED);
translucent(DecorationBlocks.W_TRAFFIC_SIGNS_DAMAGED_BULLET);
translucent(DecorationBlocks.W_TRAFFIC_SIGNS_RADIOACTIVE);
translucent(DecorationBlocks.W_TRAFFIC_SIGNS_RADIOACTIVE_DAMAGED);
translucent(DecorationBlocks.W_TRAFFIC_SIGNS_NOTSAFE);
}

private static void cutout(Supplier<? extends Block> block) {
Expand Down
95 changes: 95 additions & 0 deletions ...dead-decoration/src/main/java/com/craftingdead/decoration/world/item/DecorationItems.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1260,6 +1260,101 @@ public ItemStack makeIcon() {
() -> new BlockItem(DecorationBlocks.TRAFFIC_SIGNS_RADIOACTIVE_DAMAGED.get(),
new Item.Properties().tab(TAB)));

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

public static final RegistryObject<Item> W_TRAFFIC_SIGNS_RADIOACTIVE_DAMAGED =
deferredRegister.register("w_traffic_signs_radioactive_damaged",
() -> new BlockItem(DecorationBlocks.W_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
3 changes: 3 additions & 0 deletions ...d-decoration/src/main/java/com/craftingdead/decoration/world/level/block/BlockShapes.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -412,6 +412,9 @@ public class BlockShapes {
public static final Function<Direction, VoxelShape> TRAFFIC_SIGNS_EMPTY =
rotatedOrientableShape(Shapes.or(Block.box(7.5, 0, 7.5, 8.5, 30, 8.5)));

public static final Function<Direction, VoxelShape> TRAFFIC_SIGNS_WALL =
rotatedOrientableShape(Shapes.or(Block.box(1, 1, 15.75, 15, 15, 16)));

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

Expand Down
188 changes: 188 additions & 0 deletions ...oration/src/main/java/com/craftingdead/decoration/world/level/block/DecorationBlocks.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1984,8 +1984,196 @@ public class DecorationBlocks {
.sound(SoundType.METAL)
.noOcclusion(),
BlockShapes.TRAFFIC_SIGNS_EMPTY));

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

// Items from HL2Pack
public static final RegistryObject<Block> HEALTH_CHARGER =
Expand Down
19 changes: 19 additions & 0 deletions ...ration/src/main/resources/assets/craftingdeaddecoration/blockstates/traffic_signs_03.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
{
"variants": {
"facing=east": {
"model": "craftingdeaddecoration:block/traffic_signs_03",
"y": 90
},
"facing=north": {
"model": "craftingdeaddecoration:block/traffic_signs_03"
},
"facing=west": {
"model": "craftingdeaddecoration:block/traffic_signs_03",
"y": 270
},
"facing=south": {
"model": "craftingdeaddecoration:block/traffic_signs_03",
"y": 180
}
}
}
19 changes: 19 additions & 0 deletions ...src/main/resources/assets/craftingdeaddecoration/blockstates/w_traffic_signs_damaged.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
{
"variants": {
"facing=east": {
"model": "craftingdeaddecoration:block/w_traffic_signs_damaged",
"y": 90
},
"facing=north": {
"model": "craftingdeaddecoration:block/w_traffic_signs_damaged"
},
"facing=west": {
"model": "craftingdeaddecoration:block/w_traffic_signs_damaged",
"y": 270
},
"facing=south": {
"model": "craftingdeaddecoration:block/w_traffic_signs_damaged",
"y": 180
}
}
}
19 changes: 19 additions & 0 deletions ...n/resources/assets/craftingdeaddecoration/blockstates/w_traffic_signs_damaged_bullet.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
{
"variants": {
"facing=east": {
"model": "craftingdeaddecoration:block/w_traffic_signs_damaged_bullet",
"y": 90
},
"facing=north": {
"model": "craftingdeaddecoration:block/w_traffic_signs_damaged_bullet"
},
"facing=west": {
"model": "craftingdeaddecoration:block/w_traffic_signs_damaged_bullet",
"y": 270
},
"facing=south": {
"model": "craftingdeaddecoration:block/w_traffic_signs_damaged_bullet",
"y": 180
}
}
}

0 comments on commit 496b95c

Please sign in to comment.