From 820ca984d2dea005a126ef585661503f8cc992f5 Mon Sep 17 00:00:00 2001 From: kekzdealer Date: Wed, 9 Oct 2019 02:43:07 +0200 Subject: improved T.F.F.T code; Prepared for MultiHatch --- src/main/java/util/Util.java | 102 +++++++++++++++++++------------------- src/main/java/util/Vector3i.java | 64 ++++++++++++------------ src/main/java/util/Vector3ic.java | 16 +++--- 3 files changed, 91 insertions(+), 91 deletions(-) (limited to 'src/main/java/util') diff --git a/src/main/java/util/Util.java b/src/main/java/util/Util.java index 76232d6e47..aa362d67d7 100644 --- a/src/main/java/util/Util.java +++ b/src/main/java/util/Util.java @@ -1,51 +1,51 @@ -package util; - -import java.util.ArrayList; -import java.util.Iterator; -import java.util.List; - -import items.ErrorItem; -import net.minecraft.item.ItemStack; -import net.minecraftforge.fluids.FluidStack; -import net.minecraftforge.oredict.OreDictionary; - -public class Util { - - public static ItemStack getStackofAmountFromOreDict(String oredictName, final int amount){ - final ArrayList list = OreDictionary.getOres(oredictName); - if(!list.isEmpty()) { - final ItemStack ret = list.get(0).copy(); - ret.stackSize = amount; - return ret; - } - System.err.println("Failed to find " + oredictName + " in OreDict"); - return new ItemStack(ErrorItem.getInstance(), amount); - } - - public static ItemStack[] toItemStackArray(List stacksList) { - if(stacksList.size() == 0) { - return null; - } - - ItemStack[] ret = new ItemStack[stacksList.size()]; - Iterator iterator = stacksList.iterator(); - for(int i = 0; i < ret.length; i++ ) { - ret[i] = iterator.next(); - } - return ret; - } - - public static FluidStack[] toFluidStackArray(List stacksList) { - if(stacksList.size() == 0) { - return null; - } - - FluidStack[] ret = new FluidStack[stacksList.size()]; - Iterator iterator = stacksList.iterator(); - for(int i = 0; i < ret.length; i++ ) { - ret[i] = iterator.next(); - } - return ret; - } - -} +package util; + +import java.util.ArrayList; +import java.util.Iterator; +import java.util.List; + +import items.ErrorItem; +import net.minecraft.item.ItemStack; +import net.minecraftforge.fluids.FluidStack; +import net.minecraftforge.oredict.OreDictionary; + +public class Util { + + public static ItemStack getStackofAmountFromOreDict(String oredictName, final int amount){ + final ArrayList list = OreDictionary.getOres(oredictName); + if(!list.isEmpty()) { + final ItemStack ret = list.get(0).copy(); + ret.stackSize = amount; + return ret; + } + System.err.println("Failed to find " + oredictName + " in OreDict"); + return new ItemStack(ErrorItem.getInstance(), amount); + } + + public static ItemStack[] toItemStackArray(List stacksList) { + if(stacksList.size() == 0) { + return null; + } + + ItemStack[] ret = new ItemStack[stacksList.size()]; + Iterator iterator = stacksList.iterator(); + for(int i = 0; i < ret.length; i++ ) { + ret[i] = iterator.next(); + } + return ret; + } + + public static FluidStack[] toFluidStackArray(List stacksList) { + if(stacksList.size() == 0) { + return null; + } + + FluidStack[] ret = new FluidStack[stacksList.size()]; + Iterator iterator = stacksList.iterator(); + for(int i = 0; i < ret.length; i++ ) { + ret[i] = iterator.next(); + } + return ret; + } + +} diff --git a/src/main/java/util/Vector3i.java b/src/main/java/util/Vector3i.java index ff2b017551..5281c2dacc 100644 --- a/src/main/java/util/Vector3i.java +++ b/src/main/java/util/Vector3i.java @@ -1,32 +1,32 @@ -package util; - -public class Vector3i implements Vector3ic { - - public int x, y, z; - - public Vector3i() { - x = 1; - y = 1; - z = 1; - } - - public Vector3i(int x, int y, int z) { - this.x = x; - this.y = y; - this.z = z; - } - - public int x() { - return x; - } - - public int y() { - return y; - } - - public int z() { - return z; - } - - -} +package util; + +public class Vector3i implements Vector3ic { + + public int x, y, z; + + public Vector3i() { + x = 1; + y = 1; + z = 1; + } + + public Vector3i(int x, int y, int z) { + this.x = x; + this.y = y; + this.z = z; + } + + public int x() { + return x; + } + + public int y() { + return y; + } + + public int z() { + return z; + } + + +} diff --git a/src/main/java/util/Vector3ic.java b/src/main/java/util/Vector3ic.java index 102418bc98..8c73c858a3 100644 --- a/src/main/java/util/Vector3ic.java +++ b/src/main/java/util/Vector3ic.java @@ -1,8 +1,8 @@ -package util; - -public interface Vector3ic { - - public int x(); - public int y(); - public int z(); -} +package util; + +public interface Vector3ic { + + public int x(); + public int y(); + public int z(); +} -- cgit