Compare commits

..

10 Commits

Author SHA1 Message Date
Liz Graham
c111cc7193 Update README.md 2023-06-21 02:49:11 +01:00
Liz Graham
deed3db2cd Update build-release.yml 2023-05-22 03:57:51 +01:00
Liz Graham
de0983047a Bump to 1.4.0 2023-05-22 03:30:29 +01:00
Liz Graham
f453148c35 Improve error handling for incompatible particles 2023-05-22 03:29:40 +01:00
Liz Graham
5f48fec41a Fix bugs and fix #4
Particles can no longer spawn under the world.
Particles no longer spawn in blocks, instead spawning in air.
Fixed bug present since 1.2.0, which meant particle amount was dependant on blocks around player.
New particle multiplier allowing greater control of particle amount.
New F3 screen text, allows user to debug particle amount.
Removed upper and lower limit buttons.
2023-05-22 03:26:21 +01:00
Liz Graham
c345b7822c UI update 2023-05-22 03:23:13 +01:00
Liz Graham
0a49b2d459 Update build-release.yml 2023-05-21 23:27:16 +01:00
Liz Graham
282ce2e1af Bump to 1.3.0 2023-05-21 07:47:32 +01:00
Liz Graham
ec342b7506 Update README.md 2023-05-21 07:44:22 +01:00
Liz Graham
b8a45b3ed5 set default id to white ash's id 2023-05-21 07:30:04 +01:00
29 changed files with 225 additions and 783 deletions

View File

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

View File

@@ -1,9 +1,11 @@
plugins { plugins {
id 'fabric-loom' version '1.11-SNAPSHOT' id 'fabric-loom' version '1.2-SNAPSHOT'
id 'maven-publish' id 'maven-publish'
id 'org.jetbrains.kotlin.jvm'
} }
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
@@ -27,7 +29,6 @@ repositories {
name = 'minelp-release' name = 'minelp-release'
url = 'https://repo.minelittlepony-mod.com/maven/release' url = 'https://repo.minelittlepony-mod.com/maven/release'
} }
mavenCentral()
// Add repositories to retrieve artifacts from in here. // Add repositories to retrieve artifacts from in here.
// You should only use this when depending on other mods because // You should only use this when depending on other mods because
// Loom adds the essential maven repositories to download Minecraft and libraries from automatically. // Loom adds the essential maven repositories to download Minecraft and libraries from automatically.
@@ -48,7 +49,6 @@ dependencies {
include "com.minelittlepony:kirin:${project.kirin_version}" include "com.minelittlepony:kirin:${project.kirin_version}"
modCompileOnly("com.terraformersmc:modmenu:${project.modmenu_version}") modCompileOnly("com.terraformersmc:modmenu:${project.modmenu_version}")
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8"
} }
processResources { processResources {
@@ -61,7 +61,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 = 21 it.options.release = 17
} }
java { java {
@@ -93,6 +93,3 @@ publishing {
// retrieving dependencies. // retrieving dependencies.
} }
} }
kotlin {
jvmToolchain(21)
}

View File

@@ -3,19 +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.21.8 minecraft_version=1.19.3
yarn_mappings=1.21.8+build.1 yarn_mappings=1.19.3+build.5
loader_version=0.17.2 loader_version=0.14.13
loom_version=1.11-SNAPSHOT
# Mod Properties # Mod Properties
mod_version=4.0.0 mod_version = 1.4.0
maven_group = com.lizistired maven_group = com.lizistired
archives_base_name = cave_dust archives_base_name = cave_dust
# Dependencies # Dependencies
fabric_version=0.133.0+1.21.8 fabric_version=0.72.0+1.19.3
clothconfig_version=19.0.147 clothconfig_version =9.0.94
modmenu_version=15.0.0 modmenu_version =5.1.0-beta.3
kirin_version=1.21.0-beta.5+1.21.7 kirin_version=1.13.2

Binary file not shown.

View File

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

44
gradlew vendored
View File

@@ -15,8 +15,6 @@
# 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
#
############################################################################## ##############################################################################
# #
@@ -57,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/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt # https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
# within the Gradle project. # within the Gradle project.
# #
# You can find Gradle at https://github.com/gradle/gradle/. # You can find Gradle at https://github.com/gradle/gradle/.
@@ -82,12 +80,13 @@ do
esac esac
done done
# This is normally unused APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
# 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)
APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
' "$PWD" ) || exit DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
# 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
@@ -134,29 +133,22 @@ location of your Java installation."
fi fi
else else
JAVACMD=java JAVACMD=java
if ! command -v java >/dev/null 2>&1 which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
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
@@ -201,15 +193,11 @@ if "$cygwin" || "$msys" ; then
done done
fi fi
# Collect all arguments for the java command;
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. # * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' # shell script including quotes and variable substitutions, so put them in
# double quotes to make sure that they get re-expanded; and
# Collect all arguments for the java command: # * put everything else in single quotes, so that it's not re-expanded.
# * 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" \
@@ -217,12 +205,6 @@ 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
View File

@@ -13,8 +13,6 @@
@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 ##########################################################################
@@ -28,7 +26,6 @@ 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%
@@ -43,13 +40,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% equ 0 goto execute if "%ERRORLEVEL%" == "0" goto execute
echo. 1>&2 echo.
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2 echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
echo. 1>&2 echo.
echo Please set the JAVA_HOME variable in your environment to match the 1>&2 echo Please set the JAVA_HOME variable in your environment to match the
echo location of your Java installation. 1>&2 echo location of your Java installation.
goto fail goto fail
@@ -59,11 +56,11 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe
if exist "%JAVA_EXE%" goto execute if exist "%JAVA_EXE%" goto execute
echo. 1>&2 echo.
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2 echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
echo. 1>&2 echo.
echo Please set the JAVA_HOME variable in your environment to match the 1>&2 echo Please set the JAVA_HOME variable in your environment to match the
echo location of your Java installation. 1>&2 echo location of your Java installation.
goto fail goto fail
@@ -78,15 +75,13 @@ 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% equ 0 goto mainEnd if "%ERRORLEVEL%"=="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!
set EXIT_CODE=%ERRORLEVEL% if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
if %EXIT_CODE% equ 0 set EXIT_CODE=1 exit /b 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

View File

@@ -7,10 +7,4 @@ pluginManagement {
mavenCentral() mavenCentral()
gradlePluginPortal() gradlePluginPortal()
} }
plugins {
id 'org.jetbrains.kotlin.jvm' version '2.2.0'
}
}
plugins {
id 'org.gradle.toolchains.foojay-resolver-convention' version '0.8.0'
} }

View File

@@ -1,31 +1,17 @@
package net.lizistired.cavedust; package net.lizistired.cavedust;
//minecraft imports //minecraft imports
import net.fabricmc.fabric.api.client.particle.v1.ParticleFactoryRegistry; import net.minecraft.block.Blocks;
import net.fabricmc.fabric.api.client.particle.v1.ParticleRenderEvents;
import net.fabricmc.fabric.api.client.rendering.v1.WorldRenderContext;
import net.fabricmc.fabric.api.client.rendering.v1.WorldRenderEvents;
import net.fabricmc.fabric.api.event.lifecycle.v1.ServerLifecycleEvents;
import net.lizistired.cavedust.utils.CubeCreator;
import net.minecraft.block.Block;
import net.minecraft.client.MinecraftClient; import net.minecraft.client.MinecraftClient;
import net.minecraft.particle.ParticleEffect; import net.minecraft.particle.ParticleTypes;
import net.minecraft.particle.ParticleType;
import net.minecraft.particle.ParticleUtil;
import net.minecraft.registry.Registries; import net.minecraft.registry.Registries;
import net.minecraft.server.MinecraftServer;
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.util.math.MathHelper;
import net.minecraft.util.math.Vec3d;
import net.minecraft.util.shape.VoxelShape;
import net.minecraft.world.World; import net.minecraft.world.World;
//other imports //other imports
import com.minelittlepony.common.util.GamePaths; 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.minecraft.world.event.GameEvent;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
//java imports //java imports
@@ -40,10 +26,6 @@ import static net.lizistired.cavedust.utils.KeybindingHelper.*;
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");
//modid
public static final String modid = "cave_dust";
//make class static //make class static
private static CaveDust instance; private static CaveDust instance;
public static CaveDust getInstance() { public static CaveDust getInstance() {
@@ -58,111 +40,59 @@ public class CaveDust implements ClientModInitializer {
return config; return config;
} }
public static ParticleEffect WHITE_ASH_ID = (ParticleEffect) Registries.PARTICLE_TYPE.get(Identifier.of(modid, "cave_dust")); public static int WHITE_ASH_ID = Registries.PARTICLE_TYPE.getRawId(ParticleTypes.WHITE_ASH);
public static int PARTICLE_AMOUNT = 0; public static int PARTICLE_AMOUNT = 0;
public static int PARTICLE_RADIUS_PLUME = 50;
CubeCreator cubeCreator = new CubeCreator();
MinecraftClient client;
@Override @Override
public void onInitializeClient() { public void onInitializeClient() {
//config path and loading //config path and loading
Path CaveDustFolder = GamePaths.getConfigDirectory().resolve(modid); Path CaveDustFolder = GamePaths.getConfigDirectory().resolve("cavedust");
config = new CaveDustConfig(CaveDustFolder.getParent().resolve(modid + ".json"), this); config = new CaveDustConfig(CaveDustFolder.getParent().resolve("cavedust.json"), this);
config.load(); config.load();
registerKeyBindings(); registerKeyBindings();
ParticleFactoryRegistry.getInstance().register(CaveDustServer.CAVE_DUST_MOTE, CaveDustMoteParticleFactory.Factory::new);
ParticleFactoryRegistry.getInstance().register(CaveDustServer.CAVE_DUST_PLUME, CaveDustPlumeParticleFactory.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
WorldRenderEvents.LAST.register(this::createCaveDust); ClientTickEvents.END_CLIENT_TICK.register(this::createCaveDust);
ServerLifecycleEvents.SERVER_STOPPING.register(this::nullClient);
}
private void nullClient(MinecraftServer minecraftServer) {
client = null;
}
private void createCaveDust(WorldRenderContext worldRenderContext) {
if(client == null) {
try {
client = worldRenderContext.gameRenderer().getClient();
} catch (Exception e) {
throw new RuntimeException(e);
}
} }
private void createCaveDust(MinecraftClient client) {
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()), true); 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");
client.player.sendMessage(Text.translatable("debug.cavedust.reload"), true); client.player.sendMessage(Text.translatable("debug.cavedust.reload"), false);
} }
//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;
for (int i = 0; i < 5; i++) {
cubeCreator.randomSphereCreator(5, 0, 0, 0, Identifier.of(modid, "cave_dust_mote"));
}
for (int i = 0; i < 1; i++) {
cubeCreator.randomSphereCreator(20, 0, 0, 0, Identifier.of(modid, "cave_dust_plume"));
}
}
private void createCaveDust(MinecraftClient client) {
//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++) {
// int x = (int) (client.player.getPos().getX() + (int) generateRandomDouble(config.getDimensionWidth() *-1, config.getDimensionWidth())); try {
// int y = (int) (client.player.getEyePos().getY() + (int) generateRandomDouble(config.getDimensionHeight() *-1, config.getDimensionHeight())); double x = client.player.getPos().getX() + generateRandomDouble(config.getDimensionsX() * -1, config.getDimensionsX());
// int z = (int) (client.player.getPos().getZ() + (int) generateRandomDouble(config.getDimensionWidth() *-1, config.getDimensionWidth())); double y = client.player.getPos().getY() + generateRandomDouble(config.getDimensionsY() * -1, config.getDimensionsY());
// double miniX = (x + Math.random()); double z = client.player.getPos().getZ() + generateRandomDouble(config.getDimensionsZ() * -1, config.getDimensionsZ());
// double miniY = (y + Math.random()); BlockPos particlePos = new BlockPos(x, y, z);
// double miniZ = (z + Math.random());
// BlockPos particlePos = new BlockPos(x, y, z);
//
// if (shouldParticlesSpawn(client, config, particlePos)) {
// if (client.world.getBlockState(particlePos).isAir()) {
// world.addParticleClient((ParticleEffect) Registries.PARTICLE_TYPE.get(Identifier.of("cavedust", "cave_dust_mote")), miniX, miniY, miniZ, config.getVelocityRandomnessRandom() * 0.01, config.getVelocityRandomnessRandom() * 0.01, config.getVelocityRandomnessRandom() * 0.01);
// }
// }
// }
//cubeCreator.cubeCreator(50, 0, 0, 0); if (shouldParticlesSpawn(client, config, particlePos)) {
for (int i = 0; i < 1; i++) { if (client.world.getBlockState(particlePos).isAir()) {
cubeCreator.randomSphereCreator(5, 0, 0, 0, Identifier.of("cavedust", "cave_dust_mote")); world.addParticle(config.getParticle(), x, y, z, config.getVelocityRandomnessRandom(), config.getVelocityRandomnessRandom(), config.getVelocityRandomnessRandom());
} }
}
}
//Vec3d playerPos = client.player.getEyePos(); catch (NullPointerException e) {
//int x = (int) (playerPos.getX() + (int) generateRandomDouble(generateRandomDouble(-50, -25), (generateRandomDouble(25, 50)))); LOGGER.error(String.valueOf(e));
////int y = (int) (playerPos.getY() + (int) generateRandomDouble(PARTICLE_RADIUS_PLUME *-1, PARTICLE_RADIUS_PLUME)); getConfig().setParticleID(WHITE_ASH_ID);
//int z = (int) (playerPos.getZ() + (int) generateRandomDouble(PARTICLE_RADIUS_PLUME *-1, PARTICLE_RADIUS_PLUME)); }
//BlockPos particlePos = new BlockPos(x, (int) playerPos.y, z); }
//
//
//if (shouldParticlesSpawn(client, config, particlePos)) {
//
// if (playerPos.distanceTo(particlePos.toCenterPos()) >= 45 && playerPos.distanceTo(particlePos.toCenterPos()) <= 55) {
// if (client.world.getBlockState(particlePos).isAir()) {
// world.addParticleClient((ParticleEffect) Registries.PARTICLE_TYPE.get(Identifier.of("cavedust", "cave_dust_mote")), x, playerPos.y, z, 0, 0, 0);
// }
// }
//}
//}
} }
} }

View File

@@ -1,31 +1,25 @@
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 width = 10; private int dimensionX = 5;
private int height = 10; private int dimensionY = 5;
private int velocityRandomness = 0; private int dimensionZ = 5;
private int velocityRandomness = 1;
private boolean caveDustEnabled = true; private boolean caveDustEnabled = true;
private boolean seaLevelCheck = true; private boolean seaLevelCheck = true;
@@ -34,41 +28,49 @@ 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;
List<Identifier> list = List.of(Registries.PARTICLE_TYPE.getIds().toArray(new Identifier[0])); private int particleID = WHITE_ASH_ID;
Identifier newId = Identifier.of("cavedust", "cave_dust_mote");
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 setDimensionWidth(float size){ public float setDimensionsX(float size){
if (this.width != size) { if (this.dimensionX != size) {
this.width = (int)size; this.dimensionX = (int)size;
save(); save();
} }
return getDimensionWidth(); return getDimensionsX();
} }
public float setDimensionHeight(float size){ public float setDimensionsY(float size){
if (this.height != size) { if (this.dimensionY != size) {
this.height = (int)size; this.dimensionY = (int)size;
save(); save();
} }
return getDimensionHeight(); return getDimensionsY();
} }
public float getDimensionWidth(){ public float setDimensionsZ(float size){
return width; if (this.dimensionZ != size) {
this.dimensionZ = (int)size;
save();
}
return getDimensionsZ();
} }
public float getDimensionHeight(){ public float getDimensionsX(){
return height; return dimensionX;
}
public float getDimensionsY(){
return dimensionY;
}
public float getDimensionsZ(){
return dimensionZ;
} }
public float setUpperLimit(float upperLimit){ public float setUpperLimit(float upperLimit){
@@ -133,32 +135,20 @@ public class CaveDustConfig extends JsonFile {
return caveDustEnabled; return caveDustEnabled;
} }
//todo public ParticleEffect setParticle(String particleType){
//public Identifier setParticle(String particleType){
//particleName = particleType; //particleName = particleType;
//save(); save();
//return getParticle().get().getKey().get().getValue(); return getParticle();
//} }
//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(newId); return (ParticleEffect) Registries.PARTICLE_TYPE.get(new Identifier(Registries.PARTICLE_TYPE.getEntry(getParticleID()).get().getKey().get().getValue().toString().toLowerCase()));
} } catch (ClassCastException e) {
catch (ClassCastException e){ MinecraftClient.getInstance().player.sendMessage(Text.literal("Issue loading particle, defaulting to white ash particle!"), false);
iterateParticle(); setParticleID(WHITE_ASH_ID);
return getParticle(); save();
return ParticleTypes.WHITE_ASH;
} }
} }
@@ -198,35 +188,41 @@ public class CaveDustConfig extends JsonFile {
} }
public void iterateParticle(){ public void iterateParticle(){
try { if(getParticleID() > Registries.PARTICLE_TYPE.size() - 2) {
listNumber = listNumber + 1; particleID = 1;
newId = list.get(listNumber); save();
} catch (IndexOutOfBoundsException e){ } else {
newId = list.get(0); particleID = getParticleID() + 1;
listNumber = 0; save();
} }
}
public void setParticleID(int particleID){
this.particleID = particleID;
save(); save();
} }
public ParticleEffect getParticleID(){ public int getParticleID(){
return getParticle(); if ((!Registries.PARTICLE_TYPE.getEntry(particleID).isPresent())) {
setParticleID(WHITE_ASH_ID);
}
return particleID;
} }
public void resetConfig(){ public void resetConfig(){
width = 10; dimensionX = 5;
height = 10; dimensionY = 5;
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();
} }
} }

View File

@@ -1,54 +0,0 @@
package net.lizistired.cavedust;
import net.fabricmc.api.EnvType;
import net.fabricmc.api.Environment;
import net.minecraft.client.particle.*;
import net.minecraft.client.world.ClientWorld;
import net.minecraft.particle.SimpleParticleType;
public class CaveDustMoteParticleFactory extends SpriteBillboardParticle {
private final SpriteProvider spriteProvider;
CaveDustMoteParticleFactory(ClientWorld clientWorld, double x, double y, double z, double velocityX, double velocityY, double velocityZ, SpriteProvider spriteProvider) {
super(clientWorld, x, y, z);
this.spriteProvider = spriteProvider; //Sets the sprite provider from above to the sprite provider in the constructor method
this.maxAge = 200; //20 ticks = 1 second
this.scale = 0.1f;
this.velocityX = velocityX; //The velX from the constructor parameters
this.velocityY = -0.007f; //Allows the particle to slowly fall
this.velocityZ = velocityZ;
this.x = x; //The x from the constructor parameters
this.y = y;
this.z = z;
this.collidesWithWorld = true;
this.alpha = 1.0f; //Setting the alpha to 1.0f means there will be no opacity change until the alpha value is changed
this.setSpriteForAge(spriteProvider); //Required
}
@Override
public void tick() {
super.tick();
if(this.alpha < 0.0f){
this.markDead();
}
this.alpha -= 0.005f;
}
@Override
public ParticleTextureSheet getType() {
return ParticleTextureSheet.PARTICLE_SHEET_TRANSLUCENT;
}
@Environment(EnvType.CLIENT)
public static class Factory implements ParticleFactory<SimpleParticleType> {
private final SpriteProvider spriteProvider;
public Factory(SpriteProvider spriteProvider) {
this.spriteProvider = spriteProvider;
}
public Particle createParticle(SimpleParticleType type, ClientWorld world, double x, double y, double z, double velocityX, double velocityY, double velocityZ) {
return new CaveDustMoteParticleFactory(world, x, y, z, velocityX, velocityY, velocityZ, this.spriteProvider);
}
}
}

View File

@@ -1,65 +0,0 @@
package net.lizistired.cavedust;
import net.fabricmc.api.EnvType;
import net.fabricmc.api.Environment;
import net.lizistired.cavedust.utils.MathHelper;
import net.minecraft.client.MinecraftClient;
import net.minecraft.client.network.ClientPlayerEntity;
import net.minecraft.client.particle.*;
import net.minecraft.client.world.ClientWorld;
import net.minecraft.particle.SimpleParticleType;
import net.minecraft.util.math.Vec3d;
public class CaveDustPlumeParticleFactory extends SpriteBillboardParticle {
private final SpriteProvider spriteProvider;
CaveDustPlumeParticleFactory(ClientWorld clientWorld, double x, double y, double z, double velocityX, double velocityY, double velocityZ, SpriteProvider spriteProvider) {
super(clientWorld, x, y, z);
this.spriteProvider = spriteProvider; //Sets the sprite provider from above to the sprite provider in the constructor method
this.maxAge = 60; //20 ticks = 1 second
this.scale = 10f;
this.velocityX = velocityX; //The velX from the constructor parameters
this.velocityY = -0.007f; //Allows the particle to slowly fall
this.velocityZ = velocityZ;
this.x = x; //The x from the constructor parameters
this.y = y;
this.z = z;
this.collidesWithWorld = false;
this.alpha = 0.5f; //Setting the alpha to 1.0f means there will be no opacity change until the alpha value is changed
this.setSprite(spriteProvider); //Required
}
@Override
public void tick() {
super.tick();
ClientPlayerEntity player = MinecraftClient.getInstance().player;
Vec3d particlePos = new Vec3d(this.x, this.y, this.z);
double distanceFromParticleToPlayer = particlePos.distanceTo(player.getEyePos());
this.alpha = net.minecraft.util.math.MathHelper.clamp((float) MathHelper.normalize(0, 50, distanceFromParticleToPlayer) * -1, -1, 1);
if(this.alpha < 0.001f){
this.markDead();
}
this.alpha -= 0.00005f;
}
@Override
public ParticleTextureSheet getType() {
return ParticleTextureSheet.PARTICLE_SHEET_TRANSLUCENT;
}
@Environment(EnvType.CLIENT)
public static class Factory implements ParticleFactory<SimpleParticleType> {
private final SpriteProvider spriteProvider;
public Factory(SpriteProvider spriteProvider) {
this.spriteProvider = spriteProvider;
}
public Particle createParticle(SimpleParticleType type, ClientWorld world, double x, double y, double z, double velocityX, double velocityY, double velocityZ) {
return new CaveDustPlumeParticleFactory(world, x, y, z, velocityX, velocityY, velocityZ, this.spriteProvider);
}
}
}

View File

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

View File

@@ -3,15 +3,13 @@ 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.particle.ParticleType; import net.minecraft.client.util.math.MatrixStack;
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);
@@ -35,10 +33,70 @@ public class ModMenuConfigScreen extends GameGui {
.setText("menu.cavedust.global." + config.getCaveDustEnabled()) .setText("menu.cavedust.global." + config.getCaveDustEnabled())
.setTooltip(Text.translatable("menu.cavedust.global.tooltip." + config.getCaveDustEnabled())); .setTooltip(Text.translatable("menu.cavedust.global.tooltip." + config.getCaveDustEnabled()));
addButton(new Button(left, row += 120) /*addButton(new Button(left, row += 24).onClick(sender -> {
.onClick(sender -> sender.getStyle().setText("menu.cavedust.enhanceddetection." + config.setEnhancedDetection()).setTooltip(Text.translatable("menu.cavedust.enhanceddetection.tooltip"));
client.setScreen(new ModMenuConfigScreenAdvanced(parent) })).getStyle()
))); .setText("menu.cavedust.enhanceddetection." + config.getEnhancedDetection())
.setTooltip(Text.translatable("menu.cavedust.enhanceddetection.tooltip"));*/
addButton(new Button(left, row += 24).onClick(sender -> {
sender.getStyle().setText("menu.cavedust.superflatstatus." + config.setSuperFlatStatus()).setTooltip(Text.translatable("menu.cavedust.superflatstatus.tooltip"));
})).getStyle()
.setText("menu.cavedust.superflatstatus." + config.getSuperFlatStatus())
.setTooltip(Text.translatable("menu.cavedust.superflatstatus.tooltip"));
/*addButton(new Slider(left, row += 48, -64, 319, config.getUpperLimit()))
.onChange(config::setUpperLimit)
.setTextFormat(transText::formatUpperLimit)
.getStyle().setTooltip(Text.translatable("menu.cavedust.upperlimit.tooltip"));
addButton(new Slider(left, row += 24, -64, 319, config.getLowerLimit()))
.onChange(config::setLowerLimit)
.setTextFormat(transText::formatLowerLimit)
.getStyle().setTooltip(Text.translatable("menu.cavedust.lowerlimit.tooltip"));*/
addButton(new Slider(left, row += 24, 1, 100, config.getParticleMultiplier()))
.onChange(config::setParticleMultiplier)
.setTextFormat(transText::formatParticleMultiplier)
.getStyle().setTooltip(Text.translatable("menu.cavedust.particlemultiplier.tooltip"));
addButton(new Slider(left, row += 24, 1, 100, config.getParticleMultiplierMultiplier()))
.onChange(config::setParticleMultiplierMultiplier)
.setTextFormat(transText::formatParticleMultiplierMultiplier)
.getStyle().setTooltip(Text.translatable("menu.cavedust.particlemultipliermultiplier.tooltip"));
addButton(new Button(left, row += 24).onClick(sender ->{
config.iterateParticle();
sender.getStyle().setText("Particle: " + (getNameOfParticle()));
})).getStyle().setText("Particle: " + (getNameOfParticle()))
.setTooltip(Text.translatable("menu.cavedust.particle.tooltip"));
addButton(new Slider(left += 220, row -= 96, 1, 50, config.getDimensionsX()))
.onChange(config::setDimensionsX)
.setTextFormat(transText::formatMaxX)
.getStyle().setTooltip(Text.translatable("menu.cavedust.X.tooltip"));
addButton(new Slider(left, row += 24, 1, 50, config.getDimensionsY()))
.onChange(config::setDimensionsY)
.setTextFormat(transText::formatMaxY)
.getStyle().setTooltip(Text.translatable("menu.cavedust.Y.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()))
.onChange(config::setVelocityRandomness)
.setTextFormat(transText::formatVelocityRandomness)
.getStyle().setTooltip(Text.translatable("menu.cavedust.velocityrandomness.tooltip"));
addButton(new Button(left -= 110, row += 60).onClick(sender -> {
config.resetConfig();
finish();
})).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)
.onClick(sender -> finish())).getStyle() .onClick(sender -> finish())).getStyle()
@@ -48,18 +106,13 @@ public class ModMenuConfigScreen extends GameGui {
@Override @Override
public void render(DrawContext context, int mouseX, int mouseY, float partialTicks) { public void render(MatrixStack matrices, int mouseX, int mouseY, float partialTicks) {
super.render(context, mouseX, mouseY, partialTicks); renderBackground(matrices);
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();
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){
CaveDust.LOGGER.error(String.valueOf(e));
return "null";
}
} }
} }

View File

@@ -1,118 +0,0 @@
package net.lizistired.cavedust;
import com.minelittlepony.common.client.gui.GameGui;
import com.minelittlepony.common.client.gui.element.Button;
import com.minelittlepony.common.client.gui.element.Label;
import com.minelittlepony.common.client.gui.element.Slider;
import net.lizistired.cavedust.utils.TranslatableTextHelper;
import net.minecraft.client.gui.DrawContext;
import net.minecraft.client.gui.screen.Screen;
import net.minecraft.particle.ParticleType;
import net.minecraft.registry.Registries;
import net.minecraft.text.Text;
import org.jetbrains.annotations.Nullable;
import java.util.NoSuchElementException;
public class ModMenuConfigScreenAdvanced extends GameGui {
public ModMenuConfigScreenAdvanced(@Nullable Screen parent) {
super(Text.translatable("menu.cavedust.title.advanced"), parent);
}
@Override
public void init() {
int left = width / 2 - 100;
int row = height / 4 + 14;
CaveDustConfig config = CaveDust.getInstance().getConfig();
TranslatableTextHelper transText = new TranslatableTextHelper();;
config.load();
addButton(new Label(width / 2, 30)).setCentered().getStyle()
.setText(getTitle());
/*addButton(new Button(left, row += 24).onClick(sender -> {
sender.getStyle().setText("menu.cavedust.enhanceddetection." + config.setEnhancedDetection()).setTooltip(Text.translatable("menu.cavedust.enhanceddetection.tooltip"));
})).getStyle()
.setText("menu.cavedust.enhanceddetection." + config.getEnhancedDetection())
.setTooltip(Text.translatable("menu.cavedust.enhanceddetection.tooltip"));*/
addButton(new Button(left, row += 24).onClick(sender -> {
sender.getStyle().setText("menu.cavedust.superflatstatus." + config.setSuperFlatStatus()).setTooltip(Text.translatable("menu.cavedust.superflatstatus.tooltip"));
})).getStyle()
.setText("menu.cavedust.superflatstatus." + config.getSuperFlatStatus())
.setTooltip(Text.translatable("menu.cavedust.superflatstatus.tooltip"));
/*addButton(new Slider(left, row += 48, -64, 319, config.getUpperLimit()))
.onChange(config::setUpperLimit)
.setTextFormat(transText::formatUpperLimit)
.getStyle().setTooltip(Text.translatable("menu.cavedust.upperlimit.tooltip"));
addButton(new Slider(left, row += 24, -64, 319, config.getLowerLimit()))
.onChange(config::setLowerLimit)
.setTextFormat(transText::formatLowerLimit)
.getStyle().setTooltip(Text.translatable("menu.cavedust.lowerlimit.tooltip"));*/
addButton(new Slider(left, row += 24, 1, 100, config.getParticleMultiplier()))
.onChange(config::setParticleMultiplier)
.setTextFormat(transText::formatParticleMultiplier)
.getStyle().setTooltip(Text.translatable("menu.cavedust.particlemultiplier.tooltip"));
addButton(new Slider(left, row += 24, 1, 100, config.getParticleMultiplierMultiplier()))
.onChange(config::setParticleMultiplierMultiplier)
.setTextFormat(transText::formatParticleMultiplierMultiplier)
.getStyle().setTooltip(Text.translatable("menu.cavedust.particlemultipliermultiplier.tooltip"));
addButton(new Button(left, row += 24).onClick(sender ->{
config.iterateParticle();
sender.getStyle().setText("Particle: " + (getNameOfParticle()));
})).getStyle().setText("Particle: " + (getNameOfParticle()))
.setTooltip(Text.translatable("menu.cavedust.particle.tooltip"));
addButton(new Slider(left += 220, row -= 96, 1, 50, config.getDimensionWidth()))
.onChange(config::setDimensionWidth)
.setTextFormat(transText::formatMaxWidth)
.getStyle().setTooltip(Text.translatable("menu.cavedust.width.tooltip"));
addButton(new Slider(left, row += 24, 1, 50, config.getDimensionHeight()))
.onChange(config::setDimensionHeight)
.setTextFormat(transText::formatMaxHeight)
.getStyle().setTooltip(Text.translatable("menu.cavedust.height.tooltip"));
addButton(new Slider(left, row += 24, 0, 10, config.getVelocityRandomness()))
.onChange(config::setVelocityRandomness)
.setTextFormat(transText::formatVelocityRandomness)
.getStyle().setTooltip(Text.translatable("menu.cavedust.velocityrandomness.tooltip"));
addButton(new Button(left -= 110, row += 120).onClick(sender -> {
config.resetConfig();
finish();
client.setScreen(new ModMenuConfigScreenAdvanced(parent));
})).getStyle().setText(Text.translatable("menu.cavedust.reset")).setTooltip(Text.translatable("menu.cavedust.reset.tooltip"));
addButton(new Button(left, row += 24)
.onClick(sender -> finish())).getStyle()
.setText("gui.done");
}
@Override
public void render(DrawContext context, int mouseX, int mouseY, float partialTicks) {
super.render(context, mouseX, mouseY, partialTicks);
}
private String getNameOfParticle(){
CaveDustConfig config = CaveDust.getInstance().getConfig();
config.load();
try {
return Registries.PARTICLE_TYPE.getEntry((ParticleType<?>) config.getParticleID()).getIdAsString();
} catch (NoSuchElementException e){
CaveDust.LOGGER.error(String.valueOf(e));
return "null";
}
}
}

View File

@@ -14,7 +14,7 @@ import static net.lizistired.cavedust.utils.ParticleSpawnUtil.shouldParticlesSpa
@Mixin(DebugHud.class) @Mixin(DebugHud.class)
public abstract class MixinDebugScreenOverlay { public abstract class MixinDebugScreenOverlay {
@Inject(method = "getRightText", at = @At("RETURN")) @Inject(method = "getRightText", at = @At("RETURN"))
private void appendDebugText(CallbackInfoReturnable<List<String>> cir) { private void appendShaderPackText(CallbackInfoReturnable<List<String>> cir) {
List<String> messages = cir.getReturnValue(); List<String> messages = cir.getReturnValue();
messages.add(""); messages.add("");

View File

@@ -1,89 +0,0 @@
package net.lizistired.cavedust.utils;
import net.minecraft.client.MinecraftClient;
import net.minecraft.particle.ParticleEffect;
import net.minecraft.registry.Registries;
import net.minecraft.util.Identifier;
import net.minecraft.util.math.BlockPos;
import java.util.Random;
public class CubeCreator {
// 3 nesting for loops to create a hollow border cube around the player
public void cubeCreator(int steps, int offsetXInitial, int offsetYInitial, int offsetZInitial, Identifier caveDust) {
BlockPos playerPos = MinecraftClient.getInstance().player.getBlockPos();
// Loop over the range of steps around the player
for (int x = -steps / 2 + offsetXInitial; x < steps / 2 + offsetXInitial; x++) {
for (int y = -steps / 2 + offsetYInitial; y < steps / 2 + offsetYInitial; y++) {
for (int z = -steps / 2 + offsetZInitial; z < steps / 2 + offsetZInitial; z++) {
// Check if the particle is on the border of the cube
boolean onBorder = x == -steps / 2 + offsetXInitial || x == steps / 2 + offsetXInitial - 1
|| y == -steps / 2 + offsetYInitial || y == steps / 2 + offsetYInitial - 1
|| z == -steps / 2 + offsetZInitial || z == steps / 2 + offsetZInitial - 1;
// If it's on the border, spawn the particle
if (onBorder) {
spawnParticleClient(playerPos.getX() + x, playerPos.getY() + y, playerPos.getZ() + z, caveDust);
}
}
}
}
}
// Create a hollow sphere around the player
public void sphereCreator(int radius, int offsetXInitial, int offsetYInitial, int offsetZInitial, Identifier caveDust) {
BlockPos playerPos = MinecraftClient.getInstance().player.getBlockPos();
// Loop over the range of steps around the player (we are using a cube bounding box to check)
for (int x = -radius; x <= radius; x++) {
for (int y = -radius; y <= radius; y++) {
for (int z = -radius; z <= radius; z++) {
// Calculate the distance from the center (player position)
double distance = Math.sqrt(Math.pow(x, 2) + Math.pow(y, 2) + Math.pow(z, 2));
// If the distance is close to the radius, spawn the particle (create the border)
if (Math.abs(distance - radius) < 1.5) { // Threshold for thickness of the border
spawnParticleClient(playerPos.getX() + x + offsetXInitial,
playerPos.getY() + y + offsetYInitial,
playerPos.getZ() + z + offsetZInitial,
caveDust);
}
}
}
}
}
public void randomSphereCreator(int radius, int offsetXInitial, int offsetYInitial, int offsetZInitial, Identifier caveDust) {
Random random = new Random(); // Random number generator
// Generate random spherical angles
double theta = Math.acos(2 * random.nextDouble() - 1); // Random polar angle (0 to pi)
double phi = 2 * Math.PI * random.nextDouble(); // Random azimuthal angle (0 to 2*pi)
// Convert spherical coordinates to Cartesian coordinates
double x = radius * Math.sin(theta) * Math.cos(phi);
double y = radius * Math.sin(theta) * Math.sin(phi);
double z = radius * Math.cos(theta);
// Offset the generated point to be around the player
BlockPos playerPos = MinecraftClient.getInstance().player.getBlockPos();
int spawnX = playerPos.getX() + (int) (x + offsetXInitial);
int spawnY = playerPos.getY() + (int) (y + offsetYInitial);
int spawnZ = playerPos.getZ() + (int) (z + offsetZInitial);
// Spawn a particle at the random position
float randomX = random.nextFloat() + spawnX;
float randomY = random.nextFloat() + spawnY;
float randomZ = random.nextFloat() + spawnZ;
spawnParticleClient(randomX, randomY, randomZ, caveDust);
}
private void spawnParticleClient(float x, float y, float z, Identifier caveDust) {
MinecraftClient.getInstance().world.addParticleClient((ParticleEffect) Registries.PARTICLE_TYPE.get(caveDust), x, y, z, 0.0D, 0.0D, 0.0D);
}
}

View File

@@ -35,10 +35,6 @@ 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;
}
} }
} }

View File

@@ -14,7 +14,6 @@ public class ParticleSpawnUtil {
private static float timer; private static float timer;
public static boolean shouldParticlesSpawn; public static boolean shouldParticlesSpawn;
/** /**
* Returns true if particles should spawn. * Returns true if particles should spawn.
* @param client MinecraftClient * @param client MinecraftClient
@@ -68,7 +67,6 @@ public class ParticleSpawnUtil {
|| 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)) || client.world.getBiome(Objects.requireNonNull(pos)).matchesKey(LUSH_CAVES))
{ {

View File

@@ -3,12 +3,17 @@ 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 formatMaxX(AbstractSlider<Float> slider) {
return Text.translatable("menu.cavedust.width", (int)Math.floor(slider.getValue())); return Text.translatable("menu.cavedust.X", (int)Math.floor(slider.getValue()));
} }
public Text formatMaxHeight(AbstractSlider<Float> slider) { public Text formatMaxY(AbstractSlider<Float> slider) {
return Text.translatable("menu.cavedust.height", (int)Math.floor(slider.getValue())); return Text.translatable("menu.cavedust.Y", (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()));

View File

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

View File

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

View File

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

View File

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

View File

@@ -1,16 +0,0 @@
{
"textures": [
"minecraft:big_smoke_0",
"minecraft:big_smoke_1",
"minecraft:big_smoke_2",
"minecraft:big_smoke_3",
"minecraft:big_smoke_4",
"minecraft:big_smoke_5",
"minecraft:big_smoke_6",
"minecraft:big_smoke_7",
"minecraft:big_smoke_8",
"minecraft:big_smoke_9",
"minecraft:big_smoke_10",
"minecraft:big_smoke_11"
]
}

View File

Before

Width:  |  Height:  |  Size: 116 KiB

After

Width:  |  Height:  |  Size: 116 KiB

View File

@@ -1,14 +1,15 @@
{ {
"menu.cavedust.title": "Cave Dust", "menu.cavedust.title": "Cave Dust",
"menu.cavedust.title.advanced": "Cave Dust Advanced Options",
"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",
"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.width": "Width bounds: %s", "menu.cavedust.X": "X bounds: %s",
"menu.cavedust.height": "Height bounds: %s", "menu.cavedust.Y": "Y bounds: %s",
"menu.cavedust.width.tooltip": "Maximum width to spawn particle.", "menu.cavedust.Z": "Z bounds: %s",
"menu.cavedust.height.tooltip": "Maximum height to spawn particle.", "menu.cavedust.X.tooltip": "X axis bounds for particle spawning.",
"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).",
@@ -36,8 +37,6 @@
"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!"
} }

View File

@@ -12,25 +12,23 @@
"sources": "https://github.com/LizIsTired/dust" "sources": "https://github.com/LizIsTired/dust"
}, },
"license": "MPL-2.0", "license": "MPL-2.0",
"icon": "assets/cavedust/icon.png", "icon": "assets/modid/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": [
"cavedust.mixins.json" "dust.mixins.json"
], ],
"depends": { "depends": {
"fabricloader": ">=0.14.5", "fabricloader": ">=0.14.5",
"fabric": "*", "fabric": "*",
"minecraft": "1.21.8", "minecraft": ">=1.19-beta.5",
"java": ">=17" "java": ">=17"
}, },
"suggests": { "suggests": {