Skip to content

Commit

Permalink
Fix mission Crops model.
Browse files Browse the repository at this point in the history
  • Loading branch information
Alexander Behrhof committed Jul 12, 2015
1 parent 9921cf9 commit b7e05cd
Show file tree
Hide file tree
Showing 6 changed files with 58 additions and 16 deletions.
20 changes: 10 additions & 10 deletions src/main/java/com/progwml6/natura/Natura.java
Expand Up @@ -2,6 +2,15 @@

import java.util.Random;

import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;

import com.progwml6.natura.common.CommonProxy;
import com.progwml6.natura.common.NaturaEvents;
import com.progwml6.natura.common.PHNatura;
import com.progwml6.natura.worldgen.CloudWorldgen;
import com.progwml6.natura.worldgen.CropWorldGen;

import mantle.pulsar.control.PulseManager;
import net.minecraftforge.common.MinecraftForge;
import net.minecraftforge.fml.common.Mod;
Expand All @@ -13,15 +22,6 @@
import net.minecraftforge.fml.common.event.FMLPreInitializationEvent;
import net.minecraftforge.fml.common.registry.GameRegistry;

import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;

import com.progwml6.natura.common.CommonProxy;
import com.progwml6.natura.common.NaturaEvents;
import com.progwml6.natura.common.PHNatura;
import com.progwml6.natura.worldgen.CloudWorldgen;
import com.progwml6.natura.worldgen.CropWorldGen;

@Mod(modid = "natura", name = "Natura", version = "3.0.0", acceptedMinecraftVersions = "[1.8]", dependencies = "required-after:mantle@[0.3.1,)")
public class Natura
{
Expand All @@ -48,7 +48,7 @@ public void preInit(FMLPreInitializationEvent evt)
MinecraftForge.EVENT_BUS.register(new NaturaEvents());
PHNatura.initProps(evt.getSuggestedConfigurationFile());
pulsar.preInit(evt);

PROXY.preInit(evt);
}

Expand Down
8 changes: 4 additions & 4 deletions src/main/java/com/progwml6/natura/NaturaCreativeTabs.java
@@ -1,13 +1,13 @@
package com.progwml6.natura;

import com.progwml6.natura.blocks.BlocksNatura;
import com.progwml6.natura.blocks.natural.BlockClouds;

import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.item.Item;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;

import com.progwml6.natura.blocks.BlocksNatura;
import com.progwml6.natura.blocks.natural.BlockClouds;

public class NaturaCreativeTabs
{
private static class NaturaCreativeTab extends CreativeTabs
Expand Down Expand Up @@ -47,4 +47,4 @@ public static void registerTabIcons()
{
tabMisc.setItemToDisplay(Item.getItemFromBlock(BlocksNatura.clouds), BlockClouds.WHITE.getMeta());
}
}
}
Expand Up @@ -25,6 +25,8 @@ public void preInit()
this.addVariantNames(BlocksNatura.logs, "eucalyptus_log", "sakura_log", "ghostwood_log", "hopseed_log");
this.addVariantNames(BlocksNatura.planks, "eucalyptus_planks", "sakura_planks", "ghostwood_planks", "redwood_planks", "bloodwood_planks", "hopseed_planks", "maple_planks", "silverbell_planks", "purpleheart_planks", "tiger_planks", "willow_planks", "darkwood_planks", "fusewood_planks", "redwood_bark", "redwood_heart", "redwood_root");
this.addVariantNames(BlocksNatura.crafting_table, "table_eucalyptus", "table_sakura", "table_ghostwood", "table_redwood", "table_bloodwood", "table_hopseed", "table_maple", "table_silverbell", "table_purpleheart", "table_tiger", "table_willow", "table_darkwood", "table_fusewood");
this.addVariantNames(BlocksNatura.cottonCrop, "cotton_stage0");
this.addVariantNames(BlocksNatura.barleyCrop, "barley_stage0");

this.addVariantNames(ItemsNatura.materials, "materials_barley_plant", "materials_barley_flour", "materials_wheat_flour", "materials_cotton_plant", "materials_sulfur", "materials_ghostwood_fletching", "materials_leather_imp", "materials_flamestring", "materials_dye_blue");
this.addVariantNames(ItemsNatura.impMeat, "impmeat_raw", "impmeat_cooked");
Expand All @@ -33,8 +35,9 @@ public void preInit()

public void init()
{
this.registerBlockModel(BlocksNatura.cottonCrop);
this.registerBlockModel(BlocksNatura.barleyCrop);
this.registerBlockModel(BlocksNatura.cottonCrop, 0, getResource("cotton_stage0"));

this.registerBlockModel(BlocksNatura.barleyCrop, 0, getResource("barley_stage0"));

this.registerBlockModel(BlocksNatura.clouds, BlockClouds.WHITE.getMeta(), getResource("cloud_white"));
this.registerBlockModel(BlocksNatura.clouds, BlockClouds.GREY.getMeta(), getResource("cloud_gray"));
Expand Down
3 changes: 3 additions & 0 deletions src/main/resources/assets/natura/lang/en_US.lang
@@ -1,5 +1,8 @@
itemGroup.naturaMisc=Natura

tile.cotton_crops.name=Cotton Crops
tile.barley_crops.name=Barley Crops

natura.item.cotton_seeds.name=Cotton Seeds
natura.item.barley_seeds.name=Barley Seeds
tooltip.barley=Similar to wheat, it grows in the wild
Expand Down
18 changes: 18 additions & 0 deletions src/main/resources/assets/natura/models/item/barley_stage0.json
@@ -0,0 +1,18 @@
{
"parent": "builtin/generated",
"textures": {
"layer0": "natura:blocks/barley_stage_0"
},
"display": {
"thirdperson": {
"rotation": [ -90, 0, 0 ],
"translation": [ 0, 1, -2.5 ],
"scale": [ 0.55, 0.55, 0.55 ]
},
"firstperson": {
"rotation": [ 0, -135, 25 ],
"translation": [ 0, 4, 2 ],
"scale": [ 1.7, 1.7, 1.7 ]
}
}
}
18 changes: 18 additions & 0 deletions src/main/resources/assets/natura/models/item/cotton_stage0.json
@@ -0,0 +1,18 @@
{
"parent": "builtin/generated",
"textures": {
"layer0": "natura:blocks/cotton_stage_0"
},
"display": {
"thirdperson": {
"rotation": [ -90, 0, 0 ],
"translation": [ 0, 1, -2.5 ],
"scale": [ 0.55, 0.55, 0.55 ]
},
"firstperson": {
"rotation": [ 0, -135, 25 ],
"translation": [ 0, 4, 2 ],
"scale": [ 1.7, 1.7, 1.7 ]
}
}
}

0 comments on commit b7e05cd

Please sign in to comment.