From 2fc439b3064abff99a8dbdbed1fa6a476fe84bec Mon Sep 17 00:00:00 2001 From: ShadowRanger Date: Fri, 13 May 2016 00:20:24 +1000 Subject: [PATCH 1/2] Update to 1.9.4 --- pom.xml | 4 +-- .../openinv/internal/AnySilentChest.java | 30 +++++++++---------- .../openinv/internal/EnumDirectionList.java | 4 +-- .../openinv/internal/InventoryAccess.java | 4 +-- .../openinv/internal/PlayerDataManager.java | 8 ++--- .../openinv/internal/SilentInventory.java | 18 +++++------ .../openinv/internal/SpecialEnderChest.java | 10 +++---- .../internal/SpecialPlayerInventory.java | 14 ++++----- 8 files changed, 46 insertions(+), 46 deletions(-) diff --git a/pom.xml b/pom.xml index 183edbe..c42cd36 100644 --- a/pom.xml +++ b/pom.xml @@ -23,14 +23,14 @@ org.bukkit bukkit - 1.9.2-R0.1-SNAPSHOT + 1.9.4-R0.1-SNAPSHOT provided org.bukkit craftbukkit - 1.9.2-R0.1-SNAPSHOT + 1.9.4-R0.1-SNAPSHOT provided diff --git a/src/main/java/com/lishid/openinv/internal/AnySilentChest.java b/src/main/java/com/lishid/openinv/internal/AnySilentChest.java index ae43489..f25903f 100644 --- a/src/main/java/com/lishid/openinv/internal/AnySilentChest.java +++ b/src/main/java/com/lishid/openinv/internal/AnySilentChest.java @@ -18,25 +18,25 @@ package com.lishid.openinv.internal; import java.util.Iterator; -import org.bukkit.craftbukkit.v1_9_R1.entity.CraftPlayer; +import org.bukkit.craftbukkit.v1_9_R2.entity.CraftPlayer; import org.bukkit.entity.Player; import com.lishid.openinv.OpenInv; -import net.minecraft.server.v1_9_R1.AxisAlignedBB; -import net.minecraft.server.v1_9_R1.Block; -import net.minecraft.server.v1_9_R1.BlockChest; -import net.minecraft.server.v1_9_R1.BlockChest.Type; -import net.minecraft.server.v1_9_R1.BlockPosition; -import net.minecraft.server.v1_9_R1.Entity; -import net.minecraft.server.v1_9_R1.EntityOcelot; -import net.minecraft.server.v1_9_R1.EntityPlayer; -import net.minecraft.server.v1_9_R1.EnumDirection; -import net.minecraft.server.v1_9_R1.ITileInventory; -import net.minecraft.server.v1_9_R1.InventoryLargeChest; -import net.minecraft.server.v1_9_R1.TileEntity; -import net.minecraft.server.v1_9_R1.TileEntityChest; -import net.minecraft.server.v1_9_R1.World; +import net.minecraft.server.v1_9_R2.AxisAlignedBB; +import net.minecraft.server.v1_9_R2.Block; +import net.minecraft.server.v1_9_R2.BlockChest; +import net.minecraft.server.v1_9_R2.BlockChest.Type; +import net.minecraft.server.v1_9_R2.BlockPosition; +import net.minecraft.server.v1_9_R2.Entity; +import net.minecraft.server.v1_9_R2.EntityOcelot; +import net.minecraft.server.v1_9_R2.EntityPlayer; +import net.minecraft.server.v1_9_R2.EnumDirection; +import net.minecraft.server.v1_9_R2.ITileInventory; +import net.minecraft.server.v1_9_R2.InventoryLargeChest; +import net.minecraft.server.v1_9_R2.TileEntity; +import net.minecraft.server.v1_9_R2.TileEntityChest; +import net.minecraft.server.v1_9_R2.World; public class AnySilentChest { diff --git a/src/main/java/com/lishid/openinv/internal/EnumDirectionList.java b/src/main/java/com/lishid/openinv/internal/EnumDirectionList.java index 2cd77f6..cd8a8c2 100644 --- a/src/main/java/com/lishid/openinv/internal/EnumDirectionList.java +++ b/src/main/java/com/lishid/openinv/internal/EnumDirectionList.java @@ -4,8 +4,8 @@ import java.util.Iterator; import com.google.common.collect.Iterators; -import net.minecraft.server.v1_9_R1.EnumDirection; -import net.minecraft.server.v1_9_R1.EnumDirection.EnumDirectionLimit; +import net.minecraft.server.v1_9_R2.EnumDirection; +import net.minecraft.server.v1_9_R2.EnumDirection.EnumDirectionLimit; public enum EnumDirectionList implements Iterable { diff --git a/src/main/java/com/lishid/openinv/internal/InventoryAccess.java b/src/main/java/com/lishid/openinv/internal/InventoryAccess.java index 29738c7..5c388f1 100644 --- a/src/main/java/com/lishid/openinv/internal/InventoryAccess.java +++ b/src/main/java/com/lishid/openinv/internal/InventoryAccess.java @@ -18,14 +18,14 @@ package com.lishid.openinv.internal; import java.lang.reflect.Field; -import org.bukkit.craftbukkit.v1_9_R1.inventory.CraftInventory; +import org.bukkit.craftbukkit.v1_9_R2.inventory.CraftInventory; import org.bukkit.entity.HumanEntity; import org.bukkit.inventory.Inventory; import com.lishid.openinv.OpenInv; import com.lishid.openinv.Permissions; -import net.minecraft.server.v1_9_R1.IInventory; +import net.minecraft.server.v1_9_R2.IInventory; public class InventoryAccess { diff --git a/src/main/java/com/lishid/openinv/internal/PlayerDataManager.java b/src/main/java/com/lishid/openinv/internal/PlayerDataManager.java index 87bab09..ac600fb 100644 --- a/src/main/java/com/lishid/openinv/internal/PlayerDataManager.java +++ b/src/main/java/com/lishid/openinv/internal/PlayerDataManager.java @@ -20,15 +20,15 @@ import java.util.UUID; import org.bukkit.Bukkit; import org.bukkit.OfflinePlayer; -import org.bukkit.craftbukkit.v1_9_R1.CraftServer; +import org.bukkit.craftbukkit.v1_9_R2.CraftServer; import org.bukkit.entity.Player; import com.lishid.openinv.OpenInv; import com.mojang.authlib.GameProfile; -import net.minecraft.server.v1_9_R1.EntityPlayer; -import net.minecraft.server.v1_9_R1.MinecraftServer; -import net.minecraft.server.v1_9_R1.PlayerInteractManager; +import net.minecraft.server.v1_9_R2.EntityPlayer; +import net.minecraft.server.v1_9_R2.MinecraftServer; +import net.minecraft.server.v1_9_R2.PlayerInteractManager; public class PlayerDataManager { diff --git a/src/main/java/com/lishid/openinv/internal/SilentInventory.java b/src/main/java/com/lishid/openinv/internal/SilentInventory.java index f2b246e..509795b 100644 --- a/src/main/java/com/lishid/openinv/internal/SilentInventory.java +++ b/src/main/java/com/lishid/openinv/internal/SilentInventory.java @@ -3,18 +3,18 @@ package com.lishid.openinv.internal; import java.util.List; import org.bukkit.Location; -import org.bukkit.craftbukkit.v1_9_R1.entity.CraftHumanEntity; +import org.bukkit.craftbukkit.v1_9_R2.entity.CraftHumanEntity; import org.bukkit.entity.HumanEntity; import org.bukkit.inventory.InventoryHolder; -import net.minecraft.server.v1_9_R1.ChestLock; -import net.minecraft.server.v1_9_R1.Container; -import net.minecraft.server.v1_9_R1.ContainerChest; -import net.minecraft.server.v1_9_R1.EntityHuman; -import net.minecraft.server.v1_9_R1.IChatBaseComponent; -import net.minecraft.server.v1_9_R1.ITileInventory; -import net.minecraft.server.v1_9_R1.ItemStack; -import net.minecraft.server.v1_9_R1.PlayerInventory; +import net.minecraft.server.v1_9_R2.ChestLock; +import net.minecraft.server.v1_9_R2.Container; +import net.minecraft.server.v1_9_R2.ContainerChest; +import net.minecraft.server.v1_9_R2.EntityHuman; +import net.minecraft.server.v1_9_R2.IChatBaseComponent; +import net.minecraft.server.v1_9_R2.ITileInventory; +import net.minecraft.server.v1_9_R2.ItemStack; +import net.minecraft.server.v1_9_R2.PlayerInventory; public class SilentInventory implements ITileInventory { diff --git a/src/main/java/com/lishid/openinv/internal/SpecialEnderChest.java b/src/main/java/com/lishid/openinv/internal/SpecialEnderChest.java index 2c96c10..5ce95a8 100644 --- a/src/main/java/com/lishid/openinv/internal/SpecialEnderChest.java +++ b/src/main/java/com/lishid/openinv/internal/SpecialEnderChest.java @@ -16,15 +16,15 @@ package com.lishid.openinv.internal; -import org.bukkit.craftbukkit.v1_9_R1.entity.CraftHumanEntity; -import org.bukkit.craftbukkit.v1_9_R1.entity.CraftPlayer; -import org.bukkit.craftbukkit.v1_9_R1.inventory.CraftInventory; +import org.bukkit.craftbukkit.v1_9_R2.entity.CraftHumanEntity; +import org.bukkit.craftbukkit.v1_9_R2.entity.CraftPlayer; +import org.bukkit.craftbukkit.v1_9_R2.inventory.CraftInventory; import org.bukkit.entity.Player; import org.bukkit.inventory.Inventory; import org.bukkit.inventory.InventoryHolder; -import net.minecraft.server.v1_9_R1.InventoryEnderChest; -import net.minecraft.server.v1_9_R1.InventorySubcontainer; +import net.minecraft.server.v1_9_R2.InventoryEnderChest; +import net.minecraft.server.v1_9_R2.InventorySubcontainer; public class SpecialEnderChest extends InventorySubcontainer { diff --git a/src/main/java/com/lishid/openinv/internal/SpecialPlayerInventory.java b/src/main/java/com/lishid/openinv/internal/SpecialPlayerInventory.java index 532f2df..8c86ba1 100644 --- a/src/main/java/com/lishid/openinv/internal/SpecialPlayerInventory.java +++ b/src/main/java/com/lishid/openinv/internal/SpecialPlayerInventory.java @@ -18,16 +18,16 @@ package com.lishid.openinv.internal; import java.lang.reflect.Field; -import org.bukkit.craftbukkit.v1_9_R1.entity.CraftHumanEntity; -import org.bukkit.craftbukkit.v1_9_R1.entity.CraftPlayer; -import org.bukkit.craftbukkit.v1_9_R1.inventory.CraftInventory; +import org.bukkit.craftbukkit.v1_9_R2.entity.CraftHumanEntity; +import org.bukkit.craftbukkit.v1_9_R2.entity.CraftPlayer; +import org.bukkit.craftbukkit.v1_9_R2.inventory.CraftInventory; import org.bukkit.entity.Player; import org.bukkit.inventory.Inventory; -import net.minecraft.server.v1_9_R1.ContainerUtil; -import net.minecraft.server.v1_9_R1.EntityHuman; -import net.minecraft.server.v1_9_R1.ItemStack; -import net.minecraft.server.v1_9_R1.PlayerInventory; +import net.minecraft.server.v1_9_R2.ContainerUtil; +import net.minecraft.server.v1_9_R2.EntityHuman; +import net.minecraft.server.v1_9_R2.ItemStack; +import net.minecraft.server.v1_9_R2.PlayerInventory; public class SpecialPlayerInventory extends PlayerInventory { From d9c1b00b506f0d2548df3a9dc51f7c7d21c878ed Mon Sep 17 00:00:00 2001 From: ShadowRanger Date: Fri, 13 May 2016 00:21:37 +1000 Subject: [PATCH 2/2] Update to 1.9.4 --- pom.xml | 2 +- src/main/resources/plugin.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index c42cd36..11fd144 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ com.lishid openinv jar - 2.3.7 + 2.3.8 OpenInv http://dev.bukkit.org/bukkit-plugins/openinv/ diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml index d1be4db..4860eb4 100644 --- a/src/main/resources/plugin.yml +++ b/src/main/resources/plugin.yml @@ -1,6 +1,6 @@ name: OpenInv main: com.lishid.openinv.OpenInv -version: 2.3.7 +version: 2.3.8 author: lishid authors: [ShadowRanger] description: >