Improve code readability for binnie.core package (#14)

This commit is contained in:
Alexander Kornilov authored and mezz committed 2017-04-22 18:31:40 -07:00
1 parent a610833a24
commit d251d83105
241 files changed
+5085 -5971

No files matched your search

+18 -33
View File
@@ -1,39 +1,24 @@
//
// Decompiled by Procyon v0.5.30
//
package binnie;
import java.util.ArrayList;
import binnie.core.resource.ManagerResource;
import binnie.core.item.ManagerItem;
import binnie.core.machines.ManagerMachine;
import binnie.core.liquid.ManagerLiquid;
import binnie.core.mod.config.ManagerConfig;
import binnie.core.genetics.ManagerGenetics;
import binnie.core.language.ManagerLanguage;
import binnie.core.ManagerBase;
import binnie.core.genetics.ManagerGenetics;
import binnie.core.item.ManagerItem;
import binnie.core.language.ManagerLanguage;
import binnie.core.liquid.ManagerLiquid;
import binnie.core.machines.ManagerMachine;
import binnie.core.mod.config.ManagerConfig;
import binnie.core.resource.ManagerResource;
import java.util.ArrayList;
import java.util.List;
public final class Binnie
{
public static final List<ManagerBase> Managers;
public static final ManagerLanguage Language;
public static final ManagerGenetics Genetics;
public static final ManagerConfig Configuration;
public static final ManagerLiquid Liquid;
public static final ManagerMachine Machine;
public static final ManagerItem Item;
public static final ManagerResource Resource;
static {
Managers = new ArrayList<ManagerBase>();
Language = new ManagerLanguage();
Genetics = new ManagerGenetics();
Configuration = new ManagerConfig();
Liquid = new ManagerLiquid();
Machine = new ManagerMachine();
Item = new ManagerItem();
Resource = new ManagerResource();
}
public final class Binnie {
public static List<ManagerBase> Managers = new ArrayList<>();
public static ManagerLanguage Language = new ManagerLanguage();
public static ManagerGenetics Genetics = new ManagerGenetics();
public static ManagerConfig Configuration = new ManagerConfig();
public static ManagerLiquid Liquid = new ManagerLiquid();
public static ManagerMachine Machine = new ManagerMachine();
public static ManagerItem Item = new ManagerItem();
public static ManagerResource Resource = new ManagerResource();
}
+2 -6
View File
@@ -1,11 +1,7 @@
//
// Decompiled by Procyon v0.5.30
//
package binnie;
public final class Constants
{
// TODO unusing class?
public final class Constants {
public static final String LiquidJuice = "juice";
public static final String LiquidWater = "water";
public static final String LiquidSeedOil = "seedoil";
@@ -4,29 +4,30 @@
package binnie.botany.ceramic;
import net.minecraft.util.MovingObjectPosition;
import binnie.botany.Botany;
import net.minecraft.client.renderer.texture.IIconRegister;
import binnie.botany.CreativeTabBotany;
import binnie.botany.genetics.EnumFlowerColor;
import binnie.core.block.BlockMetadata;
import binnie.core.block.IBlockMetadata;
import binnie.core.block.TileEntityMetadata;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import net.minecraft.util.IIcon;
import net.minecraft.world.IBlockAccess;
import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.item.Item;
import java.util.List;
import binnie.botany.genetics.EnumFlowerColor;
import net.minecraftforge.common.util.ForgeDirection;
import binnie.core.block.TileEntityMetadata;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.entity.player.EntityPlayer;
import binnie.core.block.BlockMetadata;
import net.minecraft.item.ItemStack;
import java.util.ArrayList;
import net.minecraft.world.World;
import binnie.botany.CreativeTabBotany;
import net.minecraft.block.material.Material;
import binnie.core.block.IBlockMetadata;
import net.minecraft.block.Block;
import net.minecraft.block.material.Material;
import net.minecraft.client.renderer.texture.IIconRegister;
import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.IIcon;
import net.minecraft.util.MovingObjectPosition;
import net.minecraft.world.IBlockAccess;
import net.minecraft.world.World;
import net.minecraftforge.common.util.ForgeDirection;
import java.util.ArrayList;
import java.util.List;
public class BlockCeramic extends Block implements IBlockMetadata
{
@@ -66,8 +67,8 @@ public class BlockCeramic extends Block implements IBlockMetadata
}
@Override
public int getPlacedMeta(final ItemStack stack, final World world, final int x, final int y, final int z, final ForgeDirection clickedBlock) {
return TileEntityMetadata.getItemDamage(stack);
public int getPlacedMeta(final ItemStack itemStack, final World world, final int x, final int y, final int z, final ForgeDirection direction) {
return TileEntityMetadata.getItemDamage(itemStack);
}
@Override
@@ -76,18 +77,18 @@ public class BlockCeramic extends Block implements IBlockMetadata
}
@Override
public String getBlockName(final ItemStack par1ItemStack) {
final int meta = TileEntityMetadata.getItemDamage(par1ItemStack);
public String getBlockName(final ItemStack itemStack) {
final int meta = TileEntityMetadata.getItemDamage(itemStack);
return EnumFlowerColor.get(meta).getName() + " Ceramic Block";
}
@Override
public void getBlockTooltip(final ItemStack par1ItemStack, final List par3List) {
public void getBlockTooltip(final ItemStack itemStack, final List tooltip) {
}
@Override
public void dropAsStack(final World world, final int x, final int y, final int z, final ItemStack drop) {
this.dropBlockAsItem(world, x, y, z, drop);
public void dropAsStack(final World world, final int x, final int y, final int z, final ItemStack itemStack) {
this.dropBlockAsItem(world, x, y, z, itemStack);
}
@Override
@@ -74,8 +74,8 @@ public class BlockCeramicBrick extends Block implements IBlockMetadata, IMultipa
}
@Override
public int getPlacedMeta(final ItemStack stack, final World world, final int x, final int y, final int z, final ForgeDirection clickedBlock) {
return TileEntityMetadata.getItemDamage(stack);
public int getPlacedMeta(final ItemStack itemStack, final World world, final int x, final int y, final int z, final ForgeDirection direction) {
return TileEntityMetadata.getItemDamage(itemStack);
}
@Override
@@ -84,18 +84,18 @@ public class BlockCeramicBrick extends Block implements IBlockMetadata, IMultipa
}
@Override
public String getBlockName(final ItemStack par1ItemStack) {
final int meta = TileEntityMetadata.getItemDamage(par1ItemStack);
public String getBlockName(final ItemStack itemStack) {
final int meta = TileEntityMetadata.getItemDamage(itemStack);
return getType(meta).getName();
}
@Override
public void getBlockTooltip(final ItemStack par1ItemStack, final List par3List) {
public void getBlockTooltip(final ItemStack itemStack, final List tooltip) {
}
@Override
public void dropAsStack(final World world, final int x, final int y, final int z, final ItemStack drop) {
this.dropBlockAsItem(world, x, y, z, drop);
public void dropAsStack(final World world, final int x, final int y, final int z, final ItemStack itemStack) {
this.dropBlockAsItem(world, x, y, z, itemStack);
}
@Override
@@ -4,32 +4,33 @@
package binnie.botany.ceramic;
import net.minecraft.util.MovingObjectPosition;
import binnie.botany.Botany;
import net.minecraft.client.renderer.texture.IIconRegister;
import net.minecraft.util.IIcon;
import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.item.Item;
import java.util.List;
import binnie.botany.CreativeTabBotany;
import binnie.botany.genetics.EnumFlowerColor;
import net.minecraftforge.common.util.ForgeDirection;
import binnie.core.block.TileEntityMetadata;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.entity.player.EntityPlayer;
import binnie.core.block.BlockMetadata;
import net.minecraft.item.ItemStack;
import java.util.ArrayList;
import net.minecraft.world.World;
import binnie.core.block.IBlockMetadata;
import binnie.core.block.TileEntityMetadata;
import binnie.extratrees.ExtraTrees;
import net.minecraft.util.Facing;
import net.minecraft.world.IBlockAccess;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import java.util.Random;
import binnie.botany.CreativeTabBotany;
import net.minecraft.block.material.Material;
import binnie.core.block.IBlockMetadata;
import net.minecraft.block.Block;
import net.minecraft.block.material.Material;
import net.minecraft.client.renderer.texture.IIconRegister;
import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.Facing;
import net.minecraft.util.IIcon;
import net.minecraft.util.MovingObjectPosition;
import net.minecraft.world.IBlockAccess;
import net.minecraft.world.World;
import net.minecraftforge.common.util.ForgeDirection;
import java.util.ArrayList;
import java.util.List;
import java.util.Random;
public class BlockStained extends Block implements IBlockMetadata
{
@@ -96,8 +97,8 @@ public class BlockStained extends Block implements IBlockMetadata
}
@Override
public int getPlacedMeta(final ItemStack stack, final World world, final int x, final int y, final int z, final ForgeDirection clickedBlock) {
return TileEntityMetadata.getItemDamage(stack);
public int getPlacedMeta(final ItemStack itemStack, final World world, final int x, final int y, final int z, final ForgeDirection direction) {
return TileEntityMetadata.getItemDamage(itemStack);
}
@Override
@@ -106,18 +107,18 @@ public class BlockStained extends Block implements IBlockMetadata
}
@Override
public String getBlockName(final ItemStack par1ItemStack) {
final int meta = TileEntityMetadata.getItemDamage(par1ItemStack);
public String getBlockName(final ItemStack itemStack) {
final int meta = TileEntityMetadata.getItemDamage(itemStack);
return EnumFlowerColor.get(meta).getName() + " Pigmented Glass";
}
@Override
public void getBlockTooltip(final ItemStack par1ItemStack, final List par3List) {
public void getBlockTooltip(final ItemStack itemStack, final List tooltip) {
}
@Override
public void dropAsStack(final World world, final int x, final int y, final int z, final ItemStack drop) {
this.dropBlockAsItem(world, x, y, z, drop);
public void dropAsStack(final World world, final int x, final int y, final int z, final ItemStack itemStack) {
this.dropBlockAsItem(world, x, y, z, itemStack);
}
@Override
@@ -24,13 +24,10 @@ import net.minecraft.world.World;
import forestry.lepidopterology.entities.EntityButterfly;
import binnie.botany.gardening.BlockPlant;
import net.minecraft.entity.Entity;
import net.minecraft.entity.item.EntityItem;
import binnie.botany.api.EnumFlowerStage;
import cpw.mods.fml.common.network.simpleimpl.IMessage;
import binnie.botany.network.MessageFlowerUpdate;
import net.minecraft.network.Packet;
@@ -57,7 +54,6 @@ import java.util.EnumSet;
import binnie.botany.core.BotanyCore;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTBase;
import binnie.Binnie;
import binnie.core.BinnieCore;
@@ -307,7 +303,7 @@ public class TileEntityFlower extends TileEntity implements IPollinatable, IButt
if (this.renderInfo == null && this.getFlower() != null && this.getFlower().getGenome() != null) {
this.renderInfo = new RenderInfo(this.getFlower(), this);
}
return (this.renderInfo != null) ? Botany.instance.getNetworkWrapper().getPacketFrom(new MessageFlowerUpdate(this.xCoord, this.yCoord, this.zCoord, this.renderInfo).GetMessage()) : null;
return (this.renderInfo != null) ? Botany.instance.getNetworkWrapper().getPacketFrom(new MessageFlowerUpdate(this.xCoord, this.yCoord, this.zCoord, this.renderInfo).getMessage()) : null;
}
public void updateRender(final boolean update) {
@@ -33,7 +33,7 @@ public enum BotanyItems implements IItemMisc
}
@Override
public IIcon getIcon(final ItemStack stack) {
public IIcon getIcon(final ItemStack itemStack) {
return this.icon;
}
@@ -43,17 +43,17 @@ public enum BotanyItems implements IItemMisc
}
@Override
public void addInformation(final List par3List) {
public void addInformation(final List data) {
}
@Override
public String getName(final ItemStack stack) {
public String getName(final ItemStack itemStack) {
return this.name;
}
@Override
public ItemStack get(final int size) {
return new ItemStack(Botany.misc, size, this.ordinal());
public ItemStack get(final int count) {
return new ItemStack(Botany.misc, count, this.ordinal());
}
@Override
+50 -50
View File
@@ -1,35 +1,32 @@
//
// Decompiled by Procyon v0.5.30
//
package binnie.core;
import cpw.mods.fml.relauncher.Side;
import binnie.core.network.packet.MessageBinnie;
import cpw.mods.fml.common.network.NetworkRegistry;
import binnie.core.mod.parser.FieldParser;
import binnie.Binnie;
import binnie.core.network.BinniePacketHandler;
import binnie.core.proxy.IProxyCore;
import binnie.core.gui.IBinnieGUID;
import binnie.core.mod.parser.FieldParser;
import binnie.core.network.BinniePacketHandler;
import binnie.core.network.IPacketID;
import net.minecraftforge.common.MinecraftForge;
import java.util.ArrayList;
import java.util.List;
import java.lang.reflect.Field;
import java.util.LinkedHashSet;
import cpw.mods.fml.common.network.simpleimpl.SimpleNetworkWrapper;
import binnie.core.network.IPacketProvider;
import binnie.core.network.packet.MessageBinnie;
import binnie.core.proxy.IProxyCore;
import cpw.mods.fml.common.network.NetworkRegistry;
import cpw.mods.fml.common.network.simpleimpl.SimpleNetworkWrapper;
import cpw.mods.fml.relauncher.Side;
import net.minecraftforge.common.MinecraftForge;
public abstract class AbstractMod implements IPacketProvider, IInitializable
{
import java.lang.reflect.Field;
import java.util.ArrayList;
import java.util.Collections;
import java.util.LinkedHashSet;
import java.util.List;
public abstract class AbstractMod implements IPacketProvider, IInitializable {
private SimpleNetworkWrapper wrapper;
private LinkedHashSet<Field> fields;
protected List<IInitializable> modules;
public AbstractMod() {
this.fields = new LinkedHashSet<Field>();
this.modules = new ArrayList<IInitializable>();
this.fields = new LinkedHashSet<>();
this.modules = new ArrayList<>();
BinnieCore.registerMod(this);
MinecraftForge.EVENT_BUS.register(this);
}
@@ -57,39 +54,37 @@ public abstract class AbstractMod implements IPacketProvider, IInitializable
public abstract String getModID();
public SimpleNetworkWrapper getNetworkWrapper() {
return this.wrapper;
return wrapper;
}
protected abstract Class<? extends BinniePacketHandler> getPacketHandler();
@Override
public void preInit() {
if (!this.isActive()) {
if (!isActive()) {
return;
}
if (this.getConfigs() != null) {
for (final Class cls : this.getConfigs()) {
if (getConfigs() != null) {
for (Class cls : getConfigs()) {
Binnie.Configuration.registerConfiguration(cls, this);
}
}
this.getProxy().preInit();
for (final IInitializable module : this.modules) {
getProxy().preInit();
for (IInitializable module : modules) {
module.preInit();
}
for (final Field field : this.getClass().getFields()) {
this.fields.add(field);
// TODO what does it mean?
Collections.addAll(fields, getClass().getFields());
for (Class cls : getClass().getClasses()) {
Collections.addAll(fields, getClass().getFields());
}
for (final Class cls : this.getClass().getClasses()) {
for (final Field field2 : this.getClass().getFields()) {
this.fields.add(field2);
}
for (IInitializable module : modules) {
Collections.addAll(fields, module.getClass().getFields());
}
for (final IInitializable module : this.modules) {
for (final Field field3 : module.getClass().getFields()) {
this.fields.add(field3);
}
}
for (final Field field4 : this.fields) {
for (Field field4 : this.fields) {
try {
FieldParser.preInitParse(field4, this);
} catch (Exception e) {
@@ -100,16 +95,19 @@ public abstract class AbstractMod implements IPacketProvider, IInitializable
@Override
public void init() {
if (!this.isActive()) {
if (!isActive()) {
return;
}
this.getProxy().init();
(this.wrapper = NetworkRegistry.INSTANCE.newSimpleChannel(this.getChannel())).registerMessage((Class) this.getPacketHandler(), (Class) MessageBinnie.class, 1, Side.CLIENT);
this.wrapper.registerMessage((Class) this.getPacketHandler(), (Class) MessageBinnie.class, 1, Side.SERVER);
for (final IInitializable module : this.modules) {
getProxy().init();
wrapper = NetworkRegistry.INSTANCE.newSimpleChannel(this.getChannel());
wrapper.registerMessage(getPacketHandler(), MessageBinnie.class, 1, Side.CLIENT);
wrapper.registerMessage(getPacketHandler(), MessageBinnie.class, 1, Side.SERVER);
for (IInitializable module : this.modules) {
module.init();
}
for (final Field field : this.fields) {
for (Field field : this.fields) {
try {
FieldParser.initParse(field, this);
} catch (Exception e) {
@@ -120,14 +118,16 @@ public abstract class AbstractMod implements IPacketProvider, IInitializable
@Override
public void postInit() {
if (!this.isActive()) {
if (!isActive()) {
return;
}
this.getProxy().postInit();
for (final IInitializable module : this.modules) {
getProxy().postInit();
for (IInitializable module : this.modules) {
module.postInit();
}
for (final Field field : this.fields) {
for (Field field : this.fields) {
try {
FieldParser.postInitParse(field, this);
} catch (Exception e) {
@@ -136,8 +136,8 @@ public abstract class AbstractMod implements IPacketProvider, IInitializable
}
}
protected final void addModule(final IInitializable init) {
this.modules.add(init);
protected void addModule(IInitializable init) {
modules.add(init);
MinecraftForge.EVENT_BUS.register(init);
}
}
+69 -79
View File
@@ -1,95 +1,88 @@
//
// Decompiled by Procyon v0.5.30
//
package binnie.core;
import binnie.core.network.BinniePacketHandler;
import binnie.core.mod.config.ConfigurationMain;
import net.minecraft.client.renderer.texture.IIconRegister;
import net.minecraftforge.client.event.TextureStitchEvent;
import binnie.core.network.BinnieCorePacketID;
import binnie.core.network.IPacketID;
import binnie.core.proxy.IBinnieProxy;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import cpw.mods.fml.common.eventhandler.SubscribeEvent;
import net.minecraft.entity.player.EntityPlayerMP;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.server.MinecraftServer;
import forestry.api.core.ForestryEvent;
import java.util.ArrayList;
import forestry.plugins.PluginManager;
import binnie.core.block.TileEntityMetadata;
import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler;
import binnie.core.block.MultipassBlockRenderer;
import cpw.mods.fml.client.registry.RenderingRegistry;
import cpw.mods.fml.common.network.IGuiHandler;
import binnie.core.gui.BinnieGUIHandler;
import cpw.mods.fml.common.network.NetworkRegistry;
import net.minecraft.item.Item;
import binnie.core.mod.parser.ItemParser;
import binnie.core.mod.parser.FieldParser;
import cpw.mods.fml.common.registry.GameRegistry;
import binnie.core.liquid.ItemFluidContainer;
import binnie.core.liquid.FluidContainer;
import binnie.core.gui.BinnieCoreGUI;
import binnie.core.gui.IBinnieGUID;
import cpw.mods.fml.common.event.FMLPostInitializationEvent;
import cpw.mods.fml.common.event.FMLInitializationEvent;
import binnie.core.triggers.ModuleTrigger;
import cpw.mods.fml.common.Loader;
import binnie.core.item.ModuleItems;
import binnie.core.machines.storage.ModuleStorage;
import binnie.craftgui.minecraft.ModuleCraftGUI;
import binnie.core.mod.config.ConfigurationMods;
import binnie.Binnie;
import cpw.mods.fml.common.event.FMLPreInitializationEvent;
import binnie.core.block.MultipassBlockRenderer;
import binnie.core.block.TileEntityMetadata;
import binnie.core.gui.BinnieCoreGUI;
import binnie.core.gui.BinnieGUIHandler;
import binnie.core.gui.IBinnieGUID;
import binnie.core.item.ItemFieldKit;
import binnie.core.item.ItemGenesis;
import binnie.core.item.ModuleItems;
import binnie.core.liquid.FluidContainer;
import binnie.core.liquid.ItemFluidContainer;
import binnie.core.machines.MachineGroup;
import java.util.List;
import cpw.mods.fml.common.SidedProxy;
import binnie.core.machines.storage.ModuleStorage;
import binnie.core.mod.config.ConfigurationMain;
import binnie.core.mod.config.ConfigurationMods;
import binnie.core.mod.parser.FieldParser;
import binnie.core.mod.parser.ItemParser;
import binnie.core.network.BinnieCorePacketID;
import binnie.core.network.BinniePacketHandler;
import binnie.core.network.IPacketID;
import binnie.core.proxy.BinnieProxy;
import binnie.core.proxy.IBinnieProxy;
import binnie.core.triggers.ModuleTrigger;
import binnie.craftgui.minecraft.ModuleCraftGUI;
import cpw.mods.fml.client.registry.RenderingRegistry;
import cpw.mods.fml.common.Loader;
import cpw.mods.fml.common.Mod;
import cpw.mods.fml.common.SidedProxy;
import cpw.mods.fml.common.event.FMLInitializationEvent;
import cpw.mods.fml.common.event.FMLPostInitializationEvent;
import cpw.mods.fml.common.event.FMLPreInitializationEvent;
import cpw.mods.fml.common.eventhandler.SubscribeEvent;
import cpw.mods.fml.common.network.NetworkRegistry;
import cpw.mods.fml.common.registry.GameRegistry;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import forestry.api.core.ForestryEvent;
import forestry.plugins.PluginManager;
import net.minecraft.entity.player.EntityPlayerMP;
import net.minecraft.item.Item;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.server.MinecraftServer;
import net.minecraftforge.client.event.TextureStitchEvent;
import java.util.ArrayList;
import java.util.List;
@Mod(modid = "BinnieCore", name = "Binnie Core", useMetadata = true)
public final class BinnieCore extends AbstractMod
{
public final class BinnieCore extends AbstractMod {
@Mod.Instance("BinnieCore")
public static BinnieCore instance;
@SidedProxy(clientSide = "binnie.core.proxy.BinnieProxyClient", serverSide = "binnie.core.proxy.BinnieProxyServer")
public static BinnieProxy proxy;
public static int multipassRenderID;
private static List<AbstractMod> modList;
private static List<AbstractMod> modList = new ArrayList<>();
public static MachineGroup packageCompartment;
public static ItemGenesis genesis;
public static ItemFieldKit fieldKit;
@Mod.EventHandler
public void preInit(final FMLPreInitializationEvent evt) {
public void preInit(FMLPreInitializationEvent evt) {
Binnie.Configuration.registerConfiguration(ConfigurationMods.class, this);
for (final ManagerBase baseManager : Binnie.Managers) {
this.addModule(baseManager);
for (ManagerBase baseManager : Binnie.Managers) {
addModule(baseManager);
}
this.addModule(new ModuleCraftGUI());
this.addModule(new ModuleStorage());
this.addModule(new ModuleItems());
addModule(new ModuleCraftGUI());
addModule(new ModuleStorage());
addModule(new ModuleItems());
if (Loader.isModLoaded("BuildCraft|Silicon")) {
this.addModule(new ModuleTrigger());
addModule(new ModuleTrigger());
}
this.preInit();
preInit();
}
@Mod.EventHandler
public void init(final FMLInitializationEvent evt) {
this.init();
public void init(FMLInitializationEvent evt) {
init();
}
@Mod.EventHandler
public void postInit(final FMLPostInitializationEvent evt) {
this.postInit();
public void postInit(FMLPostInitializationEvent evt) {
postInit();
}
@Override
@@ -100,8 +93,8 @@ public final class BinnieCore extends AbstractMod
@Override
public void preInit() {
BinnieCore.instance = this;
for (final FluidContainer container : FluidContainer.values()) {
final Item item = new ItemFluidContainer(container);
for (FluidContainer container : FluidContainer.values()) {
Item item = new ItemFluidContainer(container);
GameRegistry.registerItem(item, item.getUnlocalizedName().substring(5));
}
FieldParser.parsers.add(new ItemParser());
@@ -111,9 +104,10 @@ public final class BinnieCore extends AbstractMod
@Override
public void init() {
super.init();
for (final AbstractMod mod : getActiveMods()) {
for (AbstractMod mod : getActiveMods()) {
NetworkRegistry.INSTANCE.registerGuiHandler(mod, new BinnieGUIHandler(mod));
}
BinnieCore.multipassRenderID = RenderingRegistry.getNextAvailableRenderId();
RenderingRegistry.registerBlockHandler(new MultipassBlockRenderer());
GameRegistry.registerTileEntity(TileEntityMetadata.class, "binnie.tile.metadata");
@@ -152,13 +146,13 @@ public final class BinnieCore extends AbstractMod
super.postInit();
}
static void registerMod(final AbstractMod mod) {
static void registerMod(AbstractMod mod) {
BinnieCore.modList.add(mod);
}
private static List<AbstractMod> getActiveMods() {
final List<AbstractMod> list = new ArrayList<AbstractMod>();
for (final AbstractMod mod : BinnieCore.modList) {
List<AbstractMod> list = new ArrayList<>();
for (AbstractMod mod : BinnieCore.modList) {
if (mod.isActive()) {
list.add(mod);
}
@@ -168,16 +162,17 @@ public final class BinnieCore extends AbstractMod
@SubscribeEvent
@SideOnly(Side.CLIENT)
public void handleSpeciesDiscovered(final ForestryEvent.SpeciesDiscovered event) {
public void handleSpeciesDiscovered(ForestryEvent.SpeciesDiscovered event) {
try {
final EntityPlayerMP player = MinecraftServer.getServer().getConfigurationManager().func_152612_a(event.username.getName());
EntityPlayerMP player = MinecraftServer.getServer().getConfigurationManager().func_152612_a(event.username.getName());
if (player == null) {
return;
}
event.tracker.synchToPlayer(player);
final NBTTagCompound nbt = new NBTTagCompound();
NBTTagCompound nbt = new NBTTagCompound();
nbt.setString("species", event.species.getUID());
} catch (Exception ex) {
// ignored
}
}
@@ -203,7 +198,7 @@ public final class BinnieCore extends AbstractMod
@SubscribeEvent
@SideOnly(Side.CLIENT)
public void handleTextureRemap(final TextureStitchEvent.Pre event) {
public void handleTextureRemap(TextureStitchEvent.Pre event) {
if (event.map.getTextureType() == 0) {
Binnie.Liquid.reloadIcons(event.map);
}
@@ -212,7 +207,7 @@ public final class BinnieCore extends AbstractMod
@Override
public Class<?>[] getConfigs() {
return new Class[] { ConfigurationMain.class };
return new Class[]{ConfigurationMain.class};
}
@Override
@@ -225,12 +220,7 @@ public final class BinnieCore extends AbstractMod
return true;
}
static {
BinnieCore.modList = new ArrayList<AbstractMod>();
}
public static class PacketHandler extends BinniePacketHandler
{
public static class PacketHandler extends BinniePacketHandler {
public PacketHandler() {
super(BinnieCore.instance);
}
@@ -1,11 +1,6 @@
//
// Decompiled by Procyon v0.5.30
//
package binnie.core;
public interface IInitializable
{
public interface IInitializable {
void preInit();
void init();
+4 -6
View File
@@ -1,26 +1,24 @@
//
// Decompiled by Procyon v0.5.30
//
package binnie.core;
import binnie.Binnie;
public abstract class ManagerBase implements IInitializable
{
public abstract class ManagerBase implements IInitializable {
public ManagerBase() {
Binnie.Managers.add(this);
}
@Override
public void preInit() {
// ignored
}
@Override
public void init() {
// ignored
}
@Override
public void postInit() {
// ignored
}
}
+23 -30
View File
@@ -1,44 +1,38 @@
//
// Decompiled by Procyon v0.5.30
//
package binnie.core;
import cpw.mods.fml.common.versioning.ArtifactVersion;
import cpw.mods.fml.common.versioning.Restriction;
import cpw.mods.fml.common.versioning.DefaultArtifactVersion;
import cpw.mods.fml.common.Loader;
import net.minecraft.block.Block;
import net.minecraft.item.ItemStack;
import cpw.mods.fml.common.registry.GameRegistry;
import cpw.mods.fml.common.versioning.DefaultArtifactVersion;
import cpw.mods.fml.common.versioning.Restriction;
import net.minecraft.block.Block;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
public class Mods
{
public class Mods {
public static Mod Forestry;
public static Mod IC2;
public static Mod Botania;
private static boolean WARN;
private static Item findItem(final String modId, final String name) {
final Item stack = GameRegistry.findItem(modId, name);
if (stack == null && Mods.WARN && modId == "Forestry") {
private static Item findItem(String modId, String name) {
Item stack = GameRegistry.findItem(modId, name);
if (stack == null && Mods.WARN && modId.equals("Forestry")) {
throw new RuntimeException("Item not found: " + modId + ":" + name);
}
return stack;
}
private static ItemStack findItemStack(final String modId, final String name, final int stackSize) {
final ItemStack stack = GameRegistry.findItemStack(modId, name, stackSize);
if (stack == null && Mods.WARN && modId == "Forestry") {
private static ItemStack findItemStack(String modId, String name, int stackSize) {
ItemStack stack = GameRegistry.findItemStack(modId, name, stackSize);
if (stack == null && Mods.WARN && modId.equals("Forestry")) {
throw new RuntimeException("Stack not found: " + modId + ":" + name);
}
return stack;
}
private static Block findBlock(final String modId, final String name) {
final Block stack = GameRegistry.findBlock(modId, name);
if (stack == null && Mods.WARN && modId == "Forestry") {
private static Block findBlock(String modId, String name) {
Block stack = GameRegistry.findBlock(modId, name);
if (stack == null && Mods.WARN && modId.equals("Forestry")) {
throw new RuntimeException("Block not found: " + modId + ":" + name);
}
return stack;
@@ -48,8 +42,8 @@ public class Mods
Mods.Forestry = new Mod("Forestry") {
@Override
public boolean dev() {
final String forVersion = Loader.instance().getIndexedModList().get("Forestry").getVersion();
final Restriction rest = new Restriction(new DefaultArtifactVersion("3.6"), true, (ArtifactVersion) null, false);
String forVersion = Loader.instance().getIndexedModList().get("Forestry").getVersion();
Restriction rest = new Restriction(new DefaultArtifactVersion("3.6"), true, null, false);
return rest.containsVersion(new DefaultArtifactVersion(forVersion));
}
};
@@ -58,31 +52,30 @@ public class Mods
Mods.WARN = true;
}
public static class Mod
{
public static class Mod {
private String id;
private Mod(final String id) {
private Mod(String id) {
this.id = id;
}
public Item item(final String name) {
public Item item(String name) {
return findItem(this.id, name);
}
public Block block(final String name) {
public Block block(String name) {
return findBlock(this.id, name);
}
public ItemStack stack(final String name, final int stackSize) {
public ItemStack stack(String name, int stackSize) {
return findItemStack(this.id, name, stackSize);
}
public ItemStack stack(final String name) {
public ItemStack stack(String name) {
return this.stack(name, 1);
}
public ItemStack stack(final String string, final int i, final int j) {
public ItemStack stack(String string, int i, int j) {
return new ItemStack(this.item(string), i, j);
}
@@ -1,106 +1,101 @@
//
// Decompiled by Procyon v0.5.30
//
package binnie.core.block;
import net.minecraft.util.MovingObjectPosition;
import binnie.core.BinnieCore;
import net.minecraft.block.Block;
import net.minecraftforge.common.util.ForgeDirection;
import java.util.List;
import net.minecraft.util.IIcon;
import net.minecraft.world.IBlockAccess;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.block.BlockContainer;
import net.minecraft.block.material.Material;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack;
import java.util.ArrayList;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.IIcon;
import net.minecraft.util.MovingObjectPosition;
import net.minecraft.world.IBlockAccess;
import net.minecraft.world.World;
import net.minecraft.block.material.Material;
import net.minecraft.block.BlockContainer;
import net.minecraftforge.common.util.ForgeDirection;
public class BlockMetadata extends BlockContainer implements IBlockMetadata
{
static int temporyMeta;
import java.util.ArrayList;
import java.util.List;
public BlockMetadata(final Material material) {
public class BlockMetadata extends BlockContainer implements IBlockMetadata {
public BlockMetadata(Material material) {
super(material);
}
@Override
public ArrayList<ItemStack> getDrops(final World world, final int x, final int y, final int z, final int blockMeta, final int fortune) {
public ArrayList<ItemStack> getDrops(World world, int x, int y, int z, int blockMeta, int fortune) {
return getBlockDropped(this, world, x, y, z, blockMeta);
}
@Override
public boolean removedByPlayer(final World world, final EntityPlayer player, final int x, final int y, final int z) {
// TODO fix deprecated usage
public boolean removedByPlayer(World world, EntityPlayer player, int x, int y, int z) {
return breakBlock(this, player, world, x, y, z);
}
@Override
public TileEntity createNewTileEntity(final World var1, final int i) {
public TileEntity createNewTileEntity(World world, int i) {
return new TileEntityMetadata();
}
@Override
public boolean hasTileEntity(final int meta) {
public boolean hasTileEntity(int meta) {
return true;
}
@Override
public boolean onBlockEventReceived(final World par1World, final int par2, final int par3, final int par4, final int par5, final int par6) {
super.onBlockEventReceived(par1World, par2, par3, par4, par5, par6);
final TileEntity tileentity = par1World.getTileEntity(par2, par3, par4);
public boolean onBlockEventReceived(World world, int x, int y, int z, int par5, int par6) {
super.onBlockEventReceived(world, x, y, z, par5, par6);
TileEntity tileentity = world.getTileEntity(x, y, z);
return tileentity != null && tileentity.receiveClientEvent(par5, par6);
}
@Override
public IIcon getIcon(final IBlockAccess par1IBlockAccess, final int par2, final int par3, final int par4, final int par5) {
final int metadata = TileEntityMetadata.getTileMetadata(par1IBlockAccess, par2, par3, par4);
public IIcon getIcon(IBlockAccess block, int x, int y, int z, int par5) {
int metadata = TileEntityMetadata.getTileMetadata(block, x, y, z);
return this.getIcon(par5, metadata);
}
@Override
public String getBlockName(final ItemStack par1ItemStack) {
return this.getLocalizedName();
public String getBlockName(ItemStack itemStack) {
return getLocalizedName();
}
@Override
public void getBlockTooltip(final ItemStack par1ItemStack, final List par3List) {
public void getBlockTooltip(ItemStack itemStack, List tooltip) {
// ignored
}
@Override
public int getPlacedMeta(final ItemStack item, final World world, final int x, final int y, final int z, final ForgeDirection clickedBlock) {
final int damage = TileEntityMetadata.getItemDamage(item);
return damage;
public int getPlacedMeta(ItemStack itemStack, World world, int x, int y, int z, ForgeDirection direction) {
return TileEntityMetadata.getItemDamage(itemStack);
}
@Override
public int getDroppedMeta(final int tileMeta, final int blockMeta) {
return tileMeta;
public int getDroppedMeta(int blockMeta, int tileMeta) {
return blockMeta;
}
public static ArrayList<ItemStack> getBlockDropped(final IBlockMetadata block, final World world, final int x, final int y, final int z, final int blockMeta) {
final ArrayList<ItemStack> array = new ArrayList<ItemStack>();
final TileEntityMetadata tile = TileEntityMetadata.getTile(world, x, y, z);
public static ArrayList<ItemStack> getBlockDropped(IBlockMetadata block, World world, int x, int y, int z, int blockMeta) {
ArrayList<ItemStack> array = new ArrayList<>();
TileEntityMetadata tile = TileEntityMetadata.getTile(world, x, y, z);
if (tile != null && !tile.hasDroppedBlock()) {
final int meta = block.getDroppedMeta(world.getBlockMetadata(x, y, z), tile.getTileMetadata());
int meta = block.getDroppedMeta(world.getBlockMetadata(x, y, z), tile.getTileMetadata());
array.add(TileEntityMetadata.getItemStack((Block) block, meta));
}
return array;
}
public static boolean breakBlock(final IBlockMetadata block, final EntityPlayer player, final World world, final int i, final int j, final int k) {
List<ItemStack> drops = new ArrayList<ItemStack>();
final Block block2 = (Block) block;
final TileEntityMetadata tile = TileEntityMetadata.getTile(world, i, j, k);
public static boolean breakBlock(IBlockMetadata block, EntityPlayer player, World world, int i, int j, int k) {
List<ItemStack> drops = new ArrayList<>();
Block block2 = (Block) block;
TileEntityMetadata tile = TileEntityMetadata.getTile(world, i, j, k);
if (tile != null && !tile.hasDroppedBlock()) {
final int tileMeta = TileEntityMetadata.getTileMetadata(world, i, j, k);
drops = block2.getDrops(world, i, j, k, world.getBlockMetadata(i, j, k), 0);
}
final boolean hasBeenBroken = world.setBlockToAir(i, j, k);
boolean hasBeenBroken = world.setBlockToAir(i, j, k);
if (hasBeenBroken && BinnieCore.proxy.isSimulating(world) && drops.size() > 0 && (player == null || !player.capabilities.isCreativeMode)) {
for (final ItemStack drop : drops) {
for (ItemStack drop : drops) {
block.dropAsStack(world, i, j, k, drop);
}
tile.dropBlock();
@@ -109,27 +104,25 @@ public class BlockMetadata extends BlockContainer implements IBlockMetadata
}
@Override
public void dropAsStack(final World world, final int x, final int y, final int z, final ItemStack drop) {
this.dropBlockAsItem(world, x, y, z, drop);
public void dropAsStack(World world, int x, int y, int z, ItemStack itemStack) {
this.dropBlockAsItem(world, x, y, z, itemStack);
}
@Override
public void breakBlock(final World par1World, final int par2, final int par3, final int par4, final Block par5, final int par6) {
super.breakBlock(par1World, par2, par3, par4, par5, par6);
par1World.removeTileEntity(par2, par3, par4);
public void breakBlock(World world, int x, int y, int z, Block block, int meta) {
super.breakBlock(world, x, y, z, block, meta);
world.removeTileEntity(x, y, z);
}
public static ItemStack getPickBlock(final World world, final int x, final int y, final int z) {
final List<ItemStack> list = getBlockDropped((IBlockMetadata) world.getBlock(x, y, z), world, x, y, z, world.getBlockMetadata(x, y, z));
public static ItemStack getPickBlock(World world, int x, int y, int z) {
IBlockMetadata block = (IBlockMetadata) world.getBlock(x, y, z);
List<ItemStack> list = getBlockDropped(block, world, x, y, z, world.getBlockMetadata(x, y, z));
return list.isEmpty() ? null : list.get(0);
}
@Override
public ItemStack getPickBlock(final MovingObjectPosition target, final World world, final int x, final int y, final int z) {
// TODO fix deprecated usage
public ItemStack getPickBlock(MovingObjectPosition target, World world, int x, int y, int z) {
return getPickBlock(world, x, y, z);
}
static {
BlockMetadata.temporyMeta = -1;
}
}
@@ -1,24 +1,20 @@
//
// Decompiled by Procyon v0.5.30
//
package binnie.core.block;
import java.util.List;
import net.minecraftforge.common.util.ForgeDirection;
import net.minecraft.world.World;
import net.minecraft.item.ItemStack;
import net.minecraft.block.ITileEntityProvider;
import net.minecraft.item.ItemStack;
import net.minecraft.world.World;
import net.minecraftforge.common.util.ForgeDirection;
public interface IBlockMetadata extends ITileEntityProvider
{
int getPlacedMeta(final ItemStack p0, final World p1, final int p2, final int p3, final int p4, final ForgeDirection p5);
import java.util.List;
int getDroppedMeta(final int p0, final int p1);
public interface IBlockMetadata extends ITileEntityProvider {
int getPlacedMeta(ItemStack itemStack, World world, int x, int y, int z, ForgeDirection direction);
String getBlockName(final ItemStack p0);
int getDroppedMeta(int blockMeta, int tileMeta);
void getBlockTooltip(final ItemStack p0, final List p1);
String getBlockName(ItemStack itemStack);
void dropAsStack(final World p0, final int p1, final int p2, final int p3, final ItemStack p4);
void getBlockTooltip(ItemStack itemStack, List tooltip);
void dropAsStack(World world, int x, int y, int z, ItemStack itemStack);
}
@@ -1,12 +1,7 @@
//
// Decompiled by Procyon v0.5.30
//
package binnie.core.block;
public interface IMultipassBlock
{
public interface IMultipassBlock {
int getNumberOfPasses();
int colorMultiplier(final int p0);
int colorMultiplier(int meta);
}
@@ -1,48 +1,41 @@
//
// Decompiled by Procyon v0.5.30
//
package binnie.core.block;
import net.minecraft.util.IIcon;
import java.util.List;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import net.minecraft.entity.EntityLivingBase;
import net.minecraft.world.IBlockAccess;
import net.minecraftforge.common.util.ForgeDirection;
import net.minecraft.world.World;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack;
import net.minecraft.block.Block;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemBlock;
import net.minecraft.item.ItemStack;
import net.minecraft.util.IIcon;
import net.minecraft.world.World;
import net.minecraftforge.common.util.ForgeDirection;
public class ItemMetadata extends ItemBlock
{
public ItemMetadata(final Block block) {
import java.util.List;
public class ItemMetadata extends ItemBlock {
public ItemMetadata(Block block) {
super(block);
}
@Override
public int getMetadata(final int par1) {
public int getMetadata(int damage) {
return 0;
}
@Override
public boolean placeBlockAt(final ItemStack stack, final EntityPlayer player, final World world, final int x, final int y, final int z, final int side, final float hitX, final float hitY, final float hitZ, final int metadata) {
final Block block = this.field_150939_a;
public boolean placeBlockAt(ItemStack stack, EntityPlayer player, World world, int x, int y, int z, int side, float hitX, float hitY, float hitZ, int metadata) {
Block block = field_150939_a;
if (!(block instanceof IBlockMetadata)) {
return false;
}
final int placedMeta = ((IBlockMetadata) block).getPlacedMeta(stack, world, x, y, z, ForgeDirection.values()[side]);
if (placedMeta < 0) {
return false;
}
if (!world.setBlock(x, y, z, block, metadata, 3)) {
int placedMeta = ((IBlockMetadata) block).getPlacedMeta(stack, world, x, y, z, ForgeDirection.values()[side]);
if (placedMeta < 0 || !world.setBlock(x, y, z, block, metadata, 3)) {
return false;
}
if (world.getBlock(x, y, z) == block) {
final TileEntityMetadata tile = TileEntityMetadata.getTile(world, x, y, z);
TileEntityMetadata tile = TileEntityMetadata.getTile(world, x, y, z);
if (tile != null) {
tile.setTileMetadata(placedMeta, false);
}
@@ -54,18 +47,18 @@ public class ItemMetadata extends ItemBlock
@Override
@SideOnly(Side.CLIENT)
public String getItemStackDisplayName(final ItemStack par1ItemStack) {
return ((IBlockMetadata) this.field_150939_a).getBlockName(par1ItemStack);
public String getItemStackDisplayName(ItemStack par1ItemStack) {
return ((IBlockMetadata) field_150939_a).getBlockName(par1ItemStack);
}
@Override
@SideOnly(Side.CLIENT)
public void addInformation(final ItemStack par1ItemStack, final EntityPlayer par2EntityPlayer, final List par3List, final boolean par4) {
((IBlockMetadata) this.field_150939_a).getBlockTooltip(par1ItemStack, par3List);
public void addInformation(ItemStack itemStack, EntityPlayer player, List par3List, boolean par4) {
((IBlockMetadata) field_150939_a).getBlockTooltip(itemStack, par3List);
}
@Override
public IIcon getIconFromDamage(final int par1) {
return this.field_150939_a.getIcon(1, par1);
public IIcon getIconFromDamage(int damage) {
return field_150939_a.getIcon(1, damage);
}
}
@@ -1,38 +1,38 @@
//
// Decompiled by Procyon v0.5.30
//
package binnie.core.block;
import net.minecraft.client.renderer.RenderBlocks;
import net.minecraft.client.renderer.OpenGlHelper;
import net.minecraft.block.Block;
import org.lwjgl.opengl.GL11;
import net.minecraft.client.renderer.OpenGlHelper;
import net.minecraft.client.renderer.RenderBlocks;
import net.minecraft.item.ItemStack;
import net.minecraftforge.client.IItemRenderer;
import org.lwjgl.opengl.GL11;
public class ItemMetadataRenderer implements IItemRenderer
{
public class ItemMetadataRenderer implements IItemRenderer {
@Override
public boolean handleRenderType(final ItemStack item, final IItemRenderer.ItemRenderType type) {
return type == IItemRenderer.ItemRenderType.INVENTORY || type == IItemRenderer.ItemRenderType.ENTITY || type == IItemRenderer.ItemRenderType.EQUIPPED || type == IItemRenderer.ItemRenderType.EQUIPPED_FIRST_PERSON;
public boolean handleRenderType(ItemStack item, IItemRenderer.ItemRenderType type) {
return type == IItemRenderer.ItemRenderType.INVENTORY
|| type == IItemRenderer.ItemRenderType.ENTITY
|| type == IItemRenderer.ItemRenderType.EQUIPPED
|| type == IItemRenderer.ItemRenderType.EQUIPPED_FIRST_PERSON;
}
@Override
public boolean shouldUseRenderHelper(final IItemRenderer.ItemRenderType type, final ItemStack item, final IItemRenderer.ItemRendererHelper helper) {
public boolean shouldUseRenderHelper(IItemRenderer.ItemRenderType type, ItemStack item, IItemRenderer.ItemRendererHelper helper) {
if (type == IItemRenderer.ItemRenderType.INVENTORY) {
return helper == IItemRenderer.ItemRendererHelper.INVENTORY_BLOCK;
}
if (type == IItemRenderer.ItemRenderType.ENTITY) {
return helper == IItemRenderer.ItemRendererHelper.ENTITY_BOBBING || helper == IItemRenderer.ItemRendererHelper.ENTITY_ROTATION;
return helper == IItemRenderer.ItemRendererHelper.ENTITY_BOBBING
|| helper == IItemRenderer.ItemRendererHelper.ENTITY_ROTATION;
}
return (type == IItemRenderer.ItemRenderType.EQUIPPED || type == IItemRenderer.ItemRenderType.EQUIPPED_FIRST_PERSON) && helper == IItemRenderer.ItemRendererHelper.EQUIPPED_BLOCK;
return (type == IItemRenderer.ItemRenderType.EQUIPPED || type == IItemRenderer.ItemRenderType.EQUIPPED_FIRST_PERSON)
&& helper == IItemRenderer.ItemRendererHelper.EQUIPPED_BLOCK;
}
@Override
public void renderItem(final IItemRenderer.ItemRenderType type, final ItemStack item, final Object... data) {
public void renderItem(IItemRenderer.ItemRenderType type, ItemStack item, Object... data) {
GL11.glPushMatrix();
final Block block = Block.getBlockFromItem(item.getItem());
Block block = Block.getBlockFromItem(item.getItem());
if (type == IItemRenderer.ItemRenderType.EQUIPPED_FIRST_PERSON) {
GL11.glTranslated(0.5, 0.5, 0.5);
}
@@ -1,64 +1,53 @@
//
// Decompiled by Procyon v0.5.30
//
package binnie.core.block;
import binnie.core.BinnieCore;
import net.minecraft.world.IBlockAccess;
import net.minecraft.client.renderer.RenderBlocks;
import net.minecraft.block.Block;
import org.lwjgl.opengl.GL11;
import net.minecraft.client.renderer.Tessellator;
import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler;
import net.minecraft.block.Block;
import net.minecraft.client.renderer.RenderBlocks;
import net.minecraft.client.renderer.Tessellator;
import net.minecraft.world.IBlockAccess;
import org.lwjgl.opengl.GL11;
public class MultipassBlockRenderer implements ISimpleBlockRenderingHandler
{
public class MultipassBlockRenderer implements ISimpleBlockRenderingHandler {
public static MultipassBlockRenderer instance;
private static int layer;
private static int layer = 0;
public MultipassBlockRenderer() {
MultipassBlockRenderer.instance = this;
}
private void setColour(final Tessellator tess, final int colour) {
final float var6 = (colour >> 16 & 0xFF) / 255.0f;
final float var7 = (colour >> 8 & 0xFF) / 255.0f;
final float var8 = (colour & 0xFF) / 255.0f;
GL11.glColor3f(var6, var7, var8);
}
public static int getLayer() {
return MultipassBlockRenderer.layer;
}
@Override
public void renderInventoryBlock(final Block block, final int meta, final int modelID, final RenderBlocks renderer) {
public void renderInventoryBlock(Block block, int meta, int modelID, RenderBlocks renderer) {
block.setBlockBoundsForItemRender();
renderer.setRenderBoundsFromBlock(block);
GL11.glTranslatef(-0.5f, -0.5f, -0.5f);
MultipassBlockRenderer.layer = 0;
while (MultipassBlockRenderer.layer < ((IMultipassBlock) block).getNumberOfPasses()) {
this.renderItem(block, renderer, meta);
++MultipassBlockRenderer.layer;
renderItem(block, renderer, meta);
MultipassBlockRenderer.layer++;
}
MultipassBlockRenderer.layer = 0;
}
@Override
public boolean renderWorldBlock(final IBlockAccess world, final int x, final int y, final int z, final Block block, final int modelId, final RenderBlocks renderer) {
public boolean renderWorldBlock(IBlockAccess world, int x, int y, int z, Block block, int modelId, RenderBlocks renderer) {
boolean r = true;
MultipassBlockRenderer.layer = 0;
while (MultipassBlockRenderer.layer < ((IMultipassBlock) block).getNumberOfPasses()) {
r = renderer.renderStandardBlock(block, x, y, z);
++MultipassBlockRenderer.layer;
MultipassBlockRenderer.layer++;
}
MultipassBlockRenderer.layer = 0;
return r;
}
@Override
public boolean shouldRender3DInInventory(final int i) {
public boolean shouldRender3DInInventory(int i) {
return true;
}
@@ -67,43 +56,44 @@ public class MultipassBlockRenderer implements ISimpleBlockRenderingHandler
return BinnieCore.multipassRenderID;
}
public void renderItem(final Block block, final RenderBlocks renderer, final int meta) {
this.setColor(((IMultipassBlock) block).colorMultiplier(meta));
final Tessellator tessellator = Tessellator.instance;
public void renderItem(Block block, RenderBlocks renderer, int meta) {
setColor(((IMultipassBlock) block).colorMultiplier(meta));
Tessellator tessellator = Tessellator.instance;
tessellator.startDrawingQuads();
tessellator.setNormal(0.0f, -1.0f, 0.0f);
renderer.renderFaceYNeg(block, 0.0, 0.0, 0.0, renderer.getBlockIconFromSideAndMetadata(block, 0, meta));
tessellator.draw();
tessellator.startDrawingQuads();
tessellator.setNormal(0.0f, 1.0f, 0.0f);
renderer.renderFaceYPos(block, 0.0, 0.0, 0.0, renderer.getBlockIconFromSideAndMetadata(block, 1, meta));
tessellator.draw();
tessellator.startDrawingQuads();
tessellator.setNormal(0.0f, 0.0f, -1.0f);
renderer.renderFaceZNeg(block, 0.0, 0.0, 0.0, renderer.getBlockIconFromSideAndMetadata(block, 2, meta));
tessellator.draw();
tessellator.startDrawingQuads();
tessellator.setNormal(0.0f, 0.0f, 1.0f);
renderer.renderFaceZPos(block, 0.0, 0.0, 0.0, renderer.getBlockIconFromSideAndMetadata(block, 3, meta));
tessellator.draw();
tessellator.startDrawingQuads();
tessellator.setNormal(-1.0f, 0.0f, 0.0f);
renderer.renderFaceXNeg(block, 0.0, 0.0, 0.0, renderer.getBlockIconFromSideAndMetadata(block, 4, meta));
tessellator.draw();
tessellator.startDrawingQuads();
tessellator.setNormal(1.0f, 0.0f, 0.0f);
renderer.renderFaceXPos(block, 0.0, 0.0, 0.0, renderer.getBlockIconFromSideAndMetadata(block, 5, meta));
tessellator.draw();
}
public void setColor(final int l) {
final float f = (l >> 16 & 0xFF) / 255.0f;
final float f2 = (l >> 8 & 0xFF) / 255.0f;
final float f3 = (l & 0xFF) / 255.0f;
public void setColor(int l) {
float f = (l >> 16 & 0xFF) / 255.0f;
float f2 = (l >> 8 & 0xFF) / 255.0f;
float f3 = (l & 0xFF) / 255.0f;
GL11.glColor3f(f, f2, f3);
}
static {
MultipassBlockRenderer.layer = 0;
}
}
@@ -1,32 +1,27 @@
//
// Decompiled by Procyon v0.5.30
//
package binnie.core.block;
import net.minecraft.block.Block;
import net.minecraft.client.renderer.OpenGlHelper;
import net.minecraft.item.ItemBlock;
import org.lwjgl.opengl.GL11;
import net.minecraft.item.ItemStack;
import net.minecraft.client.renderer.RenderBlocks;
import net.minecraft.item.ItemBlock;
import net.minecraft.item.ItemStack;
import net.minecraftforge.client.IItemRenderer;
import org.lwjgl.opengl.GL11;
public class MultipassItemRenderer implements IItemRenderer
{
private void render(final RenderBlocks renderer, final ItemStack item, final float f, final float g, final float h) {
public class MultipassItemRenderer implements IItemRenderer {
private void render(RenderBlocks renderer, ItemStack item, float f, float g, float h) {
GL11.glTranslatef(f, g, h);
final Block block = ((ItemBlock) item.getItem()).field_150939_a;
Block block = ((ItemBlock) item.getItem()).field_150939_a;
GL11.glEnable(3008);
if (block.getRenderBlockPass() != 0) {
GL11.glAlphaFunc(516, 0.1f);
GL11.glEnable(3042);
OpenGlHelper.glBlendFunc(770, 771, 1, 0);
}
else {
} else {
GL11.glAlphaFunc(516, 0.5f);
GL11.glDisable(3042);
}
MultipassBlockRenderer.instance.renderInventoryBlock(block, TileEntityMetadata.getItemDamage(item), 0, renderer);
if (block.getRenderBlockPass() == 0) {
GL11.glAlphaFunc(516, 0.1f);
@@ -35,47 +30,34 @@ public class MultipassItemRenderer implements IItemRenderer
}
@Override
public boolean handleRenderType(final ItemStack item, final IItemRenderer.ItemRenderType type) {
public boolean handleRenderType(ItemStack item, IItemRenderer.ItemRenderType type) {
switch (type) {
case ENTITY: {
return true;
}
case EQUIPPED: {
return true;
}
case INVENTORY: {
return true;
}
case EQUIPPED_FIRST_PERSON: {
return true;
}
default: {
return false;
}
case ENTITY:
case EQUIPPED:
case INVENTORY:
case EQUIPPED_FIRST_PERSON:
return true;
}
return false;
}
@Override
public boolean shouldUseRenderHelper(final IItemRenderer.ItemRenderType type, final ItemStack item, final IItemRenderer.ItemRendererHelper helper) {
public boolean shouldUseRenderHelper(IItemRenderer.ItemRenderType type, ItemStack item, IItemRenderer.ItemRendererHelper helper) {
return true;
}
@Override
public void renderItem(final IItemRenderer.ItemRenderType type, final ItemStack item, final Object... data) {
public void renderItem(IItemRenderer.ItemRenderType type, ItemStack item, Object... data) {
switch (type) {
case ENTITY: {
this.render((RenderBlocks) data[0], item, 0.0f, 0.0f, 0.0f);
break;
}
case EQUIPPED:
case EQUIPPED_FIRST_PERSON: {
this.render((RenderBlocks) data[0], item, 0.5f, 0.5f, 0.5f);
break;
}
case INVENTORY: {
this.render((RenderBlocks) data[0], item, 0.0f, 0.0f, 0.0f);
break;
}
case INVENTORY:
case ENTITY:
render((RenderBlocks) data[0], item, 0.0f, 0.0f, 0.0f);
break;
case EQUIPPED:
case EQUIPPED_FIRST_PERSON:
render((RenderBlocks) data[0], item, 0.5f, 0.5f, 0.5f);
break;
}
}
}
@@ -1,47 +1,42 @@
//
// Decompiled by Procyon v0.5.30
//
package binnie.core.block;
import net.minecraft.item.ItemStack;
import net.minecraft.block.Block;
import net.minecraft.world.IBlockAccess;
import cpw.mods.fml.common.network.simpleimpl.IMessage;
import binnie.core.network.packet.MessageMetadata;
import binnie.core.BinnieCore;
import net.minecraft.network.Packet;
import binnie.core.network.packet.MessageMetadata;
import net.minecraft.block.Block;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.network.Packet;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.world.IBlockAccess;
public class TileEntityMetadata extends TileEntity
{
public class TileEntityMetadata extends TileEntity {
private int meta;
private boolean droppedBlock;
public TileEntityMetadata() {
this.droppedBlock = false;
droppedBlock = false;
}
@Override
public boolean receiveClientEvent(final int par1, final int par2) {
if (par1 == 42) {
this.meta = par2;
this.worldObj.markBlockForUpdate(this.xCoord, this.yCoord, this.zCoord);
public boolean receiveClientEvent(int id, int meta) {
// TODO fix magic const
if (id == 42) {
this.meta = meta;
worldObj.markBlockForUpdate(xCoord, yCoord, zCoord);
}
return true;
}
@Override
public void readFromNBT(final NBTTagCompound nbt) {
public void readFromNBT(NBTTagCompound nbt) {
super.readFromNBT(nbt);
this.meta = nbt.getInteger("meta");
meta = nbt.getInteger("meta");
}
@Override
public void writeToNBT(final NBTTagCompound nbt) {
public void writeToNBT(NBTTagCompound nbt) {
super.writeToNBT(nbt);
nbt.setInteger("meta", this.meta);
nbt.setInteger("meta", meta);
}
@Override
@@ -50,61 +45,61 @@ public class TileEntityMetadata extends TileEntity
}
public int getTileMetadata() {
return this.meta;
return meta;
}
public void setTileMetadata(final int meta, final boolean notify) {
if (this.meta != meta) {
this.meta = meta;
if (notify) {
this.worldObj.markBlockForUpdate(this.xCoord, this.yCoord, this.zCoord);
}
public void setTileMetadata(int meta, boolean notify) {
if (this.meta == meta) {
return;
}
this.meta = meta;
if (notify) {
worldObj.markBlockForUpdate(xCoord, yCoord, zCoord);
}
}
@Override
public Packet getDescriptionPacket() {
return BinnieCore.instance.getNetworkWrapper().getPacketFrom(new MessageMetadata(this.xCoord, this.yCoord, this.zCoord, this.meta).GetMessage());
MessageMetadata message = new MessageMetadata(xCoord, yCoord, zCoord, meta);
return BinnieCore.instance.getNetworkWrapper().getPacketFrom(message.getMessage());
}
public static TileEntityMetadata getTile(final IBlockAccess world, final int x, final int y, final int z) {
final TileEntity tile = world.getTileEntity(x, y, z);
if (!(tile instanceof TileEntityMetadata)) {
return null;
public static TileEntityMetadata getTile(IBlockAccess world, int x, int y, int z) {
TileEntity tile = world.getTileEntity(x, y, z);
if (tile instanceof TileEntityMetadata) {
return (TileEntityMetadata) tile;
}
return (TileEntityMetadata) tile;
return null;
}
public static ItemStack getItemStack(final Block block, final int damage) {
final ItemStack item = new ItemStack(block, 1, 0);
setItemDamage(item, damage);
public static ItemStack getItemStack(Block block, int damage) {
NBTTagCompound tag = new NBTTagCompound();
tag.setInteger("meta", damage);
ItemStack item = new ItemStack(block, 1, 0);
item.setItemDamage((damage < 16387) ? damage : 16387);
item.setTagCompound(tag);
return item;
}
public static void setItemDamage(final ItemStack item, final int i) {
item.setItemDamage((i < 16387) ? i : 16387);
final NBTTagCompound tag = new NBTTagCompound();
tag.setInteger("meta", i);
item.setTagCompound(tag);
}
public static int getItemDamage(final ItemStack item) {
public static int getItemDamage(ItemStack item) {
if (item.hasTagCompound() && item.getTagCompound().hasKey("meta")) {
return item.getTagCompound().getInteger("meta");
}
return item.getItemDamage();
}
public static int getTileMetadata(final IBlockAccess world, final int x, final int y, final int z) {
final TileEntityMetadata tile = getTile(world, x, y, z);
public static int getTileMetadata(IBlockAccess world, int x, int y, int z) {
TileEntityMetadata tile = getTile(world, x, y, z);
return (tile == null) ? 0 : tile.getTileMetadata();
}
public boolean hasDroppedBlock() {
return this.droppedBlock;
return droppedBlock;
}
public void dropBlock() {
this.droppedBlock = true;
droppedBlock = true;
}
}
@@ -1,50 +1,41 @@
//
// Decompiled by Procyon v0.5.30
//
package binnie.core.circuits;
import net.minecraft.item.Item;
import forestry.api.circuits.ChipsetManager;
import java.util.ArrayList;
import forestry.api.circuits.ICircuit;
import forestry.api.circuits.ICircuitLayout;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import forestry.api.circuits.ICircuitLayout;
import java.util.ArrayList;
import java.util.List;
import forestry.api.circuits.ICircuit;
public class BinnieCircuit implements ICircuit
{
public class BinnieCircuit implements ICircuit {
private String uid;
private int limit;
private List<String> tooltips;
public BinnieCircuit(final String uid, final int limit, final ICircuitLayout layout, final ItemStack itemStack) {
this.tooltips = new ArrayList<String>();
public BinnieCircuit(String uid, int limit, ICircuitLayout layout, ItemStack itemStack) {
tooltips = new ArrayList<>();
this.uid = "binnie.circuit." + uid;
this.limit = limit;
ChipsetManager.circuitRegistry.registerCircuit(this);
if (itemStack != null) {
ChipsetManager.solderManager.addRecipe(layout, itemStack, this);
}
}
public BinnieCircuit(final String uid, final int limit, final ICircuitLayout layout, final Item item, final int itemMeta) {
public BinnieCircuit(String uid, int limit, ICircuitLayout layout, Item item, int itemMeta) {
this(uid, limit, layout, new ItemStack(item, 1, itemMeta));
}
public void addTooltipString(final String string) {
this.tooltips.add(string);
public void addTooltipString(String string) {
tooltips.add(string);
}
@Override
public String getUID() {
return this.uid;
return uid;
}
@Override
@@ -54,17 +45,17 @@ public class BinnieCircuit implements ICircuit
@Override
public int getLimit() {
return this.limit;
return limit;
}
@Override
public String getName() {
return this.uid;
return uid;
}
@Override
public void addTooltip(final List<String> list) {
for (final String string : this.tooltips) {
public void addTooltip(List<String> list) {
for (String string : tooltips) {
list.add(" - " + string);
}
}
@@ -76,17 +67,21 @@ public class BinnieCircuit implements ICircuit
@Override
public void onInsertion(int arg0, Object arg1) {
// ignored
}
@Override
public void onLoad(int arg0, Object arg1) {
// ignored
}
@Override
public void onRemoval(int arg0, Object arg1) {
// ignored
}
@Override
public void onTick(int arg0, Object arg1) {
// ignored
}
}
@@ -1,22 +1,17 @@
//
// Decompiled by Procyon v0.5.30
//
package binnie.core.circuits;
import binnie.Binnie;
import binnie.core.AbstractMod;
import forestry.api.circuits.ChipsetManager;
import forestry.api.circuits.CircuitSocketType;
import forestry.api.circuits.ICircuitSocketType;
import binnie.core.AbstractMod;
import forestry.api.circuits.ICircuitLayout;
import forestry.api.circuits.ICircuitSocketType;
public class BinnieCircuitLayout implements ICircuitLayout
{
public class BinnieCircuitLayout implements ICircuitLayout {
private String uid;
private AbstractMod mod;
public BinnieCircuitLayout(final AbstractMod mod, final String uid) {
public BinnieCircuitLayout(AbstractMod mod, String uid) {
this.uid = uid;
this.mod = mod;
ChipsetManager.circuitRegistry.registerLayout(this);
@@ -24,21 +19,22 @@ public class BinnieCircuitLayout implements ICircuitLayout
@Override
public String getUID() {
return "binnie.circuitLayout" + this.uid;
return "binnie.circuitLayout" + uid;
}
@Override
public String getName() {
return Binnie.Language.localise(this.mod, "circuit.layout." + this.uid.toLowerCase());
return Binnie.Language.localise(mod, "circuit.layout." + uid.toLowerCase());
}
@Override
public String getUsage() {
return Binnie.Language.localise(this.mod, "circuit.layout." + this.uid.toLowerCase() + ".usage");
return Binnie.Language.localise(mod, "circuit.layout." + uid.toLowerCase() + ".usage");
}
@Override
public ICircuitSocketType getSocketType() {
return CircuitSocketType.NONE;// TODO hmm? CircuitSocketType
// TODO hmm? CircuitSocketType
return CircuitSocketType.NONE;
}
}
@@ -1,49 +1,40 @@
//
// Decompiled by Procyon v0.5.30
//
package binnie.core.genetics;
import binnie.Binnie;
import binnie.core.BinnieCore;
import binnie.extrabees.ExtraBees;
import forestry.api.apiculture.EnumBeeChromosome;
import forestry.api.apiculture.EnumBeeType;
import forestry.api.apiculture.IAlleleBeeSpecies;
import forestry.api.apiculture.IApiaristTracker;
import forestry.api.apiculture.IBeeGenome;
import forestry.api.apiculture.IBeeMutation;
import forestry.api.apiculture.IBeeRoot;
import forestry.api.genetics.IAllele;
import forestry.api.genetics.IBreedingTracker;
import forestry.api.genetics.IChromosomeType;
import forestry.api.genetics.IMutation;
import forestry.api.genetics.ISpeciesRoot;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack;
import java.util.TreeSet;
import forestry.api.apiculture.EnumBeeType;
import forestry.api.apiculture.IAlleleBeeSpecies;
import forestry.api.apiculture.IBeeGenome;
import forestry.api.apiculture.IBeeRoot;
import net.minecraft.item.ItemStack;
import binnie.core.BinnieCore;
import forestry.api.apiculture.EnumBeeChromosome;
import forestry.api.genetics.IChromosomeType;
import forestry.api.apiculture.IApiaristTracker;
import forestry.api.genetics.IBreedingTracker;
import forestry.api.genetics.ISpeciesRoot;
import forestry.api.apiculture.IBeeMutation;
import forestry.api.genetics.IAllele;
import net.minecraft.entity.player.EntityPlayer;
import forestry.api.genetics.IMutation;
import binnie.extrabees.ExtraBees;
import binnie.Binnie;
class BeeBreedingSystem extends BreedingSystem
{
class BeeBreedingSystem extends BreedingSystem {
public BeeBreedingSystem() {
this.iconUndiscovered = Binnie.Resource.getItemIcon(ExtraBees.instance, "icon/undiscoveredBee");
this.iconDiscovered = Binnie.Resource.getItemIcon(ExtraBees.instance, "icon/discoveredBee");
iconUndiscovered = Binnie.Resource.getItemIcon(ExtraBees.instance, "icon/undiscoveredBee");
iconDiscovered = Binnie.Resource.getItemIcon(ExtraBees.instance, "icon/discoveredBee");
}
@Override
public float getChance(final IMutation mutation, final EntityPlayer player, final IAllele species1, final IAllele species2) {
return ((IBeeMutation) mutation).
getChance(new VirtualBeeHousing(player),
(IAlleleBeeSpecies) species1,
(IAlleleBeeSpecies) species2,
(IBeeGenome) this.getSpeciesRoot().
templateAsGenome(this.getSpeciesRoot().getTemplate(species1.getUID())),
(IBeeGenome) this.getSpeciesRoot().templateAsGenome(this.getSpeciesRoot().getTemplate(species2.getUID())));
public float getChance(IMutation mutation, EntityPlayer player, IAllele species1, IAllele species2) {
return ((IBeeMutation) mutation).getChance(
new VirtualBeeHousing(player),
(IAlleleBeeSpecies) species1,
(IAlleleBeeSpecies) species2,
(IBeeGenome) getSpeciesRoot().templateAsGenome(getSpeciesRoot().getTemplate(species1.getUID())),
(IBeeGenome) getSpeciesRoot().templateAsGenome(getSpeciesRoot().getTemplate(species2.getUID()))
);
}
@Override
@@ -53,7 +44,7 @@ class BeeBreedingSystem extends BreedingSystem
@Override
public int getColour() {
return 16767232;
return 0xffd900;
}
@Override
@@ -62,7 +53,7 @@ class BeeBreedingSystem extends BreedingSystem
}
@Override
public String getAlleleName(final IChromosomeType chromosome, final IAllele allele) {
public String getAlleleName(IChromosomeType chromosome, IAllele allele) {
if (chromosome == EnumBeeChromosome.FERTILITY) {
if (allele.getUID().contains("Low")) {
return Binnie.Language.localise(BinnieCore.instance, "allele.fertility.low");
@@ -81,63 +72,67 @@ class BeeBreedingSystem extends BreedingSystem
}
@Override
public boolean isDNAManipulable(final ItemStack member) {
return ((IBeeRoot) this.getSpeciesRoot()).getType(member) == EnumBeeType.LARVAE;
public boolean isDNAManipulable(ItemStack member) {
return ((IBeeRoot) getSpeciesRoot()).getType(member) == EnumBeeType.LARVAE;
}
@Override
public int[] getActiveTypes() {
return new int[] { EnumBeeType.DRONE.ordinal(), EnumBeeType.PRINCESS.ordinal(), EnumBeeType.QUEEN.ordinal(), EnumBeeType.LARVAE.ordinal() };
return new int[] {
EnumBeeType.DRONE.ordinal(),
EnumBeeType.PRINCESS.ordinal(),
EnumBeeType.QUEEN.ordinal(),
EnumBeeType.LARVAE.ordinal()
};
}
@Override
public void addExtraAlleles(final IChromosomeType chromosome, final TreeSet<IAllele> alleles) {
public void addExtraAlleles(IChromosomeType chromosome, TreeSet<IAllele> alleles) {
switch ((EnumBeeChromosome) chromosome) {
case FERTILITY: {
for (final ForestryAllele.Fertility a : ForestryAllele.Fertility.values()) {
alleles.add(a.getAllele());
}
break;
}
case FLOWERING: {
for (final ForestryAllele.Flowering a2 : ForestryAllele.Flowering.values()) {
alleles.add(a2.getAllele());
}
break;
}
case HUMIDITY_TOLERANCE:
case TEMPERATURE_TOLERANCE: {
for (final Tolerance a3 : Tolerance.values()) {
alleles.add(a3.getAllele());
}
break;
}
case LIFESPAN: {
for (final ForestryAllele.Lifespan a4 : ForestryAllele.Lifespan.values()) {
alleles.add(a4.getAllele());
}
break;
}
case SPEED: {
for (final ForestryAllele.Speed a5 : ForestryAllele.Speed.values()) {
alleles.add(a5.getAllele());
}
break;
}
case TERRITORY: {
for (final ForestryAllele.Territory a6 : ForestryAllele.Territory.values()) {
alleles.add(a6.getAllele());
}
break;
}
case NOCTURNAL:
case CAVE_DWELLING:
case TOLERANT_FLYER: {
for (final ForestryAllele.Bool a7 : ForestryAllele.Bool.values()) {
alleles.add(a7.getAllele());
}
break;
}
case FERTILITY:
for (ForestryAllele.Fertility a : ForestryAllele.Fertility.values()) {
alleles.add(a.getAllele());
}
break;
case FLOWERING:
for (ForestryAllele.Flowering a2 : ForestryAllele.Flowering.values()) {
alleles.add(a2.getAllele());
}
break;
case HUMIDITY_TOLERANCE:
case TEMPERATURE_TOLERANCE:
for (Tolerance a3 : Tolerance.values()) {
alleles.add(a3.getAllele());
}
break;
case LIFESPAN:
for (ForestryAllele.Lifespan a4 : ForestryAllele.Lifespan.values()) {
alleles.add(a4.getAllele());
}
break;
case SPEED:
for (ForestryAllele.Speed a5 : ForestryAllele.Speed.values()) {
alleles.add(a5.getAllele());
}
break;
case TERRITORY:
for (ForestryAllele.Territory a6 : ForestryAllele.Territory.values()) {
alleles.add(a6.getAllele());
}
break;
case NOCTURNAL:
case CAVE_DWELLING:
case TOLERANT_FLYER:
for (ForestryAllele.Bool a7 : ForestryAllele.Bool.values()) {
alleles.add(a7.getAllele());
}
break;
}
}
}
@@ -1,7 +1,3 @@
//
// Decompiled by Procyon v0.5.30
//
package binnie.core.genetics;
import java.util.ArrayList;
@@ -9,45 +5,45 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
public class BeeModifierLogic
{
public class BeeModifierLogic {
private Map<EnumBeeModifier, Float[]> modifiers;
private List<EnumBeeBooleanModifier> booleanModifiers;
public BeeModifierLogic() {
this.modifiers = new HashMap<EnumBeeModifier, Float[]>();
this.booleanModifiers = new ArrayList<EnumBeeBooleanModifier>();
this.modifiers = new HashMap<>();
this.booleanModifiers = new ArrayList<>();
}
public float getModifier(final EnumBeeModifier modifier, final float currentModifier) {
public float getModifier(EnumBeeModifier modifier, float currentModifier) {
if (!this.modifiers.containsKey(modifier)) {
return 1.0f;
}
final float mult = this.modifiers.get(modifier)[0];
final float max = this.modifiers.get(modifier)[1];
Float[] values = modifiers.get(modifier);
float mult = values[0];
float max = values[1];
if (max >= 1.0f) {
if (max <= currentModifier) {
return 1.0f;
}
return Math.min(max / currentModifier, mult);
}
else {
if (max >= currentModifier) {
return 1.0f;
}
return Math.max(max / currentModifier, mult);
if (max >= currentModifier) {
return 1.0f;
}
return Math.max(max / currentModifier, mult);
}
public boolean getModifier(final EnumBeeBooleanModifier modifier) {
return this.booleanModifiers.contains(modifier);
public boolean getModifier(EnumBeeBooleanModifier modifier) {
return booleanModifiers.contains(modifier);
}
public void setModifier(final EnumBeeBooleanModifier modifier) {
this.booleanModifiers.add(modifier);
public void setModifier(EnumBeeBooleanModifier modifier) {
booleanModifiers.add(modifier);
}
public void setModifier(final EnumBeeModifier modifier, final float mult, final float max) {
this.modifiers.put(modifier, new Float[] { mult, max });
public void setModifier(EnumBeeModifier modifier, float mult, float max) {
modifiers.put(modifier, new Float[] { mult, max });
}
}
@@ -1,53 +1,49 @@
//
// Decompiled by Procyon v0.5.30
//
package binnie.core.genetics;
import forestry.api.genetics.IGenome;
import java.util.TreeSet;
import forestry.api.genetics.IIndividual;
import net.minecraft.item.ItemStack;
import forestry.api.genetics.IAlleleBoolean;
import binnie.Binnie;
import binnie.core.BinnieCore;
import binnie.core.resource.BinnieIcon;
import binnie.extrabees.genetics.ExtraBeeMutation;
import com.mojang.authlib.GameProfile;
import cpw.mods.fml.common.eventhandler.SubscribeEvent;
import forestry.api.core.ForestryEvent;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.util.IIcon;
import forestry.api.genetics.IBreedingTracker;
import com.mojang.authlib.GameProfile;
import net.minecraft.world.World;
import java.util.Set;
import binnie.extrabees.genetics.ExtraBeeMutation;
import java.util.LinkedHashSet;
import forestry.api.genetics.IAllele;
import forestry.api.genetics.AlleleManager;
import java.util.Collection;
import forestry.api.genetics.ISpeciesRoot;
import binnie.core.BinnieCore;
import forestry.api.genetics.IChromosomeType;
import net.minecraftforge.common.MinecraftForge;
import binnie.Binnie;
import java.util.HashMap;
import java.util.ArrayList;
import java.util.Map;
import forestry.api.genetics.IMutation;
import forestry.api.genetics.IAllele;
import forestry.api.genetics.IAlleleBoolean;
import forestry.api.genetics.IAlleleSpecies;
import forestry.api.genetics.IBreedingTracker;
import forestry.api.genetics.IChromosomeType;
import forestry.api.genetics.IClassification;
import java.util.List;
import binnie.core.resource.BinnieIcon;
import forestry.api.genetics.IGenome;
import forestry.api.genetics.IIndividual;
import forestry.api.genetics.IMutation;
import forestry.api.genetics.ISpeciesRoot;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack;
import net.minecraft.util.IIcon;
import net.minecraft.world.World;
import net.minecraftforge.common.MinecraftForge;
public abstract class BreedingSystem implements IItemStackRepresentitive
{
import java.util.ArrayList;
import java.util.Collection;
import java.util.HashMap;
import java.util.LinkedHashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.TreeSet;
public abstract class BreedingSystem implements IItemStackRepresentative {
protected BinnieIcon iconUndiscovered;
protected BinnieIcon iconDiscovered;
private List<IClassification> allBranches;
List<IAlleleSpecies> allActiveSpecies;
private List<IAlleleSpecies> allSpecies;
private List<IMutation> allMutations;
private Map<IAlleleSpecies, List<IMutation>> resultantMutations;
private Map<IAlleleSpecies, List<IMutation>> furtherMutations;
private Map<IAlleleSpecies, List<IMutation>> allResultantMutations;
private Map<IAlleleSpecies, List<IMutation>> allFurtherMutations;
private List<IClassification> allBranches = new ArrayList<>();
List<IAlleleSpecies> allActiveSpecies = new ArrayList<>();
private List<IAlleleSpecies> allSpecies = new ArrayList<>();
private List<IMutation> allMutations = new ArrayList<>();
private Map<IAlleleSpecies, List<IMutation>> resultantMutations = new HashMap<>();
private Map<IAlleleSpecies, List<IMutation>> furtherMutations = new HashMap<>();
private Map<IAlleleSpecies, List<IMutation>> allResultantMutations = new HashMap<>();
private Map<IAlleleSpecies, List<IMutation>> allFurtherMutations = new HashMap<>();
public float discoveredSpeciesPercentage;
public int totalSpeciesCount;
public int discoveredSpeciesCount;
@@ -61,200 +57,190 @@ public abstract class BreedingSystem implements IItemStackRepresentitive
String currentEpithet;
public BreedingSystem() {
this.allBranches = new ArrayList<IClassification>();
this.allActiveSpecies = new ArrayList<IAlleleSpecies>();
this.allSpecies = new ArrayList<IAlleleSpecies>();
this.allMutations = new ArrayList<IMutation>();
this.resultantMutations = new HashMap<IAlleleSpecies, List<IMutation>>();
this.furtherMutations = new HashMap<IAlleleSpecies, List<IMutation>>();
this.allResultantMutations = new HashMap<IAlleleSpecies, List<IMutation>>();
this.allFurtherMutations = new HashMap<IAlleleSpecies, List<IMutation>>();
Binnie.Genetics.registerBreedingSystem(this);
MinecraftForge.EVENT_BUS.register(this);
}
public String getChromosomeName(final IChromosomeType chromo) {
return BinnieCore.proxy.localise(this.getSpeciesRoot().getUID() + ".chromosome." + chromo.getName());
public String getChromosomeName(IChromosomeType chromo) {
return BinnieCore.proxy.localise(getSpeciesRoot().getUID() + ".chromosome." + chromo.getName());
}
public String getChromosomeShortName(final IChromosomeType chromo) {
return BinnieCore.proxy.localise(this.getSpeciesRoot().getUID() + ".chromosome." + chromo.getName() + ".short");
public String getChromosomeShortName(IChromosomeType chromo) {
return BinnieCore.proxy.localise(getSpeciesRoot().getUID() + ".chromosome." + chromo.getName() + ".short");
}
public final String getEpitome(final float discoveredPercentage) {
public String getEpitome(float discoveredPercentage) {
// TODO refactor
int i = 0;
if (discoveredPercentage == 1.0f) {
i = 6;
}
else if (discoveredPercentage < 0.1f) {
} else if (discoveredPercentage < 0.1f) {
i = 0;
}
else if (discoveredPercentage < 0.3f) {
} else if (discoveredPercentage < 0.3f) {
i = 1;
}
else if (discoveredPercentage < 0.5f) {
} else if (discoveredPercentage < 0.5f) {
i = 2;
}
else if (discoveredPercentage < 0.7f) {
} else if (discoveredPercentage < 0.7f) {
i = 3;
}
else if (discoveredPercentage < 0.9f) {
} else if (discoveredPercentage < 0.9f) {
i = 4;
}
else if (discoveredPercentage < 1.0f) {
} else if (discoveredPercentage < 1.0f) {
i = 5;
}
return BinnieCore.proxy.localise(this.getSpeciesRoot().getUID() + ".epitome." + i);
return BinnieCore.proxy.localise(getSpeciesRoot().getUID() + ".epitome." + i);
}
public abstract ISpeciesRoot getSpeciesRoot();
public final List<IClassification> getAllBranches() {
return this.allBranches;
public List<IClassification> getAllBranches() {
return allBranches;
}
public final Collection<IAlleleSpecies> getAllSpecies() {
return this.allActiveSpecies;
public Collection<IAlleleSpecies> getAllSpecies() {
return allActiveSpecies;
}
public final Collection<IMutation> getAllMutations() {
return this.allMutations;
public Collection<IMutation> getAllMutations() {
return allMutations;
}
public void calculateArrays() {
final Collection<IAllele> allAlleles = AlleleManager.alleleRegistry.getRegisteredAlleles().values();
this.resultantMutations = new HashMap<IAlleleSpecies, List<IMutation>>();
this.furtherMutations = new HashMap<IAlleleSpecies, List<IMutation>>();
this.allResultantMutations = new HashMap<IAlleleSpecies, List<IMutation>>();
this.allFurtherMutations = new HashMap<IAlleleSpecies, List<IMutation>>();
this.allActiveSpecies = new ArrayList<IAlleleSpecies>();
this.allSpecies = new ArrayList<IAlleleSpecies>();
for (final IAllele species : allAlleles) {
if (this.getSpeciesRoot().getTemplate(species.getUID()) != null) {
this.resultantMutations.put((IAlleleSpecies) species, new ArrayList<IMutation>());
this.furtherMutations.put((IAlleleSpecies) species, new ArrayList<IMutation>());
this.allResultantMutations.put((IAlleleSpecies) species, new ArrayList<IMutation>());
this.allFurtherMutations.put((IAlleleSpecies) species, new ArrayList<IMutation>());
this.allSpecies.add((IAlleleSpecies) species);
if (this.isBlacklisted(species) || species.getUID().contains("speciesBotAlfheim")) {
Collection<IAllele> allAlleles = AlleleManager.alleleRegistry.getRegisteredAlleles().values();
resultantMutations = new HashMap<>();
furtherMutations = new HashMap<>();
allResultantMutations = new HashMap<>();
allFurtherMutations = new HashMap<>();
allActiveSpecies = new ArrayList<>();
allSpecies = new ArrayList<>();
for (IAllele species : allAlleles) {
if (getSpeciesRoot().getTemplate(species.getUID()) != null) {
resultantMutations.put((IAlleleSpecies) species, new ArrayList<>());
furtherMutations.put((IAlleleSpecies) species, new ArrayList<>());
allResultantMutations.put((IAlleleSpecies) species, new ArrayList<>());
allFurtherMutations.put((IAlleleSpecies) species, new ArrayList<>());
allSpecies.add((IAlleleSpecies) species);
if (isBlacklisted(species) || species.getUID().contains("speciesBotAlfheim")) {
continue;
}
this.allActiveSpecies.add((IAlleleSpecies) species);
allActiveSpecies.add((IAlleleSpecies) species);
}
}
this.allMutations = new ArrayList<IMutation>();
final Collection<IClassification> allRegBranches = AlleleManager.alleleRegistry.getRegisteredClassifications().values();
this.allBranches = new ArrayList<IClassification>();
for (final IClassification branch : allRegBranches) {
if (branch.getMemberSpecies().length > 0 && this.getSpeciesRoot().getTemplate(branch.getMemberSpecies()[0].getUID()) != null) {
allMutations = new ArrayList<>();
Collection<IClassification> allRegBranches = AlleleManager.alleleRegistry.getRegisteredClassifications().values();
allBranches = new ArrayList<>();
for (IClassification branch : allRegBranches) {
if (branch.getMemberSpecies().length > 0 && getSpeciesRoot().getTemplate(branch.getMemberSpecies()[0].getUID()) != null) {
boolean possible = false;
for (final IAlleleSpecies species2 : branch.getMemberSpecies()) {
if (this.allActiveSpecies.contains(species2)) {
for (IAlleleSpecies species2 : branch.getMemberSpecies()) {
if (allActiveSpecies.contains(species2)) {
possible = true;
}
}
if (!possible) {
continue;
}
this.allBranches.add(branch);
allBranches.add(branch);
}
}
if (this.getSpeciesRoot().getMutations(false) != null) {
final Set<IMutation> mutations = new LinkedHashSet<IMutation>();
mutations.addAll(this.getSpeciesRoot().getMutations(false));
if (getSpeciesRoot().getMutations(false) != null) {
Set<IMutation> mutations = new LinkedHashSet<>();
mutations.addAll(getSpeciesRoot().getMutations(false));
if (this == Binnie.Genetics.beeBreedingSystem) {
mutations.addAll(ExtraBeeMutation.mutations);
}
for (final IMutation mutation : mutations) {
this.allMutations.add(mutation);
final Set<IAlleleSpecies> participatingSpecies = new LinkedHashSet<IAlleleSpecies>();
if (mutation.getAllele0() instanceof IAlleleSpecies) {
for (IMutation mutation : mutations) {
allMutations.add(mutation);
Set<IAlleleSpecies> participatingSpecies = new LinkedHashSet<>();
if (mutation.getAllele0() != null) {
participatingSpecies.add(mutation.getAllele0());
}
if (mutation.getAllele1() instanceof IAlleleSpecies) {
if (mutation.getAllele1() != null) {
participatingSpecies.add(mutation.getAllele1());
}
for (final IAlleleSpecies species3 : participatingSpecies) {
this.allFurtherMutations.get(species3).add(mutation);
if (this.allActiveSpecies.contains(species3)) {
this.furtherMutations.get(species3).add(mutation);
for (IAlleleSpecies species3 : participatingSpecies) {
allFurtherMutations.get(species3).add(mutation);
if (allActiveSpecies.contains(species3)) {
furtherMutations.get(species3).add(mutation);
}
}
if (this.resultantMutations.containsKey(mutation.getTemplate()[0])) {
this.allResultantMutations.get(mutation.getTemplate()[0]).add(mutation);
this.resultantMutations.get(mutation.getTemplate()[0]).add(mutation);
if (resultantMutations.containsKey(mutation.getTemplate()[0])) {
allResultantMutations.get(mutation.getTemplate()[0]).add(mutation);
resultantMutations.get(mutation.getTemplate()[0]).add(mutation);
}
}
}
}
public final boolean isBlacklisted(final IAllele allele) {
public boolean isBlacklisted(IAllele allele) {
return AlleleManager.alleleRegistry.isBlacklisted(allele.getUID());
}
public final List<IMutation> getResultantMutations(final IAlleleSpecies species, final boolean includeInactive) {
if (this.resultantMutations.isEmpty()) {
this.calculateArrays();
public List<IMutation> getResultantMutations(IAlleleSpecies species, boolean includeInactive) {
if (resultantMutations.isEmpty()) {
calculateArrays();
}
return includeInactive ? this.allResultantMutations.get(species) : this.resultantMutations.get(species);
return includeInactive ? allResultantMutations.get(species) : resultantMutations.get(species);
}
public final List<IMutation> getResultantMutations(final IAlleleSpecies species) {
if (this.resultantMutations.isEmpty()) {
this.calculateArrays();
public List<IMutation> getResultantMutations(IAlleleSpecies species) {
if (resultantMutations.isEmpty()) {
calculateArrays();
}
return this.resultantMutations.get(species);
return resultantMutations.get(species);
}
public final List<IMutation> getFurtherMutations(final IAlleleSpecies species, final boolean includeInactive) {
if (this.furtherMutations.isEmpty()) {
this.calculateArrays();
public List<IMutation> getFurtherMutations(IAlleleSpecies species, boolean includeInactive) {
if (furtherMutations.isEmpty()) {
calculateArrays();
}
return includeInactive ? this.allFurtherMutations.get(species) : this.furtherMutations.get(species);
return includeInactive ? allFurtherMutations.get(species) : furtherMutations.get(species);
}
public final List<IMutation> getFurtherMutations(final IAlleleSpecies species) {
if (this.furtherMutations.isEmpty()) {
this.calculateArrays();
public List<IMutation> getFurtherMutations(IAlleleSpecies species) {
if (furtherMutations.isEmpty()) {
calculateArrays();
}
return this.furtherMutations.get(species);
return furtherMutations.get(species);
}
public final boolean isMutationDiscovered(final IMutation mutation, final World world, final GameProfile name) {
return this.isMutationDiscovered(mutation, this.getSpeciesRoot().getBreedingTracker(world, name));
public boolean isMutationDiscovered(IMutation mutation, World world, GameProfile name) {
return isMutationDiscovered(mutation, getSpeciesRoot().getBreedingTracker(world, name));
}
public final boolean isMutationDiscovered(final IMutation mutation, final IBreedingTracker tracker) {
public boolean isMutationDiscovered(IMutation mutation, IBreedingTracker tracker) {
return tracker == null || tracker.isDiscovered(mutation);
}
public final boolean isSpeciesDiscovered(final IAlleleSpecies species, final World world, final GameProfile name) {
return this.isSpeciesDiscovered(species, this.getSpeciesRoot().getBreedingTracker(world, name));
public boolean isSpeciesDiscovered(IAlleleSpecies species, World world, GameProfile name) {
return isSpeciesDiscovered(species, getSpeciesRoot().getBreedingTracker(world, name));
}
public final boolean isSpeciesDiscovered(final IAlleleSpecies species, final IBreedingTracker tracker) {
public boolean isSpeciesDiscovered(IAlleleSpecies species, IBreedingTracker tracker) {
return tracker == null || tracker.isDiscovered(species);
}
public final boolean isSecret(final IAlleleSpecies species) {
public boolean isSecret(IAlleleSpecies species) {
return !species.isCounted();
}
public final boolean isSecret(final IClassification branch) {
for (final IAlleleSpecies species : branch.getMemberSpecies()) {
if (!this.isSecret(species)) {
public boolean isSecret(IClassification branch) {
for (IAlleleSpecies species : branch.getMemberSpecies()) {
if (!isSecret(species)) {
return false;
}
}
return true;
}
public final Collection<IClassification> getDiscoveredBranches(final World world, final GameProfile player) {
final List<IClassification> branches = new ArrayList<IClassification>();
for (final IClassification branch : this.getAllBranches()) {
public Collection<IClassification> getDiscoveredBranches(World world, GameProfile player) {
List<IClassification> branches = new ArrayList<>();
for (IClassification branch : getAllBranches()) {
boolean discovered = false;
for (final IAlleleSpecies species : branch.getMemberSpecies()) {
if (this.isSpeciesDiscovered(species, world, player)) {
for (IAlleleSpecies species : branch.getMemberSpecies()) {
if (isSpeciesDiscovered(species, world, player)) {
discovered = true;
}
}
@@ -265,12 +251,12 @@ public abstract class BreedingSystem implements IItemStackRepresentitive
return branches;
}
public final Collection<IClassification> getDiscoveredBranches(final IBreedingTracker tracker) {
final List<IClassification> branches = new ArrayList<IClassification>();
for (final IClassification branch : this.getAllBranches()) {
public Collection<IClassification> getDiscoveredBranches(IBreedingTracker tracker) {
List<IClassification> branches = new ArrayList<>();
for (IClassification branch : getAllBranches()) {
boolean discovered = false;
for (final IAlleleSpecies species : branch.getMemberSpecies()) {
if (this.isSpeciesDiscovered(species, tracker)) {
for (IAlleleSpecies species : branch.getMemberSpecies()) {
if (isSpeciesDiscovered(species, tracker)) {
discovered = true;
}
}
@@ -281,145 +267,148 @@ public abstract class BreedingSystem implements IItemStackRepresentitive
return branches;
}
public final Collection<IAlleleSpecies> getDiscoveredSpecies(final World world, final GameProfile player) {
final List<IAlleleSpecies> speciesList = new ArrayList<IAlleleSpecies>();
for (final IAlleleSpecies species : this.getAllSpecies()) {
if (this.isSpeciesDiscovered(species, world, player)) {
public Collection<IAlleleSpecies> getDiscoveredSpecies(World world, GameProfile player) {
List<IAlleleSpecies> speciesList = new ArrayList<>();
for (IAlleleSpecies species : getAllSpecies()) {
if (isSpeciesDiscovered(species, world, player)) {
speciesList.add(species);
}
}
return speciesList;
}
public final Collection<IAlleleSpecies> getDiscoveredSpecies(final IBreedingTracker tracker) {
final List<IAlleleSpecies> speciesList = new ArrayList<IAlleleSpecies>();
for (final IAlleleSpecies species : this.getAllSpecies()) {
if (this.isSpeciesDiscovered(species, tracker)) {
public Collection<IAlleleSpecies> getDiscoveredSpecies(IBreedingTracker tracker) {
List<IAlleleSpecies> speciesList = new ArrayList<>();
for (IAlleleSpecies species : getAllSpecies()) {
if (isSpeciesDiscovered(species, tracker)) {
speciesList.add(species);
}
}
return speciesList;
}
public final List<IMutation> getDiscoveredMutations(final World world, final GameProfile player) {
final List<IMutation> speciesList = new ArrayList<IMutation>();
for (final IMutation species : this.getAllMutations()) {
if (this.isMutationDiscovered(species, world, player)) {
public List<IMutation> getDiscoveredMutations(World world, GameProfile player) {
List<IMutation> speciesList = new ArrayList<>();
for (IMutation species : getAllMutations()) {
if (isMutationDiscovered(species, world, player)) {
speciesList.add(species);
}
}
return speciesList;
}
public final List<IMutation> getDiscoveredMutations(final IBreedingTracker tracker) {
final List<IMutation> speciesList = new ArrayList<IMutation>();
for (final IMutation species : this.getAllMutations()) {
if (this.isMutationDiscovered(species, tracker)) {
public List<IMutation> getDiscoveredMutations(IBreedingTracker tracker) {
List<IMutation> speciesList = new ArrayList<>();
for (IMutation species : getAllMutations()) {
if (isMutationDiscovered(species, tracker)) {
speciesList.add(species);
}
}
return speciesList;
}
public final int getDiscoveredBranchMembers(final IClassification branch, final IBreedingTracker tracker) {
public int getDiscoveredBranchMembers(IClassification branch, IBreedingTracker tracker) {
int discoveredSpecies = 0;
for (final IAlleleSpecies species : branch.getMemberSpecies()) {
if (this.isSpeciesDiscovered(species, tracker)) {
++discoveredSpecies;
for (IAlleleSpecies species : branch.getMemberSpecies()) {
if (isSpeciesDiscovered(species, tracker)) {
discoveredSpecies++;
}
}
return discoveredSpecies;
}
public IIcon getUndiscoveredIcon() {
return this.iconUndiscovered.getIcon();
return iconUndiscovered.getIcon();
}
public IIcon getDiscoveredIcon() {
return this.iconDiscovered.getIcon();
return iconDiscovered.getIcon();
}
public abstract float getChance(final IMutation p0, final EntityPlayer p1, final IAllele p2, final IAllele p3);
public abstract float getChance(IMutation mutation, EntityPlayer player, IAllele allele1, IAllele allele2);
public abstract Class<? extends IBreedingTracker> getTrackerClass();
@SubscribeEvent
public final void onSyncBreedingTracker(final ForestryEvent.SyncedBreedingTracker event) {
final IBreedingTracker tracker = event.tracker;
if (!this.getTrackerClass().isInstance(tracker)) {
public void onSyncBreedingTracker(ForestryEvent.SyncedBreedingTracker event) {
IBreedingTracker tracker = event.tracker;
if (!getTrackerClass().isInstance(tracker)) {
return;
}
this.syncTracker(tracker);
syncTracker(tracker);
}
public final void syncTracker(final IBreedingTracker tracker) {
this.discoveredSpeciesPercentage = 0.0f;
this.totalSpeciesCount = 0;
this.discoveredSpeciesCount = 0;
this.totalSecretCount = 0;
this.discoveredSecretCount = 0;
final Collection<IAlleleSpecies> discoveredSpecies = this.getDiscoveredSpecies(tracker);
final Collection<IAlleleSpecies> allSpecies = this.getAllSpecies();
for (final IAlleleSpecies species : allSpecies) {
if (!this.isSecret(species)) {
++this.totalSpeciesCount;
if (!this.isSpeciesDiscovered(species, tracker)) {
public void syncTracker(IBreedingTracker tracker) {
discoveredSpeciesPercentage = 0.0f;
totalSpeciesCount = 0;
discoveredSpeciesCount = 0;
totalSecretCount = 0;
discoveredSecretCount = 0;
Collection<IAlleleSpecies> discoveredSpecies = getDiscoveredSpecies(tracker);
Collection<IAlleleSpecies> allSpecies = getAllSpecies();
for (IAlleleSpecies species : allSpecies) {
if (!isSecret(species)) {
totalSpeciesCount++;
if (!isSpeciesDiscovered(species, tracker)) {
continue;
}
++this.discoveredSpeciesCount;
}
else {
++this.totalSecretCount;
if (!this.isSpeciesDiscovered(species, tracker)) {
discoveredSpeciesCount++;
} else {
totalSecretCount++;
if (!isSpeciesDiscovered(species, tracker)) {
continue;
}
++this.discoveredSecretCount;
discoveredSecretCount++;
}
}
this.discoveredBranchPercentage = 0.0f;
this.totalBranchCount = 0;
this.discoveredBranchCount = 0;
final Collection<IClassification> discoveredBranches = this.getDiscoveredBranches(tracker);
final Collection<IClassification> allBranches = this.getAllBranches();
for (final IClassification branch : allBranches) {
if (!this.isSecret(branch)) {
++this.totalBranchCount;
discoveredBranchPercentage = 0.0f;
totalBranchCount = 0;
discoveredBranchCount = 0;
Collection<IClassification> discoveredBranches = getDiscoveredBranches(tracker);
Collection<IClassification> allBranches = getAllBranches();
for (IClassification branch : allBranches) {
if (!isSecret(branch)) {
totalBranchCount++;
if (!discoveredBranches.contains(branch)) {
continue;
}
++this.discoveredBranchCount;
}
else {
++this.totalSecretBranchCount;
discoveredBranchCount++;
} else {
totalSecretBranchCount++;
if (!discoveredBranches.contains(branch)) {
continue;
}
++this.discoveredSecretBranchCount;
discoveredSecretBranchCount++;
}
}
this.discoveredSpeciesPercentage = this.discoveredSpeciesCount / this.totalSpeciesCount;
this.discoveredBranchPercentage = this.discoveredBranchCount / this.totalBranchCount;
final String epithet = this.getEpitome();
this.onSyncBreedingTracker(tracker);
discoveredSpeciesPercentage = discoveredSpeciesCount / totalSpeciesCount;
discoveredBranchPercentage = discoveredBranchCount / totalBranchCount;
String epithet = getEpitome();
onSyncBreedingTracker(tracker);
}
public void onSyncBreedingTracker(final IBreedingTracker tracker) {
public void onSyncBreedingTracker(IBreedingTracker tracker) {
// ignored
}
public String getEpitome() {
return this.getEpitome(this.discoveredSpeciesPercentage);
return getEpitome(discoveredSpeciesPercentage);
}
public final String getDescriptor() {
return BinnieCore.proxy.localise(this.getSpeciesRoot().getUID() + ".descriptor");
public String getDescriptor() {
return BinnieCore.proxy.localise(getSpeciesRoot().getUID() + ".descriptor");
}
public final String getIdent() {
return this.getSpeciesRoot().getUID();
public String getIdent() {
return getSpeciesRoot().getUID();
}
public final IChromosomeType getChromosome(final int i) {
for (final IChromosomeType chromosome : this.getSpeciesRoot().getKaryotype()) {
public IChromosomeType getChromosome(int i) {
for (IChromosomeType chromosome : getSpeciesRoot().getKaryotype()) {
if (i == chromosome.ordinal()) {
return chromosome;
}
@@ -429,9 +418,11 @@ public abstract class BreedingSystem implements IItemStackRepresentitive
public abstract int getColour();
public String getAlleleName(final IChromosomeType chromosome, final IAllele allele) {
public String getAlleleName(IChromosomeType chromosome, IAllele allele) {
if (allele instanceof IAlleleBoolean) {
return ((IAlleleBoolean) allele).getValue() ? Binnie.Language.localise(BinnieCore.instance, "allele.true") : Binnie.Language.localise(BinnieCore.instance, "allele.false");
return ((IAlleleBoolean) allele).getValue() ?
Binnie.Language.localise(BinnieCore.instance, "allele.true") :
Binnie.Language.localise(BinnieCore.instance, "allele.false");
}
if (allele.getName() == "for.gui.maximum") {
return Binnie.Language.localise(BinnieCore.instance, "allele.fertility.maximum");
@@ -440,55 +431,56 @@ public abstract class BreedingSystem implements IItemStackRepresentitive
}
public String getName() {
return BinnieCore.proxy.localise(this.getSpeciesRoot().getUID() + ".shortName");
return BinnieCore.proxy.localise(getSpeciesRoot().getUID() + ".shortName");
}
@Override
public ItemStack getItemStackRepresentitive() {
final IIndividual first = this.getSpeciesRoot().getIndividualTemplates().get(0);
return this.getSpeciesRoot().getMemberStack(first, this.getDefaultType());
public ItemStack getItemStackRepresentative() {
ISpeciesRoot speciesRoot = getSpeciesRoot();
IIndividual first = speciesRoot.getIndividualTemplates().get(0);
return speciesRoot.getMemberStack(first, getDefaultType());
}
@Override
public String toString() {
return this.getName();
return getName();
}
public abstract boolean isDNAManipulable(final ItemStack p0);
public abstract boolean isDNAManipulable(ItemStack p0);
public IIndividual getConversion(final ItemStack stack) {
public IIndividual getConversion(ItemStack stack) {
return null;
}
public final IIndividual getDefaultIndividual() {
return this.getSpeciesRoot().templateAsIndividual(this.getSpeciesRoot().getDefaultTemplate());
public IIndividual getDefaultIndividual() {
return getSpeciesRoot().templateAsIndividual(getSpeciesRoot().getDefaultTemplate());
}
public final int getDefaultType() {
return this.getActiveTypes()[0];
public int getDefaultType() {
return getActiveTypes()[0];
}
public abstract int[] getActiveTypes();
public abstract void addExtraAlleles(final IChromosomeType p0, final TreeSet<IAllele> p1);
public abstract void addExtraAlleles(IChromosomeType chromosome, TreeSet<IAllele> alleles);
public ItemStack getConversionStack(final ItemStack stack) {
return this.getSpeciesRoot().getMemberStack(this.getConversion(stack), this.getDefaultType());
public ItemStack getConversionStack(ItemStack stack) {
return getSpeciesRoot().getMemberStack(getConversion(stack), getDefaultType());
}
public final Collection<IChromosomeType> getActiveKaryotype() {
return Binnie.Genetics.getActiveChromosomes(this.getSpeciesRoot());
public Collection<IChromosomeType> getActiveKaryotype() {
return Binnie.Genetics.getActiveChromosomes(getSpeciesRoot());
}
public ItemStack getDefaultMember(final String uid) {
return this.getSpeciesRoot().getMemberStack(this.getIndividual(uid), this.getDefaultType());
public ItemStack getDefaultMember(String uid) {
return getSpeciesRoot().getMemberStack(getIndividual(uid), getDefaultType());
}
public IIndividual getIndividual(final String uid) {
return this.getSpeciesRoot().templateAsIndividual(this.getSpeciesRoot().getTemplate(uid));
public IIndividual getIndividual(String uid) {
return getSpeciesRoot().templateAsIndividual(getSpeciesRoot().getTemplate(uid));
}
public IGenome getGenome(final String uid) {
return this.getSpeciesRoot().templateAsGenome(this.getSpeciesRoot().getTemplate(uid));
public IGenome getGenome(String uid) {
return getSpeciesRoot().templateAsGenome(getSpeciesRoot().getTemplate(uid));
}
}
@@ -1,13 +1,8 @@
//
// Decompiled by Procyon v0.5.30
//
package binnie.core.genetics;
public enum EnumBeeBooleanModifier
{
public enum EnumBeeBooleanModifier {
Sealed,
SelfLighted,
SunlightStimulated,
Hellish;
Hellish
}
@@ -1,14 +1,9 @@
//
// Decompiled by Procyon v0.5.30
//
package binnie.core.genetics;
import binnie.core.BinnieCore;
import binnie.Binnie;
import binnie.core.BinnieCore;
public enum EnumBeeModifier
{
public enum EnumBeeModifier {
Territory,
Mutation,
Lifespan,
@@ -17,6 +12,6 @@ public enum EnumBeeModifier
GeneticDecay;
public String getName() {
return Binnie.Language.localise(BinnieCore.instance, "beemodifier." + this.name().toLowerCase());
return Binnie.Language.localise(BinnieCore.instance, "beemodifier." + name().toLowerCase());
}
}
@@ -1,39 +1,34 @@
//
// Decompiled by Procyon v0.5.30
//
package binnie.core.genetics;
import binnie.botany.genetics.EnumFlowerColor;
import java.util.TreeSet;
import binnie.botany.core.BotanyCore;
import forestry.api.genetics.IIndividual;
import binnie.botany.api.EnumFlowerStage;
import binnie.botany.api.IFlowerRoot;
import net.minecraft.item.ItemStack;
import binnie.core.BinnieCore;
import binnie.botany.api.EnumFlowerChromosome;
import forestry.api.genetics.IChromosomeType;
import binnie.botany.api.IBotanistTracker;
import forestry.api.genetics.IBreedingTracker;
import forestry.api.genetics.ISpeciesRoot;
import binnie.botany.api.IFlowerMutation;
import forestry.api.genetics.IAllele;
import net.minecraft.entity.player.EntityPlayer;
import forestry.api.genetics.IMutation;
import binnie.extrabees.ExtraBees;
import binnie.Binnie;
import binnie.botany.api.EnumFlowerChromosome;
import binnie.botany.api.EnumFlowerStage;
import binnie.botany.api.IBotanistTracker;
import binnie.botany.api.IFlowerRoot;
import binnie.botany.core.BotanyCore;
import binnie.botany.genetics.EnumFlowerColor;
import binnie.core.BinnieCore;
import binnie.extrabees.ExtraBees;
import forestry.api.genetics.IAllele;
import forestry.api.genetics.IBreedingTracker;
import forestry.api.genetics.IChromosomeType;
import forestry.api.genetics.IIndividual;
import forestry.api.genetics.IMutation;
import forestry.api.genetics.ISpeciesRoot;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack;
class FlowerBreedingSystem extends BreedingSystem
{
import java.util.TreeSet;
class FlowerBreedingSystem extends BreedingSystem {
public FlowerBreedingSystem() {
this.iconUndiscovered = Binnie.Resource.getItemIcon(ExtraBees.instance, "icon/undiscoveredBee");
this.iconDiscovered = Binnie.Resource.getItemIcon(ExtraBees.instance, "icon/discoveredBee");
iconUndiscovered = Binnie.Resource.getItemIcon(ExtraBees.instance, "icon/undiscoveredBee");
iconDiscovered = Binnie.Resource.getItemIcon(ExtraBees.instance, "icon/discoveredBee");
}
@Override
public float getChance(final IMutation mutation, final EntityPlayer player, final IAllele species1, final IAllele species2) {
return ((IFlowerMutation) mutation).getBaseChance();
public float getChance(IMutation mutation, EntityPlayer player, IAllele species1, IAllele species2) {
return mutation.getBaseChance();
}
@Override
@@ -43,7 +38,7 @@ class FlowerBreedingSystem extends BreedingSystem
@Override
public int getColour() {
return 14563127;
return 0xde3737;
}
@Override
@@ -52,7 +47,7 @@ class FlowerBreedingSystem extends BreedingSystem
}
@Override
public String getAlleleName(final IChromosomeType chromosome, final IAllele allele) {
public String getAlleleName(IChromosomeType chromosome, IAllele allele) {
if (chromosome == EnumFlowerChromosome.FERTILITY) {
if (allele.getUID().contains("Low")) {
return Binnie.Language.localise(BinnieCore.instance, "allele.fertility.low");
@@ -71,63 +66,66 @@ class FlowerBreedingSystem extends BreedingSystem
}
@Override
public boolean isDNAManipulable(final ItemStack member) {
return ((IFlowerRoot) this.getSpeciesRoot()).getStageType(member) == EnumFlowerStage.POLLEN;
public boolean isDNAManipulable(ItemStack member) {
return ((IFlowerRoot) getSpeciesRoot()).getStageType(member) == EnumFlowerStage.POLLEN;
}
@Override
public IIndividual getConversion(final ItemStack stack) {
public IIndividual getConversion(ItemStack stack) {
return BotanyCore.getFlowerRoot().getConversion(stack);
}
@Override
public int[] getActiveTypes() {
return new int[] { EnumFlowerStage.FLOWER.ordinal(), EnumFlowerStage.POLLEN.ordinal(), EnumFlowerStage.SEED.ordinal() };
return new int[]{
EnumFlowerStage.FLOWER.ordinal(),
EnumFlowerStage.POLLEN.ordinal(),
EnumFlowerStage.SEED.ordinal()
};
}
@Override
public void addExtraAlleles(final IChromosomeType chromosome, final TreeSet<IAllele> alleles) {
public void addExtraAlleles(IChromosomeType chromosome, TreeSet<IAllele> alleles) {
switch ((EnumFlowerChromosome) chromosome) {
case FERTILITY: {
for (final ForestryAllele.Fertility a : ForestryAllele.Fertility.values()) {
alleles.add(a.getAllele());
}
break;
}
case LIFESPAN: {
for (final ForestryAllele.Lifespan a2 : ForestryAllele.Lifespan.values()) {
alleles.add(a2.getAllele());
}
break;
}
case HUMIDITY_TOLERANCE:
case PH_TOLERANCE:
case TEMPERATURE_TOLERANCE: {
for (final Tolerance a3 : Tolerance.values()) {
alleles.add(a3.getAllele());
}
break;
}
case PRIMARY:
case SECONDARY:
case STEM: {
for (final EnumFlowerColor a4 : EnumFlowerColor.values()) {
alleles.add(a4.getAllele());
}
break;
}
case SAPPINESS: {
for (final ForestryAllele.Sappiness a5 : ForestryAllele.Sappiness.values()) {
alleles.add(a5.getAllele());
}
break;
}
case TERRITORY: {
for (final ForestryAllele.Territory a6 : ForestryAllele.Territory.values()) {
alleles.add(a6.getAllele());
}
break;
}
case FERTILITY:
for (ForestryAllele.Fertility a : ForestryAllele.Fertility.values()) {
alleles.add(a.getAllele());
}
break;
case LIFESPAN:
for (ForestryAllele.Lifespan a2 : ForestryAllele.Lifespan.values()) {
alleles.add(a2.getAllele());
}
break;
case HUMIDITY_TOLERANCE:
case PH_TOLERANCE:
case TEMPERATURE_TOLERANCE:
for (Tolerance a3 : Tolerance.values()) {
alleles.add(a3.getAllele());
}
break;
case PRIMARY:
case SECONDARY:
case STEM:
for (EnumFlowerColor a4 : EnumFlowerColor.values()) {
alleles.add(a4.getAllele());
}
break;
case SAPPINESS:
for (ForestryAllele.Sappiness a5 : ForestryAllele.Sappiness.values()) {
alleles.add(a5.getAllele());
}
break;
case TERRITORY:
for (ForestryAllele.Territory a6 : ForestryAllele.Territory.values()) {
alleles.add(a6.getAllele());
}
break;
}
}
}
@@ -1,7 +1,3 @@
//
// Decompiled by Procyon v0.5.30
//
package binnie.core.genetics;
import binnie.Binnie;
@@ -9,10 +5,8 @@ import forestry.api.apiculture.IAlleleBeeSpecies;
import forestry.api.genetics.AlleleManager;
import forestry.api.genetics.IAllele;
public class ForestryAllele
{
public enum Lifespan
{
public class ForestryAllele {
public enum Lifespan {
Shortest,
Shorter,
Short,
@@ -24,12 +18,11 @@ public class ForestryAllele
Longest;
public IAllele getAllele() {
return AlleleManager.alleleRegistry.getAllele("forestry.lifespan" + this.toString());
return AlleleManager.alleleRegistry.getAllele("forestry.lifespan" + toString());
}
}
public enum Speed
{
public enum Speed {
Slowest,
Slower,
Slow,
@@ -39,24 +32,22 @@ public class ForestryAllele
Fastest;
public IAllele getAllele() {
return AlleleManager.alleleRegistry.getAllele("forestry.speed" + this.toString());
return AlleleManager.alleleRegistry.getAllele("forestry.speed" + toString());
}
}
public enum Fertility
{
public enum Fertility {
Low,
Normal,
High,
Maximum;
public IAllele getAllele() {
return AlleleManager.alleleRegistry.getAllele("forestry.fertility" + this.toString());
return AlleleManager.alleleRegistry.getAllele("forestry.fertility" + toString());
}
}
public enum Flowering
{
public enum Flowering {
Slowest,
Slower,
Slow,
@@ -67,24 +58,22 @@ public class ForestryAllele
Maximum;
public IAllele getAllele() {
return AlleleManager.alleleRegistry.getAllele("forestry.flowering" + this.toString());
return AlleleManager.alleleRegistry.getAllele("forestry.flowering" + toString());
}
}
public enum Territory
{
public enum Territory {
Default,
Large,
Larger,
Largest;
public IAllele getAllele() {
return AlleleManager.alleleRegistry.getAllele("forestry.territory" + this.toString());
return AlleleManager.alleleRegistry.getAllele("forestry.territory" + toString());
}
}
public enum Sappiness
{
public enum Sappiness {
Lowest,
Lower,
Low,
@@ -94,12 +83,11 @@ public class ForestryAllele
Highest;
public IAllele getAllele() {
return AlleleManager.alleleRegistry.getAllele("forestry.sappiness" + this.toString());
return AlleleManager.alleleRegistry.getAllele("forestry.sappiness" + toString());
}
}
public enum TreeHeight
{
public enum TreeHeight {
Smallest,
Smaller,
Small,
@@ -110,12 +98,11 @@ public class ForestryAllele
Gigantic;
public IAllele getAllele() {
return AlleleManager.alleleRegistry.getAllele("forestry.height" + ((this == TreeHeight.Average) ? "Max10" : this.toString()));
return AlleleManager.alleleRegistry.getAllele("forestry.height" + ((this == TreeHeight.Average) ? "Max10" : toString()));
}
}
public enum Size
{
public enum Size {
Smallest,
Smaller,
Small,
@@ -125,12 +112,11 @@ public class ForestryAllele
Largest;
public IAllele getAllele() {
return AlleleManager.alleleRegistry.getAllele("forestry.size" + this.toString());
return AlleleManager.alleleRegistry.getAllele("forestry.size" + toString());
}
}
public enum Saplings
{
public enum Saplings {
Lowest,
Lower,
Low,
@@ -140,7 +126,7 @@ public class ForestryAllele
Highest;
public IAllele getAllele() {
String s = this.toString();
String s = toString();
if (this == Saplings.Average) {
s = "Default";
}
@@ -154,8 +140,7 @@ public class ForestryAllele
}
}
public enum Yield
{
public enum Yield {
Lowest,
Lower,
Low,
@@ -165,12 +150,11 @@ public class ForestryAllele
Highest;
public IAllele getAllele() {
return AlleleManager.alleleRegistry.getAllele("forestry.yield" + ((this == Yield.Average) ? "Default" : this.toString()));
return AlleleManager.alleleRegistry.getAllele("forestry.yield" + ((this == Yield.Average) ? "Default" : toString()));
}
}
public enum Maturation
{
public enum Maturation {
Slowest,
Slower,
Slow,
@@ -180,35 +164,32 @@ public class ForestryAllele
Fastest;
public IAllele getAllele() {
return AlleleManager.alleleRegistry.getAllele("forestry.maturation" + this.toString());
return AlleleManager.alleleRegistry.getAllele("forestry.maturation" + toString());
}
}
public enum Bool
{
public enum Bool {
True,
False;
public IAllele getAllele() {
return AlleleManager.alleleRegistry.getAllele("forestry.bool" + this.toString());
return AlleleManager.alleleRegistry.getAllele("forestry.bool" + toString());
}
public static IAllele get(final boolean bool) {
public static IAllele get(boolean bool) {
return (bool ? Bool.True : Bool.False).getAllele();
}
}
public enum Growth
{
public enum Growth {
Tropical;
public IAllele getAllele() {
return AlleleManager.alleleRegistry.getAllele("forestry.growth" + this.toString());
return AlleleManager.alleleRegistry.getAllele("forestry.growth" + toString());
}
}
public enum Int
{
public enum Int {
Int1,
Int2,
Int3,
@@ -221,12 +202,11 @@ public class ForestryAllele
Int10;
public IAllele getAllele() {
return AlleleManager.alleleRegistry.getAllele("forestry.i" + (this.ordinal() + 1) + "d");
return AlleleManager.alleleRegistry.getAllele("forestry.i" + (ordinal() + 1) + "d");
}
}
public enum BeeSpecies
{
public enum BeeSpecies {
Modest,
Noble,
Forest,
@@ -261,11 +241,11 @@ public class ForestryAllele
Demonic;
public IAlleleBeeSpecies getAllele() {
return (IAlleleBeeSpecies) AlleleManager.alleleRegistry.getAllele("forestry.species" + this.toString());
return (IAlleleBeeSpecies) AlleleManager.alleleRegistry.getAllele("forestry.species" + toString());
}
public IAllele[] getTemplate() {
return Binnie.Genetics.getBeeRoot().getTemplate(this.getAllele().getUID());
return Binnie.Genetics.getBeeRoot().getTemplate(getAllele().getUID());
}
}
}
+38 -43
View File
@@ -1,119 +1,114 @@
//
// Decompiled by Procyon v0.5.30
//
package binnie.core.genetics;
import binnie.Binnie;
import forestry.api.genetics.AlleleManager;
import net.minecraft.nbt.NBTTagCompound;
import forestry.api.genetics.ISpeciesRoot;
import forestry.api.genetics.IChromosomeType;
import forestry.api.genetics.IAllele;
import binnie.genetics.api.IGene;
import forestry.api.core.INBTTagable;
import forestry.api.genetics.AlleleManager;
import forestry.api.genetics.IAllele;
import forestry.api.genetics.IChromosomeType;
import forestry.api.genetics.ISpeciesRoot;
import net.minecraft.nbt.NBTTagCompound;
public class Gene implements INBTTagable, IGene
{
public class Gene implements INBTTagable, IGene {
private IAllele allele;
private IChromosomeType chromosome;
private ISpeciesRoot root;
@Override
public ISpeciesRoot getSpeciesRoot() {
return this.root;
return root;
}
@Override
public String toString() {
return this.getAlleleName();
return getAlleleName();
}
public Gene(final IAllele allele, final IChromosomeType chromosome, final ISpeciesRoot root) {
public Gene(IAllele allele, IChromosomeType chromosome, ISpeciesRoot root) {
this.allele = allele;
this.chromosome = chromosome;
this.root = root;
}
public Gene(final NBTTagCompound nbt) {
this.readFromNBT(nbt);
public Gene(NBTTagCompound nbt) {
readFromNBT(nbt);
}
@Override
public void readFromNBT(final NBTTagCompound nbt) {
this.allele = AlleleManager.alleleRegistry.getAllele(nbt.getString("allele"));
this.root = AlleleManager.alleleRegistry.getSpeciesRoot(nbt.getString("root"));
final int chromoID = nbt.getByte("chromo");
if (this.root != null && chromoID >= 0 && chromoID < this.root.getKaryotype().length) {
this.chromosome = this.root.getKaryotype()[chromoID];
public void readFromNBT(NBTTagCompound nbt) {
allele = AlleleManager.alleleRegistry.getAllele(nbt.getString("allele"));
root = AlleleManager.alleleRegistry.getSpeciesRoot(nbt.getString("root"));
int chromoID = nbt.getByte("chromo");
if (root != null && chromoID >= 0 && chromoID < root.getKaryotype().length) {
chromosome = root.getKaryotype()[chromoID];
}
}
@Override
public void writeToNBT(final NBTTagCompound nbt) {
nbt.setString("allele", this.allele.getUID());
nbt.setString("root", this.root.getUID());
nbt.setByte("chromo", (byte) this.chromosome.ordinal());
public void writeToNBT(NBTTagCompound nbt) {
nbt.setString("allele", allele.getUID());
nbt.setString("root", root.getUID());
nbt.setByte("chromo", (byte) chromosome.ordinal());
}
public boolean isCorrupted() {
return this.allele == null || this.chromosome == null || this.root == null;
return allele == null || chromosome == null || root == null;
}
public static Gene create(final NBTTagCompound nbt) {
final Gene gene = new Gene(nbt);
public static Gene create(NBTTagCompound nbt) {
Gene gene = new Gene(nbt);
return gene.isCorrupted() ? null : gene;
}
public static Gene create(final IAllele allele, final IChromosomeType chromosome, final ISpeciesRoot root) {
final Gene gene = new Gene(allele, chromosome, root);
public static Gene create(IAllele allele, IChromosomeType chromosome, ISpeciesRoot root) {
Gene gene = new Gene(allele, chromosome, root);
return gene.isCorrupted() ? null : gene;
}
@Override
public NBTTagCompound getNBTTagCompound() {
final NBTTagCompound nbt = new NBTTagCompound();
this.writeToNBT(nbt);
NBTTagCompound nbt = new NBTTagCompound();
writeToNBT(nbt);
return nbt;
}
@Override
public String getName() {
return Binnie.Genetics.getSystem(this.root).getAlleleName(this.chromosome, this.allele);
return Binnie.Genetics.getSystem(root).getAlleleName(chromosome, allele);
}
public BreedingSystem getSystem() {
return Binnie.Genetics.getSystem(this.root);
return Binnie.Genetics.getSystem(root);
}
@Override
public IChromosomeType getChromosome() {
return this.chromosome;
return chromosome;
}
@Override
public IAllele getAllele() {
return this.allele;
return allele;
}
@Override
public boolean equals(final Object obj) {
public boolean equals(Object obj) {
if (!(obj instanceof Gene)) {
return false;
}
final Gene g = (Gene) obj;
return this.allele == g.allele && this.chromosome.ordinal() == g.chromosome.ordinal() && this.root == g.root;
Gene g = (Gene) obj;
return allele == g.allele && chromosome.ordinal() == g.chromosome.ordinal() && root == g.root;
}
public String getAlleleName() {
return this.getSystem().getAlleleName(this.chromosome, this.allele);
return getSystem().getAlleleName(chromosome, allele);
}
public String getChromosomeName() {
return this.getSystem().getChromosomeName(this.chromosome);
return getSystem().getChromosomeName(chromosome);
}
public String getShortChromosomeName() {
return this.getSystem().getChromosomeShortName(this.chromosome);
return getSystem().getChromosomeShortName(chromosome);
}
}
@@ -1,12 +1,7 @@
//
// Decompiled by Procyon v0.5.30
//
package binnie.core.genetics;
import forestry.api.genetics.IAllele;
public interface IAlleleProvider
{
public interface IAlleleProvider {
IAllele getAllele();
}
@@ -1,40 +1,35 @@
//
// Decompiled by Procyon v0.5.30
//
package binnie.core.genetics;
import forestry.api.genetics.IClassification;
import binnie.core.BinnieCore;
import binnie.Binnie;
import forestry.api.genetics.ISpeciesRoot;
import binnie.core.BinnieCore;
import forestry.api.genetics.AlleleManager;
import forestry.api.genetics.IAlleleSpecies;
import forestry.api.genetics.IClassification;
import forestry.api.genetics.ISpeciesRoot;
import net.minecraft.item.ItemStack;
interface IBreedingMessage
{
// TODO unused interface?
interface IBreedingMessage {
String getTitle();
String getBody();
ItemStack getIcon();
public static class MessageSpeciesDiscovered implements IBreedingMessage
{
class MessageSpeciesDiscovered implements IBreedingMessage {
IAlleleSpecies species;
ItemStack stack;
public MessageSpeciesDiscovered(final IAlleleSpecies species) {
public MessageSpeciesDiscovered(IAlleleSpecies species) {
this.species = species;
ISpeciesRoot root = null;
for (final ISpeciesRoot sRoot : AlleleManager.alleleRegistry.getSpeciesRoot().values()) {
for (ISpeciesRoot sRoot : AlleleManager.alleleRegistry.getSpeciesRoot().values()) {
if (sRoot.getKaryotype()[0].getAlleleClass().isInstance(species)) {
root = sRoot;
}
}
if (root != null) {
this.stack = root.getMemberStack(root.templateAsIndividual(root.getTemplate(species.getUID())), 0);
stack = root.getMemberStack(root.templateAsIndividual(root.getTemplate(species.getUID())), 0);
}
}
@@ -45,32 +40,31 @@ interface IBreedingMessage
@Override
public String getBody() {
return this.species.getName();
return species.getName();
}
@Override
public ItemStack getIcon() {
return this.stack;
return stack;
}
}
public static class BranchDiscovered implements IBreedingMessage
{
class BranchDiscovered implements IBreedingMessage {
IAlleleSpecies species;
IClassification classification;
ItemStack stack;
public BranchDiscovered(final IAlleleSpecies species, final IClassification classification) {
public BranchDiscovered(IAlleleSpecies species, IClassification classification) {
this.species = species;
this.classification = classification;
ISpeciesRoot root = null;
for (final ISpeciesRoot sRoot : AlleleManager.alleleRegistry.getSpeciesRoot().values()) {
for (ISpeciesRoot sRoot : AlleleManager.alleleRegistry.getSpeciesRoot().values()) {
if (sRoot.getKaryotype()[0].getAlleleClass().isInstance(species)) {
root = sRoot;
}
}
if (root != null) {
this.stack = root.getMemberStack(root.templateAsIndividual(root.getTemplate(species.getUID())), 0);
stack = root.getMemberStack(root.templateAsIndividual(root.getTemplate(species.getUID())), 0);
}
}
@@ -90,14 +84,13 @@ interface IBreedingMessage
}
}
public static class EpithetGained implements IBreedingMessage
{
class EpithetGained implements IBreedingMessage {
String epithet;
ItemStack stack;
public EpithetGained(final String epithet, final ISpeciesRoot root) {
public EpithetGained(String epithet, ISpeciesRoot root) {
this.epithet = epithet;
this.stack = root.getMemberStack(root.templateAsIndividual(root.getDefaultTemplate()), 0);
stack = root.getMemberStack(root.templateAsIndividual(root.getDefaultTemplate()), 0);
}
@Override
@@ -107,12 +100,12 @@ interface IBreedingMessage
@Override
public String getBody() {
return this.epithet;
return epithet;
}
@Override
public ItemStack getIcon() {
return this.stack;
return stack;
}
}
}
@@ -0,0 +1,7 @@
package binnie.core.genetics;
import net.minecraft.item.ItemStack;
public interface IItemStackRepresentative {
ItemStack getItemStackRepresentative();
}
@@ -1,12 +0,0 @@
//
// Decompiled by Procyon v0.5.30
//
package binnie.core.genetics;
import net.minecraft.item.ItemStack;
public interface IItemStackRepresentitive
{
ItemStack getItemStackRepresentitive();
}
@@ -1,68 +1,64 @@
//
// Decompiled by Procyon v0.5.30
//
package binnie.core.genetics;
import binnie.botany.genetics.AlleleColor;
import forestry.api.genetics.IAlleleInteger;
import forestry.api.genetics.IAlleleFloat;
import forestry.api.genetics.IGenome;
import java.util.Comparator;
import java.util.TreeSet;
import binnie.Binnie;
import cpw.mods.fml.common.eventhandler.SubscribeEvent;
import net.minecraftforge.event.world.WorldEvent;
import forestry.api.genetics.IIndividual;
import net.minecraft.item.ItemStack;
import java.util.Collection;
import forestry.api.genetics.EnumTolerance;
import binnie.botany.api.IFlowerRoot;
import forestry.api.lepidopterology.IButterflyRoot;
import forestry.api.apiculture.IBeeRoot;
import forestry.api.genetics.AlleleManager;
import forestry.api.arboriculture.ITreeRoot;
import net.minecraft.world.World;
import forestry.api.genetics.IAlleleSpecies;
import binnie.botany.genetics.AlleleColor;
import binnie.core.BinnieCore;
import java.util.ArrayList;
import java.util.LinkedHashMap;
import forestry.api.genetics.IAllele;
import forestry.api.genetics.IChromosomeType;
import java.util.List;
import forestry.api.genetics.ISpeciesRoot;
import java.util.Map;
import binnie.core.ManagerBase;
import cpw.mods.fml.common.eventhandler.SubscribeEvent;
import forestry.api.apiculture.IBeeRoot;
import forestry.api.arboriculture.ITreeRoot;
import forestry.api.genetics.AlleleManager;
import forestry.api.genetics.EnumTolerance;
import forestry.api.genetics.IAllele;
import forestry.api.genetics.IAlleleFloat;
import forestry.api.genetics.IAlleleInteger;
import forestry.api.genetics.IAlleleSpecies;
import forestry.api.genetics.IChromosomeType;
import forestry.api.genetics.IGenome;
import forestry.api.genetics.IIndividual;
import forestry.api.genetics.ISpeciesRoot;
import forestry.api.lepidopterology.IButterflyRoot;
import net.minecraft.item.ItemStack;
import net.minecraft.world.World;
import net.minecraftforge.event.world.WorldEvent;
public class ManagerGenetics extends ManagerBase
{
import java.util.ArrayList;
import java.util.Collection;
import java.util.Comparator;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
import java.util.TreeSet;
public class ManagerGenetics extends ManagerBase {
public BreedingSystem beeBreedingSystem;
public BreedingSystem treeBreedingSystem;
public BreedingSystem mothBreedingSystem;
public BreedingSystem flowerBreedingSystem;
private final Map<ISpeciesRoot, BreedingSystem> BREEDING_SYSTEMS;
private Map<ISpeciesRoot, BreedingSystem> breedingSystems;
private List<IChromosomeType> invalidChromosomeTypes;
private Map<ISpeciesRoot, Map<IChromosomeType, List<IAllele>>> chromosomeArray;
public ManagerGenetics() {
this.BREEDING_SYSTEMS = new LinkedHashMap<ISpeciesRoot, BreedingSystem>();
this.invalidChromosomeTypes = new ArrayList<IChromosomeType>();
this.chromosomeArray = new LinkedHashMap<ISpeciesRoot, Map<IChromosomeType, List<IAllele>>>();
breedingSystems = new LinkedHashMap<>();
invalidChromosomeTypes = new ArrayList<>();
chromosomeArray = new LinkedHashMap<>();
}
@Override
public void init() {
if (BinnieCore.isApicultureActive()) {
this.beeBreedingSystem = new BeeBreedingSystem();
beeBreedingSystem = new BeeBreedingSystem();
}
if (BinnieCore.isArboricultureActive()) {
this.treeBreedingSystem = new TreeBreedingSystem();
treeBreedingSystem = new TreeBreedingSystem();
}
if (BinnieCore.isLepidopteryActive()) {
this.mothBreedingSystem = new MothBreedingSystem();
mothBreedingSystem = new MothBreedingSystem();
}
if (BinnieCore.isBotanyActive()) {
this.flowerBreedingSystem = new FlowerBreedingSystem();
flowerBreedingSystem = new FlowerBreedingSystem();
}
}
@@ -71,7 +67,8 @@ public class ManagerGenetics extends ManagerBase
this.refreshData();
}
public boolean isSpeciesDiscovered(final IAlleleSpecies species, final World world, final boolean nei) {
// TODO unused method?
public boolean isSpeciesDiscovered(IAlleleSpecies species, World world, boolean nei) {
return true;
}
@@ -91,8 +88,8 @@ public class ManagerGenetics extends ManagerBase
return (IFlowerRoot) AlleleManager.alleleRegistry.getSpeciesRoot("rootFlowers");
}
public BreedingSystem getSystem(final String string) {
for (final BreedingSystem system : this.BREEDING_SYSTEMS.values()) {
public BreedingSystem getSystem(String string) {
for (BreedingSystem system : breedingSystems.values()) {
if (system.getIdent().equals(string)) {
return system;
}
@@ -100,12 +97,12 @@ public class ManagerGenetics extends ManagerBase
return null;
}
public BreedingSystem getSystem(final ISpeciesRoot root) {
return this.getSystem(root.getUID());
public BreedingSystem getSystem(ISpeciesRoot root) {
return getSystem(root.getUID());
}
public ISpeciesRoot getSpeciesRoot(final IAlleleSpecies species) {
for (final ISpeciesRoot root : AlleleManager.alleleRegistry.getSpeciesRoot().values()) {
public ISpeciesRoot getSpeciesRoot(IAlleleSpecies species) {
for (ISpeciesRoot root : AlleleManager.alleleRegistry.getSpeciesRoot().values()) {
if (root.getKaryotype()[0].getAlleleClass().isInstance(species)) {
return root;
}
@@ -113,24 +110,24 @@ public class ManagerGenetics extends ManagerBase
return null;
}
public IAllele getToleranceAllele(final EnumTolerance tol) {
public IAllele getToleranceAllele(EnumTolerance tol) {
return AlleleManager.alleleRegistry.getAllele(Tolerance.values()[tol.ordinal()].getUID());
}
public int[] getTolerance(final EnumTolerance tol) {
public int[] getTolerance(EnumTolerance tol) {
return Tolerance.values()[tol.ordinal()].getBounds();
}
public Collection<BreedingSystem> getActiveSystems() {
return this.BREEDING_SYSTEMS.values();
return breedingSystems.values();
}
public void registerBreedingSystem(final BreedingSystem system) {
this.BREEDING_SYSTEMS.put(system.getSpeciesRoot(), system);
public void registerBreedingSystem(BreedingSystem system) {
breedingSystems.put(system.getSpeciesRoot(), system);
}
public BreedingSystem getConversionSystem(final ItemStack stack) {
for (final BreedingSystem system : this.getActiveSystems()) {
public BreedingSystem getConversionSystem(ItemStack stack) {
for (BreedingSystem system : getActiveSystems()) {
if (system.getConversion(stack) != null) {
return system;
}
@@ -138,40 +135,40 @@ public class ManagerGenetics extends ManagerBase
return null;
}
public ItemStack getConversionStack(final ItemStack stack) {
final BreedingSystem system = this.getConversionSystem(stack);
public ItemStack getConversionStack(ItemStack stack) {
BreedingSystem system = getConversionSystem(stack);
return (system == null) ? null : system.getConversionStack(stack);
}
public IIndividual getConversion(final ItemStack stack) {
final BreedingSystem system = this.getConversionSystem(stack);
public IIndividual getConversion(ItemStack stack) {
BreedingSystem system = getConversionSystem(stack);
return (system == null) ? null : system.getConversion(stack);
}
@SubscribeEvent
public void onWorldLoad(final WorldEvent.Load event) {
public void onWorldLoad(WorldEvent.Load event) {
this.refreshData();
}
private void refreshData() {
this.loadAlleles();
for (final BreedingSystem system : Binnie.Genetics.getActiveSystems()) {
loadAlleles();
for (BreedingSystem system : Binnie.Genetics.getActiveSystems()) {
system.calculateArrays();
}
}
private void loadAlleles() {
this.invalidChromosomeTypes.clear();
for (final ISpeciesRoot root : AlleleManager.alleleRegistry.getSpeciesRoot().values()) {
final BreedingSystem system = this.getSystem(root);
final Map<IChromosomeType, List<IAllele>> chromosomeMap = new LinkedHashMap<IChromosomeType, List<IAllele>>();
for (final IChromosomeType chromosome : root.getKaryotype()) {
final TreeSet<IAllele> alleles = new TreeSet<IAllele>(new ComparatorAllele());
for (final IIndividual individual : root.getIndividualTemplates()) {
final IGenome genome = individual.getGenome();
for (ISpeciesRoot root : AlleleManager.alleleRegistry.getSpeciesRoot().values()) {
BreedingSystem system = getSystem(root);
Map<IChromosomeType, List<IAllele>> chromosomeMap = new LinkedHashMap<>();
for (IChromosomeType chromosome : root.getKaryotype()) {
TreeSet<IAllele> alleles = new TreeSet<>(new ComparatorAllele());
for (IIndividual individual : root.getIndividualTemplates()) {
IGenome genome = individual.getGenome();
try {
final IAllele a1 = genome.getActiveAllele(chromosome);
final IAllele a2 = genome.getInactiveAllele(chromosome);
IAllele a1 = genome.getActiveAllele(chromosome);
IAllele a2 = genome.getInactiveAllele(chromosome);
if (chromosome.getAlleleClass().isInstance(a1)) {
alleles.add(a1);
}
@@ -180,38 +177,38 @@ public class ManagerGenetics extends ManagerBase
}
alleles.add(a2);
} catch (Exception ex) {
// ignored
}
}
system.addExtraAlleles(chromosome, alleles);
if (alleles.size() == 0) {
this.invalidChromosomeTypes.add(chromosome);
}
else {
final List<IAllele> alleleList = new ArrayList<IAllele>();
invalidChromosomeTypes.add(chromosome);
} else {
List<IAllele> alleleList = new ArrayList<>();
alleleList.addAll(alleles);
chromosomeMap.put(chromosome, alleleList);
}
}
this.chromosomeArray.put(root, chromosomeMap);
chromosomeArray.put(root, chromosomeMap);
}
}
public Map<IChromosomeType, List<IAllele>> getChromosomeMap(final ISpeciesRoot root) {
return this.chromosomeArray.get(root);
public Map<IChromosomeType, List<IAllele>> getChromosomeMap(ISpeciesRoot root) {
return chromosomeArray.get(root);
}
public Collection<IChromosomeType> getActiveChromosomes(final ISpeciesRoot root) {
return this.getChromosomeMap(root).keySet();
public Collection<IChromosomeType> getActiveChromosomes(ISpeciesRoot root) {
return getChromosomeMap(root).keySet();
}
public boolean isInvalidChromosome(final IChromosomeType type) {
return this.invalidChromosomeTypes.contains(type);
public boolean isInvalidChromosome(IChromosomeType type) {
return invalidChromosomeTypes.contains(type);
}
static class ComparatorAllele implements Comparator<IAllele>
{
static class ComparatorAllele implements Comparator<IAllele> {
@Override
public int compare(final IAllele o1, final IAllele o2) {
public int compare(IAllele o1, IAllele o2) {
if (o1 == null || o2 == null) {
throw new NullPointerException("Allele is null!");
}
@@ -1,35 +1,31 @@
//
// Decompiled by Procyon v0.5.30
//
package binnie.core.genetics;
import java.util.TreeSet;
import binnie.Binnie;
import binnie.core.BinnieCore;
import binnie.extratrees.ExtraTrees;
import forestry.api.genetics.IAllele;
import forestry.api.genetics.IAlleleInteger;
import forestry.api.genetics.IBreedingTracker;
import forestry.api.genetics.IChromosomeType;
import forestry.api.genetics.IMutation;
import forestry.api.genetics.ISpeciesRoot;
import forestry.api.lepidopterology.EnumButterflyChromosome;
import forestry.api.lepidopterology.EnumFlutterType;
import forestry.api.lepidopterology.IButterflyRoot;
import net.minecraft.item.ItemStack;
import binnie.core.BinnieCore;
import forestry.api.genetics.IAlleleInteger;
import forestry.api.lepidopterology.EnumButterflyChromosome;
import forestry.api.genetics.IChromosomeType;
import forestry.api.lepidopterology.ILepidopteristTracker;
import forestry.api.genetics.IBreedingTracker;
import forestry.api.genetics.ISpeciesRoot;
import forestry.api.genetics.IAllele;
import net.minecraft.entity.player.EntityPlayer;
import forestry.api.genetics.IMutation;
import binnie.extratrees.ExtraTrees;
import binnie.Binnie;
import net.minecraft.item.ItemStack;
class MothBreedingSystem extends BreedingSystem
{
import java.util.TreeSet;
class MothBreedingSystem extends BreedingSystem {
public MothBreedingSystem() {
this.iconUndiscovered = Binnie.Resource.getItemIcon(ExtraTrees.instance, "icon/undiscoveredMoth");
this.iconDiscovered = Binnie.Resource.getItemIcon(ExtraTrees.instance, "icon/discoveredMoth");
iconUndiscovered = Binnie.Resource.getItemIcon(ExtraTrees.instance, "icon/undiscoveredMoth");
iconDiscovered = Binnie.Resource.getItemIcon(ExtraTrees.instance, "icon/discoveredMoth");
}
@Override
public float getChance(final IMutation mutation, final EntityPlayer player, final IAllele species1, final IAllele species2) {
public float getChance(IMutation mutation, EntityPlayer player, IAllele species1, IAllele species2) {
return 0.0f;
}
@@ -40,7 +36,7 @@ class MothBreedingSystem extends BreedingSystem
@Override
public int getColour() {
return 62194;
return 0x00f2f2;
}
@Override
@@ -49,9 +45,9 @@ class MothBreedingSystem extends BreedingSystem
}
@Override
public String getAlleleName(final IChromosomeType chromosome, final IAllele allele) {
public String getAlleleName(IChromosomeType chromosome, IAllele allele) {
if (chromosome == EnumButterflyChromosome.METABOLISM) {
final int metabolism = ((IAlleleInteger) allele).getValue();
int metabolism = ((IAlleleInteger) allele).getValue();
if (metabolism >= 19) {
return Binnie.Language.localise(BinnieCore.instance, "allele.metabolism.highest");
}
@@ -72,73 +68,73 @@ class MothBreedingSystem extends BreedingSystem
}
return Binnie.Language.localise(BinnieCore.instance, "allele.metabolism.slowest");
}
else {
if (chromosome == EnumButterflyChromosome.FERTILITY) {
final int metabolism = ((IAlleleInteger) allele).getValue();
return metabolism + "x";
}
return super.getAlleleName(chromosome, allele);
if (chromosome == EnumButterflyChromosome.FERTILITY) {
return ((IAlleleInteger) allele).getValue() + "x";
}
return super.getAlleleName(chromosome, allele);
}
@Override
public boolean isDNAManipulable(final ItemStack member) {
return ((IButterflyRoot) this.getSpeciesRoot()).getType(member) == EnumFlutterType.SERUM;
public boolean isDNAManipulable(ItemStack member) {
return ((IButterflyRoot) getSpeciesRoot()).getType(member) == EnumFlutterType.SERUM;
}
@Override
public int[] getActiveTypes() {
return new int[] { EnumFlutterType.BUTTERFLY.ordinal(), EnumFlutterType.CATERPILLAR.ordinal(), EnumFlutterType.SERUM.ordinal() };
return new int[]{
EnumFlutterType.BUTTERFLY.ordinal(),
EnumFlutterType.CATERPILLAR.ordinal(),
EnumFlutterType.SERUM.ordinal()
};
}
@Override
public void addExtraAlleles(final IChromosomeType chromosome, final TreeSet<IAllele> alleles) {
public void addExtraAlleles(IChromosomeType chromosome, TreeSet<IAllele> alleles) {
switch ((EnumButterflyChromosome) chromosome) {
case FERTILITY: {
for (final ForestryAllele.Int a : ForestryAllele.Int.values()) {
alleles.add(a.getAllele());
}
break;
}
case LIFESPAN: {
for (final ForestryAllele.Lifespan a2 : ForestryAllele.Lifespan.values()) {
alleles.add(a2.getAllele());
}
break;
}
case METABOLISM: {
for (final ForestryAllele.Int a : ForestryAllele.Int.values()) {
alleles.add(a.getAllele());
}
break;
}
case TOLERANT_FLYER:
case FIRE_RESIST:
case NOCTURNAL: {
for (final ForestryAllele.Bool a3 : ForestryAllele.Bool.values()) {
alleles.add(a3.getAllele());
}
break;
}
case SIZE: {
for (final ForestryAllele.Size a4 : ForestryAllele.Size.values()) {
alleles.add(a4.getAllele());
}
break;
}
case SPEED: {
for (final ForestryAllele.Speed a5 : ForestryAllele.Speed.values()) {
alleles.add(a5.getAllele());
}
break;
}
case HUMIDITY_TOLERANCE:
case TEMPERATURE_TOLERANCE: {
for (final Tolerance a6 : Tolerance.values()) {
alleles.add(a6.getAllele());
}
break;
}
case FERTILITY:
for (ForestryAllele.Int a : ForestryAllele.Int.values()) {
alleles.add(a.getAllele());
}
break;
case LIFESPAN:
for (ForestryAllele.Lifespan a2 : ForestryAllele.Lifespan.values()) {
alleles.add(a2.getAllele());
}
break;
case METABOLISM:
for (ForestryAllele.Int a : ForestryAllele.Int.values()) {
alleles.add(a.getAllele());
}
break;
case TOLERANT_FLYER:
case FIRE_RESIST:
case NOCTURNAL:
for (ForestryAllele.Bool a3 : ForestryAllele.Bool.values()) {
alleles.add(a3.getAllele());
}
break;
case SIZE:
for (ForestryAllele.Size a4 : ForestryAllele.Size.values()) {
alleles.add(a4.getAllele());
}
break;
case SPEED:
for (ForestryAllele.Speed a5 : ForestryAllele.Speed.values()) {
alleles.add(a5.getAllele());
}
break;
case HUMIDITY_TOLERANCE:
case TEMPERATURE_TOLERANCE:
for (Tolerance a6 : Tolerance.values()) {
alleles.add(a6.getAllele());
}
break;
}
}
}
@@ -1,15 +1,10 @@
//
// Decompiled by Procyon v0.5.30
//
package binnie.core.genetics;
import forestry.api.genetics.AlleleManager;
import forestry.api.genetics.IAllele;
import forestry.api.genetics.EnumTolerance;
import forestry.api.genetics.IAllele;
public enum Tolerance
{
public enum Tolerance {
None(0, 0),
Both1(-1, 1),
Both2(-2, 2),
@@ -29,31 +24,32 @@ public enum Tolerance
private int[] bounds;
private Tolerance(final int a, final int b) {
this.bounds = new int[] { a, b };
Tolerance(int a, int b) {
bounds = new int[]{a, b};
}
public String getUID() {
return "forestry.tolerance" + this.toString();
return "forestry.tolerance" + toString();
}
public int[] getBounds() {
return this.bounds;
return bounds;
}
public static Tolerance get(final EnumTolerance tol) {
public static Tolerance get(EnumTolerance tol) {
return values()[tol.ordinal()];
}
public IAllele getAllele() {
return AlleleManager.alleleRegistry.getAllele(this.getUID());
return AlleleManager.alleleRegistry.getAllele(getUID());
}
public <T extends Enum<T>> boolean canTolerate(final T base, final T test) {
return test.ordinal() <= base.ordinal() + this.bounds[1] && test.ordinal() >= base.ordinal() + this.bounds[0];
public <T extends Enum<T>> boolean canTolerate(T base, T test) {
return test.ordinal() <= base.ordinal() + bounds[1]
&& test.ordinal() >= base.ordinal() + bounds[0];
}
public static <T extends Enum<T>> boolean canTolerate(final T base, final T test, final EnumTolerance tol) {
public static <T extends Enum<T>> boolean canTolerate(T base, T test, EnumTolerance tol) {
return get(tol).canTolerate(base, test);
}
}
@@ -1,87 +1,66 @@
//
// Decompiled by Procyon v0.5.30
//
package binnie.core.genetics;
import java.util.TreeSet;
import java.util.Map;
import forestry.api.genetics.AlleleManager;
import forestry.api.genetics.IIndividual;
import binnie.Binnie;
import binnie.core.BinnieCore;
import binnie.core.util.UniqueItemStackSet;
import binnie.extratrees.ExtraTrees;
import binnie.extratrees.FakeWorld;
import binnie.extratrees.machines.Lumbermill;
import com.mojang.authlib.GameProfile;
import forestry.api.arboriculture.EnumGermlingType;
import forestry.api.arboriculture.EnumTreeChromosome;
import forestry.api.arboriculture.IAlleleFruit;
import forestry.api.arboriculture.IAlleleTreeSpecies;
import forestry.api.arboriculture.IArboristTracker;
import forestry.api.arboriculture.IFruitProvider;
import forestry.api.arboriculture.ITreeGenome;
import forestry.api.arboriculture.ITreeMutation;
import forestry.api.arboriculture.ITreeRoot;
import forestry.api.arboriculture.TreeManager;
import binnie.extratrees.machines.Lumbermill;
import java.util.Set;
import forestry.api.genetics.IFruitFamily;
import java.util.HashSet;
import java.util.List;
import java.util.ArrayList;
import java.util.Collection;
import com.mojang.authlib.GameProfile;
import net.minecraft.world.World;
import net.minecraft.item.ItemStack;
import forestry.api.arboriculture.ITreeGenome;
import forestry.api.arboriculture.IAlleleTreeSpecies;
import forestry.api.genetics.AlleleManager;
import forestry.api.genetics.IAllele;
import forestry.api.genetics.IAlleleInteger;
import forestry.api.genetics.IAllelePlantType;
import forestry.api.genetics.IAlleleSpecies;
import forestry.api.arboriculture.IFruitProvider;
import java.util.EnumSet;
import forestry.api.arboriculture.IAlleleFruit;
import forestry.api.genetics.IBreedingTracker;
import forestry.api.genetics.IChromosomeType;
import forestry.api.genetics.IFruitFamily;
import forestry.api.genetics.IIndividual;
import forestry.api.genetics.IMutation;
import forestry.api.genetics.ISpeciesRoot;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack;
import net.minecraft.world.World;
import net.minecraftforge.common.EnumPlantType;
import net.minecraftforge.common.util.ForgeDirection;
import binnie.core.BinnieCore;
import forestry.api.genetics.IAllelePlantType;
import forestry.api.genetics.IAlleleInteger;
import forestry.api.arboriculture.EnumTreeChromosome;
import forestry.api.genetics.IChromosomeType;
import forestry.api.arboriculture.IArboristTracker;
import forestry.api.genetics.IBreedingTracker;
import forestry.api.genetics.ISpeciesRoot;
import forestry.api.arboriculture.ITreeMutation;
import forestry.api.genetics.IAllele;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
import java.util.EnumSet;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.TreeSet;
import net.minecraft.entity.player.EntityPlayer;
import forestry.api.genetics.IMutation;
import binnie.extratrees.ExtraTrees;
import binnie.extratrees.FakeWorld;
import binnie.Binnie;
import binnie.core.util.UniqueItemStackSet;
public class TreeBreedingSystem extends BreedingSystem
{
public UniqueItemStackSet allFruits;
public UniqueItemStackSet allWoods;
private UniqueItemStackSet discoveredFruits;
private UniqueItemStackSet discoveredWoods;
public UniqueItemStackSet discoveredPlanks;
public class TreeBreedingSystem extends BreedingSystem {
public UniqueItemStackSet allFruits = new UniqueItemStackSet();
public UniqueItemStackSet allWoods = new UniqueItemStackSet();
private UniqueItemStackSet discoveredFruits = new UniqueItemStackSet();
private UniqueItemStackSet discoveredWoods = new UniqueItemStackSet();
public UniqueItemStackSet discoveredPlanks = new UniqueItemStackSet();
public TreeBreedingSystem() {
this.allFruits = new UniqueItemStackSet();
this.allWoods = new UniqueItemStackSet();
this.discoveredFruits = new UniqueItemStackSet();
this.discoveredWoods = new UniqueItemStackSet();
this.discoveredPlanks = new UniqueItemStackSet();
this.iconUndiscovered = Binnie.Resource.getItemIcon(ExtraTrees.instance, "icon/undiscoveredTree");
this.iconDiscovered = Binnie.Resource.getItemIcon(ExtraTrees.instance, "icon/discoveredTree");
iconUndiscovered = Binnie.Resource.getItemIcon(ExtraTrees.instance, "icon/undiscoveredTree");
iconDiscovered = Binnie.Resource.getItemIcon(ExtraTrees.instance, "icon/discoveredTree");
}
@Override
public float getChance(final IMutation mutation, final EntityPlayer player, final IAllele species1, final IAllele species2) {
final ITreeGenome genome0 = (ITreeGenome) this.getSpeciesRoot().templateAsGenome(this.getSpeciesRoot().getTemplate(species1.getUID()));
final ITreeGenome genome2 = (ITreeGenome) this.getSpeciesRoot().templateAsGenome(this.getSpeciesRoot().getTemplate(species2.getUID()));
public float getChance(IMutation mutation, EntityPlayer player, IAllele species1, IAllele species2) {
ISpeciesRoot speciesRoot = getSpeciesRoot();
ITreeGenome genome0 = (ITreeGenome) speciesRoot.templateAsGenome(speciesRoot.getTemplate(species1.getUID()));
ITreeGenome genome2 = (ITreeGenome) speciesRoot.templateAsGenome(speciesRoot.getTemplate(species2.getUID()));
return ((ITreeMutation) mutation).getChance(player.worldObj, (int) player.posX, (int) player.posY, (int) player.posZ, (IAlleleTreeSpecies) species1, (IAlleleTreeSpecies) species2, genome0, genome2);
}
@@ -101,18 +80,25 @@ public class TreeBreedingSystem extends BreedingSystem
}
@Override
public String getAlleleName(final IChromosomeType chromosome, final IAllele allele) {
public String getAlleleName(IChromosomeType chromosome, IAllele allele) {
if (chromosome == EnumTreeChromosome.GIRTH) {
return ((IAlleleInteger) allele).getValue() + "x" + ((IAlleleInteger) allele).getValue();
}
if (chromosome == EnumTreeChromosome.PLANT) {
final EnumSet<EnumPlantType> types = ((IAllelePlantType) allele).getPlantTypes();
return types.isEmpty() ? Binnie.Language.localise(BinnieCore.instance, "allele.none") : types.iterator().next().toString();
EnumSet<EnumPlantType> types = ((IAllelePlantType) allele).getPlantTypes();
return types.isEmpty() ?
Binnie.Language.localise(BinnieCore.instance, "allele.none") :
types.iterator().next().toString();
}
if (chromosome == EnumTreeChromosome.FRUITS && allele.getUID().contains(".")) {
final IFruitProvider provider = ((IAlleleFruit) allele).getProvider();
return (provider.getProducts().length == 0) ? Binnie.Language.localise(BinnieCore.instance, "allele.none") : provider.getProducts()[0].getDisplayName();
IFruitProvider provider = ((IAlleleFruit) allele).getProvider();
return (provider.getProducts().length == 0) ?
Binnie.Language.localise(BinnieCore.instance, "allele.none") :
provider.getProducts()[0].getDisplayName();
}
if (chromosome == EnumTreeChromosome.GROWTH) {
if (allele.getUID().contains("Tropical")) {
return Binnie.Language.localise(BinnieCore.instance, "allele.growth.tropical");
@@ -125,65 +111,64 @@ public class TreeBreedingSystem extends BreedingSystem
}
@Override
public void onSyncBreedingTracker(final IBreedingTracker tracker) {
this.discoveredFruits.clear();
this.discoveredWoods.clear();
for (final IAlleleSpecies species : this.getDiscoveredSpecies(tracker)) {
final IAlleleTreeSpecies tSpecies = (IAlleleTreeSpecies) species;
final ITreeGenome genome = (ITreeGenome) this.getSpeciesRoot().templateAsGenome(this.getSpeciesRoot().getTemplate(tSpecies.getUID()));
public void onSyncBreedingTracker(IBreedingTracker tracker) {
discoveredFruits.clear();
discoveredWoods.clear();
for (IAlleleSpecies species : getDiscoveredSpecies(tracker)) {
IAlleleTreeSpecies tSpecies = (IAlleleTreeSpecies) species;
ISpeciesRoot speciesRoot = getSpeciesRoot();
ITreeGenome genome = (ITreeGenome) speciesRoot.templateAsGenome(speciesRoot.getTemplate(tSpecies.getUID()));
FakeWorld world = FakeWorld.instance;
genome.getPrimary().getGenerator().setLogBlock(genome, world, 0, 0, 0, ForgeDirection.UP);
final ItemStack wood = world.getWooLog();
ItemStack wood = world.getWooLog();
if (wood != null) {
this.discoveredWoods.add(wood);
discoveredWoods.add(wood);
}
// for (final ItemStack wood :
// TODO ???
// for (ItemStack wood :
// tSpecies.getRoot().templateAsIndividual(getSpeciesRoot().getTemplate(tSpecies.getUID())).getProduceList())
// {
// this.discoveredWoods.add(wood);
// }
for (final ItemStack fruit : genome.getFruitProvider().getProducts()) {
this.discoveredFruits.add(fruit);
}
discoveredFruits.addAll(Arrays.asList(genome.getFruitProvider().getProducts()));
for (ItemStack wood2 : this.discoveredWoods) {
}
}
}
@Override
public final void calculateArrays() {
public void calculateArrays() {
super.calculateArrays();
for (final IAlleleSpecies species : this.allActiveSpecies) {
final IAlleleTreeSpecies tSpecies = (IAlleleTreeSpecies) species;
final ITreeGenome genome = (ITreeGenome) this.getSpeciesRoot().templateAsGenome(this.getSpeciesRoot().getTemplate(tSpecies.getUID()));
for (IAlleleSpecies species : this.allActiveSpecies) {
IAlleleTreeSpecies tSpecies = (IAlleleTreeSpecies) species;
ITreeGenome genome = (ITreeGenome) this.getSpeciesRoot().templateAsGenome(this.getSpeciesRoot().getTemplate(tSpecies.getUID()));
FakeWorld world = FakeWorld.instance;
genome.getPrimary().getGenerator().setLogBlock(genome, world, 0, 0, 0, ForgeDirection.UP);
final ItemStack wood = world.getWooLog();
ItemStack wood = world.getWooLog();
if (wood != null) {
this.allWoods.add(wood);
}
// for (final ItemStack wood :
// TODO ???
// for (ItemStack wood :
// tSpecies.getRoot().templateAsIndividual(getSpeciesRoot().getTemplate(tSpecies.getUID())).getProduceList())
// {
// this.allWoods.add(wood);
// }
for (final ItemStack fruit : genome.getFruitProvider().getProducts()) {
this.allFruits.add(fruit);
}
allFruits.addAll(Arrays.asList(genome.getFruitProvider().getProducts()));
}
}
public Collection<IAlleleSpecies> getTreesThatBearFruit(final ItemStack fruit, final boolean nei, final World world, final GameProfile player) {
final Collection<IAlleleSpecies> set = nei ? this.getAllSpecies() : this.getDiscoveredSpecies(world, player);
final List<IAlleleSpecies> found = new ArrayList<IAlleleSpecies>();
for (final IAlleleSpecies species : set) {
final IAlleleTreeSpecies tSpecies = (IAlleleTreeSpecies) species;
final ITreeGenome genome = (ITreeGenome) this.getSpeciesRoot().templateAsGenome(this.getSpeciesRoot().getTemplate(tSpecies.getUID()));
for (final ItemStack fruit2 : genome.getFruitProvider().getProducts()) {
public Collection<IAlleleSpecies> getTreesThatBearFruit(ItemStack fruit, boolean nei, World world, GameProfile player) {
Collection<IAlleleSpecies> set = nei ? getAllSpecies() : getDiscoveredSpecies(world, player);
List<IAlleleSpecies> found = new ArrayList<>();
for (IAlleleSpecies species : set) {
IAlleleTreeSpecies tSpecies = (IAlleleTreeSpecies) species;
ITreeGenome genome = (ITreeGenome) this.getSpeciesRoot().templateAsGenome(this.getSpeciesRoot().getTemplate(tSpecies.getUID()));
for (ItemStack fruit2 : genome.getFruitProvider().getProducts()) {
if (fruit2.isItemEqual(fruit)) {
found.add(species);
}
@@ -192,22 +177,22 @@ public class TreeBreedingSystem extends BreedingSystem
return found;
}
public Collection<IAlleleSpecies> getTreesThatCanBearFruit(final ItemStack fruit, final boolean nei, final World world, final GameProfile player) {
final Collection<IAlleleSpecies> set = nei ? this.getAllSpecies() : this.getDiscoveredSpecies(world, player);
final List<IAlleleSpecies> found = new ArrayList<IAlleleSpecies>();
final Set<IFruitFamily> providers = new HashSet<IFruitFamily>();
for (final IAlleleSpecies species : set) {
final IAlleleTreeSpecies tSpecies = (IAlleleTreeSpecies) species;
final ITreeGenome genome = (ITreeGenome) this.getSpeciesRoot().templateAsGenome(this.getSpeciesRoot().getTemplate(tSpecies.getUID()));
for (final ItemStack fruit2 : genome.getFruitProvider().getProducts()) {
public Collection<IAlleleSpecies> getTreesThatCanBearFruit(ItemStack fruit, boolean nei, World world, GameProfile player) {
Collection<IAlleleSpecies> set = nei ? getAllSpecies() : getDiscoveredSpecies(world, player);
List<IAlleleSpecies> found = new ArrayList<>();
Set<IFruitFamily> providers = new HashSet<>();
for (IAlleleSpecies species : set) {
IAlleleTreeSpecies tSpecies = (IAlleleTreeSpecies) species;
ITreeGenome genome = (ITreeGenome) getSpeciesRoot().templateAsGenome(getSpeciesRoot().getTemplate(tSpecies.getUID()));
for (ItemStack fruit2 : genome.getFruitProvider().getProducts()) {
if (fruit2.isItemEqual(fruit)) {
providers.add(genome.getFruitProvider().getFamily());
}
}
}
for (final IAlleleSpecies species : set) {
final IAlleleTreeSpecies tSpecies = (IAlleleTreeSpecies) species;
for (final IFruitFamily family : providers) {
for (IAlleleSpecies species : set) {
IAlleleTreeSpecies tSpecies = (IAlleleTreeSpecies) species;
for (IFruitFamily family : providers) {
if (tSpecies.getSuitableFruit().contains(family)) {
found.add(species);
break;
@@ -217,13 +202,13 @@ public class TreeBreedingSystem extends BreedingSystem
return found;
}
public Collection<IAlleleSpecies> getTreesThatHaveWood(final ItemStack fruit, final boolean nei, final World world, final GameProfile player) {
final Collection<IAlleleSpecies> set = nei ? this.getAllSpecies() : this.getDiscoveredSpecies(world, player);
final List<IAlleleSpecies> found = new ArrayList<IAlleleSpecies>();
for (final IAlleleSpecies species : set) {
public Collection<IAlleleSpecies> getTreesThatHaveWood(ItemStack fruit, boolean nei, World world, GameProfile player) {
Collection<IAlleleSpecies> set = nei ? getAllSpecies() : getDiscoveredSpecies(world, player);
List<IAlleleSpecies> found = new ArrayList<>();
for (IAlleleSpecies species : set) {
IAlleleTreeSpecies tSpecies = (IAlleleTreeSpecies) species;
ITreeGenome genome = TreeManager.treeRoot.templateAsGenome(TreeManager.treeRoot.getTemplate(tSpecies.getUID()));
// for (final ItemStack fruit2 :
// for (ItemStack fruit2 :
// tSpecies.getRoot().getMember(fruit).getProduceList()){
tSpecies.getGenerator().setLogBlock(genome, FakeWorld.instance, 0, 0, 0, ForgeDirection.UP);
ItemStack fruit2 = FakeWorld.instance.getWooLog();
@@ -235,18 +220,18 @@ public class TreeBreedingSystem extends BreedingSystem
return found;
}
public Collection<IAlleleSpecies> getTreesThatMakePlanks(final ItemStack fruit, final boolean nei, final World world, final GameProfile player) {
public Collection<IAlleleSpecies> getTreesThatMakePlanks(ItemStack fruit, boolean nei, World world, GameProfile player) {
if (fruit == null) {
return new ArrayList<IAlleleSpecies>();
return new ArrayList<>();
}
final Collection<IAlleleSpecies> set = nei ? this.getAllSpecies() : this.getDiscoveredSpecies(world, player);
final List<IAlleleSpecies> found = new ArrayList<IAlleleSpecies>();
for (final IAlleleSpecies species : set) {
final IAlleleTreeSpecies tSpecies = (IAlleleTreeSpecies) species;
Collection<IAlleleSpecies> set = nei ? getAllSpecies() : getDiscoveredSpecies(world, player);
List<IAlleleSpecies> found = new ArrayList<IAlleleSpecies>();
for (IAlleleSpecies species : set) {
IAlleleTreeSpecies tSpecies = (IAlleleTreeSpecies) species;
ITreeGenome genome = TreeManager.treeRoot.templateAsGenome(TreeManager.treeRoot.getTemplate(tSpecies.getUID()));
tSpecies.getGenerator().setLogBlock(genome, FakeWorld.instance, 0, 0, 0, ForgeDirection.UP);
ItemStack fruit2 = FakeWorld.instance.getWooLog();
// for (final ItemStack fruit2 :
// for (ItemStack fruit2 :
// tSpecies.getRoot().getMember(fruit).getProduceList()) {
if (Lumbermill.getPlankProduct(fruit2) != null && fruit.isItemEqual(Lumbermill.getPlankProduct(fruit2))) {
found.add(species);
@@ -257,16 +242,16 @@ public class TreeBreedingSystem extends BreedingSystem
}
@Override
public boolean isDNAManipulable(final ItemStack member) {
return ((ITreeRoot) this.getSpeciesRoot()).getType(member) == EnumGermlingType.POLLEN;
public boolean isDNAManipulable(ItemStack member) {
return ((ITreeRoot) getSpeciesRoot()).getType(member) == EnumGermlingType.POLLEN;
}
@Override
public IIndividual getConversion(final ItemStack stack) {
public IIndividual getConversion(ItemStack stack) {
if (stack == null) {
return null;
}
for (final Map.Entry<ItemStack, IIndividual> entry : AlleleManager.ersatzSaplings.entrySet()) {
for (Map.Entry<ItemStack, IIndividual> entry : AlleleManager.ersatzSaplings.entrySet()) {
if (ItemStack.areItemStacksEqual(stack, entry.getKey())) {
return entry.getValue();
}
@@ -276,60 +261,59 @@ public class TreeBreedingSystem extends BreedingSystem
@Override
public int[] getActiveTypes() {
return new int[] { EnumGermlingType.SAPLING.ordinal(), EnumGermlingType.POLLEN.ordinal() };
return new int[]{EnumGermlingType.SAPLING.ordinal(), EnumGermlingType.POLLEN.ordinal()};
}
@Override
public void addExtraAlleles(final IChromosomeType chromosome, final TreeSet<IAllele> alleles) {
public void addExtraAlleles(IChromosomeType chromosome, TreeSet<IAllele> alleles) {
switch ((EnumTreeChromosome) chromosome) {
case FERTILITY: {
for (final ForestryAllele.Saplings a : ForestryAllele.Saplings.values()) {
alleles.add(a.getAllele());
}
break;
}
case GIRTH: {
for (final ForestryAllele.Int a2 : ForestryAllele.Int.values()) {
alleles.add(a2.getAllele());
}
break;
}
case HEIGHT: {
for (final ForestryAllele.TreeHeight a3 : ForestryAllele.TreeHeight.values()) {
alleles.add(a3.getAllele());
}
break;
}
case MATURATION: {
for (final ForestryAllele.Maturation a4 : ForestryAllele.Maturation.values()) {
alleles.add(a4.getAllele());
}
break;
}
case SAPPINESS: {
for (final ForestryAllele.Sappiness a5 : ForestryAllele.Sappiness.values()) {
alleles.add(a5.getAllele());
}
break;
}
case TERRITORY: {
for (final ForestryAllele.Territory a6 : ForestryAllele.Territory.values()) {
alleles.add(a6.getAllele());
}
break;
}
case YIELD: {
for (final ForestryAllele.Yield a7 : ForestryAllele.Yield.values()) {
alleles.add(a7.getAllele());
}
break;
}
case FIREPROOF: {
for (final ForestryAllele.Bool a8 : ForestryAllele.Bool.values()) {
alleles.add(a8.getAllele());
}
break;
}
case FERTILITY:
for (ForestryAllele.Saplings a : ForestryAllele.Saplings.values()) {
alleles.add(a.getAllele());
}
break;
case GIRTH:
for (ForestryAllele.Int a2 : ForestryAllele.Int.values()) {
alleles.add(a2.getAllele());
}
break;
case HEIGHT:
for (ForestryAllele.TreeHeight a3 : ForestryAllele.TreeHeight.values()) {
alleles.add(a3.getAllele());
}
break;
case MATURATION:
for (ForestryAllele.Maturation a4 : ForestryAllele.Maturation.values()) {
alleles.add(a4.getAllele());
}
break;
case SAPPINESS:
for (ForestryAllele.Sappiness a5 : ForestryAllele.Sappiness.values()) {
alleles.add(a5.getAllele());
}
break;
case TERRITORY:
for (ForestryAllele.Territory a6 : ForestryAllele.Territory.values()) {
alleles.add(a6.getAllele());
}
break;
case YIELD:
for (ForestryAllele.Yield a7 : ForestryAllele.Yield.values()) {
alleles.add(a7.getAllele());
}
break;
case FIREPROOF:
for (ForestryAllele.Bool a8 : ForestryAllele.Bool.values()) {
alleles.add(a8.getAllele());
}
break;
}
}
}
@@ -1,18 +1,6 @@
//
// Decompiled by Procyon v0.5.30
//
package binnie.core.genetics;
import java.util.ArrayList;
import com.mojang.authlib.GameProfile;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack;
import net.minecraft.util.Vec3;
import net.minecraft.world.biome.BiomeGenBase;
import forestry.api.apiculture.IBee;
import forestry.api.apiculture.IBeeGenome;
import forestry.api.apiculture.IBeeHousing;
@@ -24,36 +12,40 @@ import forestry.api.core.IErrorLogic;
import forestry.api.genetics.IIndividual;
import forestry.apiculture.InventoryBeeHousing;
import forestry.core.access.FakeAccessHandler;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack;
import net.minecraft.util.Vec3;
import net.minecraft.world.biome.BiomeGenBase;
public class VirtualBeeHousing extends VirtualHousing implements IBeeHousing, IBeeModifier
{
ArrayList<IBeeModifier> beeModifier = new ArrayList<IBeeModifier>();
import java.util.ArrayList;
public class VirtualBeeHousing extends VirtualHousing implements IBeeHousing, IBeeModifier {
ArrayList<IBeeModifier> beeModifier = new ArrayList<>();
private InventoryBeeHousing beeInventory;
public VirtualBeeHousing(final EntityPlayer player) {
public VirtualBeeHousing(EntityPlayer player) {
super(player);
beeModifier.add(this);
beeInventory = new InventoryBeeHousing(12, FakeAccessHandler.getInstance());
}
@Override
public float getTerritoryModifier(final IBeeGenome genome, final float currentModifier) {
public float getTerritoryModifier(IBeeGenome genome, float currentModifier) {
return 1.0f;
}
@Override
public float getMutationModifier(final IBeeGenome genome, final IBeeGenome mate, final float currentModifier) {
public float getMutationModifier(IBeeGenome genome, IBeeGenome mate, float currentModifier) {
return 1.0f;
}
@Override
public float getLifespanModifier(final IBeeGenome genome, final IBeeGenome mate, final float currentModifier) {
public float getLifespanModifier(IBeeGenome genome, IBeeGenome mate, float currentModifier) {
return 1.0f;
}
@Override
public float getProductionModifier(final IBeeGenome genome, final float currentModifier) {
public float getProductionModifier(IBeeGenome genome, float currentModifier) {
return 1.0f;
}
@@ -65,10 +57,11 @@ public class VirtualBeeHousing extends VirtualHousing implements IBeeHousing, IB
return null;
}
public void setQueen(final ItemStack itemstack) {
public void setQueen(ItemStack itemStack) {
// ignored
}
public void setDrone(final ItemStack itemstack) {
public void setDrone(ItemStack itemStack) {
}
public boolean canBreed() {
@@ -76,14 +69,14 @@ public class VirtualBeeHousing extends VirtualHousing implements IBeeHousing, IB
}
@Override
public boolean addProduct(final ItemStack product, final boolean all) {
public boolean addProduct(ItemStack product, boolean all) {
return false;
}
public void wearOutEquipment(final int amount) {
public void wearOutEquipment(int amount) {
}
public void onQueenChange(final ItemStack queen) {
public void onQueenChange(ItemStack queen) {
}
@Override
@@ -107,26 +100,26 @@ public class VirtualBeeHousing extends VirtualHousing implements IBeeHousing, IB
}
@Override
public float getFloweringModifier(final IBeeGenome genome, final float currentModifier) {
public float getFloweringModifier(IBeeGenome genome, float currentModifier) {
return 1.0f;
}
public void onQueenDeath(final IBee queen) {
public void onQueenDeath(IBee queen) {
}
public void onPostQueenDeath(final IBee queen) {
public void onPostQueenDeath(IBee queen) {
}
public boolean onPollenRetrieved(final IBee queen, final IIndividual pollen, final boolean isHandled) {
public boolean onPollenRetrieved(IBee queen, IIndividual pollen, boolean isHandled) {
return false;
}
public boolean onEggLaid(final IBee queen) {
public boolean onEggLaid(IBee queen) {
return false;
}
@Override
public float getGeneticDecay(final IBeeGenome genome, final float currentModifier) {
public float getGeneticDecay(IBeeGenome genome, float currentModifier) {
return 1.0f;
}
@@ -177,5 +170,4 @@ public class VirtualBeeHousing extends VirtualHousing implements IBeeHousing, IB
public GameProfile getOwner() {
return getOwnerName();
}
}
@@ -1,50 +1,39 @@
//
// Decompiled by Procyon v0.5.30
//
package binnie.core.genetics;
import com.mojang.authlib.GameProfile;
import forestry.api.core.EnumHumidity;
import forestry.api.core.EnumTemperature;
import forestry.api.core.IErrorState;
import forestry.api.genetics.IHousing;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack;
import net.minecraft.util.ChunkCoordinates;
import net.minecraft.world.World;
import net.minecraft.world.biome.BiomeGenBase;
import java.util.Set;
import forestry.api.core.IErrorState;
import net.minecraft.util.ChunkCoordinates;
import net.minecraft.world.biome.BiomeGenBase;
import com.mojang.authlib.GameProfile;
import net.minecraft.item.ItemStack;
import net.minecraft.world.World;
import forestry.api.core.EnumHumidity;
import forestry.api.core.EnumTemperature;
import net.minecraft.entity.player.EntityPlayer;
import forestry.api.genetics.IHousing;
class VirtualHousing implements IHousing
{
class VirtualHousing implements IHousing {
private EntityPlayer player;
public VirtualHousing(final EntityPlayer player) {
public VirtualHousing(EntityPlayer player) {
this.player = player;
}
public int getXCoord() {
return (int) this.player.posX;
public int getX() {
return (int) player.posX;
}
public int getYCoord() {
return (int) this.player.posY;
public int getY() {
return (int) player.posY;
}
public int getZCoord() {
return (int) this.player.posZ;
public int getZ() {
return (int) player.posZ;
}
public int getBiomeId() {
return this.player.worldObj.getBiomeGenForCoords(this.getXCoord(), this.getYCoord()).biomeID;
return player.worldObj.getBiomeGenForCoords(getX(), getY()).biomeID;
}
public EnumTemperature getTemperature() {
@@ -59,33 +48,34 @@ class VirtualHousing implements IHousing
return this.player.worldObj;
}
public void setErrorState(final int state) {
public void setErrorState(int state) {
// ignored
}
public int getErrorOrdinal() {
return 0;
}
public boolean addProduct(final ItemStack product, final boolean all) {
public boolean addProduct(ItemStack product, boolean all) {
return false;
}
public GameProfile getOwnerName() {
return this.player.getGameProfile();
return player.getGameProfile();
}
public BiomeGenBase getBiome() {
return this.player.worldObj.getBiomeGenForCoords(this.getXCoord(), this.getZCoord());
return player.worldObj.getBiomeGenForCoords(getX(), getZ());
}
// public EnumErrorCode getErrorState() {
// return null;
// }
public void setErrorState(final IErrorState state) {
public void setErrorState(IErrorState state) {
}
public boolean setErrorCondition(final boolean condition, final IErrorState errorState) {
public boolean setErrorCondition(boolean condition, IErrorState errorState) {
return false;
}
@@ -95,6 +85,6 @@ class VirtualHousing implements IHousing
@Override
public ChunkCoordinates getCoordinates() {
return new ChunkCoordinates(getXCoord(), getYCoord(), getZCoord());
return new ChunkCoordinates(getX(), getY(), getZ());
}
}
@@ -1,17 +1,13 @@
//
// Decompiled by Procyon v0.5.30
//
package binnie.core.genetics;
import forestry.api.genetics.IIndividual;
import forestry.api.lepidopterology.IButterfly;
import net.minecraft.entity.player.EntityPlayer;
import forestry.api.lepidopterology.IButterflyNursery;
import net.minecraft.entity.player.EntityPlayer;
public class VirtualMothHousing extends VirtualHousing implements IButterflyNursery
{
public VirtualMothHousing(final EntityPlayer player) {
// TODO unused class?
public class VirtualMothHousing extends VirtualHousing implements IButterflyNursery {
public VirtualMothHousing(EntityPlayer player) {
super(player);
}
@@ -26,11 +22,11 @@ public class VirtualMothHousing extends VirtualHousing implements IButterflyNurs
}
@Override
public void setCaterpillar(final IButterfly butterfly) {
public void setCaterpillar(IButterfly butterfly) {
}
@Override
public boolean canNurse(final IButterfly butterfly) {
public boolean canNurse(IButterfly butterfly) {
return false;
}
}
@@ -1,54 +1,47 @@
//
// Decompiled by Procyon v0.5.30
//
package binnie.core.gui;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.world.World;
import binnie.craftgui.binniecore.WindowGenesis;
import binnie.craftgui.binniecore.WindowFieldKit;
import binnie.core.machines.storage.WindowCompartment;
import binnie.craftgui.binniecore.WindowFieldKit;
import binnie.craftgui.binniecore.WindowGenesis;
import binnie.craftgui.minecraft.Window;
import cpw.mods.fml.relauncher.Side;
import net.minecraft.inventory.IInventory;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.inventory.IInventory;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.world.World;
public enum BinnieCoreGUI implements IBinnieGUID
{
public enum BinnieCoreGUI implements IBinnieGUID {
Compartment,
FieldKit,
Genesis;
public Window getWindow(final EntityPlayer player, final IInventory object, final Side side) throws Exception {
public Window getWindow(EntityPlayer player, IInventory object, Side side) throws Exception {
switch (this) {
case Compartment: {
return new WindowCompartment(player, object, side);
}
case FieldKit: {
return new WindowFieldKit(player, null, side);
}
case Genesis: {
return new WindowGenesis(player, null, side);
}
default: {
return null;
}
case Compartment:
return new WindowCompartment(player, object, side);
case FieldKit:
return new WindowFieldKit(player, null, side);
case Genesis:
return new WindowGenesis(player, null, side);
}
return null;
}
@Override
public Window getWindow(final EntityPlayer player, final World world, final int x, final int y, final int z, final Side side) {
Window window = null;
final TileEntity tileEntity = world.getTileEntity(x, y, z);
public Window getWindow(EntityPlayer player, World world, int x, int y, int z, Side side) {
TileEntity tileEntity = world.getTileEntity(x, y, z);
IInventory object = null;
if (tileEntity instanceof IInventory) {
object = (IInventory) tileEntity;
}
Window window = null;
try {
window = this.getWindow(player, object, side);
} catch (Exception e) {
e.printStackTrace();
window = getWindow(player, object, side);
} catch (Exception ex) {
ex.printStackTrace();
}
return window;
}
@@ -1,28 +1,23 @@
//
// Decompiled by Procyon v0.5.30
//
package binnie.core.gui;
import binnie.core.AbstractMod;
import binnie.core.BinnieCore;
import binnie.craftgui.minecraft.Window;
import cpw.mods.fml.relauncher.Side;
import net.minecraft.world.World;
import net.minecraft.entity.player.EntityPlayer;
import binnie.core.AbstractMod;
import cpw.mods.fml.common.network.IGuiHandler;
import cpw.mods.fml.relauncher.Side;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.world.World;
public final class BinnieGUIHandler implements IGuiHandler
{
public class BinnieGUIHandler implements IGuiHandler {
private AbstractMod mod;
public BinnieGUIHandler(final AbstractMod mod) {
public BinnieGUIHandler(AbstractMod mod) {
this.mod = mod;
}
@Override
public final Object getServerGuiElement(final int id, final EntityPlayer player, final World world, final int x, final int y, final int z) {
final Window window = this.getWindow(id, player, world, x, y, z, Side.SERVER);
public Object getServerGuiElement(int id, EntityPlayer player, World world, int x, int y, int z) {
Window window = this.getWindow(id, player, world, x, y, z, Side.SERVER);
if (window == null) {
return null;
}
@@ -31,19 +26,20 @@ public final class BinnieGUIHandler implements IGuiHandler
}
@Override
public final Object getClientGuiElement(final int id, final EntityPlayer player, final World world, final int x, final int y, final int z) {
public Object getClientGuiElement(int id, EntityPlayer player, World world, int x, int y, int z) {
if (BinnieCore.proxy.isSimulating(world)) {
return this.getServerGuiElement(id, player, world, x, y, z);
return getServerGuiElement(id, player, world, x, y, z);
}
final Window window = this.getWindow(id, player, world, x, y, z, Side.CLIENT);
Window window = getWindow(id, player, world, x, y, z, Side.CLIENT);
if (window == null) {
return null;
}
return window.getGui();
}
public Window getWindow(final int id, final EntityPlayer player, final World world, final int x, final int y, final int z, final Side side) {
for (final IBinnieGUID guid : this.mod.getGUIDs()) {
public Window getWindow(int id, EntityPlayer player, World world, int x, int y, int z, Side side) {
for (IBinnieGUID guid : mod.getGUIDs()) {
if (guid.ordinal() == id) {
return guid.getWindow(player, world, x, y, z, side);
}
@@ -1,16 +1,11 @@
//
// Decompiled by Procyon v0.5.30
//
package binnie.core.gui;
import binnie.core.network.IOrdinaled;
import binnie.craftgui.minecraft.Window;
import cpw.mods.fml.relauncher.Side;
import net.minecraft.world.World;
import net.minecraft.entity.player.EntityPlayer;
import binnie.core.network.IOrdinaled;
import net.minecraft.world.World;
public interface IBinnieGUID extends IOrdinaled
{
Window getWindow(final EntityPlayer p0, final World p1, final int p2, final int p3, final int p4, final Side p5);
public interface IBinnieGUID extends IOrdinaled {
Window getWindow(EntityPlayer player, World world, int x, int y, int z, Side side);
}
@@ -1,18 +1,13 @@
//
// Decompiled by Procyon v0.5.30
//
package binnie.core.item;
import net.minecraft.item.ItemStack;
public interface IItemEnum
{
public interface IItemEnum {
boolean isActive();
String getName(final ItemStack p0);
String getName(ItemStack itemStack);
int ordinal();
ItemStack get(final int p0);
ItemStack get(int count);
}
+7 -11
View File
@@ -1,22 +1,18 @@
//
// Decompiled by Procyon v0.5.30
//
package binnie.core.item;
import java.util.List;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import net.minecraft.client.renderer.texture.IIconRegister;
import net.minecraft.util.IIcon;
import net.minecraft.item.ItemStack;
import net.minecraft.util.IIcon;
public interface IItemMisc extends IItemEnum
{
IIcon getIcon(final ItemStack p0);
import java.util.List;
public interface IItemMisc extends IItemEnum {
IIcon getIcon(ItemStack itemStack);
@SideOnly(Side.CLIENT)
void registerIcons(final IIconRegister p0);
void registerIcons(IIconRegister register);
void addInformation(final List p0);
void addInformation(List data);
}
@@ -1,84 +1,79 @@
//
// Decompiled by Procyon v0.5.30
//
package binnie.core.item;
import java.util.List;
import binnie.core.BinnieCore;
import binnie.core.gui.BinnieCoreGUI;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.world.World;
import net.minecraft.item.ItemStack;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import binnie.core.BinnieCore;
import net.minecraft.client.renderer.texture.IIconRegister;
import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.util.IIcon;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.util.IIcon;
import net.minecraft.world.World;
public class ItemFieldKit extends Item
{
import java.util.List;
public class ItemFieldKit extends Item {
private IIcon fieldKit0;
private IIcon fieldKit1;
private IIcon fieldKit2;
private IIcon fieldKit3;
public ItemFieldKit() {
this.setUnlocalizedName("fieldKit");
this.setCreativeTab(CreativeTabs.tabTools);
this.setMaxStackSize(1);
this.setMaxDamage(64);
setUnlocalizedName("fieldKit");
setCreativeTab(CreativeTabs.tabTools);
setMaxStackSize(1);
setMaxDamage(64);
}
@Override
@SideOnly(Side.CLIENT)
public void registerIcons(final IIconRegister register) {
this.fieldKit0 = BinnieCore.proxy.getIcon(register, "fieldKit");
this.fieldKit1 = BinnieCore.proxy.getIcon(register, "fieldKit1");
this.fieldKit2 = BinnieCore.proxy.getIcon(register, "fieldKit2");
this.fieldKit3 = BinnieCore.proxy.getIcon(register, "fieldKit3");
this.itemIcon = this.fieldKit0;
public void registerIcons(IIconRegister register) {
fieldKit0 = BinnieCore.proxy.getIcon(register, "fieldKit");
fieldKit1 = BinnieCore.proxy.getIcon(register, "fieldKit1");
fieldKit2 = BinnieCore.proxy.getIcon(register, "fieldKit2");
fieldKit3 = BinnieCore.proxy.getIcon(register, "fieldKit3");
itemIcon = fieldKit0;
}
@Override
public IIcon getIcon(final ItemStack stack, final int pass) {
final int damage = stack.getItemDamage();
public IIcon getIcon(ItemStack stack, int pass) {
int damage = stack.getItemDamage();
if (damage < 24) {
return this.fieldKit3;
return fieldKit3;
}
if (damage < 48) {
return this.fieldKit2;
return fieldKit2;
}
if (damage < 64) {
return this.fieldKit1;
return fieldKit1;
}
return this.fieldKit0;
return fieldKit0;
}
@Override
public ItemStack onItemRightClick(final ItemStack itemstack, final World world, final EntityPlayer player) {
public ItemStack onItemRightClick(ItemStack itemStack, World world, EntityPlayer player) {
if (!player.isSneaking()) {
BinnieCore.proxy.openGui(BinnieCoreGUI.FieldKit, player, (int) player.posX, (int) player.posY, (int) player.posZ);
}
return itemstack;
return itemStack;
}
@Override
@SideOnly(Side.CLIENT)
public void addInformation(final ItemStack p_77624_1_, final EntityPlayer p_77624_2_, final List p_77624_3_, final boolean p_77624_4_) {
final int i = this.getMaxDamage() - p_77624_1_.getItemDamage();
public void addInformation(ItemStack itemStack, EntityPlayer player, List tooltip, boolean advanced) {
int i = getMaxDamage() - itemStack.getItemDamage();
if (i == 0) {
p_77624_3_.add("No paper");
tooltip.add("No paper");
} else {
tooltip.add("" + i + " sheet" + ((i > 1) ? "s" : "") + " of paper");
}
else {
p_77624_3_.add("" + i + " sheet" + ((i > 1) ? "s" : "") + " of paper");
}
super.addInformation(p_77624_1_, p_77624_2_, p_77624_3_, p_77624_4_);
super.addInformation(itemStack, player, tooltip, advanced);
}
@Override
public String getItemStackDisplayName(final ItemStack p_77653_1_) {
public String getItemStackDisplayName(ItemStack p_77653_1_) {
return "Field Kit";
}
}
+14 -19
View File
@@ -1,42 +1,37 @@
//
// Decompiled by Procyon v0.5.30
//
package binnie.core.item;
import binnie.core.BinnieCore;
import binnie.core.gui.BinnieCoreGUI;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.world.World;
import net.minecraft.item.ItemStack;
import forestry.api.core.Tabs;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import binnie.core.BinnieCore;
import forestry.api.core.Tabs;
import net.minecraft.client.renderer.texture.IIconRegister;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.world.World;
public class ItemGenesis extends Item
{
public class ItemGenesis extends Item {
@Override
@SideOnly(Side.CLIENT)
public void registerIcons(final IIconRegister register) {
this.itemIcon = BinnieCore.proxy.getIcon(register, "genesis");
public void registerIcons(IIconRegister register) {
itemIcon = BinnieCore.proxy.getIcon(register, "genesis");
}
public ItemGenesis() {
this.setCreativeTab(Tabs.tabApiculture);
this.setUnlocalizedName("genesis");
this.setMaxStackSize(1);
setCreativeTab(Tabs.tabApiculture);
setUnlocalizedName("genesis");
setMaxStackSize(1);
}
@Override
public ItemStack onItemRightClick(final ItemStack itemstack, final World world, final EntityPlayer player) {
public ItemStack onItemRightClick(ItemStack itemStack, World world, EntityPlayer player) {
BinnieCore.proxy.openGui(BinnieCoreGUI.Genesis, player, (int) player.posX, (int) player.posY, (int) player.posZ);
return itemstack;
return itemStack;
}
@Override
public String getItemStackDisplayName(final ItemStack i) {
public String getItemStackDisplayName(ItemStack itemStack) {
return "Genesis";
}
}
+33 -34
View File
@@ -1,80 +1,79 @@
//
// Decompiled by Procyon v0.5.30
//
package binnie.core.item;
import net.minecraft.client.renderer.texture.IIconRegister;
import net.minecraft.util.IIcon;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import java.util.List;
import net.minecraft.client.renderer.texture.IIconRegister;
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.IIcon;
public class ItemMisc extends Item
{
import java.util.List;
public class ItemMisc extends Item {
private IItemMisc[] items;
protected ItemMisc(final CreativeTabs tab, final IItemMisc[] items2) {
this.setCreativeTab(tab);
this.setHasSubtypes(true);
this.setUnlocalizedName("misc");
this.items = items2;
protected ItemMisc(CreativeTabs tab, IItemMisc[] items2) {
setCreativeTab(tab);
setHasSubtypes(true);
setUnlocalizedName("misc");
items = items2;
}
@Override
@SideOnly(Side.CLIENT)
public void getSubItems(final Item par1, final CreativeTabs par2CreativeTabs, final List par3List) {
for (final IItemMisc item : this.items) {
public void getSubItems(Item par1, CreativeTabs tab, List list) {
for (IItemMisc item : items) {
if (item.isActive()) {
par3List.add(this.getStack(item, 1));
list.add(getStack(item, 1));
}
}
}
private IItemMisc getItem(final int damage) {
return (damage >= this.items.length) ? this.items[0] : this.items[damage];
private IItemMisc getItem(int damage) {
if (damage >= items.length) {
return items[0];
}
return items[damage];
}
public ItemStack getStack(final IItemMisc type, final int size) {
public ItemStack getStack(IItemMisc type, int size) {
return new ItemStack(this, size, type.ordinal());
}
@Override
@SideOnly(Side.CLIENT)
public void addInformation(final ItemStack par1ItemStack, final EntityPlayer par2EntityPlayer, final List par3List, final boolean par4) {
super.addInformation(par1ItemStack, par2EntityPlayer, par3List, par4);
final IItemMisc item = this.getItem(par1ItemStack.getItemDamage());
public void addInformation(ItemStack itemStack, EntityPlayer player, List tooltip, boolean advanced) {
super.addInformation(itemStack, player, tooltip, advanced);
IItemMisc item = getItem(itemStack.getItemDamage());
if (item != null) {
item.addInformation(par3List);
item.addInformation(tooltip);
}
}
@Override
public String getItemStackDisplayName(final ItemStack stack) {
final IItemMisc item = this.getItem(stack.getItemDamage());
public String getItemStackDisplayName(ItemStack stack) {
IItemMisc item = getItem(stack.getItemDamage());
return (item != null) ? item.getName(stack) : "null";
}
@Override
public IIcon getIcon(final ItemStack stack, final int pass) {
final IItemMisc item = this.getItem(stack.getItemDamage());
public IIcon getIcon(ItemStack stack, int pass) {
IItemMisc item = getItem(stack.getItemDamage());
return (item != null) ? item.getIcon(stack) : null;
}
@Override
public IIcon getIconFromDamage(final int damage) {
final IItemMisc item = this.getItem(damage);
public IIcon getIconFromDamage(int damage) {
IItemMisc item = getItem(damage);
return (item != null) ? item.getIcon(null) : null;
}
@Override
@SideOnly(Side.CLIENT)
public void registerIcons(final IIconRegister register) {
for (final IItemMisc item : this.items) {
public void registerIcons(IIconRegister register) {
for (IItemMisc item : items) {
item.registerIcons(register);
}
}
@@ -1,14 +1,9 @@
//
// Decompiled by Procyon v0.5.30
//
package binnie.core.item;
import net.minecraft.creativetab.CreativeTabs;
public class ManagerItem
{
public ItemMisc registerMiscItems(final IItemMisc[] items, final CreativeTabs tab) {
public class ManagerItem {
public ItemMisc registerMiscItems(IItemMisc[] items, CreativeTabs tab) {
return new ItemMisc(tab, items);
}
}
+47 -42
View File
@@ -1,29 +1,22 @@
//
// Decompiled by Procyon v0.5.30
//
package binnie.core.item;
import cpw.mods.fml.common.eventhandler.SubscribeEvent;
import binnie.botany.api.IFlower;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.entity.EntityLivingBase;
import binnie.core.network.packet.MessageNBT;
import binnie.botany.network.PacketID;
import binnie.botany.Botany;
import net.minecraft.nbt.NBTTagCompound;
import binnie.botany.api.IFlower;
import binnie.botany.flower.TileEntityFlower;
import net.minecraftforge.event.entity.player.PlayerInteractEvent;
import cpw.mods.fml.common.registry.GameRegistry;
import net.minecraft.init.Items;
import net.minecraft.init.Blocks;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import binnie.botany.network.PacketID;
import binnie.core.BinnieCore;
import binnie.core.IInitializable;
import binnie.core.network.packet.MessageNBT;
import cpw.mods.fml.common.eventhandler.SubscribeEvent;
import cpw.mods.fml.common.registry.GameRegistry;
import net.minecraft.init.Blocks;
import net.minecraft.init.Items;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.tileentity.TileEntity;
import net.minecraftforge.event.entity.player.PlayerInteractEvent;
public class ModuleItems implements IInitializable
{
public class ModuleItems implements IInitializable {
@Override
public void preInit() {
BinnieCore.fieldKit = new ItemFieldKit();
@@ -32,39 +25,51 @@ public class ModuleItems implements IInitializable
@Override
public void init() {
// ignored
}
@Override
public void postInit() {
GameRegistry.addRecipe(new ItemStack(BinnieCore.fieldKit, 1, 63), new Object[] { "g ", " is", " pi", 'g', Blocks.glass_pane, 'i', Items.iron_ingot, 'p', Items.paper, 's', new ItemStack(Items.dye, 1) });
GameRegistry.addRecipe(
new ItemStack(BinnieCore.fieldKit, 1, 63),
"g ", " is", " pi",
'g', Blocks.glass_pane,
'i', Items.iron_ingot,
'p', Items.paper,
's', new ItemStack(Items.dye, 1)
);
}
@SubscribeEvent
public void onUseFieldKit(final PlayerInteractEvent event) {
if (!BinnieCore.isBotanyActive()) {
public void onUseFieldKit(PlayerInteractEvent event) {
if (!BinnieCore.isBotanyActive() || event.action != PlayerInteractEvent.Action.RIGHT_CLICK_BLOCK) {
return;
}
if (event.action != PlayerInteractEvent.Action.RIGHT_CLICK_BLOCK) {
return;
}
if (event.entityPlayer != null && event.entityPlayer.getHeldItem() != null && event.entityPlayer.getHeldItem().getItem() == BinnieCore.fieldKit && event.entityPlayer.isSneaking()) {
final TileEntity tile = event.world.getTileEntity(event.x, event.y, event.z);
if (tile instanceof TileEntityFlower) {
final TileEntityFlower tileFlower = (TileEntityFlower) tile;
final IFlower flower = tileFlower.getFlower();
if (flower != null) {
final NBTTagCompound info = new NBTTagCompound();
info.setString("Species", flower.getGenome().getPrimary().getUID());
info.setString("Species2", flower.getGenome().getSecondary().getUID());
info.setFloat("Age", flower.getAge() / flower.getGenome().getLifespan());
info.setShort("Colour", (short) flower.getGenome().getPrimaryColor().getID());
info.setShort("Colour2", (short) flower.getGenome().getSecondaryColor().getID());
info.setBoolean("Wilting", flower.isWilted());
info.setBoolean("Flowered", flower.hasFlowered());
Botany.proxy.sendToPlayer(new MessageNBT(PacketID.Encylopedia.ordinal(), info), event.entityPlayer);
event.entityPlayer.getHeldItem().damageItem(1, event.entityPlayer);
}
if (event.entityPlayer != null
&& event.entityPlayer.getHeldItem() != null
&& event.entityPlayer.getHeldItem().getItem() == BinnieCore.fieldKit
&& event.entityPlayer.isSneaking()) {
TileEntity tile = event.world.getTileEntity(event.x, event.y, event.z);
if (!(tile instanceof TileEntityFlower)) {
return;
}
TileEntityFlower tileFlower = (TileEntityFlower) tile;
IFlower flower = tileFlower.getFlower();
if (flower == null) {
return;
}
NBTTagCompound info = new NBTTagCompound();
info.setString("Species", flower.getGenome().getPrimary().getUID());
info.setString("Species2", flower.getGenome().getSecondary().getUID());
info.setFloat("Age", flower.getAge() / flower.getGenome().getLifespan());
info.setShort("Colour", (short) flower.getGenome().getPrimaryColor().getID());
info.setShort("Colour2", (short) flower.getGenome().getSecondaryColor().getID());
info.setBoolean("Wilting", flower.isWilted());
info.setBoolean("Flowered", flower.hasFlowered());
Botany.proxy.sendToPlayer(new MessageNBT(PacketID.Encylopedia.ordinal(), info), event.entityPlayer);
event.entityPlayer.getHeldItem().damageItem(1, event.entityPlayer);
}
}
}
@@ -1,58 +1,57 @@
//
// Decompiled by Procyon v0.5.30
//
package binnie.core.language;
import net.minecraft.util.StatCollector;
import binnie.core.AbstractMod;
import binnie.core.ManagerBase;
import net.minecraft.util.StatCollector;
import java.util.HashMap;
import java.util.Map;
import binnie.core.ManagerBase;
public class ManagerLanguage extends ManagerBase
{
public class ManagerLanguage extends ManagerBase {
private Map<Object, String> objNames;
public ManagerLanguage() {
this.objNames = new HashMap<Object, String>();
objNames = new HashMap<>();
}
public void addObjectName(final Object obj, final String name) {
this.objNames.put(obj, name);
public void addObjectName(Object obj, String name) {
objNames.put(obj, name);
}
public String unlocalised(final AbstractMod mod, final String id) {
public String unlocalised(AbstractMod mod, String id) {
return mod.getModID() + "." + id;
}
public String localise(final Object key) {
final String loc = StatCollector.translateToLocal(key.toString());
public String localise(Object key) {
String loc = StatCollector.translateToLocal(key.toString());
if (loc.equals(key.toString())) {
return this.objNames.containsKey(key) ? this.localise(this.objNames.get(key)) : key.toString();
if (objNames.containsKey(key)) {
return localise(objNames.get(key));
}
return key.toString();
}
return loc;
}
public String localise(final AbstractMod mod, final String id) {
return this.localise(this.unlocalised(mod, id));
public String localise(AbstractMod mod, String id) {
return localise(unlocalised(mod, id));
}
public String localiseOrBlank(final AbstractMod mod, final String id) {
return this.localiseOrBlank(this.unlocalised(mod, id));
public String localiseOrBlank(AbstractMod mod, String id) {
return localiseOrBlank(unlocalised(mod, id));
}
public String localise(final AbstractMod mod, final String id, final Object... objs) {
return String.format(this.localise(mod, id), objs);
public String localise(AbstractMod mod, String id, Object... objs) {
return String.format(localise(mod, id), objs);
}
public String localiseOrBlank(final Object key) {
final String trans = this.localise(key);
public String localiseOrBlank(Object key) {
String trans = localise(key);
return trans.equals(key) ? "" : trans;
}
public boolean canLocalise(final Object key) {
final String trans = this.localise(key);
public boolean canLocalise(Object key) {
String trans = localise(key);
return !trans.equals(key);
}
}
@@ -1,33 +1,30 @@
//
// Decompiled by Procyon v0.5.30
//
package binnie.core.liquid;
import net.minecraftforge.fluids.Fluid;
class BinnieFluid extends Fluid
{
private final String name;
final IFluidType fluidType;
class BinnieFluid extends Fluid {
protected IFluidType fluidType;
private String name;
@Override
// TODO fix deprecated usage
public String getLocalizedName() {
return this.name;
return name;
}
public BinnieFluid(final IFluidType fluid) {
public BinnieFluid(IFluidType fluid) {
super(fluid.getIdentifier());
this.fluidType = fluid;
this.name = fluid.getName();
fluidType = fluid;
name = fluid.getName();
}
@Override
public int getColor() {
return this.fluidType.getColour();
return fluidType.getColour();
}
public IFluidType getType() {
return this.fluidType;
return fluidType;
}
}
@@ -1,22 +1,17 @@
//
// Decompiled by Procyon v0.5.30
//
package binnie.core.liquid;
import net.minecraftforge.fluids.FluidContainerRegistry;
import binnie.genetics.item.GeneticsItems;
import binnie.core.BinnieCore;
import binnie.core.Mods;
import net.minecraft.init.Items;
import net.minecraft.item.ItemStack;
import binnie.genetics.item.GeneticsItems;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import binnie.core.BinnieCore;
import net.minecraft.client.renderer.texture.IIconRegister;
import net.minecraft.init.Items;
import net.minecraft.item.ItemStack;
import net.minecraft.util.IIcon;
import net.minecraftforge.fluids.FluidContainerRegistry;
public enum FluidContainer
{
public enum FluidContainer {
Bucket,
Capsule,
Refractory,
@@ -24,72 +19,78 @@ public enum FluidContainer
Glass,
Cylinder;
IIcon bottle;
IIcon contents;
ItemFluidContainer item;
protected IIcon bottle;
protected IIcon contents;
protected ItemFluidContainer item;
public int getMaxStackSize() {
return (this == FluidContainer.Bucket) ? 1 : 16;
}
@SideOnly(Side.CLIENT)
public void updateIcons(final IIconRegister register) {
this.bottle = BinnieCore.proxy.getIcon(register, (this == FluidContainer.Cylinder) ? "binniecore" : "forestry", "liquids/" + this.toString().toLowerCase() + ".bottle");
this.contents = BinnieCore.proxy.getIcon(register, (this == FluidContainer.Cylinder) ? "binniecore" : "forestry", "liquids/" + this.toString().toLowerCase() + ".contents");
public void updateIcons(IIconRegister register) {
String liquidName = "liquids/" + toString().toLowerCase();
String modName;
if (this == FluidContainer.Cylinder) {
modName = "binniecore";
} else {
modName = "forestry";
}
bottle = BinnieCore.proxy.getIcon(register, modName, liquidName + ".bottle");
contents = BinnieCore.proxy.getIcon(register, modName, liquidName + ".contents");
}
public IIcon getBottleIcon() {
return this.bottle;
return bottle;
}
public IIcon getContentsIcon() {
return this.contents;
return contents;
}
public String getName() {
return BinnieCore.proxy.localise("item.container." + this.name().toLowerCase());
return BinnieCore.proxy.localise("item.container." + name().toLowerCase());
}
public boolean isActive() {
return this.getEmpty() != null;
return getEmpty() != null;
}
public ItemStack getEmpty() {
switch (this) {
case Bucket: {
return new ItemStack(Items.bucket, 1, 0);
}
case Can: {
return Mods.Forestry.stack("canEmpty");
}
case Capsule: {
return Mods.Forestry.stack("waxCapsule");
}
case Glass: {
return new ItemStack(Items.glass_bottle, 1, 0);
}
case Refractory: {
return Mods.Forestry.stack("refractoryEmpty");
}
case Cylinder: {
return GeneticsItems.Cylinder.get(1);
}
default: {
return null;
}
case Bucket:
return new ItemStack(Items.bucket, 1, 0);
case Can:
return Mods.Forestry.stack("canEmpty");
case Capsule:
return Mods.Forestry.stack("waxCapsule");
case Glass:
return new ItemStack(Items.glass_bottle, 1, 0);
case Refractory:
return Mods.Forestry.stack("refractoryEmpty");
case Cylinder:
return GeneticsItems.Cylinder.get(1);
}
return null;
}
public void registerContainerData(final IFluidType fluid) {
if (!this.isActive()) {
public void registerContainerData(IFluidType fluid) {
if (!isActive()) {
return;
}
final ItemStack filled = this.item.getContainer(fluid);
final ItemStack empty = this.getEmpty();
ItemStack filled = item.getContainer(fluid);
ItemStack empty = getEmpty();
if (filled == null || empty == null || fluid.get(1000) == null) {
return;
}
final FluidContainerRegistry.FluidContainerData data = new FluidContainerRegistry.FluidContainerData(fluid.get(1000), filled, empty);
FluidContainerRegistry.FluidContainerData data = new FluidContainerRegistry.FluidContainerData(fluid.get(1000), filled, empty);
FluidContainerRegistry.registerFluidContainer(data);
}
}
@@ -1,24 +1,19 @@
//
// Decompiled by Procyon v0.5.30
//
package binnie.core.liquid;
import net.minecraftforge.fluids.FluidStack;
import net.minecraft.client.renderer.texture.IIconRegister;
import net.minecraft.util.IIcon;
import net.minecraftforge.fluids.FluidStack;
public interface IFluidType
{
public interface IFluidType {
IIcon getIcon();
void registerIcon(final IIconRegister p0);
void registerIcon(IIconRegister register);
String getName();
String getIdentifier();
FluidStack get(final int p0);
FluidStack get(int amount);
int getColour();
@@ -26,7 +21,7 @@ public interface IFluidType
int getTransparency();
boolean canPlaceIn(final FluidContainer p0);
boolean canPlaceIn(FluidContainer container);
boolean showInCreative(final FluidContainer p0);
boolean showInCreative(FluidContainer container);
}
@@ -1,7 +1,3 @@
//
// Decompiled by Procyon v0.5.30
//
package binnie.core.liquid;
public interface ILiquidType extends IFluidType
@@ -1,112 +1,105 @@
//
// Decompiled by Procyon v0.5.30
//
package binnie.core.liquid;
import java.util.HashMap;
import net.minecraft.item.EnumAction;
import binnie.extratrees.alcohol.drink.IDrinkLiquid;
import binnie.Binnie;
import binnie.extratrees.alcohol.AlcoholEffect;
import binnie.extratrees.alcohol.drink.DrinkManager;
import net.minecraft.entity.Entity;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.world.World;
import net.minecraft.util.IIcon;
import java.util.List;
import net.minecraft.item.Item;
import binnie.extratrees.alcohol.drink.IDrinkLiquid;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import net.minecraft.client.renderer.texture.IIconRegister;
import binnie.Binnie;
import net.minecraftforge.fluids.FluidStack;
import net.minecraft.item.ItemStack;
import net.minecraft.creativetab.CreativeTabs;
import java.util.Map;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.EnumAction;
import net.minecraft.item.Item;
import net.minecraft.item.ItemFood;
import net.minecraft.item.ItemStack;
import net.minecraft.util.IIcon;
import net.minecraft.world.World;
import net.minecraftforge.fluids.FluidStack;
public class ItemFluidContainer extends ItemFood
{
import java.util.HashMap;
import java.util.List;
import java.util.Map;
public class ItemFluidContainer extends ItemFood {
private FluidContainer container;
public static int LiquidExtraBee;
public static int LiquidExtraTree;
public static int LiquidJuice;
public static int LiquidAlcohol;
public static int LiquidSpirit;
public static int LiquidLiqueuer;
public static int LiquidGenetics;
private static Map<Integer, String> idToFluid;
private static Map<String, Integer> fluidToID;
public static int LiquidExtraBee = 64;
public static int LiquidExtraTree = 128;
public static int LiquidJuice = 256;
public static int LiquidAlcohol = 384;
public static int LiquidSpirit = 512;
public static int LiquidLiqueuer = 640;
public static int LiquidGenetics = 768;
public static void registerFluid(final IFluidType fluid, final int id) {
private static Map<Integer, String> idToFluid = new HashMap<Integer, String>();
private static Map<String, Integer> fluidToID = new HashMap<String, Integer>();
public static void registerFluid(IFluidType fluid, int id) {
ItemFluidContainer.idToFluid.put(id, fluid.getIdentifier().toLowerCase());
ItemFluidContainer.fluidToID.put(fluid.getIdentifier().toLowerCase(), id);
}
public ItemFluidContainer(final FluidContainer container) {
public ItemFluidContainer(FluidContainer container) {
super(0, false);
this.container = container;
container.item = this;
this.maxStackSize = container.getMaxStackSize();
this.setHasSubtypes(true);
this.setUnlocalizedName("container" + container.name());
this.setCreativeTab(CreativeTabs.tabMaterials);
maxStackSize = container.getMaxStackSize();
setHasSubtypes(true);
setUnlocalizedName("container" + container.name());
setCreativeTab(CreativeTabs.tabMaterials);
}
private FluidStack getLiquid(final ItemStack stack) {
final String liquid = ItemFluidContainer.idToFluid.get(stack.getItemDamage());
private FluidStack getLiquid(ItemStack stack) {
String liquid = ItemFluidContainer.idToFluid.get(stack.getItemDamage());
return (liquid == null) ? null : Binnie.Liquid.getLiquidStack(liquid, 1000);
}
@Override
@SideOnly(Side.CLIENT)
public void registerIcons(final IIconRegister register) {
this.container.updateIcons(register);
public void registerIcons(IIconRegister register) {
container.updateIcons(register);
}
@Override
public String getItemStackDisplayName(final ItemStack itemstack) {
public String getItemStackDisplayName(ItemStack itemstack) {
if (itemstack == null) {
return "???";
}
final FluidStack fluid = this.getLiquid(itemstack);
FluidStack fluid = getLiquid(itemstack);
if (fluid == null) {
return "Missing Fluid";
}
return fluid.getFluid().getLocalizedName(fluid) + " " + this.container.getName();
return fluid.getFluid().getLocalizedName(fluid) + " " + container.getName();
}
@Override
public void getSubItems(final Item par1, final CreativeTabs par2CreativeTabs, final List itemList) {
for (final IFluidType liquid : Binnie.Liquid.fluids.values()) {
if (!liquid.canPlaceIn(this.container)) {
continue;
}
if (!liquid.showInCreative(this.container)) {
public void getSubItems(Item item, CreativeTabs tab, List itemList) {
for (IFluidType liquid : Binnie.Liquid.fluids.values()) {
if (!liquid.canPlaceIn(container) || !liquid.showInCreative(container)) {
continue;
}
itemList.add(this.getContainer(liquid));
}
}
public ItemStack getContainer(final IFluidType liquid) {
final int id = ItemFluidContainer.fluidToID.get(liquid.getIdentifier().toLowerCase());
final ItemStack itemstack = new ItemStack(this, 1, id);
return itemstack;
public ItemStack getContainer(IFluidType liquid) {
int id = ItemFluidContainer.fluidToID.get(liquid.getIdentifier().toLowerCase());
return new ItemStack(this, 1, id);
}
@Override
public IIcon getIcon(final ItemStack itemstack, final int j) {
public IIcon getIcon(ItemStack itemStack, int j) {
if (j > 0) {
return this.container.getBottleIcon();
return container.getBottleIcon();
}
return this.container.getContentsIcon();
return container.getContentsIcon();
}
@Override
@SideOnly(Side.CLIENT)
public int getColorFromItemStack(final ItemStack item, final int pass) {
final FluidStack fluid = this.getLiquid(item);
public int getColorFromItemStack(ItemStack item, int pass) {
FluidStack fluid = this.getLiquid(item);
if (fluid == null) {
return 16777215;
}
@@ -122,67 +115,57 @@ public class ItemFluidContainer extends ItemFood
}
@Override
public ItemStack onEaten(final ItemStack stack, final World world, final EntityPlayer player) {
public ItemStack onEaten(ItemStack stack, World world, EntityPlayer player) {
player.getFoodStats().func_151686_a(this, stack);
world.playSoundAtEntity(player, "random.burp", 0.5f, world.rand.nextFloat() * 0.1f + 0.9f);
this.onFoodEaten(stack, world, player);
return this.container.getEmpty();
onFoodEaten(stack, world, player);
return container.getEmpty();
}
@Override
protected void onFoodEaten(final ItemStack stack, final World world, final EntityPlayer player) {
if (!world.isRemote) {
final FluidStack fluid = this.getLiquid(stack);
final IDrinkLiquid liquid = DrinkManager.getLiquid(fluid);
if (liquid != null) {
AlcoholEffect.makeDrunk(player, liquid.getABV() * fluid.amount);
}
protected void onFoodEaten(ItemStack stack, World world, EntityPlayer player) {
if (world.isRemote) {
return;
}
FluidStack fluid = this.getLiquid(stack);
IDrinkLiquid liquid = DrinkManager.getLiquid(fluid);
if (liquid != null) {
AlcoholEffect.makeDrunk(player, liquid.getABV() * fluid.amount);
}
}
@Override
public int getMaxItemUseDuration(final ItemStack stack) {
public int getMaxItemUseDuration(ItemStack stack) {
return 32;
}
@Override
public EnumAction getItemUseAction(final ItemStack stack) {
return this.isDrinkable(stack) ? EnumAction.drink : EnumAction.none;
public EnumAction getItemUseAction(ItemStack stack) {
return isDrinkable(stack) ? EnumAction.drink : EnumAction.none;
}
@Override
public ItemStack onItemRightClick(final ItemStack stack, final World world, final EntityPlayer player) {
if (this.isDrinkable(stack)) {
public ItemStack onItemRightClick(ItemStack stack, World world, EntityPlayer player) {
if (isDrinkable(stack)) {
player.setItemInUse(stack, this.getMaxItemUseDuration(stack));
}
return stack;
}
@Override
public int func_150905_g(final ItemStack p_150905_1_) {
public int func_150905_g(ItemStack p_150905_1_) {
return 0;
}
@Override
public float func_150906_h(final ItemStack p_150906_1_) {
public float func_150906_h(ItemStack p_150906_1_) {
return 0.0f;
}
private boolean isDrinkable(final ItemStack stack) {
final FluidStack fluid = this.getLiquid(stack);
final IDrinkLiquid liquid = DrinkManager.getLiquid(fluid);
private boolean isDrinkable(ItemStack stack) {
FluidStack fluid = this.getLiquid(stack);
IDrinkLiquid liquid = DrinkManager.getLiquid(fluid);
return liquid != null && liquid.isConsumable();
}
static {
ItemFluidContainer.LiquidExtraBee = 64;
ItemFluidContainer.LiquidExtraTree = 128;
ItemFluidContainer.LiquidJuice = 256;
ItemFluidContainer.LiquidAlcohol = 384;
ItemFluidContainer.LiquidSpirit = 512;
ItemFluidContainer.LiquidLiqueuer = 640;
ItemFluidContainer.LiquidGenetics = 768;
ItemFluidContainer.idToFluid = new HashMap<Integer, String>();
ItemFluidContainer.fluidToID = new HashMap<String, Integer>();
}
}
@@ -1,57 +1,53 @@
//
// Decompiled by Procyon v0.5.30
//
package binnie.core.liquid;
import binnie.core.ManagerBase;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import net.minecraft.client.renderer.texture.IIconRegister;
import net.minecraftforge.fluids.FluidStack;
import net.minecraftforge.fluids.Fluid;
import net.minecraftforge.fluids.FluidRegistry;
import net.minecraftforge.fluids.FluidStack;
import java.util.Collection;
import java.util.LinkedHashMap;
import java.util.Map;
import binnie.core.ManagerBase;
public class ManagerLiquid extends ManagerBase
{
public class ManagerLiquid extends ManagerBase {
Map<String, IFluidType> fluids;
public ManagerLiquid() {
this.fluids = new LinkedHashMap<String, IFluidType>();
fluids = new LinkedHashMap<String, IFluidType>();
}
public Collection<IFluidType> getFluidTypes() {
return this.fluids.values();
return fluids.values();
}
public void createLiquids(final IFluidType[] liquids, int startID) {
for (final IFluidType liquid : liquids) {
final BinnieFluid fluid = this.createLiquid(liquid, startID++);
public void createLiquids(IFluidType[] liquids, int startID) {
for (IFluidType liquid : liquids) {
BinnieFluid fluid = this.createLiquid(liquid, startID++);
if (fluid == null) {
throw new RuntimeException("Liquid registered incorrectly - " + liquid.getIdentifier());
}
}
}
public BinnieFluid createLiquid(final IFluidType fluid, final int id) {
this.fluids.put(fluid.getIdentifier().toLowerCase(), fluid);
final BinnieFluid bFluid = new BinnieFluid(fluid);
FluidRegistry.registerFluid(bFluid);
public BinnieFluid createLiquid(IFluidType fluid, int id) {
fluids.put(fluid.getIdentifier().toLowerCase(), fluid);
BinnieFluid binnieFluid = new BinnieFluid(fluid);
FluidRegistry.registerFluid(binnieFluid);
ItemFluidContainer.registerFluid(fluid, id);
return bFluid;
return binnieFluid;
}
public FluidStack getLiquidStack(final String name, final int amount) {
public FluidStack getLiquidStack(String name, int amount) {
return FluidRegistry.getFluidStack(name.toLowerCase(), amount);
}
@SideOnly(Side.CLIENT)
public void reloadIcons(final IIconRegister register) {
for (final IFluidType type : this.fluids.values()) {
final Fluid fluid = this.getLiquidStack(type.getIdentifier(), 1).getFluid();
public void reloadIcons(IIconRegister register) {
for (IFluidType type : fluids.values()) {
Fluid fluid = getLiquidStack(type.getIdentifier(), 1).getFluid();
type.registerIcon(register);
if (fluid == null) {
throw new RuntimeException("[Binnie] Liquid not registered properly - " + type.getIdentifier());
@@ -62,12 +58,13 @@ public class ManagerLiquid extends ManagerBase
@Override
public void init() {
// ignored
}
@Override
public void postInit() {
for (final IFluidType fluid : this.fluids.values()) {
for (final FluidContainer container : FluidContainer.values()) {
for (IFluidType fluid : fluids.values()) {
for (FluidContainer container : FluidContainer.values()) {
if (container.isActive() && fluid.canPlaceIn(container)) {
container.registerContainerData(fluid);
}
@@ -75,7 +72,7 @@ public class ManagerLiquid extends ManagerBase
}
}
public IFluidType getFluidType(final String liquid) {
return this.fluids.get(liquid.toLowerCase());
public IFluidType getFluidType(String liquid) {
return fluids.get(liquid.toLowerCase());
}
}
@@ -1,46 +1,42 @@
//
// Decompiled by Procyon v0.5.30
//
package binnie.core.machines;
import java.util.ArrayList;
import binnie.Binnie;
import binnie.core.BinnieCore;
import binnie.core.machines.component.IRender;
import java.util.Random;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import net.minecraft.block.Block;
import net.minecraft.block.BlockContainer;
import net.minecraft.block.material.Material;
import net.minecraft.client.renderer.texture.IIconRegister;
import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.entity.EntityLivingBase;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.init.Blocks;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.IIcon;
import net.minecraft.world.IBlockAccess;
import net.minecraft.entity.EntityLivingBase;
import binnie.core.BinnieCore;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.world.World;
import binnie.Binnie;
import net.minecraft.block.Block;
import net.minecraft.item.ItemStack;
import java.util.List;
import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.item.Item;
import net.minecraft.block.material.Material;
import net.minecraft.block.BlockContainer;
class BlockMachine extends BlockContainer implements IBlockMachine
{
import java.util.ArrayList;
import java.util.List;
import java.util.Random;
class BlockMachine extends BlockContainer implements IBlockMachine {
private MachineGroup group;
public BlockMachine(final MachineGroup group, final String blockName) {
public BlockMachine(MachineGroup group, String blockName) {
super(Material.iron);
this.group = group;
this.setHardness(1.5f);
this.setBlockName(blockName);
setHardness(1.5f);
setBlockName(blockName);
}
@Override
public void getSubBlocks(final Item par1, final CreativeTabs par2CreativeTabs, final List itemList) {
for (final MachinePackage pack : this.group.getPackages()) {
public void getSubBlocks(Item item, CreativeTabs tab, List itemList) {
for (MachinePackage pack : group.getPackages()) {
if (pack.isActive()) {
itemList.add(new ItemStack(this, 1, pack.getMetadata()));
}
@@ -54,7 +50,7 @@ class BlockMachine extends BlockContainer implements IBlockMachine
@Override
public boolean renderAsNormalBlock() {
return !this.group.customRenderer;
return !group.customRenderer;
}
@Override
@@ -63,42 +59,42 @@ class BlockMachine extends BlockContainer implements IBlockMachine
}
@Override
public TileEntity createTileEntity(final World world, final int metadata) {
if (this.group.getPackage(metadata) == null) {
public TileEntity createTileEntity(World world, int meta) {
MachinePackage pkg = group.getPackage(meta);
if (pkg == null) {
return null;
}
return this.group.getPackage(metadata).createTileEntity();
return pkg.createTileEntity();
}
@Override
public MachinePackage getPackage(final int meta) {
return this.group.getPackage(meta);
public MachinePackage getPackage(int meta) {
return group.getPackage(meta);
}
@Override
public String getMachineName(final int meta) {
return (this.getPackage(meta) == null) ? "Unnamed Machine" : this.getPackage(meta).getDisplayName();
public String getMachineName(int meta) {
MachinePackage pkg = getPackage(meta);
return (pkg == null) ? "Unnamed Machine" : pkg.getDisplayName();
}
@Override
public int damageDropped(final int par1) {
return par1;
public int damageDropped(int meta) {
return meta;
}
@Override
public TileEntity createNewTileEntity(final World var1, final int meta) {
return this.createTileEntity(var1, meta);
public TileEntity createNewTileEntity(World world, int meta) {
return createTileEntity(world, meta);
}
@Override
public boolean onBlockActivated(final World world, final int x, final int y, final int z, final EntityPlayer player, final int par6, final float par7, final float par8, final float par9) {
if (!BinnieCore.proxy.isSimulating(world)) {
public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer player, int side, float xOffset, float yOffset, float zOffset) {
if (!BinnieCore.proxy.isSimulating(world) || player.isSneaking()) {
return true;
}
if (player.isSneaking()) {
return true;
}
final TileEntity entity = world.getTileEntity(x, y, z);
TileEntity entity = world.getTileEntity(x, y, z);
if (entity instanceof TileEntityMachine) {
((TileEntityMachine) entity).getMachine().onRightClick(world, player, x, y, z);
}
@@ -106,23 +102,25 @@ class BlockMachine extends BlockContainer implements IBlockMachine
}
@Override
public void onBlockPlacedBy(final World world, final int i, final int j, final int k, final EntityLivingBase entityliving, final ItemStack stack) {
super.onBlockPlacedBy(world, i, j, k, entityliving, stack);
public void onBlockPlacedBy(World world, int x, int y, int z, EntityLivingBase entity, ItemStack stack) {
super.onBlockPlacedBy(world, x, y, z, entity, stack);
if (!BinnieCore.proxy.isSimulating(world)) {
return;
}
final IMachine machine = Machine.getMachine(world.getTileEntity(i, j, k));
IMachine machine = Machine.getMachine(world.getTileEntity(x, y, z));
if (machine == null) {
return;
}
if (entityliving instanceof EntityPlayer) {
machine.setOwner(((EntityPlayer) entityliving).getGameProfile());
if (entity instanceof EntityPlayer) {
machine.setOwner(((EntityPlayer) entity).getGameProfile());
}
}
@Override
public IIcon getIcon(final IBlockAccess world, final int x, final int y, final int z, final int side) {
final TileEntity entity = world.getTileEntity(x, y, z);
public IIcon getIcon(IBlockAccess world, int x, int y, int z, int side) {
TileEntity entity = world.getTileEntity(x, y, z);
if (entity instanceof TileEntityMachine && ((TileEntityMachine) entity).getMachine().hasInterface(IMachineTexturedFaces.class)) {
return ((TileEntityMachine) entity).getMachine().getInterface(IMachineTexturedFaces.class).getIcon(side);
}
@@ -130,51 +128,50 @@ class BlockMachine extends BlockContainer implements IBlockMachine
}
@Override
public void breakBlock(final World world, final int x, final int y, final int z, final Block par5, final int par6) {
final TileEntity tileentity = world.getTileEntity(x, y, z);
public void breakBlock(World world, int x, int y, int z, Block block, int meta) {
TileEntity tileentity = world.getTileEntity(x, y, z);
if (!(tileentity instanceof TileEntityMachine)) {
return;
}
final TileEntityMachine entity = (TileEntityMachine) tileentity;
if (entity != null) {
entity.onBlockDestroy();
}
super.breakBlock(world, x, y, z, par5, par6);
TileEntityMachine entity = (TileEntityMachine) tileentity;
entity.onBlockDestroy();
super.breakBlock(world, x, y, z, block, meta);
}
@Override
@SideOnly(Side.CLIENT)
public void registerBlockIcons(final IIconRegister register) {
public void registerBlockIcons(IIconRegister register) {
// ignored
}
@Override
@SideOnly(Side.CLIENT)
public void randomDisplayTick(final World world, final int x, final int y, final int z, final Random rand) {
final IMachine machine = Machine.getMachine(world.getTileEntity(x, y, z));
public void randomDisplayTick(World world, int x, int y, int z, Random rand) {
IMachine machine = Machine.getMachine(world.getTileEntity(x, y, z));
if (machine != null) {
for (final IRender.RandomDisplayTick renders : machine.getInterfaces(IRender.RandomDisplayTick.class)) {
for (IRender.RandomDisplayTick renders : machine.getInterfaces(IRender.RandomDisplayTick.class)) {
renders.onRandomDisplayTick(world, x, y, z, rand);
}
}
}
@Override
public ArrayList<ItemStack> getDrops(final World world, final int x, final int y, final int z, final int metadata, final int fortune) {
return new ArrayList<ItemStack>();
public ArrayList<ItemStack> getDrops(World world, int x, int y, int z, int meta, int fortune) {
return new ArrayList<>();
}
@Override
public boolean removedByPlayer(final World world, final EntityPlayer player, final int x, final int y, final int z, final boolean willHarvest) {
if (BinnieCore.proxy.isSimulating(world) && this.canHarvestBlock(player, world.getBlockMetadata(x, y, z)) && !player.capabilities.isCreativeMode) {
final int metadata = world.getBlockMetadata(x, y, z);
final ItemStack stack = new ItemStack(Item.getItemFromBlock(this), 1, this.damageDropped(metadata));
this.dropBlockAsItem(world, x, y, z, stack);
public boolean removedByPlayer(World world, EntityPlayer player, int x, int y, int z, boolean willHarvest) {
if (BinnieCore.proxy.isSimulating(world) && canHarvestBlock(player, world.getBlockMetadata(x, y, z)) && !player.capabilities.isCreativeMode) {
int metadata = world.getBlockMetadata(x, y, z);
ItemStack stack = new ItemStack(Item.getItemFromBlock(this), 1, damageDropped(metadata));
dropBlockAsItem(world, x, y, z, stack);
}
return world.setBlockToAir(x, y, z);
}
public interface IMachineTexturedFaces
{
IIcon getIcon(final int p0);
public interface IMachineTexturedFaces {
IIcon getIcon(int p0);
}
}
@@ -1,12 +1,7 @@
//
// Decompiled by Procyon v0.5.30
//
package binnie.core.machines;
interface IBlockMachine
{
MachinePackage getPackage(final int p0);
interface IBlockMachine {
MachinePackage getPackage(int meta);
String getMachineName(final int p0);
String getMachineName(int meta);
}
@@ -1,20 +1,16 @@
//
// Decompiled by Procyon v0.5.30
//
package binnie.core.machines;
import java.util.Collection;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.world.World;
public interface IMachine extends IOwnable
{
void addComponent(final MachineComponent p0);
import java.util.Collection;
public interface IMachine extends IOwnable {
void addComponent(MachineComponent component);
MachineUtil getMachineUtil();
<T> T getInterface(final Class<T> p0);
<T> T getInterface(Class<T> cls);
void markDirty();
@@ -22,7 +18,7 @@ public interface IMachine extends IOwnable
TileEntity getTileEntity();
<T> Collection<T> getInterfaces(final Class<T> p0);
<T> Collection<T> getInterfaces(Class<T> cls);
MachinePackage getPackage();
}
@@ -1,13 +1,8 @@
//
// Decompiled by Procyon v0.5.30
//
package binnie.core.machines;
import binnie.core.network.IOrdinaled;
public interface IMachineType extends IOrdinaled
{
public interface IMachineType extends IOrdinaled {
Class<? extends MachinePackage> getPackageClass();
boolean isActive();
@@ -1,14 +1,9 @@
//
// Decompiled by Procyon v0.5.30
//
package binnie.core.machines;
import com.mojang.authlib.GameProfile;
interface IOwnable
{
interface IOwnable {
GameProfile getOwner();
void setOwner(final GameProfile p0);
void setOwner(GameProfile owner);
}
@@ -1,31 +1,26 @@
//
// Decompiled by Procyon v0.5.30
//
package binnie.core.machines;
import net.minecraft.item.ItemStack;
import net.minecraft.block.Block;
import net.minecraft.item.ItemBlock;
import net.minecraft.item.ItemStack;
public class ItemMachine extends ItemBlock
{
public class ItemMachine extends ItemBlock {
private IBlockMachine associatedBlock;
public ItemMachine(final Block block) {
public ItemMachine(Block block) {
super(block);
this.setMaxDamage(0);
this.setHasSubtypes(true);
this.associatedBlock = (IBlockMachine) block;
setMaxDamage(0);
setHasSubtypes(true);
associatedBlock = (IBlockMachine) block;
}
@Override
public int getMetadata(final int i) {
public int getMetadata(int i) {
return i;
}
@Override
public String getItemStackDisplayName(final ItemStack itemstack) {
return this.associatedBlock.getMachineName(itemstack.getItemDamage());
public String getItemStackDisplayName(ItemStack itemstack) {
return associatedBlock.getMachineName(itemstack.getItemDamage());
}
}
+110 -110
View File
@@ -1,38 +1,32 @@
//
// Decompiled by Procyon v0.5.30
//
package binnie.core.machines;
import cpw.mods.fml.common.network.simpleimpl.IMessage;
import binnie.core.network.packet.MessageTileNBT;
import binnie.core.network.BinnieCorePacketID;
import net.minecraft.network.Packet;
import net.minecraft.nbt.NBTBase;
import net.minecraft.nbt.NBTUtil;
import net.minecraft.nbt.NBTTagCompound;
import binnie.core.machines.power.ITankMachine;
import net.minecraft.inventory.IInventory;
import binnie.core.machines.component.IRender;
import binnie.core.machines.component.IInteraction;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.world.World;
import binnie.core.network.packet.PacketPayload;
import cpw.mods.fml.relauncher.Side;
import binnie.core.BinnieCore;
import java.util.Collection;
import java.util.ArrayList;
import java.util.LinkedHashMap;
import binnie.core.machines.component.IInteraction;
import binnie.core.machines.component.IRender;
import binnie.core.machines.network.INetwork;
import binnie.core.machines.power.ITankMachine;
import binnie.core.network.BinnieCorePacketID;
import binnie.core.network.INetworkedEntity;
import binnie.core.network.packet.MessageTileNBT;
import binnie.core.network.packet.PacketPayload;
import com.mojang.authlib.GameProfile;
import cpw.mods.fml.relauncher.Side;
import forestry.api.core.INBTTagable;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.inventory.IInventory;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.nbt.NBTUtil;
import net.minecraft.network.Packet;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.world.World;
import java.util.ArrayList;
import java.util.Collection;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
import binnie.core.machines.network.INetwork;
import forestry.api.core.INBTTagable;
import binnie.core.network.INetworkedEntity;
public class Machine implements INetworkedEntity, INBTTagable, INetwork.TilePacketSync, IMachine, INetwork.GuiNBT
{
public class Machine implements INetworkedEntity, INBTTagable, INetwork.TilePacketSync, IMachine, INetwork.GuiNBT {
private MachinePackage machinePackage;
private Map<Class, List<MachineComponent>> componentInterfaceMap;
private Map<Class<? extends MachineComponent>, MachineComponent> componentMap;
@@ -41,74 +35,78 @@ public class Machine implements INetworkedEntity, INBTTagable, INetwork.TilePack
private int nextProgressBarID;
private GameProfile owner;
public Machine(final MachinePackage pack, final TileEntity tile) {
this.componentInterfaceMap = new LinkedHashMap<Class, List<MachineComponent>>();
this.componentMap = new LinkedHashMap<Class<? extends MachineComponent>, MachineComponent>();
this.queuedInventoryUpdate = false;
this.nextProgressBarID = 0;
this.owner = null;
public Machine(MachinePackage pack, TileEntity tile) {
componentInterfaceMap = new LinkedHashMap<>();
componentMap = new LinkedHashMap<>();
queuedInventoryUpdate = false;
nextProgressBarID = 0;
owner = null;
this.tile = tile;
pack.createMachine(this);
this.machinePackage = pack;
machinePackage = pack;
}
@Override
public void addComponent(final MachineComponent component) {
public void addComponent(MachineComponent component) {
if (component == null) {
throw new NullPointerException("Can't have a null machine component!");
}
component.setMachine(this);
this.componentMap.put(component.getClass(), component);
for (final Class inter : component.getComponentInterfaces()) {
if (!this.componentInterfaceMap.containsKey(inter)) {
this.componentInterfaceMap.put(inter, new ArrayList<MachineComponent>());
componentMap.put(component.getClass(), component);
for (Class inter : component.getComponentInterfaces()) {
if (!componentInterfaceMap.containsKey(inter)) {
componentInterfaceMap.put(inter, new ArrayList<>());
}
this.componentInterfaceMap.get(inter).add(component);
componentInterfaceMap.get(inter).add(component);
}
}
public Collection<MachineComponent> getComponents() {
return this.componentMap.values();
return componentMap.values();
}
public <T extends MachineComponent> T getComponent(final Class<T> componentClass) {
return this.hasComponent(componentClass) ? ((T) componentClass.cast(this.componentMap.get(componentClass))) : null;
public <T extends MachineComponent> T getComponent(Class<T> componentClass) {
if (hasComponent(componentClass)) {
return componentClass.cast(componentMap.get(componentClass));
}
return null;
}
@Override
public <T> T getInterface(final Class<T> interfaceClass) {
if (this.hasInterface(interfaceClass)) {
return this.getInterfaces(interfaceClass).get(0);
public <T> T getInterface(Class<T> cls) {
if (this.hasInterface(cls)) {
return getInterfaces(cls).get(0);
}
if (interfaceClass.isInstance(this.getPackage())) {
return interfaceClass.cast(this.getPackage());
if (cls.isInstance(getPackage())) {
return cls.cast(getPackage());
}
for (final MachineComponent component : this.getComponents()) {
if (interfaceClass.isInstance(component)) {
return interfaceClass.cast(component);
for (MachineComponent component : getComponents()) {
if (cls.isInstance(component)) {
return cls.cast(component);
}
}
return null;
}
@Override
public <T> List<T> getInterfaces(final Class<T> interfaceClass) {
final ArrayList<T> interfaces = new ArrayList<T>();
if (!this.hasInterface(interfaceClass)) {
public <T> List<T> getInterfaces(Class<T> cls) {
ArrayList<T> interfaces = new ArrayList<>();
if (!hasInterface(cls)) {
return interfaces;
}
for (final MachineComponent component : this.componentInterfaceMap.get(interfaceClass)) {
interfaces.add(interfaceClass.cast(component));
for (MachineComponent component : componentInterfaceMap.get(cls)) {
interfaces.add(cls.cast(component));
}
return interfaces;
}
public boolean hasInterface(final Class<?> interfaceClass) {
return this.componentInterfaceMap.containsKey(interfaceClass);
public boolean hasInterface(Class<?> interfaceClass) {
return componentInterfaceMap.containsKey(interfaceClass);
}
public boolean hasComponent(final Class<? extends MachineComponent> componentClass) {
return this.componentMap.containsKey(componentClass);
public boolean hasComponent(Class<? extends MachineComponent> componentClass) {
return componentMap.containsKey(componentClass);
}
@Override
@@ -117,19 +115,19 @@ public class Machine implements INetworkedEntity, INBTTagable, INetwork.TilePack
}
public void sendPacket() {
if (!BinnieCore.proxy.isSimulating(this.getTileEntity().getWorldObj())) {
if (!BinnieCore.proxy.isSimulating(getTileEntity().getWorldObj())) {
return;
}
BinnieCore.proxy.sendNetworkEntityPacket((INetworkedEntity) this.getTileEntity());
BinnieCore.proxy.sendNetworkEntityPacket((INetworkedEntity) getTileEntity());
}
public Side getSide() {
return BinnieCore.proxy.isSimulating(this.getTileEntity().getWorldObj()) ? Side.SERVER : Side.CLIENT;
return BinnieCore.proxy.isSimulating(getTileEntity().getWorldObj()) ? Side.SERVER : Side.CLIENT;
}
@Override
public void writeToPacket(final PacketPayload payload) {
for (final MachineComponent component : this.getComponents()) {
public void writeToPacket(PacketPayload payload) {
for (MachineComponent component : getComponents()) {
if (component instanceof INetworkedEntity) {
((INetworkedEntity) component).writeToPacket(payload);
}
@@ -137,69 +135,70 @@ public class Machine implements INetworkedEntity, INBTTagable, INetwork.TilePack
}
@Override
public void readFromPacket(final PacketPayload payload) {
for (final MachineComponent component : this.getComponents()) {
public void readFromPacket(PacketPayload payload) {
for (MachineComponent component : getComponents()) {
if (component instanceof INetworkedEntity) {
((INetworkedEntity) component).readFromPacket(payload);
}
}
}
public void onRightClick(final World world, final EntityPlayer player, final int x, final int y, final int z) {
for (final IInteraction.RightClick component : this.getInterfaces(IInteraction.RightClick.class)) {
public void onRightClick(World world, EntityPlayer player, int x, int y, int z) {
for (IInteraction.RightClick component : getInterfaces(IInteraction.RightClick.class)) {
component.onRightClick(world, player, x, y, z);
}
}
@Override
public void markDirty() {
this.queuedInventoryUpdate = true;
queuedInventoryUpdate = true;
}
public void onUpdate() {
if (BinnieCore.proxy.isSimulating(this.getWorld())) {
for (final MachineComponent component : this.getComponents()) {
if (BinnieCore.proxy.isSimulating(getWorld())) {
for (MachineComponent component : getComponents()) {
component.onUpdate();
}
}
else {
for (final IRender.DisplayTick renders : this.getInterfaces(IRender.DisplayTick.class)) {
renders.onDisplayTick(this.getWorld(), this.getTileEntity().xCoord, this.getTileEntity().yCoord, this.getTileEntity().zCoord, this.getWorld().rand);
} else {
for (IRender.DisplayTick renders : getInterfaces(IRender.DisplayTick.class)) {
TileEntity tileEntity = getTileEntity();
renders.onDisplayTick(getWorld(), tileEntity.xCoord, tileEntity.yCoord, tileEntity.zCoord, getWorld().rand);
}
}
if (this.queuedInventoryUpdate) {
for (final MachineComponent component : this.getComponents()) {
if (queuedInventoryUpdate) {
for (MachineComponent component : getComponents()) {
component.onInventoryUpdate();
}
this.queuedInventoryUpdate = false;
queuedInventoryUpdate = false;
}
}
public IInventory getInventory() {
return this.getInterface(IInventory.class);
return getInterface(IInventory.class);
}
public ITankMachine getTankContainer() {
return this.getInterface(ITankMachine.class);
return getInterface(ITankMachine.class);
}
@Override
public void readFromNBT(final NBTTagCompound nbttagcompound) {
for (final MachineComponent component : this.getComponents()) {
public void readFromNBT(NBTTagCompound nbttagcompound) {
for (MachineComponent component : getComponents()) {
component.readFromNBT(nbttagcompound);
}
this.owner = NBTUtil.func_152459_a(nbttagcompound.getCompoundTag("owner"));
this.markDirty();
owner = NBTUtil.func_152459_a(nbttagcompound.getCompoundTag("owner"));
markDirty();
}
@Override
public void writeToNBT(final NBTTagCompound nbttagcompound) {
for (final MachineComponent component : this.getComponents()) {
public void writeToNBT(NBTTagCompound nbttagcompound) {
for (MachineComponent component : getComponents()) {
component.writeToNBT(nbttagcompound);
}
if (this.owner != null) {
final NBTTagCompound nbt = new NBTTagCompound();
NBTUtil.func_152460_a(nbt, this.owner);
if (owner != null) {
NBTTagCompound nbt = new NBTTagCompound();
NBTUtil.func_152460_a(nbt, owner);
nbttagcompound.setTag("owner", nbt);
}
}
@@ -209,7 +208,7 @@ public class Machine implements INetworkedEntity, INBTTagable, INetwork.TilePack
return this.machinePackage;
}
public static IMachine getMachine(final Object inventory) {
public static IMachine getMachine(Object inventory) {
if (inventory != null && inventory instanceof IMachine) {
return (IMachine) inventory;
}
@@ -222,8 +221,8 @@ public class Machine implements INetworkedEntity, INBTTagable, INetwork.TilePack
return null;
}
public static <T> T getInterface(final Class<T> interfac, final Object inventory) {
final IMachine machine = getMachine(inventory);
public static <T> T getInterface(Class<T> interfac, Object inventory) {
IMachine machine = getMachine(inventory);
if (machine != null) {
return machine.getInterface(interfac);
}
@@ -240,63 +239,64 @@ public class Machine implements INetworkedEntity, INBTTagable, INetwork.TilePack
@Override
public World getWorld() {
return this.getTileEntity().getWorldObj();
return getTileEntity().getWorldObj();
}
public void onBlockDestroy() {
for (final MachineComponent component : this.getComponents()) {
for (MachineComponent component : getComponents()) {
component.onDestruction();
}
}
public int getUniqueProgressBarID() {
return this.nextProgressBarID++;
return nextProgressBarID++;
}
@Override
public GameProfile getOwner() {
return this.owner;
return owner;
}
@Override
public void setOwner(final GameProfile owner) {
public void setOwner(GameProfile owner) {
this.owner = owner;
}
public Packet getDescriptionPacket() {
final NBTTagCompound nbt = new NBTTagCompound();
this.syncToNBT(nbt);
NBTTagCompound nbt = new NBTTagCompound();
syncToNBT(nbt);
if (nbt.hasNoTags()) {
return null;
}
return BinnieCore.instance.getNetworkWrapper().getPacketFrom(new MessageTileNBT(BinnieCorePacketID.TileDescriptionSync.ordinal(), this.getTileEntity(), nbt).GetMessage());
MessageTileNBT tileNbt = new MessageTileNBT(BinnieCorePacketID.TileDescriptionSync.ordinal(), getTileEntity(), nbt);
return BinnieCore.instance.getNetworkWrapper().getPacketFrom(tileNbt.getMessage());
}
@Override
public void syncToNBT(final NBTTagCompound nbt) {
for (final INetwork.TilePacketSync comp : this.getInterfaces(INetwork.TilePacketSync.class)) {
public void syncToNBT(NBTTagCompound nbt) {
for (INetwork.TilePacketSync comp : this.getInterfaces(INetwork.TilePacketSync.class)) {
comp.syncToNBT(nbt);
}
}
@Override
public void syncFromNBT(final NBTTagCompound nbt) {
for (final INetwork.TilePacketSync comp : this.getInterfaces(INetwork.TilePacketSync.class)) {
public void syncFromNBT(NBTTagCompound nbt) {
for (INetwork.TilePacketSync comp : getInterfaces(INetwork.TilePacketSync.class)) {
comp.syncFromNBT(nbt);
}
}
@Override
public void recieveGuiNBT(final Side side, final EntityPlayer player, final String name, final NBTTagCompound nbt) {
for (final INetwork.RecieveGuiNBT recieve : this.getInterfaces(INetwork.RecieveGuiNBT.class)) {
public void recieveGuiNBT(Side side, EntityPlayer player, String name, NBTTagCompound nbt) {
for (INetwork.RecieveGuiNBT recieve : getInterfaces(INetwork.RecieveGuiNBT.class)) {
recieve.recieveGuiNBT(side, player, name, nbt);
}
}
@Override
public void sendGuiNBT(final Map<String, NBTTagCompound> nbt) {
for (final INetwork.SendGuiNBT recieve : this.getInterfaces(INetwork.SendGuiNBT.class)) {
recieve.sendGuiNBT(nbt);
public void sendGuiNBT(Map<String, NBTTagCompound> nbts) {
for (INetwork.SendGuiNBT recieve : getInterfaces(INetwork.SendGuiNBT.class)) {
recieve.sendGuiNBT(nbts);
}
}
}
@@ -1,62 +1,58 @@
//
// Decompiled by Procyon v0.5.30
//
package binnie.core.machines;
import net.minecraft.inventory.IInventory;
import binnie.core.network.packet.MachinePayload;
import binnie.Binnie;
import net.minecraft.nbt.NBTTagCompound;
import binnie.core.network.packet.MachinePayload;
import forestry.api.core.INBTTagable;
import net.minecraft.inventory.IInventory;
import net.minecraft.nbt.NBTTagCompound;
public class MachineComponent implements INBTTagable
{
public class MachineComponent implements INBTTagable {
private IMachine machine;
public MachineComponent(final IMachine machine) {
this.setMachine(machine);
public MachineComponent(IMachine machine) {
setMachine(machine);
machine.addComponent(this);
}
public void setMachine(final IMachine machine) {
public void setMachine(IMachine machine) {
this.machine = machine;
}
public IMachine getMachine() {
return this.machine;
return machine;
}
@Override
public void readFromNBT(final NBTTagCompound nbttagcompound) {
public void readFromNBT(NBTTagCompound nbttagcompound) {
}
@Override
public void writeToNBT(final NBTTagCompound nbttagcompound) {
public void writeToNBT(NBTTagCompound nbttagcompound) {
}
public void onUpdate() {
}
public Class[] getComponentInterfaces() {
return Binnie.Machine.getComponentInterfaces(this.getClass());
return Binnie.Machine.getComponentInterfaces(getClass());
}
public void onInventoryUpdate() {
}
public final MachinePayload getPayload() {
return new MachinePayload(Binnie.Machine.getNetworkID(this.getClass()));
public MachinePayload getPayload() {
return new MachinePayload(Binnie.Machine.getNetworkID(getClass()));
}
public void recieveData(final MachinePayload payload) {
public void recieveData(MachinePayload payload) {
}
public MachineUtil getUtil() {
return this.getMachine().getMachineUtil();
return getMachine().getMachineUtil();
}
public void onDestruction() {
// desctruction
}
public IInventory getInventory() {
@@ -1,20 +1,15 @@
//
// Decompiled by Procyon v0.5.30
//
package binnie.core.machines;
import net.minecraft.creativetab.CreativeTabs;
import java.util.Collection;
import net.minecraft.block.Block;
import cpw.mods.fml.common.registry.GameRegistry;
import binnie.Binnie;
import binnie.core.AbstractMod;
import cpw.mods.fml.common.registry.GameRegistry;
import net.minecraft.creativetab.CreativeTabs;
import java.util.Collection;
import java.util.LinkedHashMap;
import java.util.Map;
import binnie.core.AbstractMod;
public class MachineGroup
{
public class MachineGroup {
private AbstractMod mod;
private String blockName;
private String uid;
@@ -24,81 +19,78 @@ public class MachineGroup
public boolean customRenderer;
private boolean renderedTileEntity;
public MachineGroup(final AbstractMod mod, final String uid, final String blockName, final IMachineType[] types) {
this.packages = new LinkedHashMap<String, MachinePackage>();
this.packagesID = new LinkedHashMap<Integer, MachinePackage>();
this.customRenderer = true;
this.renderedTileEntity = true;
public MachineGroup(AbstractMod mod, String uid, String blockName, IMachineType[] types) {
packages = new LinkedHashMap<>();
packagesID = new LinkedHashMap<>();
customRenderer = true;
renderedTileEntity = true;
this.mod = mod;
this.uid = uid;
this.blockName = blockName;
for (final IMachineType type : types) {
if (type.getPackageClass() != null) {
if (type.isActive()) {
try {
final MachinePackage pack = type.getPackageClass().newInstance();
pack.assignMetadata(type.ordinal());
pack.setActive(type.isActive());
this.addPackage(pack);
} catch (Exception e) {
throw new RuntimeException("Failed to create machine package " + type.toString(), e);
}
for (IMachineType type : types) {
if (type.getPackageClass() != null && type.isActive()) {
try {
MachinePackage pack = type.getPackageClass().newInstance();
pack.assignMetadata(type.ordinal());
pack.setActive(type.isActive());
addPackage(pack);
} catch (Exception e) {
throw new RuntimeException("Failed to create machine package " + type.toString(), e);
}
}
}
Binnie.Machine.registerMachineGroup(this);
this.block = new BlockMachine(this, blockName);
if (this.block != null) {
GameRegistry.registerBlock(this.block, ItemMachine.class, blockName);
for (final MachinePackage pack2 : this.getPackages()) {
pack2.register();
}
block = new BlockMachine(this, blockName);
GameRegistry.registerBlock(block, ItemMachine.class, blockName);
for (MachinePackage pack2 : getPackages()) {
pack2.register();
}
}
private void addPackage(final MachinePackage pack) {
this.packages.put(pack.getUID(), pack);
this.packagesID.put(pack.getMetadata(), pack);
private void addPackage(MachinePackage pack) {
packages.put(pack.getUID(), pack);
packagesID.put(pack.getMetadata(), pack);
pack.setGroup(this);
}
public Collection<MachinePackage> getPackages() {
return this.packages.values();
return packages.values();
}
public BlockMachine getBlock() {
return this.block;
return block;
}
public MachinePackage getPackage(final int metadata) {
return this.packagesID.get(metadata);
public MachinePackage getPackage(int metadata) {
return packagesID.get(metadata);
}
public MachinePackage getPackage(final String name) {
return this.packages.get(name);
public MachinePackage getPackage(String name) {
return packages.get(name);
}
public String getUID() {
return this.mod.getModID() + "." + this.uid;
return mod.getModID() + "." + uid;
}
public String getShortUID() {
return this.uid;
return uid;
}
boolean isTileEntityRenderered() {
return this.renderedTileEntity;
return renderedTileEntity;
}
public void renderAsBlock() {
this.renderedTileEntity = false;
renderedTileEntity = false;
}
public void setCreativeTab(final CreativeTabs tab) {
this.block.setCreativeTab(tab);
public void setCreativeTab(CreativeTabs tab) {
block.setCreativeTab(tab);
}
public AbstractMod getMod() {
return this.mod;
return mod;
}
}
@@ -1,15 +1,10 @@
//
// Decompiled by Procyon v0.5.30
//
package binnie.core.machines;
import net.minecraft.client.renderer.RenderBlocks;
import binnie.Binnie;
import net.minecraft.client.renderer.RenderBlocks;
import net.minecraft.tileentity.TileEntity;
public abstract class MachinePackage
{
public abstract class MachinePackage {
private String uid;
private boolean active;
boolean powered;
@@ -17,54 +12,53 @@ public abstract class MachinePackage
private MachineGroup group;
public String getUID() {
return this.uid;
return uid;
}
protected MachinePackage(final String uid, final boolean powered) {
this.active = true;
this.powered = false;
this.metadata = -1;
protected MachinePackage(String uid, boolean powered) {
active = true;
metadata = -1;
this.uid = uid;
this.powered = powered;
}
public abstract void createMachine(final Machine p0);
public abstract void createMachine(Machine machine);
public abstract TileEntity createTileEntity();
public abstract void register();
public final String getDisplayName() {
return Binnie.Language.localise(this.group.getMod(), "machine." + this.group.getShortUID() + "." + this.getUID());
public String getDisplayName() {
return Binnie.Language.localise(group.getMod(), "machine." + group.getShortUID() + "." + getUID());
}
public final Integer getMetadata() {
return this.metadata;
public Integer getMetadata() {
return metadata;
}
public void assignMetadata(final int meta) {
this.metadata = meta;
public void assignMetadata(int meta) {
metadata = meta;
}
public MachineGroup getGroup() {
return this.group;
return group;
}
public void setGroup(final MachineGroup group) {
public void setGroup(MachineGroup group) {
this.group = group;
}
public abstract void renderMachine(final Machine p0, final double p1, final double p2, final double p3, final float p4, final RenderBlocks p5);
public abstract void renderMachine(Machine machine, double x, double y, double z, float partialTick, RenderBlocks renderer);
public boolean isActive() {
return this.active;
return active;
}
public void setActive(final boolean active) {
public void setActive(boolean active) {
this.active = active;
}
public final String getInformation() {
return Binnie.Language.localise(this.group.getMod(), "machine." + this.group.getShortUID() + "." + this.getUID() + ".info");
public String getInformation() {
return Binnie.Language.localise(group.getMod(), "machine." + group.getShortUID() + "." + getUID() + ".info");
}
}
@@ -1,39 +1,30 @@
//
// Decompiled by Procyon v0.5.30
//
package binnie.core.machines;
import binnie.core.BinnieCore;
import org.lwjgl.opengl.GL11;
import binnie.core.resource.BinnieResource;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import org.lwjgl.opengl.GL11;
@SideOnly(Side.CLIENT)
public class MachineRendererBlock
{
public static MachineRendererBlock instance;
public class MachineRendererBlock {
public static MachineRendererBlock instance = new MachineRendererBlock();
private BinnieResource texture;
private ModelBlock model;
public MachineRendererBlock() {
this.model = new ModelBlock();
model = new ModelBlock();
}
public void renderMachine(final BinnieResource texture, final double x, final double y, final double z, final float var8) {
public void renderMachine(BinnieResource texture, double x, double y, double z, float var8) {
this.texture = texture;
GL11.glPushMatrix();
GL11.glTranslated(x + 0.5, y + 1.5, z + 0.5);
GL11.glRotatef(180.0f, 0.0f, 0.0f, 1.0f);
BinnieCore.proxy.bindTexture(texture);
GL11.glPushMatrix();
this.model.render((float) x, (float) y, (float) z, 0.0625f, 0.0625f, 0.0625f);
model.render((float) x, (float) y, (float) z, 0.0625f, 0.0625f, 0.0625f);
GL11.glPopMatrix();
GL11.glPopMatrix();
}
static {
MachineRendererBlock.instance = new MachineRendererBlock();
}
}
@@ -1,159 +1,154 @@
//
// Decompiled by Procyon v0.5.30
//
package binnie.core.machines;
import binnie.core.BinnieCore;
import java.util.ArrayList;
import java.util.List;
import binnie.core.machines.power.IProcess;
import binnie.core.machines.inventory.IChargedSlots;
import binnie.core.machines.power.IPoweredMachine;
import binnie.core.machines.power.IProcess;
import binnie.core.machines.power.ITankMachine;
import binnie.core.machines.power.PowerSystem;
import binnie.core.util.ItemStackSet;
import java.util.Random;
import net.minecraftforge.fluids.FluidStack;
import net.minecraft.item.ItemStack;
import net.minecraftforge.fluids.IFluidTank;
import binnie.core.machines.power.IPoweredMachine;
import binnie.core.machines.power.ITankMachine;
import net.minecraft.inventory.IInventory;
import net.minecraft.item.ItemStack;
import net.minecraft.tileentity.TileEntity;
import net.minecraftforge.fluids.FluidStack;
import net.minecraftforge.fluids.IFluidTank;
public class MachineUtil
{
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import java.util.Random;
public class MachineUtil {
private IMachine machine;
public MachineUtil(final IMachine machine) {
public MachineUtil(IMachine machine) {
this.machine = machine;
}
public IInventory getInventory() {
return this.machine.getInterface(IInventory.class);
return machine.getInterface(IInventory.class);
}
public ITankMachine getTankContainer() {
return this.machine.getInterface(ITankMachine.class);
return machine.getInterface(ITankMachine.class);
}
public IPoweredMachine getPoweredMachine() {
return this.machine.getInterface(IPoweredMachine.class);
return machine.getInterface(IPoweredMachine.class);
}
public boolean isSlotEmpty(final int slot) {
return this.getInventory().getStackInSlot(slot) == null;
public boolean isSlotEmpty(int slot) {
return getInventory().getStackInSlot(slot) == null;
}
public IFluidTank getTank(final int id) {
return this.getTankContainer().getTanks()[id];
public IFluidTank getTank(int id) {
return getTankContainer().getTanks()[id];
}
public boolean spaceInTank(final int id, final int amount) {
final IFluidTank tank = this.getTank(id);
final int space = tank.getCapacity() - tank.getFluidAmount();
public boolean spaceInTank(int id, int amount) {
IFluidTank tank = getTank(id);
int space = tank.getCapacity() - tank.getFluidAmount();
return amount <= space;
}
public ItemStack getStack(final int slot) {
return this.getInventory().getStackInSlot(slot);
public ItemStack getStack(int slot) {
return getInventory().getStackInSlot(slot);
}
public void deleteStack(final int slot) {
this.setStack(slot, null);
public void deleteStack(int slot) {
setStack(slot, null);
}
public ItemStack decreaseStack(final int slotWood, final int amount) {
return this.getInventory().decrStackSize(slotWood, amount);
public ItemStack decreaseStack(int slotWood, int amount) {
return getInventory().decrStackSize(slotWood, amount);
}
public void setStack(final int slot, final ItemStack stack) {
this.getInventory().setInventorySlotContents(slot, stack);
public void setStack(int slot, ItemStack stack) {
getInventory().setInventorySlotContents(slot, stack);
}
public void fillTank(final int id, final FluidStack liquidStack) {
final IFluidTank tank = this.getTank(id);
public void fillTank(int id, FluidStack liquidStack) {
IFluidTank tank = getTank(id);
tank.fill(liquidStack, true);
}
public void addStack(final int slot, final ItemStack addition) {
if (this.isSlotEmpty(slot)) {
this.setStack(slot, addition);
}
else {
final ItemStack merge = this.getStack(slot);
public void addStack(int slot, ItemStack addition) {
if (isSlotEmpty(slot)) {
setStack(slot, addition);
} else {
ItemStack merge = getStack(slot);
if (merge.isItemEqual(addition) && merge.stackSize + addition.stackSize <= merge.getMaxStackSize()) {
final ItemStack itemStack = merge;
ItemStack itemStack = merge;
itemStack.stackSize += addition.stackSize;
this.setStack(slot, merge);
setStack(slot, merge);
}
}
}
public FluidStack drainTank(final int tank, final int amount) {
return this.getTank(tank).drain(amount, true);
public FluidStack drainTank(int tank, int amount) {
return getTank(tank).drain(amount, true);
}
public boolean liquidInTank(final int tank, final int amount) {
return this.getTank(tank).drain(amount, false) != null && this.getTank(tank).drain(amount, false).amount == amount;
public boolean liquidInTank(int tank, int amount) {
FluidStack fluidStack = getTank(tank).drain(amount, false);
return fluidStack != null && fluidStack.amount == amount;
}
public void damageItem(final int slot, final int damage) {
final ItemStack item = this.getStack(slot);
public void damageItem(int slot, int damage) {
ItemStack item = getStack(slot);
if (damage < 0) {
item.setItemDamage(Math.max(0, item.getItemDamage() + damage));
} else if (item.attemptDamageItem(damage, new Random())) {
setStack(slot, null);
}
else if (item.attemptDamageItem(damage, new Random())) {
this.setStack(slot, null);
}
this.setStack(slot, item);
setStack(slot, item);
}
public boolean isTankEmpty(final int tankInput) {
public boolean isTankEmpty(int tankInput) {
return this.getTank(tankInput).getFluidAmount() == 0;
}
public FluidStack getFluid(final int tankInput) {
return (this.getTank(tankInput).getFluid() == null) ? null : this.getTank(tankInput).getFluid();
public FluidStack getFluid(int tankInput) {
return getTank(tankInput).getFluid();
}
public ItemStack[] getStacks(final int[] slotGrains) {
final ItemStack[] stacks = new ItemStack[slotGrains.length];
public ItemStack[] getStacks(int[] slotGrains) {
ItemStack[] stacks = new ItemStack[slotGrains.length];
for (int i = 0; i < slotGrains.length; ++i) {
stacks[i] = this.getStack(slotGrains[i]);
stacks[i] = getStack(slotGrains[i]);
}
return stacks;
}
public ItemStack hasIngredients(final int recipe, final int[] inventory) {
public ItemStack hasIngredients(int recipe, int[] inventory) {
return null;
}
public boolean hasIngredients(final int[] recipe, final int[] inventory) {
final ItemStackSet requiredStacks = new ItemStackSet();
for (final ItemStack stack : this.getStacks(recipe)) {
requiredStacks.add(stack);
}
final ItemStackSet inventoryStacks = new ItemStackSet();
for (final ItemStack stack2 : this.getStacks(inventory)) {
inventoryStacks.add(stack2);
}
public boolean hasIngredients(int[] recipe, int[] inventory) {
ItemStackSet requiredStacks = new ItemStackSet();
Collections.addAll(requiredStacks, getStacks(recipe));
ItemStackSet inventoryStacks = new ItemStackSet();
Collections.addAll(inventoryStacks, getStacks(inventory));
requiredStacks.removeAll(inventoryStacks);
return requiredStacks.isEmpty();
}
public void useEnergyMJ(final float powerUsage) {
this.getPoweredMachine().getInterface().useEnergy(PowerSystem.MJ, powerUsage, true);
public void useEnergyMJ(float powerUsage) {
getPoweredMachine().getInterface().useEnergy(PowerSystem.MJ, powerUsage, true);
}
public boolean hasEnergyMJ(final float powerUsage) {
return this.getPoweredMachine().getInterface().useEnergy(PowerSystem.MJ, powerUsage, false) >= powerUsage;
public boolean hasEnergyMJ(float powerUsage) {
return getPoweredMachine().getInterface().useEnergy(PowerSystem.MJ, powerUsage, false) >= powerUsage;
}
public float getSlotCharge(final int slot) {
return this.machine.getInterface(IChargedSlots.class).getCharge(slot);
public float getSlotCharge(int slot) {
return machine.getInterface(IChargedSlots.class).getCharge(slot);
}
public void useCharge(final int slot, final float loss) {
this.machine.getInterface(IChargedSlots.class).alterCharge(slot, -loss);
public void useCharge(int slot, float loss) {
machine.getInterface(IChargedSlots.class).alterCharge(slot, -loss);
}
public Random getRandom() {
@@ -161,16 +156,17 @@ public class MachineUtil
}
public void refreshBlock() {
this.machine.getWorld().markBlockForUpdate(this.machine.getTileEntity().xCoord, this.machine.getTileEntity().yCoord, this.machine.getTileEntity().zCoord);
TileEntity tileEntity = machine.getTileEntity();
machine.getWorld().markBlockForUpdate(tileEntity.xCoord, tileEntity.yCoord, tileEntity.zCoord);
}
public IProcess getProcess() {
return this.machine.getInterface(IProcess.class);
return machine.getInterface(IProcess.class);
}
public List<ItemStack> getNonNullStacks(final int[] slotacclimatiser) {
final List<ItemStack> stacks = new ArrayList<ItemStack>();
for (final ItemStack stack : this.getStacks(slotacclimatiser)) {
public List<ItemStack> getNonNullStacks(int[] slotAcclimatiser) {
List<ItemStack> stacks = new ArrayList<ItemStack>();
for (ItemStack stack : getStacks(slotAcclimatiser)) {
if (stack != null) {
stacks.add(stack);
}
@@ -179,6 +175,6 @@ public class MachineUtil
}
public boolean isServer() {
return BinnieCore.proxy.isSimulating(this.machine.getWorld());
return BinnieCore.proxy.isSimulating(machine.getWorld());
}
}
@@ -1,21 +1,18 @@
//
// Decompiled by Procyon v0.5.30
//
package binnie.core.machines;
import binnie.core.BinnieCore;
import binnie.core.ManagerBase;
import binnie.core.machines.inventory.SlotValidator;
import binnie.core.machines.inventory.ValidatorIcon;
import binnie.core.BinnieCore;
import java.util.Set;
import forestry.api.core.INBTTagable;
import java.util.HashSet;
import java.util.HashMap;
import java.util.Map;
import binnie.core.ManagerBase;
public class ManagerMachine extends ManagerBase
{
import java.util.Collections;
import java.util.HashMap;
import java.util.HashSet;
import java.util.Map;
import java.util.Set;
public class ManagerMachine extends ManagerBase {
private Map<Class<?>, Class<?>[]> componentInterfaceMap;
private Map<String, MachineGroup> machineGroups;
private Map<Integer, Class<?>> networkIDToComponent;
@@ -24,61 +21,58 @@ public class ManagerMachine extends ManagerBase
private int machineRenderID;
public ManagerMachine() {
this.componentInterfaceMap = new HashMap<Class<?>, Class<?>[]>();
this.machineGroups = new HashMap<String, MachineGroup>();
this.networkIDToComponent = new HashMap<Integer, Class<?>>();
this.componentToNetworkID = new HashMap<Class<?>, Integer>();
this.nextNetworkID = 0;
componentInterfaceMap = new HashMap<>();
machineGroups = new HashMap<>();
networkIDToComponent = new HashMap<>();
componentToNetworkID = new HashMap<>();
nextNetworkID = 0;
}
public void registerMachineGroup(final MachineGroup group) {
this.machineGroups.put(group.getUID(), group);
public void registerMachineGroup(MachineGroup group) {
machineGroups.put(group.getUID(), group);
}
public MachineGroup getGroup(final String name) {
public MachineGroup getGroup(String name) {
return this.machineGroups.get(name);
}
public MachinePackage getPackage(final String group, final String name) {
final MachineGroup machineGroup = this.getGroup(group);
public MachinePackage getPackage(String group, String name) {
MachineGroup machineGroup = getGroup(group);
return (machineGroup == null) ? null : machineGroup.getPackage(name);
}
private void registerComponentClass(final Class<? extends MachineComponent> component) {
if (this.componentInterfaceMap.containsKey(component)) {
private void registerComponentClass(Class<? extends MachineComponent> component) {
if (componentInterfaceMap.containsKey(component)) {
return;
}
final Set<Class<?>> interfaces = new HashSet<Class<?>>();
Set<Class<?>> interfaces = new HashSet<Class<?>>();
for (Class<?> currentClass = component; currentClass != null; currentClass = null) {
for (final Class<?> clss : currentClass.getInterfaces()) {
interfaces.add(clss);
}
currentClass = currentClass.getSuperclass();
if (currentClass == Object.class) {
}
Collections.addAll(interfaces, currentClass.getInterfaces());
}
interfaces.remove(INBTTagable.class);
this.componentInterfaceMap.put(component, interfaces.toArray(new Class[0]));
final int networkID = this.nextNetworkID++;
int networkID = nextNetworkID++;
this.networkIDToComponent.put(networkID, component);
this.componentToNetworkID.put(component, networkID);
}
public int getNetworkID(final Class<?> component) {
public int getNetworkID(Class<?> component) {
return this.componentToNetworkID.get(component);
}
public Class<?> getComponentClass(final int networkID) {
return this.networkIDToComponent.get(networkID);
public Class<?> getComponentClass(int networkID) {
return networkIDToComponent.get(networkID);
}
public int getMachineRenderID() {
return this.machineRenderID;
return machineRenderID;
}
@Override
public void init() {
this.machineRenderID = BinnieCore.proxy.getUniqueRenderID();
machineRenderID = BinnieCore.proxy.getUniqueRenderID();
SlotValidator.IconBee = new ValidatorIcon(BinnieCore.instance, "validator/bee.0", "validator/bee.1");
SlotValidator.IconFrame = new ValidatorIcon(BinnieCore.instance, "validator/frame.0", "validator/frame.1");
SlotValidator.IconCircuit = new ValidatorIcon(BinnieCore.instance, "validator/circuit.0", "validator/circuit.1");
@@ -91,10 +85,10 @@ public class ManagerMachine extends ManagerBase
BinnieCore.proxy.registerTileEntity(TileEntityMachine.class, "binnie.tile.machine", BinnieCore.proxy.createObject("binnie.core.machines.RendererMachine"));
}
public Class<?>[] getComponentInterfaces(final Class<? extends MachineComponent> clss) {
if (!this.componentInterfaceMap.containsKey(clss)) {
this.registerComponentClass(clss);
public Class<?>[] getComponentInterfaces(Class<? extends MachineComponent> clss) {
if (!componentInterfaceMap.containsKey(clss)) {
registerComponentClass(clss);
}
return this.componentInterfaceMap.get(clss);
return componentInterfaceMap.get(clss);
}
}
@@ -1,40 +1,36 @@
//
// Decompiled by Procyon v0.5.30
//
package binnie.core.machines;
import net.minecraft.entity.Entity;
import net.minecraft.client.model.ModelRenderer;
import net.minecraft.client.model.ModelBase;
import net.minecraft.client.model.ModelRenderer;
class ModelBlock extends ModelBase
{
private ModelRenderer Block;
class ModelBlock extends ModelBase {
private ModelRenderer block;
public ModelBlock() {
this.textureWidth = 64;
this.textureHeight = 32;
(this.Block = new ModelRenderer(this, 0, 0)).addBox(0.0f, 0.0f, 0.0f, 16, 16, 16);
this.Block.setRotationPoint(-8.0f, 8.0f, -8.0f);
this.Block.setTextureSize(64, 32);
this.Block.mirror = true;
this.setRotation(this.Block, 0.0f, 0.0f, 0.0f);
textureWidth = 64;
textureHeight = 32;
block = new ModelRenderer(this, 0, 0);
block.addBox(0.0f, 0.0f, 0.0f, 16, 16, 16);
block.setRotationPoint(-8.0f, 8.0f, -8.0f);
block.setTextureSize(64, 32);
block.mirror = true;
setRotation(block, 0.0f, 0.0f, 0.0f);
}
public void render(final float f, final float f1, final float f2, final float f3, final float f4, final float f5) {
super.render((Entity) null, f, f1, f2, f3, f4, f5);
this.setRotationAngles(f, f1, f2, f3, f4, f5);
this.Block.render(f5);
public void render(float f, float f1, float f2, float f3, float f4, float f5) {
super.render(null, f, f1, f2, f3, f4, f5);
setRotationAngles(f, f1, f2, f3, f4, f5);
block.render(f5);
}
private void setRotation(final ModelRenderer model, final float x, final float y, final float z) {
private void setRotation(ModelRenderer model, float x, float y, float z) {
model.rotateAngleX = x;
model.rotateAngleY = y;
model.rotateAngleZ = z;
}
public void setRotationAngles(final float f, final float f1, final float f2, final float f3, final float f4, final float f5) {
super.setRotationAngles(f, f1, f2, f3, f4, f5, (Entity) null);
public void setRotationAngles(float f, float f1, float f2, float f3, float f4, float f5) {
super.setRotationAngles(f, f1, f2, f3, f4, f5, null);
}
}
@@ -1,57 +1,53 @@
//
// Decompiled by Procyon v0.5.30
//
package binnie.core.machines;
import net.minecraft.world.IBlockAccess;
import binnie.Binnie;
import net.minecraft.world.World;
import net.minecraft.block.Block;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.client.renderer.RenderBlocks;
import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler;
import net.minecraft.block.Block;
import net.minecraft.client.renderer.RenderBlocks;
import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.world.IBlockAccess;
import net.minecraft.world.World;
public class RendererMachine extends TileEntitySpecialRenderer implements ISimpleBlockRenderingHandler
{
// TODO unused class?
public class RendererMachine extends TileEntitySpecialRenderer implements ISimpleBlockRenderingHandler {
RenderBlocks blockRenderer;
@Override
public void renderTileEntityAt(final TileEntity entity, final double x, final double y, final double z, final float var8) {
this.renderTileEntity((TileEntityMachine) entity, x, y, z, var8, this.blockRenderer);
public void renderTileEntityAt(TileEntity entity, double x, double y, double z, float partialTick) {
renderTileEntity((TileEntityMachine) entity, x, y, z, partialTick, blockRenderer);
}
public void renderTileEntity(final TileEntityMachine entity, final double x, final double y, final double z, final float var8, final RenderBlocks renderer) {
public void renderTileEntity(TileEntityMachine entity, double x, double y, double z, float partialTick, RenderBlocks renderer) {
if (entity != null && entity.getMachine() != null) {
final MachinePackage machinePackage = entity.getMachine().getPackage();
machinePackage.renderMachine(entity.getMachine(), x, y, z, var8, renderer);
MachinePackage machinePackage = entity.getMachine().getPackage();
machinePackage.renderMachine(entity.getMachine(), x, y, z, partialTick, renderer);
}
}
public void renderInvBlock(final RenderBlocks renderblocks, final Block block, final int i, final int j) {
final TileEntity entity = block.createTileEntity((World) null, i);
public void renderInvBlock(RenderBlocks renderblocks, Block block, int i, int j) {
TileEntity entity = block.createTileEntity(null, i);
this.renderTileEntity((TileEntityMachine) entity, 0.0, -0.1, 0.0, 0.0625f, renderblocks);
}
@Override
public void renderInventoryBlock(final Block block, final int metadata, final int modelID, final RenderBlocks renderer) {
public void renderInventoryBlock(Block block, int metadata, int modelID, RenderBlocks renderer) {
if (modelID == Binnie.Machine.getMachineRenderID()) {
this.renderInvBlock(renderer, block, metadata, modelID);
renderInvBlock(renderer, block, metadata, modelID);
}
}
@Override
public boolean renderWorldBlock(final IBlockAccess world, final int x, final int y, final int z, final Block block, final int modelId, final RenderBlocks renderer) {
final TileEntityMachine tile = (TileEntityMachine) world.getTileEntity(x, y, z);
public boolean renderWorldBlock(IBlockAccess world, int x, int y, int z, Block block, int modelId, RenderBlocks renderer) {
TileEntityMachine tile = (TileEntityMachine) world.getTileEntity(x, y, z);
if (tile != null && tile.getMachine() != null && tile.getMachine().getPackage() != null && tile.getMachine().getPackage().getGroup() != null && !tile.getMachine().getPackage().getGroup().customRenderer) {
this.renderTileEntity(tile, x, y, z, 1.0f, renderer);
renderTileEntity(tile, x, y, z, 1.0f, renderer);
}
return true;
}
@Override
public boolean shouldRender3DInInventory(final int i) {
public boolean shouldRender3DInInventory(int i) {
return true;
}
@@ -61,7 +57,7 @@ public class RendererMachine extends TileEntitySpecialRenderer implements ISimpl
}
@Override
public void func_147496_a(final World par1World) {
this.blockRenderer = new RenderBlocks(par1World);
public void func_147496_a(World par1World) {
blockRenderer = new RenderBlocks(par1World);
}
}
@@ -1,100 +1,92 @@
//
// Decompiled by Procyon v0.5.30
//
package binnie.core.machines;
import binnie.core.machines.component.IInteraction;
import net.minecraft.network.Packet;
import binnie.core.network.packet.PacketPayload;
import binnie.Binnie;
import net.minecraft.nbt.NBTTagCompound;
import binnie.core.network.INetworkedEntity;
import binnie.core.machines.base.TileEntityMachineBase;
import binnie.core.machines.component.IInteraction;
import binnie.core.network.INetworkedEntity;
import binnie.core.network.packet.PacketPayload;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.network.Packet;
public class TileEntityMachine extends TileEntityMachineBase implements INetworkedEntity
{
public class TileEntityMachine extends TileEntityMachineBase implements INetworkedEntity {
private Machine machine;
@Override
public void updateEntity() {
super.updateEntity();
if (this.machine != null) {
this.machine.onUpdate();
if (machine != null) {
machine.onUpdate();
}
}
@Override
public boolean canUpdate() {
return super.canUpdate();
}
public TileEntityMachine(final MachinePackage pack) {
this.setMachine(pack);
public TileEntityMachine(MachinePackage pack) {
setMachine(pack);
}
public TileEntityMachine() {
// ignored
}
public void setMachine(final MachinePackage pack) {
public void setMachine(MachinePackage pack) {
if (pack != null) {
this.machine = new Machine(pack, this);
machine = new Machine(pack, this);
}
}
@Override
public void readFromNBT(final NBTTagCompound nbtTagCompound) {
public void readFromNBT(NBTTagCompound nbtTagCompound) {
super.readFromNBT(nbtTagCompound);
final String name = nbtTagCompound.getString("name");
final String group = nbtTagCompound.getString("group");
final MachinePackage pack = Binnie.Machine.getPackage(group, name);
String name = nbtTagCompound.getString("name");
String group = nbtTagCompound.getString("group");
MachinePackage pack = Binnie.Machine.getPackage(group, name);
if (pack == null) {
this.invalidate();
invalidate();
return;
}
this.setMachine(pack);
this.getMachine().readFromNBT(nbtTagCompound);
setMachine(pack);
getMachine().readFromNBT(nbtTagCompound);
}
@Override
public void writeToNBT(final NBTTagCompound nbtTagCompound) {
public void writeToNBT(NBTTagCompound nbtTagCompound) {
super.writeToNBT(nbtTagCompound);
final String name = this.machine.getPackage().getUID();
final String group = this.machine.getPackage().getGroup().getUID();
String name = machine.getPackage().getUID();
String group = machine.getPackage().getGroup().getUID();
nbtTagCompound.setString("group", group);
nbtTagCompound.setString("name", name);
this.getMachine().writeToNBT(nbtTagCompound);
getMachine().writeToNBT(nbtTagCompound);
}
@Override
public void writeToPacket(final PacketPayload payload) {
this.machine.writeToPacket(payload);
public void writeToPacket(PacketPayload payload) {
machine.writeToPacket(payload);
}
@Override
public void readFromPacket(final PacketPayload payload) {
this.machine.readFromPacket(payload);
public void readFromPacket(PacketPayload payload) {
machine.readFromPacket(payload);
}
public Machine getMachine() {
return this.machine;
return machine;
}
public void onBlockDestroy() {
if (this.getMachine() != null) {
this.getMachine().onBlockDestroy();
if (getMachine() != null) {
getMachine().onBlockDestroy();
}
}
@Override
public final Packet getDescriptionPacket() {
return (this.getMachine() != null) ? this.getMachine().getDescriptionPacket() : null;
public Packet getDescriptionPacket() {
return (getMachine() != null) ? getMachine().getDescriptionPacket() : null;
}
@Override
public void invalidate() {
super.invalidate();
for (final IInteraction.Invalidation c : this.getMachine().getInterfaces(IInteraction.Invalidation.class)) {
for (IInteraction.Invalidation c : getMachine().getInterfaces(IInteraction.Invalidation.class)) {
c.onInvalidation();
}
}
@@ -102,7 +94,7 @@ public class TileEntityMachine extends TileEntityMachineBase implements INetwork
@Override
public void onChunkUnload() {
super.onChunkUnload();
for (final IInteraction.ChunkUnload c : this.getMachine().getInterfaces(IInteraction.ChunkUnload.class)) {
for (IInteraction.ChunkUnload c : getMachine().getInterfaces(IInteraction.ChunkUnload.class)) {
c.onChunkUnload();
}
}
@@ -1,37 +1,33 @@
//
// Decompiled by Procyon v0.5.30
//
package binnie.core.machines.base;
import binnie.core.machines.inventory.IInventoryMachine;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack;
import binnie.core.machines.inventory.IInventoryMachine;
class DefaultInventory implements IInventoryMachine
{
class DefaultInventory implements IInventoryMachine {
@Override
public int getSizeInventory() {
return 0;
}
@Override
public ItemStack getStackInSlot(final int i) {
public ItemStack getStackInSlot(int slot) {
return null;
}
@Override
public ItemStack decrStackSize(final int i, final int j) {
public ItemStack decrStackSize(int index, int count) {
return null;
}
@Override
public ItemStack getStackInSlotOnClosing(final int i) {
public ItemStack getStackInSlotOnClosing(int index) {
return null;
}
@Override
public void setInventorySlotContents(final int i, final ItemStack itemstack) {
public void setInventorySlotContents(int index, ItemStack itemStack) {
// ignored
}
@Override
@@ -40,32 +36,32 @@ class DefaultInventory implements IInventoryMachine
}
@Override
public boolean isUseableByPlayer(final EntityPlayer entityplayer) {
public boolean isUseableByPlayer(EntityPlayer player) {
return false;
}
@Override
public boolean isItemValidForSlot(final int i, final ItemStack itemstack) {
public boolean isItemValidForSlot(int index, ItemStack itemStack) {
return false;
}
@Override
public int[] getAccessibleSlotsFromSide(final int var1) {
public int[] getAccessibleSlotsFromSide(int side) {
return new int[0];
}
@Override
public boolean canInsertItem(final int i, final ItemStack itemstack, final int j) {
public boolean canInsertItem(int index, ItemStack itemStack, int direction) {
return false;
}
@Override
public boolean canExtractItem(final int i, final ItemStack itemstack, final int j) {
public boolean canExtractItem(int index, ItemStack itemStack, int direction) {
return false;
}
@Override
public boolean isReadOnly(final int slot) {
public boolean isReadOnly(int slot) {
return false;
}
@@ -81,13 +77,16 @@ class DefaultInventory implements IInventoryMachine
@Override
public void markDirty() {
// ignored
}
@Override
public void openInventory() {
// ignored
}
@Override
public void closeInventory() {
// ignored
}
}
@@ -1,18 +1,13 @@
//
// Decompiled by Procyon v0.5.30
//
package binnie.core.machines.base;
import binnie.core.machines.power.IPoweredMachine;
import binnie.core.machines.power.PowerInfo;
import binnie.core.machines.power.PowerInterface;
import cpw.mods.fml.common.Optional;
import net.minecraft.tileentity.TileEntity;
import net.minecraftforge.common.util.ForgeDirection;
import cpw.mods.fml.common.Optional;
import binnie.core.machines.power.PowerInfo;
import binnie.core.machines.power.IPoweredMachine;
class DefaultPower implements IPoweredMachine
{
class DefaultPower implements IPoweredMachine {
@Override
public PowerInfo getPowerInfo() {
return new PowerInfo(this, 0.0f);
@@ -32,38 +27,38 @@ class DefaultPower implements IPoweredMachine
@Override
@Optional.Method(modid = "IC2")
public double injectEnergy(final ForgeDirection directionFrom, final double amount, final double voltage) {
public double injectEnergy(ForgeDirection directionFrom, double amount, double voltage) {
return 0.0;
}
@Override
@Optional.Method(modid = "IC2")
public boolean acceptsEnergyFrom(final TileEntity emitter, final ForgeDirection direction) {
public boolean acceptsEnergyFrom(TileEntity emitter, ForgeDirection direction) {
return false;
}
@Override
public int receiveEnergy(final ForgeDirection from, final int maxReceive, final boolean simulate) {
public int receiveEnergy(ForgeDirection from, int maxReceive, boolean simulate) {
return 0;
}
@Override
public int extractEnergy(final ForgeDirection from, final int maxExtract, final boolean simulate) {
public int extractEnergy(ForgeDirection from, int maxExtract, boolean simulate) {
return 0;
}
@Override
public int getEnergyStored(final ForgeDirection from) {
public int getEnergyStored(ForgeDirection from) {
return 0;
}
@Override
public int getMaxEnergyStored(final ForgeDirection from) {
public int getMaxEnergyStored(ForgeDirection from) {
return 0;
}
@Override
public boolean canConnectEnergy(final ForgeDirection from) {
public boolean canConnectEnergy(ForgeDirection from) {
return false;
}
@@ -1,27 +1,22 @@
//
// Decompiled by Procyon v0.5.30
//
package binnie.core.machines.base;
import net.minecraftforge.fluids.FluidTankInfo;
import net.minecraftforge.fluids.Fluid;
import net.minecraftforge.fluids.IFluidTank;
import binnie.core.machines.inventory.TankSlot;
import binnie.core.machines.power.TankInfo;
import net.minecraftforge.fluids.FluidStack;
import net.minecraftforge.common.util.ForgeDirection;
import binnie.core.machines.power.ITankMachine;
import binnie.core.machines.power.TankInfo;
import net.minecraftforge.common.util.ForgeDirection;
import net.minecraftforge.fluids.Fluid;
import net.minecraftforge.fluids.FluidStack;
import net.minecraftforge.fluids.FluidTankInfo;
import net.minecraftforge.fluids.IFluidTank;
class DefaultTankContainer implements ITankMachine
{
class DefaultTankContainer implements ITankMachine {
@Override
public int fill(final ForgeDirection from, final FluidStack resource, final boolean doFill) {
public int fill(ForgeDirection from, FluidStack resource, boolean doFill) {
return 0;
}
@Override
public FluidStack drain(final ForgeDirection from, final int maxDrain, final boolean doDrain) {
public FluidStack drain(ForgeDirection from, int maxDrain, boolean doDrain) {
return null;
}
@@ -31,47 +26,47 @@ class DefaultTankContainer implements ITankMachine
}
@Override
public boolean isTankReadOnly(final int tank) {
public boolean isTankReadOnly(int tank) {
return false;
}
@Override
public boolean isLiquidValidForTank(final FluidStack liquid, final int tank) {
public boolean isLiquidValidForTank(FluidStack liquid, int tank) {
return false;
}
@Override
public TankSlot addTank(final int index, final String name, final int capacity) {
public TankSlot addTank(int index, String name, int capacity) {
return null;
}
@Override
public IFluidTank getTank(final int index) {
public IFluidTank getTank(int index) {
return null;
}
@Override
public TankSlot getTankSlot(final int slot) {
public TankSlot getTankSlot(int slot) {
return null;
}
@Override
public FluidStack drain(final ForgeDirection from, final FluidStack resource, final boolean doDrain) {
public FluidStack drain(ForgeDirection from, FluidStack resource, boolean doDrain) {
return null;
}
@Override
public boolean canFill(final ForgeDirection from, final Fluid fluid) {
public boolean canFill(ForgeDirection from, Fluid fluid) {
return false;
}
@Override
public boolean canDrain(final ForgeDirection from, final Fluid fluid) {
public boolean canDrain(ForgeDirection from, Fluid fluid) {
return false;
}
@Override
public FluidTankInfo[] getTankInfo(final ForgeDirection from) {
public FluidTankInfo[] getTankInfo(ForgeDirection from) {
return new FluidTankInfo[0];
}
@@ -1,251 +1,249 @@
//
// Decompiled by Procyon v0.5.30
//
package binnie.core.machines.base;
import binnie.core.machines.power.PowerInterface;
import cpw.mods.fml.common.Optional;
import net.minecraftforge.fluids.FluidTankInfo;
import net.minecraftforge.fluids.Fluid;
import net.minecraftforge.common.util.ForgeDirection;
import net.minecraftforge.fluids.IFluidTank;
import binnie.core.machines.inventory.TankSlot;
import net.minecraftforge.fluids.FluidStack;
import binnie.core.machines.power.TankInfo;
import binnie.core.machines.power.PowerInfo;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack;
import binnie.core.machines.Machine;
import binnie.core.machines.inventory.IInventoryMachine;
import binnie.core.machines.inventory.TankSlot;
import binnie.core.machines.power.IPoweredMachine;
import binnie.core.machines.power.ITankMachine;
import binnie.core.machines.inventory.IInventoryMachine;
import binnie.core.machines.power.PowerInfo;
import binnie.core.machines.power.PowerInterface;
import binnie.core.machines.power.TankInfo;
import cpw.mods.fml.common.Optional;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack;
import net.minecraft.tileentity.TileEntity;
import net.minecraftforge.common.util.ForgeDirection;
import net.minecraftforge.fluids.Fluid;
import net.minecraftforge.fluids.FluidStack;
import net.minecraftforge.fluids.FluidTankInfo;
import net.minecraftforge.fluids.IFluidTank;
public class TileEntityMachineBase extends TileEntity implements IInventoryMachine, ITankMachine, IPoweredMachine
{
public class TileEntityMachineBase extends TileEntity implements IInventoryMachine, ITankMachine, IPoweredMachine {
public IInventoryMachine getInventory() {
final IInventoryMachine inv = Machine.getInterface(IInventoryMachine.class, this);
IInventoryMachine inv = Machine.getInterface(IInventoryMachine.class, this);
return (inv == null || inv == this) ? new DefaultInventory() : inv;
}
public ITankMachine getTankContainer() {
final ITankMachine inv = Machine.getInterface(ITankMachine.class, this);
ITankMachine inv = Machine.getInterface(ITankMachine.class, this);
return (inv == null || inv == this) ? new DefaultTankContainer() : inv;
}
public IPoweredMachine getPower() {
final IPoweredMachine inv = Machine.getInterface(IPoweredMachine.class, this);
IPoweredMachine inv = Machine.getInterface(IPoweredMachine.class, this);
return (inv == null || inv == this) ? new DefaultPower() : inv;
}
@Override
public int getSizeInventory() {
return this.getInventory().getSizeInventory();
return getInventory().getSizeInventory();
}
@Override
public ItemStack getStackInSlot(final int index) {
return this.getInventory().getStackInSlot(index);
public ItemStack getStackInSlot(int index) {
return getInventory().getStackInSlot(index);
}
@Override
public ItemStack decrStackSize(final int index, final int amount) {
return this.getInventory().decrStackSize(index, amount);
public ItemStack decrStackSize(int index, int amount) {
return getInventory().decrStackSize(index, amount);
}
@Override
public ItemStack getStackInSlotOnClosing(final int var1) {
return this.getInventory().getStackInSlotOnClosing(var1);
public ItemStack getStackInSlotOnClosing(int var1) {
return getInventory().getStackInSlotOnClosing(var1);
}
@Override
public void setInventorySlotContents(final int index, final ItemStack itemStack) {
this.getInventory().setInventorySlotContents(index, itemStack);
public void setInventorySlotContents(int index, ItemStack itemStack) {
getInventory().setInventorySlotContents(index, itemStack);
}
@Override
public String getInventoryName() {
return this.getInventory().getInventoryName();
return getInventory().getInventoryName();
}
@Override
public int getInventoryStackLimit() {
return this.getInventory().getInventoryStackLimit();
return getInventory().getInventoryStackLimit();
}
@Override
public boolean isUseableByPlayer(final EntityPlayer entityplayer) {
return !this.isInvalid() && this.getWorldObj().getTileEntity(this.xCoord, this.yCoord, this.zCoord) == this && entityplayer.getDistanceSq(this.xCoord + 0.5, this.yCoord + 0.5, this.zCoord + 0.5) <= 64.0 && this.getInventory().isUseableByPlayer(entityplayer);
public boolean isUseableByPlayer(EntityPlayer player) {
return !isInvalid()
&& getWorldObj().getTileEntity(xCoord, yCoord, zCoord) == this
&& player.getDistanceSq(xCoord + 0.5, yCoord + 0.5, zCoord + 0.5) <= 64.0
&& getInventory().isUseableByPlayer(player);
}
@Override
public void openInventory() {
this.getInventory().openInventory();
getInventory().openInventory();
}
@Override
public void closeInventory() {
this.getInventory().closeInventory();
getInventory().closeInventory();
}
@Override
public boolean hasCustomInventoryName() {
return this.getInventory().hasCustomInventoryName();
return getInventory().hasCustomInventoryName();
}
@Override
public void markDirty() {
super.markDirty();
this.getInventory().markDirty();
getInventory().markDirty();
}
@Override
public boolean isItemValidForSlot(final int slot, final ItemStack itemStack) {
return this.getInventory().isItemValidForSlot(slot, itemStack);
public boolean isItemValidForSlot(int slot, ItemStack itemStack) {
return getInventory().isItemValidForSlot(slot, itemStack);
}
@Override
public int[] getAccessibleSlotsFromSide(final int var1) {
return this.getInventory().getAccessibleSlotsFromSide(var1);
public int[] getAccessibleSlotsFromSide(int var1) {
return getInventory().getAccessibleSlotsFromSide(var1);
}
@Override
public boolean canInsertItem(final int i, final ItemStack itemstack, final int j) {
return this.getInventory().canInsertItem(i, itemstack, j);
public boolean canInsertItem(int i, ItemStack itemstack, int j) {
return getInventory().canInsertItem(i, itemstack, j);
}
@Override
public boolean canExtractItem(final int i, final ItemStack itemstack, final int j) {
return this.getInventory().canExtractItem(i, itemstack, j);
public boolean canExtractItem(int i, ItemStack itemstack, int j) {
return getInventory().canExtractItem(i, itemstack, j);
}
@Override
public boolean isReadOnly(final int slot) {
return this.getInventory().isReadOnly(slot);
public boolean isReadOnly(int slot) {
return getInventory().isReadOnly(slot);
}
@Override
public PowerInfo getPowerInfo() {
return this.getPower().getPowerInfo();
return getPower().getPowerInfo();
}
@Override
public TankInfo[] getTankInfos() {
return this.getTankContainer().getTankInfos();
return getTankContainer().getTankInfos();
}
@Override
public boolean isTankReadOnly(final int tank) {
return this.getTankContainer().isTankReadOnly(tank);
public boolean isTankReadOnly(int tank) {
return getTankContainer().isTankReadOnly(tank);
}
@Override
public boolean isLiquidValidForTank(final FluidStack liquid, final int tank) {
return this.getTankContainer().isLiquidValidForTank(liquid, tank);
public boolean isLiquidValidForTank(FluidStack liquid, int tank) {
return getTankContainer().isLiquidValidForTank(liquid, tank);
}
@Override
public TankSlot addTank(final int index, final String name, final int capacity) {
return this.getTankContainer().addTank(index, name, capacity);
public TankSlot addTank(int index, String name, int capacity) {
return getTankContainer().addTank(index, name, capacity);
}
@Override
public IFluidTank getTank(final int index) {
return this.getTankContainer().getTank(index);
public IFluidTank getTank(int index) {
return getTankContainer().getTank(index);
}
@Override
public TankSlot getTankSlot(final int index) {
return this.getTankContainer().getTankSlot(index);
public TankSlot getTankSlot(int slot) {
return getTankContainer().getTankSlot(slot);
}
@Override
public int fill(final ForgeDirection from, final FluidStack resource, final boolean doFill) {
return this.getTankContainer().fill(from, resource, doFill);
public int fill(ForgeDirection from, FluidStack resource, boolean doFill) {
return getTankContainer().fill(from, resource, doFill);
}
@Override
public FluidStack drain(final ForgeDirection from, final FluidStack resource, final boolean doDrain) {
return this.getTankContainer().drain(from, resource, doDrain);
public FluidStack drain(ForgeDirection from, FluidStack resource, boolean doDrain) {
return getTankContainer().drain(from, resource, doDrain);
}
@Override
public FluidStack drain(final ForgeDirection from, final int maxDrain, final boolean doDrain) {
return this.getTankContainer().drain(from, maxDrain, doDrain);
public FluidStack drain(ForgeDirection from, int maxDrain, boolean doDrain) {
return getTankContainer().drain(from, maxDrain, doDrain);
}
@Override
public boolean canFill(final ForgeDirection from, final Fluid fluid) {
return this.getTankContainer().canFill(from, fluid);
public boolean canFill(ForgeDirection from, Fluid fluid) {
return getTankContainer().canFill(from, fluid);
}
@Override
public boolean canDrain(final ForgeDirection from, final Fluid fluid) {
return this.getTankContainer().canDrain(from, fluid);
public boolean canDrain(ForgeDirection from, Fluid fluid) {
return getTankContainer().canDrain(from, fluid);
}
@Override
public FluidTankInfo[] getTankInfo(final ForgeDirection from) {
return this.getTankContainer().getTankInfo(from);
public FluidTankInfo[] getTankInfo(ForgeDirection from) {
return getTankContainer().getTankInfo(from);
}
@Override
public IFluidTank[] getTanks() {
return this.getTankContainer().getTanks();
return getTankContainer().getTanks();
}
@Override
@Optional.Method(modid = "IC2")
public double getDemandedEnergy() {
return this.getPower().getDemandedEnergy();
return getPower().getDemandedEnergy();
}
@Override
@Optional.Method(modid = "IC2")
public int getSinkTier() {
return this.getPower().getSinkTier();
return getPower().getSinkTier();
}
@Override
@Optional.Method(modid = "IC2")
public double injectEnergy(final ForgeDirection directionFrom, final double amount, final double voltage) {
return this.getPower().injectEnergy(directionFrom, amount, voltage);
public double injectEnergy(ForgeDirection directionFrom, double amount, double voltage) {
return getPower().injectEnergy(directionFrom, amount, voltage);
}
@Override
@Optional.Method(modid = "IC2")
public boolean acceptsEnergyFrom(final TileEntity emitter, final ForgeDirection direction) {
return this.getPower().acceptsEnergyFrom(emitter, direction);
public boolean acceptsEnergyFrom(TileEntity emitter, ForgeDirection direction) {
return getPower().acceptsEnergyFrom(emitter, direction);
}
@Override
public int receiveEnergy(final ForgeDirection from, final int maxReceive, final boolean simulate) {
return this.getPower().receiveEnergy(from, maxReceive, simulate);
public int receiveEnergy(ForgeDirection from, int maxReceive, boolean simulate) {
return getPower().receiveEnergy(from, maxReceive, simulate);
}
@Override
public int extractEnergy(final ForgeDirection from, final int maxExtract, final boolean simulate) {
return this.getPower().extractEnergy(from, maxExtract, simulate);
public int extractEnergy(ForgeDirection from, int maxExtract, boolean simulate) {
return getPower().extractEnergy(from, maxExtract, simulate);
}
@Override
public int getEnergyStored(final ForgeDirection from) {
return this.getPower().getEnergyStored(from);
public int getEnergyStored(ForgeDirection from) {
return getPower().getEnergyStored(from);
}
@Override
public int getMaxEnergyStored(final ForgeDirection from) {
return this.getPower().getMaxEnergyStored(from);
public int getMaxEnergyStored(ForgeDirection from) {
return getPower().getMaxEnergyStored(from);
}
@Override
public boolean canConnectEnergy(final ForgeDirection from) {
return this.getPower().canConnectEnergy(from);
public boolean canConnectEnergy(ForgeDirection from) {
return getPower().canConnectEnergy(from);
}
@Override
public PowerInterface getInterface() {
return this.getPower().getInterface();
return getPower().getInterface();
}
}
@@ -1,15 +1,10 @@
//
// Decompiled by Procyon v0.5.30
//
package binnie.core.machines.component;
import binnie.core.machines.Machine;
import binnie.core.machines.MachineComponent;
public abstract class ComponentRecipe extends MachineComponent implements IComponentRecipe
{
public ComponentRecipe(final Machine machine) {
public abstract class ComponentRecipe extends MachineComponent implements IComponentRecipe {
public ComponentRecipe(Machine machine) {
super(machine);
}
}
@@ -1,23 +1,17 @@
//
// Decompiled by Procyon v0.5.30
//
package binnie.core.machines.component;
import binnie.core.triggers.TriggerData;
import buildcraft.api.statements.IActionExternal;
import buildcraft.api.statements.IActionReceptor;
import binnie.core.triggers.TriggerData;
import java.util.List;
public interface IBuildcraft
{
public interface TriggerProvider
{
void getTriggers(final List<TriggerData> p0);
public interface IBuildcraft {
interface TriggerProvider {
void getTriggers(List<TriggerData> p0);
}
public interface ActionProvider extends IActionReceptor
{
void getActions(final List<IActionExternal> p0);
interface ActionProvider extends IActionReceptor {
void getActions(List<IActionExternal> p0);
}
}
@@ -1,16 +1,11 @@
//
// Decompiled by Procyon v0.5.30
//
package binnie.core.machines.component;
import net.minecraft.item.ItemStack;
public interface IComponentRecipe
{
public interface IComponentRecipe {
boolean isRecipe();
ItemStack doRecipe(final boolean p0);
ItemStack doRecipe(boolean p0);
ItemStack getProduct();
}
@@ -1,26 +1,18 @@
//
// Decompiled by Procyon v0.5.30
//
package binnie.core.machines.component;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.world.World;
public interface IInteraction
{
public interface ChunkUnload
{
public interface IInteraction {
interface ChunkUnload {
void onChunkUnload();
}
public interface Invalidation
{
interface Invalidation {
void onInvalidation();
}
public interface RightClick
{
void onRightClick(final World p0, final EntityPlayer p1, final int p2, final int p3, final int p4);
interface RightClick {
void onRightClick(World world, EntityPlayer player, int x, int y, int z);
}
}
@@ -1,32 +1,25 @@
//
// Decompiled by Procyon v0.5.30
//
package binnie.core.machines.component;
import net.minecraft.client.renderer.entity.RenderItem;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import java.util.Random;
import net.minecraft.client.renderer.entity.RenderItem;
import net.minecraft.world.World;
public interface IRender
{
public interface DisplayTick
{
import java.util.Random;
public interface IRender {
interface DisplayTick {
@SideOnly(Side.CLIENT)
void onDisplayTick(final World p0, final int p1, final int p2, final int p3, final Random p4);
void onDisplayTick(World world, int x, int y, int z, Random rand);
}
public interface RandomDisplayTick
{
interface RandomDisplayTick {
@SideOnly(Side.CLIENT)
void onRandomDisplayTick(final World p0, final int p1, final int p2, final int p3, final Random p4);
void onRandomDisplayTick(World world, int x, int y, int p3, Random rand);
}
public interface Render
{
interface Render {
@SideOnly(Side.CLIENT)
void renderInWorld(final RenderItem p0, final double p1, final double p2, final double p3);
void renderInWorld(RenderItem renderItem, double x, double y, double z);
}
}
@@ -1,11 +1,6 @@
//
// Decompiled by Procyon v0.5.30
//
package binnie.core.machines.inventory;
enum AccessDirection
{
enum AccessDirection {
Both,
In,
Out,
@@ -23,7 +18,7 @@ enum AccessDirection
return this != AccessDirection.Neither;
}
AccessDirection changeInsert(final boolean b) {
AccessDirection changeInsert(boolean b) {
if (b) {
if (this == AccessDirection.Out) {
return AccessDirection.Both;
@@ -31,8 +26,7 @@ enum AccessDirection
if (this == AccessDirection.Neither) {
return AccessDirection.In;
}
}
else {
} else {
if (this == AccessDirection.Both) {
return AccessDirection.Out;
}
@@ -43,7 +37,7 @@ enum AccessDirection
return this;
}
AccessDirection changeExtract(final boolean b) {
AccessDirection changeExtract(boolean b) {
if (b) {
if (this == AccessDirection.In) {
return AccessDirection.Both;
@@ -51,8 +45,7 @@ enum AccessDirection
if (this == AccessDirection.Neither) {
return AccessDirection.Out;
}
}
else {
} else {
if (this == AccessDirection.Both) {
return AccessDirection.In;
}
@@ -65,35 +58,29 @@ enum AccessDirection
public String getTextColour() {
switch (this) {
case Both: {
return "§a";
}
case In: {
return "§e";
}
case Neither: {
return "§c";
}
default: {
return "§b";
}
case Both:
return "§a";
case In:
return "§e";
case Neither:
return "§c";
}
return "§b";
}
public int getShadeColour() {
switch (this) {
case Both: {
return 1431699285;
}
case In: {
return 1442840405;
}
case Neither: {
return 1442796885;
}
default: {
return 1431699455;
}
case Both:
return 0x5555ff55;
case In:
return 0x55ffff55;
case Neither:
return 0x55ff5555;
}
return 0x5555ffff;
}
}
@@ -1,123 +1,122 @@
//
// Decompiled by Procyon v0.5.30
//
package binnie.core.machines.inventory;
import java.util.Collection;
import net.minecraftforge.common.util.ForgeDirection;
import java.util.EnumSet;
import binnie.core.util.IValidator;
import forestry.api.core.INBTTagable;
import net.minecraftforge.common.util.ForgeDirection;
public abstract class BaseSlot<T> implements INBTTagable, IValidator<T>
{
private SidedAccess access;
Validator<T> validator;
private boolean readOnly;
private int index;
import java.util.Collection;
import java.util.EnumSet;
public abstract class BaseSlot<T> implements INBTTagable, IValidator<T> {
protected Validator<T> validator;
protected String unlocName;
public BaseSlot(final int index, final String unlocName) {
this.access = new SidedAccess();
this.validator = null;
this.readOnly = false;
this.unlocName = "";
this.setIndex(index);
this.setUnlocalisedName(unlocName);
private SidedAccess access;
private boolean readOnly;
private int index;
public BaseSlot(int index, String unlocalizedName) {
access = new SidedAccess();
validator = null;
readOnly = false;
setIndex(index);
setUnlocalizedName(unlocalizedName);
}
public void setReadOnly() {
this.readOnly = true;
this.forbidInsertion();
readOnly = true;
forbidInsertion();
}
@Override
public boolean isValid(final T item) {
return item == null || this.validator == null || this.validator.isValid(item);
public boolean isValid(T item) {
return item == null
|| validator == null
|| validator.isValid(item);
}
public abstract T getContent();
public abstract void setContent(final T p0);
public abstract void setContent(T p0);
public void setValidator(final Validator<T> val) {
this.validator = val;
public void setValidator(Validator<T> validator) {
this.validator = validator;
}
public boolean isEmpty() {
return this.getContent() == null;
return getContent() == null;
}
public boolean isReadOnly() {
return this.readOnly;
return readOnly;
}
public int getIndex() {
return this.index;
return index;
}
private void setIndex(final int index) {
private void setIndex(int index) {
this.index = index;
}
public boolean canInsert() {
return !this.access.getInsertionSides().isEmpty();
return !access.getInsertionSides().isEmpty();
}
public boolean canExtract() {
return !this.access.getExtractionSides().isEmpty();
return !access.getExtractionSides().isEmpty();
}
public void forbidInteraction() {
this.forbidInsertion();
this.forbidExtraction();
forbidInsertion();
forbidExtraction();
}
public void setInputSides(final EnumSet<ForgeDirection> sides) {
for (final ForgeDirection side : EnumSet.complementOf(sides)) {
// TODO unusing method?
public void setInputSides(EnumSet<ForgeDirection> sides) {
for (ForgeDirection side : EnumSet.complementOf(sides)) {
if (side != ForgeDirection.UNKNOWN) {
this.access.setInsert(side, false);
access.setInsert(side, false);
}
}
}
public void setOutputSides(final EnumSet<ForgeDirection> sides) {
for (final ForgeDirection side : EnumSet.complementOf(sides)) {
public void setOutputSides(EnumSet<ForgeDirection> sides) {
for (ForgeDirection side : EnumSet.complementOf(sides)) {
if (side != ForgeDirection.UNKNOWN) {
this.access.setExtract(side, false);
access.setExtract(side, false);
}
}
}
public void forbidExtraction() {
this.access.setExtract(false);
this.access.forbidExtractChange();
access.setExtract(false);
access.forbidExtractChange();
}
public void forbidInsertion() {
this.access.setInsert(false);
this.access.forbidInsertChange();
access.setInsert(false);
access.forbidInsertChange();
}
public boolean canInsert(final ForgeDirection dir) {
return this.access.canInsert(dir);
public boolean canInsert(ForgeDirection dir) {
return access.canInsert(dir);
}
public boolean canExtract(final ForgeDirection dir) {
return this.access.canExtract(dir);
public boolean canExtract(ForgeDirection dir) {
return access.canExtract(dir);
}
public Collection<ForgeDirection> getInputSides() {
return this.access.getInsertionSides();
return access.getInsertionSides();
}
public Collection<ForgeDirection> getOutputSides() {
return this.access.getExtractionSides();
return access.getExtractionSides();
}
public void setUnlocalisedName(final String name) {
this.unlocName = name;
public void setUnlocalizedName(String name) {
unlocName = name;
}
public abstract String getName();
@@ -1,46 +1,40 @@
//
// Decompiled by Procyon v0.5.30
//
package binnie.core.machines.inventory;
import net.minecraft.entity.player.EntityPlayer;
import cpw.mods.fml.relauncher.Side;
import net.minecraft.nbt.NBTBase;
import net.minecraft.nbt.NBTTagList;
import net.minecraft.nbt.NBTTagCompound;
import java.util.HashMap;
import binnie.core.machines.Machine;
import java.util.Map;
import binnie.core.machines.network.INetwork;
import binnie.core.machines.MachineComponent;
import binnie.core.machines.network.INetwork;
import cpw.mods.fml.relauncher.Side;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.nbt.NBTTagList;
public class ComponentChargedSlots extends MachineComponent implements INetwork.GuiNBT, IChargedSlots
{
private Map<Integer, Float> charges;
import java.util.HashMap;
import java.util.Map;
public ComponentChargedSlots(final Machine machine) {
public class ComponentChargedSlots extends MachineComponent implements INetwork.GuiNBT, IChargedSlots {
private Map<Integer, Float> charges = new HashMap<>();
public ComponentChargedSlots(Machine machine) {
super(machine);
this.charges = new HashMap<Integer, Float>();
}
@Override
public void readFromNBT(final NBTTagCompound nbttagcompound) {
public void readFromNBT(NBTTagCompound nbttagcompound) {
super.readFromNBT(nbttagcompound);
this.charges.clear();
final NBTTagList list = nbttagcompound.getTagList("charges", 10);
charges.clear();
NBTTagList list = nbttagcompound.getTagList("charges", 10);
for (int i = 0; i < list.tagCount(); ++i) {
final NBTTagCompound tag = list.getCompoundTagAt(i);
this.charges.put((int) tag.getByte("i"), tag.getByte("v") / 100.0f);
NBTTagCompound tag = list.getCompoundTagAt(i);
charges.put((int) tag.getByte("i"), tag.getByte("v") / 100.0f);
}
}
@Override
public void writeToNBT(final NBTTagCompound nbttagcompound) {
public void writeToNBT(NBTTagCompound nbttagcompound) {
super.writeToNBT(nbttagcompound);
final NBTTagList chargeList = new NBTTagList();
for (final Map.Entry<Integer, Float> entry : this.charges.entrySet()) {
final NBTTagCompound chargesNBT = new NBTTagCompound();
NBTTagList chargeList = new NBTTagList();
for (Map.Entry<Integer, Float> entry : charges.entrySet()) {
NBTTagCompound chargesNBT = new NBTTagCompound();
chargesNBT.setByte("i", (byte) (0 + entry.getKey()));
chargesNBT.setByte("v", (byte) (entry.getValue() * 100.0f));
chargeList.appendTag(chargesNBT);
@@ -48,57 +42,57 @@ public class ComponentChargedSlots extends MachineComponent implements INetwork.
nbttagcompound.setTag("charges", chargeList);
}
public void addCharge(final int slot) {
this.charges.put(slot, 0.0f);
public void addCharge(int slot) {
charges.put(slot, 0.0f);
}
@Override
public void recieveGuiNBT(final Side side, final EntityPlayer player, final String name, final NBTTagCompound nbt) {
public void recieveGuiNBT(Side side, EntityPlayer player, String name, NBTTagCompound nbt) {
if (name.equals("slot-charges")) {
for (final int i : this.charges.keySet()) {
this.charges.put(i, nbt.getShort("" + i) / 100.0f);
for (int i : charges.keySet()) {
charges.put(i, nbt.getShort("" + i) / 100.0f);
}
}
}
@Override
public void sendGuiNBT(final Map<String, NBTTagCompound> nbt) {
final NBTTagCompound tag = new NBTTagCompound();
for (final int i : this.charges.keySet()) {
tag.setShort("" + i, (short) (this.charges.get(i) * 100.0f));
public void sendGuiNBT(Map<String, NBTTagCompound> nbts) {
NBTTagCompound tag = new NBTTagCompound();
for (int i : charges.keySet()) {
tag.setShort("" + i, (short) (charges.get(i) * 100.0f));
}
nbt.put("slot-charges", tag);
nbts.put("slot-charges", tag);
}
@Override
public float getCharge(final int slot) {
return this.charges.containsKey(slot) ? this.charges.get(slot) : 0.0f;
public float getCharge(int slot) {
return charges.containsKey(slot) ? charges.get(slot) : 0.0f;
}
@Override
public void setCharge(final int slot, float charge) {
if (charge > 1.0f) {
charge = 1.0f;
public void setCharge(int slot, float value) {
if (value > 1.0f) {
value = 1.0f;
}
if (charge < 0.0f) {
charge = 0.0f;
if (value < 0.0f) {
value = 0.0f;
}
if (this.charges.containsKey(slot)) {
this.charges.put(slot, charge);
if (charges.containsKey(slot)) {
charges.put(slot, value);
}
}
@Override
public void onUpdate() {
for (final int slot : this.charges.keySet()) {
if (this.getCharge(slot) <= 0.0f && this.getUtil().decreaseStack(slot, 1) != null) {
this.setCharge(slot, 1.0f);
for (int slot : this.charges.keySet()) {
if (getCharge(slot) <= 0.0f && getUtil().decreaseStack(slot, 1) != null) {
setCharge(slot, 1.0f);
}
}
}
@Override
public void alterCharge(final int slot, final float charge) {
this.setCharge(slot, this.getCharge(slot) + charge);
public void alterCharge(int slot, float value) {
setCharge(slot, getCharge(slot) + value);
}
}
@@ -1,23 +1,19 @@
//
// Decompiled by Procyon v0.5.30
//
package binnie.core.machines.inventory;
import binnie.core.machines.IMachine;
import net.minecraft.inventory.IInventory;
import binnie.core.machines.MachineComponent;
import net.minecraft.inventory.IInventory;
public abstract class ComponentInventory extends MachineComponent implements IInventory
{
public ComponentInventory(final IMachine machine) {
public abstract class ComponentInventory extends MachineComponent implements IInventory {
public ComponentInventory(IMachine machine) {
super(machine);
}
@Override
public void markDirty() {
if (this.getMachine() != null) {
this.getMachine().markDirty();
IMachine machine = getMachine();
if (machine != null) {
machine.markDirty();
}
}
}
@@ -1,79 +1,75 @@
//
// Decompiled by Procyon v0.5.30
//
package binnie.core.machines.inventory;
import net.minecraftforge.common.util.ForgeDirection;
import net.minecraft.entity.Entity;
import binnie.core.machines.IMachine;
import net.minecraft.entity.item.EntityItem;
import java.util.List;
import java.util.ArrayList;
import net.minecraft.nbt.NBTBase;
import net.minecraft.nbt.NBTTagList;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.nbt.NBTTagList;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.world.World;
import net.minecraftforge.common.util.ForgeDirection;
import java.util.ArrayList;
import java.util.LinkedHashMap;
import binnie.core.machines.IMachine;
import java.util.List;
import java.util.Map;
import java.util.Random;
public class ComponentInventorySlots extends ComponentInventory implements IInventoryMachine, IInventorySlots
{
private Map<Integer, InventorySlot> inventory;
public class ComponentInventorySlots extends ComponentInventory implements IInventoryMachine, IInventorySlots {
private Map<Integer, InventorySlot> inventory = new LinkedHashMap<>();
public ComponentInventorySlots(final IMachine machine) {
public ComponentInventorySlots(IMachine machine) {
super(machine);
this.inventory = new LinkedHashMap<Integer, InventorySlot>();
}
@Override
public int getSizeInventory() {
int size = 0;
for (final Integer index : this.inventory.keySet()) {
for (Integer index : inventory.keySet()) {
size = Math.max(size, index + 1);
}
return size;
}
@Override
public ItemStack getStackInSlot(final int index) {
if (this.inventory.containsKey(index)) {
return this.inventory.get(index).getContent();
public ItemStack getStackInSlot(int index) {
if (inventory.containsKey(index)) {
return inventory.get(index).getContent();
}
return null;
}
@Override
public ItemStack decrStackSize(final int index, final int amount) {
if (this.inventory.containsKey(index)) {
final ItemStack stack = this.inventory.get(index).decrStackSize(amount);
this.markDirty();
public ItemStack decrStackSize(int index, int amount) {
if (inventory.containsKey(index)) {
ItemStack stack = inventory.get(index).decrStackSize(amount);
markDirty();
return stack;
}
return null;
}
@Override
public ItemStack getStackInSlotOnClosing(final int var1) {
public ItemStack getStackInSlotOnClosing(int var1) {
return null;
}
@Override
public void setInventorySlotContents(final int index, final ItemStack itemStack) {
if (this.inventory.containsKey(index) && (itemStack == null || this.inventory.get(index).isValid(itemStack))) {
this.inventory.get(index).setContent(itemStack);
public void setInventorySlotContents(int index, ItemStack itemStack) {
if (inventory.containsKey(index) && (itemStack == null || inventory.get(index).isValid(itemStack))) {
inventory.get(index).setContent(itemStack);
}
this.markDirty();
}
protected void transferItem(final int indexFrom, final int indexTo) {
if (this.inventory.containsKey(indexFrom) && this.inventory.containsKey(indexTo)) {
final ItemStack newStack = this.inventory.get(indexFrom).getContent().copy();
this.inventory.get(indexFrom).setContent(null);
this.inventory.get(indexTo).setContent(newStack);
protected void transferItem(int indexFrom, int indexTo) {
if (inventory.containsKey(indexFrom) && inventory.containsKey(indexTo)) {
ItemStack newStack = inventory.get(indexFrom).getContent().copy();
inventory.get(indexFrom).setContent(null);
inventory.get(indexTo).setContent(newStack);
}
this.markDirty();
markDirty();
}
@Override
@@ -87,43 +83,45 @@ public class ComponentInventorySlots extends ComponentInventory implements IInve
}
@Override
public boolean isUseableByPlayer(final EntityPlayer var1) {
public boolean isUseableByPlayer(EntityPlayer var1) {
return true;
}
@Override
public void openInventory() {
// ignored
}
@Override
public void closeInventory() {
// ignored
}
@Override
public void readFromNBT(final NBTTagCompound nbttagcompound) {
public void readFromNBT(NBTTagCompound nbttagcompound) {
super.readFromNBT(nbttagcompound);
if (nbttagcompound.hasKey("inventory")) {
final NBTTagList inventoryNBT = nbttagcompound.getTagList("inventory", 10);
NBTTagList inventoryNBT = nbttagcompound.getTagList("inventory", 10);
for (int i = 0; i < inventoryNBT.tagCount(); ++i) {
final NBTTagCompound slotNBT = inventoryNBT.getCompoundTagAt(i);
NBTTagCompound slotNBT = inventoryNBT.getCompoundTagAt(i);
int index = slotNBT.getInteger("id");
if (slotNBT.hasKey("Slot")) {
index = (slotNBT.getByte("Slot") & 0xFF);
}
if (this.inventory.containsKey(index)) {
this.inventory.get(index).readFromNBT(slotNBT);
if (inventory.containsKey(index)) {
inventory.get(index).readFromNBT(slotNBT);
}
}
}
this.markDirty();
markDirty();
}
@Override
public void writeToNBT(final NBTTagCompound nbttagcompound) {
public void writeToNBT(NBTTagCompound nbttagcompound) {
super.writeToNBT(nbttagcompound);
final NBTTagList inventoryNBT = new NBTTagList();
for (final Map.Entry<Integer, InventorySlot> entry : this.inventory.entrySet()) {
final NBTTagCompound slotNBT = new NBTTagCompound();
NBTTagList inventoryNBT = new NBTTagList();
for (Map.Entry<Integer, InventorySlot> entry : inventory.entrySet()) {
NBTTagCompound slotNBT = new NBTTagCompound();
slotNBT.setInteger("id", entry.getKey());
entry.getValue().writeToNBT(slotNBT);
inventoryNBT.appendTag(slotNBT);
@@ -132,46 +130,46 @@ public class ComponentInventorySlots extends ComponentInventory implements IInve
}
@Override
public final InventorySlot addSlot(final int index, final String unlocName) {
this.inventory.put(index, new InventorySlot(index, unlocName));
return this.getSlot(index);
public InventorySlot addSlot(int index, String unlocalizedName) {
inventory.put(index, new InventorySlot(index, unlocalizedName));
return getSlot(index);
}
@Override
public final InventorySlot[] addSlotArray(final int[] indexes, final String unlocName) {
for (final int k : indexes) {
this.addSlot(k, unlocName);
public InventorySlot[] addSlotArray(int[] indexes, String unlocalizedName) {
for (int k : indexes) {
addSlot(k, unlocalizedName);
}
return this.getSlots(indexes);
return getSlots(indexes);
}
@Override
public InventorySlot getSlot(final int index) {
if (this.inventory.containsKey(index)) {
return this.inventory.get(index);
public InventorySlot getSlot(int index) {
if (inventory.containsKey(index)) {
return inventory.get(index);
}
return null;
}
@Override
public InventorySlot[] getAllSlots() {
return this.inventory.values().toArray(new InventorySlot[0]);
return inventory.values().toArray(new InventorySlot[0]);
}
@Override
public InventorySlot[] getSlots(final int[] indexes) {
final List<InventorySlot> list = new ArrayList<InventorySlot>();
for (final int i : indexes) {
if (this.getSlot(i) != null) {
list.add(this.getSlot(i));
public InventorySlot[] getSlots(int[] indexes) {
List<InventorySlot> list = new ArrayList<InventorySlot>();
for (int i : indexes) {
if (getSlot(i) != null) {
list.add(getSlot(i));
}
}
return list.toArray(new InventorySlot[0]);
}
@Override
public boolean isReadOnly(final int slot) {
final InventorySlot iSlot = this.getSlot(slot);
public boolean isReadOnly(int slot) {
InventorySlot iSlot = getSlot(slot);
return iSlot == null || iSlot.isReadOnly();
}
@@ -181,41 +179,49 @@ public class ComponentInventorySlots extends ComponentInventory implements IInve
}
@Override
public boolean isItemValidForSlot(final int slot, final ItemStack itemStack) {
final InventorySlot iSlot = this.getSlot(slot);
return iSlot != null && (iSlot.isValid(itemStack) && !this.isReadOnly(slot));
public boolean isItemValidForSlot(int slot, ItemStack itemStack) {
InventorySlot iSlot = getSlot(slot);
return iSlot != null && (iSlot.isValid(itemStack) && !isReadOnly(slot));
}
@Override
public void onDestruction() {
for (final InventorySlot slot : this.inventory.values()) {
final ItemStack stack = slot.getContent();
if (!slot.isRecipe() && stack != null) {
final float f = this.getMachine().getWorld().rand.nextFloat() * 0.8f + 0.1f;
final float f2 = this.getMachine().getWorld().rand.nextFloat() * 0.8f + 0.1f;
final float f3 = this.getMachine().getWorld().rand.nextFloat() * 0.8f + 0.1f;
if (stack.stackSize == 0) {
stack.stackSize = 1;
}
final EntityItem entityitem = new EntityItem(this.getMachine().getWorld(), this.getMachine().getTileEntity().xCoord + f, this.getMachine().getTileEntity().yCoord + f2, this.getMachine().getTileEntity().zCoord + f3, stack.copy());
final float accel = 0.05f;
entityitem.motionX = (float) this.getMachine().getWorld().rand.nextGaussian() * accel;
entityitem.motionY = (float) this.getMachine().getWorld().rand.nextGaussian() * accel + 0.2f;
entityitem.motionZ = (float) this.getMachine().getWorld().rand.nextGaussian() * accel;
this.getMachine().getWorld().spawnEntityInWorld(entityitem);
for (InventorySlot slot : this.inventory.values()) {
ItemStack stack = slot.getContent();
if (slot.isRecipe() || stack == null) {
continue;
}
IMachine machine = getMachine();
World world = machine.getWorld();
Random rand = world.rand;
TileEntity tileEntity = machine.getTileEntity();
float xOffset = rand.nextFloat() * 0.8f + 0.1f;
float yOffset = rand.nextFloat() * 0.8f + 0.1f;
float zOffset = rand.nextFloat() * 0.8f + 0.1f;
if (stack.stackSize == 0) {
stack.stackSize = 1;
}
EntityItem entityItem = new EntityItem(world, tileEntity.xCoord + xOffset, tileEntity.yCoord + yOffset, tileEntity.zCoord + zOffset, stack.copy());
float accel = 0.05f;
entityItem.motionX = (float) rand.nextGaussian() * accel;
entityItem.motionY = (float) rand.nextGaussian() * accel + 0.2f;
entityItem.motionZ = (float) rand.nextGaussian() * accel;
world.spawnEntityInWorld(entityItem);
}
}
@Override
public int[] getAccessibleSlotsFromSide(final int var1) {
final List<Integer> slots = new ArrayList<Integer>();
for (final InventorySlot slot : this.inventory.values()) {
public int[] getAccessibleSlotsFromSide(int var1) {
List<Integer> slots = new ArrayList<>();
for (InventorySlot slot : inventory.values()) {
if (slot.canInsert() || slot.canExtract()) {
slots.add(slot.getIndex());
}
}
final int[] ids = new int[slots.size()];
int[] ids = new int[slots.size()];
for (int i = 0; i < slots.size(); ++i) {
ids[i] = slots.get(i);
}
@@ -223,12 +229,13 @@ public class ComponentInventorySlots extends ComponentInventory implements IInve
}
@Override
public boolean canInsertItem(final int i, final ItemStack itemstack, final int j) {
return this.isItemValidForSlot(i, itemstack) && this.getSlot(i).canInsert(ForgeDirection.getOrientation(j));
public boolean canInsertItem(int slot, ItemStack itemstack, int direction) {
return isItemValidForSlot(slot, itemstack)
&& getSlot(slot).canInsert(ForgeDirection.getOrientation(direction));
}
@Override
public boolean canExtractItem(final int i, final ItemStack itemstack, final int j) {
return this.getSlot(i).canExtract(ForgeDirection.getOrientation(j));
public boolean canExtractItem(int slot, ItemStack itemstack, int direction) {
return getSlot(slot).canExtract(ForgeDirection.getOrientation(direction));
}
}
@@ -1,147 +1,144 @@
//
// Decompiled by Procyon v0.5.30
//
package binnie.core.machines.inventory;
import binnie.core.machines.transfer.TransferRequest;
import net.minecraft.item.ItemStack;
import net.minecraft.inventory.IInventory;
import java.util.ArrayList;
import binnie.core.machines.IMachine;
import java.util.List;
import binnie.core.machines.MachineComponent;
import binnie.core.machines.transfer.TransferRequest;
import net.minecraft.inventory.IInventory;
import net.minecraft.item.ItemStack;
public class ComponentInventoryTransfer extends MachineComponent
{
private List<Transfer> transfers;
import java.util.ArrayList;
import java.util.List;
public ComponentInventoryTransfer(final IMachine machine) {
public class ComponentInventoryTransfer extends MachineComponent {
private List<Transfer> transfers = new ArrayList<>();
public ComponentInventoryTransfer(IMachine machine) {
super(machine);
this.transfers = new ArrayList<Transfer>();
}
public void addRestock(final int[] buffer, final int destination, final int limit) {
this.transfers.add(new Restock(this.getMachine(), buffer, destination, limit));
public void addRestock(int[] buffer, int destination, int limit) {
this.transfers.add(new Restock(getMachine(), buffer, destination, limit));
}
public void addRestock(final int[] buffer, final int destination) {
this.transfers.add(new Restock(this.getMachine(), buffer, destination));
public void addRestock(int[] buffer, int destination) {
this.transfers.add(new Restock(getMachine(), buffer, destination));
}
public void addStorage(final int source, final int[] destination) {
this.transfers.add(new Storage(this.getMachine(), source, destination));
public void addStorage(int source, int[] destination) {
this.transfers.add(new Storage(getMachine(), source, destination));
}
public void performTransfer(final int source, final int[] destination) {
new Storage(this.getMachine(), source, destination).transfer(this.getMachine().getInterface(IInventoryMachine.class));
public void performTransfer(int source, int[] destination) {
new Storage(getMachine(), source, destination).transfer(getMachine().getInterface(IInventoryMachine.class));
}
@Override
public void onUpdate() {
for (final Transfer transfer : this.transfers) {
transfer.transfer(this.getMachine().getInterface(IInventoryMachine.class));
for (Transfer transfer : transfers) {
transfer.transfer(getMachine().getInterface(IInventoryMachine.class));
}
}
public void addStorage(final int source, final int[] destination, final Condition condition) {
this.transfers.add(new Storage(this.getMachine(), source, destination).setCondition(condition));
public void addStorage(int source, int[] destination, Condition condition) {
this.transfers.add(new Storage(getMachine(), source, destination).setCondition(condition));
}
public abstract class Transfer
{
public abstract class Transfer {
protected Condition condition;
protected IMachine machine;
private Transfer(final IMachine machine) {
private Transfer(IMachine machine) {
this.machine = machine;
}
public final void transfer(final IInventory inv) {
if (this.condition == null || this.fufilled(inv)) {
public void transfer(IInventory inv) {
if (this.condition == null || fufilled(inv)) {
this.doTransfer(inv);
}
}
protected boolean fufilled(final IInventory inv) {
protected boolean fufilled(IInventory inv) {
return true;
}
protected void doTransfer(final IInventory inv) {
protected void doTransfer(IInventory inv) {
}
public final Transfer setCondition(final Condition condition) {
public Transfer setCondition(Condition condition) {
this.condition = condition;
return condition.transfer = this;
}
public final IMachine getMachine() {
return this.machine;
public IMachine getMachine() {
return machine;
}
}
private class Restock extends Transfer
{
int[] buffer;
int destination;
int limit;
private class Restock extends Transfer {
private int[] buffer;
private int destination;
private int limit;
private Restock(final IMachine machine, final int[] buffer, final int destination, final int limit) {
private Restock(IMachine machine, int[] buffer, int destination, int limit) {
super(machine);
this.buffer = buffer;
this.destination = destination;
this.limit = limit;
}
private Restock(final IMachine machine, final int[] buffer, final int destination) {
private Restock(IMachine machine, int[] buffer, int destination) {
this(machine, buffer, destination, 64);
}
@Override
protected void doTransfer(final IInventory inv) {
protected void doTransfer(IInventory inv) {
if (inv.getStackInSlot(this.destination) == null) {
for (final int i : this.buffer) {
if (inv.getStackInSlot(i) != null) {
final ItemStack newStack = inv.decrStackSize(i, this.limit);
if (newStack != null) {
inv.setInventorySlotContents(this.destination, newStack);
return;
}
for (int i : buffer) {
if (inv.getStackInSlot(i) == null) {
continue;
}
ItemStack newStack = inv.decrStackSize(i, limit);
if (newStack != null) {
inv.setInventorySlotContents(destination, newStack);
return;
}
}
}
}
}
private class Storage extends Transfer
{
int source;
int[] destination;
private class Storage extends Transfer {
private int source;
private int[] destination;
private Storage(final IMachine machine, final int source, final int[] destination) {
private Storage(IMachine machine, int source, int[] destination) {
super(machine);
this.source = source;
this.destination = destination;
}
@Override
protected void doTransfer(final IInventory inv) {
if (inv.getStackInSlot(this.source) != null) {
inv.setInventorySlotContents(this.source, new TransferRequest(inv.getStackInSlot(this.source), inv).setTargetSlots(this.destination).ignoreValidation().transfer(true));
protected void doTransfer(IInventory inv) {
if (inv.getStackInSlot(source) != null) {
TransferRequest request = new TransferRequest(inv.getStackInSlot(source), inv);
ItemStack itemStack = request.setTargetSlots(destination)
.ignoreValidation()
.transfer(true);
inv.setInventorySlotContents(source, itemStack);
}
}
@Override
protected boolean fufilled(final IInventory inv) {
final ItemStack stack = inv.getStackInSlot(this.source);
return stack != null && this.condition.fufilled(stack);
protected boolean fufilled(IInventory inv) {
ItemStack stack = inv.getStackInSlot(source);
return stack != null && condition.fufilled(stack);
}
}
public abstract static class Condition
{
public abstract static class Condition {
public Transfer transfer;
public abstract boolean fufilled(final ItemStack p0);
public abstract boolean fufilled(ItemStack p0);
}
}
@@ -1,89 +1,83 @@
//
// Decompiled by Procyon v0.5.30
//
package binnie.core.machines.inventory;
import net.minecraftforge.fluids.FluidTankInfo;
import net.minecraftforge.fluids.Fluid;
import java.util.List;
import java.util.ArrayList;
import net.minecraftforge.fluids.IFluidTank;
import binnie.core.machines.power.TankInfo;
import net.minecraft.nbt.NBTBase;
import net.minecraft.nbt.NBTTagList;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraftforge.fluids.FluidStack;
import net.minecraftforge.common.util.ForgeDirection;
import java.util.LinkedHashMap;
import binnie.core.machines.IMachine;
import java.util.Map;
import binnie.core.machines.power.ITankMachine;
import binnie.core.machines.MachineComponent;
import binnie.core.machines.power.ITankMachine;
import binnie.core.machines.power.TankInfo;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.nbt.NBTTagList;
import net.minecraftforge.common.util.ForgeDirection;
import net.minecraftforge.fluids.Fluid;
import net.minecraftforge.fluids.FluidStack;
import net.minecraftforge.fluids.FluidTankInfo;
import net.minecraftforge.fluids.IFluidTank;
public class ComponentTankContainer extends MachineComponent implements ITankMachine
{
private Map<Integer, TankSlot> tanks;
import java.util.ArrayList;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
public ComponentTankContainer(final IMachine machine) {
public class ComponentTankContainer extends MachineComponent implements ITankMachine {
private Map<Integer, TankSlot> tanks = new LinkedHashMap<>();
public ComponentTankContainer(IMachine machine) {
super(machine);
this.tanks = new LinkedHashMap<Integer, TankSlot>();
}
@Override
public final TankSlot addTank(final int index, final String name, final int capacity) {
final TankSlot tank = new TankSlot(index, name, capacity);
this.tanks.put(index, tank);
public TankSlot addTank(int index, String name, int capacity) {
TankSlot tank = new TankSlot(index, name, capacity);
tanks.put(index, tank);
return tank;
}
@Override
public final int fill(final ForgeDirection from, final FluidStack resource, final boolean doFill) {
final int index = this.getTankIndexToFill(from, resource);
if (this.tanks.containsKey(index)) {
return this.fill(index, resource, doFill);
public int fill(ForgeDirection from, FluidStack resource, boolean doFill) {
int index = getTankIndexToFill(from, resource);
if (tanks.containsKey(index)) {
return fill(index, resource, doFill);
}
return 0;
}
@Override
public final FluidStack drain(final ForgeDirection from, final int maxDrain, final boolean doDrain) {
final int index = this.getTankIndexToDrain(from, null);
if (this.tanks.containsKey(index)) {
return this.drain(index, maxDrain, doDrain);
public FluidStack drain(ForgeDirection from, int maxDrain, boolean doDrain) {
int index = getTankIndexToDrain(from, null);
if (tanks.containsKey(index)) {
return drain(index, maxDrain, doDrain);
}
return null;
}
private final int fill(final int tankIndex, final FluidStack resource, final boolean doFill) {
if (!this.tanks.containsKey(tankIndex)) {
private int fill(int tankIndex, FluidStack resource, boolean doFill) {
if (!tanks.containsKey(tankIndex)) {
return 0;
}
if (!this.isLiquidValidForTank(resource, tankIndex)) {
if (!isLiquidValidForTank(resource, tankIndex)) {
return 0;
}
final TankSlot tank = this.tanks.get(tankIndex);
final int filled = tank.getTank().fill(resource, doFill);
TankSlot tank = tanks.get(tankIndex);
int filled = tank.getTank().fill(resource, doFill);
if (filled > 0) {
this.markDirty();
markDirty();
}
return filled;
}
private final FluidStack drain(final int tankIndex, final int maxDrain, final boolean doDrain) {
if (!this.tanks.containsKey(tankIndex)) {
private FluidStack drain(int tankIndex, int maxDrain, boolean doDrain) {
if (!tanks.containsKey(tankIndex)) {
return null;
}
final TankSlot tank = this.tanks.get(tankIndex);
final FluidStack drained = tank.getTank().drain(maxDrain, doDrain);
TankSlot tank = tanks.get(tankIndex);
FluidStack drained = tank.getTank().drain(maxDrain, doDrain);
if (drained != null) {
this.markDirty();
markDirty();
}
return drained;
}
private int getTankIndexToFill(final ForgeDirection from, final FluidStack resource) {
for (final TankSlot tank : this.tanks.values()) {
private int getTankIndexToFill(ForgeDirection from, FluidStack resource) {
for (TankSlot tank : tanks.values()) {
if (tank.isValid(resource) && tank.canInsert(from) && (tank.getContent() == null || tank.getContent().isFluidEqual(resource))) {
return tank.getIndex();
}
@@ -91,8 +85,8 @@ public class ComponentTankContainer extends MachineComponent implements ITankMac
return -1;
}
private int getTankIndexToDrain(final ForgeDirection from, final FluidStack resource) {
for (final TankSlot tank : this.tanks.values()) {
private int getTankIndexToDrain(ForgeDirection from, FluidStack resource) {
for (TankSlot tank : tanks.values()) {
if (tank.getContent() != null && tank.canExtract(from) && (resource == null || resource.isFluidEqual(tank.getContent()))) {
return tank.getIndex();
}
@@ -101,26 +95,26 @@ public class ComponentTankContainer extends MachineComponent implements ITankMac
}
@Override
public void readFromNBT(final NBTTagCompound nbttagcompound) {
public void readFromNBT(NBTTagCompound nbttagcompound) {
super.readFromNBT(nbttagcompound);
if (nbttagcompound.hasKey("liquidTanks")) {
final NBTTagList tanksNBT = nbttagcompound.getTagList("liquidTanks", 10);
NBTTagList tanksNBT = nbttagcompound.getTagList("liquidTanks", 10);
for (int i = 0; i < tanksNBT.tagCount(); ++i) {
final NBTTagCompound tankNBT = tanksNBT.getCompoundTagAt(i);
final int index = tankNBT.getInteger("index");
if (this.tanks.containsKey(index)) {
this.tanks.get(index).readFromNBT(tankNBT);
NBTTagCompound tankNBT = tanksNBT.getCompoundTagAt(i);
int index = tankNBT.getInteger("index");
if (tanks.containsKey(index)) {
tanks.get(index).readFromNBT(tankNBT);
}
}
}
}
@Override
public void writeToNBT(final NBTTagCompound nbttagcompound) {
public void writeToNBT(NBTTagCompound nbttagcompound) {
super.writeToNBT(nbttagcompound);
final NBTTagList tanksNBT = new NBTTagList();
for (final Map.Entry<Integer, TankSlot> entry : this.tanks.entrySet()) {
final NBTTagCompound tankNBT = new NBTTagCompound();
NBTTagList tanksNBT = new NBTTagList();
for (Map.Entry<Integer, TankSlot> entry : tanks.entrySet()) {
NBTTagCompound tankNBT = new NBTTagCompound();
tankNBT.setInteger("index", entry.getKey());
entry.getValue().writeToNBT(tankNBT);
tanksNBT.appendTag(tankNBT);
@@ -129,13 +123,13 @@ public class ComponentTankContainer extends MachineComponent implements ITankMac
}
@Override
public boolean isTankReadOnly(final int tank) {
return this.tanks.get(tank).isReadOnly();
public boolean isTankReadOnly(int tank) {
return tanks.get(tank).isReadOnly();
}
@Override
public boolean isLiquidValidForTank(final FluidStack liquid, final int tank) {
final TankSlot slot = this.getTankSlot(tank);
public boolean isLiquidValidForTank(FluidStack liquid, int tank) {
TankSlot slot = getTankSlot(tank);
return slot != null && (slot.isValid(liquid) && !slot.isReadOnly());
}
@@ -145,55 +139,55 @@ public class ComponentTankContainer extends MachineComponent implements ITankMac
}
@Override
public IFluidTank getTank(final int index) {
return this.getTanks()[index];
public IFluidTank getTank(int index) {
return getTanks()[index];
}
@Override
public IFluidTank[] getTanks() {
final List<IFluidTank> ltanks = new ArrayList<IFluidTank>();
for (final TankSlot tank : this.tanks.values()) {
List<IFluidTank> ltanks = new ArrayList<>();
for (TankSlot tank : tanks.values()) {
ltanks.add(tank.getTank());
}
return ltanks.toArray(new IFluidTank[0]);
}
@Override
public TankSlot getTankSlot(final int index) {
return this.tanks.get(index);
public TankSlot getTankSlot(int slot) {
return tanks.get(slot);
}
@Override
public FluidStack drain(final ForgeDirection from, final FluidStack resource, final boolean doDrain) {
final int index = this.getTankIndexToDrain(from, null);
if (this.tanks.containsKey(index)) {
return this.drain(index, resource.amount, doDrain);
public FluidStack drain(ForgeDirection from, FluidStack resource, boolean doDrain) {
int index = getTankIndexToDrain(from, null);
if (tanks.containsKey(index)) {
return drain(index, resource.amount, doDrain);
}
return null;
}
@Override
public boolean canFill(final ForgeDirection from, final Fluid fluid) {
return this.fill(from, new FluidStack(fluid, 1), false) > 0;
public boolean canFill(ForgeDirection from, Fluid fluid) {
return fill(from, new FluidStack(fluid, 1), false) > 0;
}
@Override
public boolean canDrain(final ForgeDirection from, final Fluid fluid) {
return this.drain(from, new FluidStack(fluid, 1), false) != null;
public boolean canDrain(ForgeDirection from, Fluid fluid) {
return drain(from, new FluidStack(fluid, 1), false) != null;
}
@Override
public FluidTankInfo[] getTankInfo(final ForgeDirection from) {
final FluidTankInfo[] info = new FluidTankInfo[this.getTanks().length];
public FluidTankInfo[] getTankInfo(ForgeDirection from) {
FluidTankInfo[] info = new FluidTankInfo[getTanks().length];
for (int i = 0; i < info.length; ++i) {
info[i] = new FluidTankInfo(this.getTanks()[i]);
info[i] = new FluidTankInfo(getTanks()[i]);
}
return info;
}
public void markDirty() {
if (this.getMachine() != null) {
this.getMachine().markDirty();
if (getMachine() != null) {
getMachine().markDirty();
}
}
}
@@ -1,14 +1,9 @@
//
// Decompiled by Procyon v0.5.30
//
package binnie.core.machines.inventory;
public interface IChargedSlots
{
float getCharge(final int p0);
public interface IChargedSlots {
float getCharge(int slot);
void setCharge(final int p0, final float p1);
void setCharge(int slot, float value);
void alterCharge(final int p0, final float p1);
void alterCharge(int slot, float value);
}
@@ -1,12 +1,7 @@
//
// Decompiled by Procyon v0.5.30
//
package binnie.core.machines.inventory;
import net.minecraft.inventory.ISidedInventory;
import net.minecraft.inventory.IInventory;
import net.minecraft.inventory.ISidedInventory;
public interface IInventoryMachine extends IInventory, ISidedInventory, IValidatedInventory
{
public interface IInventoryMachine extends IInventory, ISidedInventory, IValidatedInventory {
}
@@ -1,18 +1,13 @@
//
// Decompiled by Procyon v0.5.30
//
package binnie.core.machines.inventory;
public interface IInventorySlots
{
InventorySlot addSlot(final int p0, final String p1);
public interface IInventorySlots {
InventorySlot addSlot(int index, String unlocalizedName);
InventorySlot[] addSlotArray(final int[] p0, final String p1);
InventorySlot[] addSlotArray(int[] indexes, String unlocalizedName);
InventorySlot getSlot(final int p0);
InventorySlot getSlot(int index);
InventorySlot[] getSlots(final int[] p0);
InventorySlot[] getSlots(int[] indexes);
InventorySlot[] getAllSlots();
}
@@ -1,12 +1,7 @@
//
// Decompiled by Procyon v0.5.30
//
package binnie.core.machines.inventory;
import net.minecraft.inventory.IInventory;
interface IValidatedInventory extends IInventory
{
boolean isReadOnly(final int p0);
interface IValidatedInventory extends IInventory {
boolean isReadOnly(int slot);
}
@@ -1,14 +1,9 @@
//
// Decompiled by Procyon v0.5.30
//
package binnie.core.machines.inventory;
import net.minecraftforge.fluids.FluidStack;
public interface IValidatedTankContainer
{
boolean isTankReadOnly(final int p0);
public interface IValidatedTankContainer {
boolean isTankReadOnly(int tank);
boolean isLiquidValidForTank(final FluidStack p0, final int p1);
boolean isLiquidValidForTank(FluidStack liquid, int tank);
}
@@ -1,109 +1,102 @@
//
// Decompiled by Procyon v0.5.30
//
package binnie.core.machines.inventory;
import binnie.core.BinnieCore;
import binnie.Binnie;
import net.minecraft.nbt.NBTBase;
import net.minecraft.nbt.NBTTagCompound;
import binnie.core.BinnieCore;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
public class InventorySlot extends BaseSlot<ItemStack>
{
public class InventorySlot extends BaseSlot<ItemStack> {
private ItemStack itemStack;
private Type type;
public InventorySlot(final int index, final String unlocName) {
super(index, unlocName);
public InventorySlot(int index, String unlocalizedName) {
super(index, unlocalizedName);
this.itemStack = null;
this.type = Type.Standard;
}
@Override
public ItemStack getContent() {
return this.itemStack;
return itemStack;
}
public ItemStack getItemStack() {
return this.getContent();
return getContent();
}
@Override
public void setContent(final ItemStack itemStack) {
public void setContent(ItemStack itemStack) {
this.itemStack = itemStack;
}
public ItemStack decrStackSize(final int amount) {
if (this.itemStack == null) {
public ItemStack decrStackSize(int amount) {
if (itemStack == null) {
return null;
}
if (this.itemStack.stackSize <= amount) {
final ItemStack returnStack = this.itemStack.copy();
this.itemStack = null;
if (itemStack.stackSize <= amount) {
ItemStack returnStack = itemStack.copy();
itemStack = null;
return returnStack;
}
final ItemStack returnStack = this.itemStack.copy();
final ItemStack itemStack = this.itemStack;
ItemStack returnStack = itemStack.copy();
ItemStack itemStack = this.itemStack;
itemStack.stackSize -= amount;
returnStack.stackSize = amount;
return returnStack;
}
@Override
public void readFromNBT(final NBTTagCompound slotNBT) {
public void readFromNBT(NBTTagCompound slotNBT) {
if (slotNBT.hasKey("item")) {
final NBTTagCompound itemNBT = slotNBT.getCompoundTag("item");
this.itemStack = ItemStack.loadItemStackFromNBT(itemNBT);
}
else {
this.itemStack = null;
NBTTagCompound itemNBT = slotNBT.getCompoundTag("item");
itemStack = ItemStack.loadItemStackFromNBT(itemNBT);
} else {
itemStack = null;
}
}
@Override
public void writeToNBT(final NBTTagCompound slotNBT) {
final NBTTagCompound itemNBT = new NBTTagCompound();
if (this.itemStack != null) {
this.itemStack.writeToNBT(itemNBT);
public void writeToNBT(NBTTagCompound slotNBT) {
NBTTagCompound itemNBT = new NBTTagCompound();
if (itemStack != null) {
itemStack.writeToNBT(itemNBT);
}
slotNBT.setTag("item", itemNBT);
}
public void setItemStack(final ItemStack duplicate) {
this.setContent(duplicate);
public void setItemStack(ItemStack duplicate) {
setContent(duplicate);
}
@Override
public SlotValidator getValidator() {
return (SlotValidator) this.validator;
return (SlotValidator) validator;
}
public void setType(final Type type) {
public void setType(Type type) {
this.type = type;
if (type == Type.Recipe) {
this.setReadOnly();
this.forbidInteraction();
setReadOnly();
forbidInteraction();
}
}
public Type getType() {
return this.type;
return type;
}
public boolean isRecipe() {
return this.type == Type.Recipe;
return type == Type.Recipe;
}
@Override
public String getName() {
return Binnie.Language.localise(BinnieCore.instance, "gui.slot." + this.unlocName);
return Binnie.Language.localise(BinnieCore.instance, "gui.slot." + unlocName);
}
public enum Type
{
public enum Type {
Standard,
Recipe;
Recipe
}
}
@@ -1,29 +1,26 @@
//
// Decompiled by Procyon v0.5.30
//
package binnie.core.machines.inventory;
import java.util.Collection;
import net.minecraftforge.common.util.ForgeDirection;
import java.util.Collection;
import java.util.EnumSet;
public class MachineSide
{
private static EnumSet<ForgeDirection> All;
public static EnumSet<ForgeDirection> TopAndBottom;
public static EnumSet<ForgeDirection> None;
public static EnumSet<ForgeDirection> Top;
public static EnumSet<ForgeDirection> Bottom;
public static EnumSet<ForgeDirection> Sides;
public class MachineSide {
private static EnumSet<ForgeDirection> All = EnumSet.of(ForgeDirection.UP, ForgeDirection.DOWN, ForgeDirection.NORTH, ForgeDirection.SOUTH, ForgeDirection.EAST, ForgeDirection.WEST);
public static EnumSet<ForgeDirection> TopAndBottom = EnumSet.of(ForgeDirection.UP, ForgeDirection.DOWN);
public static EnumSet<ForgeDirection> None = EnumSet.noneOf(ForgeDirection.class);
public static EnumSet<ForgeDirection> Top = EnumSet.of(ForgeDirection.UP);
public static EnumSet<ForgeDirection> Bottom = EnumSet.of(ForgeDirection.DOWN);
public static EnumSet<ForgeDirection> Sides = EnumSet.of(ForgeDirection.NORTH, ForgeDirection.SOUTH, ForgeDirection.EAST, ForgeDirection.WEST);
public static String asString(final Collection<ForgeDirection> sides) {
public static String asString(Collection<ForgeDirection> sides) {
if (sides.containsAll(MachineSide.All)) {
return "Any";
}
if (sides.isEmpty()) {
return "None";
}
String text = "";
if (sides.contains(ForgeDirection.UP)) {
if (sides.size() > 0) {
@@ -31,37 +28,41 @@ public class MachineSide
}
text += "Up";
}
if (sides.contains(ForgeDirection.DOWN)) {
if (sides.size() > 0) {
text += ", ";
}
text += "Down";
}
if (sides.containsAll(MachineSide.Sides)) {
if (sides.size() > 0) {
text += ", ";
}
text += "Sides";
}
else {
} else {
if (sides.contains(ForgeDirection.NORTH)) {
if (sides.size() > 0) {
text += ", ";
}
text += "North";
}
if (sides.contains(ForgeDirection.EAST)) {
if (sides.size() > 0) {
text += ", ";
}
text += "East";
}
if (sides.contains(ForgeDirection.SOUTH)) {
if (sides.size() > 0) {
text += ", ";
}
text += "South";
}
if (sides.contains(ForgeDirection.WEST)) {
if (sides.size() > 0) {
text += ", ";
@@ -71,13 +72,4 @@ public class MachineSide
}
return text;
}
static {
MachineSide.All = EnumSet.of(ForgeDirection.UP, ForgeDirection.DOWN, ForgeDirection.NORTH, ForgeDirection.SOUTH, ForgeDirection.EAST, ForgeDirection.WEST);
MachineSide.TopAndBottom = EnumSet.of(ForgeDirection.UP, ForgeDirection.DOWN);
MachineSide.None = EnumSet.noneOf(ForgeDirection.class);
MachineSide.Top = EnumSet.of(ForgeDirection.UP);
MachineSide.Bottom = EnumSet.of(ForgeDirection.DOWN);
MachineSide.Sides = EnumSet.of(ForgeDirection.NORTH, ForgeDirection.SOUTH, ForgeDirection.EAST, ForgeDirection.WEST);
}
}
@@ -1,37 +1,32 @@
//
// Decompiled by Procyon v0.5.30
//
package binnie.core.machines.inventory;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Set;
import java.util.ArrayList;
public class SetList<E> extends ArrayList<E> implements Set<E>
{
private static final long serialVersionUID = 1277112003159980135L;
public class SetList<E> extends ArrayList<E> implements Set<E> {
private static long serialVersionUID = 1277112003159980135L;
@Override
public boolean add(final E e) {
return !this.contains(e) && super.add(e);
public boolean add(E e) {
return !contains(e) && super.add(e);
}
@Override
public void add(final int index, final E e) {
if (!this.contains(e)) {
public void add(int index, E e) {
if (!contains(e)) {
super.add(index, e);
}
}
@Override
public boolean addAll(final Collection<? extends E> c) {
return this.addAll(this.size(), c);
public boolean addAll(Collection<? extends E> c) {
return addAll(size(), c);
}
@Override
public boolean addAll(final int index, final Collection<? extends E> c) {
final Collection<E> copy = new ArrayList<E>(c);
public boolean addAll(int index, Collection<? extends E> c) {
Collection<E> copy = new ArrayList<>(c);
copy.removeAll(this);
return super.addAll(index, copy);
}
@@ -1,66 +1,59 @@
//
// Decompiled by Procyon v0.5.30
//
package binnie.core.machines.inventory;
import java.util.List;
import net.minecraftforge.common.util.ForgeDirection;
import java.util.ArrayList;
import java.util.Collection;
import java.util.HashMap;
import net.minecraftforge.common.util.ForgeDirection;
import java.util.List;
import java.util.Map;
class SidedAccess
{
private Map<ForgeDirection, AccessDirection> accesses;
private AccessDirection base;
class SidedAccess {
private Map<ForgeDirection, AccessDirection> accesses = new HashMap<>();
private AccessDirection base = AccessDirection.Both;
private boolean insertLocked;
private boolean extractLocked;
public SidedAccess() {
this.accesses = new HashMap<ForgeDirection, AccessDirection>();
this.base = AccessDirection.Both;
this.insertLocked = false;
this.extractLocked = false;
// ignored
}
public AccessDirection getAccess(final ForgeDirection side) {
return this.accesses.containsKey(side) ? this.accesses.get(side) : this.base;
public AccessDirection getAccess(ForgeDirection side) {
return accesses.containsKey(side) ? accesses.get(side) : base;
}
public boolean canInsert(final ForgeDirection side) {
return this.getAccess(side).canInsert();
public boolean canInsert(ForgeDirection side) {
return getAccess(side).canInsert();
}
public boolean canExtract(final ForgeDirection side) {
return this.getAccess(side).canExtract();
public boolean canExtract(ForgeDirection side) {
return getAccess(side).canExtract();
}
public boolean canAccess(final ForgeDirection side) {
return this.getAccess(side).canAccess();
public boolean canAccess(ForgeDirection side) {
return getAccess(side).canAccess();
}
public boolean canChangeInsert() {
return !this.insertLocked;
return !insertLocked;
}
public boolean canChangeExtract() {
return !this.extractLocked;
return !extractLocked;
}
public void forbidInsertChange() {
this.insertLocked = true;
insertLocked = true;
}
public void forbidExtractChange() {
this.extractLocked = true;
extractLocked = true;
}
public Collection<ForgeDirection> getInsertionSides() {
final List<ForgeDirection> dirs = new ArrayList<ForgeDirection>();
for (final ForgeDirection dir : ForgeDirection.VALID_DIRECTIONS) {
if (this.getAccess(dir).canInsert()) {
List<ForgeDirection> dirs = new ArrayList<>();
for (ForgeDirection dir : ForgeDirection.VALID_DIRECTIONS) {
if (getAccess(dir).canInsert()) {
dirs.add(dir);
}
}
@@ -68,36 +61,36 @@ class SidedAccess
}
public Collection<ForgeDirection> getExtractionSides() {
final List<ForgeDirection> dirs = new ArrayList<ForgeDirection>();
for (final ForgeDirection dir : ForgeDirection.VALID_DIRECTIONS) {
if (this.getAccess(dir).canExtract()) {
List<ForgeDirection> dirs = new ArrayList<>();
for (ForgeDirection dir : ForgeDirection.VALID_DIRECTIONS) {
if (getAccess(dir).canExtract()) {
dirs.add(dir);
}
}
return dirs;
}
public void setInsert(final ForgeDirection side, final boolean b) {
if (this.getAccess(side).canInsert() != b) {
this.accesses.put(side, this.getAccess(side).changeInsert(b));
public void setInsert(ForgeDirection side, boolean b) {
if (getAccess(side).canInsert() != b) {
accesses.put(side, getAccess(side).changeInsert(b));
}
}
public void setExtract(final ForgeDirection side, final boolean b) {
if (this.getAccess(side).canExtract() != b) {
this.accesses.put(side, this.getAccess(side).changeExtract(b));
public void setExtract(ForgeDirection side, boolean b) {
if (getAccess(side).canExtract() != b) {
accesses.put(side, getAccess(side).changeExtract(b));
}
}
public void setInsert(final boolean b) {
if (this.base.canInsert() != b) {
this.base = this.base.changeInsert(b);
public void setInsert(boolean b) {
if (base.canInsert() != b) {
base = base.changeInsert(b);
}
}
public void setExtract(final boolean b) {
if (this.base.canExtract() != b) {
this.base = this.base.changeExtract(b);
public void setExtract(boolean b) {
if (base.canExtract() != b) {
base = base.changeExtract(b);
}
}
}
@@ -1,57 +1,53 @@
//
// Decompiled by Procyon v0.5.30
//
package binnie.core.machines.inventory;
import forestry.api.genetics.AlleleManager;
import net.minecraft.util.IIcon;
import net.minecraft.item.ItemStack;
import net.minecraft.util.IIcon;
public abstract class SlotValidator extends Validator<ItemStack>
{
public abstract class SlotValidator extends Validator<ItemStack> {
public static ValidatorIcon IconBee;
public static ValidatorIcon IconFrame;
public static ValidatorIcon IconCircuit;
public static ValidatorIcon IconBlock;
private ValidatorIcon icon;
public SlotValidator(final ValidatorIcon icon) {
public SlotValidator(ValidatorIcon icon) {
this.icon = icon;
}
public IIcon getIcon(final boolean input) {
return (this.icon == null) ? null : this.icon.getIcon(input).getIcon();
public IIcon getIcon(boolean input) {
if (icon == null) {
return null;
}
return icon.getIcon(input).getIcon();
}
public static class Item extends SlotValidator
{
public static class Item extends SlotValidator {
private ItemStack target;
public Item(final ItemStack target, final ValidatorIcon icon) {
public Item(ItemStack target, ValidatorIcon icon) {
super(icon);
this.target = target;
}
@Override
public boolean isValid(final ItemStack itemStack) {
return itemStack.isItemEqual(this.target);
public boolean isValid(ItemStack itemStack) {
return itemStack.isItemEqual(target);
}
@Override
public String getTooltip() {
return this.target.getDisplayName();
return target.getDisplayName();
}
}
public static class Individual extends SlotValidator
{
public static class Individual extends SlotValidator {
public Individual() {
super(null);
}
@Override
public boolean isValid(final ItemStack itemStack) {
public boolean isValid(ItemStack itemStack) {
return AlleleManager.alleleRegistry.getIndividual(itemStack) != null;
}
Loaded 100 of 241 files, more files were not shown because too many files have changed in this diff. Show more