From ef6b31b8fbc00eb486bfa966dc72b1d4518279b3 Mon Sep 17 00:00:00 2001
From: JFronny <git@akbvopenfl1.hopto.org>
Date: Sat, 27 Aug 2022 17:21:07 +0200
Subject: [PATCH] Don't reference DamageSource class in config to prevent crash
 in ultra early loading

---
 build.gradle                                    |  2 +-
 gradle.properties                               |  8 ++++----
 .../io/gitlab/jfronny/combit/CombitConfig.java  | 17 +++++++++--------
 3 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/build.gradle b/build.gradle
index c4b6765..d593029 100644
--- a/build.gradle
+++ b/build.gradle
@@ -2,7 +2,7 @@ apply from: "https://jfmods.gitlab.io/scripts/jfmod.gradle"
 
 dependencies {
     modImplementation("io.gitlab.jfronny.libjf:libjf-config-v0:${project.jfapi_version}")
-    modRuntimeOnly("io.gitlab.jfronny.libjf:libjf-devutil-v0:${project.jfapi_version}")
+//    modRuntimeOnly("io.gitlab.jfronny.libjf:libjf-devutil-v0:${project.jfapi_version}")
 
     modImplementation "com.terraformersmc:modmenu:4.0.5"
 
diff --git a/gradle.properties b/gradle.properties
index 0f32151..649b22a 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,12 +1,12 @@
 # https://fabricmc.net/develop/
-minecraft_version=1.19.1
-yarn_mappings=build.1
-loader_version=0.14.8
+minecraft_version=1.19.2
+yarn_mappings=build.8
+loader_version=0.14.9
 
 maven_group=io.gitlab.jfronny
 archives_base_name=combit
 
-fabric_version=0.58.5+1.19.1
+fabric_version=0.60.0+1.19.2
 jfapi_version=2.10.0
 
 modrinth_id=combit
diff --git a/src/main/java/io/gitlab/jfronny/combit/CombitConfig.java b/src/main/java/io/gitlab/jfronny/combit/CombitConfig.java
index c94deb1..5a21802 100644
--- a/src/main/java/io/gitlab/jfronny/combit/CombitConfig.java
+++ b/src/main/java/io/gitlab/jfronny/combit/CombitConfig.java
@@ -55,14 +55,15 @@ public class CombitConfig implements JfConfig {
         }
         if (damageSourceWhitelist == null) {
             damageSourceWhitelist = new HashSet<>();
-            damageSourceWhitelist.add(DamageSource.IN_FIRE.getName());
-            damageSourceWhitelist.add(DamageSource.LIGHTNING_BOLT.getName());
-            damageSourceWhitelist.add(DamageSource.LAVA.getName());
-            damageSourceWhitelist.add(DamageSource.HOT_FLOOR.getName());
-            damageSourceWhitelist.add(DamageSource.IN_WALL.getName());
-            damageSourceWhitelist.add(DamageSource.CACTUS.getName());
-            damageSourceWhitelist.add(DamageSource.OUT_OF_WORLD.getName());
-            damageSourceWhitelist.add(DamageSource.SWEET_BERRY_BUSH.getName());
+            // net.minecraft.entity.damage.DamageSource
+            damageSourceWhitelist.add("inFire");
+            damageSourceWhitelist.add("lightningBolt");
+            damageSourceWhitelist.add("lava");
+            damageSourceWhitelist.add("hotFloor");
+            damageSourceWhitelist.add("inWall");
+            damageSourceWhitelist.add("cactus");
+            damageSourceWhitelist.add("outOfWorld");
+            damageSourceWhitelist.add("sweetBerryBush");
         }
         if (entityHealthBlacklist == null) {
             entityHealthBlacklist = new HashSet<>();