chylex/Hardcore-Ender-Expansion-2
1
0
Fork 0
mirror of https://github.com/chylex/Hardcore-Ender-Expansion-2.git synced 2025-04-14 12:15:44 +02:00
Code

Minor formatting fixes and updates

Browse Source
This commit is contained in:
chylex 2019-02-10 14:59:18 +01:00
parent 16d4730513
commit 5ab345b67e
3 changed files with 5 additions and 6 deletions
src/main/java/chylex/hee
game
block/fluid
FluidBase.kt
particle/base
ParticleBaseEnergy.kt
proxy
ModClientProxy.kt

3
src/main/java/chylex/hee/game/block/fluid/FluidBase.kt
View File

@ -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()
}

2
src/main/java/chylex/hee/game/particle/base/ParticleBaseEnergy.kt
View File

@ -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)
}
}

6
src/main/java/chylex/hee/proxy/ModClientProxy.kt
View File

@ -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