mirror of
https://github.com/GTNewHorizons/Binnie.git
synced 2026-11-20 20:22:35 +00:00
Merge branch 'master-MC1.11.2' of https://github.com/ForestryMC/Binnie into master-MC1.11.2
# Conflicts: # src/main/java/binnie/extrabees/worldgen/ExtraBeesWorldGenerator.java # src/main/java/binnie/extrabees/worldgen/WorldGenHiveNether.java
This commit is contained in:
commit
2a873e8bfb
835 files changed
+5922
-4280
No files matched your search
@@ -1,5 +1,35 @@
|
||||
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.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 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 +41,8 @@ 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.items.ItemMiscProduct;
|
||||
import binnie.extrabees.proxy.ExtraBeesCommonProxy;
|
||||
import binnie.extrabees.utils.AlvearyMutationHandler;
|
||||
import binnie.extrabees.utils.MaterialBeehive;
|
||||
@@ -18,27 +50,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 {
|
||||
@@ -50,6 +61,11 @@ public class ExtraBees {
|
||||
|
||||
@SidedProxy(clientSide = "binnie.extrabees.proxy.ExtraBeesClientProxy", serverSide = "binnie.extrabees.proxy.ExtraBeesCommonProxy")
|
||||
public static ExtraBeesCommonProxy proxy;
|
||||
|
||||
public ExtraBees(){
|
||||
MinecraftForge.EVENT_BUS.register(this);
|
||||
}
|
||||
|
||||
public static ConfigHandler configHandler;
|
||||
|
||||
public static Material materialBeehive;
|
||||
@@ -59,26 +75,18 @@ 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;
|
||||
public static ItemMiscProduct itemMisc;
|
||||
|
||||
@Mod.EventHandler
|
||||
@SuppressWarnings("all")
|
||||
public void preInit(final FMLPreInitializationEvent event) {
|
||||
|
||||
materialBeehive = new MaterialBeehive();
|
||||
configHandler = new ConfigHandler(event.getSuggestedConfigurationFile());
|
||||
configHandler.addConfigurable(new ConfigurationMain());
|
||||
BlockRegister.preInitBlocks();
|
||||
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);
|
||||
@@ -118,4 +126,15 @@ public class ExtraBees {
|
||||
AlvearyMutationHandler.addMutationItem(new ItemStack(Items.ENDER_PEARL), 2.0f);
|
||||
AlvearyMutationHandler.addMutationItem(new ItemStack(Items.ENDER_EYE), 4.0f);
|
||||
}
|
||||
|
||||
@SubscribeEvent
|
||||
public void onRegisterSpecies(AlleleSpeciesRegisterEvent<IAlleleBeeSpecies> event){
|
||||
if(event.getRoot() != BeeManager.beeRoot){
|
||||
return;
|
||||
}
|
||||
ExtraBeesBranch.setSpeciesBranches();
|
||||
for (final ExtraBeesSpecies species : ExtraBeesSpecies.values()) {
|
||||
AlleleManager.alleleRegistry.registerAllele(species);
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1,21 +1,25 @@
|
||||
package binnie.extrabees.alveary;
|
||||
|
||||
import binnie.extrabees.client.gui.AbstractAlvearyContainer;
|
||||
import javax.annotation.Nonnull;
|
||||
import javax.annotation.Nullable;
|
||||
|
||||
import net.minecraft.client.gui.inventory.GuiContainer;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.util.EnumFacing;
|
||||
|
||||
import net.minecraftforge.common.capabilities.Capability;
|
||||
import net.minecraftforge.common.capabilities.ICapabilityProvider;
|
||||
import net.minecraftforge.energy.IEnergyStorage;
|
||||
|
||||
import net.minecraftforge.fml.relauncher.Side;
|
||||
import net.minecraftforge.fml.relauncher.SideOnly;
|
||||
|
||||
import forestry.api.apiculture.IBeeGenome;
|
||||
import forestry.api.apiculture.IBeeListener;
|
||||
import forestry.api.apiculture.IBeeModifier;
|
||||
import forestry.api.genetics.IIndividual;
|
||||
import net.minecraft.client.gui.inventory.GuiContainer;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.util.EnumFacing;
|
||||
import net.minecraftforge.common.capabilities.Capability;
|
||||
import net.minecraftforge.common.capabilities.ICapabilityProvider;
|
||||
import net.minecraftforge.energy.IEnergyStorage;
|
||||
import net.minecraftforge.fml.relauncher.Side;
|
||||
import net.minecraftforge.fml.relauncher.SideOnly;
|
||||
|
||||
import javax.annotation.Nonnull;
|
||||
import javax.annotation.Nullable;
|
||||
import binnie.extrabees.client.gui.AbstractAlvearyContainer;
|
||||
|
||||
public abstract class AbstractAlvearyLogic implements IBeeModifier, IBeeListener, ICapabilityProvider {
|
||||
|
||||
|
||||
@@ -1,25 +1,29 @@
|
||||
package binnie.extrabees.alveary;
|
||||
|
||||
import binnie.extrabees.client.gui.AbstractAlvearyContainer;
|
||||
import binnie.extrabees.client.gui.ContainerFrameHousing;
|
||||
import binnie.extrabees.client.gui.GuiContainerAlvearyPart;
|
||||
import binnie.extrabees.utils.Utils;
|
||||
import javax.annotation.Nonnull;
|
||||
import javax.annotation.Nullable;
|
||||
|
||||
import net.minecraft.client.gui.inventory.GuiContainer;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.item.ItemStack;
|
||||
|
||||
import net.minecraftforge.items.IItemHandlerModifiable;
|
||||
import net.minecraftforge.items.ItemStackHandler;
|
||||
|
||||
import net.minecraftforge.fml.relauncher.Side;
|
||||
import net.minecraftforge.fml.relauncher.SideOnly;
|
||||
|
||||
import forestry.api.apiculture.IBee;
|
||||
import forestry.api.apiculture.IBeeGenome;
|
||||
import forestry.api.apiculture.IBeeRoot;
|
||||
import forestry.api.apiculture.IHiveFrame;
|
||||
import forestry.api.multiblock.IAlvearyController;
|
||||
import forestry.api.multiblock.IMultiblockLogicAlveary;
|
||||
import net.minecraft.client.gui.inventory.GuiContainer;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraftforge.fml.relauncher.Side;
|
||||
import net.minecraftforge.fml.relauncher.SideOnly;
|
||||
import net.minecraftforge.items.IItemHandlerModifiable;
|
||||
import net.minecraftforge.items.ItemStackHandler;
|
||||
|
||||
import javax.annotation.Nonnull;
|
||||
import javax.annotation.Nullable;
|
||||
import binnie.extrabees.client.gui.AbstractAlvearyContainer;
|
||||
import binnie.extrabees.client.gui.ContainerFrameHousing;
|
||||
import binnie.extrabees.client.gui.GuiContainerAlvearyPart;
|
||||
import binnie.extrabees.utils.Utils;
|
||||
|
||||
public class AlvearyLogicFrameHousing extends AbstractAlvearyLogic {
|
||||
|
||||
|
||||
@@ -1,23 +1,27 @@
|
||||
package binnie.extrabees.alveary;
|
||||
|
||||
import javax.annotation.Nonnull;
|
||||
import javax.annotation.Nullable;
|
||||
|
||||
import net.minecraft.client.gui.inventory.GuiContainer;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.item.ItemStack;
|
||||
|
||||
import net.minecraftforge.items.IItemHandlerModifiable;
|
||||
import net.minecraftforge.items.ItemStackHandler;
|
||||
|
||||
import net.minecraftforge.fml.relauncher.Side;
|
||||
import net.minecraftforge.fml.relauncher.SideOnly;
|
||||
|
||||
import forestry.api.apiculture.EnumBeeType;
|
||||
import forestry.api.apiculture.IBee;
|
||||
import forestry.api.apiculture.IBeeHousing;
|
||||
import forestry.api.apiculture.IBeeRoot;
|
||||
|
||||
import binnie.extrabees.client.gui.AbstractAlvearyContainer;
|
||||
import binnie.extrabees.client.gui.ContainerHatchery;
|
||||
import binnie.extrabees.client.gui.GuiContainerAlvearyPart;
|
||||
import binnie.extrabees.utils.Utils;
|
||||
import forestry.api.apiculture.EnumBeeType;
|
||||
import forestry.api.apiculture.IBee;
|
||||
import forestry.api.apiculture.IBeeHousing;
|
||||
import forestry.api.apiculture.IBeeRoot;
|
||||
import net.minecraft.client.gui.inventory.GuiContainer;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraftforge.fml.relauncher.Side;
|
||||
import net.minecraftforge.fml.relauncher.SideOnly;
|
||||
import net.minecraftforge.items.IItemHandlerModifiable;
|
||||
import net.minecraftforge.items.ItemStackHandler;
|
||||
|
||||
import javax.annotation.Nonnull;
|
||||
import javax.annotation.Nullable;
|
||||
|
||||
public class AlvearyLogicHatchery extends AbstractAlvearyLogic {
|
||||
|
||||
|
||||
@@ -1,20 +1,24 @@
|
||||
package binnie.extrabees.alveary;
|
||||
|
||||
import javax.annotation.Nonnull;
|
||||
import javax.annotation.Nullable;
|
||||
|
||||
import net.minecraft.client.gui.inventory.GuiContainer;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.item.ItemStack;
|
||||
|
||||
import net.minecraftforge.items.IItemHandlerModifiable;
|
||||
import net.minecraftforge.items.ItemStackHandler;
|
||||
|
||||
import net.minecraftforge.fml.relauncher.Side;
|
||||
import net.minecraftforge.fml.relauncher.SideOnly;
|
||||
|
||||
import forestry.api.apiculture.IBeeGenome;
|
||||
|
||||
import binnie.extrabees.client.gui.AbstractAlvearyContainer;
|
||||
import binnie.extrabees.client.gui.ContainerMutator;
|
||||
import binnie.extrabees.client.gui.GuiContainerMutator;
|
||||
import binnie.extrabees.utils.AlvearyMutationHandler;
|
||||
import forestry.api.apiculture.IBeeGenome;
|
||||
import net.minecraft.client.gui.inventory.GuiContainer;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraftforge.fml.relauncher.Side;
|
||||
import net.minecraftforge.fml.relauncher.SideOnly;
|
||||
import net.minecraftforge.items.IItemHandlerModifiable;
|
||||
import net.minecraftforge.items.ItemStackHandler;
|
||||
|
||||
import javax.annotation.Nonnull;
|
||||
import javax.annotation.Nullable;
|
||||
|
||||
public class AlvearyLogicMutator extends AbstractAlvearyLogic {
|
||||
|
||||
|
||||
@@ -1,27 +1,31 @@
|
||||
package binnie.extrabees.alveary;
|
||||
|
||||
import binnie.extrabees.circuit.StimulatorCircuit;
|
||||
import binnie.extrabees.client.gui.ContainerStimulator;
|
||||
import binnie.extrabees.client.gui.GuiContainerStimulator;
|
||||
import com.google.common.collect.Lists;
|
||||
import forestry.api.apiculture.IBeeGenome;
|
||||
import forestry.api.apiculture.IBeeModifier;
|
||||
import forestry.api.circuits.ChipsetManager;
|
||||
import forestry.api.circuits.ICircuit;
|
||||
import forestry.api.circuits.ICircuitBoard;
|
||||
import net.minecraft.client.gui.inventory.GuiContainer;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraftforge.energy.EnergyStorage;
|
||||
import net.minecraftforge.energy.IEnergyStorage;
|
||||
import net.minecraftforge.items.IItemHandlerModifiable;
|
||||
import net.minecraftforge.items.ItemStackHandler;
|
||||
|
||||
import javax.annotation.Nonnull;
|
||||
import javax.annotation.Nullable;
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
|
||||
import net.minecraft.client.gui.inventory.GuiContainer;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.item.ItemStack;
|
||||
|
||||
import net.minecraftforge.energy.EnergyStorage;
|
||||
import net.minecraftforge.energy.IEnergyStorage;
|
||||
import net.minecraftforge.items.IItemHandlerModifiable;
|
||||
import net.minecraftforge.items.ItemStackHandler;
|
||||
|
||||
import forestry.api.apiculture.IBeeGenome;
|
||||
import forestry.api.apiculture.IBeeModifier;
|
||||
import forestry.api.circuits.ChipsetManager;
|
||||
import forestry.api.circuits.ICircuit;
|
||||
import forestry.api.circuits.ICircuitBoard;
|
||||
|
||||
import binnie.extrabees.circuit.StimulatorCircuit;
|
||||
import binnie.extrabees.client.gui.ContainerStimulator;
|
||||
import binnie.extrabees.client.gui.GuiContainerStimulator;
|
||||
|
||||
public class AlvearyLogicStimulator extends AbstractAlvearyLogic {
|
||||
|
||||
private final IEnergyStorage energyStorage;
|
||||
|
||||
@@ -1,16 +1,18 @@
|
||||
package binnie.extrabees.alveary;
|
||||
|
||||
import com.google.common.collect.Lists;
|
||||
import net.minecraft.util.EnumFacing;
|
||||
import net.minecraftforge.common.capabilities.Capability;
|
||||
import net.minecraftforge.energy.CapabilityEnergy;
|
||||
import net.minecraftforge.energy.EnergyStorage;
|
||||
import net.minecraftforge.energy.IEnergyStorage;
|
||||
|
||||
import javax.annotation.Nonnull;
|
||||
import javax.annotation.Nullable;
|
||||
import java.util.List;
|
||||
|
||||
import net.minecraft.util.EnumFacing;
|
||||
|
||||
import net.minecraftforge.common.capabilities.Capability;
|
||||
import net.minecraftforge.energy.CapabilityEnergy;
|
||||
import net.minecraftforge.energy.EnergyStorage;
|
||||
import net.minecraftforge.energy.IEnergyStorage;
|
||||
|
||||
public class AlvearyLogicTransmitter extends AbstractAlvearyLogic implements IEnergyStorage {
|
||||
|
||||
private IEnergyStorage internalStorage;
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
package binnie.extrabees.alveary;
|
||||
|
||||
import forestry.apiculture.MaterialBeehive;
|
||||
import forestry.core.gui.GuiHandler;
|
||||
import forestry.core.tiles.TileUtil;
|
||||
import javax.annotation.Nonnull;
|
||||
import javax.annotation.Nullable;
|
||||
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.block.ITileEntityProvider;
|
||||
import net.minecraft.block.properties.PropertyEnum;
|
||||
@@ -19,8 +19,10 @@ import net.minecraft.util.NonNullList;
|
||||
import net.minecraft.util.math.BlockPos;
|
||||
import net.minecraft.world.World;
|
||||
|
||||
import javax.annotation.Nonnull;
|
||||
import javax.annotation.Nullable;
|
||||
import forestry.api.core.Tabs;
|
||||
import forestry.apiculture.MaterialBeehive;
|
||||
import forestry.core.gui.GuiHandler;
|
||||
import forestry.core.tiles.TileUtil;
|
||||
|
||||
@SuppressWarnings("deprecation")
|
||||
public class BlockAlveary extends Block implements ITileEntityProvider {
|
||||
@@ -29,6 +31,7 @@ public class BlockAlveary extends Block implements ITileEntityProvider {
|
||||
|
||||
public BlockAlveary() {
|
||||
super(new MaterialBeehive(false));
|
||||
setCreativeTab(Tabs.tabApiculture);
|
||||
setRegistryName("alveary");
|
||||
}
|
||||
|
||||
|
||||
@@ -1,9 +1,9 @@
|
||||
package binnie.extrabees.alveary;
|
||||
|
||||
import net.minecraft.util.IStringSerializable;
|
||||
|
||||
import javax.annotation.Nonnull;
|
||||
|
||||
import net.minecraft.util.IStringSerializable;
|
||||
|
||||
public enum EnumAlvearyLogicType implements IStringSerializable {
|
||||
|
||||
FRAME {
|
||||
|
||||
@@ -1,12 +1,11 @@
|
||||
package binnie.extrabees.alveary;
|
||||
|
||||
import forestry.api.apiculture.IBeeListener;
|
||||
import forestry.api.apiculture.IBeeModifier;
|
||||
import forestry.api.multiblock.IAlvearyComponent;
|
||||
import forestry.api.multiblock.IMultiblockComponent;
|
||||
import forestry.api.multiblock.IMultiblockController;
|
||||
import forestry.apiculture.multiblock.MultiblockLogicAlveary;
|
||||
import forestry.core.multiblock.MultiblockTileEntityForestry;
|
||||
import javax.annotation.Nonnull;
|
||||
import javax.annotation.Nullable;
|
||||
import java.util.Collection;
|
||||
import java.util.Set;
|
||||
import java.util.stream.Collectors;
|
||||
|
||||
import net.minecraft.block.state.IBlockState;
|
||||
import net.minecraft.client.gui.inventory.GuiContainer;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
@@ -15,15 +14,19 @@ import net.minecraft.nbt.NBTTagCompound;
|
||||
import net.minecraft.util.EnumFacing;
|
||||
import net.minecraft.util.math.BlockPos;
|
||||
import net.minecraft.world.World;
|
||||
|
||||
import net.minecraftforge.common.capabilities.Capability;
|
||||
|
||||
import net.minecraftforge.fml.relauncher.Side;
|
||||
import net.minecraftforge.fml.relauncher.SideOnly;
|
||||
|
||||
import javax.annotation.Nonnull;
|
||||
import javax.annotation.Nullable;
|
||||
import java.util.Collection;
|
||||
import java.util.Set;
|
||||
import java.util.stream.Collectors;
|
||||
import forestry.api.apiculture.IBeeListener;
|
||||
import forestry.api.apiculture.IBeeModifier;
|
||||
import forestry.api.multiblock.IAlvearyComponent;
|
||||
import forestry.api.multiblock.IMultiblockComponent;
|
||||
import forestry.api.multiblock.IMultiblockController;
|
||||
import forestry.apiculture.multiblock.MultiblockLogicAlveary;
|
||||
import forestry.core.multiblock.MultiblockTileEntityForestry;
|
||||
|
||||
public class TileEntityExtraBeesAlvearyPart extends MultiblockTileEntityForestry<MultiblockLogicAlveary> implements
|
||||
IAlvearyComponent.Active,
|
||||
|
||||
@@ -1,12 +1,12 @@
|
||||
package binnie.extrabees.blocks;
|
||||
|
||||
import java.util.Random;
|
||||
|
||||
import net.minecraft.block.BlockWeb;
|
||||
import net.minecraft.block.state.IBlockState;
|
||||
import net.minecraft.init.Items;
|
||||
import net.minecraft.item.Item;
|
||||
|
||||
import java.util.Random;
|
||||
|
||||
public class BlockEctoplasm extends BlockWeb {
|
||||
|
||||
public BlockEctoplasm() {
|
||||
|
||||
@@ -1,14 +1,12 @@
|
||||
package binnie.extrabees.blocks;
|
||||
|
||||
import binnie.core.genetics.ForestryAllele;
|
||||
import binnie.extrabees.ExtraBees;
|
||||
import binnie.extrabees.blocks.type.EnumHiveType;
|
||||
import binnie.extrabees.genetics.ExtraBeesSpecies;
|
||||
import forestry.api.apiculture.BeeManager;
|
||||
import forestry.api.apiculture.EnumBeeType;
|
||||
import forestry.api.apiculture.IBee;
|
||||
import forestry.api.apiculture.IHiveDrop;
|
||||
import forestry.api.core.Tabs;
|
||||
import javax.annotation.Nonnull;
|
||||
import javax.annotation.Nullable;
|
||||
import java.util.ArrayList;
|
||||
import java.util.Collections;
|
||||
import java.util.List;
|
||||
import java.util.Random;
|
||||
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.block.properties.PropertyEnum;
|
||||
import net.minecraft.block.state.BlockStateContainer;
|
||||
@@ -21,12 +19,14 @@ import net.minecraft.util.math.BlockPos;
|
||||
import net.minecraft.world.IBlockAccess;
|
||||
import net.minecraft.world.World;
|
||||
|
||||
import javax.annotation.Nonnull;
|
||||
import javax.annotation.Nullable;
|
||||
import java.util.ArrayList;
|
||||
import java.util.Collections;
|
||||
import java.util.List;
|
||||
import java.util.Random;
|
||||
import forestry.api.apiculture.BeeManager;
|
||||
import forestry.api.apiculture.EnumBeeType;
|
||||
import forestry.api.apiculture.IBee;
|
||||
import forestry.api.apiculture.IHiveDrop;
|
||||
import forestry.api.core.Tabs;
|
||||
|
||||
import binnie.extrabees.ExtraBees;
|
||||
import binnie.extrabees.blocks.type.EnumHiveType;
|
||||
|
||||
public class BlockExtraBeeHive extends Block {
|
||||
|
||||
|
||||
@@ -1,11 +1,12 @@
|
||||
package binnie.extrabees.blocks.type;
|
||||
|
||||
import forestry.api.apiculture.IHiveDrop;
|
||||
import net.minecraft.util.IStringSerializable;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
|
||||
import net.minecraft.util.IStringSerializable;
|
||||
|
||||
import forestry.api.apiculture.IHiveDrop;
|
||||
|
||||
public enum EnumHiveType implements IStringSerializable {
|
||||
|
||||
Water,
|
||||
|
||||
@@ -1,14 +1,15 @@
|
||||
package binnie.extrabees.circuit;
|
||||
|
||||
import binnie.extrabees.utils.BeeModifierLogic;
|
||||
import binnie.extrabees.utils.EnumBeeBooleanModifier;
|
||||
import binnie.extrabees.utils.EnumBeeModifier;
|
||||
import javax.annotation.Nonnull;
|
||||
import javax.annotation.Nullable;
|
||||
|
||||
import forestry.api.apiculture.IBeeGenome;
|
||||
import forestry.api.apiculture.IBeeModifier;
|
||||
import forestry.api.circuits.ICircuitLayout;
|
||||
|
||||
import javax.annotation.Nonnull;
|
||||
import javax.annotation.Nullable;
|
||||
import binnie.extrabees.utils.BeeModifierLogic;
|
||||
import binnie.extrabees.utils.EnumBeeBooleanModifier;
|
||||
import binnie.extrabees.utils.EnumBeeModifier;
|
||||
|
||||
public enum AlvearySimulatorCircuitType implements IBeeModifier {
|
||||
|
||||
|
||||
@@ -1,9 +1,10 @@
|
||||
package binnie.extrabees.circuit;
|
||||
|
||||
import net.minecraft.util.text.translation.I18n;
|
||||
|
||||
import forestry.api.circuits.ChipsetManager;
|
||||
import forestry.api.circuits.ICircuitLayout;
|
||||
import forestry.api.circuits.ICircuitSocketType;
|
||||
import net.minecraft.util.text.translation.I18n;
|
||||
|
||||
public class BinnieCircuitLayout implements ICircuitLayout {
|
||||
|
||||
|
||||
@@ -1,17 +1,19 @@
|
||||
package binnie.extrabees.circuit;
|
||||
|
||||
import com.google.common.collect.Lists;
|
||||
|
||||
import javax.annotation.Nonnull;
|
||||
import javax.annotation.Nullable;
|
||||
import java.util.List;
|
||||
|
||||
import net.minecraft.item.ItemStack;
|
||||
|
||||
import forestry.api.apiculture.IBeeGenome;
|
||||
import forestry.api.apiculture.IBeeModifier;
|
||||
import forestry.api.circuits.ChipsetManager;
|
||||
import forestry.api.circuits.ICircuit;
|
||||
import forestry.api.circuits.ICircuitLayout;
|
||||
import forestry.core.PluginCore;
|
||||
import net.minecraft.item.ItemStack;
|
||||
|
||||
import javax.annotation.Nonnull;
|
||||
import javax.annotation.Nullable;
|
||||
import java.util.List;
|
||||
|
||||
public class StimulatorCircuit implements ICircuit, IBeeModifier {
|
||||
|
||||
|
||||
@@ -1,18 +1,20 @@
|
||||
package binnie.extrabees.client;
|
||||
|
||||
import forestry.api.apiculture.BeeManager;
|
||||
import forestry.api.apiculture.EnumBeeType;
|
||||
import forestry.api.apiculture.IBeeModelProvider;
|
||||
import forestry.api.core.IModelManager;
|
||||
import java.util.Locale;
|
||||
|
||||
import net.minecraft.client.renderer.block.model.ModelBakery;
|
||||
import net.minecraft.client.renderer.block.model.ModelResourceLocation;
|
||||
import net.minecraft.item.Item;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.util.ResourceLocation;
|
||||
|
||||
import net.minecraftforge.fml.relauncher.Side;
|
||||
import net.minecraftforge.fml.relauncher.SideOnly;
|
||||
|
||||
import java.util.Locale;
|
||||
import forestry.api.apiculture.BeeManager;
|
||||
import forestry.api.apiculture.EnumBeeType;
|
||||
import forestry.api.apiculture.IBeeModelProvider;
|
||||
import forestry.api.core.IModelManager;
|
||||
|
||||
public class BeeModelProvider implements IBeeModelProvider {
|
||||
public static final BeeModelProvider instance = new BeeModelProvider();
|
||||
|
||||
@@ -1,16 +1,18 @@
|
||||
package binnie.extrabees.client.gui;
|
||||
|
||||
import binnie.extrabees.ExtraBees;
|
||||
import binnie.extrabees.alveary.EnumAlvearyLogicType;
|
||||
import binnie.extrabees.utils.ExtraBeesResourceLocation;
|
||||
import javax.annotation.Nonnull;
|
||||
import java.awt.Dimension;
|
||||
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.inventory.Container;
|
||||
import net.minecraft.inventory.Slot;
|
||||
import net.minecraft.util.ResourceLocation;
|
||||
|
||||
import net.minecraftforge.items.IItemHandlerModifiable;
|
||||
|
||||
import javax.annotation.Nonnull;
|
||||
import java.awt.Dimension;
|
||||
import binnie.extrabees.ExtraBees;
|
||||
import binnie.extrabees.alveary.EnumAlvearyLogicType;
|
||||
import binnie.extrabees.utils.ExtraBeesResourceLocation;
|
||||
|
||||
public abstract class AbstractAlvearyContainer extends Container {
|
||||
|
||||
@@ -27,8 +29,8 @@ public abstract class AbstractAlvearyContainer extends Container {
|
||||
this.inv = inv;
|
||||
this.dimension = dimension;
|
||||
String base = "extrabees.machine.alveay." + type.getName();
|
||||
title = ExtraBees.proxy.localise(base + ".name");
|
||||
tooltip = ExtraBees.proxy.localise(base + ".info");
|
||||
title = ExtraBees.proxy.localiseWithOutPrefix(base + ".name");
|
||||
tooltip = ExtraBees.proxy.localiseWithOutPrefix(base + ".info");
|
||||
background = new ExtraBeesResourceLocation("textures/gui/gui" + type.getName() + ".png");
|
||||
setupContainer();
|
||||
}
|
||||
|
||||
@@ -1,9 +1,11 @@
|
||||
package binnie.extrabees.client.gui;
|
||||
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
|
||||
import net.minecraftforge.items.SlotItemHandler;
|
||||
|
||||
import binnie.extrabees.alveary.AlvearyLogicFrameHousing;
|
||||
import binnie.extrabees.alveary.EnumAlvearyLogicType;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraftforge.items.SlotItemHandler;
|
||||
|
||||
public class ContainerFrameHousing extends AbstractAlvearyContainer {
|
||||
|
||||
|
||||
@@ -1,9 +1,11 @@
|
||||
package binnie.extrabees.client.gui;
|
||||
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
|
||||
import net.minecraftforge.items.SlotItemHandler;
|
||||
|
||||
import binnie.extrabees.alveary.AlvearyLogicHatchery;
|
||||
import binnie.extrabees.alveary.EnumAlvearyLogicType;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraftforge.items.SlotItemHandler;
|
||||
|
||||
public class ContainerHatchery extends AbstractAlvearyContainer {
|
||||
|
||||
|
||||
@@ -1,11 +1,13 @@
|
||||
package binnie.extrabees.client.gui;
|
||||
|
||||
import java.awt.Dimension;
|
||||
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
|
||||
import net.minecraftforge.items.SlotItemHandler;
|
||||
|
||||
import binnie.extrabees.alveary.AlvearyLogicMutator;
|
||||
import binnie.extrabees.alveary.EnumAlvearyLogicType;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraftforge.items.SlotItemHandler;
|
||||
|
||||
import java.awt.Dimension;
|
||||
|
||||
public class ContainerMutator extends AbstractAlvearyContainer {
|
||||
|
||||
|
||||
@@ -1,11 +1,13 @@
|
||||
package binnie.extrabees.client.gui;
|
||||
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.inventory.IContainerListener;
|
||||
|
||||
import net.minecraftforge.energy.IEnergyStorage;
|
||||
import net.minecraftforge.items.SlotItemHandler;
|
||||
|
||||
import binnie.extrabees.alveary.AlvearyLogicStimulator;
|
||||
import binnie.extrabees.alveary.EnumAlvearyLogicType;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.inventory.IContainerListener;
|
||||
import net.minecraftforge.energy.IEnergyStorage;
|
||||
import net.minecraftforge.items.SlotItemHandler;
|
||||
|
||||
public class ContainerStimulator extends AbstractAlvearyContainer {
|
||||
|
||||
|
||||
@@ -1,15 +1,17 @@
|
||||
package binnie.extrabees.client.gui;
|
||||
|
||||
import com.google.common.collect.Lists;
|
||||
|
||||
import java.awt.Color;
|
||||
|
||||
import net.minecraft.client.Minecraft;
|
||||
import net.minecraft.client.gui.FontRenderer;
|
||||
import net.minecraft.client.gui.inventory.GuiContainer;
|
||||
|
||||
import net.minecraftforge.fml.client.config.GuiUtils;
|
||||
import net.minecraftforge.fml.relauncher.Side;
|
||||
import net.minecraftforge.fml.relauncher.SideOnly;
|
||||
|
||||
import java.awt.Color;
|
||||
|
||||
@SideOnly(Side.CLIENT)
|
||||
public class GuiContainerAlvearyPart extends GuiContainer {
|
||||
|
||||
|
||||
@@ -1,11 +1,13 @@
|
||||
package binnie.extrabees.client.gui;
|
||||
|
||||
import binnie.extrabees.utils.AlvearyMutationHandler;
|
||||
import net.minecraft.client.Minecraft;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import java.awt.Color;
|
||||
|
||||
import org.apache.commons.lang3.tuple.Pair;
|
||||
|
||||
import java.awt.Color;
|
||||
import net.minecraft.client.Minecraft;
|
||||
import net.minecraft.item.ItemStack;
|
||||
|
||||
import binnie.extrabees.utils.AlvearyMutationHandler;
|
||||
|
||||
public class GuiContainerMutator extends GuiContainerAlvearyPart {
|
||||
|
||||
|
||||
@@ -1,6 +1,13 @@
|
||||
package binnie.extrabees.genetics;
|
||||
|
||||
import com.google.common.base.Preconditions;
|
||||
|
||||
import net.minecraft.tileentity.TileEntity;
|
||||
import net.minecraft.util.math.BlockPos;
|
||||
import net.minecraft.world.World;
|
||||
|
||||
import net.minecraftforge.common.BiomeDictionary;
|
||||
|
||||
import forestry.api.apiculture.BeeManager;
|
||||
import forestry.api.apiculture.IAlleleBeeSpecies;
|
||||
import forestry.api.apiculture.IBeeHousing;
|
||||
@@ -10,10 +17,6 @@ import forestry.api.genetics.IAllele;
|
||||
import forestry.api.genetics.IGenome;
|
||||
import forestry.api.genetics.IMutationCondition;
|
||||
import forestry.apiculture.genetics.BeeDefinition;
|
||||
import net.minecraft.tileentity.TileEntity;
|
||||
import net.minecraft.util.math.BlockPos;
|
||||
import net.minecraft.world.World;
|
||||
import net.minecraftforge.common.BiomeDictionary;
|
||||
|
||||
import static forestry.apiculture.genetics.BeeDefinition.AUSTERE;
|
||||
import static forestry.apiculture.genetics.BeeDefinition.BOGGY;
|
||||
|
||||
@@ -1,14 +1,15 @@
|
||||
package binnie.extrabees.genetics;
|
||||
|
||||
import binnie.extrabees.ExtraBees;
|
||||
import javax.annotation.Nullable;
|
||||
import java.util.LinkedHashSet;
|
||||
import java.util.Set;
|
||||
|
||||
import forestry.api.apiculture.IAlleleBeeSpecies;
|
||||
import forestry.api.genetics.AlleleManager;
|
||||
import forestry.api.genetics.IAlleleSpecies;
|
||||
import forestry.api.genetics.IClassification;
|
||||
|
||||
import javax.annotation.Nullable;
|
||||
import java.util.LinkedHashSet;
|
||||
import java.util.Set;
|
||||
import binnie.extrabees.ExtraBees;
|
||||
|
||||
public enum ExtraBeesBranch implements IClassification {
|
||||
|
||||
|
||||
@@ -1,7 +1,19 @@
|
||||
package binnie.extrabees.genetics;
|
||||
|
||||
import binnie.extrabees.ExtraBees;
|
||||
import binnie.extrabees.utils.Utils;
|
||||
import java.util.Collections;
|
||||
import java.util.List;
|
||||
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.block.material.Material;
|
||||
import net.minecraft.init.Blocks;
|
||||
import net.minecraft.item.Item;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.util.NonNullList;
|
||||
import net.minecraft.util.math.BlockPos;
|
||||
import net.minecraft.world.World;
|
||||
|
||||
import net.minecraftforge.common.EnumPlantType;
|
||||
|
||||
import forestry.api.apiculture.FlowerManager;
|
||||
import forestry.api.genetics.AlleleManager;
|
||||
import forestry.api.genetics.IAllele;
|
||||
@@ -12,18 +24,9 @@ import forestry.api.genetics.IFlowerProvider;
|
||||
import forestry.api.genetics.IFruitBearer;
|
||||
import forestry.api.genetics.IIndividual;
|
||||
import forestry.api.genetics.ISpeciesRoot;
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.block.material.Material;
|
||||
import net.minecraft.init.Blocks;
|
||||
import net.minecraft.item.Item;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.util.NonNullList;
|
||||
import net.minecraft.util.math.BlockPos;
|
||||
import net.minecraft.world.World;
|
||||
import net.minecraftforge.common.EnumPlantType;
|
||||
|
||||
import java.util.Collections;
|
||||
import java.util.List;
|
||||
import binnie.extrabees.ExtraBees;
|
||||
import binnie.extrabees.utils.Utils;
|
||||
|
||||
public enum ExtraBeesFlowers implements IFlowerProvider, IAlleleFlowers, IChromosomeType {
|
||||
WATER,
|
||||
|
||||
@@ -1,14 +1,27 @@
|
||||
package binnie.extrabees.genetics;
|
||||
|
||||
import binnie.extrabees.ExtraBees;
|
||||
import binnie.extrabees.client.BeeModelProvider;
|
||||
import binnie.extrabees.genetics.effect.ExtraBeesEffect;
|
||||
import binnie.extrabees.items.ItemHoneyComb;
|
||||
import binnie.extrabees.items.types.EnumHoneyComb;
|
||||
import binnie.extrabees.items.types.IEBEnumItem;
|
||||
import binnie.extrabees.utils.Utils;
|
||||
import com.google.common.base.Preconditions;
|
||||
|
||||
import javax.annotation.Nonnull;
|
||||
import javax.annotation.Nullable;
|
||||
import java.util.ArrayList;
|
||||
import java.util.Collection;
|
||||
import java.util.LinkedHashMap;
|
||||
import java.util.Map;
|
||||
|
||||
import net.minecraft.client.renderer.block.model.ModelResourceLocation;
|
||||
import net.minecraft.init.Items;
|
||||
import net.minecraft.item.Item;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.stats.Achievement;
|
||||
import net.minecraft.util.NonNullList;
|
||||
import net.minecraft.world.World;
|
||||
|
||||
import com.mojang.authlib.GameProfile;
|
||||
|
||||
import net.minecraftforge.fml.relauncher.Side;
|
||||
import net.minecraftforge.fml.relauncher.SideOnly;
|
||||
|
||||
import forestry.api.apiculture.EnumBeeChromosome;
|
||||
import forestry.api.apiculture.EnumBeeType;
|
||||
import forestry.api.apiculture.IAlleleBeeEffect;
|
||||
@@ -30,22 +43,14 @@ import forestry.apiculture.PluginApiculture;
|
||||
import forestry.apiculture.genetics.BeeDefinition;
|
||||
import forestry.core.genetics.alleles.AlleleHelper;
|
||||
import forestry.core.genetics.alleles.EnumAllele;
|
||||
import net.minecraft.client.renderer.block.model.ModelResourceLocation;
|
||||
import net.minecraft.init.Items;
|
||||
import net.minecraft.item.Item;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.stats.Achievement;
|
||||
import net.minecraft.util.NonNullList;
|
||||
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;
|
||||
import java.util.LinkedHashMap;
|
||||
import java.util.Map;
|
||||
import binnie.extrabees.ExtraBees;
|
||||
import binnie.extrabees.client.BeeModelProvider;
|
||||
import binnie.extrabees.genetics.effect.ExtraBeesEffect;
|
||||
import binnie.extrabees.items.ItemHoneyComb;
|
||||
import binnie.extrabees.items.types.EnumHoneyComb;
|
||||
import binnie.extrabees.items.types.IEBEnumItem;
|
||||
import binnie.extrabees.utils.Utils;
|
||||
|
||||
public enum ExtraBeesSpecies implements IAlleleBeeSpecies {
|
||||
ARID("aridus", 12511316),
|
||||
@@ -784,12 +789,12 @@ public enum ExtraBeesSpecies implements IAlleleBeeSpecies {
|
||||
|
||||
@Override
|
||||
public String getName() {
|
||||
return ExtraBees.proxy.localise(getUnlocalizedName());
|
||||
return ExtraBees.proxy.localiseWithOutPrefix(getUnlocalizedName());
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getDescription() {
|
||||
return ExtraBees.proxy.localise(getUID() + ".desc");
|
||||
return ExtraBees.proxy.localiseWithOutPrefix(getUID() + ".desc");
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -1,5 +1,7 @@
|
||||
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;
|
||||
@@ -8,8 +10,6 @@ import net.minecraft.util.math.BlockPos;
|
||||
import net.minecraft.util.math.MathHelper;
|
||||
import net.minecraft.world.World;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
public class EntityBeeLightning extends EntityLightningBolt {
|
||||
|
||||
private int lightningState;
|
||||
|
||||
@@ -1,16 +1,9 @@
|
||||
package binnie.extrabees.genetics.effect;
|
||||
|
||||
import binnie.extrabees.ExtraBees;
|
||||
import binnie.extrabees.genetics.ExtraBeesFlowers;
|
||||
import binnie.extrabees.utils.Utils;
|
||||
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 forestry.api.genetics.AlleleManager;
|
||||
import forestry.api.genetics.IEffectData;
|
||||
import forestry.core.render.ParticleRender;
|
||||
import java.util.ArrayList;
|
||||
import java.util.Calendar;
|
||||
import java.util.List;
|
||||
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.block.state.IBlockState;
|
||||
import net.minecraft.entity.Entity;
|
||||
@@ -36,18 +29,29 @@ import net.minecraft.util.math.Vec3i;
|
||||
import net.minecraft.util.text.translation.I18n;
|
||||
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;
|
||||
import net.minecraftforge.fml.relauncher.SideOnly;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.Calendar;
|
||||
import java.util.List;
|
||||
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 forestry.api.genetics.AlleleManager;
|
||||
import forestry.api.genetics.IEffectData;
|
||||
import forestry.core.render.ParticleRender;
|
||||
|
||||
import binnie.extrabees.ExtraBees;
|
||||
import binnie.extrabees.genetics.ExtraBeesFlowers;
|
||||
import binnie.extrabees.utils.Utils;
|
||||
|
||||
public enum ExtraBeesEffect implements IAlleleBeeEffect {
|
||||
ECTOPLASM,
|
||||
|
||||
@@ -1,12 +1,12 @@
|
||||
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 {
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
@FieldsAreNonnullByDefault
|
||||
package binnie.extrabees.genetics.effect;
|
||||
|
||||
import binnie.extrabees.utils.FieldsAreNonnullByDefault;
|
||||
import mcp.MethodsReturnNonnullByDefault;
|
||||
import javax.annotation.ParametersAreNonnullByDefault;
|
||||
|
||||
import javax.annotation.ParametersAreNonnullByDefault;
|
||||
import binnie.extrabees.utils.FieldsAreNonnullByDefault;
|
||||
import mcp.MethodsReturnNonnullByDefault;
|
||||
@@ -3,7 +3,7 @@
|
||||
@FieldsAreNonnullByDefault
|
||||
package binnie.extrabees.genetics;
|
||||
|
||||
import binnie.extrabees.utils.FieldsAreNonnullByDefault;
|
||||
import mcp.MethodsReturnNonnullByDefault;
|
||||
import javax.annotation.ParametersAreNonnullByDefault;
|
||||
|
||||
import javax.annotation.ParametersAreNonnullByDefault;
|
||||
import binnie.extrabees.utils.FieldsAreNonnullByDefault;
|
||||
import mcp.MethodsReturnNonnullByDefault;
|
||||
@@ -1,5 +1,10 @@
|
||||
package binnie.extrabees.init;
|
||||
|
||||
import net.minecraftforge.fml.common.registry.GameRegistry;
|
||||
|
||||
import forestry.api.apiculture.IAlleleBeeSpecies;
|
||||
import forestry.apiculture.genetics.BeeDefinition;
|
||||
|
||||
import binnie.extrabees.ExtraBees;
|
||||
import binnie.extrabees.alveary.BlockAlveary;
|
||||
import binnie.extrabees.alveary.TileEntityExtraBeesAlvearyPart;
|
||||
@@ -10,9 +15,6 @@ import binnie.extrabees.genetics.ExtraBeesSpecies;
|
||||
import binnie.extrabees.utils.HiveDrop;
|
||||
import binnie.extrabees.utils.Utils;
|
||||
import binnie.extrabees.utils.config.ConfigurationMain;
|
||||
import forestry.api.apiculture.IAlleleBeeSpecies;
|
||||
import forestry.apiculture.genetics.BeeDefinition;
|
||||
import net.minecraftforge.fml.common.registry.GameRegistry;
|
||||
|
||||
public final class BlockRegister {
|
||||
|
||||
|
||||
@@ -1,9 +1,10 @@
|
||||
package binnie.extrabees.init;
|
||||
|
||||
import binnie.extrabees.utils.ExtraBeesResourceLocation;
|
||||
import net.minecraftforge.fluids.Fluid;
|
||||
import net.minecraftforge.fluids.FluidRegistry;
|
||||
|
||||
import binnie.extrabees.utils.ExtraBeesResourceLocation;
|
||||
|
||||
public final class FluidRegister {
|
||||
|
||||
//Fluids seem unused,
|
||||
|
||||
@@ -1,26 +1,23 @@
|
||||
package binnie.extrabees.init;
|
||||
|
||||
import net.minecraft.init.Items;
|
||||
import net.minecraft.item.ItemBlock;
|
||||
|
||||
import net.minecraftforge.oredict.OreDictionary;
|
||||
|
||||
import forestry.api.core.Tabs;
|
||||
|
||||
import binnie.extrabees.ExtraBees;
|
||||
import binnie.extrabees.alveary.BlockAlveary;
|
||||
import binnie.extrabees.alveary.EnumAlvearyLogicType;
|
||||
import binnie.extrabees.blocks.type.EnumHiveType;
|
||||
import binnie.extrabees.items.ItemBeehive;
|
||||
import binnie.extrabees.items.ItemBlockAlveary;
|
||||
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 {
|
||||
|
||||
@@ -32,54 +29,35 @@ public final class ItemRegister {
|
||||
|
||||
@SuppressWarnings("all")
|
||||
private static void registerMisc() {
|
||||
Item i = GameRegistry.register(new ItemBlock(ExtraBees.alveary) {
|
||||
|
||||
@Override
|
||||
public int getMetadata(int damage) {
|
||||
return damage;
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getUnlocalizedName(ItemStack stack) {
|
||||
return ((BlockAlveary) block).getUnlocalizedName(stack.getMetadata());
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean getHasSubtypes() {
|
||||
return true;
|
||||
}
|
||||
}.setRegistryName(ExtraBees.alveary.getRegistryName()));
|
||||
for (int j = 0; j < EnumAlvearyLogicType.VALUES.length; j++) {
|
||||
ExtraBees.proxy.registerModel(i, j);
|
||||
}
|
||||
i = GameRegistry.register(new ItemBeehive(ExtraBees.hive));
|
||||
for (int j = 0; j < EnumHiveType.values().length; j++) {
|
||||
ExtraBees.proxy.registerModel(i, j);
|
||||
}
|
||||
ExtraBees.proxy.registerModel(GameRegistry.register(new ItemBlock(ExtraBees.ectoplasm).setRegistryName(ExtraBees.ectoplasm.getRegistryName())), 0);
|
||||
ExtraBees.itemMisc = ExtraBees.proxy.registerItem(new ItemMiscProduct(Tabs.tabApiculture, ExtraBeeItems.values()));
|
||||
ItemBlockAlveary itemAlveary = new ItemBlockAlveary(ExtraBees.alveary);
|
||||
ItemBeehive itemBeehive = new ItemBeehive(ExtraBees.hive);
|
||||
ItemBlock ectoplasm = new ItemBlock(ExtraBees.ectoplasm);
|
||||
ectoplasm.setRegistryName(ExtraBees.ectoplasm.getRegistryName());
|
||||
ItemMiscProduct itemMisc = ExtraBees.itemMisc = new ItemMiscProduct(Tabs.tabApiculture, ExtraBeeItems.values());
|
||||
|
||||
ExtraBees.proxy.registerItem(ectoplasm);
|
||||
ExtraBees.proxy.registerModel(ectoplasm, 0);
|
||||
ExtraBees.proxy.registerItem(itemAlveary);
|
||||
ExtraBees.proxy.registerItem(itemBeehive);
|
||||
ExtraBees.proxy.registerItem(itemMisc);
|
||||
for (final EnumHiveFrame frame : EnumHiveFrame.values()) {
|
||||
ExtraBees.proxy.registerItem(frame.getItem());
|
||||
}
|
||||
}
|
||||
|
||||
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());
|
||||
for (EnumHoneyComb comb : EnumHoneyComb.values()) {
|
||||
if (comb.isActive()) {
|
||||
ExtraBees.proxy.registerModel(ExtraBees.comb, comb.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();
|
||||
}
|
||||
|
||||
@@ -0,0 +1,11 @@
|
||||
package binnie.extrabees.items;
|
||||
|
||||
import net.minecraft.item.Item;
|
||||
|
||||
import net.minecraftforge.fml.relauncher.Side;
|
||||
import net.minecraftforge.fml.relauncher.SideOnly;
|
||||
|
||||
public interface IItemModelProvider {
|
||||
@SideOnly(Side.CLIENT)
|
||||
void registerModel(Item item);
|
||||
}
|
||||
@@ -1,16 +1,23 @@
|
||||
package binnie.extrabees.items;
|
||||
|
||||
import binnie.extrabees.blocks.type.EnumHiveType;
|
||||
import javax.annotation.Nonnull;
|
||||
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.client.renderer.block.model.ModelResourceLocation;
|
||||
import net.minecraft.creativetab.CreativeTabs;
|
||||
import net.minecraft.item.Item;
|
||||
import net.minecraft.item.ItemBlock;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.util.NonNullList;
|
||||
|
||||
import javax.annotation.Nonnull;
|
||||
import net.minecraftforge.client.model.ModelLoader;
|
||||
|
||||
public class ItemBeehive extends ItemBlock {
|
||||
import net.minecraftforge.fml.relauncher.Side;
|
||||
import net.minecraftforge.fml.relauncher.SideOnly;
|
||||
|
||||
import binnie.extrabees.blocks.type.EnumHiveType;
|
||||
|
||||
public class ItemBeehive extends ItemBlock implements IItemModelProvider {
|
||||
|
||||
@SuppressWarnings("all")
|
||||
public ItemBeehive(@Nonnull final Block block) {
|
||||
@@ -37,4 +44,14 @@ public class ItemBeehive extends ItemBlock {
|
||||
public String getItemStackDisplayName(final ItemStack itemStack) {
|
||||
return EnumHiveType.values()[itemStack.getItemDamage()].toString() + " Hive";
|
||||
}
|
||||
|
||||
@SideOnly(Side.CLIENT)
|
||||
@Override
|
||||
public void registerModel(Item item) {
|
||||
int i = 0;
|
||||
for(EnumHiveType type : EnumHiveType.values()){
|
||||
ModelLoader.setCustomModelResourceLocation(item, i, new ModelResourceLocation("extrabees:hive", "type=" + type.getName()));
|
||||
i++;
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,61 @@
|
||||
/*
|
||||
* Minecraft Forge
|
||||
* Copyright (c) 2016.
|
||||
*
|
||||
* This library is free software; you can redistribute it and/or
|
||||
* modify it under the terms of the GNU Lesser General Public
|
||||
* License as published by the Free Software Foundation version 2.1
|
||||
* of the License.
|
||||
*
|
||||
* This library is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
||||
* Lesser General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU Lesser General Public
|
||||
* License along with this library; if not, write to the Free Software
|
||||
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
||||
*/
|
||||
package binnie.extrabees.items;
|
||||
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.client.renderer.block.model.ModelResourceLocation;
|
||||
import net.minecraft.item.Item;
|
||||
import net.minecraft.item.ItemBlock;
|
||||
import net.minecraft.item.ItemStack;
|
||||
|
||||
import net.minecraftforge.client.model.ModelLoader;
|
||||
|
||||
import net.minecraftforge.fml.relauncher.Side;
|
||||
import net.minecraftforge.fml.relauncher.SideOnly;
|
||||
|
||||
import binnie.extrabees.alveary.BlockAlveary;
|
||||
import binnie.extrabees.alveary.EnumAlvearyLogicType;
|
||||
|
||||
public class ItemBlockAlveary extends ItemBlock implements IItemModelProvider {
|
||||
public ItemBlockAlveary(Block block) {
|
||||
super(block);
|
||||
setRegistryName(block.getRegistryName());
|
||||
setHasSubtypes(true);
|
||||
}
|
||||
|
||||
@Override
|
||||
public int getMetadata(int damage) {
|
||||
return damage;
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getUnlocalizedName(ItemStack stack) {
|
||||
return ((BlockAlveary) block).getUnlocalizedName(stack.getMetadata());
|
||||
}
|
||||
|
||||
@SideOnly(Side.CLIENT)
|
||||
@Override
|
||||
public void registerModel(Item item) {
|
||||
int i = 0;
|
||||
for(EnumAlvearyLogicType type : EnumAlvearyLogicType.values()){
|
||||
ModelLoader.setCustomModelResourceLocation(item, i, new ModelResourceLocation("extrabees:alveary", "type=" + type.getName()));
|
||||
i++;
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1,7 +1,18 @@
|
||||
package binnie.extrabees.items;
|
||||
|
||||
import binnie.extrabees.items.types.EnumHiveFrame;
|
||||
import binnie.extrabees.utils.ExtraBeesResourceLocation;
|
||||
import javax.annotation.Nullable;
|
||||
import java.util.List;
|
||||
|
||||
import net.minecraft.client.renderer.block.model.ModelResourceLocation;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.item.Item;
|
||||
import net.minecraft.item.ItemStack;
|
||||
|
||||
import net.minecraftforge.client.model.ModelLoader;
|
||||
|
||||
import net.minecraftforge.fml.relauncher.Side;
|
||||
import net.minecraftforge.fml.relauncher.SideOnly;
|
||||
|
||||
import forestry.api.apiculture.IBee;
|
||||
import forestry.api.apiculture.IBeeGenome;
|
||||
import forestry.api.apiculture.IBeeHousing;
|
||||
@@ -11,16 +22,9 @@ import forestry.api.core.IItemModelRegister;
|
||||
import forestry.api.core.IModelManager;
|
||||
import forestry.api.core.Tabs;
|
||||
import forestry.core.utils.Translator;
|
||||
import net.minecraft.client.renderer.block.model.ModelResourceLocation;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.item.Item;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraftforge.client.model.ModelLoader;
|
||||
import net.minecraftforge.fml.relauncher.Side;
|
||||
import net.minecraftforge.fml.relauncher.SideOnly;
|
||||
|
||||
import javax.annotation.Nullable;
|
||||
import java.util.List;
|
||||
import binnie.extrabees.items.types.EnumHiveFrame;
|
||||
import binnie.extrabees.utils.ExtraBeesResourceLocation;
|
||||
|
||||
public class ItemHiveFrame extends Item implements IHiveFrame, IBeeModifier, IItemModelRegister {
|
||||
|
||||
|
||||
@@ -1,21 +1,25 @@
|
||||
package binnie.extrabees.items;
|
||||
|
||||
import net.minecraft.init.Blocks;
|
||||
import net.minecraft.init.Items;
|
||||
import net.minecraft.item.ItemStack;
|
||||
|
||||
import net.minecraftforge.oredict.OreDictionary;
|
||||
|
||||
import net.minecraftforge.fml.relauncher.Side;
|
||||
import net.minecraftforge.fml.relauncher.SideOnly;
|
||||
|
||||
import forestry.api.core.Tabs;
|
||||
import forestry.apiculture.PluginApiculture;
|
||||
import forestry.core.PluginCore;
|
||||
import forestry.core.items.IColoredItem;
|
||||
|
||||
import binnie.extrabees.ExtraBees;
|
||||
import binnie.extrabees.items.types.EnumHoneyComb;
|
||||
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.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;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraftforge.fml.relauncher.Side;
|
||||
import net.minecraftforge.fml.relauncher.SideOnly;
|
||||
import net.minecraftforge.oredict.OreDictionary;
|
||||
|
||||
public class ItemHoneyComb extends ItemProduct implements IColoredItem {
|
||||
|
||||
|
||||
@@ -1,31 +1,181 @@
|
||||
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.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, IItemModelProvider {
|
||||
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) {
|
||||
ModelLoader.registerItemVariants(item, new ModelResourceLocation("extrabees:honey_crystal_full", "inventory"), new ModelResourceLocation("extrabees:honey_crystal_empty", "inventory"), new ModelResourceLocation("extrabees:honey_crystal", "inventory"));
|
||||
ModelLoader.setCustomMeshDefinition(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,9 +1,11 @@
|
||||
package binnie.extrabees.items;
|
||||
|
||||
import binnie.extrabees.items.types.EnumHoneyDrop;
|
||||
import net.minecraft.item.ItemStack;
|
||||
|
||||
import forestry.api.core.Tabs;
|
||||
import forestry.core.items.IColoredItem;
|
||||
import net.minecraft.item.ItemStack;
|
||||
|
||||
import binnie.extrabees.items.types.EnumHoneyDrop;
|
||||
|
||||
public class ItemHoneyDrop extends ItemProduct implements IColoredItem {
|
||||
|
||||
|
||||
@@ -1,17 +1,19 @@
|
||||
package binnie.extrabees.items;
|
||||
|
||||
import binnie.extrabees.items.types.IndustrialFrame;
|
||||
import javax.annotation.Nullable;
|
||||
import java.util.List;
|
||||
|
||||
import net.minecraft.creativetab.CreativeTabs;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.item.Item;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.nbt.NBTTagCompound;
|
||||
import net.minecraft.util.NonNullList;
|
||||
|
||||
import net.minecraftforge.fml.relauncher.Side;
|
||||
import net.minecraftforge.fml.relauncher.SideOnly;
|
||||
|
||||
import javax.annotation.Nullable;
|
||||
import java.util.List;
|
||||
import binnie.extrabees.items.types.IndustrialFrame;
|
||||
|
||||
public class ItemIndustrialFrame extends Item {
|
||||
|
||||
|
||||
@@ -1,19 +1,23 @@
|
||||
package binnie.extrabees.items;
|
||||
|
||||
import binnie.extrabees.items.types.IEBEnumItem;
|
||||
import binnie.extrabees.items.types.IEBItemMiscProvider;
|
||||
import binnie.extrabees.utils.ExtraBeesResourceLocation;
|
||||
import forestry.api.core.IModelManager;
|
||||
import java.util.List;
|
||||
|
||||
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.minecraftforge.client.model.ModelLoader;
|
||||
|
||||
import net.minecraftforge.fml.relauncher.Side;
|
||||
import net.minecraftforge.fml.relauncher.SideOnly;
|
||||
|
||||
import java.util.List;
|
||||
import forestry.api.core.IModelManager;
|
||||
|
||||
import binnie.extrabees.items.types.IEBEnumItem;
|
||||
import binnie.extrabees.items.types.IEBItemMiscProvider;
|
||||
import binnie.extrabees.utils.ExtraBeesResourceLocation;
|
||||
|
||||
public class ItemMiscProduct extends ItemProduct {
|
||||
|
||||
|
||||
@@ -1,17 +1,21 @@
|
||||
package binnie.extrabees.items;
|
||||
|
||||
import binnie.extrabees.items.types.IEBEnumItem;
|
||||
import forestry.api.core.IItemModelRegister;
|
||||
import forestry.api.core.IModelManager;
|
||||
import net.minecraft.client.renderer.block.model.ModelResourceLocation;
|
||||
import net.minecraft.creativetab.CreativeTabs;
|
||||
import net.minecraft.item.Item;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.util.NonNullList;
|
||||
|
||||
import net.minecraftforge.client.model.ModelLoader;
|
||||
|
||||
import net.minecraftforge.fml.relauncher.Side;
|
||||
import net.minecraftforge.fml.relauncher.SideOnly;
|
||||
|
||||
import forestry.api.core.IItemModelRegister;
|
||||
import forestry.api.core.IModelManager;
|
||||
|
||||
import binnie.extrabees.items.types.IEBEnumItem;
|
||||
|
||||
public class ItemProduct extends Item implements IItemModelRegister {
|
||||
|
||||
protected IEBEnumItem[] types;
|
||||
|
||||
@@ -1,9 +1,11 @@
|
||||
package binnie.extrabees.items;
|
||||
|
||||
import binnie.extrabees.items.types.EnumPropolis;
|
||||
import net.minecraft.item.ItemStack;
|
||||
|
||||
import forestry.api.core.Tabs;
|
||||
import forestry.core.items.IColoredItem;
|
||||
import net.minecraft.item.ItemStack;
|
||||
|
||||
import binnie.extrabees.items.types.EnumPropolis;
|
||||
|
||||
public class ItemPropolis extends ItemProduct implements IColoredItem {
|
||||
|
||||
|
||||
@@ -1,27 +1,30 @@
|
||||
package binnie.extrabees.items.types;
|
||||
|
||||
import binnie.extrabees.ExtraBees;
|
||||
import binnie.extrabees.items.ItemHiveFrame;
|
||||
import binnie.extrabees.utils.BeeModifierLogic;
|
||||
import binnie.extrabees.utils.EnumBeeBooleanModifier;
|
||||
import binnie.extrabees.utils.EnumBeeModifier;
|
||||
import javax.annotation.Nullable;
|
||||
import java.util.List;
|
||||
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
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.fml.relauncher.Side;
|
||||
import net.minecraftforge.fml.relauncher.SideOnly;
|
||||
|
||||
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.apiculture.PluginApiculture;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
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.fml.relauncher.Side;
|
||||
import net.minecraftforge.fml.relauncher.SideOnly;
|
||||
|
||||
import javax.annotation.Nullable;
|
||||
import java.util.List;
|
||||
import binnie.extrabees.ExtraBees;
|
||||
import binnie.extrabees.items.ItemHiveFrame;
|
||||
import binnie.extrabees.utils.BeeModifierLogic;
|
||||
import binnie.extrabees.utils.EnumBeeBooleanModifier;
|
||||
import binnie.extrabees.utils.EnumBeeModifier;
|
||||
|
||||
public enum EnumHiveFrame implements IHiveFrame, IBeeModifier {
|
||||
|
||||
|
||||
@@ -1,17 +1,21 @@
|
||||
package binnie.extrabees.items.types;
|
||||
|
||||
import binnie.extrabees.ExtraBees;
|
||||
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;
|
||||
|
||||
import net.minecraft.init.Blocks;
|
||||
import net.minecraft.item.Item;
|
||||
import net.minecraft.item.ItemStack;
|
||||
|
||||
import net.minecraftforge.oredict.OreDictionary;
|
||||
|
||||
import forestry.api.recipes.RecipeManagers;
|
||||
|
||||
import binnie.extrabees.ExtraBees;
|
||||
|
||||
public enum EnumHoneyComb implements IEBEnumItem {
|
||||
|
||||
BARREN(7564356, 12762791),
|
||||
|
||||
@@ -1,11 +1,14 @@
|
||||
package binnie.extrabees.items.types;
|
||||
|
||||
import net.minecraft.item.ItemStack;
|
||||
|
||||
import net.minecraftforge.fluids.FluidRegistry;
|
||||
import net.minecraftforge.fluids.FluidStack;
|
||||
|
||||
import forestry.api.recipes.RecipeManagers;
|
||||
|
||||
import binnie.extrabees.ExtraBees;
|
||||
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 IEBEnumItem {
|
||||
|
||||
|
||||
@@ -1,10 +1,13 @@
|
||||
package binnie.extrabees.items.types;
|
||||
|
||||
import net.minecraft.item.ItemStack;
|
||||
|
||||
import net.minecraftforge.fluids.FluidStack;
|
||||
|
||||
import forestry.api.recipes.RecipeManagers;
|
||||
|
||||
import binnie.extrabees.ExtraBees;
|
||||
import binnie.extrabees.utils.Utils;
|
||||
import forestry.api.recipes.RecipeManagers;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraftforge.fluids.FluidStack;
|
||||
|
||||
public enum EnumPropolis implements IEBEnumItem {
|
||||
WATER(2405321, 12762791, "Water"),
|
||||
|
||||
@@ -1,12 +1,14 @@
|
||||
package binnie.extrabees.items.types;
|
||||
|
||||
import binnie.extrabees.ExtraBees;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraftforge.oredict.OreDictionary;
|
||||
|
||||
import javax.annotation.Nullable;
|
||||
import java.util.List;
|
||||
|
||||
import net.minecraft.item.ItemStack;
|
||||
|
||||
import net.minecraftforge.oredict.OreDictionary;
|
||||
|
||||
import binnie.extrabees.ExtraBees;
|
||||
|
||||
public enum ExtraBeeItems implements IEBItemMiscProvider {
|
||||
|
||||
ScentedGear("Scented Gear", "scented_gear"),
|
||||
|
||||
@@ -1,12 +1,13 @@
|
||||
package binnie.extrabees.items.types;
|
||||
|
||||
import forestry.api.apiculture.IBeeGenome;
|
||||
import forestry.api.apiculture.IBeeModifier;
|
||||
import javax.annotation.Nullable;
|
||||
|
||||
import net.minecraft.item.Item;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.nbt.NBTTagCompound;
|
||||
|
||||
import javax.annotation.Nullable;
|
||||
import forestry.api.apiculture.IBeeGenome;
|
||||
import forestry.api.apiculture.IBeeModifier;
|
||||
|
||||
public enum IndustrialFrame implements IBeeModifier {
|
||||
|
||||
|
||||
@@ -1,10 +1,10 @@
|
||||
package binnie.extrabees.proxy;
|
||||
|
||||
import binnie.extrabees.ExtraBees;
|
||||
import binnie.extrabees.utils.ExtraBeesResourceLocation;
|
||||
import com.google.common.collect.ImmutableList;
|
||||
import forestry.core.models.BlankModel;
|
||||
import forestry.core.models.ModelManager;
|
||||
|
||||
import javax.annotation.Nonnull;
|
||||
import javax.annotation.Nullable;
|
||||
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.client.Minecraft;
|
||||
import net.minecraft.client.renderer.block.model.IBakedModel;
|
||||
@@ -16,17 +16,23 @@ import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.util.ResourceLocation;
|
||||
import net.minecraft.util.registry.IRegistry;
|
||||
import net.minecraft.world.World;
|
||||
|
||||
import net.minecraftforge.client.event.ModelBakeEvent;
|
||||
import net.minecraftforge.client.model.ModelLoader;
|
||||
|
||||
import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
|
||||
|
||||
import javax.annotation.Nonnull;
|
||||
import javax.annotation.Nullable;
|
||||
import forestry.core.models.BlankModel;
|
||||
import forestry.core.models.ModelManager;
|
||||
|
||||
import binnie.extrabees.ExtraBees;
|
||||
import binnie.extrabees.items.IItemModelProvider;
|
||||
import binnie.extrabees.utils.ExtraBeesResourceLocation;
|
||||
|
||||
public class ExtraBeesClientProxy extends ExtraBeesCommonProxy {
|
||||
|
||||
|
||||
private static final ModelManager modelManager = ModelManager.getInstance();
|
||||
|
||||
|
||||
private static IBakedModel bakeModelFor(Block block) {
|
||||
return new BlankModel() {
|
||||
|
||||
@@ -43,25 +49,28 @@ public class ExtraBeesClientProxy extends ExtraBeesCommonProxy {
|
||||
}
|
||||
};
|
||||
}
|
||||
|
||||
|
||||
@Override
|
||||
public Item registerItem(Item item) {
|
||||
modelManager.registerItemClient(item);
|
||||
if(item instanceof IItemModelProvider){
|
||||
((IItemModelProvider) item).registerModel(item);
|
||||
}
|
||||
return super.registerItem(item);
|
||||
}
|
||||
|
||||
@Override
|
||||
public Block registerBlock(Block block) {
|
||||
modelManager.registerBlockClient(block);
|
||||
return super.registerBlock(block);
|
||||
}
|
||||
|
||||
@Override
|
||||
public Item registerItem(Item item) {
|
||||
modelManager.registerItemClient(item);
|
||||
return super.registerItem(item);
|
||||
}
|
||||
|
||||
|
||||
@Override
|
||||
@SuppressWarnings("all")
|
||||
public void registerModel(@Nonnull Item item, int meta) {
|
||||
ModelLoader.setCustomModelResourceLocation(item, meta, new ModelResourceLocation(item.getRegistryName(), "inventory"));
|
||||
}
|
||||
|
||||
|
||||
@SubscribeEvent
|
||||
public void onModelsBaked(ModelBakeEvent event) {
|
||||
IRegistry<ModelResourceLocation, IBakedModel> registry = event.getModelRegistry();
|
||||
|
||||
@@ -1,11 +1,13 @@
|
||||
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.registry.GameRegistry;
|
||||
|
||||
import binnie.extrabees.genetics.ExtraBeesSpecies;
|
||||
|
||||
public class ExtraBeesCommonProxy {
|
||||
|
||||
public void registerBeeModel(ExtraBeesSpecies type) {
|
||||
@@ -21,6 +23,10 @@ public class ExtraBeesCommonProxy {
|
||||
|
||||
@SuppressWarnings("deprecation")
|
||||
public String localise(String s) {
|
||||
return I18n.translateToLocal("extrabees." + s);
|
||||
}
|
||||
|
||||
public String localiseWithOutPrefix(String s) {
|
||||
return I18n.translateToLocal(s);
|
||||
}
|
||||
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
@FieldsAreNonnullByDefault
|
||||
package binnie.extrabees.proxy;
|
||||
|
||||
import binnie.extrabees.utils.FieldsAreNonnullByDefault;
|
||||
import mcp.MethodsReturnNonnullByDefault;
|
||||
import javax.annotation.ParametersAreNonnullByDefault;
|
||||
|
||||
import javax.annotation.ParametersAreNonnullByDefault;
|
||||
import binnie.extrabees.utils.FieldsAreNonnullByDefault;
|
||||
import mcp.MethodsReturnNonnullByDefault;
|
||||
@@ -1,16 +1,17 @@
|
||||
package binnie.extrabees.utils;
|
||||
|
||||
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 org.apache.commons.lang3.tuple.Pair;
|
||||
|
||||
import net.minecraft.init.Blocks;
|
||||
import net.minecraft.item.Item;
|
||||
import net.minecraft.item.ItemStack;
|
||||
|
||||
import static org.apache.commons.lang3.ObjectUtils.firstNonNull;
|
||||
|
||||
public class AlvearyMutationHandler {
|
||||
|
||||
@@ -1,16 +1,18 @@
|
||||
package binnie.extrabees.utils;
|
||||
|
||||
import forestry.core.utils.Translator;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraftforge.fml.relauncher.Side;
|
||||
import net.minecraftforge.fml.relauncher.SideOnly;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.HashMap;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.item.ItemStack;
|
||||
|
||||
import net.minecraftforge.fml.relauncher.Side;
|
||||
import net.minecraftforge.fml.relauncher.SideOnly;
|
||||
|
||||
import forestry.core.utils.Translator;
|
||||
|
||||
public class BeeModifierLogic {
|
||||
|
||||
private Map<EnumBeeModifier, Float[]> modifiers;
|
||||
|
||||
@@ -1,8 +1,9 @@
|
||||
package binnie.extrabees.utils;
|
||||
|
||||
import binnie.extrabees.ExtraBees;
|
||||
import net.minecraft.util.ResourceLocation;
|
||||
|
||||
import binnie.extrabees.ExtraBees;
|
||||
|
||||
public class ExtraBeesResourceLocation extends ResourceLocation {
|
||||
|
||||
public ExtraBeesResourceLocation(String resourceName) {
|
||||
|
||||
@@ -1,13 +1,14 @@
|
||||
package binnie.extrabees.utils;
|
||||
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.util.NonNullList;
|
||||
import net.minecraft.util.math.BlockPos;
|
||||
import net.minecraft.world.IBlockAccess;
|
||||
|
||||
import forestry.api.apiculture.IAlleleBeeSpecies;
|
||||
import forestry.api.apiculture.IBee;
|
||||
import forestry.api.apiculture.IHiveDrop;
|
||||
import forestry.api.genetics.IAllele;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.util.NonNullList;
|
||||
import net.minecraft.util.math.BlockPos;
|
||||
import net.minecraft.world.IBlockAccess;
|
||||
|
||||
public class HiveDrop implements IHiveDrop {
|
||||
|
||||
|
||||
@@ -1,9 +1,7 @@
|
||||
package binnie.extrabees.utils;
|
||||
|
||||
import forestry.api.apiculture.BeeManager;
|
||||
import forestry.api.apiculture.IAlleleBeeSpecies;
|
||||
import forestry.api.apiculture.IBeeRoot;
|
||||
import forestry.apiculture.genetics.BeeDefinition;
|
||||
import javax.annotation.Nullable;
|
||||
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.item.Item;
|
||||
import net.minecraft.tileentity.TileEntity;
|
||||
@@ -12,12 +10,17 @@ 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;
|
||||
import forestry.api.apiculture.BeeManager;
|
||||
import forestry.api.apiculture.IAlleleBeeSpecies;
|
||||
import forestry.api.apiculture.IBeeRoot;
|
||||
import forestry.apiculture.genetics.BeeDefinition;
|
||||
|
||||
public class Utils {
|
||||
|
||||
|
||||
@@ -2,11 +2,12 @@ package binnie.extrabees.utils.config;
|
||||
|
||||
import com.google.common.base.Preconditions;
|
||||
import com.google.common.collect.Sets;
|
||||
import net.minecraftforge.common.config.Configuration;
|
||||
|
||||
import java.io.File;
|
||||
import java.util.Set;
|
||||
|
||||
import net.minecraftforge.common.config.Configuration;
|
||||
|
||||
public class ConfigHandler {
|
||||
|
||||
private final Configuration config;
|
||||
|
||||
@@ -1,8 +1,7 @@
|
||||
package binnie.extrabees.worldgen;
|
||||
|
||||
import binnie.extrabees.ExtraBees;
|
||||
import binnie.extrabees.blocks.BlockExtraBeeHive;
|
||||
import binnie.extrabees.blocks.type.EnumHiveType;
|
||||
import java.util.Random;
|
||||
|
||||
import net.minecraft.block.state.IBlockState;
|
||||
import net.minecraft.block.state.pattern.BlockStateMatcher;
|
||||
import net.minecraft.init.Blocks;
|
||||
@@ -10,7 +9,9 @@ import net.minecraft.util.math.BlockPos;
|
||||
import net.minecraft.world.World;
|
||||
import net.minecraft.world.gen.feature.WorldGenerator;
|
||||
|
||||
import java.util.Random;
|
||||
import binnie.extrabees.ExtraBees;
|
||||
import binnie.extrabees.blocks.BlockExtraBeeHive;
|
||||
import binnie.extrabees.blocks.type.EnumHiveType;
|
||||
|
||||
public class WorldGenHiveRock extends WorldGenHive {
|
||||
|
||||
|
||||
@@ -1,15 +1,16 @@
|
||||
package binnie.extrabees.worldgen;
|
||||
|
||||
import binnie.extrabees.ExtraBees;
|
||||
import binnie.extrabees.blocks.BlockExtraBeeHive;
|
||||
import binnie.extrabees.blocks.type.EnumHiveType;
|
||||
import java.util.Random;
|
||||
|
||||
import net.minecraft.block.material.Material;
|
||||
import net.minecraft.init.Blocks;
|
||||
import net.minecraft.util.math.BlockPos;
|
||||
import net.minecraft.world.World;
|
||||
import net.minecraft.world.gen.feature.WorldGenerator;
|
||||
|
||||
import java.util.Random;
|
||||
import binnie.extrabees.ExtraBees;
|
||||
import binnie.extrabees.blocks.BlockExtraBeeHive;
|
||||
import binnie.extrabees.blocks.type.EnumHiveType;
|
||||
|
||||
public class WorldGenHiveWater extends WorldGenHive {
|
||||
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
@FieldsAreNonnullByDefault
|
||||
package binnie.extrabees.worldgen;
|
||||
|
||||
import binnie.extrabees.utils.FieldsAreNonnullByDefault;
|
||||
import mcp.MethodsReturnNonnullByDefault;
|
||||
import javax.annotation.ParametersAreNonnullByDefault;
|
||||
|
||||
import javax.annotation.ParametersAreNonnullByDefault;
|
||||
import binnie.extrabees.utils.FieldsAreNonnullByDefault;
|
||||
import mcp.MethodsReturnNonnullByDefault;
|
||||
Reference in new issue
Block a user