Started on splitting ExtraBees

This commit is contained in:
Elec332 committed 2017-05-12 12:32:53 +02:00
1 parent 601e20fe99
commit ac05f9013a
47 files changed
+355 -295

No files matched your search

@@ -1,10 +1,13 @@
package binnie.core.item;
import binnie.extrabees.utils.IEBEnumItem;
import java.util.List;
public interface IItemMiscProvider extends IItemEnum {
public interface IItemMiscProvider extends IEBEnumItem {
void addInformation(List<String> tooltip);
String getModelPath();
}
@@ -128,4 +128,5 @@ public class BinnieModProxy implements IBinnieModProxy {
public String localiseOrBlank(final String string) {
return Binnie.LANGUAGE.localiseOrBlank(this.getMod(), string);
}
}
@@ -12,8 +12,10 @@ import binnie.extrabees.config.ConfigurationMain;
import binnie.extrabees.core.ExtraBeeGUID;
import binnie.extrabees.core.ModuleCore;
import binnie.extrabees.genetics.ModuleGenetics;
import binnie.extrabees.init.ItemRegister;
import binnie.extrabees.init.RecipeRegister;
import binnie.extrabees.liquids.ModuleLiquids;
import binnie.extrabees.products.ModuleProducts;
import binnie.extrabees.products.ItemHoneyComb;
import binnie.extrabees.proxy.ExtraBeesProxy;
import net.minecraft.block.Block;
import net.minecraft.block.material.Material;
@@ -52,22 +54,24 @@ public class ExtraBees extends AbstractMod {
@Mod.EventHandler
public void preInit(final FMLPreInitializationEvent evt) {
this.preInit();
ItemRegister.preInitItems();
}
@Mod.EventHandler
public void init(final FMLInitializationEvent evt) {
this.init();
ItemHoneyComb.addSubtypes();
}
@Mod.EventHandler
public void postInit(final FMLPostInitializationEvent evt) {
this.postInit();
RecipeRegister.postInitRecipes();
}
@Override
protected void registerModules() {
this.addModule(new ModuleCore());
this.addModule(new ModuleProducts());
this.addModule(new ModuleGenetics());
//this.addModule(new ModuleGeneration());
this.addModule(new ModuleLiquids());
@@ -1,15 +1,11 @@
package binnie.extrabees.apiary;
import binnie.core.Mods;
import binnie.core.genetics.BeeModifierLogic;
import binnie.core.genetics.EnumBeeBooleanModifier;
import binnie.core.genetics.EnumBeeModifier;
import binnie.extrabees.ExtraBees;
import forestry.api.apiculture.IBee;
import forestry.api.apiculture.IBeeGenome;
import forestry.api.apiculture.IBeeHousing;
import forestry.api.apiculture.IBeeModifier;
import forestry.api.apiculture.IHiveFrame;
import binnie.extrabees.utils.BeeModifierLogic;
import binnie.extrabees.utils.EnumBeeBooleanModifier;
import binnie.extrabees.utils.EnumBeeModifier;
import forestry.api.apiculture.*;
import forestry.apiculture.PluginApiculture;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.init.Blocks;
import net.minecraft.init.Items;
@@ -42,10 +38,11 @@ public enum EnumHiveFrame implements IHiveFrame, IBeeModifier {
EnumHiveFrame.Clay.logic.setModifier(EnumBeeModifier.Mutation, 0.5f, 0.2f);
EnumHiveFrame.Clay.logic.setModifier(EnumBeeModifier.Production, 0.75f, 0.2f);
EnumHiveFrame.Debug.logic.setModifier(EnumBeeModifier.Lifespan, 1.0E-4f, 1.0E-4f);
GameRegistry.addRecipe(new ItemStack(EnumHiveFrame.Cocoa.item), " c ", "cFc", " c ", 'F', Mods.Forestry.stack("frame_impregnated"), 'c', new ItemStack(Items.DYE, 1, 3));
GameRegistry.addShapelessRecipe(new ItemStack(EnumHiveFrame.Cage.item), Mods.Forestry.stack("frame_impregnated"), Blocks.IRON_BARS);
GameRegistry.addShapelessRecipe(new ItemStack(EnumHiveFrame.Soul.item), Mods.Forestry.stack("frame_impregnated"), Blocks.SOUL_SAND);
GameRegistry.addRecipe(new ItemStack(EnumHiveFrame.Clay.item), " c ", "cFc", " c ", 'F', Mods.Forestry.stack("frame_impregnated"), 'c', Items.CLAY_BALL);
ItemStack impregnatedFrame = PluginApiculture.getItems().frameImpregnated.getItemStack();
GameRegistry.addRecipe(new ItemStack(EnumHiveFrame.Cocoa.item), " c ", "cFc", " c ", 'F', impregnatedFrame, 'c', new ItemStack(Items.DYE, 1, 3));
GameRegistry.addShapelessRecipe(new ItemStack(EnumHiveFrame.Cage.item), impregnatedFrame, Blocks.IRON_BARS);
GameRegistry.addShapelessRecipe(new ItemStack(EnumHiveFrame.Soul.item), impregnatedFrame, Blocks.SOUL_SAND);
GameRegistry.addRecipe(new ItemStack(EnumHiveFrame.Clay.item), " c ", "cFc", " c ", 'F', impregnatedFrame, 'c', Items.CLAY_BALL);
}
private final Item item;
@@ -9,6 +9,7 @@ import net.minecraft.nbt.NBTTagCompound;
import javax.annotation.Nullable;
public enum IndustrialFrame implements IBeeModifier {
Empty("Empty", 5, 0),
Light("Glowstone Lighting", 2, 4),
Rain("Rain Shielding", 2, 4),
@@ -140,4 +141,5 @@ public enum IndustrialFrame implements IBeeModifier {
IndustrialFrame.NetherStar.lifespanMod = 20.0f;
IndustrialFrame.Poison.lifespanMod = 0.5f;
}
}
@@ -1,10 +1,6 @@
package binnie.extrabees.apiary;
import forestry.api.apiculture.IBee;
import forestry.api.apiculture.IBeeGenome;
import forestry.api.apiculture.IBeeHousing;
import forestry.api.apiculture.IBeeModifier;
import forestry.api.apiculture.IHiveFrame;
import forestry.api.apiculture.*;
import forestry.api.core.IItemModelRegister;
import forestry.api.core.IModelManager;
import forestry.api.core.Tabs;
@@ -36,6 +32,7 @@ public class ItemHiveFrame extends Item implements IHiveFrame, IBeeModifier, IIt
@Override
@SideOnly(Side.CLIENT)
@SuppressWarnings("all")
public void registerModel(Item item, IModelManager manager) {
manager.registerItemModel(item, 0, "frames/" + getRegistryName().getResourcePath());
}
@@ -13,11 +13,6 @@ import javax.annotation.Nullable;
import java.util.List;
public class ItemIndustrialFrame extends Item {
// @Override
// @SideOnly(Side.CLIENT)
// public boolean requiresMultipleRenderPasses() {
// return true;
// }
@Override
@SideOnly(Side.CLIENT)
@@ -1,17 +1,19 @@
package binnie.extrabees.apiary;
import binnie.core.BinnieCore;
import binnie.core.IInitializable;
import binnie.core.Mods;
import binnie.core.circuits.BinnieCircuitLayout;
import binnie.core.circuits.BinnieCircuitSocketType;
import binnie.core.machines.MachineGroup;
import binnie.core.machines.inventory.ValidatorSprite;
import binnie.extrabees.ExtraBees;
import binnie.extrabees.apiary.machine.AlvearyMachine;
import binnie.extrabees.apiary.machine.AlvearyMutator;
import binnie.extrabees.apiary.machine.AlvearyStimulator;
import binnie.extrabees.utils.BinnieCircuitLayout;
import binnie.extrabees.utils.BinnieCircuitSocketType;
import binnie.extrabees.utils.Utils;
import forestry.api.core.Tabs;
import forestry.apiculture.PluginApiculture;
import forestry.apiculture.blocks.BlockAlvearyType;
import forestry.core.PluginCore;
import net.minecraft.block.Block;
import net.minecraft.init.Blocks;
import net.minecraft.init.Items;
@@ -21,6 +23,7 @@ import net.minecraftforge.fml.common.registry.GameRegistry;
import net.minecraftforge.oredict.ShapedOreRecipe;
public class ModuleApiary implements IInitializable {
public static Block blockComponent;
public static ValidatorSprite spriteMutator;
BinnieCircuitLayout stimulatorLayout;
@@ -29,16 +32,16 @@ public class ModuleApiary implements IInitializable {
public void preInit() {
final MachineGroup machineGroup = new MachineGroup(ExtraBees.instance, "alveay", "alveary", AlvearyMachine.values());
machineGroup.setCreativeTab(Tabs.tabApiculture);
BinnieCore.getBinnieProxy().registerTileEntity(TileExtraBeeAlveary.class, "extrabees.tile.alveary", null);
GameRegistry.registerTileEntity(TileExtraBeeAlveary.class, "extrabees.tile.alveary");
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(Utils.getIC2Item("UranFuel"), 4.0f);
AlvearyMutator.addMutationItem(Utils.getIC2Item("MOXFuel"), 10.0f);
AlvearyMutator.addMutationItem(Utils.getIC2Item("Plutonium"), 8.0f);
AlvearyMutator.addMutationItem(Utils.getIC2Item("smallPlutonium"), 5.0f);
AlvearyMutator.addMutationItem(Utils.getIC2Item("Uran235"), 4.0f);
AlvearyMutator.addMutationItem(Utils.getIC2Item("smallUran235"), 2.5f);
AlvearyMutator.addMutationItem(Utils.getIC2Item("Uran238"), 2.0f);
AlvearyMutator.addMutationItem(new ItemStack(Items.ENDER_PEARL), 2.0f);
AlvearyMutator.addMutationItem(new ItemStack(Items.ENDER_EYE), 4.0f);
for (final EnumHiveFrame frame : EnumHiveFrame.values()) {
@@ -49,9 +52,9 @@ public class ModuleApiary implements IInitializable {
@Override
public void postInit() {
EnumHiveFrame.init();
Block alveary = Mods.Forestry.block("alveary.plain");
Item thermionicTubes = Mods.Forestry.item("thermionic_tubes");
Item chipsets = Mods.Forestry.item("chipsets");
ItemStack alveary = PluginApiculture.getBlocks().getAlvearyBlock(BlockAlvearyType.PLAIN);
Item thermionicTubes = PluginCore.getItems().tubes;
Item chipsets = PluginCore.getItems().circuitboards;
GameRegistry.addRecipe(AlvearyMachine.Mutator.get(1), "g g", " a ", "t t", 'g', Items.GOLD_INGOT, 'a', alveary, 't', new ItemStack(thermionicTubes, 1, 5));
GameRegistry.addRecipe(AlvearyMachine.Frame.get(1), "iii", "tat", " t ", 'i', Items.IRON_INGOT, 'a', alveary, 't', new ItemStack(thermionicTubes, 1, 4));
@@ -7,11 +7,7 @@ import forestry.api.apiculture.IBeeGenome;
import forestry.api.apiculture.IBeeListener;
import forestry.api.apiculture.IBeeModifier;
import forestry.api.genetics.IIndividual;
import forestry.api.multiblock.IAlvearyComponent;
import forestry.api.multiblock.IMultiblockComponent;
import forestry.api.multiblock.IMultiblockController;
import forestry.api.multiblock.IMultiblockLogicAlveary;
import forestry.api.multiblock.MultiblockManager;
import forestry.api.multiblock.*;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.math.BlockPos;
@@ -1,6 +1,5 @@
package binnie.extrabees.apiary.machine;
import binnie.Binnie;
import binnie.core.craftgui.minecraft.IMachineInformation;
import binnie.core.machines.Machine;
import binnie.core.machines.inventory.ComponentInventorySlots;
@@ -10,12 +9,8 @@ import binnie.extrabees.apiary.ComponentExtraBeeGUI;
import binnie.extrabees.apiary.TileExtraBeeAlveary;
import binnie.extrabees.core.ExtraBeeGUID;
import binnie.extrabees.core.ExtraBeeTexture;
import forestry.api.apiculture.IBee;
import forestry.api.apiculture.IBeeGenome;
import forestry.api.apiculture.IBeeListener;
import forestry.api.apiculture.IBeeModifier;
import forestry.api.apiculture.IBeeRoot;
import forestry.api.apiculture.IHiveFrame;
import binnie.extrabees.utils.Utils;
import forestry.api.apiculture.*;
import forestry.api.multiblock.IAlvearyController;
import forestry.api.multiblock.IMultiblockLogicAlveary;
import net.minecraft.item.ItemStack;
@@ -66,7 +61,7 @@ public class AlvearyFrame {
IHiveFrame hiveFrame = this.getHiveFrame();
if (hiveFrame != null) {
final World world = this.getMachine().getTileEntity().getWorld();
IBeeRoot beeRoot = Binnie.GENETICS.getBeeRoot();
IBeeRoot beeRoot = Utils.getBeeRoot();
IMultiblockLogicAlveary multiblockLogic = ((TileExtraBeeAlveary) this.getMachine().getTileEntity()).getMultiblockLogic();
IAlvearyController alvearyController = multiblockLogic.getController();
ItemStack queenStack = alvearyController.getBeeInventory().getQueen();
@@ -1,6 +1,5 @@
package binnie.extrabees.apiary.machine;
import binnie.Binnie;
import binnie.core.craftgui.minecraft.IMachineInformation;
import binnie.core.machines.Machine;
import binnie.core.machines.inventory.ComponentInventorySlots;
@@ -12,11 +11,8 @@ import binnie.extrabees.apiary.ComponentExtraBeeGUI;
import binnie.extrabees.apiary.TileExtraBeeAlveary;
import binnie.extrabees.core.ExtraBeeGUID;
import binnie.extrabees.core.ExtraBeeTexture;
import forestry.api.apiculture.EnumBeeType;
import forestry.api.apiculture.IBee;
import forestry.api.apiculture.IBeeHousing;
import forestry.api.apiculture.IBeeListener;
import forestry.api.apiculture.IBeeModifier;
import binnie.extrabees.utils.Utils;
import forestry.api.apiculture.*;
import net.minecraft.item.ItemStack;
import net.minecraft.tileentity.TileEntity;
@@ -48,7 +44,8 @@ public class AlvearyHatchery {
@Override
public boolean isValid(final ItemStack itemStack) {
return Binnie.GENETICS.getBeeRoot().isMember(itemStack) && Binnie.GENETICS.getBeeRoot().getType(itemStack) == EnumBeeType.LARVAE;
IBeeRoot beeRoot = Utils.getBeeRoot();
return beeRoot.isMember(itemStack) && beeRoot.getType(itemStack) == EnumBeeType.LARVAE;
}
@Override
@@ -70,9 +67,10 @@ public class AlvearyHatchery {
final IBeeHousing house = ((TileExtraBeeAlveary) tile).getMultiblockLogic().getController();
if (house != null && !house.getErrorLogic().hasErrors()) {
final ItemStack queenStack = house.getBeeInventory().getQueen();
final IBee queen = (queenStack.isEmpty()) ? null : Binnie.GENETICS.getBeeRoot().getMember(queenStack);
IBeeRoot beeRoot = Utils.getBeeRoot();
final IBee queen = (queenStack.isEmpty()) ? null : beeRoot.getMember(queenStack);
if (queen != null) {
final ItemStack larvae = Binnie.GENETICS.getBeeRoot().getMemberStack(Binnie.GENETICS.getBeeRoot().getBee(queen.getGenome()), EnumBeeType.LARVAE);
final ItemStack larvae = beeRoot.getMemberStack(beeRoot.getBee(queen.getGenome()), EnumBeeType.LARVAE);
new TransferRequest(larvae, this.getInventory()).transfer(true);
}
}
@@ -13,14 +13,19 @@ import forestry.api.apiculture.IBee;
import forestry.api.apiculture.IBeeGenome;
import forestry.api.apiculture.IBeeListener;
import forestry.api.apiculture.IBeeModifier;
import net.minecraft.init.Blocks;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import org.apache.commons.lang3.tuple.Pair;
import javax.annotation.Nullable;
import java.util.ArrayList;
import java.util.Collections;
import java.util.Comparator;
import java.util.List;
import static org.apache.commons.lang3.ObjectUtils.firstNonNull;
public class AlvearyMutator {
public static int slotMutator = 0;
private static final List<Pair<ItemStack, Float>> MUTATIONS = new ArrayList<>();
@@ -41,6 +46,10 @@ public class AlvearyMutator {
return 1.0f;
}
public static void addMutationItem(@Nullable Item item, float chance){
addMutationItem(new ItemStack(firstNonNull(item, Item.getItemFromBlock(Blocks.AIR))), chance);
}
public static void addMutationItem(final ItemStack item, final float chance) {
if (item.isEmpty()) {
return;
@@ -3,9 +3,6 @@ package binnie.extrabees.apiary.machine;
import binnie.core.Mods;
import binnie.core.circuits.BinnieCircuit;
import binnie.core.craftgui.minecraft.IMachineInformation;
import binnie.core.genetics.BeeModifierLogic;
import binnie.core.genetics.EnumBeeBooleanModifier;
import binnie.core.genetics.EnumBeeModifier;
import binnie.core.machines.Machine;
import binnie.core.machines.inventory.ComponentInventorySlots;
import binnie.core.machines.inventory.SlotValidator;
@@ -14,6 +11,9 @@ import binnie.extrabees.apiary.ComponentBeeModifier;
import binnie.extrabees.apiary.ComponentExtraBeeGUI;
import binnie.extrabees.core.ExtraBeeGUID;
import binnie.extrabees.core.ExtraBeeTexture;
import binnie.extrabees.utils.BeeModifierLogic;
import binnie.extrabees.utils.EnumBeeBooleanModifier;
import binnie.extrabees.utils.EnumBeeModifier;
import forestry.api.apiculture.IBeeGenome;
import forestry.api.apiculture.IBeeListener;
import forestry.api.apiculture.IBeeModifier;
@@ -7,10 +7,13 @@ 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 = "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;
}
@@ -16,6 +16,7 @@ import javax.annotation.Nullable;
import java.util.List;
public enum ExtraBeeItems implements IItemMiscProvider {
ScentedGear("Scented Gear", "scented_gear"),
DiamondShard("Diamond Fragment", "diamond_shard"),
EmeraldShard("Emerald Fragment", "emerald_shard"),
@@ -47,6 +48,13 @@ public enum ExtraBeeItems implements IItemMiscProvider {
BlutoniumDust("Blutonium Grains", "blutonium_dust"),
CyaniteDust("Cyanite Grains", "cyanite_dust");
ExtraBeeItems(String name, String modelPath) {
this.metalString = null;
this.gemString = null;
this.name = name;
this.modelPath = modelPath;
}
String name;
String modelPath;
@Nullable
@@ -110,13 +118,6 @@ public enum ExtraBeeItems implements IItemMiscProvider {
RecipeManagers.carpenterManager.addRecipe(100, Binnie.LIQUID.getFluidStack("for.honey", 500), ItemStack.EMPTY, ExtraBeeItems.ScentedGear.get(1), " j ", "bgb", " p ", 'j', Mods.Forestry.item("royal_jelly"), 'b', Mods.Forestry.item("beeswax"), 'p', Mods.Forestry.item("pollen"), 'g', gear);
}
ExtraBeeItems(String name, String modelPath) {
this.metalString = null;
this.gemString = null;
this.name = name;
this.modelPath = modelPath;
}
private void setGem(final String string) {
this.gemString = string;
}
@@ -133,17 +134,6 @@ public enum ExtraBeeItems implements IItemMiscProvider {
return this.gemString == null || !OreDictionary.getOres("gem" + this.gemString).isEmpty();
}
// @Override
// public IIcon getIcon(final ItemStack stack) {
// return this.icon;
// }
//
// @SideOnly(Side.CLIENT)
// @Override
// public void registerIcons(final IIconRegister register) {
// this.icon = ExtraBees.proxy.getIcon(register, "misc/" + this.iconPath);
// }
@Override
public void addInformation(final List<String> tooltip) {
}
@@ -184,4 +174,5 @@ public enum ExtraBeeItems implements IItemMiscProvider {
ExtraBeeItems.RubyShard.setGem("Ruby");
ExtraBeeItems.SapphireShard.setGem("Sapphire");
}
}
@@ -16,6 +16,7 @@ import net.minecraft.world.World;
import net.minecraftforge.common.BiomeDictionary;
public class ExtraBeeMutation {
public static void doInit() {
registerMutation(ForestryAllele.BeeSpecies.Meadows.getAllele(), ForestryAllele.BeeSpecies.Frugal.getAllele(), ExtraBeesSpecies.ARID, 10);
registerMutation(ForestryAllele.BeeSpecies.Forest.getAllele(), ForestryAllele.BeeSpecies.Frugal.getAllele(), ExtraBeesSpecies.ARID, 10);
@@ -183,12 +184,13 @@ public class ExtraBeeMutation {
}
static class ConditionPerson implements IMutationCondition {
String name;
public ConditionPerson(final String name) {
this.name = name;
}
String name;
@Override
public String getDescription() {
return "Can only be bred by " + this.name;
@@ -205,5 +207,7 @@ public class ExtraBeeMutation {
}
return 0;
}
}
}
@@ -11,6 +11,7 @@ import java.util.LinkedHashSet;
import java.util.Set;
public enum ExtraBeesBranch implements IClassification {
BARREN("Vacapis"),
HOSTILE("Infenapis"),
ROCKY("Monapis"),
@@ -39,7 +40,7 @@ public enum ExtraBeesBranch implements IClassification {
TERTIARY("Tertiapis"),
FTB("Eftebeapis"),
QUANTUM("Quantapis"),
BOTANIA("Botaniapis");
BOTANIA("Botaniapis"); //TODO There is 1 bee in here, that produces the petal of the flowers around, move to MagicBEes?
private String uid;
private String scientific;
@@ -303,4 +304,5 @@ public enum ExtraBeesBranch implements IClassification {
public void setParent(final IClassification parent) {
this.parent = parent;
}
}
@@ -1,17 +1,9 @@
package binnie.extrabees.genetics;
import binnie.core.Mods;
import binnie.extrabees.ExtraBees;
import binnie.extrabees.utils.Utils;
import forestry.api.apiculture.FlowerManager;
import forestry.api.genetics.AlleleManager;
import forestry.api.genetics.IAllele;
import forestry.api.genetics.IAlleleFlowers;
import forestry.api.genetics.ICheckPollinatable;
import forestry.api.genetics.IChromosomeType;
import forestry.api.genetics.IFlowerProvider;
import forestry.api.genetics.IFruitBearer;
import forestry.api.genetics.IIndividual;
import forestry.api.genetics.ISpeciesRoot;
import forestry.api.genetics.*;
import net.minecraft.block.Block;
import net.minecraft.block.material.Material;
import net.minecraft.init.Blocks;
@@ -152,7 +144,7 @@ public enum ExtraBeesFlowers implements IFlowerProvider, IAlleleFlowers, IChromo
return block.getClass().getName().toLowerCase().contains("sapling");
}
case Mystical: {
return block == Mods.Botania.block("flower");
return block == Utils.getBotaniaBlock("flower");
}
default: {
return false;
@@ -225,9 +217,9 @@ public enum ExtraBeesFlowers implements IFlowerProvider, IAlleleFlowers, IChromo
final int z2 = pos.getZ() - tZ + world.rand.nextInt(1 + 2 * tZ);
final BlockPos pos2 = new BlockPos(x2, y2, z2);
final Block block = world.getBlockState(pos2).getBlock();
if (block == Mods.Botania.block("flower")) {
if (block == Utils.getBotaniaBlock("flower")) {
final int meta = world.getBlockState(pos2).getBlock().getMetaFromState(world.getBlockState(pos2));
final Item item = Mods.Botania.item("petal");
final Item item = Utils.getBotaniaItem("petal");
if (item != null) {
prods.add(new ItemStack(item, 1, meta));
}
@@ -1,34 +1,22 @@
package binnie.extrabees.genetics;
import binnie.Binnie;
import binnie.core.Mods;
import binnie.core.genetics.ForestryAllele;
import binnie.core.genetics.Tolerance;
import binnie.core.item.IItemEnum;
import binnie.extrabees.ExtraBees;
import binnie.extrabees.core.BeeModelProvider;
import binnie.extrabees.genetics.effect.ExtraBeesEffect;
import binnie.extrabees.products.EnumHoneyComb;
import binnie.extrabees.products.ItemHoneyComb;
import binnie.extrabees.utils.IEBEnumItem;
import binnie.extrabees.utils.Utils;
import com.google.common.base.Preconditions;
import com.mojang.authlib.GameProfile;
import forestry.api.apiculture.EnumBeeChromosome;
import forestry.api.apiculture.EnumBeeType;
import forestry.api.apiculture.IAlleleBeeEffect;
import forestry.api.apiculture.IAlleleBeeSpecies;
import forestry.api.apiculture.IBeeGenome;
import forestry.api.apiculture.IBeeHousing;
import forestry.api.apiculture.IBeeRoot;
import forestry.api.apiculture.*;
import forestry.api.core.EnumHumidity;
import forestry.api.core.EnumTemperature;
import forestry.api.core.IModelManager;
import forestry.api.genetics.AlleleManager;
import forestry.api.genetics.IAllele;
import forestry.api.genetics.IAlleleFlowers;
import forestry.api.genetics.IAlleleSpecies;
import forestry.api.genetics.IClassification;
import forestry.api.genetics.IIndividual;
import forestry.api.genetics.IMutation;
import forestry.api.genetics.*;
import forestry.apiculture.PluginApiculture;
import net.minecraft.client.renderer.block.model.ModelResourceLocation;
import net.minecraft.init.Items;
import net.minecraft.item.Item;
@@ -39,6 +27,7 @@ import net.minecraft.world.World;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
import javax.annotation.Nonnull;
import javax.annotation.Nullable;
import java.util.ArrayList;
import java.util.Collection;
@@ -295,7 +284,7 @@ public enum ExtraBeesSpecies implements IAlleleBeeSpecies {
}
public void registerTemplate() {
Binnie.GENETICS.getBeeRoot().registerTemplate(this.getTemplate());
Utils.getBeeRoot().registerTemplate(this.getTemplate());
if (this.state != State.Active) {
AlleleManager.alleleRegistry.blacklistAllele(this.getUID());
}
@@ -310,7 +299,7 @@ public enum ExtraBeesSpecies implements IAlleleBeeSpecies {
}
}
public void addProduct(final IItemEnum product, final Float chance) {
public void addProduct(final IEBEnumItem product, final Float chance) {
if (product.isActive()) {
this.addProduct(product.get(1), chance);
} else {
@@ -328,7 +317,7 @@ public enum ExtraBeesSpecies implements IAlleleBeeSpecies {
}
}
private void addSpecialty(final IItemEnum product, final Float chance) {
private void addSpecialty(final IEBEnumItem product, final Float chance) {
if (product.isActive()) {
this.addSpecialty(product.get(1), chance);
} else {
@@ -346,8 +335,7 @@ public enum ExtraBeesSpecies implements IAlleleBeeSpecies {
}
public static IAllele[] getDefaultTemplate() {
IBeeRoot beeRoot = Binnie.GENETICS.getBeeRoot();
return beeRoot.getDefaultTemplate();
return Utils.getBeeRoot().getDefaultTemplate();
}
public IAllele[] getTemplate() {
@@ -856,7 +844,7 @@ public enum ExtraBeesSpecies implements IAlleleBeeSpecies {
ExtraBeesSpecies.JADED.setFlowering(ForestryAllele.Flowering.Maximum);
ExtraBeesSpecies.JADED.setTerritory(ForestryAllele.Territory.Largest);
ExtraBeesSpecies.JADED.addProduct(ItemHoneyComb.VanillaComb.HONEY.get(), 0.30f);
ExtraBeesSpecies.JADED.addSpecialty(Mods.Forestry.stack("pollen"), 0.20f);
ExtraBeesSpecies.JADED.addSpecialty(new ItemStack(PluginApiculture.getItems().pollenCluster), 0.20f);
ExtraBeesSpecies.JADED.setHasEffect();
ExtraBeesSpecies.JADED.setSecondaryColor(14453483);
ExtraBeesSpecies.JADED.addSpecialty(EnumHoneyComb.PURPLE, 0.15f);
@@ -988,7 +976,7 @@ public enum ExtraBeesSpecies implements IAlleleBeeSpecies {
@Override
public IBeeRoot getRoot() {
return Binnie.GENETICS.getBeeRoot();
return Utils.getBeeRoot();
}
@Override
@@ -1080,13 +1068,13 @@ public enum ExtraBeesSpecies implements IAlleleBeeSpecies {
if (itemstack.getItem() == Items.GLASS_BOTTLE) {
return 0.9f;
}
if (itemstack.getItem() == Mods.Forestry.item("honey_drop")) {
if (itemstack.getItem() == PluginApiculture.getItems().honeyDrop) {
return 0.5f;
}
if (itemstack.getItem() == Mods.Forestry.item("honeydew")) {
if (itemstack.getItem() == PluginApiculture.getItems().honeydew) {
return 0.7f;
}
if (itemstack.getItem() == Mods.Forestry.item("bee_comb")) {
if (itemstack.getItem() == PluginApiculture.getItems().beeComb) {
return 0.4f;
}
if (AlleleManager.alleleRegistry.isIndividual(itemstack)) {
@@ -1129,10 +1117,6 @@ public enum ExtraBeesSpecies implements IAlleleBeeSpecies {
return bounty;
}
// @Override
// public String getEntityTexture() {
// return "/gfx/forestry/entities/bees/honeyBee.png";
// }
@Override
public int getComplexity() {
@@ -1195,7 +1179,8 @@ public enum ExtraBeesSpecies implements IAlleleBeeSpecies {
@SideOnly(Side.CLIENT)
@Override
public void registerModels(Item item, IModelManager manager) {
public void registerModels(Item item, @Nonnull IModelManager manager) {
BeeModelProvider.instance.registerModels(item, manager);
}
}
@@ -17,7 +17,9 @@ import net.minecraft.item.ItemStack;
import net.minecraftforge.fml.common.registry.GameRegistry;
public class ModuleGenetics implements IInitializable {
@Override
@SuppressWarnings("all")
public void preInit() {
ExtraBeesBranch.setSpeciesBranches();
for (final ExtraBeesSpecies species : ExtraBeesSpecies.values()) {
@@ -39,14 +41,14 @@ public class ModuleGenetics implements IInitializable {
@Override
public void postInit() {
int ebSpeciesCount = 0;
/*int ebSpeciesCount = 0; TODO: Find out what this was for
int ebTotalSpeciesCount = 0;
for (final ExtraBeesSpecies species : ExtraBeesSpecies.values()) {
++ebTotalSpeciesCount;
if (!AlleleManager.alleleRegistry.isBlacklisted(species.getUID())) {
++ebSpeciesCount;
}
}
}*/
RecipeManagers.carpenterManager.addRecipe(100, Binnie.LIQUID.getFluidStack("water", 2000), ItemStack.EMPTY, 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);
}
@@ -54,17 +56,4 @@ public class ModuleGenetics implements IInitializable {
return Binnie.GENETICS.getBeeRoot().templateAsGenome(Binnie.GENETICS.getBeeRoot().getTemplate(allele0));
}
// public static ItemStack getBeeIcon(final IAlleleBeeSpecies species) {
// if (species == null) {
// return null;
// }
// final IAllele[] template = Binnie.Genetics.getBeeRoot().getTemplate(species.getUID());
// if (template == null) {
// return null;
// }
// final IBeeGenome genome = Binnie.Genetics.getBeeRoot().templateAsGenome(template);
// final IBee bee = Binnie.Genetics.getBeeRoot().getBee(BinnieCore.proxy.getWorld(), genome);
// final ItemStack item = Binnie.Genetics.getBeeRoot().getMemberStack(bee, EnumBeeType.PRINCESS);
// return item;
// }
}
@@ -8,11 +8,6 @@ import net.minecraft.item.Item;
import java.util.Random;
public class BlockEctoplasm extends BlockWeb {
// @Override
// @SideOnly(Side.CLIENT)
// public void registerBlockIcons(final IIconRegister register) {
// this.blockIcon = ExtraBees.proxy.getIcon(register, "ectoplasm");
// }
public BlockEctoplasm() {
this.setLightOpacity(1);
@@ -34,4 +29,5 @@ public class BlockEctoplasm extends BlockWeb {
public String getUnlocalizedName() {
return "extrabees.block.ectoplasm";
}
}
@@ -11,10 +11,8 @@ import net.minecraft.world.World;
import java.util.List;
public class EntityBeeLightning extends EntityLightningBolt {
int lightningState;
int boltLivingTime;
@SuppressWarnings("unused")
public EntityBeeLightning(final World world) {
super(world, 0, 0, 0, true);
}
@@ -25,6 +23,9 @@ public class EntityBeeLightning extends EntityLightningBolt {
this.boltLivingTime = this.rand.nextInt(3) + 1;
}
private int lightningState;
private int boltLivingTime;
@Override
public void onUpdate() {
this.onEntityUpdate();
@@ -59,4 +60,5 @@ public class EntityBeeLightning extends EntityLightningBolt {
}
}
}
}
@@ -1,14 +1,9 @@
package binnie.extrabees.genetics.effect;
import binnie.Binnie;
import binnie.core.util.TileUtil;
import binnie.extrabees.ExtraBees;
import binnie.extrabees.genetics.ExtraBeesFlowers;
import forestry.api.apiculture.BeeManager;
import forestry.api.apiculture.IAlleleBeeEffect;
import forestry.api.apiculture.IBeeGenome;
import forestry.api.apiculture.IBeeHousing;
import forestry.api.apiculture.IBeekeepingLogic;
import binnie.extrabees.utils.Utils;
import forestry.api.apiculture.*;
import forestry.api.genetics.AlleleManager;
import forestry.api.genetics.IEffectData;
import forestry.core.render.ParticleRender;
@@ -38,6 +33,8 @@ import net.minecraft.world.World;
import net.minecraft.world.WorldServer;
import net.minecraftforge.energy.CapabilityEnergy;
import net.minecraftforge.energy.IEnergyStorage;
import net.minecraftforge.fluids.FluidRegistry;
import net.minecraftforge.fluids.FluidStack;
import net.minecraftforge.fluids.capability.CapabilityFluidHandler;
import net.minecraftforge.fluids.capability.IFluidHandler;
import net.minecraftforge.fml.relauncher.Side;
@@ -422,9 +419,9 @@ public enum ExtraBeesEffect implements IAlleleBeeEffect {
if (world.rand.nextInt(120) > 1) {
return storedData;
}
IFluidHandler fluidHandler = TileUtil.getCapability(world, pos, CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY, EnumFacing.UP);
IFluidHandler fluidHandler = Utils.getCapability(world, pos, CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY, EnumFacing.UP);
if (fluidHandler != null) {
fluidHandler.fill(Binnie.LIQUID.getFluidStack("water", 100), true);
fluidHandler.fill(new FluidStack(FluidRegistry.WATER, 100), true);
break;
}
break;
@@ -8,6 +8,7 @@ import net.minecraft.nbt.NBTTagList;
import java.util.ArrayList;
public class FireworkCreator {
public enum Shape {
Ball,
LargeBall,
@@ -17,10 +18,6 @@ public class FireworkCreator {
}
public static class Firework {
boolean flicker;
boolean trail;
ArrayList<Integer> colors;
byte shape;
public Firework() {
this.flicker = false;
@@ -29,6 +26,11 @@ public class FireworkCreator {
this.shape = 0;
}
boolean flicker;
boolean trail;
ArrayList<Integer> colors;
byte shape;
public void setFlicker() {
this.flicker = true;
}
@@ -77,5 +79,7 @@ public class FireworkCreator {
item.setTagCompound(var15);
return item;
}
}
}
@@ -19,6 +19,7 @@ import net.minecraftforge.fml.relauncher.SideOnly;
import java.util.List;
public class ItemDictionary extends Item implements IItemModelRegister {
public ItemDictionary() {
this.setCreativeTab(Tabs.tabApiculture);
this.setUnlocalizedName("dictionary");
@@ -64,8 +65,10 @@ public class ItemDictionary extends Item implements IItemModelRegister {
@Override
@SideOnly(Side.CLIENT)
@SuppressWarnings("all")
public void registerModel(Item item, IModelManager manager) {
manager.registerItemModel(item, 0, getRegistryName().getResourcePath());
manager.registerItemModel(item, 1, getRegistryName().getResourcePath() + "_master");
}
}
@@ -12,11 +12,6 @@ import net.minecraft.util.EnumHand;
import net.minecraft.world.World;
public class ItemPunnettSquare extends Item {
// @Override
// @SideOnly(Side.CLIENT)
// public void registerIcons(final IIconRegister register) {
// this.itemIcon = ExtraBees.proxy.getIcon(register, "");
// }
public ItemPunnettSquare() {
this.setCreativeTab(CreativeTabs.TOOLS);
@@ -36,4 +31,5 @@ public class ItemPunnettSquare extends Item {
ItemStack itemStack = playerIn.getHeldItem(handIn);
return new ActionResult<>(EnumActionResult.PASS, itemStack);
}
}
@@ -1,11 +1,7 @@
package binnie.extrabees.gui.database;
import binnie.Binnie;
import binnie.core.craftgui.Attribute;
import binnie.core.craftgui.CraftGUI;
import binnie.core.craftgui.ITooltip;
import binnie.core.craftgui.IWidget;
import binnie.core.craftgui.Tooltip;
import binnie.core.craftgui.*;
import binnie.core.craftgui.controls.core.Control;
import binnie.core.craftgui.geometry.Area;
import binnie.core.craftgui.resource.minecraft.CraftGUITexture;
@@ -1,11 +1,7 @@
package binnie.extrabees.gui.database;
import binnie.Binnie;
import binnie.core.craftgui.Attribute;
import binnie.core.craftgui.CraftGUI;
import binnie.core.craftgui.ITooltip;
import binnie.core.craftgui.IWidget;
import binnie.core.craftgui.Tooltip;
import binnie.core.craftgui.*;
import binnie.core.craftgui.controls.core.Control;
import binnie.core.craftgui.geometry.Area;
import binnie.core.craftgui.renderer.RenderUtil;
@@ -2,15 +2,7 @@ package binnie.extrabees.gui.database;
import binnie.Binnie;
import binnie.core.AbstractMod;
import binnie.core.craftgui.database.DatabaseTab;
import binnie.core.craftgui.database.PageBranchOverview;
import binnie.core.craftgui.database.PageBranchSpecies;
import binnie.core.craftgui.database.PageBreeder;
import binnie.core.craftgui.database.PageSpeciesClassification;
import binnie.core.craftgui.database.PageSpeciesMutations;
import binnie.core.craftgui.database.PageSpeciesOverview;
import binnie.core.craftgui.database.PageSpeciesResultant;
import binnie.core.craftgui.database.WindowAbstractDatabase;
import binnie.core.craftgui.database.*;
import binnie.core.craftgui.minecraft.Window;
import binnie.extrabees.ExtraBees;
import net.minecraft.entity.player.EntityPlayer;
@@ -1,10 +1,6 @@
package binnie.extrabees.gui.punnett;
import binnie.core.craftgui.Attribute;
import binnie.core.craftgui.CraftGUI;
import binnie.core.craftgui.ITooltip;
import binnie.core.craftgui.IWidget;
import binnie.core.craftgui.Tooltip;
import binnie.core.craftgui.*;
import binnie.core.craftgui.controls.core.Control;
import binnie.core.craftgui.controls.core.IControlValue;
import binnie.core.craftgui.renderer.RenderUtil;
@@ -1,16 +1,20 @@
package binnie.extrabees.products;
package binnie.extrabees.init;
import binnie.core.IInitializable;
import binnie.core.Mods;
import binnie.extrabees.ExtraBees;
import binnie.extrabees.products.*;
import net.minecraft.init.Items;
import net.minecraft.item.ItemStack;
import net.minecraftforge.fml.common.registry.GameRegistry;
import net.minecraftforge.oredict.OreDictionary;
public class ModuleProducts implements IInitializable {
@Override
public void preInit() {
/**
* Created by Elec332 on 12-5-2017.
*/
public final class ItemRegister {
public static void preInitItems(){
registerProducts();
}
private static void registerProducts(){
ExtraBees.honeyCrystal = new ItemHoneyCrystal("honey_crystal");
ExtraBees.honeyCrystalEmpty = new ItemHoneyCrystalEmpty("honey_crystal_empty");
ExtraBees.honeyDrop = new ItemHoneyDrop();
@@ -35,22 +39,4 @@ public class ModuleProducts implements IInitializable {
OreDictionary.registerOre("gemDiamond", Items.DIAMOND);
}
@Override
public void init() {
ItemHoneyComb.addSubtypes();
}
@Override
public void postInit() {
GameRegistry.addRecipe(new ItemStack(ExtraBees.honeyCrystalEmpty), "#@#", "@#@", "#@#", '@', Mods.Forestry.stack("honey_drop"), '#', EnumHoneyDrop.ENERGY.get(1));
for (final EnumHoneyComb info : EnumHoneyComb.values()) {
info.addRecipe();
}
for (final EnumHoneyDrop info2 : EnumHoneyDrop.values()) {
info2.addRecipe();
}
for (final EnumPropolis info3 : EnumPropolis.values()) {
info3.addRecipe();
}
}
}
@@ -0,0 +1,29 @@
package binnie.extrabees.init;
import binnie.core.Mods;
import binnie.extrabees.ExtraBees;
import binnie.extrabees.products.EnumHoneyComb;
import binnie.extrabees.products.EnumHoneyDrop;
import binnie.extrabees.products.EnumPropolis;
import net.minecraft.item.ItemStack;
import net.minecraftforge.fml.common.registry.GameRegistry;
/**
* Created by Elec332 on 12-5-2017.
*/
public final class RecipeRegister {
public static void postInitRecipes(){
GameRegistry.addRecipe(new ItemStack(ExtraBees.honeyCrystalEmpty), "#@#", "@#@", "#@#", '@', Mods.Forestry.stack("honey_drop"), '#', EnumHoneyDrop.ENERGY.get(1));
for (final EnumHoneyComb info : EnumHoneyComb.values()) {
info.addRecipe();
}
for (final EnumHoneyDrop info2 : EnumHoneyDrop.values()) {
info2.addRecipe();
}
for (final EnumPropolis info3 : EnumPropolis.values()) {
info3.addRecipe();
}
}
}
@@ -1,15 +1,20 @@
package binnie.extrabees.products;
import binnie.core.item.IItemEnum;
import binnie.extrabees.ExtraBees;
import binnie.extrabees.utils.IEBEnumItem;
import com.google.common.base.Objects;
import forestry.api.recipes.RecipeManagers;
import net.minecraft.init.Blocks;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraftforge.oredict.OreDictionary;
import javax.annotation.Nullable;
import java.util.LinkedHashMap;
import java.util.Map;
public enum EnumHoneyComb implements IItemEnum {
public enum EnumHoneyComb implements IEBEnumItem {
BARREN(7564356, 12762791),
ROTTEN(4084257, 11652233),
BONE(12895407, 14606017),
@@ -97,11 +102,6 @@ public enum EnumHoneyComb implements IItemEnum {
CYANITE(2564173, 34541),
BLUTONIUM(2564173, 1769702);
int[] colour;
public Map<ItemStack, Float> products;
boolean active;
public boolean deprecated;
EnumHoneyComb() {
this(16777215, 16777215);
this.active = false;
@@ -116,6 +116,11 @@ public enum EnumHoneyComb implements IItemEnum {
this.colour = new int[]{colour, colour2};
}
int[] colour;
public Map<ItemStack, Float> products;
boolean active;
public boolean deprecated;
public void addRecipe() {
RecipeManagers.centrifugeManager.addRecipe(20, this.get(1), this.products);
}
@@ -143,6 +148,10 @@ public enum EnumHoneyComb implements IItemEnum {
return ExtraBees.proxy.localise("item.comb." + this.name().toLowerCase());
}
public boolean addProduct(@Nullable Item item, final Float chance){
return addProduct(new ItemStack(Objects.firstNonNull(item, Item.getItemFromBlock(Blocks.AIR))), chance);
}
public boolean addProduct(final ItemStack item, final Float chance) {
if (item.isEmpty()) {
return false;
@@ -155,6 +164,10 @@ public enum EnumHoneyComb implements IItemEnum {
this.active = this.addProduct(item, chance);
}
public void tryAddProduct(@Nullable final Item item, final Float chance) {
this.active = this.addProduct(item, chance);
}
public void tryAddProduct(final String oreDict, final Float chance) {
if (!OreDictionary.getOres(oreDict).isEmpty()) {
this.tryAddProduct(OreDictionary.getOres(oreDict).get(0), chance);
@@ -163,7 +176,7 @@ public enum EnumHoneyComb implements IItemEnum {
}
}
public void tryAddProduct(final IItemEnum type, final Float chance) {
public void tryAddProduct(final IEBEnumItem type, final Float chance) {
this.tryAddProduct(type.get(1), chance);
this.active = (this.active && type.isActive());
}
@@ -171,4 +184,5 @@ public enum EnumHoneyComb implements IItemEnum {
public void copyProducts(final EnumHoneyComb comb) {
this.products.putAll(comb.products);
}
}
@@ -1,14 +1,15 @@
package binnie.extrabees.products;
import binnie.Binnie;
import binnie.core.item.IItemEnum;
import binnie.extrabees.ExtraBees;
import binnie.extrabees.utils.IEBEnumItem;
import binnie.extrabees.utils.Utils;
import forestry.api.recipes.RecipeManagers;
import net.minecraft.item.ItemStack;
import net.minecraftforge.fluids.FluidRegistry;
import net.minecraftforge.fluids.FluidStack;
public enum EnumHoneyDrop implements IItemEnum {
public enum EnumHoneyDrop implements IEBEnumItem {
ENERGY(10242418, 14905713, ""),
ACID(4961601, 4841020, "acid"),
POISON(13698745, 16712674, "poison"),
@@ -39,14 +40,6 @@ public enum EnumHoneyDrop implements IItemEnum {
MAGENTA(15040472, 16711884, "for.honey"),
LIGHTGRAY(10066329, 13224393, "for.honey");
private int[] colour;
private String liquidName;
private ItemStack remnant;
public void addRemnant(final ItemStack stack) {
this.remnant = stack;
}
EnumHoneyDrop() {
this(16777215, 16777215, "");
}
@@ -57,8 +50,16 @@ public enum EnumHoneyDrop implements IItemEnum {
this.liquidName = liquid;
}
private int[] colour;
private String liquidName;
private ItemStack remnant;
public void addRemnant(final ItemStack stack) {
this.remnant = stack;
}
public void addRecipe() {
final FluidStack liquid = Binnie.LIQUID.getFluidStack(this.getLiquidName(), 200);
final FluidStack liquid = Utils.getFluidFromName(this.getLiquidName(), 200);
if (liquid != null) {
RecipeManagers.squeezerManager.addRecipe(10, this.get(1), liquid, this.getRemnant(), 100);
}
@@ -98,4 +99,5 @@ public enum EnumHoneyDrop implements IItemEnum {
public ItemStack getRemnant() {
return remnant;
}
}
@@ -1,13 +1,13 @@
package binnie.extrabees.products;
import binnie.Binnie;
import binnie.core.item.IItemEnum;
import binnie.extrabees.ExtraBees;
import binnie.extrabees.utils.IEBEnumItem;
import binnie.extrabees.utils.Utils;
import forestry.api.recipes.RecipeManagers;
import net.minecraft.item.ItemStack;
import net.minecraftforge.fluids.FluidStack;
public enum EnumPropolis implements IItemEnum {
public enum EnumPropolis implements IEBEnumItem {
WATER(2405321, 12762791, "Water"),
OIL(1519411, 12762791, "oil"),
FUEL(10718482, 12762791, "fuel"),
@@ -19,10 +19,6 @@ public enum EnumPropolis implements IItemEnum {
GLACIAL,
PEAT;
int[] colour;
String liquidName;
boolean active;
EnumPropolis() {
this(16777215, 16777215, "");
this.active = false;
@@ -35,8 +31,12 @@ public enum EnumPropolis implements IItemEnum {
this.liquidName = liquid;
}
int[] colour;
String liquidName;
boolean active;
public void addRecipe() {
final FluidStack liquid = Binnie.LIQUID.getFluidStack(this.liquidName, 500);
final FluidStack liquid = Utils.getFluidFromName(this.liquidName, 500);
if (liquid != null) {
RecipeManagers.squeezerManager.addRecipe(20, this.get(1), liquid, ItemStack.EMPTY, 0);
}
@@ -44,7 +44,7 @@ public enum EnumPropolis implements IItemEnum {
@Override
public boolean isActive() {
return this.active && Binnie.LIQUID.getFluidStack(this.liquidName, 100) != null;
return this.active && Utils.getFluidFromName(this.liquidName, 100) != null;
}
public static EnumPropolis get(final ItemStack itemStack) {
@@ -64,4 +64,5 @@ public enum EnumPropolis implements IItemEnum {
public String getName(final ItemStack stack) {
return ExtraBees.proxy.localise("item.propolis." + this.name().toLowerCase());
}
}
@@ -1,9 +1,11 @@
package binnie.extrabees.products;
import binnie.core.Mods;
import binnie.extrabees.ExtraBees;
import binnie.extrabees.core.ExtraBeeItems;
import binnie.extrabees.utils.Utils;
import forestry.api.core.Tabs;
import forestry.apiculture.PluginApiculture;
import forestry.core.PluginCore;
import forestry.core.items.IColoredItem;
import net.minecraft.init.Blocks;
import net.minecraft.init.Items;
@@ -22,8 +24,8 @@ public class ItemHoneyComb extends ItemProduct implements IColoredItem {
}
public static void addSubtypes() {
final ItemStack beeswax = Mods.Forestry.stack("beeswax");
final ItemStack honeyDrop = Mods.Forestry.stack("honey_drop");
final ItemStack beeswax = PluginCore.getItems().beeswax.getItemStack();
final ItemStack honeyDrop = PluginApiculture.getItems().honeyDrop.getItemStack();
OreDictionary.registerOre("ingotIron", Items.IRON_INGOT);
OreDictionary.registerOre("ingotGold", Items.GOLD_INGOT);
OreDictionary.registerOre("gemDiamond", Items.DIAMOND);
@@ -69,8 +71,8 @@ public class ItemHoneyComb extends ItemProduct implements IColoredItem {
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.tryAddProduct(Utils.getIC2Item("itemHarz"), 1.00f);
EnumHoneyComb.RESIN.tryAddProduct(Utils.getIC2Item("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);
@@ -112,7 +114,7 @@ public class ItemHoneyComb extends ItemProduct implements IColoredItem {
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.tryAddProduct(Utils.getIC2Item("itemCofeePowder"), 0.75f);
EnumHoneyComb.GLACIAL.tryAddProduct(EnumHoneyDrop.ICE, 0.80f);
EnumHoneyComb.GLACIAL.addProduct(honeyDrop, 0.75f);
EnumHoneyComb.SHADOW.addProduct(honeyDrop, 0.50f);
@@ -148,7 +150,7 @@ public class ItemHoneyComb extends ItemProduct implements IColoredItem {
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("fertilizer_bio"), 1.00f);
EnumHoneyComb.COMPOST.tryAddProduct(PluginCore.getItems().fertilizerBio.getItemStack(), 1.00f);
EnumHoneyComb.SAWDUST.addProduct(honeyDrop, 0.25f);
if (!OreDictionary.getOres("dustSawdust").isEmpty()) {
EnumHoneyComb.SAWDUST.tryAddProduct(OreDictionary.getOres("dustSawdust").get(0), 1.00f);
@@ -255,7 +257,9 @@ public class ItemHoneyComb extends ItemProduct implements IColoredItem {
QUARTZ;
public ItemStack get() {
return Mods.Forestry.stack("bee_combs", 1, this.ordinal());
return new ItemStack(PluginApiculture.getItems().beeComb, 1, this.ordinal());
}
}
}
@@ -4,18 +4,8 @@ import binnie.extrabees.ExtraBees;
import forestry.api.core.Tabs;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
public class ItemHoneyCrystal extends Item {
private int maxCharge;
private int transferLimit;
private int tier;
// @Override
// @SideOnly(Side.CLIENT)
// public void registerIcons(final IIconRegister register) {
// this.itemIcon = ExtraBees.proxy.getIcon(register, "honeyCrystal");
// }
public ItemHoneyCrystal(String name) {
this.maxCharge = 8000;
@@ -29,17 +19,14 @@ public class ItemHoneyCrystal extends Item {
ExtraBees.proxy.registerModel(this, 0);
}
//TODO: Usage??
private int maxCharge;
private int transferLimit;
private int tier;
@Override
public String getItemStackDisplayName(final ItemStack i) {
return ExtraBees.proxy.localise("item.honeycrystal");
}
public static NBTTagCompound getOrCreateNbtData(final ItemStack itemStack) {
NBTTagCompound ret = itemStack.getTagCompound();
if (ret == null) {
ret = new NBTTagCompound();
itemStack.setTagCompound(ret);
}
return ret;
}
}
@@ -4,6 +4,7 @@ import binnie.extrabees.ExtraBees;
import net.minecraft.item.ItemStack;
public class ItemHoneyCrystalEmpty extends ItemHoneyCrystal {
public ItemHoneyCrystalEmpty(String name) {
super(name);
this.setMaxDamage(0);
@@ -11,14 +12,9 @@ public class ItemHoneyCrystalEmpty extends ItemHoneyCrystal {
this.setUnlocalizedName("honey_crystal_empty");
}
// @SideOnly(Side.CLIENT)
// @Override
// public void registerIcons(final IIconRegister register) {
// this.itemIcon = ExtraBees.proxy.getIcon(register, "honeyCrystalEmpty");
// }
@Override
public String getItemStackDisplayName(final ItemStack i) {
return ExtraBees.proxy.localise("item.honeycrystal.empty");
}
}
@@ -1,6 +1,6 @@
package binnie.extrabees.products;
import binnie.core.item.IItemEnum;
import binnie.extrabees.utils.IEBEnumItem;
import forestry.api.core.IItemModelRegister;
import forestry.api.core.IModelManager;
import net.minecraft.creativetab.CreativeTabs;
@@ -11,16 +11,17 @@ import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
public class ItemProduct extends Item implements IItemModelRegister {
IItemEnum[] types;
public ItemProduct(final IItemEnum[] types) {
public ItemProduct(final IEBEnumItem[] types) {
this.setMaxStackSize(64);
this.setMaxDamage(0);
this.setHasSubtypes(true);
this.types = types;
}
public IItemEnum get(final ItemStack stack) {
private IEBEnumItem[] types;
public IEBEnumItem get(final ItemStack stack) {
final int i = stack.getItemDamage();
if (i >= 0 && i < this.types.length) {
return this.types[i];
@@ -35,7 +36,7 @@ public class ItemProduct extends Item implements IItemModelRegister {
@Override
public void getSubItems(final Item itemIn, final CreativeTabs tab, final NonNullList<ItemStack> subItems) {
for (final IItemEnum type : this.types) {
for (final IEBEnumItem type : this.types) {
if (type.isActive()) {
subItems.add(new ItemStack(this, 1, type.ordinal()));
}
@@ -44,9 +45,11 @@ public class ItemProduct extends Item implements IItemModelRegister {
@Override
@SideOnly(Side.CLIENT)
@SuppressWarnings("all")
public void registerModel(Item item, IModelManager manager) {
for (IItemEnum type : types) {
for (IEBEnumItem type : types) {
manager.registerItemModel(item, type.ordinal(), getRegistryName().getResourcePath());
}
}
}
@@ -5,6 +5,7 @@ import forestry.core.items.IColoredItem;
import net.minecraft.item.ItemStack;
public class ItemPropolis extends ItemProduct implements IColoredItem {
public ItemPropolis() {
super(EnumPropolis.values());
this.setCreativeTab(Tabs.tabApiculture);
@@ -1,4 +1,4 @@
package binnie.core.genetics;
package binnie.extrabees.utils;
import forestry.core.utils.Translator;
import net.minecraft.entity.player.EntityPlayer;
@@ -1,4 +1,4 @@
package binnie.core.circuits;
package binnie.extrabees.utils;
import binnie.Binnie;
import binnie.core.AbstractMod;
@@ -1,4 +1,4 @@
package binnie.core.circuits;
package binnie.extrabees.utils;
import forestry.api.circuits.ICircuitSocketType;
@@ -1,4 +1,4 @@
package binnie.core.genetics;
package binnie.extrabees.utils;
public enum EnumBeeBooleanModifier {
Sealed,
@@ -1,4 +1,4 @@
package binnie.core.genetics;
package binnie.extrabees.utils;
import binnie.Binnie;
import binnie.core.BinnieCore;
@@ -0,0 +1,20 @@
package binnie.extrabees.utils;
import net.minecraft.item.ItemStack;
/**
* Created by Elec332 on 12-5-2017.
*/
public interface IEBEnumItem {
boolean isActive();
String getName(final ItemStack p0);
int ordinal();
ItemStack get(final int p0);
String name();
}
@@ -0,0 +1,73 @@
package binnie.extrabees.utils;
import forestry.api.apiculture.BeeManager;
import forestry.api.apiculture.IBeeRoot;
import net.minecraft.block.Block;
import net.minecraft.item.Item;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.EnumFacing;
import net.minecraft.util.ResourceLocation;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.IBlockAccess;
import net.minecraft.world.World;
import net.minecraftforge.common.capabilities.Capability;
import net.minecraftforge.fluids.FluidRegistry;
import net.minecraftforge.fluids.FluidStack;
import net.minecraftforge.fml.common.registry.ForgeRegistries;
import javax.annotation.Nullable;
/**
* Created by Elec332 on 12-5-2017.
*/
public class Utils {
public static IBeeRoot getBeeRoot() {
return BeeManager.beeRoot;
}
@Nullable
public static Item getIC2Item(String name){
return getModItem("ic2", name);
}
@Nullable
public static Item getBotaniaItem(String name){
return getModItem("botania", name);
}
@Nullable
public static Block getBotaniaBlock(String name){
ResourceLocation key = new ResourceLocation("botania", name);
return ForgeRegistries.BLOCKS.containsKey(key) ? ForgeRegistries.BLOCKS.getValue(key) : null;
}
private static Item getModItem(String mod, String name){
ResourceLocation key = new ResourceLocation(mod, name);
return ForgeRegistries.ITEMS.containsKey(key) ? ForgeRegistries.ITEMS.getValue(key) : null;
}
@Nullable
public static <T extends TileEntity> T getTile(IBlockAccess world, BlockPos pos, Class<T> tileClass) {
TileEntity tileEntity = world.getTileEntity(pos);
if (tileClass.isInstance(tileEntity)) {
return tileClass.cast(tileEntity);
} else {
return null;
}
}
@Nullable
public static <T> T getCapability(World world, BlockPos pos, Capability<T> capability, EnumFacing facing) {
TileEntity tileEntity = world.getTileEntity(pos);
if (tileEntity != null && tileEntity.hasCapability(capability, facing)) {
return tileEntity.getCapability(capability, facing);
}
return null;
}
public static FluidStack getFluidFromName(String name, int amount){
return FluidRegistry.getFluidStack(name.toLowerCase(), amount);
}
}