diff --git a/gradle.properties b/gradle.properties index 796df47a..6f8bbbe6 100644 --- a/gradle.properties +++ b/gradle.properties @@ -13,13 +13,13 @@ modrinth_versions=["1.20", "1.20.1"] release_channel=beta modrinth_id=betterend # Mod Properties -mod_version=4.0.7 +mod_version=4.0.8 maven_group=org.betterx.betterend archives_base_name=better-end # Dependencies # currently not on the main fabric site, check on the maven: https://maven.fabricmc.net/net/fabricmc/fabric-api/fabric-api patchouli_version=1.19-73-FABRIC -bclib_version=3.0.10 +bclib_version=3.0.11 rei_version=12.0.622 emi_version=1.0.3+1.20 trinkets_version=3.7.0 diff --git a/src/main/generated/data/betterend/advancements/all_the_biomes.json b/src/main/generated/data/betterend/advancements/all_the_biomes.json index bbf49edb..8e166967 100644 --- a/src/main/generated/data/betterend/advancements/all_the_biomes.json +++ b/src/main/generated/data/betterend/advancements/all_the_biomes.json @@ -420,52 +420,34 @@ }, "requirements": [ [ - "betterend:megalake_grove" - ], - [ - "betterend:blossoming_spires" + "betterend:chorus_forest" ], [ "betterend:lush_smaragdant_cave" ], [ - "betterend:ice_starfield" - ], - [ - "betterend:neon_oasis" - ], - [ - "betterend:umbrella_jungle" - ], - [ - "betterend:empty_aurora_cave" - ], - [ - "betterend:chorus_forest" - ], - [ - "betterend:sulphur_springs" - ], - [ - "betterend:shadow_forest" - ], - [ - "betterend:megalake" + "betterend:foggy_mushroomland" ], [ "betterend:lush_aurora_cave" ], [ - "betterend:empty_smaragdant_cave" + "betterend:megalake" ], [ - "betterend:jade_cave" + "betterend:sulphur_springs" + ], + [ + "betterend:megalake_grove" ], [ "betterend:dragon_graveyards" ], [ - "betterend:dry_shrubland" + "betterend:dust_wastelands" + ], + [ + "betterend:empty_end_cave" ], [ "betterend:amber_land" @@ -474,25 +456,43 @@ "betterend:umbra_valley" ], [ - "betterend:foggy_mushroomland" + "betterend:jade_cave" + ], + [ + "betterend:empty_aurora_cave" ], [ "betterend:crystal_mountains" ], [ - "betterend:empty_end_cave" + "betterend:blossoming_spires" + ], + [ + "betterend:painted_mountains" ], [ "betterend:glowing_grasslands" ], [ - "betterend:dust_wastelands" + "betterend:umbrella_jungle" + ], + [ + "betterend:empty_smaragdant_cave" + ], + [ + "betterend:shadow_forest" + ], + [ + "betterend:ice_starfield" ], [ "betterend:lantern_woods" ], [ - "betterend:painted_mountains" + "betterend:dry_shrubland" + ], + [ + "betterend:neon_oasis" ] ], "rewards": { diff --git a/src/main/generated/data/betterend/loot_tables/blocks/dragon_tree_sign.json b/src/main/generated/data/betterend/loot_tables/blocks/dragon_tree_sign.json new file mode 100644 index 00000000..c09aedca --- /dev/null +++ b/src/main/generated/data/betterend/loot_tables/blocks/dragon_tree_sign.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "betterend:dragon_tree_sign" + } + ], + "rolls": 1.0 + } + ] +} \ No newline at end of file diff --git a/src/main/generated/data/betterend/loot_tables/blocks/end_lotus_sign.json b/src/main/generated/data/betterend/loot_tables/blocks/end_lotus_sign.json new file mode 100644 index 00000000..1eb1e196 --- /dev/null +++ b/src/main/generated/data/betterend/loot_tables/blocks/end_lotus_sign.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "betterend:end_lotus_sign" + } + ], + "rolls": 1.0 + } + ] +} \ No newline at end of file diff --git a/src/main/generated/data/betterend/loot_tables/blocks/helix_tree_sign.json b/src/main/generated/data/betterend/loot_tables/blocks/helix_tree_sign.json new file mode 100644 index 00000000..7a92b715 --- /dev/null +++ b/src/main/generated/data/betterend/loot_tables/blocks/helix_tree_sign.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "betterend:helix_tree_sign" + } + ], + "rolls": 1.0 + } + ] +} \ No newline at end of file diff --git a/src/main/generated/data/betterend/loot_tables/blocks/jellyshroom_sign.json b/src/main/generated/data/betterend/loot_tables/blocks/jellyshroom_sign.json new file mode 100644 index 00000000..522a43d1 --- /dev/null +++ b/src/main/generated/data/betterend/loot_tables/blocks/jellyshroom_sign.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "betterend:jellyshroom_sign" + } + ], + "rolls": 1.0 + } + ] +} \ No newline at end of file diff --git a/src/main/generated/data/betterend/loot_tables/blocks/lacugrove_sign.json b/src/main/generated/data/betterend/loot_tables/blocks/lacugrove_sign.json new file mode 100644 index 00000000..908b2468 --- /dev/null +++ b/src/main/generated/data/betterend/loot_tables/blocks/lacugrove_sign.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "betterend:lacugrove_sign" + } + ], + "rolls": 1.0 + } + ] +} \ No newline at end of file diff --git a/src/main/generated/data/betterend/loot_tables/blocks/lucernia_sign.json b/src/main/generated/data/betterend/loot_tables/blocks/lucernia_sign.json new file mode 100644 index 00000000..598361c6 --- /dev/null +++ b/src/main/generated/data/betterend/loot_tables/blocks/lucernia_sign.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "betterend:lucernia_sign" + } + ], + "rolls": 1.0 + } + ] +} \ No newline at end of file diff --git a/src/main/generated/data/betterend/loot_tables/blocks/mossy_glowshroom_sign.json b/src/main/generated/data/betterend/loot_tables/blocks/mossy_glowshroom_sign.json new file mode 100644 index 00000000..c3c04906 --- /dev/null +++ b/src/main/generated/data/betterend/loot_tables/blocks/mossy_glowshroom_sign.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "betterend:mossy_glowshroom_sign" + } + ], + "rolls": 1.0 + } + ] +} \ No newline at end of file diff --git a/src/main/generated/data/betterend/loot_tables/blocks/pythadendron_sign.json b/src/main/generated/data/betterend/loot_tables/blocks/pythadendron_sign.json new file mode 100644 index 00000000..63c38057 --- /dev/null +++ b/src/main/generated/data/betterend/loot_tables/blocks/pythadendron_sign.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "betterend:pythadendron_sign" + } + ], + "rolls": 1.0 + } + ] +} \ No newline at end of file diff --git a/src/main/generated/data/betterend/loot_tables/blocks/tenanea_sign.json b/src/main/generated/data/betterend/loot_tables/blocks/tenanea_sign.json new file mode 100644 index 00000000..1556ca54 --- /dev/null +++ b/src/main/generated/data/betterend/loot_tables/blocks/tenanea_sign.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "betterend:tenanea_sign" + } + ], + "rolls": 1.0 + } + ] +} \ No newline at end of file diff --git a/src/main/generated/data/betterend/loot_tables/blocks/umbrella_tree_sign.json b/src/main/generated/data/betterend/loot_tables/blocks/umbrella_tree_sign.json new file mode 100644 index 00000000..25b7fa22 --- /dev/null +++ b/src/main/generated/data/betterend/loot_tables/blocks/umbrella_tree_sign.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "betterend:umbrella_tree_sign" + } + ], + "rolls": 1.0 + } + ] +} \ No newline at end of file diff --git a/src/main/java/org/betterx/datagen/betterend/BetterEndDatagen.java b/src/main/java/org/betterx/datagen/betterend/BetterEndDatagen.java index bc69c028..ce0d7469 100644 --- a/src/main/java/org/betterx/datagen/betterend/BetterEndDatagen.java +++ b/src/main/java/org/betterx/datagen/betterend/BetterEndDatagen.java @@ -1,6 +1,7 @@ package org.betterx.datagen.betterend; import org.betterx.datagen.betterend.advancement.EndAdvancementDataProvider; +import org.betterx.datagen.betterend.recipes.EndBlockLootTableProvider; import org.betterx.datagen.betterend.recipes.EndChestLootTableProvider; import org.betterx.datagen.betterend.recipes.EndRecipeDataProvider; import org.betterx.datagen.betterend.worldgen.EndBiomesDataProvider; @@ -30,6 +31,7 @@ public class BetterEndDatagen implements DataGeneratorEntrypoint { pack.addProvider(EndBlockTagDataProvider::new); pack.addProvider(EndItemTagDataProvider::new); pack.addProvider(EndChestLootTableProvider::new); + pack.addProvider(EndBlockLootTableProvider::new); } diff --git a/src/main/java/org/betterx/datagen/betterend/recipes/EndBlockLootTableProvider.java b/src/main/java/org/betterx/datagen/betterend/recipes/EndBlockLootTableProvider.java new file mode 100644 index 00000000..5cdbe81e --- /dev/null +++ b/src/main/java/org/betterx/datagen/betterend/recipes/EndBlockLootTableProvider.java @@ -0,0 +1,16 @@ +package org.betterx.datagen.betterend.recipes; + +import org.betterx.bclib.api.v3.datagen.BlockLootTableProvider; +import org.betterx.betterend.BetterEnd; + +import net.fabricmc.fabric.api.datagen.v1.FabricDataOutput; + +import java.util.List; + +public class EndBlockLootTableProvider extends BlockLootTableProvider { + public EndBlockLootTableProvider( + FabricDataOutput output + ) { + super(output, List.of(BetterEnd.MOD_ID)); + } +} diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index 900e1116..ff02136c 100644 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -53,7 +53,7 @@ "bclib": "3.0.x" }, "breaks": { - "bclib": "<3.0.10" + "bclib": "<3.0.11" }, "suggests": { "byg": ">=2.0.0",