update to 1.19-pre1
-update mappings -bump fabric.mod.json versions -change `new TranslatableText` to `Text.translatable` -change isBedWorking to bedWorking
This commit is contained in:
@@ -3,9 +3,9 @@ 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.18.2
|
minecraft_version=1.19-pre1
|
||||||
yarn_mappings=1.18.2+build.1
|
yarn_mappings=1.19-pre1+build.1
|
||||||
loader_version=0.12.11
|
loader_version=0.14.5
|
||||||
|
|
||||||
# Mod Properties
|
# Mod Properties
|
||||||
mod_version = 1.2.0
|
mod_version = 1.2.0
|
||||||
@@ -13,8 +13,8 @@ org.gradle.jvmargs=-Xmx1G
|
|||||||
archives_base_name = cave_dust
|
archives_base_name = cave_dust
|
||||||
|
|
||||||
# Dependencies
|
# Dependencies
|
||||||
fabric_version=0.47.8+1.18.2
|
fabric_version=0.52.4+1.19
|
||||||
clothconfig_version = 6.1.48
|
clothconfig_version = 6.1.48
|
||||||
modmenu_version = 3.0.1
|
modmenu_version = 4.0.0-beta.4
|
||||||
minelp_version=4.4.0-beta.2
|
minelp_version=4.4.0-beta.2
|
||||||
kirin_version=1.10.0-beta.2
|
kirin_version=1.10.0-beta.2
|
||||||
|
|||||||
@@ -1,10 +1,8 @@
|
|||||||
package net.lizistired.cavedust;
|
package net.lizistired.cavedust;
|
||||||
|
|
||||||
//minecraft imports
|
//minecraft imports
|
||||||
import net.lizistired.cavedust.mixin.ClientWorldAccessor;
|
|
||||||
import net.minecraft.client.MinecraftClient;
|
import net.minecraft.client.MinecraftClient;
|
||||||
import net.minecraft.text.Text;
|
import net.minecraft.text.Text;
|
||||||
import net.minecraft.text.TranslatableText;
|
|
||||||
import net.minecraft.util.Util;
|
import net.minecraft.util.Util;
|
||||||
import net.minecraft.util.math.BlockPos;
|
import net.minecraft.util.math.BlockPos;
|
||||||
import net.minecraft.world.World;
|
import net.minecraft.world.World;
|
||||||
@@ -15,6 +13,7 @@ import net.fabricmc.fabric.api.client.event.lifecycle.v1.ClientTickEvents;
|
|||||||
import org.slf4j.Logger;
|
import org.slf4j.Logger;
|
||||||
import org.slf4j.LoggerFactory;
|
import org.slf4j.LoggerFactory;
|
||||||
//java imports
|
//java imports
|
||||||
|
import java.awt.*;
|
||||||
import java.nio.file.Path;
|
import java.nio.file.Path;
|
||||||
//static imports
|
//static imports
|
||||||
import static net.lizistired.cavedust.utils.MathHelper.*;
|
import static net.lizistired.cavedust.utils.MathHelper.*;
|
||||||
@@ -25,7 +24,7 @@ import static net.lizistired.cavedust.utils.KeybindingHelper.*;
|
|||||||
|
|
||||||
public class CaveDust implements ClientModInitializer {
|
public class CaveDust implements ClientModInitializer {
|
||||||
//logger
|
//logger
|
||||||
public static final Logger LOGGER = LoggerFactory.getLogger("caveDust");
|
public static final Logger LOGGER = LoggerFactory.getLogger("cavedust");
|
||||||
//make class static
|
//make class static
|
||||||
private static CaveDust instance;
|
private static CaveDust instance;
|
||||||
public static CaveDust getInstance() {
|
public static CaveDust getInstance() {
|
||||||
@@ -57,12 +56,12 @@ public class CaveDust implements ClientModInitializer {
|
|||||||
if (keyBinding1.wasPressed()){
|
if (keyBinding1.wasPressed()){
|
||||||
getConfig().toggleCaveDust();
|
getConfig().toggleCaveDust();
|
||||||
LOGGER.info("Toggled dust");
|
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()){
|
if (keyBinding2.wasPressed()){
|
||||||
getConfig().load();
|
getConfig().load();
|
||||||
LOGGER.info("Reloaded config");
|
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
|
//ensure world is not null
|
||||||
|
|||||||
@@ -5,13 +5,13 @@ 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.text.TranslatableText;
|
import net.minecraft.text.Text;
|
||||||
|
|
||||||
import javax.annotation.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) {
|
||||||
super(new TranslatableText("menu.cavedust.title"), parent);
|
super(Text.translatable("menu.cavedust.title"), parent);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
@@ -20,85 +20,85 @@ public class ModMenuConfigScreen extends GameGui {
|
|||||||
int row = height / 4 + 14;
|
int row = height / 4 + 14;
|
||||||
|
|
||||||
CaveDustConfig config = CaveDust.getInstance().getConfig();
|
CaveDustConfig config = CaveDust.getInstance().getConfig();
|
||||||
TranslatableTextHelper transText = new TranslatableTextHelper();
|
TranslatableTextHelper transText = new TranslatableTextHelper();;
|
||||||
config.load();
|
config.load();
|
||||||
|
|
||||||
addButton(new Label(width / 2, 30)).setCentered().getStyle()
|
addButton(new Label(width / 2, 30)).setCentered().getStyle()
|
||||||
.setText(getTitle());
|
.setText(getTitle());
|
||||||
|
|
||||||
addButton(new Button(left, row += -60).onClick(sender -> {
|
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()
|
})).getStyle()
|
||||||
.setText("menu.cavedust.global." + config.getCaveDustEnabled())
|
.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 -> {
|
/*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()
|
})).getStyle()
|
||||||
.setText("menu.cavedust.enhanceddetection." + config.getEnhancedDetection())
|
.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 -> {
|
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()
|
})).getStyle()
|
||||||
.setText("menu.cavedust.superflatstatus." + config.getSuperFlatStatus())
|
.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()))
|
addButton(new Slider(left += -110, row += 24, -50, 0, config.getDimensionsMinX()))
|
||||||
.onChange(config::setDimensionsMinX)
|
.onChange(config::setDimensionsMinX)
|
||||||
.setTextFormat(transText::formatMinX)
|
.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()))
|
addButton(new Slider(left, row += 24, -50, 0, config.getDimensionsMinY()))
|
||||||
.onChange(config::setDimensionsMinY)
|
.onChange(config::setDimensionsMinY)
|
||||||
.setTextFormat(transText::formatMinY)
|
.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()))
|
addButton(new Slider(left, row += 24, -50, 0, config.getDimensionsMinZ()))
|
||||||
.onChange(config::setDimensionsMinZ)
|
.onChange(config::setDimensionsMinZ)
|
||||||
.setTextFormat(transText::formatMinZ)
|
.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()))
|
addButton(new Slider(left += 220, row += -48, 0, 50, config.getDimensionsMaxX()))
|
||||||
.onChange(config::setDimensionsMaxX)
|
.onChange(config::setDimensionsMaxX)
|
||||||
.setTextFormat(transText::formatMaxX)
|
.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()))
|
addButton(new Slider(left, row += 24, 0, 50, config.getDimensionsMaxY()))
|
||||||
.onChange(config::setDimensionsMaxY)
|
.onChange(config::setDimensionsMaxY)
|
||||||
.setTextFormat(transText::formatMaxY)
|
.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()))
|
addButton(new Slider(left, row += 24, 0, 50, config.getDimensionsMaxZ()))
|
||||||
.onChange(config::setDimensionsMaxZ)
|
.onChange(config::setDimensionsMaxZ)
|
||||||
.setTextFormat(transText::formatMaxZ)
|
.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()))
|
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(new TranslatableText("menu.cavedust.upperlimit.tooltip"));
|
.getStyle().setTooltip(Text.translatable("menu.cavedust.upperlimit.tooltip"));
|
||||||
|
|
||||||
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(new TranslatableText("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(new TranslatableText("menu.cavedust.particlemultiplier.tooltip"));
|
.getStyle().setTooltip(Text.translatable("menu.cavedust.particlemultiplier.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(new TranslatableText("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();
|
||||||
})).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)
|
addButton(new Button(left, row += 60)
|
||||||
.onClick(sender -> finish())).getStyle()
|
.onClick(sender -> finish())).getStyle()
|
||||||
|
|||||||
@@ -27,7 +27,7 @@ public class ParticleSpawnUtil {
|
|||||||
if (!config.getCaveDustEnabled()
|
if (!config.getCaveDustEnabled()
|
||||||
|| client.isPaused()
|
|| client.isPaused()
|
||||||
|| client.world == null
|
|| client.world == null
|
||||||
|| !client.world.getDimension().isBedWorking()
|
|| !client.world.getDimension().bedWorks()
|
||||||
|| Objects.requireNonNull(client.player).isSubmergedInWater()
|
|| Objects.requireNonNull(client.player).isSubmergedInWater()
|
||||||
|| client.world.getBiome(Objects.requireNonNull(client.player.getBlockPos())).matchesKey(LUSH_CAVES))
|
|| client.world.getBiome(Objects.requireNonNull(client.player.getBlockPos())).matchesKey(LUSH_CAVES))
|
||||||
{
|
{
|
||||||
@@ -66,7 +66,7 @@ public class ParticleSpawnUtil {
|
|||||||
if (!config.getCaveDustEnabled()
|
if (!config.getCaveDustEnabled()
|
||||||
|| client.isPaused()
|
|| client.isPaused()
|
||||||
|| client.world == null
|
|| client.world == null
|
||||||
|| !client.world.getDimension().isBedWorking()
|
|| !client.world.getDimension().bedWorks()
|
||||||
|| Objects.requireNonNull(client.player).isSubmergedInWater()
|
|| Objects.requireNonNull(client.player).isSubmergedInWater()
|
||||||
|| client.world.getBiome(Objects.requireNonNull(pos)).matchesKey(LUSH_CAVES))
|
|| client.world.getBiome(Objects.requireNonNull(pos)).matchesKey(LUSH_CAVES))
|
||||||
|
|
||||||
|
|||||||
@@ -2,37 +2,36 @@ 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 net.minecraft.text.TranslatableText;
|
|
||||||
|
|
||||||
public class TranslatableTextHelper {
|
public class TranslatableTextHelper {
|
||||||
public Text formatMinX(AbstractSlider<Float> slider) {
|
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) {
|
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) {
|
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) {
|
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) {
|
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) {
|
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) {
|
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) {
|
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) {
|
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) {
|
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()));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -26,9 +26,9 @@
|
|||||||
"dust.mixins.json"
|
"dust.mixins.json"
|
||||||
],
|
],
|
||||||
"depends": {
|
"depends": {
|
||||||
"fabricloader": ">=0.12.11",
|
"fabricloader": ">=0.14.5",
|
||||||
"fabric": "*",
|
"fabric": "*",
|
||||||
"minecraft": "1.18.2",
|
"minecraft": ">=1.19-beta.1",
|
||||||
"java": ">=17"
|
"java": ">=17"
|
||||||
},
|
},
|
||||||
"suggests": {
|
"suggests": {
|
||||||
|
|||||||
Reference in New Issue
Block a user