Merge pull request #387 from kr1viah/main

Update to 1.21.4 - 1.21.8

Author: mattbatwings

.github/workflows/gradle.yml

@@ -24,10 +24,10 @@ jobs:
         with:
           fetch-depth: 10
 
-      - name: Set up JDK 17
+      - name: Set up JDK 21
         uses: actions/setup-java@v4
         with:
-          java-version: 17
+          java-version: 21
           distribution: temurin
 
       - uses: actions/cache@v4

build.gradle

@@ -1,42 +1,64 @@
-//file:noinspection GroovyAssignabilityCheck
-
 plugins {
-	id 'fabric-loom' version '1.2-SNAPSHOT'
+	id 'fabric-loom' version '1.10-SNAPSHOT'
 	id 'maven-publish'
 	id 'com.github.johnrengelman.shadow' version '8.+'
 }
 
-sourceCompatibility = JavaVersion.VERSION_17
-targetCompatibility = JavaVersion.VERSION_17
-
-archivesBaseName = project.archives_base_name
 version = project.mod_version
 group = project.maven_group
 
+base {
+	archivesName = project.archives_base_name
+}
+
+loom {
+	splitEnvironmentSourceSets()
+
+	mods {
+		redstonetools {
+			sourceSet sourceSets.main
+			sourceSet sourceSets.client
+		}
+	}
+}
+
 repositories {
 	// Add repositories to retrieve artifacts from in here.
 	// You should only use this when depending on other mods because
 	// Loom adds the essential maven repositories to download Minecraft and libraries from automatically.
 	// See https://docs.gradle.org/current/userguide/declaring_repositories.html
 	// for more information about repositories.
+
+	maven { url "https://maven.shedaniel.me/" }
+	maven { url "https://maven.terraformersmc.com/releases/" }
+	maven { url 'https://masa.dy.fi/maven' }
+	exclusiveContent {
+		forRepository {
+			maven {
+				name = "Modrinth"
+				url = "https://api.modrinth.com/maven"
+			}
+		}
+		filter {
+			includeGroup "maven.modrinth"
+		}
+	}
 	maven {
-        name = "WorldEdit Maven"
-        url = "https://maven.enginehub.org/repo/"
-    }
+		name = "WorldEdit Maven"
+		url = "https://maven.enginehub.org/repo/"
+	}
 	maven {
 		name = "JitPack"
 		url = "https://jitpack.io"
 	}
 }
 
 dependencies {
-	// Doctor (dependency-injection)
-	include implementation("rip.hippo:Doctor:1.0.1")
 	include implementation("javax.inject:javax.inject:1")
 
 	// Json
 	include implementation("javax.json:javax.json-api:1.1.4")
-	include "org.glassfish:javax.json:1.1.4"
+	include implementation("org.glassfish:javax.json:1.1.4")
 
 	// AutoService
 	annotationProcessor implementation("com.google.auto.service:auto-service:1.1.0")
@@ -50,47 +72,62 @@ dependencies {
 	modImplementation("net.fabricmc.fabric-api:fabric-api:${project.fabric_version}")
 
 	// Worldedit API
-	modImplementation("com.sk89q.worldedit:worldedit-fabric-mc1.18.2:7.2.10")
+	modImplementation("com.sk89q.worldedit:worldedit-fabric-mc${project.worldedit_version}")
+	// MaLiLib
+	modApi "maven.modrinth:malilib:${project.malilib_version}"
 }
 
 processResources {
 	inputs.property "version", project.version
+	inputs.property "minecraft_version", project.minecraft_version
+	inputs.property "minecraft_version_out", project.minecraft_version_out
+	inputs.property "malilib_version", project.minecraft_version_out
+	inputs.property "loader_version", project.loader_version
+	filteringCharset "UTF-8"
 
 	filesMatching("fabric.mod.json") {
-		expand "version": project.version
+		expand  "version": project.version,
+				"minecraft_version": project.minecraft_version,
+				"minecraft_version_out": project.minecraft_version_out,
+				"malilib_version": project.minecraft_version_out,
+				"loader_version": project.loader_version
 	}
 }
 
-java {
-	withSourcesJar()
-	withJavadocJar()
-
-	toolchain {
-		languageVersion = JavaLanguageVersion.of(17)
+def targetJavaVersion = 21
+tasks.withType(JavaCompile).configureEach {
+	// ensure that the encoding is set to UTF-8, no matter what the system default is
+	// this fixes some edge cases with special characters not displaying correctly
+	// see http://yodaconditions.net/blog/fix-for-java-file-encoding-problems-with-gradle.html
+	// If Javadoc is generated, this must be specified in that task too.
+	it.options.encoding = "UTF-8"
+	if (targetJavaVersion >= 10 || JavaVersion.current().isJava10Compatible()) {
+		it.options.release.set(targetJavaVersion)
 	}
 }
 
-shadowJar {
-	archiveClassifier.set("unmapped")
-
-	configurations = [project.configurations.shadow]
-
-	from("LICENSE")
-}
-
-remapJar {
-	inputFile = shadowJar.archiveFile
+java {
+	def javaVersion = JavaVersion.toVersion(targetJavaVersion)
+	if (JavaVersion.current() < javaVersion) {
+		toolchain.languageVersion = JavaLanguageVersion.of(targetJavaVersion)
+	}
+	// Loom will automatically attach sourcesJar to a RemapSourcesJar task and to the "build" task
+	// if it is present.
+	// If you remove this line, sources will not be generated.
+	withSourcesJar()
 }
 
-tasks.withType(JavaCompile).configureEach {
-	// Minecraft 1.18 (1.18-pre2) upwards uses Java 17.
-	it.options.release.set(17)
+jar {
+	from("LICENSE") {
+		rename { "${it}_${project.archivesBaseName}" }
+	}
 }
 
 // configure the maven publication
 publishing {
 	publications {
-		mavenJava(MavenPublication) {
+		create("mavenJava", MavenPublication) {
+			artifactId = project.archives_base_name
 			from components.java
 		}
 	}

gradle.properties

@@ -1,17 +1,24 @@
 # Done to increase the memory available to gradle.
-org.gradle.jvmargs=-Xmx4G
+org.gradle.jvmargs=-Xmx8G
 org.gradle.parallel=true
 
-# Fabric Properties
-	# check these on https://fabricmc.net/develop
-	minecraft_version=1.18.2
-	yarn_mappings=1.18.2+build.4
-	loader_version=0.14.6
+maven_group = tools.redstone
+archives_base_name = redstonetools
 
-# Mod Properties
-	mod_version = 1.18.2-2.0.0
-	maven_group = tools.redstone
-	archives_base_name = redstonetools
+loader_version=0.16.10
+mod_version = 3.0.0
 
-# Dependencies
-	fabric_version=0.53.0+1.18.2
+minecraft_version=1.21.8
+minecraft_version_out=1.21.8
+yarn_mappings=1.21.8+build.1
+
+fabric_version=0.130.0+1.21.8
+malilib_version=0.25.4
+worldedit_version=1.21.7:7.3.15
+#minecraft_version=1.21.4
+#minecraft_version_out=1.21.4
+#yarn_mappings=1.21.4+build.8
+#
+#fabric_version=0.119.3+1.21.4
+#malilib_version=0.23.1
+#worldedit_version=1.21.4:7.3.10

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

src/client/java/tools/redstone/redstonetools/ClientCommands.java

@@ -0,0 +1,23 @@
+package tools.redstone.redstonetools;
+
+import tools.redstone.redstonetools.features.commands.BaseConvertFeature;
+import tools.redstone.redstonetools.features.commands.EditMacroFeature;
+import tools.redstone.redstonetools.features.commands.MacroFeature;
+import tools.redstone.redstonetools.features.commands.ReachFeature;
+import tools.redstone.redstonetools.features.toggleable.*;
+
+public class ClientCommands {
+	public static void registerCommands() {
+		BaseConvertFeature.registerCommand();
+		EditMacroFeature.registerCommand();
+		MacroFeature.registerCommand();
+		ReachFeature.registerCommand();
+		AirPlaceFeature.registerCommand();
+		AutoRotateFeature.registerCommand();
+		ClickContainerFeature.registerCommand();
+		BigDustFeature.registerCommand();
+		AutoDustClient.registerHandler();
+		AutoRotateClient.registerHandler();
+		ClickContainerClient.registerHandler();
+	}
+}

src/client/java/tools/redstone/redstonetools/Init.java

@@ -0,0 +1,20 @@
+package tools.redstone.redstonetools;
+
+import fi.dy.masa.malilib.event.InitializationHandler;
+import net.fabricmc.fabric.api.client.event.lifecycle.v1.ClientLifecycleEvents;
+import tools.redstone.redstonetools.malilib.InitHandler;
+import tools.redstone.redstonetools.packets.RedstoneToolsClientPackets;
+import tools.redstone.redstonetools.utils.ClientFeatureUtils;
+
+public class Init {
+	public static void init() {
+		ClientLifecycleEvents.CLIENT_STOPPING.register(t -> ClientFeatureUtils.saveToggles());
+		ClientLifecycleEvents.CLIENT_STARTED.register(t -> ClientFeatureUtils.readToggles());
+
+		RedstoneToolsClientPackets.registerPackets();
+		ClientCommands.registerCommands();
+		Commands.registerCommands();
+
+		InitializationHandler.getInstance().registerInitializationHandler(new InitHandler());
+	}
+}

src/client/java/tools/redstone/redstonetools/RedstoneToolsClient.java

@@ -0,0 +1,27 @@
+package tools.redstone.redstonetools;
+
+import net.fabricmc.api.ClientModInitializer;
+import net.fabricmc.loader.api.FabricLoader;
+import org.lwjgl.util.tinyfd.TinyFileDialogs;
+
+import static tools.redstone.redstonetools.RedstoneTools.LOGGER;
+
+public class RedstoneToolsClient implements ClientModInitializer {
+
+	@Override
+	public void onInitializeClient() {
+		LOGGER.info("Initializing Redstone Tools");
+		// check if malilib present, if not open an error window and throw
+		if (!FabricLoader.getInstance().isModLoaded("malilib")) {
+			TinyFileDialogs.tinyfd_messageBox(
+					"Error",
+					"MaLiLib not present!\nPlease install MaLiLib if you want to use redstonetools",
+					"ok",
+					"error",
+					false
+			);
+			throw new IllegalStateException("MaLiLib not present");
+		}
+		Init.init();
+	}
+}

src/client/java/tools/redstone/redstonetools/features/commands/BaseConvertFeature.java

@@ -0,0 +1,70 @@
+package tools.redstone.redstonetools.features.commands;
+
+import com.mojang.brigadier.arguments.IntegerArgumentType;
+import com.mojang.brigadier.arguments.StringArgumentType;
+import com.mojang.brigadier.context.CommandContext;
+import com.mojang.brigadier.exceptions.SimpleCommandExceptionType;
+import net.fabricmc.fabric.api.client.command.v2.ClientCommandManager;
+import net.fabricmc.fabric.api.client.command.v2.FabricClientCommandSource;
+import net.minecraft.text.Text;
+import tools.redstone.redstonetools.features.AbstractFeature;
+import tools.redstone.redstonetools.utils.ClientFeatureUtils;
+
+import java.math.BigInteger;
+
+import static net.fabricmc.fabric.api.client.command.v2.ClientCommandRegistrationCallback.EVENT;
+
+public class BaseConvertFeature extends AbstractFeature {
+	private static final SimpleCommandExceptionType INVALID_NUMBER =
+			new SimpleCommandExceptionType(Text.literal("Invalid number"));
+
+	public static void registerCommand() {
+		EVENT.register((dispatcher, registryAccess) -> dispatcher.register(ClientCommandManager.literal("base")
+				.then(ClientCommandManager.argument("inputNum", StringArgumentType.word())
+						.then(ClientCommandManager.argument("toBase", IntegerArgumentType.integer(2, 16))
+								.executes(context -> ClientFeatureUtils.getFeature(BaseConvertFeature.class).execute(context))))));
+	}
+
+	protected int execute(CommandContext<FabricClientCommandSource> context)
+			throws com.mojang.brigadier.exceptions.CommandSyntaxException {
+		String number = StringArgumentType.getString(context, "inputNum");
+		int toBase = IntegerArgumentType.getInteger(context, "toBase");
+
+		int base = 10;
+		number = number.toLowerCase();
+		String prefix = "";
+		if (number.startsWith("0x")) {
+			prefix = "0x";
+			base = 16;
+		} else if (number.startsWith("0o")) {
+			prefix = "0o";
+			base = 8;
+		} else if (number.startsWith("0b")) {
+			prefix = "0b";
+			base = 2;
+		}
+		if (base != 10) number = number.substring(2);
+		BigInteger integer;
+		try {
+			integer = new BigInteger(number, base);
+		} catch (NumberFormatException e) {
+			throw INVALID_NUMBER.create();
+		}
+		String output = integer.toString(toBase).toLowerCase();
+
+		String toPrefix = "";
+		if (toBase == 16) {
+			toPrefix = "0x";
+		} else if (toBase == 8) {
+			toPrefix = "0o";
+		} else if (toBase == 2) {
+			toPrefix = "0b";
+		}
+		if (!toPrefix.isEmpty()) {
+			context.getSource().sendFeedback(Text.literal("%s = %s".formatted(prefix + number, toPrefix + output)));
+		} else {
+			context.getSource().sendFeedback(Text.literal("%s = %s in base %s".formatted(prefix + number, output, toBase)));
+		}
+		return 1;
+	}
+}

src/client/java/tools/redstone/redstonetools/features/commands/EditMacroFeature.java

@@ -0,0 +1,17 @@
+package tools.redstone.redstonetools.features.commands;
+
+import net.fabricmc.fabric.api.client.command.v2.ClientCommandManager;
+import net.minecraft.client.MinecraftClient;
+import tools.redstone.redstonetools.malilib.GuiMacroManager;
+
+import static net.fabricmc.fabric.api.client.command.v2.ClientCommandRegistrationCallback.EVENT;
+
+public class EditMacroFeature {
+	public static void registerCommand() {
+		EVENT.register((dispatcher, registryAccess) -> dispatcher.register(ClientCommandManager.literal("edit-macros")
+				.executes(commandContext -> {
+					MinecraftClient.getInstance().send(() -> MinecraftClient.getInstance().setScreen(new GuiMacroManager()));
+					return 1;
+				})));
+	}
+}