Clean Up Extra Trees Planks

This commit is contained in:
Nedelosk committed 2017-08-13 21:47:32 +02:00
1 parent e9556c44f9
commit 5ecb465d01
34 files changed
+624 -585

No files matched your search

@@ -2,6 +2,7 @@ package binnie.core.liquid;
import net.minecraftforge.fluids.FluidStack;
//ToDo: Why is this in the core mod and not in extra trees ?
public interface IDrinkLiquid {
boolean isConsumable();
@@ -58,7 +58,6 @@ public class ModuleManager {
containerModules.remove(coreModule);
containerModules.add(0, coreModule);
Iterator<Module> iterator = containerModules.iterator();
while (iterator.hasNext()) {
Module module = iterator.next();
@@ -139,6 +138,9 @@ public class ModuleManager {
throw new IllegalStateException("Could not find core module for the container " + containerID);
}
/**
* Loads module classes that have the annotation {@link BinnieModule}.
*/
public static void loadModules(FMLPreInitializationEvent event){
if(initialized){
return;
@@ -3,10 +3,12 @@ package binnie.core.util;
import net.minecraft.block.Block;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraftforge.fml.common.registry.ForgeRegistries;
import net.minecraftforge.oredict.ShapedOreRecipe;
import net.minecraftforge.oredict.ShapelessOreRecipe;
import net.minecraftforge.fml.common.registry.ForgeRegistries;
public class RecipeUtil {
private final String modId;
@@ -5,8 +5,14 @@ public interface ICocktailIngredient {
String getIdentifier();
/**
* @return The color of the ingredient.
*/
int getColor();
/**
* @return The transparency of the ingredient.
*/
int getTransparency();
String getTooltip(int ratio);
@@ -3,5 +3,8 @@ package binnie.extratrees.alcohol;
import net.minecraftforge.fluids.FluidStack;
public interface ICocktailLiquid extends ICocktailIngredient {
/**
* @return Returns a {@link FluidStack} of this fluid with a specific amount.
*/
FluidStack get(int amount);
}
@@ -8,8 +8,9 @@ import binnie.core.util.I18N;
import binnie.extratrees.api.IDesign;
import binnie.extratrees.carpentry.DesignBlock;
import binnie.extratrees.carpentry.DesignSystem;
import binnie.extratrees.wood.PlankType;
import binnie.extratrees.modules.ModuleCarpentry;
import binnie.extratrees.wood.planks.ExtraTreePlanks;
import binnie.extratrees.wood.planks.VanillaPlanks;
public class BlockCarpentry extends BlockDesign {
public BlockCarpentry(String name) {
@@ -22,7 +23,7 @@ public class BlockCarpentry extends BlockDesign {
@Override
public ItemStack getCreativeStack(final IDesign design) {
return ModuleCarpentry.getItemStack(this, PlankType.ExtraTreePlanks.Apple, PlankType.VanillaPlanks.BIRCH, design);
return ModuleCarpentry.getItemStack(this, ExtraTreePlanks.Apple, VanillaPlanks.BIRCH, design);
}
@Override
@@ -47,10 +47,10 @@ import binnie.core.api.block.TileEntityMetadata;
import binnie.core.models.DefaultStateMapper;
import binnie.core.models.ModelManager;
import binnie.core.util.I18N;
import binnie.extratrees.wood.IPlankType;
import binnie.extratrees.wood.PlankType;
import binnie.extratrees.wood.WoodManager;
import binnie.extratrees.models.ModelMultiFence;
import binnie.extratrees.wood.WoodManager;
import binnie.extratrees.wood.planks.IPlankType;
import binnie.extratrees.wood.planks.VanillaPlanks;
public class BlockMultiFence extends BlockFence implements IBlockMetadata, IStateMapperRegister, IItemModelRegister, IBlockFence {
public BlockMultiFence() {
@@ -151,7 +151,7 @@ public class BlockMultiFence extends BlockFence implements IBlockMetadata, IStat
@Override
public void getSubBlocks(CreativeTabs tab, NonNullList<ItemStack> itemList) {
for (FenceType type : FenceType.values()) {
itemList.add(WoodManager.getFence(PlankType.VanillaPlanks.SPRUCE, PlankType.VanillaPlanks.BIRCH, type, 1));
itemList.add(WoodManager.getFence(VanillaPlanks.SPRUCE, VanillaPlanks.BIRCH, type, 1));
}
}
@@ -1,6 +1,6 @@
package binnie.extratrees.blocks.decor;
import binnie.extratrees.wood.IPlankType;
import binnie.extratrees.wood.planks.IPlankType;
import binnie.extratrees.wood.WoodManager;
public class FenceDescription {
@@ -11,7 +11,7 @@ import net.minecraft.world.World;
import net.minecraftforge.common.ForgeHooks;
import binnie.extratrees.wood.IPlankType;
import binnie.extratrees.wood.planks.IPlankType;
import binnie.extratrees.wood.WoodManager;
import net.minecraftforge.registries.IForgeRegistryEntry;
@@ -2,7 +2,7 @@ package binnie.extratrees.blocks.decor;
import net.minecraft.item.ItemStack;
import binnie.extratrees.wood.IPlankType;
import binnie.extratrees.wood.planks.IPlankType;
import binnie.extratrees.wood.WoodManager;
public class MultiFenceRecipePattern {
@@ -14,7 +14,7 @@ import net.minecraft.world.World;
import net.minecraftforge.common.ForgeHooks;
import binnie.extratrees.wood.IPlankType;
import binnie.extratrees.wood.planks.IPlankType;
import binnie.extratrees.wood.WoodManager;
import net.minecraftforge.registries.IForgeRegistryEntry;
@@ -8,7 +8,7 @@ import java.util.Collection;
import forestry.arboriculture.blocks.PropertyWoodType;
import binnie.extratrees.wood.EnumETLog;
import binnie.extratrees.wood.PlankType;
import binnie.extratrees.wood.planks.ExtraTreePlanks;
public class PropertyETWoodType extends PropertyWoodType<EnumETLog> {
@@ -25,7 +25,7 @@ public class PropertyETWoodType extends PropertyWoodType<EnumETLog> {
if (isLog) {
length = EnumETLog.VALUES.length;
} else {
length = PlankType.ExtraTreePlanks.VALUES.length;
length = ExtraTreePlanks.VALUES.length;
}
final int variantCount = (int) Math.ceil((float) length / variantsPerBlock);
PropertyETWoodType[] variants = new PropertyETWoodType[variantCount];
@@ -16,9 +16,9 @@ import binnie.extratrees.api.IDesignCategory;
import binnie.extratrees.api.IDesignMaterial;
public class CarpentryInterface implements ICarpentryInterface {
static Map<Integer, IDesignMaterial> woodMap = new LinkedHashMap<>();
static Map<Integer, IDesign> designMap = new LinkedHashMap<>();
static Map<String, IDesignCategory> designCategories = new HashMap<>();
private static Map<Integer, IDesignMaterial> woodMap = new LinkedHashMap<>();
private static Map<Integer, IDesign> designMap = new LinkedHashMap<>();
private static Map<String, IDesignCategory> designCategories = new HashMap<>();
@Override
public boolean registerCarpentryWood(final int index, final IDesignMaterial wood) {
@@ -30,12 +30,12 @@ public class DesignBlock {
{3, 2, 0, 1, 4, 5, 6},
{0, 1, 2, 3, 4, 5, 6},
};
IDesign design;
IDesignMaterial primaryMaterial;
IDesignMaterial secondaryMaterial;
int rotation;
EnumFacing facing;
boolean panel;
private IDesign design;
private IDesignMaterial primaryMaterial;
private IDesignMaterial secondaryMaterial;
private int rotation;
private EnumFacing facing;
private boolean panel;
public DesignBlock(final IDesignSystem system, @Nullable final IDesignMaterial primaryWood, @Nullable final IDesignMaterial secondaryWood, @Nullable final IDesign design, final int rotation, @Nullable final EnumFacing dir) {
this.panel = false;
@@ -4,8 +4,6 @@ import javax.annotation.Nullable;
import java.util.HashMap;
import java.util.Map;
import binnie.extratrees.api.carpentry.DesignerManager;
import binnie.extratrees.api.carpentry.EnumPattern;
import net.minecraft.client.Minecraft;
import net.minecraft.client.renderer.texture.TextureAtlasSprite;
import net.minecraft.client.renderer.texture.TextureMap;
@@ -21,8 +19,10 @@ import binnie.extratrees.api.CarpentryManager;
import binnie.extratrees.api.IDesignMaterial;
import binnie.extratrees.api.IDesignSystem;
import binnie.extratrees.api.IPattern;
import binnie.extratrees.wood.PlankType;
import binnie.extratrees.api.carpentry.DesignerManager;
import binnie.extratrees.api.carpentry.EnumPattern;
import binnie.extratrees.items.ExtraTreeItems;
import binnie.extratrees.wood.planks.ExtraTreePlanks;
public enum DesignSystem implements IDesignSystem {
Wood,
@@ -44,7 +44,7 @@ public enum DesignSystem implements IDesignSystem {
return GlassType.get(0);
}
case Wood: {
return PlankType.ExtraTreePlanks.Fir;
return ExtraTreePlanks.Fir;
}
default: {
throw new IllegalStateException("Unknown design system: " + this);
@@ -59,7 +59,7 @@ public enum DesignSystem implements IDesignSystem {
return GlassType.get(1);
}
case Wood: {
return PlankType.ExtraTreePlanks.Whitebeam;
return ExtraTreePlanks.Whitebeam;
}
default: {
throw new IllegalStateException("Unknown design system: " + this);
@@ -276,13 +276,13 @@ public enum EnumDesign implements IDesign {
EnumDesign.OverlappedBarred.setTopPattern(EnumPattern.OverlappedBarred.layout());
}
String name;
ILayout topPattern;
ILayout bottomPattern;
ILayout northPattern;
ILayout southPattern;
ILayout eastPattern;
ILayout westPattern;
private String name;
private ILayout topPattern;
private ILayout bottomPattern;
private ILayout northPattern;
private ILayout southPattern;
private ILayout eastPattern;
private ILayout westPattern;
EnumDesign(final String name) {
this.topPattern = Layout.get(EnumPattern.Blank, false);
@@ -4,19 +4,19 @@ import javax.annotation.Nullable;
import java.util.LinkedHashMap;
import java.util.Map;
import binnie.botany.api.genetics.EnumFlowerColor;
import binnie.core.Constants;
import net.minecraft.block.Block;
import net.minecraft.init.Blocks;
import net.minecraft.item.ItemStack;
import binnie.core.api.block.TileEntityMetadata;
import binnie.extratrees.api.IDesignMaterial;
import net.minecraftforge.fml.common.registry.GameRegistry.ObjectHolder;
import binnie.botany.api.genetics.EnumFlowerColor;
import binnie.core.Constants;
import binnie.core.api.block.TileEntityMetadata;
import binnie.extratrees.api.IDesignMaterial;
public class GlassType implements IDesignMaterial {
static Map<Integer, GlassType> types;
private static Map<Integer, GlassType> types;
@ObjectHolder(Constants.BOTANY_MOD_ID)
public static final class Botany {
@@ -18,7 +18,7 @@ import binnie.core.gui.geometry.TextJustification;
import binnie.core.gui.minecraft.Window;
import binnie.core.gui.minecraft.control.ControlItemDisplay;
import binnie.core.util.I18N;
import binnie.extratrees.wood.IPlankType;
import binnie.extratrees.wood.planks.IPlankType;
import binnie.extratrees.wood.WoodManager;
import binnie.extratrees.blocks.decor.FenceType;
@@ -7,7 +7,7 @@ import java.util.Map.Entry;
import net.minecraft.item.ItemStack;
import binnie.extratrees.wood.IPlankType;
import binnie.extratrees.wood.planks.IPlankType;
import binnie.extratrees.wood.WoodManager;
import binnie.extratrees.blocks.decor.FenceDescription;
import binnie.extratrees.blocks.decor.FenceType;
@@ -6,7 +6,7 @@ import java.util.List;
import net.minecraft.item.ItemStack;
import binnie.extratrees.wood.IPlankType;
import binnie.extratrees.wood.planks.IPlankType;
import binnie.extratrees.wood.WoodManager;
import binnie.extratrees.blocks.decor.FenceDescription;
import binnie.extratrees.blocks.decor.FenceType;
@@ -5,14 +5,14 @@ import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import mezz.jei.api.recipe.IRecipeWrapper;
import net.minecraft.item.ItemStack;
import net.minecraft.util.NonNullList;
import binnie.extratrees.wood.IPlankType;
import binnie.extratrees.wood.WoodManager;
import binnie.extratrees.blocks.decor.MultiFenceRecipePattern;
import binnie.extratrees.wood.WoodManager;
import binnie.extratrees.wood.planks.IPlankType;
import mezz.jei.api.ingredients.IIngredients;
import mezz.jei.api.recipe.IRecipeWrapper;
public class MultiFenceRecipeSizeWrapper implements IRecipeWrapper {
@@ -6,7 +6,7 @@ import java.util.List;
import net.minecraft.item.ItemStack;
import binnie.extratrees.wood.IPlankType;
import binnie.extratrees.wood.planks.IPlankType;
import binnie.extratrees.wood.WoodManager;
import binnie.extratrees.blocks.decor.FenceDescription;
import binnie.extratrees.blocks.decor.FenceType;
@@ -5,11 +5,11 @@ import java.util.HashMap;
import java.util.Map;
import java.util.Objects;
import binnie.core.liquid.DrinkManager;
import binnie.extratrees.alcohol.GlasswareType;
import binnie.extratrees.alcohol.ICocktailIngredient;
import binnie.extratrees.alcohol.ICocktailIngredientProvider;
import binnie.extratrees.alcohol.drink.DrinkLiquid;
import binnie.core.liquid.DrinkManager;
public enum Cocktail {
Bellini("Bellini", GlasswareType.FLUTE, 15974764),
@@ -165,10 +165,16 @@ public enum Cocktail {
DrinkManager.registerDrinkLiquid(liquid);
}
public static void registerIngredient(final ICocktailIngredientProvider ingredient) {
public static void registerIngredient(ICocktailIngredientProvider ingredient) {
registerIngredient(ingredient.getIngredient());
}
public static void registerIngredients(ICocktailIngredientProvider[] ingredients) {
for (ICocktailIngredientProvider ingredient : ingredients) {
registerIngredient(ingredient.getIngredient());
}
}
public static ICocktailIngredient getIngredient(final String name2) {
return Cocktail.cocktailIngredients.get(name2.toLowerCase());
}
@@ -4,6 +4,7 @@ import net.minecraft.block.Block;
import net.minecraft.block.BlockFence;
import net.minecraft.block.state.IBlockState;
import net.minecraft.client.renderer.block.model.IBakedModel;
import net.minecraft.client.renderer.texture.TextureAtlasSprite;
import net.minecraft.item.ItemStack;
import net.minecraft.util.math.AxisAlignedBB;
import net.minecraft.util.math.BlockPos;
@@ -177,9 +178,11 @@ public class ModelMultiFence extends ModelBlockCached<BlockMultiFence, ModelMult
float maxPostPos = 0.5f + POST_WIDGTH / 2.0f;
int meta = key.meta;
FenceType fenceType = key.type;
TextureAtlasSprite primarySprite = block.getSprite(meta, false);
TextureAtlasSprite secondarySprite = block.getSprite(meta, true);
modelBaker.setModelBounds(new AxisAlignedBB(minPostPos, 0.0, minPostPos, maxPostPos, POST_HEIGHT, maxPostPos));
modelBaker.addBlockModel(null, block.getSprite(meta, false), 0);
modelBaker.addBlockModel(null, primarySprite, 0);
boolean connectNegX = key.west;
boolean connectPosX = key.east;
@@ -214,11 +217,11 @@ public class ModelMultiFence extends ModelBlockCached<BlockMultiFence, ModelMult
float totalMaxY = barMaxY;
if (connectAnyX) {
modelBaker.setModelBounds(new AxisAlignedBB(minX, barMinY, minPostPos, maxX, barMaxY, maxPostPos));
modelBaker.addBlockModel(null, block.getSprite(meta, true), 0);
modelBaker.addBlockModel(null, secondarySprite, 0);
}
if (connectAnyZ) {
modelBaker.setModelBounds(new AxisAlignedBB(minPostPos, barMinY, minZ, maxPostPos, barMaxY, maxZ));
modelBaker.addBlockModel(null, block.getSprite(meta, true), 0);
modelBaker.addBlockModel(null, secondarySprite, 0);
}
if (renderBottom) {
barMinY -= 6.0f * SCALE;
@@ -228,11 +231,11 @@ public class ModelMultiFence extends ModelBlockCached<BlockMultiFence, ModelMult
}
if (connectAnyX) {
modelBaker.setModelBounds(new AxisAlignedBB(minX, barMinY, minPostPos, maxX, barMaxY, maxPostPos));
modelBaker.addBlockModel(null, block.getSprite(meta, true), 0);
modelBaker.addBlockModel(null, secondarySprite, 0);
}
if (connectAnyZ) {
modelBaker.setModelBounds(new AxisAlignedBB(minPostPos, barMinY, minZ, maxPostPos, barMaxY, maxZ));
modelBaker.addBlockModel(null, block.getSprite(meta, true), 0);
modelBaker.addBlockModel(null, secondarySprite, 0);
}
if (fenceType.size == 1) {
@@ -241,11 +244,11 @@ public class ModelMultiFence extends ModelBlockCached<BlockMultiFence, ModelMult
barMaxY += SCALE;
if (connectAnyX) {
modelBaker.setModelBounds(new AxisAlignedBB(minX, barMinY, minPostPos, maxX, barMaxY, maxPostPos));
modelBaker.addBlockModel(null, block.getSprite(meta, true), 0);
modelBaker.addBlockModel(null, secondarySprite, 0);
}
if (connectAnyZ) {
modelBaker.setModelBounds(new AxisAlignedBB(minPostPos, barMinY, minZ, maxPostPos, barMaxY, maxZ));
modelBaker.addBlockModel(null, block.getSprite(meta, true), 0);
modelBaker.addBlockModel(null, secondarySprite, 0);
}
}
}
@@ -267,14 +270,14 @@ public class ModelMultiFence extends ModelBlockCached<BlockMultiFence, ModelMult
}
if (connectAnyX) {
modelBaker.setModelBounds(new AxisAlignedBB(minX, minY, minPostPos, maxX, maxY, maxPostPos));
modelBaker.addBlockModel(null, block.getSprite(meta, false), 0);
modelBaker.addBlockModel(null, primarySprite, 0);
}
if (connectAnyZ) {
modelBaker.setModelBounds(new AxisAlignedBB(minPostPos, minY, minZ, maxPostPos, maxY, maxZ));
modelBaker.addBlockModel(null, block.getSprite(meta, false), 0);
modelBaker.addBlockModel(null, primarySprite, 0);
}
}
modelBaker.setParticleSprite(block.getSprite(meta, false));
modelBaker.setParticleSprite(primarySprite);
}
public static class Key {
@@ -24,23 +24,23 @@ import binnie.core.liquid.IFluidDefinition;
import binnie.core.modules.BinnieModule;
import binnie.core.modules.ExtraTreesModuleUIDs;
import binnie.core.modules.Module;
import binnie.core.resource.BinnieSprite;
import binnie.core.util.OreDictionaryUtil;
import binnie.extratrees.ExtraTrees;
import binnie.extratrees.liquid.Alcohol;
import binnie.extratrees.liquid.Cocktail;
import binnie.extratrees.alcohol.GlasswareType;
import binnie.extratrees.liquid.Juice;
import binnie.extratrees.liquid.Liqueur;
import binnie.extratrees.liquid.Spirit;
import binnie.extratrees.alcohol.ICocktailIngredientProvider;
import binnie.extratrees.alcohol.drink.DrinkLiquid;
import binnie.extratrees.items.ItemDrink;
import binnie.extratrees.api.recipes.ExtraTreesRecipeManager;
import binnie.extratrees.api.recipes.IBreweryManager;
import binnie.extratrees.api.recipes.IDistilleryManager;
import binnie.extratrees.api.recipes.IFruitPressManager;
import binnie.extratrees.items.ExtraTreeItems;
import binnie.extratrees.items.Food;
import binnie.extratrees.items.ItemDrink;
import binnie.extratrees.liquid.Alcohol;
import binnie.extratrees.liquid.Cocktail;
import binnie.extratrees.liquid.Juice;
import binnie.extratrees.liquid.Liqueur;
import binnie.extratrees.liquid.Spirit;
import binnie.extratrees.machines.distillery.DistilleryLogic;
@BinnieModule(moduleID = ExtraTreesModuleUIDs.ALCOHOL, moduleContainerID = Constants.EXTRA_TREES_MOD_ID, name = "Alcohol", unlocalizedDescription = "extratrees.module.alcohol")
@@ -49,8 +49,6 @@ public class ModuleAlcohol extends Module {
public static ItemDrink drink;
@Nullable
public static Block blockDrink;
@Nullable
public static BinnieSprite liquid;
@Override
public void registerItemsAndBlocks() {
@@ -60,47 +58,32 @@ public class ModuleAlcohol extends Module {
@Override
public void preInit() {
liquid = Binnie.RESOURCE.getBlockSprite(ExtraTrees.instance, "liquids/liquid");
//ModuleAlcohol.drinkRendererID = BinnieCore.proxy.getUniqueRenderID();
//BinnieCore.proxy.registerCustomItemRenderer(ExtraTrees.drink, new CocktailRenderer());
Binnie.LIQUID.createLiquids(Juice.values());
Binnie.LIQUID.createLiquids(Alcohol.values());
Binnie.LIQUID.createLiquids(Spirit.values());
Binnie.LIQUID.createLiquids(Liqueur.values());
for (final Juice juice : Juice.values()) {
Cocktail.registerIngredient(juice);
}
for (final Alcohol juice2 : Alcohol.values()) {
Cocktail.registerIngredient(juice2);
}
for (final Spirit juice3 : Spirit.values()) {
Cocktail.registerIngredient(juice3);
}
for (final Liqueur juice4 : Liqueur.values()) {
Cocktail.registerIngredient(juice4);
}
registerLiquids(Juice.values());
registerLiquids(Alcohol.values());
registerLiquids(Spirit.values());
registerLiquids(Liqueur.values());
DrinkManager.registerDrinkLiquid(new DrinkLiquid("Water", 13421823, 0.1f, 0.0f, "water"));
}
@Override
public void init() {
}
@Override
public void postInit() {
IBreweryManager breweryManager = ExtraTreesRecipeManager.breweryManager;
IFruitPressManager fruitPressManager = ExtraTreesRecipeManager.fruitPressManager;
ItemStack wax = Mods.Forestry.stack("beeswax");
ItemStack waxCast = Mods.Forestry.stackWildcard("wax_cast");
for (GlasswareType glasswareType : GlasswareType.values()) {
ItemStack result = drink.getStack(glasswareType, null, 8);
Object[] recipe = glasswareType.getRecipePattern(wax.getItem());
RecipeManagers.fabricatorManager.addRecipe(waxCast, Fluids.GLASS.getFluid(glasswareType.getRecipeGlassCost()), result, recipe);
}
if(fruitPressManager != null) {
ItemStack wax = Mods.Forestry.stack("beeswax");
ItemStack waxCast = Mods.Forestry.stackWildcard("wax_cast");
for (GlasswareType glasswareType : GlasswareType.values()) {
ItemStack result = drink.getStack(glasswareType, null, 8);
Object[] recipe = glasswareType.getRecipePattern(wax.getItem());
RecipeManagers.fabricatorManager.addRecipe(waxCast, Fluids.GLASS.getFluid(glasswareType.getRecipeGlassCost()), result, recipe);
}
for (final Juice juice : Juice.values()) {
final String oreDict = juice.squeezing;
final List<ItemStack> ores = new ArrayList<>();
for (Juice juice : Juice.values()) {
String oreDict = juice.squeezing;
List<ItemStack> ores = new ArrayList<>();
ores.addAll(OreDictionary.getOres(oreDict));
for (final Food food : Food.values()) {
if (food.getOres().contains(oreDict)) {
@@ -187,7 +170,12 @@ public class ModuleAlcohol extends Module {
distilleryManager.addRecipe(singleDistilled.get(inAmount), doubleDistilled.get(outAmount2), 0);
distilleryManager.addRecipe(singleDistilled.get(inAmount), tripleDistilled.get(outAmount3), 1);
distilleryManager.addRecipe(doubleDistilled.get(inAmount), tripleDistilled.get(outAmount2), 0);
}
private <L extends IFluidDefinition & ICocktailIngredientProvider> void registerLiquids(L[] liquids){
Binnie.LIQUID.createLiquids(liquids);
Cocktail.registerIngredients(liquids);
}
}
@@ -68,6 +68,7 @@ import binnie.core.modules.ExtraTreesModuleUIDs;
import binnie.core.modules.Module;
import binnie.core.util.RecipeUtil;
import binnie.extratrees.ExtraTrees;
import binnie.extratrees.api.CarpentryManager;
import binnie.extratrees.blocks.BlockETDecorativeLeaves;
import binnie.extratrees.blocks.BlockETDefaultLeaves;
import binnie.extratrees.blocks.decor.BlockMultiFence;
@@ -94,8 +95,11 @@ import binnie.extratrees.items.ExtraTreeLiquid;
import binnie.extratrees.items.ItemBlockETDecorativeLeaves;
import binnie.extratrees.wood.EnumETLog;
import binnie.extratrees.wood.EnumShrubLog;
import binnie.extratrees.wood.IPlankType;
import binnie.extratrees.wood.PlankType;
import binnie.extratrees.wood.WoodManager;
import binnie.extratrees.wood.planks.ExtraTreePlanks;
import binnie.extratrees.wood.planks.ForestryPlanks;
import binnie.extratrees.wood.planks.IPlankType;
import binnie.extratrees.wood.planks.VanillaPlanks;
@BinnieModule(moduleID = ExtraTreesModuleUIDs.WOOD, moduleContainerID = Constants.EXTRA_TREES_MOD_ID, name = "Wood", unlocalizedDescription = "extratrees.module.wood")
public class ModuleWood extends Module {
@@ -141,7 +145,7 @@ public class ModuleWood extends Module {
public void preInit() {
MinecraftForge.EVENT_BUS.register(this);
WoodAccess woodAccess = WoodAccess.getInstance();
PlankType.setup();
registerPlanks();
logs = BlockETLog.create(false);
logsFireproof = BlockETLog.create(true);
@@ -250,7 +254,7 @@ public class ModuleWood extends Module {
fenceGates = new ArrayList<>();
fenceGatesFireproof = new ArrayList<>();
for (PlankType.ExtraTreePlanks plankType : PlankType.ExtraTreePlanks.VALUES) {
for (ExtraTreePlanks plankType : ExtraTreePlanks.VALUES) {
EnumETLog woodType = plankType.getWoodType();
BlockForestryFenceGate<EnumETLog> fenceGate = new BlockForestryFenceGate<>(false, woodType);
String name = "fence.gates." + woodType;
@@ -327,7 +331,22 @@ public class ModuleWood extends Module {
treeBreedingSystem = new TreeBreedingSystem();
Binnie.GENETICS.registerBreedingSystem(treeBreedingSystem);
}
public static void registerPlanks() {
for (VanillaPlanks plank : VanillaPlanks.values()) {
CarpentryManager.carpentryInterface.registerCarpentryWood(plank.ordinal(), plank);
}
for (ExtraTreePlanks plank : ExtraTreePlanks.values()) {
CarpentryManager.carpentryInterface.registerCarpentryWood(plank.ordinal() + 32, plank);
}
for (ForestryPlanks plank : ForestryPlanks.values()) {
CarpentryManager.carpentryInterface.registerCarpentryWood(plank.ordinal() + 128, plank);
}
/*for (ExtraBiomesPlank plank : ExtraBiomesPlank.values()) {
CarpentryManager.carpentryInterface.registerCarpentryWood(plank.ordinal() + 192, plank);
}*/
}
private void registerDoors(WoodAccess woodAccess, List<BlockETDoor> blocks) {
for (BlockETDoor block : blocks) {
registerWithoutVariants(woodAccess, block, WoodBlockKind.DOOR);
@@ -390,7 +409,7 @@ public class ModuleWood extends Module {
}
}
for (PlankType.ExtraTreePlanks plankType : PlankType.ExtraTreePlanks.VALUES) {
for (ExtraTreePlanks plankType : ExtraTreePlanks.VALUES) {
for (boolean fireproof : new boolean[]{false, true}) {
ItemStack planks = woodAccess.getStack(plankType.getWoodType(), WoodBlockKind.PLANKS, fireproof);
ItemStack slabs = woodAccess.getStack(plankType.getWoodType(), WoodBlockKind.SLAB, fireproof);
@@ -475,13 +494,7 @@ public class ModuleWood extends Module {
sprite.registerSprites();
}
TextureMap map = Minecraft.getMinecraft().getTextureMapBlocks();
for (IPlankType type : PlankType.ExtraTreePlanks.VALUES) {
type.registerSprites(map);
}
for (IPlankType type : PlankType.ForestryPlanks.values()) {
type.registerSprites(map);
}
for (IPlankType type : PlankType.VanillaPlanks.values()) {
for (IPlankType type : WoodManager.getAllPlankTypes()) {
type.registerSprites(map);
}
}
@@ -497,7 +510,7 @@ public class ModuleWood extends Module {
public static void speciesRegister(AlleleSpeciesRegisterEvent event) {
if (event.getRoot() instanceof ITreeRoot) {
ETTreeDefinition.preInitTrees();
PlankType.ExtraTreePlanks.initWoodTypes();
ExtraTreePlanks.initWoodTypes();
} else if (event.getRoot() instanceof IButterflyRoot && BinnieCore.isLepidopteryActive()) {
ButterflySpecies.preInit();
}
@@ -5,48 +5,52 @@ import java.util.Locale;
import forestry.api.arboriculture.IWoodType;
import binnie.core.Constants;
import binnie.extratrees.wood.planks.ExtraTreePlanks;
import binnie.extratrees.wood.planks.ForestryPlanks;
import binnie.extratrees.wood.planks.IPlankType;
import binnie.extratrees.wood.planks.VanillaPlanks;
public enum EnumETLog implements IWoodType {
Apple("Apple", PlankType.ExtraTreePlanks.Apple),
Fig("Fig", PlankType.ExtraTreePlanks.Fig),
Butternut("Butternut", PlankType.ExtraTreePlanks.Butternut),
Whitebeam("Whitebeam", PlankType.ExtraTreePlanks.Whitebeam),
Rowan("Rowan", PlankType.ExtraTreePlanks.Rowan),
Hemlock("Hemlock", PlankType.ExtraTreePlanks.Hemlock),
Ash("Ash", PlankType.ExtraTreePlanks.Ash),
Alder("Alder", PlankType.ExtraTreePlanks.Alder),
Beech("Beech", PlankType.ExtraTreePlanks.Beech),
Hawthorn("Hawthorn", PlankType.ExtraTreePlanks.Hawthorn),
Banana("Banana", PlankType.ExtraTreePlanks.Banana),
Yew("Yew", PlankType.ExtraTreePlanks.Yew),
Cypress("Cypress", PlankType.ExtraTreePlanks.Cypress),
Fir("Fir", PlankType.ExtraTreePlanks.Fir),
Hazel("Hazel", PlankType.ExtraTreePlanks.Hazel),
Hickory("Hickory", PlankType.ExtraTreePlanks.Hickory),
Elm("Elm", PlankType.ExtraTreePlanks.Elm),
Elder("Elder", PlankType.ExtraTreePlanks.Elder),
Holly("Holly", PlankType.ExtraTreePlanks.Holly),
Hornbeam("Hornbeam", PlankType.ExtraTreePlanks.Hornbeam),
Cedar("Cedar", PlankType.ExtraTreePlanks.Cedar),
Olive("Olive", PlankType.ExtraTreePlanks.Olive),
Sweetgum("Sweetgum", PlankType.ExtraTreePlanks.Sweetgum),
Locust("Locust", PlankType.ExtraTreePlanks.Locust),
Pear("Pear", PlankType.ExtraTreePlanks.Pear),
Maclura("Maclura", PlankType.ExtraTreePlanks.Maclura),
Brazilwood("Brazilwood", PlankType.ExtraTreePlanks.Brazilwood),
Logwood("Logwood", PlankType.ExtraTreePlanks.Logwood),
Rosewood("Rosewood", PlankType.ExtraTreePlanks.Rosewood),
Purpleheart("Purpleheart", PlankType.ExtraTreePlanks.Purpleheart),
Iroko("Iroko", PlankType.ExtraTreePlanks.Iroko),
Gingko("Gingko", PlankType.ExtraTreePlanks.Gingko),
Eucalyptus("Eucalyptus", PlankType.ExtraTreePlanks.Eucalyptus),
Box("Box", PlankType.ExtraTreePlanks.Box),
Syzgium("Syzgium", PlankType.ExtraTreePlanks.Syzgium),
PinkIvory("PinkIvory", PlankType.ExtraTreePlanks.PinkIvory),
Eucalyptus2("Eucalyptus", PlankType.ExtraTreePlanks.Eucalyptus, false),
Eucalyptus3("Eucalyptus", PlankType.ExtraTreePlanks.Eucalyptus, false),
Cherry("Cherry", PlankType.ForestryPlanks.CHERRY, false),
Cinnamon("Cinnamon", PlankType.VanillaPlanks.JUNGLE, false);
Apple("Apple", ExtraTreePlanks.Apple),
Fig("Fig", ExtraTreePlanks.Fig),
Butternut("Butternut", ExtraTreePlanks.Butternut),
Whitebeam("Whitebeam", ExtraTreePlanks.Whitebeam),
Rowan("Rowan", ExtraTreePlanks.Rowan),
Hemlock("Hemlock", ExtraTreePlanks.Hemlock),
Ash("Ash", ExtraTreePlanks.Ash),
Alder("Alder", ExtraTreePlanks.Alder),
Beech("Beech", ExtraTreePlanks.Beech),
Hawthorn("Hawthorn", ExtraTreePlanks.Hawthorn),
Banana("Banana", ExtraTreePlanks.Banana),
Yew("Yew", ExtraTreePlanks.Yew),
Cypress("Cypress", ExtraTreePlanks.Cypress),
Fir("Fir", ExtraTreePlanks.Fir),
Hazel("Hazel", ExtraTreePlanks.Hazel),
Hickory("Hickory", ExtraTreePlanks.Hickory),
Elm("Elm", ExtraTreePlanks.Elm),
Elder("Elder", ExtraTreePlanks.Elder),
Holly("Holly", ExtraTreePlanks.Holly),
Hornbeam("Hornbeam", ExtraTreePlanks.Hornbeam),
Cedar("Cedar", ExtraTreePlanks.Cedar),
Olive("Olive", ExtraTreePlanks.Olive),
Sweetgum("Sweetgum", ExtraTreePlanks.Sweetgum),
Locust("Locust", ExtraTreePlanks.Locust),
Pear("Pear", ExtraTreePlanks.Pear),
Maclura("Maclura", ExtraTreePlanks.Maclura),
Brazilwood("Brazilwood", ExtraTreePlanks.Brazilwood),
Logwood("Logwood", ExtraTreePlanks.Logwood),
Rosewood("Rosewood", ExtraTreePlanks.Rosewood),
Purpleheart("Purpleheart", ExtraTreePlanks.Purpleheart),
Iroko("Iroko", ExtraTreePlanks.Iroko),
Gingko("Gingko", ExtraTreePlanks.Gingko),
Eucalyptus("Eucalyptus", ExtraTreePlanks.Eucalyptus),
Box("Box", ExtraTreePlanks.Box),
Syzgium("Syzgium", ExtraTreePlanks.Syzgium),
PinkIvory("PinkIvory", ExtraTreePlanks.PinkIvory),
Eucalyptus2("Eucalyptus", ExtraTreePlanks.Eucalyptus, false),
Eucalyptus3("Eucalyptus", ExtraTreePlanks.Eucalyptus, false),
Cherry("Cherry", ForestryPlanks.CHERRY, false),
Cinnamon("Cinnamon", VanillaPlanks.JUNGLE, false);
public static final EnumETLog[] VALUES = values();
@@ -135,7 +139,7 @@ public enum EnumETLog implements IWoodType {
@Override
public String getPlankTexture() {
return plank.getPlankTextureName();
return Constants.EXTRA_TREES_MOD_ID + ":blocks/planks/" + name();
}
public IPlankType getPlank() {
@@ -1,414 +0,0 @@
package binnie.extratrees.wood;
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.core.Constants;
import binnie.core.util.I18N;
import binnie.extratrees.api.CarpentryManager;
public class PlankType {
public static final int MAX_PLANKS = 256;
public static void setup() {
for (final VanillaPlanks plank : VanillaPlanks.values()) {
CarpentryManager.carpentryInterface.registerCarpentryWood(plank.ordinal(), plank);
}
for (final ExtraTreePlanks plank2 : ExtraTreePlanks.values()) {
CarpentryManager.carpentryInterface.registerCarpentryWood(plank2.ordinal() + 32, plank2);
}
for (final ForestryPlanks plank3 : ForestryPlanks.values()) {
CarpentryManager.carpentryInterface.registerCarpentryWood(plank3.ordinal() + 128, plank3);
}
/*for (final ExtraBiomesPlank plank4 : ExtraBiomesPlank.values()) {
CarpentryManager.carpentryInterface.registerCarpentryWood(plank4.ordinal() + 192, plank4);
}*/
}
public enum ExtraTreePlanks implements IPlankType, IFenceProvider, IStringSerializable {
Fir(12815444),
Cedar(14181940),
Hemlock(13088108),
Cypress(16169052),
Fig(13142058),
Beech(14784849),
Alder(12092755),
Hazel(13480341),
Hornbeam(12818528),
Box(16511430),
Butternut(15510138),
Hickory(14333070),
Whitebeam(13222585),
Elm(15772004),
Apple(6305064),
Yew(14722426),
Pear(12093805),
Hawthorn(13402978),
Rowan(13610394),
Elder(12489337),
Maclura(15970862),
Syzgium(15123393),
Brazilwood(7487063),
Logwood(10762028),
Iroko(7681024),
Locust(12816736),
Eucalyptus(16165771),
Purpleheart(5970991),
Ash(16107368),
Holly(16512743),
Olive(11578760),
Sweetgum(13997656),
Rosewood(7738624),
Gingko(16050106),
PinkIvory(15502496),
Banana(9466691);
public static final ExtraTreePlanks[] VALUES = values();
private final int color;
private EnumETLog woodType;
@SideOnly(Side.CLIENT)
private TextureAtlasSprite sprite;
ExtraTreePlanks(final int color) {
this.color = color;
}
public static void initWoodTypes() {
Fir.setWoodType(EnumETLog.Fir);
Cedar.setWoodType(EnumETLog.Cedar);
Hemlock.setWoodType(EnumETLog.Hemlock);
Cypress.setWoodType(EnumETLog.Cypress);
Fig.setWoodType(EnumETLog.Fig);
Beech.setWoodType(EnumETLog.Beech);
Alder.setWoodType(EnumETLog.Alder);
Hazel.setWoodType(EnumETLog.Hazel);
Hornbeam.setWoodType(EnumETLog.Hornbeam);
Box.setWoodType(EnumETLog.Box);
Butternut.setWoodType(EnumETLog.Butternut);
Hickory.setWoodType(EnumETLog.Hickory);
Whitebeam.setWoodType(EnumETLog.Whitebeam);
Elm.setWoodType(EnumETLog.Elm);
Apple.setWoodType(EnumETLog.Apple);
Yew.setWoodType(EnumETLog.Yew);
Pear.setWoodType(EnumETLog.Pear);
Hawthorn.setWoodType(EnumETLog.Hawthorn);
Rowan.setWoodType(EnumETLog.Rowan);
Elder.setWoodType(EnumETLog.Elder);
Maclura.setWoodType(EnumETLog.Maclura);
Syzgium.setWoodType(EnumETLog.Syzgium);
Brazilwood.setWoodType(EnumETLog.Brazilwood);
Logwood.setWoodType(EnumETLog.Logwood);
Iroko.setWoodType(EnumETLog.Iroko);
Locust.setWoodType(EnumETLog.Locust);
Eucalyptus.setWoodType(EnumETLog.Eucalyptus);
Purpleheart.setWoodType(EnumETLog.Purpleheart);
Ash.setWoodType(EnumETLog.Ash);
Holly.setWoodType(EnumETLog.Holly);
Olive.setWoodType(EnumETLog.Olive);
Sweetgum.setWoodType(EnumETLog.Sweetgum);
Rosewood.setWoodType(EnumETLog.Rosewood);
Gingko.setWoodType(EnumETLog.Gingko);
PinkIvory.setWoodType(EnumETLog.PinkIvory);
Banana.setWoodType(EnumETLog.Banana);
}
@Override
public EnumETLog getWoodType() {
return woodType;
}
public void setWoodType(EnumETLog woodType) {
this.woodType = woodType;
}
@Override
public String getName() {
return "block.planks." + this.toString().toLowerCase();
}
@Override
public String getDesignMaterialName() {
return I18N.localise("extratrees.block.planks." + this.toString().toLowerCase());
}
@Override
public String getPlankTextureName() {
return Constants.EXTRA_TREES_MOD_ID + ":blocks/planks/" + name();
}
@Override
public String getDescription() {
return I18N.localise("extratrees.block.planks." + this.toString().toLowerCase() + ".desc");
}
@Override
public int getColour() {
return this.color;
}
@Override
public ItemStack getStack(boolean fireproof) {
return TreeManager.woodAccess.getStack(woodType, WoodBlockKind.PLANKS, fireproof);
}
@Override
public ItemStack getStack() {
return getStack(true);
}
@SideOnly(Side.CLIENT)
@Override
public TextureAtlasSprite getSprite() {
return sprite;
}
@SideOnly(Side.CLIENT)
@Override
public void registerSprites(TextureMap map) {
sprite = map.registerSprite(new ResourceLocation(getPlankTextureName()));
}
@Override
public ItemStack getFence() {
return TreeManager.woodAccess.getStack(woodType, WoodBlockKind.FENCE, false);
}
}
public enum VanillaPlanks implements IPlankType {
OAK(11833434, EnumVanillaWoodType.OAK),
SPRUCE(8412726, EnumVanillaWoodType.SPRUCE),
BIRCH(14139781, EnumVanillaWoodType.BIRCH),
JUNGLE(11632732, EnumVanillaWoodType.JUNGLE),
ACACIA(12215095, EnumVanillaWoodType.ACACIA),
BIG_OAK(4599061, EnumVanillaWoodType.DARK_OAK);
private final IWoodType woodType;
private int color;
@SideOnly(Side.CLIENT)
private TextureAtlasSprite sprite;
VanillaPlanks(final int color, IWoodType woodType) {
this.color = color;
this.woodType = woodType;
}
@Override
public String getDesignMaterialName() {
return I18N.localise("extratrees.block.planks.vanilla." + this.toString().toLowerCase());
}
@Override
public String getDescription() {
return I18N.localise("extratrees.block.planks.vanilla." + this.toString().toLowerCase() + ".desc");
}
@Override
public String getPlankTextureName() {
return "minecraft:blocks/planks_" + name().toLowerCase();
}
@SideOnly(Side.CLIENT)
@Override
public TextureAtlasSprite getSprite() {
return sprite;
}
@SideOnly(Side.CLIENT)
@Override
public void registerSprites(TextureMap map) {
sprite = map.registerSprite(new ResourceLocation(getPlankTextureName()));
}
@Override
public int getColour() {
return this.color;
}
@Override
public ItemStack getStack() {
return getStack(true);
}
@Override
public IWoodType getWoodType() {
return woodType;
}
@Override
public ItemStack getStack(boolean fireproof) {
return TreeManager.woodAccess.getStack(woodType, WoodBlockKind.PLANKS, fireproof);
}
}
public enum ForestryPlanks implements IPlankType, IFenceProvider {
LARCH(14131085, EnumForestryWoodType.LARCH),
TEAK(8223075, EnumForestryWoodType.TEAK),
ACACIA(9745287, EnumForestryWoodType.ACACIA),
LIME(13544048, EnumForestryWoodType.LIME),
CHESTNUT(12298845, EnumForestryWoodType.CHESTNUT),
WENGE(6182474, EnumForestryWoodType.WENGE),
BAOBAB(9608290, EnumForestryWoodType.BAOBAB),
SEQUOIA(10050135, EnumForestryWoodType.SEQUOIA),
KAPOK(8156212, EnumForestryWoodType.KAPOK),
EBONY(3946288, EnumForestryWoodType.EBONY),
MAHOGANY(7749432, EnumForestryWoodType.MAHOGANY),
BALSA(11117209, EnumForestryWoodType.BALSA),
WILLOW(11710818, EnumForestryWoodType.WILLOW),
WALNUT(6836802, EnumForestryWoodType.WALNUT),
GREENHEART(5144156, EnumForestryWoodType.GREENHEART),
CHERRY(11895348, EnumForestryWoodType.CHERRY),
MAHOE(8362154, EnumForestryWoodType.MAHOE),
POPLAR(13619074, EnumForestryWoodType.POPLAR),
PALM(13271115, EnumForestryWoodType.PALM),
PAPAYA(14470005, EnumForestryWoodType.PAPAYA),
PINE(12885585, EnumForestryWoodType.PINE),
PLUM(11364479, EnumForestryWoodType.PLUM),
MAPLE(11431211, EnumForestryWoodType.MAPLE),
CITRUS(10266653, EnumForestryWoodType.CITRUS),
GIGANTEUM(5186590, EnumForestryWoodType.GIGANTEUM),
IPE(5057822, EnumForestryWoodType.IPE),
PADAUK(11756341, EnumForestryWoodType.PADAUK),
COCOBOLO(7541506, EnumForestryWoodType.COCOBOLO),
ZEBRAWOOD(10912334, EnumForestryWoodType.ZEBRAWOOD);
private final IWoodType woodType;
private final int color;
@SideOnly(Side.CLIENT)
private TextureAtlasSprite sprite;
ForestryPlanks(final int color, IWoodType woodType) {
this.color = color;
this.woodType = woodType;
}
@Override
public String getPlankTextureName() {
return "forestry:blocks/wood/planks." + name().toLowerCase();
}
@Override
public String getDesignMaterialName() {
return I18N.localise("extratrees.block.planks.forestry." + this.toString().toLowerCase());
}
@Override
public String getDescription() {
return I18N.localise("extratrees.block.planks.forestry." + this.toString().toLowerCase() + ".desc");
}
@SideOnly(Side.CLIENT)
@Override
public TextureAtlasSprite getSprite() {
return sprite;
}
@SideOnly(Side.CLIENT)
@Override
public void registerSprites(TextureMap map) {
sprite = map.registerSprite(new ResourceLocation(getPlankTextureName()));
}
@Override
public int getColour() {
return this.color;
}
@Override
public IWoodType getWoodType() {
return woodType;
}
@Override
public ItemStack getStack(boolean fireproof) {
return TreeManager.woodAccess.getStack(woodType, WoodBlockKind.PLANKS, fireproof);
}
@Override
public ItemStack getStack() {
return getStack(true);
}
@Override
public ItemStack getFence() {
return TreeManager.woodAccess.getStack(woodType, WoodBlockKind.FENCE, false);
}
}
//TODO: extrabiomes 1.10.2
/*public enum ExtraBiomesPlank implements IPlankType {
Redwood(10185538),
Fir(8288074),
Acacia(12561022);
int color;
ExtraBiomesPlank(final int color) {
this.color = color;
}
@Override
public String getDisplayName() {
return I18N.localise("extratrees.block.planks.ebxl." + this.toString().toLowerCase());
}
@Override
public String getPlankTextureName() {
return "";
}
@Override
public String getDescription() {
return I18N.localise("extratrees.block.planks.ebxl." + this.toString().toLowerCase() + ".desc");
}
@Override
public int getColor() {
return this.color;
}
@Override
public ItemStack getStack() {
return getStack(true);
}
@Override
public ItemStack getStack(boolean fireproof) {
try {
final Class clss = Class.forName("extrabiomes.api.Stuff");
Optional planks = (Optional) clss.getField("planks").get(null);
if (planks.isPresent()) {
final Block block = (Block) planks.get();
return new ItemStack(block, 1, this.ordinal());
} else {
return null;
}
} catch (Exception e) {
return null;
}
}
@Override
public IIcon getIcon() {
if (this.getStack() != null) {
final int meta = this.getStack().getItemDamage();
final Block block = ((ItemBlock) this.getStack().getItem()).field_150939_a;
return block.getIcon(2, meta);
}
return null;
}
}*/
}
@@ -25,6 +25,10 @@ import binnie.extratrees.api.IDesignMaterial;
import binnie.extratrees.blocks.decor.FenceDescription;
import binnie.extratrees.blocks.decor.FenceType;
import binnie.extratrees.modules.ModuleWood;
import binnie.extratrees.wood.planks.ExtraTreePlanks;
import binnie.extratrees.wood.planks.ForestryPlanks;
import binnie.extratrees.wood.planks.IPlankType;
import binnie.extratrees.wood.planks.VanillaPlanks;
public class WoodManager {
private static List<IPlankType> PLANK_TYPES;
@@ -61,7 +65,7 @@ public class WoodManager {
if (wood instanceof IPlankType) {
return (IPlankType) wood;
}
return PlankType.ExtraTreePlanks.Fir;
return ExtraTreePlanks.Fir;
}
public static int getPlankTypeIndex(final IPlankType type) {
@@ -101,24 +105,24 @@ public class WoodManager {
}
public static ItemStack getGate(final IPlankType plank) {
if (plank == PlankType.VanillaPlanks.OAK) {
if (plank == VanillaPlanks.OAK) {
return new ItemStack(Blocks.OAK_FENCE_GATE);
}
return TreeManager.woodAccess.getStack(plank.getWoodType(), WoodBlockKind.FENCE_GATE, false);
}
public static ItemStack getDoor(final IPlankType plank) {
if (plank == PlankType.VanillaPlanks.OAK) {
if (plank == VanillaPlanks.OAK) {
return new ItemStack(Items.OAK_DOOR);
}else if (plank == PlankType.VanillaPlanks.BIRCH) {
}else if (plank == VanillaPlanks.BIRCH) {
return new ItemStack(Items.BIRCH_DOOR);
}else if (plank == PlankType.VanillaPlanks.SPRUCE) {
}else if (plank == VanillaPlanks.SPRUCE) {
return new ItemStack(Items.SPRUCE_DOOR);
} else if (plank == PlankType.VanillaPlanks.BIG_OAK) {
} else if (plank == VanillaPlanks.BIG_OAK) {
return new ItemStack(Items.DARK_OAK_DOOR);
} else if (plank == PlankType.VanillaPlanks.JUNGLE) {
} else if (plank == VanillaPlanks.JUNGLE) {
return new ItemStack(Items.JUNGLE_DOOR);
} else if (plank == PlankType.VanillaPlanks.ACACIA) {
} else if (plank == VanillaPlanks.ACACIA) {
return new ItemStack(Items.ACACIA_DOOR);
}
return TreeManager.woodAccess.getStack(plank.getWoodType(), WoodBlockKind.DOOR, false);
@@ -146,11 +150,11 @@ public class WoodManager {
public static List<IPlankType> getAllPlankTypes() {
if(PLANK_TYPES == null){
PLANK_TYPES = new ArrayList<>();
Collections.addAll(PLANK_TYPES, PlankType.ExtraTreePlanks.VALUES);
Collections.addAll(PLANK_TYPES, PlankType.ForestryPlanks.values());
Collections.addAll(PLANK_TYPES, PlankType.VanillaPlanks.values());
Collections.addAll(PLANK_TYPES, ExtraTreePlanks.VALUES);
Collections.addAll(PLANK_TYPES, ForestryPlanks.values());
Collections.addAll(PLANK_TYPES, VanillaPlanks.values());
//TODO: extrabiomes 1.12
/*for (final IPlankType type : PlankType.ExtraBiomesPlank.values()) {
/*for (final IPlankType type : ExtraBiomesPlank.values()) {
if (type.getStack() != null) {
list.add(type);
}
@@ -0,0 +1,65 @@
package binnie.extratrees.wood.planks;
public enum ExtraBiomesPlank /*implements IPlankType*/ {
/*Redwood(10185538),
Fir(8288074),
Acacia(12561022);
int color;
ExtraBiomesPlank(final int color) {
this.color = color;
}
@Override
public String getDisplayName() {
return I18N.localise("extratrees.block.planks.ebxl." + this.toString().toLowerCase());
}
@Override
public String getPlankTextureName() {
return "";
}
@Override
public String getDescription() {
return I18N.localise("extratrees.block.planks.ebxl." + this.toString().toLowerCase() + ".desc");
}
@Override
public int getColor() {
return this.color;
}
@Override
public ItemStack getStack() {
return getStack(true);
}
@Override
public ItemStack getStack(boolean fireproof) {
try {
final Class clss = Class.forName("extrabiomes.api.Stuff");
Optional planks = (Optional) clss.getField("planks").get(null);
if (planks.isPresent()) {
final Block block = (Block) planks.get();
return new ItemStack(block, 1, this.ordinal());
} else {
return null;
}
} catch (Exception e) {
return null;
}
}
@Override
public IIcon getIcon() {
if (this.getStack() != null) {
final int meta = this.getStack().getItemDamage();
final Block block = ((ItemBlock) this.getStack().getItem()).field_150939_a;
return block.getIcon(2, meta);
}
return null;
}*/
}
@@ -0,0 +1,166 @@
package binnie.extratrees.wood.planks;
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.TreeManager;
import forestry.api.arboriculture.WoodBlockKind;
import binnie.core.Constants;
import binnie.core.util.I18N;
import binnie.extratrees.wood.EnumETLog;
import binnie.extratrees.wood.IFenceProvider;
public enum ExtraTreePlanks implements IPlankType, IFenceProvider, IStringSerializable {
Fir(12815444),
Cedar(14181940),
Hemlock(13088108),
Cypress(16169052),
Fig(13142058),
Beech(14784849),
Alder(12092755),
Hazel(13480341),
Hornbeam(12818528),
Box(16511430),
Butternut(15510138),
Hickory(14333070),
Whitebeam(13222585),
Elm(15772004),
Apple(6305064),
Yew(14722426),
Pear(12093805),
Hawthorn(13402978),
Rowan(13610394),
Elder(12489337),
Maclura(15970862),
Syzgium(15123393),
Brazilwood(7487063),
Logwood(10762028),
Iroko(7681024),
Locust(12816736),
Eucalyptus(16165771),
Purpleheart(5970991),
Ash(16107368),
Holly(16512743),
Olive(11578760),
Sweetgum(13997656),
Rosewood(7738624),
Gingko(16050106),
PinkIvory(15502496),
Banana(9466691);
public static final ExtraTreePlanks[] VALUES = values();
private final int color;
private EnumETLog woodType;
@SideOnly(Side.CLIENT)
private TextureAtlasSprite sprite;
ExtraTreePlanks(final int color) {
this.color = color;
}
public static void initWoodTypes() {
Fir.setWoodType(EnumETLog.Fir);
Cedar.setWoodType(EnumETLog.Cedar);
Hemlock.setWoodType(EnumETLog.Hemlock);
Cypress.setWoodType(EnumETLog.Cypress);
Fig.setWoodType(EnumETLog.Fig);
Beech.setWoodType(EnumETLog.Beech);
Alder.setWoodType(EnumETLog.Alder);
Hazel.setWoodType(EnumETLog.Hazel);
Hornbeam.setWoodType(EnumETLog.Hornbeam);
Box.setWoodType(EnumETLog.Box);
Butternut.setWoodType(EnumETLog.Butternut);
Hickory.setWoodType(EnumETLog.Hickory);
Whitebeam.setWoodType(EnumETLog.Whitebeam);
Elm.setWoodType(EnumETLog.Elm);
Apple.setWoodType(EnumETLog.Apple);
Yew.setWoodType(EnumETLog.Yew);
Pear.setWoodType(EnumETLog.Pear);
Hawthorn.setWoodType(EnumETLog.Hawthorn);
Rowan.setWoodType(EnumETLog.Rowan);
Elder.setWoodType(EnumETLog.Elder);
Maclura.setWoodType(EnumETLog.Maclura);
Syzgium.setWoodType(EnumETLog.Syzgium);
Brazilwood.setWoodType(EnumETLog.Brazilwood);
Logwood.setWoodType(EnumETLog.Logwood);
Iroko.setWoodType(EnumETLog.Iroko);
Locust.setWoodType(EnumETLog.Locust);
Eucalyptus.setWoodType(EnumETLog.Eucalyptus);
Purpleheart.setWoodType(EnumETLog.Purpleheart);
Ash.setWoodType(EnumETLog.Ash);
Holly.setWoodType(EnumETLog.Holly);
Olive.setWoodType(EnumETLog.Olive);
Sweetgum.setWoodType(EnumETLog.Sweetgum);
Rosewood.setWoodType(EnumETLog.Rosewood);
Gingko.setWoodType(EnumETLog.Gingko);
PinkIvory.setWoodType(EnumETLog.PinkIvory);
Banana.setWoodType(EnumETLog.Banana);
}
@Override
public EnumETLog getWoodType() {
return woodType;
}
public void setWoodType(EnumETLog woodType) {
this.woodType = woodType;
}
@Override
public String getName() {
return "block.planks." + this.toString().toLowerCase();
}
@Override
public String getDesignMaterialName() {
return I18N.localise("extratrees.block.planks." + this.toString().toLowerCase());
}
private String getPlankTextureName() {
return Constants.EXTRA_TREES_MOD_ID + ":blocks/planks/" + name();
}
@Override
public String getDescription() {
return I18N.localise("extratrees.block.planks." + this.toString().toLowerCase() + ".desc");
}
@Override
public int getColour() {
return this.color;
}
@Override
public ItemStack getStack(boolean fireproof) {
return TreeManager.woodAccess.getStack(woodType, WoodBlockKind.PLANKS, fireproof);
}
@Override
public ItemStack getStack() {
return getStack(true);
}
@Override
@SideOnly(Side.CLIENT)
public TextureAtlasSprite getSprite() {
return sprite;
}
@SideOnly(Side.CLIENT)
@Override
public void registerSprites(TextureMap map) {
sprite = map.registerSprite(new ResourceLocation(getPlankTextureName()));
}
@Override
public ItemStack getFence() {
return TreeManager.woodAccess.getStack(woodType, WoodBlockKind.FENCE, false);
}
}
@@ -0,0 +1,110 @@
package binnie.extratrees.wood.planks;
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 forestry.api.arboriculture.EnumForestryWoodType;
import forestry.api.arboriculture.IWoodType;
import forestry.api.arboriculture.TreeManager;
import forestry.api.arboriculture.WoodBlockKind;
import binnie.core.util.I18N;
import binnie.extratrees.wood.IFenceProvider;
public enum ForestryPlanks implements IPlankType, IFenceProvider {
LARCH(14131085, EnumForestryWoodType.LARCH),
TEAK(8223075, EnumForestryWoodType.TEAK),
ACACIA(9745287, EnumForestryWoodType.ACACIA),
LIME(13544048, EnumForestryWoodType.LIME),
CHESTNUT(12298845, EnumForestryWoodType.CHESTNUT),
WENGE(6182474, EnumForestryWoodType.WENGE),
BAOBAB(9608290, EnumForestryWoodType.BAOBAB),
SEQUOIA(10050135, EnumForestryWoodType.SEQUOIA),
KAPOK(8156212, EnumForestryWoodType.KAPOK),
EBONY(3946288, EnumForestryWoodType.EBONY),
MAHOGANY(7749432, EnumForestryWoodType.MAHOGANY),
BALSA(11117209, EnumForestryWoodType.BALSA),
WILLOW(11710818, EnumForestryWoodType.WILLOW),
WALNUT(6836802, EnumForestryWoodType.WALNUT),
GREENHEART(5144156, EnumForestryWoodType.GREENHEART),
CHERRY(11895348, EnumForestryWoodType.CHERRY),
MAHOE(8362154, EnumForestryWoodType.MAHOE),
POPLAR(13619074, EnumForestryWoodType.POPLAR),
PALM(13271115, EnumForestryWoodType.PALM),
PAPAYA(14470005, EnumForestryWoodType.PAPAYA),
PINE(12885585, EnumForestryWoodType.PINE),
PLUM(11364479, EnumForestryWoodType.PLUM),
MAPLE(11431211, EnumForestryWoodType.MAPLE),
CITRUS(10266653, EnumForestryWoodType.CITRUS),
GIGANTEUM(5186590, EnumForestryWoodType.GIGANTEUM),
IPE(5057822, EnumForestryWoodType.IPE),
PADAUK(11756341, EnumForestryWoodType.PADAUK),
COCOBOLO(7541506, EnumForestryWoodType.COCOBOLO),
ZEBRAWOOD(10912334, EnumForestryWoodType.ZEBRAWOOD);
private final IWoodType woodType;
private final int color;
@SideOnly(Side.CLIENT)
private TextureAtlasSprite sprite;
ForestryPlanks(final int color, IWoodType woodType) {
this.color = color;
this.woodType = woodType;
}
private String getPlankTextureName() {
return "forestry:blocks/wood/planks." + name().toLowerCase();
}
@Override
public String getDesignMaterialName() {
return I18N.localise("extratrees.block.planks.forestry." + this.toString().toLowerCase());
}
@Override
public String getDescription() {
return I18N.localise("extratrees.block.planks.forestry." + this.toString().toLowerCase() + ".desc");
}
@SideOnly(Side.CLIENT)
@Override
public TextureAtlasSprite getSprite() {
return sprite;
}
@SideOnly(Side.CLIENT)
@Override
public void registerSprites(TextureMap map) {
sprite = map.registerSprite(new ResourceLocation(getPlankTextureName()));
}
@Override
public int getColour() {
return this.color;
}
@Override
public IWoodType getWoodType() {
return woodType;
}
@Override
public ItemStack getStack(boolean fireproof) {
return TreeManager.woodAccess.getStack(woodType, WoodBlockKind.PLANKS, fireproof);
}
@Override
public ItemStack getStack() {
return getStack(true);
}
@Override
public ItemStack getFence() {
return TreeManager.woodAccess.getStack(woodType, WoodBlockKind.FENCE, false);
}
}
@@ -1,4 +1,4 @@
package binnie.extratrees.wood;
package binnie.extratrees.wood.planks;
import net.minecraft.client.renderer.texture.TextureAtlasSprite;
import net.minecraft.client.renderer.texture.TextureMap;
@@ -11,8 +11,6 @@ import forestry.api.arboriculture.IWoodType;
import binnie.extratrees.api.IDesignMaterial;
public interface IPlankType extends IDesignMaterial {
String getPlankTextureName();
String getDescription();
IWoodType getWoodType();
@@ -0,0 +1,81 @@
package binnie.extratrees.wood.planks;
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 forestry.api.arboriculture.EnumVanillaWoodType;
import forestry.api.arboriculture.IWoodType;
import forestry.api.arboriculture.TreeManager;
import forestry.api.arboriculture.WoodBlockKind;
import binnie.core.util.I18N;
public enum VanillaPlanks implements IPlankType {
OAK(11833434, EnumVanillaWoodType.OAK),
SPRUCE(8412726, EnumVanillaWoodType.SPRUCE),
BIRCH(14139781, EnumVanillaWoodType.BIRCH),
JUNGLE(11632732, EnumVanillaWoodType.JUNGLE),
ACACIA(12215095, EnumVanillaWoodType.ACACIA),
BIG_OAK(4599061, EnumVanillaWoodType.DARK_OAK);
private final IWoodType woodType;
private int color;
@SideOnly(Side.CLIENT)
private TextureAtlasSprite sprite;
VanillaPlanks(final int color, IWoodType woodType) {
this.color = color;
this.woodType = woodType;
}
@Override
public String getDesignMaterialName() {
return I18N.localise("extratrees.block.planks.vanilla." + this.toString().toLowerCase());
}
@Override
public String getDescription() {
return I18N.localise("extratrees.block.planks.vanilla." + this.toString().toLowerCase() + ".desc");
}
private String getPlankTextureName() {
return "minecraft:blocks/planks_" + name().toLowerCase();
}
@SideOnly(Side.CLIENT)
@Override
public TextureAtlasSprite getSprite() {
return sprite;
}
@SideOnly(Side.CLIENT)
@Override
public void registerSprites(TextureMap map) {
sprite = map.registerSprite(new ResourceLocation(getPlankTextureName()));
}
@Override
public int getColour() {
return this.color;
}
@Override
public ItemStack getStack() {
return getStack(true);
}
@Override
public IWoodType getWoodType() {
return woodType;
}
@Override
public ItemStack getStack(boolean fireproof) {
return TreeManager.woodAccess.getStack(woodType, WoodBlockKind.PLANKS, fireproof);
}
}