Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Updated dependencies for 1.12.2 port. #23

Open
wants to merge 1 commit into
base: mc1.11.2
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
50 changes: 0 additions & 50 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down Expand Up @@ -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'
}
}
}
13 changes: 6 additions & 7 deletions build.properties
Original file line number Diff line number Diff line change
@@ -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

2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 2 additions & 0 deletions src/net/bdew/covers/compat/jei/CoversJeiPlugin.scala
Original file line number Diff line number Diff line change
Expand Up @@ -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) = ???
})
}

Expand Down
6 changes: 3 additions & 3 deletions src/net/bdew/covers/rendering/MicroblockColorProvider.scala
Original file line number Diff line number Diff line change
Expand Up @@ -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
}

Expand Down