diff --git a/addon.gradle b/addon.gradle index 61e6365..17e2283 100644 --- a/addon.gradle +++ b/addon.gradle @@ -1,14 +1,7 @@ apply plugin: 'org.jetbrains.kotlin.jvm' -apply plugin: 'com.github.gmazzo.buildconfig' compileKotlin { kotlinOptions { jvmTarget = 1.8 } } - -buildConfig { - packageName("com.projecturanus.betterp2p") - buildConfigField('String', 'MODVER', "\"${project.modVersion}\"") - useKotlinOutput { topLevelConstants = true } -} diff --git a/dependencies.gradle b/dependencies.gradle index 7b54813..b48c64f 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -1,7 +1,8 @@ // Add your dependencies here dependencies { - api('com.github.GTNewHorizons:Applied-Energistics-2-Unofficial:rv3-beta-913-GTNH:dev') + api('com.github.GTNewHorizons:Applied-Energistics-2-Unofficial:rv3-beta-983-GTNH:dev') + compileOnly('com.github.GTNewHorizons:GTNHLib:0.11.14:dev') api('com.github.GTNewHorizons:Forgelin:2.0.3-GTNH') api('com.github.GTNewHorizons:BuildCraft:7.1.57:dev') // Some optional P2P tunnel support diff --git a/gradle.properties b/gradle.properties index 27f4070..f6d79b0 100644 --- a/gradle.properties +++ b/gradle.properties @@ -74,10 +74,10 @@ enableGenericInjection = false # Generate a class with a String field for the mod version named as defined below. # If generateGradleTokenClass is empty or not missing, no such class will be generated. # If gradleTokenVersion is empty or missing, the field will not be present in the class. -generateGradleTokenClass = +generateGradleTokenClass = com.projecturanus.betterp2p.BuildTags # Name of the token containing the project's current version to generate/replace. -gradleTokenVersion = GRADLETOKEN_VERSION +gradleTokenVersion = VERSION # [DEPRECATED] Mod ID replacement token. gradleTokenModId = @@ -94,7 +94,7 @@ gradleTokenGroupName = # The string's content will be replaced with your mod's version when compiled. You should use this to specify your mod's # version in @Mod([...], version = VERSION, [...]). # Leave these properties empty to skip individual token replacements. -replaceGradleTokenInFile = BetterP2P.kt +replaceGradleTokenInFile = # In case your mod provides an API for other mods to implement you may declare its package here. Otherwise, you can # leave this property empty. diff --git a/gradle/gradle-daemon-jvm.properties b/gradle/gradle-daemon-jvm.properties index 58206c6..fa4ed51 100644 --- a/gradle/gradle-daemon-jvm.properties +++ b/gradle/gradle-daemon-jvm.properties @@ -1,12 +1,12 @@ #This file is generated by updateDaemonJvm -toolchainUrl.FREE_BSD.AARCH64=https\://api.foojay.io/disco/v3.0/ids/1630f7ebef05444cb27a2709ea0249b3/redirect +toolchainUrl.FREE_BSD.AARCH64=https\://api.foojay.io/disco/v3.0/ids/cf726b4a1c84b50457225f9bba6d7650/redirect toolchainUrl.FREE_BSD.X86_64=https\://api.foojay.io/disco/v3.0/ids/fa1e318c287360478e3c83a9a3ef1007/redirect -toolchainUrl.LINUX.AARCH64=https\://api.foojay.io/disco/v3.0/ids/1630f7ebef05444cb27a2709ea0249b3/redirect +toolchainUrl.LINUX.AARCH64=https\://api.foojay.io/disco/v3.0/ids/cf726b4a1c84b50457225f9bba6d7650/redirect toolchainUrl.LINUX.X86_64=https\://api.foojay.io/disco/v3.0/ids/fa1e318c287360478e3c83a9a3ef1007/redirect toolchainUrl.MAC_OS.AARCH64=https\://api.foojay.io/disco/v3.0/ids/c2dd35c9d0aaf0ba6ad0791320f99dfc/redirect toolchainUrl.MAC_OS.X86_64=https\://api.foojay.io/disco/v3.0/ids/e5810bd7fd1f8a586644409d395a7e55/redirect -toolchainUrl.UNIX.AARCH64=https\://api.foojay.io/disco/v3.0/ids/1630f7ebef05444cb27a2709ea0249b3/redirect +toolchainUrl.UNIX.AARCH64=https\://api.foojay.io/disco/v3.0/ids/cf726b4a1c84b50457225f9bba6d7650/redirect toolchainUrl.UNIX.X86_64=https\://api.foojay.io/disco/v3.0/ids/fa1e318c287360478e3c83a9a3ef1007/redirect toolchainUrl.WINDOWS.AARCH64=https\://api.foojay.io/disco/v3.0/ids/7b3c4877c0749019e6805bb61e421497/redirect -toolchainUrl.WINDOWS.X86_64=https\://api.foojay.io/disco/v3.0/ids/8e1d9ee5d0f13e442218f6884a306da1/redirect +toolchainUrl.WINDOWS.X86_64=https\://api.foojay.io/disco/v3.0/ids/d76df094a9cbbabd3b08251f9e61444a/redirect toolchainVersion=25 diff --git a/settings.gradle b/settings.gradle index 407aea2..7371c58 100644 --- a/settings.gradle +++ b/settings.gradle @@ -17,7 +17,7 @@ pluginManagement { } plugins { - id 'com.gtnewhorizons.gtnhsettingsconvention' version '2.0.24' + id 'com.gtnewhorizons.gtnhsettingsconvention' version '2.0.26' } diff --git a/src/main/java/com/projecturanus/betterp2p/BetterP2P.kt b/src/main/java/com/projecturanus/betterp2p/BetterP2P.kt index e3d6fe0..b8f482d 100644 --- a/src/main/java/com/projecturanus/betterp2p/BetterP2P.kt +++ b/src/main/java/com/projecturanus/betterp2p/BetterP2P.kt @@ -17,10 +17,8 @@ const val MODID = "betterp2p" /** * Better P2P is created by LasmGratel. * GlodBlock backported this to 1.7.10 - * - * MODVER below is handled by gradle, ignore IDE errors. */ -@Mod(modid = MODID, version = MODVER, modLanguageAdapter = "net.shadowfacts.forgelin.KotlinAdapter", dependencies = "required-after:appliedenergistics2@[rv3-beta-238,); required-after:forgelin;") +@Mod(modid = MODID, version = BuildTags.VERSION, modLanguageAdapter = "net.shadowfacts.forgelin.KotlinAdapter", dependencies = "required-after:appliedenergistics2@[rv3-beta-238,); required-after:forgelin;") object BetterP2P { lateinit var logger: Logger diff --git a/src/main/java/com/projecturanus/betterp2p/client/gui/widget/WidgetP2PColumn.kt b/src/main/java/com/projecturanus/betterp2p/client/gui/widget/WidgetP2PColumn.kt index 3fd6915..b247223 100644 --- a/src/main/java/com/projecturanus/betterp2p/client/gui/widget/WidgetP2PColumn.kt +++ b/src/main/java/com/projecturanus/betterp2p/client/gui/widget/WidgetP2PColumn.kt @@ -1,6 +1,6 @@ package com.projecturanus.betterp2p.client.gui.widget -import appeng.core.localization.GuiColors +import appeng.core.localization.ColorUtils import com.projecturanus.betterp2p.BetterP2P import com.projecturanus.betterp2p.client.gui.GuiAdvancedMemoryCard import com.projecturanus.betterp2p.client.gui.InfoList @@ -173,7 +173,8 @@ class WidgetP2PColumn(private val gui: GuiAdvancedMemoryCard, it.y + 1, it.x + 50 + 160, it.y + 1 + 12, - GuiColors.SearchboxFocused.color) + ColorUtils.searchboxFocused.color + ) } } }