From aa9a7de4e6aa9bc8710c8beb320c0fcdf3a68716 Mon Sep 17 00:00:00 2001 From: JFronny <33260128+jfronny@users.noreply.github.com> Date: Fri, 15 Jan 2021 13:42:09 +0100 Subject: [PATCH] 1.16.4, sweet berry bushes, use DamageSource object for names --- gradle.properties | 10 +++++----- .../io/gitlab/jfronny/combit/config/Cfg.java | 16 +++++++++------- 2 files changed, 14 insertions(+), 12 deletions(-) diff --git a/gradle.properties b/gradle.properties index f7107e7..7bb78e0 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,13 +2,13 @@ org.gradle.jvmargs=-Xmx1G # Fabric Properties # check these on https://modmuss50.me/fabric.html -minecraft_version=1.16.3 -yarn_mappings=1.16.3+build.47 -loader_version=0.10.5+build.213 +minecraft_version=1.16.4 +yarn_mappings=1.16.4+build.9 +loader_version=0.11.0 # Mod Properties -mod_version=1.0 +mod_version=1.1 maven_group=io.gitlab.jfronny archives_base_name=combit # Dependencies # check this on https://modmuss50.me/fabric.html -fabric_version=0.24.1+build.412-1.16 +fabric_version=0.29.3+1.16 diff --git a/src/main/java/io/gitlab/jfronny/combit/config/Cfg.java b/src/main/java/io/gitlab/jfronny/combit/config/Cfg.java index d0811f1..b25af33 100644 --- a/src/main/java/io/gitlab/jfronny/combit/config/Cfg.java +++ b/src/main/java/io/gitlab/jfronny/combit/config/Cfg.java @@ -5,6 +5,7 @@ import me.sargunvohra.mcmods.autoconfig1u.annotation.Config; import me.sargunvohra.mcmods.autoconfig1u.annotation.ConfigEntry.Category; import me.sargunvohra.mcmods.autoconfig1u.annotation.ConfigEntry.Gui.TransitiveObject; import me.sargunvohra.mcmods.autoconfig1u.shadowed.blue.endless.jankson.Comment; +import net.minecraft.entity.damage.DamageSource; import java.util.HashSet; @@ -60,13 +61,14 @@ public class Cfg implements ConfigData { } if (invulnerability.damageSrcWhitelist == null) { invulnerability.damageSrcWhitelist = new HashSet<>(); - invulnerability.damageSrcWhitelist.add("inFire"); - invulnerability.damageSrcWhitelist.add("lava"); - invulnerability.damageSrcWhitelist.add("cactus"); - invulnerability.damageSrcWhitelist.add("lightningBolt"); - invulnerability.damageSrcWhitelist.add("inWall"); - invulnerability.damageSrcWhitelist.add("hotFloor"); - invulnerability.damageSrcWhitelist.add("outOfWorld"); + invulnerability.damageSrcWhitelist.add(DamageSource.IN_FIRE.getName()); + invulnerability.damageSrcWhitelist.add(DamageSource.LIGHTNING_BOLT.getName()); + invulnerability.damageSrcWhitelist.add(DamageSource.LAVA.getName()); + invulnerability.damageSrcWhitelist.add(DamageSource.HOT_FLOOR.getName()); + invulnerability.damageSrcWhitelist.add(DamageSource.IN_WALL.getName()); + invulnerability.damageSrcWhitelist.add(DamageSource.CACTUS.getName()); + invulnerability.damageSrcWhitelist.add(DamageSource.OUT_OF_WORLD.getName()); + invulnerability.damageSrcWhitelist.add(DamageSource.SWEET_BERRY_BUSH.getName()); } } }