JfMods/Combit
JfMods
/
Combit
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

1.16.4, sweet berry bushes, use DamageSource object for names

This commit is contained in:
JFronny 2021-01-15 13:42:09 +01:00
parent 073cd2b3e6
commit aa9a7de4e6
2 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
gradle.properties
View File

@ -2,13 +2,13 @@
org.gradle.jvmargs=-Xmx1G org.gradle.jvmargs=-Xmx1G
# Fabric Properties # Fabric Properties
# check these on https://modmuss50.me/fabric.html # check these on https://modmuss50.me/fabric.html
minecraft_version=1.16.3 minecraft_version=1.16.4
yarn_mappings=1.16.3+build.47 yarn_mappings=1.16.4+build.9
loader_version=0.10.5+build.213 loader_version=0.11.0
# Mod Properties # Mod Properties
mod_version=1.0 mod_version=1.1
maven_group=io.gitlab.jfronny maven_group=io.gitlab.jfronny
archives_base_name=combit archives_base_name=combit
# Dependencies # Dependencies
# check this on https://modmuss50.me/fabric.html # check this on https://modmuss50.me/fabric.html
fabric_version=0.24.1+build.412-1.16 fabric_version=0.29.3+1.16

16
src/main/java/io/gitlab/jfronny/combit/config/Cfg.java
View File

@ -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.Category;
import me.sargunvohra.mcmods.autoconfig1u.annotation.ConfigEntry.Gui.TransitiveObject; import me.sargunvohra.mcmods.autoconfig1u.annotation.ConfigEntry.Gui.TransitiveObject;
import me.sargunvohra.mcmods.autoconfig1u.shadowed.blue.endless.jankson.Comment; import me.sargunvohra.mcmods.autoconfig1u.shadowed.blue.endless.jankson.Comment;
import net.minecraft.entity.damage.DamageSource;
import java.util.HashSet; import java.util.HashSet;
@ -60,13 +61,14 @@ public class Cfg implements ConfigData {
} }
if (invulnerability.damageSrcWhitelist == null) { if (invulnerability.damageSrcWhitelist == null) {
invulnerability.damageSrcWhitelist = new HashSet<>(); invulnerability.damageSrcWhitelist = new HashSet<>();
invulnerability.damageSrcWhitelist.add("inFire"); invulnerability.damageSrcWhitelist.add(DamageSource.IN_FIRE.getName());
invulnerability.damageSrcWhitelist.add("lava"); invulnerability.damageSrcWhitelist.add(DamageSource.LIGHTNING_BOLT.getName());
invulnerability.damageSrcWhitelist.add("cactus"); invulnerability.damageSrcWhitelist.add(DamageSource.LAVA.getName());
invulnerability.damageSrcWhitelist.add("lightningBolt"); invulnerability.damageSrcWhitelist.add(DamageSource.HOT_FLOOR.getName());
invulnerability.damageSrcWhitelist.add("inWall"); invulnerability.damageSrcWhitelist.add(DamageSource.IN_WALL.getName());
invulnerability.damageSrcWhitelist.add("hotFloor"); invulnerability.damageSrcWhitelist.add(DamageSource.CACTUS.getName());
invulnerability.damageSrcWhitelist.add("outOfWorld"); invulnerability.damageSrcWhitelist.add(DamageSource.OUT_OF_WORLD.getName());
invulnerability.damageSrcWhitelist.add(DamageSource.SWEET_BERRY_BUSH.getName());
} }
} }
} }