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

Rename BlockEndPortalCustom & refactor a few things

Browse Source
This commit is contained in:
chylex 2019-04-11 16:59:29 +02:00
parent 4cc75f1388
commit bc2c2de5b7
5 changed files with 10 additions and 8 deletions
src/main/java/chylex/hee
game
block
BlockEndPortalInner.kt
entity/living/ai/util
AIBaseTarget.kt
item
ItemAbstractInfusable.kt
world/territory
TerritoryType.kt
init
ModBlocks.kt

2
src/main/java/chylex/hee/game/block/BlockEndPortalCustom.kt → src/main/java/chylex/hee/game/block/BlockEndPortalInner.kt
View File

@ -6,7 +6,7 @@ import net.minecraft.entity.Entity
import net.minecraft.util.math.BlockPos
import net.minecraft.world.World
class BlockEndPortalCustom(builder: BlockSimple.Builder) : BlockAbstractPortal(builder){
class BlockEndPortalInner(builder: BlockSimple.Builder) : BlockAbstractPortal(builder){
override fun onEntityInside(world: World, pos: BlockPos, entity: Entity){
val acceptor = pos.closestTickingTile<TileEntityEndPortalAcceptor>(world, MAX_DISTANCE_FROM_FRAME)

7
src/main/java/chylex/hee/game/entity/living/ai/util/AIBaseTarget.kt
View File

@ -4,7 +4,12 @@ import net.minecraft.entity.EntityCreature
import net.minecraft.entity.EntityLivingBase
import net.minecraft.entity.ai.EntityAITarget
abstract class AIBaseTarget<T : EntityLivingBase>(entity: EntityCreature, checkSight: Boolean, easilyReachableOnly: Boolean, mutexBits: Int = AI_FLAG_MOVEMENT) : EntityAITarget(entity, checkSight, easilyReachableOnly){
abstract class AIBaseTarget<T : EntityLivingBase>(
entity: EntityCreature,
checkSight: Boolean,
easilyReachableOnly: Boolean,
mutexBits: Int = AI_FLAG_MOVEMENT
) : EntityAITarget(entity, checkSight, easilyReachableOnly){
init{
this.mutexBits = mutexBits
}

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

@ -16,6 +16,7 @@ abstract class ItemAbstractInfusable : Item(), IInfusableItem{
return infusion.targetItems.contains(item)
}
@SideOnly(Side.CLIENT)
fun onAddInformation(stack: ItemStack, lines: MutableList<String>){
if (lines.size > 1){ // first line is item name
lines.add("")

4
src/main/java/chylex/hee/game/world/territory/TerritoryType.kt
View File

@ -8,10 +8,6 @@ enum class TerritoryType(
val height: IntRange
){
// TODO
TEST1(key = "test1", chunks = 24, height = 0 until 128),
TEST2(key = "test2", chunks = 1, height = 0 until 128),
TEST3(key = "test3", chunks = 5, height = 0 until 128),
TEST4(key = "test4", chunks = 6, height = 0 until 128);
;
companion object{

4
src/main/java/chylex/hee/init/ModBlocks.kt
View File

@ -10,7 +10,7 @@ import chylex.hee.game.block.BlockDragonEggOverride
import chylex.hee.game.block.BlockDryVines
import chylex.hee.game.block.BlockEndPlant
import chylex.hee.game.block.BlockEndPortalAcceptor
import chylex.hee.game.block.BlockEndPortalCustom
import chylex.hee.game.block.BlockEndPortalInner
import chylex.hee.game.block.BlockEndPortalOverride
import chylex.hee.game.block.BlockEndPowderOre
import chylex.hee.game.block.BlockEnderGoo
@ -323,7 +323,7 @@ object ModBlocks{
private val portalFrameAABB = AxisAlignedBB(0.0, 0.0, 0.0, 1.0, 0.8125, 1.0)
@JvmField val END_PORTAL_INNER = BlockEndPortalCustom(buildPortalInner).apply { setup("end_portal_inner", inCreativeTab = false) }
@JvmField val END_PORTAL_INNER = BlockEndPortalInner(buildPortalInner).apply { setup("end_portal_inner", inCreativeTab = false) }
@JvmField val END_PORTAL_FRAME = BlockSimpleShaped(buildPortalFrame, portalFrameAABB).apply { setup("end_portal_frame") }
@JvmField val END_PORTAL_ACCEPTOR = BlockEndPortalAcceptor(buildPortalFrame, portalFrameAABB).apply { setup("end_portal_acceptor") }