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

Don't reference DamageSource class in config to prevent crash in ultra early loading

This commit is contained in:
Johannes Frohnmeyer 2022-08-27 17:21:07 +02:00
parent 36d1415292
commit ef6b31b8fb
Signed by: Johannes
GPG Key ID: E76429612C2929F4
3 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build.gradle
View File

@ -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"

8
gradle.properties
View File

@ -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

17
src/main/java/io/gitlab/jfronny/combit/CombitConfig.java
View File

@ -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<>();