diff options
| author | Kiwi <42833050+Kiwi233@users.noreply.github.com> | 2020-05-24 08:28:19 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-05-24 08:28:19 +0800 |
| commit | f0bce85d3faf040d87a22d83250ae2d9767c3642 (patch) | |
| tree | ed60c1d975c8b06a27cae03d148714f7bb9e9805 /src/main/java/gregtech/api/enums/Element.java | |
| parent | ac7282a30ef161101cabc921e52db5c5d7e0096c (diff) | |
| parent | d6c19a9b6434c8a4c59ea8452603f85cfd2ad208 (diff) | |
| download | GT5-Unofficial-f0bce85d3faf040d87a22d83250ae2d9767c3642.tar.gz GT5-Unofficial-f0bce85d3faf040d87a22d83250ae2d9767c3642.tar.bz2 GT5-Unofficial-f0bce85d3faf040d87a22d83250ae2d9767c3642.zip | |
Merge pull request #1 from GTNewHorizons/experimental
5/24
Diffstat (limited to 'src/main/java/gregtech/api/enums/Element.java')
| -rw-r--r-- | src/main/java/gregtech/api/enums/Element.java | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/main/java/gregtech/api/enums/Element.java b/src/main/java/gregtech/api/enums/Element.java index 144a61e7be..cfbbeaa528 100644 --- a/src/main/java/gregtech/api/enums/Element.java +++ b/src/main/java/gregtech/api/enums/Element.java @@ -283,7 +283,7 @@ public enum Element { /** * Links to every pure Material containing just this Element. */ - public ArrayList<Materials> mLinkedMaterials = new ArrayList<Materials>(); + public ArrayList<Materials> mLinkedMaterials = new ArrayList<>(); /** * @param aProtons Amount of Protons. Antiprotons if negative. @@ -292,7 +292,7 @@ public enum Element { * @param aDecayTo String representing the Elements it decays to. Separated by an '&' Character. * @param aName Name of the Element */ - private Element(long aProtons, long aNeutrons, long aAdditionalMass, long aHalfLifeSeconds, String aDecayTo, String aName, boolean aIsIsotope) { + Element(long aProtons, long aNeutrons, long aAdditionalMass, long aHalfLifeSeconds, String aDecayTo, String aName, boolean aIsIsotope) { mProtons = aProtons; mNeutrons = aNeutrons; mAdditionalMass = aAdditionalMass; @@ -304,7 +304,8 @@ public enum Element { public static Element get(String aMaterialName) { Object tObject = GT_Utility.getFieldContent(Element.class, aMaterialName, false, false); - if (tObject != null && tObject instanceof Element) return (Element) tObject; + if (tObject instanceof Element) + return (Element) tObject; return _NULL; } |
