Improve code readability in binnie.extrabees package and other packages

* Improve code readability in binnie.extrabees package and other packages
* Fix compile error after refactoring
This commit is contained in:
Alexander Kornilov authored and marcin212 committed 2017-04-29 13:43:35 +02:00
1 parent b609d6688f
commit c09ad04284
95 files changed
+3916 -3900

No files matched your search

@@ -1,67 +1,56 @@
//
// Decompiled by Procyon v0.5.30
//
package binnie.extrabees.apiary;
import binnie.extrabees.ExtraBees;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import binnie.extrabees.ExtraBees;
import net.minecraft.client.renderer.texture.IIconRegister;
import forestry.api.apiculture.IBee;
import forestry.api.apiculture.IBeeHousing;
import forestry.api.apiculture.IBeeGenome;
import forestry.api.apiculture.IBeeHousing;
import forestry.api.apiculture.IBeeModifier;
import forestry.api.apiculture.IHiveFrame;
import forestry.api.core.Tabs;
import net.minecraft.client.renderer.texture.IIconRegister;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import forestry.api.apiculture.IHiveFrame;
public class ItemHiveFrame extends Item implements IHiveFrame, IBeeModifier {
protected EnumHiveFrame frame;
import net.minecraft.item.Item;
public class ItemHiveFrame extends Item implements IHiveFrame, IBeeModifier
{
EnumHiveFrame frame;
@Override
public String getItemStackDisplayName(final ItemStack par1ItemStack) {
return this.frame.getName();
}
public ItemHiveFrame(final EnumHiveFrame frame) {
public ItemHiveFrame(EnumHiveFrame frame) {
this.frame = frame;
this.setMaxDamage(frame.maxDamage);
this.setCreativeTab(Tabs.tabApiculture);
this.setMaxStackSize(1);
this.setUnlocalizedName("hiveFrame");
setMaxDamage(frame.maxDamage);
setCreativeTab(Tabs.tabApiculture);
setMaxStackSize(1);
setUnlocalizedName("hiveFrame");
}
@Override
public float getTerritoryModifier(final IBeeGenome genome, final float currentModifier) {
return this.frame.getTerritoryModifier(genome, currentModifier);
public String getItemStackDisplayName(ItemStack par1ItemStack) {
return frame.getName();
}
@Override
public float getMutationModifier(final IBeeGenome genome, final IBeeGenome mate, final float currentModifier) {
return this.frame.getMutationModifier(genome, mate, currentModifier);
public float getTerritoryModifier(IBeeGenome genome, float currentModifier) {
return frame.getTerritoryModifier(genome, currentModifier);
}
@Override
public float getLifespanModifier(final IBeeGenome genome, final IBeeGenome mate, final float currentModifier) {
return this.frame.getLifespanModifier(genome, mate, currentModifier);
public float getMutationModifier(IBeeGenome genome, IBeeGenome mate, float currentModifier) {
return frame.getMutationModifier(genome, mate, currentModifier);
}
@Override
public float getProductionModifier(final IBeeGenome genome, final float currentModifier) {
return this.frame.getProductionModifier(genome, currentModifier);
public float getLifespanModifier(IBeeGenome genome, IBeeGenome mate, float currentModifier) {
return frame.getLifespanModifier(genome, mate, currentModifier);
}
@Override
public ItemStack frameUsed(final IBeeHousing housing, final ItemStack frame, final IBee queen, final int wear) {
public float getProductionModifier(IBeeGenome genome, float currentModifier) {
return frame.getProductionModifier(genome, currentModifier);
}
@Override
public ItemStack frameUsed(IBeeHousing housing, ItemStack frame, IBee queen, int wear) {
frame.setItemDamage(frame.getItemDamage() + wear);
if (frame.getItemDamage() >= frame.getMaxDamage()) {
return null;
@@ -70,7 +59,7 @@ public class ItemHiveFrame extends Item implements IHiveFrame, IBeeModifier
}
@Override
public float getFloweringModifier(final IBeeGenome genome, final float currentModifier) {
public float getFloweringModifier(IBeeGenome genome, float currentModifier) {
return 1.0f;
}
@@ -96,12 +85,12 @@ public class ItemHiveFrame extends Item implements IHiveFrame, IBeeModifier
@Override
@SideOnly(Side.CLIENT)
public void registerIcons(final IIconRegister register) {
this.itemIcon = ExtraBees.proxy.getIcon(register, "frame" + this.frame.toString());
public void registerIcons(IIconRegister register) {
itemIcon = ExtraBees.proxy.getIcon(register, "frame" + frame.toString());
}
@Override
public float getGeneticDecay(final IBeeGenome genome, final float currentModifier) {
public float getGeneticDecay(IBeeGenome genome, float currentModifier) {
return 1.0f;
}