Skip to content

Commit fec0221

Browse files
committed
Refactor EventArgs.
Signed-off-by: 秋雨落 <i@rain.cx>
1 parent 70322ea commit fec0221

20 files changed

Lines changed: 139 additions & 37 deletions
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
package games.moegirl.sinocraft.sinocore.api.event.game.args.client;
2+
3+
public interface IClientArgs {
4+
}
Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,14 @@
11
package games.moegirl.sinocraft.sinocore.api.event.game.args.entity;
22

3+
import games.moegirl.sinocraft.sinocore.api.event.game.args.lifecycle.ITickArgs;
4+
import lombok.Getter;
35
import net.minecraft.world.entity.Entity;
46

5-
public class AfterTickEntityArgs extends EntityArgs {
7+
public class AfterTickEntityArgs implements IEntityArgs, ITickArgs {
8+
@Getter
9+
private final Entity entity;
10+
611
public AfterTickEntityArgs(Entity entity) {
7-
super(entity);
12+
this.entity = entity;
813
}
914
}
Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,15 @@
11
package games.moegirl.sinocraft.sinocore.api.event.game.args.entity;
22

3-
import games.moegirl.sinocraft.sinocore.api.event.ICancellableArgs;
3+
import games.moegirl.sinocraft.sinocore.api.event.CancellableArgsBase;
4+
import games.moegirl.sinocraft.sinocore.api.event.game.args.lifecycle.ITickArgs;
45
import lombok.Getter;
56
import net.minecraft.world.entity.Entity;
67

7-
public class BeforeTickEntityArgs extends EntityArgs implements ICancellableArgs {
8+
public class BeforeTickEntityArgs extends CancellableArgsBase implements IEntityArgs, ITickArgs {
89
@Getter
9-
private boolean cancelled = false;
10+
private final Entity entity;
1011

1112
public BeforeTickEntityArgs(Entity entity) {
12-
super(entity);
13-
}
14-
15-
@Override
16-
public void cancel() {
17-
this.cancelled = true;
13+
this.entity = entity;
1814
}
1915
}
Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,13 @@
11
package games.moegirl.sinocraft.sinocore.api.event.game.args.entity;
22

3+
import lombok.Getter;
34
import net.minecraft.world.entity.Entity;
45

5-
public class ConstructingEntityArgs extends EntityArgs {
6+
public class ConstructingEntityArgs implements IEntityArgs {
7+
@Getter
8+
private final Entity entity;
9+
610
public ConstructingEntityArgs(Entity entity) {
7-
super(entity);
11+
this.entity = entity;
812
}
913
}

src/main/java/games/moegirl/sinocraft/sinocore/api/event/game/args/entity/EntityArgs.java

Lines changed: 0 additions & 13 deletions
This file was deleted.
Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,14 @@
11
package games.moegirl.sinocraft.sinocore.api.event.game.args.entity;
22

3-
import games.moegirl.sinocraft.sinocore.api.event.ICancellableArgs;
3+
import games.moegirl.sinocraft.sinocore.api.event.CancellableArgsBase;
4+
import games.moegirl.sinocraft.sinocore.api.event.game.args.level.ILevelArgs;
45
import lombok.Getter;
56
import net.minecraft.world.entity.Entity;
67
import net.minecraft.world.level.Level;
78

8-
public class EntityJoinLevelArgs extends EntityArgs implements ICancellableArgs {
9+
public class EntityJoinLevelArgs extends CancellableArgsBase implements IEntityArgs, ILevelArgs {
910
@Getter
10-
private boolean cancelled = false;
11+
private final Entity entity;
1112

1213
@Getter
1314
private final Level level;
@@ -20,13 +21,8 @@ public EntityJoinLevelArgs(Entity entity, Level level) {
2021
}
2122

2223
public EntityJoinLevelArgs(Entity entity, Level level, boolean worldGenSpawned) {
23-
super(entity);
24+
this.entity = entity;
2425
this.level = level;
2526
this.worldGenSpawned = worldGenSpawned;
2627
}
27-
28-
@Override
29-
public void cancel() {
30-
this.cancelled = true;
31-
}
3228
}
Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,19 @@
11
package games.moegirl.sinocraft.sinocore.api.event.game.args.entity;
22

3+
import games.moegirl.sinocraft.sinocore.api.event.game.args.level.ILevelArgs;
34
import lombok.Getter;
45
import net.minecraft.world.entity.Entity;
56
import net.minecraft.world.level.Level;
67

7-
public class EntityLeaveLevelArgs extends EntityArgs {
8+
public class EntityLeaveLevelArgs implements IEntityArgs, ILevelArgs {
9+
@Getter
10+
private final Entity entity;
11+
812
@Getter
913
private final Level level;
1014

1115
public EntityLeaveLevelArgs(Entity entity, Level level) {
12-
super(entity);
16+
this.entity = entity;
1317
this.level = level;
1418
}
1519
}
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
package games.moegirl.sinocraft.sinocore.api.event.game.args.entity;
2+
3+
import net.minecraft.world.entity.Entity;
4+
5+
public interface IEntityArgs {
6+
Entity getEntity();
7+
}
Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
package games.moegirl.sinocraft.sinocore.api.event.game.args.entity.living;
2+
3+
import games.moegirl.sinocraft.sinocore.api.event.game.args.entity.IEntityArgs;
4+
import net.minecraft.world.entity.LivingEntity;
5+
6+
public interface ILivingArgs extends IEntityArgs {
7+
@Override
8+
LivingEntity getEntity();
9+
}
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
@MethodsReturnNonnullByDefault
2+
@FieldsAreNonnullByDefault
3+
package games.moegirl.sinocraft.sinocore.api.event.game.args.entity.living;
4+
5+
import net.minecraft.FieldsAreNonnullByDefault;
6+
import net.minecraft.MethodsReturnNonnullByDefault;

0 commit comments

Comments
 (0)