Skip to content

Commit

Permalink
Fix Saplings when you use bonemeal.
Browse files Browse the repository at this point in the history
  • Loading branch information
@alexbegt
alexbegt committed Jan 9, 2016
1 parent b166435 commit 775c566
Show file tree
Hide file tree
Showing 12 changed files with 554 additions and 70 deletions.
8 changes: 4 additions & 4 deletions build.properties
View file
@@ -1,14 +1,14 @@
minecraft_version=1.8.9


forge_version=11.15.0.1674
mappings=snapshot_20151231
forge_version=11.15.0.1690
mappings=snapshot_20160108


mantle_version=0.6.jenkins64
mantle_version=0.6.jenkins69
tconstruct_version=1.6.0.build603

jei_version=2.13.5.61
jei_version=2.15.0.70


CCLIB_version=1.1.2.133
Expand Down
3 changes: 3 additions & 0 deletions src/main/java/com/progwml6/natura/client/models/blocks/NaturaBlockModels.java
View file
Expand Up @@ -2,6 +2,7 @@

import com.progwml6.natura.common.blocks.BlocksNatura;
import com.progwml6.natura.common.blocks.natural.plants.BlockNaturaSapling;
import com.progwml6.natura.common.blocks.natural.plants.BlockNaturaSapling2;
import com.progwml6.natura.common.blocks.natural.trees.BlockNaturaLeaves;

import net.minecraft.client.renderer.block.statemap.StateMap;
Expand All @@ -21,9 +22,11 @@ private static void registerStateMappers()
{
StateMap leavesMapper = new StateMap.Builder().ignore(BlockNaturaLeaves.PROPERTY_CHECK_DECAY, BlockNaturaLeaves.PROPERTY_DECAYABLE).build();
StateMap saplingMapper = new StateMap.Builder().ignore(BlockNaturaSapling.STAGE).build();
StateMap saplingMapper2 = new StateMap.Builder().ignore(BlockNaturaSapling2.STAGE).build();

ModelLoader.setCustomStateMapper(BlocksNatura.leaves, leavesMapper);
ModelLoader.setCustomStateMapper(BlocksNatura.sapling, saplingMapper);
ModelLoader.setCustomStateMapper(BlocksNatura.sapling2, saplingMapper2);
}

}
15 changes: 9 additions & 6 deletions src/main/java/com/progwml6/natura/client/models/items/NaturaItemModels.java
View file
Expand Up @@ -10,6 +10,7 @@
import com.progwml6.natura.common.blocks.natural.BlockClouds;
import com.progwml6.natura.common.blocks.natural.BlockNaturaPlanks;
import com.progwml6.natura.common.blocks.natural.plants.BlockNaturaSapling;
import com.progwml6.natura.common.blocks.natural.plants.BlockNaturaSapling2;
import com.progwml6.natura.common.blocks.natural.trees.BlockNaturaLeaves;
import com.progwml6.natura.common.blocks.natural.trees.BlockNaturaLogs;
import com.progwml6.natura.common.items.ItemsNatura;
Expand Down Expand Up @@ -64,12 +65,14 @@ private static void defineItemModels()
.add(BlockNaturaSapling.EnumType.BLOODWOOD_SAPLING.getMetadata(), "bloodwood_sapling")
.add(BlockNaturaSapling.EnumType.HOPSEED_SAPLING.getMetadata(), "hopseed_sapling")
.add(BlockNaturaSapling.EnumType.MAPLE_SAPLING.getMetadata(), "maple_sapling")
.add(BlockNaturaSapling.EnumType.SILVERBELL_SAPLING.getMetadata(), "silverbell_sapling")
.add(BlockNaturaSapling.EnumType.PURPLEHEART_SAPLING.getMetadata(), "purpleheart_sapling")
.add(BlockNaturaSapling.EnumType.TIGER_SAPLING.getMetadata(), "tiger_sapling")
.add(BlockNaturaSapling.EnumType.WILLOW_SAPLING.getMetadata(), "willow_sapling")
.add(BlockNaturaSapling.EnumType.DARKWOOD_SAPLING.getMetadata(), "darkwood_sapling")
.add(BlockNaturaSapling.EnumType.FUSEWOOD_SAPLING.getMetadata(), "fusewood_sapling"));
.add(BlockNaturaSapling.EnumType.SILVERBELL_SAPLING.getMetadata(), "silverbell_sapling"));

registerItemModels(getItem(BlocksNatura.sapling2), new ItemModelList("saplings/")
.add(BlockNaturaSapling2.EnumType.PURPLEHEART_SAPLING.getMetadata(), "purpleheart_sapling")
.add(BlockNaturaSapling2.EnumType.TIGER_SAPLING.getMetadata(), "tiger_sapling")
.add(BlockNaturaSapling2.EnumType.WILLOW_SAPLING.getMetadata(), "willow_sapling")
.add(BlockNaturaSapling2.EnumType.DARKWOOD_SAPLING.getMetadata(), "darkwood_sapling")
.add(BlockNaturaSapling2.EnumType.FUSEWOOD_SAPLING.getMetadata(), "fusewood_sapling"));

registerItemModels(getItem(BlocksNatura.planks), new ItemModelList("planks/")
.add(BlockNaturaPlanks.EUCALYPTUS_PLANKS.getMeta(), "eucalyptus_planks")
Expand Down
5 changes: 4 additions & 1 deletion src/main/java/com/progwml6/natura/common/blocks/BlocksNatura.java
View file
Expand Up @@ -6,6 +6,7 @@
import com.progwml6.natura.common.blocks.natural.plants.BlockNaturaBarleyCrop;
import com.progwml6.natura.common.blocks.natural.plants.BlockNaturaCottonCrop;
import com.progwml6.natura.common.blocks.natural.plants.BlockNaturaSapling;
import com.progwml6.natura.common.blocks.natural.plants.BlockNaturaSapling2;
import com.progwml6.natura.common.blocks.natural.trees.BlockNaturaLeaves;
import com.progwml6.natura.common.blocks.natural.trees.BlockNaturaLogs;
import com.progwml6.natura.common.blocks.util.CloudMaterial;
Expand All @@ -14,6 +15,7 @@
import com.progwml6.natura.common.items.itemblocks.ItemBlockNaturaLogs;
import com.progwml6.natura.common.items.itemblocks.ItemBlockNaturaPlanks;
import com.progwml6.natura.common.items.itemblocks.ItemBlockNaturaSaplings;
import com.progwml6.natura.common.items.itemblocks.ItemBlockNaturaSaplings2;
import com.progwml6.natura.common.items.itemblocks.ItemBlockVariants;
import com.progwml6.natura.common.items.itemblocks.ItemBlockWorkbench;

Expand All @@ -26,7 +28,7 @@ public class BlocksNatura
{
public static Material cloud = new CloudMaterial();

public static Block clouds, logs, planks, cotton_crop, barley_crop, fence, crafting_table, leaves, sapling;
public static Block clouds, logs, planks, cotton_crop, barley_crop, fence, crafting_table, leaves, sapling, sapling2;

public static void preInit()
{
Expand All @@ -38,6 +40,7 @@ public static void preInit()
crafting_table = registerBlock("crafting_table", ItemBlockWorkbench.class, new BlockNaturaWorkbench());
leaves = registerBlock("leaves", ItemBlockVariants.class, new BlockNaturaLeaves(0));
sapling = registerBlock("saplings", ItemBlockNaturaSaplings.class, new BlockNaturaSapling());
sapling2 = registerBlock("saplings2", ItemBlockNaturaSaplings2.class, new BlockNaturaSapling2());
// this.fence = this.registerBlock("fence", ItemBlockVariants.class, new BlockNaturaFence());
}

Expand Down
3 changes: 2 additions & 1 deletion src/main/java/com/progwml6/natura/common/blocks/natural/plants/BlockNaturaSapling.java
View file
Expand Up @@ -92,6 +92,7 @@ public void generateTree(World worldIn, BlockPos pos, IBlockState state, Random
switch (state.getValue(TYPE))
{
case EUCALYPTUS_SAPLING:
case SILVERBELL_SAPLING:
}

IBlockState iblockstate2 = Blocks.air.getDefaultState();
Expand Down Expand Up @@ -217,7 +218,7 @@ public String getVariantUnlocalizedName(ItemStack stack)

public static enum EnumType implements IStringSerializable
{
EUCALYPTUS_SAPLING(0, "eucalyptus_sapling"), SAKURA_SAPLING(1, "sakura_sapling"), GHOSTWOOD_SAPLING(2, "ghostwood_sapling"), REDWOOD_SAPLING(3, "redwood_sapling"), BLOODWOOD_SAPLING(4, "bloodwood_sapling"), HOPSEED_SAPLING(5, "hopseed_sapling"), MAPLE_SAPLING(6, "maple_sapling"), SILVERBELL_SAPLING(7, "silverbell_sapling"), PURPLEHEART_SAPLING(8, "purpleheart_sapling"), TIGER_SAPLING(9, "tiger_sapling"), WILLOW_SAPLING(10, "willow_sapling"), DARKWOOD_SAPLING(11, "darkwood_sapling"), FUSEWOOD_SAPLING(12, "fusewood_sapling");
EUCALYPTUS_SAPLING(0, "eucalyptus_sapling"), SAKURA_SAPLING(1, "sakura_sapling"), GHOSTWOOD_SAPLING(2, "ghostwood_sapling"), REDWOOD_SAPLING(3, "redwood_sapling"), BLOODWOOD_SAPLING(4, "bloodwood_sapling"), HOPSEED_SAPLING(5, "hopseed_sapling"), MAPLE_SAPLING(6, "maple_sapling"), SILVERBELL_SAPLING(7, "silverbell_sapling");

private static final BlockNaturaSapling.EnumType[] META_LOOKUP = new BlockNaturaSapling.EnumType[values().length];

Expand Down

0 comments on commit 775c566

Please sign in to comment.