Compare commits
15 Commits
1.20.4
...
1.21.4_fab
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
c709bb4a4b | ||
|
|
b3f79db8e2 | ||
|
|
db9040acc5 | ||
|
|
be27cf0f30 | ||
|
|
734ea7a1a2 | ||
|
|
71832342af | ||
|
|
4b4b2ad206 | ||
|
|
e795778ba8 | ||
|
|
99ffeb1f99 | ||
|
|
2161bbd1ba | ||
|
|
e35fdaa8ce | ||
|
|
a0aef4a5ef | ||
|
|
22928e4885 | ||
|
|
8cb6407f8b | ||
|
|
1a097e6daf |
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.5-SNAPSHOT'
|
id 'fabric-loom' version '1.8-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.20.4
|
minecraft_version=1.21.4
|
||||||
yarn_mappings=1.20.4+build.3
|
yarn_mappings=1.21.4+build.8
|
||||||
loader_version=0.15.5
|
loader_version=0.16.10
|
||||||
|
|
||||||
# Mod Properties
|
# Mod Properties
|
||||||
mod_version=1.4.1
|
mod_version=3.0.1
|
||||||
maven_group=com.lizistired
|
maven_group=com.lizistired
|
||||||
archives_base_name=cave_dust
|
archives_base_name=cave_dust
|
||||||
|
|
||||||
# Dependencies
|
# Dependencies
|
||||||
fabric_version=0.94.0+1.20.4
|
fabric_version=0.114.0+1.21.4
|
||||||
clothconfig_version=13.0.121
|
clothconfig_version=17.0.144
|
||||||
modmenu_version=9.0.0
|
modmenu_version=13.0.0
|
||||||
kirin_version=1.17.0+1.20.4
|
kirin_version=1.20.3+1.21.4
|
||||||
|
|||||||
BIN
gradle/wrapper/gradle-wrapper.jar
vendored
BIN
gradle/wrapper/gradle-wrapper.jar
vendored
Binary file not shown.
3
gradle/wrapper/gradle-wrapper.properties
vendored
3
gradle/wrapper/gradle-wrapper.properties
vendored
@@ -1,6 +1,7 @@
|
|||||||
distributionBase=GRADLE_USER_HOME
|
distributionBase=GRADLE_USER_HOME
|
||||||
distributionPath=wrapper/dists
|
distributionPath=wrapper/dists
|
||||||
distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
|
distributionUrl=https\://services.gradle.org/distributions/gradle-8.10-bin.zip
|
||||||
networkTimeout=10000
|
networkTimeout=10000
|
||||||
|
validateDistributionUrl=true
|
||||||
zipStoreBase=GRADLE_USER_HOME
|
zipStoreBase=GRADLE_USER_HOME
|
||||||
zipStorePath=wrapper/dists
|
zipStorePath=wrapper/dists
|
||||||
|
|||||||
24
gradlew
vendored
24
gradlew
vendored
@@ -55,7 +55,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/HEAD/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/.
|
||||||
@@ -83,7 +83,8 @@ done
|
|||||||
# This is normally unused
|
# This is normally unused
|
||||||
# shellcheck disable=SC2034
|
# shellcheck disable=SC2034
|
||||||
APP_BASE_NAME=${0##*/}
|
APP_BASE_NAME=${0##*/}
|
||||||
APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
|
# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
|
||||||
|
APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || 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
|
||||||
@@ -130,10 +131,13 @@ 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.
|
||||||
@@ -141,7 +145,7 @@ 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.
|
# In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
|
||||||
# shellcheck disable=SC3045
|
# 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
|
||||||
@@ -149,7 +153,7 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
|
|||||||
'' | soft) :;; #(
|
'' | soft) :;; #(
|
||||||
*)
|
*)
|
||||||
# In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
|
# In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
|
||||||
# shellcheck disable=SC3045
|
# 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
|
||||||
@@ -198,11 +202,11 @@ fi
|
|||||||
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
|
# 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"'
|
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
|
||||||
|
|
||||||
# Collect all arguments for the java command;
|
# Collect all arguments for the java command:
|
||||||
# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
|
# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
|
||||||
# shell script including quotes and variable substitutions, so put them in
|
# and any embedded shellness will be escaped.
|
||||||
# double quotes to make sure that they get re-expanded; and
|
# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
|
||||||
# * put everything else in single quotes, so that it's not re-expanded.
|
# treated as '${Hostname}' itself on the command line.
|
||||||
|
|
||||||
set -- \
|
set -- \
|
||||||
"-Dorg.gradle.appname=$APP_BASE_NAME" \
|
"-Dorg.gradle.appname=$APP_BASE_NAME" \
|
||||||
|
|||||||
20
gradlew.bat
vendored
20
gradlew.bat
vendored
@@ -43,11 +43,11 @@ set JAVA_EXE=java.exe
|
|||||||
%JAVA_EXE% -version >NUL 2>&1
|
%JAVA_EXE% -version >NUL 2>&1
|
||||||
if %ERRORLEVEL% equ 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
|
||||||
|
|
||||||
@@ -57,11 +57,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
|
||||||
|
|
||||||
|
|||||||
@@ -3,8 +3,11 @@ package net.lizistired.cavedust;
|
|||||||
//minecraft imports
|
//minecraft imports
|
||||||
import net.fabricmc.fabric.api.client.particle.v1.ParticleFactoryRegistry;
|
import net.fabricmc.fabric.api.client.particle.v1.ParticleFactoryRegistry;
|
||||||
import net.minecraft.client.MinecraftClient;
|
import net.minecraft.client.MinecraftClient;
|
||||||
|
import net.minecraft.particle.ParticleEffect;
|
||||||
import net.minecraft.registry.Registries;
|
import net.minecraft.registry.Registries;
|
||||||
|
import net.minecraft.registry.Registry;
|
||||||
import net.minecraft.text.Text;
|
import net.minecraft.text.Text;
|
||||||
|
import net.minecraft.util.Identifier;
|
||||||
import net.minecraft.util.math.BlockPos;
|
import net.minecraft.util.math.BlockPos;
|
||||||
import net.minecraft.world.World;
|
import net.minecraft.world.World;
|
||||||
//other imports
|
//other imports
|
||||||
@@ -39,7 +42,7 @@ public class CaveDust implements ClientModInitializer {
|
|||||||
return config;
|
return config;
|
||||||
}
|
}
|
||||||
|
|
||||||
public static int WHITE_ASH_ID = Registries.PARTICLE_TYPE.getRawId(CaveDustServer.CAVE_DUST);
|
public static ParticleEffect WHITE_ASH_ID = (ParticleEffect) Registries.PARTICLE_TYPE.get(Identifier.of("cavedust", "cave_dust"));
|
||||||
public static int PARTICLE_AMOUNT = 0;
|
public static int PARTICLE_AMOUNT = 0;
|
||||||
|
|
||||||
|
|
||||||
@@ -73,13 +76,13 @@ 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()));
|
//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());
|
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.getPos().getX() + (int) generateRandomDouble(config.getDimensionWidth() *-1, config.getDimensionWidth()));
|
int x = (int) (client.player.getPos().getX() + (int) generateRandomDouble(config.getDimensionWidth() *-1, config.getDimensionWidth()));
|
||||||
int y = (int) (client.player.getEyePos().getY() + (int) generateRandomDouble(config.getDimensionHeight() *-1, config.getDimensionHeight()));
|
int y = (int) (client.player.getEyePos().getY() + (int) generateRandomDouble(config.getDimensionHeight() *-1, config.getDimensionHeight()));
|
||||||
int z = (int) (client.player.getPos().getZ() + (int) generateRandomDouble(config.getDimensionWidth() *-1, config.getDimensionWidth()));
|
int z = (int) (client.player.getPos().getZ() + (int) generateRandomDouble(config.getDimensionWidth() *-1, config.getDimensionWidth()));
|
||||||
@@ -90,14 +93,9 @@ public class CaveDust implements ClientModInitializer {
|
|||||||
|
|
||||||
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(), miniX, miniY, miniZ, config.getVelocityRandomnessRandom() * 0.01, config.getVelocityRandomnessRandom() * 0.01, config.getVelocityRandomnessRandom() * 0.01);
|
world.addParticle(getConfig().getParticle(), miniX, miniY, miniZ, config.getVelocityRandomnessRandom() * 0.01, config.getVelocityRandomnessRandom() * 0.01, config.getVelocityRandomnessRandom() * 0.01);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
catch (NullPointerException e) {
|
|
||||||
LOGGER.error(String.valueOf(e));
|
|
||||||
//getConfig().setParticleID(WHITE_ASH_ID);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|||||||
@@ -1,16 +1,23 @@
|
|||||||
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;
|
||||||
@@ -27,9 +34,13 @@ 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);
|
||||||
@@ -122,20 +133,31 @@ 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.translatable("debug.cavedust.particleerror"), true);
|
catch (ClassCastException e){
|
||||||
LOGGER.error("Cannot spawn particle, check config.");
|
|
||||||
iterateParticle();
|
iterateParticle();
|
||||||
save();
|
|
||||||
return getParticle();
|
return getParticle();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -175,26 +197,19 @@ public class CaveDustConfig extends JsonFile {
|
|||||||
return getSuperFlatStatus();
|
return getSuperFlatStatus();
|
||||||
}
|
}
|
||||||
|
|
||||||
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(){
|
||||||
@@ -208,9 +223,10 @@ public class CaveDustConfig extends JsonFile {
|
|||||||
particleMultiplierMultiplier = 10;
|
particleMultiplierMultiplier = 10;
|
||||||
velocityRandomness = 0;
|
velocityRandomness = 0;
|
||||||
|
|
||||||
|
newId = Identifier.of("cavedust", "cave_dust");
|
||||||
|
|
||||||
seaLevelCheck = true;
|
seaLevelCheck = true;
|
||||||
caveDustEnabled = true;
|
caveDustEnabled = true;
|
||||||
particleID = WHITE_ASH_ID;
|
|
||||||
save();
|
save();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -4,7 +4,7 @@ import net.fabricmc.api.EnvType;
|
|||||||
import net.fabricmc.api.Environment;
|
import net.fabricmc.api.Environment;
|
||||||
import net.minecraft.client.particle.*;
|
import net.minecraft.client.particle.*;
|
||||||
import net.minecraft.client.world.ClientWorld;
|
import net.minecraft.client.world.ClientWorld;
|
||||||
import net.minecraft.particle.DefaultParticleType;
|
import net.minecraft.particle.SimpleParticleType;
|
||||||
|
|
||||||
public class CaveDustParticleFactory extends SpriteBillboardParticle {
|
public class CaveDustParticleFactory extends SpriteBillboardParticle {
|
||||||
private final SpriteProvider spriteProvider;
|
private final SpriteProvider spriteProvider;
|
||||||
@@ -39,7 +39,7 @@ public class CaveDustParticleFactory extends SpriteBillboardParticle {
|
|||||||
}
|
}
|
||||||
|
|
||||||
@Environment(EnvType.CLIENT)
|
@Environment(EnvType.CLIENT)
|
||||||
public static class Factory implements ParticleFactory<DefaultParticleType> {
|
public static class Factory implements ParticleFactory<SimpleParticleType> {
|
||||||
private final SpriteProvider spriteProvider;
|
private final SpriteProvider spriteProvider;
|
||||||
|
|
||||||
public Factory(SpriteProvider spriteProvider) {
|
public Factory(SpriteProvider spriteProvider) {
|
||||||
@@ -47,7 +47,7 @@ public class CaveDustParticleFactory extends SpriteBillboardParticle {
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
public Particle createParticle(DefaultParticleType type, ClientWorld world, double x, double y, double z, double velocityX, double velocityY, double velocityZ) {
|
public Particle createParticle(SimpleParticleType type, ClientWorld world, double x, double y, double z, double velocityX, double velocityY, double velocityZ) {
|
||||||
return new CaveDustParticleFactory(world, x, y, z, velocityX, velocityY, velocityZ, this.spriteProvider);
|
return new CaveDustParticleFactory(world, x, y, z, velocityX, velocityY, velocityZ, this.spriteProvider);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -2,18 +2,18 @@ package net.lizistired.cavedust;
|
|||||||
|
|
||||||
import net.fabricmc.api.ModInitializer;
|
import net.fabricmc.api.ModInitializer;
|
||||||
import net.fabricmc.fabric.api.particle.v1.FabricParticleTypes;
|
import net.fabricmc.fabric.api.particle.v1.FabricParticleTypes;
|
||||||
import net.minecraft.particle.DefaultParticleType;
|
import net.minecraft.particle.SimpleParticleType;
|
||||||
import net.minecraft.registry.Registries;
|
import net.minecraft.registry.Registries;
|
||||||
import net.minecraft.registry.Registry;
|
import net.minecraft.registry.Registry;
|
||||||
import net.minecraft.util.Identifier;
|
import net.minecraft.util.Identifier;
|
||||||
|
|
||||||
public class CaveDustServer implements ModInitializer {
|
public class CaveDustServer implements ModInitializer {
|
||||||
public static final DefaultParticleType CAVE_DUST = FabricParticleTypes.simple();
|
public static final SimpleParticleType CAVE_DUST = FabricParticleTypes.simple();
|
||||||
/**
|
/**
|
||||||
* Runs the mod initializer.
|
* Runs the mod initializer.
|
||||||
*/
|
*/
|
||||||
@Override
|
@Override
|
||||||
public void onInitialize() {
|
public void onInitialize() {
|
||||||
Registry.register(Registries.PARTICLE_TYPE, new Identifier("cavedust", "cave_dust"), CAVE_DUST);
|
Registry.register(Registries.PARTICLE_TYPE, Identifier.of("cavedust", "cave_dust"), CAVE_DUST);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -5,6 +5,7 @@ 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.DrawContext;
|
||||||
import net.minecraft.client.gui.screen.Screen;
|
import net.minecraft.client.gui.screen.Screen;
|
||||||
|
import net.minecraft.particle.ParticleType;
|
||||||
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;
|
||||||
@@ -107,12 +108,14 @@ public class ModMenuConfigScreen extends GameGui {
|
|||||||
renderBackground(context, mouseX, mouseY, partialTicks);
|
renderBackground(context, mouseX, mouseY, partialTicks);
|
||||||
super.render(context, mouseX, mouseY, partialTicks);
|
super.render(context, mouseX, mouseY, partialTicks);
|
||||||
}
|
}
|
||||||
|
|
||||||
private String getNameOfParticle(){
|
private String getNameOfParticle(){
|
||||||
CaveDustConfig config = CaveDust.getInstance().getConfig();
|
CaveDustConfig config = CaveDust.getInstance().getConfig();
|
||||||
config.load();
|
config.load();
|
||||||
try {
|
try {
|
||||||
return Registries.PARTICLE_TYPE.getEntry(config.getParticleID()).get().getKey().get().getValue().toString();
|
return Registries.PARTICLE_TYPE.getEntry((ParticleType<?>) config.getParticleID()).getIdAsString();
|
||||||
} catch (NoSuchElementException e){
|
} catch (NoSuchElementException e){
|
||||||
|
CaveDust.LOGGER.error(String.valueOf(e));
|
||||||
return "null";
|
return "null";
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -3,8 +3,6 @@ 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 formatMaxWidth(AbstractSlider<Float> slider) {
|
public Text formatMaxWidth(AbstractSlider<Float> slider) {
|
||||||
return Text.translatable("menu.cavedust.width", (int)Math.floor(slider.getValue()));
|
return Text.translatable("menu.cavedust.width", (int)Math.floor(slider.getValue()));
|
||||||
|
|||||||
@@ -1,4 +1,5 @@
|
|||||||
{
|
{
|
||||||
|
"modmenu.descriptionTranslation.cavedust": "Makes dust underground that scales with depth!",
|
||||||
"menu.cavedust.title": "Cave Dust",
|
"menu.cavedust.title": "Cave Dust",
|
||||||
"menu.cavedust.global.false": "Cave Dust: Disabled",
|
"menu.cavedust.global.false": "Cave Dust: Disabled",
|
||||||
"menu.cavedust.global.true": "Cave Dust: Enabled",
|
"menu.cavedust.global.true": "Cave Dust: Enabled",
|
||||||
|
|||||||
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": "[Пещерная пыль] Конфигурация перезагружена"
|
||||||
|
|
||||||
|
}
|
||||||
42
src/main/resources/assets/cavedust/lang/zh_cn.json
Normal file
42
src/main/resources/assets/cavedust/lang/zh_cn.json
Normal file
@@ -0,0 +1,42 @@
|
|||||||
|
{
|
||||||
|
"modmenu.descriptionTranslation.cavedust": "在地下生成随深度增加而变化的尘埃!",
|
||||||
|
"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": "(洞穴尘埃) 设置当前粒子效果时出现问题, 已自动切换至下一个粒子效果!"
|
||||||
|
|
||||||
|
}
|
||||||
@@ -25,12 +25,12 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"mixins": [
|
"mixins": [
|
||||||
"dust.mixins.json"
|
"cavedust.mixins.json"
|
||||||
],
|
],
|
||||||
"depends": {
|
"depends": {
|
||||||
"fabricloader": ">=0.14.5",
|
"fabricloader": ">=0.14.5",
|
||||||
"fabric": "*",
|
"fabric": "*",
|
||||||
"minecraft": "1.20.4",
|
"minecraft": "1.21.4",
|
||||||
"java": ">=17"
|
"java": ">=17"
|
||||||
},
|
},
|
||||||
"suggests": {
|
"suggests": {
|
||||||
|
|||||||
Reference in New Issue
Block a user