diff options
| author | Blood-Asp <Blood@Asp> | 2015-06-07 21:25:40 +0200 |
|---|---|---|
| committer | Blood-Asp <Blood@Asp> | 2015-06-07 21:25:40 +0200 |
| commit | f6fc2a6df60811b84bb929560921b02095cc035e (patch) | |
| tree | 6aa543231323eca9205ba8a840ffdc5abdc70f80 /main/java/gregtech/common/items | |
| parent | 7e0b4194ac6c5651fab4b24e4f30c447697e11ab (diff) | |
| download | GT5-Unofficial-f6fc2a6df60811b84bb929560921b02095cc035e.tar.gz GT5-Unofficial-f6fc2a6df60811b84bb929560921b02095cc035e.tar.bz2 GT5-Unofficial-f6fc2a6df60811b84bb929560921b02095cc035e.zip | |
Update 5.08.19
Diffstat (limited to 'main/java/gregtech/common/items')
| -rw-r--r-- | main/java/gregtech/common/items/GT_MetaGenerated_Tool_01.java | 4 | ||||
| -rw-r--r-- | main/java/gregtech/common/items/GT_NeutronReflector_Item.java | 7 |
2 files changed, 9 insertions, 2 deletions
diff --git a/main/java/gregtech/common/items/GT_MetaGenerated_Tool_01.java b/main/java/gregtech/common/items/GT_MetaGenerated_Tool_01.java index f6ed7f412c..7a593de334 100644 --- a/main/java/gregtech/common/items/GT_MetaGenerated_Tool_01.java +++ b/main/java/gregtech/common/items/GT_MetaGenerated_Tool_01.java @@ -169,13 +169,15 @@ import gregtech.common.tools.GT_Tool_Turbine_Small; /* ?0:73 */ GT_ModHandler.addCraftingRecipe(INSTANCE.getToolWithStats(46, 1, Materials.Aluminium, Materials.Aluminium, null), GT_ModHandler.RecipeBits.NOT_REMOVABLE, new Object[] { " S", " I ", "S f", Character.valueOf('I'), OrePrefixes.ingot.get(Materials.Aluminium), Character.valueOf('S'), OrePrefixes.stick.get(Materials.Aluminium) });
/* ?1:74 */ GT_ModHandler.addCraftingRecipe(INSTANCE.getToolWithStats(46, 1, Materials.StainlessSteel, Materials.StainlessSteel, null), GT_ModHandler.RecipeBits.NOT_REMOVABLE, new Object[] { " S", " I ", "S f", Character.valueOf('I'), OrePrefixes.ingot.get(Materials.StainlessSteel), Character.valueOf('S'), OrePrefixes.stick.get(Materials.StainlessSteel) });
/* ?2: */
+
+ if(!GregTech_API.sSpecialFile.get(ConfigCategories.general, "DisableFlintTools", false)){
/* ?3:76 */ GT_ModHandler.addCraftingRecipe(INSTANCE.getToolWithStats(0, 1, Materials.Flint, Materials.Wood, null), GT_ModHandler.RecipeBits.NOT_REMOVABLE, new Object[] { "F", "F", "S", Character.valueOf('S'), OrePrefixes.stick.get(Materials.Wood), Character.valueOf('F'), new ItemStack(Items.flint, 1) });
/* ?4:77 */ GT_ModHandler.addCraftingRecipe(INSTANCE.getToolWithStats(2, 1, Materials.Flint, Materials.Wood, null), GT_ModHandler.RecipeBits.NOT_REMOVABLE, new Object[] { "FFF", " S ", " S ", Character.valueOf('S'), OrePrefixes.stick.get(Materials.Wood), Character.valueOf('F'), new ItemStack(Items.flint, 1) });
/* ?5:78 */ GT_ModHandler.addCraftingRecipe(INSTANCE.getToolWithStats(4, 1, Materials.Flint, Materials.Wood, null), GT_ModHandler.RecipeBits.NOT_REMOVABLE, new Object[] { "F", "S", "S", Character.valueOf('S'), OrePrefixes.stick.get(Materials.Wood), Character.valueOf('F'), new ItemStack(Items.flint, 1) });
/* ?6:79 */ GT_ModHandler.addCraftingRecipe(INSTANCE.getToolWithStats(6, 1, Materials.Flint, Materials.Wood, null), GT_ModHandler.RecipeBits.MIRRORED | GT_ModHandler.RecipeBits.NOT_REMOVABLE, new Object[] { "FF", "FS", " S", Character.valueOf('S'), OrePrefixes.stick.get(Materials.Wood), Character.valueOf('F'), new ItemStack(Items.flint, 1) });
/* ?7:80 */ GT_ModHandler.addCraftingRecipe(INSTANCE.getToolWithStats(8, 1, Materials.Flint, Materials.Wood, null), GT_ModHandler.RecipeBits.MIRRORED | GT_ModHandler.RecipeBits.NOT_REMOVABLE, new Object[] { "FF", " S", " S", Character.valueOf('S'), OrePrefixes.stick.get(Materials.Wood), Character.valueOf('F'), new ItemStack(Items.flint, 1) });
/* ?8:81 */ GT_ModHandler.addCraftingRecipe(INSTANCE.getToolWithStats(34, 1, Materials.Flint, Materials.Wood, null), GT_ModHandler.RecipeBits.NOT_REMOVABLE, new Object[] { "F", "S", Character.valueOf('S'), OrePrefixes.stick.get(Materials.Wood), Character.valueOf('F'), new ItemStack(Items.flint, 1) });
-/* ?9:83 */ if (GregTech_API.sRecipeFile.get(ConfigCategories.Tools.mortar, "Coal", true)) {
+/* ?9:83 */ }if (GregTech_API.sRecipeFile.get(ConfigCategories.Tools.mortar, "Coal", true)) {
/* @0:83 */ GT_ModHandler.addShapelessCraftingRecipe(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Coal, 1L), GT_ModHandler.RecipeBits.NOT_REMOVABLE, new Object[] { ToolDictNames.craftingToolMortar, new ItemStack(Items.coal, 1) });
/* @1: */ }
/* @2:84 */ if (GregTech_API.sRecipeFile.get(ConfigCategories.Tools.mortar, "Clay", true)) {
diff --git a/main/java/gregtech/common/items/GT_NeutronReflector_Item.java b/main/java/gregtech/common/items/GT_NeutronReflector_Item.java index 1430dcda8f..a9556cc486 100644 --- a/main/java/gregtech/common/items/GT_NeutronReflector_Item.java +++ b/main/java/gregtech/common/items/GT_NeutronReflector_Item.java @@ -1,6 +1,7 @@ package gregtech.common.items; import gregtech.api.items.GT_Generic_Item; +import gregtech.api.items.GT_RadioactiveCellIC_Item; import ic2.api.reactor.IReactor; import ic2.api.reactor.IReactorComponent; import ic2.core.item.reactor.ItemReactorMOX; @@ -28,7 +29,11 @@ public class GT_NeutronReflector_Item } else { - reactor.addOutput(1.0F); + float tEnergy=1.0f; + if(pulsingStack.getItem() instanceof GT_RadioactiveCellIC_Item){ + tEnergy = (float) ((GT_RadioactiveCellIC_Item)pulsingStack.getItem()).sEnergy; + } + reactor.addOutput(tEnergy); } } return true; |