Repo-Mirror/Iris-World-Engine
9
0
Fork 0
mirror of https://github.com/VolmitSoftware/Iris.git synced 2025-12-29 20:19:06 +00:00
Code Issues Releases Activity

Entity spawns

Browse Source
This commit is contained in:
Daniel Mills
2020-11-14 22:27:37 -05:00
parent e0fc4b9443
commit 44d86bc350
17 changed files with 265 additions and 106 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/com/volmit/iris/object/IrisEntity.java
View File

@@ -1,7 +1,7 @@
package com.volmit.iris.object;
import com.volmit.iris.Iris;
import com.volmit.iris.scaffold.engine.IrisAccess;
import com.volmit.iris.scaffold.engine.Engine;
import com.volmit.iris.util.*;
import lombok.AllArgsConstructor;
import lombok.Data;
@@ -135,12 +135,12 @@ public class IrisEntity extends IrisRegistrant
@Desc("The this entity is ageable, set it's baby status")
private boolean baby = false;
public Entity spawn(IrisAccess gen, Location at)
public Entity spawn(Engine gen, Location at)
{
return spawn(gen, at, new RNG(at.hashCode()));
}
public Entity spawn(IrisAccess gen, Location at, RNG rng)
public Entity spawn(Engine gen, Location at, RNG rng)
{
Entity e = doSpawn(at);
e.setCustomName(getCustomName() != null ? C.translateAlternateColorCodes('&', getCustomName()) : null);

12
src/main/java/com/volmit/iris/object/IrisEntityInitialSpawn.java
View File

@@ -1,7 +1,7 @@
package com.volmit.iris.object;
import com.volmit.iris.scaffold.cache.AtomicCache;
import com.volmit.iris.scaffold.engine.IrisAccess;
import com.volmit.iris.scaffold.engine.Engine;
import com.volmit.iris.util.*;
import lombok.AllArgsConstructor;
import lombok.Data;
@@ -43,7 +43,7 @@ public class IrisEntityInitialSpawn
private final transient AtomicCache<RNG> rng = new AtomicCache<>();
private final transient AtomicCache<IrisEntity> ent = new AtomicCache<>();
public void spawn(IrisAccess gen, Chunk c, RNG rng)
public void spawn(Engine gen, Chunk c, RNG rng)
{
int spawns = rng.i(1, rarity) == 1 ? rng.i(minSpawns, maxSpawns) : 0;
@@ -53,18 +53,18 @@ public class IrisEntityInitialSpawn
{
int x = (c.getX() * 16) + rng.i(15);
int z = (c.getZ() * 16) + rng.i(15);
int h = gen.getHeight(x, 0, z);
int h = gen.getHeight(x, z) + gen.getMinHeight();
spawn100(gen, new Location(c.getWorld(), x, h, z));
}
}
}
public IrisEntity getRealEntity(IrisAccess g)
public IrisEntity getRealEntity(Engine g)
{
return ent.aquire(() -> g.getData().getEntityLoader().load(getEntity()));
}
public Entity spawn(IrisAccess g, Location at)
public Entity spawn(Engine g, Location at)
{
if(getRealEntity(g) == null)
{
@@ -79,7 +79,7 @@ public class IrisEntityInitialSpawn
return null;
}
private Entity spawn100(IrisAccess g, Location at)
private Entity spawn100(Engine g, Location at)
{
return getRealEntity(g).spawn(g, at.clone().add(0, 1, 0), rng.aquire(() -> new RNG(g.getTarget().getWorld().getSeed() + 4)));
}

8
src/main/java/com/volmit/iris/object/IrisEntitySpawnOverride.java
View File

@@ -1,7 +1,7 @@
package com.volmit.iris.object;
import com.volmit.iris.scaffold.cache.AtomicCache;
import com.volmit.iris.scaffold.engine.IrisAccess;
import com.volmit.iris.scaffold.engine.Engine;
import com.volmit.iris.util.*;
import lombok.AllArgsConstructor;
import lombok.Data;
@@ -47,7 +47,7 @@ public class IrisEntitySpawnOverride
private final transient AtomicCache<IrisEntity> ent = new AtomicCache<>();
public Entity on(IrisAccess g, Location at, EntityType t, EntitySpawnEvent ee)
public Entity on(Engine g, Location at, EntityType t, EntitySpawnEvent ee)
{
if(!trigger.equals(EntityType.UNKNOWN))
{
@@ -68,7 +68,7 @@ public class IrisEntitySpawnOverride
return e;
}
public Entity spawn(IrisAccess g, Location at)
public Entity spawn(Engine g, Location at)
{
if(getRealEntity(g) == null)
{
@@ -83,7 +83,7 @@ public class IrisEntitySpawnOverride
return null;
}
public IrisEntity getRealEntity(IrisAccess g)
public IrisEntity getRealEntity(Engine g)
{
return ent.aquire(() -> g.getData().getEntityLoader().load(getEntity()));
}