Compare commits

..

1 Commits

Author SHA1 Message Date
Liz Graham
c0fa50c7c4 Update README.md 2023-06-21 02:49:21 +01:00
27 changed files with 360 additions and 665 deletions

View File

@@ -33,10 +33,29 @@ jobs:
run: ./gradlew build --stacktrace
- name: Upload artifacts to Modrinth, Curseforge and GitHub
uses: Kir-Antipov/mc-publish@v3.3
uses: Kir-Antipov/mc-publish@v2.0
with:
modrinth-id: jawg7zT1
modrinth-token: ${{ secrets.MODRINTH_TOKEN }}
curseforge-id: 594750
curseforge-token: ${{ secrets.CURSEFORGE_TOKEN }}
github-token: ${{ secrets.GITHUB_TOKEN }}
files: build/libs/!(*-@(dev|sources|all)).jar
version-type: release
loaders: fabric
java: 17
dependencies: |
fabric | depends | 0.46.0
P7dR8mSH | depends | 0.46.0
kirin | includes | 1.10.0-beta.2
modmenu | recommends | *
mOgUt4GM | recommends | *
version-resolver: latest # Defaults to selecting the latest compatible version of Minecraft, using the tag from the fabric.mod.json

View File

@@ -24,12 +24,12 @@ jobs:
- 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
run: ref="${GITHUB_REF#refs/heads/}" && echo "::set-output name=branch::${ref////-}"
id: ref
- name: Set outputs
id: vars
run: echo "sha_short=$(git rev-parse --short HEAD)" >> $GITHUB_OUTPUT
run: echo "::set-output name=sha_short::$(git rev-parse --short HEAD)"
- name: Check outputs
run: echo ${{ steps.vars.outputs.sha_short }}

View File

@@ -1,12 +1,12 @@
plugins {
id 'fabric-loom' version '1.14.7'
id 'fabric-loom' version '0.12-SNAPSHOT'
id 'maven-publish'
}
base {
archivesName = project.archives_base_name
}
sourceCompatibility = JavaVersion.VERSION_17
targetCompatibility = JavaVersion.VERSION_17
archivesBaseName = project.archives_base_name
version = project.mod_version
group = project.maven_group
@@ -19,7 +19,7 @@ repositories {
}
}
maven {
url = "https://maven.terraformersmc.com/releases"
url = "https://maven.terraformersmc.com"
}
maven {
name = 'minelp'
@@ -61,7 +61,7 @@ processResources {
tasks.withType(JavaCompile).configureEach {
// Minecraft 1.18 (1.18-pre2) upwards uses Java 17.
it.options.release = 21
it.options.release = 17
}
java {
@@ -69,13 +69,11 @@ java {
// if it is present.
// If you remove this line, sources will not be generated.
withSourcesJar()
sourceCompatibility = JavaVersion.VERSION_21
targetCompatibility = JavaVersion.VERSION_21
}
jar {
from("LICENSE") {
rename { "${it}_${project.archives_base_name}" }
rename { "${it}_${project.archivesBaseName}"}
}
}

View File

@@ -2,17 +2,18 @@
org.gradle.jvmargs=-Xmx1G
# Fabric Properties
minecraft_version=1.21.11
yarn_mappings=1.21.11+build.3
loader_version=0.18.4
loom_version=1.14-SNAPSHOT
# check these on https://fabricmc.net/develop
minecraft_version=1.19.2
yarn_mappings=1.19.2+build.4
loader_version=0.14.9
# Mod Properties
mod_version=1.0.0
maven_group=com.straice
archives_base_name=cave_dust_reforged
mod_version = 1.2.0
maven_group = com.lizistired
archives_base_name = cave_dust
# Dependencies
fabric_version=0.140.2+1.21.11
modmenu_version=17.0.0-beta.1
kirin_version=1.21.4+1.21.11
fabric_version=0.59.0+1.19.2
clothconfig_version = 8.0.75
modmenu_version = 4.0.6
kirin_version=1.11.1-beta.1

Binary file not shown.

View File

@@ -1,7 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-9.2.1-bin.zip
networkTimeout=10000
validateDistributionUrl=true
distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists

54
gradlew vendored
View File

@@ -1,7 +1,7 @@
#!/bin/sh
#
# Copyright © 2015-2021 the original authors.
# Copyright © 2015-2021 the original authors.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -15,8 +15,6 @@
# See the License for the specific language governing permissions and
# limitations under the License.
#
# SPDX-License-Identifier: Apache-2.0
#
##############################################################################
#
@@ -34,10 +32,10 @@
# Busybox and similar reduced shells will NOT work, because this script
# requires all of these POSIX shell features:
# * functions;
# * expansions «$var», «${var}», «${var:-default}», «${var+SET}»,
# «${var#prefix}», «${var%suffix}», and «$( cmd )»;
# * compound commands having a testable exit status, especially «case»;
# * various built-in commands including «command», «set», and «ulimit».
# * expansions «$var», «${var}», «${var:-default}», «${var+SET}»,
# «${var#prefix}», «${var%suffix}», and «$( cmd )»;
# * compound commands having a testable exit status, especially «case»;
# * various built-in commands including «command», «set», and «ulimit».
#
# Important for patching:
#
@@ -57,7 +55,7 @@
# Darwin, MinGW, and NonStop.
#
# (3) This script is generated from the Groovy template
# https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
# https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
# within the Gradle project.
#
# You can find Gradle at https://github.com/gradle/gradle/.
@@ -82,12 +80,13 @@ do
esac
done
# This is normally unused
# shellcheck disable=SC2034
APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
APP_NAME="Gradle"
APP_BASE_NAME=${0##*/}
# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s
' "$PWD" ) || exit
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
# Use the maximum available, or set MAX_FD != -1 to use that value.
MAX_FD=maximum
@@ -134,29 +133,22 @@ location of your Java installation."
fi
else
JAVACMD=java
if ! command -v java >/dev/null 2>&1
then
die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
Please set the JAVA_HOME variable in your environment to match the
location of your Java installation."
fi
fi
# Increase the maximum file descriptors if we can.
if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
case $MAX_FD in #(
max*)
# In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
# shellcheck disable=SC2039,SC3045
MAX_FD=$( ulimit -H -n ) ||
warn "Could not query maximum file descriptor limit"
esac
case $MAX_FD in #(
'' | soft) :;; #(
*)
# In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
# shellcheck disable=SC2039,SC3045
ulimit -n "$MAX_FD" ||
warn "Could not set maximum file descriptor limit to $MAX_FD"
esac
@@ -201,15 +193,11 @@ if "$cygwin" || "$msys" ; then
done
fi
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
# Collect all arguments for the java command:
# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
# and any embedded shellness will be escaped.
# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
# treated as '${Hostname}' itself on the command line.
# Collect all arguments for the java command;
# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
# shell script including quotes and variable substitutions, so put them in
# double quotes to make sure that they get re-expanded; and
# * put everything else in single quotes, so that it's not re-expanded.
set -- \
"-Dorg.gradle.appname=$APP_BASE_NAME" \
@@ -217,12 +205,6 @@ set -- \
org.gradle.wrapper.GradleWrapperMain \
"$@"
# Stop when "xargs" is not available.
if ! command -v xargs >/dev/null 2>&1
then
die "xargs is not available"
fi
# Use "xargs" to parse quoted args.
#
# With -n1 it outputs one arg per line, with the quotes and backslashes removed.

37
gradlew.bat vendored
View File

@@ -13,10 +13,8 @@
@rem See the License for the specific language governing permissions and
@rem limitations under the License.
@rem
@rem SPDX-License-Identifier: Apache-2.0
@rem
@if "%DEBUG%"=="" @echo off
@if "%DEBUG%" == "" @echo off
@rem ##########################################################################
@rem
@rem Gradle startup script for Windows
@@ -27,8 +25,7 @@
if "%OS%"=="Windows_NT" setlocal
set DIRNAME=%~dp0
if "%DIRNAME%"=="" set DIRNAME=.
@rem This is normally unused
if "%DIRNAME%" == "" set DIRNAME=.
set APP_BASE_NAME=%~n0
set APP_HOME=%DIRNAME%
@@ -43,13 +40,13 @@ if defined JAVA_HOME goto findJavaFromJavaHome
set JAVA_EXE=java.exe
%JAVA_EXE% -version >NUL 2>&1
if %ERRORLEVEL% equ 0 goto execute
if "%ERRORLEVEL%" == "0" goto execute
echo. 1>&2
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
echo. 1>&2
echo Please set the JAVA_HOME variable in your environment to match the 1>&2
echo location of your Java installation. 1>&2
echo.
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
echo.
echo Please set the JAVA_HOME variable in your environment to match the
echo location of your Java installation.
goto fail
@@ -59,11 +56,11 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe
if exist "%JAVA_EXE%" goto execute
echo. 1>&2
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
echo. 1>&2
echo Please set the JAVA_HOME variable in your environment to match the 1>&2
echo location of your Java installation. 1>&2
echo.
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
echo.
echo Please set the JAVA_HOME variable in your environment to match the
echo location of your Java installation.
goto fail
@@ -78,15 +75,13 @@ set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
:end
@rem End local scope for the variables with windows NT shell
if %ERRORLEVEL% equ 0 goto mainEnd
if "%ERRORLEVEL%"=="0" goto mainEnd
:fail
rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
rem the _cmd.exe /c_ return code!
set EXIT_CODE=%ERRORLEVEL%
if %EXIT_CODE% equ 0 set EXIT_CODE=1
if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
exit /b %EXIT_CODE%
if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
exit /b 1
:mainEnd
if "%OS%"=="Windows_NT" endlocal

View File

@@ -1,128 +1,89 @@
package net.lizistired.cavedust;
// minecraft imports
import net.fabricmc.api.ClientModInitializer;
import net.fabricmc.fabric.api.client.event.lifecycle.v1.ClientTickEvents;
import net.fabricmc.fabric.api.client.particle.v1.ParticleFactoryRegistry;
//minecraft imports
import net.minecraft.client.MinecraftClient;
import net.minecraft.particle.ParticleEffect;
import net.minecraft.registry.Registries;
import net.minecraft.text.Text;
import net.minecraft.util.Identifier;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.World;
// other imports
//other imports
import com.minelittlepony.common.util.GamePaths;
import net.fabricmc.api.ClientModInitializer;
import net.fabricmc.fabric.api.client.event.lifecycle.v1.ClientTickEvents;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
// java imports
//java imports
import java.nio.file.Path;
// static imports
import static net.lizistired.cavedust.utils.KeybindingHelper.*;
//static imports
import static net.lizistired.cavedust.utils.MathHelper.*;
import static net.lizistired.cavedust.utils.MathHelper.generateRandomDouble;
import static net.lizistired.cavedust.utils.MathHelper.normalize;
import static net.lizistired.cavedust.utils.ParticleSpawnUtil.shouldParticlesSpawn;
import static net.lizistired.cavedust.utils.KeybindingHelper.*;
public class CaveDust implements ClientModInitializer {
// logger
//logger
public static final Logger LOGGER = LoggerFactory.getLogger("cavedust");
// make class static
//make class static
private static CaveDust instance;
public static CaveDust getInstance() {
return instance;
}
public CaveDust() {
instance = this;
}
// config assignment
private static CaveDustConfig config;
public CaveDustConfig getConfig() {
//config assignment
private static net.lizistired.cavedust.CaveDustConfig config;
public net.lizistired.cavedust.CaveDustConfig getConfig() {
return config;
}
public static ParticleEffect WHITE_ASH_ID =
(ParticleEffect) Registries.PARTICLE_TYPE.get(Identifier.of("cavedust", "cave_dust"));
public static int PARTICLE_AMOUNT = 0;
@Override
public void onInitializeClient() {
// config path and loading
Path caveDustFolder = GamePaths.getConfigDirectory().resolve("cavedust");
config = new CaveDustConfig(caveDustFolder.getParent().resolve("cavedust.json"), this);
//config path and loading
Path CaveDustFolder = GamePaths.getConfigDirectory().resolve("cavedust");
config = new CaveDustConfig(CaveDustFolder.getParent().resolve("cavedust.json"), this);
config.load();
registerKeyBindings();
ParticleFactoryRegistry.getInstance().register(CaveDustServer.CAVE_DUST, CaveDustParticleFactory.Factory::new);
// register end client tick to create cave dust function, using end client tick for async
//register end client tick to create cave dust function, using end client tick for async
ClientTickEvents.END_CLIENT_TICK.register(this::createCaveDust);
}
private void createCaveDust(MinecraftClient client) {
if (client.player == null) return;
if (keyBinding1.wasPressed()) {
if (keyBinding1.wasPressed()){
getConfig().toggleCaveDust();
LOGGER.info("Toggled dust");
client.player.sendMessage(
Text.translatable("debug.cavedust.toggle." + config.getCaveDustEnabled()),
false
);
client.player.sendMessage(Text.translatable("debug.cavedust.toggle." + config.getCaveDustEnabled()), false);
}
if (keyBinding2.wasPressed()) {
if (keyBinding2.wasPressed()){
getConfig().load();
LOGGER.info("Reloaded config");
client.player.sendMessage(Text.translatable("debug.cavedust.reload"), false);
}
// ensure world is not null
//ensure world is not null
if (client.world == null) return;
World world = client.world;
//LOGGER.info(String.valueOf(((ClientWorldAccessor) client.world.getLevelProperties()).getFlatWorld()));
// )
double probabilityNormalized = normalize(config.getLowerLimit(), config.getUpperLimit(), client.player.getBlockY());
double probabilityNormalized =
normalize(config.getLowerLimit(), config.getUpperLimit(), client.player.getBlockY());
PARTICLE_AMOUNT = (int) (probabilityNormalized
* config.getParticleMultiplier()
* config.getParticleMultiplierMultiplier());
for (int i = 0; i < PARTICLE_AMOUNT; i++) {
int x = (int) (client.player.getX()
+ generateRandomDouble(-config.getDimensionWidth(), config.getDimensionWidth()));
int y = (int) (client.player.getEyeY()
+ generateRandomDouble(-config.getDimensionHeight(), config.getDimensionHeight()));
int z = (int) (client.player.getZ()
+ generateRandomDouble(-config.getDimensionWidth(), config.getDimensionWidth()));
double miniX = x + Math.random();
double miniY = y + Math.random();
double miniZ = z + Math.random();
for (int i = 0; i < probabilityNormalized * config.getParticleMultiplier() * 10; i++) {
try {
double x = client.player.getPos().getX() + generateRandomDouble(config.getDimensionsMinX(), config.getDimensionsMaxX());
double y = client.player.getPos().getY() + generateRandomDouble(config.getDimensionsMinX(), config.getDimensionsMaxY());
double z = client.player.getPos().getZ() + generateRandomDouble(config.getDimensionsMinX(), config.getDimensionsMaxZ());
BlockPos particlePos = new BlockPos(x, y, z);
if (shouldParticlesSpawn(client, config, particlePos)) {
if (client.world.getBlockState(particlePos).isAir()) {
world.addParticleClient(
getConfig().getParticle(),
miniX, miniY, miniZ,
config.getVelocityRandomnessRandom() * 0.01,
config.getVelocityRandomnessRandom() * 0.01,
config.getVelocityRandomnessRandom() * 0.01
);
if (!shouldParticlesSpawn(client, config, particlePos)){return;}
world.addParticle(config.getParticle(), x, y, z, config.getVelocityRandomnessRandom(), config.getVelocityRandomnessRandom(), config.getVelocityRandomnessRandom());
}
catch (NullPointerException e) {
LOGGER.error(String.valueOf(e));
getConfig().setParticle("minecraft:white_ash");
}
}
}

View File

@@ -1,74 +1,111 @@
package net.lizistired.cavedust;
import com.google.common.collect.ImmutableList;
import net.lizistired.cavedust.utils.JsonFile;
import net.minecraft.client.MinecraftClient;
import net.minecraft.client.render.RenderLayer;
import net.minecraft.particle.ParticleEffect;
import net.minecraft.particle.ParticleType;
import net.minecraft.particle.ParticleTypes;
import net.minecraft.registry.Registries;
import net.minecraft.registry.Registry;
import net.minecraft.registry.RegistryKey;
import net.minecraft.registry.RegistryKeys;
import net.minecraft.text.Text;
import net.minecraft.util.Identifier;
import net.minecraft.util.registry.Registry;
import static net.lizistired.cavedust.CaveDust.*;
import static net.lizistired.cavedust.utils.MathHelper.*;
import java.nio.file.Path;
import java.util.*;
public class CaveDustConfig extends JsonFile {
private transient final net.lizistired.cavedust.CaveDust CaveDust;
private int width = 10;
private int height = 10;
private int velocityRandomness = 0;
private int dimensionMaxX = 5;
private int dimensionMaxY = 5;
private int dimensionMaxZ = 5;
private int dimensionMinX = -5;
private int dimensionMinY = -5;
private int dimensionMinZ = -5;
private int velocityRandomness = 1;
private boolean caveDustEnabled = true;
private String particleName = "white_ash";
private boolean seaLevelCheck = true;
private boolean superFlatStatus = false;
//private boolean enhancedDetection = true;
private float upperLimit = 64;
private float lowerLimit = -64;
private int particleMultiplier = 1;
int listNumber = 0;
private int particleMultiplierMultiplier = 10;
List<Identifier> list = List.of(Registries.PARTICLE_TYPE.getIds().toArray(new Identifier[0]));
Identifier newId = Identifier.of("cavedust", "cave_dust");
public CaveDustConfig(Path file, net.lizistired.cavedust.CaveDust caveDust) {
super(file);
this.CaveDust = caveDust;
}
public float setDimensionWidth(float size){
if (this.width != size) {
this.width = (int)size;
public float setDimensionsMinX(float size){
if (this.dimensionMinX != size) {
this.dimensionMinX = (int)size;
save();
}
return getDimensionWidth();
return getDimensionsMinX();
}
public float setDimensionHeight(float size){
if (this.height != size) {
this.height = (int)size;
public float setDimensionsMinY(float size){
if (this.dimensionMinY != size) {
this.dimensionMinY = (int)size;
save();
}
return getDimensionHeight();
return getDimensionsMinY();
}
public float getDimensionWidth(){
return width;
public float setDimensionsMinZ(float size){
if (this.dimensionMinZ != size) {
this.dimensionMinZ = (int)size;
save();
}
return getDimensionsMinZ();
}
public float getDimensionHeight(){
return height;
public float getDimensionsMinX(){
return dimensionMinX;
}
public float getDimensionsMinY(){
return dimensionMinY;
}
public float getDimensionsMinZ(){
return dimensionMinZ;
}
public float setDimensionsMaxX(float size){
if (this.dimensionMaxX != size) {
this.dimensionMaxX = (int)size;
save();
}
return getDimensionsMaxX();
}
public float setDimensionsMaxY(float size){
if (this.dimensionMaxY != size) {
this.dimensionMaxY = (int)size;
save();
}
return getDimensionsMaxY();
}
public float setDimensionsMaxZ(float size){
if (this.dimensionMaxZ != size) {
this.dimensionMaxZ = (int)size;
save();
}
return getDimensionsMaxZ();
}
public float getDimensionsMaxX(){
return dimensionMaxX;
}
public float getDimensionsMaxY(){
return dimensionMaxY;
}
public float getDimensionsMaxZ(){
return dimensionMaxZ;
}
public float setUpperLimit(float upperLimit){
@@ -113,16 +150,6 @@ public class CaveDustConfig extends JsonFile {
return getParticleMultiplier();
}
public int getParticleMultiplierMultiplier(){
return particleMultiplierMultiplier;
}
public float setParticleMultiplierMultiplier(float particleMultiplierMultiplier){
this.particleMultiplierMultiplier = (int) particleMultiplierMultiplier;
save();
return getParticleMultiplierMultiplier();
}
public boolean toggleCaveDust(){
caveDustEnabled = !caveDustEnabled;
save();
@@ -133,32 +160,20 @@ public class CaveDustConfig extends JsonFile {
return caveDustEnabled;
}
//todo
//public Identifier setParticle(String particleType){
//particleName = particleType;
//save();
//return getParticle().get().getKey().get().getValue();
//}
//public ParticleEffect getParticle(){
// try {
// return Registries.PARTICLE_TYPE.getOptional(Identifier.of(Registries.PARTICLE_TYPE.getOptional(getParticleID()).get().getKey().get().getValue().toString().toLowerCase()));
// } catch (ClassCastException e) {
// MinecraftClient.getInstance().player.sendMessage(Text.translatable("debug.cavedust.particleerror"), true);
// LOGGER.error("Cannot spawn particle, check config.");
// iterateParticle();
// save();
// return getParticle();
// }
//}
public ParticleEffect setParticle(String particleType){
particleName = particleType;
save();
return getParticle();
}
public ParticleEffect getParticle(){
try{
return (ParticleEffect) Registries.PARTICLE_TYPE.get(newId);
}
catch (ClassCastException e){
iterateParticle();
return getParticle();
try {
return (ParticleEffect) Registry.PARTICLE_TYPE.get(new Identifier(particleName.toLowerCase()));
} catch (ClassCastException e) {
LOGGER.error(e + "\nThere was an error loading the specified particle from the config, make sure a valid particle name is specified. Falling back to \"minecraft:white_ash\".");
particleName = "minecraft:white_ash";
save();
return ParticleTypes.WHITE_ASH;
}
}
@@ -197,36 +212,33 @@ public class CaveDustConfig extends JsonFile {
return getSuperFlatStatus();
}
public void iterateParticle() {
try {
listNumber = listNumber + 1;
newId = list.get(listNumber);
} catch (IndexOutOfBoundsException e){
newId = list.get(0);
listNumber = 0;
}
save();
/*public boolean getEnhancedDetection(){
return enhancedDetection;
}
public ParticleEffect getParticleID(){
return getParticle();
}
public boolean setEnhancedDetection(){
enhancedDetection = !enhancedDetection;
save();
return getEnhancedDetection();
}*/
public void resetConfig(){
width = 10;
height = 10;
dimensionMinX = -5;
dimensionMinY = -5;
dimensionMinZ = -5;
dimensionMaxX = 5;
dimensionMaxY = 5;
dimensionMaxZ = 5;
upperLimit = 64;
lowerLimit = -64;
particleMultiplier = 1;
particleMultiplierMultiplier = 10;
velocityRandomness = 0;
newId = Identifier.of("cavedust", "cave_dust");
seaLevelCheck = true;
caveDustEnabled = true;
particleName = "minecraft:white_ash";
save();
}
}

View File

@@ -1,83 +0,0 @@
package net.lizistired.cavedust;
import net.fabricmc.api.EnvType;
import net.fabricmc.api.Environment;
import net.minecraft.client.particle.BillboardParticle;
import net.minecraft.client.particle.Particle;
import net.minecraft.client.particle.ParticleFactory;
import net.minecraft.client.particle.SpriteProvider;
import net.minecraft.client.world.ClientWorld;
import net.minecraft.particle.SimpleParticleType;
import net.minecraft.util.math.random.Random;
@Environment(EnvType.CLIENT)
public class CaveDustParticleFactory extends BillboardParticle {
private final SpriteProvider spriteProvider;
CaveDustParticleFactory(
ClientWorld world,
double x, double y, double z,
double velocityX, double velocityY, double velocityZ,
SpriteProvider spriteProvider
) {
// En 1.21.9+ BillboardParticle puede recibir sprite inicial
super(world, x, y, z, velocityX, velocityY, velocityZ, spriteProvider.getFirst());
this.spriteProvider = spriteProvider;
this.maxAge = 200; // 20 ticks = 1s
this.scale = 0.1f;
this.velocityX = velocityX;
this.velocityY = -0.007f;
this.velocityZ = velocityZ;
this.collidesWithWorld = true;
this.alpha = 1.0f;
// Selecciona el sprite correcto según edad/maxAge (equivalente a setSpriteForAge)
this.updateSprite(spriteProvider);
}
@Override
protected BillboardParticle.RenderType getRenderType() {
return BillboardParticle.RenderType.PARTICLE_ATLAS_TRANSLUCENT;
}
@Override
public void tick() {
super.tick();
if (!this.isAlive()) {
return;
}
this.alpha -= 0.005f;
if (this.alpha <= 0.0f) {
this.markDead();
return;
}
this.updateSprite(this.spriteProvider);
}
@Environment(EnvType.CLIENT)
public static class Factory implements ParticleFactory<SimpleParticleType> {
private final SpriteProvider spriteProvider;
public Factory(SpriteProvider spriteProvider) {
this.spriteProvider = spriteProvider;
}
@Override
public Particle createParticle(
SimpleParticleType type,
ClientWorld world,
double x, double y, double z,
double velocityX, double velocityY, double velocityZ,
Random random
) {
return new CaveDustParticleFactory(world, x, y, z, velocityX, velocityY, velocityZ, this.spriteProvider);
}
}
}

View File

@@ -1,19 +0,0 @@
package net.lizistired.cavedust;
import net.fabricmc.api.ModInitializer;
import net.fabricmc.fabric.api.particle.v1.FabricParticleTypes;
import net.minecraft.particle.SimpleParticleType;
import net.minecraft.registry.Registries;
import net.minecraft.registry.Registry;
import net.minecraft.util.Identifier;
public class CaveDustServer implements ModInitializer {
public static final SimpleParticleType CAVE_DUST = FabricParticleTypes.simple();
/**
* Runs the mod initializer.
*/
@Override
public void onInitialize() {
Registry.register(Registries.PARTICLE_TYPE, Identifier.of("cavedust", "cave_dust"), CAVE_DUST);
}
}

View File

@@ -3,14 +3,11 @@ package net.lizistired.cavedust;
import com.minelittlepony.common.client.gui.GameGui;
import com.minelittlepony.common.client.gui.element.*;
import net.lizistired.cavedust.utils.TranslatableTextHelper;
import net.minecraft.client.gui.DrawContext;
import net.minecraft.client.gui.screen.Screen;
import net.minecraft.particle.ParticleType;
import net.minecraft.registry.Registries;
import net.minecraft.client.util.math.MatrixStack;
import net.minecraft.text.Text;
import org.jetbrains.annotations.Nullable;
import java.util.NoSuchElementException;
import javax.annotation.Nullable;
public class ModMenuConfigScreen extends GameGui {
public ModMenuConfigScreen(@Nullable Screen parent) {
@@ -29,7 +26,7 @@ public class ModMenuConfigScreen extends GameGui {
addButton(new Label(width / 2, 30)).setCentered().getStyle()
.setText(getTitle());
addButton(new Button(left += -110, row += -60).onClick(sender -> {
addButton(new Button(left, row += -60).onClick(sender -> {
sender.getStyle().setText("menu.cavedust.global." + config.toggleCaveDust()).setTooltip(Text.translatable("menu.cavedust.global.tooltip." + config.getCaveDustEnabled()));
})).getStyle()
.setText("menu.cavedust.global." + config.getCaveDustEnabled())
@@ -47,9 +44,37 @@ public class ModMenuConfigScreen extends GameGui {
.setText("menu.cavedust.superflatstatus." + config.getSuperFlatStatus())
.setTooltip(Text.translatable("menu.cavedust.superflatstatus.tooltip"));
addButton(new Slider(left += -110, row += 24, -50, 0, config.getDimensionsMinX()))
.onChange(config::setDimensionsMinX)
.setTextFormat(transText::formatMinX)
.getStyle().setTooltip(Text.translatable("menu.cavedust.minX.tooltip"));
addButton(new Slider(left, row += 24, -50, 0, config.getDimensionsMinY()))
.onChange(config::setDimensionsMinY)
.setTextFormat(transText::formatMinY)
.getStyle().setTooltip(Text.translatable("menu.cavedust.minY.tooltip"));
/*addButton(new Slider(left, row += 48, -64, 319, config.getUpperLimit()))
addButton(new Slider(left, row += 24, -50, 0, config.getDimensionsMinZ()))
.onChange(config::setDimensionsMinZ)
.setTextFormat(transText::formatMinZ)
.getStyle().setTooltip(Text.translatable("menu.cavedust.minZ.tooltip"));
addButton(new Slider(left += 220, row += -48, 0, 50, config.getDimensionsMaxX()))
.onChange(config::setDimensionsMaxX)
.setTextFormat(transText::formatMaxX)
.getStyle().setTooltip(Text.translatable("menu.cavedust.maxX.tooltip"));
addButton(new Slider(left, row += 24, 0, 50, config.getDimensionsMaxY()))
.onChange(config::setDimensionsMaxY)
.setTextFormat(transText::formatMaxY)
.getStyle().setTooltip(Text.translatable("menu.cavedust.maxY.tooltip"));
addButton(new Slider(left, row += 24, 0, 50, config.getDimensionsMaxZ()))
.onChange(config::setDimensionsMaxZ)
.setTextFormat(transText::formatMaxZ)
.getStyle().setTooltip(Text.translatable("menu.cavedust.maxZ.tooltip"));
addButton(new Slider(left += -110, row += 24, -64, 319, config.getUpperLimit()))
.onChange(config::setUpperLimit)
.setTextFormat(transText::formatUpperLimit)
.getStyle().setTooltip(Text.translatable("menu.cavedust.upperlimit.tooltip"));
@@ -57,65 +82,33 @@ public class ModMenuConfigScreen extends GameGui {
addButton(new Slider(left, row += 24, -64, 319, config.getLowerLimit()))
.onChange(config::setLowerLimit)
.setTextFormat(transText::formatLowerLimit)
.getStyle().setTooltip(Text.translatable("menu.cavedust.lowerlimit.tooltip"));*/
.getStyle().setTooltip(Text.translatable("menu.cavedust.lowerlimit.tooltip"));
addButton(new Slider(left, row += 24, 1, 100, config.getParticleMultiplier()))
.onChange(config::setParticleMultiplier)
.setTextFormat(transText::formatParticleMultiplier)
.getStyle().setTooltip(Text.translatable("menu.cavedust.particlemultiplier.tooltip"));
addButton(new Slider(left, row += 24, 1, 100, config.getParticleMultiplierMultiplier()))
.onChange(config::setParticleMultiplierMultiplier)
.setTextFormat(transText::formatParticleMultiplierMultiplier)
.getStyle().setTooltip(Text.translatable("menu.cavedust.particlemultipliermultiplier.tooltip"));
addButton(new Button(left, row += 24).onClick(sender ->{
config.iterateParticle();
sender.getStyle().setText("Particle: " + (getNameOfParticle()));
})).getStyle().setText("Particle: " + (getNameOfParticle()))
.setTooltip(Text.translatable("menu.cavedust.particle.tooltip"));
addButton(new Slider(left += 220, row -= 96, 1, 50, config.getDimensionWidth()))
.onChange(config::setDimensionWidth)
.setTextFormat(transText::formatMaxWidth)
.getStyle().setTooltip(Text.translatable("menu.cavedust.width.tooltip"));
addButton(new Slider(left, row += 24, 1, 50, config.getDimensionHeight()))
.onChange(config::setDimensionHeight)
.setTextFormat(transText::formatMaxHeight)
.getStyle().setTooltip(Text.translatable("menu.cavedust.height.tooltip"));
addButton(new Slider(left, row += 24, 0, 10, config.getVelocityRandomness()))
.onChange(config::setVelocityRandomness)
.setTextFormat(transText::formatVelocityRandomness)
.getStyle().setTooltip(Text.translatable("menu.cavedust.velocityrandomness.tooltip"));
addButton(new Button(left -= 110, row += 120).onClick(sender -> {
addButton(new Button(left, row += 24).onClick(sender -> {
config.resetConfig();
finish();
client.setScreen(new ModMenuConfigScreen(parent));
})).getStyle().setText(Text.translatable("menu.cavedust.reset")).setTooltip(Text.translatable("menu.cavedust.reset.tooltip"));
addButton(new Button(left, row += 24)
addButton(new Button(left, row += 60)
.onClick(sender -> finish())).getStyle()
.setText("gui.done");
}
@Override
public void render(DrawContext context, int mouseX, int mouseY, float partialTicks) {
super.render(context, mouseX, mouseY, partialTicks);
}
private String getNameOfParticle(){
CaveDustConfig config = CaveDust.getInstance().getConfig();
config.load();
try {
return Registries.PARTICLE_TYPE.getEntry((ParticleType<?>) config.getParticleID()).getIdAsString();
} catch (NoSuchElementException e){
CaveDust.LOGGER.error(String.valueOf(e));
return "null";
}
public void render(MatrixStack matrices, int mouseX, int mouseY, float partialTicks) {
renderBackground(matrices);
super.render(matrices, mouseX, mouseY, partialTicks);
}
}

View File

@@ -6,31 +6,17 @@ import org.spongepowered.asm.mixin.injection.At;
import org.spongepowered.asm.mixin.injection.Inject;
import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
import java.util.ArrayList;
import java.util.List;
import static net.lizistired.cavedust.CaveDust.PARTICLE_AMOUNT;
import static net.lizistired.cavedust.utils.ParticleSpawnUtil.shouldParticlesSpawn;
@Mixin(DebugHud.class)
public abstract class MixinDebugScreenOverlay {
@Inject(
method = "getRightText()Ljava/util/List;",
at = @At("RETURN"),
cancellable = true,
require = 0
)
private void appendDebugText(CallbackInfoReturnable<List<String>> cir) {
@Inject(method = "getRightText", at = @At("RETURN"))
private void appendShaderPackText(CallbackInfoReturnable<List<String>> cir) {
List<String> messages = cir.getReturnValue();
if (messages == null) return;
// Evita modificar una lista inmutable/compartida
List<String> out = new ArrayList<>(messages);
out.add("");
out.add("Particle amount evaluated: " + PARTICLE_AMOUNT);
out.add("");
cir.setReturnValue(out);
messages.add("");
messages.add("Should particles spawn: " + shouldParticlesSpawn);
messages.add("");
}
}

View File

@@ -3,7 +3,6 @@ package net.lizistired.cavedust.utils;
import net.fabricmc.fabric.api.client.keybinding.v1.KeyBindingHelper;
import net.minecraft.client.option.KeyBinding;
import net.minecraft.client.util.InputUtil;
import net.minecraft.util.Identifier;
import org.lwjgl.glfw.GLFW;
public class KeybindingHelper {
@@ -11,23 +10,19 @@ public class KeybindingHelper {
public static KeyBinding keyBinding1;
public static KeyBinding keyBinding2;
// 1.21.9+ requiere Category (no String)
private static final KeyBinding.Category CATEGORY =
KeyBinding.Category.create(Identifier.of("cavedust", "spook"));
public static void registerKeyBindings() {
public static void registerKeyBindings(){
keyBinding1 = KeyBindingHelper.registerKeyBinding(new KeyBinding(
"key.cavedust.toggle",
InputUtil.Type.KEYSYM,
GLFW.GLFW_KEY_KP_ADD,
CATEGORY
InputUtil.Type.KEYSYM,// The translation key of the keybinding's name // The type of the keybinding, KEYSYM for keyboard, MOUSE for mouse.
GLFW.GLFW_KEY_KP_ADD, // The keycode of the key
"category.cavedust.spook" // The translation key of the keybinding's category.
));
keyBinding2 = KeyBindingHelper.registerKeyBinding(new KeyBinding(
"key.cavedust.reload",
InputUtil.Type.KEYSYM,
GLFW.GLFW_KEY_KP_ENTER,
CATEGORY
"key.cavedust.reload", // The translation key of the keybinding's name
InputUtil.Type.KEYSYM, // The type of the keybinding, KEYSYM for keyboard, MOUSE for mouse.
GLFW.GLFW_KEY_KP_ENTER, // The keycode of the key
"category.cavedust.spook" // The translation key of the keybinding's category.
));
}
}

View File

@@ -35,10 +35,6 @@ public class MathHelper {
* @return Random number (double)
*/
public static double generateRandomDouble(double min, double max) {
try {
return ThreadLocalRandom.current().nextDouble(min, max);
} catch (IllegalArgumentException e) {
return 0;
}
}
}

View File

@@ -22,21 +22,14 @@ public class ParticleSpawnUtil {
*/
public static boolean shouldParticlesSpawn(MinecraftClient client, CaveDustConfig config) {
if (client.player == null) {
timer = 0;
shouldParticlesSpawn = false;
return false;
}
// checks if the config is enabled, if the game isn't paused, if the world is valid,
// only in overworld, and if the player isn't in a lush caves biome
//checks if the config is enabled, if the game isn't paused, if the world is valid, if the particle is valid and if the player isn't in a lush caves biome
if (!config.getCaveDustEnabled()
|| client.isPaused()
|| client.world == null
|| !client.world.getRegistryKey().equals(World.OVERWORLD)
|| client.player.isSubmergedInWater()
|| client.world.getBiome(client.player.getBlockPos()).matchesKey(LUSH_CAVES)) {
|| !client.world.getDimension().bedWorks()
|| Objects.requireNonNull(client.player).isSubmergedInWater()
|| client.world.getBiome(Objects.requireNonNull(client.player.getBlockPos())).matchesKey(LUSH_CAVES))
{
timer = 0;
shouldParticlesSpawn = false;
return false;
@@ -45,17 +38,16 @@ public class ParticleSpawnUtil {
World world = client.world;
int seaLevel = world.getSeaLevel();
if (!world.isSkyVisible(client.player.getBlockPos())) {
if (client.player.getBlockPos().getY() + 2 < seaLevel) {
if (!client.player.clientWorld.isSkyVisible(client.player.getBlockPos())) {
if (client.player.getBlockPos().getY() + 2 < seaLevel){
timer = timer + 1;
if (timer > 10) {
if (timer > 10){
timer = 10;
shouldParticlesSpawn = true;
return true;
}
}
}
shouldParticlesSpawn = false;
return false;
}
@@ -69,27 +61,20 @@ public class ParticleSpawnUtil {
*/
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,
// only in overworld, and if the particle position isn't in lush caves
//checks if the config is enabled, if the game isn't paused, if the world is valid, if the particle is valid and if the player isn't in a lush caves biome
if (!config.getCaveDustEnabled()
|| client.isPaused()
|| client.world == null
|| !client.world.getRegistryKey().equals(World.OVERWORLD)
|| (client.world.getBottomY() > pos.getY())
|| client.world.getBiome(Objects.requireNonNull(pos)).matchesKey(LUSH_CAVES)) {
|| !client.world.getDimension().bedWorks()
|| Objects.requireNonNull(client.player).isSubmergedInWater()
|| client.world.getBiome(Objects.requireNonNull(pos)).matchesKey(LUSH_CAVES))
{
timer = 0;
shouldParticlesSpawn = false;
return false;
}
if (client.player == null) {
timer = 0;
shouldParticlesSpawn = false;
return false;
}
if (!config.getSuperFlatStatus()) {
if(!config.getSuperFlatStatus()) {
if (((ClientWorldAccessor) client.world.getLevelProperties()).getFlatWorld()) {
return false;
}
@@ -98,17 +83,16 @@ public class ParticleSpawnUtil {
World world = client.world;
int seaLevel = world.getSeaLevel();
if (!world.isSkyVisible(pos)) {
if (pos.getY() + 2 < seaLevel) {
if (!client.player.clientWorld.isSkyVisible(pos)) {
if (pos.getY() + 2 < seaLevel){
timer = timer + 1;
if (timer > 10) {
if (timer > 10){
timer = 10;
shouldParticlesSpawn = true;
return true;
}
}
}
shouldParticlesSpawn = false;
return false;
}

View File

@@ -4,11 +4,23 @@ import com.minelittlepony.common.client.gui.element.AbstractSlider;
import net.minecraft.text.Text;
public class TranslatableTextHelper {
public Text formatMaxWidth(AbstractSlider<Float> slider) {
return Text.translatable("menu.cavedust.width", (int)Math.floor(slider.getValue()));
public Text formatMinX(AbstractSlider<Float> slider) {
return Text.translatable("menu.cavedust.minX", (int)Math.floor(slider.getValue()));
}
public Text formatMaxHeight(AbstractSlider<Float> slider) {
return Text.translatable("menu.cavedust.height", (int)Math.floor(slider.getValue()));
public Text formatMinY(AbstractSlider<Float> slider) {
return Text.translatable("menu.cavedust.minY", (int)Math.floor(slider.getValue()));
}
public Text formatMinZ(AbstractSlider<Float> slider) {
return Text.translatable("menu.cavedust.minZ", (int)Math.floor(slider.getValue()));
}
public Text formatMaxX(AbstractSlider<Float> slider) {
return Text.translatable("menu.cavedust.maxX", (int)Math.floor(slider.getValue()));
}
public Text formatMaxY(AbstractSlider<Float> slider) {
return Text.translatable("menu.cavedust.maxY", (int)Math.floor(slider.getValue()));
}
public Text formatMaxZ(AbstractSlider<Float> slider) {
return Text.translatable("menu.cavedust.maxZ", (int)Math.floor(slider.getValue()));
}
public Text formatUpperLimit(AbstractSlider<Float> slider) {
return Text.translatable("menu.cavedust.upperlimit", (int)Math.floor(slider.getValue()));
@@ -19,10 +31,6 @@ public class TranslatableTextHelper {
public Text formatParticleMultiplier(AbstractSlider<Float> slider) {
return Text.translatable("menu.cavedust.particlemultiplier", (int)Math.floor(slider.getValue()));
}
public Text formatParticleMultiplierMultiplier(AbstractSlider<Float> slider) {
return Text.translatable("menu.cavedust.particlemultipliermultiplier", (int)Math.floor(slider.getValue()));
}
public Text formatVelocityRandomness(AbstractSlider<Float> slider) {
return Text.translatable("menu.cavedust.velocityrandomness", (int) Math.floor(slider.getValue()));
}

Binary file not shown.

Before

Width:  |  Height:  |  Size: 250 KiB

View File

@@ -1,44 +0,0 @@
{
"menu.cavedust.title": "Cave Dust",
"menu.cavedust.global.false": "Cave Dust: Désactivée",
"menu.cavedust.global.true": "Cave Dust: Activée",
"menu.cavedust.global.tooltip.false": "Activer les particules de poussière de grotte ?",
"menu.cavedust.global.tooltip.true": "Désactiver les particules de poussière de grotte ?",
"menu.cavedust.minX": "Minimum X: %s",
"menu.cavedust.minY": "Minimum Y: %s",
"menu.cavedust.minZ": "Minimum Z: %s",
"menu.cavedust.maxX": "Maximum X: %s",
"menu.cavedust.maxY": "Maximum Y: %s",
"menu.cavedust.maxZ": "Maximum Z: %s",
"menu.cavedust.minX.tooltip": "Minimum X: %s",
"menu.cavedust.minY.tooltip": "Minimum Y: %s",
"menu.cavedust.minZ.tooltip": "Minimum Z: %s",
"menu.cavedust.maxX.tooltip": "Maximum X: %s",
"menu.cavedust.maxY.tooltip": "Maximum Y: %s",
"menu.cavedust.maxZ.tooltip": "Maximum Z: %s",
"menu.cavedust.upperlimit": "Limite supérieure : %s",
"menu.cavedust.lowerlimit": "Limite inférieure : %s",
"menu.cavedust.upperlimit.tooltip": "La hauteur à laquelle les particules s'estompent et cessent de spawner (utilise l'axe Y du joueur).",
"menu.cavedust.lowerlimit.tooltip": "La hauteur où les particules apparaissent le plus (utilise l'axe Y du joueur).",
"menu.cavedust.reset": "Réinitialiser les paramètres",
"menu.cavedust.reset.tooltip": "Êtes-vous sûr de vouloir réinitialiser tous les paramètres ?",
"menu.cavedust.particlemultiplier": "Multiplicateur de particules : %s",
"menu.cavedust.particlemultiplier.tooltip": "Multiplie la quantité de particules à une profondeur donnée.",
"menu.cavedust.velocityrandomness": "Aléatoire de la vélocité : %s",
"menu.cavedust.velocityrandomness.tooltip": "Le niveau d'aléatoire de la vélocité des particules.",
"menu.cavedust.enhanceddetection.true": "Détection améliorée : Activée",
"menu.cavedust.enhanceddetection.false": "Détection améliorée : Désactivée",
"menu.cavedust.enhanceddetection.tooltip": "La détection améliorée permet des vérifications plus précises en utilisant la position des particules\n plutôt que celle du joueur, mais impacte les performances.",
"menu.cavedust.superflatstatus.true": "Particules sur monde Superflat : Activées",
"menu.cavedust.superflatstatus.false": "Particules sur monde Superflat : Désactivées",
"menu.cavedust.superflatstatus.tooltip": "Les particules doivent-elles apparaître sur les mondes Superflat ?",
"key.cavedust.reload": "Recharger la configuration",
"key.cavedust.toggle": "Activer/Désactiver les particules",
"category.cavedust.spook": "Cave Dust",
"debug.cavedust.toggle.true": "(Cave Dust) Particules activées",
"debug.cavedust.toggle.false": "(Cave Dust) Particules désactivées",
"debug.cavedust.reload": "(Cave Dust) Configuration rechargée"
}

View File

@@ -1,44 +0,0 @@
{
"menu.cavedust.title": "Пещерная пыль",
"menu.cavedust.global.false": "Пещерная пыль: отключена",
"menu.cavedust.global.true": "Пещерная пыль: включена",
"menu.cavedust.global.tooltip.false": "Включить частицы пещерной пыли?",
"menu.cavedust.global.tooltip.true": "Отключить частицы пещерной пыли?",
"menu.cavedust.minX": "Минимум по X: %s",
"menu.cavedust.minY": "Минимум по Y: %s",
"menu.cavedust.minZ": "Минимум по Z: %s",
"menu.cavedust.maxX": "Максимум по X: %s",
"menu.cavedust.maxY": "Максимум по Y: %s",
"menu.cavedust.maxZ": "Максимум по Z: %s",
"menu.cavedust.minX.tooltip": "Минимум по X: %s",
"menu.cavedust.minY.tooltip": "Минимум по Y: %s",
"menu.cavedust.minZ.tooltip": "Минимум по Z: %s",
"menu.cavedust.maxX.tooltip": "Максимум по X: %s",
"menu.cavedust.maxY.tooltip": "Максимум по Y: %s",
"menu.cavedust.maxZ.tooltip": "Максимум по Z: %s",
"menu.cavedust.upperlimit": "Верхний предел: %s",
"menu.cavedust.lowerlimit": "Нижний предел: %s",
"menu.cavedust.upperlimit.tooltip": "Высота, на которой частицы будут исчезать и перестанут появляться (испольует координату Y игрока).",
"menu.cavedust.lowerlimit.tooltip": "The height where particles spawn the most (испольует координату Y игрока).",
"menu.cavedust.reset": "Сброс настроек",
"menu.cavedust.reset.tooltip": "Вы уверены, что хотите сбросить все настройки?",
"menu.cavedust.particlemultiplier": "Множитель частиц: %s",
"menu.cavedust.particlemultiplier.tooltip": "Увеличивает количество частиц на любой заданной глубине.",
"menu.cavedust.velocityrandomness": "Случайность скорости: %s",
"menu.cavedust.velocityrandomness.tooltip": "Случайность скорости движения частиц.",
"menu.cavedust.enhanceddetection.true": "Улучшенное обнаружение: включено",
"menu.cavedust.enhanceddetection.false": "Улучшенное обнаружение: отключено",
"menu.cavedust.enhanceddetection.tooltip": "Улучшенное обнаружение позволяет проводить более точные проверки, используя положение частиц\nвместо положения игрока, что оказывает некоторое влияние на производительность.",
"menu.cavedust.superflatstatus.true": "Частицы в суперплоскости: включены",
"menu.cavedust.superflatstatus.false": "Частицы в суперплоскости: отключены",
"menu.cavedust.superflatstatus.tooltip": "Должны ли частицы появляться в суперплоских мирах?",
"key.cavedust.reload": "Перезагрузить конфигурацию",
"key.cavedust.toggle": "Переключить частицы",
"category.cavedust.spook": "Пещерная пыль",
"debug.cavedust.toggle.true": "[Пещерная пыль] Включенные частицы",
"debug.cavedust.toggle.false": "[Пещерная пыль] Отключенные частицы",
"debug.cavedust.reload": "[Пещерная пыль] Конфигурация перезагружена"
}

View File

@@ -1,41 +0,0 @@
{
"menu.cavedust.title": "洞穴尘埃",
"menu.cavedust.global.false": "洞穴尘埃: 功能启用",
"menu.cavedust.global.true": "洞穴尘埃: 功能禁用",
"menu.cavedust.global.tooltip.false": "启用洞穴尘埃粒子效果?",
"menu.cavedust.global.tooltip.true": "禁用洞穴尘埃粒子效果?",
"menu.cavedust.width": "边界宽度: %s",
"menu.cavedust.height": "边界高度: %s",
"menu.cavedust.width.tooltip": "生成粒子效果的最大宽度.",
"menu.cavedust.height.tooltip": "生成粒子效果的最大高度.",
"menu.cavedust.upperlimit": "最大高度限制: %s",
"menu.cavedust.lowerlimit": "最低高度限制: %s",
"menu.cavedust.upperlimit.tooltip": "粒子效果消失的高度 (读取玩家所在的 y 轴).",
"menu.cavedust.lowerlimit.tooltip": "粒子效果出现最多的高度 (读取玩家所在的 y 轴).",
"menu.cavedust.reset": "重置所有设置",
"menu.cavedust.reset.tooltip": "你确定要这么做吗?",
"menu.cavedust.particlemultiplier": "粒子数量: %s",
"menu.cavedust.particlemultiplier.tooltip": "指定深度生成的粒子效果数量.",
"menu.cavedust.particlemultipliermultiplier": "粒子效果倍率: %s",
"menu.cavedust.particlemultipliermultiplier.tooltip": "粒子效果的生成倍率.",
"menu.cavedust.velocityrandomness": "速度随机性: %s",
"menu.cavedust.velocityrandomness.tooltip": "粒子效果的速度随机程度.",
"menu.cavedust.enhanceddetection.true": "强化检测: 功能启用",
"menu.cavedust.enhanceddetection.false": "强化检测: 功能禁用",
"menu.cavedust.enhanceddetection.tooltip": "强化检测会使用粒子效果而非玩家的位置进行更精确的检测\n 对性能略有影响.",
"menu.cavedust.superflatstatus.true": "超平坦粒子: 功能启用",
"menu.cavedust.superflatstatus.false": "超平坦粒子: 功能禁用",
"menu.cavedust.superflatstatus.tooltip": "是否允许超平坦世界生成洞穴尘埃?",
"menu.cavedust.particle": "粒子效果: ",
"menu.cavedust.particle.tooltip": "生成的粒子效果名称, 点击切换.",
"key.cavedust.reload": "重载配置",
"key.cavedust.toggle": "切换粒子",
"category.cavedust.spook": "洞穴尘埃",
"debug.cavedust.toggle.true": "(洞穴尘埃) 粒子效果已启用",
"debug.cavedust.toggle.false": "(洞穴尘埃) 粒子效果已禁用",
"debug.cavedust.reload": "(洞穴尘埃) 配置已重载",
"debug.cavedust.particleerror": "(洞穴尘埃) 设置当前粒子效果时出现问题, 已自动切换至下一个粒子效果!"
}

View File

@@ -1,5 +0,0 @@
{
"textures": [
"minecraft:generic_0"
]
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 116 KiB

View File

@@ -4,20 +4,26 @@
"menu.cavedust.global.true": "Cave Dust: Enabled",
"menu.cavedust.global.tooltip.false": "Enable cave dust particles?",
"menu.cavedust.global.tooltip.true": "Disable cave dust particles?",
"menu.cavedust.width": "Width bounds: %s",
"menu.cavedust.height": "Height bounds: %s",
"menu.cavedust.width.tooltip": "Maximum width to spawn particle.",
"menu.cavedust.height.tooltip": "Maximum height to spawn particle.",
"menu.cavedust.upperlimit": "Upper limit height: %s",
"menu.cavedust.lowerlimit": "Lower limit height: %s",
"menu.cavedust.minX": "Minimum X: %s",
"menu.cavedust.minY": "Minimum Y: %s",
"menu.cavedust.minZ": "Minimum Z: %s",
"menu.cavedust.maxX": "Maximum X: %s",
"menu.cavedust.maxY": "Maximum Y: %s",
"menu.cavedust.maxZ": "Maximum Z: %s",
"menu.cavedust.minX.tooltip": "Minimum X: %s",
"menu.cavedust.minY.tooltip": "Minimum Y: %s",
"menu.cavedust.minZ.tooltip": "Minimum Z: %s",
"menu.cavedust.maxX.tooltip": "Maximum X: %s",
"menu.cavedust.maxY.tooltip": "Maximum Y: %s",
"menu.cavedust.maxZ.tooltip": "Maximum Z: %s",
"menu.cavedust.upperlimit": "Upper limit: %s",
"menu.cavedust.lowerlimit": "Lower limit: %s",
"menu.cavedust.upperlimit.tooltip": "The height where particles will fade out and stop spawning (uses player y).",
"menu.cavedust.lowerlimit.tooltip": "The height where particles spawn the most (uses player y).",
"menu.cavedust.reset": "Reset settings",
"menu.cavedust.reset.tooltip": "Are you sure you want to reset all settings?",
"menu.cavedust.particlemultiplier": "Particle amount: %s",
"menu.cavedust.particlemultiplier.tooltip": "Amount of particles to spawn at any given depth.",
"menu.cavedust.particlemultipliermultiplier": "Particle multiplier: %s",
"menu.cavedust.particlemultipliermultiplier.tooltip": "Multiplies particle amount.",
"menu.cavedust.particlemultiplier": "Particle multiplier: %s",
"menu.cavedust.particlemultiplier.tooltip": "Multiplies the amount of particles at any given depth.",
"menu.cavedust.velocityrandomness": "Velocity randomness: %s",
"menu.cavedust.velocityrandomness.tooltip": "The randomness of the velocity of the particles.",
"menu.cavedust.enhanceddetection.true": "Enhanced detection: Enabled",
@@ -26,8 +32,6 @@
"menu.cavedust.superflatstatus.true": "Superflat particles: Enabled",
"menu.cavedust.superflatstatus.false": "Superflat particles: Disabled",
"menu.cavedust.superflatstatus.tooltip": "Should particles spawn on superflat worlds?",
"menu.cavedust.particle": "Particle: ",
"menu.cavedust.particle.tooltip": "Particle to spawn. Click to cycle.",
"key.cavedust.reload": "Reload Config",
"key.cavedust.toggle": "Toggle Particles",
@@ -35,7 +39,6 @@
"debug.cavedust.toggle.true": "(Cave Dust) Enabled particles",
"debug.cavedust.toggle.false": "(Cave Dust) Disabled particles",
"debug.cavedust.reload": "(Cave Dust) Reloaded config",
"debug.cavedust.particleerror": "(Cave Dust) Error setting particle, skipping to next particle!"
"debug.cavedust.reload": "(Cave Dust) Reloaded config"
}

View File

@@ -4,8 +4,7 @@
"package": "net.lizistired.cavedust.mixin",
"compatibilityLevel": "JAVA_16",
"mixins": [
"ClientWorldAccessor",
"MixinDebugScreenOverlay"
"ClientWorldAccessor"
],
"client": [
],

View File

@@ -1,43 +1,44 @@
{
"schemaVersion": 1,
"id": "cavedustreforged",
"id": "cavedust",
"version": "${version}",
"name": "Cave Dust Reforged",
"name": "Cave Dust",
"description": "Makes dust underground that scales with depth!",
"authors": [
"DekinDev"
],
"contributors": [
"LizIsTired (Original mod)"
"LizIsTired"
],
"contact": {
"issues": "https://git.straice.com/DekinDev/cave_dust_reforged/issues",
"sources": "https://git.straice.com/DekinDev/cave_dust_reforged",
"homepage": "https://modrinth.com/project/cave-dust-reforged"
"issues": "https://github.com/LizIsTired/dust/issues",
"sources": "https://github.com/LizIsTired/dust"
},
"license": "MPL-2.0",
"icon": "assets/cavedust/icon.png",
"icon": "assets/modid/icon.png",
"environment": "*",
"entrypoints": {
"client": [
"net.lizistired.cavedust.CaveDust"
],
"main": [
"net.lizistired.cavedust.CaveDustServer"],
"modmenu": [
"net.lizistired.cavedust.CaveDustModMenuFactory"
]
},
"mixins": [
"cavedust.mixins.json"
"dust.mixins.json"
],
"depends": {
"fabricloader": ">=0.17.2",
"fabricloader": ">=0.14.5",
"fabric": "*",
"minecraft": "1.21.11",
"minecraft": ">=1.19-beta.5",
"java": ">=17"
},
"suggests": {
"modmenu": ">=3.0.1"
},
"custom": {
"modmenu": {
"links": {
"modmenu.discord": "https://discord.gg/4m6kQSX6bx"
}
}
}
}