Port to MC 1.19.4

Darkhax-Minecraft · Mar 19, 2023 · 14756e9 · 14756e9
1 parent f1e6082
commit 14756e9
Show file tree

Hide file tree

Showing 8 changed files with 9 additions and 79 deletions.
diff --git a/Common/src/main/java/net/darkhax/openloader/Constants.java b/Common/src/main/java/net/darkhax/openloader/Constants.java
@@ -2,7 +2,6 @@
 
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
-import com.mojang.realmsclient.dto.GuardedSerializer;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 

diff --git a/Common/src/main/java/net/darkhax/openloader/packs/RepoType.java b/Common/src/main/java/net/darkhax/openloader/packs/RepoType.java
@@ -1,7 +1,6 @@
 package net.darkhax.openloader.packs;
 
 import net.minecraft.server.packs.PackType;
-import net.minecraft.server.packs.repository.PackSource;
 
 import java.io.File;
 import java.nio.file.Path;

diff --git a/Fabric/build.gradle b/Fabric/build.gradle
@@ -1,7 +1,6 @@
 plugins {
     id 'fabric-loom' version '1.0-SNAPSHOT'
     id 'net.darkhax.curseforgegradle' version '1.0.11'
-    id 'net.darkhax.tweedle' version '1.0.5'
     id 'idea'
 }
 
@@ -128,37 +127,4 @@ task publishCurseForge(type: net.darkhax.curseforgegradle.TaskPublishCurseForge)
             project.ext.curse_file_url = "${mod_homepage}/files/${mainFile.curseFileId}"
         }
     }
-}
-
-// Twitter Announcement
-def canTweet = project.hasProperty('twitter_api_key') && project.hasProperty('twitter_api_key_secret') && project.hasProperty('twitter_access_token') && project.hasProperty('twitter_access_token_secret')
-
-task postTweet(type: net.darkhax.tweedle.TaskPostTweet) {
-
-    onlyIf {
-
-        canTweet && project.hasProperty('minecraft_version') && project.hasProperty('curse_file_url')
-    }
-
-    if (canTweet) {
-
-        addClient(project.findProperty('twitter_api_key'), project.findProperty('twitter_api_key_secret'), project.findProperty('twitter_access_token'), project.findProperty('twitter_access_token_secret'))
-    }
-
-    doLast {
-
-        def tweetBody = "${project.ext.mod_name} (Fabric) ${project.version} for Minecraft ${project.ext.minecraft_version} has been released. #${project.ext.mod_name.toLowerCase().replaceAll("[^a-zA-Z]", "")} #fabric"
-
-        if (project.hasProperty('curse_file_url')) {
-
-            tweetBody += " ${project.findProperty('curse_file_url')}"
-        }
-
-        sendTweet(tweetBody)
-    }
-}
-
-if (!canTweet) {
-
-    project.logger.warn("Skipping Twitter plugin. APIKey: ${project.hasProperty('twitter_api_key')} ${project.hasProperty('twitter_api_key_secret')} AccessToken: ${project.hasProperty('twitter_access_token')} ${project.hasProperty('twitter_access_token_secret')}")
 }
diff --git a/Fabric/src/main/resources/fabric.mod.json b/Fabric/src/main/resources/fabric.mod.json
@@ -28,9 +28,9 @@
     "${mod_id}.mixins.json"
   ],
   "depends": {
-    "fabricloader": ">=0.14.12",
+    "fabricloader": ">=0.14.17",
     "fabric": "*",
-    "minecraft": "1.19.3",
+    "minecraft": "1.19.4",
     "java": ">=17"
   },
   "custom": {

diff --git a/Forge/build.gradle b/Forge/build.gradle
@@ -11,7 +11,6 @@ buildscript {
 plugins {
     id 'net.minecraftforge.gradle' version '5.1.+'
     id 'net.darkhax.curseforgegradle' version '1.0.11'
-    id 'net.darkhax.tweedle' version '1.0.5'
 }
 
 apply from: '../gradle/patreon.gradle'
@@ -209,39 +208,6 @@ task publishCurseForge(type: net.darkhax.curseforgegradle.TaskPublishCurseForge)
     }
 }
 
-// Twitter Announcement
-def canTweet = project.hasProperty('twitter_api_key') && project.hasProperty('twitter_api_key_secret') && project.hasProperty('twitter_access_token') && project.hasProperty('twitter_access_token_secret')
-
-task postTweet(type: net.darkhax.tweedle.TaskPostTweet) {
-
-    onlyIf {
-
-        canTweet && project.hasProperty('minecraft_version') && project.hasProperty('curse_file_url')
-    }
-
-    if (canTweet) {
-
-        addClient(project.findProperty('twitter_api_key'), project.findProperty('twitter_api_key_secret'), project.findProperty('twitter_access_token'), project.findProperty('twitter_access_token_secret'))
-    }
-
-    doLast {
-
-        def tweetBody = "${project.ext.mod_name} (Forge) ${project.version} for Minecraft ${project.ext.minecraft_version} has been released. #${project.ext.mod_name.toLowerCase().replaceAll("[^a-zA-Z]", "")} #forge"
-
-        if (project.hasProperty('curse_file_url')) {
-
-            tweetBody += " ${project.findProperty('curse_file_url')}"
-        }
-
-        sendTweet(tweetBody)
-    }
-}
-
-if (!canTweet) {
-
-    project.logger.warn("Skipping Twitter plugin. APIKey: ${project.hasProperty('twitter_api_key')} ${project.hasProperty('twitter_api_key_secret')} AccessToken: ${project.hasProperty('twitter_access_token')} ${project.hasProperty('twitter_access_token_secret')}")
-}
-
 // Forge's Jar Signer
 def canSignJar = project.hasProperty('keyStore') && project.hasProperty('keyStorePass') && project.hasProperty('keyStoreKeyPass') && project.hasProperty('keyStoreAlias')
 

diff --git a/Forge/src/main/resources/META-INF/mods.toml b/Forge/src/main/resources/META-INF/mods.toml
@@ -1,5 +1,5 @@
 modLoader = "javafml"
-loaderVersion = "[44,)"
+loaderVersion = "[45,)"
 license = "${mod_license}"
 issueTrackerURL = "${mod_issues}"
 

diff --git a/Jenkinsfile b/Jenkinsfile
@@ -31,7 +31,7 @@ pipeline {
                 ]) {
 
                     echo 'Building project.'
-                    sh './gradlew build publish publishCurseForge updateVersionTracker postTweet postDiscord --stacktrace --warn'
+                    sh './gradlew build publish publishCurseForge updateVersionTracker postDiscord --stacktrace --warn'
                 }
             }
         }

diff --git a/gradle.properties b/gradle.properties
@@ -1,16 +1,16 @@
 # Project
-version=16.0
+version=17.0
 group=net.darkhax.openloader
 
 # Common
-minecraft_version=1.19.3
+minecraft_version=1.19.4
 
 # Forge
-forge_version=44.1.2
+forge_version=45.0.9
 
 # Fabric
-fabric_version=0.72.0+1.19.3
-fabric_loader_version=0.14.12
+fabric_version=0.76.0+1.19.4
+fabric_loader_version=0.14.17
 
 # Mod options
 mod_name=OpenLoader