Compare commits
1 Commits
v1.4.1_1.1
...
1.19
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
c0fa50c7c4 |
23
.github/workflows/build-release.yml
vendored
23
.github/workflows/build-release.yml
vendored
@@ -33,10 +33,29 @@ jobs:
|
|||||||
run: ./gradlew build --stacktrace
|
run: ./gradlew build --stacktrace
|
||||||
|
|
||||||
- name: Upload artifacts to Modrinth, Curseforge and GitHub
|
- name: Upload artifacts to Modrinth, Curseforge and GitHub
|
||||||
uses: Kir-Antipov/mc-publish@v3.3
|
uses: Kir-Antipov/mc-publish@v2.0
|
||||||
with:
|
with:
|
||||||
modrinth-id: jawg7zT1
|
modrinth-id: jawg7zT1
|
||||||
modrinth-token: ${{ secrets.MODRINTH_TOKEN }}
|
modrinth-token: ${{ secrets.MODRINTH_TOKEN }}
|
||||||
|
|
||||||
curseforge-id: 594750
|
curseforge-id: 594750
|
||||||
curseforge-token: ${{ secrets.CURSEFORGE_TOKEN }}
|
curseforge-token: ${{ secrets.CURSEFORGE_TOKEN }}
|
||||||
|
|
||||||
|
github-token: ${{ secrets.GITHUB_TOKEN }}
|
||||||
|
|
||||||
|
files: build/libs/!(*-@(dev|sources|all)).jar
|
||||||
|
|
||||||
|
version-type: release
|
||||||
|
|
||||||
|
loaders: fabric
|
||||||
|
|
||||||
|
java: 17
|
||||||
|
|
||||||
|
dependencies: |
|
||||||
|
fabric | depends | 0.46.0
|
||||||
|
P7dR8mSH | depends | 0.46.0
|
||||||
|
kirin | includes | 1.10.0-beta.2
|
||||||
|
modmenu | recommends | *
|
||||||
|
mOgUt4GM | recommends | *
|
||||||
|
|
||||||
|
version-resolver: latest # Defaults to selecting the latest compatible version of Minecraft, using the tag from the fabric.mod.json
|
||||||
@@ -1,5 +1,5 @@
|
|||||||
plugins {
|
plugins {
|
||||||
id 'fabric-loom' version '1.2-SNAPSHOT'
|
id 'fabric-loom' version '0.12-SNAPSHOT'
|
||||||
id 'maven-publish'
|
id 'maven-publish'
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -3,17 +3,17 @@ org.gradle.jvmargs=-Xmx1G
|
|||||||
|
|
||||||
# Fabric Properties
|
# Fabric Properties
|
||||||
# check these on https://fabricmc.net/develop
|
# check these on https://fabricmc.net/develop
|
||||||
minecraft_version=1.19.4
|
minecraft_version=1.19.2
|
||||||
yarn_mappings=1.19.4+build.2
|
yarn_mappings=1.19.2+build.4
|
||||||
loader_version=0.14.19
|
loader_version=0.14.9
|
||||||
|
|
||||||
# Mod Properties
|
# Mod Properties
|
||||||
mod_version = 1.4.1
|
mod_version = 1.2.0
|
||||||
maven_group = com.lizistired
|
maven_group = com.lizistired
|
||||||
archives_base_name = cave_dust
|
archives_base_name = cave_dust
|
||||||
|
|
||||||
# Dependencies
|
# Dependencies
|
||||||
fabric_version=0.81.1+1.19.4
|
fabric_version=0.59.0+1.19.2
|
||||||
clothconfig_version =9.0.94
|
clothconfig_version = 8.0.75
|
||||||
modmenu_version =6.2.2
|
modmenu_version = 4.0.6
|
||||||
kirin_version=1.14.0
|
kirin_version=1.11.1-beta.1
|
||||||
|
|||||||
BIN
gradle/wrapper/gradle-wrapper.jar
vendored
BIN
gradle/wrapper/gradle-wrapper.jar
vendored
Binary file not shown.
2
gradle/wrapper/gradle-wrapper.properties
vendored
2
gradle/wrapper/gradle-wrapper.properties
vendored
@@ -1,5 +1,5 @@
|
|||||||
distributionBase=GRADLE_USER_HOME
|
distributionBase=GRADLE_USER_HOME
|
||||||
distributionPath=wrapper/dists
|
distributionPath=wrapper/dists
|
||||||
distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip
|
distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip
|
||||||
zipStoreBase=GRADLE_USER_HOME
|
zipStoreBase=GRADLE_USER_HOME
|
||||||
zipStorePath=wrapper/dists
|
zipStorePath=wrapper/dists
|
||||||
|
|||||||
10
gradlew
vendored
10
gradlew
vendored
@@ -1,7 +1,7 @@
|
|||||||
#!/bin/sh
|
#!/bin/sh
|
||||||
|
|
||||||
#
|
#
|
||||||
# Copyright © 2015-2021 the original authors.
|
# Copyright © 2015-2021 the original authors.
|
||||||
#
|
#
|
||||||
# Licensed under the Apache License, Version 2.0 (the "License");
|
# Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
# you may not use this file except in compliance with the License.
|
# you may not use this file except in compliance with the License.
|
||||||
@@ -32,10 +32,10 @@
|
|||||||
# Busybox and similar reduced shells will NOT work, because this script
|
# Busybox and similar reduced shells will NOT work, because this script
|
||||||
# requires all of these POSIX shell features:
|
# requires all of these POSIX shell features:
|
||||||
# * functions;
|
# * functions;
|
||||||
# * expansions «$var», «${var}», «${var:-default}», «${var+SET}»,
|
# * expansions «$var», «${var}», «${var:-default}», «${var+SET}»,
|
||||||
# «${var#prefix}», «${var%suffix}», and «$( cmd )»;
|
# «${var#prefix}», «${var%suffix}», and «$( cmd )»;
|
||||||
# * compound commands having a testable exit status, especially «case»;
|
# * compound commands having a testable exit status, especially «case»;
|
||||||
# * various built-in commands including «command», «set», and «ulimit».
|
# * various built-in commands including «command», «set», and «ulimit».
|
||||||
#
|
#
|
||||||
# Important for patching:
|
# Important for patching:
|
||||||
#
|
#
|
||||||
|
|||||||
@@ -1,10 +1,7 @@
|
|||||||
package net.lizistired.cavedust;
|
package net.lizistired.cavedust;
|
||||||
|
|
||||||
//minecraft imports
|
//minecraft imports
|
||||||
import net.minecraft.block.Blocks;
|
|
||||||
import net.minecraft.client.MinecraftClient;
|
import net.minecraft.client.MinecraftClient;
|
||||||
import net.minecraft.particle.ParticleTypes;
|
|
||||||
import net.minecraft.registry.Registries;
|
|
||||||
import net.minecraft.text.Text;
|
import net.minecraft.text.Text;
|
||||||
import net.minecraft.util.math.BlockPos;
|
import net.minecraft.util.math.BlockPos;
|
||||||
import net.minecraft.world.World;
|
import net.minecraft.world.World;
|
||||||
@@ -40,9 +37,6 @@ public class CaveDust implements ClientModInitializer {
|
|||||||
return config;
|
return config;
|
||||||
}
|
}
|
||||||
|
|
||||||
public static int WHITE_ASH_ID = Registries.PARTICLE_TYPE.getRawId(ParticleTypes.WHITE_ASH);
|
|
||||||
public static int PARTICLE_AMOUNT = 0;
|
|
||||||
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onInitializeClient() {
|
public void onInitializeClient() {
|
||||||
@@ -74,24 +68,22 @@ public class CaveDust implements ClientModInitializer {
|
|||||||
//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());
|
|
||||||
|
|
||||||
for (int i = 0; i < PARTICLE_AMOUNT; i++) {
|
for (int i = 0; i < probabilityNormalized * config.getParticleMultiplier() * 10; i++) {
|
||||||
try {
|
try {
|
||||||
int x = (int) (client.player.getPos().getX() + (int) generateRandomDouble(config.getDimensionsX() * -1, config.getDimensionsX()));
|
double x = client.player.getPos().getX() + generateRandomDouble(config.getDimensionsMinX(), config.getDimensionsMaxX());
|
||||||
int y = (int) (client.player.getPos().getY() + (int) generateRandomDouble(config.getDimensionsY() * -1, config.getDimensionsY()));
|
double y = client.player.getPos().getY() + generateRandomDouble(config.getDimensionsMinX(), config.getDimensionsMaxY());
|
||||||
int z = (int) (client.player.getPos().getZ() + (int) generateRandomDouble(config.getDimensionsZ() * -1, config.getDimensionsZ()));
|
double z = client.player.getPos().getZ() + generateRandomDouble(config.getDimensionsMinX(), config.getDimensionsMaxZ());
|
||||||
BlockPos particlePos = new BlockPos(x, y, z);
|
BlockPos particlePos = new BlockPos(x, y, z);
|
||||||
|
|
||||||
if (shouldParticlesSpawn(client, config, particlePos)) {
|
if (!shouldParticlesSpawn(client, config, particlePos)){return;}
|
||||||
if (client.world.getBlockState(particlePos).isAir()) {
|
|
||||||
world.addParticle(config.getParticle(), x, y, z, config.getVelocityRandomnessRandom(), config.getVelocityRandomnessRandom(), config.getVelocityRandomnessRandom());
|
|
||||||
}
|
world.addParticle(config.getParticle(), x, y, z, config.getVelocityRandomnessRandom(), config.getVelocityRandomnessRandom(), config.getVelocityRandomnessRandom());
|
||||||
}
|
|
||||||
}
|
}
|
||||||
catch (NullPointerException e) {
|
catch (NullPointerException e) {
|
||||||
LOGGER.error(String.valueOf(e));
|
LOGGER.error(String.valueOf(e));
|
||||||
getConfig().setParticleID(WHITE_ASH_ID);
|
getConfig().setParticle("minecraft:white_ash");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,12 +1,10 @@
|
|||||||
package net.lizistired.cavedust;
|
package net.lizistired.cavedust;
|
||||||
|
|
||||||
import net.lizistired.cavedust.utils.JsonFile;
|
import net.lizistired.cavedust.utils.JsonFile;
|
||||||
import net.minecraft.client.MinecraftClient;
|
|
||||||
import net.minecraft.particle.ParticleEffect;
|
import net.minecraft.particle.ParticleEffect;
|
||||||
import net.minecraft.particle.ParticleTypes;
|
import net.minecraft.particle.ParticleTypes;
|
||||||
import net.minecraft.registry.Registries;
|
|
||||||
import net.minecraft.text.Text;
|
|
||||||
import net.minecraft.util.Identifier;
|
import net.minecraft.util.Identifier;
|
||||||
|
import net.minecraft.util.registry.Registry;
|
||||||
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.*;
|
||||||
|
|
||||||
@@ -16,61 +14,98 @@ public class CaveDustConfig extends JsonFile {
|
|||||||
private transient final net.lizistired.cavedust.CaveDust CaveDust;
|
private transient final net.lizistired.cavedust.CaveDust CaveDust;
|
||||||
|
|
||||||
|
|
||||||
private int dimensionX = 5;
|
private int dimensionMaxX = 5;
|
||||||
private int dimensionY = 5;
|
private int dimensionMaxY = 5;
|
||||||
private int dimensionZ = 5;
|
private int dimensionMaxZ = 5;
|
||||||
|
private int dimensionMinX = -5;
|
||||||
|
private int dimensionMinY = -5;
|
||||||
|
private int dimensionMinZ = -5;
|
||||||
private int velocityRandomness = 1;
|
private int velocityRandomness = 1;
|
||||||
|
|
||||||
private boolean caveDustEnabled = true;
|
private boolean caveDustEnabled = true;
|
||||||
|
private String particleName = "white_ash";
|
||||||
private boolean seaLevelCheck = true;
|
private boolean seaLevelCheck = true;
|
||||||
private boolean superFlatStatus = false;
|
private boolean superFlatStatus = false;
|
||||||
|
//private boolean enhancedDetection = true;
|
||||||
private float upperLimit = 64;
|
private float upperLimit = 64;
|
||||||
private float lowerLimit = -64;
|
private float lowerLimit = -64;
|
||||||
private int particleMultiplier = 1;
|
private int particleMultiplier = 1;
|
||||||
|
|
||||||
private int particleMultiplierMultiplier = 10;
|
|
||||||
|
|
||||||
private int particleID = WHITE_ASH_ID;
|
|
||||||
|
|
||||||
public CaveDustConfig(Path file, net.lizistired.cavedust.CaveDust caveDust) {
|
public CaveDustConfig(Path file, net.lizistired.cavedust.CaveDust caveDust) {
|
||||||
super(file);
|
super(file);
|
||||||
this.CaveDust = caveDust;
|
this.CaveDust = caveDust;
|
||||||
}
|
}
|
||||||
|
|
||||||
public float setDimensionsX(float size){
|
public float setDimensionsMinX(float size){
|
||||||
if (this.dimensionX != size) {
|
if (this.dimensionMinX != size) {
|
||||||
this.dimensionX = (int)size;
|
this.dimensionMinX = (int)size;
|
||||||
save();
|
save();
|
||||||
}
|
}
|
||||||
return getDimensionsX();
|
return getDimensionsMinX();
|
||||||
}
|
}
|
||||||
|
|
||||||
public float setDimensionsY(float size){
|
public float setDimensionsMinY(float size){
|
||||||
if (this.dimensionY != size) {
|
if (this.dimensionMinY != size) {
|
||||||
this.dimensionY = (int)size;
|
this.dimensionMinY = (int)size;
|
||||||
save();
|
save();
|
||||||
}
|
}
|
||||||
return getDimensionsY();
|
return getDimensionsMinY();
|
||||||
}
|
}
|
||||||
|
|
||||||
public float setDimensionsZ(float size){
|
public float setDimensionsMinZ(float size){
|
||||||
if (this.dimensionZ != size) {
|
if (this.dimensionMinZ != size) {
|
||||||
this.dimensionZ = (int)size;
|
this.dimensionMinZ = (int)size;
|
||||||
save();
|
save();
|
||||||
}
|
}
|
||||||
return getDimensionsZ();
|
return getDimensionsMinZ();
|
||||||
}
|
}
|
||||||
|
|
||||||
public float getDimensionsX(){
|
public float getDimensionsMinX(){
|
||||||
return dimensionX;
|
return dimensionMinX;
|
||||||
}
|
}
|
||||||
|
|
||||||
public float getDimensionsY(){
|
public float getDimensionsMinY(){
|
||||||
return dimensionY;
|
return dimensionMinY;
|
||||||
}
|
}
|
||||||
|
|
||||||
public float getDimensionsZ(){
|
public float getDimensionsMinZ(){
|
||||||
return dimensionZ;
|
return dimensionMinZ;
|
||||||
|
}
|
||||||
|
|
||||||
|
public float setDimensionsMaxX(float size){
|
||||||
|
if (this.dimensionMaxX != size) {
|
||||||
|
this.dimensionMaxX = (int)size;
|
||||||
|
save();
|
||||||
|
}
|
||||||
|
return getDimensionsMaxX();
|
||||||
|
}
|
||||||
|
|
||||||
|
public float setDimensionsMaxY(float size){
|
||||||
|
if (this.dimensionMaxY != size) {
|
||||||
|
this.dimensionMaxY = (int)size;
|
||||||
|
save();
|
||||||
|
}
|
||||||
|
return getDimensionsMaxY();
|
||||||
|
}
|
||||||
|
|
||||||
|
public float setDimensionsMaxZ(float size){
|
||||||
|
if (this.dimensionMaxZ != size) {
|
||||||
|
this.dimensionMaxZ = (int)size;
|
||||||
|
save();
|
||||||
|
}
|
||||||
|
return getDimensionsMaxZ();
|
||||||
|
}
|
||||||
|
|
||||||
|
public float getDimensionsMaxX(){
|
||||||
|
return dimensionMaxX;
|
||||||
|
}
|
||||||
|
|
||||||
|
public float getDimensionsMaxY(){
|
||||||
|
return dimensionMaxY;
|
||||||
|
}
|
||||||
|
|
||||||
|
public float getDimensionsMaxZ(){
|
||||||
|
return dimensionMaxZ;
|
||||||
}
|
}
|
||||||
|
|
||||||
public float setUpperLimit(float upperLimit){
|
public float setUpperLimit(float upperLimit){
|
||||||
@@ -115,16 +150,6 @@ public class CaveDustConfig extends JsonFile {
|
|||||||
return getParticleMultiplier();
|
return getParticleMultiplier();
|
||||||
}
|
}
|
||||||
|
|
||||||
public int getParticleMultiplierMultiplier(){
|
|
||||||
return particleMultiplierMultiplier;
|
|
||||||
}
|
|
||||||
|
|
||||||
public float setParticleMultiplierMultiplier(float particleMultiplierMultiplier){
|
|
||||||
this.particleMultiplierMultiplier = (int) particleMultiplierMultiplier;
|
|
||||||
save();
|
|
||||||
return getParticleMultiplierMultiplier();
|
|
||||||
}
|
|
||||||
|
|
||||||
public boolean toggleCaveDust(){
|
public boolean toggleCaveDust(){
|
||||||
caveDustEnabled = !caveDustEnabled;
|
caveDustEnabled = !caveDustEnabled;
|
||||||
save();
|
save();
|
||||||
@@ -136,17 +161,17 @@ public class CaveDustConfig extends JsonFile {
|
|||||||
}
|
}
|
||||||
|
|
||||||
public ParticleEffect setParticle(String particleType){
|
public ParticleEffect setParticle(String particleType){
|
||||||
//particleName = particleType;
|
particleName = particleType;
|
||||||
save();
|
save();
|
||||||
return getParticle();
|
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) Registry.PARTICLE_TYPE.get(new Identifier(particleName.toLowerCase()));
|
||||||
} catch (ClassCastException e) {
|
} catch (ClassCastException e) {
|
||||||
MinecraftClient.getInstance().player.sendMessage(Text.literal("Issue loading particle, defaulting to white ash particle!"), false);
|
LOGGER.error(e + "\nThere was an error loading the specified particle from the config, make sure a valid particle name is specified. Falling back to \"minecraft:white_ash\".");
|
||||||
setParticleID(WHITE_ASH_ID);
|
particleName = "minecraft:white_ash";
|
||||||
save();
|
save();
|
||||||
return ParticleTypes.WHITE_ASH;
|
return ParticleTypes.WHITE_ASH;
|
||||||
}
|
}
|
||||||
@@ -187,42 +212,33 @@ public class CaveDustConfig extends JsonFile {
|
|||||||
return getSuperFlatStatus();
|
return getSuperFlatStatus();
|
||||||
}
|
}
|
||||||
|
|
||||||
public void iterateParticle(){
|
/*public boolean getEnhancedDetection(){
|
||||||
if(getParticleID() > Registries.PARTICLE_TYPE.size() - 2) {
|
return enhancedDetection;
|
||||||
particleID = 1;
|
|
||||||
save();
|
|
||||||
} else {
|
|
||||||
particleID = getParticleID() + 1;
|
|
||||||
save();
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public void setParticleID(int particleID){
|
public boolean setEnhancedDetection(){
|
||||||
this.particleID = particleID;
|
enhancedDetection = !enhancedDetection;
|
||||||
save();
|
save();
|
||||||
}
|
return getEnhancedDetection();
|
||||||
|
}*/
|
||||||
public int getParticleID(){
|
|
||||||
if ((!Registries.PARTICLE_TYPE.getEntry(particleID).isPresent())) {
|
|
||||||
setParticleID(WHITE_ASH_ID);
|
|
||||||
}
|
|
||||||
return particleID;
|
|
||||||
}
|
|
||||||
|
|
||||||
public void resetConfig(){
|
public void resetConfig(){
|
||||||
dimensionX = 5;
|
dimensionMinX = -5;
|
||||||
dimensionY = 5;
|
dimensionMinY = -5;
|
||||||
dimensionZ = 5;
|
dimensionMinZ = -5;
|
||||||
|
|
||||||
|
dimensionMaxX = 5;
|
||||||
|
dimensionMaxY = 5;
|
||||||
|
dimensionMaxZ = 5;
|
||||||
|
|
||||||
upperLimit = 64;
|
upperLimit = 64;
|
||||||
lowerLimit = -64;
|
lowerLimit = -64;
|
||||||
|
|
||||||
particleMultiplier = 1;
|
particleMultiplier = 1;
|
||||||
particleMultiplierMultiplier = 10;
|
|
||||||
|
|
||||||
seaLevelCheck = true;
|
seaLevelCheck = true;
|
||||||
caveDustEnabled = true;
|
caveDustEnabled = true;
|
||||||
particleID = WHITE_ASH_ID;
|
particleName = "minecraft:white_ash";
|
||||||
save();
|
save();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -5,10 +5,9 @@ import com.minelittlepony.common.client.gui.element.*;
|
|||||||
import net.lizistired.cavedust.utils.TranslatableTextHelper;
|
import net.lizistired.cavedust.utils.TranslatableTextHelper;
|
||||||
import net.minecraft.client.gui.screen.Screen;
|
import net.minecraft.client.gui.screen.Screen;
|
||||||
import net.minecraft.client.util.math.MatrixStack;
|
import net.minecraft.client.util.math.MatrixStack;
|
||||||
import net.minecraft.particle.ParticleEffect;
|
|
||||||
import net.minecraft.registry.Registries;
|
|
||||||
import net.minecraft.text.Text;
|
import net.minecraft.text.Text;
|
||||||
import org.jetbrains.annotations.Nullable;
|
|
||||||
|
import javax.annotation.Nullable;
|
||||||
|
|
||||||
public class ModMenuConfigScreen extends GameGui {
|
public class ModMenuConfigScreen extends GameGui {
|
||||||
public ModMenuConfigScreen(@Nullable Screen parent) {
|
public ModMenuConfigScreen(@Nullable Screen parent) {
|
||||||
@@ -27,7 +26,7 @@ public class ModMenuConfigScreen extends GameGui {
|
|||||||
addButton(new Label(width / 2, 30)).setCentered().getStyle()
|
addButton(new Label(width / 2, 30)).setCentered().getStyle()
|
||||||
.setText(getTitle());
|
.setText(getTitle());
|
||||||
|
|
||||||
addButton(new Button(left += -110, row += -60).onClick(sender -> {
|
addButton(new Button(left, row += -60).onClick(sender -> {
|
||||||
sender.getStyle().setText("menu.cavedust.global." + config.toggleCaveDust()).setTooltip(Text.translatable("menu.cavedust.global.tooltip." + config.getCaveDustEnabled()));
|
sender.getStyle().setText("menu.cavedust.global." + config.toggleCaveDust()).setTooltip(Text.translatable("menu.cavedust.global.tooltip." + config.getCaveDustEnabled()));
|
||||||
})).getStyle()
|
})).getStyle()
|
||||||
.setText("menu.cavedust.global." + config.getCaveDustEnabled())
|
.setText("menu.cavedust.global." + config.getCaveDustEnabled())
|
||||||
@@ -45,9 +44,37 @@ public class ModMenuConfigScreen extends GameGui {
|
|||||||
.setText("menu.cavedust.superflatstatus." + config.getSuperFlatStatus())
|
.setText("menu.cavedust.superflatstatus." + config.getSuperFlatStatus())
|
||||||
.setTooltip(Text.translatable("menu.cavedust.superflatstatus.tooltip"));
|
.setTooltip(Text.translatable("menu.cavedust.superflatstatus.tooltip"));
|
||||||
|
|
||||||
|
addButton(new Slider(left += -110, row += 24, -50, 0, config.getDimensionsMinX()))
|
||||||
|
.onChange(config::setDimensionsMinX)
|
||||||
|
.setTextFormat(transText::formatMinX)
|
||||||
|
.getStyle().setTooltip(Text.translatable("menu.cavedust.minX.tooltip"));
|
||||||
|
|
||||||
|
addButton(new Slider(left, row += 24, -50, 0, config.getDimensionsMinY()))
|
||||||
|
.onChange(config::setDimensionsMinY)
|
||||||
|
.setTextFormat(transText::formatMinY)
|
||||||
|
.getStyle().setTooltip(Text.translatable("menu.cavedust.minY.tooltip"));
|
||||||
|
|
||||||
/*addButton(new Slider(left, row += 48, -64, 319, config.getUpperLimit()))
|
addButton(new Slider(left, row += 24, -50, 0, config.getDimensionsMinZ()))
|
||||||
|
.onChange(config::setDimensionsMinZ)
|
||||||
|
.setTextFormat(transText::formatMinZ)
|
||||||
|
.getStyle().setTooltip(Text.translatable("menu.cavedust.minZ.tooltip"));
|
||||||
|
|
||||||
|
addButton(new Slider(left += 220, row += -48, 0, 50, config.getDimensionsMaxX()))
|
||||||
|
.onChange(config::setDimensionsMaxX)
|
||||||
|
.setTextFormat(transText::formatMaxX)
|
||||||
|
.getStyle().setTooltip(Text.translatable("menu.cavedust.maxX.tooltip"));
|
||||||
|
|
||||||
|
addButton(new Slider(left, row += 24, 0, 50, config.getDimensionsMaxY()))
|
||||||
|
.onChange(config::setDimensionsMaxY)
|
||||||
|
.setTextFormat(transText::formatMaxY)
|
||||||
|
.getStyle().setTooltip(Text.translatable("menu.cavedust.maxY.tooltip"));
|
||||||
|
|
||||||
|
addButton(new Slider(left, row += 24, 0, 50, config.getDimensionsMaxZ()))
|
||||||
|
.onChange(config::setDimensionsMaxZ)
|
||||||
|
.setTextFormat(transText::formatMaxZ)
|
||||||
|
.getStyle().setTooltip(Text.translatable("menu.cavedust.maxZ.tooltip"));
|
||||||
|
|
||||||
|
addButton(new Slider(left += -110, row += 24, -64, 319, config.getUpperLimit()))
|
||||||
.onChange(config::setUpperLimit)
|
.onChange(config::setUpperLimit)
|
||||||
.setTextFormat(transText::formatUpperLimit)
|
.setTextFormat(transText::formatUpperLimit)
|
||||||
.getStyle().setTooltip(Text.translatable("menu.cavedust.upperlimit.tooltip"));
|
.getStyle().setTooltip(Text.translatable("menu.cavedust.upperlimit.tooltip"));
|
||||||
@@ -55,53 +82,27 @@ public class ModMenuConfigScreen extends GameGui {
|
|||||||
addButton(new Slider(left, row += 24, -64, 319, config.getLowerLimit()))
|
addButton(new Slider(left, row += 24, -64, 319, config.getLowerLimit()))
|
||||||
.onChange(config::setLowerLimit)
|
.onChange(config::setLowerLimit)
|
||||||
.setTextFormat(transText::formatLowerLimit)
|
.setTextFormat(transText::formatLowerLimit)
|
||||||
.getStyle().setTooltip(Text.translatable("menu.cavedust.lowerlimit.tooltip"));*/
|
.getStyle().setTooltip(Text.translatable("menu.cavedust.lowerlimit.tooltip"));
|
||||||
|
|
||||||
addButton(new Slider(left, row += 24, 1, 100, config.getParticleMultiplier()))
|
addButton(new Slider(left, row += 24, 1, 100, config.getParticleMultiplier()))
|
||||||
.onChange(config::setParticleMultiplier)
|
.onChange(config::setParticleMultiplier)
|
||||||
.setTextFormat(transText::formatParticleMultiplier)
|
.setTextFormat(transText::formatParticleMultiplier)
|
||||||
.getStyle().setTooltip(Text.translatable("menu.cavedust.particlemultiplier.tooltip"));
|
.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()))
|
addButton(new Slider(left, row += 24, 0, 10, config.getVelocityRandomness()))
|
||||||
.onChange(config::setVelocityRandomness)
|
.onChange(config::setVelocityRandomness)
|
||||||
.setTextFormat(transText::formatVelocityRandomness)
|
.setTextFormat(transText::formatVelocityRandomness)
|
||||||
.getStyle().setTooltip(Text.translatable("menu.cavedust.velocityrandomness.tooltip"));
|
.getStyle().setTooltip(Text.translatable("menu.cavedust.velocityrandomness.tooltip"));
|
||||||
|
|
||||||
|
|
||||||
addButton(new Button(left -= 110, row += 60).onClick(sender -> {
|
addButton(new Button(left, row += 24).onClick(sender -> {
|
||||||
config.resetConfig();
|
config.resetConfig();
|
||||||
finish();
|
finish();
|
||||||
})).getStyle().setText(Text.translatable("menu.cavedust.reset")).setTooltip(Text.translatable("menu.cavedust.reset.tooltip"));
|
})).getStyle().setText(Text.translatable("menu.cavedust.reset")).setTooltip(Text.translatable("menu.cavedust.reset.tooltip"));
|
||||||
|
|
||||||
addButton(new Button(left, row += 24)
|
addButton(new Button(left, row += 60)
|
||||||
.onClick(sender -> finish())).getStyle()
|
.onClick(sender -> finish())).getStyle()
|
||||||
.setText("gui.done");
|
.setText("gui.done");
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@@ -110,9 +111,4 @@ public class ModMenuConfigScreen extends GameGui {
|
|||||||
renderBackground(matrices);
|
renderBackground(matrices);
|
||||||
super.render(matrices, mouseX, mouseY, partialTicks);
|
super.render(matrices, 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();
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -7,8 +7,6 @@ import org.spongepowered.asm.mixin.injection.Inject;
|
|||||||
import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
|
import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
|
||||||
|
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
import static net.lizistired.cavedust.CaveDust.PARTICLE_AMOUNT;
|
|
||||||
import static net.lizistired.cavedust.utils.ParticleSpawnUtil.shouldParticlesSpawn;
|
import static net.lizistired.cavedust.utils.ParticleSpawnUtil.shouldParticlesSpawn;
|
||||||
|
|
||||||
@Mixin(DebugHud.class)
|
@Mixin(DebugHud.class)
|
||||||
@@ -18,7 +16,7 @@ public abstract class MixinDebugScreenOverlay {
|
|||||||
List<String> messages = cir.getReturnValue();
|
List<String> messages = cir.getReturnValue();
|
||||||
|
|
||||||
messages.add("");
|
messages.add("");
|
||||||
messages.add("Particle amount evaluated: " + PARTICLE_AMOUNT);
|
messages.add("Should particles spawn: " + shouldParticlesSpawn);
|
||||||
messages.add("");
|
messages.add("");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -66,7 +66,7 @@ public class ParticleSpawnUtil {
|
|||||||
|| client.isPaused()
|
|| client.isPaused()
|
||||||
|| client.world == null
|
|| client.world == null
|
||||||
|| !client.world.getDimension().bedWorks()
|
|| !client.world.getDimension().bedWorks()
|
||||||
|| (client.world.getBottomY() > pos.getY())
|
|| Objects.requireNonNull(client.player).isSubmergedInWater()
|
||||||
|| client.world.getBiome(Objects.requireNonNull(pos)).matchesKey(LUSH_CAVES))
|
|| client.world.getBiome(Objects.requireNonNull(pos)).matchesKey(LUSH_CAVES))
|
||||||
|
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -3,17 +3,24 @@ 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 formatMinX(AbstractSlider<Float> slider) {
|
||||||
|
return Text.translatable("menu.cavedust.minX", (int)Math.floor(slider.getValue()));
|
||||||
|
}
|
||||||
|
public Text formatMinY(AbstractSlider<Float> slider) {
|
||||||
|
return Text.translatable("menu.cavedust.minY", (int)Math.floor(slider.getValue()));
|
||||||
|
}
|
||||||
|
public Text formatMinZ(AbstractSlider<Float> slider) {
|
||||||
|
return Text.translatable("menu.cavedust.minZ", (int)Math.floor(slider.getValue()));
|
||||||
|
}
|
||||||
public Text formatMaxX(AbstractSlider<Float> slider) {
|
public Text formatMaxX(AbstractSlider<Float> slider) {
|
||||||
return Text.translatable("menu.cavedust.X", (int)Math.floor(slider.getValue()));
|
return Text.translatable("menu.cavedust.maxX", (int)Math.floor(slider.getValue()));
|
||||||
}
|
}
|
||||||
public Text formatMaxY(AbstractSlider<Float> slider) {
|
public Text formatMaxY(AbstractSlider<Float> slider) {
|
||||||
return Text.translatable("menu.cavedust.Y", (int)Math.floor(slider.getValue()));
|
return Text.translatable("menu.cavedust.maxY", (int)Math.floor(slider.getValue()));
|
||||||
}
|
}
|
||||||
public Text formatMaxZ(AbstractSlider<Float> slider) {
|
public Text formatMaxZ(AbstractSlider<Float> slider) {
|
||||||
return Text.translatable("menu.cavedust.Z", (int)Math.floor(slider.getValue()));
|
return Text.translatable("menu.cavedust.maxZ", (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()));
|
||||||
@@ -24,10 +31,6 @@ public class TranslatableTextHelper {
|
|||||||
public Text formatParticleMultiplier(AbstractSlider<Float> slider) {
|
public Text formatParticleMultiplier(AbstractSlider<Float> slider) {
|
||||||
return Text.translatable("menu.cavedust.particlemultiplier", (int)Math.floor(slider.getValue()));
|
return Text.translatable("menu.cavedust.particlemultiplier", (int)Math.floor(slider.getValue()));
|
||||||
}
|
}
|
||||||
|
|
||||||
public Text formatParticleMultiplierMultiplier(AbstractSlider<Float> slider) {
|
|
||||||
return Text.translatable("menu.cavedust.particlemultipliermultiplier", (int)Math.floor(slider.getValue()));
|
|
||||||
}
|
|
||||||
public Text formatVelocityRandomness(AbstractSlider<Float> slider) {
|
public Text formatVelocityRandomness(AbstractSlider<Float> slider) {
|
||||||
return Text.translatable("menu.cavedust.velocityrandomness", (int) Math.floor(slider.getValue()));
|
return Text.translatable("menu.cavedust.velocityrandomness", (int) Math.floor(slider.getValue()));
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -4,22 +4,26 @@
|
|||||||
"menu.cavedust.global.true": "Cave Dust: Enabled",
|
"menu.cavedust.global.true": "Cave Dust: Enabled",
|
||||||
"menu.cavedust.global.tooltip.false": "Enable cave dust particles?",
|
"menu.cavedust.global.tooltip.false": "Enable cave dust particles?",
|
||||||
"menu.cavedust.global.tooltip.true": "Disable cave dust particles?",
|
"menu.cavedust.global.tooltip.true": "Disable cave dust particles?",
|
||||||
"menu.cavedust.X": "X bounds: %s",
|
"menu.cavedust.minX": "Minimum X: %s",
|
||||||
"menu.cavedust.Y": "Y bounds: %s",
|
"menu.cavedust.minY": "Minimum Y: %s",
|
||||||
"menu.cavedust.Z": "Z bounds: %s",
|
"menu.cavedust.minZ": "Minimum Z: %s",
|
||||||
"menu.cavedust.X.tooltip": "X axis bounds for particle spawning.",
|
"menu.cavedust.maxX": "Maximum X: %s",
|
||||||
"menu.cavedust.Y.tooltip": "Y axis bounds for particle spawning.",
|
"menu.cavedust.maxY": "Maximum Y: %s",
|
||||||
"menu.cavedust.Z.tooltip": "Z axis bounds for particle spawning.",
|
"menu.cavedust.maxZ": "Maximum Z: %s",
|
||||||
"menu.cavedust.upperlimit": "Upper limit height: %s",
|
"menu.cavedust.minX.tooltip": "Minimum X: %s",
|
||||||
"menu.cavedust.lowerlimit": "Lower limit height: %s",
|
"menu.cavedust.minY.tooltip": "Minimum Y: %s",
|
||||||
|
"menu.cavedust.minZ.tooltip": "Minimum Z: %s",
|
||||||
|
"menu.cavedust.maxX.tooltip": "Maximum X: %s",
|
||||||
|
"menu.cavedust.maxY.tooltip": "Maximum Y: %s",
|
||||||
|
"menu.cavedust.maxZ.tooltip": "Maximum Z: %s",
|
||||||
|
"menu.cavedust.upperlimit": "Upper limit: %s",
|
||||||
|
"menu.cavedust.lowerlimit": "Lower limit: %s",
|
||||||
"menu.cavedust.upperlimit.tooltip": "The height where particles will fade out and stop spawning (uses player y).",
|
"menu.cavedust.upperlimit.tooltip": "The height where particles will fade out and stop spawning (uses player y).",
|
||||||
"menu.cavedust.lowerlimit.tooltip": "The height where particles spawn the most (uses player y).",
|
"menu.cavedust.lowerlimit.tooltip": "The height where particles spawn the most (uses player y).",
|
||||||
"menu.cavedust.reset": "Reset settings",
|
"menu.cavedust.reset": "Reset settings",
|
||||||
"menu.cavedust.reset.tooltip": "Are you sure you want to reset all settings?",
|
"menu.cavedust.reset.tooltip": "Are you sure you want to reset all settings?",
|
||||||
"menu.cavedust.particlemultiplier": "Particle amount: %s",
|
"menu.cavedust.particlemultiplier": "Particle multiplier: %s",
|
||||||
"menu.cavedust.particlemultiplier.tooltip": "Amount of particles to spawn at any given depth.",
|
"menu.cavedust.particlemultiplier.tooltip": "Multiplies the amount of particles at any given depth.",
|
||||||
"menu.cavedust.particlemultipliermultiplier": "Particle multiplier: %s",
|
|
||||||
"menu.cavedust.particlemultipliermultiplier.tooltip": "Multiplies particle amount.",
|
|
||||||
"menu.cavedust.velocityrandomness": "Velocity randomness: %s",
|
"menu.cavedust.velocityrandomness": "Velocity randomness: %s",
|
||||||
"menu.cavedust.velocityrandomness.tooltip": "The randomness of the velocity of the particles.",
|
"menu.cavedust.velocityrandomness.tooltip": "The randomness of the velocity of the particles.",
|
||||||
"menu.cavedust.enhanceddetection.true": "Enhanced detection: Enabled",
|
"menu.cavedust.enhanceddetection.true": "Enhanced detection: Enabled",
|
||||||
@@ -28,8 +32,6 @@
|
|||||||
"menu.cavedust.superflatstatus.true": "Superflat particles: Enabled",
|
"menu.cavedust.superflatstatus.true": "Superflat particles: Enabled",
|
||||||
"menu.cavedust.superflatstatus.false": "Superflat particles: Disabled",
|
"menu.cavedust.superflatstatus.false": "Superflat particles: Disabled",
|
||||||
"menu.cavedust.superflatstatus.tooltip": "Should particles spawn on superflat worlds?",
|
"menu.cavedust.superflatstatus.tooltip": "Should particles spawn on superflat worlds?",
|
||||||
"menu.cavedust.particle": "Particle: ",
|
|
||||||
"menu.cavedust.particle.tooltip": "Particle to spawn. Click to cycle.",
|
|
||||||
|
|
||||||
"key.cavedust.reload": "Reload Config",
|
"key.cavedust.reload": "Reload Config",
|
||||||
"key.cavedust.toggle": "Toggle Particles",
|
"key.cavedust.toggle": "Toggle Particles",
|
||||||
|
|||||||
@@ -4,8 +4,7 @@
|
|||||||
"package": "net.lizistired.cavedust.mixin",
|
"package": "net.lizistired.cavedust.mixin",
|
||||||
"compatibilityLevel": "JAVA_16",
|
"compatibilityLevel": "JAVA_16",
|
||||||
"mixins": [
|
"mixins": [
|
||||||
"ClientWorldAccessor",
|
"ClientWorldAccessor"
|
||||||
"MixinDebugScreenOverlay"
|
|
||||||
],
|
],
|
||||||
"client": [
|
"client": [
|
||||||
],
|
],
|
||||||
|
|||||||
@@ -28,7 +28,7 @@
|
|||||||
"depends": {
|
"depends": {
|
||||||
"fabricloader": ">=0.14.5",
|
"fabricloader": ">=0.14.5",
|
||||||
"fabric": "*",
|
"fabric": "*",
|
||||||
"minecraft": "1.19.4",
|
"minecraft": ">=1.19-beta.5",
|
||||||
"java": ">=17"
|
"java": ">=17"
|
||||||
},
|
},
|
||||||
"suggests": {
|
"suggests": {
|
||||||
|
|||||||
Reference in New Issue
Block a user