StateMc/BetterFoliage
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

update Forge / Forgelin / Kotlin versions

Browse Source
This commit is contained in:
octarine-noise
2019-09-03 14:23:44 +02:00
parent ac015b12df
commit d96ac1c94c
5 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
build.gradle
View File

@@ -27,7 +27,7 @@ repositories {
} }
dependencies { dependencies {
compileOnly "net.shadowfacts:Forgelin:$forgelin_version" compile "net.shadowfacts:Forgelin:$forgelin_version"
} }
minecraft { minecraft {

6
gradle.properties
View File

@@ -4,8 +4,8 @@ jarName = BetterFoliage-MC1.12
version = 2.2.1 version = 2.2.1
mc_version = 1.12.2 mc_version = 1.12.2
forge_version = 14.23.5.2768 forge_version = 14.23.5.2844
mcp_mappings = stable_39 mcp_mappings = stable_39
kotlin_version = 1.2.41 kotlin_version = 1.3.40
forgelin_version = 1.6.0 forgelin_version = 1.8.3

2
src/main/kotlin/mods/betterfoliage/client/config/Config.kt
View File

@@ -198,7 +198,7 @@ object Config : DelegatingConfig(BetterFoliageMod.MOD_ID, BetterFoliageMod.DOMAI
blocks.leavesModels, blocks.leavesModels,
blocks.grassClasses, blocks.grassClasses,
blocks.grassModels, blocks.grassModels,
shortGrass["saturationThreshold"] shortGrass["saturationThreshold"]!!
) )
override fun onChange(event: ConfigChangedEvent.PostConfigChangedEvent) { override fun onChange(event: ConfigChangedEvent.PostConfigChangedEvent) {

7
src/main/kotlin/mods/octarinecore/client/render/AbstractBlockRenderingHandler.kt
View File

@@ -22,6 +22,7 @@ import net.minecraft.util.math.BlockPos
import net.minecraft.util.math.MathHelper import net.minecraft.util.math.MathHelper
import net.minecraft.world.IBlockAccess import net.minecraft.world.IBlockAccess
import net.minecraft.world.biome.Biome import net.minecraft.world.biome.Biome
import kotlin.math.abs
/** /**
* [ThreadLocal] instance of [BlockContext] representing the block being rendered. * [ThreadLocal] instance of [BlockContext] representing the block being rendered.
@@ -114,8 +115,8 @@ class BlockContext {
/** Get the distance of the block from the camera (player). */ /** Get the distance of the block from the camera (player). */
val cameraDistance: Int get() { val cameraDistance: Int get() {
val camera = Minecraft.getMinecraft().renderViewEntity ?: return 0 val camera = Minecraft.getMinecraft().renderViewEntity ?: return 0
return Math.abs(pos.x - MathHelper.floor(camera.posX)) + return abs(pos.x - MathHelper.floor(camera.posX)) +
Math.abs(pos.y - MathHelper.floor(camera.posY)) + abs(pos.y - MathHelper.floor(camera.posY)) +
Math.abs(pos.z - MathHelper.floor(camera.posZ)) abs(pos.z - MathHelper.floor(camera.posZ))
} }
} }

2
src/main/kotlin/mods/octarinecore/common/config/DelegatingConfig.kt
View File

@@ -92,7 +92,7 @@ abstract class DelegatingConfig(val modId: String, val langPrefix: String) {
* Returns true if any of the given configuration elements have changed. * Returns true if any of the given configuration elements have changed.
* Supports both categories and * Supports both categories and
*/ */
fun hasChanged(elements: List<*>): Boolean { fun hasChanged(elements: List<ConfigPropertyBase>): Boolean {
reflectNestedObjects.forEach { category -> reflectNestedObjects.forEach { category ->
if (category.second in elements && config?.getCategory(category.first)?.hasChanged() ?: false) return true if (category.second in elements && config?.getCategory(category.first)?.hasChanged() ?: false) return true
} }