Skip to content

Commit

Permalink
fixed fence doors duplicating
Browse files Browse the repository at this point in the history
  • Loading branch information
Azagwen committed Jun 25, 2021
1 parent f7f5b93 commit 5a9c9f5
Showing 1 changed file with 32 additions and 9 deletions.
41 changes: 32 additions & 9 deletions src/main/java/net/azagwen/atbyw/datagen/arrp/AtbywLootTables.java
Original file line number Diff line number Diff line change
Expand Up @@ -218,6 +218,20 @@ private static void blockSlabSilkTouch(RuntimeResourcePack pack, Identifier silk
);
}

private static void blockDoorDropSelf(RuntimeResourcePack pack, Identifier blockID) {
pack.addLootTable(new Identifier(blockID.getNamespace(), "blocks/" + blockID.getPath()), JLootTable.loot("minecraft:block")
.pool(pool()
.rolls(1)
.entry(entry()
.type("minecraft:item")
.condition(condition("minecraft:block_state_property")
.parameter("block", blockID.toString())
.parameter("properties", blockStringProperty("half", "lower")))
.name(blockID.toString()))
.condition(condition("minecraft:survives_explosion")))
);
}

private static void blocksDropSelf(RuntimeResourcePack pack, ArrayList<Block> blocks) {
for (Block block : blocks) {
blockDropSelf(pack, getBlockID(block));
Expand All @@ -230,6 +244,12 @@ private static void blockSlabDropSelf(RuntimeResourcePack pack, ArrayList<Block>
}
}

private static void blocksDoorDropSelf(RuntimeResourcePack pack, ArrayList<Block> blocks) {
for (Block block : blocks) {
blockDoorDropSelf(pack, getBlockID(block));
}
}

//TODO: Add slab loot table builders.

public static void init() {
Expand Down Expand Up @@ -267,6 +287,18 @@ public static void init() {

blockCompactedSnow(ATBYW_RESOURCE_PACK, getBlockID(AtbywBlocks.COMPACTED_SNOW));

blocksDoorDropSelf(ATBYW_RESOURCE_PACK, Lists.newArrayList(
AtbywBlocks.IRON_FENCE_DOOR,
AtbywBlocks.OAK_FENCE_DOOR,
AtbywBlocks.SPRUCE_FENCE_DOOR,
AtbywBlocks.BIRCH_FENCE_DOOR,
AtbywBlocks.JUNGLE_FENCE_DOOR,
AtbywBlocks.ACACIA_FENCE_DOOR,
AtbywBlocks.DARK_OAK_FENCE_DOOR,
AtbywBlocks.CRIMSON_FENCE_DOOR,
AtbywBlocks.WARPED_FENCE_DOOR
));

blockSlabDropSelf(ATBYW_RESOURCE_PACK, Lists.newArrayList(
AtbywBlocks.DIRT_SLAB,
AtbywBlocks.COARSE_DIRT_SLAB,
Expand Down Expand Up @@ -332,15 +364,6 @@ public static void init() {
));

blocksDropSelf(ATBYW_RESOURCE_PACK, Lists.newArrayList(
AtbywBlocks.IRON_FENCE_DOOR,
AtbywBlocks.OAK_FENCE_DOOR,
AtbywBlocks.SPRUCE_FENCE_DOOR,
AtbywBlocks.BIRCH_FENCE_DOOR,
AtbywBlocks.JUNGLE_FENCE_DOOR,
AtbywBlocks.ACACIA_FENCE_DOOR,
AtbywBlocks.DARK_OAK_FENCE_DOOR,
AtbywBlocks.CRIMSON_FENCE_DOOR,
AtbywBlocks.WARPED_FENCE_DOOR,
AtbywBlocks.OAK_BOOKSHELF_TOGGLE,
AtbywBlocks.SPRUCE_BOOKSHELF_TOGGLE,
AtbywBlocks.BIRCH_BOOKSHELF_TOGGLE,
Expand Down

0 comments on commit 5a9c9f5

Please sign in to comment.