diff --git a/src/main/java/binnie/botany/ceramic/BlockStainedGlass.java b/src/main/java/binnie/botany/ceramic/BlockStainedGlass.java index 35bf63cc..0da98bfd 100644 --- a/src/main/java/binnie/botany/ceramic/BlockStainedGlass.java +++ b/src/main/java/binnie/botany/ceramic/BlockStainedGlass.java @@ -7,6 +7,8 @@ import binnie.core.block.BlockMetadata; import binnie.core.block.IBlockMetadata; import binnie.core.block.TileEntityMetadata; import binnie.core.util.TileUtil; +import forestry.api.core.IItemModelRegister; +import forestry.api.core.IModelManager; import forestry.core.blocks.IColoredBlock; import net.minecraft.block.Block; import net.minecraft.block.material.Material; @@ -30,7 +32,7 @@ import java.util.Collections; import java.util.List; import java.util.Random; -public class BlockStainedGlass extends Block implements IBlockMetadata, IColoredBlock { +public class BlockStainedGlass extends Block implements IBlockMetadata, IColoredBlock, IItemModelRegister { public BlockStainedGlass() { super(Material.GLASS); this.setCreativeTab(CreativeTabBotany.instance); @@ -50,7 +52,15 @@ public class BlockStainedGlass extends Block implements IBlockMetadata, IColored @SideOnly(Side.CLIENT) @Override public BlockRenderLayer getBlockLayer() { - return BlockRenderLayer.CUTOUT_MIPPED; + return BlockRenderLayer.TRANSLUCENT; + } + + @SideOnly(Side.CLIENT) + @Override + public void registerModel(Item item, IModelManager manager) { + for (EnumFlowerColor color : EnumFlowerColor.values()) { + manager.registerItemModel(item, color.getID()); + } } @Override @@ -108,7 +118,6 @@ public class BlockStainedGlass extends Block implements IBlockMetadata, IColored @Override public boolean eventReceived(IBlockState state, World worldIn, BlockPos pos, int id, int param) { - super.eventReceived(state, worldIn, pos, id, param); TileEntity tileentity = worldIn.getTileEntity(pos); return tileentity == null ? false : tileentity.receiveClientEvent(id, param); } @@ -136,27 +145,6 @@ public class BlockStainedGlass extends Block implements IBlockMetadata, IColored } } -// @Override -// @SideOnly(Side.CLIENT) -// public IIcon getIcon(final IBlockAccess world, final int x, final int y, final int z, final int side) { -// final TileEntityMetadata tile = TileEntityMetadata.getTile(world, x, y, z); -// if (tile != null) { -// return this.getIcon(side, tile.getTileMetadata()); -// } -// return super.getIcon(world, x, y, z, side); -// } - -// @Override -// public IIcon getIcon(final int side, final int meta) { -// return this.blockIcon; -// } -// -// @Override -// @SideOnly(Side.CLIENT) -// public void registerBlockIcons(final IIconRegister register) { -// this.blockIcon = Botany.proxy.getIcon(register, "stained"); -// } - @Override public boolean isWood(IBlockAccess world, BlockPos pos) { return true; @@ -184,6 +172,9 @@ public class BlockStainedGlass extends Block implements IBlockMetadata, IColored @Override public int colorMultiplier(IBlockState state, IBlockAccess worldIn, BlockPos pos, int tintIndex) { - return EnumFlowerColor.get(getMetaFromState(state)).getColor(false); + if(worldIn == null || pos == null){ + return 0; + } + return EnumFlowerColor.get(TileEntityMetadata.getTileMetadata(worldIn, pos)).getColor(false); } } diff --git a/src/main/java/binnie/botany/ceramic/ItemStainedGlass.java b/src/main/java/binnie/botany/ceramic/ItemStainedGlass.java new file mode 100644 index 00000000..bc7a8a77 --- /dev/null +++ b/src/main/java/binnie/botany/ceramic/ItemStainedGlass.java @@ -0,0 +1,24 @@ +package binnie.botany.ceramic; + +import binnie.botany.genetics.EnumFlowerColor; +import binnie.core.block.ItemMetadata; +import binnie.core.block.TileEntityMetadata; +import forestry.core.items.IColoredItem; +import net.minecraft.block.Block; +import net.minecraft.item.ItemStack; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; + +public class ItemStainedGlass extends ItemMetadata implements IColoredItem { + + public ItemStainedGlass(Block block) { + super(block); + } + + @SideOnly(Side.CLIENT) + @Override + public int getColorFromItemstack(ItemStack stack, int tintIndex) { + return EnumFlowerColor.get(TileEntityMetadata.getItemDamage(stack)).getColor(false); + } + +} diff --git a/src/main/java/binnie/botany/gardening/ModuleGardening.java b/src/main/java/binnie/botany/gardening/ModuleGardening.java index f40b9db4..71c60a3d 100644 --- a/src/main/java/binnie/botany/gardening/ModuleGardening.java +++ b/src/main/java/binnie/botany/gardening/ModuleGardening.java @@ -10,6 +10,7 @@ import binnie.botany.ceramic.BlockCeramicPatterned; import binnie.botany.ceramic.BlockStainedGlass; import binnie.botany.ceramic.CeramicTileRecipe; import binnie.botany.ceramic.ItemCeramic; +import binnie.botany.ceramic.ItemStainedGlass; import binnie.botany.ceramic.PigmentRecipe; import binnie.botany.ceramic.TileCeramic; import binnie.botany.ceramic.brick.BlockCeramicBrick; @@ -87,7 +88,7 @@ public class ModuleGardening implements IInitializable { BinnieCore.proxy.registerTileEntity(TileCeramic.class, "botany.tile.ceramic"); // BinnieCore.proxy.registerCustomItemRenderer(Item.getItemFromBlock(Botany.ceramic), new ItemMetadataRenderer()); Botany.stained = new BlockStainedGlass(); - Botany.proxy.registerBlock(Botany.stained, new ItemMetadata(Botany.stained)); + Botany.proxy.registerBlock(Botany.stained, new ItemStainedGlass(Botany.stained)); // BinnieCore.proxy.registerCustomItemRenderer(Item.getItemFromBlock(Botany.stained), new ItemMetadataRenderer()); Botany.ceramicTile = new BlockCeramicPatterned(); Botany.proxy.registerBlock(Botany.ceramicTile, new ItemDesign(Botany.ceramicTile)); diff --git a/src/main/java/binnie/core/BinnieCore.java b/src/main/java/binnie/core/BinnieCore.java index ef3c6d7b..fc940fee 100644 --- a/src/main/java/binnie/core/BinnieCore.java +++ b/src/main/java/binnie/core/BinnieCore.java @@ -149,6 +149,9 @@ public final class BinnieCore extends AbstractMod { @SubscribeEvent @SideOnly(Side.CLIENT) public void handleSpeciesDiscovered(final ForestryEvent.SpeciesDiscovered event) { + if(event.username == null){ + return; + } final EntityPlayerMP player = FMLCommonHandler.instance().getMinecraftServerInstance().getPlayerList().getPlayerByUUID(event.username.getId()); if (player == null) { return; diff --git a/src/main/java/binnie/extratrees/block/EnumExtraTreeLog.java b/src/main/java/binnie/extratrees/block/EnumETLog.java similarity index 89% rename from src/main/java/binnie/extratrees/block/EnumExtraTreeLog.java rename to src/main/java/binnie/extratrees/block/EnumETLog.java index 5986f0dd..8a83bbd2 100644 --- a/src/main/java/binnie/extratrees/block/EnumExtraTreeLog.java +++ b/src/main/java/binnie/extratrees/block/EnumETLog.java @@ -3,13 +3,14 @@ package binnie.extratrees.block; import javax.annotation.Nonnull; import binnie.Constants; +import forestry.api.arboriculture.EnumForestryWoodType; 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; -public enum EnumExtraTreeLog implements IWoodType { +public enum EnumETLog implements IWoodType { Apple("Apple", PlankType.ExtraTreePlanks.Apple), Fig("Fig", PlankType.ExtraTreePlanks.Fig), Butternut("Butternut", PlankType.ExtraTreePlanks.Butternut), @@ -50,14 +51,14 @@ public enum EnumExtraTreeLog implements IWoodType { 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 + Shrub("Shrub", PlankType.VanillaPlanks.OAK); - public static final EnumExtraTreeLog[] VALUES = values(); + public static final EnumETLog[] VALUES = values(); String name; IPlankType plank; - EnumExtraTreeLog(final String name, final IPlankType plank) { + EnumETLog(final String name, final IPlankType plank) { this.name = name; this.plank = plank; } @@ -94,12 +95,19 @@ public enum EnumExtraTreeLog implements IWoodType { @Override public int getCarbonization() { - return 0; //TODO return valid value + return 4; } - + @Override public float getCharcoalChance(int numberOfCharcoal) { - return 0;//TODO return valid value + if(numberOfCharcoal == 3){ + return 0.75F; + }else if(numberOfCharcoal == 4){ + return 0.5F; + }else if(numberOfCharcoal == 5){ + return 0.25F; + } + return 0.15F; } @Override @@ -137,7 +145,7 @@ public enum EnumExtraTreeLog implements IWoodType { } @Nonnull - public static EnumExtraTreeLog byMetadata(int meta) { + public static EnumETLog byMetadata(int meta) { if (meta < 0 || meta >= VALUES.length) { meta = 0; } diff --git a/src/main/java/binnie/extratrees/block/IWoodKind.java b/src/main/java/binnie/extratrees/block/IWoodKind.java index c57270bf..2fc315bb 100644 --- a/src/main/java/binnie/extratrees/block/IWoodKind.java +++ b/src/main/java/binnie/extratrees/block/IWoodKind.java @@ -4,7 +4,7 @@ import forestry.api.arboriculture.WoodBlockKind; import net.minecraft.block.properties.PropertyEnum; public interface IWoodKind { - PropertyEnum getVariant(); - EnumExtraTreeLog getWoodType(int meta); + PropertyEnum getVariant(); + EnumETLog getWoodType(int meta); WoodBlockKind getWoodKind(); } diff --git a/src/main/java/binnie/extratrees/block/ModuleBlocks.java b/src/main/java/binnie/extratrees/block/ModuleBlocks.java index 2bc7fe1d..c5997550 100644 --- a/src/main/java/binnie/extratrees/block/ModuleBlocks.java +++ b/src/main/java/binnie/extratrees/block/ModuleBlocks.java @@ -133,7 +133,7 @@ public class ModuleBlocks implements IInitializable { for (BlockETPlank plank : planks) { for (IBlockState blockState : plank.getBlockState().getValidStates()) { int meta = plank.getMetaFromState(blockState); - EnumExtraTreeLog woodType = plank.getWoodType(meta); + EnumETLog woodType = plank.getWoodType(meta); BlockForestryStairs stair = new BlockForestryStairs(false, blockState, woodType); String name = "stairs." + woodType; @@ -149,7 +149,7 @@ public class ModuleBlocks implements IInitializable { for (BlockETPlank plank : planksFireproof) { for (IBlockState blockState : plank.getBlockState().getValidStates()) { int meta = plank.getMetaFromState(blockState); - EnumExtraTreeLog woodType = plank.getWoodType(meta); + EnumETLog woodType = plank.getWoodType(meta); BlockForestryStairs stair = new BlockForestryStairs(true, blockState, woodType); String name = "stairs.fireproof." + woodType; @@ -183,8 +183,9 @@ public class ModuleBlocks implements IInitializable { fenceGates = new ArrayList<>(); fenceGatesFireproof = new ArrayList<>(); - for (EnumExtraTreeLog woodType : EnumExtraTreeLog.VALUES) { - BlockForestryFenceGate fenceGate = new BlockForestryFenceGate<>(false, woodType); + for (PlankType.ExtraTreePlanks plankType : PlankType.ExtraTreePlanks.VALUES) { + EnumETLog woodType = plankType.getWoodType(); + BlockForestryFenceGate fenceGate = new BlockForestryFenceGate(false, woodType); String name = "fence.gates." + woodType; fenceGate.setRegistryName(new ResourceLocation(Constants.EXTRA_TREES_MOD_ID, name)); fenceGate.setUnlocalizedName(name); @@ -193,7 +194,7 @@ public class ModuleBlocks implements IInitializable { fenceGates.add(fenceGate); FMLInterModComms.sendMessage("forestry", "add-fence-block", fenceGate.getRegistryName().toString()); - BlockForestryFenceGate fenceGateFireproof = new BlockForestryFenceGate<>(true, woodType); + BlockForestryFenceGate fenceGateFireproof = new BlockForestryFenceGate(true, woodType); String nameFireproof = "fence.gates.fireproof." + woodType; fenceGateFireproof.setRegistryName(new ResourceLocation(Constants.EXTRA_TREES_MOD_ID, nameFireproof)); fenceGateFireproof.setUnlocalizedName(nameFireproof); diff --git a/src/main/java/binnie/extratrees/block/PlankType.java b/src/main/java/binnie/extratrees/block/PlankType.java index 3e935561..91c98b98 100644 --- a/src/main/java/binnie/extratrees/block/PlankType.java +++ b/src/main/java/binnie/extratrees/block/PlankType.java @@ -69,7 +69,7 @@ public class PlankType { public static final ExtraTreePlanks[] VALUES = values(); - private IWoodType woodType; + private EnumETLog woodType; private final int color; //IIcon icon; @@ -78,50 +78,50 @@ public class PlankType { } 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); + 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); } - public void setWoodType(IWoodType woodType) { + public void setWoodType(EnumETLog woodType) { this.woodType = woodType; } @Override - public IWoodType getWoodType() { + public EnumETLog getWoodType() { return woodType; } diff --git a/src/main/java/binnie/extratrees/block/WoodManager.java b/src/main/java/binnie/extratrees/block/WoodManager.java index 1366464f..c3d19143 100644 --- a/src/main/java/binnie/extratrees/block/WoodManager.java +++ b/src/main/java/binnie/extratrees/block/WoodManager.java @@ -28,7 +28,7 @@ public class WoodManager { String displayName; - if (woodType instanceof EnumExtraTreeLog) { + if (woodType instanceof EnumETLog) { String customUnlocalizedName = "tile.et." + blockKind + "." + woodType + ".name"; if (Translator.canTranslateToLocal(customUnlocalizedName)) { displayName = Translator.translateToLocal(customUnlocalizedName); diff --git a/src/main/java/binnie/extratrees/block/property/ETWoodTypePredicate.java b/src/main/java/binnie/extratrees/block/property/ETWoodTypePredicate.java index d8da25cb..3ee571e9 100644 --- a/src/main/java/binnie/extratrees/block/property/ETWoodTypePredicate.java +++ b/src/main/java/binnie/extratrees/block/property/ETWoodTypePredicate.java @@ -2,10 +2,10 @@ package binnie.extratrees.block.property; import com.google.common.base.Predicate; -import binnie.extratrees.block.EnumExtraTreeLog; +import binnie.extratrees.block.EnumETLog; import binnie.extratrees.block.PlankType; -public class ETWoodTypePredicate implements Predicate { +public class ETWoodTypePredicate implements Predicate { private final int minWoodTypeMeta; private final int maxWoodTypeMeta; private final boolean isLog; @@ -17,7 +17,7 @@ public class ETWoodTypePredicate implements Predicate { } @Override - public boolean apply(EnumExtraTreeLog woodType) { + public boolean apply(EnumETLog woodType) { if(!isLog && !(woodType.getPlank() instanceof PlankType.ExtraTreePlanks)){ return false; } diff --git a/src/main/java/binnie/extratrees/block/property/PropertyETWoodType.java b/src/main/java/binnie/extratrees/block/property/PropertyETWoodType.java index 11f7c8d2..3b45d754 100644 --- a/src/main/java/binnie/extratrees/block/property/PropertyETWoodType.java +++ b/src/main/java/binnie/extratrees/block/property/PropertyETWoodType.java @@ -7,11 +7,11 @@ import javax.annotation.Nonnull; import com.google.common.collect.Collections2; import com.google.common.collect.Lists; -import binnie.extratrees.block.EnumExtraTreeLog; +import binnie.extratrees.block.EnumETLog; import binnie.extratrees.block.PlankType; import forestry.arboriculture.blocks.property.PropertyWoodType; -public class PropertyETWoodType extends PropertyWoodType { +public class PropertyETWoodType extends PropertyWoodType { public static PropertyETWoodType[] create(@Nonnull String name, int variantsPerBlock) { return create(name, variantsPerBlock, false); @@ -19,7 +19,7 @@ public class PropertyETWoodType extends PropertyWoodType { public static PropertyETWoodType[] create(@Nonnull String name, int variantsPerBlock, boolean isLog) { int length; if(isLog){ - length = EnumExtraTreeLog.VALUES.length; + length = EnumETLog.VALUES.length; }else{ length = PlankType.ExtraTreePlanks.VALUES.length; } @@ -27,13 +27,13 @@ public class PropertyETWoodType extends PropertyWoodType { PropertyETWoodType[] variants = new PropertyETWoodType[variantCount]; for (int variantNumber = 0; variantNumber < variantCount; variantNumber++) { 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); + Collection allowedValues = Collections2.filter(Lists.newArrayList(EnumETLog.class.getEnumConstants()), filter); + variants[variantNumber] = new PropertyETWoodType(name, EnumETLog.class, allowedValues); } return variants; } - protected PropertyETWoodType(String name, Class valueClass, Collection allowedValues) { + protected PropertyETWoodType(String name, Class valueClass, Collection allowedValues) { super(name, valueClass, allowedValues); } } diff --git a/src/main/java/binnie/extratrees/block/wood/BlockETFence.java b/src/main/java/binnie/extratrees/block/wood/BlockETFence.java index 26dfb82d..e77fd997 100644 --- a/src/main/java/binnie/extratrees/block/wood/BlockETFence.java +++ b/src/main/java/binnie/extratrees/block/wood/BlockETFence.java @@ -6,7 +6,7 @@ import java.util.List; import javax.annotation.Nonnull; import binnie.Constants; -import binnie.extratrees.block.EnumExtraTreeLog; +import binnie.extratrees.block.EnumETLog; import binnie.extratrees.block.property.PropertyETWoodType; import forestry.api.core.IItemModelRegister; import forestry.api.core.IStateMapperRegister; @@ -14,7 +14,7 @@ import forestry.arboriculture.IWoodTyped; import forestry.arboriculture.blocks.fence.BlockForestryFence; import net.minecraft.util.ResourceLocation; -public abstract class BlockETFence extends BlockForestryFence implements IWoodTyped, IItemModelRegister, IStateMapperRegister { +public abstract class BlockETFence extends BlockForestryFence implements IWoodTyped, IItemModelRegister, IStateMapperRegister { public static List create(boolean fireproof) { List blocks = new ArrayList<>(); @@ -46,9 +46,9 @@ public abstract class BlockETFence extends BlockForestryFence @Nonnull @Override - public EnumExtraTreeLog getWoodType(int meta) { + public EnumETLog getWoodType(int meta) { int variantCount = getVariant().getAllowedValues().size(); int variantMeta = (meta % variantCount) + getBlockNumber() * VARIANTS_PER_BLOCK; - return EnumExtraTreeLog.byMetadata(variantMeta); + return EnumETLog.byMetadata(variantMeta); } } diff --git a/src/main/java/binnie/extratrees/block/wood/BlockETLog.java b/src/main/java/binnie/extratrees/block/wood/BlockETLog.java index c19ff9bd..9cccb5b4 100644 --- a/src/main/java/binnie/extratrees/block/wood/BlockETLog.java +++ b/src/main/java/binnie/extratrees/block/wood/BlockETLog.java @@ -1,7 +1,7 @@ package binnie.extratrees.block.wood; import binnie.Constants; -import binnie.extratrees.block.EnumExtraTreeLog; +import binnie.extratrees.block.EnumETLog; import binnie.extratrees.block.property.PropertyETWoodType; import forestry.arboriculture.blocks.log.BlockForestryLog; import forestry.arboriculture.blocks.property.PropertyWoodType; @@ -10,7 +10,7 @@ import java.util.ArrayList; import java.util.List; import javax.annotation.Nonnull; -public abstract class BlockETLog extends BlockForestryLog { +public abstract class BlockETLog extends BlockForestryLog { public static List create(boolean fireproof) { List blocks = new ArrayList<>(); PropertyETWoodType[] variants = PropertyETWoodType.create("variant", VARIANTS_PER_BLOCK, true); @@ -19,7 +19,7 @@ public abstract class BlockETLog extends BlockForestryLog { BlockETLog block = new BlockETLog(fireproof, i) { @Nonnull @Override - public PropertyWoodType getVariant() { + public PropertyWoodType getVariant() { return variant; } }; @@ -41,10 +41,10 @@ public abstract class BlockETLog extends BlockForestryLog { @Nonnull @Override - public EnumExtraTreeLog getWoodType(int meta) { + public EnumETLog getWoodType(int meta) { int variantCount = getVariant().getAllowedValues().size(); int variantMeta = (meta % variantCount) + getBlockNumber() * VARIANTS_PER_BLOCK; - return EnumExtraTreeLog.byMetadata(variantMeta); + return EnumETLog.byMetadata(variantMeta); } } diff --git a/src/main/java/binnie/extratrees/block/wood/BlockETPlank.java b/src/main/java/binnie/extratrees/block/wood/BlockETPlank.java index 22798cfd..3fc353f4 100644 --- a/src/main/java/binnie/extratrees/block/wood/BlockETPlank.java +++ b/src/main/java/binnie/extratrees/block/wood/BlockETPlank.java @@ -1,7 +1,7 @@ package binnie.extratrees.block.wood; import binnie.Constants; -import binnie.extratrees.block.EnumExtraTreeLog; +import binnie.extratrees.block.EnumETLog; import binnie.extratrees.block.property.PropertyETWoodType; import forestry.arboriculture.blocks.planks.BlockForestryPlanks; import net.minecraft.util.ResourceLocation; @@ -9,7 +9,7 @@ import java.util.ArrayList; import java.util.List; import javax.annotation.Nonnull; -public abstract class BlockETPlank extends BlockForestryPlanks { +public abstract class BlockETPlank extends BlockForestryPlanks { public static final String BLOCK_NAME = "plank"; public static List create(boolean fireproof) { @@ -42,9 +42,9 @@ public abstract class BlockETPlank extends BlockForestryPlanks @Nonnull @Override - public EnumExtraTreeLog getWoodType(int meta) { + public EnumETLog getWoodType(int meta) { int variantCount = getVariant().getAllowedValues().size(); int variantMeta = (meta % variantCount) + getBlockNumber() * VARIANTS_PER_BLOCK; - return EnumExtraTreeLog.byMetadata(variantMeta); + return EnumETLog.byMetadata(variantMeta); } } diff --git a/src/main/java/binnie/extratrees/block/wood/BlockETSlab.java b/src/main/java/binnie/extratrees/block/wood/BlockETSlab.java index 7ee3d4d1..99a2f4c3 100644 --- a/src/main/java/binnie/extratrees/block/wood/BlockETSlab.java +++ b/src/main/java/binnie/extratrees/block/wood/BlockETSlab.java @@ -1,7 +1,7 @@ package binnie.extratrees.block.wood; import binnie.Constants; -import binnie.extratrees.block.EnumExtraTreeLog; +import binnie.extratrees.block.EnumETLog; import binnie.extratrees.block.property.PropertyETWoodType; import forestry.arboriculture.blocks.slab.BlockForestrySlab; import net.minecraft.util.ResourceLocation; @@ -10,7 +10,7 @@ import javax.annotation.Nonnull; import java.util.ArrayList; import java.util.List; -public abstract class BlockETSlab extends BlockForestrySlab { +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, false); @@ -49,10 +49,10 @@ public abstract class BlockETSlab extends BlockForestrySlab { @Nonnull @Override - public EnumExtraTreeLog getWoodType(int meta) { + public EnumETLog getWoodType(int meta) { meta &= ~8; // unset the top/bottom slab bit int variantCount = getVariant().getAllowedValues().size(); int variantMeta = (meta % variantCount) + getBlockNumber() * VARIANTS_PER_BLOCK; - return EnumExtraTreeLog.byMetadata(variantMeta); + return EnumETLog.byMetadata(variantMeta); } } diff --git a/src/main/java/binnie/extratrees/carpentry/ModuleCarpentry.java b/src/main/java/binnie/extratrees/carpentry/ModuleCarpentry.java index 82a88fb9..8ce1bef0 100644 --- a/src/main/java/binnie/extratrees/carpentry/ModuleCarpentry.java +++ b/src/main/java/binnie/extratrees/carpentry/ModuleCarpentry.java @@ -24,7 +24,7 @@ public class ModuleCarpentry implements IInitializable { blockStained = new BlockStainedDesign(); ExtraTrees.proxy.registerBlock(blockCarpentry, new ItemDesign(blockCarpentry)); ExtraTrees.proxy.registerBlock(blockPanel, new ItemDesign(blockPanel)); - ExtraTrees.proxy.registerBlock(blockStained, new ItemDesign(blockPanel)); + ExtraTrees.proxy.registerBlock(blockStained, new ItemDesign(blockStained)); //BinnieCore.proxy.registerCustomItemRenderer(Item.getItemFromBlock(ExtraTrees.blockCarpentry), new MultipassItemRenderer()); //BinnieCore.proxy.registerCustomItemRenderer(Item.getItemFromBlock(ExtraTrees.blockStained), new MultipassItemRenderer()); diff --git a/src/main/java/binnie/extratrees/core/ModuleCore.java b/src/main/java/binnie/extratrees/core/ModuleCore.java index 7194df50..b377575f 100644 --- a/src/main/java/binnie/extratrees/core/ModuleCore.java +++ b/src/main/java/binnie/extratrees/core/ModuleCore.java @@ -5,7 +5,7 @@ import binnie.core.IInitializable; import binnie.extratrees.api.CarpentryManager; import binnie.extratrees.api.IDesign; import binnie.extratrees.api.IDesignMaterial; -import binnie.extratrees.block.EnumExtraTreeLog; +import binnie.extratrees.block.EnumETLog; import binnie.extratrees.block.PlankType; import binnie.extratrees.genetics.AlleleETFruit; import binnie.extratrees.genetics.ETTreeDefinition; @@ -42,7 +42,7 @@ public class ModuleCore implements IInitializable { speciesQueue.add(s.getSpecies()); } final Queue logQueue = new LinkedList<>(); - Collections.addAll(logQueue, EnumExtraTreeLog.values()); + Collections.addAll(logQueue, EnumETLog.values()); final Queue plankQueue = new LinkedList<>(); Collections.addAll(plankQueue, PlankType.ExtraTreePlanks.values()); final Queue fruitQueue = new LinkedList<>(); @@ -68,7 +68,7 @@ public class ModuleCore implements IInitializable { while (!logQueue.isEmpty()) { outputLogs.println(""); for (int i = 0; i < 4; ++i) { - final EnumExtraTreeLog wood5 = (EnumExtraTreeLog) logQueue.poll(); + final EnumETLog wood5 = (EnumETLog) logQueue.poll(); if (wood5 == null) { outputLogs.println(""); } else { diff --git a/src/main/java/binnie/extratrees/genetics/ETTreeDefinition.java b/src/main/java/binnie/extratrees/genetics/ETTreeDefinition.java index 28d92f97..c3f5776e 100644 --- a/src/main/java/binnie/extratrees/genetics/ETTreeDefinition.java +++ b/src/main/java/binnie/extratrees/genetics/ETTreeDefinition.java @@ -2,7 +2,7 @@ package binnie.extratrees.genetics; import binnie.Constants; import binnie.core.genetics.ForestryAllele; -import binnie.extratrees.block.EnumExtraTreeLog; +import binnie.extratrees.block.EnumETLog; import binnie.extratrees.gen.*; import forestry.api.arboriculture.*; import forestry.api.genetics.AlleleManager; @@ -36,7 +36,7 @@ import java.util.Arrays; import java.util.Locale; public enum ETTreeDefinition implements IStringSerializable, ITreeDefinition, ITreeGenerator { - OrchardApple("malus", "domestica", EnumLeafType.DECIDUOUS, new Color(0x09E67E), new Color(0xFF9CF3),EnumSaplingType.Default, EnumExtraTreeLog.Apple, new Color(0x7B7A7B)){ + OrchardApple("malus", "domestica", EnumLeafType.DECIDUOUS, new Color(0x09E67E), new Color(0xFF9CF3),EnumSaplingType.Default, EnumETLog.Apple, new Color(0x7B7A7B)){ @Override public WorldGenerator getWorldGenerator(ITreeGenData tree) { @@ -56,7 +56,7 @@ public enum ETTreeDefinition implements IStringSerializable, ITreeDefinition, IT species.addFruitFamily(ETFruitFamily.Citrus); } }, - SweetCrabapple("malus", "coronaria", EnumLeafType.DECIDUOUS, new Color(0x7A9953), new Color(0xFC359F),EnumSaplingType.Default, EnumExtraTreeLog.Apple, new Color(0x7B7A7B)){ + SweetCrabapple("malus", "coronaria", EnumLeafType.DECIDUOUS, new Color(0x7A9953), new Color(0xFC359F),EnumSaplingType.Default, EnumETLog.Apple, new Color(0x7B7A7B)){ @Override public WorldGenerator getWorldGenerator(ITreeGenData tree) { @@ -78,7 +78,7 @@ public enum ETTreeDefinition implements IStringSerializable, ITreeDefinition, IT species.addFruitFamily(ETFruitFamily.Citrus); } }, - FloweringCrabapple("malus", "hopa", EnumLeafType.DECIDUOUS, new Color(0x7A9953), new Color(0xFC359F),EnumSaplingType.Default, EnumExtraTreeLog.Apple, new Color(0x7B7A7B)){ + FloweringCrabapple("malus", "hopa", EnumLeafType.DECIDUOUS, new Color(0x7A9953), new Color(0xFC359F),EnumSaplingType.Default, EnumETLog.Apple, new Color(0x7B7A7B)){ @Override public WorldGenerator getWorldGenerator(ITreeGenData tree) { @@ -101,7 +101,7 @@ public enum ETTreeDefinition implements IStringSerializable, ITreeDefinition, IT species.addFruitFamily(ETFruitFamily.Citrus); } }, - PrairieCrabapple("malus", "ioensis", EnumLeafType.DECIDUOUS, new Color(0x7A9953), new Color(0xFC359F), EnumSaplingType.Default, EnumExtraTreeLog.Apple, new Color(0x7B7A7B)){ + PrairieCrabapple("malus", "ioensis", EnumLeafType.DECIDUOUS, new Color(0x7A9953), new Color(0xFC359F), EnumSaplingType.Default, EnumETLog.Apple, new Color(0x7B7A7B)){ @Override public WorldGenerator getWorldGenerator(ITreeGenData tree) { @@ -259,7 +259,7 @@ public enum ETTreeDefinition implements IStringSerializable, ITreeDefinition, IT species.addFruitFamily(ETFruitFamily.Citrus); } }, - WildCherry("prunus", "avium", EnumLeafType.DECIDUOUS, new Color(0x6D8F1E), new Color(0xF7EBF6), EnumSaplingType.Fruit, EnumExtraTreeLog.Cherry, new Color(0x716850)){ + WildCherry("prunus", "avium", EnumLeafType.DECIDUOUS, new Color(0x6D8F1E), new Color(0xF7EBF6), EnumSaplingType.Fruit, EnumETLog.Cherry, new Color(0x716850)){ @Override public WorldGenerator getWorldGenerator(ITreeGenData tree) { @@ -283,7 +283,7 @@ public enum ETTreeDefinition implements IStringSerializable, ITreeDefinition, IT species.addFruitFamily(ETFruitFamily.Citrus); } }, - SourCherry("prunus", "cerasus", EnumLeafType.DECIDUOUS, new Color(0x6D8F1E), new Color(0xF7EBF6), EnumSaplingType.Fruit, EnumExtraTreeLog.Cherry, new Color(0x716850)){ + SourCherry("prunus", "cerasus", EnumLeafType.DECIDUOUS, new Color(0x6D8F1E), new Color(0xF7EBF6), EnumSaplingType.Fruit, EnumETLog.Cherry, new Color(0x716850)){ @Override public WorldGenerator getWorldGenerator(ITreeGenData tree) { @@ -304,7 +304,7 @@ public enum ETTreeDefinition implements IStringSerializable, ITreeDefinition, IT species.addFruitFamily(ETFruitFamily.Citrus); } }, - BlackCherry("prunus", "serotina", EnumLeafType.DECIDUOUS, new Color(0x6D8F1E), new Color(0xFAE1F8), EnumSaplingType.Fruit, EnumExtraTreeLog.Cherry, new Color(0x716850)){ + BlackCherry("prunus", "serotina", EnumLeafType.DECIDUOUS, new Color(0x6D8F1E), new Color(0xFAE1F8), EnumSaplingType.Fruit, EnumETLog.Cherry, new Color(0x716850)){ @Override public WorldGenerator getWorldGenerator(ITreeGenData tree) { @@ -602,7 +602,7 @@ public enum ETTreeDefinition implements IStringSerializable, ITreeDefinition, IT species.addFruitFamily(ETFruitFamily.Citrus); } }, - Banana("musa", "sinensis", EnumLeafType.PALM, new Color(0xA1CD8E), new Color(0x44E500), EnumSaplingType.Default, EnumExtraTreeLog.Banana, new Color(0x85924F)){ + Banana("musa", "sinensis", EnumLeafType.PALM, new Color(0xA1CD8E), new Color(0x44E500), EnumSaplingType.Default, EnumETLog.Banana, new Color(0x85924F)){ @Override public WorldGenerator getWorldGenerator(ITreeGenData tree) { @@ -623,7 +623,7 @@ public enum ETTreeDefinition implements IStringSerializable, ITreeDefinition, IT species.addFruitFamily(AlleleManager.alleleRegistry.getFruitFamily("forestry.jungle")); } }, - RedBanana("musa", "rubra", EnumLeafType.PALM, new Color(0xA1CD8E), new Color(0x44E500), EnumSaplingType.Default, EnumExtraTreeLog.Banana, new Color(0x85924F)){ + RedBanana("musa", "rubra", EnumLeafType.PALM, new Color(0xA1CD8E), new Color(0x44E500), EnumSaplingType.Default, EnumETLog.Banana, new Color(0x85924F)){ @Override public WorldGenerator getWorldGenerator(ITreeGenData tree) { @@ -641,7 +641,7 @@ public enum ETTreeDefinition implements IStringSerializable, ITreeDefinition, IT species.addFruitFamily(AlleleManager.alleleRegistry.getFruitFamily("forestry.jungle")); } }, - Plantain("musa", "paradisiaca", EnumLeafType.PALM, new Color(0xA1CD8E), new Color(0x44E500), EnumSaplingType.Default, EnumExtraTreeLog.Banana, new Color(0x85924F)){ + Plantain("musa", "paradisiaca", EnumLeafType.PALM, new Color(0xA1CD8E), new Color(0x44E500), EnumSaplingType.Default, EnumETLog.Banana, new Color(0x85924F)){ @Override public WorldGenerator getWorldGenerator(ITreeGenData tree) { @@ -661,7 +661,7 @@ public enum ETTreeDefinition implements IStringSerializable, ITreeDefinition, IT species.addFruitFamily(AlleleManager.alleleRegistry.getFruitFamily("forestry.jungle")); } }, - Butternut("juglans", "cinerea", EnumLeafType.DECIDUOUS, new Color(0x82B58C), new Color(0x82DD8C), EnumSaplingType.Default, EnumExtraTreeLog.Butternut, new Color(0xB7ADA0)){ + Butternut("juglans", "cinerea", EnumLeafType.DECIDUOUS, new Color(0x82B58C), new Color(0x82DD8C), EnumSaplingType.Default, EnumETLog.Butternut, new Color(0xB7ADA0)){ @Override public WorldGenerator getWorldGenerator(ITreeGenData tree) { @@ -684,7 +684,7 @@ public enum ETTreeDefinition implements IStringSerializable, ITreeDefinition, IT species.addFruitFamily(ETFruitFamily.Citrus); } }, - Rowan("sorbus", "aucuparia", EnumLeafType.DECIDUOUS, new Color(0x9EC79B), new Color(0x9EE8B2), EnumSaplingType.Default, EnumExtraTreeLog.Rowan, new Color(0xB6B09B)){ + Rowan("sorbus", "aucuparia", EnumLeafType.DECIDUOUS, new Color(0x9EC79B), new Color(0x9EE8B2), EnumSaplingType.Default, EnumETLog.Rowan, new Color(0xB6B09B)){ @Override public WorldGenerator getWorldGenerator(ITreeGenData tree) { @@ -704,7 +704,7 @@ public enum ETTreeDefinition implements IStringSerializable, ITreeDefinition, IT species.addFruitFamily(ETFruitFamily.Berry); } }, - Hemlock("tsuga", "heterophylla", EnumLeafType.CONIFERS, new Color(0x5CAC72), new Color(0x5CD172), EnumSaplingType.Default, EnumExtraTreeLog.Hemlock, new Color(0xADA39B)){ + Hemlock("tsuga", "heterophylla", EnumLeafType.CONIFERS, new Color(0x5CAC72), new Color(0x5CD172), EnumSaplingType.Default, EnumETLog.Hemlock, new Color(0xADA39B)){ @Override public WorldGenerator getWorldGenerator(ITreeGenData tree) { @@ -719,7 +719,7 @@ public enum ETTreeDefinition implements IStringSerializable, ITreeDefinition, IT template.set(EnumTreeChromosome.GIRTH, ForestryAllele.Int.Int2.getAllele()); } }, - Ash("fraxinus", "excelsior", EnumLeafType.DECIDUOUS, new Color(0x488E2B), new Color(0x48E42B), EnumSaplingType.Default, EnumExtraTreeLog.Ash, new Color(0x898982)){ + Ash("fraxinus", "excelsior", EnumLeafType.DECIDUOUS, new Color(0x488E2B), new Color(0x48E42B), EnumSaplingType.Default, EnumETLog.Ash, new Color(0x898982)){ @Override public WorldGenerator getWorldGenerator(ITreeGenData tree) { @@ -740,7 +740,7 @@ public enum ETTreeDefinition implements IStringSerializable, ITreeDefinition, IT species.addFruitFamily(ETFruitFamily.Citrus); } }, - Alder("alnus", "glutinosa", EnumLeafType.DECIDUOUS, new Color(0x698A33), new Color(0x69AE33), EnumSaplingType.Default, EnumExtraTreeLog.Alder, new Color(0xC6C0B8)){ + Alder("alnus", "glutinosa", EnumLeafType.DECIDUOUS, new Color(0x698A33), new Color(0x69AE33), EnumSaplingType.Default, EnumETLog.Alder, new Color(0xC6C0B8)){ @Override public WorldGenerator getWorldGenerator(ITreeGenData tree) { @@ -760,7 +760,7 @@ public enum ETTreeDefinition implements IStringSerializable, ITreeDefinition, IT species.addFruitFamily(AlleleManager.alleleRegistry.getFruitFamily("forestry.nuts")); } }, - Beech("fagus", "sylvatica", EnumLeafType.DECIDUOUS, new Color(0x83A04C), new Color(0x83C64C), EnumSaplingType.Default, EnumExtraTreeLog.Beech, new Color(0xB2917E)){ + Beech("fagus", "sylvatica", EnumLeafType.DECIDUOUS, new Color(0x83A04C), new Color(0x83C64C), EnumSaplingType.Default, EnumETLog.Beech, new Color(0xB2917E)){ @Override public WorldGenerator getWorldGenerator(ITreeGenData tree) { @@ -780,7 +780,7 @@ public enum ETTreeDefinition implements IStringSerializable, ITreeDefinition, IT species.addFruitFamily(AlleleManager.alleleRegistry.getFruitFamily("forestry.nuts")); } }, - CopperBeech("fagus", "purpurea", EnumLeafType.DECIDUOUS, new Color(0x801318), new Color(0xD15B4D), EnumSaplingType.Default, EnumExtraTreeLog.Beech, new Color(0xB2917E)){ + CopperBeech("fagus", "purpurea", EnumLeafType.DECIDUOUS, new Color(0x801318), new Color(0xD15B4D), EnumSaplingType.Default, EnumETLog.Beech, new Color(0xB2917E)){ @Override public WorldGenerator getWorldGenerator(ITreeGenData tree) { @@ -818,7 +818,7 @@ public enum ETTreeDefinition implements IStringSerializable, ITreeDefinition, IT species.addFruitFamily(AlleleManager.alleleRegistry.getFruitFamily("forestry.nuts")); } }, - Yew("taxus", "baccata", EnumLeafType.CONIFERS, new Color(0x948A4D), new Color(0x94AE4D), EnumSaplingType.Default, EnumExtraTreeLog.Yew, new Color(0xD1BBC1)){ + Yew("taxus", "baccata", EnumLeafType.CONIFERS, new Color(0x948A4D), new Color(0x94AE4D), EnumSaplingType.Default, EnumETLog.Yew, new Color(0xD1BBC1)){ @Override public WorldGenerator getWorldGenerator(ITreeGenData tree) { @@ -831,7 +831,7 @@ public enum ETTreeDefinition implements IStringSerializable, ITreeDefinition, IT template.set(EnumTreeChromosome.SAPPINESS, ForestryAllele.Sappiness.Lower.getAllele()); } }, - Cypress("chamaecyparis", "lawsoniana", EnumLeafType.CONIFERS, new Color(0x89C9A7), new Color(0x89DDC6), EnumSaplingType.Poplar, EnumExtraTreeLog.Cypress, new Color(0x9A8483)){ + Cypress("chamaecyparis", "lawsoniana", EnumLeafType.CONIFERS, new Color(0x89C9A7), new Color(0x89DDC6), EnumSaplingType.Poplar, EnumETLog.Cypress, new Color(0x9A8483)){ @Override public WorldGenerator getWorldGenerator(ITreeGenData tree) { @@ -846,7 +846,7 @@ public enum ETTreeDefinition implements IStringSerializable, ITreeDefinition, IT template.set(EnumTreeChromosome.MATURATION, ForestryAllele.Maturation.Slow.getAllele()); } }, - DouglasFir("pseudotsuga", "menziesii", EnumLeafType.CONIFERS, new Color(0x99B582), new Color(0x99D1AA), EnumSaplingType.Default, EnumExtraTreeLog.Fir, new Color(0x828382)){ + DouglasFir("pseudotsuga", "menziesii", EnumLeafType.CONIFERS, new Color(0x99B582), new Color(0x99D1AA), EnumSaplingType.Default, EnumETLog.Fir, new Color(0x828382)){ @Override public WorldGenerator getWorldGenerator(ITreeGenData tree) { @@ -861,7 +861,7 @@ public enum ETTreeDefinition implements IStringSerializable, ITreeDefinition, IT template.set(EnumTreeChromosome.MATURATION, ForestryAllele.Maturation.Slower.getAllele()); } }, - Hazel("Corylus", "avellana", EnumLeafType.DECIDUOUS, new Color(0x9BB552), new Color(0x9BE152), EnumSaplingType.Default, EnumExtraTreeLog.Hazel, new Color(0xAA986F)){ + Hazel("Corylus", "avellana", EnumLeafType.DECIDUOUS, new Color(0x9BB552), new Color(0x9BE152), EnumSaplingType.Default, EnumETLog.Hazel, new Color(0xAA986F)){ @Override public WorldGenerator getWorldGenerator(ITreeGenData tree) { @@ -883,7 +883,7 @@ public enum ETTreeDefinition implements IStringSerializable, ITreeDefinition, IT species.addFruitFamily(AlleleManager.alleleRegistry.getFruitFamily("forestry.nuts")); } }, - Sycamore("ficus", "sycomorus", EnumLeafType.DECIDUOUS, new Color(0xA0A52F), new Color(0xB4D55C), EnumSaplingType.Default, EnumExtraTreeLog.Fig, new Color(0x807357)){ + Sycamore("ficus", "sycomorus", EnumLeafType.DECIDUOUS, new Color(0xA0A52F), new Color(0xB4D55C), EnumSaplingType.Default, EnumETLog.Fig, new Color(0x807357)){ @Override public WorldGenerator getWorldGenerator(ITreeGenData tree) { @@ -904,7 +904,7 @@ public enum ETTreeDefinition implements IStringSerializable, ITreeDefinition, IT species.addFruitFamily(ETFruitFamily.Citrus); } }, - Whitebeam("sorbus", "aria", EnumLeafType.DECIDUOUS, new Color(0xBACE99), new Color(0x72863F), EnumSaplingType.Default, EnumExtraTreeLog.Whitebeam, new Color(0x786A6D)){ + Whitebeam("sorbus", "aria", EnumLeafType.DECIDUOUS, new Color(0xBACE99), new Color(0x72863F), EnumSaplingType.Default, EnumETLog.Whitebeam, new Color(0x786A6D)){ @Override public WorldGenerator getWorldGenerator(ITreeGenData tree) { @@ -922,7 +922,7 @@ public enum ETTreeDefinition implements IStringSerializable, ITreeDefinition, IT species.addFruitFamily(AlleleManager.alleleRegistry.getFruitFamily("forestry.prunes")); } }, - Hawthorn("crataegus", "monogyna", EnumLeafType.DECIDUOUS, new Color(0x6BA84A), new Color(0x98B77B), EnumSaplingType.Default, EnumExtraTreeLog.Hawthorn, new Color(0x5F5745)){ + Hawthorn("crataegus", "monogyna", EnumLeafType.DECIDUOUS, new Color(0x6BA84A), new Color(0x98B77B), EnumSaplingType.Default, EnumETLog.Hawthorn, new Color(0x5F5745)){ @Override public WorldGenerator getWorldGenerator(ITreeGenData tree) { @@ -940,7 +940,7 @@ public enum ETTreeDefinition implements IStringSerializable, ITreeDefinition, IT species.addFruitFamily(AlleleManager.alleleRegistry.getFruitFamily("forestry.nuts")); } }, - Pecan("carya", "illinoinensis", EnumLeafType.DECIDUOUS, new Color(0x85B674), new Color(0x2C581B), EnumSaplingType.Default, EnumExtraTreeLog.Hickory, new Color(0x3E3530)){ + Pecan("carya", "illinoinensis", EnumLeafType.DECIDUOUS, new Color(0x85B674), new Color(0x2C581B), EnumSaplingType.Default, EnumETLog.Hickory, new Color(0x3E3530)){ @Override public WorldGenerator getWorldGenerator(ITreeGenData tree) { @@ -963,7 +963,7 @@ public enum ETTreeDefinition implements IStringSerializable, ITreeDefinition, IT species.addFruitFamily(ETFruitFamily.Citrus); } }, - Elm("ulmus", "procera", EnumLeafType.DECIDUOUS, new Color(0x7C9048), new Color(0x7CBE48), EnumSaplingType.Default, EnumExtraTreeLog.Elm, new Color(0x848386)){ + Elm("ulmus", "procera", EnumLeafType.DECIDUOUS, new Color(0x7C9048), new Color(0x7CBE48), EnumSaplingType.Default, EnumETLog.Elm, new Color(0x848386)){ @Override public WorldGenerator getWorldGenerator(ITreeGenData tree) { @@ -983,7 +983,7 @@ public enum ETTreeDefinition implements IStringSerializable, ITreeDefinition, IT species.addFruitFamily(AlleleManager.alleleRegistry.getFruitFamily("forestry.prunes")); } }, - Elder("sambucus", "nigra", EnumLeafType.DECIDUOUS, new Color(0xAEB873), new Color(0xE0E7BD), EnumSaplingType.Default, EnumExtraTreeLog.Elder, new Color(0xD8B874)){ + Elder("sambucus", "nigra", EnumLeafType.DECIDUOUS, new Color(0xAEB873), new Color(0xE0E7BD), EnumSaplingType.Default, EnumETLog.Elder, new Color(0xD8B874)){ @Override public WorldGenerator getWorldGenerator(ITreeGenData tree) { @@ -1005,7 +1005,7 @@ public enum ETTreeDefinition implements IStringSerializable, ITreeDefinition, IT species.addFruitFamily(ETFruitFamily.Citrus); } }, - Holly("ilex", "aquifolium", EnumLeafType.DECIDUOUS, new Color(0x254B4C), new Color(0x6E9284), EnumSaplingType.Default, EnumExtraTreeLog.Holly, new Color(0xB5AA85)){ + Holly("ilex", "aquifolium", EnumLeafType.DECIDUOUS, new Color(0x254B4C), new Color(0x6E9284), EnumSaplingType.Default, EnumETLog.Holly, new Color(0xB5AA85)){ @Override public WorldGenerator getWorldGenerator(ITreeGenData tree) { @@ -1025,7 +1025,7 @@ public enum ETTreeDefinition implements IStringSerializable, ITreeDefinition, IT species.addFruitFamily(ETFruitFamily.Citrus); } }, - Hornbeam("carpinus", "betulus", EnumLeafType.DECIDUOUS, new Color(0x96A71B), new Color(0x96DD1B), EnumSaplingType.Default, EnumExtraTreeLog.Hornbeam, new Color(0xA39276)){ + Hornbeam("carpinus", "betulus", EnumLeafType.DECIDUOUS, new Color(0x96A71B), new Color(0x96DD1B), EnumSaplingType.Default, EnumETLog.Hornbeam, new Color(0xA39276)){ @Override public WorldGenerator getWorldGenerator(ITreeGenData tree) { @@ -1089,7 +1089,7 @@ public enum ETTreeDefinition implements IStringSerializable, ITreeDefinition, IT species.addFruitFamily(AlleleManager.alleleRegistry.getFruitFamily("forestry.nuts")); } }, - Fir("abies", "alba", EnumLeafType.CONIFERS, new Color(0x6F7C20), new Color(0x6FD120), EnumSaplingType.Default, EnumExtraTreeLog.Fir, new Color(0x828382)){ + Fir("abies", "alba", EnumLeafType.CONIFERS, new Color(0x6F7C20), new Color(0x6FD120), EnumSaplingType.Default, EnumETLog.Fir, new Color(0x828382)){ @Override public WorldGenerator getWorldGenerator(ITreeGenData tree) { @@ -1103,7 +1103,7 @@ public enum ETTreeDefinition implements IStringSerializable, ITreeDefinition, IT template.set(EnumTreeChromosome.MATURATION, ForestryAllele.Maturation.Slow.getAllele()); } }, - Cedar("cedrus", "libani", EnumLeafType.CONIFERS, new Color(0x95A370), new Color(0x95E870), EnumSaplingType.Default, EnumExtraTreeLog.Cedar, new Color(0xAD764F)){ + Cedar("cedrus", "libani", EnumLeafType.CONIFERS, new Color(0x95A370), new Color(0x95E870), EnumSaplingType.Default, EnumETLog.Cedar, new Color(0xAD764F)){ @Override public WorldGenerator getWorldGenerator(ITreeGenData tree) { @@ -1118,7 +1118,7 @@ public enum ETTreeDefinition implements IStringSerializable, ITreeDefinition, IT template.set(EnumTreeChromosome.MATURATION, ForestryAllele.Maturation.Slower.getAllele()); } }, - Olive("olea", "europaea", EnumLeafType.DECIDUOUS, new Color(0x3C4834), new Color(0x3C4834), EnumSaplingType.Default, EnumExtraTreeLog.Olive, new Color(0x7B706A)){ + Olive("olea", "europaea", EnumLeafType.DECIDUOUS, new Color(0x3C4834), new Color(0x3C4834), EnumSaplingType.Default, EnumETLog.Olive, new Color(0x7B706A)){ @Override public WorldGenerator getWorldGenerator(ITreeGenData tree) { @@ -1158,7 +1158,7 @@ public enum ETTreeDefinition implements IStringSerializable, ITreeDefinition, IT species.addFruitFamily(ETFruitFamily.Citrus); } }, - BalsamFir("abies", "balsamea", EnumLeafType.CONIFERS, new Color(0x74A07C), new Color(0x74A07C), EnumSaplingType.Default, EnumExtraTreeLog.Fir, new Color(0x828382)){ + BalsamFir("abies", "balsamea", EnumLeafType.CONIFERS, new Color(0x74A07C), new Color(0x74A07C), EnumSaplingType.Default, EnumETLog.Fir, new Color(0x828382)){ @Override public WorldGenerator getWorldGenerator(ITreeGenData tree) { @@ -1186,7 +1186,7 @@ public enum ETTreeDefinition implements IStringSerializable, ITreeDefinition, IT template.set(EnumTreeChromosome.MATURATION, ForestryAllele.Maturation.Slow.getAllele()); } }, - Sweetgum("liquidambar", "styraciflua", EnumLeafType.DECIDUOUS, new Color(0x8B8762), new Color(0x8B8762), EnumSaplingType.Default, EnumExtraTreeLog.Sweetgum, new Color(0xA1A19C)){ + Sweetgum("liquidambar", "styraciflua", EnumLeafType.DECIDUOUS, new Color(0x8B8762), new Color(0x8B8762), EnumSaplingType.Default, EnumETLog.Sweetgum, new Color(0xA1A19C)){ @Override public WorldGenerator getWorldGenerator(ITreeGenData tree) { @@ -1206,7 +1206,7 @@ public enum ETTreeDefinition implements IStringSerializable, ITreeDefinition, IT species.addFruitFamily(AlleleManager.alleleRegistry.getFruitFamily("forestry.nuts")); } }, - Locust("robinia", "pseudoacacia", EnumLeafType.DECIDUOUS, new Color(0x887300), new Color(0x887300), EnumSaplingType.Default, EnumExtraTreeLog.Locust, new Color(0xADACBC)){ + Locust("robinia", "pseudoacacia", EnumLeafType.DECIDUOUS, new Color(0x887300), new Color(0x887300), EnumSaplingType.Default, EnumETLog.Locust, new Color(0xADACBC)){ @Override public WorldGenerator getWorldGenerator(ITreeGenData tree) { @@ -1225,7 +1225,7 @@ public enum ETTreeDefinition implements IStringSerializable, ITreeDefinition, IT species.addFruitFamily(ETFruitFamily.Citrus); } }, - Pear("pyrus", "communis", EnumLeafType.DECIDUOUS, new Color(0x5E8826), new Color(0x5E8826), EnumSaplingType.Default, EnumExtraTreeLog.Pear, new Color(0xA89779)){ + Pear("pyrus", "communis", EnumLeafType.DECIDUOUS, new Color(0x5E8826), new Color(0x5E8826), EnumSaplingType.Default, EnumETLog.Pear, new Color(0xA89779)){ @Override public WorldGenerator getWorldGenerator(ITreeGenData tree) { @@ -1249,7 +1249,7 @@ public enum ETTreeDefinition implements IStringSerializable, ITreeDefinition, IT species.addFruitFamily(ETFruitFamily.Citrus); } }, - OsangeOsange("maclura", "pomifera", EnumLeafType.JUNGLE, new Color(0x687A50), new Color(0x687A50), EnumSaplingType.Default, EnumExtraTreeLog.Maclura, new Color(0x8B5734)){ + OsangeOsange("maclura", "pomifera", EnumLeafType.JUNGLE, new Color(0x687A50), new Color(0x687A50), EnumSaplingType.Default, EnumETLog.Maclura, new Color(0x8B5734)){ @Override public WorldGenerator getWorldGenerator(ITreeGenData tree) { @@ -1270,7 +1270,7 @@ public enum ETTreeDefinition implements IStringSerializable, ITreeDefinition, IT species.addFruitFamily(ETFruitFamily.Citrus); } }, - OldFustic("maclura", "tinctoria", EnumLeafType.JUNGLE, new Color(0x687A50), new Color(0x687A50), EnumSaplingType.Default, EnumExtraTreeLog.Maclura, new Color(0x8B5734)){ + OldFustic("maclura", "tinctoria", EnumLeafType.JUNGLE, new Color(0x687A50), new Color(0x687A50), EnumSaplingType.Default, EnumETLog.Maclura, new Color(0x8B5734)){ @Override public WorldGenerator getWorldGenerator(ITreeGenData tree) { @@ -1288,7 +1288,7 @@ public enum ETTreeDefinition implements IStringSerializable, ITreeDefinition, IT species.addFruitFamily(AlleleManager.alleleRegistry.getFruitFamily("forestry.jungle")); } }, - Brazilwood("caesalpinia", "echinata", EnumLeafType.JUNGLE, new Color(0x607459), new Color(0x607459), EnumSaplingType.Default, EnumExtraTreeLog.Brazilwood, new Color(0x9E8068)){ + Brazilwood("caesalpinia", "echinata", EnumLeafType.JUNGLE, new Color(0x607459), new Color(0x607459), EnumSaplingType.Default, EnumETLog.Brazilwood, new Color(0x9E8068)){ @Override public WorldGenerator getWorldGenerator(ITreeGenData tree) { @@ -1308,7 +1308,7 @@ public enum ETTreeDefinition implements IStringSerializable, ITreeDefinition, IT species.addFruitFamily(AlleleManager.alleleRegistry.getFruitFamily("forestry.jungle")); } }, - Logwood("haematoxylum", "campechianum", EnumLeafType.JUNGLE, new Color(0x889F6B), new Color(0x889F6B), EnumSaplingType.Default, EnumExtraTreeLog.Logwood, new Color(0xF9E2D2)){ + Logwood("haematoxylum", "campechianum", EnumLeafType.JUNGLE, new Color(0x889F6B), new Color(0x889F6B), EnumSaplingType.Default, EnumETLog.Logwood, new Color(0xF9E2D2)){ @Override public WorldGenerator getWorldGenerator(ITreeGenData tree) { @@ -1327,7 +1327,7 @@ public enum ETTreeDefinition implements IStringSerializable, ITreeDefinition, IT species.addFruitFamily(AlleleManager.alleleRegistry.getFruitFamily("forestry.jungle")); } }, - Rosewood("dalbergia", "latifolia", EnumLeafType.JUNGLE, new Color(0x879B22), new Color(0x879B22), EnumSaplingType.Default, EnumExtraTreeLog.Rosewood, new Color(0x998666)){ + Rosewood("dalbergia", "latifolia", EnumLeafType.JUNGLE, new Color(0x879B22), new Color(0x879B22), EnumSaplingType.Default, EnumETLog.Rosewood, new Color(0x998666)){ @Override public WorldGenerator getWorldGenerator(ITreeGenData tree) { @@ -1345,7 +1345,7 @@ public enum ETTreeDefinition implements IStringSerializable, ITreeDefinition, IT species.addFruitFamily(AlleleManager.alleleRegistry.getFruitFamily("forestry.jungle")); } }, - Purpleheart("peltogyne", "spp", EnumLeafType.JUNGLE, new Color(0x778F55), new Color(0x778F55), EnumSaplingType.Default, EnumExtraTreeLog.Purpleheart, new Color(0x9392A2)){ + Purpleheart("peltogyne", "spp", EnumLeafType.JUNGLE, new Color(0x778F55), new Color(0x778F55), EnumSaplingType.Default, EnumETLog.Purpleheart, new Color(0x9392A2)){ @Override public WorldGenerator getWorldGenerator(ITreeGenData tree) { @@ -1363,7 +1363,7 @@ public enum ETTreeDefinition implements IStringSerializable, ITreeDefinition, IT species.addFruitFamily(AlleleManager.alleleRegistry.getFruitFamily("forestry.jungle")); } }, - Iroko("milicia", "excelsa", EnumLeafType.DECIDUOUS, new Color(0xAFC86C), new Color(0xAFC86C), EnumSaplingType.Default, EnumExtraTreeLog.Iroko, new Color(0x605C5B)){ + Iroko("milicia", "excelsa", EnumLeafType.DECIDUOUS, new Color(0xAFC86C), new Color(0xAFC86C), EnumSaplingType.Default, EnumETLog.Iroko, new Color(0x605C5B)){ @Override public WorldGenerator getWorldGenerator(ITreeGenData tree) { @@ -1382,7 +1382,7 @@ public enum ETTreeDefinition implements IStringSerializable, ITreeDefinition, IT species.addFruitFamily(AlleleManager.alleleRegistry.getFruitFamily("forestry.nuts")); } }, - Gingko("ginkgo", "biloba", EnumLeafType.JUNGLE, new Color(0x719651), new Color(0x719651), EnumSaplingType.Default, EnumExtraTreeLog.Gingko, new Color(0xADAE9C)){ + Gingko("ginkgo", "biloba", EnumLeafType.JUNGLE, new Color(0x719651), new Color(0x719651), EnumSaplingType.Default, EnumETLog.Gingko, new Color(0xADAE9C)){ @Override public WorldGenerator getWorldGenerator(ITreeGenData tree) { @@ -1424,7 +1424,7 @@ public enum ETTreeDefinition implements IStringSerializable, ITreeDefinition, IT species.addFruitFamily(AlleleManager.alleleRegistry.getFruitFamily("forestry.nuts")); } }, - RoseGum("eucalyptus", "grandis", EnumLeafType.JUNGLE, new Color(0x9CA258), new Color(0x9CA258), EnumSaplingType.Default, EnumExtraTreeLog.Eucalyptus, new Color(0xEADEDA)){ + RoseGum("eucalyptus", "grandis", EnumLeafType.JUNGLE, new Color(0x9CA258), new Color(0x9CA258), EnumSaplingType.Default, EnumETLog.Eucalyptus, new Color(0xEADEDA)){ @Override public WorldGenerator getWorldGenerator(ITreeGenData tree) { @@ -1445,7 +1445,7 @@ public enum ETTreeDefinition implements IStringSerializable, ITreeDefinition, IT species.addFruitFamily(AlleleManager.alleleRegistry.getFruitFamily("forestry.jungle")); } }, - SwampGum("eucalyptus", "grandis", EnumLeafType.JUNGLE, new Color(0xA2C686), new Color(0xA2C686), EnumSaplingType.Default, EnumExtraTreeLog.Eucalyptus2, new Color(0x867E65)){ + SwampGum("eucalyptus", "grandis", EnumLeafType.JUNGLE, new Color(0xA2C686), new Color(0xA2C686), EnumSaplingType.Default, EnumETLog.Eucalyptus2, new Color(0x867E65)){ @Override public WorldGenerator getWorldGenerator(ITreeGenData tree) { @@ -1465,7 +1465,7 @@ public enum ETTreeDefinition implements IStringSerializable, ITreeDefinition, IT species.addFruitFamily(AlleleManager.alleleRegistry.getFruitFamily("forestry.jungle")); } }, - Box("boxus", "sempervirens", EnumLeafType.DECIDUOUS, new Color(0x72996D), new Color(0x72996D), EnumSaplingType.Default, EnumExtraTreeLog.Box, new Color(0xAB6F57)){ + Box("boxus", "sempervirens", EnumLeafType.DECIDUOUS, new Color(0x72996D), new Color(0x72996D), EnumSaplingType.Default, EnumETLog.Box, new Color(0xAB6F57)){ @Override public WorldGenerator getWorldGenerator(ITreeGenData tree) { @@ -1486,7 +1486,7 @@ public enum ETTreeDefinition implements IStringSerializable, ITreeDefinition, IT species.addFruitFamily(ETFruitFamily.Citrus); } }, - Clove("syzygium", "aromaticum", EnumLeafType.DECIDUOUS, new Color(0x7A821F), new Color(0x7A821F), EnumSaplingType.Default, EnumExtraTreeLog.Syzgium, new Color(0xAB6F57)){ + Clove("syzygium", "aromaticum", EnumLeafType.DECIDUOUS, new Color(0x7A821F), new Color(0x7A821F), EnumSaplingType.Default, EnumETLog.Syzgium, new Color(0xAB6F57)){ @Override public WorldGenerator getWorldGenerator(ITreeGenData tree) { @@ -1551,7 +1551,7 @@ public enum ETTreeDefinition implements IStringSerializable, ITreeDefinition, IT species.addFruitFamily(AlleleManager.alleleRegistry.getFruitFamily("forestry.nuts")); } }, - RainbowGum("eucalyptus", "deglupta", EnumLeafType.JUNGLE, new Color(0xB7F025), new Color(0xB7F025), EnumSaplingType.Default, EnumExtraTreeLog.Eucalyptus3, new Color(0x6CB03F)){ + RainbowGum("eucalyptus", "deglupta", EnumLeafType.JUNGLE, new Color(0xB7F025), new Color(0xB7F025), EnumSaplingType.Default, EnumETLog.Eucalyptus3, new Color(0x6CB03F)){ @Override public WorldGenerator getWorldGenerator(ITreeGenData tree) { @@ -1570,7 +1570,7 @@ public enum ETTreeDefinition implements IStringSerializable, ITreeDefinition, IT species.addFruitFamily(AlleleManager.alleleRegistry.getFruitFamily("forestry.nuts")); } }, - PinkIvory("berchemia", "zeyheri", EnumLeafType.DECIDUOUS, new Color(0x7C9159), new Color(0x7C9159), EnumSaplingType.Default, EnumExtraTreeLog.PinkIvory, new Color(0x7F6554)){ + PinkIvory("berchemia", "zeyheri", EnumLeafType.DECIDUOUS, new Color(0x7C9159), new Color(0x7C9159), EnumSaplingType.Default, EnumETLog.PinkIvory, new Color(0x7F6554)){ @Override public WorldGenerator getWorldGenerator(ITreeGenData tree) { @@ -1588,7 +1588,7 @@ public enum ETTreeDefinition implements IStringSerializable, ITreeDefinition, IT species.addFruitFamily(AlleleManager.alleleRegistry.getFruitFamily("forestry.nuts")); } }, - Blackcurrant("ribes", "nigrum", EnumLeafType.DECIDUOUS, new Color(0xA6DA5C), new Color(0xA6DA5C), EnumSaplingType.Shrub, EnumExtraTreeLog.EMPTY, new Color(0xFFFFFF)){ + Blackcurrant("ribes", "nigrum", EnumLeafType.DECIDUOUS, new Color(0xA6DA5C), new Color(0xA6DA5C), EnumSaplingType.Shrub, EnumETLog.Shrub, new Color(0xFFFFFF)){ @Override public WorldGenerator getWorldGenerator(ITreeGenData tree) { @@ -1612,7 +1612,7 @@ public enum ETTreeDefinition implements IStringSerializable, ITreeDefinition, IT species.addFruitFamily(ETFruitFamily.Berry); } }, - Redcurrant("ribes", "rubrum", EnumLeafType.DECIDUOUS, new Color(0x74AC00), new Color(0x74AC00), EnumSaplingType.Shrub, EnumExtraTreeLog.EMPTY, new Color(0xFFFFFF)){ + Redcurrant("ribes", "rubrum", EnumLeafType.DECIDUOUS, new Color(0x74AC00), new Color(0x74AC00), EnumSaplingType.Shrub, EnumETLog.Shrub, new Color(0xFFFFFF)){ @Override public WorldGenerator getWorldGenerator(ITreeGenData tree) { @@ -1636,7 +1636,7 @@ public enum ETTreeDefinition implements IStringSerializable, ITreeDefinition, IT species.addFruitFamily(ETFruitFamily.Berry); } }, - Blackberry("rubus", "fruticosus", EnumLeafType.DECIDUOUS, new Color(0x92C15B), new Color(0x92C15B), EnumSaplingType.Shrub, EnumExtraTreeLog.EMPTY, new Color(0xFFFFFF)){ + Blackberry("rubus", "fruticosus", EnumLeafType.DECIDUOUS, new Color(0x92C15B), new Color(0x92C15B), EnumSaplingType.Shrub, EnumETLog.Shrub, new Color(0xFFFFFF)){ @Override public WorldGenerator getWorldGenerator(ITreeGenData tree) { @@ -1659,7 +1659,7 @@ public enum ETTreeDefinition implements IStringSerializable, ITreeDefinition, IT species.addFruitFamily(ETFruitFamily.Berry); } }, - Raspberry("rubus", "idaeus", EnumLeafType.DECIDUOUS, new Color(0x83B96E), new Color(0x83B96E), EnumSaplingType.Shrub, EnumExtraTreeLog.EMPTY, new Color(0xFFFFFF)){ + Raspberry("rubus", "idaeus", EnumLeafType.DECIDUOUS, new Color(0x83B96E), new Color(0x83B96E), EnumSaplingType.Shrub, EnumETLog.Shrub, new Color(0xFFFFFF)){ @Override public WorldGenerator getWorldGenerator(ITreeGenData tree) { @@ -1683,7 +1683,7 @@ public enum ETTreeDefinition implements IStringSerializable, ITreeDefinition, IT species.addFruitFamily(ETFruitFamily.Berry); } }, - Blueberry("vaccinium", "corymbosum", EnumLeafType.DECIDUOUS, new Color(0x72C750), new Color(0x72C750), EnumSaplingType.Shrub, EnumExtraTreeLog.EMPTY, new Color(0xFFFFFF)){ + Blueberry("vaccinium", "corymbosum", EnumLeafType.DECIDUOUS, new Color(0x72C750), new Color(0x72C750), EnumSaplingType.Shrub, EnumETLog.Shrub, new Color(0xFFFFFF)){ @Override public WorldGenerator getWorldGenerator(ITreeGenData tree) { @@ -1707,7 +1707,7 @@ public enum ETTreeDefinition implements IStringSerializable, ITreeDefinition, IT species.addFruitFamily(ETFruitFamily.Berry); } }, - Cranberry("vaccinium", "oxycoccos", EnumLeafType.DECIDUOUS, new Color(0x96D179), new Color(0x96D179), EnumSaplingType.Shrub, EnumExtraTreeLog.EMPTY, new Color(0xFFFFFF)){ + Cranberry("vaccinium", "oxycoccos", EnumLeafType.DECIDUOUS, new Color(0x96D179), new Color(0x96D179), EnumSaplingType.Shrub, EnumETLog.Shrub, new Color(0xFFFFFF)){ @Override public WorldGenerator getWorldGenerator(ITreeGenData tree) { @@ -1731,7 +1731,7 @@ public enum ETTreeDefinition implements IStringSerializable, ITreeDefinition, IT species.addFruitFamily(ETFruitFamily.Berry); } }, - Juniper("juniperus", "communis", EnumLeafType.CONIFERS, new Color(0x90B149), new Color(0x90B149), EnumSaplingType.Shrub, EnumExtraTreeLog.EMPTY, new Color(0xFFFFFF)){ + Juniper("juniperus", "communis", EnumLeafType.CONIFERS, new Color(0x90B149), new Color(0x90B149), EnumSaplingType.Shrub, EnumETLog.Shrub, new Color(0xFFFFFF)){ @Override public WorldGenerator getWorldGenerator(ITreeGenData tree) { @@ -1755,7 +1755,7 @@ public enum ETTreeDefinition implements IStringSerializable, ITreeDefinition, IT species.addFruitFamily(ETFruitFamily.Berry); } }, - Gooseberry("ribes", "grossularia", EnumLeafType.DECIDUOUS, new Color(0x79BB00), new Color(0x79BB00), EnumSaplingType.Shrub, EnumExtraTreeLog.EMPTY, new Color(0xFFFFFF)){ + Gooseberry("ribes", "grossularia", EnumLeafType.DECIDUOUS, new Color(0x79BB00), new Color(0x79BB00), EnumSaplingType.Shrub, EnumETLog.Shrub, new Color(0xFFFFFF)){ @Override public WorldGenerator getWorldGenerator(ITreeGenData tree) { @@ -1778,7 +1778,7 @@ public enum ETTreeDefinition implements IStringSerializable, ITreeDefinition, IT species.addFruitFamily(ETFruitFamily.Berry); } }, - GoldenRaspberry("rubus", "occidentalis", EnumLeafType.DECIDUOUS, new Color(0x83B96E), new Color(0x83B96E), EnumSaplingType.Shrub, EnumExtraTreeLog.EMPTY, new Color(0xFFFFFF)){ + GoldenRaspberry("rubus", "occidentalis", EnumLeafType.DECIDUOUS, new Color(0x83B96E), new Color(0x83B96E), EnumSaplingType.Shrub, EnumETLog.Shrub, new Color(0xFFFFFF)){ @Override public WorldGenerator getWorldGenerator(ITreeGenData tree) { @@ -1802,7 +1802,7 @@ public enum ETTreeDefinition implements IStringSerializable, ITreeDefinition, IT species.addFruitFamily(ETFruitFamily.Berry); } }, - Cinnamon("cinnamomum", "cassia", EnumLeafType.JUNGLE, new Color(0x738E0B), new Color(0x738E0B), EnumSaplingType.Default, EnumExtraTreeLog.Cinnamon, new Color(0x86583C)){ + Cinnamon("cinnamomum", "cassia", EnumLeafType.JUNGLE, new Color(0x738E0B), new Color(0x738E0B), EnumSaplingType.Default, EnumETLog.Cinnamon, new Color(0x86583C)){ @Override public WorldGenerator getWorldGenerator(ITreeGenData tree) { @@ -2035,7 +2035,7 @@ public enum ETTreeDefinition implements IStringSerializable, ITreeDefinition, IT species.addFruitFamily(AlleleManager.alleleRegistry.getFruitFamily("forestry.nuts")); } }, - DwarfHazel("Corylus", "americana", EnumLeafType.DECIDUOUS, new Color(0x9BB552), new Color(0x9BE152), EnumSaplingType.Shrub, EnumExtraTreeLog.Hazel, new Color(0xAA986F)){ + DwarfHazel("Corylus", "americana", EnumLeafType.DECIDUOUS, new Color(0x9BB552), new Color(0x9BE152), EnumSaplingType.Shrub, EnumETLog.Hazel, new Color(0xAA986F)){ @Override public WorldGenerator getWorldGenerator(ITreeGenData tree) { diff --git a/src/main/java/binnie/extratrees/genetics/WoodProvider.java b/src/main/java/binnie/extratrees/genetics/WoodProvider.java index 2a0b1d9d..fcbc7f19 100644 --- a/src/main/java/binnie/extratrees/genetics/WoodProvider.java +++ b/src/main/java/binnie/extratrees/genetics/WoodProvider.java @@ -1,7 +1,7 @@ package binnie.extratrees.genetics; import binnie.Constants; -import binnie.extratrees.block.EnumExtraTreeLog; +import binnie.extratrees.block.EnumETLog; import forestry.api.arboriculture.EnumForestryWoodType; import forestry.api.arboriculture.EnumVanillaWoodType; import forestry.api.arboriculture.IWoodProvider; @@ -25,7 +25,7 @@ public class WoodProvider implements IWoodProvider { public WoodProvider(IWoodType type) { this.type = type; - if (type instanceof EnumExtraTreeLog) { + if (type instanceof EnumETLog) { modID = Constants.EXTRA_TREES_MOD_ID; } else if (type instanceof EnumVanillaWoodType) { modID = "minecraft"; diff --git a/src/main/java/binnie/extratrees/item/ItemDictionary.java b/src/main/java/binnie/extratrees/item/ItemArboristDatabase.java similarity index 77% rename from src/main/java/binnie/extratrees/item/ItemDictionary.java rename to src/main/java/binnie/extratrees/item/ItemArboristDatabase.java index ce95680e..1d902cbe 100644 --- a/src/main/java/binnie/extratrees/item/ItemDictionary.java +++ b/src/main/java/binnie/extratrees/item/ItemArboristDatabase.java @@ -2,6 +2,8 @@ package binnie.extratrees.item; import binnie.extratrees.ExtraTrees; import binnie.extratrees.core.ExtraTreesGUID; +import forestry.api.core.IItemModelRegister; +import forestry.api.core.IModelManager; import forestry.api.core.Tabs; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; @@ -10,34 +12,28 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.ActionResult; import net.minecraft.util.EnumHand; import net.minecraft.util.math.BlockPos; +import net.minecraft.util.text.TextFormatting; import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; import java.util.List; -public class ItemDictionary extends Item { -// IIcon iconMaster; -// -// @Override -// @SideOnly(Side.CLIENT) -// public void registerIcons(final IIconRegister register) { -// this.itemIcon = ExtraTrees.proxy.getIcon(register, "arboristDatabase"); -// this.iconMaster = ExtraTrees.proxy.getIcon(register, "masterArboristDatabase"); -// } -// -// @Override -// @SideOnly(Side.CLIENT) -// public IIcon getIconFromDamage(final int par1) { -// return (par1 == 0) ? this.itemIcon : this.iconMaster; -// } +public class ItemArboristDatabase extends Item implements IItemModelRegister { + public ItemArboristDatabase() { + this.setCreativeTab(Tabs.tabArboriculture); + this.setUnlocalizedName("database"); + this.setMaxStackSize(1); + setRegistryName("databaseTree"); + } + @Override @SideOnly(Side.CLIENT) public void addInformation(ItemStack stack, EntityPlayer playerIn, List tooltip, boolean advanced) { super.addInformation(stack, playerIn, tooltip, advanced); if (stack.getItemDamage() > 0) { - tooltip.add("Sengir-in-a-can"); + tooltip.add(TextFormatting.DARK_PURPLE + "Sengir-in-a-can"); } } @@ -48,11 +44,11 @@ public class ItemDictionary extends Item { par3List.add(new ItemStack(par1, 1, 1)); } - public ItemDictionary() { - this.setCreativeTab(Tabs.tabArboriculture); - this.setUnlocalizedName("database"); - this.setMaxStackSize(1); - setRegistryName("databaseTree"); + @Override + @SideOnly(Side.CLIENT) + public void registerModel(Item item, IModelManager manager) { + manager.registerItemModel(item, 0, "arboristDatabase"); + manager.registerItemModel(item, 1, "masterArboristDatabase"); } @Override diff --git a/src/main/java/binnie/extratrees/item/ItemMothDatabase.java b/src/main/java/binnie/extratrees/item/ItemMothDatabase.java index 997ff83b..ad26d377 100644 --- a/src/main/java/binnie/extratrees/item/ItemMothDatabase.java +++ b/src/main/java/binnie/extratrees/item/ItemMothDatabase.java @@ -2,6 +2,8 @@ package binnie.extratrees.item; import binnie.extratrees.ExtraTrees; import binnie.extratrees.core.ExtraTreesGUID; +import forestry.api.core.IItemModelRegister; +import forestry.api.core.IModelManager; import forestry.api.core.Tabs; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; @@ -10,34 +12,35 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.ActionResult; import net.minecraft.util.EnumHand; import net.minecraft.util.math.BlockPos; +import net.minecraft.util.text.TextFormatting; import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; import java.util.List; -public class ItemMothDatabase extends Item { -// IIcon iconMaster; -// -// @Override -// @SideOnly(Side.CLIENT) -// public void registerIcons(final IIconRegister register) { -// this.itemIcon = ExtraTrees.proxy.getIcon(register, "lepiDatabase"); -// this.iconMaster = ExtraTrees.proxy.getIcon(register, "masterLepiDatabase"); -// } -// -// @Override -// @SideOnly(Side.CLIENT) -// public IIcon getIconFromDamage(final int par1) { -// return (par1 == 0) ? this.itemIcon : this.iconMaster; -// } +public class ItemMothDatabase extends Item implements IItemModelRegister { + + public ItemMothDatabase() { + this.setCreativeTab(Tabs.tabLepidopterology); + this.setUnlocalizedName("databaseMoth"); + this.setMaxStackSize(1); + setRegistryName("databaseMoth"); + } + + @Override + @SideOnly(Side.CLIENT) + public void registerModel(Item item, IModelManager manager) { + manager.registerItemModel(item, 0, "lepiDatabase"); + manager.registerItemModel(item, 1, "masterLepiDatabase"); + } @Override @SideOnly(Side.CLIENT) public void addInformation(ItemStack stack, EntityPlayer playerIn, List tooltip, boolean advanced) { super.addInformation(stack, playerIn, tooltip, advanced); if (stack.getItemDamage() > 0) { - tooltip.add("Binnie's Emporium of Lepidopterans"); + tooltip.add(TextFormatting.DARK_PURPLE + "Binnie's Emporium of Lepidopterans"); } } @@ -48,13 +51,6 @@ public class ItemMothDatabase extends Item { par3List.add(new ItemStack(par1, 1, 1)); } - public ItemMothDatabase() { - this.setCreativeTab(Tabs.tabLepidopterology); - this.setUnlocalizedName("databaseMoth"); - this.setMaxStackSize(1); - setRegistryName("databaseMoth"); - } - @Override public ActionResult onItemRightClick(ItemStack itemStack, World world, EntityPlayer player, EnumHand hand) { if (itemStack.getItemDamage() == 0) { diff --git a/src/main/java/binnie/extratrees/item/ItemSetSquare.java b/src/main/java/binnie/extratrees/item/ItemSetSquare.java index c5109cd3..1ff30878 100644 --- a/src/main/java/binnie/extratrees/item/ItemSetSquare.java +++ b/src/main/java/binnie/extratrees/item/ItemSetSquare.java @@ -1,28 +1,31 @@ package binnie.extratrees.item; import binnie.extratrees.api.IToolHammer; +import forestry.api.core.IItemModelRegister; +import forestry.api.core.IModelManager; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; -public class ItemSetSquare extends Item implements IToolHammer { - EnumSetSquareMode mode; - -// @Override -// @SideOnly(Side.CLIENT) -// public void registerIcons(final IIconRegister register) { -// this.itemIcon = ExtraTrees.proxy.getIcon(register, "setSquare" + this.mode.ordinal()); -// } +public class ItemSetSquare extends Item implements IToolHammer, IItemModelRegister { + private EnumSetSquareMode mode; public ItemSetSquare(final EnumSetSquareMode mode) { - this.mode = EnumSetSquareMode.Rotate; this.mode = mode; this.setCreativeTab(CreativeTabs.TOOLS); this.setUnlocalizedName("setSquare" + mode); setRegistryName("setSquare" + mode); this.setMaxStackSize(1); } + + @SideOnly(Side.CLIENT) + @Override + public void registerModel(Item item, IModelManager manager) { + manager.registerItemModel(item, 0, "setSquare" + this.mode.ordinal()); + } @Override public String getItemStackDisplayName(final ItemStack i) { diff --git a/src/main/java/binnie/extratrees/item/ModuleItems.java b/src/main/java/binnie/extratrees/item/ModuleItems.java index ca279239..35d2c82b 100644 --- a/src/main/java/binnie/extratrees/item/ModuleItems.java +++ b/src/main/java/binnie/extratrees/item/ModuleItems.java @@ -7,7 +7,7 @@ import binnie.core.Mods; import binnie.core.item.ItemMisc; import binnie.core.liquid.ItemFluidContainer; import binnie.extratrees.ExtraTrees; -import binnie.extratrees.block.EnumExtraTreeLog; +import binnie.extratrees.block.EnumETLog; import forestry.api.core.Tabs; import forestry.api.fuels.EngineBronzeFuel; import forestry.api.fuels.FuelManager; @@ -37,7 +37,7 @@ public class ModuleItems implements IInitializable { itemMisc = new ItemMisc(Tabs.tabArboriculture, ExtraTreeItems.values()); ExtraTrees.proxy.registerItem(itemMisc); - itemDictionary = new ItemDictionary(); + itemDictionary = new ItemArboristDatabase(); ExtraTrees.proxy.registerItem(itemDictionary); if (BinnieCore.isLepidopteryActive()) { @@ -160,7 +160,7 @@ public class ModuleItems implements IInitializable { } FuelManager.bronzeEngineFuel.put(ExtraTreeLiquid.Sap.get(1).getFluid(), new EngineBronzeFuel(ExtraTreeLiquid.Sap.get(1).getFluid(), 20, 10000, 1)); FuelManager.bronzeEngineFuel.put(ExtraTreeLiquid.Resin.get(1).getFluid(), new EngineBronzeFuel(ExtraTreeLiquid.Resin.get(1).getFluid(), 30, 10000, 1)); - for (EnumExtraTreeLog log : EnumExtraTreeLog.values()) { + for (EnumETLog log : EnumETLog.values()) { log.addRecipe(); } } diff --git a/src/main/resources/assets/botany/blockstates/stained.json b/src/main/resources/assets/botany/blockstates/stained.json new file mode 100644 index 00000000..bf1499b5 --- /dev/null +++ b/src/main/resources/assets/botany/blockstates/stained.json @@ -0,0 +1,6 @@ +{ + "variants": { + "normal": { "model": "botany:stained" } + } + +} diff --git a/src/main/resources/assets/botany/models/block/stained.json b/src/main/resources/assets/botany/models/block/stained.json new file mode 100644 index 00000000..f5ddea68 --- /dev/null +++ b/src/main/resources/assets/botany/models/block/stained.json @@ -0,0 +1,21 @@ +{ + "parent": "block/block", + "textures": { + "particle": "botany:blocks/stained", + "all": "botany:blocks/stained" + }, + "elements": [ + { "from": [ 0, 0, 0 ], + "to": [ 16, 16, 16 ], + "faces": { + "down": { "texture": "#all", "cullface": "down", "tintindex": 0 }, + "up": { "texture": "#all", "cullface": "up", "tintindex": 0 }, + "north": { "texture": "#all", "cullface": "north", "tintindex": 0 }, + "south": { "texture": "#all", "cullface": "south", "tintindex": 0 }, + "west": { "texture": "#all", "cullface": "west", "tintindex": 0 }, + "east": { "texture": "#all", "cullface": "east", "tintindex": 0 } + } + } + ] + +} diff --git a/src/main/resources/assets/botany/models/item/stained.json b/src/main/resources/assets/botany/models/item/stained.json new file mode 100644 index 00000000..edf121ff --- /dev/null +++ b/src/main/resources/assets/botany/models/item/stained.json @@ -0,0 +1,3 @@ +{ + "parent": "botany:block/stained" +} diff --git a/src/main/resources/assets/extratrees/models/block/shrub_trunk.json b/src/main/resources/assets/extratrees/models/block/shrub_trunk.json new file mode 100644 index 00000000..b53fa8c6 --- /dev/null +++ b/src/main/resources/assets/extratrees/models/block/shrub_trunk.json @@ -0,0 +1,21 @@ +{ + "textures": { + "particle": "blocks/log_oak", + "side": "blocks/log_oak", + "top": "blocks/log_oak_top" + }, + "elements": [ + { + "from": [ 6, 0, 6 ], + "to": [ 10, 16, 10 ], + "faces": { + "down": { "uv": [ 6, 6, 10, 10 ], "texture": "#top" }, + "up": { "uv": [ 6, 6, 10, 10 ], "texture": "#top" }, + "north": { "uv": [ 6, 0, 10, 16 ], "texture": "#side" }, + "south": { "uv": [ 6, 0, 10, 16 ], "texture": "#side" }, + "west": { "uv": [ 6, 0, 10, 16 ], "texture": "#side" }, + "east": { "uv": [ 6, 0, 10, 16 ], "texture": "#side" } + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/extratrees/models/item/arboristDatabase.json b/src/main/resources/assets/extratrees/models/item/arboristDatabase.json new file mode 100644 index 00000000..27d9dedf --- /dev/null +++ b/src/main/resources/assets/extratrees/models/item/arboristDatabase.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "extratrees:items/arboristDatabase" + } +} diff --git a/src/main/resources/assets/extratrees/models/item/carpentryHammer.json b/src/main/resources/assets/extratrees/models/item/carpentryHammer.json new file mode 100644 index 00000000..35f4fec5 --- /dev/null +++ b/src/main/resources/assets/extratrees/models/item/carpentryHammer.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "extratrees:items/carpentryHammer" + } +} diff --git a/src/main/resources/assets/extratrees/models/item/durableHammer.json b/src/main/resources/assets/extratrees/models/item/durableHammer.json new file mode 100644 index 00000000..770987b9 --- /dev/null +++ b/src/main/resources/assets/extratrees/models/item/durableHammer.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "extratrees:items/durableHammer" + } +} diff --git a/src/main/resources/assets/extratrees/models/item/lepiDatabase.json b/src/main/resources/assets/extratrees/models/item/lepiDatabase.json new file mode 100644 index 00000000..2f929b2c --- /dev/null +++ b/src/main/resources/assets/extratrees/models/item/lepiDatabase.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "extratrees:items/lepiDatabase" + } +} diff --git a/src/main/resources/assets/extratrees/models/item/masterArboristDatabase.json b/src/main/resources/assets/extratrees/models/item/masterArboristDatabase.json new file mode 100644 index 00000000..9ef5d7d2 --- /dev/null +++ b/src/main/resources/assets/extratrees/models/item/masterArboristDatabase.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "extratrees:items/masterArboristDatabase" + } +} diff --git a/src/main/resources/assets/extratrees/models/item/masterLepiDatabase.json b/src/main/resources/assets/extratrees/models/item/masterLepiDatabase.json new file mode 100644 index 00000000..5dc2ccd3 --- /dev/null +++ b/src/main/resources/assets/extratrees/models/item/masterLepiDatabase.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "extratrees:items/masterLepiDatabase" + } +} diff --git a/src/main/resources/assets/extratrees/models/item/misc/bark.json b/src/main/resources/assets/extratrees/models/item/misc/bark.json new file mode 100644 index 00000000..097a65dd --- /dev/null +++ b/src/main/resources/assets/extratrees/models/item/misc/bark.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "extratrees:items/misc/bark" + } +} diff --git a/src/main/resources/assets/extratrees/models/item/misc/glassFitting.json b/src/main/resources/assets/extratrees/models/item/misc/glassFitting.json new file mode 100644 index 00000000..7f5278c9 --- /dev/null +++ b/src/main/resources/assets/extratrees/models/item/misc/glassFitting.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "extratrees:items/misc/glassFitting" + } +} diff --git a/src/main/resources/assets/extratrees/models/item/misc/grainBarley.json b/src/main/resources/assets/extratrees/models/item/misc/grainBarley.json new file mode 100644 index 00000000..477d1d59 --- /dev/null +++ b/src/main/resources/assets/extratrees/models/item/misc/grainBarley.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "extratrees:items/misc/grainBarley" + } +} diff --git a/src/main/resources/assets/extratrees/models/item/misc/grainCorn.json b/src/main/resources/assets/extratrees/models/item/misc/grainCorn.json new file mode 100644 index 00000000..2e01d2f3 --- /dev/null +++ b/src/main/resources/assets/extratrees/models/item/misc/grainCorn.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "extratrees:items/misc/grainCorn" + } +} diff --git a/src/main/resources/assets/extratrees/models/item/misc/grainRoasted.json b/src/main/resources/assets/extratrees/models/item/misc/grainRoasted.json new file mode 100644 index 00000000..c3df5661 --- /dev/null +++ b/src/main/resources/assets/extratrees/models/item/misc/grainRoasted.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "extratrees:items/misc/grainRoasted" + } +} diff --git a/src/main/resources/assets/extratrees/models/item/misc/grainRye.json b/src/main/resources/assets/extratrees/models/item/misc/grainRye.json new file mode 100644 index 00000000..4b1acf77 --- /dev/null +++ b/src/main/resources/assets/extratrees/models/item/misc/grainRye.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "extratrees:items/misc/grainRye" + } +} diff --git a/src/main/resources/assets/extratrees/models/item/misc/grainWheat.json b/src/main/resources/assets/extratrees/models/item/misc/grainWheat.json new file mode 100644 index 00000000..6da96b85 --- /dev/null +++ b/src/main/resources/assets/extratrees/models/item/misc/grainWheat.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "extratrees:items/misc/grainWheat" + } +} diff --git a/src/main/resources/assets/extratrees/models/item/misc/hops.json b/src/main/resources/assets/extratrees/models/item/misc/hops.json new file mode 100644 index 00000000..971cd850 --- /dev/null +++ b/src/main/resources/assets/extratrees/models/item/misc/hops.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "extratrees:items/misc/hops" + } +} diff --git a/src/main/resources/assets/extratrees/models/item/misc/provenGear.json b/src/main/resources/assets/extratrees/models/item/misc/provenGear.json new file mode 100644 index 00000000..f21d6779 --- /dev/null +++ b/src/main/resources/assets/extratrees/models/item/misc/provenGear.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "extratrees:items/misc/provenGear" + } +} diff --git a/src/main/resources/assets/extratrees/models/item/misc/sawdust.json b/src/main/resources/assets/extratrees/models/item/misc/sawdust.json new file mode 100644 index 00000000..f8d66fca --- /dev/null +++ b/src/main/resources/assets/extratrees/models/item/misc/sawdust.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "extratrees:items/misc/sawdust" + } +} diff --git a/src/main/resources/assets/extratrees/models/item/misc/woodWax.json b/src/main/resources/assets/extratrees/models/item/misc/woodWax.json new file mode 100644 index 00000000..916ce220 --- /dev/null +++ b/src/main/resources/assets/extratrees/models/item/misc/woodWax.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "extratrees:items/misc/woodWax" + } +} diff --git a/src/main/resources/assets/extratrees/models/item/misc/yeast.json b/src/main/resources/assets/extratrees/models/item/misc/yeast.json new file mode 100644 index 00000000..caf27bc4 --- /dev/null +++ b/src/main/resources/assets/extratrees/models/item/misc/yeast.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "extratrees:items/misc/yeast" + } +} diff --git a/src/main/resources/assets/extratrees/models/item/misc/yeastLager.json b/src/main/resources/assets/extratrees/models/item/misc/yeastLager.json new file mode 100644 index 00000000..9a23cd7a --- /dev/null +++ b/src/main/resources/assets/extratrees/models/item/misc/yeastLager.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "extratrees:items/misc/yeastLager" + } +} diff --git a/src/main/resources/assets/extratrees/textures/items/bark.png b/src/main/resources/assets/extratrees/textures/items/misc/bark.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/items/bark.png rename to src/main/resources/assets/extratrees/textures/items/misc/bark.png diff --git a/src/main/resources/assets/extratrees/textures/items/glassFitting.png b/src/main/resources/assets/extratrees/textures/items/misc/glassFitting.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/items/glassFitting.png rename to src/main/resources/assets/extratrees/textures/items/misc/glassFitting.png diff --git a/src/main/resources/assets/extratrees/textures/items/grainBarley.png b/src/main/resources/assets/extratrees/textures/items/misc/grainBarley.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/items/grainBarley.png rename to src/main/resources/assets/extratrees/textures/items/misc/grainBarley.png diff --git a/src/main/resources/assets/extratrees/textures/items/grainCorn.png b/src/main/resources/assets/extratrees/textures/items/misc/grainCorn.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/items/grainCorn.png rename to src/main/resources/assets/extratrees/textures/items/misc/grainCorn.png diff --git a/src/main/resources/assets/extratrees/textures/items/grainRoasted.png b/src/main/resources/assets/extratrees/textures/items/misc/grainRoasted.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/items/grainRoasted.png rename to src/main/resources/assets/extratrees/textures/items/misc/grainRoasted.png diff --git a/src/main/resources/assets/extratrees/textures/items/grainRye.png b/src/main/resources/assets/extratrees/textures/items/misc/grainRye.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/items/grainRye.png rename to src/main/resources/assets/extratrees/textures/items/misc/grainRye.png diff --git a/src/main/resources/assets/extratrees/textures/items/grainWheat.png b/src/main/resources/assets/extratrees/textures/items/misc/grainWheat.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/items/grainWheat.png rename to src/main/resources/assets/extratrees/textures/items/misc/grainWheat.png diff --git a/src/main/resources/assets/extratrees/textures/items/hops.png b/src/main/resources/assets/extratrees/textures/items/misc/hops.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/items/hops.png rename to src/main/resources/assets/extratrees/textures/items/misc/hops.png diff --git a/src/main/resources/assets/extratrees/textures/items/provenGear.png b/src/main/resources/assets/extratrees/textures/items/misc/provenGear.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/items/provenGear.png rename to src/main/resources/assets/extratrees/textures/items/misc/provenGear.png diff --git a/src/main/resources/assets/extratrees/textures/items/sawdust.png b/src/main/resources/assets/extratrees/textures/items/misc/sawdust.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/items/sawdust.png rename to src/main/resources/assets/extratrees/textures/items/misc/sawdust.png diff --git a/src/main/resources/assets/extratrees/textures/items/woodWax.png b/src/main/resources/assets/extratrees/textures/items/misc/woodWax.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/items/woodWax.png rename to src/main/resources/assets/extratrees/textures/items/misc/woodWax.png diff --git a/src/main/resources/assets/extratrees/textures/items/yeast.png b/src/main/resources/assets/extratrees/textures/items/misc/yeast.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/items/yeast.png rename to src/main/resources/assets/extratrees/textures/items/misc/yeast.png diff --git a/src/main/resources/assets/extratrees/textures/items/yeastLager.png b/src/main/resources/assets/extratrees/textures/items/misc/yeastLager.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/items/yeastLager.png rename to src/main/resources/assets/extratrees/textures/items/misc/yeastLager.png