Skip to content

Commit

Permalink
fix a few minor issues
Browse files Browse the repository at this point in the history
  • Loading branch information
@xanthian
xanthian committed Sep 17, 2023
1 parent 4d05f00 commit 16e9701
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 43 deletions.
0 .../loot_tables/blocks/ru_cherry_barrel.json → .../loot_tables/blocks/ru_cherry_barrel.json
View file
File renamed without changes.
0 ...ot_tables/blocks/ru_sculkwood_barrel.json → ...ot_tables/blocks/ru_sculkwood_barrel.json
View file
File renamed without changes.
42 changes: 3 additions & 39 deletions src/main/java/net/xanthian/variantbarrels/datagen/LootTableGenerator.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -59,46 +59,10 @@ public void generate() {
}

// Regions Unexplored
addDrop(RegionsUnexplored.RU_ALPHA_OAK_BARREL, addConditions(nameableContainerDrops(RegionsUnexplored.RU_ALPHA_OAK_BARREL), List.of(DefaultResourceConditions.allModsLoaded("regions_unexplored"))));
addDrop(RegionsUnexplored.RU_BAOBAB_BARREL, addConditions(nameableContainerDrops(RegionsUnexplored.RU_BAOBAB_BARREL), List.of(DefaultResourceConditions.allModsLoaded("regions_unexplored"))));
addDrop(RegionsUnexplored.RU_BLACK_PAINTED_BARREL, addConditions(nameableContainerDrops(RegionsUnexplored.RU_BLACK_PAINTED_BARREL), List.of(DefaultResourceConditions.allModsLoaded("regions_unexplored"))));
addDrop(RegionsUnexplored.RU_BLACKWOOD_BARREL, addConditions(nameableContainerDrops(RegionsUnexplored.RU_BLACKWOOD_BARREL), List.of(DefaultResourceConditions.allModsLoaded("regions_unexplored"))));
addDrop(RegionsUnexplored.RU_BLUE_PAINTED_BARREL, addConditions(nameableContainerDrops(RegionsUnexplored.RU_BLUE_PAINTED_BARREL), List.of(DefaultResourceConditions.allModsLoaded("regions_unexplored"))));
addDrop(RegionsUnexplored.RU_BROWN_PAINTED_BARREL, addConditions(nameableContainerDrops(RegionsUnexplored.RU_BROWN_PAINTED_BARREL), List.of(DefaultResourceConditions.allModsLoaded("regions_unexplored"))));
addDrop(RegionsUnexplored.RU_CYAN_PAINTED_BARREL, addConditions(nameableContainerDrops(RegionsUnexplored.RU_CYAN_PAINTED_BARREL), List.of(DefaultResourceConditions.allModsLoaded("regions_unexplored"))));
addDrop(RegionsUnexplored.RU_CYPRESS_BARREL, addConditions(nameableContainerDrops(RegionsUnexplored.RU_CYPRESS_BARREL), List.of(DefaultResourceConditions.allModsLoaded("regions_unexplored"))));
addDrop(RegionsUnexplored.RU_DEAD_BARREL, addConditions(nameableContainerDrops(RegionsUnexplored.RU_DEAD_BARREL), List.of(DefaultResourceConditions.allModsLoaded("regions_unexplored"))));
addDrop(RegionsUnexplored.RU_EUCALYPTUS_BARREL, addConditions(nameableContainerDrops(RegionsUnexplored.RU_EUCALYPTUS_BARREL), List.of(DefaultResourceConditions.allModsLoaded("regions_unexplored"))));
addDrop(RegionsUnexplored.RU_GREEN_PAINTED_BARREL, addConditions(nameableContainerDrops(RegionsUnexplored.RU_GREEN_PAINTED_BARREL), List.of(DefaultResourceConditions.allModsLoaded("regions_unexplored"))));
addDrop(RegionsUnexplored.RU_GRAY_PAINTED_BARREL, addConditions(nameableContainerDrops(RegionsUnexplored.RU_GRAY_PAINTED_BARREL), List.of(DefaultResourceConditions.allModsLoaded("regions_unexplored"))));
addDrop(RegionsUnexplored.RU_JOSHUA_BARREL, addConditions(nameableContainerDrops(RegionsUnexplored.RU_JOSHUA_BARREL), List.of(DefaultResourceConditions.allModsLoaded("regions_unexplored"))));
addDrop(RegionsUnexplored.RU_LARCH_BARREL, addConditions(nameableContainerDrops(RegionsUnexplored.RU_LARCH_BARREL), List.of(DefaultResourceConditions.allModsLoaded("regions_unexplored"))));
addDrop(RegionsUnexplored.RU_LIGHT_BLUE_PAINTED_BARREL, addConditions(nameableContainerDrops(RegionsUnexplored.RU_LIGHT_BLUE_PAINTED_BARREL), List.of(DefaultResourceConditions.allModsLoaded("regions_unexplored"))));
addDrop(RegionsUnexplored.RU_LIGHT_GRAY_PAINTED_BARREL, addConditions(nameableContainerDrops(RegionsUnexplored.RU_LIGHT_GRAY_PAINTED_BARREL), List.of(DefaultResourceConditions.allModsLoaded("regions_unexplored"))));
addDrop(RegionsUnexplored.RU_LIME_PAINTED_BARREL, addConditions(nameableContainerDrops(RegionsUnexplored.RU_LIME_PAINTED_BARREL), List.of(DefaultResourceConditions.allModsLoaded("regions_unexplored"))));
addDrop(RegionsUnexplored.RU_MAGENTA_PAINTED_BARREL, addConditions(nameableContainerDrops(RegionsUnexplored.RU_MAGENTA_PAINTED_BARREL), List.of(DefaultResourceConditions.allModsLoaded("regions_unexplored"))));
addDrop(RegionsUnexplored.RU_MAPLE_BARREL, addConditions(nameableContainerDrops(RegionsUnexplored.RU_MAPLE_BARREL), List.of(DefaultResourceConditions.allModsLoaded("regions_unexplored"))));
addDrop(RegionsUnexplored.RU_MAUVE_BARREL, addConditions(nameableContainerDrops(RegionsUnexplored.RU_MAUVE_BARREL), List.of(DefaultResourceConditions.allModsLoaded("regions_unexplored"))));
addDrop(RegionsUnexplored.RU_ORANGE_PAINTED_BARREL, addConditions(nameableContainerDrops(RegionsUnexplored.RU_ORANGE_PAINTED_BARREL), List.of(DefaultResourceConditions.allModsLoaded("regions_unexplored"))));
addDrop(RegionsUnexplored.RU_PALM_BARREL, addConditions(nameableContainerDrops(RegionsUnexplored.RU_PALM_BARREL), List.of(DefaultResourceConditions.allModsLoaded("regions_unexplored"))));
addDrop(RegionsUnexplored.RU_PINE_BARREL, addConditions(nameableContainerDrops(RegionsUnexplored.RU_PINE_BARREL), List.of(DefaultResourceConditions.allModsLoaded("regions_unexplored"))));
addDrop(RegionsUnexplored.RU_PINK_PAINTED_BARREL, addConditions(nameableContainerDrops(RegionsUnexplored.RU_PINK_PAINTED_BARREL), List.of(DefaultResourceConditions.allModsLoaded("regions_unexplored"))));
addDrop(RegionsUnexplored.RU_PURPLE_PAINTED_BARREL, addConditions(nameableContainerDrops(RegionsUnexplored.RU_PURPLE_PAINTED_BARREL), List.of(DefaultResourceConditions.allModsLoaded("regions_unexplored"))));
addDrop(RegionsUnexplored.RU_RED_PAINTED_BARREL, addConditions(nameableContainerDrops(RegionsUnexplored.RU_RED_PAINTED_BARREL), List.of(DefaultResourceConditions.allModsLoaded("regions_unexplored"))));
addDrop(RegionsUnexplored.RU_REDWOOD_BARREL, addConditions(nameableContainerDrops(RegionsUnexplored.RU_REDWOOD_BARREL), List.of(DefaultResourceConditions.allModsLoaded("regions_unexplored"))));

addDrop(RegionsUnexplored.RU_WHITE_PAINTED_BARREL, addConditions(nameableContainerDrops(RegionsUnexplored.RU_WHITE_PAINTED_BARREL), List.of(DefaultResourceConditions.allModsLoaded("regions_unexplored"))));
addDrop(RegionsUnexplored.RU_WILLOW_BARREL, addConditions(nameableContainerDrops(RegionsUnexplored.RU_WILLOW_BARREL), List.of(DefaultResourceConditions.allModsLoaded("regions_unexplored"))));
addDrop(RegionsUnexplored.RU_YELLOW_PAINTED_BARREL, addConditions(nameableContainerDrops(RegionsUnexplored.RU_YELLOW_PAINTED_BARREL), List.of(DefaultResourceConditions.allModsLoaded("regions_unexplored"))));
//addDrop(RegionsUnexplored.RU_CHERRY_BARREL, addConditions(nameableContainerDrops(RegionsUnexplored.RU_CHERRY_BARREL), List.of(DefaultResourceConditions.and(DefaultResourceConditions.allModsLoaded("regions_unexplored"),DefaultResourceConditions.registryContains(RegistryKey.of(RegistryKeys.BLOCK, new Identifier("regions_unexplored:cherry_planks")))))));
//addDrop(RegionsUnexplored.RU_SCULKWOOD_BARREL, addConditions(nameableContainerDrops(RegionsUnexplored.RU_SCULKWOOD_BARREL), List.of(DefaultResourceConditions.and(DefaultResourceConditions.allModsLoaded("regions_unexplored"),DefaultResourceConditions.registryContains(RegistryKey.of(RegistryKeys.BLOCK, new Identifier("regions_unexplored:sculkwood_planks")))))));
addDrop(RegionsUnexplored.RU_BRIMWOOD_BARREL, addConditions(drops(RegionsUnexplored.RU_BRIMWOOD_BARREL), List.of(DefaultResourceConditions.and(DefaultResourceConditions.allModsLoaded("regions_unexplored")))));
addDrop(RegionsUnexplored.RU_COBALT_BARREL, addConditions(drops(RegionsUnexplored.RU_COBALT_BARREL), List.of(DefaultResourceConditions.and(DefaultResourceConditions.allModsLoaded("regions_unexplored")))));
addDrop(RegionsUnexplored.RU_KAPOK_BARREL, addConditions(drops(RegionsUnexplored.RU_KAPOK_BARREL), List.of(DefaultResourceConditions.and(DefaultResourceConditions.allModsLoaded("regions_unexplored")))));
addDrop(RegionsUnexplored.RU_MAGNOLIA_BARREL, addConditions(drops(RegionsUnexplored.RU_MAGNOLIA_BARREL), List.of(DefaultResourceConditions.and(DefaultResourceConditions.allModsLoaded("regions_unexplored")))));
addDrop(RegionsUnexplored.RU_SOCOTRA_BARREL, addConditions(drops(RegionsUnexplored.RU_SOCOTRA_BARREL), List.of(DefaultResourceConditions.and(DefaultResourceConditions.allModsLoaded("regions_unexplored")))));
addDrop(RegionsUnexplored.RU_YELLOW_BIOSHROOM_BARREL, addConditions(drops(RegionsUnexplored.RU_YELLOW_BIOSHROOM_BARREL), List.of(DefaultResourceConditions.and(DefaultResourceConditions.allModsLoaded("regions_unexplored")))));

for (Block block : RegionsUnexplored.RU_BARRELS.values()){
addDrop(block, addConditions(nameableContainerDrops(block),List.of(DefaultResourceConditions.allModsLoaded("regions_unexplored"))));
}

// SnifferPlus
addDrop(SnifferPlus.SP_STONE_PINE_BARREL, addConditions(nameableContainerDrops(SnifferPlus.SP_STONE_PINE_BARREL), List.of(DefaultResourceConditions.allModsLoaded("snifferplus"))));
Expand Down
7 changes: 3 additions & 4 deletions src/main/java/net/xanthian/variantbarrels/util/ModCreativeTab.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -68,10 +68,9 @@ public class ModCreativeTab {
}
}
if (FabricLoader.getInstance().isModLoaded("promenade")) {
entries.add(Promenade.PROM_DARK_AMARANTH_BARREL);
entries.add(Promenade.PROM_MAPLE_BARREL);
entries.add(Promenade.PROM_PALM_BARREL);
entries.add(Promenade.PROM_SAKURA_BARREL);
for (Block block : Promenade.PROM_BARRELS.values()) {
entries.add(block);
}
}
if (FabricLoader.getInstance().isModLoaded("regions_unexplored")){
entries.add(RegionsUnexplored.RU_ALPHA_OAK_BARREL);
Expand Down

0 comments on commit 16e9701

Please sign in to comment.