Skip to content

Commit 3d18251

Browse files
whichonespink44whichonespink44
authored
Merge dev into master (0.1.0-UNSTABLE-ALPHA-3)
2 parents db49e1b + 7f14612 commit 3d18251

File tree

225 files changed

+1794
-107
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

225 files changed

+1794
-107
lines changed

‎build.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
mod_id=appalachia
44
mod_name=Appalachia
55
mod_desc=Minecraft mod that adds biomes inspired by the Appalachian region of North America.
6-
mod_version=0.1.0-UNSTABLE-ALPHA-2
6+
mod_version=0.1.0-UNSTABLE-ALPHA-3
77
mc_version=1.10.2
88
mod_url=https://github.com/Team-RTG/Appalachia
99
mod_author="Team RTG"

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

Lines changed: 35 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,17 +4,10 @@
44

55
public class AppalachiaBlocks {
66

7-
//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
8-
// Saplings
9-
//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
10-
11-
public static Block sapling_quercus_robur;
127

13-
//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
14-
//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
158

169
//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
17-
// DYNAMICALLY-GENERATED CODE - PLEASE DO NO MODIFY BELOW THIS LINE
10+
// DYNAMICALLY-GENERATED CODE - PLEASE DO NOT MODIFY BELOW THIS LINE
1811
//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
1912

2013
public static Block fence_gate_american_beech_01;
@@ -305,5 +298,39 @@ public class AppalachiaBlocks {
305298
public static Block stairs_yellow_birch_01;
306299

307300

301+
public static Block sapling_american_beech_01;
302+
public static Block sapling_american_chestnut_01;
303+
public static Block sapling_american_elm_01;
304+
public static Block sapling_ash_01;
305+
public static Block sapling_bitternut_hickory_01;
306+
public static Block sapling_black_cherry_01;
307+
public static Block sapling_black_gum_01;
308+
public static Block sapling_black_locust_01;
309+
public static Block sapling_black_oak_01;
310+
public static Block sapling_black_walnut_01;
311+
public static Block sapling_blue_beech_01;
312+
public static Block sapling_box_elder_01;
313+
public static Block sapling_buckeye_01;
314+
public static Block sapling_cedar_01;
315+
public static Block sapling_dogwood_01;
316+
public static Block sapling_hackberry_01;
317+
public static Block sapling_honey_locust_01;
318+
public static Block sapling_hop_hornbeam_01;
319+
public static Block sapling_persimmon_01;
320+
public static Block sapling_pignut_hickory_01;
321+
public static Block sapling_red_elm_01;
322+
public static Block sapling_red_maple_01;
323+
public static Block sapling_red_oak_01;
324+
public static Block sapling_river_birch_01;
325+
public static Block sapling_sassafras_01;
326+
public static Block sapling_shagbark_hickory_01;
327+
public static Block sapling_shortleaf_pine_01;
328+
public static Block sapling_sugar_maple_01;
329+
public static Block sapling_sycamore_01;
330+
public static Block sapling_tulip_poplar_01;
331+
public static Block sapling_white_oak_01;
332+
public static Block sapling_white_pine_01;
333+
public static Block sapling_white_walnut_01;
334+
public static Block sapling_yellow_birch_01;
308335

309336
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ public BiomeBlueRidgeBog(BiomeProperties props) {
2424
theBiomeDecorator.treesPerChunk = 2;
2525

2626
this.spawnableCreatureList.clear();
27-
this.spawnableCreatureList.add(new SpawnListEntry(EntityFireFly.class, 15, 4, 10));
27+
this.spawnableCaveCreatureList.add(new SpawnListEntry(EntityFireFly.class, 10, 4, 8));
2828

2929
biomeTypes = new BiomeDictionary.Type[]{
3030
BiomeDictionary.Type.SWAMP,

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ public BiomeBlueRidgeForest(BiomeProperties props) {
1212

1313
super(props);
1414

15-
this.spawnableCreatureList.add(new SpawnListEntry(EntityFireFly.class, 15, 4, 10));
15+
this.spawnableCaveCreatureList.add(new SpawnListEntry(EntityFireFly.class, 10, 4, 8));
1616

1717
biomeTypes = new BiomeDictionary.Type[]{
1818
BiomeDictionary.Type.FOREST,

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ public BiomeSmokyBog(BiomeProperties props) {
2424
theBiomeDecorator.treesPerChunk = 2;
2525

2626
this.spawnableCreatureList.clear();
27-
this.spawnableCreatureList.add(new SpawnListEntry(EntityFireFly.class, 15, 4, 10));
27+
this.spawnableCaveCreatureList.add(new SpawnListEntry(EntityFireFly.class, 10, 4, 8));
2828

2929
biomeTypes = new BiomeDictionary.Type[]{
3030
BiomeDictionary.Type.SWAMP,

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ public BiomeSmokyForest(BiomeProperties props) {
1212

1313
super(props);
1414

15-
this.spawnableCreatureList.add(new SpawnListEntry(EntityFireFly.class, 15, 4, 10));
15+
this.spawnableCaveCreatureList.add(new SpawnListEntry(EntityFireFly.class, 10, 4, 8));
1616

1717
biomeTypes = new BiomeDictionary.Type[]{
1818
BiomeDictionary.Type.FOREST,

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

Lines changed: 71 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,7 @@
2626
import appalachia.block.leaves.fallen.*;
2727
import appalachia.block.logs.*;
2828
import appalachia.block.planks.*;
29-
import appalachia.block.saplings.AppalachiaBlockSapling;
30-
import appalachia.block.saplings.BlockSaplingQuercusRobur;
29+
import appalachia.block.saplings.*;
3130
import appalachia.block.slabs.*;
3231
import appalachia.block.stairs.*;
3332
import appalachia.item.ItemManager;
@@ -380,7 +379,42 @@ public static void registerBlocks() {
380379
addFenceGates();
381380

382381
//Saplings.
383-
AppalachiaBlocks.sapling_quercus_robur = new BlockSaplingQuercusRobur();
382+
383+
AppalachiaBlocks.sapling_american_beech_01 = new BlockSaplingAmericanBeech01();
384+
AppalachiaBlocks.sapling_american_chestnut_01 = new BlockSaplingAmericanChestnut01();
385+
AppalachiaBlocks.sapling_american_elm_01 = new BlockSaplingAmericanElm01();
386+
AppalachiaBlocks.sapling_ash_01 = new BlockSaplingAsh01();
387+
AppalachiaBlocks.sapling_bitternut_hickory_01 = new BlockSaplingBitternutHickory01();
388+
AppalachiaBlocks.sapling_black_cherry_01 = new BlockSaplingBlackCherry01();
389+
AppalachiaBlocks.sapling_black_gum_01 = new BlockSaplingBlackGum01();
390+
AppalachiaBlocks.sapling_black_locust_01 = new BlockSaplingBlackLocust01();
391+
AppalachiaBlocks.sapling_black_oak_01 = new BlockSaplingBlackOak01();
392+
AppalachiaBlocks.sapling_black_walnut_01 = new BlockSaplingBlackWalnut01();
393+
AppalachiaBlocks.sapling_blue_beech_01 = new BlockSaplingBlueBeech01();
394+
AppalachiaBlocks.sapling_box_elder_01 = new BlockSaplingBoxElder01();
395+
AppalachiaBlocks.sapling_buckeye_01 = new BlockSaplingBuckeye01();
396+
AppalachiaBlocks.sapling_cedar_01 = new BlockSaplingCedar01();
397+
AppalachiaBlocks.sapling_dogwood_01 = new BlockSaplingDogwood01();
398+
AppalachiaBlocks.sapling_hackberry_01 = new BlockSaplingHackberry01();
399+
AppalachiaBlocks.sapling_honey_locust_01 = new BlockSaplingHoneyLocust01();
400+
AppalachiaBlocks.sapling_hop_hornbeam_01 = new BlockSaplingHopHornbeam01();
401+
AppalachiaBlocks.sapling_persimmon_01 = new BlockSaplingPersimmon01();
402+
AppalachiaBlocks.sapling_pignut_hickory_01 = new BlockSaplingPignutHickory01();
403+
AppalachiaBlocks.sapling_red_elm_01 = new BlockSaplingRedElm01();
404+
AppalachiaBlocks.sapling_red_maple_01 = new BlockSaplingRedMaple01();
405+
AppalachiaBlocks.sapling_red_oak_01 = new BlockSaplingRedOak01();
406+
AppalachiaBlocks.sapling_river_birch_01 = new BlockSaplingRiverBirch01();
407+
AppalachiaBlocks.sapling_sassafras_01 = new BlockSaplingSassafras01();
408+
AppalachiaBlocks.sapling_shagbark_hickory_01 = new BlockSaplingShagbarkHickory01();
409+
AppalachiaBlocks.sapling_shortleaf_pine_01 = new BlockSaplingShortleafPine01();
410+
AppalachiaBlocks.sapling_sugar_maple_01 = new BlockSaplingSugarMaple01();
411+
AppalachiaBlocks.sapling_sycamore_01 = new BlockSaplingSycamore01();
412+
AppalachiaBlocks.sapling_tulip_poplar_01 = new BlockSaplingTulipPoplar01();
413+
AppalachiaBlocks.sapling_white_oak_01 = new BlockSaplingWhiteOak01();
414+
AppalachiaBlocks.sapling_white_pine_01 = new BlockSaplingWhitePine01();
415+
AppalachiaBlocks.sapling_white_walnut_01 = new BlockSaplingWhiteWalnut01();
416+
AppalachiaBlocks.sapling_yellow_birch_01 = new BlockSaplingYellowBirch01();
417+
384418
addSaplings();
385419

386420
addAppalachiaBlocks();
@@ -703,7 +737,40 @@ private static void addFallenLeaves() {
703737

704738
private static void addSaplings() {
705739

706-
appalachiaSaplings.add(AppalachiaBlocks.sapling_quercus_robur);
740+
appalachiaSaplings.add(AppalachiaBlocks.sapling_american_beech_01);
741+
appalachiaSaplings.add(AppalachiaBlocks.sapling_american_chestnut_01);
742+
appalachiaSaplings.add(AppalachiaBlocks.sapling_american_elm_01);
743+
appalachiaSaplings.add(AppalachiaBlocks.sapling_ash_01);
744+
appalachiaSaplings.add(AppalachiaBlocks.sapling_bitternut_hickory_01);
745+
appalachiaSaplings.add(AppalachiaBlocks.sapling_black_cherry_01);
746+
appalachiaSaplings.add(AppalachiaBlocks.sapling_black_gum_01);
747+
appalachiaSaplings.add(AppalachiaBlocks.sapling_black_locust_01);
748+
appalachiaSaplings.add(AppalachiaBlocks.sapling_black_oak_01);
749+
appalachiaSaplings.add(AppalachiaBlocks.sapling_black_walnut_01);
750+
appalachiaSaplings.add(AppalachiaBlocks.sapling_blue_beech_01);
751+
appalachiaSaplings.add(AppalachiaBlocks.sapling_box_elder_01);
752+
appalachiaSaplings.add(AppalachiaBlocks.sapling_buckeye_01);
753+
appalachiaSaplings.add(AppalachiaBlocks.sapling_cedar_01);
754+
appalachiaSaplings.add(AppalachiaBlocks.sapling_dogwood_01);
755+
appalachiaSaplings.add(AppalachiaBlocks.sapling_hackberry_01);
756+
appalachiaSaplings.add(AppalachiaBlocks.sapling_honey_locust_01);
757+
appalachiaSaplings.add(AppalachiaBlocks.sapling_hop_hornbeam_01);
758+
appalachiaSaplings.add(AppalachiaBlocks.sapling_persimmon_01);
759+
appalachiaSaplings.add(AppalachiaBlocks.sapling_pignut_hickory_01);
760+
appalachiaSaplings.add(AppalachiaBlocks.sapling_red_elm_01);
761+
appalachiaSaplings.add(AppalachiaBlocks.sapling_red_maple_01);
762+
appalachiaSaplings.add(AppalachiaBlocks.sapling_red_oak_01);
763+
appalachiaSaplings.add(AppalachiaBlocks.sapling_river_birch_01);
764+
appalachiaSaplings.add(AppalachiaBlocks.sapling_sassafras_01);
765+
appalachiaSaplings.add(AppalachiaBlocks.sapling_shagbark_hickory_01);
766+
appalachiaSaplings.add(AppalachiaBlocks.sapling_shortleaf_pine_01);
767+
appalachiaSaplings.add(AppalachiaBlocks.sapling_sugar_maple_01);
768+
appalachiaSaplings.add(AppalachiaBlocks.sapling_sycamore_01);
769+
appalachiaSaplings.add(AppalachiaBlocks.sapling_tulip_poplar_01);
770+
appalachiaSaplings.add(AppalachiaBlocks.sapling_white_oak_01);
771+
appalachiaSaplings.add(AppalachiaBlocks.sapling_white_pine_01);
772+
appalachiaSaplings.add(AppalachiaBlocks.sapling_white_walnut_01);
773+
appalachiaSaplings.add(AppalachiaBlocks.sapling_yellow_birch_01);
707774
}
708775

709776
private static void addAppalachiaBlocks() {

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
import net.minecraft.block.state.IBlockState;
1313
import net.minecraft.client.renderer.color.IBlockColor;
1414
import net.minecraft.entity.player.EntityPlayer;
15+
import net.minecraft.init.Blocks;
1516
import net.minecraft.init.Items;
1617
import net.minecraft.item.Item;
1718
import net.minecraft.item.ItemStack;
@@ -26,7 +27,6 @@
2627
import net.minecraftforge.fml.relauncher.SideOnly;
2728

2829
import appalachia.api.AppalachiaAPI;
29-
import appalachia.api.AppalachiaBlocks;
3030
import appalachia.block.BlockManager;
3131
import appalachia.block.IAppalachiaBlock;
3232
import appalachia.gui.AppalachiaTabs;
@@ -103,7 +103,7 @@ public void setGraphicsLevel(boolean fancy) {
103103
@Override
104104
public Item getItemDropped(IBlockState state, Random rand, int fortune) {
105105

106-
return Item.getItemFromBlock(AppalachiaBlocks.sapling_quercus_robur);
106+
return Item.getItemFromBlock(Blocks.LEAVES);
107107
}
108108

109109
@Override

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

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,11 @@
11
package appalachia.block.leaves;
22

3+
import java.util.Random;
4+
5+
import net.minecraft.block.state.IBlockState;
6+
import net.minecraft.item.Item;
7+
8+
import appalachia.api.AppalachiaBlocks;
39
import appalachia.block.IAppalachiaBlock;
410

511
public class BlockLeavesAmericanBeech01 extends AppalachiaBlockLeaves implements IAppalachiaBlock {
@@ -14,4 +20,10 @@ public String registryName() {
1420

1521
return super.registryName();
1622
}
23+
24+
@Override
25+
public Item getItemDropped(IBlockState state, Random rand, int fortune) {
26+
27+
return Item.getItemFromBlock(AppalachiaBlocks.sapling_american_beech_01);
28+
}
1729
}

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

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,11 @@
11
package appalachia.block.leaves;
22

3+
import java.util.Random;
4+
5+
import net.minecraft.block.state.IBlockState;
6+
import net.minecraft.item.Item;
7+
8+
import appalachia.api.AppalachiaBlocks;
39
import appalachia.block.IAppalachiaBlock;
410

511
public class BlockLeavesAmericanChestnut01 extends AppalachiaBlockLeaves implements IAppalachiaBlock {
@@ -14,4 +20,10 @@ public String registryName() {
1420

1521
return super.registryName();
1622
}
23+
24+
@Override
25+
public Item getItemDropped(IBlockState state, Random rand, int fortune) {
26+
27+
return Item.getItemFromBlock(AppalachiaBlocks.sapling_american_chestnut_01);
28+
}
1729
}

0 commit comments

Comments
 (0)