From 4c8cf9986d75f91b13281de1d9d476d6dd392d50 Mon Sep 17 00:00:00 2001
From: Léa Gris <lea.gris@noiraude.net>
Date: Tue, 27 Apr 2021 23:13:38 +0200
Subject: fix(textfiles): add missing neline at end of files

git and diff tools will complain if text file does not end with a newline.

Fixed all text files in the repository with Linux bash shell:

```sh
git ls-files -z |
while IFS= read -rd '' f; do
  mime="$(file --brief --mime "$f")";
  if [ -z "${mime##text/*}" ]; then
    tail -c1 "$f" |
      read -r _ || printf '\n' >>"$f";
  fi;
done
```
---
 src/main/java/gregtech/api/damagesources/GT_DamageSources.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/main/java/gregtech/api/damagesources')

diff --git a/src/main/java/gregtech/api/damagesources/GT_DamageSources.java b/src/main/java/gregtech/api/damagesources/GT_DamageSources.java
index bb5ff01b8f..fd13b9cfee 100644
--- a/src/main/java/gregtech/api/damagesources/GT_DamageSources.java
+++ b/src/main/java/gregtech/api/damagesources/GT_DamageSources.java
@@ -83,4 +83,4 @@ public class GT_DamageSources {
             return new ChatComponentText(EnumChatFormatting.RED + aTarget.getCommandSenderName() + EnumChatFormatting.WHITE + " exploded");
         }
     }
-}
\ No newline at end of file
+}
-- 
cgit 


From 915eafcfcaeb1d3b79d7ee85ac9e7da09a006a8c Mon Sep 17 00:00:00 2001
From: TimeConqueror <timeconqueror999@gmail.com>
Date: Tue, 10 Aug 2021 20:19:18 +0300
Subject: Added Damage Source Based on Hot Item (for gloves in GTNHCoreMod)

---
 .../gregtech/api/damagesources/GT_DamageSources.java  | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

(limited to 'src/main/java/gregtech/api/damagesources')

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");
-- 
cgit