Beginning Thaumcraft compat

Derp
This commit is contained in:
Arcaratus 2016-02-16 18:32:57 -05:00
parent 15650bac8b
commit abf54bf9af
7 changed files with 78 additions and 4 deletions

View file

@ -1,9 +1,10 @@
package WayofTime.bloodmagic.compat.jei; package WayofTime.bloodmagic.compat.thaumcraft;
import WayofTime.bloodmagic.api.livingArmour.LivingArmourHandler; import WayofTime.bloodmagic.api.livingArmour.LivingArmourHandler;
import WayofTime.bloodmagic.compat.ICompatibility; import WayofTime.bloodmagic.compat.ICompatibility;
import WayofTime.bloodmagic.compat.thaumcraft.LivingArmourUpgradeThaumRunicShielding; import WayofTime.bloodmagic.compat.thaumcraft.LivingArmourUpgradeThaumRunicShielding;
import WayofTime.bloodmagic.compat.thaumcraft.StatTrackerThaumRunicShielding; import WayofTime.bloodmagic.compat.thaumcraft.StatTrackerThaumRunicShielding;
import WayofTime.bloodmagic.compat.thaumcraft.research.BloodMagicResearch;
public class CompatibilityThaumcraft implements ICompatibility public class CompatibilityThaumcraft implements ICompatibility
{ {
@ -12,6 +13,8 @@ public class CompatibilityThaumcraft implements ICompatibility
{ {
if (phase == InitializationPhase.POST_INIT) if (phase == InitializationPhase.POST_INIT)
{ {
BloodMagicResearch.addResearch();
LivingArmourHandler.registerStatTracker(StatTrackerThaumRunicShielding.class); LivingArmourHandler.registerStatTracker(StatTrackerThaumRunicShielding.class);
LivingArmourHandler.registerArmourUpgrade(new LivingArmourUpgradeThaumRunicShielding(0)); LivingArmourHandler.registerArmourUpgrade(new LivingArmourUpgradeThaumRunicShielding(0));

View file

@ -0,0 +1,31 @@
package WayofTime.bloodmagic.compat.thaumcraft.research;
import WayofTime.bloodmagic.api.BloodMagicAPI;
import WayofTime.bloodmagic.api.Constants;
import net.minecraft.item.ItemStack;
import net.minecraft.util.ResourceLocation;
import thaumcraft.api.aspects.AspectList;
import thaumcraft.api.research.ResearchCategories;
import thaumcraft.api.research.ResearchPage;
public class BloodMagicResearch
{
public static void addResearch()
{
final String BLOOD_MAGIC = "BLOODMAGIC";
ResearchCategories.registerCategory(BLOOD_MAGIC, null, new ResourceLocation("bloodmagic", "textures/items/WeakBloodOrb.png"), new ResourceLocation("bloodmagic", "textures/gui/thaumcraft/gui_research_back.jpg"), new ResourceLocation("bloodmagic", "textures/gui/thaumcraft/gui_research_back_over.png"));
(new SanguineResearchItem("BLOODMAGIC", BLOOD_MAGIC, new AspectList(), 0, 0, 0, new ItemStack(BloodMagicAPI.getItem(Constants.BloodMagicItem.BLOOD_ORB), 1, 0))).setPages(new ResearchPage[]{new ResearchPage(researchPage("BLOODMAGIC"))}).setAutoUnlock().setStub().setRound().registerResearchItem();
}
private static String researchPage(String researchName)
{
return researchPage(researchName, 1);
}
private static String researchPage(String researchName, int pageNumber)
{
return "bloodmagic.research_page." + researchName + "." + pageNumber;
}
}

View file

@ -0,0 +1,32 @@
package WayofTime.bloodmagic.compat.thaumcraft.research;
import net.minecraft.util.StatCollector;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
import thaumcraft.api.aspects.AspectList;
import thaumcraft.api.research.ResearchItem;
public class SanguineResearchItem extends ResearchItem
{
public SanguineResearchItem(String key, String category)
{
super(key, category);
}
public SanguineResearchItem(String key, String category, AspectList tags, int col, int row, int complex, Object... icon)
{
super(key, category, tags, col, row, complex, icon);
}
@Override
@SideOnly(Side.CLIENT)
public String getName() {
return StatCollector.translateToLocal("bloodmagic.research_name." + this.key);
}
@Override
@SideOnly(Side.CLIENT)
public String getText() {
return StatCollector.translateToLocal("bloodmagic.research_text." + this.key);
}
}

View file

@ -5,7 +5,7 @@ import java.util.ArrayList;
import net.minecraftforge.fml.common.Loader; import net.minecraftforge.fml.common.Loader;
import WayofTime.bloodmagic.compat.ICompatibility; import WayofTime.bloodmagic.compat.ICompatibility;
import WayofTime.bloodmagic.compat.jei.CompatibilityJustEnoughItems; import WayofTime.bloodmagic.compat.jei.CompatibilityJustEnoughItems;
import WayofTime.bloodmagic.compat.jei.CompatibilityThaumcraft; import WayofTime.bloodmagic.compat.thaumcraft.CompatibilityThaumcraft;
import WayofTime.bloodmagic.compat.waila.CompatibilityWaila; import WayofTime.bloodmagic.compat.waila.CompatibilityWaila;
public class ModCompatibility public class ModCompatibility

View file

@ -175,7 +175,7 @@ tile.BloodMagic.crystal.large.name=Crystal Cluster
tile.BloodMagic.crystal.brick.name=Crystal Cluster Brick tile.BloodMagic.crystal.brick.name=Crystal Cluster Brick
tile.BloodMagic.bloodLight.name=Blood Light tile.BloodMagic.bloodLight.name=Blood Light
tile.BloodMagic.spectralBlock.name=Spectral Block tile.BloodMagic.spectralBlock.name=Spectral Block
tile.BloodMagic.phantomBlock.name=Phantom Block tile.BloodMagic.phantom.name=Phantom Block
tile.BloodMagic.incenseAltar.name=Incense Altar tile.BloodMagic.incenseAltar.name=Incense Altar
tile.BloodMagic.teleposer.name=Teleposer tile.BloodMagic.teleposer.name=Teleposer
@ -348,7 +348,7 @@ chat.BloodMagic.livingArmour.newUpgrade=&4Upgrade acquired!
# JustEnoughItems # JustEnoughItems
jei.BloodMagic.recipe.altar=Blood Altar jei.BloodMagic.recipe.altar=Blood Altar
jei.BloodMagic.recipe.binding=Binding Ritual jei.BloodMagic.recipe.binding=Alchemy Array (Binding)
jei.BloodMagic.recipe.alchemyArrayCrafting=Alchemy Array jei.BloodMagic.recipe.alchemyArrayCrafting=Alchemy Array
jei.BloodMagic.recipe.soulForge=Hellfire Forge jei.BloodMagic.recipe.soulForge=Hellfire Forge
jei.BloodMagic.recipe.requiredLP=LP: %,d jei.BloodMagic.recipe.requiredLP=LP: %,d
@ -370,3 +370,11 @@ option.BloodMagic.bloodAltar=Blood Altar
option.BloodMagic.ritualController=Ritual Stones option.BloodMagic.ritualController=Ritual Stones
option.BloodMagic.teleposer=Teleposer option.BloodMagic.teleposer=Teleposer
option.BloodMagic.array=Alchemy Array option.BloodMagic.array=Alchemy Array
# Thaumcraft
tc.research_category.BLOODMAGIC=Sanguine Arcana
# Thaumcraft Research
bloodmagic.research_name.BLOODMAGIC=Blood Magic
bloodmagic.research_text.BLOODMAGIC=Sanguine Arcana
bloodmagic.research_page.BLOODMAGIC.1=The realm of the Blood Magics has always appeared to be a more solitary and "individual" art with blood mages being notoriously reclusive and a bit insane at times. However, the powers of self-sacrifice and life essence have uses even beyond a normal blood mage's sight, in fact, it is quite apparent that it may have some uses in thaumaturgy after all!

Binary file not shown.

After

Width:  |  Height:  |  Size: 72 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 300 KiB