Name changes

ThexXTURBOXx · Mar 3, 2016 · 6c57cbe · 6c57cbe
1 parent af408f0
commit 6c57cbe
Show file tree

Hide file tree

Showing 7 changed files with 23 additions and 20 deletions.
diff --git a/java/org/silvercatcher/reforged/ReforgedMod.java b/java/org/silvercatcher/reforged/ReforgedMod.java
@@ -1,6 +1,6 @@
 package org.silvercatcher.reforged;
 
-import org.silvercatcher.reforged.api.APIRegistry;
+import org.silvercatcher.reforged.api.InegrationRegistry;
 import org.silvercatcher.reforged.api.ReforgedAdditions;
 import org.silvercatcher.reforged.proxy.CommonProxy;
 
@@ -13,7 +13,7 @@
 import net.minecraftforge.fml.common.event.FMLInitializationEvent;
 import net.minecraftforge.fml.common.event.FMLPreInitializationEvent;
 
-@Mod(modid = ReforgedMod.ID, version = ReforgedMod.VERSION, name = ReforgedMod.NAME, dependencies = APIRegistry.Deps)
+@Mod(modid = ReforgedMod.ID, version = ReforgedMod.VERSION, name = ReforgedMod.NAME, dependencies = InegrationRegistry.Deps)
 public class ReforgedMod {
 	public static final String NAME = "Reforged";
     public static final String ID = "reforged";

diff --git a/java/org/silvercatcher/reforged/ReforgedRegistry.java b/java/org/silvercatcher/reforged/ReforgedRegistry.java
@@ -4,8 +4,8 @@
 import java.util.List;
 
 import org.silvercatcher.reforged.ReforgedReferences.GlobalValues;
-import org.silvercatcher.reforged.api.APIBase;
-import org.silvercatcher.reforged.api.APIRegistry;
+import org.silvercatcher.reforged.api.InegrationRegistry;
+import org.silvercatcher.reforged.api.IntegrationBase;
 import org.silvercatcher.reforged.api.ReforgedAdditions;
 import org.silvercatcher.reforged.items.ItemExtension;
 import org.silvercatcher.reforged.items.others.ItemArrowBundle;
@@ -145,16 +145,15 @@ public static void createItems() {
 			registrationList.add(ReforgedAdditions.DART_WITHER = new ItemDart("wither"));
 			registrationList.add(ReforgedAdditions.BLOWGUN = new ItemBlowGun());
 		}
-
 	}
 
 	/**Registers all items out of the registrationList*/
 	public static void registerItems() {
 
 		//Add all the API-Items to the registrationList [Better Config later]
 		if(GlobalValues.INTEGRATION) {
-			APIRegistry.addAPIs();
-			for(APIBase ab : APIRegistry.regList) {
+			InegrationRegistry.addAPIs();
+			for(IntegrationBase ab : InegrationRegistry.regList) {
 				ab.registerMatDefs();
 				ab.registerItems();
 				if(!ab.regListItems.isEmpty()) {

diff --git a/...lvercatcher/reforged/api/APIRegistry.java → ...cher/reforged/api/InegrationRegistry.java b/...lvercatcher/reforged/api/APIRegistry.java → ...cher/reforged/api/InegrationRegistry.java
@@ -9,18 +9,18 @@
 import net.minecraft.item.Item;
 import net.minecraftforge.fml.common.Loader;
 
-public class APIRegistry {
+public class InegrationRegistry {
 
 	/**All the Dependencies for our mod*/
 	public static final String Deps = "after:ProjectE;after:Thaumcraft";
 
 	/**Saves all the instances of the Integration APIs*/
-	public static final List<APIBase> regList = new ArrayList<APIBase>();
+	public static final List<IntegrationBase> regList = new ArrayList<IntegrationBase>();
 
 	/**The Creative Tab for all Integration-Items*/
     public static CreativeTabs tabReforgedIntegration;
 
-	/**Adds all the Integration APIs to the List {@link APIRegistry#regList}*/
+	/**Adds all the Integration APIs to the List {@link InegrationRegistry#regList}*/
 	public static void addAPIs() {
 		if(Loader.isModLoaded(new Thaumcraft().getModName())) {
 			regList.add(new Thaumcraft());

diff --git a/...g/silvercatcher/reforged/api/APIBase.java → ...catcher/reforged/api/IntegrationBase.java b/...g/silvercatcher/reforged/api/APIBase.java → ...catcher/reforged/api/IntegrationBase.java
@@ -5,7 +5,7 @@
 
 import net.minecraft.item.Item;
 
-public abstract class APIBase {
+public abstract class IntegrationBase {
 
 	/**Saves all the instances of the Integration APIs*/
 	public static List<Item> regListItems = new ArrayList<Item>();
@@ -28,6 +28,6 @@ public String getModName() {
 
 	/**Simple Registry for the Item*/
 	protected void simpleReg(Item item) {
-		regListItems.add(item.setCreativeTab(APIRegistry.tabReforgedIntegration));
+		regListItems.add(item.setCreativeTab(InegrationRegistry.tabReforgedIntegration));
 	}
 }
diff --git a/java/org/silvercatcher/reforged/api/ProjectE.java b/java/org/silvercatcher/reforged/api/ProjectE.java
@@ -13,7 +13,7 @@
 import net.minecraft.item.ItemStack;
 import net.minecraftforge.common.util.EnumHelper;
 
-public class ProjectE extends APIBase {
+public class ProjectE extends IntegrationBase {
 
 	/**ProjectE's DarkMatter as ToolMaterial*/
 	public static ToolMaterial ProjectE_DarkMatter = EnumHelper.addToolMaterial("DARK_MATTER", 7, 9999, 30, 8, 0);

diff --git a/java/org/silvercatcher/reforged/api/Thaumcraft.java b/java/org/silvercatcher/reforged/api/Thaumcraft.java
@@ -11,7 +11,7 @@
 
 import net.minecraft.item.ItemStack;
 
-public class Thaumcraft extends APIBase {
+public class Thaumcraft extends IntegrationBase {
 
 	public Thaumcraft() {
 		modName = "Thaumcraft";

diff --git a/java/org/silvercatcher/reforged/material/MaterialManager.java b/java/org/silvercatcher/reforged/material/MaterialManager.java
@@ -1,14 +1,13 @@
 package org.silvercatcher.reforged.material;
 
 import java.util.HashMap;
-import java.util.Map;
 import java.util.Map.Entry;
 import java.util.Set;
 
 import net.minecraft.item.Item.ToolMaterial;
 
 public class MaterialManager {	
-	
+
 	private static final HashMap<ToolMaterial, MaterialDefinition> definitionMap = new HashMap<ToolMaterial, MaterialDefinition>();
 
 	static {
@@ -30,12 +29,17 @@ public static Set<Entry<ToolMaterial, MaterialDefinition>> getEntries() {
 	}
 
 	public static MaterialDefinition getMaterialDefinition(ToolMaterial material) {
-
-		return definitionMap.get(material);
+		if(definitionMap.containsKey(material)) {
+			return definitionMap.get(material);
+		} else {
+			return null;
+		}
 	}
 
 	public static void addMaterialDefinition(ToolMaterial material, MaterialDefinition definition) {
-
-		definitionMap.put(material, definition);
+
+		if(!definitionMap.containsKey(material)) {
+			definitionMap.put(material, definition);
+		}
 	}
 }