1.7.10/build fix and update checker backport (#2640)

* Fix build failing to locally build * Port Update Checker from 1.12.2 * Fix the maxZoneID not saving for SingleFileProviders Backport fix from 1.16 * Remove Un-needed Expose statment * Fix logo not showing in mod window * Fix link and grammar in info file [skip actions] --------- Co-authored-by: Spacebuilder2020 <spacebuilder2020@users.noreply.github.com>
ForgeEssentials · Aug 13, 2023 · bf7ba0b · bf7ba0b
1 parent 50c56be
commit bf7ba0b
Show file tree

Hide file tree

Showing 25 changed files with 306 additions and 188 deletions.
diff --git a/build.gradle b/build.gradle
@@ -20,13 +20,17 @@ buildscript {
 			name = "sonatype"
 			url = "https://oss.sonatype.org/content/repositories/snapshots/"
 		}
+		maven {
+      		url = uri("https://plugins.gradle.org/m2/")
+    	}
 		jcenter()
 
 	}
 	dependencies {
 		classpath "net.minecraftforge.gradle:ForgeGradle:1.2.13"
 		classpath "org.jfrog.buildinfo:build-info-extractor-gradle:3.0.1"
 		classpath "org.ajoberstar:gradle-git:0.12.0"
+		classpath("com.modrinth.minotaur:Minotaur:2.8.3")
 	}
 
 }
@@ -48,6 +52,8 @@ repositories {
 }
 
 apply plugin: "forge"
+import org.ajoberstar.grgit.Grgit
+import org.apache.tools.ant.filters.ReplaceTokens
 /************************************************************
  * General configuration
  */
@@ -63,21 +69,18 @@ ext.set 'changelog', System.getenv("CHANGE_LOG")
 ext.set 'releaseType', 'release'
 
 // Get commit hash
-import org.ajoberstar.grgit.Grgit
 def repo = Grgit.open(project.file("."))
 ext.gitCommitHash = repo.log().find().abbreviatedId
 
 // Set build properties
-ext.baseVersion = "7.5"
-ext.projectID=74735
-ext.clientProjectID=235928
-version = baseVersion + "." + buildNumber
+version = "$mod_base.$mod_major.$buildNumber"
 group = "com.forgeessentials"
 archivesBaseName = "forgeessentials"
 sourceCompatibility = 1.8
 targetCompatibility = 1.8
-ext.set 'srcFile',file("./tmp/$archivesBaseName-$minecraft.version-$baseVersion.$buildNumber-server.jar")
-ext.set 'clientSrcFile',file("./tmp/$archivesBaseName-$minecraft.version-$baseVersion.$buildNumber-client.jar")
+
+ext.set 'srcFile',file("./tmp/$archivesBaseName-$minecraftVersion-$mod_base.$mod_major.$buildNumber-server.jar")
+ext.set 'clientSrcFile',file("./tmp/$archivesBaseName-$minecraftVersion-$mod_base.$mod_major.$buildNumber-client.jar")
 
 curseforge {
     apiKey = System.getenv("CF_APIKEY")
@@ -86,13 +89,13 @@ curseforge {
             id = projectID
             changelog = project.changelog + "\n\nNote: Java 17+ requires another mod (lwjgl3ify) to bootstrap Forge."
             releaseType = project.releaseType
-            addGameVersion minecraft.version
+            addGameVersion minecraftVersion
             addGameVersion 'Forge'
             addGameVersion 'Java 17'
             addGameVersion 'Java 8'
 
             mainArtifact(project.srcFile) {
-                displayName = "$archivesBaseName-$minecraft.version-$baseVersion.$buildNumber"
+                displayName = "$archivesBaseName-$minecraftVersion-$mod_base.$mod_major.$buildNumber"
                 relations {
                     optionalDependency 'baubles'
                 }
@@ -102,12 +105,12 @@ curseforge {
             id = clientProjectID
             changelog = project.changelog
             releaseType = project.releaseType
-            addGameVersion minecraft.version
+            addGameVersion minecraftVersion
             addGameVersion 'Forge'
             addGameVersion 'Java 8'
 
             mainArtifact(project.clientSrcFile) {
-                displayName = "$archivesBaseName-$minecraft.version-$baseVersion.$buildNumber"
+                displayName = "$archivesBaseName-$minecraftVersion-$mod_base.$mod_major.$buildNumber"
                 relations {
                     tool('forge-essentials')
                 }
@@ -130,11 +133,8 @@ project.afterEvaluate {
 
 // Set up forge options
 minecraft {
-	version = "1.7.10-10.13.4.1558-1.7.10"
+	version = "$project.minecraftVersion-$project.forgeVersion-$project.minecraftVersion"
 	runDir = "rundir"
-
-	replaceIn "src/utils/java/com/forgeessentials/commons/BuildInfo.java"
-	replace "_VERSION_", project.version
 }
 
 apply plugin: "com.modrinth.minotaur"
@@ -189,9 +189,11 @@ dependencies {
 	serverLib('net.dv8tion:JDA:5.0.0-beta.8')
 	// Database libraries	
 	shadowLib group: 'com.h2database', 	name: 'h2', 					version: '1.3.175'
-	serverLib group: 'mysql', 			name: 'mysql-connector-java', 	version: '8.0.21'
+	serverLib group: 'mysql', 			name: 'mysql-connector-java', 	version: '5.1.22'
 	shadowLib group: 'org.hibernate', 	name: 'hibernate-core', 		version: '5.2.2.Final'
-	buildDep  group: 'org.hibernate', 	name: 'hibernate-jpamodelgen', 	version: '5.2.2.Final'
+	implementation 'javax.persistence:javax.persistence-api:2.2'
+	annotationProcessor group: 'org.hibernate', 	name: 'hibernate-jpamodelgen', 	version: '5.6.14.Final'
+	annotationProcessor 'org.spongepowered:mixin:0.8.5:processor'
 	/* serverLib "org.eclipse.persistence:eclipselink:2.6.0" */
 
 	// WorldEdit
@@ -232,16 +234,29 @@ sourceSets {
 	}
 	main {
 		compileClasspath = files(configurations.compile, sourceSets.api.output, sourceSets.utils.output)
+		ext.refMap = "mixins.forgeessentials.refmap.json"
 	}
 	client {
 		compileClasspath = files(configurations.compile, sourceSets.api.output, sourceSets.utils.output)
+		ext.refMap = "mixins.forgeessentials.client.refmap.json"
 	}
 
 	test {
 		compileClasspath = files(configurations.compile, sourceSets.api.output, sourceSets.utils.output, sourceSets.main.output)
 	}
 }
 
+// Configure utils tokens
+task processSource(type: Sync) {
+    from sourceSets.utils.java
+	filter(ReplaceTokens, tokens: ['_MCVERSION_':project.minecraftVersion, '_BASEVERSION_': project.mod_base, '_MAJORVERSION_': project.mod_major])
+    into "$buildDir/src"
+}
+
+project.compileUtilsJava {
+	source = processSource.outputs
+}
+
 // Configure server resource processing
 project.processResources {
 	from (sourceSets.main.resources.srcDirs) {
@@ -255,7 +270,7 @@ project.processResources {
 		include "mcmod.info"
 		expand (
 			"version": project.version, 
-			"mcversion": project.minecraft.version,
+			"mcversion": project.minecraftVersion,
 		)
 	}
 }
@@ -266,7 +281,7 @@ project.processClientResources {
 		include "mcmod.info"
 		expand (
 			"version": project.version, 
-			"mcversion": project.minecraft.version,
+			"mcversion": project.minecraftVersion,
 		)
 	}
 }
@@ -302,6 +317,7 @@ task serverLibArchive(type: Zip) {
 jar.doLast {
 	delete (serverLibArchive.archivePath)
 	delete (shadowJar.archivePath)
+	delete (processSource.outputs)
 }
 
 def serverRefMap = "${tasks.compileJava.temporaryDir}" + File.separator + "mixins.forgeessentials.refmap.json"
@@ -335,7 +351,7 @@ jar {
 	dependsOn "serverLibArchive"
 	dependsOn shadowJar
 	classifier = "server"
-	appendix = minecraft.version
+	appendix = project.minecraftVersion
 
 	from sourceSets.main.output
 	from sourceSets.utils.output
@@ -376,7 +392,7 @@ jar {
 
 task clientJar (dependsOn: "clientClasses", type: Jar) {
 	classifier = "client"
-	appendix = minecraft.version
+	appendix = project.minecraftVersion
 
 	from sourceSets.client.output
 	from sourceSets.utils.output
@@ -401,7 +417,7 @@ task clientJar (dependsOn: "clientClasses", type: Jar) {
 
 task deobfJar(dependsOn: "classes", type: Jar) {
 	classifier = "dev"
-	appendix = minecraft.version
+	appendix = project.minecraftVersion
 
 	from sourceSets.main.output
 	from sourceSets.utils.output
@@ -421,7 +437,7 @@ task deobfJar(dependsOn: "classes", type: Jar) {
 
 task sourceJar(type: Jar) {
 	classifier = "sources"
-	appendix = minecraft.version
+	appendix = project.minecraftVersion
 
 	from sourceSets.main.allSource
 
@@ -442,7 +458,7 @@ javadoc {
 
 task javadocJar(type: Jar, dependsOn: javadoc) {
 	classifier = "javadoc"
-	appendix = project.minecraft.version
+	appendix = project.minecraftVersion
 
 	from javadoc.destinationDir
 
@@ -454,15 +470,15 @@ task javadocJar(type: Jar, dependsOn: javadoc) {
  */
 
 def mixinSrg = "${tasks.reobf.temporaryDir}" + File.separator + "mixins.srg"
-def mixinClientSrg = "${tasks.reobf.temporaryDir}" + File.separator + "mixinsClient.srg"
+//def mixinClientSrg = "${tasks.reobf.temporaryDir}" + File.separator + "mixinsClient.srg"
 afterEvaluate {
 	tasks.compileJava.options.compilerArgs += ["-AreobfSrgFile=${tasks.reobf.srg}", "-AoutSrgFile=${mixinSrg}", "-AoutRefMapFile=${serverRefMap}"]
-	tasks.compileClientJava.options.compilerArgs += ["-AreobfSrgFile=${tasks.reobf.srg}", "-AoutSrgFile=${mixinClientSrg}", "-AoutRefMapFile=${clientRefMap}"]
+	//tasks.compileClientJava.options.compilerArgs += ["-AreobfSrgFile=${tasks.reobf.srg}", "-AoutSrgFile=${mixinClientSrg}", "-AoutRefMapFile=${clientRefMap}"]
 }
 
 reobf {
 	addExtraSrgFile mixinSrg
-	addExtraSrgFile mixinClientSrg
+	//addExtraSrgFile mixinClientSrg
 	reobf (clientJar) { reobfSpec ->
 		reobfSpec.classpath = sourceSets.main.compileClasspath
 	}
@@ -475,9 +491,9 @@ reobf {
 // util.jar
 task Annotations(type: Jar) {
 	classifier = "annotations"
-	appendix = project.minecraft.version
+	appendix = project.minecraftVersion
 
-    from(sourceSets.utils.output) {
+    from(sourceSets.main.output) {
         include "com/forgeessentials/playerlogger/entity/**"
         exclude "com/forgeessentials/playerlogger/entity/Action.class"
         exclude "com/forgeessentials/playerlogger/entity/Action01Block\$ActionBlockType.class"
@@ -497,7 +513,7 @@ task Annotations(type: Jar) {
                 include "**annotations.jar"
             }
             into "misc"
-            rename 'forgeessentials-'+project.minecraft.version+"-"+project.version+'-annotations.jar', 'forgeessentials-'+project.minecraft.version+'-annotations.jar'
+            rename 'forgeessentials-'+project.minecraftVersion+"-"+project.version+'-annotations.jar', 'forgeessentials-'+project.minecraftVersion+'-annotations.jar'
         }
         delete fileTree(dir:'build/libs/', include: '**annotations.jar')
         }
@@ -515,10 +531,6 @@ artifacts {
 	archives Annotations
 }
 
-task wrapper(type: Wrapper) {
-	gradleVersion = "2.10"
-}
-
 /************************************************************
  * Configure maven publishing
  */
@@ -532,9 +544,9 @@ publishing {
 		mavenJava (MavenPublication) {
 			groupId "com.forgeessentials"
 			artifactId "forgeessentials"
-			version baseVersion + "-SNAPSHOT"
+			version mod_base + "." + mod_major + "-SNAPSHOT"
 			if (System.getenv("PUBLISH_RELEASE"))
-				version baseVersion
+				version mod_base + "." + mod_major
 
 			artifact deobfJar
 			artifact sourceJar

diff --git a/gradle.properties b/gradle.properties
@@ -0,0 +1,15 @@
+# Gradle properties
+org.gradle.jvmargs=-Xmx4G
+org.gradle.daemon=false
+
+# Mod properties
+mod_base=7
+mod_major=5
+
+# Forge properties
+minecraftVersion=1.7.10
+forgeVersion=10.13.4.1558
+
+#Curseforge
+projectID=74735
+clientProjectID=235928
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/misc/forgeessentials-1.7.10-annotations.jar b/misc/forgeessentials-1.7.10-annotations.jar
diff --git a/src/client/java/com/forgeessentials/client/ForgeEssentialsClient.java b/src/client/java/com/forgeessentials/client/ForgeEssentialsClient.java
@@ -17,7 +17,7 @@
 import cpw.mods.fml.common.network.NetworkCheckHandler;
 import cpw.mods.fml.relauncher.Side;
 
-@Mod(modid = ForgeEssentialsClient.MODID, name = "ForgeEssentials Client Addon", version = BuildInfo.BASE_VERSION, guiFactory = "com.forgeessentials.client.gui.forge.FEGUIFactory", useMetadata = true, dependencies = BuildInfo.DEPENDENCIES)
+@Mod(modid = ForgeEssentialsClient.MODID, name = "ForgeEssentials Client Addon", guiFactory = "com.forgeessentials.client.gui.forge.FEGUIFactory", useMetadata = true, dependencies = BuildInfo.DEPENDENCIES)
 public class ForgeEssentialsClient
 {
 

diff --git a/src/client/java/com/forgeessentials/client/core/ClientProxy.java b/src/client/java/com/forgeessentials/client/core/ClientProxy.java
@@ -77,7 +77,7 @@ public ClientProxy()
     public void doPreInit(FMLPreInitializationEvent event)
     {
         BuildInfo.getBuildInfo(event.getSourceFile());
-        feclientlog.info(String.format("Running ForgeEssentials client %s (%s)", BuildInfo.getFullVersion(), BuildInfo.getBuildHash()));
+        feclientlog.info(String.format("Running ForgeEssentials client %s (%s)", BuildInfo.getCurrentVersion(), BuildInfo.getBuildHash()));
 
         // Initialize configuration
         config = new Configuration(event.getSuggestedConfigurationFile());

diff --git a/src/client/java/com/forgeessentials/client/core/FEClientCommand.java b/src/client/java/com/forgeessentials/client/core/FEClientCommand.java
@@ -41,7 +41,7 @@ else if (args[0].equalsIgnoreCase("reinit"))
         else if (args[0].equalsIgnoreCase("info"))
         {
             sender.addChatMessage(new ChatComponentText(String.format("Running ForgeEssentials client %s (%s)", //
-                    BuildInfo.getFullVersion(), BuildInfo.getBuildHash())));
+                    BuildInfo.getCurrentVersion(), BuildInfo.getBuildHash())));
             sender.addChatMessage(new ChatComponentText(
                     "Please refer to https://github.com/ForgeEssentials/ForgeEssentialsMain/wiki/Team-Information if you would like more information about the FE developers."));
         }

diff --git a/src/client/resources/mcmod.info b/src/client/resources/mcmod.info
@@ -4,18 +4,20 @@
   "description": "Client addon for ForgeEssentials (optional)",
   "version": "${version}",
   "mcversion": "${mcversion}",
-  "url": "https://github.com/ForgeEssentials/ForgeEssentialsMain",
+  "url": "https://github.com/ForgeEssentials/ForgeEssentials",
   "updateUrl": "",
   "authorList": [
 	"AbrarSyed",
 	"luacs1998",
 	"olee",
 	"dries007",
 	"Malkierian",
+	"spacebuilder2020",
+	"maximuslotro/MaximustheMiner",
 	"And a few others"
   ],
   "credits": "Thanks to everyone who has helped us so far.",
-  "logoFile": "/logo.png",
+  "logoFile": "logo.png",
   "screenshots": [
   ],
   "parent":"",

diff --git a/src/main/java/com/forgeessentials/api/permissions/ServerZone.java b/src/main/java/com/forgeessentials/api/permissions/ServerZone.java
@@ -40,7 +40,6 @@ public class ServerZone extends Zone implements Loadable
 
     private Map<Integer, WorldZone> worldZones = new HashMap<Integer, WorldZone>();
 
-    @Expose(serialize = false)
     private int maxZoneID;
 
     private Map<UserIdent, Set<String>> playerGroups = new HashMap<UserIdent, Set<String>>();