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

fix

Browse Source
This commit is contained in:
Dan Macbook
2020-08-02 11:35:35 -04:00
parent ea3e7f9ace
commit 7863660a47
10 changed files with 98 additions and 97 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/volmit/iris/command/CommandIrisGoto.java
View File

@@ -24,7 +24,7 @@ public class CommandIrisGoto extends MortarCommand
@Override
public boolean handle(MortarSender sender, String[] args)
{
if(args.length <= 1)
if(args.length < 1)
{
sender.sendMessage("/iris world goto " + getArgsUsage());
return true;

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

@@ -26,7 +26,7 @@ public class CommandIrisMetrics extends MortarCommand
{
if(sender.isPlayer())
{
Player p = (Player) sender;
Player p = sender.player();
World world = p.getWorld();
IrisChunkGenerator g = (IrisChunkGenerator) world.getGenerator();
IrisMetrics m = g.getMetrics();

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

@@ -79,17 +79,17 @@ public class CommandIrisStudioCreate extends MortarCommand
b1.setMin(3);
b1.setMax(7);
IrisBiomeGeneratorLink b2 = new IrisBiomeGeneratorLink();
b1.setGenerator(gen.getLoadKey());
b1.setMin(12);
b1.setMax(35);
b2.setGenerator(gen.getLoadKey());
b2.setMin(12);
b2.setMax(35);
IrisBiomeGeneratorLink b3 = new IrisBiomeGeneratorLink();
b1.setGenerator(gen.getLoadKey());
b1.setMin(-1);
b1.setMax(1);
b3.setGenerator(gen.getLoadKey());
b3.setMin(-1);
b3.setMax(1);
IrisBiomeGeneratorLink b4 = new IrisBiomeGeneratorLink();
b1.setGenerator(gen.getLoadKey());
b1.setMin(-5);
b1.setMax(-38);
b4.setGenerator(gen.getLoadKey());
b4.setMin(-5);
b4.setMax(-38);
exampleLand2.getLayers().get(0).getPalette().clear();
exampleLand2.getLayers().get(0).getPalette().add("RED_SAND");
exampleShore1.getLayers().get(0).getPalette().clear();

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

@@ -25,7 +25,8 @@ public class CommandIrisWhatBlock extends MortarCommand
{
if(sender.isPlayer())
{
BlockData bd = ((Player) sender).getTargetBlockExact(128, FluidCollisionMode.NEVER).getBlockData();
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));
}

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

@@ -1,7 +1,6 @@
package com.volmit.iris.command;
import org.bukkit.ChatColor;
import org.bukkit.FluidCollisionMode;
import org.bukkit.block.data.BlockData;
import org.bukkit.entity.Player;
@@ -9,10 +8,8 @@ import com.volmit.iris.Iris;
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);
@@ -24,8 +21,9 @@ public class CommandIrisWhatHand extends MortarCommand
public boolean handle(MortarSender sender, String[] args)
{
if(sender.isPlayer())
{
BlockData bd = ((Player) sender).getTargetBlockExact(128, FluidCollisionMode.NEVER).getBlockData();
{
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));
}
@@ -39,8 +37,7 @@ public class CommandIrisWhatHand extends MortarCommand
}
@Override
protected String getArgsUsage()
{
protected String getArgsUsage() {
return "";
}
}