From ae21012d216df71f31aed6fbc9d76215fc24ceed Mon Sep 17 00:00:00 2001 From: Draknyte1 Date: Sat, 4 Mar 2017 12:58:47 +1000 Subject: + New texture for the slow builders ring. + Added the Alkalus Disk. $ Fixed Frame Box Assembler Recipes. $ Fixed Missing 7Li material. $ Fixed Tiered Tanks not showing their capacity in the tooltip. $ Fixed tooltips for alloys containing Bronze or Steel. $ Fixed Clay Pipe Extruder Recipes. - Removed a handful of Plasma cells for misc. materials. % Changed the Industrial Coke Oven's tooltip, to better describe the input/output requirements. % Cleaned up The Entire Project. --- .../xmod/forestry/bees/items/FR_ItemRegistry.java | 10 +-- .../xmod/forestry/bees/items/FR_StringUtil.java | 4 +- .../xmod/forestry/bees/items/MB_FrameType.java | 56 ++++++------- .../xmod/forestry/bees/items/MB_ItemFrame.java | 95 +++++++++++----------- 4 files changed, 83 insertions(+), 82 deletions(-) (limited to 'src/Java/gtPlusPlus/xmod/forestry/bees/items') diff --git a/src/Java/gtPlusPlus/xmod/forestry/bees/items/FR_ItemRegistry.java b/src/Java/gtPlusPlus/xmod/forestry/bees/items/FR_ItemRegistry.java index a4d842edad..f3f4367b75 100644 --- a/src/Java/gtPlusPlus/xmod/forestry/bees/items/FR_ItemRegistry.java +++ b/src/Java/gtPlusPlus/xmod/forestry/bees/items/FR_ItemRegistry.java @@ -9,13 +9,13 @@ * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges ******************************************************************************/ package gtPlusPlus.xmod.forestry.bees.items; +import cpw.mods.fml.common.Optional; +import cpw.mods.fml.common.registry.GameRegistry; import forestry.core.utils.StringUtil; import gtPlusPlus.core.lib.LoadedMods; import net.minecraft.item.*; import net.minecraft.util.WeightedRandomChestContent; import net.minecraftforge.common.ChestGenHooks; -import cpw.mods.fml.common.Optional; -import cpw.mods.fml.common.registry.GameRegistry; public class FR_ItemRegistry { @@ -40,7 +40,7 @@ public class FR_ItemRegistry { @Optional.Method(modid = "Forestry") - public static void Register() { + public static void Register() { //Forestry Frames //frameUntreated = registerItem(new FR_ItemHiveFrame(80, 0.9f), "frameUntreated"); @@ -63,7 +63,7 @@ public class FR_ItemRegistry { 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."); + hiveFrameNova = new MB_ItemFrame(MB_FrameType.NOVA, EnumRarity.epic, "A Creative Only Frame."); } @@ -71,7 +71,7 @@ public class FR_ItemRegistry { } - protected static T registerItem(T item, String name) { + protected static T registerItem(final T item, final String name) { item.setUnlocalizedName(name); GameRegistry.registerItem(item, StringUtil.cleanItemName(item)); return item; diff --git a/src/Java/gtPlusPlus/xmod/forestry/bees/items/FR_StringUtil.java b/src/Java/gtPlusPlus/xmod/forestry/bees/items/FR_StringUtil.java index 69065bec24..e075bf1eda 100644 --- a/src/Java/gtPlusPlus/xmod/forestry/bees/items/FR_StringUtil.java +++ b/src/Java/gtPlusPlus/xmod/forestry/bees/items/FR_StringUtil.java @@ -4,7 +4,7 @@ import net.minecraft.util.StatCollector; public class FR_StringUtil { - public static String getLocalizedString(String key) + public static String getLocalizedString(final String key) { if(StatCollector.canTranslate(key)) { @@ -13,7 +13,7 @@ public class FR_StringUtil return StatCollector.translateToFallback(key); } - public static String getLocalizedString(String key, Object... objects) + public static String getLocalizedString(final String key, final Object... objects) { if(StatCollector.canTranslate(key)) { diff --git a/src/Java/gtPlusPlus/xmod/forestry/bees/items/MB_FrameType.java b/src/Java/gtPlusPlus/xmod/forestry/bees/items/MB_FrameType.java index 5a61c94196..ef3e2f58c3 100644 --- a/src/Java/gtPlusPlus/xmod/forestry/bees/items/MB_FrameType.java +++ b/src/Java/gtPlusPlus/xmod/forestry/bees/items/MB_FrameType.java @@ -6,15 +6,15 @@ 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) + //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) + + + //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), @@ -33,18 +33,18 @@ public enum MB_FrameType implements IBeeModifier 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) { + + MB_FrameType(final String name, final int damage, final float territory, final float mutation, final float lifespan, final float production, final 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) + + MB_FrameType(final String name, final int damage, + final float territory, final float mutation, final float lifespan, final float production, final float flowering, final float geneticDecay, + final boolean sealed, final boolean lit, final boolean sunlit, final boolean hellish) { this.frameName = name; this.maxDamage = damage; - + this.territoryMod = territory; this.mutationMod = mutation; this.lifespanMod = lifespan; @@ -61,59 +61,59 @@ public enum MB_FrameType implements IBeeModifier { return this.frameName; } - + public String getLocalizedName() { return FR_StringUtil.getLocalizedString("frame." + this.frameName); } @Override - public float getTerritoryModifier(IBeeGenome genome, float currentModifier) { - return territoryMod; + public float getTerritoryModifier(final IBeeGenome genome, final float currentModifier) { + return this.territoryMod; } @Override - public float getMutationModifier(IBeeGenome genome, IBeeGenome mate, float currentModifier) { - return mutationMod; + public float getMutationModifier(final IBeeGenome genome, final IBeeGenome mate, final float currentModifier) { + return this.mutationMod; } @Override - public float getLifespanModifier(IBeeGenome genome, IBeeGenome mate, float currentModifier) { - return lifespanMod; + public float getLifespanModifier(final IBeeGenome genome, final IBeeGenome mate, final float currentModifier) { + return this.lifespanMod; } @Override - public float getProductionModifier(IBeeGenome genome, float currentModifier) { - return productionMod; + public float getProductionModifier(final IBeeGenome genome, final float currentModifier) { + return this.productionMod; } @Override - public float getFloweringModifier(IBeeGenome genome, float currentModifier) { - return floweringMod; + public float getFloweringModifier(final IBeeGenome genome, final float currentModifier) { + return this.floweringMod; } @Override - public float getGeneticDecay(IBeeGenome genome, float currentModifier) { - return geneticDecayMod; + public float getGeneticDecay(final IBeeGenome genome, final float currentModifier) { + return this.geneticDecayMod; } @Override public boolean isSealed() { - return isSealed; + return this.isSealed; } @Override public boolean isSelfLighted() { - return isLit; + return this.isLit; } @Override public boolean isSunlightSimulated() { - return isSunlit; + return this.isSunlit; } @Override public boolean isHellish() { - return isHellish; + return this.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 index 1dc6f25d89..6e9a2006d0 100644 --- a/src/Java/gtPlusPlus/xmod/forestry/bees/items/MB_ItemFrame.java +++ b/src/Java/gtPlusPlus/xmod/forestry/bees/items/MB_ItemFrame.java @@ -2,29 +2,29 @@ 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.*; -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.*; import gtPlusPlus.core.creative.AddToCreativeTab; import gtPlusPlus.core.lib.CORE; +import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.*; +import net.minecraft.util.EnumChatFormatting; public class MB_ItemFrame extends Item implements IHiveFrame { - private MB_FrameType type; + private final MB_FrameType type; private EnumRarity rarity_value = EnumRarity.uncommon; private final String toolTip; - public MB_ItemFrame(MB_FrameType frameType, String description) + public MB_ItemFrame(final MB_FrameType frameType, final String description) { this(frameType, EnumRarity.uncommon, description); } - - public MB_ItemFrame(MB_FrameType frameType, EnumRarity rarity, String description) + + public MB_ItemFrame(final MB_FrameType frameType, final EnumRarity rarity, final String description) { super(); this.type = frameType; @@ -36,26 +36,26 @@ public class MB_ItemFrame extends Item implements IHiveFrame 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); + public void addInformation(final ItemStack stack, final EntityPlayer aPlayer, final List list, final boolean bool) { + if ((this.toolTip != "") || !this.toolTip.equals("")){ + list.add(EnumChatFormatting.GRAY+this.toolTip); } super.addInformation(stack, aPlayer, list, bool); - } - + } + @Override @SideOnly(Side.CLIENT) - public void registerIcons(IIconRegister par1IconRegister) + public void registerIcons(final IIconRegister par1IconRegister) { - this.itemIcon = par1IconRegister.registerIcon(CORE.MODID + ":frame" + type.getName()); + this.itemIcon = par1IconRegister.registerIcon(CORE.MODID + ":frame" + this.type.getName()); } - + // --------- IHiveFrame functions ----------------------------------------- - + @Override - public ItemStack frameUsed(IBeeHousing housing, ItemStack frame, IBee queen, int wear) { + public ItemStack frameUsed(final IBeeHousing housing, ItemStack frame, final IBee queen, final int wear) { frame.setItemDamage(frame.getItemDamage() + wear); if (frame.getItemDamage() >= frame.getMaxDamage()) { @@ -65,70 +65,71 @@ public class MB_ItemFrame extends Item implements IHiveFrame return frame; } - - + + @Override @SideOnly(Side.CLIENT) - public EnumRarity getRarity(ItemStack par1ItemStack){ - return rarity_value; + public EnumRarity getRarity(final ItemStack par1ItemStack){ + return this.rarity_value; } - + @Override - public boolean hasEffect(ItemStack par1ItemStack){ - if (rarity_value == EnumRarity.uncommon || rarity_value == EnumRarity.common){ + public boolean hasEffect(final ItemStack par1ItemStack){ + if ((this.rarity_value == EnumRarity.uncommon) || (this.rarity_value == EnumRarity.common)){ return false; } return true; } + @Override public IBeeModifier getBeeModifier() { - return type; + return this.type; } - + @Override - public boolean isBookEnchantable(ItemStack itemstack1, ItemStack itemstack2) + public boolean isBookEnchantable(final ItemStack itemstack1, final ItemStack itemstack2) { return false; } - - public float getTerritoryModifier(IBeeGenome genome, float currentModifier) { - return type.getTerritoryModifier(genome, currentModifier); + + public float getTerritoryModifier(final IBeeGenome genome, final float currentModifier) { + return this.type.getTerritoryModifier(genome, currentModifier); } - public float getMutationModifier(IBeeGenome genome, IBeeGenome mate, float currentModifier) { - return type.getMutationModifier(genome, mate, currentModifier); + public float getMutationModifier(final IBeeGenome genome, final IBeeGenome mate, final float currentModifier) { + return this.type.getMutationModifier(genome, mate, currentModifier); } - public float getLifespanModifier(IBeeGenome genome, IBeeGenome mate, float currentModifier) { - return type.getLifespanModifier(genome, mate, currentModifier); + public float getLifespanModifier(final IBeeGenome genome, final IBeeGenome mate, final float currentModifier) { + return this.type.getLifespanModifier(genome, mate, currentModifier); } - public float getProductionModifier(IBeeGenome genome, float currentModifier) { - return type.getProductionModifier(genome, currentModifier); + public float getProductionModifier(final IBeeGenome genome, final float currentModifier) { + return this.type.getProductionModifier(genome, currentModifier); } - public float getFloweringModifier(IBeeGenome genome, float currentModifier) { - return type.getFloweringModifier(genome, currentModifier); + public float getFloweringModifier(final IBeeGenome genome, final float currentModifier) { + return this.type.getFloweringModifier(genome, currentModifier); } - public float getGeneticDecay(IBeeGenome genome, float currentModifier) { - return type.getGeneticDecay(genome, currentModifier); + public float getGeneticDecay(final IBeeGenome genome, final float currentModifier) { + return this.type.getGeneticDecay(genome, currentModifier); } public boolean isSealed() { - return type.isSealed(); + return this.type.isSealed(); } public boolean isSelfLighted() { - return type.isSelfLighted(); + return this.type.isSelfLighted(); } public boolean isSunlightSimulated() { - return type.isSunlightSimulated(); + return this.type.isSunlightSimulated(); } - + public boolean isHellish(){ - return type.isHellish(); + return this.type.isHellish(); } } -- cgit