aboutsummaryrefslogtreecommitdiff
path: root/src/Java/gtPlusPlus/core
diff options
context:
space:
mode:
authorAlkalus <3060479+draknyte1@users.noreply.github.com>2018-05-23 22:38:01 +1000
committerAlkalus <3060479+draknyte1@users.noreply.github.com>2018-05-23 22:38:01 +1000
commit41e94c991ba39a7a466b67a13f346461b26ce3c1 (patch)
tree5f840273c9b485902f5853e957c8fd252dce248b /src/Java/gtPlusPlus/core
parent80f8ece9e92eeab9c3a05a98c87e0476827f3306 (diff)
downloadGT5-Unofficial-41e94c991ba39a7a466b67a13f346461b26ce3c1.tar.gz
GT5-Unofficial-41e94c991ba39a7a466b67a13f346461b26ce3c1.tar.bz2
GT5-Unofficial-41e94c991ba39a7a466b67a13f346461b26ce3c1.zip
% More Crate work.
Diffstat (limited to 'src/Java/gtPlusPlus/core')
-rw-r--r--src/Java/gtPlusPlus/core/util/data/ArrayUtils.java12
1 files changed, 12 insertions, 0 deletions
diff --git a/src/Java/gtPlusPlus/core/util/data/ArrayUtils.java b/src/Java/gtPlusPlus/core/util/data/ArrayUtils.java
index afccf6bd2b..0c752c20e0 100644
--- a/src/Java/gtPlusPlus/core/util/data/ArrayUtils.java
+++ b/src/Java/gtPlusPlus/core/util/data/ArrayUtils.java
@@ -4,6 +4,8 @@ import java.util.*;
import net.minecraft.item.ItemStack;
+import gtPlusPlus.api.objects.data.AutoMap;
+
public class ArrayUtils {
public static Object[] expandArray(final Object[] someArray, final Object newValueToAdd) {
@@ -39,6 +41,16 @@ public class ArrayUtils {
return mData;
}
+ public static <A> AutoMap<A> mergeTwoMaps(AutoMap<A> a, AutoMap<A> b) {
+ AutoMap<A> c = new AutoMap<A>();
+ for (A g : a.values()) {
+ c.put(g);
+ }
+ for (A g : b.values()) {
+ c.put(g);
+ }
+ return c;
+ }
}