Repo-Mirror/Iris-World-Engine
9
0
Fork 0
mirror of https://github.com/VolmitSoftware/Iris.git synced 2025-12-29 20:19:06 +00:00
Code Issues Releases Activity

More fix

Browse Source
This commit is contained in:
Daniel Mills
2020-08-26 09:33:05 -04:00
parent 5ab2bae5d7
commit ed9ddc0825
59 changed files with 563 additions and 497 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -10,15 +10,12 @@ public class CommandIris extends MortarCommand
@Command
private CommandIrisStudio studio;
@Command
private CommandIrisWorld world;
@Command
private CommandIrisWhat what;
@Command
private CommandIrisObject object;
@Command
private CommandIrisStructure structure;

56
src/main/java/com/volmit/iris/command/CommandIrisEditBiome.java Normal file
View File

@@ -0,0 +1,56 @@
package com.volmit.iris.command;
import java.awt.Desktop;
import java.io.File;
import org.bukkit.entity.Player;
import com.volmit.iris.Iris;
import com.volmit.iris.util.MortarCommand;
import com.volmit.iris.util.MortarSender;
public class CommandIrisEditBiome extends MortarCommand
{
public CommandIrisEditBiome()
{
super("editbiome", "ebiome", "eb");
setDescription("Open this biome file in vscode");
requiresPermission(Iris.perm.studio);
setCategory("Studio");
}
@Override
public boolean handle(MortarSender sender, String[] args)
{
if(sender.isPlayer())
{
Player p = sender.player();
try
{
File f = Iris.proj.getCurrentProject().sampleTrueBiome(p.getLocation().getBlockX(), p.getLocation().getBlockY(), p.getLocation().getBlockZ()).getBiome().getLoadFile();
Desktop.getDesktop().open(f);
}
catch(Throwable e)
{
sender.sendMessage("Cant find the file. Are you in an Iris world?");
}
return true;
}
else
{
sender.sendMessage("Players only.");
}
return true;
}
@Override
protected String getArgsUsage()
{
return "[width]";
}
}

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

@@ -1,12 +1,12 @@
package com.volmit.iris.command;
import org.bukkit.ChatColor;
import org.bukkit.World;
import org.bukkit.entity.Player;
import com.volmit.iris.Iris;
import com.volmit.iris.IrisMetrics;
import com.volmit.iris.gen.IrisChunkGenerator;
import com.volmit.iris.util.C;
import com.volmit.iris.util.Form;
import com.volmit.iris.util.MortarCommand;
import com.volmit.iris.util.MortarSender;
@@ -30,12 +30,12 @@ public class CommandIrisMetrics extends MortarCommand
World world = p.getWorld();
IrisChunkGenerator g = (IrisChunkGenerator) world.getGenerator();
IrisMetrics m = g.getMetrics();
sender.sendMessage("Thread Count: " + ChatColor.BOLD + "" + ChatColor.WHITE + g.getThreads());
sender.sendMessage("Total : " + ChatColor.BOLD + "" + ChatColor.WHITE + Form.duration(m.getTotal().getAverage(), 2));
sender.sendMessage(" Terrain : " + ChatColor.BOLD + "" + ChatColor.WHITE + Form.duration(m.getTerrain().getAverage(), 2));
sender.sendMessage(" Parallax: " + ChatColor.BOLD + "" + ChatColor.WHITE + Form.duration(m.getParallax().getAverage(), 2));
sender.sendMessage(" Post : " + ChatColor.BOLD + "" + ChatColor.WHITE + Form.duration(m.getPost().getAverage(), 2));
sender.sendMessage("Updates : " + ChatColor.BOLD + "" + ChatColor.WHITE + Form.duration(m.getUpdate().getAverage(), 2));
sender.sendMessage("Thread Count: " + C.BOLD + "" + C.WHITE + g.getThreads());
sender.sendMessage("Total : " + C.BOLD + "" + C.WHITE + Form.duration(m.getTotal().getAverage(), 2));
sender.sendMessage(" Terrain : " + C.BOLD + "" + C.WHITE + Form.duration(m.getTerrain().getAverage(), 2));
sender.sendMessage(" Parallax: " + C.BOLD + "" + C.WHITE + Form.duration(m.getParallax().getAverage(), 2));
sender.sendMessage(" Post : " + C.BOLD + "" + C.WHITE + Form.duration(m.getPost().getAverage(), 2));
sender.sendMessage("Updates : " + C.BOLD + "" + C.WHITE + Form.duration(m.getUpdate().getAverage(), 2));
return true;
}

24
src/main/java/com/volmit/iris/command/CommandIrisStudio.java
View File

@@ -31,6 +31,30 @@ public class CommandIrisStudio extends MortarCommand
@Command
private CommandIrisStudioList list;
@Command
private CommandIrisGoto got0;
@Command
private CommandIrisEditBiome ebiome;
@Command
private CommandIrisMetrics metrics;
@Command
private CommandIrisPregen pregen;
@Command
private CommandIrisPregen world;
@Command
private CommandIrisHotload hotload;
@Command
private CommandIrisTC tc;
@Command
private CommandIrisLoot loot;
public CommandIrisStudio()
{
super("studio", "std");

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

@@ -1,11 +1,10 @@
package com.volmit.iris.command;
import com.volmit.iris.Iris;
import com.volmit.iris.util.C;
import com.volmit.iris.util.MortarCommand;
import com.volmit.iris.util.MortarSender;
import net.md_5.bungee.api.ChatColor;
public class CommandIrisStudioCreate extends MortarCommand
{
public CommandIrisStudioCreate()
@@ -22,7 +21,7 @@ public class CommandIrisStudioCreate extends MortarCommand
if(args.length != 1)
{
sender.sendMessage("Please use a lowercase name with hyphens (-) for spaces.");
sender.sendMessage("I.e. /iris std new " + ChatColor.BOLD + "aether");
sender.sendMessage("I.e. /iris std new " + C.BOLD + "aether");
return true;
}

12
src/main/java/com/volmit/iris/command/CommandIrisWhat.java
View File

@@ -1,12 +1,12 @@
package com.volmit.iris.command;
import org.bukkit.ChatColor;
import org.bukkit.World;
import org.bukkit.entity.Player;
import com.volmit.iris.Iris;
import com.volmit.iris.IrisMetrics;
import com.volmit.iris.gen.IrisChunkGenerator;
import com.volmit.iris.util.C;
import com.volmit.iris.util.Command;
import com.volmit.iris.util.Form;
import com.volmit.iris.util.MortarCommand;
@@ -38,11 +38,11 @@ public class CommandIrisWhat extends MortarCommand
World world = p.getWorld();
IrisChunkGenerator g = (IrisChunkGenerator) world.getGenerator();
IrisMetrics m = g.getMetrics();
sender.sendMessage("Thread Count: " + ChatColor.BOLD + "" + ChatColor.WHITE + g.getThreads());
sender.sendMessage("Total : " + ChatColor.BOLD + "" + ChatColor.WHITE + Form.duration(m.getTotal().getAverage(), 2));
sender.sendMessage(" Terrain : " + ChatColor.BOLD + "" + ChatColor.WHITE + Form.duration(m.getTerrain().getAverage(), 2));
sender.sendMessage(" Parallax: " + ChatColor.BOLD + "" + ChatColor.WHITE + Form.duration(m.getParallax().getAverage(), 2));
sender.sendMessage(" Post : " + ChatColor.BOLD + "" + ChatColor.WHITE + Form.duration(m.getPost().getAverage(), 2));
sender.sendMessage("Thread Count: " + C.BOLD + "" + C.WHITE + g.getThreads());
sender.sendMessage("Total : " + C.BOLD + "" + C.WHITE + Form.duration(m.getTotal().getAverage(), 2));
sender.sendMessage(" Terrain : " + C.BOLD + "" + C.WHITE + Form.duration(m.getTerrain().getAverage(), 2));
sender.sendMessage(" Parallax: " + C.BOLD + "" + C.WHITE + Form.duration(m.getParallax().getAverage(), 2));
sender.sendMessage(" Post : " + C.BOLD + "" + C.WHITE + Form.duration(m.getPost().getAverage(), 2));
return true;
}

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

@@ -1,11 +1,11 @@
package com.volmit.iris.command;
import org.bukkit.ChatColor;
import org.bukkit.FluidCollisionMode;
import org.bukkit.block.data.BlockData;
import org.bukkit.entity.Player;
import com.volmit.iris.Iris;
import com.volmit.iris.util.C;
import com.volmit.iris.util.MortarCommand;
import com.volmit.iris.util.MortarSender;
@@ -27,8 +27,8 @@ public class CommandIrisWhatBlock extends MortarCommand
{
Player p = sender.player();
BlockData bd = p.getTargetBlockExact(128, FluidCollisionMode.NEVER).getBlockData();
sender.sendMessage("Material: " + ChatColor.GREEN + bd.getMaterial().name());
sender.sendMessage("Full: " + ChatColor.WHITE + bd.getAsString(true));
sender.sendMessage("Material: " + C.GREEN + bd.getMaterial().name());
sender.sendMessage("Full: " + C.WHITE + bd.getAsString(true));
}
else

17
src/main/java/com/volmit/iris/command/CommandIrisWhatHand.java
View File

@@ -1,15 +1,17 @@
package com.volmit.iris.command;
import org.bukkit.ChatColor;
import org.bukkit.block.data.BlockData;
import org.bukkit.entity.Player;
import com.volmit.iris.Iris;
import com.volmit.iris.util.C;
import com.volmit.iris.util.MortarCommand;
import com.volmit.iris.util.MortarSender;
public class CommandIrisWhatHand extends MortarCommand {
public CommandIrisWhatHand() {
public class CommandIrisWhatHand extends MortarCommand
{
public CommandIrisWhatHand()
{
super("hand", "h");
setDescription("Get the block data for holding.");
requiresPermission(Iris.perm.studio);
@@ -21,11 +23,11 @@ public class CommandIrisWhatHand extends MortarCommand {
public boolean handle(MortarSender sender, String[] args)
{
if(sender.isPlayer())
{
{
Player p = sender.player();
BlockData bd = p.getInventory().getItemInMainHand().getType().createBlockData();
sender.sendMessage("Material: " + ChatColor.GREEN + bd.getMaterial().name());
sender.sendMessage("Full: " + ChatColor.WHITE + bd.getAsString(true));
sender.sendMessage("Material: " + C.GREEN + bd.getMaterial().name());
sender.sendMessage("Full: " + C.WHITE + bd.getAsString(true));
}
else
@@ -37,7 +39,8 @@ public class CommandIrisWhatHand extends MortarCommand {
}
@Override
protected String getArgsUsage() {
protected String getArgsUsage()
{
return "";
}
}

54
src/main/java/com/volmit/iris/command/CommandIrisWorld.java
View File

@@ -1,54 +0,0 @@
package com.volmit.iris.command;
import com.volmit.iris.Iris;
import com.volmit.iris.util.Command;
import com.volmit.iris.util.MortarCommand;
import com.volmit.iris.util.MortarSender;
public class CommandIrisWorld extends MortarCommand
{
@Command
private CommandIrisGoto got0;
@Command
private CommandIrisMetrics metrics;
@Command
private CommandIrisPregen pregen;
@Command
private CommandIrisPregen world;
@Command
private CommandIrisHotload hotload;
@Command
private CommandIrisTC tc;
@Command
private CommandIrisLoot loot;
public CommandIrisWorld()
{
super("world", "wrld", "w");
setDescription("Commands while in an iris world.");
requiresPermission(Iris.perm.studio);
setCategory("World");
setDescription("Worldly commands");
}
@Override
public boolean handle(MortarSender sender, String[] args)
{
sender.sendMessage("Iris In-World Commands");
printHelp(sender);
return true;
}
@Override
protected String getArgsUsage()
{
return "[biome] [otherbiome] [-cave]";
}
}