+ Added some Fleshy components!

+ Added a Roadmap.
% Updated en_US.lang.

9 files changed, 112 insertions, 14 deletions

diff --git a/src/Java/gtPlusPlus/RoadMap.java b/src/Java/gtPlusPlus/RoadMap.java
new file mode 100644
index 0000000000..bbd602cab4
--- /dev/null
+++ b/src/Java/gtPlusPlus/RoadMap.java
@@ -0,0 +1,36 @@
+package gtPlusPlus;
+
+/**
+ * This Class purely exists to note down ideas and or plans to (re)implement things.
+ * 
+ * @author Alkalus
+ *
+ */
+public class RoadMap {
+
+	//Reorganization of Item, Block and Common Class loading.
+	/*
+	 * So, due to the complex/silly way I've done things, I've ran into some circular loading problems around the mod.
+	 * Issues occur where Classes like CI.java try access the GregtechItemList.java objects before they're actually set.
+	 * A plan should be created to organize the best scheme to load things in the best order.
+	 */
+	
+	//Recreation of GUIs for all Multiblocks
+	/*
+	 * Most Multi's use generic or straight out wrong GUI's on the controller.
+	 * I'd like to go back and recreate all of these.
+	 * 
+	 * Some could even benefit from a totally new type of UI (Instead of Text issues, just change a 2x2px area between red and green for status lights)
+	 * These advanced GUIs are probably out of my capability, but if anyone thinks they're a good idea, I'll give them a go.
+	 */
+	
+	//Better Integration with GTNH
+	/*
+	 * Refactor things to be more common, refactor things to automatically switch between GTNH and standard variants 
+	 * without having to over-abuse CORE.GTNH switches everywhere.
+	 * Most of this can be done via expanding CI.java, so that we have automated handlers for everything 
+	 * (IE. getX(5) will get 5x of the correct version of X)
+	 */
+	
+	
+}
diff --git a/src/Java/gtPlusPlus/core/item/ModItems.java b/src/Java/gtPlusPlus/core/item/ModItems.java
index ded264cb19..e15c326e34 100644
--- a/src/Java/gtPlusPlus/core/item/ModItems.java
+++ b/src/Java/gtPlusPlus/core/item/ModItems.java
@@ -8,10 +8,14 @@ import net.minecraft.item.*;
 import net.minecraft.item.Item.ToolMaterial;
 import net.minecraft.util.EnumChatFormatting;
 
+import gregtech.api.enums.GT_Values;
 import gregtech.api.enums.Materials;
+import gregtech.api.enums.TextureSet;
 import gregtech.api.util.GT_OreDictUnificator;
 
 import gtPlusPlus.api.objects.Logger;
+import gtPlusPlus.core.block.base.BlockBaseModular;
+import gtPlusPlus.core.block.base.BasicBlock.BlockTypes;
 import gtPlusPlus.core.common.compat.COMPAT_Baubles;
 import gtPlusPlus.core.creative.AddToCreativeTab;
 import gtPlusPlus.core.item.base.*;
@@ -42,17 +46,13 @@ import gtPlusPlus.core.item.tool.staballoy.*;
 import gtPlusPlus.core.lib.CORE;
 import gtPlusPlus.core.lib.CORE.ConfigSwitches;
 import gtPlusPlus.core.lib.LoadedMods;
-import gtPlusPlus.core.material.ALLOY;
-import gtPlusPlus.core.material.ELEMENT;
-import gtPlusPlus.core.material.MaterialGenerator;
+import gtPlusPlus.core.material.*;
 import gtPlusPlus.core.material.nuclear.FLUORIDES;
 import gtPlusPlus.core.material.nuclear.NUCLIDE;
 import gtPlusPlus.core.util.Utils;
 import gtPlusPlus.core.util.data.StringUtils;
 import gtPlusPlus.core.util.debug.DEBUG_INIT;
-import gtPlusPlus.core.util.minecraft.FluidUtils;
-import gtPlusPlus.core.util.minecraft.ItemUtils;
-import gtPlusPlus.core.util.minecraft.MaterialUtils;
+import gtPlusPlus.core.util.minecraft.*;
 import gtPlusPlus.everglades.GTplusplus_Everglades;
 import gtPlusPlus.xmod.eio.material.MaterialEIO;
 import net.minecraftforge.common.util.EnumHelper;
@@ -65,8 +65,8 @@ public final class ModItems {
 
 	public static Item ZZZ_Empty;
 	public static Item AAA_Broken;
-	
-	
+
+
 	public static Item itemAlkalusDisk;
 	public static Item itemDebugShapeSpawner;
 	public static Item itemBaseSpawnEgg;
@@ -217,6 +217,7 @@ public final class ModItems {
 	//Possibly missing base items that GT may be missing.
 
 	public static Item itemSmallWroughtIronGear;
+	public static Item itemPlateRawMeat;
 	public static Item itemPlateClay;
 	public static Item itemPlateLithium;
 	public static Item itemPlateEuropium;
@@ -224,7 +225,8 @@ public final class ModItems {
 	public static Item itemDoublePlateClay;
 	public static Item itemDoublePlateEuropium;
 	public static Item itemFoilUranium235;
-
+	public static BlockBaseModular blockRawMeat;
+	
 	public static Item itemBoilerChassis;
 	public static Item itemDehydratorCoilWire;
 	public static Item itemDehydratorCoil;
@@ -666,6 +668,24 @@ public final class ModItems {
 		if (ItemUtils.getItemStackOfAmountFromOreDictNoBroken("gearGtSmallWroughtIron", 1) == null){
 			itemSmallWroughtIronGear = new BaseItemSmallGear(MaterialUtils.generateMaterialFromGtENUM(Materials.WroughtIron));
 		}
+
+		//Special Sillyness
+		if (true) {
+			
+			Material meatRaw = MaterialUtils.generateMaterialFromGtENUM(Materials.MeatRaw);
+			meatRaw.setTextureSet(TextureSet.SET_ROUGH);
+			// A plate of Meat.
+			if (ItemUtils.getItemStackOfAmountFromOreDictNoBroken("plateMeatRaw", 1) == null){
+				itemPlateRawMeat = new BaseItemPlate(meatRaw);
+				RecipeUtils.generateMortarRecipe(ItemUtils.getSimpleStack(itemPlateRawMeat), ItemUtils.getItemStackOfAmountFromOreDict("dustMeatRaw", 1));
+				ItemUtils.registerFuel(ItemUtils.getSimpleStack(itemPlateRawMeat), 100);
+			}
+			// A Block of Meat.
+			if (ItemUtils.getItemStackOfAmountFromOreDictNoBroken("blockMeatRaw", 1) == null){
+				blockRawMeat  = new BlockBaseModular(meatRaw.getUnlocalizedName(), meatRaw.getLocalizedName(), BlockTypes.STANDARD, meatRaw.getRgbAsHex());
+				ItemUtils.registerFuel(ItemUtils.getSimpleStack(blockRawMeat), 900);
+			}
+		}
 		
 
 		// A plate of Vanadium.
@@ -689,7 +709,7 @@ public final class ModItems {
 		dustNeptunium238 = new DustDecayable("dustNeptunium238", Utils.rgbtoHexValue(175, 240, 75), 50640, new String[] {""+StringUtils.superscript("238Np"), "Result: Plutonium 238 ("+StringUtils.superscript("238Pu")+")"}, ELEMENT.getInstance().PLUTONIUM238.getDust(1).getItem(), 5);
 		dustDecayedRadium226 = ItemUtils.generateSpecialUseDusts("DecayedRadium226", "Decayed Radium-226", ""+StringUtils.superscript("226Ra"), ELEMENT.getInstance().RADIUM.getRgbAsHex())[0];
 		dustRadium226 = new DustDecayable("dustRadium226", ELEMENT.getInstance().RADIUM.getRgbAsHex(), 90000, new String[] {""+StringUtils.superscript("226Ra"), "Result: Radon 222 ("+StringUtils.superscript("222Rn")+")"}, ItemUtils.getSimpleStack(dustDecayedRadium226).getItem(), 5);
-		
+
 		itemBoilerChassis = new ItemBoilerChassis();
 		itemDehydratorCoilWire = new ItemDehydratorCoilWire();
 		itemDehydratorCoil = new ItemDehydratorCoil();
diff --git a/src/Java/gtPlusPlus/core/material/Material.java b/src/Java/gtPlusPlus/core/material/Material.java
index 4ab502e1ab..e5abd9bbc3 100644
--- a/src/Java/gtPlusPlus/core/material/Material.java
+++ b/src/Java/gtPlusPlus/core/material/Material.java
@@ -338,7 +338,7 @@ public class Material {
 		}		
 	}
 
-	private TextureSet setTextureSet(TextureSet set) {
+	public TextureSet setTextureSet(TextureSet set) {
 		if (set != null) {
 			return set;			
 		}
diff --git a/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java b/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java
index 56cf563e79..6d940f9454 100644
--- a/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java
+++ b/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java
@@ -57,9 +57,19 @@ public class RECIPES_GREGTECH {
 		sifterRecipes();
 		electroMagneticSeperatorRecipes();
 		extruderRecipes();
+		cuttingSawRecipes();
 		addFuels();
 	}
 
+	private static void cuttingSawRecipes() {
+		GT_Values.RA.addCutterRecipe(
+				ItemUtils.getItemStackOfAmountFromOreDict("blockMeatRaw", 1), //Input
+				ItemUtils.getItemStackOfAmountFromOreDict("plateMeatRaw", 9), //Output
+				null,
+				16, //Time
+				8); //EU
+	}
+
 	private static void electrolyzerRecipes() {
 		GT_Values.RA.addElectrolyzerRecipe(
 				ItemUtils.getSimpleStack(ModItems.dustDecayedRadium226, 1),
@@ -1218,11 +1228,18 @@ public class RECIPES_GREGTECH {
 	private static void compressorRecipes() {
 		GT_ModHandler.addCompressionRecipe(ItemUtils.getItemStackOfAmountFromOreDict("dustSmallClay", 4),
 				ItemUtils.getItemStackOfAmountFromOreDict("plateClay", 1));
+		GT_ModHandler.addCompressionRecipe(ItemUtils.getItemStackOfAmountFromOreDict("dustSmallMeatRaw", 4),
+				ItemUtils.getItemStackOfAmountFromOreDict("plateMeatRaw", 1));
+		GT_ModHandler.addCompressionRecipe(ItemUtils.getItemStackOfAmountFromOreDict("dustMeatRaw", 9),
+				ItemUtils.getItemStackOfAmountFromOreDict("blockMeatRaw", 1));
 	}
 
 	private static void macerationRecipes() {
 		GT_ModHandler.addPulverisationRecipe(ItemUtils.getItemStackOfAmountFromOreDict("pelletZirconium", 1),
 				ItemUtils.getItemStackOfAmountFromOreDict("dustZrCl4", 1));
+		
+		GT_ModHandler.addPulverisationRecipe(ItemUtils.getItemStackOfAmountFromOreDict("blockMeatRaw", 1),
+				ItemUtils.getItemStackOfAmountFromOreDict("dustMeatRaw", 9));
 		/*
 		 * GT_ModHandler.addPulverisationRecipe( FLUORIDES.FLUORITE.getOre(1),
 		 * FLUORIDES.FLUORITE.getDust(4));
diff --git a/src/Java/gtPlusPlus/core/recipe/common/CI.java b/src/Java/gtPlusPlus/core/recipe/common/CI.java
index 3074c3a4fe..5264a16cb8 100644
--- a/src/Java/gtPlusPlus/core/recipe/common/CI.java
+++ b/src/Java/gtPlusPlus/core/recipe/common/CI.java
@@ -165,6 +165,7 @@ public class CI {
 	public static String craftingToolHammer_Soft = "craftingToolSoftHammer";
 	public static String craftingToolScrewdriver = "craftingToolScrewdriver";
 	public static String craftingToolFile = "craftingToolFile";
+	public static String craftingToolMortar = "craftingToolMortar";
 	public static String craftingToolKnife = "craftingToolKnife";
 	public static String craftingToolCrowbar = "craftingToolCrowbar";
 	public static String craftingToolSaw = "craftingToolSaw";
diff --git a/src/Java/gtPlusPlus/core/util/minecraft/ItemUtils.java b/src/Java/gtPlusPlus/core/util/minecraft/ItemUtils.java
index 42f130ad57..4d167949c6 100644
--- a/src/Java/gtPlusPlus/core/util/minecraft/ItemUtils.java
+++ b/src/Java/gtPlusPlus/core/util/minecraft/ItemUtils.java
@@ -10,7 +10,6 @@ import net.minecraft.item.Item;
 import net.minecraft.item.Item.ToolMaterial;
 import net.minecraft.item.ItemStack;
 
-import gregtech.api.enums.GT_Values;
 import gregtech.api.enums.Materials;
 import gregtech.api.enums.OrePrefixes;
 import gregtech.api.util.GT_ModHandler;
@@ -728,6 +727,10 @@ public class ItemUtils {
 			return null;
 		}
 	}
+	
+	public static boolean registerFuel(ItemStack aBurnable, int burn){
+		return CORE.burnables.add(new Pair<Integer, ItemStack>(burn, aBurnable));
+	}
 
 
 }
diff --git a/src/Java/gtPlusPlus/core/util/minecraft/RecipeUtils.java b/src/Java/gtPlusPlus/core/util/minecraft/RecipeUtils.java
index 78d6f94d21..d3367cc46b 100644
--- a/src/Java/gtPlusPlus/core/util/minecraft/RecipeUtils.java
+++ b/src/Java/gtPlusPlus/core/util/minecraft/RecipeUtils.java
@@ -18,6 +18,7 @@ import gtPlusPlus.core.handler.COMPAT_HANDLER;
 import gtPlusPlus.core.handler.Recipes.LateRegistrationHandler;
 import gtPlusPlus.core.handler.Recipes.RegistrationHandler;
 import gtPlusPlus.core.lib.CORE;
+import gtPlusPlus.core.recipe.common.CI;
 import net.minecraftforge.oredict.OreDictionary;
 import net.minecraftforge.oredict.ShapedOreRecipe;
 import net.minecraftforge.oredict.ShapelessOreRecipe;
@@ -482,5 +483,13 @@ public class RecipeUtils {
 	public static boolean buildShapelessRecipe(final ItemStack output, final Object[] input){
 		return ShapelessUtils.addShapelessRecipe(output, input);
 	}
+	
+	public static boolean generateMortarRecipe(ItemStack aStack, ItemStack aOutput) {
+		return RecipeUtils.addShapedGregtechRecipe(
+				aStack, null, null,
+				CI.craftingToolMortar, null, null,
+				null, null, null,
+				aOutput);
+	}
 
 }
diff --git a/src/Java/gtPlusPlus/nei/NEI_GT_Config.java b/src/Java/gtPlusPlus/nei/NEI_GT_Config.java
index 586860c923..4ba55babad 100644
--- a/src/Java/gtPlusPlus/nei/NEI_GT_Config.java
+++ b/src/Java/gtPlusPlus/nei/NEI_GT_Config.java
@@ -9,7 +9,7 @@ implements IConfigureNEI {
 	public static boolean sIsAdded = true;
 
 	@Override
-	public void loadConfig() {
+	public synchronized void loadConfig() {
 		sIsAdded = false;
 		for (final CustomRecipeMap tMap : gregtech.api.util.CustomRecipeMap.sMappings) {
 			if (tMap.mNEIAllowed) {
diff --git a/src/resources/assets/miscutils/lang/en_US.lang b/src/resources/assets/miscutils/lang/en_US.lang
index 22a950be88..a90bf55f89 100644
--- a/src/resources/assets/miscutils/lang/en_US.lang
+++ b/src/resources/assets/miscutils/lang/en_US.lang
@@ -1939,4 +1939,16 @@ tile.blockDarkWorldPortal.name=A Glimpse of the Future
 tile.blockDarkWorldGround.name=Unstable Earth
 tile.blockDarkWorldGround2.name=Polluted Soil
 tile.blockDarkWorldGround2.2.name=Highly Polluted Soil
-tile.blockDarkWorldPortalFrame.name=Containment Frame
\ No newline at end of file
+tile.blockDarkWorldPortalFrame.name=Containment Frame
+
+
+//Added 1/4/18
+tile.Block of Plutonium-239.name=Block of Uranium-239
+tile.Fluorite Ore [Old].name=Fluorite Ore [Deprecated]
+tile.blockMiningPipeFake.name=Strengthened Mining Pipe
+tile.blockMiningHeadFake.name=Bedrock Drill
+item.itemCellLiFBeF2ThF4UF4.name=Cell of Molten Salt [LiFBeF2ThF4UF4]
+item.itemCellLiFBeF2ZrF4UF4.name=Cell of Molten Salt [LiFBeF2ZrF4UF4]
+item.itemCellLiFBeF2ZrF4U235.name=Cell of Molten Salt [LiFBeF2ZrF4U235]
+item.itemPlateMeatRaw.name=Fleshy Panel
+tile.Block of MeatRaw.name=Block of Raw Meat
\ No newline at end of file