Skip to content

Commit 0c693cb

Browse files
TravjaTravja
committed
Merge branch 'merge_legacy'
2 parents ab97584 + b67ce08 commit 0c693cb

19 files changed

Lines changed: 1146 additions & 230 deletions

‎pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
<groupId>mc.promcteam</groupId>
88
<artifactId>ProRPGItems</artifactId>
9-
<version>1.0-ALPHA</version>
9+
<version>1.0.1-ALPHA</version>
1010

1111
<properties>
1212
<maven.compiler.source>8</maven.compiler.source>

‎src/main/java/su/nightexpress/quantumrpg/api/event/EntityEquipmentChangeEvent.java‎

Lines changed: 22 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,30 @@
11
package su.nightexpress.quantumrpg.api.event;
22

33
import org.bukkit.entity.LivingEntity;
4+
import org.bukkit.event.Event;
5+
import org.bukkit.event.HandlerList;
46
import org.jetbrains.annotations.NotNull;
57

6-
import su.nexmedia.engine.manager.api.event.IEvent;
8+
public class EntityEquipmentChangeEvent extends Event {
9+
private static final HandlerList handlers = new HandlerList();
710

8-
public class EntityEquipmentChangeEvent extends IEvent {
9-
10-
private LivingEntity entity;
11+
private LivingEntity entity;
1112

12-
public EntityEquipmentChangeEvent(@NotNull LivingEntity entity) {
13-
this.entity = entity;
14-
}
15-
16-
@NotNull
17-
public LivingEntity getEntity() {
18-
return this.entity;
19-
}
13+
public EntityEquipmentChangeEvent(@NotNull LivingEntity entity) {
14+
this.entity = entity;
15+
}
16+
17+
public static HandlerList getHandlerList() {
18+
return handlers;
19+
}
20+
21+
@NotNull
22+
public final HandlerList getHandlers() {
23+
return handlers;
24+
}
25+
26+
@NotNull
27+
public LivingEntity getEntity() {
28+
return this.entity;
29+
}
2030
}

‎src/main/java/su/nightexpress/quantumrpg/api/event/EntityRPGItemPickupEvent.java‎

Lines changed: 51 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -1,40 +1,59 @@
11
package su.nightexpress.quantumrpg.api.event;
22

33
import org.bukkit.entity.LivingEntity;
4+
import org.bukkit.event.Cancellable;
5+
import org.bukkit.event.Event;
6+
import org.bukkit.event.HandlerList;
47
import org.bukkit.inventory.ItemStack;
58
import org.jetbrains.annotations.NotNull;
6-
7-
import su.nexmedia.engine.manager.api.event.ICancellableEvent;
89
import su.nightexpress.quantumrpg.modules.api.QModuleDrop;
910

10-
public class EntityRPGItemPickupEvent extends ICancellableEvent {
11-
12-
private ItemStack item;
13-
private LivingEntity entity;
14-
private QModuleDrop<?> module;
15-
16-
public EntityRPGItemPickupEvent(
17-
@NotNull ItemStack item,
18-
@NotNull LivingEntity entity,
19-
@NotNull QModuleDrop<?> module
20-
) {
21-
this.item = item;
22-
this.entity = entity;
23-
this.module = module;
24-
}
25-
26-
@NotNull
27-
public ItemStack getItem() {
28-
return this.item;
29-
}
30-
31-
@NotNull
32-
public LivingEntity getEntity() {
33-
return this.entity;
34-
}
35-
36-
@NotNull
37-
public QModuleDrop<?> getModule() {
38-
return this.module;
39-
}
11+
public class EntityRPGItemPickupEvent extends Event implements Cancellable {
12+
private static final HandlerList handlers = new HandlerList();
13+
14+
private boolean cancelled;
15+
16+
private ItemStack item;
17+
18+
private LivingEntity li;
19+
20+
private QModuleDrop<?> module;
21+
22+
public EntityRPGItemPickupEvent(@NotNull ItemStack item, @NotNull LivingEntity li, @NotNull QModuleDrop<?> module) {
23+
this.item = item;
24+
this.li = li;
25+
this.module = module;
26+
}
27+
28+
public static HandlerList getHandlerList() {
29+
return handlers;
30+
}
31+
32+
@NotNull
33+
public HandlerList getHandlers() {
34+
return handlers;
35+
}
36+
37+
public boolean isCancelled() {
38+
return this.cancelled;
39+
}
40+
41+
public void setCancelled(boolean cancelled) {
42+
this.cancelled = cancelled;
43+
}
44+
45+
@NotNull
46+
public ItemStack getItem() {
47+
return this.item;
48+
}
49+
50+
@NotNull
51+
public LivingEntity getEntity() {
52+
return this.li;
53+
}
54+
55+
@NotNull
56+
public QModuleDrop<?> getModule() {
57+
return this.module;
58+
}
4059
}

‎src/main/java/su/nightexpress/quantumrpg/api/event/EntityStatsBonusUpdateEvent.java‎

Lines changed: 32 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,39 @@
11
package su.nightexpress.quantumrpg.api.event;
22

33
import org.bukkit.entity.LivingEntity;
4+
import org.bukkit.event.Event;
5+
import org.bukkit.event.HandlerList;
46
import org.jetbrains.annotations.NotNull;
5-
6-
import su.nexmedia.engine.manager.api.event.IEvent;
77
import su.nightexpress.quantumrpg.stats.EntityStats;
88

9-
public class EntityStatsBonusUpdateEvent extends IEvent {
10-
11-
protected LivingEntity entity;
12-
protected EntityStats stats;
13-
14-
public EntityStatsBonusUpdateEvent(
15-
@NotNull LivingEntity entity,
16-
@NotNull EntityStats stats
17-
) {
18-
this.entity = entity;
19-
this.stats = stats;
20-
}
21-
22-
@NotNull
23-
public LivingEntity getEntity() {
24-
return this.entity;
25-
}
26-
27-
@NotNull
28-
public final EntityStats getStats() {
29-
return this.stats;
30-
}
9+
public class EntityStatsBonusUpdateEvent extends Event {
10+
private static final HandlerList handlers = new HandlerList();
11+
12+
protected LivingEntity entity;
13+
14+
protected EntityStats stats;
15+
16+
public EntityStatsBonusUpdateEvent(@NotNull LivingEntity entity, @NotNull EntityStats stats) {
17+
this.entity = entity;
18+
this.stats = stats;
19+
}
20+
21+
public static HandlerList getHandlerList() {
22+
return handlers;
23+
}
24+
25+
@NotNull
26+
public final HandlerList getHandlers() {
27+
return handlers;
28+
}
29+
30+
@NotNull
31+
public LivingEntity getEntity() {
32+
return this.entity;
33+
}
34+
35+
@NotNull
36+
public final EntityStats getStats() {
37+
return this.stats;
38+
}
3139
}

‎src/main/java/su/nightexpress/quantumrpg/api/event/QuantumItemDamageEvent.java‎

Lines changed: 50 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,50 @@
1+
package su.nightexpress.quantumrpg.api.event;
2+
3+
import org.bukkit.entity.LivingEntity;
4+
import org.bukkit.event.Cancellable;
5+
import org.bukkit.event.Event;
6+
import org.bukkit.event.HandlerList;
7+
import org.bukkit.inventory.ItemStack;
8+
import org.jetbrains.annotations.NotNull;
9+
10+
public class QuantumItemDamageEvent extends Event implements Cancellable {
11+
private static final HandlerList handlers = new HandlerList();
12+
13+
private boolean cancelled;
14+
15+
private ItemStack item;
16+
17+
private LivingEntity li;
18+
19+
public QuantumItemDamageEvent(@NotNull ItemStack item, @NotNull LivingEntity li) {
20+
this.item = item;
21+
this.li = li;
22+
}
23+
24+
public static HandlerList getHandlerList() {
25+
return handlers;
26+
}
27+
28+
@NotNull
29+
public HandlerList getHandlers() {
30+
return handlers;
31+
}
32+
33+
public boolean isCancelled() {
34+
return this.cancelled;
35+
}
36+
37+
public void setCancelled(boolean cancelled) {
38+
this.cancelled = cancelled;
39+
}
40+
41+
@NotNull
42+
public ItemStack getItem() {
43+
return this.item;
44+
}
45+
46+
@NotNull
47+
public LivingEntity getEntity() {
48+
return this.li;
49+
}
50+
}

‎src/main/java/su/nightexpress/quantumrpg/api/event/QuantumPlayerItemUseEvent.java‎

Lines changed: 68 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,68 @@
1+
package su.nightexpress.quantumrpg.api.event;
2+
3+
import org.bukkit.entity.Player;
4+
import org.bukkit.event.Cancellable;
5+
import org.bukkit.event.Event;
6+
import org.bukkit.event.HandlerList;
7+
import org.bukkit.inventory.ItemStack;
8+
import org.jetbrains.annotations.NotNull;
9+
import su.nightexpress.quantumrpg.modules.LimitedItem;
10+
import su.nightexpress.quantumrpg.types.QClickType;
11+
12+
public class QuantumPlayerItemUseEvent extends Event implements Cancellable {
13+
private static final HandlerList handlers = new HandlerList();
14+
15+
private boolean cancelled;
16+
17+
private ItemStack item;
18+
19+
private LimitedItem ci;
20+
21+
private Player p;
22+
23+
private QClickType click;
24+
25+
public QuantumPlayerItemUseEvent(@NotNull ItemStack item, @NotNull Player p, @NotNull LimitedItem ci, @NotNull QClickType click) {
26+
this.item = item;
27+
this.ci = ci;
28+
this.p = p;
29+
this.click = click;
30+
}
31+
32+
public static HandlerList getHandlerList() {
33+
return handlers;
34+
}
35+
36+
@NotNull
37+
public HandlerList getHandlers() {
38+
return handlers;
39+
}
40+
41+
public boolean isCancelled() {
42+
return this.cancelled;
43+
}
44+
45+
public void setCancelled(boolean cancelled) {
46+
this.cancelled = cancelled;
47+
}
48+
49+
@NotNull
50+
public LimitedItem getItem() {
51+
return this.ci;
52+
}
53+
54+
@NotNull
55+
public ItemStack getItemStack() {
56+
return this.item;
57+
}
58+
59+
@NotNull
60+
public Player getPlayer() {
61+
return this.p;
62+
}
63+
64+
@NotNull
65+
public QClickType getClickType() {
66+
return this.click;
67+
}
68+
}

0 commit comments

Comments
 (0)