Renaming Thaumic Apiary to Magic Apiary.

This commit is contained in:
MysteriousAges committed 2015-03-20 16:52:42 -07:00
1 parent 4f39132e4e
commit cc987d6ac8
8 files changed
+32 -35

No files matched your search

@@ -6,7 +6,7 @@ import magicbees.client.gui.UIScreens;
import magicbees.main.CommonProxy;
import magicbees.main.MagicBees;
import magicbees.main.utils.TabMagicBees;
import magicbees.tileentity.TileEntityThaumicApiary;
import magicbees.tileentity.TileEntityMagicApiary;
import net.minecraft.block.Block;
import net.minecraft.block.BlockContainer;
import net.minecraft.block.material.Material;
@@ -21,16 +21,16 @@ import net.minecraft.world.World;
import javax.swing.*;
public class BlockThaumicApiary extends BlockContainer
public class BlockMagicApiary extends BlockContainer
{
@SideOnly(Side.CLIENT)
private IIcon[] icons;
public BlockThaumicApiary()
public BlockMagicApiary()
{
super(Material.wood);
this.setCreativeTab(TabMagicBees.tabMagicBees);
this.setBlockName("thaumicApiary");
this.setBlockName("magicApiary");
this.setHardness(1f);
this.setResistance(1.5f);
this.setHarvestLevel("axe", 0);
@@ -79,7 +79,7 @@ public class BlockThaumicApiary extends BlockContainer
@Override
public TileEntity createNewTileEntity(World world, int metadata) {
return new TileEntityThaumicApiary();
return new TileEntityMagicApiary();
}
@Override
@@ -3,16 +3,16 @@ package magicbees.client.gui;
import forestry.api.apiculture.IHiveFrame;
import forestry.plugins.PluginApiculture;
import magicbees.main.utils.ItemInterface;
import magicbees.tileentity.TileEntityThaumicApiary;
import magicbees.tileentity.TileEntityMagicApiary;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.entity.player.InventoryPlayer;
import net.minecraft.inventory.ICrafting;
import net.minecraft.inventory.Slot;
import net.minecraft.item.ItemStack;
public class ContainerThaumicApiary extends ContainerMB {
public class ContainerMagicApiary extends ContainerMB {
public TileEntityThaumicApiary apiary;
public TileEntityMagicApiary apiary;
public int maxSlot = 0;
// Constants
@@ -23,7 +23,7 @@ public class ContainerThaumicApiary extends ContainerMB {
private static final int SLOT_FRAME_COUNT = 3;
private static final int SLOT_INVENTORY_COUNT = 7;
public ContainerThaumicApiary(InventoryPlayer inventoryPlayer, TileEntityThaumicApiary thaumicApiary){
public ContainerMagicApiary(InventoryPlayer inventoryPlayer, TileEntityMagicApiary thaumicApiary){
this.apiary = thaumicApiary;
// Queen/Princess slot
@@ -1,7 +1,7 @@
package magicbees.client.gui;
import magicbees.tileentity.TileEntityEffectJar;
import magicbees.tileentity.TileEntityThaumicApiary;
import magicbees.tileentity.TileEntityMagicApiary;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.world.World;
@@ -21,8 +21,8 @@ public class GUIHandler implements IGuiHandler
}
else if (ID == UIScreens.THAUMIC_APIARY.ordinal())
{
TileEntityThaumicApiary tileEntityThaumicApiary = (TileEntityThaumicApiary) world.getTileEntity(x, y, z);
value = new ContainerThaumicApiary(player.inventory, tileEntityThaumicApiary);
TileEntityMagicApiary tileEntityThaumicApiary = (TileEntityMagicApiary) world.getTileEntity(x, y, z);
value = new ContainerMagicApiary(player.inventory, tileEntityThaumicApiary);
}
return value;
@@ -38,8 +38,8 @@ public class GUIHandler implements IGuiHandler
value = new GUIEffectJar((TileEntityEffectJar)world.getTileEntity(x, y, z), player);
}else if (ID == UIScreens.THAUMIC_APIARY.ordinal())
{
TileEntityThaumicApiary tileEntityThaumicApiary = (TileEntityThaumicApiary) world.getTileEntity(x, y, z);
value = new GuiThaumicApiary(player.inventory, tileEntityThaumicApiary);
TileEntityMagicApiary tileEntityThaumicApiary = (TileEntityMagicApiary) world.getTileEntity(x, y, z);
value = new GuiMagicApiary(player.inventory, tileEntityThaumicApiary);
}
return value;
@@ -3,7 +3,7 @@ package magicbees.client.gui;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import magicbees.main.CommonProxy;
import magicbees.tileentity.TileEntityThaumicApiary;
import magicbees.tileentity.TileEntityMagicApiary;
import net.minecraft.client.gui.inventory.GuiContainer;
import net.minecraft.entity.player.InventoryPlayer;
import net.minecraft.inventory.Container;
@@ -12,7 +12,7 @@ import net.minecraft.util.ResourceLocation;
import org.lwjgl.opengl.GL11;
@SideOnly(Side.CLIENT)
public class GuiThaumicApiary extends GuiContainer
public class GuiMagicApiary extends GuiContainer
{
public static final ResourceLocation BACKGROUND_LOCATION = new ResourceLocation(CommonProxy.DOMAIN, CommonProxy.GUI_TEXTURE + "apiary.png");
@@ -53,8 +53,8 @@ public class GuiThaumicApiary extends GuiContainer
private static final int MUTATIONBOOST_SRC_X = 176;
private static final int MUTATIONBOOST_SRC_Y = 71;
public GuiThaumicApiary(InventoryPlayer inventoryPlayer, TileEntityThaumicApiary thaumicApiary) {
super(new ContainerThaumicApiary(inventoryPlayer, thaumicApiary));
public GuiMagicApiary(InventoryPlayer inventoryPlayer, TileEntityMagicApiary thaumicApiary) {
super(new ContainerMagicApiary(inventoryPlayer, thaumicApiary));
this.xSize = WIDTH;
this.ySize = HEIGHT;
@@ -73,7 +73,7 @@ public class GuiThaumicApiary extends GuiContainer
this.drawTexturedModalRect(guiLeft, guiTop, 0, 0, xSize, ySize);
TileEntityThaumicApiary apiary = ((ContainerThaumicApiary)this.inventorySlots).apiary;
TileEntityMagicApiary apiary = ((ContainerMagicApiary)this.inventorySlots).apiary;
drawLifebar(apiary);
@@ -82,35 +82,35 @@ public class GuiThaumicApiary extends GuiContainer
drawMutationIcon(apiary);
}
private void drawMutationIcon(TileEntityThaumicApiary apiary) {
private void drawMutationIcon(TileEntityMagicApiary apiary) {
if (apiary.isMutationBoosted()) {
this.drawTexturedModalRect(this.guiLeft + MUTATIONBOOST_DEST_X, this.guiTop + MUTATIONBOOST_DEST_Y,
MUTATIONBOOST_SRC_X, MUTATIONBOOST_SRC_Y, MUTATIONBOOST_WIDTH, MUTATIONBOOST_HEIGHT);
}
}
private void drawDeathRateIcon(TileEntityThaumicApiary apiary) {
private void drawDeathRateIcon(TileEntityMagicApiary apiary) {
if (apiary.isDeathRateBoosted()) {
this.drawTexturedModalRect(this.guiLeft + DEATHBOOST_DEST_X, this.guiTop + DEATHBOOST_DEST_Y,
DEATHBOOST_SRC_X, DEATHBOOST_SRC_Y, DEATHBOOST_WIDTH, DEATHBOOST_HEIGHT);
}
}
private void drawWorkBoostIcon(TileEntityThaumicApiary apiary) {
private void drawWorkBoostIcon(TileEntityMagicApiary apiary) {
if (apiary.isWorkBoosted()) {
this.drawTexturedModalRect(this.guiLeft + WORKBOOST_DEST_X, this.guiTop + WORKBOOST_DEST_Y,
WORKBOOST_SRC_X, WORKBOOST_SRC_Y, WORKBOOST_WIDTH, WORKBOOST_HEIGHT);
}
}
private void drawLifebar(TileEntityThaumicApiary apiary) {
private void drawLifebar(TileEntityMagicApiary apiary) {
int value = LIFEBAR_HEIGHT - apiary.getHealthScaled(LIFEBAR_HEIGHT);
int lifebarSrc = getLifebarSrc(apiary);
this.drawTexturedModalRect(this.guiLeft + LIFEBAR_DEST_X, this.guiTop + value + LIFEBAR_DEST_Y,
lifebarSrc, LIFEBAR_SRC_Y, LIFEBAR_WIDTH, LIFEBAR_HEIGHT - value);
}
private int getLifebarSrc(TileEntityThaumicApiary apiary) {
private int getLifebarSrc(TileEntityMagicApiary apiary) {
int value = apiary.getHealthScaled(5);
if (value >= 5) {
return LIFEBAR_SRC_STAGE1_X;
+4 -4
View File
@@ -35,7 +35,7 @@ import magicbees.main.utils.VersionInfo;
import magicbees.main.utils.compat.ThaumcraftHelper;
import magicbees.storage.BackpackDefinition;
import magicbees.tileentity.TileEntityEffectJar;
import magicbees.tileentity.TileEntityThaumicApiary;
import magicbees.tileentity.TileEntityMagicApiary;
import net.minecraft.block.Block;
import net.minecraft.item.Item;
import net.minecraft.item.ItemFood;
@@ -92,7 +92,7 @@ public class Config
public static BlockWoodSlab slabWoodFull;
public static BlockEffectJar effectJar;
public static BlockHive hive;
public static BlockThaumicApiary thaumicApiary;
public static BlockMagicApiary thaumicApiary;
public static ItemComb combs;
public static ItemWax wax;
@@ -391,9 +391,9 @@ public class Config
}
private void setupApiary() {
thaumicApiary = new BlockThaumicApiary();
thaumicApiary = new BlockMagicApiary();
GameRegistry.registerBlock(thaumicApiary, "thaumicApiary");
GameRegistry.registerTileEntity(TileEntityThaumicApiary.class, TileEntityThaumicApiary.tileEntityName);
GameRegistry.registerTileEntity(TileEntityMagicApiary.class, TileEntityMagicApiary.tileEntityName);
}
private void setupFrames() {
@@ -30,9 +30,9 @@ import forestry.api.core.IErrorState;
import forestry.api.genetics.IIndividual;
import forestry.core.utils.Utils;
public class TileEntityThaumicApiary extends TileEntity implements ISidedInventory, IBeeHousing {
public class TileEntityMagicApiary extends TileEntity implements ISidedInventory, IBeeHousing {
public static final String tileEntityName = CommonProxy.DOMAIN + ".thaumicApiary";
public static final String tileEntityName = CommonProxy.DOMAIN + ".magicApiary";
private GameProfile ownerProfile;
// Constants
@@ -53,7 +53,7 @@ public class TileEntityThaumicApiary extends TileEntity implements ISidedInvento
private ItemStack[] items;
public TileEntityThaumicApiary(){
public TileEntityMagicApiary(){
items = new ItemStack[12];
logic = BeeManager.beeRoot.createBeekeepingLogic(this);
}
@@ -10,11 +10,8 @@ item.magicbees:mysteriousMagnet.name=Mysterious Magnet
item.moonDial.name=Jade Moon Dial
#Tiles
tile.planks.greatwood.name=Greatwood Planks
tile.slab.wood.greatwood.name=Greatwood Slab
tile.planks.silverwood.name=Silverwood Planks
tile.slab.wood.silverwood.name=Silverwood Slab
tile.effectJar.name=Bee Collector's Jar
tile.magicApiary.name=Magic Apiary
tile.hive.curious.name=Curious Hive
tile.hive.unusual.name=Unusual Hive
tile.hive.deep.name=Deep Hive
Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.2 KiB

After

Width:  |  Height:  |  Size: 1.2 KiB