Skip to content
This repository has been archived by the owner on Aug 31, 2019. It is now read-only.

Redo particle effects API and add new effects #89

Closed
wants to merge 1 commit into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
79 changes: 79 additions & 0 deletions Bukkit/0011-Add-missing-effects.patch
@@ -0,0 +1,79 @@
From 9512b1149c4ec0ce7181f2774c819c96899db96d Mon Sep 17 00:00:00 2001
From: Marcos Vives Del Sol <socram8888@gmail.com>
Date: Fri, 13 Jun 2014 16:45:04 +0200
Subject: [PATCH] Add missing effects


diff --git a/src/main/java/org/bukkit/Effect.java b/src/main/java/org/bukkit/Effect.java
index 2474a2d..6cd2df8 100644
--- a/src/main/java/org/bukkit/Effect.java
+++ b/src/main/java/org/bukkit/Effect.java
@@ -60,6 +60,42 @@ public enum Effect {
*/
ZOMBIE_DESTROY_DOOR(1012, Type.SOUND),
/**
+ * Sound of a Wither spawning.
+ */
+ WITHER_SPAWN(1013, Type.SOUND),
+ /**
+ * Sound of a Wither firing.
+ */
+ WITHER_SHOOT(1014, Type.SOUND),
+ /**
+ * Sound of a bat taking off.
+ */
+ BAT_TAKEOFF(1015, Type.SOUND),
+ /**
+ * Sound of villager getting infected.
+ */
+ VILLAGER_INFECT(1016, Type.SOUND),
+ /**
+ * Sound of villager being cured.
+ */
+ VILLAGER_CURE(1017, Type.SOUND),
+ /**
+ * Sound of an Enderdragon dying.
+ */
+ ENDERDRAGON_DIE(1018, Type.SOUND),
+ /**
+ * Sound of an anvil breaking.
+ */
+ ANVIL_BREAK(1020, Type.SOUND),
+ /**
+ * Sound of an anvil being used.
+ */
+ ANVIL_USE(1021, Type.SOUND),
+ /**
+ * Sound of an anvil landing.
+ */
+ ANVIL_LAND(1022, Type.SOUND),
+ /**
* A visual smoke effect. Needs direction as additional info.
*/
SMOKE(2000, Type.VISUAL, BlockFace.class),
@@ -79,7 +115,21 @@ public enum Effect {
/**
* The flames seen on a mobspawner; a visual effect.
*/
- MOBSPAWNER_FLAMES(2004, Type.VISUAL);
+ MOBSPAWNER_FLAMES(2004, Type.VISUAL),
+ /**
+ * The green particles that appear when using bonemeal on a plant.
+ */
+ BONEMEAL_USE(2005, Type.VISUAL),
+ /**
+ * Visual effect of dust played when an entity lands on a block after
+ * falling from a high altitude. Needs an integer which is the particle
+ * speed.
+ * <p>
+ * When playing it, the location is the block the entity has fallen on,
+ * and is used to choose the appropiate texture based on the block
+ * material. The particles are rendered on top of that.
+ */
+ LAND_DUST(2006, Type.VISUAL, Integer.class);

private final int id;
private final Type type;
--
1.7.9

@@ -1,14 +1,14 @@
From 5e81515921092e47be8def93d499a7f0622fa315 Mon Sep 17 00:00:00 2001
From 6099e328ef32f8138d08a8ca07a1cb41149e3eb8 Mon Sep 17 00:00:00 2001
From: Jedediah Smith <jedediah@silencegreys.com>
Date: Sat, 28 Apr 2012 01:39:04 -0400
Subject: [PATCH] Add API to control if a player can push other entities


diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
index 4d6722d..1fcbd0c 100644
index 2fe8651..2e8631c 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
@@ -884,6 +884,18 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
@@ -882,6 +882,18 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
public void setFlying(boolean value);

/**
Expand All @@ -28,5 +28,5 @@ index 4d6722d..1fcbd0c 100644
* reverse directions.
*
--
1.8.5.1
1.7.9

12 changes: 6 additions & 6 deletions Bukkit/0016-Visibility-API.patch
@@ -1,14 +1,14 @@
From b9e789c4a35610100364ce3a876fcd92df3720d7 Mon Sep 17 00:00:00 2001
From df67b0d7b2ecd4645aca986781df6ab739182582 Mon Sep 17 00:00:00 2001
From: mrapple <tony@oc.tc>
Date: Wed, 29 May 2013 23:52:37 -0500
Subject: [PATCH] Visibility API


diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
index 1fcbd0c..5593816 100644
index 2e8631c..c125985 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
@@ -841,6 +841,8 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
@@ -839,6 +839,8 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
*/
public void hidePlayer(Player player);

Expand All @@ -17,7 +17,7 @@ index 1fcbd0c..5593816 100644
/**
* Allows this player to see a player that was previously hidden
*
@@ -849,6 +851,13 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
@@ -847,6 +849,13 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
public void showPlayer(Player player);

/**
Expand All @@ -31,7 +31,7 @@ index 1fcbd0c..5593816 100644
* Checks to see if a player has been hidden from this player
*
* @param player Player to check
@@ -858,6 +867,15 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
@@ -856,6 +865,15 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
public boolean canSee(Player player);

/**
Expand All @@ -48,5 +48,5 @@ index 1fcbd0c..5593816 100644
* information may not be reliable, as it is a state provided by the
* client, and may therefore not be accurate.
--
1.8.5.1
1.7.9

8 changes: 4 additions & 4 deletions Bukkit/0018-Add-getHostname-to-Player.patch
@@ -1,14 +1,14 @@
From 4834d202aa43dbae6623fde47141d5f3c44ceedd Mon Sep 17 00:00:00 2001
From 90583229b559aacc206504f4229415457235bee9 Mon Sep 17 00:00:00 2001
From: Marcos Vives Del Sol <socram8888@gmail.com>
Date: Sun, 28 Jul 2013 21:56:56 +0200
Subject: [PATCH] Add getHostname to Player


diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
index 5593816..df2905e 100644
index c125985..549c07b 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
@@ -1079,4 +1079,14 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
@@ -1077,4 +1077,14 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
public void removeIgnorantEffect(PotionEffectType effect);

public boolean hasIgnorantEffect(PotionEffectType effect);
Expand All @@ -24,5 +24,5 @@ index 5593816..df2905e 100644
+ public String getHostname();
}
--
1.8.5.1
1.7.9

8 changes: 4 additions & 4 deletions Bukkit/0021-Allow-plugins-to-access-player-locale.patch
@@ -1,14 +1,14 @@
From aa90dbbbf812bd8ac2e7de17fa40629455d7432f Mon Sep 17 00:00:00 2001
From ba8eab22bd884ab994b7e7a94b2b75e4e1a3daea Mon Sep 17 00:00:00 2001
From: Isaac Moore <rmsy@me.com>
Date: Sun, 5 Jan 2014 20:32:00 -0600
Subject: [PATCH] Allow plugins to access player locale


diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
index df2905e..c6aa0e4 100644
index 549c07b..cb4a96c 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
@@ -1089,4 +1089,11 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
@@ -1087,4 +1087,11 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
* @return The hostname and port
*/
public String getHostname();
Expand All @@ -21,5 +21,5 @@ index df2905e..c6aa0e4 100644
+ public String getLocale();
}
--
1.8.5.1
1.7.9