Compare commits
35 Commits
v1.4.0_1.1
...
v1.0.0_1.2
| Author | SHA1 | Date | |
|---|---|---|---|
| ca2dac47b8 | |||
| ec9a0ff865 | |||
| 959f435e8f | |||
|
|
e0eba682ed | ||
|
|
459e6de64a | ||
|
|
db9040acc5 | ||
|
|
be27cf0f30 | ||
|
|
734ea7a1a2 | ||
|
|
71832342af | ||
|
|
4b4b2ad206 | ||
|
|
e795778ba8 | ||
|
|
99ffeb1f99 | ||
|
|
4e1a122289 | ||
|
|
2161bbd1ba | ||
|
|
e35fdaa8ce | ||
|
|
a0aef4a5ef | ||
|
|
39cf0a0703 | ||
|
|
22928e4885 | ||
|
|
8cb6407f8b | ||
|
|
4f3e80bac4 | ||
|
|
12016db5f2 | ||
|
|
e6b4636119 | ||
|
|
10a4c88d9b | ||
|
|
2bc02401b0 | ||
|
|
a071eba485 | ||
|
|
0dde5fa1eb | ||
|
|
f00d0171ae | ||
|
|
93a18d622b | ||
|
|
cfe0ec666f | ||
|
|
1b20ee94c4 | ||
|
|
f0fdd69260 | ||
|
|
6197a489b3 | ||
|
|
1a097e6daf | ||
|
|
2fb8ba966a | ||
|
|
6a5d68cc84 |
2
.github/workflows/build-release.yml
vendored
2
.github/workflows/build-release.yml
vendored
@@ -40,5 +40,3 @@ jobs:
|
|||||||
|
|
||||||
curseforge-id: 594750
|
curseforge-id: 594750
|
||||||
curseforge-token: ${{ secrets.CURSEFORGE_TOKEN }}
|
curseforge-token: ${{ secrets.CURSEFORGE_TOKEN }}
|
||||||
|
|
||||||
github-token: ${{ secrets.GITHUB_TOKEN }}
|
|
||||||
4
.github/workflows/build.yml
vendored
4
.github/workflows/build.yml
vendored
@@ -24,12 +24,12 @@ jobs:
|
|||||||
- name: Extract current branch name
|
- name: Extract current branch name
|
||||||
shell: bash
|
shell: bash
|
||||||
# bash pattern expansion to grab branch name without slashes
|
# bash pattern expansion to grab branch name without slashes
|
||||||
run: ref="${GITHUB_REF#refs/heads/}" && echo "::set-output name=branch::${ref////-}"
|
run: ref="${GITHUB_REF#refs/heads/}" && echo "branch=${ref////-}" >> $GITHUB_OUTPUT
|
||||||
id: ref
|
id: ref
|
||||||
|
|
||||||
- name: Set outputs
|
- name: Set outputs
|
||||||
id: vars
|
id: vars
|
||||||
run: echo "::set-output name=sha_short::$(git rev-parse --short HEAD)"
|
run: echo "sha_short=$(git rev-parse --short HEAD)" >> $GITHUB_OUTPUT
|
||||||
- name: Check outputs
|
- name: Check outputs
|
||||||
run: echo ${{ steps.vars.outputs.sha_short }}
|
run: echo ${{ steps.vars.outputs.sha_short }}
|
||||||
|
|
||||||
|
|||||||
@@ -1,11 +1,8 @@
|
|||||||
plugins {
|
plugins {
|
||||||
id 'fabric-loom' version '1.2-SNAPSHOT'
|
id 'fabric-loom' version '1.11-SNAPSHOT'
|
||||||
id 'maven-publish'
|
id 'maven-publish'
|
||||||
}
|
}
|
||||||
|
|
||||||
sourceCompatibility = JavaVersion.VERSION_17
|
|
||||||
targetCompatibility = JavaVersion.VERSION_17
|
|
||||||
|
|
||||||
archivesBaseName = project.archives_base_name
|
archivesBaseName = project.archives_base_name
|
||||||
version = project.mod_version
|
version = project.mod_version
|
||||||
group = project.maven_group
|
group = project.maven_group
|
||||||
@@ -61,7 +58,7 @@ processResources {
|
|||||||
|
|
||||||
tasks.withType(JavaCompile).configureEach {
|
tasks.withType(JavaCompile).configureEach {
|
||||||
// Minecraft 1.18 (1.18-pre2) upwards uses Java 17.
|
// Minecraft 1.18 (1.18-pre2) upwards uses Java 17.
|
||||||
it.options.release = 17
|
it.options.release = 21
|
||||||
}
|
}
|
||||||
|
|
||||||
java {
|
java {
|
||||||
@@ -69,6 +66,8 @@ java {
|
|||||||
// if it is present.
|
// if it is present.
|
||||||
// If you remove this line, sources will not be generated.
|
// If you remove this line, sources will not be generated.
|
||||||
withSourcesJar()
|
withSourcesJar()
|
||||||
|
sourceCompatibility = JavaVersion.VERSION_21
|
||||||
|
targetCompatibility = JavaVersion.VERSION_21
|
||||||
}
|
}
|
||||||
|
|
||||||
jar {
|
jar {
|
||||||
|
|||||||
@@ -3,17 +3,17 @@ org.gradle.jvmargs=-Xmx1G
|
|||||||
|
|
||||||
# Fabric Properties
|
# Fabric Properties
|
||||||
# check these on https://fabricmc.net/develop
|
# check these on https://fabricmc.net/develop
|
||||||
minecraft_version=1.19.3
|
minecraft_version=1.21.9
|
||||||
yarn_mappings=1.19.3+build.5
|
yarn_mappings=1.21.9+build.1
|
||||||
loader_version=0.14.13
|
loader_version=0.18.4
|
||||||
|
loom_version=1.14-SNAPSHOT
|
||||||
|
|
||||||
# Mod Properties
|
# Mod Properties
|
||||||
mod_version = 1.4.0
|
mod_version=1.0.0
|
||||||
maven_group = com.lizistired
|
maven_group=com.straice
|
||||||
archives_base_name = cave_dust
|
archives_base_name=cave_dust_reforged
|
||||||
|
|
||||||
# Dependencies
|
# Dependencies
|
||||||
fabric_version=0.72.0+1.19.3
|
fabric_version=0.134.1+1.21.9
|
||||||
clothconfig_version =9.0.94
|
modmenu_version=16.0.0-rc.2
|
||||||
modmenu_version =5.1.0-beta.3
|
kirin_version=1.21.1+1.21.7
|
||||||
kirin_version=1.13.2
|
|
||||||
BIN
gradle/wrapper/gradle-wrapper.jar
vendored
BIN
gradle/wrapper/gradle-wrapper.jar
vendored
Binary file not shown.
4
gradle/wrapper/gradle-wrapper.properties
vendored
4
gradle/wrapper/gradle-wrapper.properties
vendored
@@ -1,5 +1,7 @@
|
|||||||
distributionBase=GRADLE_USER_HOME
|
distributionBase=GRADLE_USER_HOME
|
||||||
distributionPath=wrapper/dists
|
distributionPath=wrapper/dists
|
||||||
distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip
|
distributionUrl=https\://services.gradle.org/distributions/gradle-8.14-bin.zip
|
||||||
|
networkTimeout=10000
|
||||||
|
validateDistributionUrl=true
|
||||||
zipStoreBase=GRADLE_USER_HOME
|
zipStoreBase=GRADLE_USER_HOME
|
||||||
zipStorePath=wrapper/dists
|
zipStorePath=wrapper/dists
|
||||||
|
|||||||
44
gradlew
vendored
44
gradlew
vendored
@@ -15,6 +15,8 @@
|
|||||||
# See the License for the specific language governing permissions and
|
# See the License for the specific language governing permissions and
|
||||||
# limitations under the License.
|
# limitations under the License.
|
||||||
#
|
#
|
||||||
|
# SPDX-License-Identifier: Apache-2.0
|
||||||
|
#
|
||||||
|
|
||||||
##############################################################################
|
##############################################################################
|
||||||
#
|
#
|
||||||
@@ -55,7 +57,7 @@
|
|||||||
# Darwin, MinGW, and NonStop.
|
# Darwin, MinGW, and NonStop.
|
||||||
#
|
#
|
||||||
# (3) This script is generated from the Groovy template
|
# (3) This script is generated from the Groovy template
|
||||||
# https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
|
# https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
|
||||||
# within the Gradle project.
|
# within the Gradle project.
|
||||||
#
|
#
|
||||||
# You can find Gradle at https://github.com/gradle/gradle/.
|
# You can find Gradle at https://github.com/gradle/gradle/.
|
||||||
@@ -80,13 +82,12 @@ do
|
|||||||
esac
|
esac
|
||||||
done
|
done
|
||||||
|
|
||||||
APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
|
# This is normally unused
|
||||||
|
# shellcheck disable=SC2034
|
||||||
APP_NAME="Gradle"
|
|
||||||
APP_BASE_NAME=${0##*/}
|
APP_BASE_NAME=${0##*/}
|
||||||
|
# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
|
||||||
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
|
APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s
|
||||||
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
|
' "$PWD" ) || exit
|
||||||
|
|
||||||
# Use the maximum available, or set MAX_FD != -1 to use that value.
|
# Use the maximum available, or set MAX_FD != -1 to use that value.
|
||||||
MAX_FD=maximum
|
MAX_FD=maximum
|
||||||
@@ -133,22 +134,29 @@ location of your Java installation."
|
|||||||
fi
|
fi
|
||||||
else
|
else
|
||||||
JAVACMD=java
|
JAVACMD=java
|
||||||
which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
|
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.
|
||||||
|
|
||||||
Please set the JAVA_HOME variable in your environment to match the
|
Please set the JAVA_HOME variable in your environment to match the
|
||||||
location of your Java installation."
|
location of your Java installation."
|
||||||
fi
|
fi
|
||||||
|
fi
|
||||||
|
|
||||||
# Increase the maximum file descriptors if we can.
|
# Increase the maximum file descriptors if we can.
|
||||||
if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
|
if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
|
||||||
case $MAX_FD in #(
|
case $MAX_FD in #(
|
||||||
max*)
|
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 ) ||
|
MAX_FD=$( ulimit -H -n ) ||
|
||||||
warn "Could not query maximum file descriptor limit"
|
warn "Could not query maximum file descriptor limit"
|
||||||
esac
|
esac
|
||||||
case $MAX_FD in #(
|
case $MAX_FD in #(
|
||||||
'' | soft) :;; #(
|
'' | 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" ||
|
ulimit -n "$MAX_FD" ||
|
||||||
warn "Could not set maximum file descriptor limit to $MAX_FD"
|
warn "Could not set maximum file descriptor limit to $MAX_FD"
|
||||||
esac
|
esac
|
||||||
@@ -193,11 +201,15 @@ if "$cygwin" || "$msys" ; then
|
|||||||
done
|
done
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Collect all arguments for the java command;
|
|
||||||
# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
|
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
|
||||||
# shell script including quotes and variable substitutions, so put them in
|
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
|
||||||
# double quotes to make sure that they get re-expanded; and
|
|
||||||
# * put everything else in single quotes, so that it's not re-expanded.
|
# 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.
|
||||||
|
|
||||||
set -- \
|
set -- \
|
||||||
"-Dorg.gradle.appname=$APP_BASE_NAME" \
|
"-Dorg.gradle.appname=$APP_BASE_NAME" \
|
||||||
@@ -205,6 +217,12 @@ set -- \
|
|||||||
org.gradle.wrapper.GradleWrapperMain \
|
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.
|
# Use "xargs" to parse quoted args.
|
||||||
#
|
#
|
||||||
# With -n1 it outputs one arg per line, with the quotes and backslashes removed.
|
# With -n1 it outputs one arg per line, with the quotes and backslashes removed.
|
||||||
|
|||||||
33
gradlew.bat
vendored
33
gradlew.bat
vendored
@@ -13,6 +13,8 @@
|
|||||||
@rem See the License for the specific language governing permissions and
|
@rem See the License for the specific language governing permissions and
|
||||||
@rem limitations under the License.
|
@rem limitations under the License.
|
||||||
@rem
|
@rem
|
||||||
|
@rem SPDX-License-Identifier: Apache-2.0
|
||||||
|
@rem
|
||||||
|
|
||||||
@if "%DEBUG%"=="" @echo off
|
@if "%DEBUG%"=="" @echo off
|
||||||
@rem ##########################################################################
|
@rem ##########################################################################
|
||||||
@@ -26,6 +28,7 @@ if "%OS%"=="Windows_NT" setlocal
|
|||||||
|
|
||||||
set DIRNAME=%~dp0
|
set DIRNAME=%~dp0
|
||||||
if "%DIRNAME%"=="" set DIRNAME=.
|
if "%DIRNAME%"=="" set DIRNAME=.
|
||||||
|
@rem This is normally unused
|
||||||
set APP_BASE_NAME=%~n0
|
set APP_BASE_NAME=%~n0
|
||||||
set APP_HOME=%DIRNAME%
|
set APP_HOME=%DIRNAME%
|
||||||
|
|
||||||
@@ -40,13 +43,13 @@ if defined JAVA_HOME goto findJavaFromJavaHome
|
|||||||
|
|
||||||
set JAVA_EXE=java.exe
|
set JAVA_EXE=java.exe
|
||||||
%JAVA_EXE% -version >NUL 2>&1
|
%JAVA_EXE% -version >NUL 2>&1
|
||||||
if "%ERRORLEVEL%" == "0" goto execute
|
if %ERRORLEVEL% equ 0 goto execute
|
||||||
|
|
||||||
echo.
|
echo. 1>&2
|
||||||
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
|
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
|
||||||
echo.
|
echo. 1>&2
|
||||||
echo Please set the JAVA_HOME variable in your environment to match the
|
echo Please set the JAVA_HOME variable in your environment to match the 1>&2
|
||||||
echo location of your Java installation.
|
echo location of your Java installation. 1>&2
|
||||||
|
|
||||||
goto fail
|
goto fail
|
||||||
|
|
||||||
@@ -56,11 +59,11 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe
|
|||||||
|
|
||||||
if exist "%JAVA_EXE%" goto execute
|
if exist "%JAVA_EXE%" goto execute
|
||||||
|
|
||||||
echo.
|
echo. 1>&2
|
||||||
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
|
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
|
||||||
echo.
|
echo. 1>&2
|
||||||
echo Please set the JAVA_HOME variable in your environment to match the
|
echo Please set the JAVA_HOME variable in your environment to match the 1>&2
|
||||||
echo location of your Java installation.
|
echo location of your Java installation. 1>&2
|
||||||
|
|
||||||
goto fail
|
goto fail
|
||||||
|
|
||||||
@@ -75,13 +78,15 @@ set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
|
|||||||
|
|
||||||
:end
|
:end
|
||||||
@rem End local scope for the variables with windows NT shell
|
@rem End local scope for the variables with windows NT shell
|
||||||
if "%ERRORLEVEL%"=="0" goto mainEnd
|
if %ERRORLEVEL% equ 0 goto mainEnd
|
||||||
|
|
||||||
:fail
|
:fail
|
||||||
rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
|
rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
|
||||||
rem the _cmd.exe /c_ return code!
|
rem the _cmd.exe /c_ return code!
|
||||||
if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
|
set EXIT_CODE=%ERRORLEVEL%
|
||||||
exit /b 1
|
if %EXIT_CODE% equ 0 set EXIT_CODE=1
|
||||||
|
if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
|
||||||
|
exit /b %EXIT_CODE%
|
||||||
|
|
||||||
:mainEnd
|
:mainEnd
|
||||||
if "%OS%"=="Windows_NT" endlocal
|
if "%OS%"=="Windows_NT" endlocal
|
||||||
|
|||||||
@@ -1,67 +1,85 @@
|
|||||||
package net.lizistired.cavedust;
|
package net.lizistired.cavedust;
|
||||||
|
|
||||||
// minecraft imports
|
// minecraft imports
|
||||||
import net.minecraft.block.Blocks;
|
|
||||||
import net.minecraft.client.MinecraftClient;
|
|
||||||
import net.minecraft.particle.ParticleTypes;
|
|
||||||
import net.minecraft.registry.Registries;
|
|
||||||
import net.minecraft.text.Text;
|
|
||||||
import net.minecraft.util.math.BlockPos;
|
|
||||||
import net.minecraft.world.World;
|
|
||||||
//other imports
|
|
||||||
import com.minelittlepony.common.util.GamePaths;
|
|
||||||
import net.fabricmc.api.ClientModInitializer;
|
import net.fabricmc.api.ClientModInitializer;
|
||||||
import net.fabricmc.fabric.api.client.event.lifecycle.v1.ClientTickEvents;
|
import net.fabricmc.fabric.api.client.event.lifecycle.v1.ClientTickEvents;
|
||||||
|
import net.fabricmc.fabric.api.client.particle.v1.ParticleFactoryRegistry;
|
||||||
|
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
|
||||||
|
import com.minelittlepony.common.util.GamePaths;
|
||||||
import org.slf4j.Logger;
|
import org.slf4j.Logger;
|
||||||
import org.slf4j.LoggerFactory;
|
import org.slf4j.LoggerFactory;
|
||||||
|
|
||||||
// java imports
|
// java imports
|
||||||
import java.nio.file.Path;
|
import java.nio.file.Path;
|
||||||
//static imports
|
|
||||||
import static net.lizistired.cavedust.utils.MathHelper.*;
|
|
||||||
import static net.lizistired.cavedust.utils.MathHelper.generateRandomDouble;
|
|
||||||
import static net.lizistired.cavedust.utils.ParticleSpawnUtil.shouldParticlesSpawn;
|
|
||||||
import static net.lizistired.cavedust.utils.KeybindingHelper.*;
|
|
||||||
|
|
||||||
|
// static imports
|
||||||
|
import static net.lizistired.cavedust.utils.KeybindingHelper.*;
|
||||||
|
import static net.lizistired.cavedust.utils.MathHelper.generateRandomDouble;
|
||||||
|
import static net.lizistired.cavedust.utils.MathHelper.normalize;
|
||||||
|
import static net.lizistired.cavedust.utils.ParticleSpawnUtil.shouldParticlesSpawn;
|
||||||
|
|
||||||
public class CaveDust implements ClientModInitializer {
|
public class CaveDust implements ClientModInitializer {
|
||||||
// logger
|
// logger
|
||||||
public static final Logger LOGGER = LoggerFactory.getLogger("cavedust");
|
public static final Logger LOGGER = LoggerFactory.getLogger("cavedust");
|
||||||
|
|
||||||
// make class static
|
// make class static
|
||||||
private static CaveDust instance;
|
private static CaveDust instance;
|
||||||
|
|
||||||
public static CaveDust getInstance() {
|
public static CaveDust getInstance() {
|
||||||
return instance;
|
return instance;
|
||||||
}
|
}
|
||||||
|
|
||||||
public CaveDust() {
|
public CaveDust() {
|
||||||
instance = this;
|
instance = this;
|
||||||
}
|
}
|
||||||
|
|
||||||
// config assignment
|
// config assignment
|
||||||
private static net.lizistired.cavedust.CaveDustConfig config;
|
private static CaveDustConfig config;
|
||||||
public net.lizistired.cavedust.CaveDustConfig getConfig() {
|
|
||||||
|
public CaveDustConfig getConfig() {
|
||||||
return config;
|
return config;
|
||||||
}
|
}
|
||||||
|
|
||||||
public static int WHITE_ASH_ID = Registries.PARTICLE_TYPE.getRawId(ParticleTypes.WHITE_ASH);
|
public static ParticleEffect WHITE_ASH_ID =
|
||||||
public static int PARTICLE_AMOUNT = 0;
|
(ParticleEffect) Registries.PARTICLE_TYPE.get(Identifier.of("cavedust", "cave_dust"));
|
||||||
|
|
||||||
|
public static int PARTICLE_AMOUNT = 0;
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onInitializeClient() {
|
public void onInitializeClient() {
|
||||||
// config path and loading
|
// config path and loading
|
||||||
Path CaveDustFolder = GamePaths.getConfigDirectory().resolve("cavedust");
|
Path caveDustFolder = GamePaths.getConfigDirectory().resolve("cavedust");
|
||||||
config = new CaveDustConfig(CaveDustFolder.getParent().resolve("cavedust.json"), this);
|
config = new CaveDustConfig(caveDustFolder.getParent().resolve("cavedust.json"), this);
|
||||||
config.load();
|
config.load();
|
||||||
|
|
||||||
registerKeyBindings();
|
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);
|
ClientTickEvents.END_CLIENT_TICK.register(this::createCaveDust);
|
||||||
}
|
}
|
||||||
|
|
||||||
private void createCaveDust(MinecraftClient client) {
|
private void createCaveDust(MinecraftClient client) {
|
||||||
|
if (client.player == null) return;
|
||||||
|
|
||||||
if (keyBinding1.wasPressed()) {
|
if (keyBinding1.wasPressed()) {
|
||||||
getConfig().toggleCaveDust();
|
getConfig().toggleCaveDust();
|
||||||
LOGGER.info("Toggled dust");
|
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();
|
getConfig().load();
|
||||||
LOGGER.info("Reloaded config");
|
LOGGER.info("Reloaded config");
|
||||||
@@ -71,27 +89,40 @@ public class CaveDust implements ClientModInitializer {
|
|||||||
// ensure world is not null
|
// ensure world is not null
|
||||||
if (client.world == null) return;
|
if (client.world == null) return;
|
||||||
World world = client.world;
|
World world = client.world;
|
||||||
//LOGGER.info(String.valueOf(((ClientWorldAccessor) client.world.getLevelProperties()).getFlatWorld()));
|
|
||||||
// )
|
double probabilityNormalized =
|
||||||
double probabilityNormalized = normalize(config.getLowerLimit(), config.getUpperLimit(), client.player.getBlockY());
|
normalize(config.getLowerLimit(), config.getUpperLimit(), client.player.getBlockY());
|
||||||
PARTICLE_AMOUNT = (int) (probabilityNormalized * config.getParticleMultiplier() * config.getParticleMultiplierMultiplier());
|
|
||||||
|
PARTICLE_AMOUNT = (int) (probabilityNormalized
|
||||||
|
* config.getParticleMultiplier()
|
||||||
|
* config.getParticleMultiplierMultiplier());
|
||||||
|
|
||||||
for (int i = 0; i < PARTICLE_AMOUNT; i++) {
|
for (int i = 0; i < PARTICLE_AMOUNT; i++) {
|
||||||
try {
|
int x = (int) (client.player.getX()
|
||||||
double x = client.player.getPos().getX() + generateRandomDouble(config.getDimensionsX() * -1, config.getDimensionsX());
|
+ generateRandomDouble(-config.getDimensionWidth(), config.getDimensionWidth()));
|
||||||
double y = client.player.getPos().getY() + generateRandomDouble(config.getDimensionsY() * -1, config.getDimensionsY());
|
|
||||||
double z = client.player.getPos().getZ() + generateRandomDouble(config.getDimensionsZ() * -1, config.getDimensionsZ());
|
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();
|
||||||
|
|
||||||
BlockPos particlePos = new BlockPos(x, y, z);
|
BlockPos particlePos = new BlockPos(x, y, z);
|
||||||
|
|
||||||
if (shouldParticlesSpawn(client, config, particlePos)) {
|
if (shouldParticlesSpawn(client, config, particlePos)) {
|
||||||
if (client.world.getBlockState(particlePos).isAir()) {
|
if (client.world.getBlockState(particlePos).isAir()) {
|
||||||
world.addParticle(config.getParticle(), x, y, z, config.getVelocityRandomnessRandom(), config.getVelocityRandomnessRandom(), config.getVelocityRandomnessRandom());
|
world.addParticleClient(
|
||||||
}
|
getConfig().getParticle(),
|
||||||
}
|
miniX, miniY, miniZ,
|
||||||
}
|
config.getVelocityRandomnessRandom() * 0.01,
|
||||||
catch (NullPointerException e) {
|
config.getVelocityRandomnessRandom() * 0.01,
|
||||||
LOGGER.error(String.valueOf(e));
|
config.getVelocityRandomnessRandom() * 0.01
|
||||||
getConfig().setParticleID(WHITE_ASH_ID);
|
);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,25 +1,31 @@
|
|||||||
package net.lizistired.cavedust;
|
package net.lizistired.cavedust;
|
||||||
|
|
||||||
|
import com.google.common.collect.ImmutableList;
|
||||||
import net.lizistired.cavedust.utils.JsonFile;
|
import net.lizistired.cavedust.utils.JsonFile;
|
||||||
import net.minecraft.client.MinecraftClient;
|
import net.minecraft.client.MinecraftClient;
|
||||||
|
import net.minecraft.client.render.RenderLayer;
|
||||||
import net.minecraft.particle.ParticleEffect;
|
import net.minecraft.particle.ParticleEffect;
|
||||||
|
import net.minecraft.particle.ParticleType;
|
||||||
import net.minecraft.particle.ParticleTypes;
|
import net.minecraft.particle.ParticleTypes;
|
||||||
import net.minecraft.registry.Registries;
|
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.text.Text;
|
||||||
import net.minecraft.util.Identifier;
|
import net.minecraft.util.Identifier;
|
||||||
import static net.lizistired.cavedust.CaveDust.*;
|
import static net.lizistired.cavedust.CaveDust.*;
|
||||||
import static net.lizistired.cavedust.utils.MathHelper.*;
|
import static net.lizistired.cavedust.utils.MathHelper.*;
|
||||||
|
|
||||||
import java.nio.file.Path;
|
import java.nio.file.Path;
|
||||||
|
import java.util.*;
|
||||||
|
|
||||||
public class CaveDustConfig extends JsonFile {
|
public class CaveDustConfig extends JsonFile {
|
||||||
private transient final net.lizistired.cavedust.CaveDust CaveDust;
|
private transient final net.lizistired.cavedust.CaveDust CaveDust;
|
||||||
|
|
||||||
|
|
||||||
private int dimensionX = 5;
|
private int width = 10;
|
||||||
private int dimensionY = 5;
|
private int height = 10;
|
||||||
private int dimensionZ = 5;
|
private int velocityRandomness = 0;
|
||||||
private int velocityRandomness = 1;
|
|
||||||
|
|
||||||
private boolean caveDustEnabled = true;
|
private boolean caveDustEnabled = true;
|
||||||
private boolean seaLevelCheck = true;
|
private boolean seaLevelCheck = true;
|
||||||
@@ -28,49 +34,41 @@ public class CaveDustConfig extends JsonFile {
|
|||||||
private float lowerLimit = -64;
|
private float lowerLimit = -64;
|
||||||
private int particleMultiplier = 1;
|
private int particleMultiplier = 1;
|
||||||
|
|
||||||
|
int listNumber = 0;
|
||||||
|
|
||||||
private int particleMultiplierMultiplier = 10;
|
private int particleMultiplierMultiplier = 10;
|
||||||
|
|
||||||
private int particleID = WHITE_ASH_ID;
|
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) {
|
public CaveDustConfig(Path file, net.lizistired.cavedust.CaveDust caveDust) {
|
||||||
super(file);
|
super(file);
|
||||||
this.CaveDust = caveDust;
|
this.CaveDust = caveDust;
|
||||||
}
|
}
|
||||||
|
|
||||||
public float setDimensionsX(float size){
|
public float setDimensionWidth(float size){
|
||||||
if (this.dimensionX != size) {
|
if (this.width != size) {
|
||||||
this.dimensionX = (int)size;
|
this.width = (int)size;
|
||||||
save();
|
save();
|
||||||
}
|
}
|
||||||
return getDimensionsX();
|
return getDimensionWidth();
|
||||||
}
|
}
|
||||||
|
|
||||||
public float setDimensionsY(float size){
|
public float setDimensionHeight(float size){
|
||||||
if (this.dimensionY != size) {
|
if (this.height != size) {
|
||||||
this.dimensionY = (int)size;
|
this.height = (int)size;
|
||||||
save();
|
save();
|
||||||
}
|
}
|
||||||
return getDimensionsY();
|
return getDimensionHeight();
|
||||||
}
|
}
|
||||||
|
|
||||||
public float setDimensionsZ(float size){
|
public float getDimensionWidth(){
|
||||||
if (this.dimensionZ != size) {
|
return width;
|
||||||
this.dimensionZ = (int)size;
|
|
||||||
save();
|
|
||||||
}
|
|
||||||
return getDimensionsZ();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public float getDimensionsX(){
|
public float getDimensionHeight(){
|
||||||
return dimensionX;
|
return height;
|
||||||
}
|
|
||||||
|
|
||||||
public float getDimensionsY(){
|
|
||||||
return dimensionY;
|
|
||||||
}
|
|
||||||
|
|
||||||
public float getDimensionsZ(){
|
|
||||||
return dimensionZ;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public float setUpperLimit(float upperLimit){
|
public float setUpperLimit(float upperLimit){
|
||||||
@@ -135,20 +133,32 @@ public class CaveDustConfig extends JsonFile {
|
|||||||
return caveDustEnabled;
|
return caveDustEnabled;
|
||||||
}
|
}
|
||||||
|
|
||||||
public ParticleEffect setParticle(String particleType){
|
//todo
|
||||||
|
//public Identifier setParticle(String particleType){
|
||||||
//particleName = particleType;
|
//particleName = particleType;
|
||||||
save();
|
//save();
|
||||||
return getParticle();
|
//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 getParticle(){
|
public ParticleEffect getParticle(){
|
||||||
try{
|
try{
|
||||||
return (ParticleEffect) Registries.PARTICLE_TYPE.get(new Identifier(Registries.PARTICLE_TYPE.getEntry(getParticleID()).get().getKey().get().getValue().toString().toLowerCase()));
|
return (ParticleEffect) Registries.PARTICLE_TYPE.get(newId);
|
||||||
} catch (ClassCastException e) {
|
}
|
||||||
MinecraftClient.getInstance().player.sendMessage(Text.literal("Issue loading particle, defaulting to white ash particle!"), false);
|
catch (ClassCastException e){
|
||||||
setParticleID(WHITE_ASH_ID);
|
iterateParticle();
|
||||||
save();
|
return getParticle();
|
||||||
return ParticleTypes.WHITE_ASH;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -188,41 +198,35 @@ public class CaveDustConfig extends JsonFile {
|
|||||||
}
|
}
|
||||||
|
|
||||||
public void iterateParticle() {
|
public void iterateParticle() {
|
||||||
if(getParticleID() > Registries.PARTICLE_TYPE.size() - 2) {
|
try {
|
||||||
particleID = 1;
|
listNumber = listNumber + 1;
|
||||||
save();
|
newId = list.get(listNumber);
|
||||||
} else {
|
} catch (IndexOutOfBoundsException e){
|
||||||
particleID = getParticleID() + 1;
|
newId = list.get(0);
|
||||||
save();
|
listNumber = 0;
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
public void setParticleID(int particleID){
|
|
||||||
this.particleID = particleID;
|
|
||||||
save();
|
save();
|
||||||
}
|
}
|
||||||
|
|
||||||
public int getParticleID(){
|
public ParticleEffect getParticleID(){
|
||||||
if ((!Registries.PARTICLE_TYPE.getEntry(particleID).isPresent())) {
|
return getParticle();
|
||||||
setParticleID(WHITE_ASH_ID);
|
|
||||||
}
|
|
||||||
return particleID;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public void resetConfig(){
|
public void resetConfig(){
|
||||||
dimensionX = 5;
|
width = 10;
|
||||||
dimensionY = 5;
|
height = 10;
|
||||||
dimensionZ = 5;
|
|
||||||
|
|
||||||
upperLimit = 64;
|
upperLimit = 64;
|
||||||
lowerLimit = -64;
|
lowerLimit = -64;
|
||||||
|
|
||||||
particleMultiplier = 1;
|
particleMultiplier = 1;
|
||||||
particleMultiplierMultiplier = 10;
|
particleMultiplierMultiplier = 10;
|
||||||
|
velocityRandomness = 0;
|
||||||
|
|
||||||
|
newId = Identifier.of("cavedust", "cave_dust");
|
||||||
|
|
||||||
seaLevelCheck = true;
|
seaLevelCheck = true;
|
||||||
caveDustEnabled = true;
|
caveDustEnabled = true;
|
||||||
particleID = WHITE_ASH_ID;
|
|
||||||
save();
|
save();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,83 @@
|
|||||||
|
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);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
19
src/main/java/net/lizistired/cavedust/CaveDustServer.java
Normal file
19
src/main/java/net/lizistired/cavedust/CaveDustServer.java
Normal file
@@ -0,0 +1,19 @@
|
|||||||
|
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);
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -3,13 +3,15 @@ package net.lizistired.cavedust;
|
|||||||
import com.minelittlepony.common.client.gui.GameGui;
|
import com.minelittlepony.common.client.gui.GameGui;
|
||||||
import com.minelittlepony.common.client.gui.element.*;
|
import com.minelittlepony.common.client.gui.element.*;
|
||||||
import net.lizistired.cavedust.utils.TranslatableTextHelper;
|
import net.lizistired.cavedust.utils.TranslatableTextHelper;
|
||||||
|
import net.minecraft.client.gui.DrawContext;
|
||||||
import net.minecraft.client.gui.screen.Screen;
|
import net.minecraft.client.gui.screen.Screen;
|
||||||
import net.minecraft.client.util.math.MatrixStack;
|
import net.minecraft.particle.ParticleType;
|
||||||
import net.minecraft.particle.ParticleEffect;
|
|
||||||
import net.minecraft.registry.Registries;
|
import net.minecraft.registry.Registries;
|
||||||
import net.minecraft.text.Text;
|
import net.minecraft.text.Text;
|
||||||
import org.jetbrains.annotations.Nullable;
|
import org.jetbrains.annotations.Nullable;
|
||||||
|
|
||||||
|
import java.util.NoSuchElementException;
|
||||||
|
|
||||||
public class ModMenuConfigScreen extends GameGui {
|
public class ModMenuConfigScreen extends GameGui {
|
||||||
public ModMenuConfigScreen(@Nullable Screen parent) {
|
public ModMenuConfigScreen(@Nullable Screen parent) {
|
||||||
super(Text.translatable("menu.cavedust.title"), parent);
|
super(Text.translatable("menu.cavedust.title"), parent);
|
||||||
@@ -72,20 +74,15 @@ public class ModMenuConfigScreen extends GameGui {
|
|||||||
})).getStyle().setText("Particle: " + (getNameOfParticle()))
|
})).getStyle().setText("Particle: " + (getNameOfParticle()))
|
||||||
.setTooltip(Text.translatable("menu.cavedust.particle.tooltip"));
|
.setTooltip(Text.translatable("menu.cavedust.particle.tooltip"));
|
||||||
|
|
||||||
addButton(new Slider(left += 220, row -= 96, 1, 50, config.getDimensionsX()))
|
addButton(new Slider(left += 220, row -= 96, 1, 50, config.getDimensionWidth()))
|
||||||
.onChange(config::setDimensionsX)
|
.onChange(config::setDimensionWidth)
|
||||||
.setTextFormat(transText::formatMaxX)
|
.setTextFormat(transText::formatMaxWidth)
|
||||||
.getStyle().setTooltip(Text.translatable("menu.cavedust.X.tooltip"));
|
.getStyle().setTooltip(Text.translatable("menu.cavedust.width.tooltip"));
|
||||||
|
|
||||||
addButton(new Slider(left, row += 24, 1, 50, config.getDimensionsY()))
|
addButton(new Slider(left, row += 24, 1, 50, config.getDimensionHeight()))
|
||||||
.onChange(config::setDimensionsY)
|
.onChange(config::setDimensionHeight)
|
||||||
.setTextFormat(transText::formatMaxY)
|
.setTextFormat(transText::formatMaxHeight)
|
||||||
.getStyle().setTooltip(Text.translatable("menu.cavedust.Y.tooltip"));
|
.getStyle().setTooltip(Text.translatable("menu.cavedust.height.tooltip"));
|
||||||
|
|
||||||
addButton(new Slider(left, row += 24, 1, 50, config.getDimensionsZ()))
|
|
||||||
.onChange(config::setDimensionsZ)
|
|
||||||
.setTextFormat(transText::formatMaxZ)
|
|
||||||
.getStyle().setTooltip(Text.translatable("menu.cavedust.Z.tooltip"));
|
|
||||||
|
|
||||||
addButton(new Slider(left, row += 24, 0, 10, config.getVelocityRandomness()))
|
addButton(new Slider(left, row += 24, 0, 10, config.getVelocityRandomness()))
|
||||||
.onChange(config::setVelocityRandomness)
|
.onChange(config::setVelocityRandomness)
|
||||||
@@ -93,9 +90,10 @@ public class ModMenuConfigScreen extends GameGui {
|
|||||||
.getStyle().setTooltip(Text.translatable("menu.cavedust.velocityrandomness.tooltip"));
|
.getStyle().setTooltip(Text.translatable("menu.cavedust.velocityrandomness.tooltip"));
|
||||||
|
|
||||||
|
|
||||||
addButton(new Button(left -= 110, row += 60).onClick(sender -> {
|
addButton(new Button(left -= 110, row += 120).onClick(sender -> {
|
||||||
config.resetConfig();
|
config.resetConfig();
|
||||||
finish();
|
finish();
|
||||||
|
client.setScreen(new ModMenuConfigScreen(parent));
|
||||||
})).getStyle().setText(Text.translatable("menu.cavedust.reset")).setTooltip(Text.translatable("menu.cavedust.reset.tooltip"));
|
})).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 += 24)
|
||||||
@@ -106,13 +104,18 @@ public class ModMenuConfigScreen extends GameGui {
|
|||||||
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void render(MatrixStack matrices, int mouseX, int mouseY, float partialTicks) {
|
public void render(DrawContext context, int mouseX, int mouseY, float partialTicks) {
|
||||||
renderBackground(matrices);
|
super.render(context, mouseX, mouseY, partialTicks);
|
||||||
super.render(matrices, mouseX, mouseY, partialTicks);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
private String getNameOfParticle(){
|
private String getNameOfParticle(){
|
||||||
CaveDustConfig config = CaveDust.getInstance().getConfig();
|
CaveDustConfig config = CaveDust.getInstance().getConfig();
|
||||||
config.load();
|
config.load();
|
||||||
return Registries.PARTICLE_TYPE.getEntry(config.getParticleID()).get().getKey().get().getValue().toString();
|
try {
|
||||||
|
return Registries.PARTICLE_TYPE.getEntry((ParticleType<?>) config.getParticleID()).getIdAsString();
|
||||||
|
} catch (NoSuchElementException e){
|
||||||
|
CaveDust.LOGGER.error(String.valueOf(e));
|
||||||
|
return "null";
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -6,19 +6,31 @@ import org.spongepowered.asm.mixin.injection.At;
|
|||||||
import org.spongepowered.asm.mixin.injection.Inject;
|
import org.spongepowered.asm.mixin.injection.Inject;
|
||||||
import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
|
import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
|
||||||
|
|
||||||
|
import java.util.ArrayList;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
import static net.lizistired.cavedust.CaveDust.PARTICLE_AMOUNT;
|
import static net.lizistired.cavedust.CaveDust.PARTICLE_AMOUNT;
|
||||||
import static net.lizistired.cavedust.utils.ParticleSpawnUtil.shouldParticlesSpawn;
|
|
||||||
|
|
||||||
@Mixin(DebugHud.class)
|
@Mixin(DebugHud.class)
|
||||||
public abstract class MixinDebugScreenOverlay {
|
public abstract class MixinDebugScreenOverlay {
|
||||||
@Inject(method = "getRightText", at = @At("RETURN"))
|
|
||||||
private void appendShaderPackText(CallbackInfoReturnable<List<String>> cir) {
|
|
||||||
List<String> messages = cir.getReturnValue();
|
|
||||||
|
|
||||||
messages.add("");
|
@Inject(
|
||||||
messages.add("Particle amount evaluated: " + PARTICLE_AMOUNT);
|
method = "getRightText()Ljava/util/List;",
|
||||||
messages.add("");
|
at = @At("RETURN"),
|
||||||
|
cancellable = true,
|
||||||
|
require = 0
|
||||||
|
)
|
||||||
|
private void appendDebugText(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);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -3,6 +3,7 @@ package net.lizistired.cavedust.utils;
|
|||||||
import net.fabricmc.fabric.api.client.keybinding.v1.KeyBindingHelper;
|
import net.fabricmc.fabric.api.client.keybinding.v1.KeyBindingHelper;
|
||||||
import net.minecraft.client.option.KeyBinding;
|
import net.minecraft.client.option.KeyBinding;
|
||||||
import net.minecraft.client.util.InputUtil;
|
import net.minecraft.client.util.InputUtil;
|
||||||
|
import net.minecraft.util.Identifier;
|
||||||
import org.lwjgl.glfw.GLFW;
|
import org.lwjgl.glfw.GLFW;
|
||||||
|
|
||||||
public class KeybindingHelper {
|
public class KeybindingHelper {
|
||||||
@@ -10,19 +11,23 @@ public class KeybindingHelper {
|
|||||||
public static KeyBinding keyBinding1;
|
public static KeyBinding keyBinding1;
|
||||||
public static KeyBinding keyBinding2;
|
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(
|
keyBinding1 = KeyBindingHelper.registerKeyBinding(new KeyBinding(
|
||||||
"key.cavedust.toggle",
|
"key.cavedust.toggle",
|
||||||
InputUtil.Type.KEYSYM,// The translation key of the keybinding's name // The type of the keybinding, KEYSYM for keyboard, MOUSE for mouse.
|
InputUtil.Type.KEYSYM,
|
||||||
GLFW.GLFW_KEY_KP_ADD, // The keycode of the key
|
GLFW.GLFW_KEY_KP_ADD,
|
||||||
"category.cavedust.spook" // The translation key of the keybinding's category.
|
CATEGORY
|
||||||
));
|
));
|
||||||
|
|
||||||
keyBinding2 = KeyBindingHelper.registerKeyBinding(new KeyBinding(
|
keyBinding2 = KeyBindingHelper.registerKeyBinding(new KeyBinding(
|
||||||
"key.cavedust.reload", // The translation key of the keybinding's name
|
"key.cavedust.reload",
|
||||||
InputUtil.Type.KEYSYM, // The type of the keybinding, KEYSYM for keyboard, MOUSE for mouse.
|
InputUtil.Type.KEYSYM,
|
||||||
GLFW.GLFW_KEY_KP_ENTER, // The keycode of the key
|
GLFW.GLFW_KEY_KP_ENTER,
|
||||||
"category.cavedust.spook" // The translation key of the keybinding's category.
|
CATEGORY
|
||||||
));
|
));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -35,6 +35,10 @@ public class MathHelper {
|
|||||||
* @return Random number (double)
|
* @return Random number (double)
|
||||||
*/
|
*/
|
||||||
public static double generateRandomDouble(double min, double max) {
|
public static double generateRandomDouble(double min, double max) {
|
||||||
|
try {
|
||||||
return ThreadLocalRandom.current().nextDouble(min, max);
|
return ThreadLocalRandom.current().nextDouble(min, max);
|
||||||
|
} catch (IllegalArgumentException e) {
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -22,14 +22,21 @@ public class ParticleSpawnUtil {
|
|||||||
*/
|
*/
|
||||||
public static boolean shouldParticlesSpawn(MinecraftClient client, CaveDustConfig config) {
|
public static boolean shouldParticlesSpawn(MinecraftClient client, CaveDustConfig config) {
|
||||||
|
|
||||||
//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 (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,
|
||||||
|
// if the dimension is valid 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.getDimension().bedWorks()
|
||||||
|| Objects.requireNonNull(client.player).isSubmergedInWater()
|
|| client.player.isSubmergedInWater()
|
||||||
|| client.world.getBiome(Objects.requireNonNull(client.player.getBlockPos())).matchesKey(LUSH_CAVES))
|
|| client.world.getBiome(client.player.getBlockPos()).matchesKey(LUSH_CAVES)) {
|
||||||
{
|
|
||||||
timer = 0;
|
timer = 0;
|
||||||
shouldParticlesSpawn = false;
|
shouldParticlesSpawn = false;
|
||||||
return false;
|
return false;
|
||||||
@@ -38,7 +45,8 @@ public class ParticleSpawnUtil {
|
|||||||
World world = client.world;
|
World world = client.world;
|
||||||
int seaLevel = world.getSeaLevel();
|
int seaLevel = world.getSeaLevel();
|
||||||
|
|
||||||
if (!client.player.clientWorld.isSkyVisible(client.player.getBlockPos())) {
|
// 1.21.10: usar world directamente
|
||||||
|
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;
|
||||||
if (timer > 10) {
|
if (timer > 10) {
|
||||||
@@ -48,6 +56,7 @@ public class ParticleSpawnUtil {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
shouldParticlesSpawn = false;
|
shouldParticlesSpawn = false;
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
@@ -61,19 +70,26 @@ 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, if the particle is valid 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 dimension is valid 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.getDimension().bedWorks()
|
||||||
|| (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)) {
|
||||||
|
|
||||||
{
|
|
||||||
timer = 0;
|
timer = 0;
|
||||||
shouldParticlesSpawn = false;
|
shouldParticlesSpawn = false;
|
||||||
return 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()) {
|
if (((ClientWorldAccessor) client.world.getLevelProperties()).getFlatWorld()) {
|
||||||
return false;
|
return false;
|
||||||
@@ -83,7 +99,8 @@ public class ParticleSpawnUtil {
|
|||||||
World world = client.world;
|
World world = client.world;
|
||||||
int seaLevel = world.getSeaLevel();
|
int seaLevel = world.getSeaLevel();
|
||||||
|
|
||||||
if (!client.player.clientWorld.isSkyVisible(pos)) {
|
// 1.21.10: usar world directamente
|
||||||
|
if (!world.isSkyVisible(pos)) {
|
||||||
if (pos.getY() + 2 < seaLevel) {
|
if (pos.getY() + 2 < seaLevel) {
|
||||||
timer = timer + 1;
|
timer = timer + 1;
|
||||||
if (timer > 10) {
|
if (timer > 10) {
|
||||||
@@ -93,6 +110,7 @@ public class ParticleSpawnUtil {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
shouldParticlesSpawn = false;
|
shouldParticlesSpawn = false;
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -3,17 +3,12 @@ package net.lizistired.cavedust.utils;
|
|||||||
import com.minelittlepony.common.client.gui.element.AbstractSlider;
|
import com.minelittlepony.common.client.gui.element.AbstractSlider;
|
||||||
import net.minecraft.text.Text;
|
import net.minecraft.text.Text;
|
||||||
|
|
||||||
import javax.swing.*;
|
|
||||||
|
|
||||||
public class TranslatableTextHelper {
|
public class TranslatableTextHelper {
|
||||||
public Text formatMaxX(AbstractSlider<Float> slider) {
|
public Text formatMaxWidth(AbstractSlider<Float> slider) {
|
||||||
return Text.translatable("menu.cavedust.X", (int)Math.floor(slider.getValue()));
|
return Text.translatable("menu.cavedust.width", (int)Math.floor(slider.getValue()));
|
||||||
}
|
}
|
||||||
public Text formatMaxY(AbstractSlider<Float> slider) {
|
public Text formatMaxHeight(AbstractSlider<Float> slider) {
|
||||||
return Text.translatable("menu.cavedust.Y", (int)Math.floor(slider.getValue()));
|
return Text.translatable("menu.cavedust.height", (int)Math.floor(slider.getValue()));
|
||||||
}
|
|
||||||
public Text formatMaxZ(AbstractSlider<Float> slider) {
|
|
||||||
return Text.translatable("menu.cavedust.Z", (int)Math.floor(slider.getValue()));
|
|
||||||
}
|
}
|
||||||
public Text formatUpperLimit(AbstractSlider<Float> slider) {
|
public Text formatUpperLimit(AbstractSlider<Float> slider) {
|
||||||
return Text.translatable("menu.cavedust.upperlimit", (int)Math.floor(slider.getValue()));
|
return Text.translatable("menu.cavedust.upperlimit", (int)Math.floor(slider.getValue()));
|
||||||
|
|||||||
BIN
src/main/resources/assets/cavedust/icon.png
Normal file
BIN
src/main/resources/assets/cavedust/icon.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 250 KiB |
@@ -4,12 +4,10 @@
|
|||||||
"menu.cavedust.global.true": "Cave Dust: Enabled",
|
"menu.cavedust.global.true": "Cave Dust: Enabled",
|
||||||
"menu.cavedust.global.tooltip.false": "Enable cave dust particles?",
|
"menu.cavedust.global.tooltip.false": "Enable cave dust particles?",
|
||||||
"menu.cavedust.global.tooltip.true": "Disable cave dust particles?",
|
"menu.cavedust.global.tooltip.true": "Disable cave dust particles?",
|
||||||
"menu.cavedust.X": "X bounds: %s",
|
"menu.cavedust.width": "Width bounds: %s",
|
||||||
"menu.cavedust.Y": "Y bounds: %s",
|
"menu.cavedust.height": "Height bounds: %s",
|
||||||
"menu.cavedust.Z": "Z bounds: %s",
|
"menu.cavedust.width.tooltip": "Maximum width to spawn particle.",
|
||||||
"menu.cavedust.X.tooltip": "X axis bounds for particle spawning.",
|
"menu.cavedust.height.tooltip": "Maximum height to spawn particle.",
|
||||||
"menu.cavedust.Y.tooltip": "Y axis bounds for particle spawning.",
|
|
||||||
"menu.cavedust.Z.tooltip": "Z axis bounds for particle spawning.",
|
|
||||||
"menu.cavedust.upperlimit": "Upper limit height: %s",
|
"menu.cavedust.upperlimit": "Upper limit height: %s",
|
||||||
"menu.cavedust.lowerlimit": "Lower limit height: %s",
|
"menu.cavedust.lowerlimit": "Lower limit height: %s",
|
||||||
"menu.cavedust.upperlimit.tooltip": "The height where particles will fade out and stop spawning (uses player y).",
|
"menu.cavedust.upperlimit.tooltip": "The height where particles will fade out and stop spawning (uses player y).",
|
||||||
@@ -37,6 +35,7 @@
|
|||||||
|
|
||||||
"debug.cavedust.toggle.true": "(Cave Dust) Enabled particles",
|
"debug.cavedust.toggle.true": "(Cave Dust) Enabled particles",
|
||||||
"debug.cavedust.toggle.false": "(Cave Dust) Disabled particles",
|
"debug.cavedust.toggle.false": "(Cave Dust) Disabled particles",
|
||||||
"debug.cavedust.reload": "(Cave Dust) Reloaded config"
|
"debug.cavedust.reload": "(Cave Dust) Reloaded config",
|
||||||
|
"debug.cavedust.particleerror": "(Cave Dust) Error setting particle, skipping to next particle!"
|
||||||
|
|
||||||
}
|
}
|
||||||
44
src/main/resources/assets/cavedust/lang/fr_fr.json
Normal file
44
src/main/resources/assets/cavedust/lang/fr_fr.json
Normal file
@@ -0,0 +1,44 @@
|
|||||||
|
{
|
||||||
|
"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"
|
||||||
|
|
||||||
|
}
|
||||||
44
src/main/resources/assets/cavedust/lang/ru_ru.json
Normal file
44
src/main/resources/assets/cavedust/lang/ru_ru.json
Normal file
@@ -0,0 +1,44 @@
|
|||||||
|
{
|
||||||
|
"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": "[Пещерная пыль] Конфигурация перезагружена"
|
||||||
|
|
||||||
|
}
|
||||||
41
src/main/resources/assets/cavedust/lang/zh_cn.json
Normal file
41
src/main/resources/assets/cavedust/lang/zh_cn.json
Normal file
@@ -0,0 +1,41 @@
|
|||||||
|
{
|
||||||
|
"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": "(洞穴尘埃) 设置当前粒子效果时出现问题, 已自动切换至下一个粒子效果!"
|
||||||
|
|
||||||
|
}
|
||||||
@@ -0,0 +1,5 @@
|
|||||||
|
{
|
||||||
|
"textures": [
|
||||||
|
"minecraft:generic_0"
|
||||||
|
]
|
||||||
|
}
|
||||||
Binary file not shown.
|
Before Width: | Height: | Size: 116 KiB |
@@ -1,44 +1,43 @@
|
|||||||
{
|
{
|
||||||
"schemaVersion": 1,
|
"schemaVersion": 1,
|
||||||
"id": "cavedust",
|
"id": "cavedustreforged",
|
||||||
"version": "${version}",
|
"version": "${version}",
|
||||||
"name": "Cave Dust",
|
"name": "Cave Dust Reforged",
|
||||||
"description": "Makes dust underground that scales with depth!",
|
"description": "Makes dust underground that scales with depth!",
|
||||||
"authors": [
|
"authors": [
|
||||||
"LizIsTired"
|
"DekinDev"
|
||||||
|
],
|
||||||
|
"contributors": [
|
||||||
|
"LizIsTired (Original mod)"
|
||||||
],
|
],
|
||||||
"contact": {
|
"contact": {
|
||||||
"issues": "https://github.com/LizIsTired/dust/issues",
|
"issues": "https://git.straice.com/DekinDev/cave_dust_reforged/issues",
|
||||||
"sources": "https://github.com/LizIsTired/dust"
|
"sources": "https://git.straice.com/DekinDev/cave_dust_reforged",
|
||||||
|
"homepage": "https://modrinth.com/project/cave-dust-reforged"
|
||||||
},
|
},
|
||||||
"license": "MPL-2.0",
|
"license": "MPL-2.0",
|
||||||
"icon": "assets/modid/icon.png",
|
"icon": "assets/cavedust/icon.png",
|
||||||
"environment": "*",
|
"environment": "*",
|
||||||
"entrypoints": {
|
"entrypoints": {
|
||||||
"client": [
|
"client": [
|
||||||
"net.lizistired.cavedust.CaveDust"
|
"net.lizistired.cavedust.CaveDust"
|
||||||
],
|
],
|
||||||
|
"main": [
|
||||||
|
"net.lizistired.cavedust.CaveDustServer"],
|
||||||
"modmenu": [
|
"modmenu": [
|
||||||
"net.lizistired.cavedust.CaveDustModMenuFactory"
|
"net.lizistired.cavedust.CaveDustModMenuFactory"
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"mixins": [
|
"mixins": [
|
||||||
"dust.mixins.json"
|
"cavedust.mixins.json"
|
||||||
],
|
],
|
||||||
"depends": {
|
"depends": {
|
||||||
"fabricloader": ">=0.14.5",
|
"fabricloader": ">=0.17.2",
|
||||||
"fabric": "*",
|
"fabric": "*",
|
||||||
"minecraft": ">=1.19-beta.5",
|
"minecraft": "1.21.9",
|
||||||
"java": ">=17"
|
"java": ">=17"
|
||||||
},
|
},
|
||||||
"suggests": {
|
"suggests": {
|
||||||
"modmenu": ">=3.0.1"
|
"modmenu": ">=3.0.1"
|
||||||
},
|
|
||||||
"custom": {
|
|
||||||
"modmenu": {
|
|
||||||
"links": {
|
|
||||||
"modmenu.discord": "https://discord.gg/4m6kQSX6bx"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user