rename phialing cabinet to apiamancers drainer

src/main/java/magicbees/block/BlockApiamancersDrainer.java

@@ -15,27 +15,27 @@ import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 import magicbees.main.CommonProxy;
 import magicbees.main.utils.TabMagicBees;
-import magicbees.tileentity.TileEntityPhialingCabinet;
+import magicbees.tileentity.TileEntityApiamancersDrainer;
 import thaumcraft.api.aspects.Aspect;
 import thaumcraft.api.aspects.IEssentiaContainerItem;
 
-public class BlockPhialingCabinet extends BlockContainer {
+public class BlockApiamancersDrainer extends BlockContainer {
 
     @SideOnly(Side.CLIENT)
     private IIcon[] icons;
 
-    public BlockPhialingCabinet() {
-        super(Material.wood);
+    public BlockApiamancersDrainer() {
+        super(Material.rock);
         this.setCreativeTab(TabMagicBees.tabMagicBees);
-        this.setBlockName("phialingCabinet");
+        this.setBlockName("apiamancersDrainer");
         this.setHardness(1f);
         this.setResistance(1.5f);
-        this.setHarvestLevel("axe", 0);
+        this.setHarvestLevel("pickaxe", 0);
     }
 
     @Override
     public TileEntity createNewTileEntity(World world, int metadata) {
-        return new TileEntityPhialingCabinet();
+        return new TileEntityApiamancersDrainer();
     }
 
     @Override
@@ -45,7 +45,7 @@ public class BlockPhialingCabinet extends BlockContainer {
             return false;
         } else {
             TileEntity tile = world.getTileEntity(x, y, z);
-            if (tile instanceof TileEntityPhialingCabinet) {
+            if (tile instanceof TileEntityApiamancersDrainer) {
                 ItemStack tItemStack = player.getHeldItem();
                 if (tItemStack != null) {
                     Item tItem = tItemStack.getItem();
@@ -54,14 +54,14 @@ public class BlockPhialingCabinet extends BlockContainer {
                             && ((IEssentiaContainerItem) tItem).getAspects(player.getHeldItem()).size() > 0) {
                         Aspect tLocked = ((IEssentiaContainerItem) tItem).getAspects(player.getHeldItem())
                                 .getAspects()[0];
-                        ((TileEntityPhialingCabinet) tile).setAspect(tLocked);
+                        ((TileEntityApiamancersDrainer) tile).setAspect(tLocked);
 
                         // TODO: improve text
                         player.addChatMessage(
                                 new ChatComponentTranslation("Producing " + tLocked.getLocalizedDescription()));
                     }
                 } else {
-                    ((TileEntityPhialingCabinet) tile).setAspect(null);
+                    ((TileEntityApiamancersDrainer) tile).setAspect(null);
 
                     // TODO: improve text
                     player.addChatMessage(new ChatComponentTranslation("Cleared production specifier"));
@@ -90,8 +90,8 @@ public class BlockPhialingCabinet extends BlockContainer {
     public void registerBlockIcons(IIconRegister register) {
         icons = new IIcon[4];
 
-        icons[0] = register.registerIcon(CommonProxy.DOMAIN + ":phialingcabinet.0");
-        icons[1] = register.registerIcon(CommonProxy.DOMAIN + ":phialingcabinet.1");
-        icons[2] = register.registerIcon(CommonProxy.DOMAIN + ":phialingcabinet.2");
+        icons[0] = register.registerIcon(CommonProxy.DOMAIN + ":apiamancersdrainer.0");
+        icons[1] = register.registerIcon(CommonProxy.DOMAIN + ":apiamancersdrainer.1");
+        icons[2] = register.registerIcon(CommonProxy.DOMAIN + ":apiamancersdrainer.2");
     }
 }

src/main/java/magicbees/main/Config.java

@@ -20,12 +20,12 @@ 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.BlockEffectJar;
 import magicbees.block.BlockEnchantedEarth;
 import magicbees.block.BlockHive;
 import magicbees.block.BlockMagicApiary;
 import magicbees.block.BlockManaAuraProvider;
-import magicbees.block.BlockPhialingCabinet;
 import magicbees.block.BlockVisAuraProvider;
 import magicbees.block.types.HiveType;
 import magicbees.item.ItemCapsule;
@@ -57,10 +57,10 @@ import magicbees.main.utils.VersionInfo;
 import magicbees.main.utils.compat.BotaniaHelper;
 import magicbees.main.utils.compat.ThaumcraftHelper;
 import magicbees.storage.BackpackDefinition;
+import magicbees.tileentity.TileEntityApiamancersDrainer;
 import magicbees.tileentity.TileEntityEffectJar;
 import magicbees.tileentity.TileEntityMagicApiary;
 import magicbees.tileentity.TileEntityManaAuraProvider;
-import magicbees.tileentity.TileEntityPhialingCabinet;
 import magicbees.tileentity.TileEntityVisAuraProvider;
 
 /**
@@ -91,9 +91,9 @@ public class Config {
     public static double thaumcraftSaplingDroprate;
     public static int aromaticLumpSwarmerRate;
     public static int thaumcraftNodeMaxSize;
-    public static int thaumcraftEssentiaBeePhialingCabinetTimeBetween;
-    public static int thaumcraftEssentiaBeePhialingCabinetAmount;
-    public static int thaumcraftEssentiaBeePhialingCabinetCapacity;
+    public static int drainerTimeBetween;
+    public static int drainerAmount;
+    public static int drainerCapacity;
 
     public static boolean arsMagicaActive;
     public static boolean baublesActive;
@@ -117,7 +117,7 @@ public class Config {
     public static BlockEffectJar effectJar;
     public static BlockHive hive;
     public static BlockMagicApiary magicApiary;
-    public static BlockPhialingCabinet phialingCabinet;
+    public static BlockApiamancersDrainer apiamancersDrainer;
     public static BlockManaAuraProvider manaAuraProvider;
     public static BlockVisAuraProvider visAuraProvider;
 
@@ -340,28 +340,28 @@ public class Config {
 
         p = configuration.get(
                 CATEGORY_GENERAL,
-                "thaumcraftEssentiaBeePhialingCabinetTimeBetween",
+                "drainerTimeBetween",
                 200,
-                "The time in ticks between Phialing Cabinet essentia generation",
+                "The time in ticks between Apiamancer's Drainer essentia generation",
                 1,
                 32767);
-        thaumcraftEssentiaBeePhialingCabinetTimeBetween = p.getInt(200);
+        drainerTimeBetween = p.getInt(200);
         p = configuration.get(
                 CATEGORY_GENERAL,
-                "thaumcraftEssentiaBeePhialingCabinetAmount",
+                "drainerAmount",
                 1,
-                "The amount that the Phialing Cabinet generates on every round",
+                "The amount that the Apiamancer's Drainer generates on every round",
                 1,
                 32767);
-        thaumcraftEssentiaBeePhialingCabinetAmount = p.getInt(1);
+        drainerAmount = p.getInt(1);
         p = configuration.get(
                 CATEGORY_GENERAL,
-                "thaumcraftEssentiaBeePhialingCabinetCapacity",
+                "drainerCapacity",
                 64,
-                "The amount that the Phialing Cabinet can hold of each aspect",
+                "The amount that the Apiamancer's Drainer can hold of each aspect",
                 1,
                 32767);
-        thaumcraftEssentiaBeePhialingCabinetCapacity = p.getInt(256);
+        drainerCapacity = p.getInt(256);
 
         p = configuration.get(CATEGORY_GENERAL, "moonDialShowText", false);
         p.comment = "set to true to show the current moon phase in mouse-over text.";
@@ -503,9 +503,9 @@ public class Config {
             GameRegistry.registerBlock(visAuraProvider, "visAuraProvider");
             GameRegistry.registerTileEntity(TileEntityVisAuraProvider.class, "visAuraProvider");
 
-            phialingCabinet = new BlockPhialingCabinet();
-            GameRegistry.registerBlock(phialingCabinet, "phialingCabinet");
-            GameRegistry.registerTileEntity(TileEntityPhialingCabinet.class, "phialingCabinet");
+            apiamancersDrainer = new BlockApiamancersDrainer();
+            GameRegistry.registerBlock(apiamancersDrainer, "apiamancersDrainer");
+            GameRegistry.registerTileEntity(TileEntityApiamancersDrainer.class, "apiamancersDrainer");
         }
     }
 

src/main/java/magicbees/main/utils/compat/ThaumcraftHelper.java

@@ -85,7 +85,7 @@ public class ThaumcraftHelper implements IModHelper {
     private static Object visAuraProvider;
     private static Object voidScoop;
     private static Object voidGrafter;
-    private static InfusionRecipe phialingCabinet;
+    private static InfusionRecipe apiamancersDrainer;
 
     public static boolean isActive() {
         return isThaumcraftPresent;
@@ -292,9 +292,9 @@ public class ThaumcraftHelper implements IModHelper {
                 'T',
                 new ItemStack(miscResource, 1, MiscResource.VOID_INGOT.ordinal()));
 
-        phialingCabinet = ThaumcraftApi.addInfusionCraftingRecipe(
-                "MB_PhialingCabinet",
-                new ItemStack(Config.phialingCabinet),
+        apiamancersDrainer = ThaumcraftApi.addInfusionCraftingRecipe(
+                "MB_ApiamancersDrainer",
+                new ItemStack(Config.apiamancersDrainer),
                 6,
                 new AspectList().add(Aspect.ELDRITCH, 10).add(Aspect.EXCHANGE, 20).add(Aspect.VOID, 15),
                 Config.propolis.getStackForType(PropolisType.UNSTABLE),
@@ -544,15 +544,15 @@ public class ThaumcraftHelper implements IModHelper {
                         .setParentsHidden("VISPOWER").registerResearchItem();
 
         new ResearchItem(
-                "MB_PhialingCabinet",
+                "MB_ApiamancersDrainer",
                 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.phialingCabinet))
-                        .setPages(getResearchPage("MB_PhialingCabinet.1"), new ResearchPage(phialingCabinet))
+                new ItemStack(Config.apiamancersDrainer))
+                        .setPages(getResearchPage("MB_ApiamancersDrainer.1"), new ResearchPage(apiamancersDrainer))
                         .setParentsHidden("VOIDMETAL", "ESSENTIARESERVOIR").setConcealed().registerResearchItem();
 
     }

src/main/java/magicbees/tileentity/TileEntityApiamancersDrainer.java

@@ -28,12 +28,12 @@ import thaumcraft.api.aspects.AspectList;
 import thaumcraft.api.aspects.IAspectContainer;
 import thaumcraft.api.aspects.IEssentiaTransport;
 
-public class TileEntityPhialingCabinet extends TileEntity implements IAspectContainer, IEssentiaTransport {
+public class TileEntityApiamancersDrainer extends TileEntity implements IAspectContainer, IEssentiaTransport {
 
     public Aspect aspect;
     public AspectList essentia = new AspectList();
 
-    public final int maxAmount = Config.thaumcraftEssentiaBeePhialingCabinetCapacity;
+    public final int maxAmount = Config.drainerCapacity;
 
     private int increment = 0;
 
@@ -47,7 +47,7 @@ public class TileEntityPhialingCabinet extends TileEntity implements IAspectCont
         // We also don't need to run all the logic if the cabinet is full.
         if (aspect == null || essentia.visSize() == maxAmount) return;
 
-        if (increment >= Config.thaumcraftEssentiaBeePhialingCabinetTimeBetween) {
+        if (increment >= Config.drainerTimeBetween) {
             increment = 0;
             try {
                 IBeeHousing beeHousing = beeHousing();
@@ -74,9 +74,7 @@ public class TileEntityPhialingCabinet extends TileEntity implements IAspectCont
                         IBeeGenome queenGenome = queen.getGenome();
                         float productionMultiplier = modifier.getProductionModifier(queenGenome, 1.0F);
 
-                        int amount = (int) Math.ceil(
-                                Config.thaumcraftEssentiaBeePhialingCabinetAmount
-                                        * Math.max(productionMultiplier, 1.0F));
+                        int amount = (int) Math.ceil(Config.drainerAmount * Math.max(productionMultiplier, 1.0F));
 
                         addToContainer(aspect, amount);
                         drainQueen(beeHousing, modifier, queen);
@@ -92,7 +90,7 @@ public class TileEntityPhialingCabinet extends TileEntity implements IAspectCont
         TileEntity above = worldObj.getTileEntity(this.xCoord, this.yCoord + 1, this.zCoord);
         // TODO: Revert once Industrial Apiary is working
         Set<String> classes = ClassUtils.getAllInterfaces(above.getClass()).stream().map(Class::getName)
-            .collect(Collectors.toSet());
+                .collect(Collectors.toSet());
         LogHelper.warn(classes);
 
         return classes.contains("forestry.api.apiculture.IBeeHousing") ? (IBeeHousing) above : null;