Skip to content

Commit

Permalink
Comment out saplings for now, and Add back the Entity's Rendering code.
Browse files Browse the repository at this point in the history
  • Loading branch information
alexbegt committed Sep 6, 2015
1 parent 359831a commit 0049151
Show file tree
Hide file tree
Showing 4 changed files with 45 additions and 8 deletions.
2 changes: 2 additions & 0 deletions src/main/java/com/progwml6/natura/client/ClientProxy.java
@@ -1,6 +1,7 @@
package com.progwml6.natura.client;

import com.progwml6.natura.client.models.ModelNatura;
import com.progwml6.natura.client.renderer.EntityModelRenderer;
import com.progwml6.natura.client.renderer.NCropsTickHandler;
import com.progwml6.natura.common.CommonProxy;
import com.progwml6.natura.common.util.NaturaCreativeTabs;
Expand All @@ -27,6 +28,7 @@ public void init(FMLInitializationEvent event)
super.init(event);

ModelNatura.init();
EntityModelRenderer.init();
FMLCommonHandler.instance().bus().register(new NCropsTickHandler());
}
}
Expand Up @@ -10,16 +10,13 @@
import com.progwml6.natura.common.blocks.natural.BlockClouds;
import com.progwml6.natura.common.blocks.natural.BlockNaturaLogs;
import com.progwml6.natura.common.blocks.natural.BlockNaturaPlanks;
import com.progwml6.natura.common.blocks.natural.plants.BlockNaturaSapling;
import com.progwml6.natura.common.items.ItemsNatura;

import net.minecraft.block.Block;
import net.minecraft.client.Minecraft;
import net.minecraft.client.renderer.block.statemap.StateMap;
import net.minecraft.client.resources.model.ModelBakery;
import net.minecraft.client.resources.model.ModelResourceLocation;
import net.minecraft.item.Item;
import net.minecraftforge.client.model.ModelLoader;

public class ModelNatura
{
Expand All @@ -43,7 +40,7 @@ public static void init()
*/
private static void registerStateMappers()
{
ModelLoader.setCustomStateMapper(BlocksNatura.sapling, new StateMap.Builder().ignore(BlockNaturaSapling.PROPERTY_STAGE).build());
//ModelLoader.setCustomStateMapper(BlocksNatura.sapling, new StateMap.Builder().ignore(BlockNaturaSapling.PROPERTY_STAGE).build());
}

private static void defineModels()
Expand Down
@@ -0,0 +1,40 @@
package com.progwml6.natura.client.renderer;

import com.progwml6.natura.client.models.ImpModel;
import com.progwml6.natura.client.renderer.entity.FlameSpiderBabyRender;
import com.progwml6.natura.client.renderer.entity.FlameSpiderRender;
import com.progwml6.natura.client.renderer.entity.FusewoodArrowRender;
import com.progwml6.natura.client.renderer.entity.ImpRender;
import com.progwml6.natura.client.renderer.entity.NitroCreeperRender;
import com.progwml6.natura.common.world.entites.BabyHeatscarSpider;
import com.progwml6.natura.common.world.entites.FusewoodArrow;
import com.progwml6.natura.common.world.entites.HeatscarSpider;
import com.progwml6.natura.common.world.entites.ImpEntity;
import com.progwml6.natura.common.world.entites.NitroCreeper;

import net.minecraft.client.Minecraft;
import net.minecraft.client.renderer.texture.TextureUtil;
import net.minecraft.util.ResourceLocation;
import net.minecraftforge.fml.client.registry.RenderingRegistry;

public class EntityModelRenderer
{
public static void init()
{
RenderingRegistry.registerEntityRenderingHandler(ImpEntity.class, new ImpRender(Minecraft.getMinecraft().getRenderManager(), new ImpModel(), 0f));
RenderingRegistry.registerEntityRenderingHandler(HeatscarSpider.class, new FlameSpiderRender(Minecraft.getMinecraft().getRenderManager()));
RenderingRegistry.registerEntityRenderingHandler(NitroCreeper.class, new NitroCreeperRender(Minecraft.getMinecraft().getRenderManager()));
RenderingRegistry.registerEntityRenderingHandler(FusewoodArrow.class, new FusewoodArrowRender(Minecraft.getMinecraft().getRenderManager()));
RenderingRegistry.registerEntityRenderingHandler(BabyHeatscarSpider.class, new FlameSpiderBabyRender(Minecraft.getMinecraft().getRenderManager()));

try
{
GrassColorizerAlternate.setBlueGrassBiomeColorizer(TextureUtil.readImageData(Minecraft.getMinecraft().getResourceManager(), new ResourceLocation("natura", "textures/misc/bluegrasscolor.png")));
GrassColorizerAlternate.setOrangeGrassBiomeColorizer(TextureUtil.readImageData(Minecraft.getMinecraft().getResourceManager(), new ResourceLocation("natura", "textures/misc/orangegrasscolor.png")));
}
catch (Exception e)
{
e.printStackTrace();
}
}
}
Expand Up @@ -6,13 +6,11 @@
import com.progwml6.natura.common.blocks.natural.BlockNaturaPlanks;
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.util.CloudMaterial;
import com.progwml6.natura.common.items.itemblocks.ItemBlockClouds;
import com.progwml6.natura.common.items.itemblocks.ItemBlockCrops;
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.ItemBlockWorkbench;

import net.minecraft.block.Block;
Expand All @@ -24,7 +22,7 @@ public class BlocksNatura
{
public static Material cloud = new CloudMaterial();

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

public static void preInit()
{
Expand All @@ -34,7 +32,7 @@ public static void preInit()
cotton_crop = registerBlock("cotton_crops", ItemBlockCrops.class, new BlockNaturaCottonCrop());
barley_crop = registerBlock("barley_crops", ItemBlockCrops.class, new BlockNaturaBarleyCrop());
crafting_table = registerBlock("crafting_table", ItemBlockWorkbench.class, new BlockNaturaWorkbench());
sapling = registerBlock("saplings", ItemBlockNaturaSaplings.class, new BlockNaturaSapling());
// sapling = registerBlock("saplings", ItemBlockNaturaSaplings.class, new BlockNaturaSapling());
// this.fence = this.registerBlock("fence", ItemBlockVariants.class, new BlockNaturaFence());
}

Expand Down

0 comments on commit 0049151

Please sign in to comment.