Bump to 1.19.4
This commit is contained in:
parent
390a704d5c
commit
f003d6febb
|
@ -6,9 +6,10 @@ plugins {
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
modImplementation("io.gitlab.jfronny.libjf:libjf-config-core-v1:${prop("libjf_version")}")
|
modImplementation("io.gitlab.jfronny.libjf:libjf-config-core-v1:${prop("libjf_version")}")
|
||||||
|
modImplementation(fabricApi.module("fabric-api-base", prop("fabric_version")))
|
||||||
|
|
||||||
// Dev env
|
// Dev env
|
||||||
modLocalRuntime("io.gitlab.jfronny.libjf:libjf-config-ui-tiny-v1:${prop("libjf_version")}")
|
modLocalRuntime("io.gitlab.jfronny.libjf:libjf-config-ui-tiny-v1:${prop("libjf_version")}")
|
||||||
modLocalRuntime("io.gitlab.jfronny.libjf:libjf-devutil:${prop("libjf_version")}")
|
modLocalRuntime("io.gitlab.jfronny.libjf:libjf-devutil:${prop("libjf_version")}")
|
||||||
modLocalRuntime("com.terraformersmc:modmenu:5.0.2")
|
modLocalRuntime("com.terraformersmc:modmenu:6.1.0-rc.1")
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
# https://fabricmc.net/develop/
|
# https://fabricmc.net/develop/
|
||||||
minecraft_version=1.19.3
|
minecraft_version=1.19.4
|
||||||
yarn_mappings=build.5
|
yarn_mappings=build.1
|
||||||
loader_version=0.14.12
|
loader_version=0.14.17
|
||||||
|
|
||||||
maven_group=io.gitlab.jfronny
|
maven_group=io.gitlab.jfronny
|
||||||
archives_base_name=combit
|
archives_base_name=combit
|
||||||
|
@ -13,5 +13,5 @@ curseforge_id=561742
|
||||||
curseforge_required_dependencies=libjf
|
curseforge_required_dependencies=libjf
|
||||||
curseforge_optional_dependencies=modmenu, cloth-config
|
curseforge_optional_dependencies=modmenu, cloth-config
|
||||||
|
|
||||||
fabric_version=0.70.0+1.19.3
|
fabric_version=0.75.3+1.19.4
|
||||||
libjf_version=3.4.1
|
libjf_version=3.6.0
|
||||||
|
|
|
@ -1,13 +1,13 @@
|
||||||
package io.gitlab.jfronny.combit;
|
package io.gitlab.jfronny.combit;
|
||||||
|
|
||||||
import io.gitlab.jfronny.combit.events.*;
|
import io.gitlab.jfronny.combit.events.*;
|
||||||
import net.fabricmc.api.*;
|
import net.fabricmc.api.ModInitializer;
|
||||||
import net.minecraft.entity.*;
|
import net.minecraft.entity.*;
|
||||||
import net.minecraft.entity.player.*;
|
import net.minecraft.entity.player.PlayerEntity;
|
||||||
import net.minecraft.text.*;
|
import net.minecraft.text.Text;
|
||||||
import net.minecraft.util.*;
|
import net.minecraft.util.ActionResult;
|
||||||
|
|
||||||
import java.util.*;
|
import java.util.Set;
|
||||||
|
|
||||||
public class Combit implements ModInitializer {
|
public class Combit implements ModInitializer {
|
||||||
@Override
|
@Override
|
||||||
|
|
|
@ -65,6 +65,7 @@ public class CombitConfig {
|
||||||
damageSourceWhitelist.add("cactus");
|
damageSourceWhitelist.add("cactus");
|
||||||
damageSourceWhitelist.add("outOfWorld");
|
damageSourceWhitelist.add("outOfWorld");
|
||||||
damageSourceWhitelist.add("sweetBerryBush");
|
damageSourceWhitelist.add("sweetBerryBush");
|
||||||
|
damageSourceWhitelist.add("dryout");
|
||||||
}
|
}
|
||||||
if (entityHealthBlacklist == null) {
|
if (entityHealthBlacklist == null) {
|
||||||
entityHealthBlacklist = new HashSet<>();
|
entityHealthBlacklist = new HashSet<>();
|
||||||
|
|
|
@ -3,7 +3,6 @@ package io.gitlab.jfronny.combit.mixin;
|
||||||
import io.gitlab.jfronny.combit.CombitConfig;
|
import io.gitlab.jfronny.combit.CombitConfig;
|
||||||
import net.minecraft.entity.Entity;
|
import net.minecraft.entity.Entity;
|
||||||
import net.minecraft.entity.EntityType;
|
import net.minecraft.entity.EntityType;
|
||||||
import net.minecraft.entity.damage.DamageSource;
|
|
||||||
import net.minecraft.entity.player.PlayerEntity;
|
import net.minecraft.entity.player.PlayerEntity;
|
||||||
import net.minecraft.entity.projectile.thrown.EggEntity;
|
import net.minecraft.entity.projectile.thrown.EggEntity;
|
||||||
import net.minecraft.entity.projectile.thrown.ThrownItemEntity;
|
import net.minecraft.entity.projectile.thrown.ThrownItemEntity;
|
||||||
|
@ -29,7 +28,7 @@ public abstract class EggEntityMixin extends ThrownItemEntity {
|
||||||
e.velocityModified = true;
|
e.velocityModified = true;
|
||||||
}
|
}
|
||||||
if (CombitConfig.eggDamage > 0) {
|
if (CombitConfig.eggDamage > 0) {
|
||||||
e.damage(DamageSource.thrownProjectile(this, this.getOwner()), CombitConfig.eggDamage);
|
e.damage(getDamageSources().thrown(this, this.getOwner()), CombitConfig.eggDamage);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -3,7 +3,6 @@ package io.gitlab.jfronny.combit.mixin;
|
||||||
import io.gitlab.jfronny.combit.CombitConfig;
|
import io.gitlab.jfronny.combit.CombitConfig;
|
||||||
import net.minecraft.entity.Entity;
|
import net.minecraft.entity.Entity;
|
||||||
import net.minecraft.entity.EntityType;
|
import net.minecraft.entity.EntityType;
|
||||||
import net.minecraft.entity.damage.DamageSource;
|
|
||||||
import net.minecraft.entity.player.PlayerEntity;
|
import net.minecraft.entity.player.PlayerEntity;
|
||||||
import net.minecraft.entity.projectile.thrown.SnowballEntity;
|
import net.minecraft.entity.projectile.thrown.SnowballEntity;
|
||||||
import net.minecraft.entity.projectile.thrown.ThrownItemEntity;
|
import net.minecraft.entity.projectile.thrown.ThrownItemEntity;
|
||||||
|
@ -29,7 +28,7 @@ public abstract class SnowballEntityMixin extends ThrownItemEntity {
|
||||||
e.velocityModified = true;
|
e.velocityModified = true;
|
||||||
}
|
}
|
||||||
if (CombitConfig.snowballDamage > 0) {
|
if (CombitConfig.snowballDamage > 0) {
|
||||||
e.damage(DamageSource.thrownProjectile(this, this.getOwner()), CombitConfig.snowballDamage);
|
e.damage(getDamageSources().thrown(this, this.getOwner()), CombitConfig.snowballDamage);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue