diff --git a/build.gradle b/build.gradle index 42f571c..de8050f 100644 --- a/build.gradle +++ b/build.gradle @@ -69,7 +69,7 @@ dependencies { compile "codechicken:CodeChickenCore:" + config.mc_version + "-" + config.ccc_version + ":dev" compile "codechicken:NotEnoughItems:" + config.mc_version + "-" + config.nei_version + ":dev" compile "codechicken:ForgeMultipart:" + config.mc_version + "-" + config.forgeMultipart_version + ":dev" -// compile "mcp.mobius.waila:Waila:" + config.waila_version + "_" + config.mc_version + ":dev" + compile "mcp.mobius.waila:Waila:" + config.waila_version + "_" + config.mc_version + ":dev" compile "mantle:Mantle:1.7.10-0.3.2.jenkins187:deobf" compile "tconstruct:TConstruct:" + config.mc_version + "-" + config.tconstruct_version + ":deobf" } diff --git a/src/main/api/java/mcp/mobius/waila/api/IWailaBlock.java b/src/main/api/java/mcp/mobius/waila/api/IWailaBlock.java deleted file mode 100644 index 8b4dd13..0000000 --- a/src/main/api/java/mcp/mobius/waila/api/IWailaBlock.java +++ /dev/null @@ -1,34 +0,0 @@ -package mcp.mobius.waila.api; - -import java.util.List; - -import net.minecraft.item.ItemStack; - -@Deprecated -public interface IWailaBlock { - /* - * Use this method to return an item stack in case the default lookup system fails. - * Return null if you want to use the default lookup system. - * You get the world, the player and the location of the block. With that, it is easy to gather information & tile entities - */ - ItemStack getWailaStack(IWailaDataAccessor accessor, IWailaConfigHandler config); - - /* Waila HUD is divided into 3 zones. The head corresponds to the item name, - * body to where you mostly want to put informations, and I reserve the tail for modname display - */ - - /* Those 2 methods works exactly the same way, except they are related to a different zone in Waila HUD. - * You get in input world, player and the block location. You also get the itemstack as returned by the default lookup system or getWailaStack(). - * ConfigHandler provides the current Waila config state so you can show/hide elements depending on the configuration. Refer the ConfigHandler class for more info. - * currenttip represents the current list of text lines in the tooltip zone. - * For example, getWailaHead() will have the current item name as currenttip. - * You can modify the tips, add more, remove some, etc. - * When you are done, just returns the currenttip and it will display in Waila. - * - * Always return the currenttip is you don't want to modify the current zone. - */ - - List getWailaHead(ItemStack itemStack, List currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config); - List getWailaBody(ItemStack itemStack, List currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config); - List getWailaTail(ItemStack itemStack, List currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config); -} diff --git a/src/main/api/java/mcp/mobius/waila/api/IWailaBlockDecorator.java b/src/main/api/java/mcp/mobius/waila/api/IWailaBlockDecorator.java deleted file mode 100644 index 935d475..0000000 --- a/src/main/api/java/mcp/mobius/waila/api/IWailaBlockDecorator.java +++ /dev/null @@ -1,9 +0,0 @@ -package mcp.mobius.waila.api; - -import net.minecraft.item.ItemStack; - -public interface IWailaBlockDecorator { - - void decorateBlock(ItemStack itemStack, IWailaDataAccessor accessor, IWailaConfigHandler config); - -} diff --git a/src/main/api/java/mcp/mobius/waila/api/IWailaConfigHandler.java b/src/main/api/java/mcp/mobius/waila/api/IWailaConfigHandler.java deleted file mode 100644 index faede63..0000000 --- a/src/main/api/java/mcp/mobius/waila/api/IWailaConfigHandler.java +++ /dev/null @@ -1,28 +0,0 @@ -package mcp.mobius.waila.api; - -import java.util.HashMap; -import java.util.Set; - -public interface IWailaConfigHandler { - /* Returns a set of all the currently loaded modules in the config handler */ - public Set getModuleNames(); - - /* Returns all the currently available options for a given module */ - public HashMap getConfigKeys(String modName); - - /* Add a new option to a given module - * - * modName is the name of the module to add the option to (ie : Buildcraft, IndustrialCraft2, etc) - * key is the config key (ie : bc.tankcontent, ic2.inputvalue) - * name is the human readable name of the option (ie : "Tank content", "Max EU Input") - * */ - //public void addConfig(String modName, String key, String name); - - /* Returns the current value of an option (true/false) with a default value defvalue if not set*/ - public boolean getConfig(String key, boolean defvalue); - - /* Returns the current value of an option (true/false) with a default value true if not set*/ - public boolean getConfig(String key); - - //public void setConfig(String key, boolean value); -} diff --git a/src/main/api/java/mcp/mobius/waila/api/IWailaDataAccessor.java b/src/main/api/java/mcp/mobius/waila/api/IWailaDataAccessor.java deleted file mode 100644 index 0288624..0000000 --- a/src/main/api/java/mcp/mobius/waila/api/IWailaDataAccessor.java +++ /dev/null @@ -1,33 +0,0 @@ -package mcp.mobius.waila.api; - -import net.minecraft.block.Block; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.MovingObjectPosition; -import net.minecraft.util.Vec3; -import net.minecraft.world.World; -import net.minecraftforge.common.util.ForgeDirection; - -/* The Accessor is used to get some basic data out of the game without having to request - * direct access to the game engine. - * It will also return things that are unmodified by the overriding systems (like getWailaStack). - */ - -public interface IWailaDataAccessor { - - World getWorld(); - EntityPlayer getPlayer(); - Block getBlock(); - int getBlockID(); - int getMetadata(); - TileEntity getTileEntity(); - MovingObjectPosition getPosition(); - Vec3 getRenderingPosition(); - NBTTagCompound getNBTData(); - int getNBTInteger(NBTTagCompound tag, String keyname); - double getPartialFrame(); - ForgeDirection getSide(); - ItemStack getStack(); -} diff --git a/src/main/api/java/mcp/mobius/waila/api/IWailaDataProvider.java b/src/main/api/java/mcp/mobius/waila/api/IWailaDataProvider.java deleted file mode 100644 index 4859d9c..0000000 --- a/src/main/api/java/mcp/mobius/waila/api/IWailaDataProvider.java +++ /dev/null @@ -1,33 +0,0 @@ -package mcp.mobius.waila.api; - -import java.util.List; - -import net.minecraft.item.ItemStack; - -public interface IWailaDataProvider{ - /* - * Use this method to return an item stack in case the default lookup system fails. - * Return null if you want to use the default lookup system. - * You get the world, the player and the location of the block. With that, it is easy to gather information & tile entities - */ - ItemStack getWailaStack(IWailaDataAccessor accessor, IWailaConfigHandler config); - - /* Waila HUD is divided into 3 zones. The head corresponds to the item name, - * body to where you mostly want to put informations, and I reserve the tail for modname display - */ - - /* Those 2 methods works exactly the same way, except they are related to a different zone in Waila HUD. - * You get in input world, player and the block location. You also get the itemstack as returned by the default lookup system or getWailaStack(). - * ConfigHandler provides the current Waila config state so you can show/hide elements depending on the configuration. Refer the ConfigHandler class for more info. - * currenttip represents the current list of text lines in the tooltip zone. - * For example, getWailaHead() will have the current item name as currenttip. - * You can modify the tips, add more, remove some, etc. - * When you are done, just returns the currenttip and it will display in Waila. - * - * Always return the currenttip is you don't want to modify the current zone. - */ - - List getWailaHead(ItemStack itemStack, List currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config); - List getWailaBody(ItemStack itemStack, List currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config); - List getWailaTail(ItemStack itemStack, List currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config); -} diff --git a/src/main/api/java/mcp/mobius/waila/api/IWailaEntityAccessor.java b/src/main/api/java/mcp/mobius/waila/api/IWailaEntityAccessor.java deleted file mode 100644 index 788067a..0000000 --- a/src/main/api/java/mcp/mobius/waila/api/IWailaEntityAccessor.java +++ /dev/null @@ -1,24 +0,0 @@ -package mcp.mobius.waila.api; - -import net.minecraft.entity.Entity; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.MovingObjectPosition; -import net.minecraft.util.Vec3; -import net.minecraft.world.World; - -/* The Accessor is used to get some basic data out of the game without having to request - * direct access to the game engine. - * It will also return things that are unmodified by the overriding systems (like getWailaStack). - */ - -public interface IWailaEntityAccessor { - World getWorld(); - EntityPlayer getPlayer(); - Entity getEntity(); - MovingObjectPosition getPosition(); - Vec3 getRenderingPosition(); - NBTTagCompound getNBTData(); - int getNBTInteger(NBTTagCompound tag, String keyname); - double getPartialFrame(); -} diff --git a/src/main/api/java/mcp/mobius/waila/api/IWailaEntityProvider.java b/src/main/api/java/mcp/mobius/waila/api/IWailaEntityProvider.java deleted file mode 100644 index 9548289..0000000 --- a/src/main/api/java/mcp/mobius/waila/api/IWailaEntityProvider.java +++ /dev/null @@ -1,16 +0,0 @@ -package mcp.mobius.waila.api; - -import java.util.List; - -import net.minecraft.entity.Entity; - -public interface IWailaEntityProvider { - - /* A way to get an override on the entity returned by the raytracing */ - Entity getWailaOverride(IWailaEntityAccessor accessor, IWailaConfigHandler config); - - /* The classical HEAD/BODY/TAIL text getters */ - List getWailaHead(Entity entity, List currenttip, IWailaEntityAccessor accessor, IWailaConfigHandler config); - List getWailaBody(Entity entity, List currenttip, IWailaEntityAccessor accessor, IWailaConfigHandler config); - List getWailaTail(Entity entity, List currenttip, IWailaEntityAccessor accessor, IWailaConfigHandler config); -} diff --git a/src/main/api/java/mcp/mobius/waila/api/IWailaFMPAccessor.java b/src/main/api/java/mcp/mobius/waila/api/IWailaFMPAccessor.java deleted file mode 100644 index 19e01fa..0000000 --- a/src/main/api/java/mcp/mobius/waila/api/IWailaFMPAccessor.java +++ /dev/null @@ -1,27 +0,0 @@ -package mcp.mobius.waila.api; - -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.MovingObjectPosition; -import net.minecraft.util.Vec3; -import net.minecraft.world.World; - -/* The Accessor is used to get some basic data out of the game without having to request - * direct access to the game engine. - * It will also return things that are unmodified by the overriding systems (like getWailaStack). - */ - -public interface IWailaFMPAccessor { - World getWorld(); - EntityPlayer getPlayer(); - TileEntity getTileEntity(); - MovingObjectPosition getPosition(); - NBTTagCompound getNBTData(); - NBTTagCompound getFullNBTData(); - int getNBTInteger(NBTTagCompound tag, String keyname); - double getPartialFrame(); - Vec3 getRenderingPosition(); - String getID(); -} diff --git a/src/main/api/java/mcp/mobius/waila/api/IWailaFMPDecorator.java b/src/main/api/java/mcp/mobius/waila/api/IWailaFMPDecorator.java deleted file mode 100644 index 839af31..0000000 --- a/src/main/api/java/mcp/mobius/waila/api/IWailaFMPDecorator.java +++ /dev/null @@ -1,7 +0,0 @@ -package mcp.mobius.waila.api; - -import net.minecraft.item.ItemStack; - -public interface IWailaFMPDecorator { - void decorateBlock(ItemStack itemStack, IWailaFMPAccessor accessor, IWailaConfigHandler config); -} diff --git a/src/main/api/java/mcp/mobius/waila/api/IWailaFMPProvider.java b/src/main/api/java/mcp/mobius/waila/api/IWailaFMPProvider.java deleted file mode 100644 index 232c83e..0000000 --- a/src/main/api/java/mcp/mobius/waila/api/IWailaFMPProvider.java +++ /dev/null @@ -1,12 +0,0 @@ -package mcp.mobius.waila.api; - -import java.util.List; - -import net.minecraft.item.ItemStack; - -public interface IWailaFMPProvider { - /* The classical HEAD/BODY/TAIL text getters */ - List getWailaHead(ItemStack itemStack, List currenttip, IWailaFMPAccessor accessor, IWailaConfigHandler config); - List getWailaBody(ItemStack itemStack, List currenttip, IWailaFMPAccessor accessor, IWailaConfigHandler config); - List getWailaTail(ItemStack itemStack, List currenttip, IWailaFMPAccessor accessor, IWailaConfigHandler config); -} diff --git a/src/main/api/java/mcp/mobius/waila/api/IWailaRegistrar.java b/src/main/api/java/mcp/mobius/waila/api/IWailaRegistrar.java deleted file mode 100644 index 162aeb6..0000000 --- a/src/main/api/java/mcp/mobius/waila/api/IWailaRegistrar.java +++ /dev/null @@ -1,44 +0,0 @@ -package mcp.mobius.waila.api; - -public interface IWailaRegistrar { - /* Add a config option in the section modname with displayed text configtext and access key keyname */ - public void addConfig(String modname, String keyname, String configtext); - public void addConfigRemote(String modname, String keyname, String configtext); - public void addConfig(String modname, String keyname); - public void addConfigRemote(String modname, String keyname); - - /* Register a stack overrider for the given blockID */ - public void registerStackProvider(IWailaDataProvider dataProvider, Class block); - - /* Same thing, but works on a class hierarchy instead */ - public void registerHeadProvider (IWailaDataProvider dataProvider, Class block); - public void registerBodyProvider (IWailaDataProvider dataProvider, Class block); - public void registerTailProvider (IWailaDataProvider dataProvider, Class block); - - /* Entity text registration methods */ - public void registerHeadProvider (IWailaEntityProvider dataProvider, Class entity); - public void registerBodyProvider (IWailaEntityProvider dataProvider, Class entity); - public void registerTailProvider (IWailaEntityProvider dataProvider, Class entity); - public void registerOverrideEntityProvider (IWailaEntityProvider dataProvider, Class entity); - - /* FMP Providers */ - public void registerHeadProvider(IWailaFMPProvider dataProvider, String name); - public void registerBodyProvider(IWailaFMPProvider dataProvider, String name); - public void registerTailProvider(IWailaFMPProvider dataProvider, String name); - - /* The block decorators */ - public void registerDecorator (IWailaBlockDecorator decorator, Class block); - public void registerDecorator (IWailaFMPDecorator decorator, String name); - - /* Selective NBT key syncing. Will register a key to sync over the network for the given class (block, te or ent). - * Accept * as a ending wildcard - * registerNBTKey("bob.*", MyBlock.class) - * registerNBTKey("data.life", MyEntity.class) - * registerNBTKey("*", MyTileEntity.class) will reproduce the full tag syncing from 1.4.5 - * */ - public void registerSyncedNBTKey(String key, Class target); - - /* UNUSED FOR NOW (Will be used for the ingame wiki */ - public void registerDocTextFile (String filename); - public void registerShortDataProvider (IWailaSummaryProvider dataProvider, Class item); -} diff --git a/src/main/api/java/mcp/mobius/waila/api/IWailaSummaryProvider.java b/src/main/api/java/mcp/mobius/waila/api/IWailaSummaryProvider.java deleted file mode 100644 index f790649..0000000 --- a/src/main/api/java/mcp/mobius/waila/api/IWailaSummaryProvider.java +++ /dev/null @@ -1,21 +0,0 @@ -package mcp.mobius.waila.api; - -import java.util.LinkedHashMap; - -import net.minecraft.item.ItemStack; - -public interface IWailaSummaryProvider { - /* This interface is used to control the display data in the description screen */ - - /* BASIC TOOLS & ITEMS DATA */ - //EnumToolMaterial getMaterial(ItemStack stack); - //String getMaterialName(ItemStack stack); - //String getEffectiveBlock(ItemStack stack); - //int getHarvestLevel(ItemStack stack); - //float getEfficiencyOnProperMaterial(ItemStack stack); - //int getEnchantability(ItemStack stack); - //int getDamageVsEntity(ItemStack stack); - //int getDurability(ItemStack stack); - - LinkedHashMap getSummary(ItemStack stack, LinkedHashMap currentSummary, IWailaConfigHandler config); -} diff --git a/src/main/api/java/mcp/mobius/waila/api/SpecialChars.java b/src/main/api/java/mcp/mobius/waila/api/SpecialChars.java deleted file mode 100644 index 5bd92a8..0000000 --- a/src/main/api/java/mcp/mobius/waila/api/SpecialChars.java +++ /dev/null @@ -1,40 +0,0 @@ -package mcp.mobius.waila.api; - -public class SpecialChars { - - public static String MCStyle = "\u00A7"; - - public static String BLACK = MCStyle + "0"; - public static String DBLUE = MCStyle + "1"; - public static String DGREEN = MCStyle + "2"; - public static String DAQUA = MCStyle + "3"; - public static String DRED = MCStyle + "4"; - public static String DPURPLE = MCStyle + "5"; - public static String GOLD = MCStyle + "6"; - public static String GRAY = MCStyle + "7"; - public static String DGRAY = MCStyle + "8"; - public static String BLUE = MCStyle + "9"; - public static String GREEN = MCStyle + "a"; - public static String AQUA = MCStyle + "b"; - public static String RED = MCStyle + "c"; - public static String LPURPLE = MCStyle + "d"; - public static String YELLOW = MCStyle + "e"; - public static String WHITE = MCStyle + "f"; - - public static String OBF = MCStyle + "k"; - public static String BOLD = MCStyle + "l"; - public static String STRIKE = MCStyle + "m"; - public static String UNDER = MCStyle + "n"; - public static String ITALIC = MCStyle + "o"; - public static String RESET = MCStyle + "r"; - - public static String WailaStyle = "\u00A4"; - public static String WailaIcon = "\u00A5"; - public static String TAB = WailaStyle + WailaStyle +"a"; - public static String ALIGNRIGHT = WailaStyle + WailaStyle +"b"; - public static String ALIGNCENTER = WailaStyle + WailaStyle +"c"; - public static String HEART = WailaStyle + WailaIcon +"a"; - public static String HHEART = WailaStyle + WailaIcon +"b"; - public static String EHEART = WailaStyle + WailaIcon +"c"; - -} diff --git a/src/main/api/java/mcp/mobius/waila/api/package-info.java b/src/main/api/java/mcp/mobius/waila/api/package-info.java deleted file mode 100644 index 9b5e663..0000000 --- a/src/main/api/java/mcp/mobius/waila/api/package-info.java +++ /dev/null @@ -1,3 +0,0 @@ -@API(apiVersion="1.0",owner="Waila",provides="WailaAPI") -package mcp.mobius.waila.api; -import cpw.mods.fml.common.API; \ No newline at end of file diff --git a/src/main/java/com/arc/bloodarsenal/common/BloodArsenal.java b/src/main/java/com/arc/bloodarsenal/common/BloodArsenal.java index 261efde..a801d90 100644 --- a/src/main/java/com/arc/bloodarsenal/common/BloodArsenal.java +++ b/src/main/java/com/arc/bloodarsenal/common/BloodArsenal.java @@ -15,10 +15,7 @@ import cpw.mods.fml.common.FMLCommonHandler; import cpw.mods.fml.common.Loader; import cpw.mods.fml.common.Mod; import cpw.mods.fml.common.SidedProxy; -import cpw.mods.fml.common.event.FMLInitializationEvent; -import cpw.mods.fml.common.event.FMLPostInitializationEvent; -import cpw.mods.fml.common.event.FMLPreInitializationEvent; -import cpw.mods.fml.common.event.FMLServerStartingEvent; +import cpw.mods.fml.common.event.*; import cpw.mods.fml.common.network.NetworkRegistry; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.Item; @@ -129,7 +126,7 @@ public class BloodArsenal } @Mod.EventHandler - public void load(FMLInitializationEvent event) + public void init(FMLInitializationEvent event) { BloodArsenalRecipes.registerBindingRecipes(); BloodArsenalRecipes.registerAltarRecipes(); @@ -138,6 +135,8 @@ public class BloodArsenal proxy.init(); + FMLInterModComms.sendMessage("Waila", "register", "com.arc.bloodarsenal.common.misc.WAILAPlugin.registerAddon"); + vampiricAura = new PotionBloodArsenal(BloodArsenalConfig.vampiricAuraID, false, 0).setIconIndex(0, 0).setPotionName("Vampiric Aura"); bleeding = new PotionBloodArsenal(BloodArsenalConfig.bleedingID, true, 0).setIconIndex(1, 0).setPotionName("Bleeding"); swimming = new PotionBloodArsenal(BloodArsenalConfig.swimmingID, false, 0).setIconIndex(2, 0).setPotionName("Swimming"); diff --git a/src/main/java/com/arc/bloodarsenal/common/block/BlockCompacter.java b/src/main/java/com/arc/bloodarsenal/common/block/BlockCompacter.java index e2bc70e..08ea116 100644 --- a/src/main/java/com/arc/bloodarsenal/common/block/BlockCompacter.java +++ b/src/main/java/com/arc/bloodarsenal/common/block/BlockCompacter.java @@ -48,9 +48,18 @@ public class BlockCompacter extends BlockContainer private float capacityMultiplier; private float orbCapacityMultiplier; private float dislocationMultiplier; - private int accelerationUpgrades; private int bufferCapacity; + private int speedUpgrades = 0; + private int efficiencyUpgrades = 0; + private int sacrificeUpgrades = 0; + private int selfSacrificeUpgrades = 0; + private int displacementUpgrades = 0; + private int altarCapacitiveUpgrades = 0; + private int orbCapacitiveUpgrades = 0; + private int betterCapacitiveUpgrades = 0; + private int accelerationUpgrades = 0; + @SideOnly(Side.CLIENT) private IIcon topIcon; @SideOnly(Side.CLIENT) @@ -369,6 +378,15 @@ public class BlockCompacter extends BlockContainer orbCapacityMultiplier = (float) (1 + 0.02 * upgrades.getOrbCapacitiveUpgrades()); capacity = (int) (FluidContainerRegistry.BUCKET_VOLUME * 10 * capacityMultiplier); bufferCapacity = (int) (FluidContainerRegistry.BUCKET_VOLUME * 1 * capacityMultiplier); + + speedUpgrades = upgrades.getSpeedUpgrades(); + efficiencyUpgrades = upgrades.getEfficiencyUpgrades(); + sacrificeUpgrades = upgrades.getSacrificeUpgrades(); + selfSacrificeUpgrades = upgrades.getSelfSacrificeUpgrades(); + displacementUpgrades = upgrades.getDisplacementUpgrades(); + altarCapacitiveUpgrades = upgrades.getAltarCapacitiveUpgrades(); + orbCapacitiveUpgrades = upgrades.getOrbCapacitiveUpgrades(); + betterCapacitiveUpgrades = upgrades.getBetterCapacitiveUpgrades(); accelerationUpgrades = upgrades.getAccelerationUpgrades(); world.markBlockForUpdate(x, y, z); @@ -421,7 +439,7 @@ public class BlockCompacter extends BlockContainer altar.setCapacityMultiplier(capacityMultiplier); altar.setCapacity(capacity); altar.setBufferCapacity(bufferCapacity); - altar.setAccelerationUpgrades(accelerationUpgrades); + altar.setUpgrades(speedUpgrades, efficiencyUpgrades, sacrificeUpgrades, selfSacrificeUpgrades, displacementUpgrades, altarCapacitiveUpgrades, orbCapacitiveUpgrades, betterCapacitiveUpgrades, accelerationUpgrades); world.markBlockForUpdate(x, y, z); diff --git a/src/main/java/com/arc/bloodarsenal/common/items/block/CompactedMRSBlock.java b/src/main/java/com/arc/bloodarsenal/common/items/block/CompactedMRSBlock.java index bc991ac..0925841 100644 --- a/src/main/java/com/arc/bloodarsenal/common/items/block/CompactedMRSBlock.java +++ b/src/main/java/com/arc/bloodarsenal/common/items/block/CompactedMRSBlock.java @@ -26,7 +26,7 @@ public class CompactedMRSBlock extends ItemBlock { if (GuiScreen.isShiftKeyDown()) { - addHiddenTooltip(par1ItemStack, par2EntityPlayer, par3List, par4); + addHiddenTooltip(par1ItemStack, par3List); } else { @@ -34,7 +34,7 @@ public class CompactedMRSBlock extends ItemBlock } } - public void addHiddenTooltip(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, List par3List, boolean par4) + public void addHiddenTooltip(ItemStack par1ItemStack, List par3List) { String ritualID = par1ItemStack.getTagCompound().getString("ritualName"); String ritualName = Rituals.getNameOfRitual(ritualID); diff --git a/src/main/java/com/arc/bloodarsenal/common/items/block/PortableAltarBlock.java b/src/main/java/com/arc/bloodarsenal/common/items/block/PortableAltarBlock.java index a8a514f..1969ca1 100644 --- a/src/main/java/com/arc/bloodarsenal/common/items/block/PortableAltarBlock.java +++ b/src/main/java/com/arc/bloodarsenal/common/items/block/PortableAltarBlock.java @@ -25,7 +25,7 @@ public class PortableAltarBlock extends ItemBlock { if (GuiScreen.isShiftKeyDown()) { - addHiddenTooltip(par1ItemStack, par2EntityPlayer, par3List, par4); + addHiddenTooltip(par1ItemStack, par3List); } else { @@ -33,7 +33,7 @@ public class PortableAltarBlock extends ItemBlock } } - public void addHiddenTooltip(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, List par3List, boolean par4) + public void addHiddenTooltip(ItemStack par1ItemStack, List par3List) { String capacity = par1ItemStack.getTagCompound().getString("capacity"); int alterTier = par1ItemStack.getTagCompound().getInteger("upgradeLevel"); diff --git a/src/main/java/com/arc/bloodarsenal/common/misc/VersionChecker.java b/src/main/java/com/arc/bloodarsenal/common/misc/VersionChecker.java index 21bd824..f88d1f0 100644 --- a/src/main/java/com/arc/bloodarsenal/common/misc/VersionChecker.java +++ b/src/main/java/com/arc/bloodarsenal/common/misc/VersionChecker.java @@ -17,8 +17,6 @@ public class VersionChecker public static boolean startedDownload = false; public static boolean downloadedFile = false; - private static String BUILD = "GRADLE:BUILD"; - public void init() { new ThreadVersionChecker(); diff --git a/src/main/java/com/arc/bloodarsenal/common/misc/WAILAPlugin.java b/src/main/java/com/arc/bloodarsenal/common/misc/WAILAPlugin.java new file mode 100644 index 0000000..2854561 --- /dev/null +++ b/src/main/java/com/arc/bloodarsenal/common/misc/WAILAPlugin.java @@ -0,0 +1,196 @@ +package com.arc.bloodarsenal.common.misc; + +import WayofTime.alchemicalWizardry.api.rituals.Rituals; +import WayofTime.alchemicalWizardry.common.items.sigil.SigilDivination; +import WayofTime.alchemicalWizardry.common.items.sigil.SigilSeer; +import WayofTime.alchemicalWizardry.common.items.sigil.holding.SigilOfHolding; +import com.arc.bloodarsenal.common.block.BlockCompactedMRS; +import com.arc.bloodarsenal.common.block.BlockLPMaterializer; +import com.arc.bloodarsenal.common.block.BlockLifeInfuser; +import com.arc.bloodarsenal.common.block.BlockPortableAltar; +import com.arc.bloodarsenal.common.items.sigil.holding.SigilAugmentedHolding; +import com.arc.bloodarsenal.common.tileentity.TileCompactedMRS; +import com.arc.bloodarsenal.common.tileentity.TileLPMaterializer; +import com.arc.bloodarsenal.common.tileentity.TileLifeInfuser; +import com.arc.bloodarsenal.common.tileentity.TilePortableAltar; +import mcp.mobius.waila.api.IWailaConfigHandler; +import mcp.mobius.waila.api.IWailaDataAccessor; +import mcp.mobius.waila.api.IWailaDataProvider; +import mcp.mobius.waila.api.IWailaRegistrar; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.EntityPlayerMP; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.EnumChatFormatting; +import net.minecraft.util.StatCollector; +import net.minecraft.world.World; + +import java.util.List; + +public class WAILAPlugin implements IWailaDataProvider +{ + @Override + public ItemStack getWailaStack(IWailaDataAccessor data, IWailaConfigHandler cfg) + { + return data.getStack(); + } + + @Override + public List getWailaHead(ItemStack stack, List tip, IWailaDataAccessor data, IWailaConfigHandler cfg) + { + return tip; + } + + @Override + public List getWailaBody(ItemStack stack, List tip, IWailaDataAccessor data, IWailaConfigHandler cfg) + { + if (data.getTileEntity() != null) + { + if (data.getTileEntity() instanceof TilePortableAltar) + { + EntityPlayer player = data.getPlayer(); + NBTTagCompound tagCompound = data.getNBTData(); + EnumChatFormatting red = EnumChatFormatting.RED; + //Basic + int currentEssence = tagCompound.getInteger("currentEssence"); + int tier = tagCompound.getInteger("upgradeLevel"); + int capacity = tagCompound.getInteger("capacity"); + //Extended + TilePortableAltar altar = (TilePortableAltar) data.getTileEntity(); + + if (player.getCurrentEquippedItem() != null) + { + if (player.getCurrentEquippedItem().getItem() instanceof SigilDivination || player.getCurrentEquippedItem().getItem() instanceof SigilSeer) + { + tip.add(StatCollector.translateToLocal("tooltip.currentEssence") + " " + red + currentEssence); + tip.add(StatCollector.translateToLocal("tooltip.altarTier") + " " + red + tier); + tip.add(StatCollector.translateToLocal("tooltip.capacity") + " " + red + capacity); + + addTonsOfInfo(player, altar, tip, cfg); + } + else if (player.getCurrentEquippedItem().getItem() instanceof SigilOfHolding) + { + if (SigilOfHolding.getCurrentSigil(player.getCurrentEquippedItem()).getItem() instanceof SigilDivination || SigilOfHolding.getCurrentSigil(player.getCurrentEquippedItem()).getItem() instanceof SigilSeer) + { + tip.add(StatCollector.translateToLocal("tooltip.currentEssence") + " " + red + currentEssence); + tip.add(StatCollector.translateToLocal("tooltip.altarTier") + " " + red + tier); + tip.add(StatCollector.translateToLocal("tooltip.capacity") + " " + red + capacity); + } + + addTonsOfInfo(player, altar, tip, cfg); + } + else if (player.getCurrentEquippedItem().getItem() instanceof SigilAugmentedHolding) + { + if (SigilAugmentedHolding.getCurrentSigil(player.getCurrentEquippedItem()).getItem() instanceof SigilDivination || SigilAugmentedHolding.getCurrentSigil(player.getCurrentEquippedItem()).getItem() instanceof SigilSeer) + { + tip.add(StatCollector.translateToLocal("tooltip.currentEssence") + " " + red + currentEssence); + tip.add(StatCollector.translateToLocal("tooltip.altarTier") + " " + red + tier); + tip.add(StatCollector.translateToLocal("tooltip.capacity") + " " + red + capacity); + } + + addTonsOfInfo(player, altar, tip, cfg); + } + } + } + else if (data.getTileEntity() instanceof TileCompactedMRS) + { + EnumChatFormatting red = EnumChatFormatting.RED; + NBTTagCompound tagCompound = data.getNBTData(); + + boolean isRunning = tagCompound.getBoolean("isRunning"); + String ritualID = tagCompound.getString("ritualName"); + String ritualName = Rituals.getNameOfRitual(ritualID); + int direction = tagCompound.getInteger("direction"); + + tip.add(StatCollector.translateToLocal("tooltip.ritualName") + " " + red + ritualName); + tip.add(StatCollector.translateToLocal("tooltip.running") + " " + red + (isRunning ? StatCollector.translateToLocal("tooltip.yes") : StatCollector.translateToLocal("tooltip.no"))); + tip.add(StatCollector.translateToLocal("tooltip.direction") + " " + red + direction); + } + else if (data.getTileEntity() instanceof TileLifeInfuser) + { + EnumChatFormatting red = EnumChatFormatting.RED; +// NBTTagCompound tagCompound = data.getNBTData(); + +// boolean isRunning = tagCompound.getBoolean("isRunning"); + int currentEssence = ((TileLifeInfuser) data.getTileEntity()).getFluidAmount(); + + tip.add(StatCollector.translateToLocal("message.tile.contains") + " " + red + currentEssence); +// tip.add(StatCollector.translateToLocal("tooltip.running") + " " + red + (isRunning ? StatCollector.translateToLocal("tooltip.yes") : StatCollector.translateToLocal("tooltip.no"))); + } + else if (data.getTileEntity() instanceof TileLPMaterializer) + { + EnumChatFormatting red = EnumChatFormatting.RED; + + int currentEssence = ((TileLPMaterializer) data.getTileEntity()).getFluidAmount(); + + tip.add(StatCollector.translateToLocal("message.tile.contains") + " " + red + currentEssence); + } + } + + return tip; + } + + protected void addTonsOfInfo(EntityPlayer player, TilePortableAltar altar, List tip, IWailaConfigHandler cfg) + { + int speedUpgrades = altar.speedUpgrades; + int efficiencyUpgrades = altar.efficiencyUpgrades; + int sacrificeUpgrades = altar.sacrificeUpgrades; + int selfSacrificeUpgrades = altar.selfSacrificeUpgrades; + int displacementUpgrades = altar.displacementUpgrades; + int altarCapacitiveUpgrades = altar.altarCapacitiveUpgrades; + int orbCapacitiveUpgrades = altar.orbCapacitiveUpgrades; + int betterCapacitiveUpgrades = altar.betterCapacitiveUpgrades; + int accelerationUpgrades = altar.accelerationUpgrades; + + if (cfg.getConfig(showExtendedTooltip) && player.isSneaking()) + { + tip.add(StatCollector.translateToLocal("tooltip.speedUpgrades") + " " + speedUpgrades); + tip.add(StatCollector.translateToLocal("tooltip.efficiencyUpgrades") + " " + efficiencyUpgrades); + tip.add(StatCollector.translateToLocal("tooltip.sacrificeUpgrades") + " " + sacrificeUpgrades); + tip.add(StatCollector.translateToLocal("tooltip.selfSacrificeUpgrades") + " " + selfSacrificeUpgrades); + tip.add(StatCollector.translateToLocal("tooltip.displacementUpgrades") + " " + displacementUpgrades); + tip.add(StatCollector.translateToLocal("tooltip.altarCapacitiveUpgrades") + " " + altarCapacitiveUpgrades); + tip.add(StatCollector.translateToLocal("tooltip.orbCapacitiveUpgrades") + " " + orbCapacitiveUpgrades); + tip.add(StatCollector.translateToLocal("tooltip.betterCapacitiveUpgrades") + " " + betterCapacitiveUpgrades); + tip.add(StatCollector.translateToLocal("tooltip.accelerationUpgrades") + " " + accelerationUpgrades); + } + } + + @Override + public List getWailaTail(ItemStack stack, List tip, IWailaDataAccessor data, IWailaConfigHandler cfg) + { + return tip; + } + + @Override + public NBTTagCompound getNBTData(EntityPlayerMP player, TileEntity tileEntity, NBTTagCompound tag, World world, int x, int y, int z) + { + if (tileEntity != null) + { + tileEntity.writeToNBT(tag); + } + + return tag; + } + + private static String showExtendedTooltip = "bloodarsenal.showExtendedAltarTooltip"; + + public static void registerAddon(IWailaRegistrar register) + { + WAILAPlugin dataProvider = new WAILAPlugin(); + + register.addConfig("BloodArsenal", showExtendedTooltip, false); + register.registerBodyProvider(dataProvider, BlockPortableAltar.class); + register.registerNBTProvider(dataProvider, BlockPortableAltar.class); + + register.registerBodyProvider(dataProvider, BlockCompactedMRS.class); + register.registerNBTProvider(dataProvider, BlockCompactedMRS.class); + + register.registerBodyProvider(dataProvider, BlockLifeInfuser.class); + register.registerNBTProvider(dataProvider, BlockLifeInfuser.class); + + register.registerBodyProvider(dataProvider, BlockLPMaterializer.class); + register.registerBodyProvider(dataProvider, BlockLPMaterializer.class); + } +} diff --git a/src/main/java/com/arc/bloodarsenal/common/tileentity/PacketHandler.java b/src/main/java/com/arc/bloodarsenal/common/tileentity/PacketHandler.java index ee1909e..149c86c 100644 --- a/src/main/java/com/arc/bloodarsenal/common/tileentity/PacketHandler.java +++ b/src/main/java/com/arc/bloodarsenal/common/tileentity/PacketHandler.java @@ -32,11 +32,6 @@ public enum PacketHandler { addClientHandler(); } - if (FMLCommonHandler.instance().getSide() == Side.SERVER) - { - System.out.println("Server sided~"); - addServerHandler(); - } } @SideOnly(Side.CLIENT) @@ -50,15 +45,6 @@ public enum PacketHandler clientChannel.pipeline().addAfter(tileCodec, "TileLPMaterializer", new TileLPMaterializerMessageHandler()); } - @SideOnly(Side.SERVER) - private void addServerHandler() - { - FMLEmbeddedChannel serverChannel = this.channels.get(Side.SERVER); - - String messageCodec = serverChannel.findChannelHandlerNameForType(BATileCodec.class); - serverChannel.pipeline().addAfter(messageCodec, "KeyboardMessageHandler", new KeyboardMessageHandler()); - } - private static class TilePortableAltarMessageHandler extends SimpleChannelInboundHandler { @Override @@ -110,21 +96,6 @@ public enum PacketHandler } } - private static class KeyboardMessageHandler extends SimpleChannelInboundHandler - { - public KeyboardMessageHandler() - { - System.out.println("I am being created"); - } - - @Override - protected void channelRead0(ChannelHandlerContext ctx, KeyboardMessage msg) throws Exception - { - System.out.println("Hmmm"); - - } - } - public static class BAMessage { int index; @@ -163,11 +134,6 @@ public enum PacketHandler int capacity; } - public static class KeyboardMessage extends BAMessage - { - byte keyPressed; - } - private class ClientToServerCodec extends FMLIndexedMessageToMessageCodec { public ClientToServerCodec() diff --git a/src/main/java/com/arc/bloodarsenal/common/tileentity/TileCompactedMRS.java b/src/main/java/com/arc/bloodarsenal/common/tileentity/TileCompactedMRS.java index 5a5d1df..982e409 100644 --- a/src/main/java/com/arc/bloodarsenal/common/tileentity/TileCompactedMRS.java +++ b/src/main/java/com/arc/bloodarsenal/common/tileentity/TileCompactedMRS.java @@ -76,6 +76,7 @@ public class TileCompactedMRS extends TEMasterStone implements IMasterRitualSton tag.setString("ritualName", ritualName); } + @Override public void readClientNBT(NBTTagCompound tag) { ritualName = tag.getString("ritualName"); @@ -94,6 +95,7 @@ public class TileCompactedMRS extends TEMasterStone implements IMasterRitualSton } } + @Override public void writeClientNBT(NBTTagCompound tag) { tag.setString("ritualName", ritualName); diff --git a/src/main/java/com/arc/bloodarsenal/common/tileentity/TileLPMaterializer.java b/src/main/java/com/arc/bloodarsenal/common/tileentity/TileLPMaterializer.java index 94bbd40..05d197e 100644 --- a/src/main/java/com/arc/bloodarsenal/common/tileentity/TileLPMaterializer.java +++ b/src/main/java/com/arc/bloodarsenal/common/tileentity/TileLPMaterializer.java @@ -243,7 +243,7 @@ public class TileLPMaterializer extends TileEntity implements IInventory, IFluid public void sendChatInfoToPlayer(EntityPlayer player) { - player.addChatMessage(new ChatComponentText(StatCollector.translateToLocal("message.tile.contains") + " " + this.getFluidAmount() + "LP")); + player.addChatMessage(new ChatComponentText(StatCollector.translateToLocal("message.tile.contains") + " " + this.getFluidAmount() + "LE")); } @Override @@ -275,8 +275,8 @@ public class TileLPMaterializer extends TileEntity implements IInventory, IFluid } } - FluidStack flMain = new FluidStack(fluidData[0], fluidData[1]); - FluidStack flIn = new FluidStack(fluidData[2], fluidData[3]); + FluidStack flMain = new FluidStack(fluid, fluidData[1]); + FluidStack flIn = new FluidStack(fluidOutput, fluidData[3]); this.setMainFluid(flMain); this.setOutputFluid(flIn); @@ -316,6 +316,28 @@ public class TileLPMaterializer extends TileEntity implements IInventory, IFluid { super.updateEntity(); + if (getTankAbove() != null) + { + IFluidHandler aboveTank = getTankAbove(); + + if (aboveTank.canFill(ForgeDirection.DOWN, fluid.getFluid())) + { + aboveTank.fill(ForgeDirection.DOWN, fluidOutput, true); + drain(ForgeDirection.UP, fluidOutput, true); + } + } + + if (getTankBelow() != null) + { + IFluidHandler belowTank = getTankBelow(); + + if (belowTank.canFill(ForgeDirection.UP, fluid.getFluid())) + { + belowTank.fill(ForgeDirection.UP, fluidOutput, true); + drain(ForgeDirection.DOWN, fluidOutput, true); + } + } + if (worldObj.isBlockIndirectlyGettingPowered(xCoord, yCoord, zCoord)) { materialize(); @@ -373,26 +395,14 @@ public class TileLPMaterializer extends TileEntity implements IInventory, IFluid } } - private IFluidHandler[] checkForTanks(TileLPMaterializer tile) + private IFluidHandler getTankAbove() { - ForgeDirection[] directions = ForgeDirection.VALID_DIRECTIONS; + return worldObj.getTileEntity(xCoord, yCoord + 1, zCoord) != null && worldObj.getTileEntity(xCoord, yCoord + 1, zCoord) instanceof IFluidHandler ? (IFluidHandler) worldObj.getTileEntity(xCoord, yCoord + 1, zCoord) : null; + } - for (ForgeDirection forgeDirection : directions) - { - IFluidHandler[] fluidHandlers; - int x = tile.xCoord; - int y = tile.yCoord; - int z = tile.zCoord; - - switch (forgeDirection) - { - case NORTH: - worldObj.getTileEntity(x, y, z); - break; - } - } - - return null; + private IFluidHandler getTankBelow() + { + return worldObj.getTileEntity(xCoord, yCoord - 1, zCoord) != null && worldObj.getTileEntity(xCoord, yCoord - 1, zCoord) instanceof IFluidHandler ? (IFluidHandler) worldObj.getTileEntity(xCoord, yCoord - 1, zCoord) : null; } //Fluid Stuffs diff --git a/src/main/java/com/arc/bloodarsenal/common/tileentity/TileLifeInfuser.java b/src/main/java/com/arc/bloodarsenal/common/tileentity/TileLifeInfuser.java index dcc493d..a271e08 100644 --- a/src/main/java/com/arc/bloodarsenal/common/tileentity/TileLifeInfuser.java +++ b/src/main/java/com/arc/bloodarsenal/common/tileentity/TileLifeInfuser.java @@ -299,7 +299,7 @@ public class TileLifeInfuser extends TileEntity implements IInventory, IFluidTan public void sendChatInfoToPlayer(EntityPlayer player) { - player.addChatMessage(new ChatComponentText(StatCollector.translateToLocal("message.tile.contains") + " " + this.getFluidAmount() + "LP")); + player.addChatMessage(new ChatComponentText(StatCollector.translateToLocal("message.tile.contains") + " " + this.getFluidAmount() + "LE")); } @Override @@ -331,8 +331,8 @@ public class TileLifeInfuser extends TileEntity implements IInventory, IFluidTan } } - FluidStack flMain = new FluidStack(fluidData[0], fluidData[1]); - FluidStack flIn = new FluidStack(fluidData[2], fluidData[3]); + FluidStack flMain = new FluidStack(fluid, fluidData[1]); + FluidStack flIn = new FluidStack(fluidInput, fluidData[3]); this.setMainFluid(flMain); this.setInputFluid(flIn); @@ -436,7 +436,7 @@ public class TileLifeInfuser extends TileEntity implements IInventory, IFluidTan if (tile != null) { - FluidEvent.fireEvent(new FluidEvent.FluidFillingEvent(fluidInput, tile.getWorldObj(), tile.xCoord, tile.yCoord, tile.zCoord, this, resource.amount)); + FluidEvent.fireEvent(new FluidEvent.FluidFillingEvent(fluidInput, tile.getWorldObj(), tile.xCoord, tile.yCoord, tile.zCoord, this, fluidInput.amount)); } return fluidInput.amount; @@ -457,7 +457,7 @@ public class TileLifeInfuser extends TileEntity implements IInventory, IFluidTan if (tile != null) { - FluidEvent.fireEvent(new FluidEvent.FluidFillingEvent(fluidInput, tile.getWorldObj(), tile.xCoord, tile.yCoord, tile.zCoord, this, resource.amount)); + FluidEvent.fireEvent(new FluidEvent.FluidFillingEvent(fluidInput, tile.getWorldObj(), tile.xCoord, tile.yCoord, tile.zCoord, this, fluidInput.amount)); } return filled; @@ -501,7 +501,7 @@ public class TileLifeInfuser extends TileEntity implements IInventory, IFluidTan @Override public boolean canFill(ForgeDirection from, Fluid fluid) { - return this.fluidInput != null && this.fluid.getFluid().equals(fluidInput.getFluid()) && this.fluid.amount > capacity; + return this.fluidInput != null && this.fluid.getFluid().equals(fluidInput.getFluid()); } @Override diff --git a/src/main/java/com/arc/bloodarsenal/common/tileentity/TilePortableAltar.java b/src/main/java/com/arc/bloodarsenal/common/tileentity/TilePortableAltar.java index 7c3d1c3..1d39b4b 100644 --- a/src/main/java/com/arc/bloodarsenal/common/tileentity/TilePortableAltar.java +++ b/src/main/java/com/arc/bloodarsenal/common/tileentity/TilePortableAltar.java @@ -19,6 +19,7 @@ import net.minecraft.potion.Potion; import net.minecraft.potion.PotionEffect; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.ChatComponentText; +import net.minecraft.util.StatCollector; import net.minecraftforge.common.util.Constants; import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.fluids.*; @@ -32,30 +33,38 @@ public class TilePortableAltar extends TileEntity implements IInventory, IFluidT private int resultID; private int resultDamage; private int upgradeLevel; - protected FluidStack fluid; + public FluidStack fluid; public int capacity; private boolean isActive; - private int liquidRequired; //mB + public int liquidRequired; //mB private boolean canBeFilled; - private int consumptionRate; + public int consumptionRate; private int drainRate; - private float consumptionMultiplier; + public float consumptionMultiplier; private float efficiencyMultiplier; private float sacrificeEfficiencyMultiplier; private float selfSacrificeEfficiencyMultiplier; private float capacityMultiplier; private float orbCapacityMultiplier; private float dislocationMultiplier; - private int accelerationUpgrades; private boolean isUpgraded; private boolean isResultBlock; private int bufferCapacity; - protected FluidStack fluidOutput; - protected FluidStack fluidInput; - private int progress; - private int hasChanged = 0; + public FluidStack fluidOutput; + public FluidStack fluidInput; + public int progress; private int cooldownAfterCrafting = 500; + public int speedUpgrades = 0; + public int efficiencyUpgrades = 0; + public int sacrificeUpgrades = 0; + public int selfSacrificeUpgrades = 0; + public int displacementUpgrades = 0; + public int altarCapacitiveUpgrades = 0; + public int orbCapacitiveUpgrades = 0; + public int betterCapacitiveUpgrades = 0; + public int accelerationUpgrades = 0; + private int lockdownDuration; private int demonBloodDuration; @@ -421,16 +430,6 @@ public class TilePortableAltar extends TileEntity implements IInventory, IFluidT return fluid; } - public FluidStack getInputFluid() - { - return fluidInput; - } - - public FluidStack getOutputFluid() - { - return fluidOutput; - } - @Override public int getFluidAmount() { @@ -551,8 +550,16 @@ public class TilePortableAltar extends TileEntity implements IInventory, IFluidT this.capacityMultiplier = capacityMultiplier; } - public void setAccelerationUpgrades(int accelerationUpgrades) + public void setUpgrades(int speedUpgrades, int efficiencyUpgrades, int sacrificeUpgrades, int selfSacrificeUpgrades, int displacementUpgrades, int altarCapacitiveUpgrades, int orbCapacitiveUpgrades, int betterCapacitiveUpgrades, int accelerationUpgrades) { + this.speedUpgrades = speedUpgrades; + this.efficiencyUpgrades = efficiencyUpgrades; + this.sacrificeUpgrades = sacrificeUpgrades; + this.selfSacrificeUpgrades = selfSacrificeUpgrades; + this.displacementUpgrades = displacementUpgrades; + this.altarCapacitiveUpgrades = altarCapacitiveUpgrades; + this.orbCapacitiveUpgrades = orbCapacitiveUpgrades; + this.betterCapacitiveUpgrades = betterCapacitiveUpgrades; this.accelerationUpgrades = accelerationUpgrades; } @@ -935,7 +942,7 @@ public class TilePortableAltar extends TileEntity implements IInventory, IFluidT public int[] buildIntDataList() { - int[] sortList = new int[1 * 3]; + int[] sortList = new int[3];//1 * 3 int pos = 0; for (ItemStack is : inv) @@ -1124,9 +1131,9 @@ public class TilePortableAltar extends TileEntity implements IInventory, IFluidT public void sendChatInfoToPlayer(EntityPlayer player) { - player.addChatMessage(new ChatComponentText("Altar's Current Essence: " + this.fluid.amount + "LP")); - player.addChatMessage(new ChatComponentText("Altar's Current Tier: " + this.upgradeLevel)); - player.addChatMessage(new ChatComponentText("Capacity: " + this.getCapacity() + "LP")); + player.addChatMessage(new ChatComponentText(StatCollector.translateToLocal("message.altarEssence") + " " + this.fluid.amount + "LP")); + player.addChatMessage(new ChatComponentText(StatCollector.translateToLocal("message.altarCurrentTier") + " " + this.upgradeLevel)); + player.addChatMessage(new ChatComponentText(StatCollector.translateToLocal("message.capacity") + " " + this.getCapacity() + "LP")); } public void sendMoreChatInfoToPlayer(EntityPlayer player) @@ -1134,12 +1141,12 @@ public class TilePortableAltar extends TileEntity implements IInventory, IFluidT if (getStackInSlot(0) != null) { int stackSize = getStackInSlot(0).stackSize; - player.addChatMessage(new ChatComponentText("Altar's Progress: " + progress + "LP/" + liquidRequired * stackSize + "LP")); - player.addChatMessage(new ChatComponentText("Consumption rate: " + (int) (consumptionRate * (1 + consumptionMultiplier)) + "LP/t")); + player.addChatMessage(new ChatComponentText(StatCollector.translateToLocal("message.altarProgress") + " " + progress + "LP/" + liquidRequired * stackSize + "LP")); + player.addChatMessage(new ChatComponentText(StatCollector.translateToLocal("message.consumptionRate") + " " + (int) (consumptionRate * (1 + consumptionMultiplier)) + "LP/t")); } - player.addChatMessage(new ChatComponentText("Altar's Current Essence: " + this.fluid.amount + "LP")); - player.addChatMessage(new ChatComponentText("Input tank: " + this.fluidInput.amount + "LP")); - player.addChatMessage(new ChatComponentText("Output tank: " + this.fluidOutput.amount + "LP")); + player.addChatMessage(new ChatComponentText(StatCollector.translateToLocal("message.altarEssence") + " " + this.fluid.amount + "LP")); + player.addChatMessage(new ChatComponentText(StatCollector.translateToLocal("message.inputTank") + " " + this.fluidInput.amount + "LP")); + player.addChatMessage(new ChatComponentText(StatCollector.translateToLocal("message.outputTank") + " " + this.fluidOutput.amount + "LP")); } @Override diff --git a/src/main/resources/assets/bloodarsenal/lang/en_US.lang b/src/main/resources/assets/bloodarsenal/lang/en_US.lang index 64d29f9..f91921b 100644 --- a/src/main/resources/assets/bloodarsenal/lang/en_US.lang +++ b/src/main/resources/assets/bloodarsenal/lang/en_US.lang @@ -144,14 +144,29 @@ tooltip.armor.glassArmor=More painful than it looks tooltip.armor.lifeImbuedArmor=Living Armor tooltip.energybattery.currentLP=Current LP: -tooltip.shiftinfo=Press &cSHIFT&7 for more info +tooltip.shiftinfo=-Press &cSHIFT&7 for more info- tooltip.ritualName=Ritual: +tooltip.running=Running: +tooltip.yes=Yes +tooltip.no=No +tooltip.direction=Direction: + tooltip.currentEssence=Current Essence: tooltip.altarTier=Altar Tier: tooltip.capacity=Capacity: +tooltip.speedUpgrades=Speed Upgrades: +tooltip.efficiencyUpgrades=Efficiency Upgrades: +tooltip.sacrificeUpgrades=Sacrifice Upgrades: +tooltip.selfSacrificeUpgrades=Self-Sacrifice Upgrades: +tooltip.displacementUpgrades=Dislocation Upgrades: +tooltip.altarCapacitiveUpgrades=Capacity Upgrades: +tooltip.orbCapacitiveUpgrades=Orb Upgrades: +tooltip.betterCapacitiveUpgrades=Superior Capacity Upgrades: +tooltip.accelerationUpgrades=Acceleration Upgrades: + tooltip.fillable.currentAmount=Stored LP: tooltip.bauble.sacrifice=Collecting some life! @@ -183,6 +198,14 @@ message.enchant.The enchantment is not valid for the item message.tile.contains=Contains: +message.altarCurrentTier=Altar's Current Tier: +message.capacity=Capacity: +message.altarProgress=Altar's Progress: +message.consumptionRate=Consumption rate: +message.altarEssence=Altar's Current Essence: +message.inputTank=Input tank: +message.outputTank=Output tank: + #Miscs ba.versioning.update=Get the latest Blood Arsenal, NOW! ba.versioning.outdated=You are running Blood Arsenal %s, the latest is %s.