diff options
Diffstat (limited to 'src/main/java/gtPlusPlus/xmod/thaumcraft')
10 files changed, 209 insertions, 256 deletions
diff --git a/src/main/java/gtPlusPlus/xmod/thaumcraft/HANDLER_Thaumcraft.java b/src/main/java/gtPlusPlus/xmod/thaumcraft/HANDLER_Thaumcraft.java index bbda74449b..082486dd62 100644 --- a/src/main/java/gtPlusPlus/xmod/thaumcraft/HANDLER_Thaumcraft.java +++ b/src/main/java/gtPlusPlus/xmod/thaumcraft/HANDLER_Thaumcraft.java @@ -1,21 +1,21 @@ package gtPlusPlus.xmod.thaumcraft; +import net.minecraft.init.Items; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; + import gtPlusPlus.api.objects.data.AutoMap; import gtPlusPlus.api.objects.data.Pair; import gtPlusPlus.core.lib.LoadedMods; import gtPlusPlus.core.util.reflect.ReflectionUtils; import gtPlusPlus.xmod.thaumcraft.aspect.GTPP_AspectCompat; import gtPlusPlus.xmod.thaumcraft.aspect.GTPP_AspectStack; -import net.minecraft.init.Items; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; public class HANDLER_Thaumcraft { public static GTPP_AspectCompat sThaumcraftCompat; public static Item mResearchNotes; - public static final AutoMap<Pair<ItemStack, GTPP_AspectStack[]>> sItemsToGetAspects = - new AutoMap<Pair<ItemStack, GTPP_AspectStack[]>>(); + public static final AutoMap<Pair<ItemStack, GTPP_AspectStack[]>> sItemsToGetAspects = new AutoMap<Pair<ItemStack, GTPP_AspectStack[]>>(); public static void preInit() { if (LoadedMods.Thaumcraft) {} @@ -24,8 +24,8 @@ public class HANDLER_Thaumcraft { public static void init() { if (LoadedMods.Thaumcraft) { try { - mResearchNotes = (Item) ReflectionUtils.getField( - ReflectionUtils.getClass("thaumcraft.common.config.ConfigItems"), "itemResearchNotes") + mResearchNotes = (Item) ReflectionUtils + .getField(ReflectionUtils.getClass("thaumcraft.common.config.ConfigItems"), "itemResearchNotes") .get(null); } catch (IllegalArgumentException | IllegalAccessException e) { mResearchNotes = Items.paper; @@ -42,19 +42,14 @@ public class HANDLER_Thaumcraft { // new Object[0]); // sThaumcraftCompat = new GTPP_AspectCompat(); - /*if (!sItemsToGetAspects.isEmpty() && false) { - for (Pair<ItemStack, GTPP_AspectStack[]> j : sItemsToGetAspects) { - if (j .getKey() != null && (j.getValue() != null && j.getValue().length > 0)) { - List<GTPP_AspectStack> list = Arrays.asList(j.getValue()); - if (ThaumcraftUtils.registerThaumcraftAspectsToItem(j.getKey(), list, true)) { - Logger.WARNING("[Aspect] Successfully added Aspects to "+j.getKey().getDisplayName()+"."); - } - else { - Logger.WARNING("[Aspect] Failed adding Aspects to "+j.getKey().getDisplayName()+"."); - } - } - } - }*/ + /* + * if (!sItemsToGetAspects.isEmpty() && false) { for (Pair<ItemStack, GTPP_AspectStack[]> j : + * sItemsToGetAspects) { if (j .getKey() != null && (j.getValue() != null && j.getValue().length > 0)) { + * List<GTPP_AspectStack> list = Arrays.asList(j.getValue()); if + * (ThaumcraftUtils.registerThaumcraftAspectsToItem(j.getKey(), list, true)) { + * Logger.WARNING("[Aspect] Successfully added Aspects to "+j.getKey().getDisplayName()+"."); } else { + * Logger.WARNING("[Aspect] Failed adding Aspects to "+j.getKey().getDisplayName()+"."); } } } } + */ } } } diff --git a/src/main/java/gtPlusPlus/xmod/thaumcraft/aspect/GTPP_AspectCompat.java b/src/main/java/gtPlusPlus/xmod/thaumcraft/aspect/GTPP_AspectCompat.java index c3d256a132..4f0c9873a1 100644 --- a/src/main/java/gtPlusPlus/xmod/thaumcraft/aspect/GTPP_AspectCompat.java +++ b/src/main/java/gtPlusPlus/xmod/thaumcraft/aspect/GTPP_AspectCompat.java @@ -1,5 +1,13 @@ package gtPlusPlus.xmod.thaumcraft.aspect; +import java.lang.reflect.InvocationTargetException; +import java.lang.reflect.Method; +import java.util.HashMap; +import java.util.LinkedHashMap; +import java.util.List; + +import net.minecraft.util.ResourceLocation; + import gregtech.api.enums.TC_Aspects; import gregtech.common.GT_ThaumcraftCompat; import gtPlusPlus.api.objects.Logger; @@ -7,12 +15,6 @@ import gtPlusPlus.core.lib.CORE; import gtPlusPlus.core.util.Utils; import gtPlusPlus.xmod.thaumcraft.objects.wrapper.aspect.TC_AspectList_Wrapper; import gtPlusPlus.xmod.thaumcraft.objects.wrapper.aspect.TC_Aspect_Wrapper; -import java.lang.reflect.InvocationTargetException; -import java.lang.reflect.Method; -import java.util.HashMap; -import java.util.LinkedHashMap; -import java.util.List; -import net.minecraft.util.ResourceLocation; public class GTPP_AspectCompat { @@ -26,55 +28,29 @@ public class GTPP_AspectCompat { public static TC_Aspect_Wrapper ASPECT_TOXIC; public static TC_Aspect_Wrapper ASPECT_HEAVEN; - /* TC_Aspects.AER.mAspect = Aspect.AIR; - TC_Aspects.ALIENIS.mAspect = Aspect.ELDRITCH; - TC_Aspects.AQUA.mAspect = Aspect.WATER; - TC_Aspects.ARBOR.mAspect = Aspect.TREE; - TC_Aspects.AURAM.mAspect = Aspect.AURA; - TC_Aspects.BESTIA.mAspect = Aspect.BEAST; - TC_Aspects.COGNITIO.mAspect = Aspect.MIND; - TC_Aspects.CORPUS.mAspect = Aspect.FLESH; - TC_Aspects.EXANIMIS.mAspect = Aspect.UNDEAD; - TC_Aspects.FABRICO.mAspect = Aspect.CRAFT; - TC_Aspects.FAMES.mAspect = Aspect.HUNGER; - TC_Aspects.GELUM.mAspect = Aspect.COLD; - TC_Aspects.GRANUM.mAspect = Aspect.PLANT; - TC_Aspects.HERBA.mAspect = Aspect.PLANT; - TC_Aspects.HUMANUS.mAspect = Aspect.MAN; - TC_Aspects.IGNIS.mAspect = Aspect.FIRE; - TC_Aspects.INSTRUMENTUM.mAspect = Aspect.TOOL; - TC_Aspects.ITER.mAspect = Aspect.TRAVEL; - TC_Aspects.LIMUS.mAspect = Aspect.SLIME; - TC_Aspects.LUCRUM.mAspect = Aspect.GREED; - TC_Aspects.LUX.mAspect = Aspect.LIGHT; - TC_Aspects.MACHINA.mAspect = Aspect.MECHANISM; - TC_Aspects.MESSIS.mAspect = Aspect.CROP; - TC_Aspects.METALLUM.mAspect = Aspect.METAL; - TC_Aspects.METO.mAspect = Aspect.HARVEST; - TC_Aspects.MORTUUS.mAspect = Aspect.DEATH; - TC_Aspects.MOTUS.mAspect = Aspect.MOTION; - TC_Aspects.ORDO.mAspect = Aspect.ORDER; - TC_Aspects.PANNUS.mAspect = Aspect.CLOTH; - TC_Aspects.PERDITIO.mAspect = Aspect.ENTROPY; - TC_Aspects.PERFODIO.mAspect = Aspect.MINE; - TC_Aspects.PERMUTATIO.mAspect = Aspect.EXCHANGE; - TC_Aspects.POTENTIA.mAspect = Aspect.ENERGY; - TC_Aspects.PRAECANTATIO.mAspect = Aspect.MAGIC; - TC_Aspects.SANO.mAspect = Aspect.HEAL; - TC_Aspects.SENSUS.mAspect = Aspect.SENSES; - TC_Aspects.SPIRITUS.mAspect = Aspect.SOUL; - TC_Aspects.TELUM.mAspect = Aspect.WEAPON; - TC_Aspects.TERRA.mAspect = Aspect.EARTH; - TC_Aspects.TEMPESTAS.mAspect = Aspect.WEATHER; - TC_Aspects.TENEBRAE.mAspect = Aspect.DARKNESS; - TC_Aspects.TUTAMEN.mAspect = Aspect.ARMOR; - TC_Aspects.VACUOS.mAspect = Aspect.VOID; - TC_Aspects.VENENUM.mAspect = Aspect.POISON; - TC_Aspects.VICTUS.mAspect = Aspect.LIFE; - TC_Aspects.VINCULUM.mAspect = Aspect.TRAP; - TC_Aspects.VITIUM.mAspect = Aspect.TAINT; - TC_Aspects.VITREUS.mAspect = Aspect.CRYSTAL; - TC_Aspects.VOLATUS.mAspect = Aspect.FLIGHT;*/ + /* + * TC_Aspects.AER.mAspect = Aspect.AIR; TC_Aspects.ALIENIS.mAspect = Aspect.ELDRITCH; TC_Aspects.AQUA.mAspect = + * Aspect.WATER; TC_Aspects.ARBOR.mAspect = Aspect.TREE; TC_Aspects.AURAM.mAspect = Aspect.AURA; + * TC_Aspects.BESTIA.mAspect = Aspect.BEAST; TC_Aspects.COGNITIO.mAspect = Aspect.MIND; TC_Aspects.CORPUS.mAspect = + * Aspect.FLESH; TC_Aspects.EXANIMIS.mAspect = Aspect.UNDEAD; TC_Aspects.FABRICO.mAspect = Aspect.CRAFT; + * TC_Aspects.FAMES.mAspect = Aspect.HUNGER; TC_Aspects.GELUM.mAspect = Aspect.COLD; TC_Aspects.GRANUM.mAspect = + * Aspect.PLANT; TC_Aspects.HERBA.mAspect = Aspect.PLANT; TC_Aspects.HUMANUS.mAspect = Aspect.MAN; + * TC_Aspects.IGNIS.mAspect = Aspect.FIRE; TC_Aspects.INSTRUMENTUM.mAspect = Aspect.TOOL; TC_Aspects.ITER.mAspect = + * Aspect.TRAVEL; TC_Aspects.LIMUS.mAspect = Aspect.SLIME; TC_Aspects.LUCRUM.mAspect = Aspect.GREED; + * TC_Aspects.LUX.mAspect = Aspect.LIGHT; TC_Aspects.MACHINA.mAspect = Aspect.MECHANISM; TC_Aspects.MESSIS.mAspect = + * Aspect.CROP; TC_Aspects.METALLUM.mAspect = Aspect.METAL; TC_Aspects.METO.mAspect = Aspect.HARVEST; + * TC_Aspects.MORTUUS.mAspect = Aspect.DEATH; TC_Aspects.MOTUS.mAspect = Aspect.MOTION; TC_Aspects.ORDO.mAspect = + * Aspect.ORDER; TC_Aspects.PANNUS.mAspect = Aspect.CLOTH; TC_Aspects.PERDITIO.mAspect = Aspect.ENTROPY; + * TC_Aspects.PERFODIO.mAspect = Aspect.MINE; TC_Aspects.PERMUTATIO.mAspect = Aspect.EXCHANGE; + * TC_Aspects.POTENTIA.mAspect = Aspect.ENERGY; TC_Aspects.PRAECANTATIO.mAspect = Aspect.MAGIC; + * TC_Aspects.SANO.mAspect = Aspect.HEAL; TC_Aspects.SENSUS.mAspect = Aspect.SENSES; TC_Aspects.SPIRITUS.mAspect = + * Aspect.SOUL; TC_Aspects.TELUM.mAspect = Aspect.WEAPON; TC_Aspects.TERRA.mAspect = Aspect.EARTH; + * TC_Aspects.TEMPESTAS.mAspect = Aspect.WEATHER; TC_Aspects.TENEBRAE.mAspect = Aspect.DARKNESS; + * TC_Aspects.TUTAMEN.mAspect = Aspect.ARMOR; TC_Aspects.VACUOS.mAspect = Aspect.VOID; TC_Aspects.VENENUM.mAspect = + * Aspect.POISON; TC_Aspects.VICTUS.mAspect = Aspect.LIFE; TC_Aspects.VINCULUM.mAspect = Aspect.TRAP; + * TC_Aspects.VITIUM.mAspect = Aspect.TAINT; TC_Aspects.VITREUS.mAspect = Aspect.CRYSTAL; TC_Aspects.VOLATUS.mAspect + * = Aspect.FLIGHT; + */ public GTPP_AspectCompat() { @@ -95,7 +71,7 @@ public class GTPP_AspectCompat { ASPECT_BALANCE = new TC_Aspect_Wrapper( "Sagrausten", Utils.rgbtoHexValue(125, 125, 125), - new TC_Aspect_Wrapper[] {ASPECT_STARBOUND, get(TC_Aspects.RADIO)}, + new TC_Aspect_Wrapper[] { ASPECT_STARBOUND, get(TC_Aspects.RADIO) }, new ResourceLocation(CORE.MODID + ":textures/aspects/" + "Sagrausten.png"), false, 1, @@ -104,7 +80,7 @@ public class GTPP_AspectCompat { ASPECT_LUST = new TC_Aspect_Wrapper( "Slusium", Utils.rgbtoHexValue(175, 125, 25), - new TC_Aspect_Wrapper[] {ASPECT_BALANCE, get(TC_Aspects.NEBRISUM)}, + new TC_Aspect_Wrapper[] { ASPECT_BALANCE, get(TC_Aspects.NEBRISUM) }, new ResourceLocation(CORE.MODID + ":textures/aspects/" + "Slusium.png"), false, 1, @@ -113,7 +89,7 @@ public class GTPP_AspectCompat { ASPECT_STARBOUND = new TC_Aspect_Wrapper( "Xenil", Utils.rgbtoHexValue(25, 25, 25), - new TC_Aspect_Wrapper[] {get(TC_Aspects.MAGNETO), get(TC_Aspects.RADIO)}, + new TC_Aspect_Wrapper[] { get(TC_Aspects.MAGNETO), get(TC_Aspects.RADIO) }, new ResourceLocation(CORE.MODID + ":textures/aspects/" + "Xenil.png"), false, 1, @@ -122,7 +98,7 @@ public class GTPP_AspectCompat { ASPECT_TOXIC = new TC_Aspect_Wrapper( "Xablum", Utils.rgbtoHexValue(25, 185, 25), - new TC_Aspect_Wrapper[] {ASPECT_STARBOUND, ASPECT_LUST}, + new TC_Aspect_Wrapper[] { ASPECT_STARBOUND, ASPECT_LUST }, new ResourceLocation(CORE.MODID + ":textures/aspects/" + "Xablum.png"), false, 1, @@ -131,7 +107,7 @@ public class GTPP_AspectCompat { ASPECT_HEAVEN = new TC_Aspect_Wrapper( "Zetralt", Utils.rgbtoHexValue(225, 225, 225), - new TC_Aspect_Wrapper[] {get(TC_Aspects.AURAM), ASPECT_TOXIC}, + new TC_Aspect_Wrapper[] { get(TC_Aspects.AURAM), ASPECT_TOXIC }, new ResourceLocation(CORE.MODID + ":textures/aspects/" + "Zetralt.png"), false, 1, @@ -158,10 +134,7 @@ public class GTPP_AspectCompat { if (m != null) { o = (TC_AspectList_Wrapper) m.invoke(null, aAspects); } - } catch (NoSuchMethodException - | SecurityException - | IllegalAccessException - | IllegalArgumentException + } catch (NoSuchMethodException | SecurityException | IllegalAccessException | IllegalArgumentException | InvocationTargetException e) { e.printStackTrace(); } diff --git a/src/main/java/gtPlusPlus/xmod/thaumcraft/commands/CommandDumpAspects.java b/src/main/java/gtPlusPlus/xmod/thaumcraft/commands/CommandDumpAspects.java index 6f1d53bc33..f44ba823db 100644 --- a/src/main/java/gtPlusPlus/xmod/thaumcraft/commands/CommandDumpAspects.java +++ b/src/main/java/gtPlusPlus/xmod/thaumcraft/commands/CommandDumpAspects.java @@ -2,17 +2,20 @@ package gtPlusPlus.xmod.thaumcraft.commands; import static gtPlusPlus.core.util.minecraft.PlayerUtils.messagePlayer; -import gtPlusPlus.api.objects.Logger; -import gtPlusPlus.core.commands.CommandUtils; -import gtPlusPlus.core.util.minecraft.PlayerUtils; -import gtPlusPlus.xmod.thaumcraft.objects.ThreadAspectScanner; import java.util.ArrayList; import java.util.List; + import net.minecraft.command.ICommand; import net.minecraft.command.ICommandSender; import net.minecraft.entity.player.EntityPlayer; +import gtPlusPlus.api.objects.Logger; +import gtPlusPlus.core.commands.CommandUtils; +import gtPlusPlus.core.util.minecraft.PlayerUtils; +import gtPlusPlus.xmod.thaumcraft.objects.ThreadAspectScanner; + public class CommandDumpAspects implements ICommand { + private final List<String> aliases; public static long mLastScanTime = System.currentTimeMillis(); @@ -56,7 +59,8 @@ public class CommandDumpAspects implements ICommand { Thread t = createNewThread(); messagePlayer(P, "Beginning to dump information about all items/blocks & their aspects to file."); messagePlayer( - P, "Please do not close your game during this process, you will be notified upon completion."); + P, + "Please do not close your game during this process, you will be notified upon completion."); t.start(); } else { messagePlayer( diff --git a/src/main/java/gtPlusPlus/xmod/thaumcraft/objects/ThreadAspectScanner.java b/src/main/java/gtPlusPlus/xmod/thaumcraft/objects/ThreadAspectScanner.java index 896c68aa3a..8fb8e2fc7d 100644 --- a/src/main/java/gtPlusPlus/xmod/thaumcraft/objects/ThreadAspectScanner.java +++ b/src/main/java/gtPlusPlus/xmod/thaumcraft/objects/ThreadAspectScanner.java @@ -1,12 +1,5 @@ package gtPlusPlus.xmod.thaumcraft.objects; -import gtPlusPlus.api.objects.Logger; -import gtPlusPlus.api.objects.data.AutoMap; -import gtPlusPlus.api.objects.data.Pair; -import gtPlusPlus.core.util.Utils; -import gtPlusPlus.core.util.data.FileUtils; -import gtPlusPlus.core.util.minecraft.ItemUtils; -import gtPlusPlus.xmod.thaumcraft.commands.CommandDumpAspects; import java.io.File; import java.util.ArrayList; import java.util.HashMap; @@ -14,10 +7,19 @@ import java.util.Iterator; import java.util.List; import java.util.Map; import java.util.Set; + import net.minecraft.block.Block; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; +import gtPlusPlus.api.objects.Logger; +import gtPlusPlus.api.objects.data.AutoMap; +import gtPlusPlus.api.objects.data.Pair; +import gtPlusPlus.core.util.Utils; +import gtPlusPlus.core.util.data.FileUtils; +import gtPlusPlus.core.util.minecraft.ItemUtils; +import gtPlusPlus.xmod.thaumcraft.commands.CommandDumpAspects; + public class ThreadAspectScanner extends Thread { public static boolean mDoWeScan = false; @@ -55,7 +57,7 @@ public class ThreadAspectScanner extends Thread { mAllGameContent.put(nameKey, m); } - @SuppressWarnings({"rawtypes"}) + @SuppressWarnings({ "rawtypes" }) @Override public void run() { if (mDoWeScan) { @@ -116,8 +118,8 @@ public class ThreadAspectScanner extends Thread { continue; } for (ItemStack stack : group) { - thaumcraft.api.aspects.AspectList a = - thaumcraft.common.lib.crafting.ThaumcraftCraftingManager.getObjectTags(stack); + thaumcraft.api.aspects.AspectList a = thaumcraft.common.lib.crafting.ThaumcraftCraftingManager + .getObjectTags(stack); if (a == null) { continue; } else { @@ -129,8 +131,11 @@ public class ThreadAspectScanner extends Thread { } try { List<String> mList = new ArrayList<String>(); - mList.add(stack.getDisplayName() + " | Meta: " + stack.getItemDamage() + " | Unlocal: " - + stack.getUnlocalizedName()); + mList.add( + stack.getDisplayName() + " | Meta: " + + stack.getItemDamage() + + " | Unlocal: " + + stack.getUnlocalizedName()); for (Pair<String, Integer> r : aspectPairs) { if (r != null) { mList.add(r.getKey() + " x" + r.getValue()); diff --git a/src/main/java/gtPlusPlus/xmod/thaumcraft/objects/wrapper/aspect/TC_Aspect_Wrapper.java b/src/main/java/gtPlusPlus/xmod/thaumcraft/objects/wrapper/aspect/TC_Aspect_Wrapper.java index 6847fcfe69..c847953cd8 100644 --- a/src/main/java/gtPlusPlus/xmod/thaumcraft/objects/wrapper/aspect/TC_Aspect_Wrapper.java +++ b/src/main/java/gtPlusPlus/xmod/thaumcraft/objects/wrapper/aspect/TC_Aspect_Wrapper.java @@ -1,22 +1,24 @@ package gtPlusPlus.xmod.thaumcraft.objects.wrapper.aspect; -import gregtech.api.enums.TC_Aspects; -import gregtech.api.util.GT_LanguageManager; -import gtPlusPlus.api.objects.Logger; -import gtPlusPlus.core.lib.CORE; -import gtPlusPlus.core.util.reflect.ReflectionUtils; -import gtPlusPlus.xmod.thaumcraft.util.ThaumcraftUtils; import java.lang.reflect.Array; import java.lang.reflect.Constructor; import java.lang.reflect.Field; import java.lang.reflect.Method; import java.util.LinkedHashMap; import java.util.Map; + import net.minecraft.util.ResourceLocation; +import gregtech.api.enums.TC_Aspects; +import gregtech.api.util.GT_LanguageManager; +import gtPlusPlus.api.objects.Logger; +import gtPlusPlus.core.lib.CORE; +import gtPlusPlus.core.util.reflect.ReflectionUtils; +import gtPlusPlus.xmod.thaumcraft.util.ThaumcraftUtils; + /** - * Wrapper class for Thaumcraft Aspects. - * Used to avoid compile time dependencies. + * Wrapper class for Thaumcraft Aspects. Used to avoid compile time dependencies. + * * @author Alkalus * */ @@ -48,6 +50,7 @@ public class TC_Aspect_Wrapper { /** * Gets the total aspect list from Thaumcraft, which should contain all other registered aspects. + * * @return - A LinkedHashMap(String, Aspect); */ public static LinkedHashMap<String, Object> getVanillaAspectList() { @@ -68,7 +71,8 @@ public class TC_Aspect_Wrapper { /** * Vanilla Aspect Constructor - * @param tag - Aspect Name + * + * @param tag - Aspect Name * @param color * @param chatcolor * @param blend @@ -81,7 +85,8 @@ public class TC_Aspect_Wrapper { /** * * Vanilla Aspect Constructor - * @param tag - Aspect Name + * + * @param tag - Aspect Name * @param color * @param components */ @@ -92,7 +97,8 @@ public class TC_Aspect_Wrapper { /** * * Vanilla Aspect Constructor - * @param tag - Aspect Name + * + * @param tag - Aspect Name * @param color * @param components * @param blend @@ -104,20 +110,20 @@ public class TC_Aspect_Wrapper { /** * * Vanilla Aspect Constructor - * @param tag - Aspect Name + * + * @param tag - Aspect Name * @param color * @param components * @param image * @param blend */ - public TC_Aspect_Wrapper( - String tag, int color, TC_Aspect_Wrapper[] components, boolean vanilla, int blend, String aTooltip) { + public TC_Aspect_Wrapper(String tag, int color, TC_Aspect_Wrapper[] components, boolean vanilla, int blend, + String aTooltip) { this( tag, color, components, - vanilla - ? new ResourceLocation("thaumcraft", "textures/aspects/" + tag.toLowerCase() + ".png") + vanilla ? new ResourceLocation("thaumcraft", "textures/aspects/" + tag.toLowerCase() + ".png") : new ResourceLocation(CORE.MODID, "textures/aspects/" + tag.toLowerCase() + ".png"), vanilla, blend, @@ -126,14 +132,8 @@ public class TC_Aspect_Wrapper { private static int aInternalAspectIDAllocation = 1; - public TC_Aspect_Wrapper( - String tag, - int color, - TC_Aspect_Wrapper[] components, - ResourceLocation image, - boolean vanilla, - int blend, - String aTooltip) { + public TC_Aspect_Wrapper(String tag, int color, TC_Aspect_Wrapper[] components, ResourceLocation image, + boolean vanilla, int blend, String aTooltip) { if (components == null) { components = new TC_Aspect_Wrapper[] {}; } @@ -183,6 +183,7 @@ public class TC_Aspect_Wrapper { /** * Generates a TC_Aspect from an object, presummed to be a TC Aspect. + * * @param aBaseAspect - The TC Aspect to generate from. * @return * @throws IllegalArgumentException @@ -207,15 +208,14 @@ public class TC_Aspect_Wrapper { aTag, (int) ReflectionUtils.getField(mClass_Aspect, "color").get(aBaseAspect), generateAspectArrayInternal( - ReflectionUtils.getField(mClass_Aspect, "components"), (aBaseAspect)), - (ResourceLocation) - ReflectionUtils.getField(mClass_Aspect, "image").get(aBaseAspect), + ReflectionUtils.getField(mClass_Aspect, "components"), + (aBaseAspect)), + (ResourceLocation) ReflectionUtils.getField(mClass_Aspect, "image").get(aBaseAspect), true, (int) ReflectionUtils.getField(mClass_Aspect, "blend").get(aBaseAspect), ""); if (aTemp != null) { - aTemp.chatcolor = (String) - ReflectionUtils.getField(mClass_Aspect, "chatcolor").get(aBaseAspect); + aTemp.chatcolor = (String) ReflectionUtils.getField(mClass_Aspect, "chatcolor").get(aBaseAspect); return aTemp; } else { return null; @@ -234,6 +234,7 @@ public class TC_Aspect_Wrapper { /** * Public getter for all TC_Aspects + * * @param aAspectName - Aspect Name * @return - A GT++ Aspect wrapper or null. (TC_Aspect) */ @@ -270,8 +271,7 @@ public class TC_Aspect_Wrapper { if (aAspectArray.length > 0) { int i = 0; for (Object g : components) { - aAspectArray[i] = getAspect((String) - ReflectionUtils.getField(mClass_Aspect, "tag").get(g)); + aAspectArray[i] = getAspect((String) ReflectionUtils.getField(mClass_Aspect, "tag").get(g)); i++; } } @@ -284,6 +284,7 @@ public class TC_Aspect_Wrapper { /** * Tasty code to generate TC Aspects reflectively. + * * @return */ public Object generateTcAspect() { @@ -298,7 +299,11 @@ public class TC_Aspect_Wrapper { } } Constructor constructor = mClass_Aspect.getConstructor( - String.class, int.class, aAspectArray.getClass(), ResourceLocation.class, int.class); + String.class, + int.class, + aAspectArray.getClass(), + ResourceLocation.class, + int.class); Object myObject = constructor.newInstance(tag, color, aAspectArray, image, blend); // Set chat colour 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; diff --git a/src/main/java/gtPlusPlus/xmod/thaumcraft/util/ThaumcraftUtils.java b/src/main/java/gtPlusPlus/xmod/thaumcraft/util/ThaumcraftUtils.java index 8489a4d50e..5376739106 100644 --- a/src/main/java/gtPlusPlus/xmod/thaumcraft/util/ThaumcraftUtils.java +++ b/src/main/java/gtPlusPlus/xmod/thaumcraft/util/ThaumcraftUtils.java @@ -2,6 +2,18 @@ package gtPlusPlus.xmod.thaumcraft.util; import static gtPlusPlus.xmod.thaumcraft.HANDLER_Thaumcraft.sItemsToGetAspects; +import java.lang.reflect.Field; +import java.lang.reflect.InvocationTargetException; +import java.lang.reflect.Method; +import java.util.ArrayList; +import java.util.Iterator; +import java.util.List; + +import net.minecraft.block.Block; +import net.minecraft.item.ItemStack; +import net.minecraft.item.crafting.IRecipe; +import net.minecraft.world.World; + import gregtech.api.GregTech_API; import gregtech.api.enums.ConfigCategories; import gregtech.api.enums.TC_Aspects; @@ -23,16 +35,6 @@ import gtPlusPlus.xmod.thaumcraft.objects.wrapper.research.TC_ResearchCategoryLi import gtPlusPlus.xmod.thaumcraft.objects.wrapper.research.TC_ResearchItem_Wrapper; import gtPlusPlus.xmod.thaumcraft.objects.wrapper.research.TC_ResearchNoteData_Wrapper; import gtPlusPlus.xmod.thaumcraft.objects.wrapper.research.TC_ResearchPage_Wrapper; -import java.lang.reflect.Field; -import java.lang.reflect.InvocationTargetException; -import java.lang.reflect.Method; -import java.util.ArrayList; -import java.util.Iterator; -import java.util.List; -import net.minecraft.block.Block; -import net.minecraft.item.ItemStack; -import net.minecraft.item.crafting.IRecipe; -import net.minecraft.world.World; public class ThaumcraftUtils { @@ -50,7 +52,7 @@ public class ThaumcraftUtils { } public static boolean addAspectToItem(ItemStack item, TC_Aspect_Wrapper aspect, int amount) { - return addAspectToItem(item, new TC_Aspect_Wrapper[] {aspect}, new Integer[] {amount}); + return addAspectToItem(item, new TC_Aspect_Wrapper[] { aspect }, new Integer[] { amount }); } public static boolean addAspectToItem(ItemStack item, TC_Aspect_Wrapper[] aspect, Integer[] amounts) { @@ -81,20 +83,9 @@ public class ThaumcraftUtils { return r.mGtEnumField; } - public static Object addResearch( - String aResearch, - String aName, - String aText, - String[] aParentResearches, - String aCategory, - ItemStack aIcon, - int aComplexity, - int aType, - int aX, - int aY, - List<GTPP_AspectStack> aAspects, - ItemStack[] aResearchTriggers, - Object[] aPages) { + public static Object addResearch(String aResearch, String aName, String aText, String[] aParentResearches, + String aCategory, ItemStack aIcon, int aComplexity, int aType, int aX, int aY, + List<GTPP_AspectStack> aAspects, ItemStack[] aResearchTriggers, Object[] aPages) { if (!GregTech_API.sRecipeFile.get(ConfigCategories.Recipes.researches, aResearch, true)) { return null; } @@ -102,7 +93,7 @@ public class ThaumcraftUtils { if (tCategory == null) { return null; } - for (Iterator<TC_ResearchItem_Wrapper> i$ = tCategory.research.values().iterator(); i$.hasNext(); ) { + for (Iterator<TC_ResearchItem_Wrapper> i$ = tCategory.research.values().iterator(); i$.hasNext();) { TC_ResearchItem_Wrapper tResearch = (TC_ResearchItem_Wrapper) i$.next(); if ((tResearch.displayColumn == aX) && (tResearch.displayRow == aY)) { aX += (aX > 0 ? 5 : -5); @@ -110,7 +101,13 @@ public class ThaumcraftUtils { } } TC_ResearchItem_Wrapper rResearch = new TC_ResearchItem_Wrapper( - aResearch, aCategory, getAspectList_Ex(aAspects), aX, aY, aComplexity, aIcon); + aResearch, + aCategory, + getAspectList_Ex(aAspects), + aX, + aY, + aComplexity, + aIcon); ArrayList<Object> tPages = new ArrayList<Object>(aPages.length); GT_LanguageManager.addStringLocalization("tc.research_name." + aResearch, aName); GT_LanguageManager.addStringLocalization("tc.research_text." + aResearch, "[GT++] " + aText); @@ -172,13 +169,9 @@ public class ThaumcraftUtils { return rResearch.registerResearchItem(); } - public static Object addCrucibleRecipe( - final String aResearch, - final Object aInput, - final ItemStack aOutput, + public static Object addCrucibleRecipe(final String aResearch, final Object aInput, final ItemStack aOutput, final List<GTPP_AspectStack> aAspects) { - if (GT_Utility.isStringInvalid((Object) aResearch) - || aInput == null + if (GT_Utility.isStringInvalid((Object) aResearch) || aInput == null || aOutput == null || aAspects == null || aAspects.isEmpty()) { @@ -186,20 +179,15 @@ public class ThaumcraftUtils { } return addCrucibleRecipe( aResearch, - GT_Utility.copy(new Object[] {aOutput}), + GT_Utility.copy(new Object[] { aOutput }), (aInput instanceof ItemStack || aInput instanceof ArrayList) ? aInput : aInput.toString(), getAspectList_Ex(aAspects)); } - public static Object addInfusionRecipe( - final String aResearch, - final ItemStack aMainInput, - final ItemStack[] aSideInputs, - final ItemStack aOutput, - final int aInstability, + public static Object addInfusionRecipe(final String aResearch, final ItemStack aMainInput, + final ItemStack[] aSideInputs, final ItemStack aOutput, final int aInstability, final List<GTPP_AspectStack> aAspects) { - if (GT_Utility.isStringInvalid((Object) aResearch) - || aMainInput == null + if (GT_Utility.isStringInvalid((Object) aResearch) || aMainInput == null || aSideInputs == null || aOutput == null || aAspects == null @@ -208,15 +196,15 @@ public class ThaumcraftUtils { } return addInfusionCraftingRecipe( aResearch, - (Object) GT_Utility.copy(new Object[] {aOutput}), + (Object) GT_Utility.copy(new Object[] { aOutput }), aInstability, getAspectList_Ex(aAspects), aMainInput, aSideInputs); } - public static boolean registerThaumcraftAspectsToItem( - final ItemStack aExampleStack, final List<GTPP_AspectStack> aAspects, final String aOreDict) { + public static boolean registerThaumcraftAspectsToItem(final ItemStack aExampleStack, + final List<GTPP_AspectStack> aAspects, final String aOreDict) { if (aAspects.isEmpty()) { return false; } @@ -224,8 +212,8 @@ public class ThaumcraftUtils { return true; } - public static boolean registerThaumcraftAspectsToItem( - final ItemStack aStack, final List<GTPP_AspectStack> aAspects, final boolean aAdditive) { + public static boolean registerThaumcraftAspectsToItem(final ItemStack aStack, final List<GTPP_AspectStack> aAspects, + final boolean aAdditive) { try { if (aAspects.isEmpty()) { return false; @@ -276,14 +264,14 @@ public class ThaumcraftUtils { /* * Methods */ - mMethod_registerObjectTag1 = ReflectionUtils.getMethod( - mClass_ThaumcraftApi, "registerObjectTag", ItemStack.class, mClass_AspectList); + mMethod_registerObjectTag1 = ReflectionUtils + .getMethod(mClass_ThaumcraftApi, "registerObjectTag", ItemStack.class, mClass_AspectList); - mMethod_registerObjectTag2 = - ReflectionUtils.getMethod(mClass_ThaumcraftApi, "registerObjectTag", String.class, mClass_AspectList); + mMethod_registerObjectTag2 = ReflectionUtils + .getMethod(mClass_ThaumcraftApi, "registerObjectTag", String.class, mClass_AspectList); - mMethod_registerComplexObjectTag = ReflectionUtils.getMethod( - mClass_ThaumcraftApi, "registerComplexObjectTag", ItemStack.class, mClass_AspectList); + mMethod_registerComplexObjectTag = ReflectionUtils + .getMethod(mClass_ThaumcraftApi, "registerComplexObjectTag", ItemStack.class, mClass_AspectList); mMethod_addInfusionCraftingRecipe = ReflectionUtils.getMethod( mClass_ThaumcraftApi, @@ -303,8 +291,8 @@ public class ThaumcraftUtils { Object.class, mClass_AspectList); - mMethod_getObjectAspects = - ReflectionUtils.getMethod(mClass_ThaumcraftApiHelper, "getObjectAspects", ItemStack.class); + mMethod_getObjectAspects = ReflectionUtils + .getMethod(mClass_ThaumcraftApiHelper, "getObjectAspects", ItemStack.class); mMethod_updateData = ReflectionUtils.getMethod( mClass_ResearchManager, @@ -352,8 +340,8 @@ public class ThaumcraftUtils { return null; } - public static Object addCrucibleRecipe( - String aResearch, ItemStack copy, Object aOutput, TC_AspectList_Wrapper aAspectList) { + public static Object addCrucibleRecipe(String aResearch, ItemStack copy, Object aOutput, + TC_AspectList_Wrapper aAspectList) { try { return mMethod_addCrucibleRecipe.invoke(null, aResearch, copy, aOutput, aAspectList); } catch (IllegalAccessException | IllegalArgumentException | InvocationTargetException e) { @@ -362,16 +350,11 @@ public class ThaumcraftUtils { return null; } - public static Object addInfusionCraftingRecipe( - String aResearch, - Object copy, - int aInstability, - TC_AspectList_Wrapper aAspectList, - ItemStack aMainInput, - ItemStack[] aSideInputs) { + public static Object addInfusionCraftingRecipe(String aResearch, Object copy, int aInstability, + TC_AspectList_Wrapper aAspectList, ItemStack aMainInput, ItemStack[] aSideInputs) { try { - return mMethod_addInfusionCraftingRecipe.invoke( - null, aResearch, copy, aInstability, aAspectList, aMainInput, aSideInputs); + return mMethod_addInfusionCraftingRecipe + .invoke(null, aResearch, copy, aInstability, aAspectList, aMainInput, aSideInputs); } catch (IllegalAccessException | IllegalArgumentException | InvocationTargetException e) { e.printStackTrace(); } @@ -426,8 +409,7 @@ public class ThaumcraftUtils { } public static boolean isItemResearchNotes(ItemStack aStack) { - if (aStack != null - && aStack.getItem() == HANDLER_Thaumcraft.mResearchNotes + if (aStack != null && aStack.getItem() == HANDLER_Thaumcraft.mResearchNotes && HANDLER_Thaumcraft.mResearchNotes.getClass().isInstance(aStack.getItem())) { return true; } @@ -449,39 +431,24 @@ public class ThaumcraftUtils { return research; } - public static void placeAspectIntoResearchNote( - ItemStack note, World aWorld, final int q, final int r, final TC_Aspect_Wrapper aspect) { - /*TC_ResearchNoteData_Wrapper data = gatherResults(note); - String mGTPP = CORE.gameProfile.getName(); - EntityPlayer player = CORE.getFakePlayer(aWorld); - - if (isItemResearchNotes(note) && data != null && note.getItemDamage() < 64) { - final boolean r2 = ResearchManager.isResearchComplete(mGTPP, "RESEARCHER1"); - final boolean r3 = ResearchManager.isResearchComplete(mGTPP, "RESEARCHER2"); - final HexUtils.Hex hex = new HexUtils.Hex(q, r); - ResearchManager.HexEntry he = null; - if (aspect != null) { - he = new ResearchManager.HexEntry(aspect, 2); - if (r3 && aWorld.rand.nextFloat() < 0.1f) { - aWorld.playSoundAtEntity((Entity) player, "random.orb", 0.2f, 0.9f + player.worldObj.rand.nextFloat() * 0.2f); - } - } else { - final float f = aWorld.rand.nextFloat(); - if (data.hexEntries.get(hex.toString()).aspect != null - && ((r2 && f < 0.25f) || (r3 && f < 0.5f))) { - aWorld.playSoundAtEntity((Entity) player, "random.orb", 0.2f, - 0.9f + player.worldObj.rand.nextFloat() * 0.2f); - ResearchManager.scheduleSave(player); - } - he = new ResearchManager.HexEntry((Aspect) null, 0); - } - data.hexEntries.put(hex.toString(), he); - data.hexes.put(hex.toString(), hex); - updateResearchNote(note, data); - if (!aWorld.isRemote && ResearchManager.checkResearchCompletion(note, data, player.getCommandSenderName())) { - note.setItemDamage(64); - } - }*/ + public static void placeAspectIntoResearchNote(ItemStack note, World aWorld, final int q, final int r, + final TC_Aspect_Wrapper aspect) { + /* + * TC_ResearchNoteData_Wrapper data = gatherResults(note); String mGTPP = CORE.gameProfile.getName(); + * EntityPlayer player = CORE.getFakePlayer(aWorld); if (isItemResearchNotes(note) && data != null && + * note.getItemDamage() < 64) { final boolean r2 = ResearchManager.isResearchComplete(mGTPP, "RESEARCHER1"); + * final boolean r3 = ResearchManager.isResearchComplete(mGTPP, "RESEARCHER2"); final HexUtils.Hex hex = new + * HexUtils.Hex(q, r); ResearchManager.HexEntry he = null; if (aspect != null) { he = new + * ResearchManager.HexEntry(aspect, 2); if (r3 && aWorld.rand.nextFloat() < 0.1f) { + * aWorld.playSoundAtEntity((Entity) player, "random.orb", 0.2f, 0.9f + player.worldObj.rand.nextFloat() * + * 0.2f); } } else { final float f = aWorld.rand.nextFloat(); if (data.hexEntries.get(hex.toString()).aspect != + * null && ((r2 && f < 0.25f) || (r3 && f < 0.5f))) { aWorld.playSoundAtEntity((Entity) player, "random.orb", + * 0.2f, 0.9f + player.worldObj.rand.nextFloat() * 0.2f); ResearchManager.scheduleSave(player); } he = new + * ResearchManager.HexEntry((Aspect) null, 0); } data.hexEntries.put(hex.toString(), he); + * data.hexes.put(hex.toString(), hex); updateResearchNote(note, data); if (!aWorld.isRemote && + * ResearchManager.checkResearchCompletion(note, data, player.getCommandSenderName())) { note.setItemDamage(64); + * } } + */ } public static void completeResearchNote(World aWorld, ItemStack aStack) { |