remove redundant functions for negative bounds
This commit is contained in:
@@ -2,6 +2,7 @@ package net.lizistired.cavedust;
|
|||||||
|
|
||||||
//minecraft imports
|
//minecraft imports
|
||||||
import net.minecraft.client.MinecraftClient;
|
import net.minecraft.client.MinecraftClient;
|
||||||
|
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;
|
||||||
@@ -71,9 +72,9 @@ public class CaveDust implements ClientModInitializer {
|
|||||||
|
|
||||||
for (int i = 0; i < probabilityNormalized * config.getParticleMultiplier() * 10; i++) {
|
for (int i = 0; i < probabilityNormalized * config.getParticleMultiplier() * 10; i++) {
|
||||||
try {
|
try {
|
||||||
double x = client.player.getPos().getX() + generateRandomDouble(config.getDimensionsMinX(), config.getDimensionsMaxX());
|
double x = client.player.getPos().getX() + generateRandomDouble(-config.getDimensionsX(), config.getDimensionsX());
|
||||||
double y = client.player.getPos().getY() + generateRandomDouble(config.getDimensionsMinX(), config.getDimensionsMaxY());
|
double y = client.player.getPos().getY() + generateRandomDouble(-config.getDimensionsY(), config.getDimensionsY());
|
||||||
double z = client.player.getPos().getZ() + generateRandomDouble(config.getDimensionsMinX(), config.getDimensionsMaxZ());
|
double z = client.player.getPos().getZ() + generateRandomDouble(-config.getDimensionsZ(), config.getDimensionsZ());
|
||||||
BlockPos particlePos = new BlockPos(x, y, z);
|
BlockPos particlePos = new BlockPos(x, y, z);
|
||||||
|
|
||||||
if (!shouldParticlesSpawn(client, config, particlePos)){return;}
|
if (!shouldParticlesSpawn(client, config, particlePos)){return;}
|
||||||
|
|||||||
@@ -36,78 +36,42 @@ public class CaveDustConfig extends JsonFile {
|
|||||||
this.CaveDust = caveDust;
|
this.CaveDust = caveDust;
|
||||||
}
|
}
|
||||||
|
|
||||||
public float setDimensionsMinX(float size){
|
public float setDimensionsX(float size){
|
||||||
if (this.dimensionMinX != size) {
|
if (this.dimensionMinX != size) {
|
||||||
this.dimensionMinX = (int)size;
|
this.dimensionMinX = (int)size;
|
||||||
save();
|
save();
|
||||||
}
|
}
|
||||||
return getDimensionsMinX();
|
return getDimensionsX();
|
||||||
}
|
}
|
||||||
|
|
||||||
public float setDimensionsMinY(float size){
|
public float setDimensionsY(float size){
|
||||||
if (this.dimensionMinY != size) {
|
if (this.dimensionMinY != size) {
|
||||||
this.dimensionMinY = (int)size;
|
this.dimensionMinY = (int)size;
|
||||||
save();
|
save();
|
||||||
}
|
}
|
||||||
return getDimensionsMinY();
|
return getDimensionsY();
|
||||||
}
|
}
|
||||||
|
|
||||||
public float setDimensionsMinZ(float size){
|
public float setDimensionsZ(float size){
|
||||||
if (this.dimensionMinZ != size) {
|
if (this.dimensionMinZ != size) {
|
||||||
this.dimensionMinZ = (int)size;
|
this.dimensionMinZ = (int)size;
|
||||||
save();
|
save();
|
||||||
}
|
}
|
||||||
return getDimensionsMinZ();
|
return getDimensionsZ();
|
||||||
}
|
}
|
||||||
|
|
||||||
public float getDimensionsMinX(){
|
public float getDimensionsX(){
|
||||||
return dimensionMinX;
|
return dimensionMinX;
|
||||||
}
|
}
|
||||||
|
|
||||||
public float getDimensionsMinY(){
|
public float getDimensionsY(){
|
||||||
return dimensionMinY;
|
return dimensionMinY;
|
||||||
}
|
}
|
||||||
|
|
||||||
public float getDimensionsMinZ(){
|
public float getDimensionsZ(){
|
||||||
return dimensionMinZ;
|
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){
|
||||||
if (this.upperLimit - 1 < getLowerLimit())
|
if (this.upperLimit - 1 < getLowerLimit())
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -43,37 +43,23 @@ 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()))
|
addButton(new Slider(left, row += 48, 0, 50, config.getDimensionsX()))
|
||||||
.onChange(config::setDimensionsMinY)
|
.onChange(config::setDimensionsX)
|
||||||
.setTextFormat(transText::formatMinY)
|
|
||||||
.getStyle().setTooltip(Text.translatable("menu.cavedust.minY.tooltip"));
|
|
||||||
|
|
||||||
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)
|
.setTextFormat(transText::formatMaxX)
|
||||||
.getStyle().setTooltip(Text.translatable("menu.cavedust.maxX.tooltip"));
|
.getStyle().setTooltip(Text.translatable("menu.cavedust.X.tooltip"));
|
||||||
|
|
||||||
addButton(new Slider(left, row += 24, 0, 50, config.getDimensionsMaxY()))
|
addButton(new Slider(left, row += 24, 0, 50, config.getDimensionsY()))
|
||||||
.onChange(config::setDimensionsMaxY)
|
.onChange(config::setDimensionsY)
|
||||||
.setTextFormat(transText::formatMaxY)
|
.setTextFormat(transText::formatMaxY)
|
||||||
.getStyle().setTooltip(Text.translatable("menu.cavedust.maxY.tooltip"));
|
.getStyle().setTooltip(Text.translatable("menu.cavedust.Y.tooltip"));
|
||||||
|
|
||||||
addButton(new Slider(left, row += 24, 0, 50, config.getDimensionsMaxZ()))
|
addButton(new Slider(left, row += 24, 0, 50, config.getDimensionsZ()))
|
||||||
.onChange(config::setDimensionsMaxZ)
|
.onChange(config::setDimensionsZ)
|
||||||
.setTextFormat(transText::formatMaxZ)
|
.setTextFormat(transText::formatMaxZ)
|
||||||
.getStyle().setTooltip(Text.translatable("menu.cavedust.maxZ.tooltip"));
|
.getStyle().setTooltip(Text.translatable("menu.cavedust.Z.tooltip"));
|
||||||
|
|
||||||
addButton(new Slider(left += -110, row += 24, -64, 319, config.getUpperLimit()))
|
addButton(new Slider(left, 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"));
|
||||||
@@ -93,7 +79,6 @@ public class ModMenuConfigScreen extends GameGui {
|
|||||||
.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, row += 24).onClick(sender -> {
|
addButton(new Button(left, row += 24).onClick(sender -> {
|
||||||
config.resetConfig();
|
config.resetConfig();
|
||||||
finish();
|
finish();
|
||||||
@@ -102,6 +87,7 @@ public class ModMenuConfigScreen extends GameGui {
|
|||||||
addButton(new Button(left, row += 60)
|
addButton(new Button(left, row += 60)
|
||||||
.onClick(sender -> finish())).getStyle()
|
.onClick(sender -> finish())).getStyle()
|
||||||
.setText("gui.done");
|
.setText("gui.done");
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -4,23 +4,14 @@ import com.minelittlepony.common.client.gui.element.AbstractSlider;
|
|||||||
import net.minecraft.text.Text;
|
import net.minecraft.text.Text;
|
||||||
|
|
||||||
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.maxX", (int)Math.floor(slider.getValue()));
|
return Text.translatable("menu.cavedust.X", (int)Math.floor(slider.getValue()));
|
||||||
}
|
}
|
||||||
public Text formatMaxY(AbstractSlider<Float> slider) {
|
public Text formatMaxY(AbstractSlider<Float> slider) {
|
||||||
return Text.translatable("menu.cavedust.maxY", (int)Math.floor(slider.getValue()));
|
return Text.translatable("menu.cavedust.Y", (int)Math.floor(slider.getValue()));
|
||||||
}
|
}
|
||||||
public Text formatMaxZ(AbstractSlider<Float> slider) {
|
public Text formatMaxZ(AbstractSlider<Float> slider) {
|
||||||
return Text.translatable("menu.cavedust.maxZ", (int)Math.floor(slider.getValue()));
|
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()));
|
||||||
|
|||||||
@@ -4,20 +4,14 @@
|
|||||||
"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.minX": "Minimum X: %s",
|
"menu.cavedust.X": "X bounds: %s",
|
||||||
"menu.cavedust.minY": "Minimum Y: %s",
|
"menu.cavedust.Y": "Y bounds: %s",
|
||||||
"menu.cavedust.minZ": "Minimum Z: %s",
|
"menu.cavedust.Z": "Z bounds: %s",
|
||||||
"menu.cavedust.maxX": "Maximum X: %s",
|
"menu.cavedust.X.tooltip": "X axis bounds for particle spawning.",
|
||||||
"menu.cavedust.maxY": "Maximum Y: %s",
|
"menu.cavedust.Y.tooltip": "Y axis bounds for particle spawning.",
|
||||||
"menu.cavedust.maxZ": "Maximum Z: %s",
|
"menu.cavedust.Z.tooltip": "Z axis bounds for particle spawning.",
|
||||||
"menu.cavedust.minX.tooltip": "Minimum X: %s",
|
"menu.cavedust.upperlimit": "Upper limit height: %s",
|
||||||
"menu.cavedust.minY.tooltip": "Minimum Y: %s",
|
"menu.cavedust.lowerlimit": "Lower limit height: %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",
|
||||||
|
|||||||
Reference in New Issue
Block a user