switch to recent Forge and Kotlin versions

This commit is contained in:
octarine-noise
2016-09-05 22:43:30 +02:00
parent 4a4d39b523
commit f0a447bbbb
2 changed files with 5 additions and 6 deletions

View File

@@ -2,11 +2,11 @@ apply plugin: "net.minecraftforge.gradle.forge"
apply plugin: 'kotlin' apply plugin: 'kotlin'
group = 'com.github.octarine-noise' group = 'com.github.octarine-noise'
version = "2.1.0" version = "2.1.1"
archivesBaseName = rootProject.name + '-MC1.10' archivesBaseName = rootProject.name + '-MC1.10.2'
buildscript { buildscript {
ext.kotlin_version = '1.0.2' ext.kotlin_version = '1.0.3'
repositories { repositories {
mavenCentral() mavenCentral()
maven { maven {
@@ -32,8 +32,8 @@ dependencies {
shade "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version" shade "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version"
} }
minecraft { minecraft {
version = '1.10-12.18.0.2000-1.10.0' version = '1.10.2-12.18.1.2075'
mappings = 'snapshot_20160627' mappings = 'snapshot_20160905'
runDir = 'run' runDir = 'run'
} }

View File

@@ -18,7 +18,6 @@ class OffsetBlockAccess(val original: IBlockAccess, val modded: BlockPos, val ta
inline fun actualPos(pos: BlockPos?) = inline fun actualPos(pos: BlockPos?) =
if (pos != null && pos.x == modded.x && pos.y == modded.y && pos.z == modded.z) target else pos if (pos != null && pos.x == modded.x && pos.y == modded.y && pos.z == modded.z) target else pos
override fun extendedLevelsInChunkCache() = original.extendedLevelsInChunkCache()
override fun getBiome(pos: BlockPos?) = original.getBiome(actualPos(pos)) override fun getBiome(pos: BlockPos?) = original.getBiome(actualPos(pos))
override fun getBlockState(pos: BlockPos?) = original.getBlockState(actualPos(pos)) override fun getBlockState(pos: BlockPos?) = original.getBlockState(actualPos(pos))
override fun getCombinedLight(pos: BlockPos?, lightValue: Int) = original.getCombinedLight(actualPos(pos), lightValue) override fun getCombinedLight(pos: BlockPos?, lightValue: Int) = original.getCombinedLight(actualPos(pos), lightValue)