diff --git a/build.gradle b/build.gradle index 0bf73bd..19c764f 100644 --- a/build.gradle +++ b/build.gradle @@ -1,5 +1,5 @@ plugins { - id 'babric-loom' version '1.1.+' + id 'babric-loom' version '1.4.+' id 'java' } diff --git a/gradle.properties b/gradle.properties index 52ccfaa..c9b301a 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,7 +1,7 @@ org.gradle.jvmargs=-Xmx2G # BTA -bta_version=7.2-pre2 +bta_version=7.2_01 # Loader loader_version=0.15.6-babric.6-bta diff --git a/src/main/java/toufoumaster/btwaila/gui/components/AdvancedInfoComponent.java b/src/main/java/toufoumaster/btwaila/gui/components/AdvancedInfoComponent.java index 2086e03..c04888f 100644 --- a/src/main/java/toufoumaster/btwaila/gui/components/AdvancedInfoComponent.java +++ b/src/main/java/toufoumaster/btwaila/gui/components/AdvancedInfoComponent.java @@ -103,7 +103,7 @@ private void renderEntityOverlay(Entity entity){ } } private void drawFunctionalBlocksData(TileEntity tileEntity) { - if (tileEntity != null) { + if (tileEntity != null && tileEntity.worldObj != null) { boolean askTileEntity = !(BTWaila.excludeContinuousTileEntityData.get(tileEntity.getClass()) != null ? BTWaila.excludeContinuousTileEntityData.get(tileEntity.getClass()) : false); if (tileEntity.worldObj == null) return; Block block = Block.blocksList[tileEntity.worldObj.getBlockId(tileEntity.x, tileEntity.y, tileEntity.z)]; diff --git a/src/main/java/toufoumaster/btwaila/gui/components/WailaTextComponent.java b/src/main/java/toufoumaster/btwaila/gui/components/WailaTextComponent.java index d7fd9bf..f636e7c 100644 --- a/src/main/java/toufoumaster/btwaila/gui/components/WailaTextComponent.java +++ b/src/main/java/toufoumaster/btwaila/gui/components/WailaTextComponent.java @@ -47,7 +47,7 @@ import static toufoumaster.btwaila.BTWaila.translator; public abstract class WailaTextComponent extends MovableHudComponent { - public static final ItemEntityRenderer itemRender = new ItemEntityRenderer(); + public static ItemEntityRenderer itemRender = null; public static final HashMap, ItemStack> entityIconMap = new HashMap<>(); public static void init(){ @@ -614,6 +614,7 @@ protected void drawRect(int minX, int minY, int maxX, int maxY, int argb) { } public ItemEntityRenderer getItemRenderer(){ + if (itemRender == null) itemRender = new ItemEntityRenderer(); return itemRender; }