Optimize imports

This commit is contained in:
Nedelosk committed 2017-06-15 23:11:48 +02:00
1 parent f1df70aeec
commit 10e641506e
801 files changed
+5090 -3876

No files matched your search

+30 -25
View File
@@ -1,5 +1,35 @@
package binnie.extratrees;
import com.google.common.base.Preconditions;
import javax.annotation.Nullable;
import java.util.Arrays;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
import net.minecraft.client.Minecraft;
import net.minecraft.client.renderer.block.model.ModelResourceLocation;
import net.minecraft.client.renderer.texture.TextureMap;
import net.minecraftforge.client.event.ModelBakeEvent;
import net.minecraftforge.client.event.TextureStitchEvent;
import net.minecraftforge.common.MinecraftForge;
import net.minecraftforge.fml.common.Mod;
import net.minecraftforge.fml.common.SidedProxy;
import net.minecraftforge.fml.common.event.FMLConstructionEvent;
import net.minecraftforge.fml.common.event.FMLInitializationEvent;
import net.minecraftforge.fml.common.event.FMLPostInitializationEvent;
import net.minecraftforge.fml.common.event.FMLPreInitializationEvent;
import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
import forestry.api.arboriculture.ITreeRoot;
import forestry.api.genetics.AlleleSpeciesRegisterEvent;
import forestry.api.lepidopterology.IButterflyRoot;
import binnie.Constants;
import binnie.core.AbstractMod;
import binnie.core.BinnieCore;
@@ -23,31 +53,6 @@ import binnie.extratrees.item.ModuleItems;
import binnie.extratrees.kitchen.ModuleKitchen;
import binnie.extratrees.machines.ModuleMachine;
import binnie.extratrees.proxy.Proxy;
import com.google.common.base.Preconditions;
import forestry.api.arboriculture.ITreeRoot;
import forestry.api.genetics.AlleleSpeciesRegisterEvent;
import forestry.api.lepidopterology.IButterflyRoot;
import net.minecraft.client.Minecraft;
import net.minecraft.client.renderer.block.model.ModelResourceLocation;
import net.minecraft.client.renderer.texture.TextureMap;
import net.minecraftforge.client.event.ModelBakeEvent;
import net.minecraftforge.client.event.TextureStitchEvent;
import net.minecraftforge.common.MinecraftForge;
import net.minecraftforge.fml.common.Mod;
import net.minecraftforge.fml.common.SidedProxy;
import net.minecraftforge.fml.common.event.FMLConstructionEvent;
import net.minecraftforge.fml.common.event.FMLInitializationEvent;
import net.minecraftforge.fml.common.event.FMLPostInitializationEvent;
import net.minecraftforge.fml.common.event.FMLPreInitializationEvent;
import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
import javax.annotation.Nullable;
import java.util.Arrays;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
@Mod(modid = Constants.EXTRA_TREES_MOD_ID, name = "Binnie's Extra Trees", useMetadata = true, dependencies = "required-after:" + Constants.CORE_MOD_ID)
public class ExtraTrees extends AbstractMod {
@@ -1,15 +1,17 @@
package binnie.extratrees.alcohol;
import java.util.ArrayList;
import java.util.List;
import net.minecraft.util.ResourceLocation;
import net.minecraftforge.fluids.FluidStack;
import binnie.Binnie;
import binnie.Constants;
import binnie.core.liquid.FluidContainerType;
import binnie.core.liquid.IFluidType;
import binnie.extratrees.ExtraTrees;
import net.minecraft.util.ResourceLocation;
import net.minecraftforge.fluids.FluidStack;
import java.util.ArrayList;
import java.util.List;
public enum Alcohol implements IFluidType, ICocktailLiquid {
Apple("cider.apple", 16432700, 0.3, 0.05),
@@ -1,13 +1,13 @@
package binnie.extratrees.alcohol;
import binnie.extratrees.alcohol.drink.DrinkLiquid;
import binnie.extratrees.alcohol.drink.DrinkManager;
import javax.annotation.Nullable;
import java.util.HashMap;
import java.util.Map;
import java.util.Objects;
import binnie.extratrees.alcohol.drink.DrinkLiquid;
import binnie.extratrees.alcohol.drink.DrinkManager;
public enum Cocktail {
Bellini("Bellini", Glassware.Flute, 15974764),
BlackRussian("Black Russian", Glassware.OldFashioned, 3347992),
@@ -1,10 +1,11 @@
package binnie.extratrees.alcohol;
import javax.annotation.Nullable;
import net.minecraft.item.ItemStack;
import binnie.Binnie;
import binnie.extratrees.ExtraTrees;
import net.minecraft.item.ItemStack;
import javax.annotation.Nullable;
public enum Glassware {
BeerMug(480, 10, 14),
@@ -1,11 +1,13 @@
package binnie.extratrees.alcohol;
import net.minecraft.util.ResourceLocation;
import net.minecraftforge.fluids.FluidStack;
import binnie.Binnie;
import binnie.Constants;
import binnie.core.liquid.FluidContainerType;
import binnie.core.liquid.IFluidType;
import net.minecraft.util.ResourceLocation;
import net.minecraftforge.fluids.FluidStack;
public enum Juice implements IFluidType, ICocktailLiquid {
Apple("Apple Juice", "juice.apple", 16763442, 0.7, "Apple"),
@@ -1,11 +1,13 @@
package binnie.extratrees.alcohol;
import net.minecraft.util.ResourceLocation;
import net.minecraftforge.fluids.FluidStack;
import binnie.Binnie;
import binnie.Constants;
import binnie.core.liquid.FluidContainerType;
import binnie.core.liquid.IFluidType;
import net.minecraft.util.ResourceLocation;
import net.minecraftforge.fluids.FluidStack;
public enum Liqueur implements IFluidType, ICocktailLiquid {
Almond("Almond", 14966063, 0.3, 0.2),
@@ -1,11 +1,13 @@
package binnie.extratrees.alcohol;
import net.minecraft.util.ResourceLocation;
import net.minecraftforge.fluids.FluidStack;
import binnie.Binnie;
import binnie.Constants;
import binnie.core.liquid.FluidContainerType;
import binnie.core.liquid.IFluidType;
import net.minecraft.util.ResourceLocation;
import net.minecraftforge.fluids.FluidStack;
public enum MiscFluid implements IFluidType, ICocktailLiquid {
CarbonatedWater("Carbonated Water", "water.carbonated", 13421823, 0.10000000149011612),
@@ -1,5 +1,19 @@
package binnie.extratrees.alcohol;
import java.util.ArrayList;
import java.util.List;
import java.util.Objects;
import net.minecraft.block.Block;
import net.minecraft.item.ItemStack;
import net.minecraftforge.fluids.Fluid;
import net.minecraftforge.fluids.FluidStack;
import net.minecraftforge.oredict.OreDictionary;
import forestry.api.recipes.ISqueezerRecipe;
import forestry.api.recipes.RecipeManagers;
import binnie.Binnie;
import binnie.core.IInitializable;
import binnie.core.liquid.IFluidType;
@@ -15,17 +29,6 @@ import binnie.extratrees.machines.brewery.BreweryRecipes;
import binnie.extratrees.machines.distillery.DistilleryLogic;
import binnie.extratrees.machines.distillery.DistilleryRecipes;
import binnie.extratrees.machines.fruitpress.FruitPressRecipes;
import forestry.api.recipes.ISqueezerRecipe;
import forestry.api.recipes.RecipeManagers;
import net.minecraft.block.Block;
import net.minecraft.item.ItemStack;
import net.minecraftforge.fluids.Fluid;
import net.minecraftforge.fluids.FluidStack;
import net.minecraftforge.oredict.OreDictionary;
import java.util.ArrayList;
import java.util.List;
import java.util.Objects;
public class ModuleAlcohol implements IInitializable {
public ItemDrink drink;
@@ -1,11 +1,13 @@
package binnie.extratrees.alcohol;
import net.minecraft.util.ResourceLocation;
import net.minecraftforge.fluids.FluidStack;
import binnie.Binnie;
import binnie.Constants;
import binnie.core.liquid.FluidContainerType;
import binnie.core.liquid.IFluidType;
import net.minecraft.util.ResourceLocation;
import net.minecraftforge.fluids.FluidStack;
public enum Spirit implements IFluidType, ICocktailLiquid {
NeutralSpirit("Neutral Spirit", "spirit.neutral", 16777215, 0.05, 0.8),
@@ -1,8 +1,9 @@
package binnie.extratrees.alcohol.drink;
import binnie.Binnie;
import net.minecraftforge.fluids.FluidStack;
import binnie.Binnie;
public class DrinkLiquid implements IDrinkLiquid {
private final String name;
private final int colour;
@@ -1,12 +1,12 @@
package binnie.extratrees.alcohol.drink;
import net.minecraftforge.fluids.Fluid;
import net.minecraftforge.fluids.FluidStack;
import javax.annotation.Nullable;
import java.util.HashMap;
import java.util.Map;
import net.minecraftforge.fluids.Fluid;
import net.minecraftforge.fluids.FluidStack;
public class DrinkManager {
private static final Map<String, IDrinkLiquid> DRINK_LIQUIDS = new HashMap<>();
@@ -1,11 +1,13 @@
package binnie.extratrees.alcohol.drink;
import binnie.extratrees.alcohol.Glassware;
import net.minecraft.item.ItemStack;
import net.minecraftforge.fluids.Fluid;
import net.minecraftforge.fluids.FluidStack;
import net.minecraftforge.fluids.capability.templates.FluidHandlerItemStackSimple;
import binnie.extratrees.alcohol.Glassware;
// TODO implement cocktails and only allow glassware to hold the correct cocktails.
public class FluidHandlerItemGlassware extends FluidHandlerItemStackSimple {
@@ -1,8 +1,7 @@
package binnie.extratrees.alcohol.drink;
import binnie.extratrees.alcohol.Alcohol;
import binnie.extratrees.alcohol.Glassware;
import forestry.api.core.Tabs;
import javax.annotation.Nullable;
import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.item.EnumAction;
import net.minecraft.item.Item;
@@ -10,13 +9,18 @@ import net.minecraft.item.ItemFood;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.util.NonNullList;
import net.minecraftforge.common.capabilities.ICapabilityProvider;
import net.minecraftforge.fluids.FluidStack;
import net.minecraftforge.fluids.FluidUtil;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
import javax.annotation.Nullable;
import forestry.api.core.Tabs;
import binnie.extratrees.alcohol.Alcohol;
import binnie.extratrees.alcohol.Glassware;
public class ItemDrink extends ItemFood {
public ItemDrink() {
@@ -3,7 +3,7 @@
@FieldsAreNonnullByDefault
package binnie.extratrees.alcohol.drink;
import binnie.core.util.FieldsAreNonnullByDefault;
import mcp.MethodsReturnNonnullByDefault;
import javax.annotation.ParametersAreNonnullByDefault;
import javax.annotation.ParametersAreNonnullByDefault;
import binnie.core.util.FieldsAreNonnullByDefault;
import mcp.MethodsReturnNonnullByDefault;
@@ -3,7 +3,7 @@
@FieldsAreNonnullByDefault
package binnie.extratrees.alcohol;
import binnie.core.util.FieldsAreNonnullByDefault;
import mcp.MethodsReturnNonnullByDefault;
import javax.annotation.ParametersAreNonnullByDefault;
import javax.annotation.ParametersAreNonnullByDefault;
import binnie.core.util.FieldsAreNonnullByDefault;
import mcp.MethodsReturnNonnullByDefault;
@@ -1,11 +1,11 @@
package binnie.extratrees.api;
import net.minecraft.item.ItemStack;
import javax.annotation.Nullable;
import java.util.Collection;
import java.util.List;
import net.minecraft.item.ItemStack;
public interface ICarpentryInterface {
boolean registerCarpentryWood(final int index, final IDesignMaterial material);
@@ -1,12 +1,13 @@
package binnie.extratrees.api;
import javax.annotation.Nullable;
import net.minecraft.client.renderer.texture.TextureAtlasSprite;
import net.minecraft.item.ItemStack;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
import javax.annotation.Nullable;
public interface IDesignSystem {
@Nullable
@SideOnly(Side.CLIENT)
@@ -1,6 +1,7 @@
package binnie.extratrees.api;
import net.minecraft.client.renderer.texture.TextureAtlasSprite;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
@@ -1,10 +1,12 @@
package binnie.extratrees.api;
import forestry.api.core.ISpriteRegister;
import net.minecraft.client.renderer.texture.TextureAtlasSprite;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
import forestry.api.core.ISpriteRegister;
public interface IPattern extends ISpriteRegister {
@SideOnly(Side.CLIENT)
TextureAtlasSprite getPrimarySprite(IDesignSystem system);
@@ -2,6 +2,6 @@
@MethodsReturnNonnullByDefault
package binnie.extratrees.api;
import mcp.MethodsReturnNonnullByDefault;
import javax.annotation.ParametersAreNonnullByDefault;
import javax.annotation.ParametersAreNonnullByDefault;
import mcp.MethodsReturnNonnullByDefault;
@@ -1,15 +1,10 @@
package binnie.extratrees.block;
import binnie.Constants;
import binnie.extratrees.block.property.PropertyETType;
import binnie.extratrees.genetics.ETTreeDefinition;
import forestry.api.arboriculture.IFruitProvider;
import forestry.api.arboriculture.ITreeGenome;
import forestry.api.core.IItemModelRegister;
import forestry.api.core.IModelManager;
import forestry.api.core.Tabs;
import forestry.core.blocks.IColoredBlock;
import forestry.core.proxy.Proxies;
import javax.annotation.Nullable;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import net.minecraft.block.Block;
import net.minecraft.block.SoundType;
import net.minecraft.block.material.Material;
@@ -29,15 +24,24 @@ import net.minecraft.util.ResourceLocation;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.IBlockAccess;
import net.minecraft.world.World;
import net.minecraftforge.client.model.ModelLoader;
import net.minecraftforge.common.IShearable;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
import javax.annotation.Nullable;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import forestry.api.arboriculture.IFruitProvider;
import forestry.api.arboriculture.ITreeGenome;
import forestry.api.core.IItemModelRegister;
import forestry.api.core.IModelManager;
import forestry.api.core.Tabs;
import forestry.core.blocks.IColoredBlock;
import forestry.core.proxy.Proxies;
import binnie.Constants;
import binnie.extratrees.block.property.PropertyETType;
import binnie.extratrees.genetics.ETTreeDefinition;
public abstract class BlockETDecorativeLeaves extends Block implements IItemModelRegister, IColoredBlock, IShearable {
private static final int VARIANTS_PER_BLOCK = 16;
@@ -1,11 +1,7 @@
package binnie.extratrees.block;
import binnie.Binnie;
import binnie.core.block.BlockMetadata;
import binnie.core.block.IBlockMetadata;
import binnie.core.block.TileEntityMetadata;
import binnie.extratrees.ExtraTrees;
import forestry.api.core.Tabs;
import java.util.List;
import net.minecraft.block.BlockDoor;
import net.minecraft.block.ITileEntityProvider;
import net.minecraft.block.SoundType;
@@ -22,10 +18,17 @@ import net.minecraft.util.math.BlockPos;
import net.minecraft.util.math.RayTraceResult;
import net.minecraft.world.IBlockAccess;
import net.minecraft.world.World;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
import java.util.List;
import forestry.api.core.Tabs;
import binnie.Binnie;
import binnie.core.block.BlockMetadata;
import binnie.core.block.IBlockMetadata;
import binnie.core.block.TileEntityMetadata;
import binnie.extratrees.ExtraTrees;
public class BlockETDoor extends BlockDoor implements IBlockMetadata, ITileEntityProvider {
/*private IIcon getFlippedIcon(final boolean upper, final boolean flip, final int tileMeta) {
@@ -1,13 +1,16 @@
package binnie.extratrees.block;
import binnie.Constants;
import java.util.Locale;
import net.minecraft.item.ItemStack;
import net.minecraftforge.fml.common.registry.GameRegistry;
import forestry.api.arboriculture.IWoodType;
import forestry.api.arboriculture.TreeManager;
import forestry.api.arboriculture.WoodBlockKind;
import net.minecraft.item.ItemStack;
import net.minecraftforge.fml.common.registry.GameRegistry;
import java.util.Locale;
import binnie.Constants;
public enum EnumETLog implements IWoodType {
Apple("Apple", PlankType.ExtraTreePlanks.Apple),
@@ -1,12 +1,15 @@
package binnie.extratrees.block;
import binnie.extratrees.api.IDesignMaterial;
import forestry.api.arboriculture.IWoodType;
import net.minecraft.client.renderer.texture.TextureAtlasSprite;
import net.minecraft.client.renderer.texture.TextureMap;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
import forestry.api.arboriculture.IWoodType;
import binnie.extratrees.api.IDesignMaterial;
public interface IPlankType extends IDesignMaterial {
String getPlankTextureName();
@@ -1,8 +1,9 @@
package binnie.extratrees.block;
import forestry.api.arboriculture.WoodBlockKind;
import net.minecraft.block.properties.PropertyEnum;
import forestry.api.arboriculture.WoodBlockKind;
public interface IWoodKind {
PropertyEnum<EnumETLog> getVariant();
@@ -1,6 +1,11 @@
package binnie.extratrees.block;
import binnie.extratrees.genetics.ETTreeDefinition;
import net.minecraft.block.Block;
import net.minecraft.item.ItemStack;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
import forestry.api.arboriculture.IFruitProvider;
import forestry.api.arboriculture.ITreeGenome;
import forestry.arboriculture.PluginArboriculture;
@@ -8,10 +13,8 @@ import forestry.arboriculture.items.ItemBlockLeaves;
import forestry.core.items.IColoredItem;
import forestry.core.items.ItemBlockForestry;
import forestry.core.utils.Translator;
import net.minecraft.block.Block;
import net.minecraft.item.ItemStack;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
import binnie.extratrees.genetics.ETTreeDefinition;
public class ItemBlockETDecorativeLeaves extends ItemBlockForestry<BlockETDecorativeLeaves> implements IColoredItem {
public ItemBlockETDecorativeLeaves(Block block) {
@@ -1,6 +1,5 @@
package binnie.extratrees.block;
import binnie.core.block.ItemMetadata;
import net.minecraft.block.Block;
import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.entity.player.EntityPlayer;
@@ -11,6 +10,8 @@ import net.minecraft.util.EnumHand;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.World;
import binnie.core.block.ItemMetadata;
public class ItemETDoor extends ItemMetadata {
/*@Override
@SideOnly(Side.CLIENT)
@@ -1,21 +1,24 @@
package binnie.extratrees.block;
import binnie.Constants;
import binnie.extratrees.ExtraTrees;
import binnie.extratrees.api.CarpentryManager;
import forestry.api.arboriculture.EnumForestryWoodType;
import forestry.api.arboriculture.EnumVanillaWoodType;
import forestry.api.arboriculture.IWoodType;
import forestry.api.arboriculture.TreeManager;
import forestry.api.arboriculture.WoodBlockKind;
import net.minecraft.client.renderer.texture.TextureAtlasSprite;
import net.minecraft.client.renderer.texture.TextureMap;
import net.minecraft.item.ItemStack;
import net.minecraft.util.IStringSerializable;
import net.minecraft.util.ResourceLocation;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
import forestry.api.arboriculture.EnumForestryWoodType;
import forestry.api.arboriculture.EnumVanillaWoodType;
import forestry.api.arboriculture.IWoodType;
import forestry.api.arboriculture.TreeManager;
import forestry.api.arboriculture.WoodBlockKind;
import binnie.Constants;
import binnie.extratrees.ExtraTrees;
import binnie.extratrees.api.CarpentryManager;
public class PlankType {
public static final int MAX_PLANKS = 256;
@@ -1,20 +1,5 @@
package binnie.extratrees.block;
import binnie.core.block.TileEntityMetadata;
import binnie.extratrees.ExtraTrees;
import binnie.extratrees.api.CarpentryManager;
import binnie.extratrees.api.IDesignMaterial;
import binnie.extratrees.block.decor.FenceDescription;
import binnie.extratrees.block.decor.FenceType;
import forestry.api.arboriculture.IWoodType;
import forestry.api.arboriculture.TreeManager;
import forestry.api.arboriculture.WoodBlockKind;
import forestry.arboriculture.IWoodTyped;
import forestry.core.utils.Translator;
import net.minecraft.init.Blocks;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import javax.annotation.Nullable;
import java.util.ArrayList;
import java.util.Collection;
@@ -23,6 +8,23 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
import net.minecraft.init.Blocks;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import forestry.api.arboriculture.IWoodType;
import forestry.api.arboriculture.TreeManager;
import forestry.api.arboriculture.WoodBlockKind;
import forestry.arboriculture.IWoodTyped;
import forestry.core.utils.Translator;
import binnie.core.block.TileEntityMetadata;
import binnie.extratrees.ExtraTrees;
import binnie.extratrees.api.CarpentryManager;
import binnie.extratrees.api.IDesignMaterial;
import binnie.extratrees.block.decor.FenceDescription;
import binnie.extratrees.block.decor.FenceType;
public class WoodManager {
public static Map<IPlankType, ItemStack> PLANKS;
@@ -1,9 +1,8 @@
package binnie.extratrees.block.decor;
import forestry.api.arboriculture.EnumLeafType;
import forestry.api.core.Tabs;
import forestry.arboriculture.PluginArboriculture;
import forestry.core.blocks.IColoredBlock;
import javax.annotation.Nullable;
import java.util.List;
import net.minecraft.block.Block;
import net.minecraft.block.BlockFence;
import net.minecraft.block.BlockFenceGate;
@@ -21,11 +20,14 @@ import net.minecraft.util.math.BlockPos;
import net.minecraft.world.ColorizerFoliage;
import net.minecraft.world.IBlockAccess;
import net.minecraft.world.World;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
import javax.annotation.Nullable;
import java.util.List;
import forestry.api.arboriculture.EnumLeafType;
import forestry.api.core.Tabs;
import forestry.arboriculture.PluginArboriculture;
import forestry.core.blocks.IColoredBlock;
public class BlockHedge extends Block implements IBlockFence, IColoredBlock {
public BlockHedge() {
@@ -1,23 +1,8 @@
package binnie.extratrees.block.decor;
import binnie.core.block.BlockMetadata;
import binnie.core.block.IBlockMetadata;
import binnie.core.block.TileEntityMetadata;
import binnie.core.models.DefaultStateMapper;
import binnie.core.models.ModelManager;
import binnie.extratrees.ExtraTrees;
import binnie.extratrees.block.IPlankType;
import binnie.extratrees.block.PlankType;
import binnie.extratrees.block.WoodManager;
import binnie.extratrees.models.ModelMultiFence;
import forestry.api.core.IItemModelRegister;
import forestry.api.core.IModelManager;
import forestry.api.core.IStateMapperRegister;
import forestry.api.core.Tabs;
import forestry.arboriculture.PluginArboriculture;
import forestry.core.blocks.properties.UnlistedBlockAccess;
import forestry.core.blocks.properties.UnlistedBlockPos;
import forestry.core.models.BlockModelEntry;
import javax.annotation.Nullable;
import java.util.List;
import net.minecraft.block.Block;
import net.minecraft.block.BlockFence;
import net.minecraft.block.BlockFenceGate;
@@ -43,15 +28,34 @@ import net.minecraft.util.math.BlockPos;
import net.minecraft.util.math.RayTraceResult;
import net.minecraft.world.IBlockAccess;
import net.minecraft.world.World;
import net.minecraftforge.client.model.ModelLoader;
import net.minecraftforge.common.property.ExtendedBlockState;
import net.minecraftforge.common.property.IExtendedBlockState;
import net.minecraftforge.common.property.IUnlistedProperty;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
import javax.annotation.Nullable;
import java.util.List;
import forestry.api.core.IItemModelRegister;
import forestry.api.core.IModelManager;
import forestry.api.core.IStateMapperRegister;
import forestry.api.core.Tabs;
import forestry.arboriculture.PluginArboriculture;
import forestry.core.blocks.properties.UnlistedBlockAccess;
import forestry.core.blocks.properties.UnlistedBlockPos;
import forestry.core.models.BlockModelEntry;
import binnie.core.block.BlockMetadata;
import binnie.core.block.IBlockMetadata;
import binnie.core.block.TileEntityMetadata;
import binnie.core.models.DefaultStateMapper;
import binnie.core.models.ModelManager;
import binnie.extratrees.ExtraTrees;
import binnie.extratrees.block.IPlankType;
import binnie.extratrees.block.PlankType;
import binnie.extratrees.block.WoodManager;
import binnie.extratrees.models.ModelMultiFence;
public class BlockMultiFence extends BlockFence implements IBlockMetadata, IStateMapperRegister, IItemModelRegister, IBlockFence {
public BlockMultiFence() {
@@ -1,11 +1,11 @@
package binnie.extratrees.block.decor;
import binnie.extratrees.ExtraTrees;
import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
import binnie.extratrees.ExtraTrees;
public class FenceType {
public static List<FenceType> VALUES;
@@ -1,15 +1,17 @@
package binnie.extratrees.block.decor;
import binnie.extratrees.block.IPlankType;
import binnie.extratrees.block.WoodManager;
import net.minecraft.init.Blocks;
import net.minecraft.inventory.InventoryCrafting;
import net.minecraft.item.ItemStack;
import net.minecraft.item.crafting.IRecipe;
import net.minecraft.util.NonNullList;
import net.minecraft.world.World;
import net.minecraftforge.common.ForgeHooks;
import binnie.extratrees.block.IPlankType;
import binnie.extratrees.block.WoodManager;
public class MultiFenceRecipeEmbedded implements IRecipe {
private ItemStack cached = ItemStack.EMPTY;
@@ -1,8 +1,9 @@
package binnie.extratrees.block.decor;
import net.minecraft.item.ItemStack;
import binnie.extratrees.block.IPlankType;
import binnie.extratrees.block.WoodManager;
import net.minecraft.item.ItemStack;
public class MultiFenceRecipePattern {
public static MultiFenceRecipePattern[] VALUES;
@@ -1,17 +1,19 @@
package binnie.extratrees.block.decor;
import binnie.extratrees.block.IPlankType;
import binnie.extratrees.block.WoodManager;
import java.util.ArrayList;
import java.util.List;
import net.minecraft.init.Blocks;
import net.minecraft.inventory.InventoryCrafting;
import net.minecraft.item.ItemStack;
import net.minecraft.item.crafting.IRecipe;
import net.minecraft.util.NonNullList;
import net.minecraft.world.World;
import net.minecraftforge.common.ForgeHooks;
import java.util.ArrayList;
import java.util.List;
import binnie.extratrees.block.IPlankType;
import binnie.extratrees.block.WoodManager;
public class MultiFenceRecipeSize implements IRecipe {
private ItemStack cached = ItemStack.EMPTY;
@@ -1,14 +1,16 @@
package binnie.extratrees.block.decor;
import binnie.extratrees.block.WoodManager;
import net.minecraft.init.Blocks;
import net.minecraft.inventory.InventoryCrafting;
import net.minecraft.item.ItemStack;
import net.minecraft.item.crafting.IRecipe;
import net.minecraft.util.NonNullList;
import net.minecraft.world.World;
import net.minecraftforge.common.ForgeHooks;
import binnie.extratrees.block.WoodManager;
public class MultiFenceRecipeSolid implements IRecipe {
private ItemStack cached = ItemStack.EMPTY;
@@ -3,7 +3,7 @@
@FieldsAreNonnullByDefault
package binnie.extratrees.block.decor;
import binnie.core.util.FieldsAreNonnullByDefault;
import mcp.MethodsReturnNonnullByDefault;
import javax.annotation.ParametersAreNonnullByDefault;
import javax.annotation.ParametersAreNonnullByDefault;
import binnie.core.util.FieldsAreNonnullByDefault;
import mcp.MethodsReturnNonnullByDefault;
@@ -3,7 +3,7 @@
@FieldsAreNonnullByDefault
package binnie.extratrees.block;
import binnie.core.util.FieldsAreNonnullByDefault;
import mcp.MethodsReturnNonnullByDefault;
import javax.annotation.ParametersAreNonnullByDefault;
import javax.annotation.ParametersAreNonnullByDefault;
import binnie.core.util.FieldsAreNonnullByDefault;
import mcp.MethodsReturnNonnullByDefault;
@@ -1,11 +1,12 @@
package binnie.extratrees.block.property;
import binnie.extratrees.block.EnumETLog;
import binnie.extratrees.block.PlankType;
import com.google.common.base.Predicate;
import javax.annotation.Nullable;
import binnie.extratrees.block.EnumETLog;
import binnie.extratrees.block.PlankType;
public class ETWoodTypePredicate implements Predicate<EnumETLog> {
private final int minWoodTypeMeta;
private final int maxWoodTypeMeta;
@@ -1,12 +1,14 @@
package binnie.extratrees.block.property;
import com.google.common.collect.Collections2;
import com.google.common.collect.Lists;
import java.util.Collection;
import forestry.arboriculture.blocks.PropertyWoodType;
import binnie.extratrees.block.EnumETLog;
import binnie.extratrees.block.PlankType;
import com.google.common.collect.Collections2;
import com.google.common.collect.Lists;
import forestry.arboriculture.blocks.PropertyWoodType;
import java.util.Collection;
public class PropertyETWoodType extends PropertyWoodType<EnumETLog> {
@@ -1,10 +1,11 @@
package binnie.extratrees.block.property;
import binnie.extratrees.genetics.ETTreeDefinition;
import com.google.common.base.Predicate;
import javax.annotation.Nullable;
import binnie.extratrees.genetics.ETTreeDefinition;
public class TreeTypePredicate implements Predicate<ETTreeDefinition> {
private final int minMeta;
private final int maxMeta;
@@ -3,7 +3,7 @@
@FieldsAreNonnullByDefault
package binnie.extratrees.block.property;
import binnie.core.util.FieldsAreNonnullByDefault;
import mcp.MethodsReturnNonnullByDefault;
import javax.annotation.ParametersAreNonnullByDefault;
import javax.annotation.ParametersAreNonnullByDefault;
import binnie.core.util.FieldsAreNonnullByDefault;
import mcp.MethodsReturnNonnullByDefault;
@@ -1,16 +1,18 @@
package binnie.extratrees.block.wood;
import binnie.Constants;
import binnie.extratrees.block.EnumETLog;
import binnie.extratrees.block.property.PropertyETWoodType;
import java.util.ArrayList;
import java.util.List;
import net.minecraft.util.ResourceLocation;
import forestry.api.core.IItemModelRegister;
import forestry.api.core.IStateMapperRegister;
import forestry.arboriculture.IWoodTyped;
import forestry.arboriculture.blocks.BlockForestryFence;
import net.minecraft.util.ResourceLocation;
import java.util.ArrayList;
import java.util.List;
import binnie.Constants;
import binnie.extratrees.block.EnumETLog;
import binnie.extratrees.block.property.PropertyETWoodType;
public abstract class BlockETFence extends BlockForestryFence<EnumETLog> implements IWoodTyped, IItemModelRegister, IStateMapperRegister {
private BlockETFence(boolean fireproof, int blockNumber) {
@@ -1,14 +1,16 @@
package binnie.extratrees.block.wood;
import java.util.ArrayList;
import java.util.List;
import net.minecraft.util.ResourceLocation;
import forestry.arboriculture.blocks.BlockForestryLog;
import forestry.arboriculture.blocks.PropertyWoodType;
import binnie.Constants;
import binnie.extratrees.block.EnumETLog;
import binnie.extratrees.block.property.PropertyETWoodType;
import forestry.arboriculture.blocks.BlockForestryLog;
import forestry.arboriculture.blocks.PropertyWoodType;
import net.minecraft.util.ResourceLocation;
import java.util.ArrayList;
import java.util.List;
public abstract class BlockETLog extends BlockForestryLog<EnumETLog> {
private BlockETLog(boolean fireproof, int blockNumber) {
@@ -1,13 +1,15 @@
package binnie.extratrees.block.wood;
import java.util.ArrayList;
import java.util.List;
import net.minecraft.util.ResourceLocation;
import forestry.arboriculture.blocks.BlockForestryPlanks;
import binnie.Constants;
import binnie.extratrees.block.EnumETLog;
import binnie.extratrees.block.property.PropertyETWoodType;
import forestry.arboriculture.blocks.BlockForestryPlanks;
import net.minecraft.util.ResourceLocation;
import java.util.ArrayList;
import java.util.List;
public abstract class BlockETPlank extends BlockForestryPlanks<EnumETLog> {
public static final String BLOCK_NAME = "plank";
@@ -1,13 +1,15 @@
package binnie.extratrees.block.wood;
import java.util.ArrayList;
import java.util.List;
import net.minecraft.util.ResourceLocation;
import forestry.arboriculture.blocks.BlockForestrySlab;
import binnie.Constants;
import binnie.extratrees.block.EnumETLog;
import binnie.extratrees.block.property.PropertyETWoodType;
import forestry.arboriculture.blocks.BlockForestrySlab;
import net.minecraft.util.ResourceLocation;
import java.util.ArrayList;
import java.util.List;
public abstract class BlockETSlab extends BlockForestrySlab<EnumETLog> {
private BlockETSlab(boolean fireproof, int blockNumber) {
@@ -1,13 +1,11 @@
package binnie.extratrees.block.wood;
import binnie.Constants;
import binnie.extratrees.block.EnumShrubLog;
import forestry.api.arboriculture.IWoodType;
import forestry.api.arboriculture.WoodBlockKind;
import forestry.api.core.IItemModelRegister;
import forestry.api.core.IModelManager;
import forestry.api.core.IStateMapperRegister;
import forestry.arboriculture.IWoodTyped;
import javax.annotation.Nullable;
import java.util.Collection;
import java.util.Collections;
import java.util.List;
import java.util.Random;
import net.minecraft.block.Block;
import net.minecraft.block.SoundType;
import net.minecraft.block.material.Material;
@@ -27,15 +25,21 @@ import net.minecraft.util.math.AxisAlignedBB;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.IBlockAccess;
import net.minecraft.world.World;
import net.minecraftforge.client.model.ModelLoader;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
import javax.annotation.Nullable;
import java.util.Collection;
import java.util.Collections;
import java.util.List;
import java.util.Random;
import forestry.api.arboriculture.IWoodType;
import forestry.api.arboriculture.WoodBlockKind;
import forestry.api.core.IItemModelRegister;
import forestry.api.core.IModelManager;
import forestry.api.core.IStateMapperRegister;
import forestry.arboriculture.IWoodTyped;
import binnie.Constants;
import binnie.extratrees.block.EnumShrubLog;
public class BlockShrubLog extends Block implements IWoodTyped, IStateMapperRegister, IItemModelRegister {
@@ -1,11 +1,13 @@
package binnie.extratrees.block.wood;
import binnie.extratrees.block.WoodManager;
import net.minecraft.block.Block;
import net.minecraft.item.ItemStack;
import forestry.api.arboriculture.IWoodType;
import forestry.arboriculture.IWoodTyped;
import forestry.arboriculture.items.ItemBlockWood;
import net.minecraft.block.Block;
import net.minecraft.item.ItemStack;
import binnie.extratrees.block.WoodManager;
public class ItemBlockETWood<V extends Block & IWoodTyped> extends ItemBlockWood<V> {
@@ -1,10 +1,12 @@
package binnie.extratrees.block.wood;
import binnie.extratrees.block.WoodManager;
import forestry.api.arboriculture.IWoodType;
import net.minecraft.item.ItemSlab;
import net.minecraft.item.ItemStack;
import forestry.api.arboriculture.IWoodType;
import binnie.extratrees.block.WoodManager;
public class ItemETSlab extends ItemSlab {
public ItemETSlab(BlockETSlab block, BlockETSlab slab, BlockETSlab doubleSlab) {
@@ -3,7 +3,7 @@
@FieldsAreNonnullByDefault
package binnie.extratrees.block.wood;
import binnie.core.util.FieldsAreNonnullByDefault;
import mcp.MethodsReturnNonnullByDefault;
import javax.annotation.ParametersAreNonnullByDefault;
import javax.annotation.ParametersAreNonnullByDefault;
import binnie.core.util.FieldsAreNonnullByDefault;
import mcp.MethodsReturnNonnullByDefault;
@@ -1,13 +1,15 @@
package binnie.extratrees.carpentry;
import net.minecraft.block.SoundType;
import net.minecraft.block.material.Material;
import net.minecraft.item.ItemStack;
import forestry.api.core.Tabs;
import binnie.Binnie;
import binnie.extratrees.ExtraTrees;
import binnie.extratrees.api.IDesign;
import binnie.extratrees.block.PlankType;
import forestry.api.core.Tabs;
import net.minecraft.block.SoundType;
import net.minecraft.block.material.Material;
import net.minecraft.item.ItemStack;
public class BlockCarpentry extends BlockDesign {
public BlockCarpentry(String name) {
@@ -1,9 +1,7 @@
package binnie.extratrees.carpentry;
import binnie.Binnie;
import binnie.core.block.BlockMetadata;
import binnie.core.block.TileEntityMetadata;
import binnie.extratrees.ExtraTrees;
import javax.annotation.Nullable;
import net.minecraft.block.state.IBlockState;
import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.item.Item;
@@ -15,7 +13,10 @@ import net.minecraft.util.math.BlockPos;
import net.minecraft.world.IBlockAccess;
import net.minecraft.world.World;
import javax.annotation.Nullable;
import binnie.Binnie;
import binnie.core.block.BlockMetadata;
import binnie.core.block.TileEntityMetadata;
import binnie.extratrees.ExtraTrees;
public class BlockCarpentryPanel extends BlockCarpentry {
public BlockCarpentryPanel() {
@@ -1,25 +1,8 @@
package binnie.extratrees.carpentry;
import binnie.core.block.BlockMetadata;
import binnie.core.block.IMultipassBlock;
import binnie.core.block.TileEntityMetadata;
import binnie.core.models.DefaultStateMapper;
import binnie.core.models.ModelManager;
import binnie.core.models.ModelMutlipass;
import binnie.core.util.TileUtil;
import binnie.extratrees.api.CarpentryManager;
import binnie.extratrees.api.IDesign;
import binnie.extratrees.api.IDesignSystem;
import binnie.extratrees.api.IToolHammer;
import forestry.api.core.IItemModelRegister;
import forestry.api.core.IModelManager;
import forestry.api.core.ISpriteRegister;
import forestry.api.core.IStateMapperRegister;
import forestry.api.core.ITextureManager;
import forestry.core.blocks.IColoredBlock;
import forestry.core.blocks.properties.UnlistedBlockAccess;
import forestry.core.blocks.properties.UnlistedBlockPos;
import forestry.core.models.BlockModelEntry;
import javax.annotation.Nullable;
import java.util.List;
import net.minecraft.block.material.Material;
import net.minecraft.block.properties.IProperty;
import net.minecraft.block.state.BlockStateContainer;
@@ -40,17 +23,38 @@ import net.minecraft.util.ResourceLocation;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.IBlockAccess;
import net.minecraft.world.World;
import net.minecraftforge.client.model.ModelLoader;
import net.minecraftforge.common.property.ExtendedBlockState;
import net.minecraftforge.common.property.IExtendedBlockState;
import net.minecraftforge.common.property.IUnlistedProperty;
import net.minecraftforge.event.entity.player.PlayerInteractEvent;
import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
import javax.annotation.Nullable;
import java.util.List;
import forestry.api.core.IItemModelRegister;
import forestry.api.core.IModelManager;
import forestry.api.core.ISpriteRegister;
import forestry.api.core.IStateMapperRegister;
import forestry.api.core.ITextureManager;
import forestry.core.blocks.IColoredBlock;
import forestry.core.blocks.properties.UnlistedBlockAccess;
import forestry.core.blocks.properties.UnlistedBlockPos;
import forestry.core.models.BlockModelEntry;
import binnie.core.block.BlockMetadata;
import binnie.core.block.IMultipassBlock;
import binnie.core.block.TileEntityMetadata;
import binnie.core.models.DefaultStateMapper;
import binnie.core.models.ModelManager;
import binnie.core.models.ModelMutlipass;
import binnie.core.util.TileUtil;
import binnie.extratrees.api.CarpentryManager;
import binnie.extratrees.api.IDesign;
import binnie.extratrees.api.IDesignSystem;
import binnie.extratrees.api.IToolHammer;
public abstract class BlockDesign extends BlockMetadata implements IMultipassBlock<Integer>, IColoredBlock, ISpriteRegister, IItemModelRegister, IStateMapperRegister {
public static final EnumFacing[] RENDER_DIRECTIONS = new EnumFacing[]{EnumFacing.DOWN, EnumFacing.UP, EnumFacing.EAST, EnumFacing.WEST, EnumFacing.NORTH, EnumFacing.SOUTH};
@@ -1,9 +1,7 @@
package binnie.extratrees.carpentry;
import binnie.Binnie;
import binnie.extratrees.ExtraTrees;
import binnie.extratrees.api.IDesign;
import forestry.api.core.Tabs;
import java.util.Random;
import net.minecraft.block.Block;
import net.minecraft.block.material.Material;
import net.minecraft.block.state.IBlockState;
@@ -12,10 +10,15 @@ import net.minecraft.util.BlockRenderLayer;
import net.minecraft.util.EnumFacing;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.IBlockAccess;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
import java.util.Random;
import forestry.api.core.Tabs;
import binnie.Binnie;
import binnie.extratrees.ExtraTrees;
import binnie.extratrees.api.IDesign;
public class BlockStainedDesign extends BlockDesign {
public BlockStainedDesign() {
@@ -1,13 +1,5 @@
package binnie.extratrees.carpentry;
import binnie.extratrees.api.ICarpentryInterface;
import binnie.extratrees.api.IDesign;
import binnie.extratrees.api.IDesignCategory;
import binnie.extratrees.api.IDesignMaterial;
import binnie.extratrees.api.ILayout;
import binnie.extratrees.api.IPattern;
import net.minecraft.item.ItemStack;
import javax.annotation.Nullable;
import java.util.ArrayList;
import java.util.Collection;
@@ -16,6 +8,15 @@ import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
import net.minecraft.item.ItemStack;
import binnie.extratrees.api.ICarpentryInterface;
import binnie.extratrees.api.IDesign;
import binnie.extratrees.api.IDesignCategory;
import binnie.extratrees.api.IDesignMaterial;
import binnie.extratrees.api.ILayout;
import binnie.extratrees.api.IPattern;
public class CarpentryInterface implements ICarpentryInterface {
static Map<Integer, IDesignMaterial> woodMap = new LinkedHashMap<>();
static Map<Integer, IDesign> designMap = new LinkedHashMap<>();
@@ -1,20 +1,22 @@
package binnie.extratrees.carpentry;
import binnie.extratrees.api.IDesign;
import binnie.extratrees.api.IDesignMaterial;
import binnie.extratrees.api.IDesignSystem;
import binnie.extratrees.api.ILayout;
import binnie.extratrees.api.IToolHammer;
import javax.annotation.Nullable;
import net.minecraft.client.renderer.texture.TextureAtlasSprite;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack;
import net.minecraft.util.EnumFacing;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.World;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
import javax.annotation.Nullable;
import binnie.extratrees.api.IDesign;
import binnie.extratrees.api.IDesignMaterial;
import binnie.extratrees.api.IDesignSystem;
import binnie.extratrees.api.ILayout;
import binnie.extratrees.api.IToolHammer;
public class DesignBlock {
private static final int[][] ROTATION_MATRIX = {
@@ -1,5 +1,18 @@
package binnie.extratrees.carpentry;
import javax.annotation.Nullable;
import java.util.HashMap;
import java.util.Map;
import net.minecraft.client.Minecraft;
import net.minecraft.client.renderer.texture.TextureAtlasSprite;
import net.minecraft.client.renderer.texture.TextureMap;
import net.minecraft.item.ItemStack;
import net.minecraft.util.ResourceLocation;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
import binnie.core.AbstractMod;
import binnie.extratrees.ExtraTrees;
import binnie.extratrees.api.CarpentryManager;
@@ -8,17 +21,6 @@ import binnie.extratrees.api.IDesignSystem;
import binnie.extratrees.api.IPattern;
import binnie.extratrees.block.PlankType;
import binnie.extratrees.item.ExtraTreeItems;
import net.minecraft.client.Minecraft;
import net.minecraft.client.renderer.texture.TextureAtlasSprite;
import net.minecraft.client.renderer.texture.TextureMap;
import net.minecraft.item.ItemStack;
import net.minecraft.util.ResourceLocation;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
import javax.annotation.Nullable;
import java.util.HashMap;
import java.util.Map;
public enum DesignSystem implements IDesignSystem {
Wood,
@@ -1,11 +1,11 @@
package binnie.extratrees.carpentry;
import binnie.extratrees.api.IDesignSystem;
import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
import binnie.extratrees.api.IDesignSystem;
public class DesignerManager {
public static DesignerManager instance = new DesignerManager();
@@ -1,13 +1,13 @@
package binnie.extratrees.carpentry;
import java.util.ArrayList;
import java.util.List;
import binnie.extratrees.api.CarpentryManager;
import binnie.extratrees.api.IDesign;
import binnie.extratrees.api.IDesignCategory;
import binnie.extratrees.api.ILayout;
import java.util.ArrayList;
import java.util.List;
public enum EnumDesign implements IDesign {
Blank("Blank"),
Octagon("Octagon"),
@@ -1,12 +1,15 @@
package binnie.extratrees.carpentry;
import net.minecraft.client.renderer.texture.TextureAtlasSprite;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
import forestry.api.core.ITextureManager;
import binnie.extratrees.api.IDesignSystem;
import binnie.extratrees.api.ILayout;
import binnie.extratrees.api.IPattern;
import forestry.api.core.ITextureManager;
import net.minecraft.client.renderer.texture.TextureAtlasSprite;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
public enum EnumPattern implements IPattern {
Blank,
@@ -1,15 +1,16 @@
package binnie.extratrees.carpentry;
import javax.annotation.Nullable;
import java.util.LinkedHashMap;
import java.util.Map;
import net.minecraft.init.Blocks;
import net.minecraft.item.ItemStack;
import binnie.botany.Botany;
import binnie.botany.genetics.EnumFlowerColor;
import binnie.core.block.TileEntityMetadata;
import binnie.extratrees.api.IDesignMaterial;
import net.minecraft.init.Blocks;
import net.minecraft.item.ItemStack;
import javax.annotation.Nullable;
import java.util.LinkedHashMap;
import java.util.Map;
public class GlassType implements IDesignMaterial {
static Map<Integer, GlassType> types;
@@ -1,11 +1,14 @@
package binnie.extratrees.carpentry;
import net.minecraft.item.ItemStack;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
import forestry.core.items.IColoredItem;
import binnie.core.block.ItemMetadata;
import binnie.core.block.TileEntityMetadata;
import forestry.core.items.IColoredItem;
import net.minecraft.item.ItemStack;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
public class ItemDesign extends ItemMetadata implements IColoredItem {
@@ -1,11 +1,13 @@
package binnie.extratrees.carpentry;
import net.minecraft.client.renderer.texture.TextureAtlasSprite;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
import binnie.extratrees.api.IDesignSystem;
import binnie.extratrees.api.ILayout;
import binnie.extratrees.api.IPattern;
import net.minecraft.client.renderer.texture.TextureAtlasSprite;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
public class Layout implements ILayout {
IPattern pattern;
@@ -1,5 +1,10 @@
package binnie.extratrees.carpentry;
import net.minecraft.item.ItemStack;
import net.minecraft.util.EnumFacing;
import net.minecraftforge.common.MinecraftForge;
import binnie.core.IInitializable;
import binnie.core.block.TileEntityMetadata;
import binnie.extratrees.ExtraTrees;
@@ -7,9 +12,6 @@ import binnie.extratrees.api.CarpentryManager;
import binnie.extratrees.api.IDesign;
import binnie.extratrees.api.IDesignMaterial;
import binnie.extratrees.api.IDesignSystem;
import net.minecraft.item.ItemStack;
import net.minecraft.util.EnumFacing;
import net.minecraftforge.common.MinecraftForge;
public class ModuleCarpentry implements IInitializable {
@@ -3,7 +3,7 @@
@FieldsAreNonnullByDefault
package binnie.extratrees.carpentry;
import binnie.core.util.FieldsAreNonnullByDefault;
import mcp.MethodsReturnNonnullByDefault;
import javax.annotation.ParametersAreNonnullByDefault;
import javax.annotation.ParametersAreNonnullByDefault;
import binnie.core.util.FieldsAreNonnullByDefault;
import mcp.MethodsReturnNonnullByDefault;
@@ -3,7 +3,7 @@
@FieldsAreNonnullByDefault
package binnie.extratrees.config;
import binnie.core.util.FieldsAreNonnullByDefault;
import mcp.MethodsReturnNonnullByDefault;
import javax.annotation.ParametersAreNonnullByDefault;
import javax.annotation.ParametersAreNonnullByDefault;
import binnie.core.util.FieldsAreNonnullByDefault;
import mcp.MethodsReturnNonnullByDefault;
@@ -1,14 +1,15 @@
package binnie.extratrees.core;
import javax.annotation.Nullable;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
import binnie.Binnie;
import binnie.core.resource.BinnieResource;
import binnie.core.resource.IBinnieTexture;
import binnie.core.resource.ResourceType;
import binnie.extratrees.ExtraTrees;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
import javax.annotation.Nullable;
public enum ExtraTreeTexture implements IBinnieTexture {
Gui(ResourceType.GUI, "gui"),
@@ -1,5 +1,13 @@
package binnie.extratrees.core;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.inventory.IInventory;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.World;
import net.minecraftforge.fml.relauncher.Side;
import binnie.core.craftgui.minecraft.Window;
import binnie.core.gui.IBinnieGUID;
import binnie.extratrees.kitchen.craftgui.WindowBottleRack;
@@ -11,12 +19,6 @@ import binnie.extratrees.machines.craftgui.WindowLumbermill;
import binnie.extratrees.machines.craftgui.WindowPress;
import binnie.extratrees.machines.craftgui.WindowSetSquare;
import binnie.extratrees.machines.craftgui.WindowWoodworker;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.inventory.IInventory;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.World;
import net.minecraftforge.fml.relauncher.Side;
public enum ExtraTreesGUID implements IBinnieGUID {
Database,
@@ -1,5 +1,15 @@
package binnie.extratrees.core;
import java.io.FileWriter;
import java.io.IOException;
import java.io.PrintWriter;
import java.util.Collections;
import java.util.LinkedList;
import java.util.Queue;
import forestry.api.arboriculture.IAlleleTreeSpecies;
import forestry.api.arboriculture.IWoodType;
import binnie.core.BinnieCore;
import binnie.core.IInitializable;
import binnie.extratrees.api.CarpentryManager;
@@ -9,15 +19,6 @@ import binnie.extratrees.block.EnumETLog;
import binnie.extratrees.block.PlankType;
import binnie.extratrees.genetics.AlleleETFruit;
import binnie.extratrees.genetics.ETTreeDefinition;
import forestry.api.arboriculture.IAlleleTreeSpecies;
import forestry.api.arboriculture.IWoodType;
import java.io.FileWriter;
import java.io.IOException;
import java.io.PrintWriter;
import java.util.Collections;
import java.util.LinkedList;
import java.util.Queue;
public class ModuleCore implements IInitializable {
@Override
@@ -3,7 +3,7 @@
@FieldsAreNonnullByDefault
package binnie.extratrees.core;
import binnie.core.util.FieldsAreNonnullByDefault;
import mcp.MethodsReturnNonnullByDefault;
import javax.annotation.ParametersAreNonnullByDefault;
import javax.annotation.ParametersAreNonnullByDefault;
import binnie.core.util.FieldsAreNonnullByDefault;
import mcp.MethodsReturnNonnullByDefault;
@@ -1,12 +1,13 @@
package binnie.extratrees.gen;
import forestry.api.arboriculture.ITree;
import forestry.api.world.ITreeGenData;
import java.util.Random;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.World;
import net.minecraft.world.gen.feature.WorldGenerator;
import java.util.Random;
import forestry.api.arboriculture.ITree;
import forestry.api.world.ITreeGenData;
public class TreeGenBase extends WorldGenerator {
protected ITree tree;
@@ -1,14 +1,15 @@
package binnie.extratrees.gen;
import java.util.List;
import java.util.Random;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.World;
import forestry.api.world.ITreeGenData;
import forestry.arboriculture.worldgen.TreeBlockTypeLeaf;
import forestry.core.worldgen.WorldGenHelper;
import forestry.core.worldgen.WorldGenHelper.EnumReplaceMode;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.World;
import java.util.List;
import java.util.Random;
public class WorldGenAlder {
public static class CommonAlder extends forestry.arboriculture.worldgen.WorldGenTree {
@@ -1,13 +1,14 @@
package binnie.extratrees.gen;
import java.util.List;
import java.util.Random;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.World;
import forestry.api.world.ITreeGenData;
import forestry.arboriculture.worldgen.TreeBlockTypeLeaf;
import forestry.core.worldgen.WorldGenHelper;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.World;
import java.util.List;
import java.util.Random;
public class WorldGenApple {
public static class OrchardApple extends forestry.arboriculture.worldgen.WorldGenTree {
@@ -1,13 +1,14 @@
package binnie.extratrees.gen;
import java.util.List;
import java.util.Random;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.World;
import forestry.api.world.ITreeGenData;
import forestry.arboriculture.worldgen.TreeBlockTypeLeaf;
import forestry.core.worldgen.WorldGenHelper;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.World;
import java.util.List;
import java.util.Random;
public class WorldGenAsh {
public static class CommonAsh extends forestry.arboriculture.worldgen.WorldGenTree {
@@ -1,13 +1,14 @@
package binnie.extratrees.gen;
import java.util.List;
import java.util.Random;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.World;
import forestry.api.world.ITreeGenData;
import forestry.arboriculture.worldgen.TreeBlockTypeLeaf;
import forestry.core.worldgen.WorldGenHelper;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.World;
import java.util.List;
import java.util.Random;
public class WorldGenBanana extends forestry.arboriculture.worldgen.WorldGenTree {
public WorldGenBanana(ITreeGenData tree) {
@@ -1,13 +1,14 @@
package binnie.extratrees.gen;
import java.util.List;
import java.util.Random;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.World;
import forestry.api.world.ITreeGenData;
import forestry.arboriculture.worldgen.TreeBlockTypeLeaf;
import forestry.core.worldgen.WorldGenHelper;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.World;
import java.util.List;
import java.util.Random;
public class WorldGenBeech {
public static class CommonBeech extends forestry.arboriculture.worldgen.WorldGenTree {
@@ -1,13 +1,14 @@
package binnie.extratrees.gen;
import java.util.List;
import java.util.Random;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.World;
import forestry.api.world.ITreeGenData;
import forestry.arboriculture.worldgen.TreeBlockTypeLeaf;
import forestry.core.worldgen.WorldGenHelper;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.World;
import java.util.List;
import java.util.Random;
public class WorldGenConifer {
public static class WesternHemlock extends forestry.arboriculture.worldgen.WorldGenTree {
@@ -1,9 +1,10 @@
package binnie.extratrees.gen;
import binnie.extratrees.worldgen.WorldGenBlockType;
import binnie.extratrees.worldgen.BlockTypeLog;
import forestry.api.world.ITreeGenData;
import binnie.extratrees.worldgen.BlockTypeLog;
import binnie.extratrees.worldgen.WorldGenBlockType;
public class WorldGenDefault extends WorldGenTree {
public WorldGenDefault(final ITreeGenData tree) {
super(tree);
@@ -1,13 +1,14 @@
package binnie.extratrees.gen;
import java.util.List;
import java.util.Random;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.World;
import forestry.api.world.ITreeGenData;
import forestry.arboriculture.worldgen.TreeBlockTypeLeaf;
import forestry.core.worldgen.WorldGenHelper;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.World;
import java.util.List;
import java.util.Random;
public class WorldGenPalm {
public static class Coconut extends forestry.arboriculture.worldgen.WorldGenTree {
@@ -1,5 +1,14 @@
package binnie.extratrees.gen;
import javax.annotation.Nullable;
import java.util.Collections;
import java.util.List;
import java.util.Random;
import java.util.Set;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.World;
import forestry.api.arboriculture.ITreeModifier;
import forestry.api.arboriculture.TreeManager;
import forestry.api.world.ITreeGenData;
@@ -8,14 +17,6 @@ import forestry.arboriculture.worldgen.TreeBlockTypeLog;
import forestry.arboriculture.worldgen.WorldGenArboriculture;
import forestry.core.worldgen.WorldGenHelper;
import forestry.core.worldgen.WorldGenHelper.EnumReplaceMode;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.World;
import javax.annotation.Nullable;
import java.util.Collections;
import java.util.List;
import java.util.Random;
import java.util.Set;
public class WorldGenShrub {
public static class Shrub extends WorldGenArboriculture {
@@ -1,21 +1,24 @@
package binnie.extratrees.gen;
import javax.annotation.Nullable;
import java.util.Random;
import net.minecraft.init.Blocks;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.World;
import net.minecraft.world.gen.feature.WorldGenerator;
import com.mojang.authlib.GameProfile;
import forestry.api.world.ITreeGenData;
import forestry.arboriculture.tiles.TileTreeContainer;
import binnie.core.util.TileUtil;
import binnie.extratrees.worldgen.BlockType;
import binnie.extratrees.worldgen.BlockTypeLeaf;
import binnie.extratrees.worldgen.BlockTypeLog;
import binnie.extratrees.worldgen.BlockTypeVoid;
import binnie.extratrees.worldgen.WorldGenBlockType;
import com.mojang.authlib.GameProfile;
import forestry.api.world.ITreeGenData;
import forestry.arboriculture.tiles.TileTreeContainer;
import net.minecraft.init.Blocks;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.World;
import net.minecraft.world.gen.feature.WorldGenerator;
import javax.annotation.Nullable;
import java.util.Random;
public class WorldGenTree extends WorldGenerator {
protected ITreeGenData treeGen;
@@ -1,14 +1,15 @@
package binnie.extratrees.gen;
import java.util.List;
import java.util.Random;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.World;
import forestry.api.world.ITreeGenData;
import forestry.arboriculture.worldgen.TreeBlockTypeLeaf;
import forestry.arboriculture.worldgen.WorldGenTree;
import forestry.core.worldgen.WorldGenHelper;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.World;
import java.util.List;
import java.util.Random;
public class WorldGenWalnut {
public static class BlackWalnut extends WorldGenTree {
@@ -3,7 +3,7 @@
@FieldsAreNonnullByDefault
package binnie.extratrees.gen;
import binnie.core.util.FieldsAreNonnullByDefault;
import mcp.MethodsReturnNonnullByDefault;
import javax.annotation.ParametersAreNonnullByDefault;
import javax.annotation.ParametersAreNonnullByDefault;
import binnie.core.util.FieldsAreNonnullByDefault;
import mcp.MethodsReturnNonnullByDefault;
@@ -1,13 +1,27 @@
package binnie.extratrees.genetics;
import binnie.Binnie;
import binnie.Constants;
import binnie.extratrees.ExtraTrees;
import binnie.extratrees.block.FruitPod;
import binnie.extratrees.config.ConfigurationMain;
import binnie.extratrees.item.Food;
import com.google.common.base.Preconditions;
import com.google.common.base.Throwables;
import javax.annotation.Nullable;
import java.lang.reflect.Field;
import java.util.HashMap;
import java.util.LinkedList;
import java.util.List;
import java.util.Map;
import java.util.Random;
import net.minecraft.init.Items;
import net.minecraft.item.ItemStack;
import net.minecraft.util.NonNullList;
import net.minecraft.util.ResourceLocation;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.IBlockAccess;
import net.minecraft.world.World;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
import forestry.api.arboriculture.EnumTreeChromosome;
import forestry.api.arboriculture.IAlleleFruit;
import forestry.api.arboriculture.IAlleleTreeSpecies;
@@ -20,23 +34,13 @@ import forestry.api.genetics.IFruitFamily;
import forestry.arboriculture.FruitProviderNone;
import forestry.arboriculture.genetics.alleles.AlleleTreeSpecies;
import forestry.core.genetics.alleles.AlleleCategorized;
import net.minecraft.init.Items;
import net.minecraft.item.ItemStack;
import net.minecraft.util.NonNullList;
import net.minecraft.util.ResourceLocation;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.IBlockAccess;
import net.minecraft.world.World;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
import javax.annotation.Nullable;
import java.lang.reflect.Field;
import java.util.HashMap;
import java.util.LinkedList;
import java.util.List;
import java.util.Map;
import java.util.Random;
import binnie.Binnie;
import binnie.Constants;
import binnie.extratrees.ExtraTrees;
import binnie.extratrees.block.FruitPod;
import binnie.extratrees.config.ConfigurationMain;
import binnie.extratrees.item.Food;
public class AlleleETFruit extends AlleleCategorized implements IAlleleFruit, IFruitProvider {
public static final AlleleETFruit Blackthorn = new AlleleETFruit("Blackthorn", 10, 7180062, 14561129, FruitSprite.SMALL);
@@ -1,6 +1,10 @@
package binnie.extratrees.genetics;
import binnie.Constants;
import java.awt.Color;
import java.util.Arrays;
import net.minecraft.item.ItemStack;
import forestry.api.genetics.AlleleManager;
import forestry.api.genetics.IAllele;
import forestry.api.genetics.IClassification;
@@ -17,10 +21,8 @@ import forestry.lepidopterology.genetics.Butterfly;
import forestry.lepidopterology.genetics.ButterflyDefinition;
import forestry.lepidopterology.genetics.IButterflyDefinition;
import forestry.lepidopterology.genetics.MothDefinition;
import net.minecraft.item.ItemStack;
import java.awt.Color;
import java.util.Arrays;
import binnie.Constants;
public enum ButterflySpecies implements IButterflyDefinition {
White_Admiral("White Admiral", "Limenitis camilla", 16448250),
@@ -1,14 +1,16 @@
package binnie.extratrees.genetics;
import binnie.extratrees.block.ModuleBlocks;
import javax.annotation.Nullable;
import net.minecraft.item.ItemStack;
import forestry.api.arboriculture.EnumTreeChromosome;
import forestry.api.arboriculture.IAlleleTreeSpecies;
import forestry.api.arboriculture.ILeafProvider;
import forestry.api.genetics.IAllele;
import forestry.arboriculture.genetics.TreeDefinition;
import net.minecraft.item.ItemStack;
import javax.annotation.Nullable;
import binnie.extratrees.block.ModuleBlocks;
public class ETLeafProvider implements ILeafProvider {
@Nullable
@@ -1,32 +1,25 @@
package binnie.extratrees.genetics;
import binnie.Constants;
import binnie.core.genetics.ForestryAllele;
import binnie.extratrees.block.EnumETLog;
import binnie.extratrees.block.EnumShrubLog;
import binnie.extratrees.gen.WorldGenAlder;
import binnie.extratrees.gen.WorldGenApple;
import binnie.extratrees.gen.WorldGenAsh;
import binnie.extratrees.gen.WorldGenBanana;
import binnie.extratrees.gen.WorldGenBeech;
import binnie.extratrees.gen.WorldGenConifer;
import binnie.extratrees.gen.WorldGenEucalyptus;
import binnie.extratrees.gen.WorldGenFir;
import binnie.extratrees.gen.WorldGenHolly;
import binnie.extratrees.gen.WorldGenJungle;
import binnie.extratrees.gen.WorldGenLazy;
import binnie.extratrees.gen.WorldGenMaple;
import binnie.extratrees.gen.WorldGenPalm;
import binnie.extratrees.gen.WorldGenPoplar;
import binnie.extratrees.gen.WorldGenShrub;
import binnie.extratrees.gen.WorldGenSorbus;
import binnie.extratrees.gen.WorldGenTree;
import binnie.extratrees.gen.WorldGenTree2;
import binnie.extratrees.gen.WorldGenTree3;
import binnie.extratrees.gen.WorldGenTropical;
import binnie.extratrees.gen.WorldGenWalnut;
import com.google.common.base.Preconditions;
import java.awt.Color;
import java.util.Arrays;
import java.util.Locale;
import org.apache.commons.lang3.StringUtils;
import net.minecraft.block.Block;
import net.minecraft.block.BlockLog;
import net.minecraft.block.state.IBlockState;
import net.minecraft.item.ItemStack;
import net.minecraft.util.EnumFacing;
import net.minecraft.util.IStringSerializable;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.World;
import net.minecraft.world.gen.feature.WorldGenerator;
import com.mojang.authlib.GameProfile;
import forestry.api.arboriculture.EnumForestryWoodType;
import forestry.api.arboriculture.EnumGermlingType;
import forestry.api.arboriculture.EnumLeafType;
@@ -59,20 +52,32 @@ import forestry.arboriculture.worldgen.WorldGenLemon;
import forestry.arboriculture.worldgen.WorldGenPlum;
import forestry.core.genetics.alleles.AlleleBoolean;
import forestry.core.tiles.TileUtil;
import net.minecraft.block.Block;
import net.minecraft.block.BlockLog;
import net.minecraft.block.state.IBlockState;
import net.minecraft.item.ItemStack;
import net.minecraft.util.EnumFacing;
import net.minecraft.util.IStringSerializable;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.World;
import net.minecraft.world.gen.feature.WorldGenerator;
import org.apache.commons.lang3.StringUtils;
import java.awt.Color;
import java.util.Arrays;
import java.util.Locale;
import binnie.Constants;
import binnie.core.genetics.ForestryAllele;
import binnie.extratrees.block.EnumETLog;
import binnie.extratrees.block.EnumShrubLog;
import binnie.extratrees.gen.WorldGenAlder;
import binnie.extratrees.gen.WorldGenApple;
import binnie.extratrees.gen.WorldGenAsh;
import binnie.extratrees.gen.WorldGenBanana;
import binnie.extratrees.gen.WorldGenBeech;
import binnie.extratrees.gen.WorldGenConifer;
import binnie.extratrees.gen.WorldGenEucalyptus;
import binnie.extratrees.gen.WorldGenFir;
import binnie.extratrees.gen.WorldGenHolly;
import binnie.extratrees.gen.WorldGenJungle;
import binnie.extratrees.gen.WorldGenLazy;
import binnie.extratrees.gen.WorldGenMaple;
import binnie.extratrees.gen.WorldGenPalm;
import binnie.extratrees.gen.WorldGenPoplar;
import binnie.extratrees.gen.WorldGenShrub;
import binnie.extratrees.gen.WorldGenSorbus;
import binnie.extratrees.gen.WorldGenTree;
import binnie.extratrees.gen.WorldGenTree2;
import binnie.extratrees.gen.WorldGenTree3;
import binnie.extratrees.gen.WorldGenTropical;
import binnie.extratrees.gen.WorldGenWalnut;
public enum ETTreeDefinition implements IStringSerializable, ITreeDefinition, ITreeGenerator {
OrchardApple("malus", "domestica", EnumLeafType.DECIDUOUS, new Color(0x09E67E), new Color(0xFF9CF3), EnumSaplingType.Default, EnumETLog.Apple, new Color(0x7B7A7B)) {
@@ -1,16 +1,18 @@
package binnie.extratrees.genetics;
import forestry.api.arboriculture.EnumGermlingType;
import forestry.api.arboriculture.IGermlingModelProvider;
import forestry.api.core.IModelManager;
import java.awt.Color;
import net.minecraft.client.renderer.block.model.ModelBakery;
import net.minecraft.client.renderer.block.model.ModelResourceLocation;
import net.minecraft.item.Item;
import net.minecraft.util.ResourceLocation;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
import java.awt.Color;
import forestry.api.arboriculture.EnumGermlingType;
import forestry.api.arboriculture.IGermlingModelProvider;
import forestry.api.core.IModelManager;
public enum EnumSaplingType {
Default,
@@ -1,7 +1,15 @@
package binnie.extratrees.genetics;
import binnie.Binnie;
import com.google.common.base.Preconditions;
import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.World;
import net.minecraft.world.biome.Biome;
import forestry.api.arboriculture.IAlleleTreeSpecies;
import forestry.api.arboriculture.ITreeGenome;
import forestry.api.arboriculture.ITreeMutation;
@@ -9,13 +17,8 @@ import forestry.api.arboriculture.ITreeRoot;
import forestry.api.genetics.AlleleManager;
import forestry.api.genetics.IAllele;
import forestry.api.genetics.IAlleleSpecies;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.World;
import net.minecraft.world.biome.Biome;
import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
import binnie.Binnie;
public class ExtraTreeMutation implements ITreeMutation {
int chance;
@@ -1,13 +1,15 @@
package binnie.extratrees.genetics;
import binnie.Constants;
import java.util.Locale;
import net.minecraft.client.Minecraft;
import net.minecraft.client.renderer.texture.TextureMap;
import net.minecraft.util.ResourceLocation;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
import java.util.Locale;
import binnie.Constants;
public enum FruitSprite {
TINY,
@@ -1,14 +1,16 @@
package binnie.extratrees.genetics;
import binnie.core.BinnieCore;
import binnie.core.IInitializable;
import forestry.api.arboriculture.IAlleleFruit;
import forestry.api.genetics.AlleleRegisterEvent;
import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
import java.util.ArrayList;
import java.util.List;
import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
import forestry.api.arboriculture.IAlleleFruit;
import forestry.api.genetics.AlleleRegisterEvent;
import binnie.core.BinnieCore;
import binnie.core.IInitializable;
public class ModuleGenetics implements IInitializable {
String[] branches;
List<List<String>> classifications;
@@ -1,21 +1,24 @@
package binnie.extratrees.genetics;
import com.google.common.base.Preconditions;
import forestry.api.arboriculture.IWoodProvider;
import forestry.api.arboriculture.IWoodType;
import forestry.api.arboriculture.TreeManager;
import forestry.api.arboriculture.WoodBlockKind;
import forestry.api.core.ITextureManager;
import javax.annotation.Nullable;
import net.minecraft.client.renderer.texture.TextureAtlasSprite;
import net.minecraft.client.renderer.texture.TextureMap;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.util.ResourceLocation;
import net.minecraftforge.fml.client.FMLClientHandler;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
import javax.annotation.Nullable;
import forestry.api.arboriculture.IWoodProvider;
import forestry.api.arboriculture.IWoodType;
import forestry.api.arboriculture.TreeManager;
import forestry.api.arboriculture.WoodBlockKind;
import forestry.api.core.ITextureManager;
public class WoodProvider implements IWoodProvider {
private IWoodType type;
@@ -3,7 +3,7 @@
@FieldsAreNonnullByDefault
package binnie.extratrees.genetics;
import binnie.core.util.FieldsAreNonnullByDefault;
import mcp.MethodsReturnNonnullByDefault;
import javax.annotation.ParametersAreNonnullByDefault;
import javax.annotation.ParametersAreNonnullByDefault;
import binnie.core.util.FieldsAreNonnullByDefault;
import mcp.MethodsReturnNonnullByDefault;
@@ -1,5 +1,8 @@
package binnie.extratrees.integration.jei;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import binnie.core.integration.jei.Drawables;
import binnie.extratrees.ExtraTrees;
import binnie.extratrees.block.WoodManager;
@@ -21,8 +24,6 @@ import mezz.jei.api.IJeiHelpers;
import mezz.jei.api.IModRegistry;
import mezz.jei.api.ISubtypeRegistry;
import mezz.jei.api.JEIPlugin;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
@JEIPlugin
public class ExtraTreesJeiPlugin extends BlankModPlugin {
@@ -1,5 +1,12 @@
package binnie.extratrees.integration.jei.brewery;
import java.util.List;
import net.minecraft.client.Minecraft;
import net.minecraft.item.ItemStack;
import net.minecraftforge.fluids.Fluid;
import binnie.extratrees.ExtraTrees;
import binnie.extratrees.integration.jei.ExtraTreesJeiPlugin;
import binnie.extratrees.integration.jei.RecipeUids;
@@ -11,11 +18,6 @@ import mezz.jei.api.gui.IGuiItemStackGroup;
import mezz.jei.api.gui.IRecipeLayout;
import mezz.jei.api.ingredients.IIngredients;
import mezz.jei.api.recipe.BlankRecipeCategory;
import net.minecraft.client.Minecraft;
import net.minecraft.item.ItemStack;
import net.minecraftforge.fluids.Fluid;
import java.util.List;
public class BreweryRecipeCategory extends BlankRecipeCategory<BreweryRecipeWrapper> {
private final IDrawableAnimated arrowAnimated;
@@ -1,11 +1,11 @@
package binnie.extratrees.integration.jei.brewery;
import binnie.extratrees.machines.brewery.BreweryRecipes;
import binnie.extratrees.machines.brewery.IBreweryRecipe;
import java.util.ArrayList;
import java.util.List;
import binnie.extratrees.machines.brewery.BreweryRecipes;
import binnie.extratrees.machines.brewery.IBreweryRecipe;
public class BreweryRecipeMaker {
public static List<BreweryRecipeWrapper> create() {
List<BreweryRecipeWrapper> recipes = new ArrayList<>();
@@ -1,15 +1,17 @@
package binnie.extratrees.integration.jei.brewery;
import binnie.extratrees.machines.brewery.IBreweryRecipe;
import mezz.jei.api.ingredients.IIngredients;
import mezz.jei.api.recipe.BlankRecipeWrapper;
import net.minecraft.item.ItemStack;
import net.minecraftforge.fluids.FluidStack;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import net.minecraft.item.ItemStack;
import net.minecraftforge.fluids.FluidStack;
import binnie.extratrees.machines.brewery.IBreweryRecipe;
import mezz.jei.api.ingredients.IIngredients;
import mezz.jei.api.recipe.BlankRecipeWrapper;
public class BreweryRecipeWrapper extends BlankRecipeWrapper {
private final IBreweryRecipe recipe;
@@ -3,7 +3,7 @@
@MethodsReturnNonnullByDefault
package binnie.extratrees.integration.jei.brewery;
import binnie.core.util.FieldsAreNonnullByDefault;
import mcp.MethodsReturnNonnullByDefault;
import javax.annotation.ParametersAreNonnullByDefault;
import javax.annotation.ParametersAreNonnullByDefault;
import binnie.core.util.FieldsAreNonnullByDefault;
import mcp.MethodsReturnNonnullByDefault;
@@ -1,5 +1,10 @@
package binnie.extratrees.integration.jei.distillery.brewery;
import net.minecraft.client.Minecraft;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
import binnie.core.craftgui.CraftGUI;
import binnie.core.craftgui.geometry.Area;
import binnie.core.craftgui.geometry.Point;
@@ -18,9 +23,6 @@ import mezz.jei.api.gui.IRecipeLayout;
import mezz.jei.api.gui.ITickTimer;
import mezz.jei.api.ingredients.IIngredients;
import mezz.jei.api.recipe.BlankRecipeCategory;
import net.minecraft.client.Minecraft;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
public class DistilleryRecipeCategory extends BlankRecipeCategory<DistilleryRecipeWrapper> {
private static final Texture DISTILLERY_BASE = new StandardTexture(43, 0, 58, 60, ExtraTreeTexture.Gui);
@@ -1,12 +1,14 @@
package binnie.extratrees.integration.jei.distillery.brewery;
import binnie.extratrees.machines.distillery.DistilleryRecipes;
import net.minecraftforge.fluids.FluidStack;
import org.apache.commons.lang3.tuple.Pair;
import java.util.ArrayList;
import java.util.List;
import org.apache.commons.lang3.tuple.Pair;
import net.minecraftforge.fluids.FluidStack;
import binnie.extratrees.machines.distillery.DistilleryRecipes;
public class DistilleryRecipeMaker {
public static List<DistilleryRecipeWrapper> create() {
List<DistilleryRecipeWrapper> recipes = new ArrayList<>();
Loaded 100 of 801 files, more files were not shown because too many files have changed in this diff. Show more