diff options
| author | Jordan Byrne <draknyte1@hotmail.com> | 2018-03-18 20:27:42 +1000 |
|---|---|---|
| committer | Jordan Byrne <draknyte1@hotmail.com> | 2018-03-18 20:27:42 +1000 |
| commit | 92c98220c875e40badcc6c504b0c53c059aa5d54 (patch) | |
| tree | f530887578a0099e11d2377791877b8836a43f1c /src/Java/gtPlusPlus/core | |
| parent | d545325fc2e750f6197fe11d7c1330d5c06ca614 (diff) | |
| download | GT5-Unofficial-92c98220c875e40badcc6c504b0c53c059aa5d54.tar.gz GT5-Unofficial-92c98220c875e40badcc6c504b0c53c059aa5d54.tar.bz2 GT5-Unofficial-92c98220c875e40badcc6c504b0c53c059aa5d54.zip | |
+ Added TC Aspect support to all Materials.
+ Added 5 custom TC Aspects.
$ Fixing Buggy name of Mini-Fusion Reactor.
Diffstat (limited to 'src/Java/gtPlusPlus/core')
| -rw-r--r-- | src/Java/gtPlusPlus/core/material/Material.java | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/Java/gtPlusPlus/core/material/Material.java b/src/Java/gtPlusPlus/core/material/Material.java index 93b03af96c..4fa17ec7aa 100644 --- a/src/Java/gtPlusPlus/core/material/Material.java +++ b/src/Java/gtPlusPlus/core/material/Material.java @@ -23,6 +23,7 @@ import gtPlusPlus.core.util.math.MathUtils; import gtPlusPlus.core.util.minecraft.FluidUtils; import gtPlusPlus.core.util.minecraft.ItemUtils; import gtPlusPlus.core.util.minecraft.MaterialUtils; +import gtPlusPlus.xmod.thaumcraft.aspect.GTPP_Aspects; import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidStack; @@ -71,6 +72,8 @@ public class Material { public long vDurability; public int vToolQuality; public int vHarvestLevel; + + private GTPP_Aspects[] vAspects; public static Map<Integer, Materials> invalidMaterials = new HashMap<Integer, Materials>(); @@ -180,6 +183,7 @@ public class Material { } + this.vAspects = null; this.vMass = this.getMass(); |