diff options
Diffstat (limited to 'src/Java/gtPlusPlus')
4 files changed, 112 insertions, 15 deletions
diff --git a/src/Java/gtPlusPlus/core/material/nuclear/NUCLIDE.java b/src/Java/gtPlusPlus/core/material/nuclear/NUCLIDE.java index 1b91741edb..f6c7d952b8 100644 --- a/src/Java/gtPlusPlus/core/material/nuclear/NUCLIDE.java +++ b/src/Java/gtPlusPlus/core/material/nuclear/NUCLIDE.java @@ -20,7 +20,7 @@ public final class NUCLIDE { //RTG Fuels public final Material PLUTONIUM238 = new Material("Plutonium-238", MaterialState.SOLID, Materials.Plutonium241.mDurability, Materials.Plutonium241.mRGBa, Materials.Plutonium241.mMeltingPoint, Materials.Plutonium241.mBlastFurnaceTemp, 94, 144, false, StringUtils.superscript("238Pu"), 2);//Not a GT Inherited Material - public final Material STRONTIUM90 = new Material("Strongtium-90", MaterialState.SOLID, Materials.Strontium.mDurability, Materials.Strontium.mRGBa, Materials.Strontium.mMeltingPoint, Materials.Strontium.mBlastFurnaceTemp, 38, 52, false, StringUtils.superscript("90Sr"), 2);//Not a GT Inherited Material + public final Material STRONTIUM90 = new Material("Strontium-90", MaterialState.SOLID, Materials.Strontium.mDurability, Materials.Strontium.mRGBa, Materials.Strontium.mMeltingPoint, Materials.Strontium.mBlastFurnaceTemp, 38, 52, false, StringUtils.superscript("90Sr"), 2);//Not a GT Inherited Material public final Material POLONIUM210 = new Material("Polonium-210", MaterialState.SOLID, ELEMENT.getInstance().POLONIUM.vDurability, ELEMENT.getInstance().POLONIUM.getRGBA(), ELEMENT.getInstance().POLONIUM.getMeltingPointK(), ELEMENT.getInstance().POLONIUM.getBoilingPointK(), 84, 126, false, StringUtils.superscript("210Po"), 2);//Not a GT Inherited Material public final Material AMERICIUM241 = new Material("Americium-241", MaterialState.SOLID, Materials.Americium.mDurability, Materials.Americium.mRGBa, Materials.Americium.mMeltingPoint, Materials.Americium.mBlastFurnaceTemp, 95, 146, false, StringUtils.superscript("241Am"), 2);//Not a GT Inherited Material diff --git a/src/Java/gtPlusPlus/core/recipe/RECIPES_Machines.java b/src/Java/gtPlusPlus/core/recipe/RECIPES_Machines.java index 79d868c7d6..f12d75175a 100644 --- a/src/Java/gtPlusPlus/core/recipe/RECIPES_Machines.java +++ b/src/Java/gtPlusPlus/core/recipe/RECIPES_Machines.java @@ -904,7 +904,7 @@ public class RECIPES_Machines { "plateDoubleZeron100", CI.craftingToolHammer_Hard, "plateDoubleZeron100", RECIPE_LFTRInnerCasing); - ItemStack IC2HeatPlate = ItemUtils.getItemStackWithMeta(LoadedMods.IndustrialCraft2, "IC2:itemreactorPlatingHeat", "ReactorHeatPlating", 0, 1); + ItemStack IC2HeatPlate = ItemUtils.getItemStack("IC2:reactorPlatingHeat", 1); RecipeUtils.addShapedGregtechRecipe( "plateDoubleHastelloyN", IC2HeatPlate, "plateDoubleHastelloyN", IC2HeatPlate, "frameGtHastelloyC276", IC2HeatPlate, @@ -913,7 +913,44 @@ public class RECIPES_Machines { //LFTR Control Circuit ItemStack circuitT5 = ItemList.Circuit_Master.get(1); - GT_Values.RA.addAssemblerRecipe(circuitT5, CI.fieldGenerator_MV, controlCircuit, 240*20, 500); + GT_Values.RA.addAssemblerRecipe(circuitT5, CI.fieldGenerator_HV, controlCircuit, 240*20, 500); + + + //Fission Fuel Plant + RecipeUtils.addShapedGregtechRecipe( + CI.getTieredCircuit(5), CI.craftingToolSolderingIron, CI.getTieredCircuit(5), + "plate", GregtechItemList.Gregtech_Computer_Cube.get(1), "", + "gearStellite", CI.machineHull_LuV, "gearStellite", + GregtechItemList.Industrial_FuelRefinery.get(1)); + + //Incoloy Casing + RecipeUtils.addShapedGregtechRecipe( + "plateIncoloyDS", "pipeHugeStaballoy", "plateIncoloyDS", + "gearIncoloyDS", GregtechItemList.GT_FluidTank_EV.get(1), "gearIncoloyDS", + "plateIncoloyDS", "pipeHugeStaballoy", "plateIncoloyDS", + GregtechItemList.Casing_Refinery_Internal.get(1)); + + //Hastelloy-N Sealant Casing + RecipeUtils.addShapedGregtechRecipe( + "plateIncoloyMA956", "plateHastelloyN", "plateIncoloyMA956", + "plateHastelloyN", "frameGtHastelloyC276", "plateHastelloyN", + "plateIncoloyMA956", "plateHastelloyN", "plateIncoloyMA956", + GregtechItemList.Casing_Refinery_External.get(1)); + + //Hastelloy-X Structural Casing + RecipeUtils.addShapedGregtechRecipe( + "ringInconel792", "gearHastelloyX", CI.component_Plate[5], + CI.craftingToolHammer_Hard, "frameGtHastelloyC276", CI.craftingToolWrench, + CI.component_Plate[5], CI.getTieredMachineCasing(4), "ringInconel792", + GregtechItemList.Casing_Refinery_Structural.get(1)); + + + + + + + + } } diff --git a/src/Java/gtPlusPlus/core/recipe/common/CI.java b/src/Java/gtPlusPlus/core/recipe/common/CI.java index 46f7f6e0e9..59df867766 100644 --- a/src/Java/gtPlusPlus/core/recipe/common/CI.java +++ b/src/Java/gtPlusPlus/core/recipe/common/CI.java @@ -153,6 +153,7 @@ public class CI { public static String craftingToolKnife = "craftingToolKnife"; public static String craftingToolCrowbar = "craftingToolCrowbar"; public static String craftingToolWireCutter = "craftingToolWirecutter"; + public static String craftingToolSolderingIron = "craftingToolSolderingIron"; public static void Init(){ @@ -394,5 +395,71 @@ public class CI { return ItemList.Tool_DataOrb.get(1); } } + + public static final ItemStack getTieredMachineHull(int tier){ + if (tier == 0){ + return machineHull_ULV; + } + else if (tier == 1){ + return machineHull_LV; + } + else if (tier == 2){ + return machineHull_MV; + } + else if (tier == 3){ + return machineHull_HV; + } + else if (tier == 4){ + return machineHull_EV; + } + else if (tier == 5){ + return machineHull_IV; + } + else if (tier == 6){ + return machineHull_LuV; + } + else if (tier == 7){ + return machineHull_ZPM; + } + else if (tier == 8){ + return machineHull_UV; + } + else { + return machineHull_MAX; + } + } + + public static final ItemStack getTieredMachineCasing(int tier){ + if (tier == 0){ + return machineCasing_ULV; + } + else if (tier == 1){ + return machineCasing_LV; + } + else if (tier == 2){ + return machineCasing_MV; + } + else if (tier == 3){ + return machineCasing_HV; + } + else if (tier == 4){ + return machineCasing_EV; + } + else if (tier == 5){ + return machineCasing_IV; + } + else if (tier == 6){ + return machineCasing_LuV; + } + else if (tier == 7){ + return machineCasing_ZPM; + } + else if (tier == 8){ + return machineCasing_UV; + } + else { + return machineCasing_MAX; + } + } } diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntity_Refinery.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntity_Refinery.java index 47f225f53c..1c5930537e 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntity_Refinery.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntity_Refinery.java @@ -2,25 +2,18 @@ package gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi; import java.util.ArrayList; -import gregtech.api.enums.GT_Values; -import gregtech.api.enums.TAE; -import gregtech.api.enums.Textures; +import gregtech.api.enums.*; import gregtech.api.gui.GT_GUIContainer_MultiMachine; import gregtech.api.interfaces.ITexture; import gregtech.api.interfaces.metatileentity.IMetaTileEntity; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_MultiBlockBase; import gregtech.api.objects.GT_RenderedTexture; -import gregtech.api.util.CustomRecipeMap; -import gregtech.api.util.GT_ModHandler; -import gregtech.api.util.GT_Recipe; -import gregtech.api.util.GT_Utility; -import gregtech.api.util.Recipe_GT; +import gregtech.api.util.*; import gtPlusPlus.core.block.ModBlocks; import gtPlusPlus.core.lib.CORE; import gtPlusPlus.core.util.Utils; import net.minecraft.entity.player.InventoryPlayer; -import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.fluids.FluidStack; @@ -42,10 +35,10 @@ public class GregtechMetaTileEntity_Refinery extends GT_MetaTileEntity_MultiBloc return new String[]{ "Controller Block for the Fission Fuel Processing Unit", "Size(WxHxD): 3x9x3", "Controller (Front middle at bottom)", - "3x2x3 Base platform of Hastelloy-X", - "1x6x1 Incoloy-DS Fluid Containment Block pillar (Center of base, From layer 3 upwards)", + "3x2x3 Base platform of Hastelloy-X (7x Casings)", + "1x5x1 Incoloy-DS Fluid Containment Block pillar (Center of base, From layer 3 upwards)", "4x Zeron-100 Reactor Shielding (Each side of Second Sealant Tower layer, Surrounding Incoloy-DS Fluid Containment)", - "Hastelloy-N Sealant Blocks (Each side of Incoloy-DS Fluid Containment casings, except layer 2 and one on top)", + "17x Hastelloy-N Sealant Blocks (Each side of Incoloy-DS Fluid Containment casings, except layer 2 and one on top)", "4x Input Hatch (One of base platform)", "2x Output Hatch (One of base platform)", "1x Output Bus (One of base platform)", |