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

Merge branch 'kotlin-1.8' into kotlin-1.8.8

Browse Source
This commit is contained in:
octarine-noise
2016-02-21 10:39:14 +01:00
parent 662b4f50f0 7393fed5fd
commit f68f0e5edd
13 changed files with 22 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/kotlin/mods/betterfoliage/client/config/BlockMatcher.kt
View File

@@ -22,8 +22,8 @@ import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
*/
class BlockMatcher(val domain: String, val path: String) : ConfigPropertyBase() {
val blackList = linkedListOf<Class<*>>()
val whiteList = linkedListOf<Class<*>>()
val blackList = mutableListOf<Class<*>>()
val whiteList = mutableListOf<Class<*>>()
val blockIDs = hashSetOf<Int>()
var blacklistProperty: Property? = null
var whitelistProperty: Property? = null

2
src/main/kotlin/mods/betterfoliage/client/render/EntityRisingSoulFX.kt
View File

@@ -19,7 +19,7 @@ import java.util.*
class EntityRisingSoulFX(world: World, pos: BlockPos) :
AbstractEntityFX(world, pos.x.toDouble() + 0.5, pos.y.toDouble() + 1.0, pos.z.toDouble() + 0.5) {
val particleTrail: Deque<Double3> = linkedListOf()
val particleTrail: Deque<Double3> = LinkedList<Double3>()
val initialPhase = rand.nextInt(64)
init {

2
src/main/kotlin/mods/betterfoliage/client/render/RenderLeaves.kt
View File

@@ -25,7 +25,7 @@ class RenderLeaves : AbstractBlockRenderingHandler(BetterFoliageMod.MOD_ID) {
val leavesModel = model {
verticalRectangle(x1 = -0.5, z1 = 0.5, x2 = 0.5, z2 = -0.5, yBottom = -0.5 * 1.41, yTop = 0.5 * 1.41)
.setAoShader(edgeOrientedAuto(corner = cornerAo(Axis.Y)))
.setAoShader(edgeOrientedAuto(corner = cornerAoMaxGreen))
.setFlatShader(FlatOffset(Int3.zero))
.scale(Config.leaves.size)
.toCross(UP).addAll()

2
src/main/kotlin/mods/betterfoliage/client/texture/LeafGenerator.kt
View File

@@ -21,7 +21,7 @@ class LeafGenerator(domain: String) : TextureGenerator(domain) {
val leafType = params["type"] ?: "default"
val handDrawnLoc = target.second.stripStart("textures/").stripStart("blocks/").let {
ResourceLocation(BetterFoliageMod.DOMAIN, "textures/blocks/${it.resourceDomain}/${it.resourcePath}")
ResourceLocation(BetterFoliageMod.DOMAIN, "${it.resourceDomain}/textures/blocks/${it.resourcePath}")
}
resourceManager[handDrawnLoc]?.loadImage()?.let { return it }

2
src/main/kotlin/mods/betterfoliage/client/texture/TextureMatcher.kt
View File

@@ -17,7 +17,7 @@ class TextureMatcher() {
}
}
val mappings: MutableList<Mapping> = linkedListOf()
val mappings: MutableList<Mapping> = mutableListOf()
fun getType(icon: TextureAtlasSprite): String? = mappings.filter { it.matches(icon) }.map { it.type }.firstOrNull()