diff options
Diffstat (limited to 'src/main/java/gtPlusPlus/xmod/thaumcraft/objects/wrapper/research')
4 files changed, 26 insertions, 22 deletions
diff --git a/src/main/java/gtPlusPlus/xmod/thaumcraft/objects/wrapper/research/TC_ResearchCategories_Wrapper.java b/src/main/java/gtPlusPlus/xmod/thaumcraft/objects/wrapper/research/TC_ResearchCategories_Wrapper.java index 0130ca3b96..5ed57574d2 100644 --- a/src/main/java/gtPlusPlus/xmod/thaumcraft/objects/wrapper/research/TC_ResearchCategories_Wrapper.java +++ b/src/main/java/gtPlusPlus/xmod/thaumcraft/objects/wrapper/research/TC_ResearchCategories_Wrapper.java @@ -1,17 +1,19 @@ package gtPlusPlus.xmod.thaumcraft.objects.wrapper.research; -import cpw.mods.fml.common.FMLLog; import java.util.Collection; import java.util.Iterator; import java.util.LinkedHashMap; + import net.minecraft.util.ResourceLocation; import net.minecraft.util.StatCollector; + import org.apache.logging.log4j.Level; +import cpw.mods.fml.common.FMLLog; + public class TC_ResearchCategories_Wrapper { - public static LinkedHashMap<String, TC_ResearchCategoryList_Wrapper> researchCategories = - new LinkedHashMap<String, TC_ResearchCategoryList_Wrapper>(); + public static LinkedHashMap<String, TC_ResearchCategoryList_Wrapper> researchCategories = new LinkedHashMap<String, TC_ResearchCategoryList_Wrapper>(); public static TC_ResearchCategoryList_Wrapper getResearchList(String key) { return (TC_ResearchCategoryList_Wrapper) researchCategories.get(key); @@ -60,7 +62,9 @@ public class TC_ResearchCategories_Wrapper { FMLLog.log( Level.FATAL, "[Thaumcraft] Research [" + ri.getName() - + "] not added as it overlaps with existing research [" + rr.getName() + "]", + + "] not added as it overlaps with existing research [" + + rr.getName() + + "]", new Object[0]); return; } diff --git a/src/main/java/gtPlusPlus/xmod/thaumcraft/objects/wrapper/research/TC_ResearchCategoryList_Wrapper.java b/src/main/java/gtPlusPlus/xmod/thaumcraft/objects/wrapper/research/TC_ResearchCategoryList_Wrapper.java index 08c69cdca5..f8066abe2d 100644 --- a/src/main/java/gtPlusPlus/xmod/thaumcraft/objects/wrapper/research/TC_ResearchCategoryList_Wrapper.java +++ b/src/main/java/gtPlusPlus/xmod/thaumcraft/objects/wrapper/research/TC_ResearchCategoryList_Wrapper.java @@ -2,9 +2,11 @@ package gtPlusPlus.xmod.thaumcraft.objects.wrapper.research; import java.util.HashMap; import java.util.Map; + import net.minecraft.util.ResourceLocation; public class TC_ResearchCategoryList_Wrapper { + public int minDisplayColumn; public int minDisplayRow; public int maxDisplayColumn; diff --git a/src/main/java/gtPlusPlus/xmod/thaumcraft/objects/wrapper/research/TC_ResearchItem_Wrapper.java b/src/main/java/gtPlusPlus/xmod/thaumcraft/objects/wrapper/research/TC_ResearchItem_Wrapper.java index be0ae26e61..1baefdc465 100644 --- a/src/main/java/gtPlusPlus/xmod/thaumcraft/objects/wrapper/research/TC_ResearchItem_Wrapper.java +++ b/src/main/java/gtPlusPlus/xmod/thaumcraft/objects/wrapper/research/TC_ResearchItem_Wrapper.java @@ -1,12 +1,13 @@ package gtPlusPlus.xmod.thaumcraft.objects.wrapper.research; -import gtPlusPlus.xmod.thaumcraft.objects.wrapper.aspect.TC_AspectList_Wrapper; -import gtPlusPlus.xmod.thaumcraft.objects.wrapper.aspect.TC_Aspect_Wrapper; -import gtPlusPlus.xmod.thaumcraft.util.ThaumcraftUtils; import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; import net.minecraft.util.StatCollector; +import gtPlusPlus.xmod.thaumcraft.objects.wrapper.aspect.TC_AspectList_Wrapper; +import gtPlusPlus.xmod.thaumcraft.objects.wrapper.aspect.TC_Aspect_Wrapper; +import gtPlusPlus.xmod.thaumcraft.util.ThaumcraftUtils; + public class TC_ResearchItem_Wrapper { public final String key; @@ -45,14 +46,8 @@ public class TC_ResearchItem_Wrapper { this.setVirtual(); } - public TC_ResearchItem_Wrapper( - String key, - String category, - TC_AspectList_Wrapper tags, - int col, - int row, - int complex, - ResourceLocation icon) { + public TC_ResearchItem_Wrapper(String key, String category, TC_AspectList_Wrapper tags, int col, int row, + int complex, ResourceLocation icon) { this.key = key; this.category = category; this.tags = tags; @@ -70,8 +65,8 @@ public class TC_ResearchItem_Wrapper { } } - public TC_ResearchItem_Wrapper( - String key, String category, TC_AspectList_Wrapper tags, int col, int row, int complex, ItemStack icon) { + public TC_ResearchItem_Wrapper(String key, String category, TC_AspectList_Wrapper tags, int col, int row, + int complex, ItemStack icon) { this.key = key; this.category = category; this.tags = tags; diff --git a/src/main/java/gtPlusPlus/xmod/thaumcraft/objects/wrapper/research/TC_ResearchPage_Wrapper.java b/src/main/java/gtPlusPlus/xmod/thaumcraft/objects/wrapper/research/TC_ResearchPage_Wrapper.java index 83ddd106a5..4632909620 100644 --- a/src/main/java/gtPlusPlus/xmod/thaumcraft/objects/wrapper/research/TC_ResearchPage_Wrapper.java +++ b/src/main/java/gtPlusPlus/xmod/thaumcraft/objects/wrapper/research/TC_ResearchPage_Wrapper.java @@ -1,18 +1,21 @@ package gtPlusPlus.xmod.thaumcraft.objects.wrapper.research; -import gtPlusPlus.xmod.thaumcraft.objects.wrapper.aspect.TC_AspectList_Wrapper; -import gtPlusPlus.xmod.thaumcraft.objects.wrapper.recipe.TC_CrucibleRecipe_Wrapper; -import gtPlusPlus.xmod.thaumcraft.objects.wrapper.recipe.TC_IArcaneRecipe_Wrapper; -import gtPlusPlus.xmod.thaumcraft.objects.wrapper.recipe.TC_InfusionEnchantmentRecipe_Wrapper; -import gtPlusPlus.xmod.thaumcraft.objects.wrapper.recipe.TC_InfusionRecipe_Wrapper; import java.util.List; + import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.FurnaceRecipes; import net.minecraft.item.crafting.IRecipe; import net.minecraft.util.ResourceLocation; import net.minecraft.util.StatCollector; +import gtPlusPlus.xmod.thaumcraft.objects.wrapper.aspect.TC_AspectList_Wrapper; +import gtPlusPlus.xmod.thaumcraft.objects.wrapper.recipe.TC_CrucibleRecipe_Wrapper; +import gtPlusPlus.xmod.thaumcraft.objects.wrapper.recipe.TC_IArcaneRecipe_Wrapper; +import gtPlusPlus.xmod.thaumcraft.objects.wrapper.recipe.TC_InfusionEnchantmentRecipe_Wrapper; +import gtPlusPlus.xmod.thaumcraft.objects.wrapper.recipe.TC_InfusionRecipe_Wrapper; + public class TC_ResearchPage_Wrapper { + public TC_PageType_Wrapper type; public String text; public String research; |