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

Remove unnecessary JvmStatic and JvmField annotations

Browse Source
This commit is contained in:
chylex 2019-08-06 16:49:43 +02:00
parent 33e924c2b6
commit 2ee8b75c38
24 changed files with 10 additions and 36 deletions

4
src/main/java/chylex/hee/client/render/OverlayRenderer.kt
View File

@ -36,8 +36,8 @@ object OverlayRenderer{
private const val BORDER_SIZE = 4
private const val LINE_SPACING = 7
@JvmStatic private val TEX_ENDER_GOO_OVERLAY = Resource.Custom("textures/overlay/ender_goo.png")
@JvmStatic private val TEX_PURIFIED_ENDER_GOO_OVERLAY = Resource.Custom("textures/overlay/purified_ender_goo.png")
private val TEX_ENDER_GOO_OVERLAY = Resource.Custom("textures/overlay/ender_goo.png")
private val TEX_PURIFIED_ENDER_GOO_OVERLAY = Resource.Custom("textures/overlay/purified_ender_goo.png")
private var clusterLookedAt: TileEntityEnergyCluster? = null

6
src/main/java/chylex/hee/client/render/block/RenderTileAbstractPortal.kt
View File

@ -38,10 +38,10 @@ import kotlin.math.pow
@SideOnly(Side.CLIENT)
abstract class RenderTileAbstractPortal<T : TileEntityPortalInner, C : IPortalController> : TileEntitySpecialRenderer<T>(){
private companion object{
@JvmStatic private val TEX_BACKGROUND = Resource.Vanilla("textures/environment/end_sky.png")
@JvmStatic private val TEX_PARTICLE_LAYER = Resource.Vanilla("textures/entity/end_portal.png")
private val TEX_BACKGROUND = Resource.Vanilla("textures/environment/end_sky.png")
private val TEX_PARTICLE_LAYER = Resource.Vanilla("textures/entity/end_portal.png")
@JvmStatic private val BUFFER = GLAllocation.createDirectFloatBuffer(16)
private val BUFFER = GLAllocation.createDirectFloatBuffer(16)
private fun updateBuffer(value1: Float, value2: Float, value3: Float, value4: Float) = BUFFER.apply {
clear()

1
src/main/java/chylex/hee/game/block/BlockDragonEggOverride.kt
View File

@ -46,7 +46,6 @@ class BlockDragonEggOverride : BlockDragonEgg(){
mot = InBox(0.025F)
)
@JvmStatic
val FX_BREAK = object : FxBlockHandler(){
override fun handle(pos: BlockPos, world: World, rand: Random){
PARTICLE_BREAK.spawn(Point(pos, 30), rand)

1
src/main/java/chylex/hee/game/block/BlockEnderGooPurified.kt
View File

@ -59,7 +59,6 @@ open class BlockEnderGooPurified : BlockAbstractGoo(FluidEnderGooPurified, Mater
mot = Constant(0.025F, UP) + InBox(0.01F, 0.01F, 0.01F)
)
@JvmStatic
val FX_PLACE = object : FxBlockHandler(){
override fun handle(pos: BlockPos, world: World, rand: Random){
PARTICLE_PLACE.spawn(Point(pos, rand.nextInt(5, 6)), rand)

1
src/main/java/chylex/hee/game/block/IBlockDeathFlowerDecaying.kt
View File

@ -180,7 +180,6 @@ interface IBlockDeathFlowerDecaying{
}
}
@JvmStatic
val FX_HEAL = object : IFxHandler<FxHealData>{
override fun handle(buffer: ByteBuf, world: World, rand: Random){
val pos = buffer.readPos()

1
src/main/java/chylex/hee/game/block/entity/TileEntityTablePedestal.kt
View File

@ -53,7 +53,6 @@ import java.util.Random
class TileEntityTablePedestal : TileEntityBase(){
companion object{
@JvmStatic
val FX_ITEM_UPDATE = object : FxBlockHandler(){
override fun handle(pos: BlockPos, world: World, rand: Random){
val player = HEE.proxy.getClientSidePlayer() ?: return

1
src/main/java/chylex/hee/game/container/slot/SlotTrinketItem.kt
View File

@ -17,7 +17,6 @@ open class SlotTrinketItem(trinketHandler: IItemHandler, slotIndex: Int, x: Int,
const val TEX_SLOT_W = 64F
const val TEX_SLOT_H = 32F
@JvmStatic
@SideOnly(Side.CLIENT)
private val TEX_DEFINITION = object : TextureAtlasSprite(TEX_SLOT.toString()){
override fun getMinU() = 19F / TEX_SLOT_W

4
src/main/java/chylex/hee/game/container/slot/SlotTrinketItemInventory.kt
View File

@ -62,21 +62,18 @@ class SlotTrinketItemInventory(trinketHandler: IItemHandler, slotNumber: Int) :
// GUI integration
@JvmStatic
private val SURVIVAL_INVENTORY_SLOT_POSITIONS = arrayOf(
Pair(77, 44),
Pair(77, 26),
Pair(77, 8)
)
@JvmStatic
private val CREATIVE_INVENTORY_SLOT_POSITIONS = arrayOf(
Pair(127, 20),
Pair(146, 20),
Pair(165, 20)
)
@JvmStatic
private fun Slot.moveSlotToEmptyPos(allSlots: List<Slot>, positions: Array<Pair<Int, Int>>){
xPos = -2000
yPos = -2000
@ -114,7 +111,6 @@ class SlotTrinketItemInventory(trinketHandler: IItemHandler, slotNumber: Int) :
// Texture rendering
@JvmField
var isRenderingGUI = false
@JvmStatic

6
src/main/java/chylex/hee/game/entity/CustomCreatureType.kt
View File

@ -8,15 +8,15 @@ object CustomCreatureType{
private val DEMON = EnumHelper.addCreatureAttribute("HEE_DEMON")
private val SHADOW = EnumHelper.addCreatureAttribute("HEE_SHADOW")
@JvmStatic fun isEnder(entity: EntityLivingBase): Boolean{
fun isEnder(entity: EntityLivingBase): Boolean{
return entity is EntityCreature && entity.creatureAttribute == ENDER // TODO more stuff
}
@JvmStatic fun isDemon(entity: EntityLivingBase): Boolean{
fun isDemon(entity: EntityLivingBase): Boolean{
return entity is EntityCreature && entity.creatureAttribute == DEMON
}
@JvmStatic fun isShadow(entity: EntityLivingBase): Boolean{
fun isShadow(entity: EntityLivingBase): Boolean{
return entity is EntityCreature && entity.creatureAttribute == SHADOW
}
}

1
src/main/java/chylex/hee/game/entity/item/EntityFallingObsidian.kt
View File

@ -42,7 +42,6 @@ class EntityFallingObsidian : EntityFallingBlockHeavy{
}
}
@JvmStatic
val FX_FALL = object : IFxHandler<FxFallData>{
override fun handle(buffer: ByteBuf, world: World, rand: Random) = buffer.use {
val pos = readPos()

2
src/main/java/chylex/hee/game/entity/item/EntityItemIgneousRock.kt
View File

@ -86,7 +86,6 @@ class EntityItemIgneousRock : EntityItemNoBob{
mot = PARTICLE_FLAME_MOT
)
@JvmStatic
val FX_BLOCK_SMELT = object : FxBlockHandler(){
override fun handle(pos: BlockPos, world: World, rand: Random){
PARTICLE_SMELT.spawn(Point(pos, 20), rand)
@ -94,7 +93,6 @@ class EntityItemIgneousRock : EntityItemNoBob{
}
}
@JvmStatic
val FX_ENTITY_BURN = object : FxEntityHandler(){
override fun handle(entity: Entity, rand: Random){
PARTICLE_BURN(entity).spawn(Point(entity, heightMp = 0.5F, amount = 24), rand)

1
src/main/java/chylex/hee/game/entity/item/EntityItemRevitalizationSubstance.kt
View File

@ -46,7 +46,6 @@ class EntityItemRevitalizationSubstance : EntityItem{
}
}
@JvmStatic
val FX_REVITALIZE_GOO = object : IFxHandler<FxRevitalizeGooData>{
override fun handle(buffer: ByteBuf, world: World, rand: Random) = buffer.use {
val center = readPos()

2
src/main/java/chylex/hee/game/entity/living/enderman/EndermanTeleportHandler.kt
View File

@ -71,7 +71,6 @@ class EndermanTeleportHandler(private val enderman: EntityMobAbstractEnderman) :
hideOnMinimalSetting = false
)
@JvmStatic
val FX_TELEPORT_FAIL = object : FxEntityHandler(){
override fun handle(entity: Entity, rand: Random){
PARTICLE_TELEPORT_FAIL(entity).spawn(Point(entity, heightMp = 0.5F, amount = 55), rand)
@ -79,7 +78,6 @@ class EndermanTeleportHandler(private val enderman: EntityMobAbstractEnderman) :
}
}
@JvmStatic
val FX_TELEPORT_OUT_OF_WORLD = object : FxEntityHandler(){
override fun handle(entity: Entity, rand: Random){
val startPoint = entity.posVec

1
src/main/java/chylex/hee/game/entity/projectile/EntityProjectileSpatialDash.kt
View File

@ -81,7 +81,6 @@ class EntityProjectileSpatialDash : Entity, IProjectile{
}
}
@JvmStatic
val FX_EXPIRE = object : IFxHandler<FxExpireData>{
override fun handle(buffer: ByteBuf, world: World, rand: Random) = buffer.use {
val point = readCompactVec()

1
src/main/java/chylex/hee/game/item/ItemAbstractEnergyUser.kt
View File

@ -64,7 +64,6 @@ abstract class ItemAbstractEnergyUser : Item(){
}
}
@JvmStatic
val FX_CHARGE = object : IFxHandler<FxChargeData>{
override fun handle(buffer: ByteBuf, world: World, rand: Random) = buffer.use {
val cluster = readPos().getTile<TileEntityEnergyCluster>(world) ?: return

1
src/main/java/chylex/hee/game/item/ItemCompost.kt
View File

@ -28,7 +28,6 @@ class ItemCompost : Item(){
companion object{
private const val BONE_MEAL_EQUIVALENT = 2
@JvmStatic
val FX_USE = object : FxBlockHandler(){
override fun handle(pos: BlockPos, world: World, rand: Random){
ItemDye.spawnBonemealParticles(world, pos, 25)

1
src/main/java/chylex/hee/game/item/ItemRevitalizationSubstance.kt
View File

@ -53,7 +53,6 @@ class ItemRevitalizationSubstance : Item(){
}
}
@JvmStatic
val FX_FAIL = object : IFxHandler<FxUseData>{
override fun handle(buffer: ByteBuf, world: World, rand: Random) = buffer.use {
val blockPos = readPos().center

1
src/main/java/chylex/hee/game/item/ItemTableLink.kt
View File

@ -62,7 +62,6 @@ class ItemTableLink : Item(){
}
}
@JvmStatic
val FX_USE = object : IFxHandler<FxUseData>{
override fun handle(buffer: ByteBuf, world: World, rand: Random) = buffer.use {
val pos = readPos()

2
src/main/java/chylex/hee/game/mechanics/potion/PotionBase.kt
View File

@ -10,7 +10,7 @@ import net.minecraftforge.fml.relauncher.SideOnly
abstract class PotionBase(color: RGB, isNegative: Boolean) : Potion(isNegative, color.toInt()){
companion object{
@JvmStatic private val TEX_ICONS = Resource.Custom("textures/gui/status.png")
private val TEX_ICONS = Resource.Custom("textures/gui/status.png")
private const val ICON_SIZE = 18
private const val TEXTURE_SIZE = 64F

2
src/main/java/chylex/hee/game/mechanics/scorching/ScorchingHelper.kt
View File

@ -43,14 +43,12 @@ object ScorchingHelper{
pos = Constant(0.2F, UP) + InBox(target, 0.4F)
)
@JvmStatic
val FX_BLOCK_BREAK = object : FxBlockHandler(){
override fun handle(pos: BlockPos, world: World, rand: Random){
PARTICLE_MINING.spawn(Point(pos, 15), rand)
}
}
@JvmStatic
val FX_ENTITY_HIT = object : FxEntityHandler(){
override fun handle(entity: Entity, rand: Random){
PARTICLE_HITTING(entity).spawn(Point(entity, heightMp = 0.5F, amount = 20), rand)

2
src/main/java/chylex/hee/game/mechanics/table/TableParticleHandler.kt
View File

@ -54,7 +54,6 @@ class TableParticleHandler(private val table: TileEntityBaseTable){
}
}
@JvmStatic
val FX_PROCESS_PEDESTALS = object : IFxHandler<FxProcessPedestalsData>{
override fun handle(buffer: ByteBuf, world: World, rand: Random) = buffer.use {
val table = readPos().getTile<TileEntityBaseTable>(world) ?: return
@ -82,7 +81,6 @@ class TableParticleHandler(private val table: TileEntityBaseTable){
}
}
@JvmStatic
val FX_DRAIN_CLUSTER = object : IFxHandler<FxDrainClusterData>{
override fun handle(buffer: ByteBuf, world: World, rand: Random) = buffer.use {
val cluster = readPos().getTile<TileEntityEnergyCluster>(world) ?: return

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

@ -27,7 +27,7 @@ import java.util.Random
@SideOnly(Side.CLIENT)
abstract class ParticleBaseEnergy(world: World, posX: Double, posY: Double, posZ: Double, motX: Double, motY: Double, motZ: Double) : ParticleBaseFloating(world, posX, posY, posZ, motX, motY, motZ){
private companion object{
@JvmStatic private val TEX_PARTICLE = Resource.Custom("textures/particle/energy.png")
private val TEX_PARTICLE = Resource.Custom("textures/particle/energy.png")
@SideOnly(Side.CLIENT)
private object TextureDescription : TextureAtlasSprite(TEX_PARTICLE.toString()){

1
src/main/java/chylex/hee/game/world/util/Teleporter.kt
View File

@ -92,7 +92,6 @@ class Teleporter(
}
}
@JvmStatic
val FX_TELEPORT = object : IFxHandler<FxTeleportData>{
override fun handle(buffer: ByteBuf, world: World, rand: Random) = buffer.use {
val player = HEE.proxy.getClientSidePlayer() ?: return

1
src/main/java/chylex/hee/system/capability/PlayerCapabilityHandler.kt
View File

@ -27,7 +27,6 @@ object PlayerCapabilityHandler{
private val entries = mutableListOf<IPlayerCapability>()
@JvmStatic
fun register(capability: IPlayerCapability){
entries.add(capability)
}