diff --git a/build.gradle b/build.gradle index 778bcec..d034763 100644 --- a/build.gradle +++ b/build.gradle @@ -1,5 +1,5 @@ plugins { - id 'fabric-loom' version '1.2-SNAPSHOT' + id 'fabric-loom' version '1.6-SNAPSHOT' id 'maven-publish' } diff --git a/gradle.properties b/gradle.properties index 3bc0f9b..b76fe6b 100644 --- a/gradle.properties +++ b/gradle.properties @@ -3,17 +3,17 @@ org.gradle.jvmargs=-Xmx1G # Fabric Properties # check these on https://fabricmc.net/develop - minecraft_version=1.20.2 - yarn_mappings=1.20.2+build.4 - loader_version=0.14.24 + minecraft_version=1.20.1 + yarn_mappings=1.20.1+build.10 + loader_version=0.15.11 # Mod Properties - mod_version=1.4.1 + mod_version=3.0.0 maven_group=com.lizistired archives_base_name=cave_dust # Dependencies - fabric_version=0.90.7+1.20.2 - clothconfig_version=12.0.10 - modmenu_version=8.0.0-beta.2 - kirin_version=1.16.0+1.20.2 + fabric_version=0.92.2+1.20.1 + clothconfig_version=11.1.118 + modmenu_version=7.2.2 + kirin_version=1.15.6+1.20.1 diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 41d9927..c1962a7 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index fae0804..20db9ad 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip +networkTimeout=10000 zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew index 1b6c787..aeb74cb 100755 --- a/gradlew +++ b/gradlew @@ -55,7 +55,7 @@ # Darwin, MinGW, and NonStop. # # (3) This script is generated from the Groovy template -# https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt # within the Gradle project. # # You can find Gradle at https://github.com/gradle/gradle/. @@ -80,13 +80,10 @@ do esac done -APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit - -APP_NAME="Gradle" +# This is normally unused +# shellcheck disable=SC2034 APP_BASE_NAME=${0##*/} - -# 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"' +APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit # Use the maximum available, or set MAX_FD != -1 to use that value. MAX_FD=maximum @@ -143,12 +140,16 @@ fi if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then case $MAX_FD in #( max*) + # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC3045 MAX_FD=$( ulimit -H -n ) || warn "Could not query maximum file descriptor limit" esac case $MAX_FD in #( '' | soft) :;; #( *) + # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC3045 ulimit -n "$MAX_FD" || warn "Could not set maximum file descriptor limit to $MAX_FD" esac @@ -193,6 +194,10 @@ if "$cygwin" || "$msys" ; then done fi + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + # Collect all arguments for the java command; # * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of # shell script including quotes and variable substitutions, so put them in @@ -205,6 +210,12 @@ set -- \ org.gradle.wrapper.GradleWrapperMain \ "$@" +# Stop when "xargs" is not available. +if ! command -v xargs >/dev/null 2>&1 +then + die "xargs is not available" +fi + # Use "xargs" to parse quoted args. # # With -n1 it outputs one arg per line, with the quotes and backslashes removed. diff --git a/gradlew.bat b/gradlew.bat index 107acd3..93e3f59 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -14,7 +14,7 @@ @rem limitations under the License. @rem -@if "%DEBUG%" == "" @echo off +@if "%DEBUG%"=="" @echo off @rem ########################################################################## @rem @rem Gradle startup script for Windows @@ -25,7 +25,8 @@ if "%OS%"=="Windows_NT" setlocal set DIRNAME=%~dp0 -if "%DIRNAME%" == "" set DIRNAME=. +if "%DIRNAME%"=="" set DIRNAME=. +@rem This is normally unused set APP_BASE_NAME=%~n0 set APP_HOME=%DIRNAME% @@ -40,7 +41,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome set JAVA_EXE=java.exe %JAVA_EXE% -version >NUL 2>&1 -if "%ERRORLEVEL%" == "0" goto execute +if %ERRORLEVEL% equ 0 goto execute echo. echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. @@ -75,13 +76,15 @@ set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar :end @rem End local scope for the variables with windows NT shell -if "%ERRORLEVEL%"=="0" goto mainEnd +if %ERRORLEVEL% equ 0 goto mainEnd :fail rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of rem the _cmd.exe /c_ return code! -if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 -exit /b 1 +set EXIT_CODE=%ERRORLEVEL% +if %EXIT_CODE% equ 0 set EXIT_CODE=1 +if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% +exit /b %EXIT_CODE% :mainEnd if "%OS%"=="Windows_NT" endlocal diff --git a/src/main/java/net/lizistired/cavedust/CaveDust.java b/src/main/java/net/lizistired/cavedust/CaveDust.java index 2dfd336..89a788b 100644 --- a/src/main/java/net/lizistired/cavedust/CaveDust.java +++ b/src/main/java/net/lizistired/cavedust/CaveDust.java @@ -1,6 +1,7 @@ package net.lizistired.cavedust; //minecraft imports +import net.fabricmc.fabric.api.client.particle.v1.ParticleFactoryRegistry; import net.minecraft.block.Blocks; import net.minecraft.client.MinecraftClient; import net.minecraft.particle.ParticleTypes; @@ -39,8 +40,7 @@ public class CaveDust implements ClientModInitializer { public net.lizistired.cavedust.CaveDustConfig getConfig() { return config; } - - public static int WHITE_ASH_ID = Registries.PARTICLE_TYPE.getRawId(ParticleTypes.WHITE_ASH); + public static int WHITE_ASH_ID = Registries.PARTICLE_TYPE.getRawId(CaveDustServer.CAVE_DUST); public static int PARTICLE_AMOUNT = 0; @@ -51,7 +51,7 @@ public class CaveDust implements ClientModInitializer { config = new CaveDustConfig(CaveDustFolder.getParent().resolve("cavedust.json"), this); config.load(); registerKeyBindings(); - + ParticleFactoryRegistry.getInstance().register(CaveDustServer.CAVE_DUST, CaveDustParticleFactory.Factory::new); //register end client tick to create cave dust function, using end client tick for async ClientTickEvents.END_CLIENT_TICK.register(this::createCaveDust); } @@ -78,20 +78,23 @@ public class CaveDust implements ClientModInitializer { for (int i = 0; i < PARTICLE_AMOUNT; i++) { try { - int x = (int) (client.player.getPos().getX() + (int) generateRandomDouble(config.getDimensionsX() * -1, config.getDimensionsX())); - int y = (int) (client.player.getPos().getY() + (int) generateRandomDouble(config.getDimensionsY() * -1, config.getDimensionsY())); - int z = (int) (client.player.getPos().getZ() + (int) generateRandomDouble(config.getDimensionsZ() * -1, config.getDimensionsZ())); + 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 z = (int) (client.player.getPos().getZ() + (int) generateRandomDouble(config.getDimensionWidth() *-1, config.getDimensionWidth())); + double miniX = (x + Math.random()); + double miniY = (y + Math.random()); + double miniZ = (z + Math.random()); BlockPos particlePos = new BlockPos(x, y, z); if (shouldParticlesSpawn(client, config, particlePos)) { if (client.world.getBlockState(particlePos).isAir()) { - world.addParticle(config.getParticle(), x, y, z, config.getVelocityRandomnessRandom(), config.getVelocityRandomnessRandom(), config.getVelocityRandomnessRandom()); + world.addParticle(config.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); + //getConfig().setParticleID(WHITE_ASH_ID); } } } diff --git a/src/main/java/net/lizistired/cavedust/CaveDustConfig.java b/src/main/java/net/lizistired/cavedust/CaveDustConfig.java index 9043df2..09f8388 100644 --- a/src/main/java/net/lizistired/cavedust/CaveDustConfig.java +++ b/src/main/java/net/lizistired/cavedust/CaveDustConfig.java @@ -16,10 +16,9 @@ public class CaveDustConfig extends JsonFile { private transient final net.lizistired.cavedust.CaveDust CaveDust; - private int dimensionX = 5; - private int dimensionY = 5; - private int dimensionZ = 5; - private int velocityRandomness = 1; + private int dimensionWidth = 10; + private int dimensionHeight = 10; + private int velocityRandomness = 0; private boolean caveDustEnabled = true; private boolean seaLevelCheck = true; @@ -37,40 +36,29 @@ public class CaveDustConfig extends JsonFile { this.CaveDust = caveDust; } - public float setDimensionsX(float size){ - if (this.dimensionX != size) { - this.dimensionX = (int)size; + public float setDimensionWidth(float size){ + if (this.dimensionWidth != size) { + this.dimensionWidth = (int)size; save(); } - return getDimensionsX(); + return getDimensionWidth(); } - public float setDimensionsY(float size){ - if (this.dimensionY != size) { - this.dimensionY = (int)size; + public float setDimensionHeight(float size){ + if (this.dimensionHeight != size) { + this.dimensionHeight = (int)size; save(); } - return getDimensionsY(); + return getDimensionHeight(); } - public float setDimensionsZ(float size){ - if (this.dimensionZ != size) { - this.dimensionZ = (int)size; - save(); - } - return getDimensionsZ(); + + public float getDimensionWidth(){ + return dimensionWidth; } - public float getDimensionsX(){ - return dimensionX; - } - - public float getDimensionsY(){ - return dimensionY; - } - - public float getDimensionsZ(){ - return dimensionZ; + public float getDimensionHeight(){ + return dimensionHeight; } public float setUpperLimit(float upperLimit){ @@ -145,10 +133,11 @@ public class CaveDustConfig extends JsonFile { try { return (ParticleEffect) Registries.PARTICLE_TYPE.get(new Identifier(Registries.PARTICLE_TYPE.getEntry(getParticleID()).get().getKey().get().getValue().toString().toLowerCase())); } catch (ClassCastException e) { - MinecraftClient.getInstance().player.sendMessage(Text.literal("Issue loading particle, defaulting to white ash particle!"), false); - setParticleID(WHITE_ASH_ID); + MinecraftClient.getInstance().player.sendMessage(Text.translatable("debug.cavedust.particleerror"), true); + LOGGER.error("Cannot spawn particle, check config."); + iterateParticle(); save(); - return ParticleTypes.WHITE_ASH; + return getParticle(); } } @@ -210,9 +199,8 @@ public class CaveDustConfig extends JsonFile { } public void resetConfig(){ - dimensionX = 5; - dimensionY = 5; - dimensionZ = 5; + dimensionWidth = 10; + dimensionHeight = 10; upperLimit = 64; lowerLimit = -64; @@ -220,6 +208,8 @@ public class CaveDustConfig extends JsonFile { particleMultiplier = 1; particleMultiplierMultiplier = 10; + velocityRandomness = 0; + seaLevelCheck = true; caveDustEnabled = true; particleID = WHITE_ASH_ID; diff --git a/src/main/java/net/lizistired/cavedust/CaveDustParticleFactory.java b/src/main/java/net/lizistired/cavedust/CaveDustParticleFactory.java new file mode 100644 index 0000000..abd5442 --- /dev/null +++ b/src/main/java/net/lizistired/cavedust/CaveDustParticleFactory.java @@ -0,0 +1,54 @@ +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.DefaultParticleType; + +public class CaveDustParticleFactory extends SpriteBillboardParticle { + private final SpriteProvider spriteProvider; + CaveDustParticleFactory(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 { + private final SpriteProvider spriteProvider; + + public Factory(SpriteProvider spriteProvider) { + this.spriteProvider = spriteProvider; + } + + + public Particle createParticle(DefaultParticleType 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); + } + } +} diff --git a/src/main/java/net/lizistired/cavedust/CaveDustServer.java b/src/main/java/net/lizistired/cavedust/CaveDustServer.java new file mode 100644 index 0000000..49cf0bd --- /dev/null +++ b/src/main/java/net/lizistired/cavedust/CaveDustServer.java @@ -0,0 +1,19 @@ +package net.lizistired.cavedust; + +import net.fabricmc.api.ModInitializer; +import net.fabricmc.fabric.api.particle.v1.FabricParticleTypes; +import net.minecraft.particle.DefaultParticleType; +import net.minecraft.registry.Registries; +import net.minecraft.registry.Registry; +import net.minecraft.util.Identifier; + +public class CaveDustServer implements ModInitializer { + public static final DefaultParticleType CAVE_DUST = FabricParticleTypes.simple(); + /** + * Runs the mod initializer. + */ + @Override + public void onInitialize() { + Registry.register(Registries.PARTICLE_TYPE, new Identifier("cavedust", "cave_dust"), CAVE_DUST); + } +} diff --git a/src/main/java/net/lizistired/cavedust/ModMenuConfigScreen.java b/src/main/java/net/lizistired/cavedust/ModMenuConfigScreen.java index 25ec6e1..35f45ae 100644 --- a/src/main/java/net/lizistired/cavedust/ModMenuConfigScreen.java +++ b/src/main/java/net/lizistired/cavedust/ModMenuConfigScreen.java @@ -5,12 +5,12 @@ import com.minelittlepony.common.client.gui.element.*; import net.lizistired.cavedust.utils.TranslatableTextHelper; import net.minecraft.client.gui.DrawContext; import net.minecraft.client.gui.screen.Screen; -import net.minecraft.client.util.math.MatrixStack; -import net.minecraft.particle.ParticleEffect; import net.minecraft.registry.Registries; import net.minecraft.text.Text; import org.jetbrains.annotations.Nullable; +import java.util.NoSuchElementException; + public class ModMenuConfigScreen extends GameGui { public ModMenuConfigScreen(@Nullable Screen parent) { super(Text.translatable("menu.cavedust.title"), parent); @@ -73,30 +73,26 @@ public class ModMenuConfigScreen extends GameGui { })).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) + addButton(new Slider(left += 220, row -= 96, 1, 50, config.getDimensionWidth())) + .onChange(config::setDimensionWidth) .setTextFormat(transText::formatMaxX) .getStyle().setTooltip(Text.translatable("menu.cavedust.X.tooltip")); - addButton(new Slider(left, row += 24, 1, 50, config.getDimensionsY())) - .onChange(config::setDimensionsY) + addButton(new Slider(left, row += 24, 1, 50, config.getDimensionHeight())) + .onChange(config::setDimensionHeight) .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 -> { + addButton(new Button(left -= 110, row += 120).onClick(sender -> { config.resetConfig(); finish(); + client.setScreen(new ModMenuConfigScreen(parent)); })).getStyle().setText(Text.translatable("menu.cavedust.reset")).setTooltip(Text.translatable("menu.cavedust.reset.tooltip")); addButton(new Button(left, row += 24) @@ -108,12 +104,16 @@ public class ModMenuConfigScreen extends GameGui { @Override public void render(DrawContext context, int mouseX, int mouseY, float partialTicks) { - renderBackground(context, mouseX, mouseY, partialTicks); + renderBackground(context); super.render(context, mouseX, mouseY, partialTicks); } private String getNameOfParticle(){ CaveDustConfig config = CaveDust.getInstance().getConfig(); config.load(); - return Registries.PARTICLE_TYPE.getEntry(config.getParticleID()).get().getKey().get().getValue().toString(); + try { + return Registries.PARTICLE_TYPE.getEntry(config.getParticleID()).get().getKey().get().getValue().toString(); + } catch (NoSuchElementException e){ + return "null"; + } } } diff --git a/src/main/java/net/lizistired/cavedust/mixin/MixinDebugScreenOverlay.java b/src/main/java/net/lizistired/cavedust/mixin/MixinDebugScreenOverlay.java index 30cedad..4cd4d28 100644 --- a/src/main/java/net/lizistired/cavedust/mixin/MixinDebugScreenOverlay.java +++ b/src/main/java/net/lizistired/cavedust/mixin/MixinDebugScreenOverlay.java @@ -14,7 +14,7 @@ import static net.lizistired.cavedust.utils.ParticleSpawnUtil.shouldParticlesSpa @Mixin(DebugHud.class) public abstract class MixinDebugScreenOverlay { @Inject(method = "getRightText", at = @At("RETURN")) - private void appendShaderPackText(CallbackInfoReturnable> cir) { + private void appendDebugText(CallbackInfoReturnable> cir) { List messages = cir.getReturnValue(); messages.add(""); diff --git a/src/main/java/net/lizistired/cavedust/utils/MathHelper.java b/src/main/java/net/lizistired/cavedust/utils/MathHelper.java index f9670d0..f13696d 100644 --- a/src/main/java/net/lizistired/cavedust/utils/MathHelper.java +++ b/src/main/java/net/lizistired/cavedust/utils/MathHelper.java @@ -35,6 +35,10 @@ public class MathHelper { * @return Random number (double) */ public static double generateRandomDouble(double min, double max) { - return ThreadLocalRandom.current().nextDouble(min, max); + try { + return ThreadLocalRandom.current().nextDouble(min, max); + } catch (IllegalArgumentException e) { + return 0; + } } } diff --git a/src/main/java/net/lizistired/cavedust/utils/TranslatableTextHelper.java b/src/main/java/net/lizistired/cavedust/utils/TranslatableTextHelper.java index c07ccd4..26d5e15 100644 --- a/src/main/java/net/lizistired/cavedust/utils/TranslatableTextHelper.java +++ b/src/main/java/net/lizistired/cavedust/utils/TranslatableTextHelper.java @@ -7,13 +7,10 @@ import javax.swing.*; public class TranslatableTextHelper { public Text formatMaxX(AbstractSlider slider) { - return Text.translatable("menu.cavedust.X", (int)Math.floor(slider.getValue())); + return Text.translatable("menu.cavedust.width", (int)Math.floor(slider.getValue())); } public Text formatMaxY(AbstractSlider slider) { - return Text.translatable("menu.cavedust.Y", (int)Math.floor(slider.getValue())); - } - public Text formatMaxZ(AbstractSlider slider) { - return Text.translatable("menu.cavedust.Z", (int)Math.floor(slider.getValue())); + return Text.translatable("menu.cavedust.height", (int)Math.floor(slider.getValue())); } public Text formatUpperLimit(AbstractSlider slider) { return Text.translatable("menu.cavedust.upperlimit", (int)Math.floor(slider.getValue())); diff --git a/src/main/resources/assets/modid/icon.png b/src/main/resources/assets/cavedust/icon.png similarity index 100% rename from src/main/resources/assets/modid/icon.png rename to src/main/resources/assets/cavedust/icon.png diff --git a/src/main/resources/assets/modid/lang/en_us.json b/src/main/resources/assets/cavedust/lang/en_us.json similarity index 84% rename from src/main/resources/assets/modid/lang/en_us.json rename to src/main/resources/assets/cavedust/lang/en_us.json index e053ad4..5bb13ce 100644 --- a/src/main/resources/assets/modid/lang/en_us.json +++ b/src/main/resources/assets/cavedust/lang/en_us.json @@ -4,12 +4,10 @@ "menu.cavedust.global.true": "Cave Dust: Enabled", "menu.cavedust.global.tooltip.false": "Enable cave dust particles?", "menu.cavedust.global.tooltip.true": "Disable cave dust particles?", - "menu.cavedust.X": "X bounds: %s", - "menu.cavedust.Y": "Y bounds: %s", - "menu.cavedust.Z": "Z bounds: %s", - "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.width": "Width bounds: %s", + "menu.cavedust.height": "Height bounds: %s", + "menu.cavedust.width.tooltip": "Maximum width to spawn particle.", + "menu.cavedust.height.tooltip": "Maximum height to spawn particle.", "menu.cavedust.upperlimit": "Upper limit height: %s", "menu.cavedust.lowerlimit": "Lower limit height: %s", "menu.cavedust.upperlimit.tooltip": "The height where particles will fade out and stop spawning (uses player y).", @@ -37,6 +35,7 @@ "debug.cavedust.toggle.true": "(Cave Dust) Enabled particles", "debug.cavedust.toggle.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!" } \ No newline at end of file diff --git a/src/main/resources/assets/cavedust/particles/cave_dust.json b/src/main/resources/assets/cavedust/particles/cave_dust.json new file mode 100644 index 0000000..ca698ca --- /dev/null +++ b/src/main/resources/assets/cavedust/particles/cave_dust.json @@ -0,0 +1,5 @@ +{ + "textures": [ + "minecraft:generic_0" + ] +} \ No newline at end of file diff --git a/src/main/resources/dust.mixins.json b/src/main/resources/cavedust.mixins.json similarity index 100% rename from src/main/resources/dust.mixins.json rename to src/main/resources/cavedust.mixins.json diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index 0ef1f57..64c6d5f 100644 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -12,23 +12,26 @@ "sources": "https://github.com/LizIsTired/dust" }, "license": "MPL-2.0", - "icon": "assets/modid/icon.png", + "icon": "assets/cavedust/icon.png", "environment": "*", "entrypoints": { "client": [ "net.lizistired.cavedust.CaveDust" ], + "main": [ + "net.lizistired.cavedust.CaveDustServer" + ], "modmenu": [ "net.lizistired.cavedust.CaveDustModMenuFactory" ] }, "mixins": [ - "dust.mixins.json" + "cavedust.mixins.json" ], "depends": { "fabricloader": ">=0.14.5", "fabric": "*", - "minecraft": "1.20.2", + "minecraft": "1.20.1", "java": ">=17" }, "suggests": {