Repo-Mirror/Iris-World-Engine
9
0
Fork 0
mirror of https://github.com/VolmitSoftware/Iris.git synced 2025-12-28 11:39:07 +00:00
Code Issues Releases Activity

Cleanup

Browse Source
This commit is contained in:
Daniel Mills
2021-08-06 22:15:11 -04:00
parent a5ef5769b9
commit e9f4c3d0c7
35 changed files with 179 additions and 335 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/main/java/com/volmit/iris/engine/IrisWorldManager.java
View File

@@ -87,13 +87,11 @@ public class IrisWorldManager extends EngineAssignedWorldManager {
looper = new Looper() {
@Override
protected long loop() {
if(M.ms() < charge)
{
if (M.ms() < charge) {
energy += 70;
}
if(cln.flip())
{
if (cln.flip()) {
engine.getEngineData().cleanup(getEngine());
}
@@ -207,14 +205,12 @@ public class IrisWorldManager extends EngineAssignedWorldManager {
.collect(Collectors.toList()))
.popRandom(RNG.r);
if(v != null && v.getReferenceSpawner() != null)
{
if (v != null && v.getReferenceSpawner() != null) {
int maxEntCount = v.getReferenceSpawner().getMaxEntitiesPerChunk();
for (Entity i : c.getEntities()) {
if (i instanceof LivingEntity) {
if(-maxEntCount <= 0)
{
if (-maxEntCount <= 0) {
return;
}
}
@@ -228,36 +224,30 @@ public class IrisWorldManager extends EngineAssignedWorldManager {
private void spawn(Chunk c, IrisEntitySpawn i) {
boolean allow = true;
if(!i.getReferenceSpawner().getMaximumRatePerChunk().isInfinite())
{
if (!i.getReferenceSpawner().getMaximumRatePerChunk().isInfinite()) {
allow = false;
IrisEngineChunkData cd = getEngine().getEngineData().getChunk(c.getX(), c.getZ());
IrisEngineSpawnerCooldown sc = null;
for(IrisEngineSpawnerCooldown j : cd.getCooldowns())
{
if(j.getSpawner().equals(i.getReferenceSpawner().getLoadKey()))
{
for (IrisEngineSpawnerCooldown j : cd.getCooldowns()) {
if (j.getSpawner().equals(i.getReferenceSpawner().getLoadKey())) {
sc = j;
break;
}
}
if(sc == null)
{
if (sc == null) {
sc = new IrisEngineSpawnerCooldown();
sc.setSpawner(i.getReferenceSpawner().getLoadKey());
cd.getCooldowns().add(sc);
}
if(sc.canSpawn(i.getReferenceSpawner().getMaximumRatePerChunk()))
{
if (sc.canSpawn(i.getReferenceSpawner().getMaximumRatePerChunk())) {
sc.spawn(getEngine());
allow = true;
}
}
if(allow)
{
if (allow) {
int s = i.spawn(getEngine(), c, RNG.r);
actuallySpawned += s;
if (s > 0) {

4
src/main/java/com/volmit/iris/engine/object/annotations/RegistryListSpecialEntity.java
View File

@@ -21,9 +21,7 @@ package com.volmit.iris.engine.object.annotations;
import java.lang.annotation.Retention;
import java.lang.annotation.Target;
import static java.lang.annotation.ElementType.FIELD;
import static java.lang.annotation.ElementType.PARAMETER;
import static java.lang.annotation.ElementType.TYPE;
import static java.lang.annotation.ElementType.*;
import static java.lang.annotation.RetentionPolicy.RUNTIME;
@Retention(RUNTIME)

6
src/main/java/com/volmit/iris/engine/object/block/IrisBlockData.java
View File

@@ -149,10 +149,8 @@ public class IrisBlockData extends IrisRegistrant {
});
}
private String keyify(String dat)
{
if(dat.contains(":"))
{
private String keyify(String dat) {
if (dat.contains(":")) {
return dat;
}

2
src/main/java/com/volmit/iris/engine/object/dimensional/IrisDimension.java
View File

@@ -34,7 +34,6 @@ import com.volmit.iris.engine.object.carve.IrisCaveFluid;
import com.volmit.iris.engine.object.carve.IrisCaveLayer;
import com.volmit.iris.engine.object.carve.IrisCaverns;
import com.volmit.iris.engine.object.deposits.IrisDepositGenerator;
import com.volmit.iris.engine.object.villager.IrisVillagerOverride;
import com.volmit.iris.engine.object.feature.IrisFeaturePositional;
import com.volmit.iris.engine.object.feature.IrisFeaturePotential;
import com.volmit.iris.engine.object.jigsaw.IrisJigsawStructure;
@@ -47,6 +46,7 @@ import com.volmit.iris.engine.object.objects.IrisObjectPlacement;
import com.volmit.iris.engine.object.regional.IrisRegion;
import com.volmit.iris.engine.object.spawners.IrisSpawner;
import com.volmit.iris.engine.object.trees.IrisTreeSettings;
import com.volmit.iris.engine.object.villager.IrisVillagerOverride;
import com.volmit.iris.util.collection.KList;
import com.volmit.iris.util.data.DataProvider;
import com.volmit.iris.util.io.IO;

9
src/main/java/com/volmit/iris/engine/object/engine/IrisEngineChunkData.java
View File

@@ -28,14 +28,11 @@ public class IrisEngineChunkData {
private long chunk;
private KList<IrisEngineSpawnerCooldown> cooldowns = new KList<>();
public void cleanup(Engine engine)
{
for(IrisEngineSpawnerCooldown i : getCooldowns().copy())
{
public void cleanup(Engine engine) {
for (IrisEngineSpawnerCooldown i : getCooldowns().copy()) {
IrisSpawner sp = engine.getData().getSpawnerLoader().load(i.getSpawner());
if(sp == null || i.canSpawn(sp.getMaximumRate()))
{
if (sp == null || i.canSpawn(sp.getMaximumRate())) {
getCooldowns().remove(i);
}
}

25
src/main/java/com/volmit/iris/engine/object/engine/IrisEngineData.java
View File

@@ -20,7 +20,6 @@ package com.volmit.iris.engine.object.engine;
import com.volmit.iris.engine.data.cache.Cache;
import com.volmit.iris.engine.framework.Engine;
import com.volmit.iris.engine.object.meta.IrisEnchantment;
import com.volmit.iris.engine.object.spawners.IrisSpawner;
import com.volmit.iris.util.collection.KList;
import lombok.Data;
@@ -31,20 +30,16 @@ public class IrisEngineData {
private KList<IrisEngineSpawnerCooldown> spawnerCooldowns = new KList<>();
private KList<IrisEngineChunkData> chunks = new KList<>();
public void removeChunk(int x, int z)
{
public void removeChunk(int x, int z) {
long k = Cache.key(x, z);
chunks.removeWhere((i) -> i.getChunk() == k);
}
public IrisEngineChunkData getChunk(int x, int z)
{
public IrisEngineChunkData getChunk(int x, int z) {
long k = Cache.key(x, z);
for(IrisEngineChunkData i : chunks)
{
if(i.getChunk() == k)
{
for (IrisEngineChunkData i : chunks) {
if (i.getChunk() == k) {
return i;
}
}
@@ -56,22 +51,18 @@ public class IrisEngineData {
}
public void cleanup(Engine engine) {
for(IrisEngineSpawnerCooldown i : getSpawnerCooldowns().copy())
{
for (IrisEngineSpawnerCooldown i : getSpawnerCooldowns().copy()) {
IrisSpawner sp = engine.getData().getSpawnerLoader().load(i.getSpawner());
if(sp == null || i.canSpawn(sp.getMaximumRate()))
{
if (sp == null || i.canSpawn(sp.getMaximumRate())) {
getSpawnerCooldowns().remove(i);
}
}
for(IrisEngineChunkData i : chunks.copy())
{
for (IrisEngineChunkData i : chunks.copy()) {
i.cleanup(engine);
if(i.isEmpty())
{
if (i.isEmpty()) {
getChunks().remove(i);
}
}

3
src/main/java/com/volmit/iris/engine/object/objects/IrisObject.java
View File

@@ -348,8 +348,7 @@ public class IrisObject extends IrisRegistrant {
}
public void write(File file) throws IOException {
if(file == null)
{
if (file == null) {
return;
}

12
src/main/java/com/volmit/iris/engine/object/villager/IrisVillagerOverride.java
View File

@@ -22,11 +22,11 @@ import org.bukkit.inventory.ItemStack;
@EqualsAndHashCode(callSuper = false)
public class IrisVillagerOverride {
@Desc("""
Disable the trade altogether.
If a cartographer villager gets a new explorer map trade:
If this is enabled -> the trade is removed
If this is disabled -> the trade is replaced with the "override" setting below
Default is true, so if you omit this, trades will be removed.""")
Disable the trade altogether.
If a cartographer villager gets a new explorer map trade:
If this is enabled -> the trade is removed
If this is disabled -> the trade is replaced with the "override" setting below
Default is true, so if you omit this, trades will be removed.""")
private boolean disableTrade = true;
@DependsOn("disableTrade")
@@ -44,7 +44,7 @@ public class IrisVillagerOverride {
.setMinTrades(3)
.setMaxTrades(5));
public KList<IrisVillagerTrade> getValidItems(){
public KList<IrisVillagerTrade> getValidItems() {
KList<IrisVillagerTrade> valid = new KList<>();
getItems().stream().filter(IrisVillagerTrade::isValidItems).forEach(valid::add);
return valid.size() == 0 ? null : valid;

15
src/main/java/com/volmit/iris/engine/object/villager/IrisVillagerTrade.java
View File

@@ -4,9 +4,7 @@ package com.volmit.iris.engine.object.villager;
import com.volmit.iris.Iris;
import com.volmit.iris.engine.object.annotations.*;
import com.volmit.iris.util.collection.KList;
import com.volmit.iris.util.math.M;
import com.volmit.iris.util.math.RNG;
import com.volmit.iris.util.scheduling.S;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.EqualsAndHashCode;
@@ -58,7 +56,7 @@ public class IrisVillagerTrade {
* mintrades > 0, maxtrades > 0, maxtrades > mintrades, and<br>
* ingredient 1, (if defined ingredient 2) and the result are valid items
*/
public boolean isValidItems(){
public boolean isValidItems() {
KList<String> warnings = new KList<>();
if (ingredient1 == null) {
warnings.add("Ingredient 1 is null");
@@ -80,15 +78,15 @@ public class IrisVillagerTrade {
warnings.add("More minimal than maximal trades");
}
if (ingredient1 != null && !ingredient1.getType().isItem()){
if (ingredient1 != null && !ingredient1.getType().isItem()) {
warnings.add("Ingredient 1 is not an item");
}
if (ingredient2 != null && !ingredient2.getType().isItem()){
if (ingredient2 != null && !ingredient2.getType().isItem()) {
warnings.add("Ingredient 2 is not an item");
}
if (result != null && !result.getType().isItem()){
if (result != null && !result.getType().isItem()) {
warnings.add("Result is not an item");
}
@@ -103,10 +101,11 @@ public class IrisVillagerTrade {
/**
* Get the ingredients
*
* @return The list of 1 or 2 ingredients (depending on if ing2 is null)
*/
public List<ItemStack> getIngredients() {
if (!isValidItems()){
if (!isValidItems()) {
return null;
}
return ingredient2 == null ? new KList<>(ingredient1) : new KList<>(ingredient1, ingredient2);
@@ -122,7 +121,7 @@ public class IrisVillagerTrade {
/**
* @return the trade as a merchant recipe
*/
public MerchantRecipe convert(){
public MerchantRecipe convert() {
MerchantRecipe recipe = new MerchantRecipe(getResult(), getAmount());
recipe.setIngredients(getIngredients());
return recipe;