mirrors/Iris
1
0
Fork 0
mirror of https://github.com/VolmitSoftware/Iris.git synced 2026-10-12 03:24:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

BuildFix

Browse Source
This commit is contained in:
Brian Neumann-Fopiano
2026-09-03 16:38:23 -04:00
parent a368d42558
commit a771fa6856
10 changed files with 17 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
adapters/bukkit/plugin/build.gradle
+1 -1
View File
@@ -3,7 +3,7 @@ def mainClass = 'art.arcane.iris.Iris'
def bootstrapperClass = 'art.arcane.iris.IrisBootstrap' def bootstrapperClass = 'art.arcane.iris.IrisBootstrap'
String volmLibCoordinate = providers.gradleProperty('volmLibCoordinate') String volmLibCoordinate = providers.gradleProperty('volmLibCoordinate')
.orElse('com.github.VolmitSoftware:VolmLib:e6574cf814b3dd670385a4d632a63fde2038e186') .orElse('com.github.VolmitSoftware:VolmLib:master-SNAPSHOT')
.get() .get()
dependencies { dependencies {
adapters/fabric/build.gradle
+2 -2
View File
@@ -28,10 +28,10 @@ plugins {
Properties rootProperties = new Properties() Properties rootProperties = new Properties()
file('../../gradle.properties').withInputStream { InputStream stream -> rootProperties.load(stream) } 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 minecraftVersion = providers.gradleProperty('minecraftVersion').getOrElse(rootProperties.getProperty('minecraftVersion', '26.2'))
String fabricLoaderVersion = providers.gradleProperty('fabricLoaderVersion').getOrElse(rootProperties.getProperty('fabricLoaderVersion', '0.19.3')) 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<String> irisArtifactName = { String platform, String targetVersion -> Closure<String> irisArtifactName = { String platform, String targetVersion ->
return "Iris v${project.version} [${platform}] ${targetVersion}.jar" return "Iris v${project.version} [${platform}] ${targetVersion}.jar"
} }
adapters/forge/build.gradle
+2 -2
View File
@@ -28,10 +28,10 @@ plugins {
Properties rootProperties = new Properties() Properties rootProperties = new Properties()
file('../../gradle.properties').withInputStream { InputStream stream -> rootProperties.load(stream) } 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 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 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<String> loaderDisplayVersion = { String loaderVersion -> Closure<String> loaderDisplayVersion = { String loaderVersion ->
String coordinatePrefix = "${minecraftVersion}-" String coordinatePrefix = "${minecraftVersion}-"
if (loaderVersion.startsWith(coordinatePrefix)) { if (loaderVersion.startsWith(coordinatePrefix)) {
adapters/neoforge/build.gradle
+2 -2
View File
@@ -28,10 +28,10 @@ plugins {
Properties rootProperties = new Properties() Properties rootProperties = new Properties()
file('../../gradle.properties').withInputStream { InputStream stream -> rootProperties.load(stream) } 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 minecraftVersion = providers.gradleProperty('minecraftVersion').getOrElse(rootProperties.getProperty('minecraftVersion', '26.2'))
String neoForgeVersion = providers.gradleProperty('neoForgeVersion').getOrElse(rootProperties.getProperty('neoForgeVersion', '26.2.0.59')) 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<String> irisArtifactName = { String platform, String targetVersion -> Closure<String> irisArtifactName = { String platform, String targetVersion ->
return "Iris v${project.version} [${platform}] ${targetVersion}.jar" return "Iris v${project.version} [${platform}] ${targetVersion}.jar"
} }
build.gradle
+2 -2
View File
@@ -39,7 +39,7 @@ plugins {
} }
group = 'art.arcane' 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') { project(':core') {
group = 'art.arcane' 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 forgeVersion = providers.gradleProperty('forgeVersion').getOrElse('26.2-65.1.1')
String neoForgeVersion = providers.gradleProperty('neoForgeVersion').getOrElse('26.2.0.59') String neoForgeVersion = providers.gradleProperty('neoForgeVersion').getOrElse('26.2.0.59')
String volmLibCoordinate = providers.gradleProperty('volmLibCoordinate') String volmLibCoordinate = providers.gradleProperty('volmLibCoordinate')
.orElse('com.github.VolmitSoftware:VolmLib:e6574cf814b3dd670385a4d632a63fde2038e186') .orElse('com.github.VolmitSoftware:VolmLib:master-SNAPSHOT')
.get() .get()
String useLocalVolmLib = providers.gradleProperty('useLocalVolmLib').getOrElse('true') String useLocalVolmLib = providers.gradleProperty('useLocalVolmLib').getOrElse('true')
String localVolmLibDirectory = providers.gradleProperty('localVolmLibDirectory').getOrNull() String localVolmLibDirectory = providers.gradleProperty('localVolmLibDirectory').getOrNull()
core/build.gradle
+1 -1
View File
@@ -35,7 +35,7 @@ plugins {
def lib = 'art.arcane.iris.util' def lib = 'art.arcane.iris.util'
String volmLibCoordinate = providers.gradleProperty('volmLibCoordinate') String volmLibCoordinate = providers.gradleProperty('volmLibCoordinate')
.orElse('com.github.VolmitSoftware:VolmLib:e6574cf814b3dd670385a4d632a63fde2038e186') .orElse('com.github.VolmitSoftware:VolmLib:master-SNAPSHOT')
.get() .get()
String languageSourceReference = providers.gradleProperty('languageRevision').orElse('master').get() String languageSourceReference = providers.gradleProperty('languageRevision').orElse('master').get()
core/src/main/java/art/arcane/iris/core/pack/PackDownloader.java
+2 -2
View File
@@ -63,10 +63,10 @@ import java.util.zip.ZipInputStream;
public final class PackDownloader { public final class PackDownloader {
private static final String DEFAULT_OVERWORLD_PACK = "overworld"; private static final String DEFAULT_OVERWORLD_PACK = "overworld";
private static final String DEFAULT_OVERWORLD_URL = 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_PACK = "underworld";
private static final String UNDERWORLD_URL = 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<String> BUILT_IN_PACK_KEYS = List.of(DEFAULT_OVERWORLD_PACK, UNDERWORLD_PACK); private static final List<String> BUILT_IN_PACK_KEYS = List.of(DEFAULT_OVERWORLD_PACK, UNDERWORLD_PACK);
private static final Map<String, String> BUILT_IN_PACK_URLS = Map.of( private static final Map<String, String> BUILT_IN_PACK_URLS = Map.of(
DEFAULT_OVERWORLD_PACK, DEFAULT_OVERWORLD_URL, DEFAULT_OVERWORLD_PACK, DEFAULT_OVERWORLD_URL,
core/src/test/java/art/arcane/iris/core/pack/PackDownloaderTest.java
+2 -2
View File
@@ -107,7 +107,7 @@ public class PackDownloaderTest {
@Test @Test
public void resolvesDefaultOverworldStableRelease() { public void resolvesDefaultOverworldStableRelease() {
assertEquals( assertEquals(
"https://github.com/IrisDimensions/overworld/releases/download/4002/overworld.zip", "https://github.com/IrisDimensions/overworld/releases/latest/download/overworld.zip",
PackDownloader.builtInPackUrl("overworld") PackDownloader.builtInPackUrl("overworld")
); );
assertTrue(PackDownloader.isDefaultOverworld("overworld")); assertTrue(PackDownloader.isDefaultOverworld("overworld"));
@@ -118,7 +118,7 @@ public class PackDownloaderTest {
@Test @Test
public void resolvesUnderworldStableRelease() { public void resolvesUnderworldStableRelease() {
assertEquals( assertEquals(
"https://github.com/IrisDimensions/underworld/releases/download/1005/underworld.zip", "https://github.com/IrisDimensions/underworld/releases/latest/download/underworld.zip",
PackDownloader.builtInPackUrl("underworld") PackDownloader.builtInPackUrl("underworld")
); );
assertTrue(PackDownloader.isBuiltInPack("underworld")); assertTrue(PackDownloader.isBuiltInPack("underworld"));
gradle.properties
+2 -2
View File
@@ -23,11 +23,11 @@ org.gradle.configureondemand=false
nmsTools.repo-url=https://repo.codemc.org/repository/nms/ nmsTools.repo-url=https://repo.codemc.org/repository/nms/
nmsTools.specialSourceVersion=1.11.4 nmsTools.specialSourceVersion=1.11.4
irisVersion=4.0.1-26.2 irisVersion=4.1.0-26.2
minecraftVersion=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 # Bukkit plugin api-version: lowest supported Minecraft release line so one artifact loads on 26.1.2 and 26.2
apiVersion=26.1 apiVersion=26.1
fabricLoaderVersion=0.19.3 fabricLoaderVersion=0.19.3
forgeVersion=26.2-65.1.1 forgeVersion=26.2-65.1.1
neoForgeVersion=26.2.0.59 neoForgeVersion=26.2.0.59
volmLibCoordinate=com.github.VolmitSoftware:VolmLib:e6574cf814b3dd670385a4d632a63fde2038e186 volmLibCoordinate=com.github.VolmitSoftware:VolmLib:master-SNAPSHOT
probe/build.gradle
+1 -1
View File
@@ -10,7 +10,7 @@ application {
} }
String volmLibCoordinate = providers.gradleProperty('volmLibCoordinate') String volmLibCoordinate = providers.gradleProperty('volmLibCoordinate')
.orElse('com.github.VolmitSoftware:VolmLib:e6574cf814b3dd670385a4d632a63fde2038e186') .orElse('com.github.VolmitSoftware:VolmLib:master-SNAPSHOT')
.get() .get()
dependencies { dependencies {