changed the printout statements for the bloomery and fixed a dupe bug with damascus

kfc/To-Dos.md

@@ -1,10 +1,8 @@
 # To-Dos
 
 ## Bugs
-- [ ] Magnetitie drop from failed crucible
 
 ## Current Feature
-- [ ] New Line Time Left
 - [ ] Untick Bloomery and Forge
 - [ ] Craft Tweaker Support
 - [ ] Recipe Handler for Block Breaker

kfc/gradle.properties

@@ -6,7 +6,7 @@ org.gradle.jvmargs=-Xmx3G
 mod_group=nmd.primal.forgecraft
 mod_name=ForgeCraft
 
-mod_version=1.6.22
+mod_version=1.6.23
 forge_version=14.23.4.2744
 mcp_mappings=snapshot_20171003
 mc_version=1.12.2

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

@@ -21,7 +21,7 @@ public class ModInfo {
     //public static final String MOD_PREFIX = MOD_ID + ":";
     public static final String MOD_CHANNEL = MOD_ID;
 
-    public static final String MOD_VERSION = "1.6.22";
+    public static final String MOD_VERSION = "1.6.23";
     public static final String MC_VERSIONS = "[1.12.0, 1.13.0)";
     public static final String DEPENDENCIES = "required-after:forge@[14.21.1.2400,);" + "required-after:primal@[0.6.69,);";
 

kfc/src/main/java/nmd/primal/forgecraft/blocks/machine/BloomeryBase.java

@@ -34,10 +34,12 @@ import nmd.primal.forgecraft.crafting.CrucibleCrafting;
 import nmd.primal.forgecraft.items.SlottedTongs;
 import nmd.primal.forgecraft.tiles.TileBloomery;
 
+import java.awt.*;
 import java.util.Random;
 import java.util.concurrent.ThreadLocalRandom;
 
 import static nmd.primal.forgecraft.items.SlottedTongs.ITEM_HANDLER;
+import static org.jline.utils.InfoCmp.Capability.newline;
 
 /**
  * Created by mminaie on 6/11/17.
@@ -105,13 +107,12 @@ public class BloomeryBase extends CustomContainerFacing implements ITileEntityPr
             if(pItem.isEmpty()) {
 
                 if(!player.isSneaking()){
-                    if(world.getBlockState(pos).getValue(PrimalAPI.States.ACTIVE) == true){
+                    if(world.getBlockState(pos).getValue(PrimalAPI.States.ACTIVE)){
 
                         Integer bloomeryHeat = tile.getHeat();
-                        String display =  "\n" + "Current Temp: " + bloomeryHeat.toString() +
+                        String display =  "Fuel Remaining: " + tileItem.getCount() + "\n" + "Current Temp: " + bloomeryHeat.toString();
-                                " Fuel Remaining: " + tileItem.getCount();
                         ITextComponent itextcomponent = new TextComponentString(display);
-                        player.sendStatusMessage(itextcomponent, false);
+
                         NBTTagCompound tag = tile.getSlotStack(1).getSubCompound("BlockEntityTag");
 
                         if(tag != null) {
@@ -128,22 +129,37 @@ public class BloomeryBase extends CustomContainerFacing implements ITileEntityPr
                                         Integer idealTime = recipe.getCookTime();
                                         Integer remainingTime = idealTime - cookCounter;
 
-                                        String display1 =
-                                                "Cooking: " + tileItem1.getDisplayName() +
-                                                        " Target Temp: " + minTemp.toString() +
-                                                        " Time Left: " + remainingTime.toString();
-                                        String display2 = tileItem1.getDisplayName() + "finished.";
-                                        ITextComponent itextcomponent1 = null;
-                                        if (tileItem1.getSubCompound("BlockEntityTag").getBoolean("status")) {
-                                            itextcomponent1 = new TextComponentString(display2);
-                                        } else itextcomponent1 = new TextComponentString(display1);
 
-                                        player.sendStatusMessage(itextcomponent1, false);
+                                        String display1 = "Cooking: " + recipe.getDropsCooked().getItem().getItemStackDisplayName(recipe.getDropsCooked());
+                                        String display2 = "Target Temp: " + minTemp.toString();
+                                        String display3 = "Time Left: " + remainingTime.toString() + "\n";
+                                        String display4 = "Finished";
+                                        //String display5 = "Current Temp: " + tile.getHeat();
+
+
+                                        ITextComponent cookingText = new TextComponentString(display1);
+                                        ITextComponent targetTempText = new TextComponentString(display2);
+                                        ITextComponent timeLeftText = new TextComponentString(display3);
+                                        ITextComponent finishedText = new TextComponentString(display4);
+                                        //ITextComponent itextcomponent5 = new TextComponentString(display5);
+                                        if (tileItem1.getSubCompound("BlockEntityTag").getBoolean("status")) {
+                                            player.sendMessage(finishedText);
+                                        } else {
+                                            player.sendMessage(cookingText);
+                                            player.sendMessage(itextcomponent);
+                                            player.sendMessage(targetTempText);
+                                            player.sendMessage(timeLeftText);
+                                        }
                                     }
                                 }
                             }
                             return true;
                         }
+                        else {
+                            String noRecipe =  "Fuel Remaining: " + tileItem.getCount() + "\n" + "Current Temp: " + bloomeryHeat.toString() + "\n";
+                            ITextComponent noRecipeText = new TextComponentString(noRecipe);
+                            player.sendMessage(noRecipeText);
+                        }
                     }
                 }
             }

kfc/src/main/java/nmd/primal/forgecraft/crafting/CraftingRegistery/RecipesCrucible.java

@@ -358,24 +358,12 @@ public final class RecipesCrucible {
             Ingredient.fromStacks(new ItemStack(PrimalAPI.Items.CHARCOAL_PURE, 1)),
             Ingredient.fromStacks(new ItemStack(Blocks.LEAVES, 1, BlockPlanks.EnumType.JUNGLE.getMetadata())),
             Ingredient.fromStacks(new ItemStack(PrimalAPI.Items.CHARCOAL_PURE, 1)),
-            new ItemStack(PrimalAPI.Blocks.ORE_MAGNETITE, 1),
+            new ItemStack(PrimalAPI.Items.ORE_CLUSTER_MAGNETITE, 1),
                 new ItemStack(ModItems.wootzingotball, 1),
                 2100,
                         1800,
                         1500).setRecipeName("wootz1"));
 
-        recipes.register (new CrucibleCrafting(
-                new OreIngredient("magnetite"),
-                Ingredient.fromStacks(new ItemStack(Blocks.LEAVES, 1, BlockPlanks.EnumType.JUNGLE.getMetadata())),
-            Ingredient.fromStacks(new ItemStack(PrimalAPI.Items.CHARCOAL_PURE, 1)),
-            Ingredient.fromStacks(new ItemStack(Blocks.LEAVES, 1, BlockPlanks.EnumType.JUNGLE.getMetadata())),
-            Ingredient.fromStacks(new ItemStack(PrimalAPI.Items.CHARCOAL_PURE, 1)),
-            new ItemStack(PrimalAPI.Blocks.ORE_MAGNETITE, 1),
-                new ItemStack(ModItems.wootzingotball, 1),
-                2100,
-                        1800,
-                        1500).setRecipeName("wootz2"));
-
         recipes.register (new CrucibleCrafting(
                 Ingredient.fromStacks(new ItemStack(ModItems.brokenwootztool, 1)),
             new OreIngredient("nuggetWootz"),

kfc/src/main/resources/mcmod.info

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