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

Normalized code formatting.

Browse source
This commit is contained in:
WayofTime 2016-03-16 18:41:06 -04:00
parent b1db7c5152
commit 134b11f177
122 changed files with 944 additions and 697 deletions
Download patch file Download diff file Expand all files Collapse all files

20
src/main/java/WayofTime/bloodmagic/compat/ICompatibility.java
View file

@ -6,11 +6,11 @@ package WayofTime.bloodmagic.compat;
public interface ICompatibility
{
/**
* Called during each initialization phase after the given {@link #getModId()}
* has been verified as loaded.
*
* Called during each initialization phase after the given
* {@link #getModId()} has been verified as loaded.
*
* @param phase
* - The load phase at which this method is being called.
* - The load phase at which this method is being called.
*/
void loadCompatibility(InitializationPhase phase);
@ -32,17 +32,21 @@ public interface ICompatibility
/**
* Represents a given mod initialization state.
*/
enum InitializationPhase {
enum InitializationPhase
{
/**
* Represents {@link net.minecraftforge.fml.common.event.FMLPreInitializationEvent}
* Represents
* {@link net.minecraftforge.fml.common.event.FMLPreInitializationEvent}
*/
PRE_INIT,
/**
* Represents {@link net.minecraftforge.fml.common.event.FMLInitializationEvent}
* Represents
* {@link net.minecraftforge.fml.common.event.FMLInitializationEvent}
*/
INIT,
/**
* Represents {@link net.minecraftforge.fml.common.event.FMLPostInitializationEvent}
* Represents
* {@link net.minecraftforge.fml.common.event.FMLPostInitializationEvent}
*/
POST_INIT
}

3
src/main/java/WayofTime/bloodmagic/compat/guideapi/guide/page/PageAltarRecipe.java
View file

@ -18,7 +18,8 @@ import net.minecraft.util.ResourceLocation;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
public class PageAltarRecipe extends PageBase {
public class PageAltarRecipe extends PageBase
{
public ItemStack input;
public ItemStack output;

6
src/main/java/WayofTime/bloodmagic/compat/jei/forge/TartaricForgeRecipeJEI.java
View file

@ -62,7 +62,8 @@ public class TartaricForgeRecipeJEI extends BlankRecipeWrapper
return null;
}
public enum DefaultWill {
public enum DefaultWill
{
SOUL(new ItemStack(ModItems.monsterSoul, 1, 0), 64),
PETTY(new ItemStack(ModItems.soulGem, 1, 0), 64),
LESSER(new ItemStack(ModItems.soulGem, 1, 1), 256),
@ -73,7 +74,8 @@ public class TartaricForgeRecipeJEI extends BlankRecipeWrapper
public final ItemStack willStack;
public final double minSouls;
DefaultWill(ItemStack willStack, double minSouls) {
DefaultWill(ItemStack willStack, double minSouls)
{
this.willStack = willStack;
this.minSouls = minSouls;
}

2
src/main/java/WayofTime/bloodmagic/compat/thaumcraft/CompatibilityThaumcraft.java
View file

@ -12,7 +12,7 @@ public class CompatibilityThaumcraft implements ICompatibility
if (phase == InitializationPhase.POST_INIT)
{
BloodMagicResearch.addResearch();
LivingArmourHandler.registerStatTracker(StatTrackerThaumRunicShielding.class);
LivingArmourHandler.registerArmourUpgrade(new LivingArmourUpgradeThaumRunicShielding(0));

24
src/main/java/WayofTime/bloodmagic/compat/thaumcraft/LivingArmourUpgradeThaumRevealing.java
View file

@ -4,39 +4,47 @@ import net.minecraft.nbt.NBTTagCompound;
import WayofTime.bloodmagic.api.Constants;
import WayofTime.bloodmagic.api.livingArmour.LivingArmourUpgrade;
public class LivingArmourUpgradeThaumRevealing extends LivingArmourUpgrade {
public class LivingArmourUpgradeThaumRevealing extends LivingArmourUpgrade
{
public LivingArmourUpgradeThaumRevealing(int level) {
public LivingArmourUpgradeThaumRevealing(int level)
{
super(level);
}
@Override
public String getUniqueIdentifier() {
public String getUniqueIdentifier()
{
return Constants.Mod.MODID + ".upgrade.revealing";
}
@Override
public String getUnlocalizedName() {
public String getUnlocalizedName()
{
return tooltipBase + "revealing";
}
@Override
public int getMaxTier() {
public int getMaxTier()
{
return 1;
}
@Override
public int getCostOfUpgrade() {
public int getCostOfUpgrade()
{
return 5;
}
@Override
public void writeToNBT(NBTTagCompound tag) {
public void writeToNBT(NBTTagCompound tag)
{
}
@Override
public void readFromNBT(NBTTagCompound tag) {
public void readFromNBT(NBTTagCompound tag)
{
}
}

2
src/main/java/WayofTime/bloodmagic/compat/thaumcraft/research/BloodMagicResearch.java
View file

@ -16,7 +16,7 @@ public class BloodMagicResearch
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();
(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)

6
src/main/java/WayofTime/bloodmagic/compat/thaumcraft/research/SanguineResearchItem.java
View file

@ -20,13 +20,15 @@ public class SanguineResearchItem extends ResearchItem
@Override
@SideOnly(Side.CLIENT)
public String getName() {
public String getName()
{
return StatCollector.translateToLocal("bloodmagic.research_name." + this.key);
}
@Override
@SideOnly(Side.CLIENT)
public String getText() {
public String getText()
{
return StatCollector.translateToLocal("bloodmagic.research_text." + this.key);
}
}