From cbe0e497be8e466c380a5b4fa781b314ede9ada3 Mon Sep 17 00:00:00 2001 From: Draknyte1 Date: Sun, 6 Nov 2016 19:32:27 +1000 Subject: Revert "$ Cleaned up the entire project." This reverts commit 0669f5eb9d5029a8b94ec552171b0837605f7747. # Conflicts: # src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GregtechMTE_NuclearReactor.java # src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntity_MassFabricator.java Revert "% Cleaned up Imports." This reverts commit 3654052fb63a571c5eaca7f20714b87c17f7e966. --- src/Java/gtPlusPlus/core/util/wrapper/var.java | 116 ++++++++++++------------- 1 file changed, 56 insertions(+), 60 deletions(-) (limited to 'src/Java/gtPlusPlus/core/util/wrapper') diff --git a/src/Java/gtPlusPlus/core/util/wrapper/var.java b/src/Java/gtPlusPlus/core/util/wrapper/var.java index c690723298..3e7413ed85 100644 --- a/src/Java/gtPlusPlus/core/util/wrapper/var.java +++ b/src/Java/gtPlusPlus/core/util/wrapper/var.java @@ -5,67 +5,63 @@ import gtPlusPlus.core.util.Utils; import gtPlusPlus.core.util.item.ItemUtils; import net.minecraft.item.ItemStack; -public class var { - - private ItemStack temp = null; - private final String sanitizedName; - private final String fqrn; - - public var(String o) { - final String t = this.sanitize('<', o); - final String t2 = this.sanitize('>', t); - this.sanitizedName = t2; - o = this.sanitize('"', t2); - this.fqrn = o; - } - - public String getFQRN() { - final String s = this.fqrn; - return s; - } - - private ItemStack getOreDictStack(final int stackSize) { - final ItemStack v = ItemUtils.getItemStack(this.sanitizedName, stackSize); - return v; - } - - public String getsanitizedName() { - final String s = this.sanitizedName; - return s; - } - - public ItemStack getStack(final int stackSize) { - final String oreDict = "ore:"; - if (this.fqrn.toLowerCase().contains(oreDict.toLowerCase())) { - final ItemStack v = this.getOreDictStack(stackSize); - return v; +public class var{ + + private ItemStack temp = null; + private String sanitizedName; + private String fqrn; + + public var(String o){ + String t = sanitize('<', o); + String t2 = sanitize('>', t); + sanitizedName = t2; + o = sanitize('"', t2); + fqrn = o; } - final String[] fqrnSplit = this.fqrn.split(":"); - String meta = "0"; - try { - if (fqrnSplit[2] != null) { - meta = fqrnSplit[2]; - } - this.temp = ItemUtils.getItemStackWithMeta(LoadedMods.MiscUtils, this.fqrn, fqrnSplit[1], - Integer.parseInt(meta), stackSize); + + private String sanitize(char token, String input){ + for (int i=0;i