This commit is contained in:
John Yorke committed 2021-11-25 18:27:57 -04:00
1 parent e13e17363e
commit 280e1b2cc1
10 files changed
+74 -79

No files matched your search

@@ -50,7 +50,7 @@ public class ClientProxy extends CommonProxy
super.registerHandlers();
MinecraftForge.EVENT_BUS.register(new HUDHandler());
FMLCommonHandler.instance().bus().register(new ClientHandler());
MinecraftForge.EVENT_BUS.register(new ClientHandler());
}
@@ -26,10 +26,10 @@ public class TaintedMagic
public static CommonProxy proxy;
// TM creative tab
public static CreativeTabs tabTM = new TMCreativeTab();
public static final CreativeTabs tabTM = new TMCreativeTab();
// TM log
public static final Logger log = LogManager.getLogger("TAINTED MAGIC");
// TM logger
public static final Logger logger = LogManager.getLogger("TAINTED MAGIC");
// Creation EnumRarity
public static EnumRarity rarityCreation = EnumHelper.addRarity("CREATION", EnumChatFormatting.GOLD, "Creation");
@@ -38,7 +38,7 @@ public class TaintedMagic
@EventHandler
public static void preInit (FMLPreInitializationEvent event)
{
log.info("...Pre-initializing Tainted Magic!");
logger.info("Pre-initializing Tainted Magic!");
proxy.preInit(event);
}
@@ -46,7 +46,7 @@ public class TaintedMagic
@EventHandler
public static void init (FMLInitializationEvent event)
{
log.info("...Initializing Tainted Magic!");
logger.info("Initializing Tainted Magic!");
proxy.init(event);
}
@@ -54,8 +54,8 @@ public class TaintedMagic
@EventHandler
public static void postInit (FMLPostInitializationEvent event)
{
log.info("...Post-initializing Tainted Magic!");
logger.info("Post-initializing Tainted Magic!");
proxy.postInit(event);
log.info("...Loading complete, enjoy!");
logger.info("Loading complete!");
}
}
@@ -25,23 +25,23 @@ public class ConfigHandler
public static void initConfig ()
{
TaintedMagic.log.info("Loading config...");
TaintedMagic.logger.info("Loading config...");
config.load();
NOTIFY_UPDATE = config.getBoolean("NOTIFY_UPDATE", "misc", true,
"Setting this to false will disable Tainted Magic update notifications.");
MAGE_MACE_DMG_INC_BASE = (double) config.getFloat("MAGE_MACE_DMG_INC_BASE", "misc", 8.0F, 1.0F, 100.0F,
"Defines the base amount of damage to increase wand / staff attack damage by "
+ "when the Mage's Mace focus is equipped.");
RESEARCH_TAGS = config.getBoolean("RESEARCH_TAGS", "research", true,
"Setting this to false will disable the '[TM]' tag on Tainted Magic research items.");
CUSTOM_RESEARCH_TAB_BACK = config.getBoolean("CUSTOM_RESEARCH_TAB_BACK", "research", false,
"Setting this to true will bring back the old Tainted Magic research tab background.");
MAGE_MACE_DMG_INC_BASE = (double) config.getFloat("MAGE_MACE_DMG_INC_BASE", "wands_and_foci", 8.0F, 1.0F, 100.0F,
"Defines the base amount of damage to increase wand / staff attack damage by "
+ "when the Mage's Mace focus is equipped.");
WARP_WAND_REFRESH_BASE = config.getFloat("WARP_WAND_REFRESH_BASE", "wands_and_foci", 10000.0F, 100.0F, 100000.0F,
"Defines the base refresh period in ticks for the Warpwood Wand. The delay period between vis refreshes "
+ "is calculated by dividing this number by the amount of permanent warp the player has accumulated.");
@@ -29,7 +29,7 @@ public class UpdateHandler
show = true;
updateStatus = (EnumChatFormatting.RED + "Tainted Magic is out of date! The latest version is "
+ EnumChatFormatting.GREEN + newestVersion);
TaintedMagic.log.warn("Mod out of date! You're still running " + currentVersion + " ... the latest version is "
TaintedMagic.logger.warn("Mod out of date! You're still running " + currentVersion + " ... the latest version is "
+ newestVersion);
}
}
@@ -52,7 +52,7 @@ public class UpdateHandler
catch (Exception e)
{
e.printStackTrace();
TaintedMagic.log.error("Could not connect to GitHub repository!");
TaintedMagic.logger.error("Could not connect to GitHub repository!");
}
}
}
@@ -37,19 +37,11 @@ public class ItemMagicFunguar extends ItemFood
{
super.onFoodEaten(stack, world, player);
Random random = new Random();
try
{
player.addPotionEffect(new PotionEffect(Potion.regeneration.id, 200, 2));
player.addPotionEffect(new PotionEffect(Potion.digSpeed.id, 100, 2));
player.addPotionEffect(new PotionEffect(Potion.moveSpeed.id, 100, 2));
}
catch (Exception e)
{
e.printStackTrace();
}
// Potion effects
player.addPotionEffect(new PotionEffect(Potion.regeneration.id, 60, 1));
player.addPotionEffect(new PotionEffect(Potion.moveSpeed.id, 100, 2));
int i = random.nextInt(aspects.length);
int i = world.rand.nextInt(aspects.length);
if (!world.isRemote)
{
@@ -28,7 +28,7 @@ import taintedmagic.common.items.equipment.ItemVoidwalkerSash;
import taintedmagic.common.items.equipment.ItemWarpedGoggles;
import taintedmagic.common.items.tools.ItemHollowDagger;
import taintedmagic.common.items.tools.ItemKatana;
import taintedmagic.common.items.tools.ItemPrimordialEdge;
import taintedmagic.common.items.tools.ItemPrimalBlade;
import taintedmagic.common.items.tools.ItemShadowmetalAxe;
import taintedmagic.common.items.tools.ItemShadowmetalHoe;
import taintedmagic.common.items.tools.ItemShadowmetalPick;
@@ -109,7 +109,7 @@ public class ItemRegistry
public static ItemAxe ItemShadowmetalAxe;
public static ItemSword ItemShadowmetalSword;
public static ItemSword ItemPrimordialEdge;
public static ItemSword ItemPrimalBlade;
public static Item ItemKatana;
@@ -208,7 +208,7 @@ public class ItemRegistry
WAND_CAP_CRIMSON_CLOTH = new WandCap("crimsoncloth", 0.93F, new ItemStack(ItemWandCap, 1, 2), 3);
WAND_CAP_CRIMSON_CLOTH.setTexture(new ResourceLocation("taintedmagic:textures/models/ModelWAND_CAP_CRIMSON_CLOTH.png"));
WAND_CAP_SHADOW_CLOTH = new WandCap("shadowcloth", 0.91F, new ItemStack(ItemWandCap, 1, 3), 4);
WAND_CAP_SHADOW_CLOTH = new WandCap("shadowcloth", 0.93F, new ItemStack(ItemWandCap, 1, 3), 4);
WAND_CAP_SHADOW_CLOTH.setTexture(new ResourceLocation("taintedmagic:textures/models/ModelWAND_CAP_SHADOW_CLOTH.png"));
// Foci
@@ -252,8 +252,8 @@ public class ItemRegistry
ItemShadowmetalSword = new ItemShadowmetalSword(LibMaterials.toolMatShadow);
GameRegistry.registerItem(ItemShadowmetalSword, "ItemShadowmetalSword");
ItemPrimordialEdge = new ItemPrimordialEdge(LibMaterials.toolMatPrimal);
GameRegistry.registerItem(ItemPrimordialEdge, "ItemPrimordialEdge");
ItemPrimalBlade = new ItemPrimalBlade(LibMaterials.toolMatPrimal);
GameRegistry.registerItem(ItemPrimalBlade, "ItemPrimalBlade");
ItemKatana = new ItemKatana();
GameRegistry.registerItem(ItemKatana, "ItemKatana");
@@ -8,6 +8,7 @@ import net.minecraft.nbt.NBTTagByte;
import net.minecraft.nbt.NBTTagInt;
import net.minecraftforge.oredict.OreDictionary;
import taintedmagic.common.helper.TaintedMagicHelper;
import taintedmagic.common.items.tools.ItemKatana;
import thaumcraft.api.ThaumcraftApi;
import thaumcraft.api.aspects.Aspect;
import thaumcraft.api.aspects.AspectList;
@@ -28,7 +29,7 @@ public class RecipeRegistry
/**
* Vanilla crafting table recipes
*/
public static void initCrafting ()
private static void initCrafting ()
{
// Shadow Metal Ingot from nuggets
GameRegistry.addShapedRecipe(new ItemStack(ItemRegistry.ItemMaterial, 1, 0), "AAA", "AAA", "AAA", 'A',
@@ -49,36 +50,36 @@ public class RecipeRegistry
// Shadow Metal Axe
ResearchRegistry.recipes.put("ItemShadowmetalAxe",
GameRegistry.addShapedRecipe(new ItemStack(ItemRegistry.ItemShadowmetalAxe), " AA", " BA", " B ", 'A',
GameRegistry.addShapedRecipe(new ItemStack(ItemRegistry.ItemShadowmetalAxe), "AA", "AB", " B", 'A',
new ItemStack(ItemRegistry.ItemMaterial), 'B', new ItemStack(Items.stick)));
// Shadow Metal Spade
ResearchRegistry.recipes.put("ItemShadowmetalSpade",
GameRegistry.addShapedRecipe(new ItemStack(ItemRegistry.ItemShadowmetalSpade), " A ", " B ", " B ", 'A',
GameRegistry.addShapedRecipe(new ItemStack(ItemRegistry.ItemShadowmetalSpade), "A", "B", "B", 'A',
new ItemStack(ItemRegistry.ItemMaterial), 'B', new ItemStack(Items.stick)));
// Shadow Metal Hoe
ResearchRegistry.recipes.put("ItemShadowmetalHoe",
GameRegistry.addShapedRecipe(new ItemStack(ItemRegistry.ItemShadowmetalHoe), " AA", " B ", " B ", 'A',
GameRegistry.addShapedRecipe(new ItemStack(ItemRegistry.ItemShadowmetalHoe), "AA", " B", " B", 'A',
new ItemStack(ItemRegistry.ItemMaterial), 'B', new ItemStack(Items.stick)));
// Shadow Metal Sword
ResearchRegistry.recipes.put("ItemShadowmetalSword",
GameRegistry.addShapedRecipe(new ItemStack(ItemRegistry.ItemShadowmetalSword), " A ", " A ", " B ", 'A',
GameRegistry.addShapedRecipe(new ItemStack(ItemRegistry.ItemShadowmetalSword), "A", "A", "B", 'A',
new ItemStack(ItemRegistry.ItemMaterial), 'B', new ItemStack(Items.stick)));
}
/**
* Furnace recipes
*/
public static void initSmelting ()
private static void initSmelting ()
{
}
/**
* Arcane Infusion recipes
*/
public static void initInfusion ()
private static void initInfusion ()
{
// Shockwave Focus
ResearchRegistry.recipes.put("ItemFocusShockwave",
@@ -90,9 +91,9 @@ public class RecipeRegistry
new ItemStack(ConfigItems.itemShard, 1, 0), new ItemStack(Blocks.tnt),
new ItemStack(Items.gunpowder), new ItemStack(ConfigItems.itemShard, 1, 0) }));
// Edge of the Primordials
ResearchRegistry.recipes.put("ItemPrimordialEdge", ThaumcraftApi.addInfusionCraftingRecipe("PRIMALBLADE",
new ItemStack(ItemRegistry.ItemPrimordialEdge), 8, new AspectList().add(Aspect.WEAPON, 65)
// Primal Blade
ResearchRegistry.recipes.put("ItemPrimalBlade", ThaumcraftApi.addInfusionCraftingRecipe("PRIMALBLADE",
new ItemStack(ItemRegistry.ItemPrimalBlade), 8, new AspectList().add(Aspect.WEAPON, 65)
.add(Aspect.ELDRITCH, 46).add(Aspect.DARKNESS, 16).add(Aspect.METAL, 60).add(Aspect.VOID, 56),
new ItemStack(ConfigItems.itemSwordVoid),
new ItemStack[]{ new ItemStack(ItemRegistry.ItemMaterial, 1, 5), new ItemStack(ConfigItems.itemShard, 1, 0),
@@ -444,7 +445,8 @@ public class RecipeRegistry
* Special inscription recipes which are displayed in the Thaumonomicon
*/
ResearchRegistry.recipes.put("ItemKatanaThaumium:inscription0",
ThaumcraftApi.addInfusionCraftingRecipe("INSCRIPTIONFIRE", new Object[]{ "inscription", new NBTTagInt(0) }, 8,
ThaumcraftApi.addInfusionCraftingRecipe("INSCRIPTIONFIRE",
new Object[]{ ItemKatana.TAG_INSCRIPTION, new NBTTagInt(0) }, 8,
new AspectList().add(Aspect.FIRE, 64).add(Aspect.LIGHT, 64).add(Aspect.METAL, 16),
new ItemStack(ItemRegistry.ItemKatana, 1, 0),
new ItemStack[]{ new ItemStack(ConfigItems.itemFocusFire), new ItemStack(Items.coal),
@@ -452,7 +454,7 @@ public class RecipeRegistry
new ItemStack(Items.blaze_powder), new ItemStack(ConfigItems.itemResource, 1, 1) }));
ResearchRegistry.recipes.put("ItemKatanaThaumium:inscription1", ThaumcraftApi.addInfusionCraftingRecipe(
"INSCRIPTIONTHUNDER", new Object[]{ "inscription", new NBTTagInt(1) }, 8,
"INSCRIPTIONTHUNDER", new Object[]{ ItemKatana.TAG_INSCRIPTION, new NBTTagInt(1) }, 8,
new AspectList().add(Aspect.AIR, 64).add(Aspect.MOTION, 64).add(Aspect.MAGIC, 16),
new ItemStack(ItemRegistry.ItemKatana, 1, 0),
new ItemStack[]{ new ItemStack(ItemRegistry.ItemFocusShockwave), new ItemStack(ConfigItems.itemShard, 1, 0),
@@ -460,7 +462,8 @@ public class RecipeRegistry
new ItemStack(Items.gunpowder) }));
ResearchRegistry.recipes.put("ItemKatanaThaumium:inscription2",
ThaumcraftApi.addInfusionCraftingRecipe("INSCRIPTIONUNDEAD", new Object[]{ "inscription", new NBTTagInt(2) }, 8,
ThaumcraftApi.addInfusionCraftingRecipe("INSCRIPTIONHEAL",
new Object[]{ ItemKatana.TAG_INSCRIPTION, new NBTTagInt(2) }, 8,
new AspectList().add(Aspect.HEAL, 64).add(Aspect.UNDEAD, 64).add(Aspect.MAGIC, 16),
new ItemStack(ItemRegistry.ItemKatana, 1, 0),
new ItemStack[]{ new ItemStack(ConfigItems.itemFocusPech), new ItemStack(Items.bone),
@@ -471,7 +474,8 @@ public class RecipeRegistry
* Actual inscription recipes
*/
ResearchRegistry.recipes.put("ItemKatana:inscription0",
ThaumcraftApi.addInfusionCraftingRecipe("INSCRIPTIONFIRE", new Object[]{ "inscription", new NBTTagInt(0) }, 8,
ThaumcraftApi.addInfusionCraftingRecipe("INSCRIPTIONFIRE",
new Object[]{ ItemKatana.TAG_INSCRIPTION, new NBTTagInt(0) }, 8,
new AspectList().add(Aspect.FIRE, 64).add(Aspect.ENERGY, 64).add(Aspect.MAGIC, 16),
new ItemStack(ItemRegistry.ItemKatana, 1, OreDictionary.WILDCARD_VALUE),
new ItemStack[]{ new ItemStack(ConfigItems.itemFocusFire), new ItemStack(Items.coal),
@@ -479,7 +483,7 @@ public class RecipeRegistry
new ItemStack(Items.blaze_powder), new ItemStack(ConfigItems.itemResource, 1, 1) }));
ResearchRegistry.recipes.put("ItemKatana:inscription1", ThaumcraftApi.addInfusionCraftingRecipe("INSCRIPTIONTHUNDER",
new Object[]{ "inscription", new NBTTagInt(1) }, 8,
new Object[]{ ItemKatana.TAG_INSCRIPTION, new NBTTagInt(1) }, 8,
new AspectList().add(Aspect.AIR, 64).add(Aspect.MOTION, 64).add(Aspect.MAGIC, 16),
new ItemStack(ItemRegistry.ItemKatana, 1, OreDictionary.WILDCARD_VALUE),
new ItemStack[]{ new ItemStack(ItemRegistry.ItemFocusShockwave), new ItemStack(ConfigItems.itemShard, 1, 0),
@@ -487,7 +491,8 @@ public class RecipeRegistry
new ItemStack(Items.gunpowder) }));
ResearchRegistry.recipes.put("ItemKatana:inscription2",
ThaumcraftApi.addInfusionCraftingRecipe("INSCRIPTIONUNDEAD", new Object[]{ "inscription", new NBTTagInt(2) }, 8,
ThaumcraftApi.addInfusionCraftingRecipe("INSCRIPTIONHEAL",
new Object[]{ ItemKatana.TAG_INSCRIPTION, new NBTTagInt(2) }, 8,
new AspectList().add(Aspect.HEAL, 64).add(Aspect.UNDEAD, 64).add(Aspect.METAL, 16),
new ItemStack(ItemRegistry.ItemKatana, 1, OreDictionary.WILDCARD_VALUE),
new ItemStack[]{ new ItemStack(ConfigItems.itemFocusPech), new ItemStack(Items.bone),
@@ -498,7 +503,7 @@ public class RecipeRegistry
/**
* Arcane worktable recipes
*/
public static void initArcane ()
private static void initArcane ()
{
// Crimson-stained Cloth
ResearchRegistry.recipes.put("ItemMaterial:2",
@@ -546,10 +551,9 @@ public class RecipeRegistry
new ItemStack(ItemRegistry.ItemMaterial, 1, 2)));
// Warpwood Staff Core
ResearchRegistry.recipes.put("ItemWandRod:1",
ThaumcraftApi.addArcaneCraftingRecipe("ROD_warpwood_staff", new ItemStack(ItemRegistry.ItemWandRod, 1, 1),
TaintedMagicHelper.getPrimals(120), " A", " B ", "B ", 'A',
new ItemStack(ItemRegistry.ItemMaterial, 1, 10), 'B', new ItemStack(ItemRegistry.ItemWandRod, 1, 0)));
ResearchRegistry.recipes.put("ItemWandRod:1", ThaumcraftApi.addArcaneCraftingRecipe("ROD_warpwood_staff",
new ItemStack(ItemRegistry.ItemWandRod, 1, 1), TaintedMagicHelper.getPrimals(120), " A", " B ", "B ", 'A',
new ItemStack(ConfigItems.itemEldritchObject, 1, 3), 'B', new ItemStack(ItemRegistry.ItemWandRod, 1, 0)));
// Crimson Cult Helm
ResearchRegistry.recipes.put("ItemHelmetCultistPlate",
@@ -595,16 +599,16 @@ public class RecipeRegistry
// Shadow-imbued Cloth
ResearchRegistry.recipes.put("ItemMaterial:1",
ThaumcraftApi.addArcaneCraftingRecipe("SHADOWCLOTH", new ItemStack(ItemRegistry.ItemMaterial, 1, 1),
new AspectList().add(Aspect.ORDER, 10).add(Aspect.ENTROPY, 10),
" A ", "ABA", " A ", 'A', new ItemStack(ItemRegistry.ItemMaterial, 1, 8), 'B',
new ItemStack(ConfigItems.itemResource, 1, 7)));
ThaumcraftApi.addArcaneCraftingRecipe("SHADOWMETAL", new ItemStack(ItemRegistry.ItemMaterial, 1, 1),
new AspectList().add(Aspect.ORDER, 10).add(Aspect.ENTROPY, 10), " A ", "ABA", " A ", 'A',
new ItemStack(ItemRegistry.ItemMaterial, 1, 8), 'B', new ItemStack(ConfigItems.itemResource, 1, 7)));
// Magic Funguar
ResearchRegistry.recipes.put("ItemMagicFunguar",
ThaumcraftApi.addShapelessArcaneCraftingRecipe("MAGICFUNGUAR", new ItemStack(ItemRegistry.ItemMagicFunguar),
TaintedMagicHelper.getPrimals(1), new ItemStack(ConfigBlocks.blockCustomPlant, 1, 5),
new ItemStack(ConfigItems.itemShard, 1, OreDictionary.WILDCARD_VALUE), Items.glowstone_dust));
new ItemStack(ConfigItems.itemShard, 1, OreDictionary.WILDCARD_VALUE), Items.glowstone_dust,
Items.redstone));
// Hollow Dagger
ResearchRegistry.recipes.put("ItemHollowDagger",
@@ -676,7 +680,7 @@ public class RecipeRegistry
/**
* Crucible recipes
*/
public static void initCrucible ()
private static void initCrucible ()
{
// Warped Unbalanced Shard
ResearchRegistry.recipes.put("ItemMaterial:3",
@@ -23,12 +23,12 @@ import thaumcraft.common.config.ConfigItems;
public class ResearchRegistry
{
public static final String categoryTM = "TAINTEDMAGIC";
public static final String CATEGORY_TM = "TAINTEDMAGIC";
public static HashMap<String, Object> recipes = new HashMap<String, Object>();
public static void initResearch ()
{
ResearchCategories.registerCategory(categoryTM, new ResourceLocation("taintedmagic:textures/misc/tab_tm.png"),
ResearchCategories.registerCategory(CATEGORY_TM, new ResourceLocation("taintedmagic:textures/misc/tab_tm.png"),
ConfigHandler.CUSTOM_RESEARCH_TAB_BACK
? new ResourceLocation("taintedmagic:textures/gui/gui_tm_researchback.png")
: new ResourceLocation("thaumcraft:textures/gui/gui_researchback.png"));
@@ -51,7 +51,7 @@ public class ResearchRegistry
r = new TMResearchItem("SHADOWMETAL",
new AspectList().add(Aspect.METAL, 1).add(Aspect.DARKNESS, 1).add(Aspect.MAGIC, 1), 0, 1,
new ItemStack(ItemRegistry.ItemMaterial), 0, 1);
new ItemStack(ItemRegistry.ItemMaterial), 1, 1);
r.setPages(new ResearchPage("1"), cruciblePage("ItemMaterial:0"), recipePage("ItemShadowmetalPick"),
recipePage("ItemShadowmetalSpade"), recipePage("ItemShadowmetalAxe"), recipePage("ItemShadowmetalHoe"),
recipePage("ItemShadowmetalSword"));
@@ -61,8 +61,7 @@ public class ResearchRegistry
new AspectList().add(Aspect.METAL, 4).add(Aspect.DARKNESS, 4).add(Aspect.ELDRITCH, 4).add(Aspect.MAGIC, 4), -3,
2, new ItemStack(ItemRegistry.ItemWandCap, 1, 0), 2, 4);
r.setPages(new ResearchPage("1"), infusionPage("ItemWandCap:0"));
r.setParents("SHADOWMETAL", "CAP_void", "PRIMPEARL").setParentsHidden("SHADOWCLOTH").setConcealed()
.registerResearchItem();
r.setParents("SHADOWMETAL", "CAP_void", "PRIMPEARL").setConcealed().registerResearchItem();
r = new TMResearchItem("SHADOWCLOTH", new AspectList().add(Aspect.CLOTH, 1).add(Aspect.DARKNESS, 1), -2, 4,
new ItemStack(ItemRegistry.ItemMaterial, 1, 1), 0, 0);
@@ -72,7 +71,7 @@ public class ResearchRegistry
r = new TMResearchItem("ROD_warpwood",
new AspectList().add(Aspect.TREE, 4).add(Aspect.DARKNESS, 4).add(Aspect.ELDRITCH, 4), 8, 0,
new ItemStack(ItemRegistry.ItemWandRod, 1, 0), 3, 5);
r.setPages(new ResearchPage("1"), infusionPage("ItemWandRod:0"), new ResearchPage("2"));
r.setPages(new ResearchPage("1"), infusionPage("ItemWandRod:0"));
r.setParents("WARPTREE", "VOIDMETAL", "PRIMPEARL", "ROD_primal_staff").setParentsHidden("SHADOWMETAL").setConcealed()
.registerResearchItem();
@@ -156,7 +155,7 @@ public class ResearchRegistry
r = new TMResearchItem("CREATION", new AspectList(), 11, -5,
new ResourceLocation("taintedmagic:textures/misc/r_creation.png"), 0, 0);
r.setPages(new ResearchPage("1"), new ResearchPage("2"), new ResearchPage("3"), new ResearchPage("4"),
new ResearchPage("5"));
new ResearchPage("5"), new ResearchPage("6"));
r.setParents("CREATIONSHARD").setConcealed().setRound().setSpecial().setHidden().registerResearchItem();
r = new TMResearchItem("SKYSALT", new AspectList().add(TaintedMagicHelper.getPrimals(4)).add(Aspect.WEATHER, 4), 12, -7,
@@ -166,8 +165,8 @@ public class ResearchRegistry
r = new TMResearchItem("TIMESALT", new AspectList().add(TaintedMagicHelper.getPrimals(4)).add(Aspect.EXCHANGE, 4), 13,
-6, new ItemStack(ItemRegistry.ItemSalis, 1, 1), 0, 0);
r.setConcealed().setParents("CREATION").setSecondary().registerResearchItem();
r.setPages(new ResearchPage("1"), infusionPage("ItemSalis:1"));
r.setConcealed().setParents("CREATION").setSecondary().registerResearchItem();
r = new TMResearchItem("THAUMICDISASSEMBLER",
new AspectList().add(Aspect.METAL, 4).add(Aspect.WEAPON, 8).add(Aspect.TOOL, 4), 6, -9,
@@ -231,8 +230,8 @@ public class ResearchRegistry
r = new TMResearchItem("PRIMALBLADE", new AspectList().add(Aspect.MAGIC, 1).add(Aspect.ELDRITCH, 1)
.add(Aspect.WEAPON, 1).add(Aspect.VOID, 1).add(Aspect.AURA, 1), 11, -3,
new ItemStack(ItemRegistry.ItemPrimordialEdge), 3, 5);
r.setPages(new ResearchPage("1"), infusionPage("ItemPrimordialEdge"));
new ItemStack(ItemRegistry.ItemPrimalBlade), 3, 5);
r.setPages(new ResearchPage("1"), infusionPage("ItemPrimalBlade"));
r.setParentsHidden("VOIDMETAL", "PRIMALCRUSHER", "UNBALANCEDSHARDS", "HOLLOWDAGGER").setConcealed()
.setParents("CREATION").registerResearchItem();
@@ -256,20 +255,20 @@ public class ResearchRegistry
r.setParentsHidden("VOIDMETALKATANA").setParents("SHADOWFORTRESS").setConcealed().setSecondary().registerResearchItem();
r = new TMResearchItem("INSCRIPTIONFIRE",
new AspectList().add(Aspect.FIRE, 8).add(Aspect.ENTROPY, 4).add(Aspect.METAL, 6), 14, 2,
new ResourceLocation("taintedmagic:textures/misc/r_fire.png"), 0, 0);
new AspectList().add(Aspect.FIRE, 8).add(Aspect.ENTROPY, 4).add(Aspect.METAL, 6), 14, 0,
new ResourceLocation("taintedmagic:textures/misc/r_inscription0.png"), 0, 0);
r.setPages(new ResearchPage("1"), infusionPage("ItemKatanaThaumium:inscription0"));
r.setParents("THAUMIUMKATANA").setParentsHidden("FOCUSFIRE").setConcealed().setSecondary().registerResearchItem();
r = new TMResearchItem("INSCRIPTIONTHUNDER",
new AspectList().add(Aspect.ENTROPY, 8).add(Aspect.MOTION, 4).add(Aspect.METAL, 6), 14, 1,
new ResourceLocation("taintedmagic:textures/misc/r_thunder.png"), 0, 0);
new ResourceLocation("taintedmagic:textures/misc/r_inscription1.png"), 0, 0);
r.setPages(new ResearchPage("1"), infusionPage("ItemKatanaThaumium:inscription1"));
r.setParents("THAUMIUMKATANA").setParentsHidden("FOCUSSHOCKWAVE").setConcealed().setSecondary().registerResearchItem();
r = new TMResearchItem("INSCRIPTIONUNDEAD",
new AspectList().add(Aspect.HEAL, 8).add(Aspect.UNDEAD, 4).add(Aspect.METAL, 6), 14, 0,
new ResourceLocation("taintedmagic:textures/misc/r_undead.png"), 0, 2);
r = new TMResearchItem("INSCRIPTIONHEAL",
new AspectList().add(Aspect.HEAL, 8).add(Aspect.UNDEAD, 4).add(Aspect.METAL, 6), 14, 2,
new ResourceLocation("taintedmagic:textures/misc/r_inscription2.png"), 0, 2);
r.setPages(new ResearchPage("1"), infusionPage("ItemKatanaThaumium:inscription2"));
r.setParents("THAUMIUMKATANA").setParentsHidden("BATHSALTS").setConcealed().setSecondary().registerResearchItem();
@@ -23,13 +23,13 @@ public class TMResearchItem extends ResearchItem
public TMResearchItem (String key, AspectList tags, int col, int row, ItemStack icon, int complexity, int warp)
{
super(key, ResearchRegistry.categoryTM, tags, col, row, complexity, icon);
super(key, ResearchRegistry.CATEGORY_TM, tags, col, row, complexity, icon);
this.warp = warp;
}
public TMResearchItem (String key, AspectList tags, int col, int row, ResourceLocation icon, int complexity, int warp)
{
super(key, ResearchRegistry.categoryTM, tags, col, row, complexity, icon);
super(key, ResearchRegistry.CATEGORY_TM, tags, col, row, complexity, icon);
this.warp = warp;
}
@@ -21,7 +21,7 @@ public class ThaumcraftResearchItem extends ResearchItem
public ThaumcraftResearchItem (String tag, String origin, String originCategory, int col, int row, ResourceLocation icon)
{
super(tag, ResearchRegistry.categoryTM, new AspectList(), col, row, 1, icon);
super(tag, ResearchRegistry.CATEGORY_TM, new AspectList(), col, row, 1, icon);
original = ((ResearchCategoryList) ResearchCategories.researchCategories.get(originCategory)).research.get(origin);
bindToOriginal();
setStub();
@@ -30,7 +30,7 @@ public class ThaumcraftResearchItem extends ResearchItem
public ThaumcraftResearchItem (String tag, String origin, String originCategory, int col, int row, ItemStack icon)
{
super(tag, ResearchRegistry.categoryTM, new AspectList(), col, row, 1, icon);
super(tag, ResearchRegistry.CATEGORY_TM, new AspectList(), col, row, 1, icon);
original = ((ResearchCategoryList) ResearchCategories.researchCategories.get(originCategory)).research.get(origin);
bindToOriginal();
setStub();