Concurrent Hash maps and string vars

5 files changed, 17 insertions, 17 deletions

diff --git a/src/main/java/gregtech/api/objects/GT_CopiedBlockTexture.java b/src/main/java/gregtech/api/objects/GT_CopiedBlockTexture.java
index caf46b3980..12c2e28a37 100644
--- a/src/main/java/gregtech/api/objects/GT_CopiedBlockTexture.java
+++ b/src/main/java/gregtech/api/objects/GT_CopiedBlockTexture.java
@@ -36,7 +36,7 @@ public class GT_CopiedBlockTexture implements ITexture {
         this(aBlock, aSide, aMeta, Dyes._NULL.mRGBa);
     }
 
-    private IIcon getIcon(int aSide) {
+    private final IIcon getIcon(int aSide) {
         if (mSide == 6) return mBlock.getIcon(aSide, mMeta);
         return mBlock.getIcon(mSide, mMeta);
     }
diff --git a/src/main/java/gregtech/api/objects/GT_FluidStack.java b/src/main/java/gregtech/api/objects/GT_FluidStack.java
index 3f9e52818c..d2fdbbfb47 100644
--- a/src/main/java/gregtech/api/objects/GT_FluidStack.java
+++ b/src/main/java/gregtech/api/objects/GT_FluidStack.java
@@ -29,7 +29,7 @@ public class GT_FluidStack extends FluidStack {
         this(aFluid.getFluid(), aFluid.amount);
     }
 
-    public static synchronized void fixAllThoseFuckingFluidIDs() {
+    public static final synchronized void fixAllThoseFuckingFluidIDs() {
         if (ForgeVersion.getBuildVersion() < 1355) {
             while (lock) {
                 try {
@@ -49,7 +49,7 @@ public class GT_FluidStack extends FluidStack {
         }
     }
 
-    public void fixFluidIDForFucksSake() {
+    public final void fixFluidIDForFucksSake() {
         if (ForgeVersion.getBuildVersion() < 1355) {
             int fluidID;
             try {
diff --git a/src/main/java/gregtech/api/objects/GT_HashSet.java b/src/main/java/gregtech/api/objects/GT_HashSet.java
index cec006905b..32d8319cb5 100644
--- a/src/main/java/gregtech/api/objects/GT_HashSet.java
+++ b/src/main/java/gregtech/api/objects/GT_HashSet.java
@@ -8,26 +8,26 @@ import java.util.*;
 
 public class GT_HashSet<E extends GT_ItemStack> extends AbstractSet<E> {
     private static final Object OBJECT = new Object();
-    private transient HashMap<GT_ItemStack, Object> map;
+    private transient Map<GT_ItemStack, Object> map;
 
     public GT_HashSet() {
-        map = new HashMap<GT_ItemStack, Object>();
+        map = new WeakHashMap<GT_ItemStack, Object>();
         GregTech_API.sItemStackMappings.add(map);
     }
 
     public GT_HashSet(Collection<? extends E> c) {
-        map = new HashMap<GT_ItemStack, Object>(Math.max((int) (c.size() / .75f) + 1, 16));
+        map = new WeakHashMap<GT_ItemStack, Object>(Math.max((int) (c.size() / .75f) + 1, 16));
         addAll(c);
         GregTech_API.sItemStackMappings.add(map);
     }
 
     public GT_HashSet(int initialCapacity, float loadFactor) {
-        map = new HashMap<GT_ItemStack, Object>(initialCapacity, loadFactor);
+        map = new WeakHashMap<GT_ItemStack, Object>(initialCapacity, loadFactor);
         GregTech_API.sItemStackMappings.add(map);
     }
 
     public GT_HashSet(int initialCapacity) {
-        map = new HashMap<GT_ItemStack, Object>(initialCapacity);
+        map = new WeakHashMap<GT_ItemStack, Object>(initialCapacity);
         GregTech_API.sItemStackMappings.add(map);
     }
 
@@ -36,7 +36,7 @@ public class GT_HashSet<E extends GT_ItemStack> extends AbstractSet<E> {
         GregTech_API.sItemStackMappings.add(map);
     }
 
-    public HashMap getMap() {
+    public final Map getMap() {
         return map;
     }
 
diff --git a/src/main/java/gregtech/api/objects/GT_ItemStack.java b/src/main/java/gregtech/api/objects/GT_ItemStack.java
index f865b348a0..9791cadeeb 100644
--- a/src/main/java/gregtech/api/objects/GT_ItemStack.java
+++ b/src/main/java/gregtech/api/objects/GT_ItemStack.java
@@ -24,16 +24,16 @@ public class GT_ItemStack {
         this(GT_Utility.intToStack(aHashCode));
     }
 
-    public ItemStack toStack() {
+    public final ItemStack toStack() {
         if (mItem == null) return null;
         return new ItemStack(mItem, 1, mMetaData);
     }
 
-    public boolean isStackEqual(ItemStack aStack) {
+    public final boolean isStackEqual(ItemStack aStack) {
         return GT_Utility.areStacksEqual(toStack(), aStack);
     }
 
-    public boolean isStackEqual(GT_ItemStack aStack) {
+    public final boolean isStackEqual(GT_ItemStack aStack) {
         return GT_Utility.areStacksEqual(toStack(), aStack.toStack());
     }
 
diff --git a/src/main/java/gregtech/api/objects/ItemData.java b/src/main/java/gregtech/api/objects/ItemData.java
index aedc48db5a..e4a39fd532 100644
--- a/src/main/java/gregtech/api/objects/ItemData.java
+++ b/src/main/java/gregtech/api/objects/ItemData.java
@@ -93,26 +93,26 @@ public class ItemData {
         mByProducts = rList.toArray(new MaterialStack[rList.size()]);
     }
 
-    public boolean hasValidPrefixMaterialData() {
+    public final boolean hasValidPrefixMaterialData() {
         return mPrefix != null && mMaterial != null && mMaterial.mMaterial != null;
     }
 
-    public boolean hasValidPrefixData() {
+    public final boolean hasValidPrefixData() {
         return mPrefix != null;
     }
 
-    public boolean hasValidMaterialData() {
+    public final boolean hasValidMaterialData() {
         return mMaterial != null && mMaterial.mMaterial != null;
     }
 
-    public ArrayList<MaterialStack> getAllMaterialStacks() {
+    public final ArrayList<MaterialStack> getAllMaterialStacks() {
         ArrayList<MaterialStack> rList = new ArrayList();
         if (hasValidMaterialData()) rList.add(mMaterial);
         rList.addAll(Arrays.asList(mByProducts));
         return rList;
     }
 
-    public MaterialStack getByProduct(int aIndex) {
+    public final MaterialStack getByProduct(int aIndex) {
         return aIndex >= 0 && aIndex < mByProducts.length ? mByProducts[aIndex] : null;
     }