diff --git a/Common/src/main/java/com/almostreliable/unified/api/ModConstants.java b/Common/src/main/java/com/almostreliable/unified/api/ModConstants.java index 48323105..4bf5ad84 100644 --- a/Common/src/main/java/com/almostreliable/unified/api/ModConstants.java +++ b/Common/src/main/java/com/almostreliable/unified/api/ModConstants.java @@ -1,33 +1,31 @@ package com.almostreliable.unified.api; @SuppressWarnings("SpellCheckingInspection") -public final class ModConstants { +public interface ModConstants { // recipe viewers - public static final String JEI = "jei"; - public static final String REI = "roughlyenoughitems"; + String JEI = "jei"; + String REI = "roughlyenoughitems"; // custom unify handlers - public static final String AD_ASTRA = "ad_astra"; - public static final String APPLIED_ENERGISTICS = "ae2"; - public static final String ALLOY_FORGERY = "alloy_forgery"; - public static final String AMETHYST_IMBUEMENT = "amethyst_imbuement"; - public static final String ARS_CREO = "ars_creo"; - public static final String ARS_ELEMENTAL = "ars_elemental"; - public static final String ARS_NOUVEAU = "ars_nouveau"; - public static final String ARS_SCALAES = "ars_scalaes"; - public static final String BLOOD_MAGIC = "bloodmagic"; - public static final String CYCLIC = "cyclic"; - public static final String ENDER_IO = "enderio"; - public static final String GREGTECH_MODERN = "gtceu"; - public static final String IMMERSIVE_ENGINEERING = "immersiveengineering"; - public static final String INTEGRATED_DYNAMICS = "integrateddynamics"; - public static final String MEKANISM = "mekanism"; - public static final String MODERN_INDUSTRIALIZATION = "modern_industrialization"; - public static final String WOODENCOG = "woodencog"; - public static final String TERRAFIRMACRAFT = "tfc"; - public static final String ADVANCED_TFC_TECH = "advancedtfctech"; - public static final String FIRMALIFE = "firmalife"; - public static final String TFC_WATER_FLASKS = "waterflasks"; - - private ModConstants() {} + String AD_ASTRA = "ad_astra"; + String APPLIED_ENERGISTICS = "ae2"; + String ALLOY_FORGERY = "alloy_forgery"; + String AMETHYST_IMBUEMENT = "amethyst_imbuement"; + String ARS_CREO = "ars_creo"; + String ARS_ELEMENTAL = "ars_elemental"; + String ARS_NOUVEAU = "ars_nouveau"; + String ARS_SCALAES = "ars_scalaes"; + String BLOOD_MAGIC = "bloodmagic"; + String CYCLIC = "cyclic"; + String ENDER_IO = "enderio"; + String GREGTECH_MODERN = "gtceu"; + String IMMERSIVE_ENGINEERING = "immersiveengineering"; + String INTEGRATED_DYNAMICS = "integrateddynamics"; + String MEKANISM = "mekanism"; + String MODERN_INDUSTRIALIZATION = "modern_industrialization"; + String WOODENCOG = "woodencog"; + String TERRAFIRMACRAFT = "tfc"; + String ADVANCED_TFC_TECH = "advancedtfctech"; + String FIRMALIFE = "firmalife"; + String TFC_WATER_FLASKS = "waterflasks"; } diff --git a/Fabric/build.gradle.kts b/Fabric/build.gradle.kts index 0140a966..437312a9 100644 --- a/Fabric/build.gradle.kts +++ b/Fabric/build.gradle.kts @@ -7,7 +7,7 @@ val reiVersion: String by project val emiVersion: String by project plugins { - id("com.github.johnrengelman.shadow") version "8.1.1" + id("com.gradleup.shadow") version "8.+" } architectury { diff --git a/Forge/build.gradle.kts b/Forge/build.gradle.kts index 0951da02..e5a34c9f 100644 --- a/Forge/build.gradle.kts +++ b/Forge/build.gradle.kts @@ -10,7 +10,7 @@ val emiVersion: String by project val extraModsPrefix = "extra-mods" plugins { - id("com.github.johnrengelman.shadow") version "8.1.1" + id("com.gradleup.shadow") version "8.+" } architectury { diff --git a/build.gradle.kts b/build.gradle.kts index db5a4037..66f4c96c 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -23,8 +23,8 @@ val githubUser: String by project plugins { id("architectury-plugin") version "3.4.+" - id("dev.architectury.loom") version "1.4.+" apply false - id("com.github.johnrengelman.shadow") version "8.1.1" apply false + id("dev.architectury.loom") version "1.9.+" apply false + id("com.gradleup.shadow") version "8.+" apply false java `maven-publish` } @@ -182,7 +182,7 @@ subprojects { return@subprojects } - apply(plugin = "com.github.johnrengelman.shadow") + apply(plugin = "com.gradleup.shadow") extensions.configure { runs { diff --git a/gradle.properties b/gradle.properties index 38f33825..41941092 100644 --- a/gradle.properties +++ b/gradle.properties @@ -21,7 +21,7 @@ junitVersion = 5.9.0 parchmentVersion = 2023.09.03 # Mod Dependencies -jeiVersion = 15.1.0.18 +jeiVersion = 15.20.0.106 reiVersion = 12.0.625 emiVersion = 1.1.2 diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 3c603488..5ceb4092 100644 --- 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-8.5-bin.zip +distributionUrl = https\://services.gradle.org/distributions/gradle-8.14-bin.zip zipStoreBase = GRADLE_USER_HOME zipStorePath = wrapper/dists