aboutsummaryrefslogtreecommitdiff
path: root/src/Java/gtPlusPlus/core/util
diff options
context:
space:
mode:
authorDraknyte1 <Draknyte1@hotmail.com>2016-09-25 21:11:05 +1000
committerDraknyte1 <Draknyte1@hotmail.com>2016-09-25 21:11:05 +1000
commitd43694eb98a0968190c3dbaa4ab5121c39feaf1f (patch)
tree441d4ed0300d675382539b8a650abe8e7bdf67f9 /src/Java/gtPlusPlus/core/util
parent6a95a11b16cfa38e7789418d93e70b1dc12b19c7 (diff)
downloadGT5-Unofficial-d43694eb98a0968190c3dbaa4ab5121c39feaf1f.tar.gz
GT5-Unofficial-d43694eb98a0968190c3dbaa4ab5121c39feaf1f.tar.bz2
GT5-Unofficial-d43694eb98a0968190c3dbaa4ab5121c39feaf1f.zip
+ Added the Work Bench, from Gregtech 4.
% Renamed a method that converted arrays to fixed sized lists. % Added a Util function to determine server or client easier.
Diffstat (limited to 'src/Java/gtPlusPlus/core/util')
-rw-r--r--src/Java/gtPlusPlus/core/util/Utils.java7
1 files changed, 6 insertions, 1 deletions
diff --git a/src/Java/gtPlusPlus/core/util/Utils.java b/src/Java/gtPlusPlus/core/util/Utils.java
index 42d6dc4ad4..63b42ffd05 100644
--- a/src/Java/gtPlusPlus/core/util/Utils.java
+++ b/src/Java/gtPlusPlus/core/util/Utils.java
@@ -44,12 +44,17 @@ import net.minecraftforge.fluids.FluidContainerRegistry;
import net.minecraftforge.fluids.FluidRegistry;
import net.minecraftforge.fluids.FluidStack;
import net.minecraftforge.oredict.OreDictionary;
+import cpw.mods.fml.common.FMLCommonHandler;
import cpw.mods.fml.common.FMLLog;
import cpw.mods.fml.common.registry.EntityRegistry;
public class Utils {
public static final int WILDCARD_VALUE = Short.MAX_VALUE;
+
+ public static final boolean isServer(){
+ return FMLCommonHandler.instance().getEffectiveSide().isServer();
+ }
static class ShortTimerTask extends TimerTask {
@Override
@@ -282,7 +287,7 @@ public class Utils {
return targetArray;
}
- public static List<Object> convertArrayToListFixed(Object[] sourceArray) {
+ public static List<Object> convertArrayToFixedSizeList(Object[] sourceArray) {
List<Object> targetList = Arrays.asList(sourceArray);
return targetList;
}