Make the honey crystal to a energy storage

This commit is contained in:
Nedelosk committed 2017-06-15 19:41:41 +02:00
1 parent d460bcab77
commit ef371173c9
12 files changed
+251 -89

No files matched your search

+6 -5
View File
@@ -1,19 +1,20 @@
package binnie.core;
import javax.annotation.Nonnull;
import javax.annotation.Nullable;
import net.minecraft.block.Block;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.util.ResourceLocation;
import net.minecraftforge.fml.common.Loader;
import net.minecraftforge.fml.common.registry.ForgeRegistries;
import javax.annotation.Nonnull;
import javax.annotation.Nullable;
public class Mods {
public static ModNonnull Forestry = new ModNonnull("forestry");
public static Mod IC2 = new Mod("IC2");
public static Mod Botania = new Mod("Botania");
public static Mod IC2 = new Mod("ic2");
public static Mod Botania = new Mod("botania");
public static class Mod {
protected final String id;
+27 -28
View File
@@ -1,5 +1,30 @@
package binnie.extrabees;
import com.google.common.collect.Lists;
import java.lang.reflect.Method;
import java.util.List;
import net.minecraft.block.Block;
import net.minecraft.block.material.Material;
import net.minecraft.init.Blocks;
import net.minecraft.init.Items;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraftforge.common.MinecraftForge;
import net.minecraftforge.fml.common.Mod;
import net.minecraftforge.fml.common.SidedProxy;
import net.minecraftforge.fml.common.event.FMLInitializationEvent;
import net.minecraftforge.fml.common.event.FMLPostInitializationEvent;
import net.minecraftforge.fml.common.event.FMLPreInitializationEvent;
import net.minecraftforge.fml.common.registry.GameRegistry;
import forestry.core.gui.GuiIdRegistry;
import forestry.core.gui.GuiType;
import forestry.core.proxy.Proxies;
import binnie.Constants;
import binnie.extrabees.alveary.TileEntityExtraBeesAlvearyPart;
import binnie.extrabees.genetics.ExtraBeeMutation;
@@ -11,6 +36,7 @@ import binnie.extrabees.init.BlockRegister;
import binnie.extrabees.init.ItemRegister;
import binnie.extrabees.init.RecipeRegister;
import binnie.extrabees.items.ItemHoneyComb;
import binnie.extrabees.items.ItemHoneyCrystal;
import binnie.extrabees.proxy.ExtraBeesCommonProxy;
import binnie.extrabees.utils.AlvearyMutationHandler;
import binnie.extrabees.utils.MaterialBeehive;
@@ -18,27 +44,6 @@ import binnie.extrabees.utils.Utils;
import binnie.extrabees.utils.config.ConfigHandler;
import binnie.extrabees.utils.config.ConfigurationMain;
import binnie.extrabees.worldgen.ExtraBeesWorldGenerator;
import com.google.common.collect.Lists;
import forestry.api.genetics.AlleleManager;
import forestry.core.gui.GuiIdRegistry;
import forestry.core.gui.GuiType;
import forestry.core.proxy.Proxies;
import net.minecraft.block.Block;
import net.minecraft.block.material.Material;
import net.minecraft.init.Blocks;
import net.minecraft.init.Items;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraftforge.common.MinecraftForge;
import net.minecraftforge.fml.common.Mod;
import net.minecraftforge.fml.common.SidedProxy;
import net.minecraftforge.fml.common.event.FMLInitializationEvent;
import net.minecraftforge.fml.common.event.FMLPostInitializationEvent;
import net.minecraftforge.fml.common.event.FMLPreInitializationEvent;
import net.minecraftforge.fml.common.registry.GameRegistry;
import java.lang.reflect.Method;
import java.util.List;
@Mod(modid = ExtraBees.MODID, name = "Binnie's Extra Bees", useMetadata = true, dependencies = "required-after:" + Constants.CORE_MOD_ID)
public class ExtraBees {
@@ -59,15 +64,13 @@ public class ExtraBees {
public static Item comb;
public static Item propolis;
public static Item honeyDrop;
public static Item honeyCrystal;
public static Item honeyCrystalEmpty;
public static ItemHoneyCrystal honeyCrystal;
public static Item dictionary;
public static Item itemMisc;
@Mod.EventHandler
@SuppressWarnings("all")
public void preInit(final FMLPreInitializationEvent event) {
materialBeehive = new MaterialBeehive();
configHandler = new ConfigHandler(event.getSuggestedConfigurationFile());
configHandler.addConfigurable(new ConfigurationMain());
@@ -75,10 +78,6 @@ public class ExtraBees {
ItemRegister.preInitItems();
MinecraftForge.EVENT_BUS.register(proxy);
ExtraBeesBranch.setSpeciesBranches();
// Register species
for (final ExtraBeesSpecies species : ExtraBeesSpecies.values()) {
AlleleManager.alleleRegistry.registerAllele(species);
}
try {
Method m = GuiIdRegistry.class.getDeclaredMethod("registerGuiHandlers", GuiType.class, List.class);
m.setAccessible(true);
@@ -1,5 +1,16 @@
package binnie.extrabees.init;
import net.minecraft.init.Items;
import net.minecraft.item.Item;
import net.minecraft.item.ItemBlock;
import net.minecraft.item.ItemStack;
import net.minecraftforge.oredict.OreDictionary;
import net.minecraftforge.fml.common.registry.GameRegistry;
import forestry.api.core.Tabs;
import binnie.extrabees.ExtraBees;
import binnie.extrabees.alveary.BlockAlveary;
import binnie.extrabees.alveary.EnumAlvearyLogicType;
@@ -7,20 +18,12 @@ import binnie.extrabees.blocks.type.EnumHiveType;
import binnie.extrabees.items.ItemBeehive;
import binnie.extrabees.items.ItemHoneyComb;
import binnie.extrabees.items.ItemHoneyCrystal;
import binnie.extrabees.items.ItemHoneyCrystalEmpty;
import binnie.extrabees.items.ItemHoneyDrop;
import binnie.extrabees.items.ItemMiscProduct;
import binnie.extrabees.items.ItemPropolis;
import binnie.extrabees.items.types.EnumHiveFrame;
import binnie.extrabees.items.types.EnumHoneyComb;
import binnie.extrabees.items.types.ExtraBeeItems;
import forestry.api.core.Tabs;
import net.minecraft.init.Items;
import net.minecraft.item.Item;
import net.minecraft.item.ItemBlock;
import net.minecraft.item.ItemStack;
import net.minecraftforge.fml.common.registry.GameRegistry;
import net.minecraftforge.oredict.OreDictionary;
public final class ItemRegister {
@@ -64,19 +67,15 @@ public final class ItemRegister {
}
private static void registerProducts() {
ExtraBees.honeyCrystal = new ItemHoneyCrystal("honey_crystal");
ExtraBees.honeyCrystalEmpty = new ItemHoneyCrystalEmpty("honey_crystal_empty");
ExtraBees.honeyCrystal = new ItemHoneyCrystal();
ExtraBees.honeyDrop = new ItemHoneyDrop();
ExtraBees.comb = new ItemHoneyComb();
ExtraBees.propolis = new ItemPropolis();
ExtraBees.proxy.registerItem(ExtraBees.honeyCrystal);
ExtraBees.proxy.registerItem(ExtraBees.honeyCrystalEmpty);
ExtraBees.proxy.registerItem(ExtraBees.comb);
ExtraBees.proxy.registerItem(ExtraBees.honeyDrop);
ExtraBees.proxy.registerItem(ExtraBees.propolis);
ExtraBees.proxy.registerModel(ExtraBees.honeyCrystal, 0);
ExtraBees.proxy.registerModel(ExtraBees.honeyCrystalEmpty, 0);
for (EnumHoneyComb c : EnumHoneyComb.values()) {
if (c.isActive()) {
ExtraBees.proxy.registerModel(ExtraBees.comb, c.ordinal());
@@ -1,5 +1,22 @@
package binnie.extrabees.init;
import net.minecraft.init.Blocks;
import net.minecraft.init.Items;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraftforge.oredict.OreDictionary;
import net.minecraftforge.oredict.ShapedOreRecipe;
import net.minecraftforge.fml.common.registry.GameRegistry;
import forestry.api.circuits.ICircuitLayout;
import forestry.api.recipes.RecipeManagers;
import forestry.apiculture.PluginApiculture;
import forestry.apiculture.blocks.BlockAlvearyType;
import forestry.core.PluginCore;
import forestry.core.fluids.Fluids;
import binnie.extrabees.ExtraBees;
import binnie.extrabees.alveary.EnumAlvearyLogicType;
import binnie.extrabees.circuit.AlvearySimulatorCircuitType;
@@ -11,24 +28,11 @@ import binnie.extrabees.items.types.EnumHoneyDrop;
import binnie.extrabees.items.types.EnumPropolis;
import binnie.extrabees.items.types.ExtraBeeItems;
import binnie.extrabees.utils.Utils;
import forestry.api.circuits.ICircuitLayout;
import forestry.api.recipes.RecipeManagers;
import forestry.apiculture.PluginApiculture;
import forestry.apiculture.blocks.BlockAlvearyType;
import forestry.core.PluginCore;
import forestry.core.fluids.Fluids;
import net.minecraft.init.Blocks;
import net.minecraft.init.Items;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraftforge.fml.common.registry.GameRegistry;
import net.minecraftforge.oredict.OreDictionary;
import net.minecraftforge.oredict.ShapedOreRecipe;
public final class RecipeRegister {
public static void postInitRecipes() {
GameRegistry.addRecipe(new ItemStack(ExtraBees.honeyCrystalEmpty), "#@#", "@#@", "#@#", '@', PluginApiculture.getItems().honeyDrop, '#', EnumHoneyDrop.ENERGY.get(1));
GameRegistry.addRecipe(ExtraBees.honeyCrystal.getCharged(0), "#@#", "@#@", "#@#", '@', PluginApiculture.getItems().honeyDrop, '#', EnumHoneyDrop.ENERGY.get(1));
for (final EnumHoneyComb info : EnumHoneyComb.values()) {
info.addRecipe();
}
@@ -1,31 +1,183 @@
package binnie.extrabees.items;
import binnie.extrabees.ExtraBees;
import forestry.api.core.Tabs;
import java.util.LinkedList;
import java.util.List;
import net.minecraft.client.renderer.ItemMeshDefinition;
import net.minecraft.client.renderer.block.model.ModelResourceLocation;
import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.util.ActionResult;
import net.minecraft.util.EnumActionResult;
import net.minecraft.util.EnumHand;
import net.minecraft.util.NonNullList;
import net.minecraft.world.World;
public class ItemHoneyCrystal extends Item {
import net.minecraftforge.client.model.ModelLoader;
//TODO: Usage??
import net.minecraftforge.fml.common.Optional;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
import forestry.api.core.IItemModelRegister;
import forestry.api.core.IModelManager;
import forestry.api.core.Tabs;
import binnie.core.Mods;
import binnie.extrabees.ExtraBees;
import ic2.api.item.ElectricItem;
import ic2.api.item.IElectricItem;
import ic2.api.item.IItemHudInfo;
@Optional.InterfaceList({
@Optional.Interface(modid = "ic2", iface = "ic2.api.item.IElectricItem"),
@Optional.Interface(modid = "ic2", iface = "ic2.api.item.IItemHudInfo")
})
public class ItemHoneyCrystal extends Item implements IElectricItem, IItemHudInfo, IItemModelRegister {
private int maxCharge;
private int transferLimit;
private int tier;
public ItemHoneyCrystal(String name) {
public ItemHoneyCrystal() {
this.maxCharge = 8000;
this.transferLimit = 500;
this.tier = 1;
this.setMaxDamage(27);
this.setMaxStackSize(1);
this.setMaxStackSize(16);
this.setCreativeTab(Tabs.tabApiculture);
this.setUnlocalizedName("honey_crystal");
setRegistryName(name);
ExtraBees.proxy.registerModel(this, 0);
this.setRegistryName("honey_crystal");
}
@Override
public String getItemStackDisplayName(final ItemStack i) {
public String getItemStackDisplayName(ItemStack stack) {
if(Mods.IC2.active()) {
double charge = ElectricItem.manager.getCharge(stack);
double maxCharge = ElectricItem.manager.getMaxCharge(stack);
if (charge <= 0.0F) {
return ExtraBees.proxy.localise("item.honeycrystal.empty");
}
}
return ExtraBees.proxy.localise("item.honeycrystal");
}
@Override
@Optional.Method(modid = "ic2")
public boolean showDurabilityBar(ItemStack stack) {
double charge = ElectricItem.manager.getCharge(stack);
double maxCharge = ElectricItem.manager.getMaxCharge(stack);
return charge != maxCharge;
}
@Override
@Optional.Method(modid = "ic2")
public double getDurabilityForDisplay(ItemStack stack) {
double charge = ElectricItem.manager.getCharge(stack);
double maxCharge = ElectricItem.manager.getMaxCharge(stack);
return 1D - (charge / maxCharge);
}
@Override
@SideOnly(Side.CLIENT)
public void registerModel(Item item, IModelManager manager) {
ModelLoader.registerItemVariants(item, new ModelResourceLocation("extrabees:honey_crystal_full", "inventory"), new ModelResourceLocation("extrabees:honey_crystal_empty", "inventory"), new ModelResourceLocation("extrabees:honey_crystal", "inventory"));
manager.registerItemModel(item, new HoneyCrystalMeshDefinition());
}
@Override
@Optional.Method(modid = "ic2")
public ActionResult<ItemStack> onItemRightClick(World world, EntityPlayer player, EnumHand hand) {
ItemStack stack = player.getHeldItem(hand);
if(!world.isRemote && stack.getCount() == 1) {
if(ElectricItem.manager.getCharge(stack) > 0.0D) {
boolean transferred = false;
for(int i = 0; i < 9; ++i) {
ItemStack target = (ItemStack)player.inventory.mainInventory.get(i);
if(target != null && target != stack && ElectricItem.manager.discharge(target, 1.0D / 0.0, 2147483647, true, true, true) <= 0.0D) {
double transfer = ElectricItem.manager.discharge(stack, 2.0D * this.transferLimit, 2147483647, true, true, true);
if(transfer > 0.0D) {
transfer = ElectricItem.manager.charge(target, transfer, this.tier, true, false);
if(transfer > 0.0D) {
ElectricItem.manager.discharge(stack, transfer, 2147483647, true, true, false);
transferred = true;
}
}
}
}
if(transferred && !world.isRemote) {
player.openContainer.detectAndSendChanges();
}
}
return new ActionResult(EnumActionResult.SUCCESS, stack);
} else {
return new ActionResult(EnumActionResult.PASS, stack);
}
}
@Override
@Optional.Method(modid = "ic2")
public boolean canProvideEnergy(ItemStack stack) {
return true;
}
@Override
@Optional.Method(modid = "ic2")
public double getMaxCharge(ItemStack stack) {
return this.maxCharge;
}
@Override
@Optional.Method(modid = "ic2")
public int getTier(ItemStack stack) {
return this.tier;
}
@Override
@Optional.Method(modid = "ic2")
public double getTransferLimit(ItemStack stack) {
return this.transferLimit;
}
@Override
@Optional.Method(modid = "ic2")
public List<String> getHudInfo(ItemStack stack, boolean advanced) {
List<String> info = new LinkedList();
info.add(ElectricItem.manager.getToolTip(stack));
return info;
}
@Override
@SideOnly(Side.CLIENT)
public void getSubItems(Item item, CreativeTabs tab, NonNullList<ItemStack> subItems) {
if(Mods.IC2.active()) {
subItems.add(getCharged(0.0D));
subItems.add(getCharged(1.0D / 0.0));
}
}
@Optional.Method(modid = "ic2")
public ItemStack getCharged(double charge) {
ItemStack ret = new ItemStack(this);
ElectricItem.manager.charge(ret, charge, 2147483647, true, false);
return ret;
}
private static class HoneyCrystalMeshDefinition implements ItemMeshDefinition{
@Override
public ModelResourceLocation getModelLocation(ItemStack stack) {
int damage = stack.getItemDamage();
String name = "honey_crystal";
if(damage == 0) {
name = "honey_crystal_full";
}else if(damage == 26){
name = "honey_crystal_empty";
}
return new ModelResourceLocation("extrabees:" + name, "inventory");
}
}
}
@@ -1,19 +0,0 @@
package binnie.extrabees.items;
import binnie.extrabees.ExtraBees;
import net.minecraft.item.ItemStack;
public class ItemHoneyCrystalEmpty extends ItemHoneyCrystal {
public ItemHoneyCrystalEmpty(String name) {
super(name);
this.setMaxDamage(0);
this.setMaxStackSize(64);
this.setUnlocalizedName("honey_crystal_empty");
}
@Override
public String getItemStackDisplayName(final ItemStack i) {
return ExtraBees.proxy.localise("item.honeycrystal.empty");
}
}
@@ -1,11 +1,19 @@
package binnie.extrabees.proxy;
import binnie.extrabees.genetics.ExtraBeesSpecies;
import net.minecraft.block.Block;
import net.minecraft.item.Item;
import net.minecraft.util.text.translation.I18n;
import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
import net.minecraftforge.fml.common.registry.GameRegistry;
import forestry.api.apiculture.BeeManager;
import forestry.api.apiculture.IAlleleBeeSpecies;
import forestry.api.genetics.AlleleManager;
import forestry.api.genetics.AlleleSpeciesRegisterEvent;
import binnie.extrabees.genetics.ExtraBeesSpecies;
public class ExtraBeesCommonProxy {
public void registerBeeModel(ExtraBeesSpecies type) {
@@ -26,4 +34,14 @@ public class ExtraBeesCommonProxy {
public void registerModel(Item item, int meta) {
}
@SubscribeEvent
public void onRegisterSpecies(AlleleSpeciesRegisterEvent<IAlleleBeeSpecies> event){
if(event.getRoot() != BeeManager.beeRoot){
return;
}
for (final ExtraBeesSpecies species : ExtraBeesSpecies.values()) {
AlleleManager.alleleRegistry.registerAllele(species);
}
}
}