Compare commits
7 Commits
v1.0.0_1.2
...
1.21.11_fa
| Author | SHA1 | Date | |
|---|---|---|---|
| 3cfd4c59bb | |||
| 6781cbfa05 | |||
| 5af7143532 | |||
| c71320aa08 | |||
| 457f754221 | |||
| 3bf1df5448 | |||
| ec9a0ff865 |
42
.github/workflows/build-release.yml
vendored
42
.github/workflows/build-release.yml
vendored
@@ -1,42 +0,0 @@
|
|||||||
name: build-release
|
|
||||||
|
|
||||||
on:
|
|
||||||
release:
|
|
||||||
types:
|
|
||||||
- published
|
|
||||||
|
|
||||||
jobs:
|
|
||||||
build:
|
|
||||||
runs-on: ubuntu-latest
|
|
||||||
steps:
|
|
||||||
- name: Checkout sources
|
|
||||||
uses: actions/checkout@v2
|
|
||||||
- name: Set up JDK 16
|
|
||||||
uses: actions/setup-java@v2
|
|
||||||
with:
|
|
||||||
distribution: 'temurin'
|
|
||||||
java-version: 17
|
|
||||||
- name: Cache Gradle packages
|
|
||||||
uses: actions/cache@v2
|
|
||||||
with:
|
|
||||||
path: |
|
|
||||||
~/.gradle/caches
|
|
||||||
~/.gradle/loom-cache
|
|
||||||
~/.gradle/wrapper
|
|
||||||
~/.m2/repository
|
|
||||||
key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }}
|
|
||||||
restore-keys: ${{ runner.os }}-gradle
|
|
||||||
|
|
||||||
- run: chmod +x gradlew
|
|
||||||
|
|
||||||
- name: Build Release
|
|
||||||
run: ./gradlew build --stacktrace
|
|
||||||
|
|
||||||
- name: Upload artifacts to Modrinth, Curseforge and GitHub
|
|
||||||
uses: Kir-Antipov/mc-publish@v3.3
|
|
||||||
with:
|
|
||||||
modrinth-id: jawg7zT1
|
|
||||||
modrinth-token: ${{ secrets.MODRINTH_TOKEN }}
|
|
||||||
|
|
||||||
curseforge-id: 594750
|
|
||||||
curseforge-token: ${{ secrets.CURSEFORGE_TOKEN }}
|
|
||||||
56
.github/workflows/build.yml
vendored
56
.github/workflows/build.yml
vendored
@@ -1,56 +0,0 @@
|
|||||||
# Automatically build the project and run any configured tests for every push
|
|
||||||
# and submitted pull request. This can help catch issues that only occur on
|
|
||||||
# certain platforms or Java versions, and provides a first line of defence
|
|
||||||
# against bad commits.
|
|
||||||
|
|
||||||
name: build
|
|
||||||
on: [pull_request, push]
|
|
||||||
|
|
||||||
jobs:
|
|
||||||
build:
|
|
||||||
strategy:
|
|
||||||
matrix:
|
|
||||||
# Use these Java versions
|
|
||||||
java: [
|
|
||||||
17 # Minimum supported by Minecraft 1.18
|
|
||||||
]
|
|
||||||
os: [ubuntu-20.04] # and run on Linux
|
|
||||||
runs-on: ${{ matrix.os }}
|
|
||||||
|
|
||||||
steps:
|
|
||||||
- name: Checkout repository
|
|
||||||
uses: actions/checkout@v2
|
|
||||||
|
|
||||||
- name: Extract current branch name
|
|
||||||
shell: bash
|
|
||||||
# bash pattern expansion to grab branch name without slashes
|
|
||||||
run: ref="${GITHUB_REF#refs/heads/}" && echo "branch=${ref////-}" >> $GITHUB_OUTPUT
|
|
||||||
id: ref
|
|
||||||
|
|
||||||
- name: Set outputs
|
|
||||||
id: vars
|
|
||||||
run: echo "sha_short=$(git rev-parse --short HEAD)" >> $GITHUB_OUTPUT
|
|
||||||
- name: Check outputs
|
|
||||||
run: echo ${{ steps.vars.outputs.sha_short }}
|
|
||||||
|
|
||||||
- name: Validate gradle wrapper
|
|
||||||
uses: gradle/wrapper-validation-action@v1
|
|
||||||
|
|
||||||
- name: Setup JDK${{ matrix.java }}
|
|
||||||
uses: actions/setup-java@v1
|
|
||||||
with:
|
|
||||||
java-version: ${{ matrix.java }}
|
|
||||||
|
|
||||||
- name: Make gradle wrapper executable
|
|
||||||
if: ${{ runner.os != 'Windows' }}
|
|
||||||
run: chmod +x gradlew
|
|
||||||
|
|
||||||
- name: Build
|
|
||||||
run: ./gradlew build
|
|
||||||
|
|
||||||
- name: Capture build artifacts
|
|
||||||
if: ${{ runner.os == 'Linux' && matrix.java == '17' }} # Only upload artifacts built from latest java on one OS
|
|
||||||
uses: actions/upload-artifact@v2
|
|
||||||
with:
|
|
||||||
name: dust-fabric-${{ steps.vars.outputs.sha_short }}
|
|
||||||
path: build/libs/*[0-9].jar
|
|
||||||
@@ -1,4 +1,4 @@
|
|||||||
# Cave Dust
|

|
||||||
|
|
||||||
## What...what is "Cave Dust"?
|
## What...what is "Cave Dust"?
|
||||||
|
|
||||||
@@ -11,3 +11,5 @@ It works by checking if the player has the sky above them while being below sea
|
|||||||
## Dependencies
|
## Dependencies
|
||||||
Cave Dust requires the [Fabric API](https://www.curseforge.com/minecraft/mc-mods/fabric-api) but everything else Cave Dust *needs* is included.
|
Cave Dust requires the [Fabric API](https://www.curseforge.com/minecraft/mc-mods/fabric-api) but everything else Cave Dust *needs* is included.
|
||||||
***HOWEVER***, I recommend [Mod Menu](https://www.curseforge.com/minecraft/mc-mods/modmenu) to be able to use the config screen :p
|
***HOWEVER***, I recommend [Mod Menu](https://www.curseforge.com/minecraft/mc-mods/modmenu) to be able to use the config screen :p
|
||||||
|
|
||||||
|
### Thanks to LizIsTired for the original Cave Dust mod! https://github.com/LizIsTired/cave_dust
|
||||||
11
build.gradle
11
build.gradle
@@ -1,9 +1,12 @@
|
|||||||
plugins {
|
plugins {
|
||||||
id 'fabric-loom' version '1.11-SNAPSHOT'
|
id 'fabric-loom' version '1.14.7'
|
||||||
id 'maven-publish'
|
id 'maven-publish'
|
||||||
}
|
}
|
||||||
|
|
||||||
archivesBaseName = project.archives_base_name
|
base {
|
||||||
|
archivesName = project.archives_base_name
|
||||||
|
}
|
||||||
|
|
||||||
version = project.mod_version
|
version = project.mod_version
|
||||||
group = project.maven_group
|
group = project.maven_group
|
||||||
|
|
||||||
@@ -16,7 +19,7 @@ repositories {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
maven {
|
maven {
|
||||||
url = "https://maven.terraformersmc.com"
|
url = "https://maven.terraformersmc.com/releases"
|
||||||
}
|
}
|
||||||
maven {
|
maven {
|
||||||
name = 'minelp'
|
name = 'minelp'
|
||||||
@@ -72,7 +75,7 @@ java {
|
|||||||
|
|
||||||
jar {
|
jar {
|
||||||
from("LICENSE") {
|
from("LICENSE") {
|
||||||
rename { "${it}_${project.archivesBaseName}"}
|
rename { "${it}_${project.archives_base_name}" }
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -2,8 +2,8 @@
|
|||||||
org.gradle.jvmargs=-Xmx1G
|
org.gradle.jvmargs=-Xmx1G
|
||||||
|
|
||||||
# Fabric Properties
|
# Fabric Properties
|
||||||
minecraft_version=1.21.10
|
minecraft_version=1.21.11
|
||||||
yarn_mappings=1.21.10+build.3
|
yarn_mappings=1.21.11+build.3
|
||||||
loader_version=0.18.4
|
loader_version=0.18.4
|
||||||
loom_version=1.14-SNAPSHOT
|
loom_version=1.14-SNAPSHOT
|
||||||
|
|
||||||
@@ -13,6 +13,6 @@ org.gradle.jvmargs=-Xmx1G
|
|||||||
archives_base_name=cave_dust_reforged
|
archives_base_name=cave_dust_reforged
|
||||||
|
|
||||||
# Dependencies
|
# Dependencies
|
||||||
fabric_version=0.138.4+1.21.10
|
fabric_version=0.140.2+1.21.11
|
||||||
modmenu_version=16.0.0-rc.2
|
modmenu_version=17.0.0-beta.1
|
||||||
kirin_version=1.21.3+1.21.10
|
kirin_version=1.21.4+1.21.11
|
||||||
2
gradle/wrapper/gradle-wrapper.properties
vendored
2
gradle/wrapper/gradle-wrapper.properties
vendored
@@ -1,6 +1,6 @@
|
|||||||
distributionBase=GRADLE_USER_HOME
|
distributionBase=GRADLE_USER_HOME
|
||||||
distributionPath=wrapper/dists
|
distributionPath=wrapper/dists
|
||||||
distributionUrl=https\://services.gradle.org/distributions/gradle-8.14-bin.zip
|
distributionUrl=https\://services.gradle.org/distributions/gradle-9.2.1-bin.zip
|
||||||
networkTimeout=10000
|
networkTimeout=10000
|
||||||
validateDistributionUrl=true
|
validateDistributionUrl=true
|
||||||
zipStoreBase=GRADLE_USER_HOME
|
zipStoreBase=GRADLE_USER_HOME
|
||||||
|
|||||||
@@ -29,11 +29,11 @@ public class ParticleSpawnUtil {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// checks if the config is enabled, if the game isn't paused, if the world is valid,
|
// checks if the config is enabled, if the game isn't paused, if the world is valid,
|
||||||
// if the dimension is valid and if the player isn't in a lush caves biome
|
// only in overworld, and if the player isn't in a lush caves biome
|
||||||
if (!config.getCaveDustEnabled()
|
if (!config.getCaveDustEnabled()
|
||||||
|| client.isPaused()
|
|| client.isPaused()
|
||||||
|| client.world == null
|
|| client.world == null
|
||||||
|| !client.world.getDimension().bedWorks()
|
|| !client.world.getRegistryKey().equals(World.OVERWORLD)
|
||||||
|| client.player.isSubmergedInWater()
|
|| client.player.isSubmergedInWater()
|
||||||
|| client.world.getBiome(client.player.getBlockPos()).matchesKey(LUSH_CAVES)) {
|
|| client.world.getBiome(client.player.getBlockPos()).matchesKey(LUSH_CAVES)) {
|
||||||
|
|
||||||
@@ -45,7 +45,6 @@ public class ParticleSpawnUtil {
|
|||||||
World world = client.world;
|
World world = client.world;
|
||||||
int seaLevel = world.getSeaLevel();
|
int seaLevel = world.getSeaLevel();
|
||||||
|
|
||||||
// 1.21.10: usar world directamente
|
|
||||||
if (!world.isSkyVisible(client.player.getBlockPos())) {
|
if (!world.isSkyVisible(client.player.getBlockPos())) {
|
||||||
if (client.player.getBlockPos().getY() + 2 < seaLevel) {
|
if (client.player.getBlockPos().getY() + 2 < seaLevel) {
|
||||||
timer = timer + 1;
|
timer = timer + 1;
|
||||||
@@ -71,11 +70,11 @@ public class ParticleSpawnUtil {
|
|||||||
public static boolean shouldParticlesSpawn(MinecraftClient client, CaveDustConfig config, BlockPos pos) {
|
public static boolean shouldParticlesSpawn(MinecraftClient client, CaveDustConfig config, BlockPos pos) {
|
||||||
|
|
||||||
// checks if the config is enabled, if the game isn't paused, if the world is valid,
|
// checks if the config is enabled, if the game isn't paused, if the world is valid,
|
||||||
// if the dimension is valid and if the particle position isn't in lush caves
|
// only in overworld, and if the particle position isn't in lush caves
|
||||||
if (!config.getCaveDustEnabled()
|
if (!config.getCaveDustEnabled()
|
||||||
|| client.isPaused()
|
|| client.isPaused()
|
||||||
|| client.world == null
|
|| client.world == null
|
||||||
|| !client.world.getDimension().bedWorks()
|
|| !client.world.getRegistryKey().equals(World.OVERWORLD)
|
||||||
|| (client.world.getBottomY() > pos.getY())
|
|| (client.world.getBottomY() > pos.getY())
|
||||||
|| client.world.getBiome(Objects.requireNonNull(pos)).matchesKey(LUSH_CAVES)) {
|
|| client.world.getBiome(Objects.requireNonNull(pos)).matchesKey(LUSH_CAVES)) {
|
||||||
|
|
||||||
@@ -99,7 +98,6 @@ public class ParticleSpawnUtil {
|
|||||||
World world = client.world;
|
World world = client.world;
|
||||||
int seaLevel = world.getSeaLevel();
|
int seaLevel = world.getSeaLevel();
|
||||||
|
|
||||||
// 1.21.10: usar world directamente
|
|
||||||
if (!world.isSkyVisible(pos)) {
|
if (!world.isSkyVisible(pos)) {
|
||||||
if (pos.getY() + 2 < seaLevel) {
|
if (pos.getY() + 2 < seaLevel) {
|
||||||
timer = timer + 1;
|
timer = timer + 1;
|
||||||
|
|||||||
@@ -34,7 +34,7 @@
|
|||||||
"depends": {
|
"depends": {
|
||||||
"fabricloader": ">=0.17.2",
|
"fabricloader": ">=0.17.2",
|
||||||
"fabric": "*",
|
"fabric": "*",
|
||||||
"minecraft": "1.21.10",
|
"minecraft": "1.21.11",
|
||||||
"java": ">=17"
|
"java": ">=17"
|
||||||
},
|
},
|
||||||
"suggests": {
|
"suggests": {
|
||||||
|
|||||||
Reference in New Issue
Block a user