Merge remote-tracking branch 'upstream/experimental' into experimental

1 files changed, 18 insertions, 1 deletions

diff --git a/src/main/java/gregtech/api/damagesources/GT_DamageSources.java b/src/main/java/gregtech/api/damagesources/GT_DamageSources.java
index fd13b9cfee..45f3fd5323 100644
--- a/src/main/java/gregtech/api/damagesources/GT_DamageSources.java
+++ b/src/main/java/gregtech/api/damagesources/GT_DamageSources.java
@@ -1,8 +1,11 @@
 package gregtech.api.damagesources;
 
 import net.minecraft.entity.EntityLivingBase;
+import net.minecraft.item.ItemStack;
 import net.minecraft.util.*;
 
+import javax.annotation.Nullable;
+
 public class GT_DamageSources {
     public static DamageSource getElectricDamage() {
         return ic2.api.info.Info.DMG_ELECTRIC;
@@ -33,7 +36,7 @@ public class GT_DamageSources {
     }
 
     private static class DamageSourceCombat extends EntityDamageSource {
-        private IChatComponent mDeathMessage;
+        private final IChatComponent mDeathMessage;
 
         public DamageSourceCombat(String aType, EntityLivingBase aPlayer, IChatComponent aDeathMessage) {
             super(aType, aPlayer);
@@ -70,6 +73,20 @@ public class GT_DamageSources {
         }
     }
 
+    public static class DamageSourceHotItem extends DamageSourceHeat {
+        @Nullable
+        private final ItemStack stack;
+
+        public DamageSourceHotItem(@Nullable ItemStack cause) {
+            this.stack = cause;
+        }
+
+        @Nullable
+        public ItemStack getDamagingStack() {
+            return stack;
+        }
+    }
+
     public static class DamageSourceExploding extends DamageSource {
         public DamageSourceExploding() {
             super("exploded");