Merge pull request #398 from StrangeOne101/1.17

Revert stackoverflow, persistent entities in jigsaws

build.gradle

@@ -5,7 +5,7 @@ plugins {
 }
 
 group 'com.volmit.iris'
-version '1.4.6'
+version '1.4.7'
 def apiVersion = '1.17'
 def name = 'Iris'
 def main = 'com.volmit.iris.Iris'

src/main/java/com/volmit/iris/generator/IrisEngineCompound.java

@@ -2,7 +2,6 @@ package com.volmit.iris.generator;
 
 import com.volmit.iris.Iris;
 import com.volmit.iris.manager.IrisDataManager;
-import com.volmit.iris.nms.INMS;
 import com.volmit.iris.object.IrisDimension;
 import com.volmit.iris.object.IrisDimensionIndex;
 import com.volmit.iris.object.IrisPosition;
@@ -15,14 +14,11 @@ import com.volmit.iris.scaffold.parallel.MultiBurst;
 import com.volmit.iris.util.*;
 import lombok.Getter;
 import lombok.Setter;
-import net.minecraft.core.BlockPosition;
-import net.minecraft.world.level.levelgen.feature.StructureGenerator;
 import org.bukkit.Bukkit;
 import org.bukkit.World;
 import org.bukkit.block.Biome;
 import org.bukkit.block.data.BlockData;
 import org.bukkit.command.CommandSender;
-import org.bukkit.craftbukkit.v1_17_R1.generator.InternalChunkGenerator;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.world.WorldSaveEvent;
 import org.bukkit.generator.BlockPopulator;

src/main/java/com/volmit/iris/generator/IrisEngineEffects.java

@@ -27,6 +27,9 @@ public class IrisEngineEffects extends EngineAssignedComponent implements Engine
     @Override
     public void updatePlayerMap() {
         List<Player> pr = getEngine().getWorld().getPlayers();
+
+        if (pr == null) return; //Fix for paper returning a world with a null playerlist
+
         for(Player i : pr)
         {
             Location l = i.getLocation();

src/main/java/com/volmit/iris/manager/command/studio/CommandIrisStudioLoot.java

@@ -2,6 +2,7 @@ package com.volmit.iris.manager.command.studio;
 
 import com.volmit.iris.Iris;
 import com.volmit.iris.IrisSettings;
+import com.volmit.iris.manager.IrisDataManager;
 import com.volmit.iris.object.InventorySlotType;
 import com.volmit.iris.object.IrisLootTable;
 import com.volmit.iris.scaffold.IrisWorlds;
@@ -41,9 +42,9 @@ public class CommandIrisStudioLoot extends MortarCommand
 			Player p = sender.player();
 			IrisAccess prov = IrisWorlds.access(sender.player().getWorld());
 
-			if(prov == null)
+			if (!Iris.proj.isProjectOpen())
 			{
-				sender.sendMessage("You can only use /iris loot in a studio world of iris.");
+				sender.sendMessage("You can only use /iris studio loot in a studio world of iris.");
 				return true;
 			}
 

src/main/java/com/volmit/iris/object/IrisEnchantment.java

@@ -3,6 +3,7 @@ package com.volmit.iris.object;
 import java.lang.reflect.Field;
 
 import org.bukkit.enchantments.Enchantment;
+import org.bukkit.inventory.meta.EnchantmentStorageMeta;
 import org.bukkit.inventory.meta.ItemMeta;
 
 import com.volmit.iris.util.Desc;
@@ -52,6 +53,10 @@ public class IrisEnchantment
 		{
 			if(rng.nextDouble() < chance)
 			{
+				if (meta instanceof EnchantmentStorageMeta) {
+					((EnchantmentStorageMeta) meta).addStoredEnchant(getEnchant(), getLevel(rng), true);
+					return;
+				}
 				meta.addEnchant(getEnchant(), getLevel(rng), true);
 			}
 		}

src/main/java/com/volmit/iris/object/IrisJigsawPieceConnector.java

@@ -45,6 +45,10 @@ public class IrisJigsawPieceConnector
 	@Desc("Pick an entity to spawn on this connector")
 	private String spawnEntity;
 
+	@DontObfuscate
+	@Desc("Stop the entity from despawning")
+	private boolean keepEntity;
+
 	@DontObfuscate
 	@MaxNumber(50)
 	@MinNumber(1)

src/main/java/com/volmit/iris/object/IrisObject.java

@@ -460,8 +460,52 @@ public class IrisObject extends IrisRegistrant
 		return place(x, yv, z, placer, config, rng, null, null, rdata);
 	}
 
-	public int place(int x, int yv, int z, IObjectPlacer placer, IrisObjectPlacement config, RNG rng, Consumer<BlockPosition> listener, CarveResult c, IrisDataManager rdata)
+	public int place(int x, int yv, int z, IObjectPlacer oplacer, IrisObjectPlacement config, RNG rng, Consumer<BlockPosition> listener, CarveResult c, IrisDataManager rdata)
 	{
+		IObjectPlacer placer = (config.getHeightmap() != null) ? new IObjectPlacer() {
+			final long s = rng.nextLong() + yv + z - x;
+
+			public int getHighest(int param1Int1, int param1Int2) {
+				return (int)Math.round(config.getHeightmap().getNoise(this.s, param1Int1, param1Int2));
+			}
+
+			public int getHighest(int param1Int1, int param1Int2, boolean param1Boolean) {
+				return (int)Math.round(config.getHeightmap().getNoise(this.s, param1Int1, param1Int2));
+			}
+
+			public void set(int param1Int1, int param1Int2, int param1Int3, BlockData param1BlockData) {
+				oplacer.set(param1Int1, param1Int2, param1Int3, param1BlockData);
+			}
+
+			public BlockData get(int param1Int1, int param1Int2, int param1Int3) {
+				return oplacer.get(param1Int1, param1Int2, param1Int3);
+			}
+
+			public boolean isPreventingDecay() {
+				return oplacer.isPreventingDecay();
+			}
+
+			public boolean isSolid(int param1Int1, int param1Int2, int param1Int3) {
+				return oplacer.isSolid(param1Int1, param1Int2, param1Int3);
+			}
+
+			public boolean isUnderwater(int param1Int1, int param1Int2) {
+				return oplacer.isUnderwater(param1Int1, param1Int2);
+			}
+
+			public int getFluidHeight() {
+				return oplacer.getFluidHeight();
+			}
+
+			public boolean isDebugSmartBore() {
+				return oplacer.isDebugSmartBore();
+			}
+
+			public void setTile(int param1Int1, int param1Int2, int param1Int3, TileData<? extends TileState> param1TileData) {
+				oplacer.setTile(param1Int1, param1Int2, param1Int3, param1TileData);
+			}
+		} : oplacer;
+
 		if(config.isSmartBore())
 		{
 			ensureSmartBored(placer.isDebugSmartBore());
@@ -666,7 +710,12 @@ public class IrisObject extends IrisRegistrant
 					for(BlockData k : j.getFind(rdata))
 					{
 						if (j.isExact() ? k.matches(data) : k.getMaterial().equals(data.getMaterial())) {
-							data = j.getReplace(rng, i.getX() + x, i.getY() + y, i.getZ() + z, rdata).clone();
+							BlockData newData = j.getReplace(rng, i.getX() + x, i.getY() + y, i.getZ() + z, rdata).clone();
+
+							if (newData.getMaterial() == data.getMaterial())
+								data = data.merge(newData);
+							else
+								data = newData;
 						}
 					}
 				}
@@ -726,7 +775,6 @@ public class IrisObject extends IrisRegistrant
 				{
 					placer.setTile(xx, yy, zz, tile);
 				}
-
 			}
 		}
 		readLock.unlock();

src/main/java/com/volmit/iris/object/IrisObjectLoot.java

@@ -0,0 +1,72 @@
+package com.volmit.iris.object;
+
+import com.volmit.iris.Iris;
+import com.volmit.iris.manager.IrisDataManager;
+import com.volmit.iris.scaffold.cache.AtomicCache;
+import com.volmit.iris.util.ArrayType;
+import com.volmit.iris.util.Desc;
+import com.volmit.iris.util.DontObfuscate;
+import com.volmit.iris.util.KList;
+import com.volmit.iris.util.RegistryListLoot;
+import com.volmit.iris.util.Required;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.experimental.Accessors;
+import org.bukkit.block.data.BlockData;
+
+@Accessors(chain = true)
+@NoArgsConstructor
+@AllArgsConstructor
+@Desc("Represents loot within this object or jigsaw piece")
+@Data
+public class IrisObjectLoot {
+
+    @DontObfuscate
+    @ArrayType(min = 1, type = IrisBlockData.class)
+    @Desc("The list of blocks this loot table should apply to")
+    private KList<IrisBlockData> filter = new KList<>();
+
+    @Desc("Exactly match the block data or not")
+    @DontObfuscate
+    private boolean exact = false;
+
+    @DontObfuscate
+    @Desc("The loot table name")
+    @Required
+    @RegistryListLoot
+    private String name;
+
+    @DontObfuscate
+    @Desc("The weight of this loot table being chosen")
+    private int weight = 1;
+
+    private final transient AtomicCache<KList<BlockData>> filterCache = new AtomicCache<>();
+
+    public KList<BlockData> getFilter(IrisDataManager rdata)
+    {
+        return filterCache.aquire(() ->
+        {
+            KList<BlockData> b = new KList<>();
+
+            for(IrisBlockData i : filter)
+            {
+                BlockData bx = i.getBlockData(rdata);
+
+                if(bx != null)
+                {
+                    b.add(bx);
+                }
+            }
+
+            return b;
+        });
+    }
+
+    public boolean matchesFilter(IrisDataManager manager, BlockData data) {
+        for (BlockData filterData : getFilter(manager)) {
+            if (filterData.matches(data)) return true;
+        }
+        return false;
+    }
+}

src/main/java/com/volmit/iris/object/IrisObjectPlacement.java

@@ -1,6 +1,8 @@
 package com.volmit.iris.object;
 
+import com.volmit.iris.Iris;
 import com.volmit.iris.generator.noise.CNG;
+import com.volmit.iris.manager.IrisDataManager;
 import com.volmit.iris.scaffold.cache.AtomicCache;
 import com.volmit.iris.scaffold.data.DataProvider;
 import com.volmit.iris.util.*;
@@ -9,6 +11,8 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
 import lombok.experimental.Accessors;
+import org.bukkit.Material;
+import org.bukkit.block.data.BlockData;
 
 @EqualsAndHashCode()
 @Accessors(chain = true)
@@ -76,6 +80,10 @@ public class IrisObjectPlacement
 	@Desc("If set to true, objects will place in carvings (such as underground) or under an overhang.")
 	private CarvingMode carvingSupport = CarvingMode.SURFACE_ONLY;
 
+	@DontObfuscate
+	@Desc("If this is defined, this object wont place on the terrain heightmap, but instead on this virtual heightmap")
+	private IrisNoiseGenerator heightmap;
+
 	@DontObfuscate
 	@Desc("If set to true, Iris will try to fill the insides of 'rooms' and 'pockets' where air should fit based off of raytrace checks. This prevents a village house placing in an area where a tree already exists, and instead replaces the parts of the tree where the interior of the structure is. \n\nThis operation does not affect warmed-up generation speed however it does slow down loading objects.")
 	private boolean smartBore = false;
@@ -121,6 +129,11 @@ public class IrisObjectPlacement
 	@Desc("Translate this object's placement")
 	private IrisObjectTranslate translate = new IrisObjectTranslate();
 
+	@ArrayType(min = 1, type = IrisObjectLoot.class)
+	@DontObfuscate
+	@Desc("The loot tables to apply to these objects")
+	private KList<IrisObjectLoot> loot = new KList<>();
+
 	public IrisObjectPlacement toPlacement(String... place)
 	{
 		IrisObjectPlacement p = new IrisObjectPlacement();
@@ -145,6 +158,7 @@ public class IrisObjectPlacement
 		p.setSnow(snow);
 		p.setClamp(clamp);
 		p.setRotation(rotation);
+		p.setLoot(loot);
 		return p;
 	}
 
@@ -191,4 +205,74 @@ public class IrisObjectPlacement
 	public boolean isVacuum() {
 		return getMode().equals(ObjectPlaceMode.VACUUM);
 	}
+
+	private transient AtomicCache<TableCache> cache = new AtomicCache<>();
+
+	private class TableCache {
+		transient WeightedRandom<IrisLootTable> global = new WeightedRandom<>();
+		transient KMap<Material, WeightedRandom<IrisLootTable>> basic = new KMap<>();
+		transient KMap<Material, KMap<BlockData, WeightedRandom<IrisLootTable>>> exact = new KMap<>();
+	}
+
+	private TableCache getCache(IrisDataManager manager) {
+		return cache.aquire(() -> {
+			TableCache tc = new TableCache();
+
+			for (IrisObjectLoot loot : getLoot()) {
+				IrisLootTable table = manager.getLootLoader().load(loot.getName());
+				if (table == null) {
+					Iris.warn("Couldn't find loot table " + loot.getName());
+					continue;
+				}
+
+				if (loot.getFilter().isEmpty()) //Table applies to all containers
+				{
+					tc.global.put(table, loot.getWeight());
+				} else if (!loot.isExact()) //Table is meant to be by type
+				{
+					for (BlockData filterData : loot.getFilter(manager)) {
+						if (!tc.basic.containsKey(filterData.getMaterial())) {
+							tc.basic.put(filterData.getMaterial(), new WeightedRandom<>());
+						}
+
+						tc.basic.get(filterData.getMaterial()).put(table, loot.getWeight());
+					}
+				} else //Filter is exact
+				{
+					for (BlockData filterData : loot.getFilter(manager)) {
+						if (!tc.exact.containsKey(filterData.getMaterial())) {
+							tc.exact.put(filterData.getMaterial(), new KMap<>());
+						}
+
+						if (!tc.exact.get(filterData.getMaterial()).containsKey(filterData)) {
+							tc.exact.get(filterData.getMaterial()).put(filterData, new WeightedRandom<>());
+						}
+
+						tc.exact.get(filterData.getMaterial()).get(filterData).put(table, loot.getWeight());
+					}
+				}
+			}
+			return tc;
+		});
+	}
+
+	public IrisLootTable getTable(BlockData data, IrisDataManager dataManager) {
+		TableCache cache = getCache(dataManager);
+
+		if(B.isStorageChest(data))
+		{
+			IrisLootTable picked = null;
+			if (cache.exact.containsKey(data.getMaterial()) && cache.exact.containsKey(data)) {
+				picked = cache.exact.get(data.getMaterial()).get(data).pullRandom();
+			} else if (cache.basic.containsKey(data.getMaterial())) {
+				picked = cache.basic.get(data.getMaterial()).pullRandom();
+			} else if (cache.global.getSize() > 0){
+				picked = cache.global.pullRandom();
+			}
+
+			return picked;
+		}
+
+		return null;
+	}
 }

src/main/java/com/volmit/iris/scaffold/engine/Engine.java

@@ -302,6 +302,17 @@ public interface Engine extends DataProvider, Fallible, GeneratorAccess, LootPro
         int rx = b.getX();
         int rz = b.getZ();
         double he = getFramework().getComplex().getHeightStream().get(rx, rz);
+        PlacedObject po = getFramework().getEngine().getObjectPlacement(rx, b.getY(), rz);
+        if (po != null && po.getPlacement() != null) {
+
+            if(B.isStorageChest(b.getBlockData()))
+            {
+                IrisLootTable table = po.getPlacement().getTable(b.getBlockData(), getData());
+                if (table != null) {
+                    return new KList<>(table);
+                }
+            }
+        }
         IrisRegion region = getFramework().getComplex().getRegionStream().get(rx, rz);
         IrisBiome biomeSurface = getFramework().getComplex().getTrueBiomeStream().get(rx, rz);
         IrisBiome biomeUnder = b.getY() < he ? getFramework().getComplex().getCaveBiomeStream().get(rx, rz) : biomeSurface;

src/main/java/com/volmit/iris/scaffold/jigsaw/PlannedPiece.java

@@ -1,17 +1,25 @@
 package com.volmit.iris.scaffold.jigsaw;
 
+import com.volmit.iris.Iris;
+import com.volmit.iris.generator.IrisEngine;
 import com.volmit.iris.manager.IrisDataManager;
 import com.volmit.iris.object.*;
 import com.volmit.iris.object.tile.TileData;
+import com.volmit.iris.scaffold.IrisWorlds;
+import com.volmit.iris.scaffold.engine.Engine;
+import com.volmit.iris.scaffold.engine.IrisAccess;
 import com.volmit.iris.util.AxisAlignedBB;
 import com.volmit.iris.util.IObjectPlacer;
 import com.volmit.iris.util.KList;
 import com.volmit.iris.util.RNG;
 import lombok.Data;
+import org.bukkit.Material;
 import org.bukkit.World;
+import org.bukkit.block.Block;
 import org.bukkit.block.BlockState;
 import org.bukkit.block.TileState;
 import org.bukkit.block.data.BlockData;
+import org.bukkit.inventory.InventoryHolder;
 import org.bukkit.util.BlockVector;
 
 @Data
@@ -129,8 +137,17 @@ public class PlannedPiece {
     }
 
     public void place(World world) {
+        IrisAccess a = IrisWorlds.access(world);
+
+        int minY = 0;
+        if (a != null) {
+            minY = a.getCompound().getDefaultEngine().getMinHeight();
+
+            if (!a.getCompound().getRootDimension().isBedrock()) minY--; //If the dimension has no bedrock, allow it to go a block lower
+        }
 
         getPiece().getPlacementOptions().getRotation().setEnabled(false);
+        int finalMinY = minY;
         getObject().place(position.getX()+getObject().getCenter().getBlockX(), position.getY()+getObject().getCenter().getBlockY(), position.getZ()+getObject().getCenter().getBlockZ(), new IObjectPlacer() {
             @Override
             public int getHighest(int x, int z) {
@@ -144,7 +161,22 @@ public class PlannedPiece {
 
             @Override
             public void set(int x, int y, int z, BlockData d) {
-                world.getBlockAt(x,y,z).setBlockData(d);
+                Block block = world.getBlockAt(x, y, z);
+
+                //Prevent blocks being set in or bellow bedrock
+                if (y <= finalMinY || block.getType() == Material.BEDROCK) return;
+
+                block.setBlockData(d);
+
+                if (a != null && getPiece().getPlacementOptions().getLoot().isNotEmpty() &&
+                        block.getState() instanceof InventoryHolder) {
+
+                    IrisLootTable table = getPiece().getPlacementOptions().getTable(block.getBlockData(), getData());
+                    if (table == null) return;
+                    Engine engine = a.getCompound().getEngineForHeight(y);
+                    engine.addItems(false, ((InventoryHolder) block.getState()).getInventory(), getStructure().getRng(),
+                            new KList<>(table), InventorySlotType.STORAGE, x, y, z, 15);
+                }
             }
 
             @Override
@@ -183,6 +215,6 @@ public class PlannedPiece {
                 tile.toBukkitTry(state);
                 state.update();
             }
-        }, piece.getPlacementOptions(), new RNG(), getData());
+        }, piece.getPlacementOptions(), getStructure().getRng(), getData());
     }
 }

src/main/java/com/volmit/iris/scaffold/jigsaw/PlannedStructure.java

@@ -15,6 +15,7 @@ import lombok.Data;
 import org.bukkit.Axis;
 import org.bukkit.Location;
 import org.bukkit.World;
+import org.bukkit.entity.Entity;
 
 @Data
 public class PlannedStructure {
@@ -79,7 +80,6 @@ public class PlannedStructure {
             options= i.getPiece().getPlacementOptions();
             options.getRotation().setEnabled(false);
         }
-
         else
         {
             options.setMode(i.getPiece().getPlaceMode());
@@ -162,13 +162,20 @@ public class PlannedStructure {
                 {
                     if(j.getSpawnEntity() != null)
                     {
+                        IrisAccess a = IrisWorlds.access(world);
+                        if (a == null) {
+                            Iris.warn("Cannot spawn entities from jigsaw in non Iris world!");
+                            break;
+                        }
                         IrisPosition p = i.getWorldPosition(j).add(new IrisPosition(j.getDirection().toVector().multiply(2)));
                         IrisEntity e = getData().getEntityLoader().load(j.getSpawnEntity());
-                        IrisAccess a = IrisWorlds.access(world);
 
                         if(a != null)
                         {
-                            e.spawn(a.getCompound().getEngineForHeight(p.getY()), new Location(world, p.getX(), p.getY(), p.getZ()), rng);
+                            Entity entity = e.spawn(a.getCompound().getEngineForHeight(p.getY()), new Location(world, p.getX() + 0.5, p.getY(), p.getZ() + 0.5), rng);
+                            if (j.isKeepEntity()) {
+                                entity.setPersistent(true);
+                            }
                         }
                     }
                 }

src/main/java/com/volmit/iris/util/JSONArray.java

@@ -843,7 +843,7 @@ public class JSONArray implements Iterable<Object>
 	 */
 	public JSONArray put(double value) throws JSONException
 	{
-		Double d = value;
+		Double d = new Double(value);
 		JSONObject.testValidity(d);
 		this.put(d);
 		return this;
@@ -858,7 +858,7 @@ public class JSONArray implements Iterable<Object>
 	 */
 	public JSONArray put(int value)
 	{
-		this.put(value);
+		this.put(new Integer(value));
 		return this;
 	}
 
@@ -871,7 +871,7 @@ public class JSONArray implements Iterable<Object>
 	 */
 	public JSONArray put(long value)
 	{
-		this.put(value);
+		this.put(new Long(value));
 		return this;
 	}
 
@@ -956,7 +956,7 @@ public class JSONArray implements Iterable<Object>
 	 */
 	public JSONArray put(int index, double value) throws JSONException
 	{
-		this.put(index, value);
+		this.put(index, new Double(value));
 		return this;
 	}
 
@@ -975,7 +975,7 @@ public class JSONArray implements Iterable<Object>
 	 */
 	public JSONArray put(int index, int value) throws JSONException
 	{
-		this.put(index, value);
+		this.put(index, new Integer(value));
 		return this;
 	}
 
@@ -994,7 +994,7 @@ public class JSONArray implements Iterable<Object>
 	 */
 	public JSONArray put(int index, long value) throws JSONException
 	{
-		this.put(index, value);
+		this.put(index, new Long(value));
 		return this;
 	}
 

src/main/java/com/volmit/iris/util/JSONObject.java

@@ -1352,7 +1352,7 @@ public class JSONObject
 	 */
 	public JSONObject put(String key, double value) throws JSONException
 	{
-		this.put(key, value);
+		this.put(key, new Double(value));
 		return this;
 	}
 	

src/main/java/com/volmit/iris/util/WeightedRandom.java

@@ -0,0 +1,41 @@
+package com.volmit.iris.util;
+
+import java.util.Random;
+
+public class WeightedRandom<T> {
+
+    private KList<KeyPair<T, Integer>> weightedObjects = new KList<>();
+    private Random random;
+    private int totalWeight = 0;
+
+    public WeightedRandom(Random random) {
+        this.random = random;
+    }
+
+    public WeightedRandom() {
+        this.random = new Random();
+    }
+
+    public void put(T object, int weight) {
+        weightedObjects.add(new KeyPair<>(object, weight));
+        totalWeight += weight;
+    }
+
+    public T pullRandom() {
+        int pull = random.nextInt(totalWeight);
+        int index = 0;
+        while (pull > 0) {
+            pull -= weightedObjects.get(index).getV();
+            index++;
+        }
+        return weightedObjects.get(index).getK();
+    }
+
+    public int getSize() {
+        return weightedObjects.size();
+    }
+
+    public void shuffle() {
+        weightedObjects.shuffle(random);
+    }
+}