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

Move

Browse Source
This commit is contained in:
Daniel Mills
2020-08-01 09:57:42 -04:00
parent f3d87f09d7
commit d679660e8a
40 changed files with 134 additions and 113 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/main/java/com/volmit/iris/util/BlockDataTools.java
View File

@@ -78,6 +78,21 @@ public class BlockDataTools
return null;
}
public static boolean isLit(BlockData mat)
{
return isLit(mat.getMaterial());
}
public static boolean isLit(Material mat)
{
if(mat.equals(Material.GLOWSTONE) || mat.equals(Material.TORCH) || mat.equals(Material.REDSTONE_TORCH) || mat.equals(Material.SOUL_TORCH) || mat.equals(Material.REDSTONE_WALL_TORCH) || mat.equals(Material.WALL_TORCH) || mat.equals(Material.SOUL_WALL_TORCH) || mat.equals(Material.LANTERN) || mat.equals(Material.JACK_O_LANTERN) || mat.equals(Material.REDSTONE_LAMP) || mat.equals(Material.MAGMA_BLOCK) || mat.equals(Material.SEA_LANTERN) || mat.equals(Material.SOUL_LANTERN) || mat.equals(Material.FIRE) || mat.equals(Material.SOUL_FIRE) || mat.equals(Material.SEA_PICKLE) || mat.equals(Material.BREWING_STAND) || mat.equals(Material.REDSTONE_ORE))
{
return true;
}
return false;
}
public static boolean canPlaceOnto(Material mat, Material onto)
{
if(onto.equals(Material.GRASS_BLOCK) && mat.equals(Material.DEAD_BUSH))

2
src/main/java/com/volmit/iris/util/Command.java
View File

@@ -1,4 +1,4 @@
package com.volmit.iris.command.util;
package com.volmit.iris.util;
import static java.lang.annotation.ElementType.*;
import static java.lang.annotation.RetentionPolicy.*;

2
src/main/java/com/volmit/iris/util/Control.java
View File

@@ -1,4 +1,4 @@
package com.volmit.iris.command.util;
package com.volmit.iris.util;
import static java.lang.annotation.ElementType.*;
import static java.lang.annotation.RetentionPolicy.*;

2
src/main/java/com/volmit/iris/util/Controller.java
View File

@@ -1,4 +1,4 @@
package com.volmit.iris.command.util;
package com.volmit.iris.util;
import com.volmit.iris.Iris;

4
src/main/java/com/volmit/iris/util/ICommand.java
View File

@@ -1,6 +1,4 @@
package com.volmit.iris.command.util;
import com.volmit.iris.util.KList;
package com.volmit.iris.util;
/**
* Represents a pawn command

2
src/main/java/com/volmit/iris/util/IController.java
View File

@@ -1,4 +1,4 @@
package com.volmit.iris.command.util;
package com.volmit.iris.util;
import org.bukkit.event.Listener;

2
src/main/java/com/volmit/iris/util/Instance.java
View File

@@ -1,4 +1,4 @@
package com.volmit.iris.command.util;
package com.volmit.iris.util;
import static java.lang.annotation.ElementType.*;
import static java.lang.annotation.RetentionPolicy.*;

4
src/main/java/com/volmit/iris/util/MortarCommand.java
View File

@@ -1,12 +1,10 @@
package com.volmit.iris.command.util;
package com.volmit.iris.util;
import java.lang.reflect.Field;
import java.lang.reflect.InvocationTargetException;
import org.bukkit.ChatColor;
import com.volmit.iris.util.KList;
/**
* Represents a pawn command
*

4
src/main/java/com/volmit/iris/util/MortarPermission.java
View File

@@ -1,4 +1,4 @@
package com.volmit.iris.command.util;
package com.volmit.iris.util;
import java.lang.reflect.Field;
import java.lang.reflect.InvocationTargetException;
@@ -6,8 +6,6 @@ import java.lang.reflect.Modifier;
import org.bukkit.command.CommandSender;
import com.volmit.iris.util.KList;
public abstract class MortarPermission
{
private MortarPermission parent;

11
src/main/java/com/volmit/iris/util/MortarPlugin.java
View File

@@ -1,4 +1,4 @@
package com.volmit.iris.command.util;
package com.volmit.iris.util;
import java.io.File;
import java.io.IOException;
@@ -22,11 +22,6 @@ import org.bukkit.permissions.PermissionDefault;
import org.bukkit.plugin.java.JavaPlugin;
import com.volmit.iris.Iris;
import com.volmit.iris.util.IO;
import com.volmit.iris.util.J;
import com.volmit.iris.util.KList;
import com.volmit.iris.util.KMap;
import com.volmit.iris.util.M;
public abstract class MortarPlugin extends JavaPlugin implements Listener
{
@@ -419,13 +414,13 @@ public abstract class MortarPlugin extends JavaPlugin implements Listener
for(Field i : getClass().getDeclaredFields())
{
if(i.isAnnotationPresent(com.volmit.iris.command.util.Command.class))
if(i.isAnnotationPresent(com.volmit.iris.util.Command.class))
{
try
{
i.setAccessible(true);
MortarCommand pc = (MortarCommand) i.getType().getConstructor().newInstance();
com.volmit.iris.command.util.Command c = i.getAnnotation(com.volmit.iris.command.util.Command.class);
com.volmit.iris.util.Command c = i.getAnnotation(com.volmit.iris.util.Command.class);
registerCommand(pc, c.value());
commandCache.add(pc);
v("Registered Commands /" + pc.getNode() + " (" + i.getName() + ")");

2
src/main/java/com/volmit/iris/util/MortarSender.java
View File

@@ -1,4 +1,4 @@
package com.volmit.iris.command.util;
package com.volmit.iris.util;
import java.util.Set;

2
src/main/java/com/volmit/iris/util/Permission.java
View File

@@ -1,4 +1,4 @@
package com.volmit.iris.command.util;
package com.volmit.iris.util;
import static java.lang.annotation.ElementType.*;
import static java.lang.annotation.RetentionPolicy.*;

2
src/main/java/com/volmit/iris/util/RouterCommand.java
View File

@@ -1,4 +1,4 @@
package com.volmit.iris.command.util;
package com.volmit.iris.util;
import org.bukkit.command.Command;
import org.bukkit.command.CommandExecutor;

5
src/main/java/com/volmit/iris/util/VirtualCommand.java
View File

@@ -1,4 +1,4 @@
package com.volmit.iris.command.util;
package com.volmit.iris.util;
import java.lang.reflect.Field;
@@ -7,9 +7,6 @@ import org.bukkit.ChatColor;
import org.bukkit.command.CommandSender;
import com.volmit.iris.Iris;
import com.volmit.iris.util.KList;
import com.volmit.iris.util.KMap;
import com.volmit.iris.util.V;
/**
* Represents a virtual command. A chain of iterative processing through