From d64583182537d496c10ff90f56ec9359ac632bc1 Mon Sep 17 00:00:00 2001 From: Martin Robertz Date: Mon, 5 Jul 2021 22:38:11 +0200 Subject: Merge pull request #590 from GTNewHorizons/beter-power-net fix overvolatage null crach --- src/main/java/gregtech/api/graphs/paths/PowerNodePath.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/main/java/gregtech/api/graphs/paths/PowerNodePath.java b/src/main/java/gregtech/api/graphs/paths/PowerNodePath.java index a91f9b10a8..96f1cdfd68 100644 --- a/src/main/java/gregtech/api/graphs/paths/PowerNodePath.java +++ b/src/main/java/gregtech/api/graphs/paths/PowerNodePath.java @@ -40,7 +40,9 @@ public class PowerNodePath extends NodePath { for (MetaPipeEntity tCable : mPipes) { if (((GT_MetaPipeEntity_Cable)tCable).mVoltage < this.mVoltage) { BaseMetaPipeEntity tBaseCable = (BaseMetaPipeEntity) tCable.getBaseMetaTileEntity(); - tBaseCable.setToFire(); + if (tBaseCable != null) { + tBaseCable.setToFire(); + } } } } -- cgit From 99030ff940686562c7e4f133919fb1496b0575f4 Mon Sep 17 00:00:00 2001 From: Martin Robertz Date: Thu, 22 Jul 2021 09:20:55 +0200 Subject: Merge pull request #603 from GTNewHorizons/patch-transformer --- .../metatileentity/implementations/GT_MetaTileEntity_Transformer.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Transformer.java b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Transformer.java index 5cc4245bc8..8e8cc6de76 100644 --- a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Transformer.java +++ b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Transformer.java @@ -115,7 +115,7 @@ public class GT_MetaTileEntity_Transformer extends GT_MetaTileEntity_TieredMachi @Override public long maxEUStore() { - return Math.max(512L, 1L << (mTier + 1)) + V[mTier + 1] * 2L; + return Math.max(512L, 1L << (mTier + 2)) + V[mTier + 1] * 4L; } @Override -- cgit From 019a67df3a0d789fc4244ae50a3c03e2d1291590 Mon Sep 17 00:00:00 2001 From: boubou_19 Date: Mon, 20 Sep 2021 18:33:33 +0200 Subject: prevent GT cape rendering from overriding vanilla capes with no capes. See https://github.com/GTNewHorizons/GT-New-Horizons-Modpack/issues/8558 --- src/main/java/gregtech/common/render/GT_CapeRenderer.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/gregtech/common/render/GT_CapeRenderer.java b/src/main/java/gregtech/common/render/GT_CapeRenderer.java index 713254046e..7609f6b257 100644 --- a/src/main/java/gregtech/common/render/GT_CapeRenderer.java +++ b/src/main/java/gregtech/common/render/GT_CapeRenderer.java @@ -44,7 +44,7 @@ public class GT_CapeRenderer extends RenderPlayer { return; } try { - ResourceLocation tResource = null; + ResourceLocation tResource = aPlayer.getLocationCape(); if (aPlayer.getDisplayName().equalsIgnoreCase("Friedi4321")) { tResource = this.mCapes[0]; } -- cgit