Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
56 changes: 50 additions & 6 deletions src/main/java/cam72cam/mod/entity/DamageType.java
Original file line number Diff line number Diff line change
@@ -1,9 +1,53 @@
package cam72cam.mod.entity;

public enum DamageType {
FIRE,
PROJECTILE,
EXPLOSION,
MAGIC,
OTHER,
import cam72cam.mod.resource.Identifier;
import net.minecraft.util.DamageSource;

import java.util.HashMap;
import java.util.Objects;

/**
* Damage type wrapper
* <p>
* Note that in order to make this work on 1.21.1 and upper, <code>DamageType</code>s should be treated as constants and created as soon as possible (like CONSTRUCT phase)
*/
public class DamageType {
public static final DamageType FIRE = new DamageType("fire");
public static final DamageType PROJECTILE = new DamageType("projectile");
public static final DamageType EXPLOSION = new DamageType("explosion");
public static final DamageType MAGIC = new DamageType("magic");
public static final DamageType OTHER = new DamageType("other");

private static final HashMap<Identifier, DamageType> registered = new HashMap<>();

public Identifier damageType;
public DamageSource internal;

public static DamageType getOrCreate(String cause) {
return getOrCreate(new Identifier(cause));
}

public static DamageType getOrCreate(Identifier cause) {
return registered.computeIfAbsent(cause, DamageType::new);
}

private DamageType(String cause) {
this(new Identifier(cause));
}

private DamageType(DamageSource source) {
this(new Identifier("minecraft", source.damageType));
}

private DamageType(Identifier cause) {
this.damageType = cause;
this.internal = new DamageSource(damageType.internal.toString());
}

@Override
public boolean equals(Object o) {
if (o == null || getClass() != o.getClass()) return false;
DamageType other = (DamageType) o;
return Objects.equals(damageType, other.damageType);
}
}
4 changes: 2 additions & 2 deletions src/main/java/cam72cam/mod/entity/Entity.java
Original file line number Diff line number Diff line change
Expand Up @@ -225,8 +225,8 @@ public float getRidingSoundModifier() {
}

/** Damage entity directly (bypassing armor) */
public void directDamage(String msg, double damage) {
internal.attackEntityFrom((new DamageSource(msg)).setDamageBypassesArmor(), (float) damage);
public void directDamage(DamageType type, double damage) {
internal.attackEntityFrom(type.internal.setDamageBypassesArmor(), (float) damage);
}

protected void createExplosion(Vec3d pos, float size, boolean damageTerrain) {
Expand Down