Skip to content

Commit

Permalink
Revert "Test model adding."
Browse files Browse the repository at this point in the history 
This reverts commit 00a75a6.
  • Loading branch information
@0xE69
0xE69 committed Mar 28, 2024
1 parent 42d9d87 commit d561229
Show file tree
Hide file tree
Showing 19 changed files with 1 addition and 1,005 deletions.
9 changes: 0 additions & 9 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 @@ -96,15 +96,6 @@ static void register() {
cutout(DecorationBlocks.LIGHT_SWITCH);
cutout(DecorationBlocks.ELECTRICAL_SOCKET);
cutout(DecorationBlocks.ABANDONED_CAMPFIRE);

cutout(DecorationBlocks.BH_barricade_001);
cutout(DecorationBlocks.BH_barricade_002);
cutout(DecorationBlocks.BH_bench_001);
cutout(DecorationBlocks.BH_bench_002);
cutout(DecorationBlocks.BH_bluebarrel_001);
cutout(DecorationBlocks.BH_cafeteria_table_001);
cutout(DecorationBlocks.BH_cafeteria_bench_001);
cutout(DecorationBlocks.BH_cardboard_box_001);

translucent(DecorationBlocks.QUARTZ_GLASS);
translucent(DecorationBlocks.VIBRANT_QUARTZ_GLASS);
Expand Down
8 changes: 0 additions & 8 deletions ...coration/src/main/java/com/craftingdead/decoration/data/DecorationBlockStateProvider.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,14 +46,6 @@ protected void registerStatesAndModels() {
this.horizontalBlock(DecorationBlocks.LIGHT_SWITCH);
this.horizontalBlock(DecorationBlocks.ELECTRICAL_SOCKET);
this.horizontalBlock(DecorationBlocks.ABANDONED_CAMPFIRE);
this.horizontalBlock(DecorationBlocks.BH_BARRICADE_001);
this.horizontalBlock(DecorationBlocks.BH_BARRICADE_002);
this.horizontalBlock(DecorationBlocks.BH_BENCH_001);
this.horizontalBlock(DecorationBlocks.BH_BENCH_002);
this.horizontalBlock(DecorationBlocks.BH_BLUEBARREL_001);
this.horizontalBlock(DecorationBlocks.BH_CAFETERIA_BENCH_001);
this.horizontalBlock(DecorationBlocks.BH_CAFETERIA_TABLE_001);
this.horizontalBlock(DecorationBlocks.BH_CARDBOARD_BOX_001);

this.horizontalBlock(DecorationBlocks.CLOTHING_RACK.get(),
state -> this.blockModel("clothing_rack_"
Expand Down
40 changes: 0 additions & 40 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 @@ -1139,46 +1139,6 @@ public ItemStack makeIcon() {
deferredRegister.register("lime_stained_glass",
() -> new BlockItem(DecorationBlocks.HL2_TRASH.get(),
new Item.Properties().tab(TAB)));

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

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

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

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

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

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

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

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

public static final RegistryObject<Item> HL2_TRASH_2 =
deferredRegister.register("pink_stained_glass",
Expand Down
87 changes: 1 addition & 86 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 @@ -32,7 +32,7 @@ public class BlockShapes {

public static final Function<Direction, VoxelShape> FUSE_BOX =
rotatedOrientableShape(Block.box(1, 0, 13, 15, 20, 16));

public static final Function<Direction, VoxelShape> BOXES_OF_BULLETS =
rotatedOrientableShape(Block.box(2, 0, 4, 14, 6, 14));

Expand Down Expand Up @@ -373,91 +373,6 @@ public class BlockShapes {
Block.box(0.5, 12.5, 0.5, 16, 16, 16),
Block.box(2, 0, 2, 16, 12.5, 16)));

public static final VoxelShape BH_BARRICADE_002 = Shapes.or(
Block.box(-7.0D, 0.0D, 10.45D, 7.0D, 0.6D, 11.05D),
Block.box(-7.0D, 0.0D, -11.55D, 7.0D, 0.6D, -10.95D),
Block.box(0.25D, 23.0D, -14.0D, 0.5D, 27.0D, 14.0D),
Block.box(0.25D, 16.0D, -14.0D, 0.5D, 20.0D, 14.0D),
Block.box(0.25D, 9.0D, -14.0D, 0.5D, 13.0D, 14.0D),
Block.box(-0.3D, 0.6D, -10.95D, 0.3D, 27.1D, -10.35D),
Block.box(-0.3D, 0.6D, 10.45D, 0.3D, 27.1D, 11.05D)
);

public static final VoxelShape BH_BARRICADE_001 = Shapes.or(
Block.box(-11, -0.95, 5.55, 8, -0.55, 5.95),
Block.box(-8, -0.95, 5.55, 11, -0.55, 5.95),
Block.box(-11, -0.95, -5.95, 8, -0.55, -5.55),
Block.box(-3.93853, 6.84104, -6.95, 1.06147, 7.09104, 6.95),
Block.box(-1.03853, 6.84104, -6.95, 3.96147, 7.09104, 6.95),
Block.box(9.66147, 6.84104, -6.95, 14.66147, 7.09104, 6.95),
Block.box(-14.63853, 6.84104, -6.95, -9.63853, 7.09104, 6.95)
);

public static final Function<Direction, VoxelShape> BH_BARRICADE_001 =
rotatedOrientableShape(Shapes.or(
Block.box(-11, -0.95, 5.55, 8, -0.55, 5.95),
Block.box(-8, -0.95, 5.55, 11, -0.55, 5.95),
Block.box(-11, -0.95, -5.95, 8, -0.55, -5.55),
Block.box(-3.93853, 6.84104, -6.95, 1.06147, 7.09104, 6.95),
Block.box(-1.03853, 6.84104, -6.95, 3.96147, 7.09104, 6.95),
Block.box(9.66147, 6.84104, -6.95, 14.66147, 7.09104, 6.95),
Block.box(-14.63853, 6.84104, -6.95, -9.63853, 7.09104, 6.95)
));

public static final Function<Direction, VoxelShape> BH_BARRICADE_002 =
rotatedOrientableShape(Shapes.or(
Block.box(-7, 0, 10.45, 7, 0.6, 11.05),
Block.box(-7, 0, -11.55, 7, 0.6, -10.95),
Block.box(0.25, 23, -14, 0.5, 27, 14),
Block.box(0.25, 16, -14, 0.5, 20, 14),
Block.box(0.25, 9, -14, 0.5, 13, 14),
Block.box(-0.3, 0.6, -10.95, 0.3, 27.1, -10.35),
Block.box(-0.3, 0.6, 10.45, 0.3, 27.1, 11.05)
));

public static final Function<Direction, VoxelShape> BH_BENCH_001 =
rotatedOrientableShape(Shapes.or(
Block.box(5.5, 0, 3.6, 6.5, 7, 5.6),
Block.box(-12.7, 7, -31.3, -2.8, 8, 5.5),
Block.box(-8.1, 9.1, -31.3, -0.2, 11.1, -30.5),
Block.box(-39, 5, -31.3, -36.5, 6.55, -30.5),
Block.box(-44.1, 9.1, -31.3, -36.2, 11.1, -30.5),
Block.box(-3, 5, -31.3, -0.5, 6.55, -30.5),
Block.box(-27.4, -8, 1.4, -24.9, 29, 2)
));

public static final Function<Direction, VoxelShape> BH_CARDBOARD_BOX_001 =
rotatedOrientableShape(Shapes.or(
Block.box(-8, 0, -6.5, 8, 9, 6.5)
));

public static final Function<Direction, VoxelShape> BH_BLUEBARREL_001 =
rotatedOrientableShape(Shapes.or(
Block.box(-4.9, 3.5, 2.83, 4.9, 5, 3.53), // Assuming these dimensions fit within a single block space
Block.box(-4.9, -11.4, 17.73, 4.9, -9.9, 18.43),
Block.box(-5, 1, 5, 5, 20, 6),
Block.box(21.75, -6, -6, 22.5, 6, 6)
));

public static final Function<Direction, VoxelShape> BH_CAFETERIA_BENCH_001 =
rotatedOrientableShape(Shapes.or(
Block.box(-26.5 + 16, 5.75, -2.5 + 8, 26.5 + 16, 6.5, 2.5 + 8),
Block.box(-21.4 + 16, 0.5, -1.5 + 8, -20.45 + 16, 5, 1.5 + 8),
Block.box(-21.4 + 16, -0.08135 + 0.5, 1.4783 + 8, -20.45 + 16, 1.61865 + 0.5, 1.9783 + 8),
Block.box(-21.4 + 16, -0.08135 + 0.5, -1.9783 + 8, -20.45 + 16, 1.61865 + 0.5, -1.4783 + 8),
Block.box(-21.4 + 16, -0.1 + 0.5, 1.5 + 8, -20.45 + 16, 5.1 + 0.5, 2 + 8),
Block.box(-21.4 + 16, -0.1 + 0.5, -2 + 8, -20.45 + 16, 5.1 + 0.5, -1.5 + 8)
));


public static final Function<Direction, VoxelShape> BH_BENCH_002 =
rotatedOrientableShape(Shapes.or(
Block.box(-16.45, 3.75, -1, -15.95, 5.25, 1),
Block.box(-22, 6, 2, 22, 6.5, 5),
Block.box(-19, 4.85082, -0.75, 19, 5.14918, 0.75),
Block.box(-13.34918, 0, -0.75, -13.2, 3.25, 0.75)
));

public static final Function<Direction, VoxelShape> COUNTER =
rotatedOrientableShape(Shapes.or(
Block.box(0, 12.5, 0.5, 16, 16, 16),
Expand Down
61 changes: 0 additions & 61 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 @@ -631,67 +631,6 @@ public class DecorationBlocks {
.noOcclusion(),
BlockShapes.COMPUTER));

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

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

public static final RegistryObject<Block> BH_BENCH_001 =
deferredRegister.register("BH_bench_001",
() -> new Block(
BlockBehaviour.Properties.of(Material.WOOD)
.strength(2.0F)
.sound(SoundType.WOOD)));

public static final RegistryObject<Block> BH_CARDBOARD_BOX_001 =
deferredRegister.register("BH_cardboard_box_001",
() -> new Block(
BlockBehaviour.Properties.of(Material.WOOD)
.strength(2.0F)
.sound(SoundType.WOOD)));

public static final RegistryObject<Block> BH_BENCH_002 =
deferredRegister.register("BH_bench_002",
() -> new Block(
BlockBehaviour.Properties.of(Material.WOOD)
.strength(2.0F)
.sound(SoundType.WOOD)));

public static final RegistryObject<Block> BH_BLUEBARREL_001 =
deferredRegister.register("BH_bluebarrel_001",
() -> new Block(
BlockBehaviour.Properties.of(Material.METAL)
.strength(3.0F)
.sound(SoundType.METAL)
.noOcclusion()));

public static final RegistryObject<Block> BH_CAFETERIA_BENCH_001 =
deferredRegister.register("BH_cafeteria_bench_001",
() -> new Block(
BlockBehaviour.Properties.of(Material.WOOD)
.strength(2.5F)
.sound(SoundType.WOOD)));

public static final RegistryObject<Block> BH_CAFETERIA_TABLE_001 =
deferredRegister.register("BH_cafeteria_table_001",
() -> new Block(
BlockBehaviour.Properties.of(Material.WOOD)
.strength(2.5F)
.sound(SoundType.WOOD)));

public static final RegistryObject<Block> COMPUTER_2 =
deferredRegister.register("computer_2",
() -> new OrientableBlock(
Expand Down
123 changes: 0 additions & 123 deletions ...ation/src/main/resources/assets/craftingdeaddecoration/models/block/BH_barricade_001.json
View file

This file was deleted.

0 comments on commit d561229

Please sign in to comment.