diff --git a/src/main/java/magicbees/block/BlockApiamancersDrainer.java b/src/main/java/magicbees/block/BlockApimancersDrainer.java similarity index 85% rename from src/main/java/magicbees/block/BlockApiamancersDrainer.java rename to src/main/java/magicbees/block/BlockApimancersDrainer.java index 92dc09f..742541e 100644 --- a/src/main/java/magicbees/block/BlockApiamancersDrainer.java +++ b/src/main/java/magicbees/block/BlockApimancersDrainer.java @@ -15,21 +15,21 @@ import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import magicbees.main.CommonProxy; import magicbees.main.utils.TabMagicBees; -import magicbees.tileentity.TileEntityApiamancersDrainerCommon; +import magicbees.tileentity.TileEntityApimancersDrainerCommon; import thaumcraft.api.aspects.Aspect; import thaumcraft.api.aspects.IEssentiaContainerItem; -public class BlockApiamancersDrainer extends BlockContainer { +public class BlockApimancersDrainer extends BlockContainer { @SideOnly(Side.CLIENT) private IIcon[] icons; - public static Class drainer = TileEntityApiamancersDrainerCommon.class; + public static Class drainer = TileEntityApimancersDrainerCommon.class; - public BlockApiamancersDrainer() { + public BlockApimancersDrainer() { super(Material.rock); this.setCreativeTab(TabMagicBees.tabMagicBees); - this.setBlockName("apiamancersDrainer"); + this.setBlockName("apimancersDrainer"); this.setHardness(1f); this.setResistance(1.5f); this.setHarvestLevel("pickaxe", 0); @@ -51,7 +51,7 @@ public class BlockApiamancersDrainer extends BlockContainer { return false; } else { TileEntity tile = world.getTileEntity(x, y, z); - if (tile instanceof TileEntityApiamancersDrainerCommon) { + if (tile instanceof TileEntityApimancersDrainerCommon) { ItemStack tItemStack = player.getHeldItem(); if (tItemStack != null) { Item tItem = tItemStack.getItem(); @@ -60,13 +60,13 @@ public class BlockApiamancersDrainer extends BlockContainer { && ((IEssentiaContainerItem) tItem).getAspects(player.getHeldItem()).size() > 0) { Aspect tLocked = ((IEssentiaContainerItem) tItem).getAspects(player.getHeldItem()) .getAspects()[0]; - ((TileEntityApiamancersDrainerCommon) tile).setAspect(tLocked); + ((TileEntityApimancersDrainerCommon) tile).setAspect(tLocked); player.addChatMessage( new ChatComponentTranslation("Producing " + tLocked.getLocalizedDescription())); } } else { - ((TileEntityApiamancersDrainerCommon) tile).setAspect(null); + ((TileEntityApimancersDrainerCommon) tile).setAspect(null); player.addChatMessage(new ChatComponentTranslation("Cleared production specifier")); } world.markBlockForUpdate(x, y, z); @@ -87,7 +87,7 @@ public class BlockApiamancersDrainer extends BlockContainer { icons = new IIcon[4]; for (int i = 0; i < icons.length; i++) { - icons[i] = register.registerIcon(CommonProxy.DOMAIN + ":apiamancersdrainer." + i); + icons[i] = register.registerIcon(CommonProxy.DOMAIN + ":apimancersdrainer." + i); } } } diff --git a/src/main/java/magicbees/main/Config.java b/src/main/java/magicbees/main/Config.java index 86f9880..ad97dde 100644 --- a/src/main/java/magicbees/main/Config.java +++ b/src/main/java/magicbees/main/Config.java @@ -21,7 +21,7 @@ import cpw.mods.fml.common.registry.GameRegistry; import forestry.api.apiculture.BeeManager; import forestry.api.storage.BackpackManager; import forestry.api.storage.EnumBackpackType; -import magicbees.block.BlockApiamancersDrainer; +import magicbees.block.BlockApimancersDrainer; import magicbees.block.BlockEffectJar; import magicbees.block.BlockEnchantedEarth; import magicbees.block.BlockHive; @@ -58,7 +58,7 @@ import magicbees.main.utils.VersionInfo; import magicbees.main.utils.compat.BotaniaHelper; import magicbees.main.utils.compat.ThaumcraftHelper; import magicbees.storage.BackpackDefinition; -import magicbees.tileentity.TileEntityApiamancersDrainerGT; +import magicbees.tileentity.TileEntityApimancersDrainerGT; import magicbees.tileentity.TileEntityEffectJar; import magicbees.tileentity.TileEntityMagicApiary; import magicbees.tileentity.TileEntityManaAuraProvider; @@ -118,7 +118,7 @@ public class Config { public static BlockEffectJar effectJar; public static BlockHive hive; public static BlockMagicApiary magicApiary; - public static BlockApiamancersDrainer apiamancersDrainer; + public static BlockApimancersDrainer apimancersDrainer; public static BlockManaAuraProvider manaAuraProvider; public static BlockVisAuraProvider visAuraProvider; @@ -507,10 +507,10 @@ public class Config { GameRegistry.registerBlock(visAuraProvider, "visAuraProvider"); GameRegistry.registerTileEntity(TileEntityVisAuraProvider.class, "visAuraProvider"); - if (isGTLoaded) BlockApiamancersDrainer.drainer = TileEntityApiamancersDrainerGT.class; - apiamancersDrainer = new BlockApiamancersDrainer(); - GameRegistry.registerBlock(apiamancersDrainer, "apiamancersDrainer"); - GameRegistry.registerTileEntity(BlockApiamancersDrainer.drainer, "apiamancersDrainer"); + if (isGTLoaded) BlockApimancersDrainer.drainer = TileEntityApimancersDrainerGT.class; + apimancersDrainer = new BlockApimancersDrainer(); + GameRegistry.registerBlock(apimancersDrainer, "apimancersDrainer"); + GameRegistry.registerTileEntity(BlockApimancersDrainer.drainer, "apimancersDrainer"); } } diff --git a/src/main/java/magicbees/main/utils/compat/ThaumcraftHelper.java b/src/main/java/magicbees/main/utils/compat/ThaumcraftHelper.java index 4cd978c..70fb15f 100644 --- a/src/main/java/magicbees/main/utils/compat/ThaumcraftHelper.java +++ b/src/main/java/magicbees/main/utils/compat/ThaumcraftHelper.java @@ -86,7 +86,7 @@ public class ThaumcraftHelper implements IModHelper { private static Object visAuraProvider; private static Object voidScoop; private static Object voidGrafter; - private static InfusionRecipe apiamancersDrainer; + private static InfusionRecipe apimancersDrainer; public static boolean isActive() { return isThaumcraftPresent; @@ -295,9 +295,9 @@ public class ThaumcraftHelper implements IModHelper { ItemStack centrifuge = new ItemStack(ConfigBlocks.blockTube); centrifuge.setItemDamage(2); - apiamancersDrainer = ThaumcraftApi.addInfusionCraftingRecipe( - "MB_ApiamancersDrainer", - new ItemStack(Config.apiamancersDrainer), + apimancersDrainer = ThaumcraftApi.addInfusionCraftingRecipe( + "MB_ApimancersDrainer", + new ItemStack(Config.apimancersDrainer), 6, new AspectList().add(Aspect.MAGIC, 40).add(Aspect.HARVEST, 20).add(Aspect.EXCHANGE, 20) .add(Aspect.ELDRITCH, 20), @@ -552,15 +552,15 @@ public class ThaumcraftHelper implements IModHelper { .setParentsHidden("VISPOWER").registerResearchItem(); new ResearchItem( - "MB_ApiamancersDrainer", + "MB_ApimancersDrainer", category, new AspectList().add(Aspect.ELDRITCH, 1).add(Aspect.HARVEST, 1).add(Aspect.MAGIC, 1) .add((Aspect) aspectTime, 1), -3, 5, 4, - new ItemStack(Config.apiamancersDrainer)) - .setPages(getResearchPage("MB_ApiamancersDrainer.1"), new ResearchPage(apiamancersDrainer)) + new ItemStack(Config.apimancersDrainer)) + .setPages(getResearchPage("MB_ApimancersDrainer.1"), new ResearchPage(apimancersDrainer)) .setParentsHidden("VOIDMETAL", "ESSENTIARESERVOIR").setParents("MB_EssenceUnstable") .setConcealed().registerResearchItem(); diff --git a/src/main/java/magicbees/tileentity/TileEntityApiamancersDrainerCommon.java b/src/main/java/magicbees/tileentity/TileEntityApimancersDrainerCommon.java similarity index 98% rename from src/main/java/magicbees/tileentity/TileEntityApiamancersDrainerCommon.java rename to src/main/java/magicbees/tileentity/TileEntityApimancersDrainerCommon.java index 28da442..30ffe91 100644 --- a/src/main/java/magicbees/tileentity/TileEntityApiamancersDrainerCommon.java +++ b/src/main/java/magicbees/tileentity/TileEntityApimancersDrainerCommon.java @@ -23,7 +23,7 @@ import thaumcraft.api.aspects.AspectList; import thaumcraft.api.aspects.IAspectContainer; import thaumcraft.api.aspects.IEssentiaTransport; -public class TileEntityApiamancersDrainerCommon extends TileEntity implements IAspectContainer, IEssentiaTransport { +public class TileEntityApimancersDrainerCommon extends TileEntity implements IAspectContainer, IEssentiaTransport { public Aspect aspect; public AspectList essentia = new AspectList(); diff --git a/src/main/java/magicbees/tileentity/TileEntityApiamancersDrainerGT.java b/src/main/java/magicbees/tileentity/TileEntityApimancersDrainerGT.java similarity index 96% rename from src/main/java/magicbees/tileentity/TileEntityApiamancersDrainerGT.java rename to src/main/java/magicbees/tileentity/TileEntityApimancersDrainerGT.java index bc52308..25ce725 100644 --- a/src/main/java/magicbees/tileentity/TileEntityApiamancersDrainerGT.java +++ b/src/main/java/magicbees/tileentity/TileEntityApimancersDrainerGT.java @@ -14,7 +14,7 @@ import gregtech.api.interfaces.tileentity.IGregTechDeviceInformation; import gregtech.api.metatileentity.BaseMetaTileEntity; import gregtech.common.tileentities.machines.basic.GT_MetaTileEntity_IndustrialApiary; -public class TileEntityApiamancersDrainerGT extends TileEntityApiamancersDrainerCommon +public class TileEntityApimancersDrainerGT extends TileEntityApimancersDrainerCommon implements IGregTechDeviceInformation { @Override @@ -32,7 +32,7 @@ public class TileEntityApiamancersDrainerGT extends TileEntityApiamancersDrainer + e.getValue()) .collect(Collectors.joining(EnumChatFormatting.RESET + ", " + EnumChatFormatting.RESET)); - return new String[] { EnumChatFormatting.DARK_PURPLE + "Apiamancer's Drainer" + EnumChatFormatting.RESET, + return new String[] { EnumChatFormatting.DARK_PURPLE + "Apimancer's Drainer" + EnumChatFormatting.RESET, aspect != null ? "Attuned: " + aspect.getName() : "Not attuned", "Stored Essentia:", aspects }; } diff --git a/src/main/resources/assets/magicbees/lang/en_US.lang b/src/main/resources/assets/magicbees/lang/en_US.lang index 17b1886..f271190 100644 --- a/src/main/resources/assets/magicbees/lang/en_US.lang +++ b/src/main/resources/assets/magicbees/lang/en_US.lang @@ -38,7 +38,7 @@ item.beeRing.name=Collector's Bee Ring tile.effectJar.name=Bee Collector's Jar tile.magicApiary.name=Magic Apiary tile.visAuraProvider.name=Vis Apiary Booster -tile.apiamancersDrainer.name=Apiamancer's Drainer +tile.apimancersDrainer.name=Apimancer's Drainer tile.manaAuraProvider.name=Mana Apiary Booster tile.hive.curious.name=Curious Hive tile.hive.unusual.name=Unusual Hive @@ -685,9 +685,9 @@ tc.research_name.MB_VisAuraProvider=Vis Apiary Booster tc.research_text.MB_VisAuraProvider=Vis? What about Bis? tc.research_page.MB_VisAuraProvider.1=Infusing Unusual Pollen with vis and combining it with gold creates an unusual crystal that, when fed centivis from an aura node, creates an energizing aura that bees are naturally attracted to when attuned to the environment within a Magic Apiary.§3Aqua§0 CV will double mutation rate
§8Perditio§0 CV will halve lifespan
§6Aer§0 CV will double production rate -tc.research_name.MB_ApiamancersDrainer=Apiamancer's Drainer -tc.research_text.MB_ApiamancersDrainer=How long will your queen last? -tc.research_page.MB_ApiamancersDrainer.1=The Apiamancer's Drainer is an innovative device in the field of Apimancy, designed to extract essentia from the life force of bees. It is placed beneath an apiary, establishing a direct connection with the apiary above.
To determine the type of essentia it produces, the Drainer is attuned by tapping it with the desired essentia.
Once attuned, the Drainer converts the life energy of the queen into the selected essentia... +tc.research_name.MB_ApimancersDrainer=Apimancer's Drainer +tc.research_text.MB_ApimancersDrainer=How long will your queen last? +tc.research_page.MB_ApimancersDrainer.1=The Apimancer's Drainer is an innovative device in the field of Apimancy, designed to extract essentia from the life force of bees. It is placed beneath an apiary, establishing a direct connection with the apiary above.
To determine the type of essentia it produces, the Drainer is attuned by tapping it with the desired essentia.
Once attuned, the Drainer converts the life energy of the queen into the selected essentia... tc.research_name.MB_ScoopVoid=Void Scoop tc.research_text.MB_ScoopVoid=The dark net diff --git a/src/main/resources/assets/magicbees/textures/blocks/apiamancersdrainer.0.png b/src/main/resources/assets/magicbees/textures/blocks/apimancersdrainer.0.png similarity index 100% rename from src/main/resources/assets/magicbees/textures/blocks/apiamancersdrainer.0.png rename to src/main/resources/assets/magicbees/textures/blocks/apimancersdrainer.0.png diff --git a/src/main/resources/assets/magicbees/textures/blocks/apiamancersdrainer.1.png b/src/main/resources/assets/magicbees/textures/blocks/apimancersdrainer.1.png similarity index 100% rename from src/main/resources/assets/magicbees/textures/blocks/apiamancersdrainer.1.png rename to src/main/resources/assets/magicbees/textures/blocks/apimancersdrainer.1.png diff --git a/src/main/resources/assets/magicbees/textures/blocks/apiamancersdrainer.2.png b/src/main/resources/assets/magicbees/textures/blocks/apimancersdrainer.2.png similarity index 100% rename from src/main/resources/assets/magicbees/textures/blocks/apiamancersdrainer.2.png rename to src/main/resources/assets/magicbees/textures/blocks/apimancersdrainer.2.png