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

Hotload fixes

Browse Source
This commit is contained in:
Daniel Mills 2020-11-23 02:38:49 -05:00
parent d6b7a4bdba
commit 58845ae79f
3 changed files with 32 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -397,7 +397,6 @@ public class IrisBiome extends IrisRegistrant implements IRare
CNG hgen = getLayerHeightGenerators(random, rdata).get(i);
double d = hgen.fit(layers.get(i).getMinHeight(), layers.get(i).getMaxHeight(), wx / layers.get(i).getZoom(), wz / layers.get(i).getZoom());
IrisSlopeClip sc = getLayers().get(i).getSlopeCondition();
if(!sc.isDefault())

23
src/main/java/com/volmit/iris/scaffold/engine/EngineCompositeGenerator.java
View File

@ -14,6 +14,7 @@ import org.bukkit.*;
import org.bukkit.block.Biome;
import org.bukkit.block.data.BlockData;
import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player;
import org.bukkit.generator.BlockPopulator;
import org.bukkit.generator.ChunkGenerator;
import org.bukkit.material.MaterialData;
@ -34,6 +35,7 @@ public class EngineCompositeGenerator extends ChunkGenerator implements IrisAcce
private long mst = 0;
private int generated = 0;
private int lgenerated = 0;
private ChronoLatch hotloadcd;
@Getter
private double generatedPerSecond = 0;
private int art;
@ -45,6 +47,7 @@ public class EngineCompositeGenerator extends ChunkGenerator implements IrisAcce
public EngineCompositeGenerator(String hint, boolean production) {
super();
hotloadcd = new ChronoLatch(3500);
mst = M.ms();
this.production = production;
this.dimensionHint = hint;
@ -66,8 +69,28 @@ public class EngineCompositeGenerator extends ChunkGenerator implements IrisAcce
public void hotload()
{
if(hotloadcd.flip())
{
Iris.proj.updateWorkspace();
getData().dump();
initialized.lazySet(false);
hotloader.checkIgnore();
J.s(() -> {
try
{
for(Player i : getTarget().getWorld().getPlayers())
{
new MortarSender(i, Iris.instance.getTag()).sendMessage("Dimension Hotloaded");
i.playSound(i.getLocation(), Sound.ITEM_BOTTLE_FILL, 1f, 1.25f);
}
}
catch(Throwable e)
{
}
});
}
}
public void tick()

7
src/main/java/com/volmit/iris/util/ReactiveFolder.java
View File

@ -16,11 +16,18 @@ public class ReactiveFolder
fw.checkModified();
}
public void checkIgnore()
{
fw = new FolderWatcher(folder);
}
public void check()
{
if(fw.checkModified())
{
fw.checkModified();
hotload.accept(fw.getCreated(), fw.getChanged(), fw.getDeleted());
fw.checkModified();
}
}
}