diff --git a/build.gradle b/build.gradle index b10b330..7cac2c5 100644 --- a/build.gradle +++ b/build.gradle @@ -19,13 +19,11 @@ buildscript { } dependencies { classpath 'net.minecraftforge.gradle:ForgeGradle:2.3-SNAPSHOT' - classpath "gradle.plugin.com.matthewprenger:CurseGradle:1.0.9" } } apply plugin: 'scala' apply plugin: 'net.minecraftforge.gradle.forge' -apply plugin: 'com.matthewprenger.cursegradle' file "build.properties" withReader { def prop = new Properties() @@ -149,51 +147,3 @@ artifacts { archives deobfJar archives apiJar } - -apply plugin: 'maven-publish' - -publishing { - publications { - maven(MavenPublication) { - artifact deobfJar - artifact sourceJarReal - artifact apiJar - } - } - repositories { - maven { - url "file://var/www/maven" - } - } -} - -curseforge { - apiKey = project.hasProperty("curseForgeApiKey") ? project.curseForgeApiKey : "" - project { - id = config.curseforge.id - - releaseType = "alpha" - changelog = project.hasProperty("changelog") ? project.changelog : "No changelog available" - - addGameVersion config.minecraft.version - - mainArtifact(jar) { - displayName = "Covers ${simpleVersion} (MC ${config.minecraft.version})" - } - - addArtifact(deobfJar) { - displayName = "Covers ${simpleVersion} Deobfuscated (MC ${config.minecraft.version})" - } - - addArtifact(sourceJarReal) { - displayName = "Covers ${simpleVersion} Source (MC ${config.minecraft.version})" - } - - relations { - requiredLibrary 'bdlib' - requiredLibrary 'mcmultipart' - optionalLibrary 'waila' - optionalLibrary 'just-enough-items-jei' - } - } -} \ No newline at end of file diff --git a/build.properties b/build.properties index 4c52486..f762c23 100644 --- a/build.properties +++ b/build.properties @@ -1,10 +1,9 @@ covers.version=0.6.0 curseforge.id=242498 -bdlib.version=1.14.1.5 -minecraft.version=1.12 -minecraft.mappings=snapshot_20170624 -forge.version=14.21.1.2395 -jei.version=4.7.1.69 -hwyla.version=1.8.19-B33_1.12 +bdlib.version=1.14.3.10 +minecraft.version=1.12.2 +minecraft.mappings=snapshot_20171118 +forge.version=14.23.0.2546 +jei.version=4.8.0.114 +hwyla.version=1.8.22-B37_1.12 mcmultipart.version=2.2.2 - diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index a6aff76..a403cf3 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-2.14-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-4.3.1-bin.zip diff --git a/src/net/bdew/covers/compat/jei/CoversJeiPlugin.scala b/src/net/bdew/covers/compat/jei/CoversJeiPlugin.scala index 58ce376..ce42859 100644 --- a/src/net/bdew/covers/compat/jei/CoversJeiPlugin.scala +++ b/src/net/bdew/covers/compat/jei/CoversJeiPlugin.scala @@ -36,6 +36,8 @@ class CoversJeiPlugin extends IModPlugin { subtypeRegistry.registerSubtypeInterpreter(ItemCover, new ISubtypeInterpreter { override def getSubtypeInfo(itemStack: ItemStack): String = ItemCover.getData(itemStack).map(d => "%s/%s/%d".format(d.material.getRegistryName, d.shape.name, d.size)).orNull + + override def apply(itemStack: ItemStack) = ??? }) } diff --git a/src/net/bdew/covers/rendering/MicroblockColorProvider.scala b/src/net/bdew/covers/rendering/MicroblockColorProvider.scala index 8b91cdd..947dce4 100644 --- a/src/net/bdew/covers/rendering/MicroblockColorProvider.scala +++ b/src/net/bdew/covers/rendering/MicroblockColorProvider.scala @@ -39,9 +39,9 @@ object MicroblockColorProvider extends IBlockColor with IItemColor { } else -1 } - override def getColorFromItemstack(stack: ItemStack, tintIndex: Int): Int = { - ItemCover.getData(stack) map { data => - Client.blockColors.colorMultiplier(data.material.getDefaultState, null, null, tintIndex) + override def colorMultiplier(itemStack: ItemStack, index: Int) = { + ItemCover.getData(itemStack) map { data => + Client.blockColors.colorMultiplier(data.material.getDefaultState, null, null, index) } getOrElse -1 }