fixed rendering bugs

1.11/To-Dos

@@ -1,8 +1,12 @@
 To-Dos
 
 *** Priority ***
-
+- [ ] Make an Iron Anvil
-- [ ] Update Crafting for tools to include leatherStrap
+- [ ] Make Clean Iron Recipes and Tools
+ - [ ] Make Clean Ore Recipe
+- [ ] Make Steel Recipes and Tools
+- [ ] Make Wootz Recipes and Tools
+- [ ] Add Yew
 
 *** Backlog ***
 - [ ] Add Iron Ring Recipe
@@ -18,6 +22,9 @@ To-Dos
   - [ ] Crafting recipes
 
 *** Completed ***
+- [x] Light Forge and Firebox with Firebow or Torch
+- [x] Any gallagher can be used to make a stone anvil
+- [x] Update Crafting for tools to include leatherStrap
 - [x] Forge Setting Player on fire but not taking damage
 - [x] Forge and Bloomery make Smoke
 - [x] Remove cool ingots from inventories with Hand

1.11/eula.txt

@@ -1,3 +1,3 @@
 #By changing the setting below to TRUE you are indicating your agreement to our EULA (https://account.mojang.com/documents/minecraft_eula).
-#Sat Mar 25 12:50:55 EDT 2017
+#Sat Apr 01 13:44:13 EDT 2017
 eula=false

1.11/gradle.properties

@@ -5,7 +5,7 @@ org.gradle.jvmargs=-Xmx3G
 
 mod_group=nmd.primal.forgecraft
 mod_name=ForgeCraft
-mod_version=1.2.10
+mod_version=1.2.11
 forge_version=13.20.0.2226
 mcp_mappings=snapshot_20161220
 mc_version=1.11.2

1.11/src/main/java/nmd/primal/forgecraft/ModInfo.java

@@ -17,7 +17,7 @@ public class ModInfo {
     public static final String MOD_NAME = "Kitsu's ForgeCraft";
     //public static final String MOD_PREFIX = MOD_ID + ":";
     public static final String MOD_CHANNEL = MOD_ID;
-    public static final String MOD_VERSION = "1.2.10";
+    public static final String MOD_VERSION = "1.2.11";
     public static final String MC_VERSIONS = "[1.11.0, 1.12.0)";
     public static final String DEPENDENCIES = "required-after:forge@[13.20.0.2226,);" + "required-after:primal;";
 

1.11/src/main/java/nmd/primal/forgecraft/blocks/Anvil.java

@@ -8,6 +8,7 @@ import net.minecraft.block.state.IBlockState;
 import net.minecraft.entity.EntityLivingBase;
 import net.minecraft.entity.item.EntityItem;
 import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.init.Blocks;
 import net.minecraft.init.Items;
 import net.minecraft.item.EnumDyeColor;
 import net.minecraft.item.Item;
@@ -23,11 +24,15 @@ import net.minecraft.world.World;
 import net.minecraftforge.fml.relauncher.Side;
 import net.minecraftforge.fml.relauncher.SideOnly;
 import nmd.primal.core.api.PrimalItems;
+import nmd.primal.core.common.items.tools.WorkMallet;
 import nmd.primal.forgecraft.CommonUtils;
 import nmd.primal.forgecraft.ModInfo;
 import nmd.primal.forgecraft.crafting.AnvilCrafting;
 import nmd.primal.forgecraft.init.ModBlocks;
 import nmd.primal.forgecraft.init.ModItems;
+import nmd.primal.forgecraft.init.ModMaterials;
+import nmd.primal.forgecraft.items.BaseMultiItem;
+import nmd.primal.forgecraft.items.ForgeHammer;
 import nmd.primal.forgecraft.items.parts.ToolPart;
 import nmd.primal.forgecraft.tiles.TileAnvil;
 
@@ -87,10 +92,10 @@ public class Anvil extends CustomContainerFacing {
             TileAnvil tile = (TileAnvil) world.getTileEntity(pos);
             if (tile != null) {
                 //System.out.println("Tile is not null");
-                if ((player.inventory.getCurrentItem().getItem().equals(PrimalItems.STONE_GALLAGHER)) || (player.inventory.getCurrentItem().getItem() == ModItems.forgehammer)) {
+                //if ((player.inventory.getCurrentItem().getItem().equals(PrimalItems.STONE_GALLAGHER)) || (player.inventory.getCurrentItem().getItem() == ModItems.forgehammer)) {
 
+                if ((pItem.getItem() instanceof WorkMallet) || (pItem.getItem() == ModItems.forgehammer)) {
 
-                    if ((pItem.getItem().equals(PrimalItems.STONE_GALLAGHER)) || (pItem.getItem() == ModItems.forgehammer)) {
 
                     String[] tempArray = new String[25];
                     for (int i = 0; i < 25; i++) {
@@ -99,13 +104,38 @@ public class Anvil extends CustomContainerFacing {
                         //System.out.println(i + " || " + tempArray[i] + " || " + tile.getSlotStack(i).getItem());
                     }
 
+                    if(this.getRegistryName().toString().equals("stoneanvil")){
+                        for (int i = 0; i < 25; i++) {
+                            if (tile.getSlotStack(i).getItem() instanceof BaseMultiItem) {
+                                if(((BaseMultiItem) tile.getSlotStack(i).getItem()).getMaterial(tile.getSlotStack(i).getItem()) != ModMaterials.TOOL_WROUGHT_IRON ) {
+                                    world.setBlockState(pos, Blocks.AIR.getDefaultState(), 2);
+                                    CommonUtils.spawnItemEntityFromWorld(world, pos, new ItemStack(PrimalItems.ROCK_STONE, 3));
+                                    CommonUtils.spawnItemEntityFromWorld(world, pos, new ItemStack(ModBlocks.ironball, 1));
+                                    for (ItemStack stack : tile.getSlotList()) {
+                                        if (stack != null) {
+                                            float offset = 0.7F;
+                                            double offsetX = world.rand.nextFloat() * offset + (1.0F - offset) * 0.5D;
+                                            double offsetY = world.rand.nextFloat() * offset + (1.0F - offset) * 0.5D;
+                                            double offsetZ = world.rand.nextFloat() * offset + (1.0F - offset) * 0.5D;
+                                            EntityItem item = new EntityItem(world, pos.getX() + offsetX, pos.getY() + offsetY, pos.getZ() + offsetZ, stack);
+                                            item.setDefaultPickupDelay();
+                                            world.spawnEntity(item);
+                                            world.removeTileEntity(pos);
+                                            world.playEvent(1031, pos, 0);
+                                        }
+                                    }
+                                }
+                            }
+                        }
+                    }
+
                     AnvilCrafting recipe = AnvilCrafting.getRecipe(tempArray);
 
                     if (recipe != null) {
-                            if (pItem.getItem().equals(PrimalItems.STONE_GALLAGHER)) {
+                        if (pItem.getItem() instanceof WorkMallet) {
                             pItem.damageItem(15, player);
                         }
-                            if (pItem.getItem().equals(ModItems.forgehammer)) {
+                        if (pItem.getItem() instanceof ForgeHammer) {
                             pItem.damageItem(1, player);
                         }
                         world.playEvent(1031, pos, 0);
@@ -205,7 +235,7 @@ public class Anvil extends CustomContainerFacing {
                         }
                     }
                 }
-                }
+                //}
 
 
                 /*****************************************************************************
@@ -213,7 +243,7 @@ public class Anvil extends CustomContainerFacing {
                  *****************************************************************************/
 
 
-                if ((pItem.getItem() != PrimalItems.STONE_GALLAGHER) || (pItem.getItem() != ModItems.forgehammer)) {
+                if ( (!(pItem.getItem() instanceof WorkMallet)) || (!(pItem.getItem() instanceof ForgeHammer)) ) {
 
                             if (state.getValue(FACING) == EnumFacing.NORTH) {
                                 int counter = 0;

1.11/src/main/java/nmd/primal/forgecraft/blocks/Bloomery.java

@@ -24,6 +24,7 @@ import net.minecraft.world.IBlockAccess;
 import net.minecraft.world.World;
 import net.minecraftforge.fml.relauncher.Side;
 import net.minecraftforge.fml.relauncher.SideOnly;
+import nmd.primal.core.api.PrimalItems;
 import nmd.primal.forgecraft.CommonUtils;
 import nmd.primal.forgecraft.ModInfo;
 import nmd.primal.forgecraft.crafting.BloomeryCrafting;
@@ -120,10 +121,9 @@ public class Bloomery extends CustomContainerFacing implements ITileEntityProvid
                     }
                 }
                 if(tile.getSlotStack(0) != ItemStack.EMPTY) {
-                    if ((pItem.getItem() == Items.FLINT_AND_STEEL) //|| (pItem.getItem() == PrimalItems.FIRE_BOW)
+                    if((pItem.getItem() == Items.FLINT_AND_STEEL) || (pItem.getItem() == PrimalItems.FIRE_BOW) || pItem.getItem() == PrimalItems.TORCH_WOOD_LIT || pItem.getItem() == PrimalItems.TORCH_NETHER_LIT  ) {
-                            || pItem.getItem() == Item.getItemFromBlock(Blocks.TORCH)) {
                         world.setBlockState(pos, state.withProperty(ACTIVE, true), 2);
-                        tile.setHeat(400);
+                        tile.setHeat(100);
                         tile.markDirty();
                         tile.updateBlock();
                         return true;

1.11/src/main/java/nmd/primal/forgecraft/blocks/Forge.java

@@ -117,7 +117,7 @@ public class Forge extends CustomContainerFacing implements ITileEntityProvider/
                         }
                     }
                 }
-                if((pItem.getItem() == Items.FLINT_AND_STEEL) || (pItem.getItem() == PrimalItems.FIRE_BOW) || pItem.getItem() == Item.getItemFromBlock(Blocks.TORCH)  ) {
+                if((pItem.getItem() == Items.FLINT_AND_STEEL) || (pItem.getItem() == PrimalItems.FIRE_BOW) || pItem.getItem() == PrimalItems.TORCH_WOOD_LIT || pItem.getItem() == PrimalItems.TORCH_NETHER_LIT  ) {
                     world.setBlockState(pos, state.withProperty(ACTIVE, true), 2);
                     tile.setHeat(100);
                     tile.markDirty();

1.11/src/main/java/nmd/primal/forgecraft/init/ModBlocks.java

@@ -21,6 +21,7 @@ import net.minecraftforge.fml.relauncher.Side;
 import net.minecraftforge.fml.relauncher.SideOnly;
 import nmd.primal.core.api.PrimalItems;
 import nmd.primal.core.common.blocks.PrimalBlock;
+import nmd.primal.core.common.items.tools.WorkMallet;
 import nmd.primal.forgecraft.CommonUtils;
 import nmd.primal.forgecraft.blocks.*;
 import nmd.primal.forgecraft.items.blocks.ItemBlockIngotBall;
@@ -53,10 +54,15 @@ public class ModBlocks {
 
     public static Block ironball;
     public static Block ironchunk;
-    //public static ItemBlock ironballitemcool;
+    public static Block ironcleanball;
-    //public static ItemBlock ironballitemhot;
+    public static Block ironcleanchunk;
+    public static Block steelball;
+    public static Block steelchunk;
+    public static Block wootzball;
+    public static Block wootzchunk;
 
     public static Block stoneanvil;
+    public static Block ironanvil;
 
 
     public static void init() {
@@ -92,7 +98,7 @@ public class ModBlocks {
                     Item pItem = player.getHeldItem(hand).getItem();
                     BlockPos belowPos = pos.down();
                     //System.out.println("Activating");
-                    if (pItem.equals(PrimalItems.STONE_GALLAGHER) && world.getBlockState(belowPos).getBlock().equals(Blocks.STONE)) {
+                    if (pItem instanceof WorkMallet && world.getBlockState(belowPos).getBlock().equals(Blocks.STONE)) {
                         player.swingArm(hand);
                         world.setBlockState(pos, Blocks.AIR.getDefaultState(), 2);
                         world.setBlockState(belowPos, ModBlocks.stoneanvil.getDefaultState().withProperty(Anvil.FACING, player.getHorizontalFacing()), 2);
@@ -142,6 +148,7 @@ public class ModBlocks {
         ironchunk = new IngotBall(Material.IRON, "ironchunk", 5.0F, "chunk");
 
         stoneanvil = new Anvil(Material.ROCK, "stoneanvil", 5.0f);
+        ironanvil = new Anvil(Material.IRON, "ironanvil", 6.0f);
         //ironballitemcool = new ItemBlockIngotBall(ironball);
         //ironballitemhot = new ItemBlockIngotBall(ironball);
 

1.11/src/main/java/nmd/primal/forgecraft/init/ModCrafting.java

@@ -74,11 +74,6 @@ public class ModCrafting {
         /***Iron Crucible***/
 
         ItemStack iron0 = new ItemStack(ModBlocks.rawironcrucible, 1);
-        //iron0.getTagCompound().setBoolean("mod", false);
-        ///iron0.getTagCompound().setInteger("speed", 0);
-        //iron0.getTagCompound().setInteger("fortune", 0);
-        //iron0.getTagCompound().setInteger("durability", 0);
-        //iron0.getTagCompound().setBoolean("silk", false);
 
         //Regular Iron Ore
         GameRegistry.addShapedRecipe(iron0,

1.11/src/main/java/nmd/primal/forgecraft/init/ModItems.java

@@ -36,11 +36,14 @@ public class ModItems {
 
     //public static Item test;
     public static Item pistonbellows;
-    public static Item forgehammer = new ForgeHammer("forgehammer");
+    public static Item forgehammer;
     public static Item softcrucible;
     public static Item stonetongs;
+
     public static Item ironingotballhot;
     public static Item ironchunkhot;
+    public static Item ironcleaningotballhot;
+    public static Item ironcleanchunkhot;
 
     public static Item pickaxehead;
     public static Item ironaxehead;
@@ -61,6 +64,7 @@ public class ModItems {
         pistonbellows = new ItemBellowsHandle();
         softcrucible = new ItemSoftCrucible();
         stonetongs = new ItemStoneTongs("stonetongs");
+        forgehammer = new ForgeHammer("forgehammer");
 
         pickaxehead = new ToolPart("ironpickaxehead", ModMaterials.TOOL_WROUGHT_IRON);
         ironaxehead = new ToolPart("ironaxehead", ModMaterials.TOOL_WROUGHT_IRON);
@@ -76,8 +80,9 @@ public class ModItems {
         //ironingotballcool = new BaseMultiItem("ironingotcool") {};
         //test = new ItemTest("ironsword");
 
-
+        ironingotballhot = new BaseMultiItem("ironingothot", ModMaterials.TOOL_WROUGHT_IRON);
-        ironingotballhot = new BaseMultiItem("ironingothot") {
+        ironchunkhot = new BaseMultiItem("ironchunkhot", ModMaterials.TOOL_WROUGHT_IRON);
+        /*ironingotballhot = new BaseMultiItem("ironingothot", ModMaterials.TOOL_WROUGHT_IRON) {
             public EnumActionResult onItemUse(EntityPlayer player, World world, BlockPos pos, EnumHand hand, EnumFacing facing, float hitX, float hitY, float hitZ) {
                 if(!world.isRemote) {
                     ItemStack itemstack = player.getHeldItem(hand);
@@ -93,7 +98,7 @@ public class ModItems {
                 return EnumActionResult.FAIL;
             }
         };
-        ironchunkhot = new BaseMultiItem("ironchunkhot") {
+        ironchunkhot = new BaseMultiItem("ironchunkhot", ModMaterials.TOOL_WROUGHT_IRON) {
             public EnumActionResult onItemUse(EntityPlayer player, World world, BlockPos pos, EnumHand hand, EnumFacing facing, float hitX, float hitY, float hitZ) {
                 if(!world.isRemote) {
                     ItemStack itemstack = player.getHeldItem(hand);
@@ -108,7 +113,7 @@ public class ModItems {
                 }
                 return EnumActionResult.FAIL;
             }
-        };
+        };*/
         //forgingmanual = new ItemForgingManual();
     }
 

1.11/src/main/java/nmd/primal/forgecraft/items/BaseMultiItem.java

@@ -1,15 +1,23 @@
 package nmd.primal.forgecraft.items;
 
+import net.minecraft.item.Item;
 import nmd.primal.forgecraft.items.BaseItem;
 
 /**
  * Created by mminaie on 2/19/17.
  */
-public abstract class BaseMultiItem extends BaseItem {
+public class BaseMultiItem extends BaseItem {
 
-    public BaseMultiItem( String registryName) {
+    private Item.ToolMaterial mat;
+
+    public BaseMultiItem( String registryName, Item.ToolMaterial material) {
         setUnlocalizedName(registryName);
         setRegistryName(registryName);
+        mat = material;
+    }
+
+    public Item.ToolMaterial getMaterial(Item item){
+        return mat;
     }
 
 }

1.11/src/main/java/nmd/primal/forgecraft/items/parts/ToolPart.java

@@ -215,7 +215,6 @@ public class ToolPart extends Item implements ToolNBT{
 
     }
 
-
     public static boolean isHidden()
     {
         return false;

1.11/src/main/java/nmd/primal/forgecraft/renders/blocks/TileAnvilRender.java

@@ -151,14 +151,14 @@ public class TileAnvilRender extends TileEntitySpecialRenderer<TileAnvil>
                             renderItem.renderItem(tile.getSlotStack(counter), ItemCameraTransforms.TransformType.FIXED);
                             GL11.glPopMatrix();
                         }
-                        /*if( (tile.getSlotStack(counter).getItem() == ModItems.ironchunkhot) || (tile.getSlotStack(counter).getItem() == Item.getItemFromBlock(ModBlocks.ironchunk))) {
+                        if(tile.getSlotStack(counter).getItem() == ModItems.ironchunkhot || tile.getSlotStack(counter).getItem() == ModItems.ironingotballhot){
                             GL11.glPushMatrix();
                             double scale = 1.0D;
                             GL11.glScaled(scale, scale, scale);
-                            GL11.glTranslated(tile.getNormalX(a), -0.455D, tile.getNormalZ(i));
+                            GL11.glTranslated(tile.getNormalX(a), -0.44D, tile.getNormalZ(i));
                             renderItem.renderItem(tile.getSlotStack(counter), ItemCameraTransforms.TransformType.FIXED);
                             GL11.glPopMatrix();
-                        }*/
+                        }
 
                     }
                     counter++;
@@ -228,14 +228,14 @@ public class TileAnvilRender extends TileEntitySpecialRenderer<TileAnvil>
                             renderItem.renderItem(tile.getSlotStack(counter), ItemCameraTransforms.TransformType.FIXED);
                             GL11.glPopMatrix();
                         }
-                        /*if( (tile.getSlotStack(counter).getItem() == ModItems.ironingotballhot) || (tile.getSlotStack(counter).getItem() == Item.getItemFromBlock(ModBlocks.ironball)) ){
+                        if(tile.getSlotStack(counter).getItem() == ModItems.ironchunkhot || tile.getSlotStack(counter).getItem() == ModItems.ironingotballhot){
                             GL11.glPushMatrix();
                             double scale = 1.0D;
                             GL11.glScaled(scale, scale, scale);
-                            GL11.glTranslated( tile.getReverseX(a), -0.455D, tile.getReverseZ(i) );
+                            GL11.glTranslated( tile.getReverseX(a), -0.44D, tile.getReverseZ(i) );
                             renderItem.renderItem(tile.getSlotStack(counter), ItemCameraTransforms.TransformType.FIXED);
                             GL11.glPopMatrix();
-                        }*/
+                        }
 
                     }
                     counter++;
@@ -307,14 +307,14 @@ public class TileAnvilRender extends TileEntitySpecialRenderer<TileAnvil>
                             renderItem.renderItem(tile.getSlotStack(counter), ItemCameraTransforms.TransformType.FIXED);
                             GL11.glPopMatrix();
                         }
-                        /*if(tile.getSlotStack(counter).getItem() == ModItems.ironchunkhot){
+                        if(tile.getSlotStack(counter).getItem() == ModItems.ironchunkhot || tile.getSlotStack(counter).getItem() == ModItems.ironingotballhot){
                             GL11.glPushMatrix();
                             double scale = 1.0D;
                             GL11.glScaled(scale, scale, scale);
-                            GL11.glTranslated( tile.getNormalX(a), -0.455D, tile.getReverseZ(i) );
+                            GL11.glTranslated( tile.getNormalX(a), -0.44D, tile.getReverseZ(i) );
                             renderItem.renderItem(tile.getSlotStack(counter), ItemCameraTransforms.TransformType.FIXED);
                             GL11.glPopMatrix();
-                        }*/
+                        }
                     }
                     counter++;
                 }
@@ -387,14 +387,14 @@ public class TileAnvilRender extends TileEntitySpecialRenderer<TileAnvil>
                             renderItem.renderItem(tile.getSlotStack(counter), ItemCameraTransforms.TransformType.FIXED);
                             GL11.glPopMatrix();
                         }
-                        /*if(tile.getSlotStack(counter).getItem() == ModItems.ironchunkhot){
+                        if(tile.getSlotStack(counter).getItem() == ModItems.ironchunkhot || tile.getSlotStack(counter).getItem() == ModItems.ironingotballhot){
                             GL11.glPushMatrix();
                             double scale = 1.0D;
                             GL11.glScaled(scale, scale, scale);
                             GL11.glTranslated( tile.getReverseX(a), -0.455D, tile.getNormalZ(i) );
                             renderItem.renderItem(tile.getSlotStack(counter), ItemCameraTransforms.TransformType.FIXED);
                             GL11.glPopMatrix();
-                        }*/
+                        }
                     }
                     counter++;
                 }

1.11/src/main/java/nmd/primal/forgecraft/tiles/TileAnvil.java

@@ -52,14 +52,14 @@ public class TileAnvil extends TileBaseSlot implements ITickable {
             if ( ThreadLocalRandom.current().nextInt(0,500) == 0 ) {
                 for(int i=0; i<this.getSlotListSize(); i++){
                     if(this.getSlotStack(i).getItem() == ModItems.ironchunkhot){
-                        if(ThreadLocalRandom.current().nextInt(0,10) == 0){
+                        if(ThreadLocalRandom.current().nextInt(0,10) == 1){
                             this.setSlotStack(i, new ItemStack(ModBlocks.ironchunk, 1));
                             this.updateBlock();
                             this.markDirty();
                         }
                     }
                     if(this.getSlotStack(i).getItem() == ModItems.ironingotballhot){
-                        if(ThreadLocalRandom.current().nextInt(0,10) == 0){
+                        if(ThreadLocalRandom.current().nextInt(0,20) == 2){
                             this.setSlotStack(i, new ItemStack(ModBlocks.ironball, 1));
                             this.updateBlock();
                             this.markDirty();

1.11/src/main/resources/mcmod.info

@@ -2,7 +2,7 @@
   "modid": "forgecraft",
   "name": "Kitsu's Forgecraft",
   "description": "Forged with sweat and blood",
-  "version": "1.2.10",
+  "version": "1.2.11",
   "mcversion": "1.11.2",
   "url": "",
   "updateUrl": "",