Compare commits

...

15 Commits

Author SHA1 Message Date
Liz Graham
c0fa50c7c4 Update README.md 2023-06-21 02:49:21 +01:00
Liz Graham
a8c1ce20b0 Merge branch '1.18.2' into 1.19.2 2022-08-26 13:38:43 +01:00
Liz Graham
35dd3e057c reduce size of icon image by 51% 2022-08-14 02:19:14 +01:00
Liz Graham
ab9ed3df3e reduce size of icon image by 51% 2022-08-14 02:19:08 +01:00
Liz Graham
008d3dda86 update to 1.19.2 2022-08-14 02:03:48 +01:00
Liz Graham
ec3767bc98 Merge branch '1.18.2' into 1.19 2022-06-01 20:09:29 +01:00
Liz Graham
059af3ea45 update license 2022-06-01 20:09:12 +01:00
Liz Graham
785d04f922 update license 2022-06-01 19:56:52 +01:00
Liz Graham
f375d1f6e1 Merge branch '1.18' into 1.19 2022-06-01 19:54:19 +01:00
Liz Graham
39da57ee43 none of this is needed lol 2022-06-01 19:49:48 +01:00
Liz Graham
8bc4805db0 update fabric-loom to 0.12 2022-06-01 19:44:40 +01:00
Liz Graham
b1b578cdbc update to 1.19-pre5 2022-06-01 19:44:18 +01:00
Liz Graham
90a10ce8a6 add backupsrc to .gitignore 2022-06-01 19:30:52 +01:00
Liz Graham
056a251a70 update to 1.19-pre1
-update mappings
-bump fabric.mod.json versions
-change `new TranslatableText` to `Text.translatable`
-change isBedWorking to bedWorking
2022-05-19 20:47:37 +01:00
Liz Graham
809846cfcf update license 2022-03-26 01:27:29 +00:00
13 changed files with 51 additions and 83 deletions

1
.gitignore vendored
View File

@@ -31,3 +31,4 @@ bin/
# fabric
run/
BackupSrc/

View File

@@ -6,7 +6,7 @@ I'm glad you asked! It's just a mod that adds the white ash particle from the Ba
Now to the nitty gritty:
It works by checking if the player has the sky above them while being below sea level and then scales the amount of particles based on depth.
<br><br>It has a config system that you can access using Mod Menu, most things you can change in-game, but to change the particle you'll need to open the config file manually :)
<br><br>It has a config system that you can access using Mod Menu.
<br>
## Dependencies
Cave Dust requires the [Fabric API](https://www.curseforge.com/minecraft/mc-mods/fabric-api) but everything else Cave Dust *needs* is included.

View File

@@ -1,5 +1,5 @@
plugins {
id 'fabric-loom' version '0.11-SNAPSHOT'
id 'fabric-loom' version '0.12-SNAPSHOT'
id 'maven-publish'
}

View File

@@ -3,9 +3,9 @@ org.gradle.jvmargs=-Xmx1G
# Fabric Properties
# check these on https://fabricmc.net/develop
minecraft_version=1.18.2
yarn_mappings=1.18.2+build.1
loader_version=0.12.11
minecraft_version=1.19.2
yarn_mappings=1.19.2+build.4
loader_version=0.14.9
# Mod Properties
mod_version = 1.2.0
@@ -13,8 +13,7 @@ org.gradle.jvmargs=-Xmx1G
archives_base_name = cave_dust
# Dependencies
fabric_version=0.47.8+1.18.2
clothconfig_version = 6.1.48
modmenu_version = 3.0.1
minelp_version=4.4.0-beta.2
kirin_version=1.10.0-beta.2
fabric_version=0.59.0+1.19.2
clothconfig_version = 8.0.75
modmenu_version = 4.0.6
kirin_version=1.11.1-beta.1

View File

@@ -1,11 +1,8 @@
package net.lizistired.cavedust;
//minecraft imports
import net.lizistired.cavedust.mixin.ClientWorldAccessor;
import net.minecraft.client.MinecraftClient;
import net.minecraft.text.Text;
import net.minecraft.text.TranslatableText;
import net.minecraft.util.Util;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.World;
//other imports
@@ -25,7 +22,7 @@ import static net.lizistired.cavedust.utils.KeybindingHelper.*;
public class CaveDust implements ClientModInitializer {
//logger
public static final Logger LOGGER = LoggerFactory.getLogger("caveDust");
public static final Logger LOGGER = LoggerFactory.getLogger("cavedust");
//make class static
private static CaveDust instance;
public static CaveDust getInstance() {
@@ -35,8 +32,8 @@ public class CaveDust implements ClientModInitializer {
instance = this;
}
//config assignment
private static CaveDustConfig config;
public CaveDustConfig getConfig() {
private static net.lizistired.cavedust.CaveDustConfig config;
public net.lizistired.cavedust.CaveDustConfig getConfig() {
return config;
}
@@ -57,12 +54,12 @@ public class CaveDust implements ClientModInitializer {
if (keyBinding1.wasPressed()){
getConfig().toggleCaveDust();
LOGGER.info("Toggled dust");
client.player.sendSystemMessage(new TranslatableText("debug.cavedust.toggle." + config.getCaveDustEnabled()), Util.NIL_UUID);
client.player.sendMessage(Text.translatable("debug.cavedust.toggle." + config.getCaveDustEnabled()), false);
}
if (keyBinding2.wasPressed()){
getConfig().load();
LOGGER.info("Reloaded config");
client.player.sendSystemMessage(new TranslatableText("debug.cavedust.reload"), Util.NIL_UUID);
client.player.sendMessage(Text.translatable("debug.cavedust.reload"), false);
}
//ensure world is not null

View File

@@ -11,7 +11,7 @@ import static net.lizistired.cavedust.utils.MathHelper.*;
import java.nio.file.Path;
public class CaveDustConfig extends JsonFile {
private transient final CaveDust CaveDust;
private transient final net.lizistired.cavedust.CaveDust CaveDust;
private int dimensionMaxX = 5;
@@ -31,7 +31,7 @@ public class CaveDustConfig extends JsonFile {
private float lowerLimit = -64;
private int particleMultiplier = 1;
public CaveDustConfig(Path file, CaveDust caveDust) {
public CaveDustConfig(Path file, net.lizistired.cavedust.CaveDust caveDust) {
super(file);
this.CaveDust = caveDust;
}

View File

@@ -5,13 +5,13 @@ import com.minelittlepony.common.client.gui.element.*;
import net.lizistired.cavedust.utils.TranslatableTextHelper;
import net.minecraft.client.gui.screen.Screen;
import net.minecraft.client.util.math.MatrixStack;
import net.minecraft.text.TranslatableText;
import net.minecraft.text.Text;
import javax.annotation.Nullable;
public class ModMenuConfigScreen extends GameGui {
public ModMenuConfigScreen(@Nullable Screen parent) {
super(new TranslatableText("menu.cavedust.title"), parent);
super(Text.translatable("menu.cavedust.title"), parent);
}
@Override
@@ -20,85 +20,85 @@ public class ModMenuConfigScreen extends GameGui {
int row = height / 4 + 14;
CaveDustConfig config = CaveDust.getInstance().getConfig();
TranslatableTextHelper transText = new TranslatableTextHelper();
TranslatableTextHelper transText = new TranslatableTextHelper();;
config.load();
addButton(new Label(width / 2, 30)).setCentered().getStyle()
.setText(getTitle());
addButton(new Button(left, row += -60).onClick(sender -> {
sender.getStyle().setText("menu.cavedust.global." + config.toggleCaveDust()).setTooltip(new TranslatableText("menu.cavedust.global.tooltip." + config.getCaveDustEnabled()));
sender.getStyle().setText("menu.cavedust.global." + config.toggleCaveDust()).setTooltip(Text.translatable("menu.cavedust.global.tooltip." + config.getCaveDustEnabled()));
})).getStyle()
.setText("menu.cavedust.global." + config.getCaveDustEnabled())
.setTooltip(new TranslatableText("menu.cavedust.global.tooltip." + config.getCaveDustEnabled()));
.setTooltip(Text.translatable("menu.cavedust.global.tooltip." + config.getCaveDustEnabled()));
/*addButton(new Button(left, row += 24).onClick(sender -> {
sender.getStyle().setText("menu.cavedust.enhanceddetection." + config.setEnhancedDetection()).setTooltip(new TranslatableText("menu.cavedust.enhanceddetection.tooltip"));
sender.getStyle().setText("menu.cavedust.enhanceddetection." + config.setEnhancedDetection()).setTooltip(Text.translatable("menu.cavedust.enhanceddetection.tooltip"));
})).getStyle()
.setText("menu.cavedust.enhanceddetection." + config.getEnhancedDetection())
.setTooltip(new TranslatableText("menu.cavedust.enhanceddetection.tooltip"));*/
.setTooltip(Text.translatable("menu.cavedust.enhanceddetection.tooltip"));*/
addButton(new Button(left, row += 24).onClick(sender -> {
sender.getStyle().setText("menu.cavedust.superflatstatus." + config.setSuperFlatStatus()).setTooltip(new TranslatableText("menu.cavedust.superflatstatus.tooltip"));
sender.getStyle().setText("menu.cavedust.superflatstatus." + config.setSuperFlatStatus()).setTooltip(Text.translatable("menu.cavedust.superflatstatus.tooltip"));
})).getStyle()
.setText("menu.cavedust.superflatstatus." + config.getSuperFlatStatus())
.setTooltip(new TranslatableText("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(new TranslatableText("menu.cavedust.minX.tooltip"));
.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(new TranslatableText("menu.cavedust.minY.tooltip"));
.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(new TranslatableText("menu.cavedust.minZ.tooltip"));
.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(new TranslatableText("menu.cavedust.maxX.tooltip"));
.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(new TranslatableText("menu.cavedust.maxY.tooltip"));
.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(new TranslatableText("menu.cavedust.maxZ.tooltip"));
.getStyle().setTooltip(Text.translatable("menu.cavedust.maxZ.tooltip"));
addButton(new Slider(left += -110, row += 24, -64, 319, config.getUpperLimit()))
.onChange(config::setUpperLimit)
.setTextFormat(transText::formatUpperLimit)
.getStyle().setTooltip(new TranslatableText("menu.cavedust.upperlimit.tooltip"));
.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(new TranslatableText("menu.cavedust.lowerlimit.tooltip"));
.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(new TranslatableText("menu.cavedust.particlemultiplier.tooltip"));
.getStyle().setTooltip(Text.translatable("menu.cavedust.particlemultiplier.tooltip"));
addButton(new Slider(left, row += 24, 0, 10, config.getVelocityRandomness()))
.onChange(config::setVelocityRandomness)
.setTextFormat(transText::formatVelocityRandomness)
.getStyle().setTooltip(new TranslatableText("menu.cavedust.velocityrandomness.tooltip"));
.getStyle().setTooltip(Text.translatable("menu.cavedust.velocityrandomness.tooltip"));
addButton(new Button(left, row += 24).onClick(sender -> {
config.resetConfig();
finish();
})).getStyle().setText(new TranslatableText("menu.cavedust.reset")).setTooltip(new TranslatableText("menu.cavedust.reset.tooltip"));
})).getStyle().setText(Text.translatable("menu.cavedust.reset")).setTooltip(Text.translatable("menu.cavedust.reset.tooltip"));
addButton(new Button(left, row += 60)
.onClick(sender -> finish())).getStyle()

View File

@@ -1,42 +1,16 @@
package net.lizistired.cavedust.mixin;
import net.lizistired.cavedust.CaveDustConfig;
import net.minecraft.client.gui.hud.DebugHud;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.Shadow;
import org.spongepowered.asm.mixin.Unique;
import org.spongepowered.asm.mixin.injection.At;
import org.spongepowered.asm.mixin.injection.Inject;
import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
import java.lang.management.BufferPoolMXBean;
import java.lang.management.ManagementFactory;
import java.util.List;
import java.util.Objects;
import static net.lizistired.cavedust.utils.MathHelper.*;
import static net.lizistired.cavedust.utils.ParticleSpawnUtil.shouldParticlesSpawn;
@Mixin(DebugHud.class)
public abstract class MixinDebugScreenOverlay {
@Unique
private static final List<BufferPoolMXBean> pools = ManagementFactory.getPlatformMXBeans(BufferPoolMXBean.class);
@Unique
private static final BufferPoolMXBean directPool;
static {
BufferPoolMXBean found = null;
for (BufferPoolMXBean pool : pools) {
if (pool.getName().equals("direct")) {
found = pool;
break;
}
}
directPool = Objects.requireNonNull(found);
}
@Inject(method = "getRightText", at = @At("RETURN"))
private void appendShaderPackText(CallbackInfoReturnable<List<String>> cir) {
List<String> messages = cir.getReturnValue();

View File

@@ -2,7 +2,6 @@ package net.lizistired.cavedust.utils;
import net.fabricmc.fabric.api.client.keybinding.v1.KeyBindingHelper;
import net.minecraft.client.option.KeyBinding;
import net.minecraft.client.option.StickyKeyBinding;
import net.minecraft.client.util.InputUtil;
import org.lwjgl.glfw.GLFW;

View File

@@ -7,7 +7,6 @@ import net.minecraft.util.math.BlockPos;
import net.minecraft.world.World;
import java.util.Objects;
import java.util.Optional;
import static net.minecraft.world.biome.BiomeKeys.LUSH_CAVES;
@@ -27,7 +26,7 @@ public class ParticleSpawnUtil {
if (!config.getCaveDustEnabled()
|| client.isPaused()
|| client.world == null
|| !client.world.getDimension().isBedWorking()
|| !client.world.getDimension().bedWorks()
|| Objects.requireNonNull(client.player).isSubmergedInWater()
|| client.world.getBiome(Objects.requireNonNull(client.player.getBlockPos())).matchesKey(LUSH_CAVES))
{
@@ -66,7 +65,7 @@ public class ParticleSpawnUtil {
if (!config.getCaveDustEnabled()
|| client.isPaused()
|| client.world == null
|| !client.world.getDimension().isBedWorking()
|| !client.world.getDimension().bedWorks()
|| Objects.requireNonNull(client.player).isSubmergedInWater()
|| client.world.getBiome(Objects.requireNonNull(pos)).matchesKey(LUSH_CAVES))

View File

@@ -2,37 +2,36 @@ package net.lizistired.cavedust.utils;
import com.minelittlepony.common.client.gui.element.AbstractSlider;
import net.minecraft.text.Text;
import net.minecraft.text.TranslatableText;
public class TranslatableTextHelper {
public Text formatMinX(AbstractSlider<Float> slider) {
return new TranslatableText("menu.cavedust.minX", (int)Math.floor(slider.getValue()));
return Text.translatable("menu.cavedust.minX", (int)Math.floor(slider.getValue()));
}
public Text formatMinY(AbstractSlider<Float> slider) {
return new TranslatableText("menu.cavedust.minY", (int)Math.floor(slider.getValue()));
return Text.translatable("menu.cavedust.minY", (int)Math.floor(slider.getValue()));
}
public Text formatMinZ(AbstractSlider<Float> slider) {
return new TranslatableText("menu.cavedust.minZ", (int)Math.floor(slider.getValue()));
return Text.translatable("menu.cavedust.minZ", (int)Math.floor(slider.getValue()));
}
public Text formatMaxX(AbstractSlider<Float> slider) {
return new TranslatableText("menu.cavedust.maxX", (int)Math.floor(slider.getValue()));
return Text.translatable("menu.cavedust.maxX", (int)Math.floor(slider.getValue()));
}
public Text formatMaxY(AbstractSlider<Float> slider) {
return new TranslatableText("menu.cavedust.maxY", (int)Math.floor(slider.getValue()));
return Text.translatable("menu.cavedust.maxY", (int)Math.floor(slider.getValue()));
}
public Text formatMaxZ(AbstractSlider<Float> slider) {
return new TranslatableText("menu.cavedust.maxZ", (int)Math.floor(slider.getValue()));
return Text.translatable("menu.cavedust.maxZ", (int)Math.floor(slider.getValue()));
}
public Text formatUpperLimit(AbstractSlider<Float> slider) {
return new TranslatableText("menu.cavedust.upperlimit", (int)Math.floor(slider.getValue()));
return Text.translatable("menu.cavedust.upperlimit", (int)Math.floor(slider.getValue()));
}
public Text formatLowerLimit(AbstractSlider<Float> slider) {
return new TranslatableText("menu.cavedust.lowerlimit", (int)Math.floor(slider.getValue()));
return Text.translatable("menu.cavedust.lowerlimit", (int)Math.floor(slider.getValue()));
}
public Text formatParticleMultiplier(AbstractSlider<Float> slider) {
return new TranslatableText("menu.cavedust.particlemultiplier", (int)Math.floor(slider.getValue()));
return Text.translatable("menu.cavedust.particlemultiplier", (int)Math.floor(slider.getValue()));
}
public Text formatVelocityRandomness(AbstractSlider<Float> slider) {
return new TranslatableText("menu.cavedust.velocityrandomness", (int)Math.floor(slider.getValue()));
return Text.translatable("menu.cavedust.velocityrandomness", (int) Math.floor(slider.getValue()));
}
}

Binary file not shown.

Before

Width:  |  Height:  |  Size: 227 KiB

After

Width:  |  Height:  |  Size: 116 KiB

View File

@@ -26,9 +26,9 @@
"dust.mixins.json"
],
"depends": {
"fabricloader": ">=0.12.11",
"fabricloader": ">=0.14.5",
"fabric": "*",
"minecraft": "1.18.2",
"minecraft": ">=1.19-beta.5",
"java": ">=17"
},
"suggests": {