DekinDev/Cave_Dust_Reforged
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 3 Activity

break config, but now works in 1.21.3

Browse Source
This commit is contained in:
Rain Graham
2024-11-05 15:31:44 +00:00
parent 99ffeb1f99
commit 4b4b2ad206
9 changed files with 70 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
build.gradle
View File

@@ -1,11 +1,8 @@
plugins { plugins {
id 'fabric-loom' version '1.7-SNAPSHOT' id 'fabric-loom' version '1.8-SNAPSHOT'
id 'maven-publish' id 'maven-publish'
} }
sourceCompatibility = JavaVersion.VERSION_17
targetCompatibility = JavaVersion.VERSION_17
archivesBaseName = project.archives_base_name archivesBaseName = project.archives_base_name
version = project.mod_version version = project.mod_version
group = project.maven_group group = project.maven_group
@@ -61,7 +58,7 @@ processResources {
tasks.withType(JavaCompile).configureEach { tasks.withType(JavaCompile).configureEach {
// Minecraft 1.18 (1.18-pre2) upwards uses Java 17. // Minecraft 1.18 (1.18-pre2) upwards uses Java 17.
it.options.release = 17 it.options.release = 21
} }
java { java {
@@ -69,6 +66,8 @@ java {
// if it is present. // if it is present.
// If you remove this line, sources will not be generated. // If you remove this line, sources will not be generated.
withSourcesJar() withSourcesJar()
sourceCompatibility = JavaVersion.VERSION_21
targetCompatibility = JavaVersion.VERSION_21
} }
jar { jar {

14
gradle.properties
View File

@@ -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.21 minecraft_version=1.21.3
yarn_mappings=1.21+build.4 yarn_mappings=1.21.3+build.2
loader_version=0.15.11 loader_version=0.16.9
# Mod Properties # Mod Properties
mod_version=3.0.0 mod_version=3.0.0
@@ -13,7 +13,7 @@ org.gradle.jvmargs=-Xmx1G
archives_base_name=cave_dust archives_base_name=cave_dust
# Dependencies # Dependencies
fabric_version=0.100.4+1.21 fabric_version=0.107.0+1.21.3
clothconfig_version=15.0.127 clothconfig_version=16.0.141
modmenu_version=11.0.1 modmenu_version=12.0.0-beta.1
kirin_version=1.19.0+1.21 kirin_version=1.19.1+1.21

2
gradle/wrapper/gradle-wrapper.properties vendored
View File

@@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip distributionUrl=https\://services.gradle.org/distributions/gradle-8.10-bin.zip
networkTimeout=10000 networkTimeout=10000
validateDistributionUrl=true validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME

2
gradlew vendored
View File

@@ -55,7 +55,7 @@
# Darwin, MinGW, and NonStop. # Darwin, MinGW, and NonStop.
# #
# (3) This script is generated from the Groovy template # (3) This script is generated from the Groovy template
# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt # https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
# within the Gradle project. # within the Gradle project.
# #
# You can find Gradle at https://github.com/gradle/gradle/. # You can find Gradle at https://github.com/gradle/gradle/.

6
src/main/java/net/lizistired/cavedust/CaveDust.java
View File

@@ -4,6 +4,7 @@ package net.lizistired.cavedust;
import net.fabricmc.fabric.api.client.particle.v1.ParticleFactoryRegistry; import net.fabricmc.fabric.api.client.particle.v1.ParticleFactoryRegistry;
import net.minecraft.client.MinecraftClient; import net.minecraft.client.MinecraftClient;
import net.minecraft.registry.Registries; import net.minecraft.registry.Registries;
import net.minecraft.registry.Registry;
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;
@@ -90,12 +91,15 @@ public class CaveDust implements ClientModInitializer {
if (shouldParticlesSpawn(client, config, particlePos)) { if (shouldParticlesSpawn(client, config, particlePos)) {
if (client.world.getBlockState(particlePos).isAir()) { if (client.world.getBlockState(particlePos).isAir()) {
world.addParticle(config.getParticle(), miniX, miniY, miniZ, config.getVelocityRandomnessRandom() * 0.01, config.getVelocityRandomnessRandom() * 0.01, config.getVelocityRandomnessRandom() * 0.01); //todo
//world.addParticle(config.getParticle(), miniX, miniY, miniZ, config.getVelocityRandomnessRandom() * 0.01, config.getVelocityRandomnessRandom() * 0.01, config.getVelocityRandomnessRandom() * 0.01);
world.addParticle(CaveDustServer.CAVE_DUST, miniX, miniY, miniZ, config.getVelocityRandomnessRandom() * 0.01, config.getVelocityRandomnessRandom() * 0.01, config.getVelocityRandomnessRandom() * 0.01);
} }
} }
} }
catch (NullPointerException e) { catch (NullPointerException e) {
LOGGER.error(String.valueOf(e)); LOGGER.error(String.valueOf(e));
//todo
//getConfig().setParticleID(WHITE_ASH_ID); //getConfig().setParticleID(WHITE_ASH_ID);
} }
} }

65
src/main/java/net/lizistired/cavedust/CaveDustConfig.java
View File

@@ -3,8 +3,8 @@ package net.lizistired.cavedust;
import net.lizistired.cavedust.utils.JsonFile; import net.lizistired.cavedust.utils.JsonFile;
import net.minecraft.client.MinecraftClient; import net.minecraft.client.MinecraftClient;
import net.minecraft.particle.ParticleEffect; import net.minecraft.particle.ParticleEffect;
import net.minecraft.particle.ParticleTypes;
import net.minecraft.registry.Registries; import net.minecraft.registry.Registries;
import net.minecraft.registry.RegistryKey;
import net.minecraft.text.Text; import net.minecraft.text.Text;
import net.minecraft.util.Identifier; import net.minecraft.util.Identifier;
import static net.lizistired.cavedust.CaveDust.*; import static net.lizistired.cavedust.CaveDust.*;
@@ -122,23 +122,24 @@ public class CaveDustConfig extends JsonFile {
return caveDustEnabled; return caveDustEnabled;
} }
public ParticleEffect setParticle(String particleType){ //todo
//public Identifier setParticle(String particleType){
//particleName = particleType; //particleName = particleType;
save(); //save();
return getParticle(); //return getParticle().get().getKey().get().getValue();
} //}
public ParticleEffect getParticle(){ //public ParticleEffect getParticle(){
try { // try {
return (ParticleEffect) Registries.PARTICLE_TYPE.get(Identifier.of(Registries.PARTICLE_TYPE.getEntry(getParticleID()).get().getKey().get().getValue().toString().toLowerCase())); // return Registries.PARTICLE_TYPE.getOptional(Identifier.of(Registries.PARTICLE_TYPE.getOptional(getParticleID()).get().getKey().get().getValue().toString().toLowerCase()));
} catch (ClassCastException e) { // } catch (ClassCastException e) {
MinecraftClient.getInstance().player.sendMessage(Text.translatable("debug.cavedust.particleerror"), true); // MinecraftClient.getInstance().player.sendMessage(Text.translatable("debug.cavedust.particleerror"), true);
LOGGER.error("Cannot spawn particle, check config."); // LOGGER.error("Cannot spawn particle, check config.");
iterateParticle(); // iterateParticle();
save(); // save();
return getParticle(); // return getParticle();
} // }
} //}
public boolean getSeaLevelCheck() { public boolean getSeaLevelCheck() {
return seaLevelCheck; return seaLevelCheck;
@@ -175,27 +176,29 @@ public class CaveDustConfig extends JsonFile {
return getSuperFlatStatus(); return getSuperFlatStatus();
} }
public void iterateParticle(){ //todo
if(getParticleID() > Registries.PARTICLE_TYPE.size() - 2) { //public void iterateParticle(){
particleID = 1; // if(getParticleID() > Registries.PARTICLE_TYPE.size() - 2) {
save(); // particleID = 1;
} else { // save();
particleID = getParticleID() + 1; // } else {
save(); // particleID = getParticleID() + 1;
} // save();
} // }
//}
public void setParticleID(int particleID){ public void setParticleID(int particleID){
this.particleID = particleID; this.particleID = particleID;
save(); save();
} }
public int getParticleID(){ //todo
if ((!Registries.PARTICLE_TYPE.getEntry(particleID).isPresent())) { //public int getParticleID(){
setParticleID(WHITE_ASH_ID); // if ((!Registries.PARTICLE_TYPE.getValueOrThrow())) {
} // setParticleID(WHITE_ASH_ID);
return particleID; // }
} // return particleID;
//}
public void resetConfig(){ public void resetConfig(){
width = 10; width = 10;

30
src/main/java/net/lizistired/cavedust/ModMenuConfigScreen.java
View File

@@ -67,11 +67,12 @@ public class ModMenuConfigScreen extends GameGui {
.onChange(config::setParticleMultiplierMultiplier) .onChange(config::setParticleMultiplierMultiplier)
.setTextFormat(transText::formatParticleMultiplierMultiplier) .setTextFormat(transText::formatParticleMultiplierMultiplier)
.getStyle().setTooltip(Text.translatable("menu.cavedust.particlemultipliermultiplier.tooltip")); .getStyle().setTooltip(Text.translatable("menu.cavedust.particlemultipliermultiplier.tooltip"));
addButton(new Button(left, row += 24).onClick(sender ->{ //todo
config.iterateParticle(); //addButton(new Button(left, row += 24).onClick(sender ->{
sender.getStyle().setText("Particle: " + (getNameOfParticle())); // config.iterateParticle();
})).getStyle().setText("Particle: " + (getNameOfParticle())) // sender.getStyle().setText("Particle: " + (getNameOfParticle()));
.setTooltip(Text.translatable("menu.cavedust.particle.tooltip")); //})).getStyle().setText("Particle: " + (getNameOfParticle()))
// .setTooltip(Text.translatable("menu.cavedust.particle.tooltip"));
addButton(new Slider(left += 220, row -= 96, 1, 50, config.getDimensionWidth())) addButton(new Slider(left += 220, row -= 96, 1, 50, config.getDimensionWidth()))
.onChange(config::setDimensionWidth) .onChange(config::setDimensionWidth)
@@ -107,13 +108,14 @@ public class ModMenuConfigScreen extends GameGui {
renderBackground(context, mouseX, mouseY, partialTicks); renderBackground(context, mouseX, mouseY, partialTicks);
super.render(context, mouseX, mouseY, partialTicks); super.render(context, mouseX, mouseY, partialTicks);
} }
private String getNameOfParticle(){ //todo
CaveDustConfig config = CaveDust.getInstance().getConfig(); //private String getNameOfParticle(){
config.load(); // CaveDustConfig config = CaveDust.getInstance().getConfig();
try { // config.load();
return Registries.PARTICLE_TYPE.getEntry(config.getParticleID()).get().getKey().get().getValue().toString(); // try {
} catch (NoSuchElementException e){ // return Registries.PARTICLE_TYPE.getEntry(config.getParticleID()).get().getKey().get().getValue().toString();
return "null"; // } catch (NoSuchElementException e){
} // return "null";
} // }
//}
} }

2
src/main/java/net/lizistired/cavedust/utils/TranslatableTextHelper.java
View File

@@ -3,8 +3,6 @@ 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 formatMaxWidth(AbstractSlider<Float> slider) { public Text formatMaxWidth(AbstractSlider<Float> slider) {
return Text.translatable("menu.cavedust.width", (int)Math.floor(slider.getValue())); return Text.translatable("menu.cavedust.width", (int)Math.floor(slider.getValue()));

7
src/main/resources/fabric.mod.json
View File

@@ -19,10 +19,7 @@
"net.lizistired.cavedust.CaveDust" "net.lizistired.cavedust.CaveDust"
], ],
"main": [ "main": [
"net.lizistired.cavedust.CaveDustServer"], "net.lizistired.cavedust.CaveDustServer"]
"modmenu": [
"net.lizistired.cavedust.CaveDustModMenuFactory"
]
}, },
"mixins": [ "mixins": [
"dust.mixins.json" "dust.mixins.json"
@@ -30,7 +27,7 @@
"depends": { "depends": {
"fabricloader": ">=0.14.5", "fabricloader": ">=0.14.5",
"fabric": "*", "fabric": "*",
"minecraft": "1.21", "minecraft": "1.21.3",
"java": ">=17" "java": ">=17"
}, },
"suggests": { "suggests": {