Add automatic version publishing for Modrinth and CurseForge and other fixes (#10)

- Fix project not installing due to accesswidener not existing in
subprojects
- Fix config being stored in the wrong directory
- Fixed keybinds not working in GUI screens
- Fixed savestate not saving entities correctly
- Changed savestate screen to close on error
- Fixed savestate data failing to save when directory doesn't exist
- Fixed tickrate not being correctly applied after loading a savestate
- Fixed a softlock when loading a savestate in tr0
- Fixed increase and decrease tickrate not going to the nearest value
after setting a custom tickrate
- Add github publish action

Author: ScribbleTAS

.github/workflows/release.yml

@@ -0,0 +1,39 @@
+name: Create Release
+on:
+  release:
+    types: [published]
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - name: Setup Java
+        uses: actions/setup-java@v4
+        with:
+          java-version: '22'
+          distribution: 'temurin'
+          architecture: x64
+      - name: Setup Gradle
+        uses: gradle/actions/setup-gradle@v4
+        with:
+          gradle-version: 8.10.2
+      - name: Setup workspace
+        run: gradle preprocessBase
+      - name: Build
+        run: gradle collectBuilds
+      - name: Upload assets
+        uses: softprops/action-gh-release@v2
+        with:
+          files: 'build/!(-@(dev|sources|javadoc|all)).jar'
+      - name: Publish 1.21.1
+        uses: Kir-Antipov/[email protected]
+        with:
+          files: 'build/*-1.21.1-*!(*-@(dev|sources|javadoc|all)).jar'
+          modrinth-token: ${{ secrets.MODRINTH_TOKEN }}
+          curseforge-token: ${{ secrets.CURSEFORGE_TOKEN }}
+      - name: Publish 1.21.3
+        uses: Kir-Antipov/[email protected]
+        with:
+          files: 'build/*-1.21.3-*!(*-@(dev|sources|javadoc|all)).jar'
+          modrinth-token: ${{ secrets.MODRINTH_TOKEN }}
+          curseforge-token: ${{ secrets.CURSEFORGE_TOKEN }}

1.21.1/gradle.properties

@@ -1,4 +1,5 @@
 org.gradle.jvmargs=-Xmx3G
 
 minecraft_version=1.21.1
+allowed_mc_version=>=1.21 <=1.21.1
 fabric_version=0.107.0+1.21.1

1.21.3/build.gradle

@@ -2,4 +2,4 @@ plugins {
 	id 'fabric-loom' version "${loom_version}"
 }
 
-apply from: "../common.gradle"
+apply from: "../common.gradle"

1.21.3/gradle.properties

@@ -1,4 +1,5 @@
 org.gradle.jvmargs=-Xmx3G
 
 minecraft_version=1.21.3
+allowed_mc_version=>=1.21.2 <=1.21.3
 fabric_version=0.107.0+1.21.3

common.gradle

@@ -10,14 +10,6 @@ base {
 	archivesName = "${mod_name}-${minecraft_version}"
 }
 
-loom {
-	// set access widener
-	accessWidenerPath = file('src/main/resources/lotaslight.accesswidener')
-	// set custom log4jconfig
-	log4jConfigs.from(file('src/main/resources/log4j.xml'))
-}
-
-
 tasks.withType(JavaCompile).configureEach {
 	it.options.release = 21
 }
@@ -32,10 +24,28 @@ dependencies {
 	modImplementation "net.fabricmc.fabric-api:fabric-api:${fabric_version}"
 }
 
+loom {
+	// set access widener
+	def accessWidenerFile = file('src/main/resources/lotaslight.accesswidener')
+	if(accessWidenerFile.exists()) {
+		accessWidenerPath = accessWidenerFile
+	}
+	
+	// set custom log4jconfig
+	def log4jFile = file('src/main/resources/log4j.xml')
+	if(log4jFile.exists()) {
+		log4jConfigs.from(log4jFile)
+	}
+}
+
 processResources {
 	inputs.property "version", project.version
+	inputs.property "allowedMcVersion", project.allowed_mc_version
 
-	filesMatching("fabric.mod.json") {
+	filesMatching("fabric.mod.json") { file -> 
 		expand "version": project.version
+        filter { String line ->
+            line.replace('"minecraft": "*",', '"minecraft": "' + project.allowed_mc_version + '",')
+        };
 	}
-}
+}

src/main/java/com/minecrafttas/lotas_light/LoTASLight.java

@@ -37,9 +37,5 @@ public void onInitialize() {
 				}
 			}
 		});
-
-		ServerLifecycleEvents.SERVER_STOPPED.register(server -> {
-//			savestateHandler = null
-		});
 	}
 }

src/main/java/com/minecrafttas/lotas_light/LoTASLightClient.java

@@ -10,16 +10,15 @@
 import com.minecrafttas.lotas_light.event.EventClientGameLoop;
 import com.minecrafttas.lotas_light.event.EventOnClientJoinServer;
 import com.minecrafttas.lotas_light.event.HudRenderExperienceCallback;
+import com.minecrafttas.lotas_light.keybind.KeybindManager;
+import com.minecrafttas.lotas_light.keybind.KeybindManager.Keybind;
 import com.minecrafttas.lotas_light.savestates.SavestateHandler.SavestateCallback;
 import com.minecrafttas.lotas_light.savestates.gui.SavestateDoneGui;
 import com.minecrafttas.lotas_light.savestates.gui.SavestateGui;
 import com.minecrafttas.lotas_light.savestates.gui.SavestateRenameGui;
-import com.mojang.blaze3d.platform.InputConstants;
 import net.fabricmc.api.ClientModInitializer;
-import net.fabricmc.fabric.api.client.keybinding.v1.KeyBindingHelper;
 import net.minecraft.ChatFormatting;
 import net.minecraft.client.DeltaTracker;
-import net.minecraft.client.KeyMapping;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.GuiGraphics;
 import net.minecraft.client.resources.language.I18n;
@@ -39,12 +38,7 @@
 
 public class LoTASLightClient implements ClientModInitializer {
 
-	private KeyMapping increaseTickrate = new KeyMapping("key.lotaslight.increaseTickrate", InputConstants.Type.KEYSYM, GLFW.GLFW_KEY_PERIOD, "keycategory.lotaslight.lotaslight");
-	private KeyMapping decreaseTickrate = new KeyMapping("key.lotaslight.decreaseTickrate", InputConstants.Type.KEYSYM, GLFW.GLFW_KEY_COMMA, "keycategory.lotaslight.lotaslight");
-	private KeyMapping freezeTickrate = new KeyMapping("key.lotaslight.freezeTickrate", InputConstants.Type.KEYSYM, GLFW.GLFW_KEY_F8, "keycategory.lotaslight.lotaslight");
-	private KeyMapping advanceTickrate = new KeyMapping("key.lotaslight.advanceTickrate", InputConstants.Type.KEYSYM, GLFW.GLFW_KEY_F9, "keycategory.lotaslight.lotaslight");
-	private KeyMapping savestate = new KeyMapping("key.lotaslight.savestate", InputConstants.Type.KEYSYM, GLFW.GLFW_KEY_J, "keycategory.lotaslight.lotaslight");
-	private KeyMapping loadstate = new KeyMapping("key.lotaslight.loadstate", InputConstants.Type.KEYSYM, GLFW.GLFW_KEY_K, "keycategory.lotaslight.lotaslight");
+	private KeybindManager keybindManager = new KeybindManager(KeybindManager::isKeyDownExceptTextField);
 
 	private float[] rates = new float[] { .1f, .2f, .5f, 1f, 2f, 5f, 10f, 20f, 40f, 100f };
 	private short rateIndex = 7;
@@ -56,41 +50,24 @@ public class LoTASLightClient implements ClientModInitializer {
 	@Override
 	public void onInitializeClient() {
 		Minecraft mc = Minecraft.getInstance();
-		configpath = mc.gameDirectory.toPath().resolve("configs/lotas-light.cfg");
+		configpath = mc.gameDirectory.toPath().resolve("config/lotas-light.cfg");
 		config = new Configuration("LoTAS-Light config", configpath);
 		config.loadFromXML();
+		LoTASLight.startTickrate = Float.parseFloat(LoTASLightClient.config.get(ConfigOptions.DEFAULT_TICKRATE));
+		rateIndex = (short) findClosestRateIndex(LoTASLight.startTickrate);
 		registerKeybindings();
 		HudRenderExperienceCallback.EVENT.register(this::drawHud);
 	}
 
 	private void registerKeybindings() {
-		KeyBindingHelper.registerKeyBinding(increaseTickrate);
-		KeyBindingHelper.registerKeyBinding(decreaseTickrate);
-		KeyBindingHelper.registerKeyBinding(freezeTickrate);
-		KeyBindingHelper.registerKeyBinding(advanceTickrate);
-		KeyBindingHelper.registerKeyBinding(savestate);
-		KeyBindingHelper.registerKeyBinding(loadstate);
-
-		EventClientGameLoop.EVENT.register(client -> {
-			while (increaseTickrate.consumeClick()) {
-				increaseTickrate(client);
-			}
-			while (decreaseTickrate.consumeClick()) {
-				decreaseTickrate(client);
-			}
-			while (freezeTickrate.consumeClick()) {
-				freezeTickrate(client);
-			}
-			while (advanceTickrate.consumeClick()) {
-				advanceTickrate(client);
-			}
-			while (savestate.consumeClick()) {
-				savestate();
-			}
-			while (loadstate.consumeClick()) {
-				loadstate();
-			}
-		});
+		keybindManager.registerKeybind(new Keybind("key.lotaslight.increaseTickrate", "keycategory.lotaslight.lotaslight", GLFW.GLFW_KEY_PERIOD, this::increaseTickrate));
+		keybindManager.registerKeybind(new Keybind("key.lotaslight.decreaseTickrate", "keycategory.lotaslight.lotaslight", GLFW.GLFW_KEY_COMMA, this::decreaseTickrate));
+		keybindManager.registerKeybind(new Keybind("key.lotaslight.freezeTickrate", "keycategory.lotaslight.lotaslight", GLFW.GLFW_KEY_F8, this::freezeTickrate, KeybindManager::isKeyDown));
+		keybindManager.registerKeybind(new Keybind("key.lotaslight.advanceTickrate", "keycategory.lotaslight.lotaslight", GLFW.GLFW_KEY_F9, this::advanceTickrate, KeybindManager::isKeyDown));
+		keybindManager.registerKeybind(new Keybind("key.lotaslight.savestate", "keycategory.lotaslight.lotaslight", GLFW.GLFW_KEY_J, this::savestate));
+		keybindManager.registerKeybind(new Keybind("key.lotaslight.loadstate", "keycategory.lotaslight.lotaslight", GLFW.GLFW_KEY_K, this::loadstate));
+
+		EventClientGameLoop.EVENT.register(keybindManager::onRunClientGameLoop);
 
 		EventOnClientJoinServer.EVENT.register(player -> {
 			if (LoTASLight.savestateHandler.loadStateComplete != null) {
@@ -102,12 +79,16 @@ private void registerKeybindings() {
 	}
 
 	private void increaseTickrate(Minecraft client) {
+		if (client.level == null) {
+			return;
+		}
 		TickRateManager clientTickrateChanger = client.level.tickRateManager();
 		IntegratedServer server = client.getSingleplayerServer();
 		if (server == null) {
 			return;
 		}
 		ServerTickRateManager serverTickrateChanger = server.tickRateManager();
+		rateIndex = findClosestRateIndex(clientTickrateChanger.tickrate());
 
 		rateIndex++;
 		rateIndex = (short) Math.clamp(rateIndex, 0, rates.length - 1);
@@ -124,12 +105,16 @@ private void increaseTickrate(Minecraft client) {
 	}
 
 	private void decreaseTickrate(Minecraft client) {
+		if (client.level == null) {
+			return;
+		}
 		TickRateManager clientTickrateChanger = client.level.tickRateManager();
 		IntegratedServer server = client.getSingleplayerServer();
 		if (server == null) {
 			return;
 		}
 		ServerTickRateManager serverTickrateChanger = server.tickRateManager();
+		rateIndex = findClosestRateIndex(clientTickrateChanger.tickrate());
 
 		rateIndex--;
 		rateIndex = (short) Math.clamp(rateIndex, 0, rates.length - 1);
@@ -146,6 +131,9 @@ private void decreaseTickrate(Minecraft client) {
 	}
 
 	private void freezeTickrate(Minecraft client) {
+		if (client.level == null) {
+			return;
+		}
 		TickRateManager clientTickrateManager = client.level.tickRateManager();
 		IntegratedServer server = client.getSingleplayerServer();
 		if (server == null) {
@@ -161,6 +149,9 @@ private void freezeTickrate(Minecraft client) {
 	}
 
 	private void advanceTickrate(Minecraft client) {
+		if (client.level == null) {
+			return;
+		}
 		TickRateManager clientTickrateManager = client.level.tickRateManager();
 		IntegratedServer server = client.getSingleplayerServer();
 		if (server == null) {
@@ -191,9 +182,11 @@ private void drawHud(GuiGraphics context, DeltaTracker deltaTicks) {
 		//# end
 	}
 
-	private void savestate() {
-		Minecraft mc = Minecraft.getInstance();
+	private void savestate(Minecraft mc) {
 		MinecraftServer server = mc.getSingleplayerServer();
+		if (server == null) {
+			return;
+		}
 		for (ServerLevel level : server.getAllLevels()) {
 			level.noSave = true;
 		}
@@ -224,12 +217,15 @@ private void savestate() {
 			}
 			mc.gui.getChat().addMessage(Component.literal(message).withStyle(ChatFormatting.RED));
 			LoTASLight.savestateHandler.resetState();
+			Minecraft.getInstance().setScreen(null);
 		}
 	}
 
-	private void loadstate() {
-		Minecraft mc = Minecraft.getInstance();
-
+	private void loadstate(Minecraft mc) {
+		MinecraftServer server = mc.getSingleplayerServer();
+		if (server == null) {
+			return;
+		}
 		SavestateCallback doneLoadingCallback = (paths -> {
 			//@formatter:off
 			mc.setScreen(
@@ -245,7 +241,7 @@ private void loadstate() {
 		});
 
 		try {
-			MinecraftServer server = mc.getSingleplayerServer();
+
 			for (ServerLevel level : server.getAllLevels()) {
 				level.noSave = true;
 			}
@@ -259,6 +255,37 @@ private void loadstate() {
 			}
 			mc.gui.getChat().addMessage(Component.literal(message).withStyle(ChatFormatting.RED));
 			LoTASLight.savestateHandler.resetState();
+			Minecraft.getInstance().setScreen(null);
+		}
+	}
+
+	private short findClosestRateIndex(float tickrate) {
+		for (int i = 0; i < rates.length; i++) {
+			int iMinus1 = i - 1;
+
+			float min = 0f;
+			if (iMinus1 >= 0) {
+				min = rates[iMinus1];
+			}
+			float max = rates[i];
+
+			if (tickrate >= min && tickrate < max) {
+				if (min == 0f) {
+					return (short) i;
+				}
+
+				float distanceToMin = tickrate - min;
+				float distanceToMax = max - tickrate;
+
+				if (distanceToMin < distanceToMax) {
+					return (short) iMinus1;
+				} else if (distanceToMax < distanceToMin) {
+					return (short) i;
+				} else {
+					return (short) iMinus1;
+				}
+			}
 		}
+		return (short) (rates.length - 1);
 	}
 }