From 1ea66c945433304d6869a06bb25250a2335ae203 Mon Sep 17 00:00:00 2001 From: Cyprias Date: Sat, 2 Aug 2014 05:35:42 -0600 Subject: [PATCH 1/6] * Updating for CraftBukkit 1.7.9. --- pom.xml | 8 ++++---- .../funkyclan/mc/RepairRecipe/MetricsLite.java | 2 +- .../mc/RepairRecipe/RepairRecipe.java | 18 ++++++++++-------- 3 files changed, 15 insertions(+), 13 deletions(-) diff --git a/pom.xml b/pom.xml index 6a08e55..9be27e2 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ de.funkyclan.mc.RepairRecipe RepairRecipe jar - 0.4.7 + 0.4.10 RepairRecipe http://dev.bukkit.org/bukkit-plugins/repairrecipe/ @@ -33,19 +33,19 @@ org.bukkit bukkit - 1.5.2-R1.0 + 1.7.9-R0.3-SNAPSHOT org.bukkit minecraft-server - 1.5.2 + 1.7.9 org.bukkit craftbukkit - 1.5.2-R1.0 + 1.7.9-R0.3-SNAPSHOT net.milkbowl.vault diff --git a/src/main/java/de/funkyclan/mc/RepairRecipe/MetricsLite.java b/src/main/java/de/funkyclan/mc/RepairRecipe/MetricsLite.java index 848ffd6..7ba5fdc 100644 --- a/src/main/java/de/funkyclan/mc/RepairRecipe/MetricsLite.java +++ b/src/main/java/de/funkyclan/mc/RepairRecipe/MetricsLite.java @@ -282,7 +282,7 @@ private void postPlugin(boolean isPing) throws IOException { boolean onlineMode = Bukkit.getServer().getOnlineMode(); // TRUE if online mode is enabled String pluginVersion = description.getVersion(); String serverVersion = Bukkit.getVersion(); - int playersOnline = Bukkit.getServer().getOnlinePlayers().length; + int playersOnline = Bukkit.getServer().getOnlinePlayers().size(); // END server software specific section -- all code below does not use any code outside of this class / Java diff --git a/src/main/java/de/funkyclan/mc/RepairRecipe/RepairRecipe.java b/src/main/java/de/funkyclan/mc/RepairRecipe/RepairRecipe.java index 98a3ebf..9f311aa 100644 --- a/src/main/java/de/funkyclan/mc/RepairRecipe/RepairRecipe.java +++ b/src/main/java/de/funkyclan/mc/RepairRecipe/RepairRecipe.java @@ -2,11 +2,12 @@ import de.funkyclan.mc.RepairRecipe.Listener.CraftingListener; import de.funkyclan.mc.RepairRecipe.Recipe.ShapelessRepairRecipe; -import net.minecraft.server.v1_5_R3.Packet103SetSlot; +//import net.minecraft.server.v1_7_R3.Packet103SetSlot; +import net.minecraft.server.v1_7_R3.PacketPlayOutSetSlot; import org.bukkit.Material; import org.bukkit.configuration.ConfigurationSection; -import org.bukkit.craftbukkit.v1_5_R3.entity.CraftPlayer; -import org.bukkit.craftbukkit.v1_5_R3.inventory.CraftItemStack; +import org.bukkit.craftbukkit.v1_7_R3.entity.CraftPlayer; +import org.bukkit.craftbukkit.v1_7_R3.inventory.CraftItemStack; import org.bukkit.entity.HumanEntity; import org.bukkit.inventory.ItemStack; import org.bukkit.plugin.java.JavaPlugin; @@ -71,13 +72,14 @@ public void updateSlotInventory(HumanEntity player, ItemStack item, int index) { if (player instanceof CraftPlayer) { CraftPlayer craftPlayer = (CraftPlayer) player; if (craftPlayer.getHandle().activeContainer != null) { - Packet103SetSlot packet = new Packet103SetSlot(); - packet.a = craftPlayer.getHandle().activeContainer.windowId; - packet.b = index; - packet.c = CraftItemStack.asNMSCopy(item); - + PacketPlayOutSetSlot packet = new PacketPlayOutSetSlot( + craftPlayer.getHandle().activeContainer.windowId, + 0, + CraftItemStack.asNMSCopy(item)); + craftPlayer.getHandle().playerConnection.sendPacket(packet); } + } } From 0fa6ac8aa27cc3f5c1eb3ffc6c0ad5240681ed74 Mon Sep 17 00:00:00 2001 From: Cyprias Date: Sat, 2 Aug 2014 05:43:45 -0600 Subject: [PATCH 2/6] 0 to index. --- src/main/java/de/funkyclan/mc/RepairRecipe/RepairRecipe.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/de/funkyclan/mc/RepairRecipe/RepairRecipe.java b/src/main/java/de/funkyclan/mc/RepairRecipe/RepairRecipe.java index 9f311aa..cdf72ef 100644 --- a/src/main/java/de/funkyclan/mc/RepairRecipe/RepairRecipe.java +++ b/src/main/java/de/funkyclan/mc/RepairRecipe/RepairRecipe.java @@ -74,7 +74,7 @@ public void updateSlotInventory(HumanEntity player, ItemStack item, int index) { if (craftPlayer.getHandle().activeContainer != null) { PacketPlayOutSetSlot packet = new PacketPlayOutSetSlot( craftPlayer.getHandle().activeContainer.windowId, - 0, + index, CraftItemStack.asNMSCopy(item)); craftPlayer.getHandle().playerConnection.sendPacket(packet); From 2bdc5fe3a9f3d9dd16642aacf896e3c29ee33c15 Mon Sep 17 00:00:00 2001 From: Cyprias Date: Mon, 15 Sep 2014 08:19:21 -0600 Subject: [PATCH 3/6] Updating for CB 1.7.10 (spigot #1649 actually since I can't find CB jar anywhere). --- .../java/de/funkyclan/mc/RepairRecipe/RepairRecipe.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/java/de/funkyclan/mc/RepairRecipe/RepairRecipe.java b/src/main/java/de/funkyclan/mc/RepairRecipe/RepairRecipe.java index cdf72ef..83ea4be 100644 --- a/src/main/java/de/funkyclan/mc/RepairRecipe/RepairRecipe.java +++ b/src/main/java/de/funkyclan/mc/RepairRecipe/RepairRecipe.java @@ -2,12 +2,12 @@ import de.funkyclan.mc.RepairRecipe.Listener.CraftingListener; import de.funkyclan.mc.RepairRecipe.Recipe.ShapelessRepairRecipe; -//import net.minecraft.server.v1_7_R3.Packet103SetSlot; -import net.minecraft.server.v1_7_R3.PacketPlayOutSetSlot; +import net.minecraft.server.v1_7_R4.PacketPlayOutSetSlot; + import org.bukkit.Material; import org.bukkit.configuration.ConfigurationSection; -import org.bukkit.craftbukkit.v1_7_R3.entity.CraftPlayer; -import org.bukkit.craftbukkit.v1_7_R3.inventory.CraftItemStack; +import org.bukkit.craftbukkit.v1_7_R4.entity.CraftPlayer; +import org.bukkit.craftbukkit.v1_7_R4.inventory.CraftItemStack; import org.bukkit.entity.HumanEntity; import org.bukkit.inventory.ItemStack; import org.bukkit.plugin.java.JavaPlugin; From 2700e6a8517cdb84e1a72a9e2c4eea169696a788 Mon Sep 17 00:00:00 2001 From: Cyprias Date: Mon, 15 Sep 2014 08:22:39 -0600 Subject: [PATCH 4/6] Updating pom to include the spigot jar, I don't think I can commit the jar to the repo though. --- pom.xml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pom.xml b/pom.xml index 9be27e2..51171ab 100644 --- a/pom.xml +++ b/pom.xml @@ -52,6 +52,13 @@ Vault 1.2.25-SNAPSHOT + + org.bukkit + craftbukkit + 1.7.10-R0.1 + system + ${project.basedir}/lib/spigot-1.7.10-R0.1-SNAPSHOT.jar + From 6ee66233b7a5c4162067397731f8b2acca86ac63 Mon Sep 17 00:00:00 2001 From: Cyprias Date: Thu, 4 Dec 2014 08:09:04 -0700 Subject: [PATCH 5/6] * I don't have Vault 1.2.27, using 1.2.25 for compiling instead. --- pom.xml | 146 ++++++++++++++++++++++++++++---------------------------- 1 file changed, 73 insertions(+), 73 deletions(-) diff --git a/pom.xml b/pom.xml index ac93053..dab3277 100644 --- a/pom.xml +++ b/pom.xml @@ -1,73 +1,73 @@ - - 4.0.0 - de.funkyclan.mc.RepairRecipe - RepairRecipe - jar - 0.4.9 - RepairRecipe - http://dev.bukkit.org/bukkit-plugins/repairrecipe/ - - - - src/main/resources - true - - - - - org.apache.maven.plugins - maven-compiler-plugin - 3.1 - - 1.6 - 1.6 - - - - - - - org.bukkit - bukkit - - 1.7.9-R0.3-SNAPSHOT - - - org.bukkit - minecraft-server - - 1.7.9 - - - org.bukkit - craftbukkit - - 1.7.9-R0.3-SNAPSHOT - - - net.milkbowl.vault - Vault - 1.2.27 - - - org.bukkit - craftbukkit - 1.7.10-R0.1 - system - ${project.basedir}/lib/spigot-1.7.10-R0.1-SNAPSHOT.jar - - - - - bukkit-repo - http://repo.bukkit.org/content/groups/public/ - - - vault-repo - http://ci.herocraftonline.com/plugin/repository/everything - - - + + 4.0.0 + de.funkyclan.mc.RepairRecipe + RepairRecipe + jar + 0.4.9 + RepairRecipe + http://dev.bukkit.org/bukkit-plugins/repairrecipe/ + + + + src/main/resources + true + + + + + org.apache.maven.plugins + maven-compiler-plugin + 3.1 + + 1.6 + 1.6 + + + + + + + org.bukkit + bukkit + + 1.7.9-R0.3-SNAPSHOT + + + org.bukkit + minecraft-server + + 1.7.9 + + + org.bukkit + craftbukkit + + 1.7.9-R0.3-SNAPSHOT + + + net.milkbowl.vault + Vault + 1.2.25-SNAPSHOT + + + org.bukkit + craftbukkit + 1.7.10-R0.1 + system + ${project.basedir}/lib/spigot-1.7.10-R0.1-SNAPSHOT.jar + + + + + bukkit-repo + http://repo.bukkit.org/content/groups/public/ + + + vault-repo + http://ci.herocraftonline.com/plugin/repository/everything + + + From b617dd6ef23be946878623f62d406f342b4981be Mon Sep 17 00:00:00 2001 From: Cyprias Date: Thu, 4 Dec 2014 08:22:54 -0700 Subject: [PATCH 6/6] * Removing unneeded depens. --- pom.xml | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/pom.xml b/pom.xml index dab3277..a65923a 100644 --- a/pom.xml +++ b/pom.xml @@ -33,18 +33,7 @@ org.bukkit bukkit - 1.7.9-R0.3-SNAPSHOT - - - org.bukkit - minecraft-server - - 1.7.9 - - - org.bukkit - craftbukkit - + 1.7.9-R0.3-SNAPSHOT