From b699d27d304d6bbb2702ec2b8fcf6e0725a3e498 Mon Sep 17 00:00:00 2001 From: Niklas Widmann Date: Fri, 15 Dec 2023 11:41:13 +0100 Subject: [PATCH 1/2] add loot tables to nether --- build.gradle.kts | 6 +- .../skygrid/dimensions/the_nether.xml | 8 +++ .../skygrid/dimensions/twilight_forest.xml | 60 +++++++++++++++---- .../skygrid/datagen/dimensions/Nether.kt | 10 ++++ 4 files changed, 68 insertions(+), 16 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index 63bd4ff..176ad6a 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -4,7 +4,7 @@ val xmlutil_version: String by extra plugins { idea - id("com.possible-triangle.gradle") version ("0.1.0") + id("com.possible-triangle.gradle") version ("0.1.4") } withKotlin() @@ -49,9 +49,7 @@ subprojects { } enablePublishing { - repositories { - githubPackages(this@subprojects) - } + githubPackages() } tasks.withType { diff --git a/common/src/generated/resources/data/minecraft/skygrid/dimensions/the_nether.xml b/common/src/generated/resources/data/minecraft/skygrid/dimensions/the_nether.xml index 4833e54..9e474df 100644 --- a/common/src/generated/resources/data/minecraft/skygrid/dimensions/the_nether.xml +++ b/common/src/generated/resources/data/minecraft/skygrid/dimensions/the_nether.xml @@ -189,6 +189,14 @@ + + +
+
+
+
+
+ diff --git a/common/src/generated/resources/datapacks/twilight-forest/data/twilightforest/skygrid/dimensions/twilight_forest.xml b/common/src/generated/resources/datapacks/twilight-forest/data/twilightforest/skygrid/dimensions/twilight_forest.xml index 0bed306..e48ee33 100644 --- a/common/src/generated/resources/datapacks/twilight-forest/data/twilightforest/skygrid/dimensions/twilight_forest.xml +++ b/common/src/generated/resources/datapacks/twilight-forest/data/twilightforest/skygrid/dimensions/twilight_forest.xml @@ -93,43 +93,79 @@ - + + + + - + + + + - + + + + - + + + + - + + + + - + + + + - + + + + - + + + + - + + + + - + + + + - + + + + - + + + + diff --git a/common/src/main/kotlin/com/possible_triangle/skygrid/datagen/dimensions/Nether.kt b/common/src/main/kotlin/com/possible_triangle/skygrid/datagen/dimensions/Nether.kt index d8a5326..ca5a781 100644 --- a/common/src/main/kotlin/com/possible_triangle/skygrid/datagen/dimensions/Nether.kt +++ b/common/src/main/kotlin/com/possible_triangle/skygrid/datagen/dimensions/Nether.kt @@ -16,6 +16,7 @@ import net.minecraft.world.level.block.state.properties.BlockStateProperties.AXI import net.minecraft.world.level.block.state.properties.BlockStateProperties.DOUBLE_BLOCK_HALF import net.minecraft.world.level.block.state.properties.DoubleBlockHalf import net.minecraft.world.level.dimension.LevelStem +import net.minecraft.world.level.storage.loot.BuiltInLootTables import nl.adaptivity.xmlutil.ExperimentalXmlUtilApi import java.nio.file.Path @@ -31,6 +32,15 @@ class Nether(output: Path) : GridConfigGenerator("nether", output) { mob(EntityType.MAGMA_CUBE, weight = 0.3) } + loot { + table(BuiltInLootTables.RUINED_PORTAL, weight = 20.0) + table(BuiltInLootTables.NETHER_BRIDGE, weight = 10.0) + table(BuiltInLootTables.BASTION_BRIDGE, weight = 5.0) + table(BuiltInLootTables.BASTION_OTHER, weight = 2.0) + table(BuiltInLootTables.BASTION_HOGLIN_STABLE) + table(BuiltInLootTables.BASTION_TREASURE, weight = 0.5) + } + blocks { list("fluids", weight = 0.1) { block(Blocks.LAVA, weight = 0.5) From 870da826b3023306d09490e95984c3db859d4aac Mon Sep 17 00:00:00 2001 From: Niklas Widmann Date: Fri, 15 Dec 2023 11:42:19 +0100 Subject: [PATCH 2/2] does not need sonar & build on push --- .github/workflows/test.yml | 6 ------ 1 file changed, 6 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index fced423..e0a86a5 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -3,12 +3,6 @@ on: workflow_dispatch: pull_request: types: [opened, synchronize] - push: - branches: ["[0-9]+.[0-9]+.x"] - paths: - - '**/*.kt' - - '**/*.kts' - - '**/*.java' jobs: build: