From ac4bd2d5787c35233e26b2bcc623b8fc6ec6e2f6 Mon Sep 17 00:00:00 2001 From: Jochen Jacobs Date: Wed, 18 Dec 2024 03:00:05 +0100 Subject: [PATCH 1/2] no mod versions of compat packs --- .github/workflows/release.yml | 2 +- beet-release.yaml | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 44f74dd..a0fffd5 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -75,7 +75,7 @@ jobs: if: ${{ ! inputs.skipPublishCompatDatapacks }} uses: Kir-Antipov/mc-publish@v3.3 with: - files: build/compat/* + files: build/compat/*.zip version: ${{ steps.build.outputs.version }} version-type: alpha loaders: datapack diff --git a/beet-release.yaml b/beet-release.yaml index 2e277cb..99f20f4 100644 --- a/beet-release.yaml +++ b/beet-release.yaml @@ -11,7 +11,6 @@ pipeline: zipped: true output: ../../build/compat/ pipeline: - - src.modded - beet.contrib.output - src.zip - beet.contrib.clear From 3b826d2f9c5c1810da980e5cdb6193e5fc7acf9b Mon Sep 17 00:00:00 2001 From: Jochen Jacobs Date: Wed, 18 Dec 2024 20:52:07 +0100 Subject: [PATCH 2/2] add more dnt compat, add ocean and upper biome tags --- beet-base.yaml | 2 +- compat/dnt/beet.yaml | 4 +++- .../nova_structures/worldgen/structure/hamlet.json | 14 ++++++++++++++ .../worldgen/structure/nether_port.json | 2 +- .../worldgen/structure/piglin_camp.json | 10 ++-------- .../worldgen/structure/piglin_donjon.json | 2 +- .../worldgen/structure/piglin_outstation.json | 10 ++-------- data/lavaflow/tags/worldgen/biome/ocean.json | 5 +++++ data/lavaflow/tags/worldgen/biome/upper.json | 6 ++++++ 9 files changed, 35 insertions(+), 20 deletions(-) create mode 100644 compat/dnt/data/nova_structures/worldgen/structure/hamlet.json create mode 100644 data/lavaflow/tags/worldgen/biome/ocean.json create mode 100644 data/lavaflow/tags/worldgen/biome/upper.json diff --git a/beet-base.yaml b/beet-base.yaml index 004966b..e070a78 100644 --- a/beet-base.yaml +++ b/beet-base.yaml @@ -1,5 +1,5 @@ minecraft: 1.21 -version: 0.3.1 +version: 0.3.2 author: jacobsjo meta: modded: diff --git a/compat/dnt/beet.yaml b/compat/dnt/beet.yaml index c9acad9..1c15f76 100644 --- a/compat/dnt/beet.yaml +++ b/compat/dnt/beet.yaml @@ -4,4 +4,6 @@ name: Lavaflow-DnT compatablility description: Compatability layer betwen Lavaflow and Dungeons and Taverns data_pack: load: - - "." \ No newline at end of file + - "." + name: dnt +output: ../../build/compat \ No newline at end of file diff --git a/compat/dnt/data/nova_structures/worldgen/structure/hamlet.json b/compat/dnt/data/nova_structures/worldgen/structure/hamlet.json new file mode 100644 index 0000000..4e9dc7d --- /dev/null +++ b/compat/dnt/data/nova_structures/worldgen/structure/hamlet.json @@ -0,0 +1,14 @@ +{ + "type": "minecraft:jigsaw", + "biomes": "#lavaflow:upper", + "start_pool": "nova_structures:hamlet/hamlet_center", + "max_distance_from_center": 100, + "start_height": { + "absolute": 74 + }, + "spawn_overrides": {}, + "step": "surface_structures", + "size": 4, + "use_expansion_hack": false, + "terrain_adaptation": "beard_box" +} \ No newline at end of file diff --git a/compat/dnt/data/nova_structures/worldgen/structure/nether_port.json b/compat/dnt/data/nova_structures/worldgen/structure/nether_port.json index 3057bad..ee4aeb4 100644 --- a/compat/dnt/data/nova_structures/worldgen/structure/nether_port.json +++ b/compat/dnt/data/nova_structures/worldgen/structure/nether_port.json @@ -1,6 +1,6 @@ { "type": "minecraft:jigsaw", - "biomes": "lavaflow:ocean", + "biomes": "#lavaflow:ocean", "max_distance_from_center": 100, "spawn_overrides": { "monster": { diff --git a/compat/dnt/data/nova_structures/worldgen/structure/piglin_camp.json b/compat/dnt/data/nova_structures/worldgen/structure/piglin_camp.json index 62e9c19..9a7393c 100644 --- a/compat/dnt/data/nova_structures/worldgen/structure/piglin_camp.json +++ b/compat/dnt/data/nova_structures/worldgen/structure/piglin_camp.json @@ -1,16 +1,10 @@ { "type": "minecraft:jigsaw", - "biomes": "#minecraft:has_structure/bastion_remnant", + "biomes": "#lavaflow:plateau", "start_pool": "nova_structures:piglin_camp/campfire", "max_distance_from_center": 20, "start_height": { - "type": "minecraft:uniform", - "min_inclusive": { - "absolute": 33 - }, - "max_inclusive": { - "absolute": 70 - } + "absolute": 76 }, "spawn_overrides": {}, "step": "surface_structures", diff --git a/compat/dnt/data/nova_structures/worldgen/structure/piglin_donjon.json b/compat/dnt/data/nova_structures/worldgen/structure/piglin_donjon.json index d0e22d8..7602b14 100644 --- a/compat/dnt/data/nova_structures/worldgen/structure/piglin_donjon.json +++ b/compat/dnt/data/nova_structures/worldgen/structure/piglin_donjon.json @@ -1,6 +1,6 @@ { "type": "minecraft:jigsaw", - "biomes": "#minecraft:has_structure/bastion_remnant", + "biomes": "#lavaflow:ocean", "max_distance_from_center": 128, "spawn_overrides": { "monster": { diff --git a/compat/dnt/data/nova_structures/worldgen/structure/piglin_outstation.json b/compat/dnt/data/nova_structures/worldgen/structure/piglin_outstation.json index 6b086ee..1d5e372 100644 --- a/compat/dnt/data/nova_structures/worldgen/structure/piglin_outstation.json +++ b/compat/dnt/data/nova_structures/worldgen/structure/piglin_outstation.json @@ -1,16 +1,10 @@ { "type": "minecraft:jigsaw", - "biomes": "#minecraft:has_structure/bastion_remnant", + "biomes": "#lavaflow:valley", "start_pool": "nova_structures:piglin_outstation/tower", "max_distance_from_center": 100, "start_height": { - "type": "minecraft:uniform", - "min_inclusive": { - "absolute": 33 - }, - "max_inclusive": { - "absolute": 70 - } + "absolute": 37 }, "spawn_overrides": { "monster": { diff --git a/data/lavaflow/tags/worldgen/biome/ocean.json b/data/lavaflow/tags/worldgen/biome/ocean.json new file mode 100644 index 0000000..0406447 --- /dev/null +++ b/data/lavaflow/tags/worldgen/biome/ocean.json @@ -0,0 +1,5 @@ +{ + "values": [ + "lavaflow:ocean" + ] +} \ No newline at end of file diff --git a/data/lavaflow/tags/worldgen/biome/upper.json b/data/lavaflow/tags/worldgen/biome/upper.json new file mode 100644 index 0000000..277d54a --- /dev/null +++ b/data/lavaflow/tags/worldgen/biome/upper.json @@ -0,0 +1,6 @@ +{ + "values": [ + "#lavaflow:plateau", + "#lavaflow:layer" + ] +} \ No newline at end of file