Update buildscript & spotlessApply

This commit is contained in:
DianeXD committed 2022-07-03 12:17:51 +08:00
1 parent e4329e2b8f
commit 8683a345c3
818 files changed
+51123 -49403

No files matched your search

+73 -75
View File
@@ -25,94 +25,92 @@ import net.minecraft.block.material.Material;
import net.minecraft.item.Item;
@Mod(
modid = "ExtraBees",
name = "Extra Bees",
version = BinnieCore.VERSION,
useMetadata = true,
dependencies = "after:BinnieCore"
)
modid = "ExtraBees",
name = "Extra Bees",
version = BinnieCore.VERSION,
useMetadata = true,
dependencies = "after:BinnieCore")
public class ExtraBees extends AbstractMod {
@Mod.Instance("ExtraBees")
public static ExtraBees instance;
@Mod.Instance("ExtraBees")
public static ExtraBees instance;
@SidedProxy(
clientSide = "binnie.extrabees.proxy.ExtraBeesProxyClient",
serverSide = "binnie.extrabees.proxy.ExtraBeesProxyServer"
)
public static ExtraBeesProxy proxy;
@SidedProxy(
clientSide = "binnie.extrabees.proxy.ExtraBeesProxyClient",
serverSide = "binnie.extrabees.proxy.ExtraBeesProxyServer")
public static ExtraBeesProxy proxy;
public static Block hive;
public static Material materialBeehive;
public static Block ectoplasm;
public static Item comb;
public static Item propolis;
public static Item honeyDrop;
public static Item dictionary;
public static Item itemMisc;
public static Block hive;
public static Material materialBeehive;
public static Block ectoplasm;
public static Item comb;
public static Item propolis;
public static Item honeyDrop;
public static Item dictionary;
public static Item itemMisc;
public ExtraBees() {
ExtraBees.instance = this;
}
public ExtraBees() {
ExtraBees.instance = this;
}
@Mod.EventHandler
public void preInit(FMLPreInitializationEvent event) {
addModule(new ModuleCore());
addModule(new ModuleProducts());
addModule(new ModuleGenetics());
addModule(new ModuleGeneration());
addModule(new ModuleLiquids());
addModule(new ModuleApiary());
preInit();
}
@Mod.EventHandler
public void preInit(FMLPreInitializationEvent event) {
addModule(new ModuleCore());
addModule(new ModuleProducts());
addModule(new ModuleGenetics());
addModule(new ModuleGeneration());
addModule(new ModuleLiquids());
addModule(new ModuleApiary());
preInit();
}
@Mod.EventHandler
public void init(FMLInitializationEvent event) {
init();
}
@Mod.EventHandler
public void init(FMLInitializationEvent event) {
init();
}
@Mod.EventHandler
public void postInit(FMLPostInitializationEvent event) {
postInit();
}
@Mod.EventHandler
public void postInit(FMLPostInitializationEvent event) {
postInit();
}
@Override
public IBinnieGUID[] getGUIDs() {
return ExtraBeeGUID.values();
}
@Override
public IBinnieGUID[] getGUIDs() {
return ExtraBeeGUID.values();
}
@Override
public Class<?>[] getConfigs() {
return new Class[]{ConfigurationMain.class, ConfigurationMachines.class};
}
@Override
public Class<?>[] getConfigs() {
return new Class[] {ConfigurationMain.class, ConfigurationMachines.class};
}
@Override
public IProxyCore getProxy() {
return ExtraBees.proxy;
}
@Override
public IProxyCore getProxy() {
return ExtraBees.proxy;
}
@Override
public String getChannel() {
return "EB";
}
@Override
public String getChannel() {
return "EB";
}
@Override
public String getModID() {
return "extrabees";
}
@Override
public String getModID() {
return "extrabees";
}
@Override
protected Class<? extends BinniePacketHandler> getPacketHandler() {
return PacketHandler.class;
}
@Override
protected Class<? extends BinniePacketHandler> getPacketHandler() {
return PacketHandler.class;
}
@Override
public boolean isActive() {
return BinnieCore.isExtraBeesActive();
}
@Override
public boolean isActive() {
return BinnieCore.isExtraBeesActive();
}
public static class PacketHandler extends BinniePacketHandler {
public PacketHandler() {
super(ExtraBees.instance);
}
}
public static class PacketHandler extends BinniePacketHandler {
public PacketHandler() {
super(ExtraBees.instance);
}
}
}
@@ -10,82 +10,82 @@ import forestry.api.genetics.IIndividual;
import net.minecraft.item.ItemStack;
public class ComponentBeeModifier extends MachineComponent implements IBeeModifier, IBeeListener {
public ComponentBeeModifier(Machine machine) {
super(machine);
}
public ComponentBeeModifier(Machine machine) {
super(machine);
}
@Override
public float getTerritoryModifier(IBeeGenome genome, float currentModifier) {
return 1.0f;
}
@Override
public float getTerritoryModifier(IBeeGenome genome, float currentModifier) {
return 1.0f;
}
@Override
public float getMutationModifier(IBeeGenome genome, IBeeGenome mate, float currentModifier) {
return 1.0f;
}
@Override
public float getMutationModifier(IBeeGenome genome, IBeeGenome mate, float currentModifier) {
return 1.0f;
}
@Override
public float getLifespanModifier(IBeeGenome genome, IBeeGenome mate, float currentModifier) {
return 1.0f;
}
@Override
public float getLifespanModifier(IBeeGenome genome, IBeeGenome mate, float currentModifier) {
return 1.0f;
}
@Override
public float getProductionModifier(IBeeGenome genome, float currentModifier) {
return 1.0f;
}
@Override
public float getProductionModifier(IBeeGenome genome, float currentModifier) {
return 1.0f;
}
@Override
public float getFloweringModifier(IBeeGenome genome, float currentModifier) {
return 1.0f;
}
@Override
public float getFloweringModifier(IBeeGenome genome, float currentModifier) {
return 1.0f;
}
@Override
public boolean isSealed() {
return false;
}
@Override
public boolean isSealed() {
return false;
}
@Override
public boolean isSelfLighted() {
return false;
}
@Override
public boolean isSelfLighted() {
return false;
}
@Override
public boolean isSunlightSimulated() {
return false;
}
@Override
public boolean isSunlightSimulated() {
return false;
}
@Override
public boolean isHellish() {
return false;
}
@Override
public boolean isHellish() {
return false;
}
// TODO unused method?
public void onQueenChange(ItemStack queen) {
// ignored
}
// TODO unused method?
public void onQueenChange(ItemStack queen) {
// ignored
}
@Override
public void wearOutEquipment(int amount) {
// ignored
}
@Override
public void wearOutEquipment(int amount) {
// ignored
}
// TODO unused method?
public boolean onEggLaid(IBee queen) {
return false;
}
// TODO unused method?
public boolean onEggLaid(IBee queen) {
return false;
}
@Override
public float getGeneticDecay(IBeeGenome genome, float currentModifier) {
return 1.0f;
}
@Override
public float getGeneticDecay(IBeeGenome genome, float currentModifier) {
return 1.0f;
}
@Override
public boolean onPollenRetrieved(IIndividual individual) {
return false;
}
@Override
public boolean onPollenRetrieved(IIndividual individual) {
return false;
}
@Override
public void onQueenDeath() {
// ignored
}
@Override
public void onQueenDeath() {
// ignored
}
}
@@ -9,15 +9,15 @@ import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.world.World;
public class ComponentExtraBeeGUI extends MachineComponent implements IInteraction.RightClick {
protected ExtraBeeGUID id;
protected ExtraBeeGUID id;
public ComponentExtraBeeGUI(Machine machine, ExtraBeeGUID id) {
super(machine);
this.id = id;
}
public ComponentExtraBeeGUI(Machine machine, ExtraBeeGUID id) {
super(machine);
this.id = id;
}
@Override
public void onRightClick(World world, EntityPlayer player, int x, int y, int z) {
ExtraBees.proxy.openGui(id, player, x, y, z);
}
@Override
public void onRightClick(World world, EntityPlayer player, int x, int y, int z) {
ExtraBees.proxy.openGui(id, player, x, y, z);
}
}
@@ -17,129 +17,129 @@ import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
public enum EnumHiveFrame implements IHiveFrame, IBeeModifier {
Cocoa,
Cage,
Soul,
Clay,
Debug;
Cocoa,
Cage,
Soul,
Clay,
Debug;
protected Item item;
protected int maxDamage;
protected BeeModifierLogic logic;
protected Item item;
protected int maxDamage;
protected BeeModifierLogic logic;
EnumHiveFrame() {
maxDamage = 240;
logic = new BeeModifierLogic();
}
EnumHiveFrame() {
maxDamage = 240;
logic = new BeeModifierLogic();
}
public static void init() {
EnumHiveFrame.Cocoa.logic.setModifier(EnumBeeModifier.LIFESPAN, 0.75f, 0.25f);
EnumHiveFrame.Cocoa.logic.setModifier(EnumBeeModifier.PRODUCTION, 1.5f, 5.0f);
EnumHiveFrame.Cage.logic.setModifier(EnumBeeModifier.TERRITORY, 0.5f, 0.1f);
EnumHiveFrame.Cage.logic.setModifier(EnumBeeModifier.LIFESPAN, 0.75f, 0.5f);
EnumHiveFrame.Cage.logic.setModifier(EnumBeeModifier.PRODUCTION, 0.75f, 0.5f);
EnumHiveFrame.Soul.logic.setModifier(EnumBeeModifier.MUTATION, 1.5f, 5.0f);
EnumHiveFrame.Soul.logic.setModifier(EnumBeeModifier.LIFESPAN, 0.75f, 0.5f);
EnumHiveFrame.Soul.logic.setModifier(EnumBeeModifier.PRODUCTION, 0.25f, 0.1f);
EnumHiveFrame.Soul.setMaxDamage(80);
EnumHiveFrame.Clay.logic.setModifier(EnumBeeModifier.LIFESPAN, 1.5f, 5.0f);
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);
public static void init() {
EnumHiveFrame.Cocoa.logic.setModifier(EnumBeeModifier.LIFESPAN, 0.75f, 0.25f);
EnumHiveFrame.Cocoa.logic.setModifier(EnumBeeModifier.PRODUCTION, 1.5f, 5.0f);
EnumHiveFrame.Cage.logic.setModifier(EnumBeeModifier.TERRITORY, 0.5f, 0.1f);
EnumHiveFrame.Cage.logic.setModifier(EnumBeeModifier.LIFESPAN, 0.75f, 0.5f);
EnumHiveFrame.Cage.logic.setModifier(EnumBeeModifier.PRODUCTION, 0.75f, 0.5f);
EnumHiveFrame.Soul.logic.setModifier(EnumBeeModifier.MUTATION, 1.5f, 5.0f);
EnumHiveFrame.Soul.logic.setModifier(EnumBeeModifier.LIFESPAN, 0.75f, 0.5f);
EnumHiveFrame.Soul.logic.setModifier(EnumBeeModifier.PRODUCTION, 0.25f, 0.1f);
EnumHiveFrame.Soul.setMaxDamage(80);
EnumHiveFrame.Clay.logic.setModifier(EnumBeeModifier.LIFESPAN, 1.5f, 5.0f);
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),
" 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
);
}
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);
}
public void setMaxDamage(int damage) {
maxDamage = damage;
}
public void setMaxDamage(int damage) {
maxDamage = damage;
}
@Override
public ItemStack frameUsed(IBeeHousing house, ItemStack frame, IBee queen, int wear) {
frame.setItemDamage(frame.getItemDamage() + wear);
if (frame.getItemDamage() >= frame.getMaxDamage()) {
return null;
}
return frame;
}
@Override
public ItemStack frameUsed(IBeeHousing house, ItemStack frame, IBee queen, int wear) {
frame.setItemDamage(frame.getItemDamage() + wear);
if (frame.getItemDamage() >= frame.getMaxDamage()) {
return null;
}
return frame;
}
@Override
public float getTerritoryModifier(IBeeGenome genome, float currentModifier) {
return logic.getModifier(EnumBeeModifier.TERRITORY, currentModifier);
}
@Override
public float getTerritoryModifier(IBeeGenome genome, float currentModifier) {
return logic.getModifier(EnumBeeModifier.TERRITORY, currentModifier);
}
@Override
public float getMutationModifier(IBeeGenome genome, IBeeGenome mate, float currentModifier) {
return logic.getModifier(EnumBeeModifier.MUTATION, currentModifier);
}
@Override
public float getMutationModifier(IBeeGenome genome, IBeeGenome mate, float currentModifier) {
return logic.getModifier(EnumBeeModifier.MUTATION, currentModifier);
}
@Override
public float getLifespanModifier(IBeeGenome genome, IBeeGenome mate, float currentModifier) {
return logic.getModifier(EnumBeeModifier.LIFESPAN, currentModifier);
}
@Override
public float getLifespanModifier(IBeeGenome genome, IBeeGenome mate, float currentModifier) {
return logic.getModifier(EnumBeeModifier.LIFESPAN, currentModifier);
}
@Override
public float getProductionModifier(IBeeGenome genome, float currentModifier) {
return logic.getModifier(EnumBeeModifier.PRODUCTION, currentModifier);
}
@Override
public float getProductionModifier(IBeeGenome genome, float currentModifier) {
return logic.getModifier(EnumBeeModifier.PRODUCTION, currentModifier);
}
@Override
public float getFloweringModifier(IBeeGenome genome, float currentModifier) {
return logic.getModifier(EnumBeeModifier.FLOWERING, currentModifier);
}
@Override
public float getFloweringModifier(IBeeGenome genome, float currentModifier) {
return logic.getModifier(EnumBeeModifier.FLOWERING, currentModifier);
}
@Override
public float getGeneticDecay(IBeeGenome genome, float currentModifier) {
return logic.getModifier(EnumBeeModifier.GENETIC_DECAY, currentModifier);
}
@Override
public float getGeneticDecay(IBeeGenome genome, float currentModifier) {
return logic.getModifier(EnumBeeModifier.GENETIC_DECAY, currentModifier);
}
@Override
public boolean isSealed() {
return logic.getModifier(EnumBeeBooleanModifier.SEALED);
}
@Override
public boolean isSealed() {
return logic.getModifier(EnumBeeBooleanModifier.SEALED);
}
@Override
public boolean isSelfLighted() {
return logic.getModifier(EnumBeeBooleanModifier.SELF_LIGHTED);
}
@Override
public boolean isSelfLighted() {
return logic.getModifier(EnumBeeBooleanModifier.SELF_LIGHTED);
}
@Override
public boolean isSunlightSimulated() {
return logic.getModifier(EnumBeeBooleanModifier.SUNLIGHT_STIMULATED);
}
@Override
public boolean isSunlightSimulated() {
return logic.getModifier(EnumBeeBooleanModifier.SUNLIGHT_STIMULATED);
}
@Override
public boolean isHellish() {
return logic.getModifier(EnumBeeBooleanModifier.HELLISH);
}
@Override
public boolean isHellish() {
return logic.getModifier(EnumBeeBooleanModifier.HELLISH);
}
public String getName() {
return I18N.localise("extrabees.item.frame." + toString().toLowerCase());
}
public String getName() {
return I18N.localise("extrabees.item.frame." + toString().toLowerCase());
}
@Override
public IBeeModifier getBeeModifier() {
return this;
}
@Override
public IBeeModifier getBeeModifier() {
return this;
}
}
@@ -14,88 +14,88 @@ import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
public class ItemHiveFrame extends Item implements IHiveFrame, IBeeModifier {
protected EnumHiveFrame frame;
protected EnumHiveFrame frame;
public ItemHiveFrame(EnumHiveFrame frame) {
this.frame = frame;
setMaxDamage(frame.maxDamage);
setCreativeTab(Tabs.tabApiculture);
setMaxStackSize(1);
setUnlocalizedName("hiveFrame");
}
public ItemHiveFrame(EnumHiveFrame frame) {
this.frame = frame;
setMaxDamage(frame.maxDamage);
setCreativeTab(Tabs.tabApiculture);
setMaxStackSize(1);
setUnlocalizedName("hiveFrame");
}
@Override
public String getItemStackDisplayName(ItemStack stack) {
return frame.getName();
}
@Override
public String getItemStackDisplayName(ItemStack stack) {
return frame.getName();
}
@Override
public float getTerritoryModifier(IBeeGenome genome, float currentModifier) {
return frame.getTerritoryModifier(genome, currentModifier);
}
@Override
public float getTerritoryModifier(IBeeGenome genome, float currentModifier) {
return frame.getTerritoryModifier(genome, currentModifier);
}
@Override
public float getMutationModifier(IBeeGenome genome, IBeeGenome mate, float currentModifier) {
return frame.getMutationModifier(genome, mate, currentModifier);
}
@Override
public float getMutationModifier(IBeeGenome genome, IBeeGenome mate, float currentModifier) {
return frame.getMutationModifier(genome, mate, currentModifier);
}
@Override
public float getLifespanModifier(IBeeGenome genome, IBeeGenome mate, float currentModifier) {
return frame.getLifespanModifier(genome, mate, currentModifier);
}
@Override
public float getLifespanModifier(IBeeGenome genome, IBeeGenome mate, float currentModifier) {
return frame.getLifespanModifier(genome, mate, currentModifier);
}
@Override
public float getProductionModifier(IBeeGenome genome, float currentModifier) {
return frame.getProductionModifier(genome, currentModifier);
}
@Override
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;
}
return frame;
}
@Override
public ItemStack frameUsed(IBeeHousing housing, ItemStack frame, IBee queen, int wear) {
frame.setItemDamage(frame.getItemDamage() + wear);
if (frame.getItemDamage() >= frame.getMaxDamage()) {
return null;
}
return frame;
}
@Override
public float getFloweringModifier(IBeeGenome genome, float currentModifier) {
return 1.0f;
}
@Override
public float getFloweringModifier(IBeeGenome genome, float currentModifier) {
return 1.0f;
}
@Override
public boolean isSealed() {
return false;
}
@Override
public boolean isSealed() {
return false;
}
@Override
public boolean isSelfLighted() {
return false;
}
@Override
public boolean isSelfLighted() {
return false;
}
@Override
public boolean isSunlightSimulated() {
return false;
}
@Override
public boolean isSunlightSimulated() {
return false;
}
@Override
public boolean isHellish() {
return false;
}
@Override
public boolean isHellish() {
return false;
}
@Override
@SideOnly(Side.CLIENT)
public void registerIcons(IIconRegister register) {
itemIcon = ExtraBees.proxy.getIcon(register, "frame" + frame.toString());
}
@Override
@SideOnly(Side.CLIENT)
public void registerIcons(IIconRegister register) {
itemIcon = ExtraBees.proxy.getIcon(register, "frame" + frame.toString());
}
@Override
public float getGeneticDecay(IBeeGenome genome, float currentModifier) {
return 1.0f;
}
@Override
public float getGeneticDecay(IBeeGenome genome, float currentModifier) {
return 1.0f;
}
@Override
public IBeeModifier getBeeModifier() {
return this;
}
@Override
public IBeeModifier getBeeModifier() {
return this;
}
}
@@ -18,101 +18,125 @@ import net.minecraft.item.ItemStack;
import net.minecraftforge.oredict.ShapedOreRecipe;
public class ModuleApiary implements IInitializable {
public static Block blockComponent;
public static Block blockComponent;
protected BinnieCircuitLayout stimulatorLayout;
protected BinnieCircuitLayout stimulatorLayout;
@Override
public void preInit() {
MachineGroup machineGroup = new MachineGroup(ExtraBees.instance, "alveay", "alveary", AlvearyMachine.values());
machineGroup.setCreativeTab(Tabs.tabApiculture);
BinnieCore.proxy.registerTileEntity(TileExtraBeeAlveary.class, "extrabees.tile.alveary", BinnieCore.proxy.createObject("binnie.core.machines.RendererMachine"));
ModuleApiary.blockComponent = machineGroup.getBlock();
AlvearyMutator.addMutationItem(new ItemStack(Blocks.soul_sand), 1.5f);
AlvearyMutator.addMutationItem(Mods.ic2.stack("UranFuel"), 4.0f);
AlvearyMutator.addMutationItem(Mods.ic2.stack("MOXFuel"), 10.0f);
AlvearyMutator.addMutationItem(Mods.ic2.stack("Plutonium"), 8.0f);
AlvearyMutator.addMutationItem(Mods.ic2.stack("smallPlutonium"), 5.0f);
AlvearyMutator.addMutationItem(Mods.ic2.stack("Uran235"), 4.0f);
AlvearyMutator.addMutationItem(Mods.ic2.stack("smallUran235"), 2.5f);
AlvearyMutator.addMutationItem(Mods.ic2.stack("Uran238"), 2.0f);
AlvearyMutator.addMutationItem(new ItemStack(Items.ender_pearl), 2.0f);
AlvearyMutator.addMutationItem(new ItemStack(Items.ender_eye), 4.0f);
@Override
public void preInit() {
MachineGroup machineGroup = new MachineGroup(ExtraBees.instance, "alveay", "alveary", AlvearyMachine.values());
machineGroup.setCreativeTab(Tabs.tabApiculture);
BinnieCore.proxy.registerTileEntity(
TileExtraBeeAlveary.class,
"extrabees.tile.alveary",
BinnieCore.proxy.createObject("binnie.core.machines.RendererMachine"));
ModuleApiary.blockComponent = machineGroup.getBlock();
AlvearyMutator.addMutationItem(new ItemStack(Blocks.soul_sand), 1.5f);
AlvearyMutator.addMutationItem(Mods.ic2.stack("UranFuel"), 4.0f);
AlvearyMutator.addMutationItem(Mods.ic2.stack("MOXFuel"), 10.0f);
AlvearyMutator.addMutationItem(Mods.ic2.stack("Plutonium"), 8.0f);
AlvearyMutator.addMutationItem(Mods.ic2.stack("smallPlutonium"), 5.0f);
AlvearyMutator.addMutationItem(Mods.ic2.stack("Uran235"), 4.0f);
AlvearyMutator.addMutationItem(Mods.ic2.stack("smallUran235"), 2.5f);
AlvearyMutator.addMutationItem(Mods.ic2.stack("Uran238"), 2.0f);
AlvearyMutator.addMutationItem(new ItemStack(Items.ender_pearl), 2.0f);
AlvearyMutator.addMutationItem(new ItemStack(Items.ender_eye), 4.0f);
for (EnumHiveFrame frame : EnumHiveFrame.values()) {
GameRegistry.registerItem(frame.item = new ItemHiveFrame(frame), "hiveFrame." + frame.name().toLowerCase());
}
}
for (EnumHiveFrame frame : EnumHiveFrame.values()) {
GameRegistry.registerItem(
frame.item = new ItemHiveFrame(frame),
"hiveFrame." + frame.name().toLowerCase());
}
}
@Override
public void postInit() {
EnumHiveFrame.init();
GameRegistry.addRecipe(
AlvearyMachine.Mutator.get(1),
"g g", " a ", "t t",
'g', Items.gold_ingot,
'a', Mods.forestry.block("alveary"),
't',
new ItemStack(Mods.forestry.item("thermionicTubes"), 1, 5)
);
@Override
public void postInit() {
EnumHiveFrame.init();
GameRegistry.addRecipe(
AlvearyMachine.Mutator.get(1),
"g g",
" a ",
"t t",
'g',
Items.gold_ingot,
'a',
Mods.forestry.block("alveary"),
't',
new ItemStack(Mods.forestry.item("thermionicTubes"), 1, 5));
GameRegistry.addRecipe(
AlvearyMachine.Frame.get(1),
"iii", "tat", " t ",
'i', Items.iron_ingot,
'a', Mods.forestry.block("alveary"),
't', new ItemStack(Mods.forestry.item("thermionicTubes"), 1, 4)
);
GameRegistry.addRecipe(
AlvearyMachine.Frame.get(1),
"iii",
"tat",
" t ",
'i',
Items.iron_ingot,
'a',
Mods.forestry.block("alveary"),
't',
new ItemStack(Mods.forestry.item("thermionicTubes"), 1, 4));
GameRegistry.addRecipe(
AlvearyMachine.RainShield.get(1),
" b ", "bab", "t t",
'b', Items.brick,
'a', Mods.forestry.block("alveary"),
't', new ItemStack(Mods.forestry.item("thermionicTubes"), 1, 4)
);
GameRegistry.addRecipe(
AlvearyMachine.RainShield.get(1),
" b ",
"bab",
"t t",
'b',
Items.brick,
'a',
Mods.forestry.block("alveary"),
't',
new ItemStack(Mods.forestry.item("thermionicTubes"), 1, 4));
GameRegistry.addRecipe(
AlvearyMachine.Lighting.get(1),
"iii", "iai", " t ",
'i', Items.glowstone_dust,
'a', Mods.forestry.block("alveary"),
't', new ItemStack(Mods.forestry.item("thermionicTubes"), 1, 4)
);
GameRegistry.addRecipe(
AlvearyMachine.Lighting.get(1),
"iii",
"iai",
" t ",
'i',
Items.glowstone_dust,
'a',
Mods.forestry.block("alveary"),
't',
new ItemStack(Mods.forestry.item("thermionicTubes"), 1, 4));
GameRegistry.addRecipe(
AlvearyMachine.Stimulator.get(1),
"kik", "iai", " t ",
'i', Items.gold_nugget,
'a', Mods.forestry.block("alveary"),
't', new ItemStack(Mods.forestry.item("thermionicTubes"), 1, 4),
'k', new ItemStack(Mods.forestry.item("chipsets"), 1, 2)
);
GameRegistry.addRecipe(
AlvearyMachine.Stimulator.get(1),
"kik",
"iai",
" t ",
'i',
Items.gold_nugget,
'a',
Mods.forestry.block("alveary"),
't',
new ItemStack(Mods.forestry.item("thermionicTubes"), 1, 4),
'k',
new ItemStack(Mods.forestry.item("chipsets"), 1, 2));
GameRegistry.addRecipe(
AlvearyMachine.Hatchery.get(1),
"i i", " a ", "iti",
'i', Blocks.glass_pane,
'a', Mods.forestry.block("alveary"),
't', new ItemStack(Mods.forestry.item("thermionicTubes"), 1, 5)
);
GameRegistry.addRecipe(
AlvearyMachine.Hatchery.get(1),
"i i",
" a ",
"iti",
'i',
Blocks.glass_pane,
'a',
Mods.forestry.block("alveary"),
't',
new ItemStack(Mods.forestry.item("thermionicTubes"), 1, 5));
GameRegistry.addRecipe(new ShapedOreRecipe(
AlvearyMachine.Transmission.get(1),
new Object[]{
" t ", "tat", " t ",
'a', Mods.forestry.block("alveary"),
't', "gearTin"
}
));
GameRegistry.addRecipe(new ShapedOreRecipe(
AlvearyMachine.Transmission.get(1),
new Object[] {" t ", "tat", " t ", 'a', Mods.forestry.block("alveary"), 't', "gearTin"}));
for (CircuitType type : CircuitType.values()) {
type.createCircuit(stimulatorLayout);
}
}
for (CircuitType type : CircuitType.values()) {
type.createCircuit(stimulatorLayout);
}
}
@Override
public void init() {
stimulatorLayout = new BinnieCircuitLayout(ExtraBees.instance, "Stimulator");
}
@Override
public void init() {
stimulatorLayout = new BinnieCircuitLayout(ExtraBees.instance, "Stimulator");
}
}
File diff suppressed because it is too large. Load diff
@@ -19,55 +19,56 @@ import net.minecraft.item.ItemStack;
import net.minecraft.tileentity.TileEntity;
public enum AlvearyMachine implements IMachineType {
Mutator(MutatorAlvearyPackage.class),
Frame(FrameAlvearyPackage.class),
RainShield(RainShieldAlvearyPackage.class),
Lighting(LightingAlvearyPackage.class),
Stimulator(StimulatorAlvearyPackage.class),
Hatchery(HatcheryAlvearyPackage.class),
Transmission(TransmissionAlvearyPackage.class);
Mutator(MutatorAlvearyPackage.class),
Frame(FrameAlvearyPackage.class),
RainShield(RainShieldAlvearyPackage.class),
Lighting(LightingAlvearyPackage.class),
Stimulator(StimulatorAlvearyPackage.class),
Hatchery(HatcheryAlvearyPackage.class),
Transmission(TransmissionAlvearyPackage.class);
protected Class<? extends MachinePackage> cls;
protected Class<? extends MachinePackage> cls;
AlvearyMachine(Class<? extends MachinePackage> cls) {
this.cls = cls;
}
AlvearyMachine(Class<? extends MachinePackage> cls) {
this.cls = cls;
}
@Override
public Class<? extends MachinePackage> getPackageClass() {
return cls;
}
@Override
public Class<? extends MachinePackage> getPackageClass() {
return cls;
}
public ItemStack get(int size) {
return new ItemStack(ModuleApiary.blockComponent, size, ordinal());
}
public ItemStack get(int size) {
return new ItemStack(ModuleApiary.blockComponent, size, ordinal());
}
@Override
public boolean isActive() {
return true;
}
@Override
public boolean isActive() {
return true;
}
public abstract static class AlvearyPackage extends MachinePackage {
protected BinnieResource machineTexture;
public abstract static class AlvearyPackage extends MachinePackage {
protected BinnieResource machineTexture;
public AlvearyPackage(String id, BinnieResource machineTexture, boolean powered) {
super(id, powered);
this.machineTexture = machineTexture;
}
public AlvearyPackage(String id, BinnieResource machineTexture, boolean powered) {
super(id, powered);
this.machineTexture = machineTexture;
}
@Override
public void createMachine(Machine machine) {
// ignored
}
@Override
public void createMachine(Machine machine) {
// ignored
}
@Override
public TileEntity createTileEntity() {
return new TileExtraBeeAlveary(this);
}
@Override
public TileEntity createTileEntity() {
return new TileExtraBeeAlveary(this);
}
@Override
public void renderMachine(Machine machine, double x, double y, double z, float partialTick, RenderBlocks renderer) {
MachineRendererBlock.instance.renderMachine(machineTexture, x, y, z, partialTick);
}
}
@Override
public void renderMachine(
Machine machine, double x, double y, double z, float partialTick, RenderBlocks renderer) {
MachineRendererBlock.instance.renderMachine(machineTexture, x, y, z, partialTick);
}
}
}
@@ -1,5 +1,5 @@
package binnie.extrabees.apiary.machine.frame;
public class AlvearyFrame {
public static final int SLOT_FRAME = 0;
public static final int SLOT_FRAME = 0;
}
@@ -9,16 +9,16 @@ import binnie.extrabees.core.ExtraBeeGUID;
import binnie.extrabees.core.ExtraBeeTexture;
public class FrameAlvearyPackage extends AlvearyMachine.AlvearyPackage implements IMachineInformation {
public FrameAlvearyPackage() {
super("frame", ExtraBeeTexture.AlvearyFrame.getTexture(), false);
}
public FrameAlvearyPackage() {
super("frame", ExtraBeeTexture.AlvearyFrame.getTexture(), false);
}
@Override
public void createMachine(Machine machine) {
new ComponentExtraBeeGUI(machine, ExtraBeeGUID.AlvearyFrame);
ComponentInventorySlots inventory = new ComponentInventorySlots(machine);
inventory.addSlot(AlvearyFrame.SLOT_FRAME, "frame");
inventory.getSlot(AlvearyFrame.SLOT_FRAME).setValidator(new FrameSlotValidator());
new FrameComponentModifier(machine);
}
@Override
public void createMachine(Machine machine) {
new ComponentExtraBeeGUI(machine, ExtraBeeGUID.AlvearyFrame);
ComponentInventorySlots inventory = new ComponentInventorySlots(machine);
inventory.addSlot(AlvearyFrame.SLOT_FRAME, "frame");
inventory.getSlot(AlvearyFrame.SLOT_FRAME).setValidator(new FrameSlotValidator());
new FrameComponentModifier(machine);
}
}
@@ -11,70 +11,83 @@ import forestry.api.apiculture.IHiveFrame;
import net.minecraft.world.World;
public class FrameComponentModifier extends ComponentBeeModifier implements IBeeModifier, IBeeListener {
public FrameComponentModifier(Machine machine) {
super(machine);
}
public FrameComponentModifier(Machine machine) {
super(machine);
}
@Override
public void wearOutEquipment(int amount) {
if (getHiveFrame() == null) {
return;
}
@Override
public void wearOutEquipment(int amount) {
if (getHiveFrame() == null) {
return;
}
World world = getMachine().getTileEntity().getWorldObj();
int wear = Math.round(amount * 5 * Binnie.Genetics.getBeeRoot().getBeekeepingMode(world).getWearModifier());
getInventory().setInventorySlotContents(AlvearyFrame.SLOT_FRAME, getHiveFrame().frameUsed(((TileExtraBeeAlveary) getMachine().getTileEntity()).getMultiblockLogic().getController(), getInventory().getStackInSlot(AlvearyFrame.SLOT_FRAME), null, wear));
}
World world = getMachine().getTileEntity().getWorldObj();
int wear = Math.round(amount
* 5
* Binnie.Genetics.getBeeRoot().getBeekeepingMode(world).getWearModifier());
getInventory()
.setInventorySlotContents(
AlvearyFrame.SLOT_FRAME,
getHiveFrame()
.frameUsed(
((TileExtraBeeAlveary) getMachine().getTileEntity())
.getMultiblockLogic()
.getController(),
getInventory().getStackInSlot(AlvearyFrame.SLOT_FRAME),
null,
wear));
}
public IHiveFrame getHiveFrame() {
if (getInventory().getStackInSlot(AlvearyFrame.SLOT_FRAME) == null) {
return null;
}
return (IHiveFrame) getInventory().getStackInSlot(AlvearyFrame.SLOT_FRAME).getItem();
}
public IHiveFrame getHiveFrame() {
if (getInventory().getStackInSlot(AlvearyFrame.SLOT_FRAME) == null) {
return null;
}
return (IHiveFrame)
getInventory().getStackInSlot(AlvearyFrame.SLOT_FRAME).getItem();
}
@Override
public float getTerritoryModifier(IBeeGenome genome, float currentModifier) {
IHiveFrame frame = getHiveFrame();
if (frame == null) {
return 1.0f;
}
return frame.getBeeModifier().getTerritoryModifier(genome, currentModifier);
}
@Override
public float getTerritoryModifier(IBeeGenome genome, float currentModifier) {
IHiveFrame frame = getHiveFrame();
if (frame == null) {
return 1.0f;
}
return frame.getBeeModifier().getTerritoryModifier(genome, currentModifier);
}
@Override
public float getMutationModifier(IBeeGenome genome, IBeeGenome mate, float currentModifier) {
IHiveFrame frame = getHiveFrame();
if (frame == null) {
return 1.0f;
}
return frame.getBeeModifier().getMutationModifier(genome, mate, currentModifier);
}
@Override
public float getMutationModifier(IBeeGenome genome, IBeeGenome mate, float currentModifier) {
IHiveFrame frame = getHiveFrame();
if (frame == null) {
return 1.0f;
}
return frame.getBeeModifier().getMutationModifier(genome, mate, currentModifier);
}
@Override
public float getLifespanModifier(IBeeGenome genome, IBeeGenome mate, float currentModifier) {
IHiveFrame frame = getHiveFrame();
if (getHiveFrame() == null) {
return 1.0f;
}
return frame.getBeeModifier().getLifespanModifier(genome, mate, currentModifier);
}
@Override
public float getLifespanModifier(IBeeGenome genome, IBeeGenome mate, float currentModifier) {
IHiveFrame frame = getHiveFrame();
if (getHiveFrame() == null) {
return 1.0f;
}
return frame.getBeeModifier().getLifespanModifier(genome, mate, currentModifier);
}
@Override
public float getProductionModifier(IBeeGenome genome, float currentModifier) {
IHiveFrame frame = getHiveFrame();
if (frame == null) {
return 1.0f;
}
return frame.getBeeModifier().getProductionModifier(genome, currentModifier);
}
@Override
public float getProductionModifier(IBeeGenome genome, float currentModifier) {
IHiveFrame frame = getHiveFrame();
if (frame == null) {
return 1.0f;
}
return frame.getBeeModifier().getProductionModifier(genome, currentModifier);
}
@Override
public float getFloweringModifier(IBeeGenome genome, float currentModifier) {
IHiveFrame frame = getHiveFrame();
if (frame == null) {
return 1.0f;
}
return frame.getBeeModifier().getFloweringModifier(genome, currentModifier);
}
@Override
public float getFloweringModifier(IBeeGenome genome, float currentModifier) {
IHiveFrame frame = getHiveFrame();
if (frame == null) {
return 1.0f;
}
return frame.getBeeModifier().getFloweringModifier(genome, currentModifier);
}
}
@@ -6,18 +6,17 @@ import forestry.api.apiculture.IHiveFrame;
import net.minecraft.item.ItemStack;
public class FrameSlotValidator extends SlotValidator {
public FrameSlotValidator() {
super(SlotValidator.IconFrame);
}
public FrameSlotValidator() {
super(SlotValidator.IconFrame);
}
@Override
public boolean isValid(ItemStack itemStack) {
return itemStack != null
&& itemStack.getItem() instanceof IHiveFrame;
}
@Override
public boolean isValid(ItemStack itemStack) {
return itemStack != null && itemStack.getItem() instanceof IHiveFrame;
}
@Override
public String getTooltip() {
return I18N.localise("extrabees.machine.alveay.frame.tooltip");
}
@Override
public String getTooltip() {
return I18N.localise("extrabees.machine.alveay.frame.tooltip");
}
}
@@ -1,5 +1,5 @@
package binnie.extrabees.apiary.machine.hatchery;
public class AlvearyHatchery {
public static final int[] SLOT_LARVAE = new int[]{0, 1, 2, 3, 4};
public static final int[] SLOT_LARVAE = new int[] {0, 1, 2, 3, 4};
}
@@ -10,17 +10,17 @@ import binnie.extrabees.core.ExtraBeeGUID;
import binnie.extrabees.core.ExtraBeeTexture;
public class HatcheryAlvearyPackage extends AlvearyMachine.AlvearyPackage implements IMachineInformation {
public HatcheryAlvearyPackage() {
super("hatchery", ExtraBeeTexture.AlvearyHatchery.getTexture(), false);
}
public HatcheryAlvearyPackage() {
super("hatchery", ExtraBeeTexture.AlvearyHatchery.getTexture(), false);
}
@Override
public void createMachine(Machine machine) {
new ComponentExtraBeeGUI(machine, ExtraBeeGUID.AlvearyHatchery);
ComponentInventorySlots inventory = new ComponentInventorySlots(machine);
for (InventorySlot slot : inventory.addSlotArray(AlvearyHatchery.SLOT_LARVAE, "hatchery")) {
slot.setValidator(new LarvaeSlotValidator());
}
new HatcheryComponentModifier(machine);
}
@Override
public void createMachine(Machine machine) {
new ComponentExtraBeeGUI(machine, ExtraBeeGUID.AlvearyHatchery);
ComponentInventorySlots inventory = new ComponentInventorySlots(machine);
for (InventorySlot slot : inventory.addSlotArray(AlvearyHatchery.SLOT_LARVAE, "hatchery")) {
slot.setValidator(new LarvaeSlotValidator());
}
new HatcheryComponentModifier(machine);
}
}
@@ -11,40 +11,40 @@ import forestry.api.apiculture.IBeeHousing;
import forestry.api.apiculture.IBeeListener;
import forestry.api.apiculture.IBeeModifier;
import forestry.api.apiculture.IBeeRoot;
import java.util.Random;
import net.minecraft.item.ItemStack;
import net.minecraft.tileentity.TileEntity;
import java.util.Random;
public class HatcheryComponentModifier extends ComponentBeeModifier implements IBeeModifier, IBeeListener {
public HatcheryComponentModifier(Machine machine) {
super(machine);
}
public HatcheryComponentModifier(Machine machine) {
super(machine);
}
@Override
public void onUpdate() {
if (new Random().nextInt(2400) != 0) {
return;
}
@Override
public void onUpdate() {
if (new Random().nextInt(2400) != 0) {
return;
}
TileEntity tile = getMachine().getTileEntity();
if (!(tile instanceof TileExtraBeeAlveary)) {
return;
}
TileEntity tile = getMachine().getTileEntity();
if (!(tile instanceof TileExtraBeeAlveary)) {
return;
}
IBeeHousing house = ((TileExtraBeeAlveary) tile).getMultiblockLogic().getController();
if (house == null || house.getErrorLogic().hasErrors()) {
return;
}
IBeeHousing house = ((TileExtraBeeAlveary) tile).getMultiblockLogic().getController();
if (house == null || house.getErrorLogic().hasErrors()) {
return;
}
ItemStack queenStack = house.getBeeInventory().getQueen();
IBee queen = (queenStack == null) ? null : Binnie.Genetics.getBeeRoot().getMember(queenStack);
if (queen == null) {
return;
}
ItemStack queenStack = house.getBeeInventory().getQueen();
IBee queen = (queenStack == null) ? null : Binnie.Genetics.getBeeRoot().getMember(queenStack);
if (queen == null) {
return;
}
IBeeRoot beeRoot = Binnie.Genetics.getBeeRoot();
ItemStack larvae = beeRoot.getMemberStack(beeRoot.getBee(getMachine().getWorld(), queen.getGenome()), EnumBeeType.LARVAE.ordinal());
new TransferRequest(larvae, getInventory()).transfer(true);
}
IBeeRoot beeRoot = Binnie.Genetics.getBeeRoot();
ItemStack larvae = beeRoot.getMemberStack(
beeRoot.getBee(getMachine().getWorld(), queen.getGenome()), EnumBeeType.LARVAE.ordinal());
new TransferRequest(larvae, getInventory()).transfer(true);
}
}
@@ -7,17 +7,18 @@ import forestry.api.apiculture.EnumBeeType;
import net.minecraft.item.ItemStack;
public class LarvaeSlotValidator extends SlotValidator {
public LarvaeSlotValidator() {
super(SlotValidator.IconBee);
}
public LarvaeSlotValidator() {
super(SlotValidator.IconBee);
}
@Override
public boolean isValid(ItemStack itemStack) {
return Binnie.Genetics.getBeeRoot().isMember(itemStack) && Binnie.Genetics.getBeeRoot().getType(itemStack) == EnumBeeType.LARVAE;
}
@Override
public boolean isValid(ItemStack itemStack) {
return Binnie.Genetics.getBeeRoot().isMember(itemStack)
&& Binnie.Genetics.getBeeRoot().getType(itemStack) == EnumBeeType.LARVAE;
}
@Override
public String getTooltip() {
return I18N.localise("extrabees.machine.alveay.hatchery.tooltip");
}
@Override
public String getTooltip() {
return I18N.localise("extrabees.machine.alveay.hatchery.tooltip");
}
}
@@ -6,12 +6,12 @@ import binnie.extrabees.apiary.machine.AlvearyMachine;
import binnie.extrabees.core.ExtraBeeTexture;
public class LightingAlvearyPackage extends AlvearyMachine.AlvearyPackage implements IMachineInformation {
public LightingAlvearyPackage() {
super("lighting", ExtraBeeTexture.AlvearyLighting.getTexture(), false);
}
public LightingAlvearyPackage() {
super("lighting", ExtraBeeTexture.AlvearyLighting.getTexture(), false);
}
@Override
public void createMachine(Machine machine) {
new LightingComponentModifier(machine);
}
@Override
public void createMachine(Machine machine) {
new LightingComponentModifier(machine);
}
}
@@ -6,12 +6,12 @@ import forestry.api.apiculture.IBeeListener;
import forestry.api.apiculture.IBeeModifier;
public class LightingComponentModifier extends ComponentBeeModifier implements IBeeModifier, IBeeListener {
public LightingComponentModifier(Machine machine) {
super(machine);
}
public LightingComponentModifier(Machine machine) {
super(machine);
}
@Override
public boolean isSelfLighted() {
return true;
}
@Override
public boolean isSelfLighted() {
return true;
}
}
@@ -1,41 +1,40 @@
package binnie.extrabees.apiary.machine.mutator;
import net.minecraft.item.ItemStack;
import java.util.Collection;
import java.util.HashMap;
import java.util.Map;
import net.minecraft.item.ItemStack;
public class AlvearyMutator {
public static final int SLOT_MUTATOR = 0;
public static final int SLOT_MUTATOR = 0;
protected static Map<ItemStack, Float> mutations = new HashMap<>();
protected static Map<ItemStack, Float> mutations = new HashMap<>();
public static boolean isMutationItem(ItemStack item) {
return getMutationMult(item) > 1.0f;
}
public static boolean isMutationItem(ItemStack item) {
return getMutationMult(item) > 1.0f;
}
public static float getMutationMult(ItemStack item) {
if (item == null) {
return 1.0f;
}
public static float getMutationMult(ItemStack item) {
if (item == null) {
return 1.0f;
}
for (ItemStack comp : AlvearyMutator.mutations.keySet()) {
if (ItemStack.areItemStackTagsEqual(item, comp) && item.isItemEqual(comp)) {
return AlvearyMutator.mutations.get(comp);
}
}
return 1.0f;
}
for (ItemStack comp : AlvearyMutator.mutations.keySet()) {
if (ItemStack.areItemStackTagsEqual(item, comp) && item.isItemEqual(comp)) {
return AlvearyMutator.mutations.get(comp);
}
}
return 1.0f;
}
public static void addMutationItem(ItemStack item, float chance) {
if (item == null) {
return;
}
AlvearyMutator.mutations.put(item, chance);
}
public static void addMutationItem(ItemStack item, float chance) {
if (item == null) {
return;
}
AlvearyMutator.mutations.put(item, chance);
}
public static Collection<ItemStack> getMutagens() {
return AlvearyMutator.mutations.keySet();
}
public static Collection<ItemStack> getMutagens() {
return AlvearyMutator.mutations.keySet();
}
}
@@ -9,16 +9,16 @@ import binnie.extrabees.core.ExtraBeeGUID;
import binnie.extrabees.core.ExtraBeeTexture;
public class MutatorAlvearyPackage extends AlvearyMachine.AlvearyPackage implements IMachineInformation {
public MutatorAlvearyPackage() {
super("mutator", ExtraBeeTexture.AlvearyMutator.getTexture(), false);
}
public MutatorAlvearyPackage() {
super("mutator", ExtraBeeTexture.AlvearyMutator.getTexture(), false);
}
@Override
public void createMachine(Machine machine) {
new ComponentExtraBeeGUI(machine, ExtraBeeGUID.AlvearyMutator);
ComponentInventorySlots inventory = new ComponentInventorySlots(machine);
inventory.addSlot(AlvearyMutator.SLOT_MUTATOR, "mutator");
inventory.getSlot(AlvearyMutator.SLOT_MUTATOR).setValidator(new MutatorSlotValidator());
new MutatorModifierComponent(machine);
}
@Override
public void createMachine(Machine machine) {
new ComponentExtraBeeGUI(machine, ExtraBeeGUID.AlvearyMutator);
ComponentInventorySlots inventory = new ComponentInventorySlots(machine);
inventory.addSlot(AlvearyMutator.SLOT_MUTATOR, "mutator");
inventory.getSlot(AlvearyMutator.SLOT_MUTATOR).setValidator(new MutatorSlotValidator());
new MutatorModifierComponent(machine);
}
}
@@ -7,22 +7,22 @@ import forestry.api.apiculture.IBeeListener;
import forestry.api.apiculture.IBeeModifier;
public class MutatorModifierComponent extends ComponentBeeModifier implements IBeeModifier, IBeeListener {
public MutatorModifierComponent(Machine machine) {
super(machine);
}
public MutatorModifierComponent(Machine machine) {
super(machine);
}
@Override
public float getMutationModifier(IBeeGenome genome, IBeeGenome mate, float currentModifier) {
if (getUtil().isSlotEmpty(AlvearyMutator.SLOT_MUTATOR)) {
return 1.0f;
}
@Override
public float getMutationModifier(IBeeGenome genome, IBeeGenome mate, float currentModifier) {
if (getUtil().isSlotEmpty(AlvearyMutator.SLOT_MUTATOR)) {
return 1.0f;
}
float mult = AlvearyMutator.getMutationMult(getUtil().getStack(AlvearyMutator.SLOT_MUTATOR));
return Math.min(mult, 15.0f / currentModifier);
}
float mult = AlvearyMutator.getMutationMult(getUtil().getStack(AlvearyMutator.SLOT_MUTATOR));
return Math.min(mult, 15.0f / currentModifier);
}
@Override
public void onQueenDeath() {
getUtil().decreaseStack(AlvearyMutator.SLOT_MUTATOR, 1);
}
@Override
public void onQueenDeath() {
getUtil().decreaseStack(AlvearyMutator.SLOT_MUTATOR, 1);
}
}
@@ -7,17 +7,17 @@ import binnie.extrabees.ExtraBees;
import net.minecraft.item.ItemStack;
public class MutatorSlotValidator extends SlotValidator {
public MutatorSlotValidator() {
super(new ValidatorIcon(ExtraBees.instance, "validator/mutator.0", "validator/mutator.1"));
}
public MutatorSlotValidator() {
super(new ValidatorIcon(ExtraBees.instance, "validator/mutator.0", "validator/mutator.1"));
}
@Override
public boolean isValid(ItemStack itemStack) {
return AlvearyMutator.isMutationItem(itemStack);
}
@Override
public boolean isValid(ItemStack itemStack) {
return AlvearyMutator.isMutationItem(itemStack);
}
@Override
public String getTooltip() {
return I18N.localise("extrabees.machine.alveay.mutator.tooltip");
}
@Override
public String getTooltip() {
return I18N.localise("extrabees.machine.alveay.mutator.tooltip");
}
}
@@ -6,12 +6,12 @@ import binnie.extrabees.apiary.machine.AlvearyMachine;
import binnie.extrabees.core.ExtraBeeTexture;
public class RainShieldAlvearyPackage extends AlvearyMachine.AlvearyPackage implements IMachineInformation {
public RainShieldAlvearyPackage() {
super("rainShield", ExtraBeeTexture.AlvearyRainShield.getTexture(), false);
}
public RainShieldAlvearyPackage() {
super("rainShield", ExtraBeeTexture.AlvearyRainShield.getTexture(), false);
}
@Override
public void createMachine(Machine machine) {
new RainShieldModifierComponent(machine);
}
@Override
public void createMachine(Machine machine) {
new RainShieldModifierComponent(machine);
}
}
@@ -6,12 +6,12 @@ import forestry.api.apiculture.IBeeListener;
import forestry.api.apiculture.IBeeModifier;
public class RainShieldModifierComponent extends ComponentBeeModifier implements IBeeModifier, IBeeListener {
public RainShieldModifierComponent(Machine machine) {
super(machine);
}
public RainShieldModifierComponent(Machine machine) {
super(machine);
}
@Override
public boolean isSealed() {
return true;
}
@Override
public boolean isSealed() {
return true;
}
}
@@ -1,5 +1,5 @@
package binnie.extrabees.apiary.machine.stimulator;
public class AlvearyStimulator {
public static final int SLOT_CIRCUIT = 0;
public static final int SLOT_CIRCUIT = 0;
}
@@ -6,17 +6,17 @@ import forestry.api.circuits.ChipsetManager;
import net.minecraft.item.ItemStack;
public class CircuitSlotValidator extends SlotValidator {
public CircuitSlotValidator() {
super(SlotValidator.IconCircuit);
}
public CircuitSlotValidator() {
super(SlotValidator.IconCircuit);
}
@Override
public boolean isValid(ItemStack itemStack) {
return itemStack != null && ChipsetManager.circuitRegistry.isChipset(itemStack);
}
@Override
public boolean isValid(ItemStack itemStack) {
return itemStack != null && ChipsetManager.circuitRegistry.isChipset(itemStack);
}
@Override
public String getTooltip() {
return I18N.localise("extrabees.machine.alveay.stimulator.tooltip");
}
@Override
public String getTooltip() {
return I18N.localise("extrabees.machine.alveay.stimulator.tooltip");
}
}
@@ -8,108 +8,108 @@ import forestry.api.apiculture.IBeeModifier;
import forestry.api.circuits.ICircuitLayout;
public enum CircuitType implements IBeeModifier {
LowVoltage(3, 10),
HighVoltage(5, 20),
Plant(10, 10),
Death(6, 10),
Life(11, 10),
Nether(7, 15),
Mutation(4, 15),
Inhibitor(1, 10),
Territory(2, 10);
LowVoltage(3, 10),
HighVoltage(5, 20),
Plant(10, 10),
Death(6, 10),
Life(11, 10),
Nether(7, 15),
Mutation(4, 15),
Inhibitor(1, 10),
Territory(2, 10);
static {
CircuitType.LowVoltage.logic.setModifier(EnumBeeModifier.PRODUCTION, 1.5f, 5.0f);
CircuitType.HighVoltage.logic.setModifier(EnumBeeModifier.PRODUCTION, 2.5f, 10.0f);
CircuitType.Plant.logic.setModifier(EnumBeeModifier.FLOWERING, 1.5f, 5.0f);
CircuitType.Death.logic.setModifier(EnumBeeModifier.LIFESPAN, 0.8f, 0.2f);
CircuitType.Life.logic.setModifier(EnumBeeModifier.LIFESPAN, 1.5f, 5.0f);
CircuitType.Nether.logic.setModifier(EnumBeeBooleanModifier.HELLISH);
CircuitType.Mutation.logic.setModifier(EnumBeeModifier.MUTATION, 1.5f, 5.0f);
CircuitType.Inhibitor.logic.setModifier(EnumBeeModifier.TERRITORY, 0.4f, 0.1f);
CircuitType.Inhibitor.logic.setModifier(EnumBeeModifier.PRODUCTION, 0.9f, 0.5f);
CircuitType.Territory.logic.setModifier(EnumBeeModifier.TERRITORY, 1.5f, 5.0f);
for (CircuitType type : values()) {
type.logic.setModifier(EnumBeeModifier.GENETIC_DECAY, 1.5f, 10.0f);
}
}
static {
CircuitType.LowVoltage.logic.setModifier(EnumBeeModifier.PRODUCTION, 1.5f, 5.0f);
CircuitType.HighVoltage.logic.setModifier(EnumBeeModifier.PRODUCTION, 2.5f, 10.0f);
CircuitType.Plant.logic.setModifier(EnumBeeModifier.FLOWERING, 1.5f, 5.0f);
CircuitType.Death.logic.setModifier(EnumBeeModifier.LIFESPAN, 0.8f, 0.2f);
CircuitType.Life.logic.setModifier(EnumBeeModifier.LIFESPAN, 1.5f, 5.0f);
CircuitType.Nether.logic.setModifier(EnumBeeBooleanModifier.HELLISH);
CircuitType.Mutation.logic.setModifier(EnumBeeModifier.MUTATION, 1.5f, 5.0f);
CircuitType.Inhibitor.logic.setModifier(EnumBeeModifier.TERRITORY, 0.4f, 0.1f);
CircuitType.Inhibitor.logic.setModifier(EnumBeeModifier.PRODUCTION, 0.9f, 0.5f);
CircuitType.Territory.logic.setModifier(EnumBeeModifier.TERRITORY, 1.5f, 5.0f);
for (CircuitType type : values()) {
type.logic.setModifier(EnumBeeModifier.GENETIC_DECAY, 1.5f, 10.0f);
}
}
public int recipe;
public int power;
public int recipe;
public int power;
protected BeeModifierLogic logic;
protected BeeModifierLogic logic;
CircuitType(int recipe, int power) {
logic = new BeeModifierLogic();
this.recipe = recipe;
this.power = power;
}
CircuitType(int recipe, int power) {
logic = new BeeModifierLogic();
this.recipe = recipe;
this.power = power;
}
public void createCircuit(ICircuitLayout layout) {
StimulatorCircuit circuit = new StimulatorCircuit(this, layout);
for (EnumBeeModifier modifier : EnumBeeModifier.values()) {
float mod = logic.getModifier(modifier, 1.0f);
if (mod == 1.0f) {
continue;
}
public void createCircuit(ICircuitLayout layout) {
StimulatorCircuit circuit = new StimulatorCircuit(this, layout);
for (EnumBeeModifier modifier : EnumBeeModifier.values()) {
float mod = logic.getModifier(modifier, 1.0f);
if (mod == 1.0f) {
continue;
}
if (mod > 1.0f) {
int increase = (int) ((mod - 1.0f) * 100.0f);
circuit.addTooltipString("Increases " + modifier.getName() + " by " + increase + "%");
} else {
int decrease = (int) ((1.0f - mod) * 100.0f);
circuit.addTooltipString("Decreases " + modifier.getName() + " by " + decrease + "%");
}
}
}
if (mod > 1.0f) {
int increase = (int) ((mod - 1.0f) * 100.0f);
circuit.addTooltipString("Increases " + modifier.getName() + " by " + increase + "%");
} else {
int decrease = (int) ((1.0f - mod) * 100.0f);
circuit.addTooltipString("Decreases " + modifier.getName() + " by " + decrease + "%");
}
}
}
@Override
public float getTerritoryModifier(IBeeGenome genome, float currentModifier) {
return logic.getModifier(EnumBeeModifier.TERRITORY, currentModifier);
}
@Override
public float getTerritoryModifier(IBeeGenome genome, float currentModifier) {
return logic.getModifier(EnumBeeModifier.TERRITORY, currentModifier);
}
@Override
public float getMutationModifier(IBeeGenome genome, IBeeGenome mate, float currentModifier) {
return logic.getModifier(EnumBeeModifier.MUTATION, currentModifier);
}
@Override
public float getMutationModifier(IBeeGenome genome, IBeeGenome mate, float currentModifier) {
return logic.getModifier(EnumBeeModifier.MUTATION, currentModifier);
}
@Override
public float getLifespanModifier(IBeeGenome genome, IBeeGenome mate, float currentModifier) {
return logic.getModifier(EnumBeeModifier.LIFESPAN, currentModifier);
}
@Override
public float getLifespanModifier(IBeeGenome genome, IBeeGenome mate, float currentModifier) {
return logic.getModifier(EnumBeeModifier.LIFESPAN, currentModifier);
}
@Override
public float getProductionModifier(IBeeGenome genome, float currentModifier) {
return logic.getModifier(EnumBeeModifier.PRODUCTION, currentModifier);
}
@Override
public float getProductionModifier(IBeeGenome genome, float currentModifier) {
return logic.getModifier(EnumBeeModifier.PRODUCTION, currentModifier);
}
@Override
public float getFloweringModifier(IBeeGenome genome, float currentModifier) {
return logic.getModifier(EnumBeeModifier.FLOWERING, currentModifier);
}
@Override
public float getFloweringModifier(IBeeGenome genome, float currentModifier) {
return logic.getModifier(EnumBeeModifier.FLOWERING, currentModifier);
}
@Override
public float getGeneticDecay(IBeeGenome genome, float currentModifier) {
return logic.getModifier(EnumBeeModifier.GENETIC_DECAY, currentModifier);
}
@Override
public float getGeneticDecay(IBeeGenome genome, float currentModifier) {
return logic.getModifier(EnumBeeModifier.GENETIC_DECAY, currentModifier);
}
@Override
public boolean isSealed() {
return logic.getModifier(EnumBeeBooleanModifier.SEALED);
}
@Override
public boolean isSealed() {
return logic.getModifier(EnumBeeBooleanModifier.SEALED);
}
@Override
public boolean isSelfLighted() {
return logic.getModifier(EnumBeeBooleanModifier.SELF_LIGHTED);
}
@Override
public boolean isSelfLighted() {
return logic.getModifier(EnumBeeBooleanModifier.SELF_LIGHTED);
}
@Override
public boolean isSunlightSimulated() {
return logic.getModifier(EnumBeeBooleanModifier.SUNLIGHT_STIMULATED);
}
@Override
public boolean isSunlightSimulated() {
return logic.getModifier(EnumBeeBooleanModifier.SUNLIGHT_STIMULATED);
}
@Override
public boolean isHellish() {
return logic.getModifier(EnumBeeBooleanModifier.HELLISH);
}
@Override
public boolean isHellish() {
return logic.getModifier(EnumBeeBooleanModifier.HELLISH);
}
}
@@ -10,17 +10,17 @@ import binnie.extrabees.core.ExtraBeeGUID;
import binnie.extrabees.core.ExtraBeeTexture;
public class StimulatorAlvearyPackage extends AlvearyMachine.AlvearyPackage implements IMachineInformation {
public StimulatorAlvearyPackage() {
super("stimulator", ExtraBeeTexture.AlvearyStimulator.getTexture(), true);
}
public StimulatorAlvearyPackage() {
super("stimulator", ExtraBeeTexture.AlvearyStimulator.getTexture(), true);
}
@Override
public void createMachine(Machine machine) {
new ComponentExtraBeeGUI(machine, ExtraBeeGUID.AlvearyStimulator);
ComponentInventorySlots inventory = new ComponentInventorySlots(machine);
inventory.addSlot(AlvearyStimulator.SLOT_CIRCUIT, "circuit");
inventory.getSlot(AlvearyStimulator.SLOT_CIRCUIT).setValidator(new CircuitSlotValidator());
new ComponentPowerReceptor(machine);
new StimulatorModifierComponent(machine);
}
@Override
public void createMachine(Machine machine) {
new ComponentExtraBeeGUI(machine, ExtraBeeGUID.AlvearyStimulator);
ComponentInventorySlots inventory = new ComponentInventorySlots(machine);
inventory.addSlot(AlvearyStimulator.SLOT_CIRCUIT, "circuit");
inventory.getSlot(AlvearyStimulator.SLOT_CIRCUIT).setValidator(new CircuitSlotValidator());
new ComponentPowerReceptor(machine);
new StimulatorModifierComponent(machine);
}
}
@@ -7,64 +7,69 @@ import forestry.api.apiculture.IBeeModifier;
import forestry.api.circuits.ICircuitLayout;
public class StimulatorCircuit extends BinnieCircuit implements IBeeModifier {
protected CircuitType type;
protected CircuitType type;
public StimulatorCircuit(CircuitType type, ICircuitLayout layout) {
super("stimulator." + type.toString().toLowerCase(), 4, layout, Mods.forestry.item("thermionicTubes"), type.recipe);
this.type = type;
}
public StimulatorCircuit(CircuitType type, ICircuitLayout layout) {
super(
"stimulator." + type.toString().toLowerCase(),
4,
layout,
Mods.forestry.item("thermionicTubes"),
type.recipe);
this.type = type;
}
public int getPowerUsage() {
return type.power;
}
public int getPowerUsage() {
return type.power;
}
@Override
public float getTerritoryModifier(IBeeGenome genome, float currentModifier) {
return type.getTerritoryModifier(genome, currentModifier);
}
@Override
public float getTerritoryModifier(IBeeGenome genome, float currentModifier) {
return type.getTerritoryModifier(genome, currentModifier);
}
@Override
public float getMutationModifier(IBeeGenome genome, IBeeGenome mate, float currentModifier) {
return type.getMutationModifier(genome, mate, currentModifier);
}
@Override
public float getMutationModifier(IBeeGenome genome, IBeeGenome mate, float currentModifier) {
return type.getMutationModifier(genome, mate, currentModifier);
}
@Override
public float getLifespanModifier(IBeeGenome genome, IBeeGenome mate, float currentModifier) {
return type.getLifespanModifier(genome, mate, currentModifier);
}
@Override
public float getLifespanModifier(IBeeGenome genome, IBeeGenome mate, float currentModifier) {
return type.getLifespanModifier(genome, mate, currentModifier);
}
@Override
public float getProductionModifier(IBeeGenome genome, float currentModifier) {
return type.getProductionModifier(genome, currentModifier);
}
@Override
public float getProductionModifier(IBeeGenome genome, float currentModifier) {
return type.getProductionModifier(genome, currentModifier);
}
@Override
public float getFloweringModifier(IBeeGenome genome, float currentModifier) {
return type.getFloweringModifier(genome, currentModifier);
}
@Override
public float getFloweringModifier(IBeeGenome genome, float currentModifier) {
return type.getFloweringModifier(genome, currentModifier);
}
@Override
public boolean isSealed() {
return type.isSealed();
}
@Override
public boolean isSealed() {
return type.isSealed();
}
@Override
public boolean isSelfLighted() {
return type.isSelfLighted();
}
@Override
public boolean isSelfLighted() {
return type.isSelfLighted();
}
@Override
public boolean isSunlightSimulated() {
return type.isSunlightSimulated();
}
@Override
public boolean isSunlightSimulated() {
return type.isSunlightSimulated();
}
@Override
public boolean isHellish() {
return type.isHellish();
}
@Override
public boolean isHellish() {
return type.isHellish();
}
@Override
public float getGeneticDecay(IBeeGenome genome, float currentModifier) {
return type.getGeneticDecay(genome, currentModifier);
}
@Override
public float getGeneticDecay(IBeeGenome genome, float currentModifier) {
return type.getGeneticDecay(genome, currentModifier);
}
}
@@ -8,192 +8,191 @@ import forestry.api.apiculture.IBeeModifier;
import forestry.api.circuits.ChipsetManager;
import forestry.api.circuits.ICircuit;
import forestry.api.circuits.ICircuitBoard;
import java.util.ArrayList;
import java.util.List;
public class StimulatorModifierComponent extends ComponentBeeModifier implements IBeeModifier, IBeeListener {
protected float powerUsage;
protected boolean powered;
protected StimulatorCircuit[] modifiers;
protected float powerUsage;
protected boolean powered;
protected StimulatorCircuit[] modifiers;
public StimulatorModifierComponent(Machine machine) {
super(machine);
powerUsage = 0.0f;
powered = false;
modifiers = new StimulatorCircuit[0];
}
public StimulatorModifierComponent(Machine machine) {
super(machine);
powerUsage = 0.0f;
powered = false;
modifiers = new StimulatorCircuit[0];
}
@Override
public void onUpdate() {
super.onUpdate();
modifiers = getCircuits();
powerUsage = 0.0f;
for (StimulatorCircuit beeMod : modifiers) {
powerUsage += beeMod.getPowerUsage();
}
powered = getUtil().hasEnergyMJ(powerUsage);
}
@Override
public void onUpdate() {
super.onUpdate();
modifiers = getCircuits();
powerUsage = 0.0f;
for (StimulatorCircuit beeMod : modifiers) {
powerUsage += beeMod.getPowerUsage();
}
powered = getUtil().hasEnergyMJ(powerUsage);
}
public ICircuitBoard getHiveFrame() {
if (!getUtil().isSlotEmpty(AlvearyStimulator.SLOT_CIRCUIT)) {
return ChipsetManager.circuitRegistry.getCircuitboard(getUtil().getStack(AlvearyStimulator.SLOT_CIRCUIT));
}
return null;
}
public ICircuitBoard getHiveFrame() {
if (!getUtil().isSlotEmpty(AlvearyStimulator.SLOT_CIRCUIT)) {
return ChipsetManager.circuitRegistry.getCircuitboard(getUtil().getStack(AlvearyStimulator.SLOT_CIRCUIT));
}
return null;
}
public StimulatorCircuit[] getCircuits() {
ICircuitBoard board = getHiveFrame();
if (board == null) {
return new StimulatorCircuit[0];
}
public StimulatorCircuit[] getCircuits() {
ICircuitBoard board = getHiveFrame();
if (board == null) {
return new StimulatorCircuit[0];
}
ICircuit[] circuits = board.getCircuits();
List<IBeeModifier> mod = new ArrayList<>();
for (ICircuit circuit : circuits) {
if (circuit instanceof StimulatorCircuit) {
mod.add((IBeeModifier) circuit);
}
}
return mod.toArray(new StimulatorCircuit[0]);
}
ICircuit[] circuits = board.getCircuits();
List<IBeeModifier> mod = new ArrayList<>();
for (ICircuit circuit : circuits) {
if (circuit instanceof StimulatorCircuit) {
mod.add((IBeeModifier) circuit);
}
}
return mod.toArray(new StimulatorCircuit[0]);
}
@Override
public float getTerritoryModifier(IBeeGenome genome, float currentModifier) {
float mod = 1.0f;
if (!powered) {
return mod;
}
@Override
public float getTerritoryModifier(IBeeGenome genome, float currentModifier) {
float mod = 1.0f;
if (!powered) {
return mod;
}
for (IBeeModifier beeMod : modifiers) {
mod *= beeMod.getTerritoryModifier(genome, mod);
}
return mod;
}
for (IBeeModifier beeMod : modifiers) {
mod *= beeMod.getTerritoryModifier(genome, mod);
}
return mod;
}
@Override
public float getMutationModifier(IBeeGenome genome, IBeeGenome mate, float currentModifier) {
float mod = 1.0f;
if (!powered) {
return mod;
}
@Override
public float getMutationModifier(IBeeGenome genome, IBeeGenome mate, float currentModifier) {
float mod = 1.0f;
if (!powered) {
return mod;
}
for (IBeeModifier beeMod : modifiers) {
mod *= beeMod.getMutationModifier(genome, mate, mod);
}
return mod;
}
for (IBeeModifier beeMod : modifiers) {
mod *= beeMod.getMutationModifier(genome, mate, mod);
}
return mod;
}
@Override
public float getLifespanModifier(IBeeGenome genome, IBeeGenome mate, float currentModifier) {
float mod = 1.0f;
if (!powered) {
return mod;
}
@Override
public float getLifespanModifier(IBeeGenome genome, IBeeGenome mate, float currentModifier) {
float mod = 1.0f;
if (!powered) {
return mod;
}
for (IBeeModifier beeMod : modifiers) {
mod *= beeMod.getLifespanModifier(genome, mate, mod);
}
return mod;
}
for (IBeeModifier beeMod : modifiers) {
mod *= beeMod.getLifespanModifier(genome, mate, mod);
}
return mod;
}
@Override
public float getProductionModifier(IBeeGenome genome, float currentModifier) {
float mod = 1.0f;
if (!powered) {
return mod;
}
@Override
public float getProductionModifier(IBeeGenome genome, float currentModifier) {
float mod = 1.0f;
if (!powered) {
return mod;
}
for (IBeeModifier beeMod : modifiers) {
mod *= beeMod.getProductionModifier(genome, mod);
}
return mod;
}
for (IBeeModifier beeMod : modifiers) {
mod *= beeMod.getProductionModifier(genome, mod);
}
return mod;
}
@Override
public float getFloweringModifier(IBeeGenome genome, float currentModifier) {
float mod = 1.0f;
if (!powered) {
return mod;
}
@Override
public float getFloweringModifier(IBeeGenome genome, float currentModifier) {
float mod = 1.0f;
if (!powered) {
return mod;
}
for (IBeeModifier beeMod : modifiers) {
mod *= beeMod.getFloweringModifier(genome, mod);
}
return mod;
}
for (IBeeModifier beeMod : modifiers) {
mod *= beeMod.getFloweringModifier(genome, mod);
}
return mod;
}
@Override
public float getGeneticDecay(IBeeGenome genome, float currentModifier) {
float mod = 1.0f;
if (!powered) {
return mod;
}
@Override
public float getGeneticDecay(IBeeGenome genome, float currentModifier) {
float mod = 1.0f;
if (!powered) {
return mod;
}
for (IBeeModifier beeMod : modifiers) {
mod *= beeMod.getGeneticDecay(genome, mod);
}
return mod;
}
for (IBeeModifier beeMod : modifiers) {
mod *= beeMod.getGeneticDecay(genome, mod);
}
return mod;
}
@Override
public boolean isSealed() {
if (!powered) {
return false;
}
@Override
public boolean isSealed() {
if (!powered) {
return false;
}
for (IBeeModifier beeMod : modifiers) {
if (beeMod.isSealed()) {
return true;
}
}
return false;
}
for (IBeeModifier beeMod : modifiers) {
if (beeMod.isSealed()) {
return true;
}
}
return false;
}
@Override
public boolean isSelfLighted() {
if (!powered) {
return false;
}
@Override
public boolean isSelfLighted() {
if (!powered) {
return false;
}
for (IBeeModifier beeMod : modifiers) {
if (beeMod.isSelfLighted()) {
return true;
}
}
return false;
}
for (IBeeModifier beeMod : modifiers) {
if (beeMod.isSelfLighted()) {
return true;
}
}
return false;
}
@Override
public boolean isSunlightSimulated() {
if (!powered) {
return false;
}
@Override
public boolean isSunlightSimulated() {
if (!powered) {
return false;
}
for (IBeeModifier beeMod : modifiers) {
if (beeMod.isSunlightSimulated()) {
return true;
}
}
return false;
}
for (IBeeModifier beeMod : modifiers) {
if (beeMod.isSunlightSimulated()) {
return true;
}
}
return false;
}
@Override
public boolean isHellish() {
if (!powered) {
return false;
}
@Override
public boolean isHellish() {
if (!powered) {
return false;
}
for (IBeeModifier beeMod : modifiers) {
if (beeMod.isHellish()) {
return true;
}
}
return false;
}
for (IBeeModifier beeMod : modifiers) {
if (beeMod.isHellish()) {
return true;
}
}
return false;
}
@Override
public void wearOutEquipment(int amount) {
getUtil().useEnergyMJ(powerUsage);
}
@Override
public void wearOutEquipment(int amount) {
getUtil().useEnergyMJ(powerUsage);
}
}
@@ -7,13 +7,13 @@ import binnie.extrabees.apiary.machine.AlvearyMachine;
import binnie.extrabees.core.ExtraBeeTexture;
public class TransmissionAlvearyPackage extends AlvearyMachine.AlvearyPackage implements IMachineInformation {
public TransmissionAlvearyPackage() {
super("transmission", ExtraBeeTexture.AlvearyTransmission.getTexture(), false);
}
public TransmissionAlvearyPackage() {
super("transmission", ExtraBeeTexture.AlvearyTransmission.getTexture(), false);
}
@Override
public void createMachine(Machine machine) {
new ComponentPowerReceptor(machine, 1000);
new TransmissionModifierComponent(machine);
}
@Override
public void createMachine(Machine machine) {
new ComponentPowerReceptor(machine, 1000);
new TransmissionModifierComponent(machine);
}
}
@@ -6,52 +6,51 @@ import binnie.extrabees.apiary.TileExtraBeeAlveary;
import cofh.api.energy.IEnergyHandler;
import forestry.api.apiculture.IBeeListener;
import forestry.api.apiculture.IBeeModifier;
import java.util.ArrayList;
import java.util.List;
import net.minecraft.tileentity.TileEntity;
import net.minecraftforge.common.util.ForgeDirection;
import java.util.ArrayList;
import java.util.List;
public class TransmissionModifierComponent extends ComponentBeeModifier implements IBeeModifier, IBeeListener {
public TransmissionModifierComponent(Machine machine) {
super(machine);
}
public TransmissionModifierComponent(Machine machine) {
super(machine);
}
@Override
public void onUpdate() {
super.onUpdate();
int energy = getUtil().getPoweredMachine().getEnergyStored(ForgeDirection.NORTH);
if (energy == 0) {
return;
}
@Override
public void onUpdate() {
super.onUpdate();
int energy = getUtil().getPoweredMachine().getEnergyStored(ForgeDirection.NORTH);
if (energy == 0) {
return;
}
TileExtraBeeAlveary tile = (TileExtraBeeAlveary) getMachine().getTileEntity();
List<IEnergyHandler> handlers = new ArrayList<>();
for (TileEntity alvearyTile : tile.getAlvearyBlocks()) {
if (alvearyTile instanceof IEnergyHandler && alvearyTile != tile) {
handlers.add((IEnergyHandler) alvearyTile);
}
}
TileExtraBeeAlveary tile = (TileExtraBeeAlveary) getMachine().getTileEntity();
List<IEnergyHandler> handlers = new ArrayList<>();
for (TileEntity alvearyTile : tile.getAlvearyBlocks()) {
if (alvearyTile instanceof IEnergyHandler && alvearyTile != tile) {
handlers.add((IEnergyHandler) alvearyTile);
}
}
if (handlers.isEmpty()) {
return;
}
if (handlers.isEmpty()) {
return;
}
int maxOutput = 500;
int output = energy / handlers.size();
if (output > maxOutput) {
output = maxOutput;
} else if (output < 1) {
output = 1;
}
int maxOutput = 500;
int output = energy / handlers.size();
if (output > maxOutput) {
output = maxOutput;
} else if (output < 1) {
output = 1;
}
for (IEnergyHandler handler : handlers) {
int recieved = handler.receiveEnergy(ForgeDirection.NORTH, output, false);
getUtil().getPoweredMachine().receiveEnergy(ForgeDirection.NORTH, -recieved, false);
energy = getUtil().getPoweredMachine().getEnergyStored(ForgeDirection.NORTH);
if (energy <= 0) {
return;
}
}
}
for (IEnergyHandler handler : handlers) {
int recieved = handler.receiveEnergy(ForgeDirection.NORTH, output, false);
getUtil().getPoweredMachine().receiveEnergy(ForgeDirection.NORTH, -recieved, false);
energy = getUtil().getPoweredMachine().getEnergyStored(ForgeDirection.NORTH);
if (energy <= 0) {
return;
}
}
}
}
@@ -7,20 +7,19 @@ import binnie.core.mod.config.PropPercentage;
@ConfigFile(filename = "/config/forestry/extrabees/machines.conf")
public class ConfigurationMachines {
@ConfigProperty(
key = "isolatorConsumptionChance",
comment = {"Percentage chance of Isolator consuming bee, in x%."}
)
@PropPercentage
public static int isolatorConsumptionChance = 30;
@ConfigProperty(
key = "isolatorConsumptionChance",
comment = {"Percentage chance of Isolator consuming bee, in x%."})
@PropPercentage
public static int isolatorConsumptionChance = 30;
@ConfigProperty(
key = "geneticErrorModifier",
comment = {
"Modifier that changes how severe splicer/inoculator erros are.",
"0 would result in no errors, even for awful serums.",
"2.0 would result in twice as severe errors"
})
@PropDouble
public static double geneticErrorModifier = 1.0;
@ConfigProperty(
key = "geneticErrorModifier",
comment = {
"Modifier that changes how severe splicer/inoculator erros are.",
"0 would result in no errors, even for awful serums.",
"2.0 would result in twice as severe errors"
})
@PropDouble
public static double geneticErrorModifier = 1.0;
}
@@ -7,23 +7,23 @@ import binnie.core.mod.config.PropInteger;
@ConfigFile(filename = "/config/forestry/extrabees/main.conf")
public class ConfigurationMain {
@ConfigProperty(key = "canQuarryMineHives")
@PropBoolean
public static boolean canQuarryMineHives = true;
@ConfigProperty(key = "canQuarryMineHives")
@PropBoolean
public static boolean canQuarryMineHives = true;
@ConfigProperty(key = "waterHiveRate")
@PropInteger
public static int waterHiveRate = 1;
@ConfigProperty(key = "waterHiveRate")
@PropInteger
public static int waterHiveRate = 1;
@ConfigProperty(key = "rockHiveRate")
@PropInteger
public static int rockHiveRate = 2;
@ConfigProperty(key = "rockHiveRate")
@PropInteger
public static int rockHiveRate = 2;
@ConfigProperty(key = "netherHiveRate")
@PropInteger
public static int netherHiveRate = 2;
@ConfigProperty(key = "netherHiveRate")
@PropInteger
public static int netherHiveRate = 2;
@ConfigProperty(key = "marbleHiveRate")
@PropInteger
public static int marbleHiveRate = 2;
@ConfigProperty(key = "marbleHiveRate")
@PropInteger
public static int marbleHiveRate = 2;
}
@@ -14,45 +14,45 @@ import net.minecraft.tileentity.TileEntity;
import net.minecraft.world.World;
public enum ExtraBeeGUID implements IBinnieGUID {
Database,
DatabaseNEI,
AlvearyMutator,
AlvearyFrame,
AlvearyStimulator,
PunnettSquare,
AlvearyHatchery;
Database,
DatabaseNEI,
AlvearyMutator,
AlvearyFrame,
AlvearyStimulator,
PunnettSquare,
AlvearyHatchery;
@Override
public Window getWindow(EntityPlayer player, World world, int x, int y, int z, Side side) {
Window window = null;
TileEntity tileEntity = world.getTileEntity(x, y, z);
IInventory object = null;
if (tileEntity instanceof IInventory) {
object = (IInventory) tileEntity;
}
@Override
public Window getWindow(EntityPlayer player, World world, int x, int y, int z, Side side) {
Window window = null;
TileEntity tileEntity = world.getTileEntity(x, y, z);
IInventory object = null;
if (tileEntity instanceof IInventory) {
object = (IInventory) tileEntity;
}
switch (this) {
case Database:
case DatabaseNEI:
window = WindowApiaristDatabase.create(player, side, this != ExtraBeeGUID.Database);
break;
switch (this) {
case Database:
case DatabaseNEI:
window = WindowApiaristDatabase.create(player, side, this != ExtraBeeGUID.Database);
break;
case AlvearyMutator:
window = WindowAlvearyMutator.create(player, object, side);
break;
case AlvearyMutator:
window = WindowAlvearyMutator.create(player, object, side);
break;
case AlvearyFrame:
window = WindowAlvearyFrame.create(player, object, side);
break;
case AlvearyFrame:
window = WindowAlvearyFrame.create(player, object, side);
break;
case AlvearyStimulator:
window = WindowAlvearyStimulator.create(player, object, side);
break;
case AlvearyStimulator:
window = WindowAlvearyStimulator.create(player, object, side);
break;
case AlvearyHatchery:
window = WindowAlvearyHatchery.create(player, object, side);
break;
}
return window;
}
case AlvearyHatchery:
window = WindowAlvearyHatchery.create(player, object, side);
break;
}
return window;
}
}
@@ -9,6 +9,7 @@ import cpw.mods.fml.common.registry.GameRegistry;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import forestry.api.recipes.RecipeManagers;
import java.util.List;
import net.minecraft.client.renderer.texture.IIconRegister;
import net.minecraft.init.Blocks;
import net.minecraft.init.Items;
@@ -17,187 +18,197 @@ import net.minecraft.item.ItemStack;
import net.minecraft.util.IIcon;
import net.minecraftforge.oredict.OreDictionary;
import java.util.List;
public enum ExtraBeeItems implements IItemMisc {
ScentedGear("scentedGear"),
DiamondShard("diamondShard"),
EmeraldShard("emeraldShard"),
RubyShard("rubyShard"),
SapphireShard("sapphireShard"),
LapisShard("lapisShard"),
IronDust("ironDust"),
GoldDust("goldDust"),
SilverDust("silverDust"),
PlatinumDust("platinumDust"),
CopperDust("copperDust"),
TinDust("tinDust"),
NickelDust("nickelDust"),
LeadDust("leadDust"),
ZincDust("zincDust"),
TitaniumDust("titaniumDust"),
TungstenDust("tungstenDust"),
UraniumDust("radioactiveDust"),
CoalDust("coalDust"),
RedDye("dyeRed"),
YellowDye("dyeYellow"),
BlueDye("dyeBlue"),
GreenDye("dyeGreen"),
WhiteDye("dyeWhite"),
BlackDye("dyeBlack"),
BrownDye("dyeBrown"),
ClayDust("clayDust"),
YelloriumDust("yelloriumDust"),
BlutoniumDust("blutoniumDust"),
CyaniteDust("cyaniteDust");
ScentedGear("scentedGear"),
DiamondShard("diamondShard"),
EmeraldShard("emeraldShard"),
RubyShard("rubyShard"),
SapphireShard("sapphireShard"),
LapisShard("lapisShard"),
IronDust("ironDust"),
GoldDust("goldDust"),
SilverDust("silverDust"),
PlatinumDust("platinumDust"),
CopperDust("copperDust"),
TinDust("tinDust"),
NickelDust("nickelDust"),
LeadDust("leadDust"),
ZincDust("zincDust"),
TitaniumDust("titaniumDust"),
TungstenDust("tungstenDust"),
UraniumDust("radioactiveDust"),
CoalDust("coalDust"),
RedDye("dyeRed"),
YellowDye("dyeYellow"),
BlueDye("dyeBlue"),
GreenDye("dyeGreen"),
WhiteDye("dyeWhite"),
BlackDye("dyeBlack"),
BrownDye("dyeBrown"),
ClayDust("clayDust"),
YelloriumDust("yelloriumDust"),
BlutoniumDust("blutoniumDust"),
CyaniteDust("cyaniteDust");
static {
ExtraBeeItems.TinDust.setMetal("Tin");
ExtraBeeItems.ZincDust.setMetal("Zinc");
ExtraBeeItems.CopperDust.setMetal("Copper");
ExtraBeeItems.IronDust.setMetal("Iron");
ExtraBeeItems.NickelDust.setMetal("Nickel");
ExtraBeeItems.LeadDust.setMetal("Lead");
ExtraBeeItems.SilverDust.setMetal("Silver");
ExtraBeeItems.GoldDust.setMetal("Gold");
ExtraBeeItems.PlatinumDust.setMetal("Platinum");
ExtraBeeItems.TungstenDust.setMetal("Tungsten");
ExtraBeeItems.TitaniumDust.setMetal("Titanium");
ExtraBeeItems.CoalDust.setMetal("Coal");
ExtraBeeItems.YelloriumDust.setMetal("Yellorium");
ExtraBeeItems.BlutoniumDust.setMetal("Blutonium");
ExtraBeeItems.CyaniteDust.setMetal("Cyanite");
ExtraBeeItems.DiamondShard.setGem("Diamond");
ExtraBeeItems.EmeraldShard.setGem("Emerald");
ExtraBeeItems.RubyShard.setGem("Ruby");
ExtraBeeItems.SapphireShard.setGem("Sapphire");
}
static {
ExtraBeeItems.TinDust.setMetal("Tin");
ExtraBeeItems.ZincDust.setMetal("Zinc");
ExtraBeeItems.CopperDust.setMetal("Copper");
ExtraBeeItems.IronDust.setMetal("Iron");
ExtraBeeItems.NickelDust.setMetal("Nickel");
ExtraBeeItems.LeadDust.setMetal("Lead");
ExtraBeeItems.SilverDust.setMetal("Silver");
ExtraBeeItems.GoldDust.setMetal("Gold");
ExtraBeeItems.PlatinumDust.setMetal("Platinum");
ExtraBeeItems.TungstenDust.setMetal("Tungsten");
ExtraBeeItems.TitaniumDust.setMetal("Titanium");
ExtraBeeItems.CoalDust.setMetal("Coal");
ExtraBeeItems.YelloriumDust.setMetal("Yellorium");
ExtraBeeItems.BlutoniumDust.setMetal("Blutonium");
ExtraBeeItems.CyaniteDust.setMetal("Cyanite");
ExtraBeeItems.DiamondShard.setGem("Diamond");
ExtraBeeItems.EmeraldShard.setGem("Emerald");
ExtraBeeItems.RubyShard.setGem("Ruby");
ExtraBeeItems.SapphireShard.setGem("Sapphire");
}
protected String name;
protected String iconPath;
protected IIcon icon;
protected String metalString;
protected String gemString;
protected String name;
protected String iconPath;
protected IIcon icon;
protected String metalString;
protected String gemString;
ExtraBeeItems(String name) {
this.name = name;
this.iconPath = name;
metalString = null;
gemString = null;
}
ExtraBeeItems(String name) {
this.name = name;
this.iconPath = name;
metalString = null;
gemString = null;
}
public static void init() {
OreDictionary.registerOre("dyeRed", ExtraBeeItems.RedDye.get(1));
OreDictionary.registerOre("dyeYellow", ExtraBeeItems.YellowDye.get(1));
OreDictionary.registerOre("dyeBlue", ExtraBeeItems.BlueDye.get(1));
OreDictionary.registerOre("dyeGreen", ExtraBeeItems.GreenDye.get(1));
OreDictionary.registerOre("dyeBlack", ExtraBeeItems.BlackDye.get(1));
OreDictionary.registerOre("dyeWhite", ExtraBeeItems.WhiteDye.get(1));
OreDictionary.registerOre("dyeBrown", ExtraBeeItems.BrownDye.get(1));
}
public static void init() {
OreDictionary.registerOre("dyeRed", ExtraBeeItems.RedDye.get(1));
OreDictionary.registerOre("dyeYellow", ExtraBeeItems.YellowDye.get(1));
OreDictionary.registerOre("dyeBlue", ExtraBeeItems.BlueDye.get(1));
OreDictionary.registerOre("dyeGreen", ExtraBeeItems.GreenDye.get(1));
OreDictionary.registerOre("dyeBlack", ExtraBeeItems.BlackDye.get(1));
OreDictionary.registerOre("dyeWhite", ExtraBeeItems.WhiteDye.get(1));
OreDictionary.registerOre("dyeBrown", ExtraBeeItems.BrownDye.get(1));
}
public static void postInit() {
ItemStack lapisShard = ExtraBeeItems.LapisShard.get(1);
GameRegistry.addShapelessRecipe(new ItemStack(Items.dye, 1, 4), lapisShard, lapisShard, lapisShard, lapisShard);
for (ExtraBeeItems item : values()) {
if (item.metalString != null) {
ItemStack dust = null;
ItemStack ingot = null;
if (!OreDictionary.getOres("ingot" + item.metalString).isEmpty()) {
ingot = OreDictionary.getOres("ingot" + item.metalString).get(0).copy();
}
if (!OreDictionary.getOres("dust" + item.metalString).isEmpty()) {
dust = OreDictionary.getOres("dust" + item.metalString).get(0).copy();
}
public static void postInit() {
ItemStack lapisShard = ExtraBeeItems.LapisShard.get(1);
GameRegistry.addShapelessRecipe(new ItemStack(Items.dye, 1, 4), lapisShard, lapisShard, lapisShard, lapisShard);
for (ExtraBeeItems item : values()) {
if (item.metalString != null) {
ItemStack dust = null;
ItemStack ingot = null;
if (!OreDictionary.getOres("ingot" + item.metalString).isEmpty()) {
ingot = OreDictionary.getOres("ingot" + item.metalString)
.get(0)
.copy();
}
if (!OreDictionary.getOres("dust" + item.metalString).isEmpty()) {
dust = OreDictionary.getOres("dust" + item.metalString)
.get(0)
.copy();
}
ItemStack input = item.get(1);
if (dust != null) {
GameRegistry.addShapelessRecipe(dust, input, input, input, input);
} else if (ingot != null) {
GameRegistry.addShapelessRecipe(ingot, input, input, input, input, input, input, input, input, input);
} else if (item == ExtraBeeItems.CoalDust) {
GameRegistry.addShapelessRecipe(new ItemStack(Items.coal), input, input, input, input);
}
} else if (item.gemString != null) {
ItemStack gem = null;
if (!OreDictionary.getOres("gem" + item.gemString).isEmpty()) {
gem = OreDictionary.getOres("gem" + item.gemString).get(0);
}
ItemStack input = item.get(1);
if (dust != null) {
GameRegistry.addShapelessRecipe(dust, input, input, input, input);
} else if (ingot != null) {
GameRegistry.addShapelessRecipe(
ingot, input, input, input, input, input, input, input, input, input);
} else if (item == ExtraBeeItems.CoalDust) {
GameRegistry.addShapelessRecipe(new ItemStack(Items.coal), input, input, input, input);
}
} else if (item.gemString != null) {
ItemStack gem = null;
if (!OreDictionary.getOres("gem" + item.gemString).isEmpty()) {
gem = OreDictionary.getOres("gem" + item.gemString).get(0);
}
ItemStack input2 = item.get(1);
if (gem != null) {
GameRegistry.addShapelessRecipe(gem.copy(), input2, input2, input2, input2, input2, input2, input2, input2, input2);
}
}
}
ItemStack input2 = item.get(1);
if (gem != null) {
GameRegistry.addShapelessRecipe(
gem.copy(), input2, input2, input2, input2, input2, input2, input2, input2, input2);
}
}
}
Item woodGear = null;
try {
woodGear = (Item) Class.forName("buildcraft.BuildCraftCore").getField("woodenGearItem").get(null);
} catch (Exception ex) {
// ignored
}
Item woodGear = null;
try {
woodGear = (Item) Class.forName("buildcraft.BuildCraftCore")
.getField("woodenGearItem")
.get(null);
} catch (Exception ex) {
// ignored
}
ItemStack gear = new ItemStack(Blocks.planks, 1);
if (woodGear != null) {
gear = new ItemStack(woodGear, 1);
}
ItemStack gear = new ItemStack(Blocks.planks, 1);
if (woodGear != null) {
gear = new ItemStack(woodGear, 1);
}
RecipeManagers.carpenterManager.addRecipe(
100,
Binnie.Liquid.getLiquidStack("for.honey", 500),
null,
ExtraBeeItems.ScentedGear.get(1),
" j ", "bgb", " p ",
'j', Mods.forestry.item("royalJelly"),
'b', Mods.forestry.item("beeswax"),
'p', Mods.forestry.item("pollen"),
'g', gear
);
}
RecipeManagers.carpenterManager.addRecipe(
100,
Binnie.Liquid.getLiquidStack("for.honey", 500),
null,
ExtraBeeItems.ScentedGear.get(1),
" j ",
"bgb",
" p ",
'j',
Mods.forestry.item("royalJelly"),
'b',
Mods.forestry.item("beeswax"),
'p',
Mods.forestry.item("pollen"),
'g',
gear);
}
private void setGem(String string) {
gemString = string;
}
private void setGem(String string) {
gemString = string;
}
private void setMetal(String string) {
metalString = string;
}
private void setMetal(String string) {
metalString = string;
}
@Override
public boolean isActive() {
if (metalString != null) {
return !OreDictionary.getOres("ingot" + metalString).isEmpty()
|| !OreDictionary.getOres("dust" + metalString).isEmpty()
|| this == ExtraBeeItems.CoalDust;
}
return gemString == null
|| !OreDictionary.getOres("gem" + gemString).isEmpty();
}
@Override
public boolean isActive() {
if (metalString != null) {
return !OreDictionary.getOres("ingot" + metalString).isEmpty()
|| !OreDictionary.getOres("dust" + metalString).isEmpty()
|| this == ExtraBeeItems.CoalDust;
}
return gemString == null || !OreDictionary.getOres("gem" + gemString).isEmpty();
}
@Override
public IIcon getIcon(ItemStack itemStack) {
return icon;
}
@Override
public IIcon getIcon(ItemStack itemStack) {
return icon;
}
@SideOnly(Side.CLIENT)
@Override
public void registerIcons(IIconRegister register) {
icon = ExtraBees.proxy.getIcon(register, "misc/" + iconPath);
}
@SideOnly(Side.CLIENT)
@Override
public void registerIcons(IIconRegister register) {
icon = ExtraBees.proxy.getIcon(register, "misc/" + iconPath);
}
@Override
public void addInformation(List tooltip) {
// ignored
}
@Override
public void addInformation(List tooltip) {
// ignored
}
@Override
public String getName(ItemStack itemStack) {
return I18N.localise("extrabees.item." + name);
}
@Override
public String getName(ItemStack itemStack) {
return I18N.localise("extrabees.item." + name);
}
@Override
public ItemStack get(int count) {
return new ItemStack(ExtraBees.itemMisc, count, ordinal());
}
@Override
public ItemStack get(int count) {
return new ItemStack(ExtraBees.itemMisc, count, ordinal());
}
}
@@ -7,29 +7,29 @@ import binnie.core.resource.ResourceType;
import binnie.extrabees.ExtraBees;
public enum ExtraBeeTexture implements IBinnieTexture {
AlvearyMutator(ResourceType.Tile, "alveary/AlvearyMutator"),
AlvearyNovaBlock(ResourceType.Tile, "alveary/AlvearyNovaBlock"),
AlvearyFrame(ResourceType.Tile, "alveary/AlvearyFrame"),
AlvearyLighting(ResourceType.Tile, "alveary/AlvearyLighting"),
AlvearyRainShield(ResourceType.Tile, "alveary/AlvearyRainShield"),
AlvearyStimulator(ResourceType.Tile, "alveary/AlvearyStimulator"),
AlvearyHatchery(ResourceType.Tile, "alveary/AlvearyHatchery"),
FX(ResourceType.FX, "fx"),
GUIPunnett(ResourceType.GUI, "punnett"),
GUIProgress(ResourceType.GUI, "processes"),
GUIProgress2(ResourceType.GUI, "processes2"),
AlvearyTransmission(ResourceType.Tile, "alveary/AlvearyTransmission");
AlvearyMutator(ResourceType.Tile, "alveary/AlvearyMutator"),
AlvearyNovaBlock(ResourceType.Tile, "alveary/AlvearyNovaBlock"),
AlvearyFrame(ResourceType.Tile, "alveary/AlvearyFrame"),
AlvearyLighting(ResourceType.Tile, "alveary/AlvearyLighting"),
AlvearyRainShield(ResourceType.Tile, "alveary/AlvearyRainShield"),
AlvearyStimulator(ResourceType.Tile, "alveary/AlvearyStimulator"),
AlvearyHatchery(ResourceType.Tile, "alveary/AlvearyHatchery"),
FX(ResourceType.FX, "fx"),
GUIPunnett(ResourceType.GUI, "punnett"),
GUIProgress(ResourceType.GUI, "processes"),
GUIProgress2(ResourceType.GUI, "processes2"),
AlvearyTransmission(ResourceType.Tile, "alveary/AlvearyTransmission");
protected String texture;
protected ResourceType type;
protected String texture;
protected ResourceType type;
ExtraBeeTexture(ResourceType base, String texture) {
this.texture = texture;
type = base;
}
ExtraBeeTexture(ResourceType base, String texture) {
this.texture = texture;
type = base;
}
@Override
public BinnieResource getTexture() {
return Binnie.Resource.getPNG(ExtraBees.instance, type, texture);
}
@Override
public BinnieResource getTexture() {
return Binnie.Resource.getPNG(ExtraBees.instance, type, texture);
}
}
@@ -6,18 +6,18 @@ import binnie.extrabees.ExtraBees;
import forestry.api.core.Tabs;
public class ModuleCore implements IInitializable {
@Override
public void preInit() {
ExtraBees.itemMisc = Binnie.Item.registerMiscItems(ExtraBeeItems.values(), Tabs.tabApiculture);
}
@Override
public void preInit() {
ExtraBees.itemMisc = Binnie.Item.registerMiscItems(ExtraBeeItems.values(), Tabs.tabApiculture);
}
@Override
public void init() {
ExtraBeeItems.init();
}
@Override
public void init() {
ExtraBeeItems.init();
}
@Override
public void postInit() {
ExtraBeeItems.postInit();
}
@Override
public void postInit() {
ExtraBeeItems.postInit();
}
}
@@ -10,312 +10,359 @@ import forestry.api.genetics.IClassification;
import forestry.apiculture.genetics.alleles.AlleleEffect;
import forestry.core.genetics.IBranchDefinition;
import forestry.core.genetics.alleles.EnumAllele;
import java.util.Arrays;
import java.util.Locale;
@SuppressWarnings("Duplicates")
public enum ExtraBeeBranchDefinition implements IBranchDefinition {
BARREN("Vacapis") {
@Override
protected void setBranchProperties(IAllele[] template) {
AlleleHelper.instance.set(template, EnumBeeChromosome.HUMIDITY_TOLERANCE, EnumAllele.Tolerance.DOWN_1);
AlleleHelper.instance.set(template, EnumBeeChromosome.NOCTURNAL, true);
AlleleHelper.instance.set(template, EnumBeeChromosome.SPEED, EnumAllele.Speed.SLOWER);
AlleleHelper.instance.set(template, EnumBeeChromosome.LIFESPAN, EnumAllele.Lifespan.SHORT);
AlleleHelper.instance.set(template, EnumBeeChromosome.TEMPERATURE_TOLERANCE, EnumAllele.Tolerance.UP_1);
AlleleHelper.instance.set(template, EnumBeeChromosome.FLOWER_PROVIDER, AlleleHelper.getAllele(ExtraBeesFlowers.DEAD.getUID()));
AlleleHelper.instance.set(template, EnumBeeChromosome.FERTILITY, EnumAllele.Fertility.LOW);
}
},
HOSTILE("Infenapis") {
@Override
protected void setBranchProperties(IAllele[] template) {
AlleleHelper.instance.set(template, EnumBeeChromosome.HUMIDITY_TOLERANCE, EnumAllele.Tolerance.DOWN_1);
AlleleHelper.instance.set(template, EnumBeeChromosome.NOCTURNAL, true);
AlleleHelper.instance.set(template, EnumBeeChromosome.CAVE_DWELLING, true);
AlleleHelper.instance.set(template, EnumBeeChromosome.TOLERANT_FLYER, true);
AlleleHelper.instance.set(template, EnumBeeChromosome.SPEED, EnumAllele.Speed.SLOWER);
AlleleHelper.instance.set(template, EnumBeeChromosome.LIFESPAN, EnumAllele.Lifespan.SHORT);
AlleleHelper.instance.set(template, EnumBeeChromosome.TEMPERATURE_TOLERANCE, EnumAllele.Tolerance.UP_1);
AlleleHelper.instance.set(template, EnumBeeChromosome.FLOWER_PROVIDER, AlleleHelper.getAllele(ExtraBeesFlowers.DEAD.getUID()));
AlleleHelper.instance.set(template, EnumBeeChromosome.FERTILITY, EnumAllele.Fertility.LOW);
}
},
ROCKY("Monapis") {
@Override
protected void setBranchProperties(IAllele[] template) {
AlleleHelper.instance.set(template, EnumBeeChromosome.NOCTURNAL, true);
AlleleHelper.instance.set(template, EnumBeeChromosome.CAVE_DWELLING, true);
AlleleHelper.instance.set(template, EnumBeeChromosome.TOLERANT_FLYER, true);
AlleleHelper.instance.set(template, EnumBeeChromosome.FERTILITY, EnumAllele.Fertility.LOW);
AlleleHelper.instance.set(template, EnumBeeChromosome.TEMPERATURE_TOLERANCE, EnumAllele.Tolerance.BOTH_1);
AlleleHelper.instance.set(template, EnumBeeChromosome.HUMIDITY_TOLERANCE, EnumAllele.Tolerance.BOTH_1);
AlleleHelper.instance.set(template, EnumBeeChromosome.LIFESPAN, EnumAllele.Lifespan.SHORT);
AlleleHelper.instance.set(template, EnumBeeChromosome.FLOWER_PROVIDER, AlleleHelper.getAllele(ExtraBeesFlowers.ROCK.getUID()));
}
},
METALLIC("Lamminapis") {
@Override
protected void setBranchProperties(IAllele[] template) {
AlleleHelper.instance.set(template, EnumBeeChromosome.NOCTURNAL, true);
AlleleHelper.instance.set(template, EnumBeeChromosome.CAVE_DWELLING, true);
AlleleHelper.instance.set(template, EnumBeeChromosome.TOLERANT_FLYER, true);
AlleleHelper.instance.set(template, EnumBeeChromosome.FERTILITY, EnumAllele.Fertility.LOW);
AlleleHelper.instance.set(template, EnumBeeChromosome.LIFESPAN, EnumAllele.Lifespan.SHORT);
AlleleHelper.instance.set(template, EnumBeeChromosome.FLOWER_PROVIDER, AlleleHelper.getAllele(ExtraBeesFlowers.ROCK.getUID()));
AlleleHelper.instance.set(template, EnumBeeChromosome.TEMPERATURE_TOLERANCE, EnumAllele.Tolerance.BOTH_2);
AlleleHelper.instance.set(template, EnumBeeChromosome.HUMIDITY_TOLERANCE, EnumAllele.Tolerance.BOTH_2);
}
},
METALLIC2("Metalapis") {
@Override
protected void setBranchProperties(IAllele[] template) {
AlleleHelper.instance.set(template, EnumBeeChromosome.NOCTURNAL, true);
AlleleHelper.instance.set(template, EnumBeeChromosome.CAVE_DWELLING, true);
AlleleHelper.instance.set(template, EnumBeeChromosome.TOLERANT_FLYER, true);
AlleleHelper.instance.set(template, EnumBeeChromosome.FERTILITY, EnumAllele.Fertility.LOW);
AlleleHelper.instance.set(template, EnumBeeChromosome.LIFESPAN, EnumAllele.Lifespan.SHORT);
AlleleHelper.instance.set(template, EnumBeeChromosome.FLOWER_PROVIDER, AlleleHelper.getAllele(ExtraBeesFlowers.ROCK.getUID()));
AlleleHelper.instance.set(template, EnumBeeChromosome.TEMPERATURE_TOLERANCE, EnumAllele.Tolerance.BOTH_2);
AlleleHelper.instance.set(template, EnumBeeChromosome.HUMIDITY_TOLERANCE, EnumAllele.Tolerance.BOTH_2);
}
},
ALLOY("Allapis"),
PRECIOUS("Pluriapis") {
@Override
protected void setBranchProperties(IAllele[] template) {
AlleleHelper.instance.set(template, EnumBeeChromosome.NOCTURNAL, true);
AlleleHelper.instance.set(template, EnumBeeChromosome.CAVE_DWELLING, true);
AlleleHelper.instance.set(template, EnumBeeChromosome.TOLERANT_FLYER, true);
AlleleHelper.instance.set(template, EnumBeeChromosome.FERTILITY, EnumAllele.Fertility.LOW);
AlleleHelper.instance.set(template, EnumBeeChromosome.LIFESPAN, EnumAllele.Lifespan.SHORT);
AlleleHelper.instance.set(template, EnumBeeChromosome.FLOWER_PROVIDER, AlleleHelper.getAllele(ExtraBeesFlowers.ROCK.getUID()));
AlleleHelper.instance.set(template, EnumBeeChromosome.TEMPERATURE_TOLERANCE, EnumAllele.Tolerance.BOTH_2);
AlleleHelper.instance.set(template, EnumBeeChromosome.HUMIDITY_TOLERANCE, EnumAllele.Tolerance.BOTH_2);
}
},
MINERAL("Niphapis") {
@Override
protected void setBranchProperties(IAllele[] template) {
AlleleHelper.instance.set(template, EnumBeeChromosome.NOCTURNAL, true);
AlleleHelper.instance.set(template, EnumBeeChromosome.CAVE_DWELLING, true);
AlleleHelper.instance.set(template, EnumBeeChromosome.TOLERANT_FLYER, true);
AlleleHelper.instance.set(template, EnumBeeChromosome.FERTILITY, EnumAllele.Fertility.LOW);
AlleleHelper.instance.set(template, EnumBeeChromosome.LIFESPAN, EnumAllele.Lifespan.SHORT);
AlleleHelper.instance.set(template, EnumBeeChromosome.FLOWER_PROVIDER, AlleleHelper.getAllele(ExtraBeesFlowers.ROCK.getUID()));
AlleleHelper.instance.set(template, EnumBeeChromosome.TEMPERATURE_TOLERANCE, EnumAllele.Tolerance.BOTH_2);
AlleleHelper.instance.set(template, EnumBeeChromosome.HUMIDITY_TOLERANCE, EnumAllele.Tolerance.BOTH_2);
}
},
GEMSTONE("Gemmapis") {
@Override
protected void setBranchProperties(IAllele[] template) {
AlleleHelper.instance.set(template, EnumBeeChromosome.NOCTURNAL, true);
AlleleHelper.instance.set(template, EnumBeeChromosome.CAVE_DWELLING, true);
AlleleHelper.instance.set(template, EnumBeeChromosome.TOLERANT_FLYER, true);
AlleleHelper.instance.set(template, EnumBeeChromosome.FERTILITY, EnumAllele.Fertility.LOW);
AlleleHelper.instance.set(template, EnumBeeChromosome.LIFESPAN, EnumAllele.Lifespan.SHORT);
AlleleHelper.instance.set(template, EnumBeeChromosome.FLOWER_PROVIDER, AlleleHelper.getAllele(ExtraBeesFlowers.ROCK.getUID()));
AlleleHelper.instance.set(template, EnumBeeChromosome.TEMPERATURE_TOLERANCE, EnumAllele.Tolerance.BOTH_2);
AlleleHelper.instance.set(template, EnumBeeChromosome.HUMIDITY_TOLERANCE, EnumAllele.Tolerance.BOTH_2);
}
},
NUCLEAR("Levapis") {
@Override
protected void setBranchProperties(IAllele[] template) {
AlleleHelper.instance.set(template, EnumBeeChromosome.NOCTURNAL, true);
AlleleHelper.instance.set(template, EnumBeeChromosome.CAVE_DWELLING, true);
AlleleHelper.instance.set(template, EnumBeeChromosome.TOLERANT_FLYER, true);
AlleleHelper.instance.set(template, EnumBeeChromosome.FLOWER_PROVIDER, AlleleHelper.getAllele(ExtraBeesFlowers.ROCK.getUID()));
AlleleHelper.instance.set(template, EnumBeeChromosome.TEMPERATURE_TOLERANCE, EnumAllele.Tolerance.BOTH_2);
AlleleHelper.instance.set(template, EnumBeeChromosome.HUMIDITY_TOLERANCE, EnumAllele.Tolerance.BOTH_2);
AlleleHelper.instance.set(template, EnumBeeChromosome.FERTILITY, EnumAllele.Fertility.LOW);
AlleleHelper.instance.set(template, EnumBeeChromosome.LIFESPAN, EnumAllele.Lifespan.SHORTEST);
AlleleHelper.instance.set(template, EnumBeeChromosome.EFFECT, AlleleHelper.getAllele(ExtraBeesEffect.RADIOACTIVE.getUID()));
}
},
HISTORIC("Priscapis") {
@Override
protected void setBranchProperties(IAllele[] template) {
AlleleHelper.instance.set(template, EnumBeeChromosome.SPEED, EnumAllele.Speed.SLOWER);
AlleleHelper.instance.set(template, EnumBeeChromosome.LIFESPAN, EnumAllele.Lifespan.ELONGATED);
AlleleHelper.instance.set(template, EnumBeeChromosome.FLOWERING, EnumAllele.Flowering.SLOW);
}
},
FOSSILIZED("Fosiapis") {
@Override
protected void setBranchProperties(IAllele[] template) {
AlleleHelper.instance.set(template, EnumBeeChromosome.SPEED, EnumAllele.Speed.SLOWER);
AlleleHelper.instance.set(template, EnumBeeChromosome.LIFESPAN, EnumAllele.Lifespan.NORMAL);
AlleleHelper.instance.set(template, EnumBeeChromosome.FLOWERING, EnumAllele.Flowering.SLOW);
}
},
REFINED("Petrapis") {
@Override
protected void setBranchProperties(IAllele[] template) {
AlleleHelper.instance.set(template, EnumBeeChromosome.SPEED, EnumAllele.Speed.SLOWER);
AlleleHelper.instance.set(template, EnumBeeChromosome.LIFESPAN, EnumAllele.Lifespan.NORMAL);
AlleleHelper.instance.set(template, EnumBeeChromosome.FLOWERING, EnumAllele.Flowering.SLOW);
}
},
AQUATIC("Aquapis") {
@Override
protected void setBranchProperties(IAllele[] template) {
AlleleHelper.instance.set(template, EnumBeeChromosome.TOLERANT_FLYER, true);
AlleleHelper.instance.set(template, EnumBeeChromosome.FLOWERING, EnumAllele.Flowering.SLOWEST);
AlleleHelper.instance.set(template, EnumBeeChromosome.HUMIDITY_TOLERANCE, EnumAllele.Tolerance.BOTH_1);
AlleleHelper.instance.set(template, EnumBeeChromosome.FLOWER_PROVIDER, AlleleHelper.getAllele(ExtraBeesFlowers.WATER.getUID()));
AlleleHelper.instance.set(template, EnumBeeChromosome.EFFECT, AlleleHelper.getAllele(ExtraBeesEffect.WATER.getUID()));
}
},
SACCHARINE("Sacchapis") {
@Override
protected void setBranchProperties(IAllele[] template) {
AlleleHelper.instance.set(template, EnumBeeChromosome.FLOWER_PROVIDER, AlleleHelper.getAllele(ExtraBeesFlowers.SUGAR.getUID()));
}
},
CLASSICAL("Grecapis"),
VOLCANIC("Irrapis") {
@Override
protected void setBranchProperties(IAllele[] template) {
AlleleHelper.instance.set(template, EnumBeeChromosome.NOCTURNAL, true);
AlleleHelper.instance.set(template, EnumBeeChromosome.SPEED, EnumAllele.Speed.SLOWER);
AlleleHelper.instance.set(template, EnumBeeChromosome.LIFESPAN, EnumAllele.Lifespan.NORMAL);
AlleleHelper.instance.set(template, EnumBeeChromosome.EFFECT, AlleleHelper.getAllele(ExtraBeesEffect.METEOR.getUID()));
}
},
VIRULENT("Virapis") {
@Override
protected void setBranchProperties(IAllele[] template) {
AlleleHelper.instance.set(template, EnumBeeChromosome.SPEED, EnumAllele.Speed.SLOWER);
AlleleHelper.instance.set(template, EnumBeeChromosome.LIFESPAN, EnumAllele.Lifespan.SHORT);
AlleleHelper.instance.set(template, EnumBeeChromosome.TEMPERATURE_TOLERANCE, EnumAllele.Tolerance.UP_1);
AlleleHelper.instance.set(template, EnumBeeChromosome.HUMIDITY_TOLERANCE, EnumAllele.Tolerance.UP_1);
AlleleHelper.instance.set(template, EnumBeeChromosome.FLOWER_PROVIDER, EnumAllele.Flowers.JUNGLE);
AlleleHelper.instance.set(template, EnumBeeChromosome.EFFECT, AlleleEffect.effectMiasmic);
}
},
VISCOUS("Viscapis") {
@Override
protected void setBranchProperties(IAllele[] template) {
AlleleHelper.instance.set(template, EnumBeeChromosome.TEMPERATURE_TOLERANCE, EnumAllele.Tolerance.UP_1);
AlleleHelper.instance.set(template, EnumBeeChromosome.HUMIDITY_TOLERANCE, EnumAllele.Tolerance.UP_1);
AlleleHelper.instance.set(template, EnumBeeChromosome.FLOWER_PROVIDER, EnumAllele.Flowers.JUNGLE);
AlleleHelper.instance.set(template, EnumBeeChromosome.SPEED, EnumAllele.Speed.SLOW);
AlleleHelper.instance.set(template, EnumBeeChromosome.EFFECT, AlleleHelper.getAllele(ExtraBeesEffect.ECTOPLASM.getUID()));
}
},
CAUSTIC("Morbapis") {
@Override
protected void setBranchProperties(IAllele[] template) {
AlleleHelper.instance.set(template, EnumBeeChromosome.TEMPERATURE_TOLERANCE, EnumAllele.Tolerance.UP_1);
AlleleHelper.instance.set(template, EnumBeeChromosome.HUMIDITY_TOLERANCE, EnumAllele.Tolerance.UP_1);
AlleleHelper.instance.set(template, EnumBeeChromosome.FLOWER_PROVIDER, EnumAllele.Flowers.JUNGLE);
AlleleHelper.instance.set(template, EnumBeeChromosome.SPEED, EnumAllele.Speed.FAST);
AlleleHelper.instance.set(template, EnumBeeChromosome.FLOWERING, EnumAllele.Flowering.AVERAGE);
AlleleHelper.instance.set(template, EnumBeeChromosome.EFFECT, AlleleHelper.getAllele(ExtraBeesEffect.ACID.getUID()));
}
},
ENERGETIC("Incitapis") {
@Override
protected void setBranchProperties(IAllele[] template) {
AlleleHelper.instance.set(template, EnumBeeChromosome.CAVE_DWELLING, true);
AlleleHelper.instance.set(template, EnumBeeChromosome.FLOWER_PROVIDER, AlleleHelper.getAllele(ExtraBeesFlowers.REDSTONE.getUID()));
AlleleHelper.instance.set(template, EnumBeeChromosome.EFFECT, AlleleHelper.getAllele(ExtraBeesEffect.LIGHTNING.getUID()));
}
},
FARMING("Agriapis"),
SHADOW("Pullapis") {
@Override
protected void setBranchProperties(IAllele[] template) {
AlleleHelper.instance.set(template, EnumBeeChromosome.NOCTURNAL, true);
AlleleHelper.instance.set(template, EnumBeeChromosome.SPEED, EnumAllele.Speed.SLOWER);
AlleleHelper.instance.set(template, EnumBeeChromosome.LIFESPAN, EnumAllele.Lifespan.NORMAL);
AlleleHelper.instance.set(template, EnumBeeChromosome.EFFECT, AlleleHelper.getAllele(ExtraBeesEffect.BLINDNESS.getUID()));
}
},
PRIMARY("Primapis"),
SECONDARY("Secapis"),
TERTIARY("Tertiapis"),
FTB("Eftebeapis") {
@Override
protected void setBranchProperties(IAllele[] template) {
AlleleHelper.instance.set(template, EnumBeeChromosome.SPEED, EnumAllele.Speed.SLOWER);
AlleleHelper.instance.set(template, EnumBeeChromosome.LIFESPAN, EnumAllele.Lifespan.NORMAL);
AlleleHelper.instance.set(template, EnumBeeChromosome.EFFECT, AlleleEffect.effectBeatific);
AlleleHelper.instance.set(template, EnumBeeChromosome.FERTILITY, EnumAllele.Fertility.MAXIMUM);
AlleleHelper.instance.set(template, EnumBeeChromosome.FLOWERING, EnumAllele.Flowering.MAXIMUM);
AlleleHelper.instance.set(template, EnumBeeChromosome.TERRITORY, EnumAllele.Territory.LARGEST);
}
},
QUANTUM("Quantapis") {
@Override
protected void setBranchProperties(IAllele[] template) {
AlleleHelper.instance.set(template, EnumBeeChromosome.FERTILITY, EnumAllele.Fertility.LOW);
AlleleHelper.instance.set(template, EnumBeeChromosome.SPEED, EnumAllele.Speed.SLOWER);
AlleleHelper.instance.set(template, EnumBeeChromosome.LIFESPAN, EnumAllele.Lifespan.LONGER);
AlleleHelper.instance.set(template, EnumBeeChromosome.TEMPERATURE_TOLERANCE, EnumAllele.Tolerance.UP_1);
AlleleHelper.instance.set(template, EnumBeeChromosome.TERRITORY, EnumAllele.Territory.LARGE);
AlleleHelper.instance.set(template, EnumBeeChromosome.FLOWER_PROVIDER, EnumAllele.Flowers.END);
AlleleHelper.instance.set(template, EnumBeeChromosome.NOCTURNAL, true);
AlleleHelper.instance.set(template, EnumBeeChromosome.EFFECT, AlleleHelper.getAllele(ExtraBeesEffect.GRAVITY.getUID()));
}
},
BOTANIA("Botaniapis") {
@Override
protected void setBranchProperties(IAllele[] template) {
AlleleHelper.instance.set(template, EnumBeeChromosome.SPEED, EnumAllele.Speed.SLOWER);
AlleleHelper.instance.set(template, EnumBeeChromosome.LIFESPAN, EnumAllele.Lifespan.SHORT);
AlleleHelper.instance.set(template, EnumBeeChromosome.FLOWERING, EnumAllele.Flowering.SLOW);
AlleleHelper.instance.set(template, EnumBeeChromosome.FLOWER_PROVIDER, AlleleHelper.getAllele(ExtraBeesFlowers.MYSTICAL.getUID()));
}
};
BARREN("Vacapis") {
@Override
protected void setBranchProperties(IAllele[] template) {
AlleleHelper.instance.set(template, EnumBeeChromosome.HUMIDITY_TOLERANCE, EnumAllele.Tolerance.DOWN_1);
AlleleHelper.instance.set(template, EnumBeeChromosome.NOCTURNAL, true);
AlleleHelper.instance.set(template, EnumBeeChromosome.SPEED, EnumAllele.Speed.SLOWER);
AlleleHelper.instance.set(template, EnumBeeChromosome.LIFESPAN, EnumAllele.Lifespan.SHORT);
AlleleHelper.instance.set(template, EnumBeeChromosome.TEMPERATURE_TOLERANCE, EnumAllele.Tolerance.UP_1);
AlleleHelper.instance.set(
template,
EnumBeeChromosome.FLOWER_PROVIDER,
AlleleHelper.getAllele(ExtraBeesFlowers.DEAD.getUID()));
AlleleHelper.instance.set(template, EnumBeeChromosome.FERTILITY, EnumAllele.Fertility.LOW);
}
},
HOSTILE("Infenapis") {
@Override
protected void setBranchProperties(IAllele[] template) {
AlleleHelper.instance.set(template, EnumBeeChromosome.HUMIDITY_TOLERANCE, EnumAllele.Tolerance.DOWN_1);
AlleleHelper.instance.set(template, EnumBeeChromosome.NOCTURNAL, true);
AlleleHelper.instance.set(template, EnumBeeChromosome.CAVE_DWELLING, true);
AlleleHelper.instance.set(template, EnumBeeChromosome.TOLERANT_FLYER, true);
AlleleHelper.instance.set(template, EnumBeeChromosome.SPEED, EnumAllele.Speed.SLOWER);
AlleleHelper.instance.set(template, EnumBeeChromosome.LIFESPAN, EnumAllele.Lifespan.SHORT);
AlleleHelper.instance.set(template, EnumBeeChromosome.TEMPERATURE_TOLERANCE, EnumAllele.Tolerance.UP_1);
AlleleHelper.instance.set(
template,
EnumBeeChromosome.FLOWER_PROVIDER,
AlleleHelper.getAllele(ExtraBeesFlowers.DEAD.getUID()));
AlleleHelper.instance.set(template, EnumBeeChromosome.FERTILITY, EnumAllele.Fertility.LOW);
}
},
ROCKY("Monapis") {
@Override
protected void setBranchProperties(IAllele[] template) {
AlleleHelper.instance.set(template, EnumBeeChromosome.NOCTURNAL, true);
AlleleHelper.instance.set(template, EnumBeeChromosome.CAVE_DWELLING, true);
AlleleHelper.instance.set(template, EnumBeeChromosome.TOLERANT_FLYER, true);
AlleleHelper.instance.set(template, EnumBeeChromosome.FERTILITY, EnumAllele.Fertility.LOW);
AlleleHelper.instance.set(template, EnumBeeChromosome.TEMPERATURE_TOLERANCE, EnumAllele.Tolerance.BOTH_1);
AlleleHelper.instance.set(template, EnumBeeChromosome.HUMIDITY_TOLERANCE, EnumAllele.Tolerance.BOTH_1);
AlleleHelper.instance.set(template, EnumBeeChromosome.LIFESPAN, EnumAllele.Lifespan.SHORT);
AlleleHelper.instance.set(
template,
EnumBeeChromosome.FLOWER_PROVIDER,
AlleleHelper.getAllele(ExtraBeesFlowers.ROCK.getUID()));
}
},
METALLIC("Lamminapis") {
@Override
protected void setBranchProperties(IAllele[] template) {
AlleleHelper.instance.set(template, EnumBeeChromosome.NOCTURNAL, true);
AlleleHelper.instance.set(template, EnumBeeChromosome.CAVE_DWELLING, true);
AlleleHelper.instance.set(template, EnumBeeChromosome.TOLERANT_FLYER, true);
AlleleHelper.instance.set(template, EnumBeeChromosome.FERTILITY, EnumAllele.Fertility.LOW);
AlleleHelper.instance.set(template, EnumBeeChromosome.LIFESPAN, EnumAllele.Lifespan.SHORT);
AlleleHelper.instance.set(
template,
EnumBeeChromosome.FLOWER_PROVIDER,
AlleleHelper.getAllele(ExtraBeesFlowers.ROCK.getUID()));
AlleleHelper.instance.set(template, EnumBeeChromosome.TEMPERATURE_TOLERANCE, EnumAllele.Tolerance.BOTH_2);
AlleleHelper.instance.set(template, EnumBeeChromosome.HUMIDITY_TOLERANCE, EnumAllele.Tolerance.BOTH_2);
}
},
METALLIC2("Metalapis") {
@Override
protected void setBranchProperties(IAllele[] template) {
AlleleHelper.instance.set(template, EnumBeeChromosome.NOCTURNAL, true);
AlleleHelper.instance.set(template, EnumBeeChromosome.CAVE_DWELLING, true);
AlleleHelper.instance.set(template, EnumBeeChromosome.TOLERANT_FLYER, true);
AlleleHelper.instance.set(template, EnumBeeChromosome.FERTILITY, EnumAllele.Fertility.LOW);
AlleleHelper.instance.set(template, EnumBeeChromosome.LIFESPAN, EnumAllele.Lifespan.SHORT);
AlleleHelper.instance.set(
template,
EnumBeeChromosome.FLOWER_PROVIDER,
AlleleHelper.getAllele(ExtraBeesFlowers.ROCK.getUID()));
AlleleHelper.instance.set(template, EnumBeeChromosome.TEMPERATURE_TOLERANCE, EnumAllele.Tolerance.BOTH_2);
AlleleHelper.instance.set(template, EnumBeeChromosome.HUMIDITY_TOLERANCE, EnumAllele.Tolerance.BOTH_2);
}
},
ALLOY("Allapis"),
PRECIOUS("Pluriapis") {
@Override
protected void setBranchProperties(IAllele[] template) {
AlleleHelper.instance.set(template, EnumBeeChromosome.NOCTURNAL, true);
AlleleHelper.instance.set(template, EnumBeeChromosome.CAVE_DWELLING, true);
AlleleHelper.instance.set(template, EnumBeeChromosome.TOLERANT_FLYER, true);
AlleleHelper.instance.set(template, EnumBeeChromosome.FERTILITY, EnumAllele.Fertility.LOW);
AlleleHelper.instance.set(template, EnumBeeChromosome.LIFESPAN, EnumAllele.Lifespan.SHORT);
AlleleHelper.instance.set(
template,
EnumBeeChromosome.FLOWER_PROVIDER,
AlleleHelper.getAllele(ExtraBeesFlowers.ROCK.getUID()));
AlleleHelper.instance.set(template, EnumBeeChromosome.TEMPERATURE_TOLERANCE, EnumAllele.Tolerance.BOTH_2);
AlleleHelper.instance.set(template, EnumBeeChromosome.HUMIDITY_TOLERANCE, EnumAllele.Tolerance.BOTH_2);
}
},
MINERAL("Niphapis") {
@Override
protected void setBranchProperties(IAllele[] template) {
AlleleHelper.instance.set(template, EnumBeeChromosome.NOCTURNAL, true);
AlleleHelper.instance.set(template, EnumBeeChromosome.CAVE_DWELLING, true);
AlleleHelper.instance.set(template, EnumBeeChromosome.TOLERANT_FLYER, true);
AlleleHelper.instance.set(template, EnumBeeChromosome.FERTILITY, EnumAllele.Fertility.LOW);
AlleleHelper.instance.set(template, EnumBeeChromosome.LIFESPAN, EnumAllele.Lifespan.SHORT);
AlleleHelper.instance.set(
template,
EnumBeeChromosome.FLOWER_PROVIDER,
AlleleHelper.getAllele(ExtraBeesFlowers.ROCK.getUID()));
AlleleHelper.instance.set(template, EnumBeeChromosome.TEMPERATURE_TOLERANCE, EnumAllele.Tolerance.BOTH_2);
AlleleHelper.instance.set(template, EnumBeeChromosome.HUMIDITY_TOLERANCE, EnumAllele.Tolerance.BOTH_2);
}
},
GEMSTONE("Gemmapis") {
@Override
protected void setBranchProperties(IAllele[] template) {
AlleleHelper.instance.set(template, EnumBeeChromosome.NOCTURNAL, true);
AlleleHelper.instance.set(template, EnumBeeChromosome.CAVE_DWELLING, true);
AlleleHelper.instance.set(template, EnumBeeChromosome.TOLERANT_FLYER, true);
AlleleHelper.instance.set(template, EnumBeeChromosome.FERTILITY, EnumAllele.Fertility.LOW);
AlleleHelper.instance.set(template, EnumBeeChromosome.LIFESPAN, EnumAllele.Lifespan.SHORT);
AlleleHelper.instance.set(
template,
EnumBeeChromosome.FLOWER_PROVIDER,
AlleleHelper.getAllele(ExtraBeesFlowers.ROCK.getUID()));
AlleleHelper.instance.set(template, EnumBeeChromosome.TEMPERATURE_TOLERANCE, EnumAllele.Tolerance.BOTH_2);
AlleleHelper.instance.set(template, EnumBeeChromosome.HUMIDITY_TOLERANCE, EnumAllele.Tolerance.BOTH_2);
}
},
NUCLEAR("Levapis") {
@Override
protected void setBranchProperties(IAllele[] template) {
AlleleHelper.instance.set(template, EnumBeeChromosome.NOCTURNAL, true);
AlleleHelper.instance.set(template, EnumBeeChromosome.CAVE_DWELLING, true);
AlleleHelper.instance.set(template, EnumBeeChromosome.TOLERANT_FLYER, true);
AlleleHelper.instance.set(
template,
EnumBeeChromosome.FLOWER_PROVIDER,
AlleleHelper.getAllele(ExtraBeesFlowers.ROCK.getUID()));
AlleleHelper.instance.set(template, EnumBeeChromosome.TEMPERATURE_TOLERANCE, EnumAllele.Tolerance.BOTH_2);
AlleleHelper.instance.set(template, EnumBeeChromosome.HUMIDITY_TOLERANCE, EnumAllele.Tolerance.BOTH_2);
AlleleHelper.instance.set(template, EnumBeeChromosome.FERTILITY, EnumAllele.Fertility.LOW);
AlleleHelper.instance.set(template, EnumBeeChromosome.LIFESPAN, EnumAllele.Lifespan.SHORTEST);
AlleleHelper.instance.set(
template, EnumBeeChromosome.EFFECT, AlleleHelper.getAllele(ExtraBeesEffect.RADIOACTIVE.getUID()));
}
},
HISTORIC("Priscapis") {
@Override
protected void setBranchProperties(IAllele[] template) {
AlleleHelper.instance.set(template, EnumBeeChromosome.SPEED, EnumAllele.Speed.SLOWER);
AlleleHelper.instance.set(template, EnumBeeChromosome.LIFESPAN, EnumAllele.Lifespan.ELONGATED);
AlleleHelper.instance.set(template, EnumBeeChromosome.FLOWERING, EnumAllele.Flowering.SLOW);
}
},
FOSSILIZED("Fosiapis") {
@Override
protected void setBranchProperties(IAllele[] template) {
AlleleHelper.instance.set(template, EnumBeeChromosome.SPEED, EnumAllele.Speed.SLOWER);
AlleleHelper.instance.set(template, EnumBeeChromosome.LIFESPAN, EnumAllele.Lifespan.NORMAL);
AlleleHelper.instance.set(template, EnumBeeChromosome.FLOWERING, EnumAllele.Flowering.SLOW);
}
},
REFINED("Petrapis") {
@Override
protected void setBranchProperties(IAllele[] template) {
AlleleHelper.instance.set(template, EnumBeeChromosome.SPEED, EnumAllele.Speed.SLOWER);
AlleleHelper.instance.set(template, EnumBeeChromosome.LIFESPAN, EnumAllele.Lifespan.NORMAL);
AlleleHelper.instance.set(template, EnumBeeChromosome.FLOWERING, EnumAllele.Flowering.SLOW);
}
},
AQUATIC("Aquapis") {
@Override
protected void setBranchProperties(IAllele[] template) {
AlleleHelper.instance.set(template, EnumBeeChromosome.TOLERANT_FLYER, true);
AlleleHelper.instance.set(template, EnumBeeChromosome.FLOWERING, EnumAllele.Flowering.SLOWEST);
AlleleHelper.instance.set(template, EnumBeeChromosome.HUMIDITY_TOLERANCE, EnumAllele.Tolerance.BOTH_1);
AlleleHelper.instance.set(
template,
EnumBeeChromosome.FLOWER_PROVIDER,
AlleleHelper.getAllele(ExtraBeesFlowers.WATER.getUID()));
AlleleHelper.instance.set(
template, EnumBeeChromosome.EFFECT, AlleleHelper.getAllele(ExtraBeesEffect.WATER.getUID()));
}
},
SACCHARINE("Sacchapis") {
@Override
protected void setBranchProperties(IAllele[] template) {
AlleleHelper.instance.set(
template,
EnumBeeChromosome.FLOWER_PROVIDER,
AlleleHelper.getAllele(ExtraBeesFlowers.SUGAR.getUID()));
}
},
CLASSICAL("Grecapis"),
VOLCANIC("Irrapis") {
@Override
protected void setBranchProperties(IAllele[] template) {
AlleleHelper.instance.set(template, EnumBeeChromosome.NOCTURNAL, true);
AlleleHelper.instance.set(template, EnumBeeChromosome.SPEED, EnumAllele.Speed.SLOWER);
AlleleHelper.instance.set(template, EnumBeeChromosome.LIFESPAN, EnumAllele.Lifespan.NORMAL);
AlleleHelper.instance.set(
template, EnumBeeChromosome.EFFECT, AlleleHelper.getAllele(ExtraBeesEffect.METEOR.getUID()));
}
},
VIRULENT("Virapis") {
@Override
protected void setBranchProperties(IAllele[] template) {
AlleleHelper.instance.set(template, EnumBeeChromosome.SPEED, EnumAllele.Speed.SLOWER);
AlleleHelper.instance.set(template, EnumBeeChromosome.LIFESPAN, EnumAllele.Lifespan.SHORT);
AlleleHelper.instance.set(template, EnumBeeChromosome.TEMPERATURE_TOLERANCE, EnumAllele.Tolerance.UP_1);
AlleleHelper.instance.set(template, EnumBeeChromosome.HUMIDITY_TOLERANCE, EnumAllele.Tolerance.UP_1);
AlleleHelper.instance.set(template, EnumBeeChromosome.FLOWER_PROVIDER, EnumAllele.Flowers.JUNGLE);
AlleleHelper.instance.set(template, EnumBeeChromosome.EFFECT, AlleleEffect.effectMiasmic);
}
},
VISCOUS("Viscapis") {
@Override
protected void setBranchProperties(IAllele[] template) {
AlleleHelper.instance.set(template, EnumBeeChromosome.TEMPERATURE_TOLERANCE, EnumAllele.Tolerance.UP_1);
AlleleHelper.instance.set(template, EnumBeeChromosome.HUMIDITY_TOLERANCE, EnumAllele.Tolerance.UP_1);
AlleleHelper.instance.set(template, EnumBeeChromosome.FLOWER_PROVIDER, EnumAllele.Flowers.JUNGLE);
AlleleHelper.instance.set(template, EnumBeeChromosome.SPEED, EnumAllele.Speed.SLOW);
AlleleHelper.instance.set(
template, EnumBeeChromosome.EFFECT, AlleleHelper.getAllele(ExtraBeesEffect.ECTOPLASM.getUID()));
}
},
CAUSTIC("Morbapis") {
@Override
protected void setBranchProperties(IAllele[] template) {
AlleleHelper.instance.set(template, EnumBeeChromosome.TEMPERATURE_TOLERANCE, EnumAllele.Tolerance.UP_1);
AlleleHelper.instance.set(template, EnumBeeChromosome.HUMIDITY_TOLERANCE, EnumAllele.Tolerance.UP_1);
AlleleHelper.instance.set(template, EnumBeeChromosome.FLOWER_PROVIDER, EnumAllele.Flowers.JUNGLE);
AlleleHelper.instance.set(template, EnumBeeChromosome.SPEED, EnumAllele.Speed.FAST);
AlleleHelper.instance.set(template, EnumBeeChromosome.FLOWERING, EnumAllele.Flowering.AVERAGE);
AlleleHelper.instance.set(
template, EnumBeeChromosome.EFFECT, AlleleHelper.getAllele(ExtraBeesEffect.ACID.getUID()));
}
},
ENERGETIC("Incitapis") {
@Override
protected void setBranchProperties(IAllele[] template) {
AlleleHelper.instance.set(template, EnumBeeChromosome.CAVE_DWELLING, true);
AlleleHelper.instance.set(
template,
EnumBeeChromosome.FLOWER_PROVIDER,
AlleleHelper.getAllele(ExtraBeesFlowers.REDSTONE.getUID()));
AlleleHelper.instance.set(
template, EnumBeeChromosome.EFFECT, AlleleHelper.getAllele(ExtraBeesEffect.LIGHTNING.getUID()));
}
},
FARMING("Agriapis"),
SHADOW("Pullapis") {
@Override
protected void setBranchProperties(IAllele[] template) {
AlleleHelper.instance.set(template, EnumBeeChromosome.NOCTURNAL, true);
AlleleHelper.instance.set(template, EnumBeeChromosome.SPEED, EnumAllele.Speed.SLOWER);
AlleleHelper.instance.set(template, EnumBeeChromosome.LIFESPAN, EnumAllele.Lifespan.NORMAL);
AlleleHelper.instance.set(
template, EnumBeeChromosome.EFFECT, AlleleHelper.getAllele(ExtraBeesEffect.BLINDNESS.getUID()));
}
},
PRIMARY("Primapis"),
SECONDARY("Secapis"),
TERTIARY("Tertiapis"),
FTB("Eftebeapis") {
@Override
protected void setBranchProperties(IAllele[] template) {
AlleleHelper.instance.set(template, EnumBeeChromosome.SPEED, EnumAllele.Speed.SLOWER);
AlleleHelper.instance.set(template, EnumBeeChromosome.LIFESPAN, EnumAllele.Lifespan.NORMAL);
AlleleHelper.instance.set(template, EnumBeeChromosome.EFFECT, AlleleEffect.effectBeatific);
AlleleHelper.instance.set(template, EnumBeeChromosome.FERTILITY, EnumAllele.Fertility.MAXIMUM);
AlleleHelper.instance.set(template, EnumBeeChromosome.FLOWERING, EnumAllele.Flowering.MAXIMUM);
AlleleHelper.instance.set(template, EnumBeeChromosome.TERRITORY, EnumAllele.Territory.LARGEST);
}
},
QUANTUM("Quantapis") {
@Override
protected void setBranchProperties(IAllele[] template) {
AlleleHelper.instance.set(template, EnumBeeChromosome.FERTILITY, EnumAllele.Fertility.LOW);
AlleleHelper.instance.set(template, EnumBeeChromosome.SPEED, EnumAllele.Speed.SLOWER);
AlleleHelper.instance.set(template, EnumBeeChromosome.LIFESPAN, EnumAllele.Lifespan.LONGER);
AlleleHelper.instance.set(template, EnumBeeChromosome.TEMPERATURE_TOLERANCE, EnumAllele.Tolerance.UP_1);
AlleleHelper.instance.set(template, EnumBeeChromosome.TERRITORY, EnumAllele.Territory.LARGE);
AlleleHelper.instance.set(template, EnumBeeChromosome.FLOWER_PROVIDER, EnumAllele.Flowers.END);
AlleleHelper.instance.set(template, EnumBeeChromosome.NOCTURNAL, true);
AlleleHelper.instance.set(
template, EnumBeeChromosome.EFFECT, AlleleHelper.getAllele(ExtraBeesEffect.GRAVITY.getUID()));
}
},
BOTANIA("Botaniapis") {
@Override
protected void setBranchProperties(IAllele[] template) {
AlleleHelper.instance.set(template, EnumBeeChromosome.SPEED, EnumAllele.Speed.SLOWER);
AlleleHelper.instance.set(template, EnumBeeChromosome.LIFESPAN, EnumAllele.Lifespan.SHORT);
AlleleHelper.instance.set(template, EnumBeeChromosome.FLOWERING, EnumAllele.Flowering.SLOW);
AlleleHelper.instance.set(
template,
EnumBeeChromosome.FLOWER_PROVIDER,
AlleleHelper.getAllele(ExtraBeesFlowers.MYSTICAL.getUID()));
}
};
private static IAllele[] defaultTemplate;
private static IAllele[] defaultTemplate;
private final IClassification branch;
private final IClassification branch;
ExtraBeeBranchDefinition(String scientific) {
branch = BeeManager.beeFactory.createBranch(name().toLowerCase(Locale.ENGLISH), scientific);
IClassification parent = AlleleManager.alleleRegistry.getClassification("family.apidae");
if (parent != null) {
parent.addMemberGroup(branch);
}
}
ExtraBeeBranchDefinition(String scientific) {
branch = BeeManager.beeFactory.createBranch(name().toLowerCase(Locale.ENGLISH), scientific);
IClassification parent = AlleleManager.alleleRegistry.getClassification("family.apidae");
if (parent != null) {
parent.addMemberGroup(branch);
}
}
protected void setBranchProperties(IAllele[] template) {
// ignored
}
protected void setBranchProperties(IAllele[] template) {
// ignored
}
@Override
public final IAllele[] getTemplate() {
IAllele[] template = getDefaultTemplate();
setBranchProperties(template);
return template;
}
@Override
public final IAllele[] getTemplate() {
IAllele[] template = getDefaultTemplate();
setBranchProperties(template);
return template;
}
@Override
public final IClassification getBranch() {
return branch;
}
@Override
public final IClassification getBranch() {
return branch;
}
private static IAllele[] getDefaultTemplate() {
if (defaultTemplate == null) {
defaultTemplate = new IAllele[EnumBeeChromosome.values().length];
AlleleHelper.instance.set(defaultTemplate, EnumBeeChromosome.SPEED, EnumAllele.Speed.SLOWEST);
AlleleHelper.instance.set(defaultTemplate, EnumBeeChromosome.LIFESPAN, EnumAllele.Lifespan.SHORTER);
AlleleHelper.instance.set(defaultTemplate, EnumBeeChromosome.FERTILITY, EnumAllele.Fertility.NORMAL);
AlleleHelper.instance.set(defaultTemplate, EnumBeeChromosome.TEMPERATURE_TOLERANCE, EnumAllele.Tolerance.NONE);
AlleleHelper.instance.set(defaultTemplate, EnumBeeChromosome.NOCTURNAL, false);
AlleleHelper.instance.set(defaultTemplate, EnumBeeChromosome.HUMIDITY_TOLERANCE, EnumAllele.Tolerance.NONE);
AlleleHelper.instance.set(defaultTemplate, EnumBeeChromosome.TOLERANT_FLYER, false);
AlleleHelper.instance.set(defaultTemplate, EnumBeeChromosome.CAVE_DWELLING, false);
AlleleHelper.instance.set(defaultTemplate, EnumBeeChromosome.FLOWER_PROVIDER, EnumAllele.Flowers.VANILLA);
AlleleHelper.instance.set(defaultTemplate, EnumBeeChromosome.FLOWERING, EnumAllele.Flowering.SLOWEST);
AlleleHelper.instance.set(defaultTemplate, EnumBeeChromosome.TERRITORY, EnumAllele.Territory.AVERAGE);
AlleleHelper.instance.set(defaultTemplate, EnumBeeChromosome.EFFECT, AlleleEffect.effectNone);
}
return Arrays.copyOf(defaultTemplate, defaultTemplate.length);
}
private static IAllele[] getDefaultTemplate() {
if (defaultTemplate == null) {
defaultTemplate = new IAllele[EnumBeeChromosome.values().length];
AlleleHelper.instance.set(defaultTemplate, EnumBeeChromosome.SPEED, EnumAllele.Speed.SLOWEST);
AlleleHelper.instance.set(defaultTemplate, EnumBeeChromosome.LIFESPAN, EnumAllele.Lifespan.SHORTER);
AlleleHelper.instance.set(defaultTemplate, EnumBeeChromosome.FERTILITY, EnumAllele.Fertility.NORMAL);
AlleleHelper.instance.set(
defaultTemplate, EnumBeeChromosome.TEMPERATURE_TOLERANCE, EnumAllele.Tolerance.NONE);
AlleleHelper.instance.set(defaultTemplate, EnumBeeChromosome.NOCTURNAL, false);
AlleleHelper.instance.set(defaultTemplate, EnumBeeChromosome.HUMIDITY_TOLERANCE, EnumAllele.Tolerance.NONE);
AlleleHelper.instance.set(defaultTemplate, EnumBeeChromosome.TOLERANT_FLYER, false);
AlleleHelper.instance.set(defaultTemplate, EnumBeeChromosome.CAVE_DWELLING, false);
AlleleHelper.instance.set(defaultTemplate, EnumBeeChromosome.FLOWER_PROVIDER, EnumAllele.Flowers.VANILLA);
AlleleHelper.instance.set(defaultTemplate, EnumBeeChromosome.FLOWERING, EnumAllele.Flowering.SLOWEST);
AlleleHelper.instance.set(defaultTemplate, EnumBeeChromosome.TERRITORY, EnumAllele.Territory.AVERAGE);
AlleleHelper.instance.set(defaultTemplate, EnumBeeChromosome.EFFECT, AlleleEffect.effectNone);
}
return Arrays.copyOf(defaultTemplate, defaultTemplate.length);
}
}
File diff suppressed because it is too large. Load diff
@@ -12,39 +12,43 @@ import forestry.api.apiculture.IBeeRoot;
import forestry.api.genetics.IAllele;
import forestry.api.genetics.IMutation;
import forestry.apiculture.genetics.BeeMutation;
import java.util.ArrayList;
import java.util.List;
public class ExtraBeeMutation extends BeeMutation implements IBeeMutationCustom {
public static List<IMutation> mutations = new ArrayList<>();
public static List<IMutation> mutations = new ArrayList<>();
private List<IMutationRequirement> requirements;
public ExtraBeeMutation(IAlleleBeeSpecies bee0, IAlleleBeeSpecies bee1, IAllele[] result, int chance) {
super(bee0, bee1, result, chance);
requirements = new ArrayList<>();
mutations.add(this);
}
private List<IMutationRequirement> requirements;
@Override
public IBeeRoot getRoot() {
return BeeManager.beeRoot;
}
public ExtraBeeMutation(IAlleleBeeSpecies bee0, IAlleleBeeSpecies bee1, IAllele[] result, int chance) {
super(bee0, bee1, result, chance);
requirements = new ArrayList<>();
mutations.add(this);
}
@Override
public float getChance(IBeeHousing housing, IAlleleBeeSpecies allele0, IAlleleBeeSpecies allele1, IBeeGenome genome0, IBeeGenome genome1) {
for (IMutationRequirement requirement : requirements) {
if (!requirement.fufilled(housing, allele0, allele1, genome0, genome1)) {
return 0.0f;
}
}
return super.getChance(housing, allele0, allele1, genome0, genome1);
}
@Override
public IBeeRoot getRoot() {
return BeeManager.beeRoot;
}
public void restrictPerson(String nickname) {
RequirementPerson requirement = new RequirementPerson(nickname);
requirements.add(requirement);
addMutationCondition(new DummyMutationCondition(requirement));
}
@Override
public float getChance(
IBeeHousing housing,
IAlleleBeeSpecies allele0,
IAlleleBeeSpecies allele1,
IBeeGenome genome0,
IBeeGenome genome1) {
for (IMutationRequirement requirement : requirements) {
if (!requirement.fufilled(housing, allele0, allele1, genome0, genome1)) {
return 0.0f;
}
}
return super.getChance(housing, allele0, allele1, genome0, genome1);
}
public void restrictPerson(String nickname) {
RequirementPerson requirement = new RequirementPerson(nickname);
requirements.add(requirement);
addMutationCondition(new DummyMutationCondition(requirement));
}
}
@@ -13,6 +13,12 @@ import forestry.api.genetics.IFruitBearer;
import forestry.api.genetics.IIndividual;
import forestry.api.genetics.IPollinatable;
import forestry.api.genetics.ISpeciesRoot;
import java.util.ArrayList;
import java.util.Collections;
import java.util.EnumSet;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
import net.minecraft.block.Block;
import net.minecraft.block.material.Material;
import net.minecraft.init.Blocks;
@@ -22,224 +28,217 @@ import net.minecraft.item.ItemStack;
import net.minecraft.world.World;
import net.minecraftforge.common.EnumPlantType;
import java.util.ArrayList;
import java.util.Collections;
import java.util.EnumSet;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
public enum ExtraBeesFlowers implements IFlowerProvider, IAlleleFlowers, IChromosomeType {
WATER,
SUGAR,
ROCK,
BOOK,
DEAD,
REDSTONE,
WOOD,
LEAVES,
SAPLING,
FRUIT,
MYSTICAL;
WATER,
SUGAR,
ROCK,
BOOK,
DEAD,
REDSTONE,
WOOD,
LEAVES,
SAPLING,
FRUIT,
MYSTICAL;
protected boolean dominant;
protected boolean dominant;
ExtraBeesFlowers() {
dominant = true;
}
ExtraBeesFlowers() {
dominant = true;
}
public static void doInit() {
for (ExtraBeesFlowers effect : values()) {
effect.register();
}
}
public static void doInit() {
for (ExtraBeesFlowers effect : values()) {
effect.register();
}
}
@Override
public String getUID() {
return "extrabees.flower." + toString().toLowerCase();
}
@Override
public String getUID() {
return "extrabees.flower." + toString().toLowerCase();
}
@Override
public boolean isDominant() {
return dominant;
}
@Override
public boolean isDominant() {
return dominant;
}
@Override
public IFlowerProvider getProvider() {
return this;
}
@Override
public IFlowerProvider getProvider() {
return this;
}
@Override
public String getDescription() {
return I18N.localise("extrabees.flowers." + name().toLowerCase() + ".name");
}
@Override
public String getDescription() {
return I18N.localise("extrabees.flowers." + name().toLowerCase() + ".name");
}
public void register() {
// AlleleManager.alleleRegistry.registerAllele((IAllele)this);
for (ItemStack stack : getItemStacks()) {
FlowerManager.flowerRegistry.registerAcceptableFlower(Block.getBlockFromItem(stack.getItem()), getUID());
}
public void register() {
// AlleleManager.alleleRegistry.registerAllele((IAllele)this);
for (ItemStack stack : getItemStacks()) {
FlowerManager.flowerRegistry.registerAcceptableFlower(Block.getBlockFromItem(stack.getItem()), getUID());
}
AlleleManager.alleleRegistry.registerAllele(this, this);
}
AlleleManager.alleleRegistry.registerAllele(this, this);
}
public ItemStack[] getItemStacks() {
switch (this) {
case WATER:
return new ItemStack[]{new ItemStack(Blocks.waterlily)};
public ItemStack[] getItemStacks() {
switch (this) {
case WATER:
return new ItemStack[] {new ItemStack(Blocks.waterlily)};
case SUGAR:
return new ItemStack[]{new ItemStack(Blocks.reeds)};
case SUGAR:
return new ItemStack[] {new ItemStack(Blocks.reeds)};
case ROCK:
return new ItemStack[]{new ItemStack(Blocks.cobblestone)};
case ROCK:
return new ItemStack[] {new ItemStack(Blocks.cobblestone)};
case BOOK:
return new ItemStack[]{new ItemStack(Blocks.bookshelf)};
case BOOK:
return new ItemStack[] {new ItemStack(Blocks.bookshelf)};
case REDSTONE:
return new ItemStack[]{new ItemStack(Blocks.redstone_torch)};
case REDSTONE:
return new ItemStack[] {new ItemStack(Blocks.redstone_torch)};
case DEAD:
return new ItemStack[]{new ItemStack(Blocks.deadbush)};
case DEAD:
return new ItemStack[] {new ItemStack(Blocks.deadbush)};
case FRUIT:
return new ItemStack[]{new ItemStack(Items.apple)};
case FRUIT:
return new ItemStack[] {new ItemStack(Items.apple)};
case LEAVES:
return new ItemStack[]{new ItemStack(Blocks.leaves)};
case LEAVES:
return new ItemStack[] {new ItemStack(Blocks.leaves)};
case SAPLING:
return new ItemStack[]{new ItemStack(Blocks.sapling)};
case SAPLING:
return new ItemStack[] {new ItemStack(Blocks.sapling)};
case WOOD:
return new ItemStack[]{new ItemStack(Blocks.log)};
}
return new ItemStack[0];
}
case WOOD:
return new ItemStack[] {new ItemStack(Blocks.log)};
}
return new ItemStack[0];
}
@Override
public boolean isAcceptedPollinatable(World world, IPollinatable pollinatable) {
EnumSet<EnumPlantType> types = pollinatable.getPlantType();
return types.size() > 1 || !types.contains(EnumPlantType.Nether);
}
@Override
public boolean isAcceptedPollinatable(World world, IPollinatable pollinatable) {
EnumSet<EnumPlantType> types = pollinatable.getPlantType();
return types.size() > 1 || !types.contains(EnumPlantType.Nether);
}
public boolean isAcceptedFlower(World world, int x, int y, int z) {
Block block = world.getBlock(x, y, z);
if (block == null) {
return false;
}
public boolean isAcceptedFlower(World world, int x, int y, int z) {
Block block = world.getBlock(x, y, z);
if (block == null) {
return false;
}
switch (this) {
case WATER:
return block == Blocks.waterlily;
switch (this) {
case WATER:
return block == Blocks.waterlily;
case ROCK:
return block.getMaterial() == Material.rock;
case ROCK:
return block.getMaterial() == Material.rock;
case SUGAR:
return block == Blocks.reeds;
case SUGAR:
return block == Blocks.reeds;
case BOOK:
return block == Blocks.bookshelf;
case BOOK:
return block == Blocks.bookshelf;
case REDSTONE:
return block == Blocks.redstone_torch;
case REDSTONE:
return block == Blocks.redstone_torch;
case DEAD:
return block == Blocks.deadbush;
case DEAD:
return block == Blocks.deadbush;
case WOOD:
return block.isWood(world, x, y, z);
case WOOD:
return block.isWood(world, x, y, z);
case FRUIT:
return world.getTileEntity(x, y, z) instanceof IFruitBearer;
case FRUIT:
return world.getTileEntity(x, y, z) instanceof IFruitBearer;
case LEAVES:
return block.isLeaves(world, x, y, z);
case LEAVES:
return block.isLeaves(world, x, y, z);
case SAPLING:
return block.getClass().getName().toLowerCase().contains("sapling");
case SAPLING:
return block.getClass().getName().toLowerCase().contains("sapling");
case MYSTICAL:
return block == Mods.botania.block("flower");
}
return false;
}
case MYSTICAL:
return block == Mods.botania.block("flower");
}
return false;
}
@Override
public boolean growFlower(World world, IIndividual individual, int x, int y, int z) {
switch (this) {
case WATER:
return world.isAirBlock(x, y, z)
&& world.getBlock(x, y - 1, z) == Blocks.water
&& world.setBlock(x, y, z, Blocks.waterlily, 0, 2);
@Override
public boolean growFlower(World world, IIndividual individual, int x, int y, int z) {
switch (this) {
case WATER:
return world.isAirBlock(x, y, z)
&& world.getBlock(x, y - 1, z) == Blocks.water
&& world.setBlock(x, y, z, Blocks.waterlily, 0, 2);
case SUGAR:
return world.getBlock(x, y - 1, z) == Blocks.reeds
&& world.isAirBlock(x, y, z)
&& world.setBlock(x, y, z, Blocks.reeds, 0, 0);
}
return false;
}
case SUGAR:
return world.getBlock(x, y - 1, z) == Blocks.reeds
&& world.isAirBlock(x, y, z)
&& world.setBlock(x, y, z, Blocks.reeds, 0, 0);
}
return false;
}
@Override
public ItemStack[] affectProducts(World world, IIndividual individual, int x, int y, int z, ItemStack[] products) {
if (this == ExtraBeesFlowers.MYSTICAL) {
List<ItemStack> prods = new ArrayList<>();
Collections.addAll(prods, products);
@Override
public ItemStack[] affectProducts(World world, IIndividual individual, int x, int y, int z, ItemStack[] products) {
if (this == ExtraBeesFlowers.MYSTICAL) {
List<ItemStack> prods = new ArrayList<>();
Collections.addAll(prods, products);
for (int k = 0; k < 50; ++k) {
int tX = 7;
int tY = 7;
int tZ = 3;
int x2 = x - tX + world.rand.nextInt(1 + 2 * tX);
int y2 = y - tY + world.rand.nextInt(1 + 2 * tY);
int z2 = z - tZ + world.rand.nextInt(1 + 2 * tZ);
for (int k = 0; k < 50; ++k) {
int tX = 7;
int tY = 7;
int tZ = 3;
int x2 = x - tX + world.rand.nextInt(1 + 2 * tX);
int y2 = y - tY + world.rand.nextInt(1 + 2 * tY);
int z2 = z - tZ + world.rand.nextInt(1 + 2 * tZ);
Block block = world.getBlock(x2, y2, z2);
if (block != null) {
if (block == Mods.botania.block("flower")) {
int meta = world.getBlockMetadata(x2, y2, z2);
Item item = Mods.botania.item("petal");
if (item != null) {
prods.add(new ItemStack(item, 1, meta));
}
}
}
}
return prods.toArray(new ItemStack[0]);
}
return products;
}
Block block = world.getBlock(x2, y2, z2);
if (block != null) {
if (block == Mods.botania.block("flower")) {
int meta = world.getBlockMetadata(x2, y2, z2);
Item item = Mods.botania.item("petal");
if (item != null) {
prods.add(new ItemStack(item, 1, meta));
}
}
}
}
return prods.toArray(new ItemStack[0]);
}
return products;
}
@Override
public String getName() {
return getDescription();
}
@Override
public String getName() {
return getDescription();
}
@Override
public String getUnlocalizedName() {
return getUID();
}
@Override
public String getUnlocalizedName() {
return getUID();
}
@Override
public String getFlowerType() {
return getUID();
}
@Override
public String getFlowerType() {
return getUID();
}
@Override
public Set<IFlower> getFlowers() {
return new HashSet<>();
}
@Override
public Set<IFlower> getFlowers() {
return new HashSet<>();
}
@Override
public Class<? extends IAllele> getAlleleClass() {
return getClass();
}
@Override
public Class<? extends IAllele> getAlleleClass() {
return getClass();
}
@Override
public ISpeciesRoot getSpeciesRoot() {
return AlleleManager.alleleRegistry.getSpeciesRoot(getUID());
}
@Override
public ISpeciesRoot getSpeciesRoot() {
return AlleleManager.alleleRegistry.getSpeciesRoot(getUID());
}
}
@@ -15,39 +15,47 @@ import net.minecraft.init.Items;
import net.minecraft.item.ItemStack;
public class ModuleGenetics implements IInitializable {
public static IGenome getGenome(IAlleleBeeSpecies allele0) {
return Binnie.Genetics.getBeeRoot().templateAsGenome(Binnie.Genetics.getBeeRoot().getTemplate(allele0.getUID()));
}
public static IGenome getGenome(IAlleleBeeSpecies allele0) {
return Binnie.Genetics.getBeeRoot()
.templateAsGenome(Binnie.Genetics.getBeeRoot().getTemplate(allele0.getUID()));
}
@Override
public void preInit() {
ExtraBees.dictionary = new ItemDictionary();
@Override
public void preInit() {
ExtraBees.dictionary = new ItemDictionary();
ExtraBees.ectoplasm = new BlockEctoplasm();
GameRegistry.registerBlock(ExtraBees.ectoplasm, "ectoplasm");
}
ExtraBees.ectoplasm = new BlockEctoplasm();
GameRegistry.registerBlock(ExtraBees.ectoplasm, "ectoplasm");
}
@Override
public void init() {
ExtraBeesEffect.doInit();
ExtraBeesFlowers.doInit();
ExtraBeeDefinition.initBees();
}
@Override
public void init() {
ExtraBeesEffect.doInit();
ExtraBeesFlowers.doInit();
ExtraBeeDefinition.initBees();
}
@Override
public void postInit() {
RecipeManagers.carpenterManager.addRecipe(
100,
Binnie.Liquid.getLiquidStack("water", 2000),
null,
new ItemStack(ExtraBees.dictionary),
"X#X", "YEY", "RDR",
'#', Blocks.glass_pane,
'X', Items.gold_ingot,
'Y', "ingotTin",
'R', Items.redstone,
'D', Items.diamond,
'E', Items.emerald
);
}
@Override
public void postInit() {
RecipeManagers.carpenterManager.addRecipe(
100,
Binnie.Liquid.getLiquidStack("water", 2000),
null,
new ItemStack(ExtraBees.dictionary),
"X#X",
"YEY",
"RDR",
'#',
Blocks.glass_pane,
'X',
Items.gold_ingot,
'Y',
"ingotTin",
'R',
Items.redstone,
'D',
Items.diamond,
'E',
Items.emerald);
}
}
@@ -3,37 +3,36 @@ package binnie.extrabees.genetics.effect;
import binnie.extrabees.ExtraBees;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import java.util.Random;
import net.minecraft.block.BlockWeb;
import net.minecraft.client.renderer.texture.IIconRegister;
import net.minecraft.init.Items;
import net.minecraft.item.Item;
import java.util.Random;
public class BlockEctoplasm extends BlockWeb {
public BlockEctoplasm() {
setLightOpacity(1);
setHardness(0.5f);
}
public BlockEctoplasm() {
setLightOpacity(1);
setHardness(0.5f);
}
@Override
@SideOnly(Side.CLIENT)
public void registerBlockIcons(IIconRegister register) {
blockIcon = ExtraBees.proxy.getIcon(register, "ectoplasm");
}
@Override
@SideOnly(Side.CLIENT)
public void registerBlockIcons(IIconRegister register) {
blockIcon = ExtraBees.proxy.getIcon(register, "ectoplasm");
}
@Override
public int quantityDropped(Random rand) {
return (rand.nextInt(5) == 0) ? 1 : 0;
}
@Override
public int quantityDropped(Random rand) {
return (rand.nextInt(5) == 0) ? 1 : 0;
}
@Override
public Item getItemDropped(int meta, Random rand, int fortune) {
return Items.slime_ball;
}
@Override
public Item getItemDropped(int meta, Random rand, int fortune) {
return Items.slime_ball;
}
@Override
public String getUnlocalizedName() {
return "extrabees.block.ectoplasm";
}
@Override
public String getUnlocalizedName() {
return "extrabees.block.ectoplasm";
}
}
@@ -1,5 +1,6 @@
package binnie.extrabees.genetics.effect;
import java.util.List;
import net.minecraft.entity.Entity;
import net.minecraft.entity.effect.EntityLightningBolt;
import net.minecraft.init.Blocks;
@@ -7,53 +8,64 @@ import net.minecraft.util.AxisAlignedBB;
import net.minecraft.util.MathHelper;
import net.minecraft.world.World;
import java.util.List;
public class EntityBeeLightning extends EntityLightningBolt {
int lightningState;
int boltLivingTime;
int lightningState;
int boltLivingTime;
public EntityBeeLightning(World world, double x, double y, double z) {
super(world, x, y, z);
lightningState = 2;
boltLivingTime = rand.nextInt(3) + 1;
}
public EntityBeeLightning(World world, double x, double y, double z) {
super(world, x, y, z);
lightningState = 2;
boltLivingTime = rand.nextInt(3) + 1;
}
@Override
public void onUpdate() {
onEntityUpdate();
lightningState--;
@Override
public void onUpdate() {
onEntityUpdate();
lightningState--;
if (lightningState < 0) {
if (boltLivingTime == 0) {
setDead();
} else if (lightningState < -rand.nextInt(10)) {
boltLivingTime--;
lightningState = 1;
boltVertex = rand.nextLong();
if (lightningState < 0) {
if (boltLivingTime == 0) {
setDead();
} else if (lightningState < -rand.nextInt(10)) {
boltLivingTime--;
lightningState = 1;
boltVertex = rand.nextLong();
if (!worldObj.isRemote && worldObj.doChunksNearChunkExist(MathHelper.floor_double(posX), MathHelper.floor_double(posY), MathHelper.floor_double(posZ), 10)) {
int i = MathHelper.floor_double(posX);
int j = MathHelper.floor_double(posY);
int k = MathHelper.floor_double(posZ);
if (worldObj.getBlock(i, j, k) == null && Blocks.fire.canPlaceBlockAt(worldObj, i, j, k)) {
worldObj.setBlock(i, j, k, Blocks.fire);
}
}
}
}
if (!worldObj.isRemote
&& worldObj.doChunksNearChunkExist(
MathHelper.floor_double(posX),
MathHelper.floor_double(posY),
MathHelper.floor_double(posZ),
10)) {
int i = MathHelper.floor_double(posX);
int j = MathHelper.floor_double(posY);
int k = MathHelper.floor_double(posZ);
if (worldObj.getBlock(i, j, k) == null && Blocks.fire.canPlaceBlockAt(worldObj, i, j, k)) {
worldObj.setBlock(i, j, k, Blocks.fire);
}
}
}
}
if (lightningState >= 0) {
if (worldObj.isRemote) {
worldObj.lastLightningBolt = 2;
} else {
double offset = 3.0;
List list = worldObj.getEntitiesWithinAABBExcludingEntity(this, AxisAlignedBB.getBoundingBox(posX - offset, posY - offset, posZ - offset, posX + offset, posY + 6.0 + offset, posZ + offset));
for (Object aList : list) {
Entity entity = (Entity) aList;
entity.onStruckByLightning(this);
}
}
}
}
if (lightningState >= 0) {
if (worldObj.isRemote) {
worldObj.lastLightningBolt = 2;
} else {
double offset = 3.0;
List list = worldObj.getEntitiesWithinAABBExcludingEntity(
this,
AxisAlignedBB.getBoundingBox(
posX - offset,
posY - offset,
posZ - offset,
posX + offset,
posY + 6.0 + offset,
posZ + offset));
for (Object aList : list) {
Entity entity = (Entity) aList;
entity.onStruckByLightning(this);
}
}
}
}
}
File diff suppressed because it is too large. Load diff
@@ -1,81 +1,80 @@
package binnie.extrabees.genetics.effect;
import java.util.ArrayList;
import net.minecraft.init.Items;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.nbt.NBTTagList;
import java.util.ArrayList;
public class FireworkCreator {
public enum Shape {
Ball,
LargeBall,
Star,
Creeper,
Burst
}
public enum Shape {
Ball,
LargeBall,
Star,
Creeper,
Burst
}
public static class Firework {
protected boolean flicker;
protected boolean trail;
protected ArrayList<Integer> colors;
protected byte shape;
public static class Firework {
protected boolean flicker;
protected boolean trail;
protected ArrayList<Integer> colors;
protected byte shape;
public Firework() {
flicker = false;
trail = false;
colors = new ArrayList<>();
shape = 0;
}
public Firework() {
flicker = false;
trail = false;
colors = new ArrayList<>();
shape = 0;
}
public void setTrail() {
trail = true;
}
public void setTrail() {
trail = true;
}
public void setShape(Shape shape) {
this.shape = (byte) shape.ordinal();
}
public void setShape(Shape shape) {
this.shape = (byte) shape.ordinal();
}
public void addColor(int color) {
colors.add(color);
}
public void addColor(int color) {
colors.add(color);
}
public NBTTagCompound getNBT() {
NBTTagCompound nbt = new NBTTagCompound();
if (flicker) {
nbt.setBoolean("Flicker", true);
}
public NBTTagCompound getNBT() {
NBTTagCompound nbt = new NBTTagCompound();
if (flicker) {
nbt.setBoolean("Flicker", true);
}
if (trail) {
nbt.setBoolean("Trail", true);
}
if (trail) {
nbt.setBoolean("Trail", true);
}
if (colors.size() == 0) {
addColor(0xffffff);
}
if (colors.size() == 0) {
addColor(0xffffff);
}
int[] array = new int[colors.size()];
for (int i = 0; i < colors.size(); ++i) {
array[i] = colors.get(i);
}
int[] array = new int[colors.size()];
for (int i = 0; i < colors.size(); ++i) {
array[i] = colors.get(i);
}
nbt.setIntArray("Colors", array);
nbt.setByte("Type", shape);
return nbt;
}
nbt.setIntArray("Colors", array);
nbt.setByte("Type", shape);
return nbt;
}
public ItemStack getFirework() {
NBTTagCompound fireworksNbt = new NBTTagCompound();
NBTTagCompound fireworkNbt = new NBTTagCompound();
NBTTagList explosions = new NBTTagList();
explosions.appendTag(getNBT());
fireworkNbt.setTag("Explosions", explosions);
fireworkNbt.setByte("Flight", (byte) 0);
fireworksNbt.setTag("Fireworks", fireworkNbt);
ItemStack item = new ItemStack(Items.fireworks);
item.setTagCompound(fireworksNbt);
return item;
}
}
public ItemStack getFirework() {
NBTTagCompound fireworksNbt = new NBTTagCompound();
NBTTagCompound fireworkNbt = new NBTTagCompound();
NBTTagList explosions = new NBTTagList();
explosions.appendTag(getNBT());
fireworkNbt.setTag("Explosions", explosions);
fireworkNbt.setByte("Flight", (byte) 0);
fireworksNbt.setTag("Fireworks", fireworkNbt);
ItemStack item = new ItemStack(Items.fireworks);
item.setTagCompound(fireworksNbt);
return item;
}
}
}
@@ -6,6 +6,7 @@ import binnie.extrabees.core.ExtraBeeGUID;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import forestry.api.core.Tabs;
import java.util.List;
import net.minecraft.client.renderer.texture.IIconRegister;
import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.entity.player.EntityPlayer;
@@ -14,60 +15,60 @@ import net.minecraft.item.ItemStack;
import net.minecraft.util.IIcon;
import net.minecraft.world.World;
import java.util.List;
public class ItemDictionary extends Item {
protected IIcon iconMaster;
protected IIcon iconMaster;
public ItemDictionary() {
setCreativeTab(Tabs.tabApiculture);
setUnlocalizedName("dictionary");
setMaxStackSize(1);
}
public ItemDictionary() {
setCreativeTab(Tabs.tabApiculture);
setUnlocalizedName("dictionary");
setMaxStackSize(1);
}
@Override
@SideOnly(Side.CLIENT)
public void registerIcons(IIconRegister register) {
itemIcon = ExtraBees.proxy.getIcon(register, "apiaristDatabase");
iconMaster = ExtraBees.proxy.getIcon(register, "masterApiaristDatabase");
}
@Override
@SideOnly(Side.CLIENT)
public void registerIcons(IIconRegister register) {
itemIcon = ExtraBees.proxy.getIcon(register, "apiaristDatabase");
iconMaster = ExtraBees.proxy.getIcon(register, "masterApiaristDatabase");
}
@Override
@SideOnly(Side.CLIENT)
public IIcon getIconFromDamage(int damage) {
return (damage == 0) ? itemIcon : iconMaster;
}
@Override
@SideOnly(Side.CLIENT)
public IIcon getIconFromDamage(int damage) {
return (damage == 0) ? itemIcon : iconMaster;
}
@Override
@SideOnly(Side.CLIENT)
public void addInformation(ItemStack stack, EntityPlayer player, List tooltip, boolean advanced) {
super.addInformation(stack, player, tooltip, advanced);
if (stack.getItemDamage() > 0) {
tooltip.add(I18N.localise("extrabees.item.database.tooltip"));
}
}
@Override
@SideOnly(Side.CLIENT)
public void addInformation(ItemStack stack, EntityPlayer player, List tooltip, boolean advanced) {
super.addInformation(stack, player, tooltip, advanced);
if (stack.getItemDamage() > 0) {
tooltip.add(I18N.localise("extrabees.item.database.tooltip"));
}
}
@Override
@SideOnly(Side.CLIENT)
public void getSubItems(Item item, CreativeTabs tab, List list) {
super.getSubItems(item, tab, list);
list.add(new ItemStack(item, 1, 1));
}
@Override
@SideOnly(Side.CLIENT)
public void getSubItems(Item item, CreativeTabs tab, List list) {
super.getSubItems(item, tab, list);
list.add(new ItemStack(item, 1, 1));
}
@Override
public ItemStack onItemRightClick(ItemStack stack, World world, EntityPlayer player) {
if (stack.getItemDamage() == 0) {
ExtraBees.proxy.openGui(ExtraBeeGUID.Database, player, (int) player.posX, (int) player.posY, (int) player.posZ);
} else {
ExtraBees.proxy.openGui(ExtraBeeGUID.DatabaseNEI, player, (int) player.posX, (int) player.posY, (int) player.posZ);
}
return stack;
}
@Override
public ItemStack onItemRightClick(ItemStack stack, World world, EntityPlayer player) {
if (stack.getItemDamage() == 0) {
ExtraBees.proxy.openGui(
ExtraBeeGUID.Database, player, (int) player.posX, (int) player.posY, (int) player.posZ);
} else {
ExtraBees.proxy.openGui(
ExtraBeeGUID.DatabaseNEI, player, (int) player.posX, (int) player.posY, (int) player.posZ);
}
return stack;
}
@Override
public String getItemStackDisplayName(ItemStack stack) {
return (stack.getItemDamage() == 0)
? I18N.localise("extrabees.item.database")
: I18N.localise("extrabees.item.masterDatabase");
}
@Override
public String getItemStackDisplayName(ItemStack stack) {
return (stack.getItemDamage() == 0)
? I18N.localise("extrabees.item.database")
: I18N.localise("extrabees.item.masterDatabase");
}
}
@@ -7,19 +7,28 @@ import forestry.api.genetics.IMutationCondition;
import net.minecraft.world.World;
public class DummyMutationCondition implements IMutationCondition {
private final RequirementPerson requirement;
private final RequirementPerson requirement;
public DummyMutationCondition(RequirementPerson requirement) {
this.requirement = requirement;
}
public DummyMutationCondition(RequirementPerson requirement) {
this.requirement = requirement;
}
@Override
public float getChance(World world, int x, int y, int z, IAllele allele0, IAllele allele1, IGenome genome0, IGenome genome1, IClimateProvider climate) {
return 1.0F;
}
@Override
public float getChance(
World world,
int x,
int y,
int z,
IAllele allele0,
IAllele allele1,
IGenome genome0,
IGenome genome1,
IClimateProvider climate) {
return 1.0F;
}
@Override
public String getDescription() {
return requirement.getDescription();
}
@Override
public String getDescription() {
return requirement.getDescription();
}
}
@@ -5,7 +5,7 @@ import forestry.api.genetics.IAllele;
import forestry.api.genetics.IGenome;
public interface IMutationRequirement {
String getDescription();
String getDescription();
boolean fufilled(IBeeHousing housing, IAllele allele0, IAllele allele1, IGenome genome0, IGenome genome1);
boolean fufilled(IBeeHousing housing, IAllele allele0, IAllele allele1, IGenome genome0, IGenome genome1);
}
@@ -6,20 +6,20 @@ import forestry.api.genetics.IAllele;
import forestry.api.genetics.IGenome;
public class RequirementPerson implements IMutationRequirement {
protected String name;
protected String name;
public RequirementPerson(String name) {
this.name = name;
}
public RequirementPerson(String name) {
this.name = name;
}
@Override
public String getDescription() {
return I18N.localise("extrabees.genetics.requirements.user", name);
}
@Override
public String getDescription() {
return I18N.localise("extrabees.genetics.requirements.user", name);
}
@Override
public boolean fufilled(IBeeHousing housing, IAllele allele0, IAllele allele1, IGenome genome0, IGenome genome1) {
String ownerName = housing.getOwner().getName();
return ownerName != null && ownerName.equals(name);
}
@Override
public boolean fufilled(IBeeHousing housing, IAllele allele0, IAllele allele1, IGenome genome0, IGenome genome1) {
String ownerName = housing.getOwner().getName();
return ownerName != null && ownerName.equals(name);
}
}
@@ -1,6 +1,6 @@
package binnie.extrabees.gui;
public enum ExtraBeeGUITexture {
Chromosome,
Chromosome2
Chromosome,
Chromosome2
}
@@ -13,36 +13,36 @@ import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.inventory.IInventory;
public class WindowAlvearyFrame extends Window {
protected Machine machine;
protected ControlPlayerInventory playerInventory;
protected Machine machine;
protected ControlPlayerInventory playerInventory;
public WindowAlvearyFrame(EntityPlayer player, IInventory inventory, Side side) {
super(176.0f, 144.0f, player, inventory, side);
machine = ((TileEntityMachine) inventory).getMachine();
}
public WindowAlvearyFrame(EntityPlayer player, IInventory inventory, Side side) {
super(176.0f, 144.0f, player, inventory, side);
machine = ((TileEntityMachine) inventory).getMachine();
}
public static Window create(EntityPlayer player, IInventory inventory, Side side) {
if (player == null || inventory == null) {
return null;
}
return new WindowAlvearyFrame(player, inventory, side);
}
public static Window create(EntityPlayer player, IInventory inventory, Side side) {
if (player == null || inventory == null) {
return null;
}
return new WindowAlvearyFrame(player, inventory, side);
}
@Override
public void initialiseClient() {
setTitle(I18N.localise("extrabees.machine.alveay.frame"));
playerInventory = new ControlPlayerInventory(this);
ControlSlot slot = new ControlSlot(this, 79.0f, 30.0f);
slot.assign(0);
}
@Override
public void initialiseClient() {
setTitle(I18N.localise("extrabees.machine.alveay.frame"));
playerInventory = new ControlPlayerInventory(this);
ControlSlot slot = new ControlSlot(this, 79.0f, 30.0f);
slot.assign(0);
}
@Override
public AbstractMod getMod() {
return ExtraBees.instance;
}
@Override
public AbstractMod getMod() {
return ExtraBees.instance;
}
@Override
public String getName() {
return "AlvearyFrame";
}
@Override
public String getName() {
return "AlvearyFrame";
}
}
@@ -14,36 +14,36 @@ import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.inventory.IInventory;
public class WindowAlvearyHatchery extends Window {
protected Machine machine;
protected ControlPlayerInventory playerInventory;
protected Machine machine;
protected ControlPlayerInventory playerInventory;
public WindowAlvearyHatchery(EntityPlayer player, IInventory inventory, Side side) {
super(176.0f, 144.0f, player, inventory, side);
machine = ((TileEntityMachine) inventory).getMachine();
}
public WindowAlvearyHatchery(EntityPlayer player, IInventory inventory, Side side) {
super(176.0f, 144.0f, player, inventory, side);
machine = ((TileEntityMachine) inventory).getMachine();
}
public static Window create(EntityPlayer player, IInventory inventory, Side side) {
if (player == null || inventory == null) {
return null;
}
return new WindowAlvearyHatchery(player, inventory, side);
}
public static Window create(EntityPlayer player, IInventory inventory, Side side) {
if (player == null || inventory == null) {
return null;
}
return new WindowAlvearyHatchery(player, inventory, side);
}
@Override
public void initialiseClient() {
setTitle(I18N.localise("extrabees.machine.alveay.hatchery"));
playerInventory = new ControlPlayerInventory(this);
ControlSlotArray slot = new ControlSlotArray(this, 43, 30, 5, 1);
slot.create(AlvearyHatchery.SLOT_LARVAE);
}
@Override
public void initialiseClient() {
setTitle(I18N.localise("extrabees.machine.alveay.hatchery"));
playerInventory = new ControlPlayerInventory(this);
ControlSlotArray slot = new ControlSlotArray(this, 43, 30, 5, 1);
slot.create(AlvearyHatchery.SLOT_LARVAE);
}
@Override
public AbstractMod getMod() {
return ExtraBees.instance;
}
@Override
public AbstractMod getMod() {
return ExtraBees.instance;
}
@Override
public String getName() {
return "AlvearyHatchery";
}
@Override
public String getName() {
return "AlvearyHatchery";
}
}
@@ -19,52 +19,56 @@ import net.minecraft.inventory.IInventory;
import net.minecraft.item.ItemStack;
public class WindowAlvearyMutator extends Window {
protected Machine machine;
protected ControlPlayerInventory playerInventory;
protected Machine machine;
protected ControlPlayerInventory playerInventory;
public WindowAlvearyMutator(EntityPlayer player, IInventory inventory, Side side) {
super(176.0f, 176.0f, player, inventory, side);
machine = ((TileEntityMachine) inventory).getMachine();
}
public WindowAlvearyMutator(EntityPlayer player, IInventory inventory, Side side) {
super(176.0f, 176.0f, player, inventory, side);
machine = ((TileEntityMachine) inventory).getMachine();
}
public static Window create(EntityPlayer player, IInventory inventory, Side side) {
if (player == null || inventory == null) {
return null;
}
return new WindowAlvearyMutator(player, inventory, side);
}
public static Window create(EntityPlayer player, IInventory inventory, Side side) {
if (player == null || inventory == null) {
return null;
}
return new WindowAlvearyMutator(player, inventory, side);
}
@Override
public void initialiseClient() {
setTitle(I18N.localise("extrabees.machine.alveay.mutator"));
playerInventory = new ControlPlayerInventory(this);
ControlSlot slot = new ControlSlot(this, 79.0f, 30.0f);
slot.assign(AlvearyMutator.SLOT_MUTATOR);
new ControlText(this, new IArea(0.0f, 52.0f, w(), 16.0f), I18N.localise("extrabees.machine.alveay.mutator.mutagens"), TextJustification.MIDDLE_CENTER)
.setColor(0x555555);
int size = AlvearyMutator.getMutagens().size();
int w = size * 18;
@Override
public void initialiseClient() {
setTitle(I18N.localise("extrabees.machine.alveay.mutator"));
playerInventory = new ControlPlayerInventory(this);
ControlSlot slot = new ControlSlot(this, 79.0f, 30.0f);
slot.assign(AlvearyMutator.SLOT_MUTATOR);
new ControlText(
this,
new IArea(0.0f, 52.0f, w(), 16.0f),
I18N.localise("extrabees.machine.alveay.mutator.mutagens"),
TextJustification.MIDDLE_CENTER)
.setColor(0x555555);
int size = AlvearyMutator.getMutagens().size();
int w = size * 18;
if (size <= 0) {
return;
}
if (size <= 0) {
return;
}
float x = (w() - w) / 2.0f;
for (ItemStack stack : AlvearyMutator.getMutagens()) {
ControlItemDisplay display = new ControlItemDisplay(this, x, 66.0f);
display.setItemStack(stack);
display.hastooltip = true;
x += 18.0f;
}
}
float x = (w() - w) / 2.0f;
for (ItemStack stack : AlvearyMutator.getMutagens()) {
ControlItemDisplay display = new ControlItemDisplay(this, x, 66.0f);
display.setItemStack(stack);
display.hastooltip = true;
x += 18.0f;
}
}
@Override
public AbstractMod getMod() {
return ExtraBees.instance;
}
@Override
public AbstractMod getMod() {
return ExtraBees.instance;
}
@Override
public String getName() {
return "AlvearyMutator";
}
@Override
public String getName() {
return "AlvearyMutator";
}
}
@@ -16,37 +16,37 @@ import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.inventory.IInventory;
public class WindowAlvearyStimulator extends Window {
protected Machine machine;
protected ControlPlayerInventory playerInventory;
protected Machine machine;
protected ControlPlayerInventory playerInventory;
public WindowAlvearyStimulator(EntityPlayer player, IInventory inventory, Side side) {
super(176.0f, 144.0f, player, inventory, side);
machine = ((TileEntityMachine) inventory).getMachine();
}
public WindowAlvearyStimulator(EntityPlayer player, IInventory inventory, Side side) {
super(176.0f, 144.0f, player, inventory, side);
machine = ((TileEntityMachine) inventory).getMachine();
}
public static Window create(EntityPlayer player, IInventory inventory, Side side) {
if (player == null || inventory == null) {
return null;
}
return new WindowAlvearyStimulator(player, inventory, side);
}
public static Window create(EntityPlayer player, IInventory inventory, Side side) {
if (player == null || inventory == null) {
return null;
}
return new WindowAlvearyStimulator(player, inventory, side);
}
@Override
public void initialiseClient() {
setTitle(I18N.localise("extrabees.machine.alveay.stimulator"));
new ControlEnergyBar(this, 75, 29, 60, 16, Position.LEFT);
ControlSlot slot = new ControlSlot(this, 41.0f, 28.0f);
slot.assign(AlvearyStimulator.SLOT_CIRCUIT);
playerInventory = new ControlPlayerInventory(this);
}
@Override
public void initialiseClient() {
setTitle(I18N.localise("extrabees.machine.alveay.stimulator"));
new ControlEnergyBar(this, 75, 29, 60, 16, Position.LEFT);
ControlSlot slot = new ControlSlot(this, 41.0f, 28.0f);
slot.assign(AlvearyStimulator.SLOT_CIRCUIT);
playerInventory = new ControlPlayerInventory(this);
}
@Override
public AbstractMod getMod() {
return ExtraBees.instance;
}
@Override
public AbstractMod getMod() {
return ExtraBees.instance;
}
@Override
public String getName() {
return "AlvearyStimulator";
}
@Override
public String getName() {
return "AlvearyStimulator";
}
}
@@ -15,163 +15,160 @@ import forestry.api.apiculture.IBeeRoot;
import forestry.api.core.EnumHumidity;
import forestry.api.core.EnumTemperature;
import forestry.api.genetics.EnumTolerance;
import java.awt.Color;
import java.util.ArrayList;
import java.util.List;
public class ControlClimateBar extends Control implements ITooltip {
protected boolean isHumidity;
protected List<Integer> tolerated;
protected boolean isHumidity;
protected List<Integer> tolerated;
private static final Color[] TEMP_COLORS = new Color[]{
new Color(0x00fffb),
new Color(0x78bbff),
new Color(0x4fff30),
new Color(0xffff00),
new Color(0xffa200),
new Color(0xff0000)
};
private static final Color[] HUMID_COLORS = new Color[]{
new Color(0xffe7a3),
new Color(0x1aff00),
new Color(0x307cff)
};
private static final Color[] TEMP_COLORS = new Color[] {
new Color(0x00fffb),
new Color(0x78bbff),
new Color(0x4fff30),
new Color(0xffff00),
new Color(0xffa200),
new Color(0xff0000)
};
private static final Color[] HUMID_COLORS =
new Color[] {new Color(0xffe7a3), new Color(0x1aff00), new Color(0x307cff)};
public ControlClimateBar(IWidget parent, int x, int y, int width, int height) {
this(parent, x, y, width, height, false);
}
public ControlClimateBar(IWidget parent, int x, int y, int width, int height) {
this(parent, x, y, width, height, false);
}
public ControlClimateBar(IWidget parent, int x, int y, int width, int height, boolean humidity) {
super(parent, x, y, width, height);
tolerated = new ArrayList<>();
addAttribute(WidgetAttribute.MOUSE_OVER);
isHumidity = humidity;
}
public ControlClimateBar(IWidget parent, int x, int y, int width, int height, boolean humidity) {
super(parent, x, y, width, height);
tolerated = new ArrayList<>();
addAttribute(WidgetAttribute.MOUSE_OVER);
isHumidity = humidity;
}
@Override
public void getTooltip(Tooltip tooltip) {
if (tolerated.isEmpty()) {
return;
}
@Override
public void getTooltip(Tooltip tooltip) {
if (tolerated.isEmpty()) {
return;
}
int types = isHumidity ? 3 : 6;
int type = (int) ((int) (getRelativeMousePosition().x() - 1.0f) / ((getSize().x() - 2.0f) / types));
if (!tolerated.contains(type) || type >= types) {
return;
}
int types = isHumidity ? 3 : 6;
int type = (int)
((int) (getRelativeMousePosition().x() - 1.0f) / ((getSize().x() - 2.0f) / types));
if (!tolerated.contains(type) || type >= types) {
return;
}
if (isHumidity) {
tooltip.add(EnumHumidity.values()[type].name);
} else {
tooltip.add(EnumTemperature.values()[type + 1].name);
}
}
if (isHumidity) {
tooltip.add(EnumHumidity.values()[type].name);
} else {
tooltip.add(EnumTemperature.values()[type + 1].name);
}
}
@Override
public void onRenderBackground() {
CraftGUI.render.texture(CraftGUITexture.EnergyBarBack, getArea());
int types = isHumidity ? 3 : 6;
int w = (int) ((getSize().x() - 2.0f) / types);
for (int i = 0; i < types; ++i) {
int x = i * w;
if (tolerated.contains(i)) {
Color color;
if (isHumidity) {
color = HUMID_COLORS[i];
} else {
color = TEMP_COLORS[i];
}
CraftGUI.render.solid(new IArea(x + 1, 1.0f, w, getSize().y() - 2.0f), color.getRGB());
}
}
CraftGUI.render.texture(CraftGUITexture.EnergyBarGlass, getArea());
}
@Override
public void onRenderBackground() {
CraftGUI.render.texture(CraftGUITexture.EnergyBarBack, getArea());
int types = isHumidity ? 3 : 6;
int w = (int) ((getSize().x() - 2.0f) / types);
for (int i = 0; i < types; ++i) {
int x = i * w;
if (tolerated.contains(i)) {
Color color;
if (isHumidity) {
color = HUMID_COLORS[i];
} else {
color = TEMP_COLORS[i];
}
CraftGUI.render.solid(new IArea(x + 1, 1.0f, w, getSize().y() - 2.0f), color.getRGB());
}
}
CraftGUI.render.texture(CraftGUITexture.EnergyBarGlass, getArea());
}
public void setSpecies(IAlleleBeeSpecies species) {
tolerated.clear();
if (species == null) {
return;
}
public void setSpecies(IAlleleBeeSpecies species) {
tolerated.clear();
if (species == null) {
return;
}
int main;
EnumTolerance tolerance;
IBeeRoot beeRoot = Binnie.Genetics.getBeeRoot();
IBeeGenome genome = beeRoot.templateAsGenome(beeRoot.getTemplate(species.getUID()));
if (!isHumidity) {
main = species.getTemperature().ordinal() - 1;
tolerance = genome.getToleranceTemp();
} else {
main = species.getHumidity().ordinal();
tolerance = genome.getToleranceHumid();
}
int main;
EnumTolerance tolerance;
IBeeRoot beeRoot = Binnie.Genetics.getBeeRoot();
IBeeGenome genome = beeRoot.templateAsGenome(beeRoot.getTemplate(species.getUID()));
if (!isHumidity) {
main = species.getTemperature().ordinal() - 1;
tolerance = genome.getToleranceTemp();
} else {
main = species.getHumidity().ordinal();
tolerance = genome.getToleranceHumid();
}
tolerated.add(main);
switch (tolerance) {
case BOTH_5:
case UP_5:
addTolerance(main, 5);
break;
tolerated.add(main);
switch (tolerance) {
case BOTH_5:
case UP_5:
addTolerance(main, 5);
break;
case BOTH_4:
case UP_4:
addTolerance(main, 4);
break;
case BOTH_4:
case UP_4:
addTolerance(main, 4);
break;
case BOTH_3:
case UP_3:
addTolerance(main, 3);
break;
case BOTH_3:
case UP_3:
addTolerance(main, 3);
break;
case BOTH_2:
case UP_2:
addTolerance(main, 2);
break;
case BOTH_2:
case UP_2:
addTolerance(main, 2);
break;
case BOTH_1:
case UP_1:
addTolerance(main, 1);
break;
}
case BOTH_1:
case UP_1:
addTolerance(main, 1);
break;
}
switch (tolerance) {
case BOTH_5:
case DOWN_5:
addTolerance(main, -5);
break;
switch (tolerance) {
case BOTH_5:
case DOWN_5:
addTolerance(main, -5);
break;
case BOTH_4:
case DOWN_4:
addTolerance(main, -4);
break;
case BOTH_4:
case DOWN_4:
addTolerance(main, -4);
break;
case BOTH_3:
case DOWN_3:
addTolerance(main, -3);
break;
case BOTH_3:
case DOWN_3:
addTolerance(main, -3);
break;
case BOTH_2:
case DOWN_2:
addTolerance(main, -2);
break;
case BOTH_2:
case DOWN_2:
addTolerance(main, -2);
break;
case BOTH_1:
case DOWN_1:
addTolerance(main, -1);
break;
}
}
case BOTH_1:
case DOWN_1:
addTolerance(main, -1);
break;
}
}
private void addTolerance(int main, int offset) {
offset += main;
if (main > offset) {
for (int i = offset; i < main; i++) {
tolerated.add(i);
}
} else {
for (int i = offset; i > main; i--) {
tolerated.add(i);
}
}
}
private void addTolerance(int main, int offset) {
offset += main;
if (main > offset) {
for (int i = offset; i < main; i++) {
tolerated.add(i);
}
} else {
for (int i = offset; i > main; i--) {
tolerated.add(i);
}
}
}
}
@@ -9,19 +9,19 @@ import forestry.api.apiculture.IAlleleBeeSpecies;
import forestry.api.genetics.IAlleleSpecies;
public class PageSpeciesClimate extends PageSpecies {
protected ControlClimateBar tempBar;
protected ControlClimateBar humidBar;
protected ControlClimateBar tempBar;
protected ControlClimateBar humidBar;
public PageSpeciesClimate(IWidget parent, DatabaseTab tab) {
super(parent, tab);
new ControlTextCentered(this, 8.0f, I18N.localise("extrabees.gui.database.tab.species.climate"));
tempBar = new ControlClimateBar(this, 8, 24, 128, 12);
humidBar = new ControlClimateBar(this, 8, 42, 128, 12, true);
}
public PageSpeciesClimate(IWidget parent, DatabaseTab tab) {
super(parent, tab);
new ControlTextCentered(this, 8.0f, I18N.localise("extrabees.gui.database.tab.species.climate"));
tempBar = new ControlClimateBar(this, 8, 24, 128, 12);
humidBar = new ControlClimateBar(this, 8, 42, 128, 12, true);
}
@Override
public void onValueChanged(IAlleleSpecies species) {
tempBar.setSpecies((IAlleleBeeSpecies) species);
humidBar.setSpecies((IAlleleBeeSpecies) species);
}
@Override
public void onValueChanged(IAlleleSpecies species) {
tempBar.setSpecies((IAlleleBeeSpecies) species);
humidBar.setSpecies((IAlleleBeeSpecies) species);
}
}
@@ -17,164 +17,205 @@ import forestry.api.genetics.IAlleleSpecies;
import forestry.core.genetics.alleles.EnumAllele;
public class PageSpeciesGenome extends PageSpecies {
protected ControlText title;
protected ControlText speedText;
protected ControlText lifespanText;
protected ControlText fertilityText;
protected ControlText floweringText;
protected ControlText territoryText;
protected ControlText nocturnalText;
protected ControlText caveDwellingText;
protected ControlText tolerantFlyerText;
protected ControlText flowerText;
protected ControlText effectText;
protected ControlText title;
protected ControlText speedText;
protected ControlText lifespanText;
protected ControlText fertilityText;
protected ControlText floweringText;
protected ControlText territoryText;
protected ControlText nocturnalText;
protected ControlText caveDwellingText;
protected ControlText tolerantFlyerText;
protected ControlText flowerText;
protected ControlText effectText;
public PageSpeciesGenome(IWidget parent, DatabaseTab tab) {
super(parent, tab);
title = new ControlTextCentered(this, 8.0f, I18N.localise("extrabees.gui.database.tab.species.genome"));
new ControlText(this, new IArea(0.0f, 32.0f, 68.0f, 30.0f), I18N.localise("extrabees.gui.database.tab.species.genome.speed"), TextJustification.TOP_RIGHT);
new ControlText(this, new IArea(0.0f, 44.0f, 68.0f, 30.0f), I18N.localise("extrabees.gui.database.tab.species.genome.lifespan"), TextJustification.TOP_RIGHT);
new ControlText(this, new IArea(0.0f, 56.0f, 68.0f, 30.0f), I18N.localise("extrabees.gui.database.tab.species.genome.fertility"), TextJustification.TOP_RIGHT);
new ControlText(this, new IArea(0.0f, 68.0f, 68.0f, 30.0f), I18N.localise("extrabees.gui.database.tab.species.genome.flowering"), TextJustification.TOP_RIGHT);
new ControlText(this, new IArea(0.0f, 80.0f, 68.0f, 30.0f), I18N.localise("extrabees.gui.database.tab.species.genome.territory"), TextJustification.TOP_RIGHT);
new ControlText(this, new IArea(0.0f, 97.0f, 68.0f, 30.0f), I18N.localise("extrabees.gui.database.tab.species.genome.behavior"), TextJustification.TOP_RIGHT);
new ControlText(this, new IArea(0.0f, 109.0f, 68.0f, 30.0f), I18N.localise("extrabees.gui.database.tab.species.genome.sunlight"), TextJustification.TOP_RIGHT);
new ControlText(this, new IArea(0.0f, 121.0f, 68.0f, 30.0f), I18N.localise("extrabees.gui.database.tab.species.genome.rain"), TextJustification.TOP_RIGHT);
new ControlText(this, new IArea(0.0f, 138.0f, 68.0f, 30.0f), I18N.localise("extrabees.gui.database.tab.species.genome.flower"), TextJustification.TOP_RIGHT);
new ControlText(this, new IArea(0.0f, 155.0f, 68.0f, 30.0f), I18N.localise("extrabees.gui.database.tab.species.genome.effect"), TextJustification.TOP_RIGHT);
int x = 72;
public PageSpeciesGenome(IWidget parent, DatabaseTab tab) {
super(parent, tab);
title = new ControlTextCentered(this, 8.0f, I18N.localise("extrabees.gui.database.tab.species.genome"));
new ControlText(
this,
new IArea(0.0f, 32.0f, 68.0f, 30.0f),
I18N.localise("extrabees.gui.database.tab.species.genome.speed"),
TextJustification.TOP_RIGHT);
new ControlText(
this,
new IArea(0.0f, 44.0f, 68.0f, 30.0f),
I18N.localise("extrabees.gui.database.tab.species.genome.lifespan"),
TextJustification.TOP_RIGHT);
new ControlText(
this,
new IArea(0.0f, 56.0f, 68.0f, 30.0f),
I18N.localise("extrabees.gui.database.tab.species.genome.fertility"),
TextJustification.TOP_RIGHT);
new ControlText(
this,
new IArea(0.0f, 68.0f, 68.0f, 30.0f),
I18N.localise("extrabees.gui.database.tab.species.genome.flowering"),
TextJustification.TOP_RIGHT);
new ControlText(
this,
new IArea(0.0f, 80.0f, 68.0f, 30.0f),
I18N.localise("extrabees.gui.database.tab.species.genome.territory"),
TextJustification.TOP_RIGHT);
new ControlText(
this,
new IArea(0.0f, 97.0f, 68.0f, 30.0f),
I18N.localise("extrabees.gui.database.tab.species.genome.behavior"),
TextJustification.TOP_RIGHT);
new ControlText(
this,
new IArea(0.0f, 109.0f, 68.0f, 30.0f),
I18N.localise("extrabees.gui.database.tab.species.genome.sunlight"),
TextJustification.TOP_RIGHT);
new ControlText(
this,
new IArea(0.0f, 121.0f, 68.0f, 30.0f),
I18N.localise("extrabees.gui.database.tab.species.genome.rain"),
TextJustification.TOP_RIGHT);
new ControlText(
this,
new IArea(0.0f, 138.0f, 68.0f, 30.0f),
I18N.localise("extrabees.gui.database.tab.species.genome.flower"),
TextJustification.TOP_RIGHT);
new ControlText(
this,
new IArea(0.0f, 155.0f, 68.0f, 30.0f),
I18N.localise("extrabees.gui.database.tab.species.genome.effect"),
TextJustification.TOP_RIGHT);
int x = 72;
speedText = new ControlText(this, new IArea(x, 32.0f, 72.0f, 30.0f), "", TextJustification.TOP_LEFT);
lifespanText = new ControlText(this, new IArea(x, 44.0f, 72.0f, 30.0f), "", TextJustification.TOP_LEFT);
fertilityText = new ControlText(this, new IArea(x, 56.0f, 72.0f, 30.0f), "", TextJustification.TOP_LEFT);
floweringText = new ControlText(this, new IArea(x, 68.0f, 72.0f, 30.0f), "", TextJustification.TOP_LEFT);
territoryText = new ControlText(this, new IArea(x, 80.0f, 72.0f, 30.0f), "", TextJustification.TOP_LEFT);
nocturnalText = new ControlText(this, new IArea(x, 97.0f, 72.0f, 30.0f), "", TextJustification.TOP_LEFT);
caveDwellingText = new ControlText(this, new IArea(x, 109.0f, 72.0f, 30.0f), "", TextJustification.TOP_LEFT);
tolerantFlyerText = new ControlText(this, new IArea(x, 121.0f, 72.0f, 30.0f), "", TextJustification.TOP_LEFT);
flowerText = new ControlText(this, new IArea(x, 138.0f, 72.0f, 30.0f), "", TextJustification.TOP_LEFT);
effectText = new ControlText(this, new IArea(x, 155.0f, 72.0f, 30.0f), "", TextJustification.TOP_LEFT);
}
speedText = new ControlText(this, new IArea(x, 32.0f, 72.0f, 30.0f), "", TextJustification.TOP_LEFT);
lifespanText = new ControlText(this, new IArea(x, 44.0f, 72.0f, 30.0f), "", TextJustification.TOP_LEFT);
fertilityText = new ControlText(this, new IArea(x, 56.0f, 72.0f, 30.0f), "", TextJustification.TOP_LEFT);
floweringText = new ControlText(this, new IArea(x, 68.0f, 72.0f, 30.0f), "", TextJustification.TOP_LEFT);
territoryText = new ControlText(this, new IArea(x, 80.0f, 72.0f, 30.0f), "", TextJustification.TOP_LEFT);
nocturnalText = new ControlText(this, new IArea(x, 97.0f, 72.0f, 30.0f), "", TextJustification.TOP_LEFT);
caveDwellingText = new ControlText(this, new IArea(x, 109.0f, 72.0f, 30.0f), "", TextJustification.TOP_LEFT);
tolerantFlyerText = new ControlText(this, new IArea(x, 121.0f, 72.0f, 30.0f), "", TextJustification.TOP_LEFT);
flowerText = new ControlText(this, new IArea(x, 138.0f, 72.0f, 30.0f), "", TextJustification.TOP_LEFT);
effectText = new ControlText(this, new IArea(x, 155.0f, 72.0f, 30.0f), "", TextJustification.TOP_LEFT);
}
public static String rateFlowering(int flowering) {
if (flowering >= 99) {
return AlleleHelper.toDisplay(EnumAllele.Flowering.MAXIMUM);
}
if (flowering >= 35) {
return AlleleHelper.toDisplay(EnumAllele.Flowering.FASTEST);
}
if (flowering >= 30) {
return AlleleHelper.toDisplay(EnumAllele.Flowering.FASTER);
}
if (flowering >= 25) {
return AlleleHelper.toDisplay(EnumAllele.Flowering.FAST);
}
if (flowering >= 20) {
return AlleleHelper.toDisplay(EnumAllele.Flowering.AVERAGE);
}
if (flowering >= 15) {
return AlleleHelper.toDisplay(EnumAllele.Flowering.SLOW);
}
if (flowering >= 10) {
return AlleleHelper.toDisplay(EnumAllele.Flowering.SLOWER);
}
return AlleleHelper.toDisplay(EnumAllele.Flowering.SLOWEST);
}
public static String rateFlowering(int flowering) {
if (flowering >= 99) {
return AlleleHelper.toDisplay(EnumAllele.Flowering.MAXIMUM);
}
if (flowering >= 35) {
return AlleleHelper.toDisplay(EnumAllele.Flowering.FASTEST);
}
if (flowering >= 30) {
return AlleleHelper.toDisplay(EnumAllele.Flowering.FASTER);
}
if (flowering >= 25) {
return AlleleHelper.toDisplay(EnumAllele.Flowering.FAST);
}
if (flowering >= 20) {
return AlleleHelper.toDisplay(EnumAllele.Flowering.AVERAGE);
}
if (flowering >= 15) {
return AlleleHelper.toDisplay(EnumAllele.Flowering.SLOW);
}
if (flowering >= 10) {
return AlleleHelper.toDisplay(EnumAllele.Flowering.SLOWER);
}
return AlleleHelper.toDisplay(EnumAllele.Flowering.SLOWEST);
}
public static String rateSpeed(float speed) {
if (speed >= 1.7f) {
return AlleleHelper.toDisplay(EnumAllele.Speed.FASTEST);
}
if (speed >= 1.4f) {
return AlleleHelper.toDisplay(EnumAllele.Speed.FASTER);
}
if (speed >= 1.2f) {
return AlleleHelper.toDisplay(EnumAllele.Speed.FAST);
}
if (speed >= 1.0f) {
return AlleleHelper.toDisplay(EnumAllele.Speed.NORMAL);
}
if (speed >= 0.8f) {
return AlleleHelper.toDisplay(EnumAllele.Speed.SLOW);
}
if (speed >= 0.6f) {
return AlleleHelper.toDisplay(EnumAllele.Speed.SLOWER);
}
return AlleleHelper.toDisplay(EnumAllele.Speed.SLOWEST);
}
public static String rateSpeed(float speed) {
if (speed >= 1.7f) {
return AlleleHelper.toDisplay(EnumAllele.Speed.FASTEST);
}
if (speed >= 1.4f) {
return AlleleHelper.toDisplay(EnumAllele.Speed.FASTER);
}
if (speed >= 1.2f) {
return AlleleHelper.toDisplay(EnumAllele.Speed.FAST);
}
if (speed >= 1.0f) {
return AlleleHelper.toDisplay(EnumAllele.Speed.NORMAL);
}
if (speed >= 0.8f) {
return AlleleHelper.toDisplay(EnumAllele.Speed.SLOW);
}
if (speed >= 0.6f) {
return AlleleHelper.toDisplay(EnumAllele.Speed.SLOWER);
}
return AlleleHelper.toDisplay(EnumAllele.Speed.SLOWEST);
}
public static String rateLifespan(int life) {
if (life >= 70) {
return AlleleHelper.toDisplay(EnumAllele.Lifespan.LONGEST);
}
if (life >= 60) {
return AlleleHelper.toDisplay(EnumAllele.Lifespan.LONGER);
}
if (life >= 50) {
return AlleleHelper.toDisplay(EnumAllele.Lifespan.LONG);
}
if (life >= 45) {
return AlleleHelper.toDisplay(EnumAllele.Lifespan.ELONGATED);
}
if (life >= 40) {
return AlleleHelper.toDisplay(EnumAllele.Lifespan.NORMAL);
}
if (life >= 35) {
return AlleleHelper.toDisplay(EnumAllele.Lifespan.SHORTENED);
}
if (life >= 30) {
return AlleleHelper.toDisplay(EnumAllele.Lifespan.SHORT);
}
if (life >= 20) {
return AlleleHelper.toDisplay(EnumAllele.Lifespan.SHORTER);
}
return AlleleHelper.toDisplay(EnumAllele.Lifespan.SHORTEST);
}
public static String rateLifespan(int life) {
if (life >= 70) {
return AlleleHelper.toDisplay(EnumAllele.Lifespan.LONGEST);
}
if (life >= 60) {
return AlleleHelper.toDisplay(EnumAllele.Lifespan.LONGER);
}
if (life >= 50) {
return AlleleHelper.toDisplay(EnumAllele.Lifespan.LONG);
}
if (life >= 45) {
return AlleleHelper.toDisplay(EnumAllele.Lifespan.ELONGATED);
}
if (life >= 40) {
return AlleleHelper.toDisplay(EnumAllele.Lifespan.NORMAL);
}
if (life >= 35) {
return AlleleHelper.toDisplay(EnumAllele.Lifespan.SHORTENED);
}
if (life >= 30) {
return AlleleHelper.toDisplay(EnumAllele.Lifespan.SHORT);
}
if (life >= 20) {
return AlleleHelper.toDisplay(EnumAllele.Lifespan.SHORTER);
}
return AlleleHelper.toDisplay(EnumAllele.Lifespan.SHORTEST);
}
public static String tolerated(boolean t) {
if (t) {
return I18N.localise("extrabees.gui.database.tab.species.genome.tolerated");
}
return AlleleHelper.toDisplay(EnumTolerance.NONE);
}
public static String tolerated(boolean t) {
if (t) {
return I18N.localise("extrabees.gui.database.tab.species.genome.tolerated");
}
return AlleleHelper.toDisplay(EnumTolerance.NONE);
}
@Override
public void onValueChanged(IAlleleSpecies species) {
IAllele[] template = Binnie.Genetics.getBeeRoot().getTemplate(species.getUID());
if (template == null) {
return;
}
@Override
public void onValueChanged(IAlleleSpecies species) {
IAllele[] template = Binnie.Genetics.getBeeRoot().getTemplate(species.getUID());
if (template == null) {
return;
}
IBeeGenome genome = Binnie.Genetics.getBeeRoot().templateAsGenome(template);
speedText.setValue(rateSpeed(genome.getSpeed()));
lifespanText.setValue(rateLifespan(genome.getLifespan()));
fertilityText.setValue(I18N.localise("extrabees.gui.database.tab.species.genome.children", genome.getFertility()));
floweringText.setValue(rateFlowering(genome.getFlowering()));
int[] area = genome.getTerritory();
territoryText.setValue(area[0] + "x" + area[1] + "x" + area[2]);
IBeeGenome genome = Binnie.Genetics.getBeeRoot().templateAsGenome(template);
speedText.setValue(rateSpeed(genome.getSpeed()));
lifespanText.setValue(rateLifespan(genome.getLifespan()));
fertilityText.setValue(
I18N.localise("extrabees.gui.database.tab.species.genome.children", genome.getFertility()));
floweringText.setValue(rateFlowering(genome.getFlowering()));
int[] area = genome.getTerritory();
territoryText.setValue(area[0] + "x" + area[1] + "x" + area[2]);
String behavior;
if (genome.getNocturnal()) {
behavior = I18N.localise("extrabees.gui.database.tab.species.genome.allDay");
} else if (genome.getPrimary().isNocturnal()) {
behavior = I18N.localise("extrabees.gui.database.tab.species.genome.nighttime");
} else {
behavior = I18N.localise("extrabees.gui.database.tab.species.genome.daytime");
}
nocturnalText.setValue(behavior);
if (genome.getCaveDwelling()) {
caveDwellingText.setValue(I18N.localise("extrabees.gui.database.tab.species.genome.notNeeded"));
} else {
caveDwellingText.setValue(I18N.localise("extrabees.gui.database.tab.species.genome.required"));
}
String behavior;
if (genome.getNocturnal()) {
behavior = I18N.localise("extrabees.gui.database.tab.species.genome.allDay");
} else if (genome.getPrimary().isNocturnal()) {
behavior = I18N.localise("extrabees.gui.database.tab.species.genome.nighttime");
} else {
behavior = I18N.localise("extrabees.gui.database.tab.species.genome.daytime");
}
tolerantFlyerText.setValue(tolerated(genome.getTolerantFlyer()));
if (genome.getFlowerProvider() != null) {
flowerText.setValue(genome.getFlowerProvider().getDescription());
} else {
flowerText.setValue(AlleleHelper.toDisplay(EnumTolerance.NONE));
}
effectText.setValue(genome.getEffect().getName());
}
nocturnalText.setValue(behavior);
if (genome.getCaveDwelling()) {
caveDwellingText.setValue(I18N.localise("extrabees.gui.database.tab.species.genome.notNeeded"));
} else {
caveDwellingText.setValue(I18N.localise("extrabees.gui.database.tab.species.genome.required"));
}
tolerantFlyerText.setValue(tolerated(genome.getTolerantFlyer()));
if (genome.getFlowerProvider() != null) {
flowerText.setValue(genome.getFlowerProvider().getDescription());
} else {
flowerText.setValue(AlleleHelper.toDisplay(EnumTolerance.NONE));
}
effectText.setValue(genome.getEffect().getName());
}
}
@@ -19,35 +19,36 @@ import cpw.mods.fml.relauncher.Side;
import net.minecraft.entity.player.EntityPlayer;
public class WindowApiaristDatabase extends WindowAbstractDatabase {
public WindowApiaristDatabase(EntityPlayer player, Side side, boolean nei) {
super(player, side, nei, Binnie.Genetics.beeBreedingSystem, 110.0f);
}
public WindowApiaristDatabase(EntityPlayer player, Side side, boolean nei) {
super(player, side, nei, Binnie.Genetics.beeBreedingSystem, 110.0f);
}
public static Window create(EntityPlayer player, Side side, boolean nei) {
return new WindowApiaristDatabase(player, side, nei);
}
public static Window create(EntityPlayer player, Side side, boolean nei) {
return new WindowApiaristDatabase(player, side, nei);
}
@Override
protected void addTabs() {
new PageSpeciesOverview(getInfoPages(Mode.Species), new DatabaseTab(ExtraBees.instance, "species.overview"));
new PageSpeciesClassification(getInfoPages(Mode.Species), new DatabaseTab(ExtraBees.instance, "species.classification"));
new PageSpeciesGenome(getInfoPages(Mode.Species), new DatabaseTab(ExtraBees.instance, "species.genome"));
new PageSpeciesProducts(getInfoPages(Mode.Species), new DatabaseTab(ExtraBees.instance, "species.products"));
new PageSpeciesClimate(getInfoPages(Mode.Species), new DatabaseTab(ExtraBees.instance, "species.climate"));
new PageSpeciesResultant(getInfoPages(Mode.Species), new DatabaseTab(ExtraBees.instance, "species.resultant"));
new PageSpeciesMutations(getInfoPages(Mode.Species), new DatabaseTab(ExtraBees.instance, "species.further"));
new PageBranchOverview(getInfoPages(Mode.Branches), new DatabaseTab(ExtraBees.instance, "branches.overview"));
new PageBranchSpecies(getInfoPages(Mode.Branches), new DatabaseTab(ExtraBees.instance, "branches.species"));
new PageBreeder(getInfoPages(Mode.Breeder), getUsername(), new DatabaseTab(ExtraBees.instance, "breeder"));
}
@Override
protected void addTabs() {
new PageSpeciesOverview(getInfoPages(Mode.Species), new DatabaseTab(ExtraBees.instance, "species.overview"));
new PageSpeciesClassification(
getInfoPages(Mode.Species), new DatabaseTab(ExtraBees.instance, "species.classification"));
new PageSpeciesGenome(getInfoPages(Mode.Species), new DatabaseTab(ExtraBees.instance, "species.genome"));
new PageSpeciesProducts(getInfoPages(Mode.Species), new DatabaseTab(ExtraBees.instance, "species.products"));
new PageSpeciesClimate(getInfoPages(Mode.Species), new DatabaseTab(ExtraBees.instance, "species.climate"));
new PageSpeciesResultant(getInfoPages(Mode.Species), new DatabaseTab(ExtraBees.instance, "species.resultant"));
new PageSpeciesMutations(getInfoPages(Mode.Species), new DatabaseTab(ExtraBees.instance, "species.further"));
new PageBranchOverview(getInfoPages(Mode.Branches), new DatabaseTab(ExtraBees.instance, "branches.overview"));
new PageBranchSpecies(getInfoPages(Mode.Branches), new DatabaseTab(ExtraBees.instance, "branches.species"));
new PageBreeder(getInfoPages(Mode.Breeder), getUsername(), new DatabaseTab(ExtraBees.instance, "breeder"));
}
@Override
public AbstractMod getMod() {
return ExtraBees.instance;
}
@Override
public AbstractMod getMod() {
return ExtraBees.instance;
}
@Override
public String getName() {
return I18N.localise("extrabees.gui.database");
}
@Override
public String getName() {
return I18N.localise("extrabees.gui.database");
}
}
@@ -7,55 +7,54 @@ import binnie.core.craftgui.controls.listbox.ControlListBox;
import forestry.api.apiculture.IAlleleBeeSpecies;
import forestry.api.apiculture.IBeeGenome;
import forestry.api.genetics.IAllele;
import net.minecraft.item.ItemStack;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import java.util.Set;
import net.minecraft.item.ItemStack;
public class ControlProductsBox extends ControlListBox<Product> {
protected IAlleleBeeSpecies species;
protected IAlleleBeeSpecies species;
private ProductType type;
private ProductType type;
public ControlProductsBox(IWidget parent, int x, int y, int width, int height, ProductType type) {
super(parent, x, y, width, height, 12.0f);
this.type = type;
species = null;
}
public ControlProductsBox(IWidget parent, int x, int y, int width, int height, ProductType type) {
super(parent, x, y, width, height, 12.0f);
this.type = type;
species = null;
}
@Override
public IWidget createOption(Product value, int y) {
return new ControlProductsItem(getContent(), value, y);
}
@Override
public IWidget createOption(Product value, int y) {
return new ControlProductsItem(getContent(), value, y);
}
public void setSpecies(IAlleleBeeSpecies species) {
if (species != this.species && (this.species = species) != null) {
IAllele[] template = Binnie.Genetics.getBeeRoot().getTemplate(species.getUID());
if (template == null) {
return;
}
public void setSpecies(IAlleleBeeSpecies species) {
if (species != this.species && (this.species = species) != null) {
IAllele[] template = Binnie.Genetics.getBeeRoot().getTemplate(species.getUID());
if (template == null) {
return;
}
IBeeGenome genome = Binnie.Genetics.getBeeRoot().templateAsGenome(template);
float speed = genome.getSpeed();
float modeSpeed = Binnie.Genetics.getBeeRoot()
.getBeekeepingMode(BinnieCore.proxy.getWorld())
.getBeeModifier()
.getProductionModifier(genome, 1.0f);
IBeeGenome genome = Binnie.Genetics.getBeeRoot().templateAsGenome(template);
float speed = genome.getSpeed();
float modeSpeed = Binnie.Genetics.getBeeRoot()
.getBeekeepingMode(BinnieCore.proxy.getWorld())
.getBeeModifier()
.getProductionModifier(genome, 1.0f);
List<Product> strings = new ArrayList<>();
Set<Map.Entry<ItemStack, Float>> chances;
if (type == ProductType.PRODUCTS) {
chances = species.getProductChances().entrySet();
} else {
chances = species.getSpecialtyChances().entrySet();
}
List<Product> strings = new ArrayList<>();
Set<Map.Entry<ItemStack, Float>> chances;
if (type == ProductType.PRODUCTS) {
chances = species.getProductChances().entrySet();
} else {
chances = species.getSpecialtyChances().entrySet();
}
for (Map.Entry<ItemStack, Float> entry : chances) {
strings.add(new Product(entry.getKey(), speed * modeSpeed * entry.getValue()));
}
setOptions(strings);
}
}
for (Map.Entry<ItemStack, Float> entry : chances) {
strings.add(new Product(entry.getKey(), speed * modeSpeed * entry.getValue()));
}
setOptions(strings);
}
}
}
@@ -8,35 +8,37 @@ import binnie.core.craftgui.geometry.CraftGUIUtil;
import binnie.core.craftgui.geometry.IPoint;
import binnie.core.craftgui.minecraft.control.ControlItemDisplay;
import binnie.core.util.I18N;
import java.text.DecimalFormat;
public class ControlProductsItem extends ControlOption<Product> {
protected ControlItemDisplay item;
protected ControlItemDisplay item;
public ControlProductsItem(ControlList<Product> controlList, Product value, int y) {
super(controlList, value, y);
(item = new ControlItemDisplay(this, 4.0f, 4.0f)).setTooltip();
ControlText textWidget = new ControlTextCentered(this, 2.0f, "");
CraftGUIUtil.moveWidget(textWidget, new IPoint(12.0f, 0.0f));
public ControlProductsItem(ControlList<Product> controlList, Product value, int y) {
super(controlList, value, y);
(item = new ControlItemDisplay(this, 4.0f, 4.0f)).setTooltip();
ControlText textWidget = new ControlTextCentered(this, 2.0f, "");
CraftGUIUtil.moveWidget(textWidget, new IPoint(12.0f, 0.0f));
if (value == null) {
return;
}
if (value == null) {
return;
}
item.setItemStack(value.item);
float time = (int) (550.0 / value.chance);
float seconds = time / 20.0f;
float minutes = seconds / 60.0f;
float hours = minutes / 60.0f;
DecimalFormat df = new DecimalFormat("#.0");
item.setItemStack(value.item);
float time = (int) (550.0 / value.chance);
float seconds = time / 20.0f;
float minutes = seconds / 60.0f;
float hours = minutes / 60.0f;
DecimalFormat df = new DecimalFormat("#.0");
if (hours > 1.0f) {
textWidget.setValue(I18N.localise("extrabees.gui.database.tab.species.products.everyHours", df.format(hours)));
} else if (minutes > 1.0f) {
textWidget.setValue(I18N.localise("extrabees.gui.database.tab.species.products.everyMins", df.format(minutes)));
} else {
textWidget.setValue(I18N.localise("extrabees.gui.database.tab.species.products.everySecs", df.format(seconds)));
}
}
if (hours > 1.0f) {
textWidget.setValue(
I18N.localise("extrabees.gui.database.tab.species.products.everyHours", df.format(hours)));
} else if (minutes > 1.0f) {
textWidget.setValue(
I18N.localise("extrabees.gui.database.tab.species.products.everyMins", df.format(minutes)));
} else {
textWidget.setValue(
I18N.localise("extrabees.gui.database.tab.species.products.everySecs", df.format(seconds)));
}
}
}
@@ -9,21 +9,21 @@ import forestry.api.apiculture.IAlleleBeeSpecies;
import forestry.api.genetics.IAlleleSpecies;
public class PageSpeciesProducts extends PageSpecies {
protected ControlProductsBox products;
protected ControlProductsBox specialties;
protected ControlProductsBox products;
protected ControlProductsBox specialties;
public PageSpeciesProducts(IWidget parent, DatabaseTab tab) {
super(parent, tab);
new ControlTextCentered(this, 8.0f, I18N.localise("extrabees.gui.database.tab.species.products"));
products = new ControlProductsBox(this, 4, 20, 136, 48, ProductType.PRODUCTS);
public PageSpeciesProducts(IWidget parent, DatabaseTab tab) {
super(parent, tab);
new ControlTextCentered(this, 8.0f, I18N.localise("extrabees.gui.database.tab.species.products"));
products = new ControlProductsBox(this, 4, 20, 136, 48, ProductType.PRODUCTS);
new ControlTextCentered(this, 68.0f, I18N.localise("extrabees.gui.database.tab.species.specialties"));
specialties = new ControlProductsBox(this, 4, 80, 136, 48, ProductType.SPECIALTIES);
}
new ControlTextCentered(this, 68.0f, I18N.localise("extrabees.gui.database.tab.species.specialties"));
specialties = new ControlProductsBox(this, 4, 80, 136, 48, ProductType.SPECIALTIES);
}
@Override
public void onValueChanged(IAlleleSpecies species) {
products.setSpecies((IAlleleBeeSpecies) species);
specialties.setSpecies((IAlleleBeeSpecies) species);
}
@Override
public void onValueChanged(IAlleleSpecies species) {
products.setSpecies((IAlleleBeeSpecies) species);
specialties.setSpecies((IAlleleBeeSpecies) species);
}
}
@@ -3,11 +3,11 @@ package binnie.extrabees.gui.database.product;
import net.minecraft.item.ItemStack;
public class Product {
protected ItemStack item;
protected float chance;
protected ItemStack item;
protected float chance;
public Product(ItemStack item, float chance) {
this.item = item;
this.chance = chance;
}
public Product(ItemStack item, float chance) {
this.item = item;
this.chance = chance;
}
}
@@ -1,6 +1,6 @@
package binnie.extrabees.gui.database.product;
public enum ProductType {
PRODUCTS,
SPECIALTIES
PRODUCTS,
SPECIALTIES
}
@@ -7,77 +7,76 @@ import binnie.core.util.I18N;
import binnie.extrabees.ExtraBees;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import java.awt.Color;
import net.minecraft.client.renderer.texture.IIconRegister;
import net.minecraft.util.IIcon;
import net.minecraftforge.fluids.FluidStack;
import java.awt.Color;
public enum ExtraBeeLiquid implements ILiquidType {
ACID("acid", new Color(0xafeb19)),
POISON("poison", new Color(0xeb14eb)),
GLACIAL("liquidnitrogen", new Color(0x96c8c8));
ACID("acid", new Color(0xafeb19)),
POISON("poison", new Color(0xeb14eb)),
GLACIAL("liquidnitrogen", new Color(0x96c8c8));
protected String ident;
protected IIcon icon;
protected int color;
protected String ident;
protected IIcon icon;
protected int color;
ExtraBeeLiquid(String ident, Color color) {
this.ident = ident;
this.color = color.getRGB();
}
ExtraBeeLiquid(String ident, Color color) {
this.ident = ident;
this.color = color.getRGB();
}
@Override
public IIcon getIcon() {
return icon;
}
@Override
public IIcon getIcon() {
return icon;
}
@SideOnly(Side.CLIENT)
@Override
public void registerIcon(IIconRegister register) {
icon = ExtraBees.proxy.getIcon(register, "liquids/" + getIdentifier());
}
@SideOnly(Side.CLIENT)
@Override
public void registerIcon(IIconRegister register) {
icon = ExtraBees.proxy.getIcon(register, "liquids/" + getIdentifier());
}
@Override
public String getName() {
return I18N.localise("extrabees." + toString().toLowerCase());
}
@Override
public String getName() {
return I18N.localise("extrabees." + toString().toLowerCase());
}
@Override
public String getIdentifier() {
return ident;
}
@Override
public String getIdentifier() {
return ident;
}
@Override
public int getColor() {
return 0xffffff;
}
@Override
public int getColor() {
return 0xffffff;
}
@Override
public FluidStack get(int amount) {
return Binnie.Liquid.getLiquidStack(ident, amount);
}
@Override
public FluidStack get(int amount) {
return Binnie.Liquid.getLiquidStack(ident, amount);
}
@Override
public int getTransparency() {
return 255;
}
@Override
public int getTransparency() {
return 255;
}
@Override
public boolean canPlaceIn(FluidContainer container) {
return true;
}
@Override
public boolean canPlaceIn(FluidContainer container) {
return true;
}
@Override
public boolean showInCreative(FluidContainer container) {
return container == FluidContainer.Bucket
|| container == FluidContainer.Can
|| container == FluidContainer.Capsule
|| container == FluidContainer.Refractory;
}
@Override
public boolean showInCreative(FluidContainer container) {
return container == FluidContainer.Bucket
|| container == FluidContainer.Can
|| container == FluidContainer.Capsule
|| container == FluidContainer.Refractory;
}
@Override
public int getContainerColor() {
return color;
}
@Override
public int getContainerColor() {
return color;
}
}
@@ -5,18 +5,18 @@ import binnie.core.IInitializable;
import binnie.core.liquid.ItemFluidContainer;
public class ModuleLiquids implements IInitializable {
@Override
public void preInit() {
Binnie.Liquid.createLiquids(ExtraBeeLiquid.values(), ItemFluidContainer.LiquidExtraBee);
}
@Override
public void preInit() {
Binnie.Liquid.createLiquids(ExtraBeeLiquid.values(), ItemFluidContainer.LiquidExtraBee);
}
@Override
public void init() {
// ignored
}
@Override
public void init() {
// ignored
}
@Override
public void postInit() {
// ignored
}
@Override
public void postInit() {
// ignored
}
}
@@ -4,160 +4,159 @@ import binnie.core.item.IItemEnum;
import binnie.core.util.I18N;
import binnie.extrabees.ExtraBees;
import forestry.api.recipes.RecipeManagers;
import net.minecraft.item.ItemStack;
import java.awt.Color;
import java.util.LinkedHashMap;
import java.util.Locale;
import java.util.Map;
import net.minecraft.item.ItemStack;
public enum EnumHoneyComb implements IItemEnum {
BARREN(new Color(0x736c44), new Color(0xc2bea7)),
ROTTEN(new Color(0x3e5221), new Color(0xb1cc89)),
BONE(new Color(0xc4c4af), new Color(0xdedec1)),
OIL(new Color(0x060608), new Color(0x2c2b36)),
COAL(new Color(0x9e9478), new Color(0x38311e)),
FUEL(new Color(0x9c6f40), new Color(0xffc400)),
WATER(new Color(0x2732cf), new Color(0x79a8c9)),
MILK(new Color(0xd7d9c7), new Color(0xffffff)),
FRUIT(new Color(0x7d2934), new Color(0xdb4f62)),
SEED(new Color(0x344f33), new Color(0x71cc6e)),
ALCOHOL(new Color(0x418521), new Color(0xded94e)),
STONE(new Color(0x8c8c91), new Color(0xc6c6cc)),
REDSTONE(new Color(0xfa9696), new Color(0xe61010)),
RESIN(new Color(0xffc74f), new Color(0xc98a00)),
IC2ENERGY(new Color(0xe9f50f), new Color(0x20b3c9)),
IRON(new Color(0x363534), new Color(0xa87058)),
GOLD(new Color(0x363534), new Color(0xe6cc0b)),
COPPER(new Color(0x363534), new Color(0xd16308)),
TIN(new Color(0x363534), new Color(0xbdb1bd)),
SILVER(new Color(0x363534), new Color(0xdbdbdb)),
// BRONZE,
URANIUM(new Color(0x1eff00), new Color(0x41ab33)),
CLAY(new Color(0x6b563a), new Color(0xb0c0d6)),
OLD(new Color(0x453314), new Color(0xb39664)),
FUNGAL(new Color(0x6e654b), new Color(0x2b9443)),
CREOSOTE(new Color(0x9c810c), new Color(0xbdaa57)),
LATEX(new Color(0x595541), new Color(0xa8a285)),
ACIDIC(new Color(0x348543), new Color(0x14f73e)),
VENOMOUS(new Color(0x7d187d), new Color(0xff33ff)),
SLIME(new Color(0x3b473c), new Color(0x80d185)),
BLAZE(new Color(0xff6a00), new Color(0xffcc00)),
COFFEE(new Color(0x54381d), new Color(0xb37f4b)),
GLACIAL(new Color(0x4e8787), new Color(0xcbf2f2)),
// MINT,
// CITRUS,
// PEAT,
SHADOW(new Color(0x000000), new Color(0x361835)),
LEAD(new Color(0x363534), new Color(0x9a809c)),
// BRASS,
// ELECTRUM,
ZINC(new Color(0x363534), new Color(0xedebff)),
TITANIUM(new Color(0x363534), new Color(0xb0aae3)),
TUNGSTEN(new Color(0x363534), new Color(0x131214)),
// STEEL,
// IRIDIUM,
PLATINUM(new Color(0x363534), new Color(0x9a809c)),
LAPIS(new Color(0x363534), new Color(0x3d2cdb)),
// SODALITE,
// PYRITE,
// BAUXITE,
// CINNABAR,
// SPHALERITE,
EMERALD(new Color(0x363534), new Color(0x1cff03)),
RUBY(new Color(0x363534), new Color(0xd60000)),
SAPPHIRE(new Color(0x363534), new Color(0xa47ff)),
// OLIVINE,
DIAMOND(new Color(0x363534), new Color(0x7fbdfa)),
RED(new Color(0xcc4c4c), new Color(0xff0000)),
YELLOW(new Color(0xe5e533), new Color(0xffdd00)),
BLUE(new Color(0x99b2f2), new Color(0x0022ff)),
GREEN(new Color(0x667f33), new Color(0x009900)),
BLACK(new Color(0x191919), new Color(0x575757)),
WHITE(new Color(0xd6d6d6), new Color(0xffffff)),
BROWN(new Color(0x7f664c), new Color(0x5c350f)),
ORANGE(new Color(0xf2b233), new Color(0xff9d00)),
CYAN(new Color(0x4c99b2), new Color(0x00ffe5)),
PURPLE(new Color(0xb266e5), new Color(0xae00ff)),
GRAY(new Color(0x4c4c4c), new Color(0xbababa)),
LIGHTBLUE(new Color(0x99b2f2), new Color(0x009dff)),
PINK(new Color(0xf2b2cc), new Color(0xff80df)),
LIMEGREEN(new Color(0x7fcc19), new Color(0x00ff08)),
MAGENTA(new Color(0xe57fd8), new Color(0xff00cc)),
LIGHTGRAY(new Color(0x999999), new Color(0xc9c9c9)),
NICKEL(new Color(0x363534), new Color(0xffdefc)),
// INVAR,
GLOWSTONE(new Color(0xa69c5e), new Color(0xe0c409)),
SALTPETER(new Color(0xa69c5e), new Color(0xe0c409)),
//PULP,
//MULCH,
COMPOST(new Color(0x423308), new Color(0x6b5e3b)),
SAWDUST(new Color(0xbfaa71), new Color(0xf2d37e)),
CERTUS(new Color(0xc6d0ff), new Color(0x394d63)),
ENDERPEARL(new Color(0x349786), new Color(0x32620)),
YELLORIUM(new Color(0x27204d), new Color(14019840)),
CYANITE(new Color(0x27204d), new Color(0x86ed)),
BLUTONIUM(new Color(0x27204d), new Color(0x1b00e6));
BARREN(new Color(0x736c44), new Color(0xc2bea7)),
ROTTEN(new Color(0x3e5221), new Color(0xb1cc89)),
BONE(new Color(0xc4c4af), new Color(0xdedec1)),
OIL(new Color(0x060608), new Color(0x2c2b36)),
COAL(new Color(0x9e9478), new Color(0x38311e)),
FUEL(new Color(0x9c6f40), new Color(0xffc400)),
WATER(new Color(0x2732cf), new Color(0x79a8c9)),
MILK(new Color(0xd7d9c7), new Color(0xffffff)),
FRUIT(new Color(0x7d2934), new Color(0xdb4f62)),
SEED(new Color(0x344f33), new Color(0x71cc6e)),
ALCOHOL(new Color(0x418521), new Color(0xded94e)),
STONE(new Color(0x8c8c91), new Color(0xc6c6cc)),
REDSTONE(new Color(0xfa9696), new Color(0xe61010)),
RESIN(new Color(0xffc74f), new Color(0xc98a00)),
IC2ENERGY(new Color(0xe9f50f), new Color(0x20b3c9)),
IRON(new Color(0x363534), new Color(0xa87058)),
GOLD(new Color(0x363534), new Color(0xe6cc0b)),
COPPER(new Color(0x363534), new Color(0xd16308)),
TIN(new Color(0x363534), new Color(0xbdb1bd)),
SILVER(new Color(0x363534), new Color(0xdbdbdb)),
// BRONZE,
URANIUM(new Color(0x1eff00), new Color(0x41ab33)),
CLAY(new Color(0x6b563a), new Color(0xb0c0d6)),
OLD(new Color(0x453314), new Color(0xb39664)),
FUNGAL(new Color(0x6e654b), new Color(0x2b9443)),
CREOSOTE(new Color(0x9c810c), new Color(0xbdaa57)),
LATEX(new Color(0x595541), new Color(0xa8a285)),
ACIDIC(new Color(0x348543), new Color(0x14f73e)),
VENOMOUS(new Color(0x7d187d), new Color(0xff33ff)),
SLIME(new Color(0x3b473c), new Color(0x80d185)),
BLAZE(new Color(0xff6a00), new Color(0xffcc00)),
COFFEE(new Color(0x54381d), new Color(0xb37f4b)),
GLACIAL(new Color(0x4e8787), new Color(0xcbf2f2)),
// MINT,
// CITRUS,
// PEAT,
SHADOW(new Color(0x000000), new Color(0x361835)),
LEAD(new Color(0x363534), new Color(0x9a809c)),
// BRASS,
// ELECTRUM,
ZINC(new Color(0x363534), new Color(0xedebff)),
TITANIUM(new Color(0x363534), new Color(0xb0aae3)),
TUNGSTEN(new Color(0x363534), new Color(0x131214)),
// STEEL,
// IRIDIUM,
PLATINUM(new Color(0x363534), new Color(0x9a809c)),
LAPIS(new Color(0x363534), new Color(0x3d2cdb)),
// SODALITE,
// PYRITE,
// BAUXITE,
// CINNABAR,
// SPHALERITE,
EMERALD(new Color(0x363534), new Color(0x1cff03)),
RUBY(new Color(0x363534), new Color(0xd60000)),
SAPPHIRE(new Color(0x363534), new Color(0xa47ff)),
// OLIVINE,
DIAMOND(new Color(0x363534), new Color(0x7fbdfa)),
RED(new Color(0xcc4c4c), new Color(0xff0000)),
YELLOW(new Color(0xe5e533), new Color(0xffdd00)),
BLUE(new Color(0x99b2f2), new Color(0x0022ff)),
GREEN(new Color(0x667f33), new Color(0x009900)),
BLACK(new Color(0x191919), new Color(0x575757)),
WHITE(new Color(0xd6d6d6), new Color(0xffffff)),
BROWN(new Color(0x7f664c), new Color(0x5c350f)),
ORANGE(new Color(0xf2b233), new Color(0xff9d00)),
CYAN(new Color(0x4c99b2), new Color(0x00ffe5)),
PURPLE(new Color(0xb266e5), new Color(0xae00ff)),
GRAY(new Color(0x4c4c4c), new Color(0xbababa)),
LIGHTBLUE(new Color(0x99b2f2), new Color(0x009dff)),
PINK(new Color(0xf2b2cc), new Color(0xff80df)),
LIMEGREEN(new Color(0x7fcc19), new Color(0x00ff08)),
MAGENTA(new Color(0xe57fd8), new Color(0xff00cc)),
LIGHTGRAY(new Color(0x999999), new Color(0xc9c9c9)),
NICKEL(new Color(0x363534), new Color(0xffdefc)),
// INVAR,
GLOWSTONE(new Color(0xa69c5e), new Color(0xe0c409)),
SALTPETER(new Color(0xa69c5e), new Color(0xe0c409)),
// PULP,
// MULCH,
COMPOST(new Color(0x423308), new Color(0x6b5e3b)),
SAWDUST(new Color(0xbfaa71), new Color(0xf2d37e)),
CERTUS(new Color(0xc6d0ff), new Color(0x394d63)),
ENDERPEARL(new Color(0x349786), new Color(0x32620)),
YELLORIUM(new Color(0x27204d), new Color(14019840)),
CYANITE(new Color(0x27204d), new Color(0x86ed)),
BLUTONIUM(new Color(0x27204d), new Color(0x1b00e6));
public Map<ItemStack, Float> products;
public final int primaryColor;
public final int secondaryColor;
public final String name;
public Map<ItemStack, Float> products;
public final int primaryColor;
public final int secondaryColor;
public final String name;
protected boolean active;
protected boolean active;
EnumHoneyComb(Color primaryColor, Color secondaryColor) {
this.primaryColor = primaryColor.getRGB();
this.secondaryColor = secondaryColor.getRGB();
name = toString().toLowerCase(Locale.ENGLISH);
products = new LinkedHashMap<>();
}
EnumHoneyComb(Color primaryColor, Color secondaryColor) {
this.primaryColor = primaryColor.getRGB();
this.secondaryColor = secondaryColor.getRGB();
name = toString().toLowerCase(Locale.ENGLISH);
products = new LinkedHashMap<>();
}
public static EnumHoneyComb get(ItemStack itemStack) {
int i = itemStack.getItemDamage();
if (i >= 0 && i < values().length) {
return values()[i];
}
return values()[0];
}
public static EnumHoneyComb get(ItemStack itemStack) {
int i = itemStack.getItemDamage();
if (i >= 0 && i < values().length) {
return values()[i];
}
return values()[0];
}
public void addRecipe() {
RecipeManagers.centrifugeManager.addRecipe(20, get(1), products);
}
public void addRecipe() {
RecipeManagers.centrifugeManager.addRecipe(20, get(1), products);
}
@Override
public boolean isActive() {
return active;
}
@Override
public boolean isActive() {
return active;
}
@Override
public ItemStack get(int count) {
return new ItemStack(ExtraBees.comb, count, ordinal());
}
@Override
public ItemStack get(int count) {
return new ItemStack(ExtraBees.comb, count, ordinal());
}
@Override
public String getName(ItemStack stack) {
return I18N.localise("extrabees.item.comb." + name);
}
@Override
public String getName(ItemStack stack) {
return I18N.localise("extrabees.item.comb." + name);
}
public boolean addProduct(ItemStack item, Float chance) {
if (item == null) {
return false;
}
products.put(item.copy(), chance);
return true;
}
public boolean addProduct(ItemStack item, Float chance) {
if (item == null) {
return false;
}
products.put(item.copy(), chance);
return true;
}
public void tryAddProduct(ItemStack item, Float chance) {
active = addProduct(item, chance);
}
public void tryAddProduct(ItemStack item, Float chance) {
active = addProduct(item, chance);
}
public void tryAddProduct(IItemEnum type, Float chance) {
tryAddProduct(type.get(1), chance);
active = active && type.isActive();
}
public void tryAddProduct(IItemEnum type, Float chance) {
tryAddProduct(type.get(1), chance);
active = active && type.isActive();
}
public void copyProducts(EnumHoneyComb comb) {
products.putAll(comb.products);
}
public void copyProducts(EnumHoneyComb comb) {
products.putAll(comb.products);
}
}
@@ -5,88 +5,86 @@ import binnie.core.item.IItemEnum;
import binnie.core.util.I18N;
import binnie.extrabees.ExtraBees;
import forestry.api.recipes.RecipeManagers;
import java.awt.Color;
import net.minecraft.item.ItemStack;
import net.minecraftforge.fluids.FluidRegistry;
import net.minecraftforge.fluids.FluidStack;
import java.awt.Color;
public enum EnumHoneyDrop implements IItemEnum {
ENERGY(new Color(0x9c4972), new Color(0xe37171), ""),
ACID(new Color(0x4bb541), new Color(0x49de3c), "acid"),
POISON(new Color(0xd106b9), new Color(0xff03e2), "poison"),
APPLE(new Color(0xc75252), new Color(0xc92a2a), "juice"),
// CITRUS,
ICE(new Color(0xaee8e2), new Color(0x96fff5), "liquidnitrogen"),
MILK(new Color(0xe0e0e0), new Color(0xffffff), "milk"),
SEED(new Color(0x7cc272), new Color(0xc2bea7), "seedoil"),
ALCOHOL(new Color(0xdbe84d), new Color(0xa5e84d), "short.mead"),
// FRUIT,
// VEGETABLE,
// PUMPKIN,
// MELON,
RED(new Color(0xcc4c4c), new Color(0xff0000), "for.honey"),
YELLOW(new Color(0xe5e533), new Color(0xffdd00), "for.honey"),
BLUE(new Color(0x99b2f2), new Color(0x0022ff), "for.honey"),
GREEN(new Color(0x667f33), new Color(0x009900), "for.honey"),
BLACK(new Color(0x191919), new Color(0x575757), "for.honey"),
WHITE(new Color(0xd6d6d6), new Color(0xffffff), "for.honey"),
BROWN(new Color(0x7f664c), new Color(0x5c350f), "for.honey"),
ORANGE(new Color(0xf2b233), new Color(0xff9d00), "for.honey"),
CYAN(new Color(0x4c99b2), new Color(0x00ffe5), "for.honey"),
PURPLE(new Color(0xb266e5), new Color(0xae00ff), "for.honey"),
GRAY(new Color(0x4c4c4c), new Color(0xbababa), "for.honey"),
LIGHTBLUE(new Color(0x99b2f2), new Color(0x009dff), "for.honey"),
PINK(new Color(0xf2b2cc), new Color(0xff80df), "for.honey"),
LIMEGREEN(new Color(0x7fcc19), new Color(0x00ff08), "for.honey"),
MAGENTA(new Color(0xe57fd8), new Color(0xff00cc), "for.honey"),
LIGHTGRAY(new Color(0x999999), new Color(0xc9c9c9), "for.honey");
public final int primaryColor;
public final int secondaryColor;
ENERGY(new Color(0x9c4972), new Color(0xe37171), ""),
ACID(new Color(0x4bb541), new Color(0x49de3c), "acid"),
POISON(new Color(0xd106b9), new Color(0xff03e2), "poison"),
APPLE(new Color(0xc75252), new Color(0xc92a2a), "juice"),
// CITRUS,
ICE(new Color(0xaee8e2), new Color(0x96fff5), "liquidnitrogen"),
MILK(new Color(0xe0e0e0), new Color(0xffffff), "milk"),
SEED(new Color(0x7cc272), new Color(0xc2bea7), "seedoil"),
ALCOHOL(new Color(0xdbe84d), new Color(0xa5e84d), "short.mead"),
// FRUIT,
// VEGETABLE,
// PUMPKIN,
// MELON,
RED(new Color(0xcc4c4c), new Color(0xff0000), "for.honey"),
YELLOW(new Color(0xe5e533), new Color(0xffdd00), "for.honey"),
BLUE(new Color(0x99b2f2), new Color(0x0022ff), "for.honey"),
GREEN(new Color(0x667f33), new Color(0x009900), "for.honey"),
BLACK(new Color(0x191919), new Color(0x575757), "for.honey"),
WHITE(new Color(0xd6d6d6), new Color(0xffffff), "for.honey"),
BROWN(new Color(0x7f664c), new Color(0x5c350f), "for.honey"),
ORANGE(new Color(0xf2b233), new Color(0xff9d00), "for.honey"),
CYAN(new Color(0x4c99b2), new Color(0x00ffe5), "for.honey"),
PURPLE(new Color(0xb266e5), new Color(0xae00ff), "for.honey"),
GRAY(new Color(0x4c4c4c), new Color(0xbababa), "for.honey"),
LIGHTBLUE(new Color(0x99b2f2), new Color(0x009dff), "for.honey"),
PINK(new Color(0xf2b2cc), new Color(0xff80df), "for.honey"),
LIMEGREEN(new Color(0x7fcc19), new Color(0x00ff08), "for.honey"),
MAGENTA(new Color(0xe57fd8), new Color(0xff00cc), "for.honey"),
LIGHTGRAY(new Color(0x999999), new Color(0xc9c9c9), "for.honey");
protected String liquidName;
protected ItemStack remenant;
public final int primaryColor;
public final int secondaryColor;
EnumHoneyDrop(Color primaryColor, Color secondaryColor, String liquid) {
this.primaryColor = primaryColor.getRGB();
this.secondaryColor = secondaryColor.getRGB();
liquidName = liquid;
}
protected String liquidName;
protected ItemStack remenant;
public static EnumHoneyDrop get(ItemStack itemStack) {
int i = itemStack.getItemDamage();
if (i >= 0 && i < values().length) {
return values()[i];
}
return values()[0];
}
EnumHoneyDrop(Color primaryColor, Color secondaryColor, String liquid) {
this.primaryColor = primaryColor.getRGB();
this.secondaryColor = secondaryColor.getRGB();
liquidName = liquid;
}
public void addRemenant(ItemStack stack) {
remenant = stack;
}
public static EnumHoneyDrop get(ItemStack itemStack) {
int i = itemStack.getItemDamage();
if (i >= 0 && i < values().length) {
return values()[i];
}
return values()[0];
}
public void addRecipe() {
FluidStack liquid = Binnie.Liquid.getLiquidStack(liquidName, 200);
if (liquid == null) {
return;
}
RecipeManagers.squeezerManager.addRecipe(10, new ItemStack[]{get(1)}, liquid, remenant, 100);
}
public void addRemenant(ItemStack stack) {
remenant = stack;
}
@Override
public boolean isActive() {
return liquidName == null
|| FluidRegistry.isFluidRegistered(liquidName);
}
public void addRecipe() {
FluidStack liquid = Binnie.Liquid.getLiquidStack(liquidName, 200);
if (liquid == null) {
return;
}
RecipeManagers.squeezerManager.addRecipe(10, new ItemStack[] {get(1)}, liquid, remenant, 100);
}
@Override
public ItemStack get(int count) {
return new ItemStack(ExtraBees.honeyDrop, count, ordinal());
}
@Override
public boolean isActive() {
return liquidName == null || FluidRegistry.isFluidRegistered(liquidName);
}
@Override
public String getName(ItemStack itemStack) {
return I18N.localise("extrabees.item.honeydrop." + name().toLowerCase());
}
@Override
public ItemStack get(int count) {
return new ItemStack(ExtraBees.honeyDrop, count, ordinal());
}
@Override
public String getName(ItemStack itemStack) {
return I18N.localise("extrabees.item.honeydrop." + name().toLowerCase());
}
}
@@ -5,61 +5,60 @@ import binnie.core.item.IItemEnum;
import binnie.core.util.I18N;
import binnie.extrabees.ExtraBees;
import forestry.api.recipes.RecipeManagers;
import java.awt.Color;
import net.minecraft.item.ItemStack;
import net.minecraftforge.fluids.FluidStack;
import java.awt.Color;
public enum EnumPropolis implements IItemEnum {
WATER(new Color(0x24b3c9), new Color(0xc2bea7), "Water"),
OIL(new Color(0x172f33), new Color(0xc2bea7), "oil"),
FUEL(new Color(0xa38d12), new Color(0xc2bea7), "fuel"),
// MILK,
// FRUIT,
// SEED,
// ALCOHOL,
CREOSOTE(new Color(0x877501), new Color(0xbda613), "creosote");
// GLACIAL,
// PEAT
WATER(new Color(0x24b3c9), new Color(0xc2bea7), "Water"),
OIL(new Color(0x172f33), new Color(0xc2bea7), "oil"),
FUEL(new Color(0xa38d12), new Color(0xc2bea7), "fuel"),
// MILK,
// FRUIT,
// SEED,
// ALCOHOL,
CREOSOTE(new Color(0x877501), new Color(0xbda613), "creosote");
// GLACIAL,
// PEAT
public final int secondaryColor;
public final int primaryColor;
public final String liquidName;
public final int secondaryColor;
public final int primaryColor;
public final String liquidName;
EnumPropolis(Color primaryColor, Color secondaryColor, String liquidName) {
this.primaryColor = primaryColor.getRGB();
this.secondaryColor = secondaryColor.getRGB();
this.liquidName = liquidName;
}
EnumPropolis(Color primaryColor, Color secondaryColor, String liquidName) {
this.primaryColor = primaryColor.getRGB();
this.secondaryColor = secondaryColor.getRGB();
this.liquidName = liquidName;
}
public static EnumPropolis get(ItemStack itemStack) {
int i = itemStack.getItemDamage();
if (i >= 0 && i < values().length) {
return values()[i];
}
return values()[0];
}
public static EnumPropolis get(ItemStack itemStack) {
int i = itemStack.getItemDamage();
if (i >= 0 && i < values().length) {
return values()[i];
}
return values()[0];
}
public void addRecipe() {
FluidStack liquid = Binnie.Liquid.getLiquidStack(liquidName, 500);
if (liquid == null) {
return;
}
RecipeManagers.squeezerManager.addRecipe(20, new ItemStack[]{get(1)}, liquid, null, 0);
}
public void addRecipe() {
FluidStack liquid = Binnie.Liquid.getLiquidStack(liquidName, 500);
if (liquid == null) {
return;
}
RecipeManagers.squeezerManager.addRecipe(20, new ItemStack[] {get(1)}, liquid, null, 0);
}
@Override
public boolean isActive() {
return Binnie.Liquid.getLiquidStack(liquidName, 100) != null;
}
@Override
public boolean isActive() {
return Binnie.Liquid.getLiquidStack(liquidName, 100) != null;
}
@Override
public ItemStack get(int count) {
return new ItemStack(ExtraBees.propolis, count, ordinal());
}
@Override
public ItemStack get(int count) {
return new ItemStack(ExtraBees.propolis, count, ordinal());
}
@Override
public String getName(ItemStack itemStack) {
return I18N.localise("extrabees.item.propolis." + name().toLowerCase());
}
@Override
public String getName(ItemStack itemStack) {
return I18N.localise("extrabees.item.propolis." + name().toLowerCase());
}
}
@@ -15,330 +15,335 @@ import net.minecraft.util.IIcon;
import net.minecraftforge.oredict.OreDictionary;
public class ItemHoneyComb extends ItemProduct {
protected IIcon icon1;
protected IIcon icon2;
protected IIcon icon1;
protected IIcon icon2;
public ItemHoneyComb() {
super(EnumHoneyComb.values());
setCreativeTab(Tabs.tabApiculture);
setUnlocalizedName("honeyComb");
}
public ItemHoneyComb() {
super(EnumHoneyComb.values());
setCreativeTab(Tabs.tabApiculture);
setUnlocalizedName("honeyComb");
}
public static void addSubtypes() {
ItemStack beeswax = Mods.forestry.stack("beeswax");
ItemStack honeyDrop = Mods.forestry.stack("honeyDrop");
OreDictionary.registerOre("ingotIron", Items.iron_ingot);
OreDictionary.registerOre("ingotGold", Items.gold_ingot);
OreDictionary.registerOre("gemDiamond", Items.diamond);
OreDictionary.registerOre("gemEmerald", Items.emerald);
OreDictionary.registerOre("gemLapis", new ItemStack(Items.dye, 1, 4));
public static void addSubtypes() {
ItemStack beeswax = Mods.forestry.stack("beeswax");
ItemStack honeyDrop = Mods.forestry.stack("honeyDrop");
OreDictionary.registerOre("ingotIron", Items.iron_ingot);
OreDictionary.registerOre("ingotGold", Items.gold_ingot);
OreDictionary.registerOre("gemDiamond", Items.diamond);
OreDictionary.registerOre("gemEmerald", Items.emerald);
OreDictionary.registerOre("gemLapis", new ItemStack(Items.dye, 1, 4));
EnumHoneyComb.BARREN.addProduct(beeswax, 1.00f);
EnumHoneyComb.BARREN.addProduct(honeyDrop, 0.50f);
EnumHoneyComb.BARREN.addProduct(beeswax, 1.00f);
EnumHoneyComb.BARREN.addProduct(honeyDrop, 0.50f);
EnumHoneyComb.ROTTEN.addProduct(beeswax, 0.20f);
EnumHoneyComb.ROTTEN.addProduct(honeyDrop, 0.20f);
EnumHoneyComb.ROTTEN.addProduct(new ItemStack(Items.rotten_flesh, 1, 0), 0.80f);
EnumHoneyComb.ROTTEN.addProduct(beeswax, 0.20f);
EnumHoneyComb.ROTTEN.addProduct(honeyDrop, 0.20f);
EnumHoneyComb.ROTTEN.addProduct(new ItemStack(Items.rotten_flesh, 1, 0), 0.80f);
EnumHoneyComb.BONE.addProduct(beeswax, 0.20f);
EnumHoneyComb.BONE.addProduct(honeyDrop, 0.20f);
EnumHoneyComb.BONE.addProduct(new ItemStack(Items.dye, 1, 15), 0.80f);
EnumHoneyComb.BONE.addProduct(beeswax, 0.20f);
EnumHoneyComb.BONE.addProduct(honeyDrop, 0.20f);
EnumHoneyComb.BONE.addProduct(new ItemStack(Items.dye, 1, 15), 0.80f);
EnumHoneyComb.OIL.tryAddProduct(EnumPropolis.OIL, 0.60f);
EnumHoneyComb.OIL.addProduct(honeyDrop, 0.75f);
EnumHoneyComb.OIL.tryAddProduct(EnumPropolis.OIL, 0.60f);
EnumHoneyComb.OIL.addProduct(honeyDrop, 0.75f);
EnumHoneyComb.COAL.addProduct(beeswax, 0.80f);
EnumHoneyComb.COAL.addProduct(honeyDrop, 0.75f);
EnumHoneyComb.COAL.tryAddProduct(ExtraBeeItems.CoalDust, 1.00f);
EnumHoneyComb.COAL.addProduct(beeswax, 0.80f);
EnumHoneyComb.COAL.addProduct(honeyDrop, 0.75f);
EnumHoneyComb.COAL.tryAddProduct(ExtraBeeItems.CoalDust, 1.00f);
EnumHoneyComb.WATER.tryAddProduct(EnumPropolis.WATER, 1.00f);
EnumHoneyComb.WATER.addProduct(honeyDrop, 0.90f);
EnumHoneyComb.WATER.tryAddProduct(EnumPropolis.WATER, 1.00f);
EnumHoneyComb.WATER.addProduct(honeyDrop, 0.90f);
EnumHoneyComb.STONE.addProduct(beeswax, 0.50f);
EnumHoneyComb.STONE.addProduct(honeyDrop, 0.25f);
EnumHoneyComb.STONE.addProduct(beeswax, 0.50f);
EnumHoneyComb.STONE.addProduct(honeyDrop, 0.25f);
EnumHoneyComb.MILK.tryAddProduct(EnumHoneyDrop.MILK, 1.00f);
EnumHoneyComb.MILK.addProduct(honeyDrop, 0.90f);
EnumHoneyComb.MILK.tryAddProduct(EnumHoneyDrop.MILK, 1.00f);
EnumHoneyComb.MILK.addProduct(honeyDrop, 0.90f);
EnumHoneyComb.FRUIT.tryAddProduct(EnumHoneyDrop.APPLE, 1.00f);
EnumHoneyComb.FRUIT.addProduct(honeyDrop, 0.90f);
EnumHoneyComb.FRUIT.tryAddProduct(EnumHoneyDrop.APPLE, 1.00f);
EnumHoneyComb.FRUIT.addProduct(honeyDrop, 0.90f);
EnumHoneyComb.SEED.tryAddProduct(EnumHoneyDrop.SEED, 1.00f);
EnumHoneyComb.SEED.addProduct(honeyDrop, 0.90f);
EnumHoneyComb.SEED.tryAddProduct(EnumHoneyDrop.SEED, 1.00f);
EnumHoneyComb.SEED.addProduct(honeyDrop, 0.90f);
EnumHoneyComb.ALCOHOL.tryAddProduct(EnumHoneyDrop.ALCOHOL, 1.00f);
EnumHoneyComb.ALCOHOL.addProduct(honeyDrop, 0.90f);
EnumHoneyComb.ALCOHOL.tryAddProduct(EnumHoneyDrop.ALCOHOL, 1.00f);
EnumHoneyComb.ALCOHOL.addProduct(honeyDrop, 0.90f);
EnumHoneyComb.FUEL.tryAddProduct(EnumPropolis.FUEL, 0.60f);
EnumHoneyComb.FUEL.addProduct(honeyDrop, 0.50f);
EnumHoneyComb.FUEL.tryAddProduct(EnumPropolis.FUEL, 0.60f);
EnumHoneyComb.FUEL.addProduct(honeyDrop, 0.50f);
EnumHoneyComb.CREOSOTE.tryAddProduct(EnumPropolis.CREOSOTE, 0.70f);
EnumHoneyComb.CREOSOTE.addProduct(honeyDrop, 0.50f);
EnumHoneyComb.CREOSOTE.tryAddProduct(EnumPropolis.CREOSOTE, 0.70f);
EnumHoneyComb.CREOSOTE.addProduct(honeyDrop, 0.50f);
EnumHoneyComb.LATEX.addProduct(honeyDrop, 0.50f);
EnumHoneyComb.LATEX.addProduct(beeswax, 0.85f);
if (!OreDictionary.getOres("itemRubber").isEmpty()) {
EnumHoneyComb.LATEX.tryAddProduct(OreDictionary.getOres("itemRubber").get(0), 1.00f);
} else {
EnumHoneyComb.LATEX.active = false;
}
EnumHoneyComb.LATEX.addProduct(honeyDrop, 0.50f);
EnumHoneyComb.LATEX.addProduct(beeswax, 0.85f);
if (!OreDictionary.getOres("itemRubber").isEmpty()) {
EnumHoneyComb.LATEX.tryAddProduct(
OreDictionary.getOres("itemRubber").get(0), 1.00f);
} else {
EnumHoneyComb.LATEX.active = false;
}
EnumHoneyComb.REDSTONE.addProduct(beeswax, 0.80f);
EnumHoneyComb.REDSTONE.addProduct(new ItemStack(Items.redstone, 1, 0), 1.00f);
EnumHoneyComb.REDSTONE.addProduct(honeyDrop, 0.50f);
EnumHoneyComb.REDSTONE.addProduct(beeswax, 0.80f);
EnumHoneyComb.REDSTONE.addProduct(new ItemStack(Items.redstone, 1, 0), 1.00f);
EnumHoneyComb.REDSTONE.addProduct(honeyDrop, 0.50f);
EnumHoneyComb.RESIN.addProduct(beeswax, 1.00f);
EnumHoneyComb.RESIN.tryAddProduct(Mods.ic2.stack("itemHarz"), 1.00f);
EnumHoneyComb.RESIN.tryAddProduct(Mods.ic2.stack("itemHarz"), 0.50f);
EnumHoneyComb.RESIN.addProduct(beeswax, 1.00f);
EnumHoneyComb.RESIN.tryAddProduct(Mods.ic2.stack("itemHarz"), 1.00f);
EnumHoneyComb.RESIN.tryAddProduct(Mods.ic2.stack("itemHarz"), 0.50f);
EnumHoneyComb.IC2ENERGY.addProduct(beeswax, 0.80f);
EnumHoneyComb.IC2ENERGY.addProduct(new ItemStack(Items.redstone, 1, 0), 0.75f);
EnumHoneyComb.IC2ENERGY.tryAddProduct(EnumHoneyDrop.ENERGY, 1.00f);
EnumHoneyComb.IC2ENERGY.addProduct(beeswax, 0.80f);
EnumHoneyComb.IC2ENERGY.addProduct(new ItemStack(Items.redstone, 1, 0), 0.75f);
EnumHoneyComb.IC2ENERGY.tryAddProduct(EnumHoneyDrop.ENERGY, 1.00f);
EnumHoneyComb.IRON.copyProducts(EnumHoneyComb.STONE);
EnumHoneyComb.IRON.tryAddProduct(ExtraBeeItems.IronDust, 1.00f);
EnumHoneyComb.IRON.copyProducts(EnumHoneyComb.STONE);
EnumHoneyComb.IRON.tryAddProduct(ExtraBeeItems.IronDust, 1.00f);
EnumHoneyComb.GOLD.copyProducts(EnumHoneyComb.STONE);
EnumHoneyComb.GOLD.tryAddProduct(ExtraBeeItems.GoldDust, 1.00f);
EnumHoneyComb.GOLD.copyProducts(EnumHoneyComb.STONE);
EnumHoneyComb.GOLD.tryAddProduct(ExtraBeeItems.GoldDust, 1.00f);
EnumHoneyComb.COPPER.copyProducts(EnumHoneyComb.STONE);
EnumHoneyComb.COPPER.tryAddProduct(ExtraBeeItems.CopperDust, 1.00f);
EnumHoneyComb.COPPER.copyProducts(EnumHoneyComb.STONE);
EnumHoneyComb.COPPER.tryAddProduct(ExtraBeeItems.CopperDust, 1.00f);
EnumHoneyComb.TIN.copyProducts(EnumHoneyComb.STONE);
EnumHoneyComb.TIN.tryAddProduct(ExtraBeeItems.TinDust, 1.00f);
EnumHoneyComb.TIN.copyProducts(EnumHoneyComb.STONE);
EnumHoneyComb.TIN.tryAddProduct(ExtraBeeItems.TinDust, 1.00f);
EnumHoneyComb.NICKEL.copyProducts(EnumHoneyComb.STONE);
EnumHoneyComb.NICKEL.tryAddProduct(ExtraBeeItems.NickelDust, 1.00f);
EnumHoneyComb.NICKEL.copyProducts(EnumHoneyComb.STONE);
EnumHoneyComb.NICKEL.tryAddProduct(ExtraBeeItems.NickelDust, 1.00f);
EnumHoneyComb.SILVER.copyProducts(EnumHoneyComb.STONE);
EnumHoneyComb.SILVER.tryAddProduct(ExtraBeeItems.SilverDust, 1.00f);
EnumHoneyComb.SILVER.copyProducts(EnumHoneyComb.STONE);
EnumHoneyComb.SILVER.tryAddProduct(ExtraBeeItems.SilverDust, 1.00f);
EnumHoneyComb.URANIUM.copyProducts(EnumHoneyComb.STONE);
if (!OreDictionary.getOres("crushedUranium").isEmpty()) {
EnumHoneyComb.URANIUM.tryAddProduct(OreDictionary.getOres("crushedUranium").get(0), 0.50f);
}
EnumHoneyComb.URANIUM.copyProducts(EnumHoneyComb.STONE);
if (!OreDictionary.getOres("crushedUranium").isEmpty()) {
EnumHoneyComb.URANIUM.tryAddProduct(
OreDictionary.getOres("crushedUranium").get(0), 0.50f);
}
EnumHoneyComb.CLAY.addProduct(beeswax, 0.25f);
EnumHoneyComb.CLAY.addProduct(honeyDrop, 0.80f);
EnumHoneyComb.CLAY.addProduct(new ItemStack(Items.clay_ball), 0.80f);
EnumHoneyComb.CLAY.addProduct(beeswax, 0.25f);
EnumHoneyComb.CLAY.addProduct(honeyDrop, 0.80f);
EnumHoneyComb.CLAY.addProduct(new ItemStack(Items.clay_ball), 0.80f);
EnumHoneyComb.OLD.addProduct(beeswax, 1.00f);
EnumHoneyComb.OLD.addProduct(honeyDrop, 0.90f);
EnumHoneyComb.OLD.addProduct(beeswax, 1.00f);
EnumHoneyComb.OLD.addProduct(honeyDrop, 0.90f);
EnumHoneyComb.FUNGAL.addProduct(beeswax, 0.90f);
EnumHoneyComb.FUNGAL.addProduct(new ItemStack(Blocks.brown_mushroom_block, 1, 0), 1.00f);
EnumHoneyComb.FUNGAL.addProduct(new ItemStack(Blocks.red_mushroom_block, 1, 0), 0.75f);
EnumHoneyComb.FUNGAL.addProduct(beeswax, 0.90f);
EnumHoneyComb.FUNGAL.addProduct(new ItemStack(Blocks.brown_mushroom_block, 1, 0), 1.00f);
EnumHoneyComb.FUNGAL.addProduct(new ItemStack(Blocks.red_mushroom_block, 1, 0), 0.75f);
EnumHoneyComb.ACIDIC.addProduct(beeswax, 0.80f);
EnumHoneyComb.ACIDIC.tryAddProduct(EnumHoneyDrop.ACID, 0.50f);
if (!OreDictionary.getOres("dustSulfur").isEmpty()) {
EnumHoneyComb.ACIDIC.addProduct(OreDictionary.getOres("dustSulfur").get(0), 0.75f);
}
EnumHoneyComb.ACIDIC.addProduct(beeswax, 0.80f);
EnumHoneyComb.ACIDIC.tryAddProduct(EnumHoneyDrop.ACID, 0.50f);
if (!OreDictionary.getOres("dustSulfur").isEmpty()) {
EnumHoneyComb.ACIDIC.addProduct(OreDictionary.getOres("dustSulfur").get(0), 0.75f);
}
EnumHoneyComb.VENOMOUS.addProduct(beeswax, 0.80f);
EnumHoneyComb.VENOMOUS.tryAddProduct(EnumHoneyDrop.POISON, 0.80f);
EnumHoneyComb.VENOMOUS.addProduct(beeswax, 0.80f);
EnumHoneyComb.VENOMOUS.tryAddProduct(EnumHoneyDrop.POISON, 0.80f);
EnumHoneyComb.SLIME.addProduct(beeswax, 1.00f);
EnumHoneyComb.SLIME.addProduct(honeyDrop, 0.75f);
EnumHoneyComb.SLIME.addProduct(new ItemStack(Items.slime_ball, 1, 0), 0.75f);
EnumHoneyComb.SLIME.addProduct(beeswax, 1.00f);
EnumHoneyComb.SLIME.addProduct(honeyDrop, 0.75f);
EnumHoneyComb.SLIME.addProduct(new ItemStack(Items.slime_ball, 1, 0), 0.75f);
EnumHoneyComb.BLAZE.addProduct(beeswax, 0.75f);
EnumHoneyComb.BLAZE.addProduct(new ItemStack(Items.blaze_powder, 1, 0), 1.00f);
EnumHoneyComb.BLAZE.addProduct(beeswax, 0.75f);
EnumHoneyComb.BLAZE.addProduct(new ItemStack(Items.blaze_powder, 1, 0), 1.00f);
EnumHoneyComb.COFFEE.addProduct(beeswax, 0.90f);
EnumHoneyComb.COFFEE.addProduct(honeyDrop, 0.75f);
EnumHoneyComb.COFFEE.tryAddProduct(Mods.ic2.stack("itemCofeePowder"), 0.75f);
EnumHoneyComb.COFFEE.addProduct(beeswax, 0.90f);
EnumHoneyComb.COFFEE.addProduct(honeyDrop, 0.75f);
EnumHoneyComb.COFFEE.tryAddProduct(Mods.ic2.stack("itemCofeePowder"), 0.75f);
EnumHoneyComb.GLACIAL.tryAddProduct(EnumHoneyDrop.ICE, 0.80f);
EnumHoneyComb.GLACIAL.addProduct(honeyDrop, 0.75f);
EnumHoneyComb.GLACIAL.tryAddProduct(EnumHoneyDrop.ICE, 0.80f);
EnumHoneyComb.GLACIAL.addProduct(honeyDrop, 0.75f);
EnumHoneyComb.SHADOW.addProduct(honeyDrop, 0.50f);
if (!OreDictionary.getOres("dustObsidian").isEmpty()) {
EnumHoneyComb.SHADOW.tryAddProduct(OreDictionary.getOres("dustObsidian").get(0), 0.75f);
} else {
EnumHoneyComb.SHADOW.active = false;
}
EnumHoneyComb.SHADOW.addProduct(honeyDrop, 0.50f);
if (!OreDictionary.getOres("dustObsidian").isEmpty()) {
EnumHoneyComb.SHADOW.tryAddProduct(
OreDictionary.getOres("dustObsidian").get(0), 0.75f);
} else {
EnumHoneyComb.SHADOW.active = false;
}
EnumHoneyComb.LEAD.copyProducts(EnumHoneyComb.STONE);
EnumHoneyComb.LEAD.tryAddProduct(ExtraBeeItems.LeadDust, 1.00f);
EnumHoneyComb.LEAD.copyProducts(EnumHoneyComb.STONE);
EnumHoneyComb.LEAD.tryAddProduct(ExtraBeeItems.LeadDust, 1.00f);
EnumHoneyComb.ZINC.copyProducts(EnumHoneyComb.STONE);
EnumHoneyComb.ZINC.tryAddProduct(ExtraBeeItems.ZincDust, 1.00f);
EnumHoneyComb.TITANIUM.copyProducts(EnumHoneyComb.STONE);
EnumHoneyComb.TITANIUM.tryAddProduct(ExtraBeeItems.TitaniumDust, 1.00f);
EnumHoneyComb.TUNGSTEN.copyProducts(EnumHoneyComb.STONE);
EnumHoneyComb.TUNGSTEN.tryAddProduct(ExtraBeeItems.TungstenDust, 1.00f);
EnumHoneyComb.PLATINUM.copyProducts(EnumHoneyComb.STONE);
EnumHoneyComb.PLATINUM.tryAddProduct(ExtraBeeItems.PlatinumDust, 1.00f);
EnumHoneyComb.LAPIS.copyProducts(EnumHoneyComb.STONE);
EnumHoneyComb.LAPIS.addProduct(new ItemStack(Items.dye, 6, 4), 1.00f);
EnumHoneyComb.EMERALD.copyProducts(EnumHoneyComb.STONE);
EnumHoneyComb.EMERALD.tryAddProduct(ExtraBeeItems.EmeraldShard, 1.00f);
EnumHoneyComb.RUBY.copyProducts(EnumHoneyComb.STONE);
EnumHoneyComb.RUBY.tryAddProduct(ExtraBeeItems.RubyShard, 1.00f);
EnumHoneyComb.SAPPHIRE.copyProducts(EnumHoneyComb.STONE);
EnumHoneyComb.SAPPHIRE.tryAddProduct(ExtraBeeItems.SapphireShard, 1.00f);
EnumHoneyComb.DIAMOND.copyProducts(EnumHoneyComb.STONE);
EnumHoneyComb.DIAMOND.tryAddProduct(ExtraBeeItems.DiamondShard, 1.00f);
EnumHoneyComb.RED.addProduct(honeyDrop, 0.80f);
EnumHoneyComb.RED.addProduct(beeswax, 0.80f);
EnumHoneyComb.GLOWSTONE.addProduct(honeyDrop, 0.25f);
EnumHoneyComb.GLOWSTONE.addProduct(new ItemStack(Items.glowstone_dust), 1.00f);
EnumHoneyComb.SALTPETER.addProduct(honeyDrop, 0.25f);
EnumHoneyComb.SALTPETER.tryAddProduct(getOreDictionary("dustSaltpeter"), 1.00f);
EnumHoneyComb.COMPOST.addProduct(honeyDrop, 0.25f);
EnumHoneyComb.COMPOST.tryAddProduct(Mods.forestry.stack("fertilizerBio"), 1.00f);
EnumHoneyComb.SAWDUST.addProduct(honeyDrop, 0.25f);
if (!OreDictionary.getOres("dustSawdust").isEmpty()) {
EnumHoneyComb.SAWDUST.tryAddProduct(OreDictionary.getOres("dustSawdust").get(0), 1.00f);
} else if (!OreDictionary.getOres("sawdust").isEmpty()) {
EnumHoneyComb.SAWDUST.tryAddProduct(OreDictionary.getOres("sawdust").get(0), 1.00f);
}
EnumHoneyComb.CERTUS.addProduct(honeyDrop, 0.25f);
EnumHoneyComb.CERTUS.addProduct(new ItemStack(Items.quartz), 0.25f);
if (!OreDictionary.getOres("dustCertusQuartz").isEmpty()) {
EnumHoneyComb.CERTUS.tryAddProduct(OreDictionary.getOres("dustCertusQuartz").get(0), 0.20f);
}
EnumHoneyComb.ENDERPEARL.addProduct(honeyDrop, 0.25f);
if (!OreDictionary.getOres("dustEnderPearl").isEmpty()) {
EnumHoneyComb.ENDERPEARL.tryAddProduct(OreDictionary.getOres("dustEnderPearl").get(0), 0.25f);
}
EnumHoneyComb.YELLORIUM.copyProducts(EnumHoneyComb.STONE);
EnumHoneyComb.YELLORIUM.tryAddProduct(ExtraBeeItems.YelloriumDust, 0.25f);
EnumHoneyComb.CYANITE.copyProducts(EnumHoneyComb.STONE);
EnumHoneyComb.CYANITE.tryAddProduct(ExtraBeeItems.CyaniteDust, 0.25f);
EnumHoneyComb.BLUTONIUM.copyProducts(EnumHoneyComb.STONE);
EnumHoneyComb.BLUTONIUM.tryAddProduct(ExtraBeeItems.BlutoniumDust, 0.25f);
OreDictionary.registerOre("beeComb", new ItemStack(ExtraBees.comb, 1, 32767));
for (int i = 0; i < 16; ++i) {
EnumHoneyComb type = EnumHoneyComb.values()[EnumHoneyComb.RED.ordinal() + i];
if (type != EnumHoneyComb.RED) {
type.copyProducts(EnumHoneyComb.RED);
}
}
for (int i = 0; i < 16; ++i) {
EnumHoneyComb type = EnumHoneyComb.values()[EnumHoneyComb.RED.ordinal() + i];
EnumHoneyDrop drop = EnumHoneyDrop.values()[EnumHoneyDrop.RED.ordinal() + i];
int[] dyeC = {1, 11, 4, 2, 0, 15, 3, 14, 6, 5, 8, 12, 9, 10, 13, 7};
int k = dyeC[i];
ItemStack dye = new ItemStack(Items.dye, 1, k);
switch (k) {
case 0:
dye = ExtraBeeItems.BlackDye.get(1);
break;
case 1:
dye = ExtraBeeItems.RedDye.get(1);
break;
case 2:
dye = ExtraBeeItems.GreenDye.get(1);
break;
case 3:
dye = ExtraBeeItems.BrownDye.get(1);
break;
case 4:
dye = ExtraBeeItems.BlueDye.get(1);
break;
case 11:
dye = ExtraBeeItems.YellowDye.get(1);
break;
case 15:
dye = ExtraBeeItems.WhiteDye.get(1);
break;
}
type.addProduct(drop.get(1), 1.00f);
drop.addRemenant(dye);
}
}
private static ItemStack getOreDictionary(String string) {
if (OreDictionary.getOres(string).size() > 0) {
return OreDictionary.getOres(string).get(0);
}
return null;
}
@Override
@SideOnly(Side.CLIENT)
public boolean requiresMultipleRenderPasses() {
return true;
}
@Override
public int getColorFromItemStack(ItemStack stack, int indexColor) {
EnumHoneyComb comb = EnumHoneyComb.get(stack);
if (comb == null) {
return 0xffffff;
}
if (indexColor == 0) {
return comb.primaryColor;
}
return comb.secondaryColor;
}
@Override
@SideOnly(Side.CLIENT)
public IIcon getIconFromDamageForRenderPass(int i, int j) {
if (j > 0) {
return icon1;
}
return icon2;
}
@Override
@SideOnly(Side.CLIENT)
public void registerIcons(IIconRegister register) {
icon1 = BinnieCore.proxy.getIcon(register, "forestry", "beeCombs.0");
icon2 = BinnieCore.proxy.getIcon(register, "forestry", "beeCombs.1");
}
public enum VanillaComb {
HONEY,
COCOA,
SIMMERING,
STRINGY,
FROZEN,
DRIPPING,
SILKY,
PARCHED,
MYSTERIOUS,
IRRADIATED,
POWDERY,
REDDENED,
DARKENED,
OMEGA,
WHEATEN,
MOSSY,
QUARTZ;
public ItemStack get() {
return new ItemStack(Mods.forestry.item("beeCombs"), 1, ordinal());
}
}
EnumHoneyComb.ZINC.copyProducts(EnumHoneyComb.STONE);
EnumHoneyComb.ZINC.tryAddProduct(ExtraBeeItems.ZincDust, 1.00f);
EnumHoneyComb.TITANIUM.copyProducts(EnumHoneyComb.STONE);
EnumHoneyComb.TITANIUM.tryAddProduct(ExtraBeeItems.TitaniumDust, 1.00f);
EnumHoneyComb.TUNGSTEN.copyProducts(EnumHoneyComb.STONE);
EnumHoneyComb.TUNGSTEN.tryAddProduct(ExtraBeeItems.TungstenDust, 1.00f);
EnumHoneyComb.PLATINUM.copyProducts(EnumHoneyComb.STONE);
EnumHoneyComb.PLATINUM.tryAddProduct(ExtraBeeItems.PlatinumDust, 1.00f);
EnumHoneyComb.LAPIS.copyProducts(EnumHoneyComb.STONE);
EnumHoneyComb.LAPIS.addProduct(new ItemStack(Items.dye, 6, 4), 1.00f);
EnumHoneyComb.EMERALD.copyProducts(EnumHoneyComb.STONE);
EnumHoneyComb.EMERALD.tryAddProduct(ExtraBeeItems.EmeraldShard, 1.00f);
EnumHoneyComb.RUBY.copyProducts(EnumHoneyComb.STONE);
EnumHoneyComb.RUBY.tryAddProduct(ExtraBeeItems.RubyShard, 1.00f);
EnumHoneyComb.SAPPHIRE.copyProducts(EnumHoneyComb.STONE);
EnumHoneyComb.SAPPHIRE.tryAddProduct(ExtraBeeItems.SapphireShard, 1.00f);
EnumHoneyComb.DIAMOND.copyProducts(EnumHoneyComb.STONE);
EnumHoneyComb.DIAMOND.tryAddProduct(ExtraBeeItems.DiamondShard, 1.00f);
EnumHoneyComb.RED.addProduct(honeyDrop, 0.80f);
EnumHoneyComb.RED.addProduct(beeswax, 0.80f);
EnumHoneyComb.GLOWSTONE.addProduct(honeyDrop, 0.25f);
EnumHoneyComb.GLOWSTONE.addProduct(new ItemStack(Items.glowstone_dust), 1.00f);
EnumHoneyComb.SALTPETER.addProduct(honeyDrop, 0.25f);
EnumHoneyComb.SALTPETER.tryAddProduct(getOreDictionary("dustSaltpeter"), 1.00f);
EnumHoneyComb.COMPOST.addProduct(honeyDrop, 0.25f);
EnumHoneyComb.COMPOST.tryAddProduct(Mods.forestry.stack("fertilizerBio"), 1.00f);
EnumHoneyComb.SAWDUST.addProduct(honeyDrop, 0.25f);
if (!OreDictionary.getOres("dustSawdust").isEmpty()) {
EnumHoneyComb.SAWDUST.tryAddProduct(
OreDictionary.getOres("dustSawdust").get(0), 1.00f);
} else if (!OreDictionary.getOres("sawdust").isEmpty()) {
EnumHoneyComb.SAWDUST.tryAddProduct(OreDictionary.getOres("sawdust").get(0), 1.00f);
}
EnumHoneyComb.CERTUS.addProduct(honeyDrop, 0.25f);
EnumHoneyComb.CERTUS.addProduct(new ItemStack(Items.quartz), 0.25f);
if (!OreDictionary.getOres("dustCertusQuartz").isEmpty()) {
EnumHoneyComb.CERTUS.tryAddProduct(
OreDictionary.getOres("dustCertusQuartz").get(0), 0.20f);
}
EnumHoneyComb.ENDERPEARL.addProduct(honeyDrop, 0.25f);
if (!OreDictionary.getOres("dustEnderPearl").isEmpty()) {
EnumHoneyComb.ENDERPEARL.tryAddProduct(
OreDictionary.getOres("dustEnderPearl").get(0), 0.25f);
}
EnumHoneyComb.YELLORIUM.copyProducts(EnumHoneyComb.STONE);
EnumHoneyComb.YELLORIUM.tryAddProduct(ExtraBeeItems.YelloriumDust, 0.25f);
EnumHoneyComb.CYANITE.copyProducts(EnumHoneyComb.STONE);
EnumHoneyComb.CYANITE.tryAddProduct(ExtraBeeItems.CyaniteDust, 0.25f);
EnumHoneyComb.BLUTONIUM.copyProducts(EnumHoneyComb.STONE);
EnumHoneyComb.BLUTONIUM.tryAddProduct(ExtraBeeItems.BlutoniumDust, 0.25f);
OreDictionary.registerOre("beeComb", new ItemStack(ExtraBees.comb, 1, 32767));
for (int i = 0; i < 16; ++i) {
EnumHoneyComb type = EnumHoneyComb.values()[EnumHoneyComb.RED.ordinal() + i];
if (type != EnumHoneyComb.RED) {
type.copyProducts(EnumHoneyComb.RED);
}
}
for (int i = 0; i < 16; ++i) {
EnumHoneyComb type = EnumHoneyComb.values()[EnumHoneyComb.RED.ordinal() + i];
EnumHoneyDrop drop = EnumHoneyDrop.values()[EnumHoneyDrop.RED.ordinal() + i];
int[] dyeC = {1, 11, 4, 2, 0, 15, 3, 14, 6, 5, 8, 12, 9, 10, 13, 7};
int k = dyeC[i];
ItemStack dye = new ItemStack(Items.dye, 1, k);
switch (k) {
case 0:
dye = ExtraBeeItems.BlackDye.get(1);
break;
case 1:
dye = ExtraBeeItems.RedDye.get(1);
break;
case 2:
dye = ExtraBeeItems.GreenDye.get(1);
break;
case 3:
dye = ExtraBeeItems.BrownDye.get(1);
break;
case 4:
dye = ExtraBeeItems.BlueDye.get(1);
break;
case 11:
dye = ExtraBeeItems.YellowDye.get(1);
break;
case 15:
dye = ExtraBeeItems.WhiteDye.get(1);
break;
}
type.addProduct(drop.get(1), 1.00f);
drop.addRemenant(dye);
}
}
private static ItemStack getOreDictionary(String string) {
if (OreDictionary.getOres(string).size() > 0) {
return OreDictionary.getOres(string).get(0);
}
return null;
}
@Override
@SideOnly(Side.CLIENT)
public boolean requiresMultipleRenderPasses() {
return true;
}
@Override
public int getColorFromItemStack(ItemStack stack, int indexColor) {
EnumHoneyComb comb = EnumHoneyComb.get(stack);
if (comb == null) {
return 0xffffff;
}
if (indexColor == 0) {
return comb.primaryColor;
}
return comb.secondaryColor;
}
@Override
@SideOnly(Side.CLIENT)
public IIcon getIconFromDamageForRenderPass(int i, int j) {
if (j > 0) {
return icon1;
}
return icon2;
}
@Override
@SideOnly(Side.CLIENT)
public void registerIcons(IIconRegister register) {
icon1 = BinnieCore.proxy.getIcon(register, "forestry", "beeCombs.0");
icon2 = BinnieCore.proxy.getIcon(register, "forestry", "beeCombs.1");
}
public enum VanillaComb {
HONEY,
COCOA,
SIMMERING,
STRINGY,
FROZEN,
DRIPPING,
SILKY,
PARCHED,
MYSTERIOUS,
IRRADIATED,
POWDERY,
REDDENED,
DARKENED,
OMEGA,
WHEATEN,
MOSSY,
QUARTZ;
public ItemStack get() {
return new ItemStack(Mods.forestry.item("beeCombs"), 1, ordinal());
}
}
}
@@ -9,42 +9,42 @@ import net.minecraft.item.ItemStack;
import net.minecraft.util.IIcon;
public class ItemHoneyDrop extends ItemProduct {
protected IIcon icon1;
protected IIcon icon2;
protected IIcon icon1;
protected IIcon icon2;
public ItemHoneyDrop() {
super(EnumHoneyDrop.values());
setCreativeTab(Tabs.tabApiculture);
setUnlocalizedName("honeyDrop");
}
public ItemHoneyDrop() {
super(EnumHoneyDrop.values());
setCreativeTab(Tabs.tabApiculture);
setUnlocalizedName("honeyDrop");
}
@Override
@SideOnly(Side.CLIENT)
public boolean requiresMultipleRenderPasses() {
return true;
}
@Override
@SideOnly(Side.CLIENT)
public boolean requiresMultipleRenderPasses() {
return true;
}
@Override
public int getColorFromItemStack(ItemStack itemStack, int j) {
if (j == 0) {
return EnumHoneyDrop.get(itemStack).primaryColor;
}
return EnumHoneyDrop.get(itemStack).secondaryColor;
}
@Override
public int getColorFromItemStack(ItemStack itemStack, int j) {
if (j == 0) {
return EnumHoneyDrop.get(itemStack).primaryColor;
}
return EnumHoneyDrop.get(itemStack).secondaryColor;
}
@Override
@SideOnly(Side.CLIENT)
public IIcon getIconFromDamageForRenderPass(int i, int j) {
if (j > 0) {
return icon1;
}
return icon2;
}
@Override
@SideOnly(Side.CLIENT)
public IIcon getIconFromDamageForRenderPass(int i, int j) {
if (j > 0) {
return icon1;
}
return icon2;
}
@Override
@SideOnly(Side.CLIENT)
public void registerIcons(IIconRegister register) {
icon1 = BinnieCore.proxy.getIcon(register, "forestry", "honeyDrop.0");
icon2 = BinnieCore.proxy.getIcon(register, "forestry", "honeyDrop.1");
}
@Override
@SideOnly(Side.CLIENT)
public void registerIcons(IIconRegister register) {
icon1 = BinnieCore.proxy.getIcon(register, "forestry", "honeyDrop.0");
icon2 = BinnieCore.proxy.getIcon(register, "forestry", "honeyDrop.1");
}
}
@@ -1,41 +1,40 @@
package binnie.extrabees.products;
import binnie.core.item.IItemEnum;
import java.util.List;
import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import java.util.List;
public class ItemProduct extends Item {
protected IItemEnum[] types;
protected IItemEnum[] types;
public ItemProduct(IItemEnum[] types) {
this.types = types;
setMaxStackSize(64);
setMaxDamage(0);
setHasSubtypes(true);
}
public ItemProduct(IItemEnum[] types) {
this.types = types;
setMaxStackSize(64);
setMaxDamage(0);
setHasSubtypes(true);
}
public IItemEnum get(ItemStack stack) {
int i = stack.getItemDamage();
if (i >= 0 && i < types.length) {
return types[i];
}
return types[0];
}
public IItemEnum get(ItemStack stack) {
int i = stack.getItemDamage();
if (i >= 0 && i < types.length) {
return types[i];
}
return types[0];
}
@Override
public String getItemStackDisplayName(ItemStack stack) {
return get(stack).getName(stack);
}
@Override
public String getItemStackDisplayName(ItemStack stack) {
return get(stack).getName(stack);
}
@Override
public void getSubItems(Item item, CreativeTabs tab, List list) {
for (IItemEnum type : types) {
if (type.isActive()) {
list.add(new ItemStack(this, 1, type.ordinal()));
}
}
}
@Override
public void getSubItems(Item item, CreativeTabs tab, List list) {
for (IItemEnum type : types) {
if (type.isActive()) {
list.add(new ItemStack(this, 1, type.ordinal()));
}
}
}
}
@@ -8,23 +8,23 @@ import net.minecraft.client.renderer.texture.IIconRegister;
import net.minecraft.item.ItemStack;
public class ItemPropolis extends ItemProduct {
public ItemPropolis() {
super(EnumPropolis.values());
setCreativeTab(Tabs.tabApiculture);
setUnlocalizedName("propolis");
}
public ItemPropolis() {
super(EnumPropolis.values());
setCreativeTab(Tabs.tabApiculture);
setUnlocalizedName("propolis");
}
@Override
public int getColorFromItemStack(ItemStack itemStack, int j) {
if (j == 0) {
return EnumPropolis.get(itemStack).primaryColor;
}
return EnumPropolis.get(itemStack).secondaryColor;
}
@Override
public int getColorFromItemStack(ItemStack itemStack, int j) {
if (j == 0) {
return EnumPropolis.get(itemStack).primaryColor;
}
return EnumPropolis.get(itemStack).secondaryColor;
}
@Override
@SideOnly(Side.CLIENT)
public void registerIcons(IIconRegister register) {
itemIcon = BinnieCore.proxy.getIcon(register, "forestry", "propolis.0");
}
@Override
@SideOnly(Side.CLIENT)
public void registerIcons(IIconRegister register) {
itemIcon = BinnieCore.proxy.getIcon(register, "forestry", "propolis.0");
}
}
@@ -6,31 +6,31 @@ import net.minecraft.init.Items;
import net.minecraftforge.oredict.OreDictionary;
public class ModuleProducts implements IInitializable {
@Override
public void preInit() {
ExtraBees.honeyDrop = new ItemHoneyDrop();
ExtraBees.comb = new ItemHoneyComb();
ExtraBees.propolis = new ItemPropolis();
OreDictionary.registerOre("ingotIron", Items.iron_ingot);
OreDictionary.registerOre("ingotGold", Items.gold_ingot);
OreDictionary.registerOre("gemDiamond", Items.diamond);
}
@Override
public void preInit() {
ExtraBees.honeyDrop = new ItemHoneyDrop();
ExtraBees.comb = new ItemHoneyComb();
ExtraBees.propolis = new ItemPropolis();
OreDictionary.registerOre("ingotIron", Items.iron_ingot);
OreDictionary.registerOre("ingotGold", Items.gold_ingot);
OreDictionary.registerOre("gemDiamond", Items.diamond);
}
@Override
public void init() {
ItemHoneyComb.addSubtypes();
}
@Override
public void init() {
ItemHoneyComb.addSubtypes();
}
@Override
public void postInit() {
for (EnumHoneyComb info : EnumHoneyComb.values()) {
info.addRecipe();
}
for (EnumHoneyDrop info2 : EnumHoneyDrop.values()) {
info2.addRecipe();
}
for (EnumPropolis info3 : EnumPropolis.values()) {
info3.addRecipe();
}
}
@Override
public void postInit() {
for (EnumHoneyComb info : EnumHoneyComb.values()) {
info.addRecipe();
}
for (EnumHoneyDrop info2 : EnumHoneyDrop.values()) {
info2.addRecipe();
}
for (EnumPropolis info3 : EnumPropolis.values()) {
info3.addRecipe();
}
}
}
@@ -4,7 +4,7 @@ import binnie.core.proxy.BinnieModProxy;
import binnie.extrabees.ExtraBees;
public class ExtraBeesProxy extends BinnieModProxy {
public ExtraBeesProxy() {
super(ExtraBees.instance);
}
public ExtraBeesProxy() {
super(ExtraBees.instance);
}
}
@@ -1,4 +1,3 @@
package binnie.extrabees.proxy;
public class ExtraBeesProxyClient extends ExtraBeesProxy {
}
public class ExtraBeesProxyClient extends ExtraBeesProxy {}
@@ -1,4 +1,3 @@
package binnie.extrabees.proxy;
public class ExtraBeesProxyServer extends ExtraBeesProxy {
}
public class ExtraBeesProxyServer extends ExtraBeesProxy {}
@@ -5,6 +5,9 @@ import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import forestry.api.apiculture.IHiveDrop;
import forestry.api.core.Tabs;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import net.minecraft.block.Block;
import net.minecraft.client.renderer.texture.IIconRegister;
import net.minecraft.creativetab.CreativeTabs;
@@ -13,84 +16,82 @@ import net.minecraft.item.ItemStack;
import net.minecraft.util.IIcon;
import net.minecraft.world.World;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
public class BlockExtraBeeHive extends Block {
protected IIcon[][] icons;
protected IIcon[][] icons;
public BlockExtraBeeHive() {
super(ExtraBees.materialBeehive);
setLightLevel(0.2f);
setHardness(1.0f);
setTickRandomly(true);
setBlockName("hive");
setCreativeTab(Tabs.tabApiculture);
}
public BlockExtraBeeHive() {
super(ExtraBees.materialBeehive);
setLightLevel(0.2f);
setHardness(1.0f);
setTickRandomly(true);
setBlockName("hive");
setCreativeTab(Tabs.tabApiculture);
}
public String getUnlocalizedName(ItemStack par1ItemStack) {
return "extrabees.block.hive." + par1ItemStack.getItemDamage();
}
public String getUnlocalizedName(ItemStack par1ItemStack) {
return "extrabees.block.hive." + par1ItemStack.getItemDamage();
}
@Override
public void getSubBlocks(Item par1, CreativeTabs par2CreativeTabs, List itemList) {
for (int i = 0; i < 4; ++i) {
itemList.add(new ItemStack(this, 1, i));
}
}
@Override
public void getSubBlocks(Item par1, CreativeTabs par2CreativeTabs, List itemList) {
for (int i = 0; i < 4; ++i) {
itemList.add(new ItemStack(this, 1, i));
}
}
@Override
public IIcon getIcon(int side, int metadata) {
if (metadata >= EnumHiveType.values().length) {
return null;
}
if (side < 2) {
return icons[metadata][1];
}
return icons[metadata][0];
}
@Override
public IIcon getIcon(int side, int metadata) {
if (metadata >= EnumHiveType.values().length) {
return null;
}
if (side < 2) {
return icons[metadata][1];
}
return icons[metadata][0];
}
@Override
@SideOnly(Side.CLIENT)
public void registerBlockIcons(IIconRegister register) {
icons = new IIcon[EnumHiveType.values().length][2];
for (EnumHiveType hive : EnumHiveType.values()) {
icons[hive.ordinal()][0] = ExtraBees.proxy.getIcon(register, "hive/" + hive.toString().toLowerCase() + ".0");
icons[hive.ordinal()][1] = ExtraBees.proxy.getIcon(register, "hive/" + hive.toString().toLowerCase() + ".1");
}
}
@Override
@SideOnly(Side.CLIENT)
public void registerBlockIcons(IIconRegister register) {
icons = new IIcon[EnumHiveType.values().length][2];
for (EnumHiveType hive : EnumHiveType.values()) {
icons[hive.ordinal()][0] =
ExtraBees.proxy.getIcon(register, "hive/" + hive.toString().toLowerCase() + ".0");
icons[hive.ordinal()][1] =
ExtraBees.proxy.getIcon(register, "hive/" + hive.toString().toLowerCase() + ".1");
}
}
@Override
public ArrayList<ItemStack> getDrops(World world, int x, int y, int z, int metadata, int fortune) {
ArrayList<ItemStack> ret = new ArrayList<>();
List<IHiveDrop> dropList = EnumHiveType.values()[metadata].drops;
Collections.shuffle(dropList);
int tries = 0;
@Override
public ArrayList<ItemStack> getDrops(World world, int x, int y, int z, int metadata, int fortune) {
ArrayList<ItemStack> ret = new ArrayList<>();
List<IHiveDrop> dropList = EnumHiveType.values()[metadata].drops;
Collections.shuffle(dropList);
int tries = 0;
for (boolean hasPrincess = false; tries <= 10 && !hasPrincess; hasPrincess = true) {
tries++;
for (IHiveDrop drop : dropList) {
if (world.rand.nextInt(100) < drop.getChance(world, x, y, z)) {
ret.add(drop.getPrincess(world, x, y, z, fortune));
break;
}
}
}
for (boolean hasPrincess = false; tries <= 10 && !hasPrincess; hasPrincess = true) {
tries++;
for (IHiveDrop drop : dropList) {
if (world.rand.nextInt(100) < drop.getChance(world, x, y, z)) {
ret.add(drop.getPrincess(world, x, y, z, fortune));
break;
}
}
}
for (IHiveDrop drop : dropList) {
if (world.rand.nextInt(100) < drop.getChance(world, x, y, z)) {
ret.addAll(drop.getDrones(world, x, y, z, fortune));
break;
}
}
for (IHiveDrop drop : dropList) {
if (world.rand.nextInt(100) < drop.getChance(world, x, y, z)) {
ret.addAll(drop.getDrones(world, x, y, z, fortune));
break;
}
}
for (IHiveDrop drop : dropList) {
if (world.rand.nextInt(100) < drop.getChance(world, x, y, z)) {
ret.addAll(drop.getAdditional(world, x, y, z, fortune));
break;
}
}
return ret;
}
for (IHiveDrop drop : dropList) {
if (world.rand.nextInt(100) < drop.getChance(world, x, y, z)) {
ret.addAll(drop.getAdditional(world, x, y, z, fortune));
break;
}
}
return ret;
}
}
@@ -1,19 +1,18 @@
package binnie.extrabees.worldgen;
import forestry.api.apiculture.IHiveDrop;
import java.util.ArrayList;
import java.util.List;
public enum EnumHiveType {
WATER,
ROCK,
NETHER,
MARBLE;
WATER,
ROCK,
NETHER,
MARBLE;
public List<IHiveDrop> drops;
public List<IHiveDrop> drops;
EnumHiveType() {
drops = new ArrayList<>();
}
EnumHiveType() {
drops = new ArrayList<>();
}
}
@@ -6,56 +6,56 @@ import forestry.api.apiculture.IAlleleBeeSpecies;
import forestry.api.apiculture.IBeeRoot;
import forestry.api.apiculture.IHiveDrop;
import forestry.api.genetics.IAllele;
import java.util.ArrayList;
import java.util.Collections;
import net.minecraft.item.ItemStack;
import net.minecraft.world.World;
import java.util.ArrayList;
import java.util.Collections;
public class HiveDrop implements IHiveDrop {
private IAllele[] template;
private ArrayList<ItemStack> additional;
private int chance;
private IAllele[] template;
private ArrayList<ItemStack> additional;
private int chance;
public HiveDrop(IAlleleBeeSpecies species, int chance) {
this(Binnie.Genetics.getBeeRoot().getTemplate(species.getUID()), new ItemStack[0], chance);
}
public HiveDrop(IAlleleBeeSpecies species, int chance) {
this(Binnie.Genetics.getBeeRoot().getTemplate(species.getUID()), new ItemStack[0], chance);
}
public HiveDrop(IAllele[] template, ItemStack[] bonus, int chance) {
additional = new ArrayList<>();
if (template == null) {
template = Binnie.Genetics.getBeeRoot().getDefaultTemplate();
}
this.template = template;
this.chance = chance;
Collections.addAll(additional, bonus);
}
public HiveDrop(IAllele[] template, ItemStack[] bonus, int chance) {
additional = new ArrayList<>();
if (template == null) {
template = Binnie.Genetics.getBeeRoot().getDefaultTemplate();
}
this.template = template;
this.chance = chance;
Collections.addAll(additional, bonus);
}
@Override
public ItemStack getPrincess(World world, int x, int y, int z, int fortune) {
IBeeRoot beeRoot = Binnie.Genetics.getBeeRoot();
return beeRoot.getMemberStack(beeRoot.getBee(world, beeRoot.templateAsGenome(template)), EnumBeeType.PRINCESS.ordinal());
}
@Override
public ItemStack getPrincess(World world, int x, int y, int z, int fortune) {
IBeeRoot beeRoot = Binnie.Genetics.getBeeRoot();
return beeRoot.getMemberStack(
beeRoot.getBee(world, beeRoot.templateAsGenome(template)), EnumBeeType.PRINCESS.ordinal());
}
@Override
public ArrayList<ItemStack> getDrones(World world, int x, int y, int z, int fortune) {
ArrayList<ItemStack> ret = new ArrayList<>();
IBeeRoot beeRoot = Binnie.Genetics.getBeeRoot();
ret.add(beeRoot.getMemberStack(beeRoot.templateAsIndividual(template), EnumBeeType.DRONE.ordinal()));
return ret;
}
@Override
public ArrayList<ItemStack> getDrones(World world, int x, int y, int z, int fortune) {
ArrayList<ItemStack> ret = new ArrayList<>();
IBeeRoot beeRoot = Binnie.Genetics.getBeeRoot();
ret.add(beeRoot.getMemberStack(beeRoot.templateAsIndividual(template), EnumBeeType.DRONE.ordinal()));
return ret;
}
@Override
public ArrayList<ItemStack> getAdditional(World world, int x, int y, int z, int fortune) {
ArrayList<ItemStack> ret = new ArrayList<>();
for (ItemStack stack : additional) {
ret.add(stack.copy());
}
return ret;
}
@Override
public ArrayList<ItemStack> getAdditional(World world, int x, int y, int z, int fortune) {
ArrayList<ItemStack> ret = new ArrayList<>();
for (ItemStack stack : additional) {
ret.add(stack.copy());
}
return ret;
}
@Override
public int getChance(World world, int x, int y, int z) {
return chance;
}
@Override
public int getChance(World world, int x, int y, int z) {
return chance;
}
}
@@ -1,36 +1,35 @@
package binnie.extrabees.worldgen;
import binnie.core.util.I18N;
import java.util.List;
import net.minecraft.block.Block;
import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.item.Item;
import net.minecraft.item.ItemBlock;
import net.minecraft.item.ItemStack;
import java.util.List;
public class ItemBeehive extends ItemBlock {
public ItemBeehive(Block block) {
super(block);
setMaxDamage(0);
setHasSubtypes(true);
setCreativeTab(CreativeTabs.tabBlock);
}
public ItemBeehive(Block block) {
super(block);
setMaxDamage(0);
setHasSubtypes(true);
setCreativeTab(CreativeTabs.tabBlock);
}
@Override
public int getMetadata(int i) {
return i;
}
@Override
public int getMetadata(int i) {
return i;
}
@Override
public void getSubItems(Item item, CreativeTabs tab, List list) {
for (int i = 0; i < 4; ++i) {
list.add(new ItemStack(this, 1, i));
}
}
@Override
public void getSubItems(Item item, CreativeTabs tab, List list) {
for (int i = 0; i < 4; ++i) {
list.add(new ItemStack(this, 1, i));
}
}
@Override
public String getItemStackDisplayName(ItemStack itemStack) {
return I18N.localise("extrabees.block.hive." + itemStack.getItemDamage());
}
@Override
public String getItemStackDisplayName(ItemStack itemStack) {
return I18N.localise("extrabees.block.hive." + itemStack.getItemDamage());
}
}
@@ -4,14 +4,14 @@ import net.minecraft.block.material.MapColor;
import net.minecraft.block.material.Material;
public class MaterialBeehive extends Material {
public MaterialBeehive() {
super(MapColor.stoneColor);
setRequiresTool();
setImmovableMobility();
}
public MaterialBeehive() {
super(MapColor.stoneColor);
setRequiresTool();
setImmovableMobility();
}
@Override
public boolean isOpaque() {
return true;
}
@Override
public boolean isOpaque() {
return true;
}
}
@@ -8,76 +8,87 @@ import buildcraft.api.core.BuildCraftAPI;
import cpw.mods.fml.common.IWorldGenerator;
import cpw.mods.fml.common.registry.GameRegistry;
import forestry.apiculture.genetics.BeeDefinition;
import java.util.Random;
import net.minecraft.world.World;
import net.minecraft.world.chunk.IChunkProvider;
import java.util.Random;
public class ModuleGeneration implements IWorldGenerator, IInitializable {
protected static int waterRate = 2;
protected static int rockRate = 2;
protected static int netherRate = 2;
protected static int marbleRate = 2;
protected static int waterRate = 2;
protected static int rockRate = 2;
protected static int netherRate = 2;
protected static int marbleRate = 2;
@Override
public void preInit() {
ExtraBees.materialBeehive = new MaterialBeehive();
ExtraBees.hive = new BlockExtraBeeHive();
GameRegistry.registerBlock(ExtraBees.hive, ItemBeehive.class, "hive");
}
@Override
public void preInit() {
ExtraBees.materialBeehive = new MaterialBeehive();
ExtraBees.hive = new BlockExtraBeeHive();
GameRegistry.registerBlock(ExtraBees.hive, ItemBeehive.class, "hive");
}
@Override
public void init() {
ModuleGeneration.waterRate = ConfigurationMain.waterHiveRate;
ModuleGeneration.rockRate = ConfigurationMain.rockHiveRate;
ModuleGeneration.netherRate = ConfigurationMain.netherHiveRate;
GameRegistry.registerWorldGenerator(new ModuleGeneration(), 0);
if (!ConfigurationMain.canQuarryMineHives) {
BuildCraftAPI.softBlocks.add(ExtraBees.hive);
}
}
@Override
public void init() {
ModuleGeneration.waterRate = ConfigurationMain.waterHiveRate;
ModuleGeneration.rockRate = ConfigurationMain.rockHiveRate;
ModuleGeneration.netherRate = ConfigurationMain.netherHiveRate;
GameRegistry.registerWorldGenerator(new ModuleGeneration(), 0);
if (!ConfigurationMain.canQuarryMineHives) {
BuildCraftAPI.softBlocks.add(ExtraBees.hive);
}
}
@Override
public void postInit() {
EnumHiveType.WATER.drops.add(new HiveDrop(ExtraBeeDefinition.WATER.getGenome().getPrimary(), 80));
EnumHiveType.WATER.drops.add(new HiveDrop(BeeDefinition.VALIANT.getGenome().getPrimary(), 3));
@Override
public void postInit() {
EnumHiveType.WATER.drops.add(
new HiveDrop(ExtraBeeDefinition.WATER.getGenome().getPrimary(), 80));
EnumHiveType.WATER.drops.add(
new HiveDrop(BeeDefinition.VALIANT.getGenome().getPrimary(), 3));
EnumHiveType.ROCK.drops.add(new HiveDrop(ExtraBeeDefinition.ROCK.getGenome().getPrimary(), 80));
EnumHiveType.ROCK.drops.add(new HiveDrop(BeeDefinition.VALIANT.getGenome().getPrimary(), 3));
EnumHiveType.ROCK.drops.add(
new HiveDrop(ExtraBeeDefinition.ROCK.getGenome().getPrimary(), 80));
EnumHiveType.ROCK.drops.add(
new HiveDrop(BeeDefinition.VALIANT.getGenome().getPrimary(), 3));
EnumHiveType.NETHER.drops.add(new HiveDrop(ExtraBeeDefinition.BASALT.getGenome().getPrimary(), 80));
EnumHiveType.NETHER.drops.add(new HiveDrop(BeeDefinition.VALIANT.getGenome().getPrimary(), 3));
EnumHiveType.NETHER.drops.add(
new HiveDrop(ExtraBeeDefinition.BASALT.getGenome().getPrimary(), 80));
EnumHiveType.NETHER.drops.add(
new HiveDrop(BeeDefinition.VALIANT.getGenome().getPrimary(), 3));
ExtraBees.hive.setHarvestLevel("scoop", 0, 0);
ExtraBees.hive.setHarvestLevel("scoop", 0, 1);
ExtraBees.hive.setHarvestLevel("scoop", 0, 2);
ExtraBees.hive.setHarvestLevel("scoop", 0, 3);
}
ExtraBees.hive.setHarvestLevel("scoop", 0, 0);
ExtraBees.hive.setHarvestLevel("scoop", 0, 1);
ExtraBees.hive.setHarvestLevel("scoop", 0, 2);
ExtraBees.hive.setHarvestLevel("scoop", 0, 3);
}
@Override
public void generate(Random rand, int chunkX, int chunkZ, World world, IChunkProvider chunkGenerator, IChunkProvider chunkProvider) {
chunkX <<= 4;
chunkZ <<= 4;
@Override
public void generate(
Random rand,
int chunkX,
int chunkZ,
World world,
IChunkProvider chunkGenerator,
IChunkProvider chunkProvider) {
chunkX <<= 4;
chunkZ <<= 4;
for (int i = 0; i < ModuleGeneration.waterRate; ++i) {
int randPosX = chunkX + rand.nextInt(16);
int randPosY = rand.nextInt(50) + 20;
int randPosZ = chunkZ + rand.nextInt(16);
new WorldGenHiveWater().generate(world, rand, randPosX, randPosY, randPosZ);
}
for (int i = 0; i < ModuleGeneration.waterRate; ++i) {
int randPosX = chunkX + rand.nextInt(16);
int randPosY = rand.nextInt(50) + 20;
int randPosZ = chunkZ + rand.nextInt(16);
new WorldGenHiveWater().generate(world, rand, randPosX, randPosY, randPosZ);
}
for (int i = 0; i < ModuleGeneration.rockRate; ++i) {
int randPosX = chunkX + rand.nextInt(16);
int randPosY = rand.nextInt(50) + 20;
int randPosZ = chunkZ + rand.nextInt(16);
new WorldGenHiveRock().generate(world, rand, randPosX, randPosY, randPosZ);
}
for (int i = 0; i < ModuleGeneration.rockRate; ++i) {
int randPosX = chunkX + rand.nextInt(16);
int randPosY = rand.nextInt(50) + 20;
int randPosZ = chunkZ + rand.nextInt(16);
new WorldGenHiveRock().generate(world, rand, randPosX, randPosY, randPosZ);
}
for (int i = 0; i < ModuleGeneration.netherRate; ++i) {
int randPosX = chunkX + rand.nextInt(16);
int randPosY = rand.nextInt(50) + 20;
int randPosZ = chunkZ + rand.nextInt(16);
new WorldGenHiveNether().generate(world, rand, randPosX, randPosY, randPosZ);
}
}
for (int i = 0; i < ModuleGeneration.netherRate; ++i) {
int randPosX = chunkX + rand.nextInt(16);
int randPosY = rand.nextInt(50) + 20;
int randPosZ = chunkZ + rand.nextInt(16);
new WorldGenHiveNether().generate(world, rand, randPosX, randPosY, randPosZ);
}
}
}
@@ -1,6 +1,7 @@
package binnie.extrabees.worldgen;
import binnie.extrabees.ExtraBees;
import java.util.Random;
import net.minecraft.block.Block;
import net.minecraft.init.Blocks;
import net.minecraft.world.World;
@@ -8,31 +9,27 @@ import net.minecraft.world.biome.BiomeGenBase;
import net.minecraft.world.gen.feature.WorldGenerator;
import net.minecraftforge.common.BiomeDictionary;
import java.util.Random;
public class WorldGenHiveNether extends WorldGenerator {
@Override
public boolean generate(World world, Random random, int i, int j, int k) {
BiomeGenBase biome = world.getWorldChunkManager().getBiomeGenAt(i, k);
if (!BiomeDictionary.isBiomeOfType(biome, BiomeDictionary.Type.NETHER)) {
return true;
}
@Override
public boolean generate(World world, Random random, int i, int j, int k) {
BiomeGenBase biome = world.getWorldChunkManager().getBiomeGenAt(i, k);
if (!BiomeDictionary.isBiomeOfType(biome, BiomeDictionary.Type.NETHER)) {
return true;
}
if (embedInWall(world, Blocks.netherrack, i, j, k)) {
world.setBlock(i, j, k, ExtraBees.hive, 2, 0);
}
return true;
}
if (embedInWall(world, Blocks.netherrack, i, j, k)) {
world.setBlock(i, j, k, ExtraBees.hive, 2, 0);
}
return true;
}
public boolean embedInWall(World world, Block blockID, int i, int j, int k) {
return world.getBlock(i, j, k) == blockID
&& world.getBlock(i, j + 1, k) == blockID
&& world.getBlock(i, j - 1, k) == blockID
&& (
world.isAirBlock(i + 1, j, k)
|| world.isAirBlock(i - 1, j, k)
|| world.isAirBlock(i, j, k + 1)
|| world.isAirBlock(i, j, k - 1)
);
}
public boolean embedInWall(World world, Block blockID, int i, int j, int k) {
return world.getBlock(i, j, k) == blockID
&& world.getBlock(i, j + 1, k) == blockID
&& world.getBlock(i, j - 1, k) == blockID
&& (world.isAirBlock(i + 1, j, k)
|| world.isAirBlock(i - 1, j, k)
|| world.isAirBlock(i, j, k + 1)
|| world.isAirBlock(i, j, k - 1));
}
}
@@ -1,26 +1,25 @@
package binnie.extrabees.worldgen;
import binnie.extrabees.ExtraBees;
import java.util.Random;
import net.minecraft.block.Block;
import net.minecraft.init.Blocks;
import net.minecraft.world.World;
import net.minecraft.world.biome.BiomeGenBase;
import net.minecraft.world.gen.feature.WorldGenerator;
import java.util.Random;
public class WorldGenHiveRock extends WorldGenerator {
@Override
public boolean generate(World world, Random random, int i, int j, int k) {
BiomeGenBase biome = world.getWorldChunkManager().getBiomeGenAt(i, k);
Block block = world.getBlock(i, j, k);
if (block == null) {
return true;
}
@Override
public boolean generate(World world, Random random, int i, int j, int k) {
BiomeGenBase biome = world.getWorldChunkManager().getBiomeGenAt(i, k);
Block block = world.getBlock(i, j, k);
if (block == null) {
return true;
}
if (block.isReplaceableOreGen(world, i, j, k, Blocks.stone)) {
world.setBlock(i, j, k, ExtraBees.hive, 1, 0);
}
return true;
}
if (block.isReplaceableOreGen(world, i, j, k, Blocks.stone)) {
world.setBlock(i, j, k, ExtraBees.hive, 1, 0);
}
return true;
}
}
@@ -1,28 +1,30 @@
package binnie.extrabees.worldgen;
import binnie.extrabees.ExtraBees;
import java.util.Random;
import net.minecraft.block.material.Material;
import net.minecraft.init.Blocks;
import net.minecraft.world.World;
import net.minecraft.world.biome.BiomeGenBase;
import net.minecraft.world.gen.feature.WorldGenerator;
import java.util.Random;
public class WorldGenHiveWater extends WorldGenerator {
@Override
public boolean generate(World world, Random random, int i, int j, int k) {
BiomeGenBase biome = world.getWorldChunkManager().getBiomeGenAt(i, k);
int i2 = i + random.nextInt(8) - random.nextInt(8);
int j2 = j + random.nextInt(4) - random.nextInt(4);
int k2 = k + random.nextInt(8) - random.nextInt(8);
if (world.getBlock(i2, j2, k2) != Blocks.water && world.getBlock(i2, j2, k2) != Blocks.water) {
return false;
}
@Override
public boolean generate(World world, Random random, int i, int j, int k) {
BiomeGenBase biome = world.getWorldChunkManager().getBiomeGenAt(i, k);
int i2 = i + random.nextInt(8) - random.nextInt(8);
int j2 = j + random.nextInt(4) - random.nextInt(4);
int k2 = k + random.nextInt(8) - random.nextInt(8);
if (world.getBlock(i2, j2, k2) != Blocks.water && world.getBlock(i2, j2, k2) != Blocks.water) {
return false;
}
if (world.getBlock(i2, j2 - 1, k2).getMaterial() == Material.sand || world.getBlock(i2, j2 - 1, k2).getMaterial() == Material.clay || world.getBlock(i2, j2 - 1, k2).getMaterial() == Material.ground || world.getBlock(i2, j2 - 1, k2).getMaterial() == Material.rock) {
world.setBlock(i2, j2, k2, ExtraBees.hive, 0, 0);
}
return true;
}
if (world.getBlock(i2, j2 - 1, k2).getMaterial() == Material.sand
|| world.getBlock(i2, j2 - 1, k2).getMaterial() == Material.clay
|| world.getBlock(i2, j2 - 1, k2).getMaterial() == Material.ground
|| world.getBlock(i2, j2 - 1, k2).getMaterial() == Material.rock) {
world.setBlock(i2, j2, k2, ExtraBees.hive, 0, 0);
}
return true;
}
}