Skip to content

Commit d1f7869

Browse files
committed
Add PlayerEditTextBlockEvent + a lot of extra goodies.
1 parent bda5b65 commit d1f7869

23 files changed

+607
-24
lines changed

gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ jankson.version=2.0.0-SNAPSHOT-23
7474
rebuild.version=1.1.0
7575

7676
# https://github.com/Fox2Code/FoxEvents/releases
77-
fox-events.version=1.2.0
77+
fox-events.version=1.3.1
7878

7979
# https://github.com/Fox2Code/FoxFlexVer/releases
8080
fox-flex-ver.version=1.1.0

loader/src/main/java/com/fox2code/foxloader/event/interaction/PlayerAttackEntityEvent.java

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,22 +28,24 @@
2828
import net.minecraft.common.entity.Entity;
2929
import net.minecraft.common.entity.player.EntityPlayer;
3030
import net.minecraft.common.item.ItemStack;
31+
import org.jetbrains.annotations.NotNull;
32+
import org.jetbrains.annotations.Nullable;
3133

3234
public final class PlayerAttackEntityEvent extends PlayerEvent implements Event.Cancellable {
3335
private final ItemStack heldItem;
3436
private final Entity target;
3537

36-
public PlayerAttackEntityEvent(EntityPlayer entityPlayer, ItemStack heldItem, Entity target) {
38+
public PlayerAttackEntityEvent(@NotNull EntityPlayer entityPlayer, @Nullable ItemStack heldItem, @NotNull Entity target) {
3739
super(entityPlayer);
3840
this.heldItem = heldItem;
3941
this.target = target;
4042
}
4143

42-
public ItemStack getHeldItem() {
44+
@Nullable public ItemStack getHeldItem() {
4345
return this.heldItem;
4446
}
4547

46-
public Entity getTarget() {
48+
@NotNull public Entity getTarget() {
4749
return this.target;
4850
}
4951
}

loader/src/main/java/com/fox2code/foxloader/event/interaction/PlayerUseItem.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,17 +27,19 @@
2727
import com.fox2code.foxloader.event.player.PlayerEvent;
2828
import net.minecraft.common.entity.player.EntityPlayer;
2929
import net.minecraft.common.item.ItemStack;
30+
import org.jetbrains.annotations.NotNull;
31+
import org.jetbrains.annotations.Nullable;
3032

3133
@Event.DelegateEvent
3234
public abstract class PlayerUseItem extends PlayerEvent implements Event.Cancellable {
3335
private final ItemStack heldItem;
3436

35-
public PlayerUseItem(EntityPlayer entityPlayer, ItemStack heldItem) {
37+
public PlayerUseItem(@NotNull EntityPlayer entityPlayer, @Nullable ItemStack heldItem) {
3638
super(entityPlayer);
3739
this.heldItem = heldItem;
3840
}
3941

40-
public final ItemStack getHeldItem() {
42+
@Nullable public final ItemStack getHeldItem() {
4143
return this.heldItem;
4244
}
4345
}

loader/src/main/java/com/fox2code/foxloader/event/interaction/PlayerUseItemOnAirEvent.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,12 @@
2626
import com.fox2code.foxevents.Event;
2727
import net.minecraft.common.entity.player.EntityPlayer;
2828
import net.minecraft.common.item.ItemStack;
29+
import org.jetbrains.annotations.NotNull;
30+
import org.jetbrains.annotations.Nullable;
2931

3032
@Event.DelegateEvent
3133
public final class PlayerUseItemOnAirEvent extends PlayerUseItem {
32-
public PlayerUseItemOnAirEvent(EntityPlayer entityPlayer, ItemStack heldItem) {
34+
public PlayerUseItemOnAirEvent(@NotNull EntityPlayer entityPlayer, @Nullable ItemStack heldItem) {
3335
super(entityPlayer, heldItem);
3436
}
3537
}

loader/src/main/java/com/fox2code/foxloader/event/interaction/PlayerUseItemOnBlockEvent.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,13 +26,15 @@
2626
import com.fox2code.foxevents.Event;
2727
import net.minecraft.common.entity.player.EntityPlayer;
2828
import net.minecraft.common.item.ItemStack;
29+
import org.jetbrains.annotations.NotNull;
30+
import org.jetbrains.annotations.Nullable;
2931

3032
@Event.DelegateEvent
3133
public final class PlayerUseItemOnBlockEvent extends PlayerUseItem {
3234
private final int x, y, z, facing;
3335
private final float xOffset, yOffset, zOffset;
3436

35-
public PlayerUseItemOnBlockEvent(EntityPlayer entityPlayer, ItemStack heldItem,
37+
public PlayerUseItemOnBlockEvent(@NotNull EntityPlayer entityPlayer, @Nullable ItemStack heldItem,
3638
int x, int y, int z, int facing,
3739
float xOffset, float yOffset, float zOffset) {
3840
super(entityPlayer, heldItem);

loader/src/main/java/com/fox2code/foxloader/event/interaction/PlayerUseItemOnEntityEvent.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,17 +27,19 @@
2727
import net.minecraft.common.entity.Entity;
2828
import net.minecraft.common.entity.player.EntityPlayer;
2929
import net.minecraft.common.item.ItemStack;
30+
import org.jetbrains.annotations.NotNull;
31+
import org.jetbrains.annotations.Nullable;
3032

3133
@Event.DelegateEvent
3234
public final class PlayerUseItemOnEntityEvent extends PlayerUseItem {
3335
private final Entity target;
3436

35-
public PlayerUseItemOnEntityEvent(EntityPlayer entityPlayer, ItemStack heldItem, Entity target) {
37+
public PlayerUseItemOnEntityEvent(@NotNull EntityPlayer entityPlayer, @Nullable ItemStack heldItem,@NotNull Entity target) {
3638
super(entityPlayer, heldItem);
3739
this.target = target;
3840
}
3941

40-
public Entity getTarget() {
42+
@NotNull public Entity getTarget() {
4143
return this.target;
4244
}
4345
}

loader/src/main/java/com/fox2code/foxloader/event/player/PlayerChatEvent.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ public final class PlayerChatEvent extends PlayerEvent implements Event.Cancella
3333
private final String chatMessage;
3434
private String formattedMessage;
3535

36-
public PlayerChatEvent(EntityPlayer entityPlayer, String chatMessage) {
36+
public PlayerChatEvent(@NotNull EntityPlayer entityPlayer,@NotNull String chatMessage) {
3737
super(entityPlayer);
3838
this.chatMessage = Objects.requireNonNull(chatMessage, "chatMessage");
3939
this.formattedMessage = "<" + entityPlayer.username + "> " + chatMessage;

loader/src/main/java/com/fox2code/foxloader/event/player/PlayerEvent.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
public abstract class PlayerEvent extends Event {
3333
private final EntityPlayer entityPlayer;
3434

35-
protected PlayerEvent(EntityPlayer entityPlayer) {
35+
protected PlayerEvent(@NotNull EntityPlayer entityPlayer) {
3636
this.entityPlayer = Objects.requireNonNull(entityPlayer, "entityPlayer");
3737
}
3838

loader/src/main/java/com/fox2code/foxloader/event/player/PlayerJoinEvent.java

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,8 @@
2525

2626
import net.minecraft.common.entity.player.EntityPlayer;
2727
import net.minecraft.common.util.ChatColors;
28+
import org.jetbrains.annotations.NotNull;
29+
import org.jetbrains.annotations.Nullable;
2830

2931
/**
3032
* This event is called when a player join the world.
@@ -34,16 +36,16 @@
3436
public final class PlayerJoinEvent extends PlayerEvent {
3537
private String joinMessage;
3638

37-
public PlayerJoinEvent(EntityPlayer entityPlayer) {
39+
public PlayerJoinEvent(@NotNull EntityPlayer entityPlayer) {
3840
super(entityPlayer);
3941
this.joinMessage = ChatColors.YELLOW + entityPlayer.username + " joined the game.";
4042
}
4143

42-
public void setJoinMessage(String joinMessage) {
44+
public void setJoinMessage(@Nullable String joinMessage) {
4345
this.joinMessage = joinMessage;
4446
}
4547

46-
public String getJoinMessage() {
48+
@Nullable public String getJoinMessage() {
4749
return this.joinMessage;
4850
}
4951
}

loader/src/main/java/com/fox2code/foxloader/event/player/PlayerLeaveEvent.java

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,8 @@
2525

2626
import net.minecraft.common.entity.player.EntityPlayer;
2727
import net.minecraft.common.util.ChatColors;
28+
import org.jetbrains.annotations.NotNull;
29+
import org.jetbrains.annotations.Nullable;
2830

2931
/**
3032
* This event is called when a player leaves the world.
@@ -34,16 +36,16 @@
3436
public final class PlayerLeaveEvent extends PlayerEvent {
3537
private String leaveMessage;
3638

37-
public PlayerLeaveEvent(EntityPlayer entityPlayer) {
39+
public PlayerLeaveEvent(@NotNull EntityPlayer entityPlayer) {
3840
super(entityPlayer);
3941
this.leaveMessage = ChatColors.YELLOW + entityPlayer.username + " left the game.";
4042
}
4143

42-
public void setLeaveMessage(String leaveMessage) {
44+
public void setLeaveMessage(@Nullable String leaveMessage) {
4345
this.leaveMessage = leaveMessage;
4446
}
4547

46-
public String getLeaveMessage() {
48+
@Nullable public String getLeaveMessage() {
4749
return this.leaveMessage;
4850
}
4951
}

0 commit comments

Comments
 (0)