Merge dev into master (0.1.0-UNSTABLE-ALPHA-3)

build.properties

@@ -3,7 +3,7 @@
 mod_id=appalachia
 mod_name=Appalachia
 mod_desc=Minecraft mod that adds biomes inspired by the Appalachian region of North America.
-mod_version=0.1.0-UNSTABLE-ALPHA-2
+mod_version=0.1.0-UNSTABLE-ALPHA-3
 mc_version=1.10.2
 mod_url=https://github.com/Team-RTG/Appalachia
 mod_author="Team RTG"

src/main/java/appalachia/api/AppalachiaBlocks.java

@@ -4,17 +4,10 @@
 
 public class AppalachiaBlocks {
 
-    //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-    // Saplings
-    //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-    public static Block sapling_quercus_robur;
 
-    //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-    //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
     //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-    // DYNAMICALLY-GENERATED CODE - PLEASE DO NO MODIFY BELOW THIS LINE
+    // DYNAMICALLY-GENERATED CODE - PLEASE DO NOT MODIFY BELOW THIS LINE
     //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
     public static Block fence_gate_american_beech_01;
@@ -305,5 +298,39 @@ public class AppalachiaBlocks {
     public static Block stairs_yellow_birch_01;
 
 
+    public static Block sapling_american_beech_01;
+    public static Block sapling_american_chestnut_01;
+    public static Block sapling_american_elm_01;
+    public static Block sapling_ash_01;
+    public static Block sapling_bitternut_hickory_01;
+    public static Block sapling_black_cherry_01;
+    public static Block sapling_black_gum_01;
+    public static Block sapling_black_locust_01;
+    public static Block sapling_black_oak_01;
+    public static Block sapling_black_walnut_01;
+    public static Block sapling_blue_beech_01;
+    public static Block sapling_box_elder_01;
+    public static Block sapling_buckeye_01;
+    public static Block sapling_cedar_01;
+    public static Block sapling_dogwood_01;
+    public static Block sapling_hackberry_01;
+    public static Block sapling_honey_locust_01;
+    public static Block sapling_hop_hornbeam_01;
+    public static Block sapling_persimmon_01;
+    public static Block sapling_pignut_hickory_01;
+    public static Block sapling_red_elm_01;
+    public static Block sapling_red_maple_01;
+    public static Block sapling_red_oak_01;
+    public static Block sapling_river_birch_01;
+    public static Block sapling_sassafras_01;
+    public static Block sapling_shagbark_hickory_01;
+    public static Block sapling_shortleaf_pine_01;
+    public static Block sapling_sugar_maple_01;
+    public static Block sapling_sycamore_01;
+    public static Block sapling_tulip_poplar_01;
+    public static Block sapling_white_oak_01;
+    public static Block sapling_white_pine_01;
+    public static Block sapling_white_walnut_01;
+    public static Block sapling_yellow_birch_01;
 
 }

src/main/java/appalachia/api/biome/blueridge/BiomeBlueRidgeBog.java

@@ -24,7 +24,7 @@ public BiomeBlueRidgeBog(BiomeProperties props) {
         theBiomeDecorator.treesPerChunk = 2;
 
         this.spawnableCreatureList.clear();
-        this.spawnableCreatureList.add(new SpawnListEntry(EntityFireFly.class, 15, 4, 10));
+        this.spawnableCaveCreatureList.add(new SpawnListEntry(EntityFireFly.class, 10, 4, 8));
 
         biomeTypes = new BiomeDictionary.Type[]{
             BiomeDictionary.Type.SWAMP,

src/main/java/appalachia/api/biome/blueridge/BiomeBlueRidgeForest.java

@@ -12,7 +12,7 @@ public BiomeBlueRidgeForest(BiomeProperties props) {
 
         super(props);
 
-        this.spawnableCreatureList.add(new SpawnListEntry(EntityFireFly.class, 15, 4, 10));
+        this.spawnableCaveCreatureList.add(new SpawnListEntry(EntityFireFly.class, 10, 4, 8));
 
         biomeTypes = new BiomeDictionary.Type[]{
             BiomeDictionary.Type.FOREST,

src/main/java/appalachia/api/biome/smoky/BiomeSmokyBog.java

@@ -24,7 +24,7 @@ public BiomeSmokyBog(BiomeProperties props) {
         theBiomeDecorator.treesPerChunk = 2;
 
         this.spawnableCreatureList.clear();
-        this.spawnableCreatureList.add(new SpawnListEntry(EntityFireFly.class, 15, 4, 10));
+        this.spawnableCaveCreatureList.add(new SpawnListEntry(EntityFireFly.class, 10, 4, 8));
 
         biomeTypes = new BiomeDictionary.Type[]{
             BiomeDictionary.Type.SWAMP,

src/main/java/appalachia/api/biome/smoky/BiomeSmokyForest.java

@@ -12,7 +12,7 @@ public BiomeSmokyForest(BiomeProperties props) {
 
         super(props);
 
-        this.spawnableCreatureList.add(new SpawnListEntry(EntityFireFly.class, 15, 4, 10));
+        this.spawnableCaveCreatureList.add(new SpawnListEntry(EntityFireFly.class, 10, 4, 8));
 
         biomeTypes = new BiomeDictionary.Type[]{
             BiomeDictionary.Type.FOREST,

src/main/java/appalachia/block/BlockManager.java

@@ -26,8 +26,7 @@
 import appalachia.block.leaves.fallen.*;
 import appalachia.block.logs.*;
 import appalachia.block.planks.*;
-import appalachia.block.saplings.AppalachiaBlockSapling;
-import appalachia.block.saplings.BlockSaplingQuercusRobur;
+import appalachia.block.saplings.*;
 import appalachia.block.slabs.*;
 import appalachia.block.stairs.*;
 import appalachia.item.ItemManager;
@@ -380,7 +379,42 @@ public static void registerBlocks() {
         addFenceGates();
 
         //Saplings.
-        AppalachiaBlocks.sapling_quercus_robur = new BlockSaplingQuercusRobur();
+
+        AppalachiaBlocks.sapling_american_beech_01 = new BlockSaplingAmericanBeech01();
+        AppalachiaBlocks.sapling_american_chestnut_01 = new BlockSaplingAmericanChestnut01();
+        AppalachiaBlocks.sapling_american_elm_01 = new BlockSaplingAmericanElm01();
+        AppalachiaBlocks.sapling_ash_01 = new BlockSaplingAsh01();
+        AppalachiaBlocks.sapling_bitternut_hickory_01 = new BlockSaplingBitternutHickory01();
+        AppalachiaBlocks.sapling_black_cherry_01 = new BlockSaplingBlackCherry01();
+        AppalachiaBlocks.sapling_black_gum_01 = new BlockSaplingBlackGum01();
+        AppalachiaBlocks.sapling_black_locust_01 = new BlockSaplingBlackLocust01();
+        AppalachiaBlocks.sapling_black_oak_01 = new BlockSaplingBlackOak01();
+        AppalachiaBlocks.sapling_black_walnut_01 = new BlockSaplingBlackWalnut01();
+        AppalachiaBlocks.sapling_blue_beech_01 = new BlockSaplingBlueBeech01();
+        AppalachiaBlocks.sapling_box_elder_01 = new BlockSaplingBoxElder01();
+        AppalachiaBlocks.sapling_buckeye_01 = new BlockSaplingBuckeye01();
+        AppalachiaBlocks.sapling_cedar_01 = new BlockSaplingCedar01();
+        AppalachiaBlocks.sapling_dogwood_01 = new BlockSaplingDogwood01();
+        AppalachiaBlocks.sapling_hackberry_01 = new BlockSaplingHackberry01();
+        AppalachiaBlocks.sapling_honey_locust_01 = new BlockSaplingHoneyLocust01();
+        AppalachiaBlocks.sapling_hop_hornbeam_01 = new BlockSaplingHopHornbeam01();
+        AppalachiaBlocks.sapling_persimmon_01 = new BlockSaplingPersimmon01();
+        AppalachiaBlocks.sapling_pignut_hickory_01 = new BlockSaplingPignutHickory01();
+        AppalachiaBlocks.sapling_red_elm_01 = new BlockSaplingRedElm01();
+        AppalachiaBlocks.sapling_red_maple_01 = new BlockSaplingRedMaple01();
+        AppalachiaBlocks.sapling_red_oak_01 = new BlockSaplingRedOak01();
+        AppalachiaBlocks.sapling_river_birch_01 = new BlockSaplingRiverBirch01();
+        AppalachiaBlocks.sapling_sassafras_01 = new BlockSaplingSassafras01();
+        AppalachiaBlocks.sapling_shagbark_hickory_01 = new BlockSaplingShagbarkHickory01();
+        AppalachiaBlocks.sapling_shortleaf_pine_01 = new BlockSaplingShortleafPine01();
+        AppalachiaBlocks.sapling_sugar_maple_01 = new BlockSaplingSugarMaple01();
+        AppalachiaBlocks.sapling_sycamore_01 = new BlockSaplingSycamore01();
+        AppalachiaBlocks.sapling_tulip_poplar_01 = new BlockSaplingTulipPoplar01();
+        AppalachiaBlocks.sapling_white_oak_01 = new BlockSaplingWhiteOak01();
+        AppalachiaBlocks.sapling_white_pine_01 = new BlockSaplingWhitePine01();
+        AppalachiaBlocks.sapling_white_walnut_01 = new BlockSaplingWhiteWalnut01();
+        AppalachiaBlocks.sapling_yellow_birch_01 = new BlockSaplingYellowBirch01();
+
         addSaplings();
 
         addAppalachiaBlocks();
@@ -703,7 +737,40 @@ private static void addFallenLeaves() {
 
     private static void addSaplings() {
 
-        appalachiaSaplings.add(AppalachiaBlocks.sapling_quercus_robur);
+        appalachiaSaplings.add(AppalachiaBlocks.sapling_american_beech_01);
+        appalachiaSaplings.add(AppalachiaBlocks.sapling_american_chestnut_01);
+        appalachiaSaplings.add(AppalachiaBlocks.sapling_american_elm_01);
+        appalachiaSaplings.add(AppalachiaBlocks.sapling_ash_01);
+        appalachiaSaplings.add(AppalachiaBlocks.sapling_bitternut_hickory_01);
+        appalachiaSaplings.add(AppalachiaBlocks.sapling_black_cherry_01);
+        appalachiaSaplings.add(AppalachiaBlocks.sapling_black_gum_01);
+        appalachiaSaplings.add(AppalachiaBlocks.sapling_black_locust_01);
+        appalachiaSaplings.add(AppalachiaBlocks.sapling_black_oak_01);
+        appalachiaSaplings.add(AppalachiaBlocks.sapling_black_walnut_01);
+        appalachiaSaplings.add(AppalachiaBlocks.sapling_blue_beech_01);
+        appalachiaSaplings.add(AppalachiaBlocks.sapling_box_elder_01);
+        appalachiaSaplings.add(AppalachiaBlocks.sapling_buckeye_01);
+        appalachiaSaplings.add(AppalachiaBlocks.sapling_cedar_01);
+        appalachiaSaplings.add(AppalachiaBlocks.sapling_dogwood_01);
+        appalachiaSaplings.add(AppalachiaBlocks.sapling_hackberry_01);
+        appalachiaSaplings.add(AppalachiaBlocks.sapling_honey_locust_01);
+        appalachiaSaplings.add(AppalachiaBlocks.sapling_hop_hornbeam_01);
+        appalachiaSaplings.add(AppalachiaBlocks.sapling_persimmon_01);
+        appalachiaSaplings.add(AppalachiaBlocks.sapling_pignut_hickory_01);
+        appalachiaSaplings.add(AppalachiaBlocks.sapling_red_elm_01);
+        appalachiaSaplings.add(AppalachiaBlocks.sapling_red_maple_01);
+        appalachiaSaplings.add(AppalachiaBlocks.sapling_red_oak_01);
+        appalachiaSaplings.add(AppalachiaBlocks.sapling_river_birch_01);
+        appalachiaSaplings.add(AppalachiaBlocks.sapling_sassafras_01);
+        appalachiaSaplings.add(AppalachiaBlocks.sapling_shagbark_hickory_01);
+        appalachiaSaplings.add(AppalachiaBlocks.sapling_shortleaf_pine_01);
+        appalachiaSaplings.add(AppalachiaBlocks.sapling_sugar_maple_01);
+        appalachiaSaplings.add(AppalachiaBlocks.sapling_sycamore_01);
+        appalachiaSaplings.add(AppalachiaBlocks.sapling_tulip_poplar_01);
+        appalachiaSaplings.add(AppalachiaBlocks.sapling_white_oak_01);
+        appalachiaSaplings.add(AppalachiaBlocks.sapling_white_pine_01);
+        appalachiaSaplings.add(AppalachiaBlocks.sapling_white_walnut_01);
+        appalachiaSaplings.add(AppalachiaBlocks.sapling_yellow_birch_01);
     }
 
     private static void addAppalachiaBlocks() {

src/main/java/appalachia/block/leaves/AppalachiaBlockLeaves.java

@@ -12,6 +12,7 @@
 import net.minecraft.block.state.IBlockState;
 import net.minecraft.client.renderer.color.IBlockColor;
 import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.init.Blocks;
 import net.minecraft.init.Items;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
@@ -26,7 +27,6 @@
 import net.minecraftforge.fml.relauncher.SideOnly;
 
 import appalachia.api.AppalachiaAPI;
-import appalachia.api.AppalachiaBlocks;
 import appalachia.block.BlockManager;
 import appalachia.block.IAppalachiaBlock;
 import appalachia.gui.AppalachiaTabs;
@@ -103,7 +103,7 @@ public void setGraphicsLevel(boolean fancy) {
     @Override
     public Item getItemDropped(IBlockState state, Random rand, int fortune) {
 
-        return Item.getItemFromBlock(AppalachiaBlocks.sapling_quercus_robur);
+        return Item.getItemFromBlock(Blocks.LEAVES);
     }
 
     @Override

src/main/java/appalachia/block/leaves/BlockLeavesAmericanBeech01.java

@@ -1,5 +1,11 @@
 package appalachia.block.leaves;
 
+import java.util.Random;
+
+import net.minecraft.block.state.IBlockState;
+import net.minecraft.item.Item;
+
+import appalachia.api.AppalachiaBlocks;
 import appalachia.block.IAppalachiaBlock;
 
 public class BlockLeavesAmericanBeech01 extends AppalachiaBlockLeaves implements IAppalachiaBlock {
@@ -14,4 +20,10 @@ public String registryName() {
 
         return super.registryName();
     }
+
+    @Override
+    public Item getItemDropped(IBlockState state, Random rand, int fortune) {
+
+        return Item.getItemFromBlock(AppalachiaBlocks.sapling_american_beech_01);
+    }
 }

src/main/java/appalachia/block/leaves/BlockLeavesAmericanChestnut01.java

@@ -1,5 +1,11 @@
 package appalachia.block.leaves;
 
+import java.util.Random;
+
+import net.minecraft.block.state.IBlockState;
+import net.minecraft.item.Item;
+
+import appalachia.api.AppalachiaBlocks;
 import appalachia.block.IAppalachiaBlock;
 
 public class BlockLeavesAmericanChestnut01 extends AppalachiaBlockLeaves implements IAppalachiaBlock {
@@ -14,4 +20,10 @@ public String registryName() {
 
         return super.registryName();
     }
+
+    @Override
+    public Item getItemDropped(IBlockState state, Random rand, int fortune) {
+
+        return Item.getItemFromBlock(AppalachiaBlocks.sapling_american_chestnut_01);
+    }
 }

src/main/java/appalachia/block/leaves/BlockLeavesAmericanElm01.java

@@ -1,5 +1,11 @@
 package appalachia.block.leaves;
 
+import java.util.Random;
+
+import net.minecraft.block.state.IBlockState;
+import net.minecraft.item.Item;
+
+import appalachia.api.AppalachiaBlocks;
 import appalachia.block.IAppalachiaBlock;
 
 public class BlockLeavesAmericanElm01 extends AppalachiaBlockLeaves implements IAppalachiaBlock {
@@ -14,4 +20,10 @@ public String registryName() {
 
         return super.registryName();
     }
+
+    @Override
+    public Item getItemDropped(IBlockState state, Random rand, int fortune) {
+
+        return Item.getItemFromBlock(AppalachiaBlocks.sapling_american_elm_01);
+    }
 }

src/main/java/appalachia/block/leaves/BlockLeavesAsh01.java

@@ -1,5 +1,11 @@
 package appalachia.block.leaves;
 
+import java.util.Random;
+
+import net.minecraft.block.state.IBlockState;
+import net.minecraft.item.Item;
+
+import appalachia.api.AppalachiaBlocks;
 import appalachia.block.IAppalachiaBlock;
 
 public class BlockLeavesAsh01 extends AppalachiaBlockLeaves implements IAppalachiaBlock {
@@ -14,4 +20,10 @@ public String registryName() {
 
         return super.registryName();
     }
+
+    @Override
+    public Item getItemDropped(IBlockState state, Random rand, int fortune) {
+
+        return Item.getItemFromBlock(AppalachiaBlocks.sapling_ash_01);
+    }
 }

src/main/java/appalachia/block/leaves/BlockLeavesBitternutHickory01.java

@@ -1,5 +1,11 @@
 package appalachia.block.leaves;
 
+import java.util.Random;
+
+import net.minecraft.block.state.IBlockState;
+import net.minecraft.item.Item;
+
+import appalachia.api.AppalachiaBlocks;
 import appalachia.block.IAppalachiaBlock;
 
 public class BlockLeavesBitternutHickory01 extends AppalachiaBlockLeaves implements IAppalachiaBlock {
@@ -14,4 +20,10 @@ public String registryName() {
 
         return super.registryName();
     }
+
+    @Override
+    public Item getItemDropped(IBlockState state, Random rand, int fortune) {
+
+        return Item.getItemFromBlock(AppalachiaBlocks.sapling_bitternut_hickory_01);
+    }
 }

src/main/java/appalachia/block/leaves/BlockLeavesBlackCherry01.java

@@ -1,5 +1,11 @@
 package appalachia.block.leaves;
 
+import java.util.Random;
+
+import net.minecraft.block.state.IBlockState;
+import net.minecraft.item.Item;
+
+import appalachia.api.AppalachiaBlocks;
 import appalachia.block.IAppalachiaBlock;
 
 public class BlockLeavesBlackCherry01 extends AppalachiaBlockLeaves implements IAppalachiaBlock {
@@ -14,4 +20,10 @@ public String registryName() {
 
         return super.registryName();
     }
+
+    @Override
+    public Item getItemDropped(IBlockState state, Random rand, int fortune) {
+
+        return Item.getItemFromBlock(AppalachiaBlocks.sapling_black_cherry_01);
+    }
 }

src/main/java/appalachia/block/leaves/BlockLeavesBlackGum01.java

@@ -1,5 +1,11 @@
 package appalachia.block.leaves;
 
+import java.util.Random;
+
+import net.minecraft.block.state.IBlockState;
+import net.minecraft.item.Item;
+
+import appalachia.api.AppalachiaBlocks;
 import appalachia.block.IAppalachiaBlock;
 
 public class BlockLeavesBlackGum01 extends AppalachiaBlockLeaves implements IAppalachiaBlock {
@@ -14,4 +20,10 @@ public String registryName() {
 
         return super.registryName();
     }
+
+    @Override
+    public Item getItemDropped(IBlockState state, Random rand, int fortune) {
+
+        return Item.getItemFromBlock(AppalachiaBlocks.sapling_black_gum_01);
+    }
 }