% Refactored the entire project to stop using MiscUtils everywhere possible, now it's gtPlusPlus.

4 files changed, 380 insertions, 0 deletions

diff --git a/src/Java/gtPlusPlus/xmod/forestry/bees/items/FR_ItemRegistry.java b/src/Java/gtPlusPlus/xmod/forestry/bees/items/FR_ItemRegistry.java
new file mode 100644
index 0000000000..edd04661d7
--- /dev/null
+++ b/src/Java/gtPlusPlus/xmod/forestry/bees/items/FR_ItemRegistry.java
@@ -0,0 +1,97 @@
+/*******************************************************************************
+ * Copyright (c) 2011-2014 SirSengir.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the GNU Lesser Public License v3
+ * which accompanies this distribution, and is available at
+ * http://www.gnu.org/licenses/lgpl-3.0.txt
+ *
+ * Various Contributors including, but not limited to:
+ * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges
+ ******************************************************************************/
+package gtPlusPlus.xmod.forestry.bees.items;
+import net.minecraft.block.Block;
+import net.minecraft.item.EnumRarity;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemBlock;
+import net.minecraft.item.ItemStack;
+import net.minecraft.util.WeightedRandomChestContent;
+import net.minecraftforge.common.ChestGenHooks;
+import cpw.mods.fml.common.registry.GameRegistry;
+import forestry.core.items.ItemBlockForestry;
+import forestry.core.utils.StringUtil;
+import gtPlusPlus.core.lib.CORE;
+import gtPlusPlus.core.lib.LoadedMods;
+import gtPlusPlus.xmod.forestry.bees.alveary.FR_BlockAlveary;
+
+public class FR_ItemRegistry {
+
+
+	//----- Apiary Frames ----------------------
+	//public static FR_ItemHiveFrame frameUntreated;
+	//public static FR_ItemHiveFrame frameImpregnated;
+	//public static FR_ItemHiveFrame frameProven;
+
+	//Magic Bee Frame Items
+	public static MB_ItemFrame hiveFrameAccelerated;
+	public static MB_ItemFrame hiveFrameVoid;
+	public static MB_ItemFrame hiveFrameMutagenic;
+	public static MB_ItemFrame haveFrameBusy;
+
+	//Extra Bee Frame Items
+	public static MB_ItemFrame hiveFrameCocoa;
+	public static MB_ItemFrame hiveFrameCaged;
+	public static MB_ItemFrame hiveFrameSoul;
+	public static MB_ItemFrame hiveFrameClay;
+	public static MB_ItemFrame hiveFrameNova;
+
+	//Alveary Stuff
+	public static FR_BlockAlveary alveary;
+
+	public static void Register() {		
+
+		//Forestry Frames
+		//frameUntreated = registerItem(new FR_ItemHiveFrame(80, 0.9f), "frameUntreated");
+		//frameImpregnated = registerItem(new FR_ItemHiveFrame(240, 0.4f), "frameImpregnated");
+		//frameProven = registerItem(new FR_ItemHiveFrame(720, 0.3f), "frameProven");
+
+		//Magic Bee like Frames
+		hiveFrameAccelerated = new MB_ItemFrame(MB_FrameType.ACCELERATED, "Longevity for bees isn't very common.");
+		hiveFrameVoid = new MB_ItemFrame(MB_FrameType.VOID, EnumRarity.rare, "??? (Dungeon Loot)");
+		hiveFrameMutagenic = new MB_ItemFrame(MB_FrameType.MUTAGENIC, EnumRarity.epic, "Evolution of the fitest, finest and fastest.");
+		haveFrameBusy = new MB_ItemFrame(MB_FrameType.BUSY, "Busy bee, Busy Bee, make more honey please for me.");
+		ChestGenHooks.addItem(ChestGenHooks.STRONGHOLD_CORRIDOR, new WeightedRandomChestContent(new ItemStack(hiveFrameVoid), 1, 1, 18));
+		ChestGenHooks.addItem(ChestGenHooks.STRONGHOLD_LIBRARY, new WeightedRandomChestContent(new ItemStack(hiveFrameVoid), 1, 3, 23));
+		ChestGenHooks.addItem(ChestGenHooks.PYRAMID_DESERT_CHEST, new WeightedRandomChestContent(new ItemStack(hiveFrameMutagenic), 1, 1, 18));
+		ChestGenHooks.addItem(ChestGenHooks.PYRAMID_JUNGLE_CHEST, new WeightedRandomChestContent(new ItemStack(hiveFrameMutagenic), 1, 3, 23));
+
+		//Extra Bee like Frames
+		if (!LoadedMods.ExtraBees){
+			hiveFrameCocoa = new MB_ItemFrame(MB_FrameType.COCOA, EnumRarity.common, "");
+			hiveFrameCaged = new MB_ItemFrame(MB_FrameType.CAGE, EnumRarity.common, "");
+			hiveFrameSoul = new MB_ItemFrame(MB_FrameType.SOUL, EnumRarity.common, "");
+			hiveFrameClay = new MB_ItemFrame(MB_FrameType.CLAY, EnumRarity.common, "");
+			hiveFrameNova = new MB_ItemFrame(MB_FrameType.NOVA, EnumRarity.epic, "A Creative Only Frame.");
+			if (CORE.configSwitches.enableCustomAlvearyBlocks){
+				alveary = registerBlock(new FR_BlockAlveary(), ItemBlockForestry.class, "alveary");
+			}
+		}
+
+
+
+
+	}
+
+	protected static <T extends Item> T registerItem(T item, String name) {
+		item.setUnlocalizedName(name);
+		GameRegistry.registerItem(item, StringUtil.cleanItemName(item));
+		return item;
+	}
+
+	protected static <T extends Block> T registerBlock(T block, Class<? extends ItemBlock> itemClass, String name, Object... itemCtorArgs) {
+		block.setBlockName("for." + name);
+		GameRegistry.registerBlock(block, itemClass, StringUtil.cleanBlockName(block), itemCtorArgs);
+		return block;
+	}
+}
+
+
diff --git a/src/Java/gtPlusPlus/xmod/forestry/bees/items/FR_StringUtil.java b/src/Java/gtPlusPlus/xmod/forestry/bees/items/FR_StringUtil.java
new file mode 100644
index 0000000000..69065bec24
--- /dev/null
+++ b/src/Java/gtPlusPlus/xmod/forestry/bees/items/FR_StringUtil.java
@@ -0,0 +1,24 @@
+package gtPlusPlus.xmod.forestry.bees.items;
+
+import net.minecraft.util.StatCollector;
+
+public class FR_StringUtil
+{
+	public static String getLocalizedString(String key)
+	{
+		if(StatCollector.canTranslate(key))
+		{
+			return StatCollector.translateToLocal(key);
+		}
+		return StatCollector.translateToFallback(key);
+	}
+
+	public static String getLocalizedString(String key, Object... objects)
+	{
+		if(StatCollector.canTranslate(key))
+		{
+			return String.format(StatCollector.translateToLocal(key), objects);
+		}
+		return String.format(StatCollector.translateToFallback(key), objects);
+	}
+}
diff --git a/src/Java/gtPlusPlus/xmod/forestry/bees/items/MB_FrameType.java b/src/Java/gtPlusPlus/xmod/forestry/bees/items/MB_FrameType.java
new file mode 100644
index 0000000000..5a61c94196
--- /dev/null
+++ b/src/Java/gtPlusPlus/xmod/forestry/bees/items/MB_FrameType.java
@@ -0,0 +1,119 @@
+package gtPlusPlus.xmod.forestry.bees.items;
+
+import forestry.api.apiculture.IBeeGenome;
+import forestry.api.apiculture.IBeeModifier;
+
+public enum MB_FrameType implements IBeeModifier
+{
+	//ExtraBees Clone Frames
+	//Name, FrameHP, territory (1f), Mutation rate, lifespan rate, production rate, genetic decay (1f)	
+	COCOA("Chocolate", 240, 1.0f, 1.0f, 0.50f, 1.50f, 1f),
+	CAGE("Restraint",  240, 0.5f, 1.0f, 0.75f, 0.75f, 1f),
+	SOUL("Soul", 	   80,  1.0f, 1.5f, 0.75f, 0.25f, 1f),
+	CLAY("Healing",    240, 1.0f, 0.5f, 1.50f, 0.75f, 1f),
+	NOVA("Nova",       240, 1.0f, 100.0f, 0.0001f, 1.00f, 1f),
+	
+	
+	//Name, FrameHP, territory (1f), Mutation rate, lifespan rate, production rate, genetic decay (1f)	
+	ACCELERATED("Accelerated", 175, 1f, 2.5f, 0.9f, 1.8f, 1f),
+	VOID("Void", 20, 1f, 1f, 0.0001f, 10f, 1f),
+	MUTAGENIC("Mutagenic", 3, 1f, 10f, 0.0001f, 10f, 1f),
+	BUSY("Busy", 2000, 1f, 0f, 3f, 4f, 1f);
+
+	private final String frameName;
+	public final int maxDamage;
+
+	private final float territoryMod;
+	private final float mutationMod;
+	private final float lifespanMod;
+	private final float productionMod;
+	private final float floweringMod;
+	private final float geneticDecayMod;
+	private final boolean isSealed;
+	private final boolean isLit;
+	private final boolean isSunlit;
+	private final boolean isHellish;
+	
+	MB_FrameType(String name, int damage, float territory, float mutation, float lifespan, float production, float geneticDecay) {
+		this(name, damage, territory, mutation, lifespan, production, 1f, geneticDecay, false, false, false, false);
+	}
+	
+	MB_FrameType(String name, int damage,
+						  float territory, float mutation, float lifespan, float production, float flowering, float geneticDecay,
+						  boolean sealed, boolean lit, boolean sunlit, boolean hellish)
+	{
+		this.frameName = name;
+		this.maxDamage = damage;
+		
+		this.territoryMod = territory;
+		this.mutationMod = mutation;
+		this.lifespanMod = lifespan;
+		this.productionMod = production;
+		this.floweringMod = flowering;
+		this.geneticDecayMod = geneticDecay;
+		this.isSealed = sealed;
+		this.isLit = lit;
+		this.isSunlit = sunlit;
+		this.isHellish = hellish;
+	}
+
+	public String getName()
+	{
+		return this.frameName;
+	}
+	
+	public String getLocalizedName()
+	{
+		return FR_StringUtil.getLocalizedString("frame." + this.frameName);
+	}
+
+	@Override
+	public float getTerritoryModifier(IBeeGenome genome, float currentModifier) {
+		return territoryMod;
+	}
+
+	@Override
+	public float getMutationModifier(IBeeGenome genome, IBeeGenome mate, float currentModifier) {
+		return mutationMod;
+	}
+
+	@Override
+	public float getLifespanModifier(IBeeGenome genome, IBeeGenome mate, float currentModifier) {
+		return lifespanMod;
+	}
+
+	@Override
+	public float getProductionModifier(IBeeGenome genome, float currentModifier) {
+		return productionMod;
+	}
+
+	@Override
+	public float getFloweringModifier(IBeeGenome genome, float currentModifier) {
+		return floweringMod;
+	}
+
+	@Override
+	public float getGeneticDecay(IBeeGenome genome, float currentModifier) {
+		return geneticDecayMod;
+	}
+
+	@Override
+	public boolean isSealed() {
+		return isSealed;
+	}
+
+	@Override
+	public boolean isSelfLighted() {
+		return isLit;
+	}
+
+	@Override
+	public boolean isSunlightSimulated() {
+		return isSunlit;
+	}
+
+	@Override
+	public boolean isHellish() {
+		return isHellish;
+	}
+}
diff --git a/src/Java/gtPlusPlus/xmod/forestry/bees/items/MB_ItemFrame.java b/src/Java/gtPlusPlus/xmod/forestry/bees/items/MB_ItemFrame.java
new file mode 100644
index 0000000000..0f0e7d3109
--- /dev/null
+++ b/src/Java/gtPlusPlus/xmod/forestry/bees/items/MB_ItemFrame.java
@@ -0,0 +1,140 @@
+package gtPlusPlus.xmod.forestry.bees.items;
+
+import java.util.List;
+
+import net.minecraft.client.renderer.texture.IIconRegister;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.item.EnumRarity;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
+import net.minecraft.util.EnumChatFormatting;
+import cpw.mods.fml.common.registry.GameRegistry;
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import forestry.api.apiculture.IBee;
+import forestry.api.apiculture.IBeeGenome;
+import forestry.api.apiculture.IBeeHousing;
+import forestry.api.apiculture.IBeeModifier;
+import forestry.api.apiculture.IHiveFrame;
+import gtPlusPlus.core.creative.AddToCreativeTab;
+import gtPlusPlus.core.lib.CORE;
+
+public class MB_ItemFrame extends Item implements IHiveFrame
+{
+	private MB_FrameType type;
+	private EnumRarity rarity_value = EnumRarity.uncommon;
+	private final String toolTip;
+
+	public MB_ItemFrame(MB_FrameType frameType, String description)
+	{
+		this(frameType, EnumRarity.uncommon, description);
+	}
+	
+	public MB_ItemFrame(MB_FrameType frameType, EnumRarity rarity, String description)
+	{
+		super();
+		this.type = frameType;
+		this.setMaxDamage(this.type.maxDamage);
+		this.setMaxStackSize(1);
+		this.setCreativeTab(AddToCreativeTab.tabMisc);
+		this.setUnlocalizedName("frame" + frameType.getName());
+		this.rarity_value = rarity;
+		this.toolTip = description;
+		GameRegistry.registerItem(this, "frame" + frameType.getName());
+	}
+	
+	@Override
+	public void addInformation(ItemStack stack, EntityPlayer aPlayer, List list, boolean bool) {
+		if (toolTip != "" || !toolTip.equals("")){			
+		list.add(EnumChatFormatting.GRAY+toolTip);
+		}
+		super.addInformation(stack, aPlayer, list, bool);
+	}	
+	
+	@Override
+	@SideOnly(Side.CLIENT)
+	public void registerIcons(IIconRegister par1IconRegister)
+	{
+		this.itemIcon = par1IconRegister.registerIcon(CORE.MODID + ":frame" + type.getName());
+	}
+	
+	// --------- IHiveFrame functions -----------------------------------------
+	
+	@Override
+	public ItemStack frameUsed(IBeeHousing housing, ItemStack frame, IBee queen, int wear) {
+		frame.setItemDamage(frame.getItemDamage() + wear);
+
+		if (frame.getItemDamage() >= frame.getMaxDamage()) {
+			// Break the frame.
+			frame = null;
+		}
+
+		return frame;
+	}
+	
+	
+	@Override
+	@SideOnly(Side.CLIENT)
+	public EnumRarity getRarity(ItemStack par1ItemStack){
+		return rarity_value;
+	}
+	
+	@Override
+	public boolean hasEffect(ItemStack par1ItemStack){
+		if (rarity_value == EnumRarity.uncommon || rarity_value == EnumRarity.common){
+			return false;
+		}
+		return true;
+	}
+
+	public IBeeModifier getBeeModifier() {
+		return type;
+	}
+	
+	@Override
+	public boolean isBookEnchantable(ItemStack itemstack1, ItemStack itemstack2)
+	{
+		return false;
+	}
+	
+	public float getTerritoryModifier(IBeeGenome genome, float currentModifier) {
+		return type.getTerritoryModifier(genome, currentModifier);
+	}
+
+	public float getMutationModifier(IBeeGenome genome, IBeeGenome mate, float currentModifier) {
+		return type.getMutationModifier(genome, mate, currentModifier);
+	}
+
+	public float getLifespanModifier(IBeeGenome genome, IBeeGenome mate, float currentModifier) {
+		return type.getLifespanModifier(genome, mate, currentModifier);
+	}
+
+	public float getProductionModifier(IBeeGenome genome, float currentModifier) {
+		return type.getProductionModifier(genome, currentModifier);
+	}
+
+	public float getFloweringModifier(IBeeGenome genome, float currentModifier) {
+		return type.getFloweringModifier(genome, currentModifier);
+	}
+
+	public float getGeneticDecay(IBeeGenome genome, float currentModifier) {
+		return type.getGeneticDecay(genome, currentModifier);
+	}
+
+	public boolean isSealed() {
+		return type.isSealed();
+	}
+
+	public boolean isSelfLighted() {
+		return type.isSelfLighted();
+	}
+
+	public boolean isSunlightSimulated() {
+		return type.isSunlightSimulated();
+	}
+	
+	public boolean isHellish(){
+		return type.isHellish();
+	}
+
+}