diff options
| -rw-r--r-- | src/Java/gtPlusPlus/core/material/ELEMENT.java | 107 | ||||
| -rw-r--r-- | src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GregtechMTE_NuclearReactor.java | 23 |
2 files changed, 107 insertions, 23 deletions
diff --git a/src/Java/gtPlusPlus/core/material/ELEMENT.java b/src/Java/gtPlusPlus/core/material/ELEMENT.java index e15b80c141..5397ed2d15 100644 --- a/src/Java/gtPlusPlus/core/material/ELEMENT.java +++ b/src/Java/gtPlusPlus/core/material/ELEMENT.java @@ -25,7 +25,11 @@ public final class ELEMENT { public final Material NITROGEN = MaterialUtils.generateMaterialFromGtENUM(Materials.Nitrogen); public final Material OXYGEN = MaterialUtils.generateMaterialFromGtENUM(Materials.Oxygen); public final Material FLUORINE = MaterialUtils.generateMaterialFromGtENUM(Materials.Fluorine); - //public final Material NEON = MaterialUtils.generateMaterialFromGtENUM(Materials.Ne); + + + public final Material NEON = new Material("Neon", 25600, new short[]{220, 75, 75}, -248, -246, 10, 10, false, "Ne", 0);//Not a GT Inherited Material + + public final Material SODIUM = MaterialUtils.generateMaterialFromGtENUM(Materials.Sodium); public final Material MAGNESIUM = MaterialUtils.generateMaterialFromGtENUM(Materials.Magnesium); public final Material ALUMINIUM = MaterialUtils.generateMaterialFromGtENUM(Materials.Aluminium); @@ -47,20 +51,32 @@ public final class ELEMENT { public final Material COPPER = MaterialUtils.generateMaterialFromGtENUM(Materials.Copper); public final Material ZINC = MaterialUtils.generateMaterialFromGtENUM(Materials.Zinc); public final Material GALLIUM = MaterialUtils.generateMaterialFromGtENUM(Materials.Gallium); - //public final Material GERMANIUM = MaterialUtils.generateMaterialFromGtENUM(Materials.Germanium); + + + public final Material GERMANIUM = new Material("Germanium", 51200, new short[]{255, 250, 205}, 937, 2830, 32, 41, false, "Ge", 0);//Not a GT Inherited Material + + public final Material ARSENIC = MaterialUtils.generateMaterialFromGtENUM(Materials.Arsenic); - //public final Material SELENIUM = MaterialUtils.generateMaterialFromGtENUM(Materials.Selenium); - //public final Material BROMINE = MaterialUtils.generateMaterialFromGtENUM(Materials.Bromine); - //public final Material KRYPTON = MaterialUtils.generateMaterialFromGtENUM(Materials.Krypton); + + + public final Material SELENIUM = new Material("Selenium", 51200, new short[]{255, 250, 205}, 217, 685, 34, 45, false, "Se", 0);//Not a GT Inherited Material + public final Material BROMINE = new Material("Bromine", 51200, new short[]{255, 250, 205}, -7, 58, 35, 45, false, "Br", 0);//Not a GT Inherited Material + public final Material KRYPTON = new Material("Krypton", 51200, new short[]{255, 250, 205}, -157, -153, 36, 48, false, "Kr", 0);//Not a GT Inherited Material + + public final Material RUBIDIUM = MaterialUtils.generateMaterialFromGtENUM(Materials.Rubidium); public final Material STRONTIUM = MaterialUtils.generateMaterialFromGtENUM(Materials.Strontium); public final Material YTTRIUM = MaterialUtils.generateMaterialFromGtENUM(Materials.Yttrium); public final Material ZIRCONIUM = new Material("Zirconium", 25600, new short[]{255, 250, 205}, 1855, 4377, 40, 51, false, "Zr", 0);//Not a GT Inherited Material public final Material NIOBIUM = MaterialUtils.generateMaterialFromGtENUM(Materials.Niobium); public final Material MOLYBDENUM = MaterialUtils.generateMaterialFromGtENUM(Materials.Molybdenum); - //public final Material TECHNETIUM = MaterialUtils.generateMaterialFromGtENUM(Materials.Technetium); - //public final Material RUTHENIUM = MaterialUtils.generateMaterialFromGtENUM(Materials.Ruthenium); - //public final Material RHODIUM = MaterialUtils.generateMaterialFromGtENUM(Materials.Rhodium); + + + public final Material TECHNETIUM = new Material("Technetium", 25600, new short[]{255, 250, 205}, 2200, 4877, 43, 55, false, "Tc", 0);//Not a GT Inherited Material + public final Material RUTHENIUM = new Material("Ruthenium", 25600, new short[]{255, 250, 205}, 2250, 3900, 44, 57, false, "Ru", 0);//Not a GT Inherited Material + public final Material RHODIUM = new Material("Rhodium", 25600, new short[]{255, 250, 205}, 1966, 3727, 45, 58, false, "Rh", 0);//Not a GT Inherited Material + + public final Material PALLADIUM = MaterialUtils.generateMaterialFromGtENUM(Materials.Palladium); public final Material SILVER = MaterialUtils.generateMaterialFromGtENUM(Materials.Silver); public final Material CADMIUM = MaterialUtils.generateMaterialFromGtENUM(Materials.Cadmium); @@ -68,7 +84,37 @@ public final class ELEMENT { public final Material TIN = MaterialUtils.generateMaterialFromGtENUM(Materials.Tin); +//Antimony - to the end + public final Material ANTIMONY = MaterialUtils.generateMaterialFromGtENUM(Materials.Antimony); + + + public final Material TELLURIUM = new Material("Tellurium", 25600, new short[]{255, 250, 205}, 449, 989, 52, 76, false, "Te", 0);//Not a GT Inherited Material + public final Material IODINE = new Material("Iodine", 25600, new short[]{255, 250, 205}, 114, 184, 53, 74, false, "I", 0);//Not a GT Inherited Material + public final Material XENON = new Material("Xenon", 25600, new short[]{255, 250, 205}, -111, -108, 54, 77, false, "Xe", 0);//Not a GT Inherited Material + + + public final Material CESIUM = MaterialUtils.generateMaterialFromGtENUM(Materials.Caesium); + public final Material BARIUM = MaterialUtils.generateMaterialFromGtENUM(Materials.Barium); + public final Material LANTHANUM = MaterialUtils.generateMaterialFromGtENUM(Materials.Lanthanum); + public final Material CERIUM = MaterialUtils.generateMaterialFromGtENUM(Materials.Cerium); + public final Material PRASEODYMIUM = MaterialUtils.generateMaterialFromGtENUM(Materials.Praseodymium); + public final Material NEODYMIUM = MaterialUtils.generateMaterialFromGtENUM(Materials.Neodymium); + public final Material PROMETHIUM = MaterialUtils.generateMaterialFromGtENUM(Materials.Promethium); + public final Material SAMARIUM = MaterialUtils.generateMaterialFromGtENUM(Materials.Samarium); + public final Material EUROPIUM = MaterialUtils.generateMaterialFromGtENUM(Materials.Europium); + public final Material GADOLINIUM = MaterialUtils.generateMaterialFromGtENUM(Materials.Gadolinium); + public final Material TERBIUM = MaterialUtils.generateMaterialFromGtENUM(Materials.Terbium); + + public final Material DYSPROSIUM = new Material("Dysprosium", 25600, new short[]{255, 250, 205}, 1412, 2562, 66, 97, false, "Dy", 0);//Not a GT Inherited Material + + public final Material HOLMIUM = MaterialUtils.generateMaterialFromGtENUM(Materials.Holmium); + public final Material ERBIUM = MaterialUtils.generateMaterialFromGtENUM(Materials.Erbium); + public final Material THULIUM = MaterialUtils.generateMaterialFromGtENUM(Materials.Thulium); + public final Material YTTERBIUM = MaterialUtils.generateMaterialFromGtENUM(Materials.Ytterbium); + public final Material LUTETIUM = MaterialUtils.generateMaterialFromGtENUM(Materials.Lutetium); + + public final Material HAFNIUM = new Material("Hafnium", 25600, new short[]{255, 250, 205}, 2150, 5400, 72, 106, false, "Hf", 0);//Not a GT Inherited Material @@ -78,26 +124,61 @@ public final class ELEMENT { //Second 50 elements public final Material TANTALUM = MaterialUtils.generateMaterialFromGtENUM(Materials.Tantalum); public final Material TUNGSTEN = MaterialUtils.generateMaterialFromGtENUM(Materials.Tungsten); + + + public final Material RHENIUM = new Material("name", 25600, new short[]{255, 250, 205}, melt, boil, proton, neutron, false, "Zr", 0);//Not a GT Inherited Material + + public final Material OSMIUM = MaterialUtils.generateMaterialFromGtENUM(Materials.Osmium); public final Material IRIDIUM = MaterialUtils.generateMaterialFromGtENUM(Materials.Iridium); public final Material PLATINUM = MaterialUtils.generateMaterialFromGtENUM(Materials.Platinum); public final Material GOLD = MaterialUtils.generateMaterialFromGtENUM(Materials.Gold); + public final Material MERCURY = MaterialUtils.generateMaterialFromGtENUM(Materials.Mercury); //Mercury + + + public final Material THALLIUM = new Material("name", 25600, new short[]{255, 250, 205}, melt, boil, proton, neutron, false, "Zr", 0);//Not a GT Inherited Material + + public final Material LEAD = MaterialUtils.generateMaterialFromGtENUM(Materials.Lead); - public final Material BISMUTH = MaterialUtils.generateMaterialFromGtENUM(Materials.Bismuth); - public final Material RADON = MaterialUtils.generateMaterialFromGtENUM(Materials.Radon); + public final Material BISMUTH = MaterialUtils.generateMaterialFromGtENUM(Materials.Bismuth); + + + public final Material POLONIUM = new Material("name", 25600, new short[]{255, 250, 205}, melt, boil, proton, neutron, false, "Zr", 0);//Not a GT Inherited Material + public final Material ASTATINE = new Material("name", 25600, new short[]{255, 250, 205}, melt, boil, proton, neutron, false, "Zr", 0);//Not a GT Inherited Material + + + public final Material RADON = MaterialUtils.generateMaterialFromGtENUM(Materials.Radon); + + + public final Material FRANCIUM = MaterialUtils.generateMaterialFromGtENUM(Materials.Francium); //Francium + public final Material RADIUM = MaterialUtils.generateMaterialFromGtENUM(Materials.Radium); //Radium + public final Material ACTINIUM = MaterialUtils.generateMaterialFromGtENUM(Materials.Actinium); //Actinium + public final Material THORIUM = new Material("Thorium", 51200, Materials.Thorium.mRGBa, Materials.Thorium.mMeltingPoint, Materials.Thorium.mBlastFurnaceTemp, 90, 142, false, MaterialUtils.superscript("Th"), 1); - /*MaterialUtils.generateMaterialFromGtENUM(Materials.Thorium);*/ + + public final Material PROTACTINIUM = MaterialUtils.generateMaterialFromGtENUM(Materials.Protactinium); //Protactinium + public final Material URANIUM238 = MaterialUtils.generateMaterialFromGtENUM(Materials.Uranium); - public final Material URANIUM235 = MaterialUtils.generateMaterialFromGtENUM(Materials.Uranium235); + public final Material URANIUM235 = MaterialUtils.generateMaterialFromGtENUM(Materials.Uranium235); + + public final Material NEPTUNIUM = MaterialUtils.generateMaterialFromGtENUM(Materials.Neptunium); //Neptunium + public final Material PLUTONIUM244 = MaterialUtils.generateMaterialFromGtENUM(Materials.Plutonium); public final Material PLUTONIUM241 = MaterialUtils.generateMaterialFromGtENUM(Materials.Plutonium241); + public final Material AMERICIUM = MaterialUtils.generateMaterialFromGtENUM(Materials.Americium); //Americium + + + public final Material CURIUM = MaterialUtils.generateMaterialFromGtENUM(Materials.Curium); //Curium + public final Material BERKELIUM = MaterialUtils.generateMaterialFromGtENUM(Materials.Berkelium); //Berkelium + public final Material CALIFORNIUM = MaterialUtils.generateMaterialFromGtENUM(Materials.Californium); //Californium + public final Material EINSTEINIUM = MaterialUtils.generateMaterialFromGtENUM(Materials.Einsteinium); //Einsteinium + public final Material FERMIUM = MaterialUtils.generateMaterialFromGtENUM(Materials.Fermium); //100 Fermium //Misc - public final Material AER = MaterialUtils.generateMaterialFromGtENUM(Materials.InfusedAir); public final Material IGNIS = MaterialUtils.generateMaterialFromGtENUM(Materials.InfusedFire); public final Material TERRA = MaterialUtils.generateMaterialFromGtENUM(Materials.InfusedEarth); diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GregtechMTE_NuclearReactor.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GregtechMTE_NuclearReactor.java index c9f6bfb492..1adcb793ac 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GregtechMTE_NuclearReactor.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GregtechMTE_NuclearReactor.java @@ -34,6 +34,8 @@ public class GregtechMTE_NuclearReactor extends GT_MetaTileEntity_MultiBlockBase protected int fuelRemaining = 0; protected double realOptFlow = 0; protected boolean boostEu = false; + protected boolean heliumSparging = false; + protected boolean fluorideSparging = false; //public FluidStack mFluidOut = Materials.UUMatter.getFluid(1L); @@ -345,17 +347,9 @@ public class GregtechMTE_NuclearReactor extends GT_MetaTileEntity_MultiBlockBase if(depleteInput(tLiquid)) { //Deplete that amount //If it has a supply of this material, boostEu = true; - boostEu = depleteInput(Materials.Oxygen.getGas(2L)); + boostEu = depleteInput(Materials.Helium.getGas(50L)); + - //TODO - Recipes requires this, but I don't think we will need it for the LFTR - /*if(tFluids.contains(Materials.Lubricant.getFluid(1L))) { //Has lubricant? - //Deplete Lubricant. 1000L should = 1 hour of runtime (if baseEU = 2048) - if(mRuntime % 72 == 0 || mRuntime == 0){ - depleteInput(Materials.Lubricant.getFluid(boostEu ? 2 : 1)); - } - } else { - return false; - }*/ if (aFuel != null){ this.mLastRecipe = aFuel; @@ -430,4 +424,13 @@ public class GregtechMTE_NuclearReactor extends GT_MetaTileEntity_MultiBlockBase this.getBaseMetaTileEntity().doExplosion(explodevalue); } + + protected FluidStack[] getByproductsOfSparge(FluidStack spargeGas){ + FluidStack[] outputArrayOfGases = new FluidStack[]{}; + if (spargeGas != null){ + + } + return outputArrayOfGases; + } + }
\ No newline at end of file |