gemstones, saplings for new trees, bug fixes

src/main/java/me/km/ClientProxy.java

@@ -6,7 +6,7 @@ import me.km.blocks.ModBlocks;
 import me.km.blocks.cauldron.TileEntityCauldron;
 import me.km.entities.ModEntities;
 import me.km.items.ItemColoredSoup;
-import me.km.items.ItemJewel;
+import me.km.items.ItemGemStone;
 import me.km.items.ModItems;
 import me.km.items.ModelCylinder;
 import me.km.items.ModelHat;
@@ -98,27 +98,20 @@ public class ClientProxy extends CommonProxy
             return -16777216 | c.getRed() << 16 | c.getGreen() << 8 | c.getBlue();
         }, ModBlocks.cauldronOak, ModBlocks.cauldronAcacia, ModBlocks.cauldronBigOak, ModBlocks.cauldronBirch, ModBlocks.cauldronJungle, ModBlocks.cauldronSpruce);
 
-        bColors.registerBlockColorHandler((IBlockState state, IBlockAccess w, BlockPos pos, int ti) -> 0xFFD4F7, ModBlocks.redCrystalLeaves);
-        bColors.registerBlockColorHandler((IBlockState state, IBlockAccess w, BlockPos pos, int ti) -> 0xD0FFFF, ModBlocks.blueCrystalLeaves);
-        bColors.registerBlockColorHandler((IBlockState state, IBlockAccess w, BlockPos pos, int ti) -> 0xFFFFFF, ModBlocks.whiteCrystalLeaves);
-        
         bColors.registerBlockColorHandler((IBlockState state, IBlockAccess w, BlockPos pos, int ti) -> 
             w != null && pos != null ? BiomeColorHelper.getFoliageColorAtPos(w, pos) : ColorizerFoliage.getFoliageColorBasic(), 
                 Blocks.LEAVES, ModBlocks.apricotLeaves, ModBlocks.pearLeaves, ModBlocks.plumLeaves);
         
         ItemColors iColors = Minecraft.getMinecraft().getItemColors();
         iColors.registerItemColorHandler((ItemStack stack, int tintIndex) -> tintIndex > 0 ? -1 : ((ItemColoredSoup) stack.getItem()).getColor(stack), ModItems.coloredSoup);
-        iColors.registerItemColorHandler((ItemStack stack, int tintIndex) -> tintIndex > 0 ? -1 : ((ItemJewel) stack.getItem()).getColor(stack), ModItems.jewel);
+        iColors.registerItemColorHandler((ItemStack stack, int tintIndex) -> tintIndex > 0 ? -1 : ((ItemGemStone) stack.getItem()).getColor(stack), 
+                ModItems.gemStone, ModItems.rawGemStone, ModItems.flawlessGemStone);
         
         iColors.registerItemColorHandler((ItemStack stack, int tintIndex) ->
         {
             IBlockState iblockstate = ((ItemBlock) stack.getItem()).getBlock().getStateFromMeta(stack.getMetadata());
             return bColors.colorMultiplier(iblockstate, null, null, tintIndex);
         }, ModBlocks.apricotLeaves, ModBlocks.pearLeaves, ModBlocks.plumLeaves);
-        
-        iColors.registerItemColorHandler((ItemStack stack, int tintIndex) -> 0xFFD4F7, Item.getItemFromBlock(ModBlocks.redCrystalLeaves));
-        iColors.registerItemColorHandler((ItemStack stack, int tintIndex) -> 0xD0FFFF, Item.getItemFromBlock(ModBlocks.blueCrystalLeaves));
-        iColors.registerItemColorHandler((ItemStack stack, int tintIndex) -> 0xFFFFFF, Item.getItemFromBlock(ModBlocks.whiteCrystalLeaves));
     }
 
     @SideOnly(Side.CLIENT)

src/main/java/me/km/KajetansMod.java

@@ -69,7 +69,7 @@ public class KajetansMod
 
     public static final String MODID = "km";
     public static final String NAME = "Kajetans Mod";
-    public static final String VERSION = "0.0.23";
+    public static final String VERSION = "0.0.25";
 
     @Mod.Instance(MODID)
     public static KajetansMod instance;

src/main/java/me/km/api/SimpleConfig.java

@@ -59,7 +59,12 @@ public class SimpleConfig extends SnuviConfig
     
     public Location getLocation(String key)
     {
-        return new Location(ModDimensions.getWorldFromName(getString(key + ".world", "world")), 
+        String s = getString(key + ".world");
+        if(s == null)
+        {
+            return null;
+        }
+        return new Location(ModDimensions.getWorldFromName(s), 
                 getDouble(key + ".x", 0), getDouble(key + ".y", 0), getDouble(key + ".z", 0),
                 getFloat(key + ".yaw", 0), getFloat(key + ".pitch", 0));
     }

src/main/java/me/km/blocks/ModBlocks.java

@@ -20,8 +20,6 @@ import net.minecraft.block.material.Material;
 import net.minecraft.creativetab.CreativeTabs;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemBlock;
-import net.minecraft.item.ItemMultiTexture;
-import net.minecraft.item.ItemStack;
 import net.minecraftforge.fml.common.registry.GameRegistry;
 import net.minecraftforge.registries.IForgeRegistry;
 

src/main/java/me/km/entities/EntityHuman.java

@@ -36,8 +36,8 @@ public class EntityHuman extends EntityCreature implements IEntityAdditionalSpaw
     private String name;
     private float scale;
     private byte slim;
-    private float originalWidth;
-    private float originalHeight;
+    private final float originalWidth;
+    private final float originalHeight;
     
     public EntityHuman(World w)
     {
@@ -162,7 +162,11 @@ public class EntityHuman extends EntityCreature implements IEntityAdditionalSpaw
     @Override
     public void addVelocity(double x, double y, double z)
     {
-        
+    }
+    
+    @Override
+    public void knockBack(Entity entityIn, float strength, double xRatio, double zRatio)
+    {
     }
     
     @Override

src/main/java/me/km/items/ItemJewel.java → src/main/java/me/km/items/ItemGemStone.java

@@ -5,9 +5,9 @@ import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraftforge.common.capabilities.ICapabilityProvider;
 
-public class ItemJewel extends ItemBase
+public class ItemGemStone extends ItemBase
 {
-    public ItemJewel(String name, String local) 
+    public ItemGemStone(String name, String local) 
     {
         super(name, local);
         super.setCreativeTab(CreativeTabs.MATERIALS);

src/main/java/me/km/items/ModItems.java

@@ -232,7 +232,9 @@ public class ModItems
     public static ItemBase wolfFur; 
     public static ItemBlockSpecial campFire; 
     public static ItemBase coarseCloth;
-    public static ItemJewel jewel;
+    public static ItemGemStone gemStone;
+    public static ItemGemStone rawGemStone;
+    public static ItemGemStone flawlessGemStone;
     
     // food
     public static ItemColoredSoup coloredSoup;
@@ -429,7 +431,9 @@ public class ModItems
         batWing = register(r, new ItemBase("bat_wing", "batWing").setCreativeTab(CreativeTabs.MATERIALS));
         wolfFur = register(r, new ItemBase("wolf_fur", "wolfFur").setCreativeTab(CreativeTabs.MATERIALS));
         coarseCloth = register(r, new ItemBase("coarse_cloth", "coarseCloth").setCreativeTab(CreativeTabs.MATERIALS));
-        jewel = register(r, new ItemJewel("jewel", "jewel"));
+        gemStone = register(r, new ItemGemStone("gem_stone", "gemStone"));
+        rawGemStone = register(r, new ItemGemStone("raw_gem_stone", "rawGemStone"));
+        flawlessGemStone = register(r, new ItemGemStone("flawless_gem_stone", "flawlessGemStone"));
         
         // food
         coloredSoup = register(r, new ItemColoredSoup("colored_soup", "soupColored"));

src/main/java/me/km/networking/PlayerDisplayGui.java

@@ -5,7 +5,6 @@ import java.util.TreeMap;
 import me.km.KajetansMod;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.Gui;
-import net.minecraft.client.network.NetworkPlayerInfo;
 import net.minecraft.client.renderer.GlStateManager;
 import net.minecraft.util.ResourceLocation;
 import net.minecraftforge.fml.relauncher.Side;
@@ -14,11 +13,6 @@ import net.minecraftforge.fml.relauncher.SideOnly;
 @SideOnly(Side.CLIENT)
 public class PlayerDisplayGui extends Gui
 {
-    /*
-        TODO
-        Make player head rendering work, see
-        net.minecraft.client.gui.GuiPlayerTabOverlay
-    */
     private static final ResourceLocation CUSTOM_ICONS = new ResourceLocation(KajetansMod.MODID, "textures/gui/icons.png");
     
     public final static PlayerDisplayGui INSTANCE = new PlayerDisplayGui(Minecraft.getMinecraft());

src/main/java/me/km/snuviscript/MinecraftFunctions.java

@@ -336,7 +336,8 @@ public class MinecraftFunctions
         });
                 
         parser.registerFunction("player.gettargetentity", (sc, in) -> Utils.getTargetedEntity((EntityPlayer) in[0].get(sc), in[1].getDouble(sc), getClass(in[2].getString(sc))));
-        parser.registerFunction("player.hasquest", (sc, in) -> KajetansMod.scripts.isRegistered((EntityPlayer) in[0].get(sc)));
+        parser.registerFunction("player.hasscript", (sc, in) -> KajetansMod.scripts.isRegistered((EntityPlayer) in[0].get(sc)));
+        parser.registerAlias("player.hasscript", "player.hasquest");
         parser.registerFunction("player.action", (sc, in) -> 
         {     
             TextComponentString text = new TextComponentString(SnuviUtils.connect(sc, in, 1));

src/main/resources/assets/km/lang/en_US.lang

@@ -194,7 +194,9 @@ item.bundleHay.name=Hay Bundle
 item.batWing.name=Bat Wing
 item.wolfFur.name=Wolf Fur
 item.coarseCloth.name=Coarse Cloth
-item.jewel.name=Jewel
+item.gemStone.name=Gemstone
+item.rawGemStone.name=Raw Gemstone
+item.flawlessGemStone.name=Flawless Gemstone
 
 item.soupColored.name=Stew
 item.apricot.name=Apricot

src/main/resources/assets/km/models/block/cauldron/cauldron_level1.json

@@ -1,4 +1,5 @@
 {
+    "parent": "block/block",
     "ambientocclusion": false,
     "elements": [
         {   "from": [ 0, 3, 0 ],

src/main/resources/assets/km/models/block/cauldron/cauldron_level2.json

@@ -1,4 +1,5 @@
 {
+    "parent": "block/block",
     "ambientocclusion": false,
     "elements": [
         {   "from": [ 0, 3, 0 ],

src/main/resources/assets/km/models/block/cauldron/cauldron_level3.json

@@ -1,4 +1,5 @@
 {
+    "parent": "block/block",
     "ambientocclusion": false,
     "elements": [
         {   "from": [ 0, 3, 0 ],

src/main/resources/assets/km/models/block/leaves/blue_crystal_leaves.json

@@ -1,6 +1,6 @@
 {
     "parent": "block/leaves",
     "textures": {
-        "all": "blocks/leaves_oak"
+        "all": "km:blocks/leaves/blue_crystal_leaves"
     }
 }

src/main/resources/assets/km/models/block/leaves/red_crystal_leaves.json

@@ -1,6 +1,6 @@
 {
     "parent": "block/leaves",
     "textures": {
-        "all": "blocks/leaves_jungle"
+        "all": "km:blocks/leaves/red_crystal_leaves"
     }
 }

src/main/resources/assets/km/models/block/leaves/white_crystal_leaves.json

@@ -1,6 +1,6 @@
 {
     "parent": "block/leaves",
     "textures": {
-        "all": "blocks/leaves_spruce"
+        "all": "km:blocks/leaves/white_crystal_leaves"
     }
 }

src/main/resources/assets/km/models/item/flawless_gem_stone.json

@@ -0,0 +1,6 @@
+{
+    "parent": "item/generated",
+    "textures": {
+        "layer0": "km:items/flawless_gemstone"
+    }
+}

src/main/resources/assets/km/models/item/jewel.json → src/main/resources/assets/km/models/item/gem_stone.json

@@ -1,6 +1,6 @@
 {
     "parent": "item/generated",
     "textures": {
-        "layer0": "km:items/jewel"
+        "layer0": "km:items/gemstone"
     }
 }

src/main/resources/assets/km/models/item/raw_gem_stone.json

@@ -0,0 +1,6 @@
+{
+    "parent": "item/generated",
+    "textures": {
+        "layer0": "km:items/raw_gemstone"
+    }
+}