Merge pull request #388 from kr1viah/main

Update publish.yml, delete version text from main menu

Author: mattbatwings

.github/workflows/publish.yml

@@ -12,31 +12,31 @@ jobs:
 
     steps:
       - name: Checkout code
-        uses: actions/checkout@v2
-    
+        uses: actions/checkout@v4
+
       - name: Set up Java
-        uses: actions/setup-java@v2
+        uses: actions/setup-java@v4
         with:
-          java-version: '17'
+          java-version: '21'
           distribution: 'adopt'
-    
+
       - name: Build
         run: ./gradlew build
 
       - name: Publish
-        uses: Kir-Antipov/mc-publish@v3.2
+        uses: Kir-Antipov/mc-publish@v3.3
         with:
-          name: Redstone Tools v1.18.2-${{ github.event.inputs.mod-version }}
-        
+          name: Redstone Tools ${{ github.event.inputs.mod-version }}
+
           modrinth-id: 9ySQVrz2
           modrinth-token: ${{ secrets.MODRINTH_TOKEN }}
 
           # curseforge-id: 849609
           # curseforge-token: ${{ secrets.CURSEFORGE_TOKEN }}
 
-          github-tag: v1.18.2-${{ github.event.inputs.mod-version }}
+          github-tag: ${{ github.event.inputs.mod-version }}
           github-generate-changelog: false
           github-token: ${{ secrets.RELEASE_TOKEN }}
-          
-          files-primary: build/libs/redstonetools-1.18.2-${{ github.event.inputs.mod-version }}.jar
+
+          files-primary: build/libs/redstonetools-${{ github.event.inputs.mod-version }}.jar
           files-secondary: ''

gradle.properties

@@ -6,7 +6,7 @@ maven_group = tools.redstone
 archives_base_name = redstonetools
 
 loader_version=0.16.10
-mod_version = 3.0.0
+mod_version = v3.0.0
 
 minecraft_version=1.21.8
 minecraft_version_out=1.21.8

src/client/java/tools/redstone/redstonetools/mixin/update/CheckUpdateMixin.java

@@ -14,7 +14,6 @@
     "features.ItemBindItemStackMixin",
     "features.WorldRendererInvoker",
     "macros.AddMacroButtonMixin",
-    "macros.InitializeMacroManagerMixin",
-    "update.CheckUpdateMixin"
+    "macros.InitializeMacroManagerMixin"
   ]
 }

src/client/resources/redstonetools.client.mixins.json

@@ -18,15 +18,7 @@
 
 public class RedstoneTools implements ModInitializer {
 	public static final String MOD_ID = "redstonetools";
-	/*===================================================================
-	/  VERSIONING RULES											  		/
-	/-------------------------------------------------------------------/
-	/  Format: <MCver1>[-<MCver2>]-<ModVer>						  		/
-	/	• ModVer: 3 single digits, separated by dots (e.g., 3.0.0) 		/
-	/	• Multi-version: older MC version first (e.g., 1.18.2-1.21.4)   /
-	/	• Example: MC 1.21.1 → 1.21.3, Mod v4.3.2 → v1.21-1.21.3-4.3.2  /
-	===================================================================*/
-	public static final String MOD_VERSION = "v1.21.4-1.21.8-3.0.0";
+	public static final String MOD_VERSION = "v3.0.0";
 	public static final String MOD_NAME = "Redstone tools";
 	public static final Logger LOGGER = LoggerFactory.getLogger(RedstoneTools.MOD_ID);
 
@@ -38,9 +30,6 @@ public class RedstoneTools implements ModInitializer {
 
 	@Override
 	public void onInitialize() {
-		Thread t = new Thread(CheckUpdates::checkUpdates);
-		t.start();
-
 		RedstoneToolsPackets.registerPackets();
 		RedstoneToolsGameRules.register();
 		Commands.registerCommands();