Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

add loot tables to nether #66

Merged
merged 2 commits into from
Dec 15, 2023
Merged

add loot tables to nether #66

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b699d27
add loot tables to nether
PssbleTrngle Dec 15, 2023
870da82
does not need sonar & build on push
PssbleTrngle Dec 15, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 0 additions & 6 deletions .github/workflows/test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
6 changes: 2 additions & 4 deletions build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down Expand Up @@ -49,9 +49,7 @@ subprojects {
}

enablePublishing {
repositories {
githubPackages(this@subprojects)
}
githubPackages()
}

tasks.withType<Jar> {
Expand Down
8 changes: 8 additions & 0 deletions common/src/generated/resources/data/minecraft/skygrid/dimensions/the_nether.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -189,6 +189,14 @@
</list>
</list>
</blocks>
<loot>
<table id="minecraft:chests/ruined_portal" weight="20.0"/>
<table id="minecraft:chests/nether_bridge" weight="10.0"/>
<table id="minecraft:chests/bastion_bridge" weight="5.0"/>
<table id="minecraft:chests/bastion_other" weight="2.0"/>
<table id="minecraft:chests/bastion_hoglin_stable"/>
<table id="minecraft:chests/bastion_treasure" weight="0.5"/>
</loot>
<mobs>
<mob id="minecraft:blaze"/>
<mob id="minecraft:magma_cube" weight="0.3"/>
Expand Down
60 changes: 48 additions & 12 deletions ...rces/datapacks/twilight-forest/data/twilightforest/skygrid/dimensions/twilight_forest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,43 +93,79 @@
<list weight="0.1" name="thorns">
<block id="brown_thorns" mod="twilightforest">
<side on="down" probability="0.2">
<block id="brown_thorns" mod="twilightforest"/>
<block id="brown_thorns" mod="twilightforest">
<set key="axis" value="y"/>
<set key="up" value="true"/>
</block>
</side>
<side on="up" probability="0.2">
<block id="brown_thorns" mod="twilightforest"/>
<block id="brown_thorns" mod="twilightforest">
<set key="axis" value="y"/>
<set key="down" value="true"/>
</block>
</side>
<side on="north" probability="0.2">
<block id="brown_thorns" mod="twilightforest"/>
<block id="brown_thorns" mod="twilightforest">
<set key="axis" value="z"/>
<set key="south" value="true"/>
</block>
</side>
<side on="south" probability="0.2">
<block id="brown_thorns" mod="twilightforest"/>
<block id="brown_thorns" mod="twilightforest">
<set key="axis" value="z"/>
<set key="north" value="true"/>
</block>
</side>
<side on="west" probability="0.2">
<block id="brown_thorns" mod="twilightforest"/>
<block id="brown_thorns" mod="twilightforest">
<set key="axis" value="x"/>
<set key="east" value="true"/>
</block>
</side>
<side on="east" probability="0.2">
<block id="brown_thorns" mod="twilightforest"/>
<block id="brown_thorns" mod="twilightforest">
<set key="axis" value="x"/>
<set key="west" value="true"/>
</block>
</side>
</block>
<block id="green_thorns" mod="twilightforest">
<side on="down" probability="0.2">
<block id="green_thorns" mod="twilightforest"/>
<block id="green_thorns" mod="twilightforest">
<set key="axis" value="y"/>
<set key="up" value="true"/>
</block>
</side>
<side on="up" probability="0.2">
<block id="thorn_rose" mod="twilightforest"/>
<block id="green_thorns" mod="twilightforest"/>
<block id="green_thorns" mod="twilightforest">
<set key="axis" value="y"/>
<set key="down" value="true"/>
</block>
</side>
<side on="north" probability="0.2">
<block id="green_thorns" mod="twilightforest"/>
<block id="green_thorns" mod="twilightforest">
<set key="axis" value="z"/>
<set key="south" value="true"/>
</block>
</side>
<side on="south" probability="0.2">
<block id="green_thorns" mod="twilightforest"/>
<block id="green_thorns" mod="twilightforest">
<set key="axis" value="z"/>
<set key="north" value="true"/>
</block>
</side>
<side on="west" probability="0.2">
<block id="green_thorns" mod="twilightforest"/>
<block id="green_thorns" mod="twilightforest">
<set key="axis" value="x"/>
<set key="east" value="true"/>
</block>
</side>
<side on="east" probability="0.2">
<block id="green_thorns" mod="twilightforest"/>
<block id="green_thorns" mod="twilightforest">
<set key="axis" value="x"/>
<set key="west" value="true"/>
</block>
</side>
</block>
</list>
Expand Down
10 changes: 10 additions & 0 deletions common/src/main/kotlin/com/possible_triangle/skygrid/datagen/dimensions/Nether.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand All @@ -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)
Expand Down
Loading