From 1600d18ee4bca166b14d8fb2beec6626c0a807fb Mon Sep 17 00:00:00 2001 From: Frank Date: Sun, 4 Jun 2023 17:25:16 +0200 Subject: [PATCH] Regenerated Datapack --- gradle.properties | 6 +- .../advancements/all_the_biomes.json | 72 +++++++++---------- .../generated/data/c/tags/blocks/plant.json | 2 + .../data/c/tags/blocks/saplings.json | 10 +-- .../generated/data/c/tags/items/saplings.json | 13 ---- .../tags/blocks/mineable/pickaxe.json | 3 - .../data/minecraft/tags/blocks/saplings.json | 13 ---- .../data/minecraft/tags/items/saplings.json | 13 ---- .../worldgen/EndBiomesDataProvider.java | 12 ++++ src/main/resources/fabric.mod.json | 6 +- 10 files changed, 58 insertions(+), 92 deletions(-) delete mode 100644 src/main/generated/data/c/tags/items/saplings.json delete mode 100644 src/main/generated/data/minecraft/tags/blocks/saplings.json delete mode 100644 src/main/generated/data/minecraft/tags/items/saplings.json diff --git a/gradle.properties b/gradle.properties index 4e648cb2..ca85a528 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,9 +2,9 @@ org.gradle.jvmargs=-Xmx2G # Fabric Properties # check these on https://fabricmc.net/versions.html -minecraft_version=1.20-pre5 -loader_version=0.14.19 -fabric_version=0.81.3+1.20 +minecraft_version=1.20-pre7 +loader_version=0.14.21 +fabric_version=0.83.0+1.20 #Loom loom_version=1.0-SNAPSHOT #Modrinth 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 9665aeaf..094fa8df 100644 --- a/src/main/generated/data/betterend/advancements/all_the_biomes.json +++ b/src/main/generated/data/betterend/advancements/all_the_biomes.json @@ -420,49 +420,52 @@ }, "requirements": [ [ - "betterend:umbrella_jungle" - ], - [ - "betterend:chorus_forest" + "betterend:shadow_forest" ], [ "betterend:empty_smaragdant_cave" ], [ - "betterend:sulphur_springs" + "betterend:empty_aurora_cave" ], [ - "betterend:dragon_graveyards" - ], - [ - "betterend:neon_oasis" - ], - [ - "betterend:shadow_forest" - ], - [ - "betterend:megalake_grove" - ], - [ - "betterend:dust_wastelands" + "betterend:umbrella_jungle" ], [ "betterend:foggy_mushroomland" ], + [ + "betterend:crystal_mountains" + ], + [ + "betterend:blossoming_spires" + ], + [ + "betterend:ice_starfield" + ], + [ + "betterend:sulphur_springs" + ], + [ + "betterend:chorus_forest" + ], + [ + "betterend:dry_shrubland" + ], [ "betterend:glowing_grasslands" ], + [ + "betterend:dragon_graveyards" + ], + [ + "betterend:megalake_grove" + ], [ "betterend:lantern_woods" ], [ - "betterend:empty_aurora_cave" - ], - [ - "betterend:lush_smaragdant_cave" - ], - [ - "betterend:ice_starfield" + "betterend:neon_oasis" ], [ "betterend:jade_cave" @@ -471,16 +474,7 @@ "betterend:empty_end_cave" ], [ - "betterend:painted_mountains" - ], - [ - "betterend:amber_land" - ], - [ - "betterend:blossoming_spires" - ], - [ - "betterend:crystal_mountains" + "betterend:lush_smaragdant_cave" ], [ "betterend:megalake" @@ -488,11 +482,17 @@ [ "betterend:lush_aurora_cave" ], + [ + "betterend:painted_mountains" + ], + [ + "betterend:dust_wastelands" + ], [ "betterend:umbra_valley" ], [ - "betterend:dry_shrubland" + "betterend:amber_land" ] ], "rewards": { diff --git a/src/main/generated/data/c/tags/blocks/plant.json b/src/main/generated/data/c/tags/blocks/plant.json index 7e2ca9ba..46d9e98f 100644 --- a/src/main/generated/data/c/tags/blocks/plant.json +++ b/src/main/generated/data/c/tags/blocks/plant.json @@ -1,6 +1,7 @@ { "replace": false, "values": [ + "betterend:blue_vine", "betterend:blue_vine_seed", "betterend:bulb_vine_seed", "betterend:cave_pumpkin_seed", @@ -9,6 +10,7 @@ "betterend:filalux_wings", "betterend:flamaea", "betterend:flammalix", + "betterend:glowing_pillar_roots", "betterend:glowing_pillar_seed", "betterend:lanceleaf_seed", "betterend:large_amaranita_mushroom", diff --git a/src/main/generated/data/c/tags/blocks/saplings.json b/src/main/generated/data/c/tags/blocks/saplings.json index e78c0ece..cada37e5 100644 --- a/src/main/generated/data/c/tags/blocks/saplings.json +++ b/src/main/generated/data/c/tags/blocks/saplings.json @@ -1,16 +1,10 @@ { "replace": false, "values": [ - "betterend:dragon_tree_sapling", - "betterend:helix_tree_sapling", - "betterend:lacugrove_sapling", - "betterend:lucernia_sapling", - "betterend:mossy_glowshroom_sapling", - "betterend:pythadendron_sapling", - "betterend:tenanea_sapling", - "betterend:umbrella_tree_sapling", "minecraft:acacia_sapling", + "minecraft:bamboo_sapling", "minecraft:birch_sapling", + "minecraft:cherry_sapling", "minecraft:dark_oak_sapling", "minecraft:jungle_sapling", "minecraft:mangrove_propagule", diff --git a/src/main/generated/data/c/tags/items/saplings.json b/src/main/generated/data/c/tags/items/saplings.json deleted file mode 100644 index af4d04a0..00000000 --- a/src/main/generated/data/c/tags/items/saplings.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "replace": false, - "values": [ - "betterend:dragon_tree_sapling", - "betterend:helix_tree_sapling", - "betterend:lacugrove_sapling", - "betterend:lucernia_sapling", - "betterend:mossy_glowshroom_sapling", - "betterend:pythadendron_sapling", - "betterend:tenanea_sapling", - "betterend:umbrella_tree_sapling" - ] -} \ No newline at end of file diff --git a/src/main/generated/data/minecraft/tags/blocks/mineable/pickaxe.json b/src/main/generated/data/minecraft/tags/blocks/mineable/pickaxe.json index 24b43022..16e44826 100644 --- a/src/main/generated/data/minecraft/tags/blocks/mineable/pickaxe.json +++ b/src/main/generated/data/minecraft/tags/blocks/mineable/pickaxe.json @@ -3,7 +3,6 @@ "values": [ "betterend:aeternium_block", "betterend:amber_ore", - "betterend:amber_ore", "betterend:aurora_crystal", "betterend:azure_jadestone_bricks_slab", "betterend:azure_jadestone_bricks_stairs", @@ -16,7 +15,6 @@ "betterend:end_stone_smelter", "betterend:ender_block", "betterend:ender_ore", - "betterend:ender_ore", "betterend:flavolite_bricks_slab", "betterend:flavolite_bricks_stairs", "betterend:flavolite_button", @@ -60,7 +58,6 @@ "betterend:thallasium_chandelier", "betterend:thallasium_door", "betterend:thallasium_ore", - "betterend:thallasium_ore", "betterend:thallasium_slab", "betterend:thallasium_stairs", "betterend:thallasium_tile", diff --git a/src/main/generated/data/minecraft/tags/blocks/saplings.json b/src/main/generated/data/minecraft/tags/blocks/saplings.json deleted file mode 100644 index af4d04a0..00000000 --- a/src/main/generated/data/minecraft/tags/blocks/saplings.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "replace": false, - "values": [ - "betterend:dragon_tree_sapling", - "betterend:helix_tree_sapling", - "betterend:lacugrove_sapling", - "betterend:lucernia_sapling", - "betterend:mossy_glowshroom_sapling", - "betterend:pythadendron_sapling", - "betterend:tenanea_sapling", - "betterend:umbrella_tree_sapling" - ] -} \ No newline at end of file diff --git a/src/main/generated/data/minecraft/tags/items/saplings.json b/src/main/generated/data/minecraft/tags/items/saplings.json deleted file mode 100644 index af4d04a0..00000000 --- a/src/main/generated/data/minecraft/tags/items/saplings.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "replace": false, - "values": [ - "betterend:dragon_tree_sapling", - "betterend:helix_tree_sapling", - "betterend:lacugrove_sapling", - "betterend:lucernia_sapling", - "betterend:mossy_glowshroom_sapling", - "betterend:pythadendron_sapling", - "betterend:tenanea_sapling", - "betterend:umbrella_tree_sapling" - ] -} \ No newline at end of file diff --git a/src/main/java/org/betterx/datagen/betterend/worldgen/EndBiomesDataProvider.java b/src/main/java/org/betterx/datagen/betterend/worldgen/EndBiomesDataProvider.java index c0eb1017..02138f65 100644 --- a/src/main/java/org/betterx/datagen/betterend/worldgen/EndBiomesDataProvider.java +++ b/src/main/java/org/betterx/datagen/betterend/worldgen/EndBiomesDataProvider.java @@ -1,6 +1,7 @@ package org.betterx.datagen.betterend.worldgen; import org.betterx.bclib.api.v2.levelgen.biomes.BCLBiomeBuilder; +import org.betterx.bclib.api.v2.levelgen.biomes.BCLBiomeRegistry; import org.betterx.bclib.api.v2.levelgen.biomes.BiomeAPI.BiomeType; import org.betterx.bclib.api.v3.datagen.TagDataProvider; import org.betterx.betterend.BetterEnd; @@ -8,6 +9,7 @@ import org.betterx.betterend.world.biome.EndBiome; import org.betterx.betterend.world.biome.air.BiomeIceStarfield; import org.betterx.betterend.world.biome.cave.*; import org.betterx.betterend.world.biome.land.*; +import org.betterx.datagen.betterend.EndRegistrySupplier; import org.betterx.worlds.together.tag.v3.TagManager; import net.minecraft.core.HolderLookup; @@ -68,11 +70,21 @@ public class EndBiomesDataProvider extends TagDataProvider { public static void bootstrap(BootstapContext ctx) { BCLBiomeBuilder.registerUnbound(ctx); + EndRegistrySupplier.INSTANCE.MAIN_LOCK.release(); + BetterEnd.LOGGER.info("Registered BCLBiomes: " + BCLBiomeRegistry.BUILTIN_BCL_BIOMES.size() + ", " + BCLBiomeRegistry.registryOrNull()); } public static void ensureStaticallyLoaded() { } + static { + try { + EndRegistrySupplier.INSTANCE.MAIN_LOCK.acquire(); + } catch (InterruptedException e) { + throw new RuntimeException(e); + } + } + /** * Put existing {@link EndBiome} as a sub-biome into selected parent. * diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index c760d85f..db29a9b2 100644 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -45,10 +45,10 @@ "betterend.mixins.shadow.json" ], "depends": { - "fabricloader": ">=0.14.19", - "fabric": ">=0.81.3", + "fabricloader": ">=0.14.21", + "fabric": ">=0.83.0", "minecraft": [ - "1.20-beta.5" + "1.20-beta.7" ], "bclib": "3.0.x" },