Repo-Mirror/Iris-World-Engine
9
0
Fork 0
mirror of https://github.com/VolmitSoftware/Iris.git synced 2026-01-02 22:02:23 +00:00
Code Issues Releases Activity

1.16 NMS Support

Browse Source
This commit is contained in:
Daniel Mills
2020-10-20 10:16:19 -04:00
parent 0fb5cbdb06
commit 88d589bae5
15 changed files with 81 additions and 121 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/java/com/volmit/iris/command/CommandIrisCTC.java
View File

@@ -6,6 +6,7 @@ import org.bukkit.entity.Player;
import com.volmit.iris.Iris;
import com.volmit.iris.gen.IrisTerrainProvider;
import com.volmit.iris.gen.provisions.ProvisionBukkit;
import com.volmit.iris.gen.scaffold.IrisWorlds;
import com.volmit.iris.util.MortarCommand;
import com.volmit.iris.util.MortarSender;
@@ -27,7 +28,7 @@ public class CommandIrisCTC extends MortarCommand
sender.sendMessage("/iris ctc " + getArgsUsage());
return true;
}
if(sender.isPlayer())
{
Player p = sender.player();
@@ -39,7 +40,7 @@ public class CommandIrisCTC extends MortarCommand
return true;
}
IrisTerrainProvider g = (IrisTerrainProvider) ((ProvisionBukkit) world.getGenerator()).getProvider();
IrisTerrainProvider g = IrisWorlds.getProvider(world);
int m = Math.min(Math.max(Integer.valueOf(args[0]), 2), 256);
g.changeThreadCount(m);
sender.sendMessage("Thread count changed to " + m);

3
src/main/java/com/volmit/iris/command/CommandIrisMetrics.java
View File

@@ -7,6 +7,7 @@ import com.volmit.iris.Iris;
import com.volmit.iris.gen.IrisTerrainProvider;
import com.volmit.iris.gen.provisions.ProvisionBukkit;
import com.volmit.iris.gen.scaffold.IrisMetrics;
import com.volmit.iris.gen.scaffold.IrisWorlds;
import com.volmit.iris.util.C;
import com.volmit.iris.util.Form;
import com.volmit.iris.util.MortarCommand;
@@ -35,7 +36,7 @@ public class CommandIrisMetrics extends MortarCommand
return true;
}
IrisTerrainProvider g = (IrisTerrainProvider) ((ProvisionBukkit) world.getGenerator()).getProvider();
IrisTerrainProvider g = IrisWorlds.getProvider(world);
IrisMetrics m = g.getMetrics();
sender.sendMessage("Thread Count: " + C.BOLD + "" + C.WHITE + g.getThreads());
sender.sendMessage("Total : " + C.BOLD + "" + C.WHITE + Form.duration(m.getTotal().getAverage(), 2));

3
src/main/java/com/volmit/iris/command/CommandIrisStudioGoto.java
View File

@@ -7,6 +7,7 @@ import org.bukkit.entity.Player;
import com.volmit.iris.Iris;
import com.volmit.iris.gen.IrisTerrainProvider;
import com.volmit.iris.gen.provisions.ProvisionBukkit;
import com.volmit.iris.gen.scaffold.IrisWorlds;
import com.volmit.iris.object.IrisBiome;
import com.volmit.iris.util.MortarCommand;
import com.volmit.iris.util.MortarSender;
@@ -42,7 +43,7 @@ public class CommandIrisStudioGoto extends MortarCommand
return true;
}
IrisTerrainProvider g = (IrisTerrainProvider) ((ProvisionBukkit) world.getGenerator()).getProvider();
IrisTerrainProvider g = IrisWorlds.getProvider(world);
int tries = 10000;
boolean cave = false;
IrisBiome biome2 = null;

3
src/main/java/com/volmit/iris/command/CommandIrisStudioHotload.java
View File

@@ -7,6 +7,7 @@ import com.volmit.iris.Iris;
import com.volmit.iris.IrisSettings;
import com.volmit.iris.gen.IrisTerrainProvider;
import com.volmit.iris.gen.provisions.ProvisionBukkit;
import com.volmit.iris.gen.scaffold.IrisWorlds;
import com.volmit.iris.util.MortarCommand;
import com.volmit.iris.util.MortarSender;
@@ -39,7 +40,7 @@ public class CommandIrisStudioHotload extends MortarCommand
return true;
}
IrisTerrainProvider g = (IrisTerrainProvider) ((ProvisionBukkit) world.getGenerator()).getProvider();
IrisTerrainProvider g = IrisWorlds.getProvider(world);
g.onHotload();
sender.sendMessage("Hotloaded!");
return true;

3
src/main/java/com/volmit/iris/command/CommandIrisStudioSummon.java
View File

@@ -7,6 +7,7 @@ import com.volmit.iris.Iris;
import com.volmit.iris.IrisSettings;
import com.volmit.iris.gen.IrisTerrainProvider;
import com.volmit.iris.gen.provisions.ProvisionBukkit;
import com.volmit.iris.gen.scaffold.IrisWorlds;
import com.volmit.iris.object.IrisEntity;
import com.volmit.iris.util.MortarCommand;
import com.volmit.iris.util.MortarSender;
@@ -40,7 +41,7 @@ public class CommandIrisStudioSummon extends MortarCommand
return true;
}
IrisTerrainProvider g = (IrisTerrainProvider) ((ProvisionBukkit) world.getGenerator()).getProvider();
IrisTerrainProvider g = IrisWorlds.getProvider(world);
if(args.length == 0)
{
for(String i : g.getData().getEntityLoader().getPossibleKeys())

6
src/main/java/com/volmit/iris/command/CommandIrisWhatBiome.java
View File

@@ -5,7 +5,7 @@ import org.bukkit.entity.Player;
import com.volmit.iris.Iris;
import com.volmit.iris.gen.IrisTerrainProvider;
import com.volmit.iris.gen.provisions.ProvisionBukkit;
import com.volmit.iris.gen.scaffold.IrisWorlds;
import com.volmit.iris.object.IrisBiome;
import com.volmit.iris.util.MortarCommand;
import com.volmit.iris.util.MortarSender;
@@ -31,7 +31,9 @@ public class CommandIrisWhatBiome extends MortarCommand
try
{
IrisBiome b = ((IrisTerrainProvider) ((ProvisionBukkit) w.getGenerator()).getProvider()).sampleTrueBiome(p.getLocation().getBlockX(), p.getLocation().getBlockY(), p.getLocation().getBlockZ());
IrisTerrainProvider g = IrisWorlds.getProvider(w);
IrisBiome b = g.sampleTrueBiome(p.getLocation().getBlockX(), p.getLocation().getBlockY(), p.getLocation().getBlockZ());
sender.sendMessage("IBiome: " + b.getLoadKey() + " (" + b.getDerivative().name() + ")");
}