diff --git a/src/main/java/binnie/extratrees/ExtraTrees.java b/src/main/java/binnie/extratrees/ExtraTrees.java index 04606b78..c96711dc 100644 --- a/src/main/java/binnie/extratrees/ExtraTrees.java +++ b/src/main/java/binnie/extratrees/ExtraTrees.java @@ -13,6 +13,7 @@ import binnie.extratrees.alcohol.ModuleAlcohol; import binnie.extratrees.alcohol.drink.ItemDrink; import binnie.extratrees.block.BlockETDecorativeLeaves; import binnie.extratrees.block.ModuleBlocks; +import binnie.extratrees.block.PlankType; import binnie.extratrees.block.decor.BlockHedge; import binnie.extratrees.block.decor.BlockMultiFence; import binnie.extratrees.block.log.BlockETLog; @@ -169,6 +170,7 @@ public class ExtraTrees extends AbstractMod { AlleleManager.alleleRegistry.registerAllele(fruit); } ETTreeDefinition.preInitTrees(); + PlankType.ExtraTreePlanks.initWoodTypes(); if (BinnieCore.isLepidopteryActive()) { for (final ButterflySpecies species2 : ButterflySpecies.values()) { diff --git a/src/main/java/binnie/extratrees/api/IDesignMaterial.java b/src/main/java/binnie/extratrees/api/IDesignMaterial.java index 1c6a4cc2..3f312a44 100644 --- a/src/main/java/binnie/extratrees/api/IDesignMaterial.java +++ b/src/main/java/binnie/extratrees/api/IDesignMaterial.java @@ -4,6 +4,8 @@ import net.minecraft.item.ItemStack; public interface IDesignMaterial { ItemStack getStack(); + + ItemStack getStack(boolean fireproof); String getName(); diff --git a/src/main/java/binnie/extratrees/block/EnumExtraTreeLog.java b/src/main/java/binnie/extratrees/block/EnumExtraTreeLog.java index 873577ac..5986f0dd 100644 --- a/src/main/java/binnie/extratrees/block/EnumExtraTreeLog.java +++ b/src/main/java/binnie/extratrees/block/EnumExtraTreeLog.java @@ -13,7 +13,6 @@ public enum EnumExtraTreeLog implements IWoodType { Apple("Apple", PlankType.ExtraTreePlanks.Apple), Fig("Fig", PlankType.ExtraTreePlanks.Fig), Butternut("Butternut", PlankType.ExtraTreePlanks.Butternut), - Cherry("Cherry", PlankType.ForestryPlanks.CHERRY), Whitebeam("Whitebeam", PlankType.ExtraTreePlanks.Whitebeam), Rowan("Rowan", PlankType.ExtraTreePlanks.Rowan), Hemlock("Hemlock", PlankType.ExtraTreePlanks.Hemlock), @@ -48,8 +47,9 @@ public enum EnumExtraTreeLog implements IWoodType { Box("Box", PlankType.ExtraTreePlanks.Box), Syzgium("Syzgium", PlankType.ExtraTreePlanks.Syzgium), Eucalyptus3("Eucalyptus", PlankType.ExtraTreePlanks.Eucalyptus), - Cinnamon("Cinnamon", PlankType.VanillaPlanks.JUNGLE), PinkIvory("Pink Ivory", PlankType.ExtraTreePlanks.PinkIvory), + Cherry("Cherry", PlankType.ForestryPlanks.CHERRY), + Cinnamon("Cinnamon", PlankType.VanillaPlanks.JUNGLE), EMPTY("EMPTY", PlankType.VanillaPlanks.OAK);//TODO change name/create wood for SHRUBS public static final EnumExtraTreeLog[] VALUES = values(); @@ -77,12 +77,12 @@ public enum EnumExtraTreeLog implements IWoodType { return; } ItemStack log = TreeManager.woodAccess.getStack(this, WoodBlockKind.LOG, false); - ItemStack result = TreeManager.woodAccess.getStack(this, WoodBlockKind.PLANKS, false); + ItemStack result = plank.getStack(false); result.stackSize = 4; GameRegistry.addShapelessRecipe(result, log); ItemStack logFireproof = TreeManager.woodAccess.getStack(this, WoodBlockKind.LOG, true); - ItemStack resultFireproof = TreeManager.woodAccess.getStack(this, WoodBlockKind.PLANKS, true); + ItemStack resultFireproof = plank.getStack(true); resultFireproof.stackSize = 4; GameRegistry.addShapelessRecipe(resultFireproof, logFireproof); } @@ -126,6 +126,10 @@ public enum EnumExtraTreeLog implements IWoodType { public String getPlankTexture() { return plank.getPlankTextureName(); } + + public IPlankType getPlank() { + return plank; + } @Override public int getMetadata() { diff --git a/src/main/java/binnie/extratrees/block/ModuleBlocks.java b/src/main/java/binnie/extratrees/block/ModuleBlocks.java index b60bf191..a02f7a77 100644 --- a/src/main/java/binnie/extratrees/block/ModuleBlocks.java +++ b/src/main/java/binnie/extratrees/block/ModuleBlocks.java @@ -199,12 +199,11 @@ public class ModuleBlocks implements IInitializable { @Override public void postInit() { IWoodAccess woodAccess = TreeManager.woodAccess; - for(EnumExtraTreeLog woodType : EnumExtraTreeLog.VALUES){ + for(PlankType.ExtraTreePlanks plankType : PlankType.ExtraTreePlanks.VALUES){ for(boolean fireproof : new boolean[]{false, true}){ - ItemStack logs = woodAccess.getStack(woodType, WoodBlockKind.LOG, fireproof); - ItemStack planks = woodAccess.getStack(woodType, WoodBlockKind.PLANKS, fireproof); - ItemStack slabs = woodAccess.getStack(woodType, WoodBlockKind.SLAB, fireproof); - ItemStack stairs = woodAccess.getStack(woodType, WoodBlockKind.STAIRS, fireproof); + ItemStack planks = woodAccess.getStack(plankType.getWoodType(), WoodBlockKind.PLANKS, fireproof); + ItemStack slabs = woodAccess.getStack(plankType.getWoodType(), WoodBlockKind.SLAB, fireproof); + ItemStack stairs = woodAccess.getStack(plankType.getWoodType(), WoodBlockKind.STAIRS, fireproof); stairs.stackSize = 4; RecipeUtil.addPriorityRecipe(stairs.copy(), @@ -215,10 +214,6 @@ public class ModuleBlocks implements IInitializable { slabs.stackSize = 6; RecipeUtil.addPriorityRecipe(slabs.copy(), "###", '#', planks.copy()); - - ItemStack craftedPlanks = planks.copy(); - craftedPlanks.stackSize = 4; - RecipeUtil.addShapelessRecipe(craftedPlanks, logs.copy()); } } GameRegistry.addRecipe(new MultiFenceRecipeSize()); diff --git a/src/main/java/binnie/extratrees/block/PlankType.java b/src/main/java/binnie/extratrees/block/PlankType.java index 3b73ea2f..15d4b6e9 100644 --- a/src/main/java/binnie/extratrees/block/PlankType.java +++ b/src/main/java/binnie/extratrees/block/PlankType.java @@ -33,52 +33,100 @@ public class PlankType { } public enum ExtraTreePlanks implements IPlankType, IFenceProvider, IStringSerializable { - Fir(12815444, EnumExtraTreeLog.Fir), - Cedar(14181940, EnumExtraTreeLog.Cedar), - Hemlock(13088108, EnumExtraTreeLog.Hemlock), - Cypress(16169052, EnumExtraTreeLog.Cypress), - Fig(13142058, EnumExtraTreeLog.Fig), - Beech(14784849, EnumExtraTreeLog.Beech), - Alder(12092755, EnumExtraTreeLog.Alder), - Hazel(13480341, EnumExtraTreeLog.Hazel), - Hornbeam(12818528, EnumExtraTreeLog.Hornbeam), - Box(16511430, EnumExtraTreeLog.Box), - Butternut(15510138, EnumExtraTreeLog.Butternut), - Hickory(14333070, EnumExtraTreeLog.Hickory), - Whitebeam(13222585, EnumExtraTreeLog.Whitebeam), - Elm(15772004, EnumExtraTreeLog.Elm), - Apple(6305064, EnumExtraTreeLog.Apple), - Yew(14722426, EnumExtraTreeLog.Yew), - Pear(12093805, EnumExtraTreeLog.Pear), - Hawthorn(13402978, EnumExtraTreeLog.Hawthorn), - Rowan(13610394, EnumExtraTreeLog.Rowan), - Elder(12489337, EnumExtraTreeLog.Elder), - Maclura(15970862, EnumExtraTreeLog.Maclura), - Syzgium(15123393, EnumExtraTreeLog.Syzgium), - Brazilwood(7487063, EnumExtraTreeLog.Brazilwood), - Logwood(10762028, EnumExtraTreeLog.Logwood), - Iroko(7681024, EnumExtraTreeLog.Iroko), - Locust(12816736, EnumExtraTreeLog.Locust), - Eucalyptus(16165771, EnumExtraTreeLog.Eucalyptus), - Purpleheart(5970991, EnumExtraTreeLog.Purpleheart), - Ash(16107368, EnumExtraTreeLog.Ash), - Holly(16512743, EnumExtraTreeLog.Holly), - Olive(11578760, EnumExtraTreeLog.Olive), - Sweetgum(13997656, EnumExtraTreeLog.Sweetgum), - Rosewood(7738624, EnumExtraTreeLog.Rosewood), - Gingko(16050106, EnumExtraTreeLog.Gingko), - PinkIvory(15502496, EnumExtraTreeLog.PinkIvory), - Banana(0, EnumExtraTreeLog.Banana); + 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(0); - private final IWoodType woodType; - private int color; + public static final ExtraTreePlanks[] VALUES = values(); + + private IWoodType woodType; + private final int color; //IIcon icon; - ExtraTreePlanks(final int color, IWoodType woodType) { + ExtraTreePlanks(final int color) { this.color = color; - this.woodType = woodType; } + public static void initWoodTypes(){ + Fir.setWoodType(EnumExtraTreeLog.Fir); + Cedar.setWoodType(EnumExtraTreeLog.Cedar); + Hemlock.setWoodType(EnumExtraTreeLog.Hemlock); + Cypress.setWoodType(EnumExtraTreeLog.Cypress); + Fig.setWoodType(EnumExtraTreeLog.Fig); + Beech.setWoodType(EnumExtraTreeLog.Beech); + Alder.setWoodType(EnumExtraTreeLog.Alder); + Hazel.setWoodType(EnumExtraTreeLog.Hazel); + Hornbeam.setWoodType(EnumExtraTreeLog.Hornbeam); + Box.setWoodType(EnumExtraTreeLog.Box); + Butternut.setWoodType(EnumExtraTreeLog.Butternut); + Hickory.setWoodType(EnumExtraTreeLog.Hickory); + Whitebeam.setWoodType(EnumExtraTreeLog.Whitebeam); + Elm.setWoodType(EnumExtraTreeLog.Elm); + Apple.setWoodType(EnumExtraTreeLog.Apple); + Yew.setWoodType(EnumExtraTreeLog.Yew); + Pear.setWoodType(EnumExtraTreeLog.Pear); + Hawthorn.setWoodType(EnumExtraTreeLog.Hawthorn); + Rowan.setWoodType(EnumExtraTreeLog.Rowan); + Elder.setWoodType(EnumExtraTreeLog.Elder); + Maclura.setWoodType(EnumExtraTreeLog.Maclura); + Syzgium.setWoodType(EnumExtraTreeLog.Syzgium); + Brazilwood.setWoodType(EnumExtraTreeLog.Brazilwood); + Logwood.setWoodType(EnumExtraTreeLog.Logwood); + Iroko.setWoodType(EnumExtraTreeLog.Iroko); + Locust.setWoodType(EnumExtraTreeLog.Locust); + Eucalyptus.setWoodType(EnumExtraTreeLog.Eucalyptus); + Purpleheart.setWoodType(EnumExtraTreeLog.Purpleheart); + Ash.setWoodType(EnumExtraTreeLog.Ash); + Holly.setWoodType(EnumExtraTreeLog.Holly); + Olive.setWoodType(EnumExtraTreeLog.Olive); + Sweetgum.setWoodType(EnumExtraTreeLog.Sweetgum); + Rosewood.setWoodType(EnumExtraTreeLog.Rosewood); + Gingko.setWoodType(EnumExtraTreeLog.Gingko); + PinkIvory.setWoodType(EnumExtraTreeLog.PinkIvory); + Banana.setWoodType(EnumExtraTreeLog.Banana); + } + + public void setWoodType(IWoodType woodType) { + this.woodType = woodType; + } + + public IWoodType getWoodType() { + return woodType; + } + @Override public String getName() { return ExtraTrees.proxy.localise("block.planks." + this.toString().toLowerCase()); @@ -98,10 +146,15 @@ public class PlankType { 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 TreeManager.woodAccess.getStack(woodType, WoodBlockKind.PLANKS, true); + return getStack(true); } // public IIcon loadIcon(final IIconRegister register) { @@ -154,10 +207,15 @@ public class PlankType { public int getColour() { return this.color; } - + @Override public ItemStack getStack() { - return TreeManager.woodAccess.getStack(woodType, WoodBlockKind.PLANKS, false); + return getStack(true); + } + + @Override + public ItemStack getStack(boolean fireproof) { + return TreeManager.woodAccess.getStack(woodType, WoodBlockKind.PLANKS, fireproof); } // @Override @@ -229,10 +287,15 @@ public class PlankType { 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 TreeManager.woodAccess.getStack(woodType, WoodBlockKind.PLANKS, false); + return getStack(true); } // @Override @@ -283,9 +346,14 @@ public class PlankType { public int getColour() { 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); diff --git a/src/main/java/binnie/extratrees/block/log/BlockETLog.java b/src/main/java/binnie/extratrees/block/log/BlockETLog.java index 9bffa8c3..278805fa 100644 --- a/src/main/java/binnie/extratrees/block/log/BlockETLog.java +++ b/src/main/java/binnie/extratrees/block/log/BlockETLog.java @@ -13,7 +13,7 @@ import javax.annotation.Nonnull; public abstract class BlockETLog extends BlockForestryLog { public static List create(boolean fireproof) { List blocks = new ArrayList<>(); - PropertyETWoodType[] variants = PropertyETWoodType.create("variant", VARIANTS_PER_BLOCK); + PropertyETWoodType[] variants = PropertyETWoodType.create("variant", VARIANTS_PER_BLOCK, true); for (int i = 0; i < variants.length; i++) { PropertyETWoodType variant = variants[i]; BlockETLog block = new BlockETLog(fireproof, i) { diff --git a/src/main/java/binnie/extratrees/block/plank/BlockETPlank.java b/src/main/java/binnie/extratrees/block/plank/BlockETPlank.java index 5e78e857..1ce3d1dd 100644 --- a/src/main/java/binnie/extratrees/block/plank/BlockETPlank.java +++ b/src/main/java/binnie/extratrees/block/plank/BlockETPlank.java @@ -14,7 +14,7 @@ public abstract class BlockETPlank extends BlockForestryPlanks public static List create(boolean fireproof) { List blocks = new ArrayList<>(); - PropertyETWoodType[] variants = PropertyETWoodType.create("variant", VARIANTS_PER_BLOCK); + PropertyETWoodType[] variants = PropertyETWoodType.create("variant", VARIANTS_PER_BLOCK, false); for (int i = 0; i < variants.length; i++) { PropertyETWoodType variant = variants[i]; BlockETPlank block = new BlockETPlank(fireproof, i) { diff --git a/src/main/java/binnie/extratrees/block/property/ETWoodTypePredicate.java b/src/main/java/binnie/extratrees/block/property/ETWoodTypePredicate.java new file mode 100644 index 00000000..a885f26f --- /dev/null +++ b/src/main/java/binnie/extratrees/block/property/ETWoodTypePredicate.java @@ -0,0 +1,27 @@ +package binnie.extratrees.block.property; + +import com.google.common.base.Predicate; + +import binnie.extratrees.block.EnumExtraTreeLog; +import binnie.extratrees.block.PlankType; +import forestry.api.arboriculture.IWoodType; + +public class ETWoodTypePredicate implements Predicate { + private final int minWoodTypeMeta; + private final int maxWoodTypeMeta; + private final boolean isLog; + + public ETWoodTypePredicate(int blockNumber, int variantsPerBlock, boolean isLog) { + this.minWoodTypeMeta = blockNumber * variantsPerBlock; + this.maxWoodTypeMeta = minWoodTypeMeta + variantsPerBlock - 1; + this.isLog = isLog; + } + + @Override + public boolean apply(EnumExtraTreeLog woodType) { + if(!isLog && !(woodType.getPlank() instanceof PlankType.ExtraTreePlanks)){ + return false; + } + return woodType.getMetadata() >= minWoodTypeMeta && woodType.getMetadata() <= maxWoodTypeMeta; + } +} diff --git a/src/main/java/binnie/extratrees/block/property/PropertyETType.java b/src/main/java/binnie/extratrees/block/property/PropertyETType.java index 6efcd41c..55310e37 100644 --- a/src/main/java/binnie/extratrees/block/property/PropertyETType.java +++ b/src/main/java/binnie/extratrees/block/property/PropertyETType.java @@ -3,7 +3,6 @@ package binnie.extratrees.block.property; import com.google.common.collect.Collections2; import com.google.common.collect.Lists; -import binnie.extratrees.block.TreeTypePredicate; import binnie.extratrees.genetics.ETTreeDefinition; import javax.annotation.Nonnull; diff --git a/src/main/java/binnie/extratrees/block/property/PropertyETWoodType.java b/src/main/java/binnie/extratrees/block/property/PropertyETWoodType.java index 92715708..0b925135 100644 --- a/src/main/java/binnie/extratrees/block/property/PropertyETWoodType.java +++ b/src/main/java/binnie/extratrees/block/property/PropertyETWoodType.java @@ -8,15 +8,22 @@ import com.google.common.collect.Collections2; import com.google.common.collect.Lists; import binnie.extratrees.block.EnumExtraTreeLog; +import binnie.extratrees.block.PlankType; import forestry.arboriculture.blocks.WoodTypePredicate; import forestry.arboriculture.blocks.property.PropertyWoodType; public class PropertyETWoodType extends PropertyWoodType { - public static PropertyETWoodType[] create(@Nonnull String name, int variantsPerBlock) { - final int variantCount = (int) Math.ceil((float) EnumExtraTreeLog.VALUES.length / variantsPerBlock); + public static PropertyETWoodType[] create(@Nonnull String name, int variantsPerBlock, boolean isLog) { + int length; + if(isLog){ + length = EnumExtraTreeLog.VALUES.length; + }else{ + length = PlankType.ExtraTreePlanks.VALUES.length; + } + final int variantCount = (int) Math.ceil((float) length / variantsPerBlock); PropertyETWoodType[] variants = new PropertyETWoodType[variantCount]; for (int variantNumber = 0; variantNumber < variantCount; variantNumber++) { - WoodTypePredicate filter = new WoodTypePredicate(variantNumber, variantsPerBlock); + ETWoodTypePredicate filter = new ETWoodTypePredicate(variantNumber, variantsPerBlock, isLog); Collection allowedValues = Collections2.filter(Lists.newArrayList(EnumExtraTreeLog.class.getEnumConstants()), filter); variants[variantNumber] = new PropertyETWoodType(name, EnumExtraTreeLog.class, allowedValues); } diff --git a/src/main/java/binnie/extratrees/block/TreeTypePredicate.java b/src/main/java/binnie/extratrees/block/property/TreeTypePredicate.java similarity index 93% rename from src/main/java/binnie/extratrees/block/TreeTypePredicate.java rename to src/main/java/binnie/extratrees/block/property/TreeTypePredicate.java index ecf8e2c5..c0bd4dad 100644 --- a/src/main/java/binnie/extratrees/block/TreeTypePredicate.java +++ b/src/main/java/binnie/extratrees/block/property/TreeTypePredicate.java @@ -1,4 +1,4 @@ -package binnie.extratrees.block; +package binnie.extratrees.block.property; import javax.annotation.Nullable; diff --git a/src/main/java/binnie/extratrees/block/slab/BlockETSlab.java b/src/main/java/binnie/extratrees/block/slab/BlockETSlab.java index 3a10ff00..5aed2e13 100644 --- a/src/main/java/binnie/extratrees/block/slab/BlockETSlab.java +++ b/src/main/java/binnie/extratrees/block/slab/BlockETSlab.java @@ -13,7 +13,7 @@ import java.util.List; public abstract class BlockETSlab extends BlockForestrySlab { public static List create(boolean fireproof, final boolean doubleSlab) { List blocks = new ArrayList<>(); - PropertyETWoodType[] variants = PropertyETWoodType.create("variant", VARIANTS_PER_BLOCK); + PropertyETWoodType[] variants = PropertyETWoodType.create("variant", VARIANTS_PER_BLOCK, false); for (int i = 0; i < variants.length; i++) { PropertyETWoodType variant = variants[i]; BlockETSlab block = new BlockETSlab(fireproof, i) {