Organise imports

By: md_5 <git@md-5.net>
2021-03-09 08:47:33 +11:00
parent 1ae7bcc4d0
commit b2efd58164
188 changed files with 879 additions and 825 deletions
--- a/paper-server/nms-patches/InventoryMerchant.patch
+++ b/paper-server/nms-patches/InventoryMerchant.patch
@@ -1,9 +1,9 @@
 --- a/net/minecraft/server/InventoryMerchant.java
 +++ b/net/minecraft/server/InventoryMerchant.java
-@@ -2,6 +2,13 @@
- 
+@@ -3,6 +3,14 @@
 import java.util.Iterator;
 import javax.annotation.Nullable;
+ 
 +// CraftBukkit start
 +import java.util.List;
 +import org.bukkit.Location;
@@ -11,10 +11,11 @@
 +import org.bukkit.craftbukkit.entity.CraftAbstractVillager;
 +import org.bukkit.entity.HumanEntity;
 +// CraftBukkit end
- 
+
 public class InventoryMerchant implements IInventory {
 
-@@ -12,6 +19,46 @@
+     private final IMerchant merchant;
+@@ -12,6 +20,46 @@
     public int selectedIndex;
     private int e;