From 5ab345b67ee89f7c993e04106b26c6de21764fc2 Mon Sep 17 00:00:00 2001
From: chylex <contact@chylex.com>
Date: Sun, 10 Feb 2019 14:59:18 +0100
Subject: [PATCH] Minor formatting fixes and updates
---
src/main/java/chylex/hee/game/block/fluid/FluidBase.kt | 3 +--
.../chylex/hee/game/particle/base/ParticleBaseEnergy.kt | 2 +-
src/main/java/chylex/hee/proxy/ModClientProxy.kt | 6 +++---
3 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/src/main/java/chylex/hee/game/block/fluid/FluidBase.kt b/src/main/java/chylex/hee/game/block/fluid/FluidBase.kt
index bea13dda..be0979c4 100644
--- a/src/main/java/chylex/hee/game/block/fluid/FluidBase.kt
+++ b/src/main/java/chylex/hee/game/block/fluid/FluidBase.kt
@@ -2,9 +2,8 @@ package chylex.hee.game.block.fluid
import chylex.hee.game.render.util.RGB
import net.minecraft.block.material.MapColor
import net.minecraft.util.ResourceLocation
-import net.minecraft.util.math.Vec3d
import net.minecraftforge.fluids.Fluid
abstract class FluidBase(fluidName: String, val rgbColor: RGB, val mapColor: MapColor, texStill: ResourceLocation, texFlowing: ResourceLocation) : Fluid(fluidName, texStill, texFlowing){
- val fogColor = rgbColor.let { (r, g, b) -> Vec3d(r / 255.0, g / 255.0, b / 255.0) }
+ val fogColor = rgbColor.toVec()
}
diff --git a/src/main/java/chylex/hee/game/particle/base/ParticleBaseEnergy.kt b/src/main/java/chylex/hee/game/particle/base/ParticleBaseEnergy.kt
index e4e3432d..991e3817 100644
--- a/src/main/java/chylex/hee/game/particle/base/ParticleBaseEnergy.kt
+++ b/src/main/java/chylex/hee/game/particle/base/ParticleBaseEnergy.kt
@@ -44,7 +44,7 @@ abstract class ParticleBaseEnergy(world: World, posX: Double, posY: Double, posZ
private fun adjustColorComponents(color: IColor): Int{
val rgb = color.toRGB()
- return(rgb.red.coerceIn(64, 224) shl 16) or (rgb.green.coerceIn(64, 224) shl 8) or rgb.blue.coerceIn(64, 224)
+ return (rgb.red.coerceIn(64, 224) shl 16) or (rgb.green.coerceIn(64, 224) shl 8) or rgb.blue.coerceIn(64, 224)
}
}
diff --git a/src/main/java/chylex/hee/proxy/ModClientProxy.kt b/src/main/java/chylex/hee/proxy/ModClientProxy.kt
index ac13860a..7ea97b19 100644
--- a/src/main/java/chylex/hee/proxy/ModClientProxy.kt
+++ b/src/main/java/chylex/hee/proxy/ModClientProxy.kt
@@ -120,11 +120,11 @@ class ModClientProxy : ModCommonProxy(){
for(item in keys.asSequence().filter { it.namespace == HEE.ID }.map(::getValue)){
ModelLoader.setCustomModelResourceLocation(item!!, 0, ModelResourceLocation(item.registryName!!, "inventory"))
}
-
- ModelLoader.setCustomModelResourceLocation(ModItems.VOID_SALAD, ItemVoidSalad.Type.DOUBLE.ordinal, ModelResourceLocation(Resource.Custom("void_void_salad"), "inventory"))
- ModelLoader.setCustomModelResourceLocation(ModItems.VOID_SALAD, ItemVoidSalad.Type.MEGA.ordinal, ModelResourceLocation(Resource.Custom("mega_void_salad"), "inventory"))
}
+ ModelLoader.setCustomModelResourceLocation(ModItems.VOID_SALAD, ItemVoidSalad.Type.DOUBLE.ordinal, ModelResourceLocation(Resource.Custom("void_void_salad"), "inventory"))
+ ModelLoader.setCustomModelResourceLocation(ModItems.VOID_SALAD, ItemVoidSalad.Type.MEGA.ordinal, ModelResourceLocation(Resource.Custom("mega_void_salad"), "inventory"))
+
for(block in arrayOf(
ModBlocks.TABLE_BASE,
ModBlocks.ACCUMULATION_TABLE