1.15 gradle adaptations

README.md

@@ -147,7 +147,7 @@ In order to get the most up-to-date builds, you'll have to periodically update y
 2. Navigate to `basefolder` in the console.
 3. Make sure you have not made any changes to the local repository, or else there might be issues with Git.
 	* If you have, try reverting them to the status that they were when you last updated your repository.
-4. Execute `git pull version/1.14`.  This pulls all commits from the official repository that do not yet exist on your local repository and updates it (With Gitkraken just click the small pull arrow at the top).
+4. Execute `git pull version/1.15`.  This pulls all commits from the official repository that do not yet exist on your local repository and updates it (With Gitkraken just click the small pull arrow at the top).
 
 
 #### Trouble shooting

build.gradle

@@ -77,7 +77,7 @@ dependencies {
     apiImplementation fg.deobf("com.ldtteam:structurize:${config.structurize_version}")
     compile "com.ldtteam:datagenerators:0.1.34-ALPHA"
 
-    implementation fg.deobf("mezz.jei:jei-1.14.4:${config.jei_version}")
+    implementation fg.deobf("mezz.jei:jei-1.15.1:${config.jei_version}")
 
     testImplementation  'junit:junit:4.12'
     testImplementation  "org.mockito:mockito-core:1.+"
@@ -225,7 +225,7 @@ curseforge {
 
         project {
             id = '245506'
-            addGameVersion '1.14.4'
+            addGameVersion '1.15.1'
             changelog = file('build/changelog.md')
             changelogType = 'markdown'
             releaseType = System.getenv().CURSERELEASETYPE

build.properties

@@ -2,10 +2,10 @@
 # Last update: 24.6.2018. Orion: Update buildscript to match new system.
 #
 # Minecraft / Forge.
-minecraft_version=1.14.4
-forge_version=28.1.96
-mappings=20191202-1.14.3
+minecraft_version=1.15.1
+forge_version=30.0.36
+mappings=20190719-1.14.3
 # Dependencies
-structurize_version=0.10.203-ALPHA
-jei_version=6.0.0.18
+structurize_version=0.10.210-ALPHA
+jei_version=6.0.0.1
 

gradle.properties

@@ -1,4 +1,4 @@
 # Sets default memory used for gradle commands. Can be overridden by user or command line properties.
 # This is required to provide enough memory for the Minecraft decompilation process.
-org.gradle.jvmargs=-Xmx4G
-org.gradle.daemon=false
+org.gradle.jvmargs=-Xmx3G
+org.gradle.daemon=false

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,5 @@
-#Fri Jul 19 15:33:38 BRT 2019
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.9-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.9-bin.zip

src/api/java/com/minecolonies/api/util/CompatibilityUtils.java

@@ -7,7 +7,7 @@
 /**
  * This class group method use to insure compatibility between minecraft version.
  * <p>
- * This is the 1.14 version
+ * This is the 1.15 version
  */
 public final class CompatibilityUtils
 {

src/api/java/com/minecolonies/api/util/constant/Constants.java

@@ -12,7 +12,7 @@ public final class Constants
     public static final String MOD_NAME                         = "MineColonies";
     public static final String VERSION                          = "@VERSION@";
     public static final String FORGE_VERSION                    = "required-after:Forge@[14.22.0.2459,)";
-    public static final String MC_VERSION                       = "[1.12,1.13,1.14]";
+    public static final String MC_VERSION                       = "[1.12,1.13,1.14,1.15]";
     public static final String CLIENT_PROXY_LOCATION            = "com.minecolonies.coremod.proxy.ClientProxy";
     public static final String SERVER_PROXY_LOCATION            = "com.minecolonies.coremod.proxy.ServerProxy";
     public static final String CONFIG_GUI_LOCATION              = "com.minecolonies.coremod.client.gui.GuiFactory";

src/main/resources/META-INF/mods.toml

@@ -6,7 +6,7 @@
 # The name of the mod loader type to load - for regular FML @Mod mods it should be javafml
 modLoader="javafml" #mandatory
 # A version range to match for said mod loader - for regular FML @Mod it will be the forge version
-loaderVersion="[27,)" #mandatory (27 is current forge version)
+loaderVersion="[30,)" #mandatory (27 is current forge version)
 # A URL to refer people to when problems occur with this mod
 issueTrackerURL="https://github.com/ldtteam/minecolonies/issues/new" #optional
 # A list of mods - how many allowed here is determined by the individual mod loader
@@ -38,7 +38,7 @@ MineColonies is a Colony/Town Simulator that adds many structures and NPC worker
     # Does this dependency have to exist - if not, ordering below must be specified
     mandatory=true #mandatory
     # The version range of the dependency
-    versionRange="[27,)" #mandatory
+    versionRange="[30,)" #mandatory
     # An ordering relationship for the dependency - BEFORE or AFTER required if the relationship is not mandatory
     ordering="NONE"
     # Side this dependency is applied on - BOTH, CLIENT or SERVER
@@ -47,7 +47,7 @@ MineColonies is a Colony/Town Simulator that adds many structures and NPC worker
 [[dependencies.minecolonies]]
     modId="minecraft"
     mandatory=true
-    versionRange="[1.14.4]"
+    versionRange="[1.15.1]"
     ordering="NONE"
     side="BOTH"
 # Here's another dependency