mirror of
https://github.com/GTNewHorizons/Binnie.git
synced 2026-11-19 03:49:07 +00:00
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:
1 parent
b609d6688f
commit
c09ad04284
95 files changed
+3916
-3900
No files matched your search
@@ -1,44 +1,36 @@
|
||||
//
|
||||
// Decompiled by Procyon v0.5.30
|
||||
//
|
||||
|
||||
package binnie.extrabees.apiary;
|
||||
|
||||
import binnie.extrabees.ExtraBees;
|
||||
import binnie.core.Mods;
|
||||
import binnie.core.genetics.BeeModifierLogic;
|
||||
import binnie.core.genetics.EnumBeeBooleanModifier;
|
||||
import forestry.api.apiculture.IBeeGenome;
|
||||
import binnie.core.genetics.EnumBeeModifier;
|
||||
import binnie.extrabees.ExtraBees;
|
||||
import cpw.mods.fml.common.registry.GameRegistry;
|
||||
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 net.minecraft.init.Blocks;
|
||||
|
||||
import cpw.mods.fml.common.registry.GameRegistry;
|
||||
|
||||
import net.minecraft.init.Items;
|
||||
|
||||
import binnie.core.Mods;
|
||||
|
||||
import net.minecraft.item.Item;
|
||||
import net.minecraft.item.ItemStack;
|
||||
|
||||
import binnie.core.genetics.EnumBeeModifier;
|
||||
import binnie.core.genetics.BeeModifierLogic;
|
||||
|
||||
import net.minecraft.item.Item;
|
||||
|
||||
import forestry.api.apiculture.IHiveFrame;
|
||||
|
||||
public enum EnumHiveFrame implements IHiveFrame, IBeeModifier
|
||||
{
|
||||
public enum EnumHiveFrame implements IHiveFrame, IBeeModifier {
|
||||
Cocoa,
|
||||
Cage,
|
||||
Soul,
|
||||
Clay,
|
||||
Debug;
|
||||
|
||||
Item item;
|
||||
int maxDamage;
|
||||
BeeModifierLogic logic;
|
||||
protected Item item;
|
||||
protected int maxDamage;
|
||||
protected BeeModifierLogic logic;
|
||||
|
||||
EnumHiveFrame() {
|
||||
maxDamage = 240;
|
||||
logic = new BeeModifierLogic();
|
||||
}
|
||||
|
||||
public static void init() {
|
||||
EnumHiveFrame.Cocoa.logic.setModifier(EnumBeeModifier.Lifespan, 0.75f, 0.25f);
|
||||
@@ -54,27 +46,42 @@ public enum EnumHiveFrame implements IHiveFrame, IBeeModifier
|
||||
EnumHiveFrame.Clay.logic.setModifier(EnumBeeModifier.Mutation, 0.5f, 0.2f);
|
||||
EnumHiveFrame.Clay.logic.setModifier(EnumBeeModifier.Production, 0.75f, 0.2f);
|
||||
EnumHiveFrame.Debug.logic.setModifier(EnumBeeModifier.Lifespan, 1.0E-4f, 1.0E-4f);
|
||||
GameRegistry.addRecipe(new ItemStack(EnumHiveFrame.Cocoa.item), new Object[] { " c ", "cFc", " c ", 'F', Mods.Forestry.stack("frameImpregnated"), 'c', new ItemStack(Items.dye, 1, 3) });
|
||||
GameRegistry.addShapelessRecipe(new ItemStack(EnumHiveFrame.Cage.item), new Object[] { Mods.Forestry.stack("frameImpregnated"), Blocks.iron_bars });
|
||||
GameRegistry.addShapelessRecipe(new ItemStack(EnumHiveFrame.Soul.item), new Object[] { Mods.Forestry.stack("frameImpregnated"), Blocks.soul_sand });
|
||||
GameRegistry.addRecipe(new ItemStack(EnumHiveFrame.Clay.item), new Object[] { " c ", "cFc", " c ", 'F', Mods.Forestry.stack("frameImpregnated"), 'c', Items.clay_ball });
|
||||
|
||||
GameRegistry.addRecipe(
|
||||
new ItemStack(EnumHiveFrame.Cocoa.item),
|
||||
" c ", "cFc", " c ",
|
||||
'F', Mods.Forestry.stack("frameImpregnated"),
|
||||
'c', new ItemStack(Items.dye, 1, 3)
|
||||
);
|
||||
GameRegistry.addShapelessRecipe(
|
||||
new ItemStack(EnumHiveFrame.Cage.item),
|
||||
Mods.Forestry.stack("frameImpregnated"),
|
||||
Blocks.iron_bars
|
||||
);
|
||||
GameRegistry.addShapelessRecipe(
|
||||
new ItemStack(EnumHiveFrame.Soul.item),
|
||||
Mods.Forestry.stack("frameImpregnated"),
|
||||
Blocks.soul_sand
|
||||
);
|
||||
GameRegistry.addRecipe(
|
||||
new ItemStack(EnumHiveFrame.Clay.item),
|
||||
" c ", "cFc", " c ",
|
||||
'F', Mods.Forestry.stack("frameImpregnated"),
|
||||
'c', Items.clay_ball
|
||||
);
|
||||
}
|
||||
|
||||
// TODO unused method?
|
||||
public int getIconIndex() {
|
||||
return 55 + this.ordinal();
|
||||
return 55 + ordinal();
|
||||
}
|
||||
|
||||
public void setMaxDamage(final int damage) {
|
||||
this.maxDamage = damage;
|
||||
}
|
||||
|
||||
private EnumHiveFrame() {
|
||||
this.maxDamage = 240;
|
||||
this.logic = new BeeModifierLogic();
|
||||
public void setMaxDamage(int damage) {
|
||||
maxDamage = damage;
|
||||
}
|
||||
|
||||
@Override
|
||||
public ItemStack frameUsed(final IBeeHousing house, final ItemStack frame, final IBee queen, final int wear) {
|
||||
public ItemStack frameUsed(IBeeHousing house, ItemStack frame, IBee queen, int wear) {
|
||||
frame.setItemDamage(frame.getItemDamage() + wear);
|
||||
if (frame.getItemDamage() >= frame.getMaxDamage()) {
|
||||
return null;
|
||||
@@ -83,57 +90,57 @@ public enum EnumHiveFrame implements IHiveFrame, IBeeModifier
|
||||
}
|
||||
|
||||
@Override
|
||||
public float getTerritoryModifier(final IBeeGenome genome, final float currentModifier) {
|
||||
return this.logic.getModifier(EnumBeeModifier.Territory, currentModifier);
|
||||
public float getTerritoryModifier(IBeeGenome genome, float currentModifier) {
|
||||
return logic.getModifier(EnumBeeModifier.Territory, currentModifier);
|
||||
}
|
||||
|
||||
@Override
|
||||
public float getMutationModifier(final IBeeGenome genome, final IBeeGenome mate, final float currentModifier) {
|
||||
return this.logic.getModifier(EnumBeeModifier.Mutation, currentModifier);
|
||||
public float getMutationModifier(IBeeGenome genome, IBeeGenome mate, float currentModifier) {
|
||||
return logic.getModifier(EnumBeeModifier.Mutation, currentModifier);
|
||||
}
|
||||
|
||||
@Override
|
||||
public float getLifespanModifier(final IBeeGenome genome, final IBeeGenome mate, final float currentModifier) {
|
||||
return this.logic.getModifier(EnumBeeModifier.Lifespan, currentModifier);
|
||||
public float getLifespanModifier(IBeeGenome genome, IBeeGenome mate, float currentModifier) {
|
||||
return logic.getModifier(EnumBeeModifier.Lifespan, currentModifier);
|
||||
}
|
||||
|
||||
@Override
|
||||
public float getProductionModifier(final IBeeGenome genome, final float currentModifier) {
|
||||
return this.logic.getModifier(EnumBeeModifier.Production, currentModifier);
|
||||
public float getProductionModifier(IBeeGenome genome, float currentModifier) {
|
||||
return logic.getModifier(EnumBeeModifier.Production, currentModifier);
|
||||
}
|
||||
|
||||
@Override
|
||||
public float getFloweringModifier(final IBeeGenome genome, final float currentModifier) {
|
||||
return this.logic.getModifier(EnumBeeModifier.Flowering, currentModifier);
|
||||
public float getFloweringModifier(IBeeGenome genome, float currentModifier) {
|
||||
return logic.getModifier(EnumBeeModifier.Flowering, currentModifier);
|
||||
}
|
||||
|
||||
@Override
|
||||
public float getGeneticDecay(final IBeeGenome genome, final float currentModifier) {
|
||||
return this.logic.getModifier(EnumBeeModifier.GeneticDecay, currentModifier);
|
||||
public float getGeneticDecay(IBeeGenome genome, float currentModifier) {
|
||||
return logic.getModifier(EnumBeeModifier.GeneticDecay, currentModifier);
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean isSealed() {
|
||||
return this.logic.getModifier(EnumBeeBooleanModifier.Sealed);
|
||||
return logic.getModifier(EnumBeeBooleanModifier.Sealed);
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean isSelfLighted() {
|
||||
return this.logic.getModifier(EnumBeeBooleanModifier.SelfLighted);
|
||||
return logic.getModifier(EnumBeeBooleanModifier.SelfLighted);
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean isSunlightSimulated() {
|
||||
return this.logic.getModifier(EnumBeeBooleanModifier.SunlightStimulated);
|
||||
return logic.getModifier(EnumBeeBooleanModifier.SunlightStimulated);
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean isHellish() {
|
||||
return this.logic.getModifier(EnumBeeBooleanModifier.Hellish);
|
||||
return logic.getModifier(EnumBeeBooleanModifier.Hellish);
|
||||
}
|
||||
|
||||
public String getName() {
|
||||
return ExtraBees.proxy.localise("item.frame." + this.toString().toLowerCase());
|
||||
return ExtraBees.proxy.localise("item.frame." + toString().toLowerCase());
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
Reference in new issue
Block a user