config gui rewrite

.gitignore

@@ -108,6 +108,7 @@ gradle-app.setting
 
 # Cache of project
 .gradletasknamecache
+**/.kotlin/*
 
 **/build/
 

build.gradle.kts

@@ -9,7 +9,6 @@ plugins {
 	`maven-publish`
 	checkstyle
 	alias(libs.plugins.fabric.loom)
-	alias(libs.plugins.spotless)
 }
 
 class ModInfo {
@@ -28,7 +27,6 @@ allprojects {
 	plugins.apply("java-library")
 	plugins.apply("checkstyle")
 	plugins.apply("fabric-loom")
-	plugins.apply("com.diffplug.spotless")
 
 	tasks.withType<GenerateModuleMetadata>().configureEach {
 		enabled = false
@@ -128,23 +126,6 @@ allprojects {
 		filesMatching("fabric.mod.json") { expand(map) }
 	}
 
-	spotless {
-		lineEndings = com.diffplug.spotless.LineEnding.UNIX
-
-		java {
-			removeUnusedImports()
-			importOrder("java", "javax", "", "net.minecraft", "net.fabricmc", "dev.spiritstudios")
-			leadingSpacesToTabs()
-			trimTrailingWhitespace()
-		}
-
-		json {
-			target("src/**/lang/*.json")
-			targetExclude("src/**/generated/**")
-			gson().indentWithSpaces(4).sortByKeys()
-		}
-	}
-
 	checkstyle {
 		configFile = rootProject.file("checkstyle.xml")
 	}

gradle/libs.versions.toml

@@ -1,12 +1,12 @@
 [versions]
-fabric_loom = "1.10-SNAPSHOT"
+fabric_loom = "1.11-SNAPSHOT"
 spotless = "7.0.3"
 
 minecraft = "1.21.5"
 yarn = "1.21.5+build.1"
 
 fabric_loader = "0.16.14"
-fabric_api = "0.124.0+1.21.5"
+fabric_api = "0.128.1+1.21.5"
 
 nightconfig = "3.8.1"
 modmenu = "14.0.0-rc.2"

gradle/wrapper/gradle-wrapper.properties

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

specter-block/src/main/java/dev/spiritstudios/specter/api/block/FlammableBlockData.java

@@ -2,20 +2,21 @@
 
 import com.mojang.serialization.Codec;
 import com.mojang.serialization.codecs.RecordCodecBuilder;
-import net.fabricmc.fabric.api.registry.FlammableBlockRegistry;
 import org.jetbrains.annotations.Range;
 
 import net.minecraft.network.RegistryByteBuf;
 import net.minecraft.network.codec.PacketCodec;
 import net.minecraft.network.codec.PacketCodecs;
 
+import net.fabricmc.fabric.api.registry.FlammableBlockRegistry;
+
 /**
  * The flammability data of a block.
  *
  * @see BlockMetatags#FLAMMABLE
  */
 public record FlammableBlockData(@Range(from = 0, to = Integer.MAX_VALUE) int burn,
-								 @Range(from = 0, to = Integer.MAX_VALUE) int spread) {
+								@Range(from = 0, to = Integer.MAX_VALUE) int spread) {
 	public static final Codec<FlammableBlockData> CODEC = RecordCodecBuilder.create(instance -> instance
 			.group(
 					Codec.intRange(0, Integer.MAX_VALUE).fieldOf("burn").forGetter(FlammableBlockData::burn),

specter-block/src/testmod/java/dev/spiritstudios/testmod/block/SpecterBlockGameTest.java

@@ -1,7 +1,5 @@
 package dev.spiritstudios.testmod.block;
 
-import net.fabricmc.fabric.api.gametest.v1.GameTest;
-
 import net.minecraft.block.Blocks;
 import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.item.ItemStack;
@@ -11,6 +9,8 @@
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.GameMode;
 
+import net.fabricmc.fabric.api.gametest.v1.GameTest;
+
 @SuppressWarnings("unused")
 public final class SpecterBlockGameTest {
 	@GameTest

specter-config/src/client/java/dev/spiritstudios/specter/api/config/client/ConfigScreen.java

@@ -3,32 +3,25 @@
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;
-import java.util.function.BiFunction;
 
 import net.minecraft.client.gui.DrawContext;
 import net.minecraft.client.gui.screen.Screen;
-import net.minecraft.client.gui.tooltip.Tooltip;
 import net.minecraft.client.gui.widget.ButtonWidget;
 import net.minecraft.client.gui.widget.ClickableWidget;
 import net.minecraft.screen.ScreenTexts;
 import net.minecraft.text.Text;
 
 import dev.spiritstudios.specter.api.config.Config;
-import dev.spiritstudios.specter.api.config.Value;
-import dev.spiritstudios.specter.api.core.SpecterGlobals;
-import dev.spiritstudios.specter.api.core.reflect.ReflectionHelper;
-import dev.spiritstudios.specter.impl.config.NestedConfigValue;
-import dev.spiritstudios.specter.impl.config.client.NestedConfigScreen;
 import dev.spiritstudios.specter.impl.config.client.gui.widget.OptionsScrollableWidget;
 
 public abstract class ConfigScreen extends Screen {
 	private static final Text MULTIPLAYER_SYNC_ERROR = Text.translatable("screen.specter.config.multiplayer_sync_error");
 
-	protected final Config<?> config;
+	protected final Config config;
 	protected final Screen parent;
 	protected final String id;
 
-	public ConfigScreen(Config<?> config, String id, Screen parent) {
+	public ConfigScreen(Config config, String id, Screen parent) {
 		super(Text.translatable("config.%s.title".formatted(id)));
 		this.config = config;
 		this.parent = parent;
@@ -43,56 +36,44 @@ protected void init() {
 
 		OptionsScrollableWidget scrollableWidget = new OptionsScrollableWidget(this.client, this.width, this.height - 64, 32, 25);
 
-		List<ReflectionHelper.FieldValuePair<Value<?>>> values = config.fields();
-
-		if (this.client.player != null && !this.client.isInSingleplayer()) {
-			for (ReflectionHelper.FieldValuePair<Value<?>> pair : values) {
-				if (!pair.value().sync()) continue;
-
-				this.client.player.sendMessage(MULTIPLAYER_SYNC_ERROR, false);
-				this.client.setScreen(this.parent);
-
-				return;
-			}
-		}
-
 		List<ClickableWidget> options = new ArrayList<>();
 
-		values.forEach(pair -> {
-			if (pair.value() instanceof NestedConfigValue<?> nestedOption) {
-				String nestedId = "%s.%s".formatted(id, pair.value().name());
-				ConfigScreen screen = new NestedConfigScreen(nestedOption.get(), nestedId, this);
-
-				options.add(
-						ButtonWidget.builder(
-								Text.translatable("config.%s.title".formatted(nestedId)),
-								button -> {
-									save();
-									this.client.setScreen(screen);
-								}
-						).dimensions(this.width / 2 - 100, 0, 200, 20).build()
-				);
-
-				return;
-			}
-
-			BiFunction<Value<?>, String, ? extends ClickableWidget> factory = ConfigScreenWidgets.getWidgetFactory(pair.value());
-			if (factory == null) {
-				SpecterGlobals.LOGGER.warn("No widget factory found for {}", pair.value().defaultValue().getClass().getSimpleName());
-				return;
-			}
-
-			ClickableWidget widget = factory.apply(pair.value(), id);
-			if (widget == null)
-				throw new IllegalStateException("Widget factory returned null for %s".formatted(pair.value().defaultValue().getClass().getSimpleName()));
-
-			widget.setWidth(0);
-			widget.setHeight(20);
-
-			Text tooltip = Text.translatableWithFallback("%s.tooltip".formatted(pair.value().translationKey(id)), "");
-			if (!tooltip.getString().isEmpty()) widget.setTooltip(Tooltip.of(tooltip));
-
-			options.add(widget);
+		config.values().forEach((key, value) -> {
+//			if (value instanceof Ne<?> nestedOption) {
+//				String nestedId = "%s.%s".formatted(id, pair.value().name());
+//				ConfigScreen screen = new NestedConfigScreen(nestedOption.get(), nestedId, this);
+//
+//				options.add(
+//						ButtonWidget.builder(
+//								Text.translatable("config.%s.title".formatted(nestedId)),
+//								button -> {
+//									save();
+//									this.client.setScreen(screen);
+//								}
+//						).dimensions(this.width / 2 - 100, 0, 200, 20).build()
+//				);
+//
+//				return;
+//			}
+
+//			BiFunction<Value<?>, String, ? extends ClickableWidget> factory = ConfigScreenWidgets.getWidgetFactory(value);
+//			if (factory == null) {
+//				SpecterGlobals.LOGGER.warn("No widget factory found for {}", value.defaultValue().getClass().getSimpleName());
+//				return;
+//			}
+//
+//			ClickableWidget widget = factory.apply(value, id);
+//			if (widget == null)
+//				throw new IllegalStateException("Widget factory returned null for %s".formatted(value.defaultValue().getClass().getSimpleName()));
+//
+//			widget.setWidth(0);
+//			widget.setHeight(20);
+//
+//			Text tooltip = Text.translatableWithFallback("%s.tooltip"
+//					.formatted(Value.translationKey(key, id)), "");
+//			if (!tooltip.getString().isEmpty()) widget.setTooltip(Tooltip.of(tooltip));
+//
+//			options.add(widget);
 		});
 
 		scrollableWidget.addOptions(options);