Merge branch 'release/1.1.0'

Conflicts: README.md
KillenCraft · Jan 8, 2015 · 6a33906 · 6a33906
2 parents 53be29b + 3e2cf5d
commit 6a33906
Show file tree

Hide file tree

Showing 8 changed files with 26 additions and 7 deletions.
diff --git a/README.md b/README.md
@@ -3,7 +3,9 @@
 [release]: https://github.com/MinecraftModArchive/KoreSample/releases/download/v1.0.0/KoreSample-1.7.10-1.0.0.jar
 [changelog.md]: https://github.com/MinecraftModArchive/KoreSample/blob/develop/src/main/resources/CHANGELOG.md
 
-Kore Sample provides a set of tools and base classes for other Minecraft mods the depend on it.
+![KoreSample](https://raw.githubusercontent.com/MinecraftModArchive/KoreSample/develop/src/main/resources/assets/logo.png)
+
+Kore Sample provides a set of tools and base classes for other Minecraft mods that depend on it.
 
 [Contributing](#contributing)
 

diff --git a/src/main/java/com/scottkillen/mod/koresample/tree/DefinesSapling.java b/src/main/java/com/scottkillen/mod/koresample/tree/DefinesSapling.java
@@ -3,6 +3,7 @@
 import com.scottkillen.mod.koresample.tree.block.SaplingBlock;
 import net.minecraft.world.gen.feature.WorldGenerator;
 
+@SuppressWarnings("InterfaceNeverImplemented")
 public interface DefinesSapling
 {
     void assignSaplingBlock(SaplingBlock block);
@@ -15,5 +16,8 @@ public interface DefinesSapling
 
     String speciesName();
 
+    @Deprecated
     WorldGenerator treeGenerator();
+
+    WorldGenerator saplingTreeGenerator();
 }
diff --git a/src/main/java/com/scottkillen/mod/koresample/tree/DefinesTree.java b/src/main/java/com/scottkillen/mod/koresample/tree/DefinesTree.java
@@ -3,7 +3,9 @@
 import com.scottkillen.mod.koresample.tree.block.LeavesBlock;
 import com.scottkillen.mod.koresample.tree.block.LogBlock;
 import com.scottkillen.mod.koresample.tree.block.SaplingBlock;
+import net.minecraft.world.gen.feature.WorldGenerator;
 
+@SuppressWarnings("InterfaceNeverImplemented")
 public interface DefinesTree
 {
     LeavesBlock leavesBlock();
@@ -17,4 +19,8 @@ public interface DefinesTree
     SaplingBlock saplingBlock();
 
     int saplingSubBlockIndex();
+
+    WorldGenerator saplingTreeGenerator();
+
+    WorldGenerator worldTreeGenerator();
 }
diff --git a/src/main/java/com/scottkillen/mod/koresample/tree/block/SaplingBlock.java b/src/main/java/com/scottkillen/mod/koresample/tree/block/SaplingBlock.java
@@ -23,6 +23,7 @@
 
 import static com.google.common.base.Preconditions.*;
 
+@SuppressWarnings("AbstractClassNeverImplemented")
 public abstract class SaplingBlock extends BlockSapling
 {
     public static final int CAPACITY = 8;
@@ -51,7 +52,7 @@ protected static String getUnwrappedUnlocalizedName(String unlocalizedName)
 
     protected final List<DefinesSapling> subBlocks() { return Collections.unmodifiableList(subBlocks); }
 
-    public final ImmutableList<String> getSubBlockNames()
+    public final List<String> subBlockNames()
     {
         final List<String> names = Lists.newArrayListWithCapacity(subBlocks.size());
         for (final DefinesSapling subBlock : subBlocks)
@@ -69,7 +70,7 @@ public final void func_149878_d(World world, int x, int y, int z, Random rand)
         if (!TerrainGen.saplingGrowTree(world, rand, x, y, z)) return;
 
         final int metadata = mask(world.getBlockMetadata(x, y, z));
-        final WorldGenerator treeGen = subBlocks.get(metadata).treeGenerator();
+        final WorldGenerator treeGen = subBlocks.get(metadata).saplingTreeGenerator();
         world.setBlock(x, y, z, Blocks.air, 0, 4);
         if (!treeGen.generate(world, rand, x, y, z)) world.setBlock(x, y, z, this, metadata, 4);
     }

diff --git a/src/main/resources/CHANGELOG.md b/src/main/resources/CHANGELOG.md
@@ -1,2 +1,8 @@
+## 1.1.0
+- Added logo made by [CyanideX][cyanidex_twitter]
+- Expand tree definition to include worldGen spawns
+- Enhance epic awesomeness
+[cyanidex_twitter]: https://twitter.com/electrodynamix
+
 ## 1.0.0
 - Initial release
diff --git a/src/main/resources/assets/logo.png b/src/main/resources/assets/logo.png
diff --git a/src/main/resources/mcmod.info b/src/main/resources/mcmod.info
@@ -2,7 +2,7 @@
 {
   "modid": "koresample",
   "name": "Kore Sample",
-  "description": "A Minecraft mod that provides a set of tools and base classes for other Minecraft mods the depend on it.",
+  "description": "Kore Sample provides a set of tools and base classes for other Minecraft mods that depend on it.",
   "version": "${mod_version}",
   "mcversion": "${minecraft_version}",
   "url": "",
@@ -11,7 +11,7 @@
     "ScottKillen"
   ],
   "credits": "",
-  "logoFile": "",
+  "logoFile": "assets/logo.png",
   "screenshots": [
   ],
   "parent":"",

diff --git a/version/gradle.properties b/version/gradle.properties
@@ -1,6 +1,6 @@
-#Tue, 30 Dec 2014 22:06:42 -0500
+#Wed, 07 Jan 2015 23:50:46 -0500
 mcversion=1.7.10
 forgeversion=10.13.2.1235
 version_major=1
-version_series=0
+version_series=1
 version_revision=0