From 3e2a9a9cf154f717696ae391fe8b998a6e3bbd29 Mon Sep 17 00:00:00 2001 From: Draknyte1 Date: Thu, 27 Oct 2016 04:37:30 +1000 Subject: + Made Recipes and Material init all runnable classes, now items should generate in a proper fashion. $ Fixed the Alloy Blast Furnace using the wrong recipe map and not outputting fluids. % Separated GT Material and my Material recipe generation for the Blast Alloy Smelter. --- src/Java/gtPlusPlus/core/util/array/ArrayUtils.java | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100644 src/Java/gtPlusPlus/core/util/array/ArrayUtils.java (limited to 'src/Java/gtPlusPlus/core/util/array') diff --git a/src/Java/gtPlusPlus/core/util/array/ArrayUtils.java b/src/Java/gtPlusPlus/core/util/array/ArrayUtils.java new file mode 100644 index 0000000000..ea02aaf1da --- /dev/null +++ b/src/Java/gtPlusPlus/core/util/array/ArrayUtils.java @@ -0,0 +1,18 @@ +package gtPlusPlus.core.util.array; + +import java.util.Arrays; + +public class ArrayUtils { + + public static void expandArray(Object[] someArray, Object newValueToAdd) { + Object[] series = someArray; + series = addElement(series, newValueToAdd); + } + + private static Object[] addElement(Object[] series, Object newValueToAdd) { + series = Arrays.copyOf(series, series.length + 1); + series[series.length - 1] = newValueToAdd; + return series; + } + +} -- cgit From 02a5369f5ca341713f0ef3b259ea88da01d90fb4 Mon Sep 17 00:00:00 2001 From: Draknyte1 Date: Fri, 28 Oct 2016 02:17:20 +1000 Subject: + Added Pair and Triplet classes for data storage. + More work on the Maceration Stack recipe handling, to duplicate to other machines when complete. --- src/Java/gtPlusPlus/core/util/array/Pair.java | 21 ++++++++++++++++++ src/Java/gtPlusPlus/core/util/array/Triplet.java | 27 ++++++++++++++++++++++++ 2 files changed, 48 insertions(+) create mode 100644 src/Java/gtPlusPlus/core/util/array/Pair.java create mode 100644 src/Java/gtPlusPlus/core/util/array/Triplet.java (limited to 'src/Java/gtPlusPlus/core/util/array') diff --git a/src/Java/gtPlusPlus/core/util/array/Pair.java b/src/Java/gtPlusPlus/core/util/array/Pair.java new file mode 100644 index 0000000000..251c93dcf4 --- /dev/null +++ b/src/Java/gtPlusPlus/core/util/array/Pair.java @@ -0,0 +1,21 @@ +package gtPlusPlus.core.util.array; + +public class Pair { + + private final K key; + private final V value; + + Pair(final K key, final V value){ + this.key = key; + this.value = value; + } + + final public K getKey(){ + return key; + } + + final public V getValue(){ + return value; + } + +} \ No newline at end of file diff --git a/src/Java/gtPlusPlus/core/util/array/Triplet.java b/src/Java/gtPlusPlus/core/util/array/Triplet.java new file mode 100644 index 0000000000..07f29ae6c8 --- /dev/null +++ b/src/Java/gtPlusPlus/core/util/array/Triplet.java @@ -0,0 +1,27 @@ +package gtPlusPlus.core.util.array; + +public class Triplet { + + private final K key; + private final V value; + private final C count; + + public Triplet(final K key, final V value, final C value2){ + this.key = key; + this.value = value; + this.count = value2; + } + + final public K getKey(){ + return key; + } + + final public V getValue(){ + return value; + } + + final public C getSecondValue(){ + return count; + } + +} \ No newline at end of file -- cgit From a427eaa57ea11c1e1814864bc5f8179c7e823315 Mon Sep 17 00:00:00 2001 From: Draknyte1 Date: Fri, 28 Oct 2016 03:12:30 +1000 Subject: % Should be the final changes to the output space checking. --- src/Java/gtPlusPlus/core/util/array/Pair.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/Java/gtPlusPlus/core/util/array') diff --git a/src/Java/gtPlusPlus/core/util/array/Pair.java b/src/Java/gtPlusPlus/core/util/array/Pair.java index 251c93dcf4..94437e6779 100644 --- a/src/Java/gtPlusPlus/core/util/array/Pair.java +++ b/src/Java/gtPlusPlus/core/util/array/Pair.java @@ -5,7 +5,7 @@ public class Pair { private final K key; private final V value; - Pair(final K key, final V value){ + public Pair(final K key, final V value){ this.key = key; this.value = value; } -- cgit