From f357e3a1753c7c542d48bb217d8a2545cb9544c4 Mon Sep 17 00:00:00 2001 From: Jordan Byrne Date: Mon, 8 Jan 2018 19:58:35 +1000 Subject: + Added an interface to make tooltips on tile entities more flexible. + Actually added the recipe for the Mining Explosives this time. + Attempted to add a framework for packet handling. --- .../gtPlusPlus/core/recipe/RECIPES_General.java | 9 +++++++++ src/Java/gtPlusPlus/core/recipe/common/CI.java | 21 +++++++++++++++++++++ 2 files changed, 30 insertions(+) (limited to 'src/Java/gtPlusPlus/core/recipe') diff --git a/src/Java/gtPlusPlus/core/recipe/RECIPES_General.java b/src/Java/gtPlusPlus/core/recipe/RECIPES_General.java index 19cf6da51c..6bbe28dd6e 100644 --- a/src/Java/gtPlusPlus/core/recipe/RECIPES_General.java +++ b/src/Java/gtPlusPlus/core/recipe/RECIPES_General.java @@ -122,6 +122,15 @@ public class RECIPES_General { Logger.INFO("Added a recipe for the Fish Trap."); } + //Mining Explosive + if (RecipeUtils.recipeBuilder( + CI.explosiveITNT, CI.explosiveTNT, CI.explosiveITNT, + CI.explosiveTNT, "frameGtWroughtIron", CI.explosiveTNT, + "dustSulfur", CI.explosiveTNT, "dustSulfur", + ItemUtils.getSimpleStack(ModBlocks.blockMiningExplosive))){ + Logger.INFO("Added a recipe for Mining Explosives."); + } + //Alkalus Coin if (RecipeUtils.recipeBuilder( diff --git a/src/Java/gtPlusPlus/core/recipe/common/CI.java b/src/Java/gtPlusPlus/core/recipe/common/CI.java index 9159025922..f9dc105792 100644 --- a/src/Java/gtPlusPlus/core/recipe/common/CI.java +++ b/src/Java/gtPlusPlus/core/recipe/common/CI.java @@ -11,6 +11,9 @@ import gtPlusPlus.core.recipe.LOADER_Machine_Components; import gtPlusPlus.core.util.Utils; import gtPlusPlus.core.util.item.ItemUtils; import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList; +import ic2.core.Ic2Items; +import net.minecraft.init.Blocks; +import net.minecraft.init.Items; import net.minecraft.item.ItemStack; public class CI { @@ -162,8 +165,26 @@ public class CI { public static String craftingToolCrowbar = "craftingToolCrowbar"; public static String craftingToolWireCutter = "craftingToolWirecutter"; public static String craftingToolSolderingIron = "craftingToolSolderingIron"; + + //Explosives + public static ItemStack explosivePowderKeg; + public static ItemStack explosiveTNT; + public static ItemStack explosiveITNT; public static void Init(){ + + //Set Explosives + if (ItemList.valueOf("Block_Powderbarrel") != null){ + explosivePowderKeg = ItemList.valueOf("Block_Powderbarrel").get(1); + } + else { + explosivePowderKeg = ItemUtils.getSimpleStack(Items.gunpowder); + } + explosiveTNT = ItemUtils.getSimpleStack(Blocks.tnt); + explosiveITNT = Ic2Items.industrialTnt.copy(); + + + //Tiered Components component_Plate = new String[]{ -- cgit