diff --git a/adapters/bukkit/plugin/build.gradle b/adapters/bukkit/plugin/build.gradle index f5033c170..ad15d0dc9 100644 --- a/adapters/bukkit/plugin/build.gradle +++ b/adapters/bukkit/plugin/build.gradle @@ -3,7 +3,7 @@ def mainClass = 'art.arcane.iris.Iris' def bootstrapperClass = 'art.arcane.iris.IrisBootstrap' String volmLibCoordinate = providers.gradleProperty('volmLibCoordinate') - .orElse('com.github.VolmitSoftware:VolmLib:e6574cf814b3dd670385a4d632a63fde2038e186') + .orElse('com.github.VolmitSoftware:VolmLib:master-SNAPSHOT') .get() dependencies { diff --git a/adapters/fabric/build.gradle b/adapters/fabric/build.gradle index 470d91077..c989041c2 100644 --- a/adapters/fabric/build.gradle +++ b/adapters/fabric/build.gradle @@ -28,10 +28,10 @@ plugins { Properties rootProperties = new Properties() file('../../gradle.properties').withInputStream { InputStream stream -> rootProperties.load(stream) } -String irisVersion = providers.gradleProperty('irisVersion').getOrElse(rootProperties.getProperty('irisVersion', '4.0.0-26.2')) +String irisVersion = providers.gradleProperty('irisVersion').getOrElse(rootProperties.getProperty('irisVersion', '4.1.0-26.2')) String minecraftVersion = providers.gradleProperty('minecraftVersion').getOrElse(rootProperties.getProperty('minecraftVersion', '26.2')) String fabricLoaderVersion = providers.gradleProperty('fabricLoaderVersion').getOrElse(rootProperties.getProperty('fabricLoaderVersion', '0.19.3')) -String volmLibCoordinate = providers.gradleProperty('volmLibCoordinate').getOrElse(rootProperties.getProperty('volmLibCoordinate', 'com.github.VolmitSoftware:VolmLib:e6574cf814b3dd670385a4d632a63fde2038e186')) +String volmLibCoordinate = providers.gradleProperty('volmLibCoordinate').getOrElse(rootProperties.getProperty('volmLibCoordinate', 'com.github.VolmitSoftware:VolmLib:master-SNAPSHOT')) Closure irisArtifactName = { String platform, String targetVersion -> return "Iris v${project.version} [${platform}] ${targetVersion}.jar" } diff --git a/adapters/forge/build.gradle b/adapters/forge/build.gradle index a8d6c4baa..5dab53473 100644 --- a/adapters/forge/build.gradle +++ b/adapters/forge/build.gradle @@ -28,10 +28,10 @@ plugins { Properties rootProperties = new Properties() file('../../gradle.properties').withInputStream { InputStream stream -> rootProperties.load(stream) } -String irisVersion = providers.gradleProperty('irisVersion').getOrElse(rootProperties.getProperty('irisVersion', '4.0.0-26.2')) +String irisVersion = providers.gradleProperty('irisVersion').getOrElse(rootProperties.getProperty('irisVersion', '4.1.0-26.2')) String minecraftVersion = providers.gradleProperty('minecraftVersion').getOrElse(rootProperties.getProperty('minecraftVersion', '26.2')) String forgeVersion = providers.gradleProperty('forgeVersion').getOrElse(rootProperties.getProperty('forgeVersion', '26.2-65.1.1')) -String volmLibCoordinate = providers.gradleProperty('volmLibCoordinate').getOrElse(rootProperties.getProperty('volmLibCoordinate', 'com.github.VolmitSoftware:VolmLib:e6574cf814b3dd670385a4d632a63fde2038e186')) +String volmLibCoordinate = providers.gradleProperty('volmLibCoordinate').getOrElse(rootProperties.getProperty('volmLibCoordinate', 'com.github.VolmitSoftware:VolmLib:master-SNAPSHOT')) Closure loaderDisplayVersion = { String loaderVersion -> String coordinatePrefix = "${minecraftVersion}-" if (loaderVersion.startsWith(coordinatePrefix)) { diff --git a/adapters/neoforge/build.gradle b/adapters/neoforge/build.gradle index 83bc6a8e7..c721e1c16 100644 --- a/adapters/neoforge/build.gradle +++ b/adapters/neoforge/build.gradle @@ -28,10 +28,10 @@ plugins { Properties rootProperties = new Properties() file('../../gradle.properties').withInputStream { InputStream stream -> rootProperties.load(stream) } -String irisVersion = providers.gradleProperty('irisVersion').getOrElse(rootProperties.getProperty('irisVersion', '4.0.0-26.2')) +String irisVersion = providers.gradleProperty('irisVersion').getOrElse(rootProperties.getProperty('irisVersion', '4.1.0-26.2')) String minecraftVersion = providers.gradleProperty('minecraftVersion').getOrElse(rootProperties.getProperty('minecraftVersion', '26.2')) String neoForgeVersion = providers.gradleProperty('neoForgeVersion').getOrElse(rootProperties.getProperty('neoForgeVersion', '26.2.0.59')) -String volmLibCoordinate = providers.gradleProperty('volmLibCoordinate').getOrElse(rootProperties.getProperty('volmLibCoordinate', 'com.github.VolmitSoftware:VolmLib:e6574cf814b3dd670385a4d632a63fde2038e186')) +String volmLibCoordinate = providers.gradleProperty('volmLibCoordinate').getOrElse(rootProperties.getProperty('volmLibCoordinate', 'com.github.VolmitSoftware:VolmLib:master-SNAPSHOT')) Closure irisArtifactName = { String platform, String targetVersion -> return "Iris v${project.version} [${platform}] ${targetVersion}.jar" } diff --git a/build.gradle b/build.gradle index cd0e144fb..db68c4a91 100644 --- a/build.gradle +++ b/build.gradle @@ -39,7 +39,7 @@ plugins { } group = 'art.arcane' -version = providers.gradleProperty('irisVersion').getOrElse('4.0.0-26.2') +version = providers.gradleProperty('irisVersion').getOrElse('4.1.0-26.2') project(':core') { group = 'art.arcane' @@ -52,7 +52,7 @@ String fabricLoaderVersion = providers.gradleProperty('fabricLoaderVersion').get String forgeVersion = providers.gradleProperty('forgeVersion').getOrElse('26.2-65.1.1') String neoForgeVersion = providers.gradleProperty('neoForgeVersion').getOrElse('26.2.0.59') String volmLibCoordinate = providers.gradleProperty('volmLibCoordinate') - .orElse('com.github.VolmitSoftware:VolmLib:e6574cf814b3dd670385a4d632a63fde2038e186') + .orElse('com.github.VolmitSoftware:VolmLib:master-SNAPSHOT') .get() String useLocalVolmLib = providers.gradleProperty('useLocalVolmLib').getOrElse('true') String localVolmLibDirectory = providers.gradleProperty('localVolmLibDirectory').getOrNull() diff --git a/core/build.gradle b/core/build.gradle index d63e189b0..c21c13dc4 100644 --- a/core/build.gradle +++ b/core/build.gradle @@ -35,7 +35,7 @@ plugins { def lib = 'art.arcane.iris.util' String volmLibCoordinate = providers.gradleProperty('volmLibCoordinate') - .orElse('com.github.VolmitSoftware:VolmLib:e6574cf814b3dd670385a4d632a63fde2038e186') + .orElse('com.github.VolmitSoftware:VolmLib:master-SNAPSHOT') .get() String languageSourceReference = providers.gradleProperty('languageRevision').orElse('master').get() diff --git a/core/src/main/java/art/arcane/iris/core/pack/PackDownloader.java b/core/src/main/java/art/arcane/iris/core/pack/PackDownloader.java index 67512a170..120c61386 100644 --- a/core/src/main/java/art/arcane/iris/core/pack/PackDownloader.java +++ b/core/src/main/java/art/arcane/iris/core/pack/PackDownloader.java @@ -63,10 +63,10 @@ import java.util.zip.ZipInputStream; public final class PackDownloader { private static final String DEFAULT_OVERWORLD_PACK = "overworld"; private static final String DEFAULT_OVERWORLD_URL = - "https://github.com/IrisDimensions/overworld/releases/download/4002/overworld.zip"; + "https://github.com/IrisDimensions/overworld/releases/latest/download/overworld.zip"; private static final String UNDERWORLD_PACK = "underworld"; private static final String UNDERWORLD_URL = - "https://github.com/IrisDimensions/underworld/releases/download/1005/underworld.zip"; + "https://github.com/IrisDimensions/underworld/releases/latest/download/underworld.zip"; private static final List BUILT_IN_PACK_KEYS = List.of(DEFAULT_OVERWORLD_PACK, UNDERWORLD_PACK); private static final Map BUILT_IN_PACK_URLS = Map.of( DEFAULT_OVERWORLD_PACK, DEFAULT_OVERWORLD_URL, diff --git a/core/src/test/java/art/arcane/iris/core/pack/PackDownloaderTest.java b/core/src/test/java/art/arcane/iris/core/pack/PackDownloaderTest.java index 7bfab5029..1a72c20e1 100644 --- a/core/src/test/java/art/arcane/iris/core/pack/PackDownloaderTest.java +++ b/core/src/test/java/art/arcane/iris/core/pack/PackDownloaderTest.java @@ -107,7 +107,7 @@ public class PackDownloaderTest { @Test public void resolvesDefaultOverworldStableRelease() { assertEquals( - "https://github.com/IrisDimensions/overworld/releases/download/4002/overworld.zip", + "https://github.com/IrisDimensions/overworld/releases/latest/download/overworld.zip", PackDownloader.builtInPackUrl("overworld") ); assertTrue(PackDownloader.isDefaultOverworld("overworld")); @@ -118,7 +118,7 @@ public class PackDownloaderTest { @Test public void resolvesUnderworldStableRelease() { assertEquals( - "https://github.com/IrisDimensions/underworld/releases/download/1005/underworld.zip", + "https://github.com/IrisDimensions/underworld/releases/latest/download/underworld.zip", PackDownloader.builtInPackUrl("underworld") ); assertTrue(PackDownloader.isBuiltInPack("underworld")); diff --git a/gradle.properties b/gradle.properties index ac2f45f37..0138f76d6 100644 --- a/gradle.properties +++ b/gradle.properties @@ -23,11 +23,11 @@ org.gradle.configureondemand=false nmsTools.repo-url=https://repo.codemc.org/repository/nms/ nmsTools.specialSourceVersion=1.11.4 -irisVersion=4.0.1-26.2 +irisVersion=4.1.0-26.2 minecraftVersion=26.2 # Bukkit plugin api-version: lowest supported Minecraft release line so one artifact loads on 26.1.2 and 26.2 apiVersion=26.1 fabricLoaderVersion=0.19.3 forgeVersion=26.2-65.1.1 neoForgeVersion=26.2.0.59 -volmLibCoordinate=com.github.VolmitSoftware:VolmLib:e6574cf814b3dd670385a4d632a63fde2038e186 +volmLibCoordinate=com.github.VolmitSoftware:VolmLib:master-SNAPSHOT diff --git a/probe/build.gradle b/probe/build.gradle index 732d28431..502539bc4 100644 --- a/probe/build.gradle +++ b/probe/build.gradle @@ -10,7 +10,7 @@ application { } String volmLibCoordinate = providers.gradleProperty('volmLibCoordinate') - .orElse('com.github.VolmitSoftware:VolmLib:e6574cf814b3dd670385a4d632a63fde2038e186') + .orElse('com.github.VolmitSoftware:VolmLib:master-SNAPSHOT') .get() dependencies {