lauchmelder/BloodMagic
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Massive rework of configs, items and blocks.

Browse source 
I redone where the items/blocsks are stored and how the configs are
handled to clean up it and give space. You can change the config line to
AWWayofTime if you want to keep the compatibility with old configs. Now
you reference the blocks from the ModBlocks and Items from the ModItems.
This commit is contained in:
Fenn 2014-01-17 21:05:38 +00:00
parent 8601e9faff
commit e3644f2d2b
304 changed files with 3941 additions and 5108 deletions
Download patch file Download diff file Expand all files Collapse all files

25
BM_src/thaumcraft/api/research/ResearchCategories.java
View file

@ -1,15 +1,14 @@
package thaumcraft.api.research;
import java.util.Collection;
import java.util.LinkedHashMap;
import net.minecraft.util.ResourceLocation;
import net.minecraft.util.StatCollector;
public class ResearchCategories
{
import java.util.Collection;
import java.util.LinkedHashMap;
public class ResearchCategories {
//Research
public static LinkedHashMap <String, ResearchCategoryList> researchCategories = new LinkedHashMap <String, ResearchCategoryList>();
public static LinkedHashMap<String,ResearchCategoryList> researchCategories = new LinkedHashMap<String,ResearchCategoryList>();
/**
* @param key
@ -38,15 +37,15 @@ public class ResearchCategories
{
Collection rc = researchCategories.values();
for (Object cat: rc)
for (Object cat : rc)
{
Collection rl = ((ResearchCategoryList)cat).research.values();
Collection rl = ((ResearchCategoryList) cat).research.values();
for (Object ri: rl)
for (Object ri : rl)
{
if ((((ResearchItem)ri).key).equals(key))
if ((((ResearchItem) ri).key).equals(key))
{
return (ResearchItem)ri;
return (ResearchItem) ri;
}
}
}
@ -55,8 +54,8 @@ public class ResearchCategories
}
/**
* @param key the key used for this category
* @param icon the icon to be used for the research category tab
* @param key the key used for this category
* @param icon the icon to be used for the research category tab
* @param background the resource location of the background image to use for this category
* @return the name of the research linked to this key
*/