Skip to content

Commit 9ba62be

Browse files
committed
Clean up unused debug messages and methods
1 parent 6a90b20 commit 9ba62be

File tree

3 files changed

+17
-17
lines changed

3 files changed

+17
-17
lines changed
Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
package io.izzel.arclight.common.bridge.bukkit;
2+
3+
import org.bukkit.event.entity.EntityDamageEvent;
4+
5+
import static org.bukkit.event.entity.EntityDamageEvent.DamageModifier.*;
6+
7+
public interface EntityDamageEventBridge {
8+
EntityDamageEvent.DamageModifier[] VANILLA_VALUES = new EntityDamageEvent.DamageModifier[] {
9+
BASE, BLOCKING, FREEZING, HARD_HAT, ARMOR, RESISTANCE, MAGIC, ABSORPTION
10+
};
11+
boolean arclight$applicable(EntityDamageEvent.DamageModifier stage);
12+
double arclight$getOriginalDamage(EntityDamageEvent.DamageModifier modifier);
13+
double arclight$accumulateBefore(EntityDamageEvent.DamageModifier modifier);
14+
boolean arclight$isStillOriginal(EntityDamageEvent.DamageModifier modifier, double offset);
15+
}

arclight-common/src/main/java/io/izzel/arclight/common/mixin/bukkit/event/EntityDamageEventMixin.java

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22

33
import com.google.common.base.Function;
44
import io.izzel.arclight.common.bridge.bukkit.EntityDamageEventBridge;
5-
import io.izzel.arclight.common.mod.server.ArclightServer;
65
import org.bukkit.damage.DamageSource;
76
import org.bukkit.entity.Entity;
87
import org.bukkit.event.Event;
@@ -11,6 +10,7 @@
1110
import org.spongepowered.asm.mixin.Final;
1211
import org.spongepowered.asm.mixin.Mixin;
1312
import org.spongepowered.asm.mixin.Shadow;
13+
import org.spongepowered.asm.mixin.Unique;
1414
import org.spongepowered.asm.mixin.injection.At;
1515
import org.spongepowered.asm.mixin.injection.Inject;
1616
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
@@ -25,8 +25,8 @@ public abstract class EntityDamageEventMixin extends Event implements EntityDama
2525

2626
@Shadow public abstract double getDamage(@NotNull EntityDamageEvent.DamageModifier type) throws IllegalArgumentException;
2727

28+
@Unique
2829
private Map<EntityDamageEvent.DamageModifier, ? extends Function<? super Double, Double>> arclight$originalFunction;
29-
private boolean actuallyHurt = false;
3030

3131
@Inject(method = "<init>(Lorg/bukkit/entity/Entity;Lorg/bukkit/event/entity/EntityDamageEvent$DamageCause;Lorg/bukkit/damage/DamageSource;Ljava/util/Map;Ljava/util/Map;)V", at = @At("RETURN"))
3232
private void arclight$init(Entity damagee, EntityDamageEvent.DamageCause cause, DamageSource source, Map modifiers, Map modifierFunctions, CallbackInfo ci) {
@@ -62,14 +62,4 @@ public abstract class EntityDamageEventMixin extends Event implements EntityDama
6262
public boolean arclight$isStillOriginal(EntityDamageEvent.DamageModifier modifier, double offset) {
6363
return Math.abs(offset - arclight$getOriginalDamage(modifier)) < 10E-3;
6464
}
65-
66-
@Override
67-
public void arclight$setActuallyHurt() {
68-
actuallyHurt = true;
69-
}
70-
71-
@Override
72-
public boolean arclight$actuallyHurt() {
73-
return actuallyHurt;
74-
}
7565
}

arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/entity/player/PlayerMixin.java

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -234,11 +234,6 @@ public boolean hurt(DamageSource source, float amount) {
234234
}
235235
}
236236

237-
@Inject(method = "hurtCurrentlyUsedShield", at = @At("HEAD"))
238-
private void arclight$onHurtCurrentlyUsedShield(float f, CallbackInfo ci) {
239-
ArclightServer.LOGGER.warn("Hurt currently used shield with damage " + f, new IllegalArgumentException());
240-
}
241-
242237
/**
243238
* @author IzzelAliz
244239
* @reason

0 commit comments

Comments
 (0)