mirrors/Iris
1
0
Fork 0
mirror of https://github.com/VolmitSoftware/Iris.git synced 2025-07-19 10:43:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

Loading & Saving!

Browse Source
This commit is contained in:
Daniel Mills 2020-08-24 12:57:25 -04:00
parent 998e1b62a5
commit 44b6396b78
3 changed files with 56 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/main/java/com/volmit/iris/command/CommandIrisStructureVariants.java
View File

@ -27,7 +27,15 @@ public class CommandIrisStructureVariants extends MortarCommand
Player p = sender.player();
Iris.struct.get(p).openVariants();
try
{
Iris.struct.get(p).openVariants();
}
catch(Throwable e)
{
sender.sendMessage("You do not have an open structure");
}
return true;
}

1
src/main/java/com/volmit/iris/object/IrisObject.java
View File

@ -43,6 +43,7 @@ public class IrisObject extends IrisRegistrant
public IrisObject copy()
{
IrisObject o = new IrisObject(w, h, d);
o.setLoadKey(o.getLoadKey());
o.setCenter(getCenter().clone());
for(BlockVector i : getBlocks().k())

48
src/main/java/com/volmit/iris/util/StructureTemplate.java
View File

@ -26,6 +26,7 @@ import org.bukkit.event.block.BlockIgniteEvent;
import org.bukkit.event.block.BlockPhysicsEvent;
import org.bukkit.event.block.BlockPlaceEvent;
import org.bukkit.event.block.BlockSpreadEvent;
import org.bukkit.event.player.PlayerMoveEvent;
import org.bukkit.util.BlockVector;
import com.google.gson.Gson;
@ -128,6 +129,23 @@ public class StructureTemplate implements Listener, IObjectPlacer
}
}
@EventHandler
public void on(PlayerMoveEvent e)
{
if(!e.getTo().getWorld().equals(getCenter().getWorld()))
{
e.getPlayer().sendMessage(Iris.instance.getTag() + " Saving open structure. Use /iris str load " + structure.getLoadKey() + " to re-open.");
close();
return;
}
if(e.getTo().distanceSquared(getCenter()) > Math.pow((size * w * 5), 2))
{
e.getPlayer().sendMessage(Iris.instance.getTag() + " Saving open structure. Use /iris str load " + structure.getLoadKey() + " to re-open.");
close();
}
}
public void loadStructures(IrisStructure input)
{
Iris.info("Loading existing structure");
@ -157,20 +175,23 @@ public class StructureTemplate implements Listener, IObjectPlacer
String b = o.getLoadKey();
o.setLoadKey(realType + "-" + v);
if(b.equals(o.getLoadKey()))
if(b != null && !b.equals(o.getLoadKey()))
{
Iris.warn("Loading Object " + b + " as " + o.getLoadKey() + " (not deleting the old file)");
}
hijacked.getForceObjects().put(v, o);
hijacked.getObjects().add("structure/" + this.structure.getLoadKey() + "/" + o.getLoadKey());
}
structure.getTiles().add(i);
structure.getTiles().add(hijacked);
break;
}
}
}
regenerate();
}
public void openVariants()
@ -458,6 +479,28 @@ public class StructureTemplate implements Listener, IObjectPlacer
}
}
public void deleteTiles()
{
Cuboid bounds = getBounds();
for(int i = bounds.getLowerX(); i < bounds.getUpperX(); i += w)
{
for(int j = bounds.getLowerZ(); j < bounds.getUpperZ(); j += w)
{
for(int hh = bounds.getLowerY(); hh < bounds.getUpperY(); hh += h)
{
Location l = new Location(world, i, hh, j);
if(isWithinBounds(l))
{
Cuboid d = getTileBounds(l);
J.s(() -> deleteTile(d), RNG.r.i(0, 100));
}
}
}
}
}
public void deleteTile(Cuboid from)
{
Location center = from.getCenter();
@ -511,6 +554,7 @@ public class StructureTemplate implements Listener, IObjectPlacer
Bukkit.getScheduler().cancelTask(task);
saveStructure();
Iris.struct.remove(this);
deleteTiles();
}
public TileResult getTile(int x, int y, int z)