diff options
| author | Alkalus <3060479+draknyte1@users.noreply.github.com> | 2019-03-01 03:00:51 +0000 |
|---|---|---|
| committer | Alkalus <3060479+draknyte1@users.noreply.github.com> | 2019-03-01 03:00:51 +0000 |
| commit | 35522722af5dddea144c841a71f4fa9087e68966 (patch) | |
| tree | 39f2e3908901026411d9b0ca77d4416ffb8d18cb /src/Java/gtPlusPlus/core/material | |
| parent | a5f5766e189593f8cfe7fbef862b1bb77207720e (diff) | |
| download | GT5-Unofficial-35522722af5dddea144c841a71f4fa9087e68966.tar.gz GT5-Unofficial-35522722af5dddea144c841a71f4fa9087e68966.tar.bz2 GT5-Unofficial-35522722af5dddea144c841a71f4fa9087e68966.zip | |
% More work on TiCon Compat.
Diffstat (limited to 'src/Java/gtPlusPlus/core/material')
| -rw-r--r-- | src/Java/gtPlusPlus/core/material/Material.java | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/src/Java/gtPlusPlus/core/material/Material.java b/src/Java/gtPlusPlus/core/material/Material.java index 01503a1fc5..ba572efe90 100644 --- a/src/Java/gtPlusPlus/core/material/Material.java +++ b/src/Java/gtPlusPlus/core/material/Material.java @@ -498,7 +498,9 @@ public class Material { this.textureSet = setTextureSet(set, vTier); if (LoadedMods.TiCon && this.materialState == MaterialState.SOLID) { - this.vTiConHandler = new BaseTinkersMaterial(this); + if (this.getProtons() >= 98 || this.getComposites().size() > 1 || this.getMeltingPointC() >= 3600) { + this.vTiConHandler = new BaseTinkersMaterial(this); + } } Logger.MATERIALS("Creating a Material instance for "+materialName); @@ -753,7 +755,11 @@ public class Material { } final public Block getBlock(){ - return Block.getBlockFromItem(getBlock(1).getItem()); + Block b = Block.getBlockFromItem(getBlock(1).getItem()); + if (b == null) { + Logger.INFO("[ERROR] Tried to get invalid block for "+this.getLocalizedName()+", returning debug block instead."); + } + return b != null ? b : Blocks.lit_furnace; } public final ItemStack getBlock(final int stacksize){ |