Skip to content

Commit ecbdd06

Browse files
Flo56958Flo56958
committed
Update to 1.14(.1)
Fixed MineTinker-Item-Interaction with Gridstone Fixed Permissions of Commands
1 parent 800e8bf commit ecbdd06

File tree

12 files changed

+40
-29
lines changed

12 files changed

+40
-29
lines changed

‎pom.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111

1212
<groupId>de.flo56958</groupId>
1313
<artifactId>MineTinker</artifactId>
14-
<version>a13</version>
14+
<version>a16.1</version>
1515

1616
<repositories>
1717
<repository>
@@ -23,13 +23,13 @@
2323
<dependency>
2424
<groupId>org.spigotmc</groupId>
2525
<artifactId>spigot-api</artifactId>
26-
<version>1.13-R0.1-SNAPSHOT</version>
26+
<version>1.14-R0.1-SNAPSHOT</version>
2727
<scope>provided</scope>
2828
</dependency>
2929
<dependency>
3030
<groupId>org.bukkit</groupId>
3131
<artifactId>craftbukkit</artifactId>
32-
<version>1.13.2-R0.1-SNAPSHOT</version>
32+
<version>1.14-R0.1-SNAPSHOT</version>
3333
</dependency>
3434
<dependency>
3535
<groupId>org.jetbrains</groupId>

‎src/main/java/de/flo56958/MineTinker/Commands/Commands.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -60,25 +60,25 @@ public boolean onCommand(CommandSender sender, Command cmd, String label, String
6060
break;
6161
case "checkupdate":
6262
case "cu":
63-
if (p.hasPermission("minetinker.command.checkupdate")) {
63+
if (p.hasPermission("minetinker.commands.checkupdate")) {
6464
Functions.checkUpdate(p);
6565
} else noPerm(p);
6666
break;
6767
case "convert":
6868
case "c":
69-
if (p.hasPermission("minetinker.command.convert")) {
69+
if (p.hasPermission("minetinker.commands.convert")) {
7070
Functions.convert(p, args);
7171
} else noPerm(p);
7272
break;
7373
case "give":
7474
case "g":
75-
if (p.hasPermission("minetinker.command.give")) {
75+
if (p.hasPermission("minetinker.commands.give")) {
7676
Functions.give(p, args);
7777
} else noPerm(p);
7878
break;
7979
case "givemodifieritem":
8080
case "gm":
81-
if (p.hasPermission("minetinker.command.givemodifieritem")) {
81+
if (p.hasPermission("minetinker.commands.givemodifieritem")) {
8282
Functions.giveModifierItem(p, args);
8383
} else noPerm(p);
8484
break;

‎src/main/java/de/flo56958/MineTinker/Listeners/AnvilListener.java

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
import org.bukkit.event.inventory.InventoryClickEvent;
2020
import org.bukkit.event.inventory.PrepareAnvilEvent;
2121
import org.bukkit.inventory.AnvilInventory;
22+
import org.bukkit.inventory.GrindstoneInventory;
2223
import org.bukkit.inventory.ItemStack;
2324

2425
import java.util.List;
@@ -170,4 +171,14 @@ public void onAnvilPrepare(PrepareAnvilEvent e) {
170171
i.setRepairCost(0);
171172
}
172173
}
174+
175+
@EventHandler
176+
public void onGrind(InventoryClickEvent e) {
177+
if (!(e.getInventory() instanceof GrindstoneInventory)) return;
178+
if (e.getSlot() != 9) return;
179+
ItemStack results = e.getCurrentItem();
180+
if (modManager.isToolViable(results) || modManager.isArmorViable(results)) {
181+
e.setCancelled(true);
182+
}
183+
}
173184
}

‎src/main/java/de/flo56958/MineTinker/Listeners/BuildersWandListener.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@
66
import de.flo56958.MineTinker.Utilities.ChatWriter;
77
import de.flo56958.MineTinker.Utilities.ConfigurationManager;
88
import de.flo56958.MineTinker.Utilities.PlayerInfo;
9-
import net.minecraft.server.v1_13_R2.NBTTagInt;
10-
import net.minecraft.server.v1_13_R2.NBTTagList;
11-
import net.minecraft.server.v1_13_R2.NBTTagString;
9+
import net.minecraft.server.v1_14_R1.NBTTagInt;
10+
import net.minecraft.server.v1_14_R1.NBTTagList;
11+
import net.minecraft.server.v1_14_R1.NBTTagString;
1212
import org.bukkit.*;
1313
import org.bukkit.block.Block;
1414
import org.bukkit.block.BlockFace;

‎src/main/java/de/flo56958/MineTinker/Listeners/EasyHarvestListener.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,11 @@
77
import de.flo56958.MineTinker.Modifiers.Types.ModifierType;
88
import de.flo56958.MineTinker.Modifiers.Types.Power;
99
import de.flo56958.MineTinker.Utilities.PlayerInfo;
10-
import net.minecraft.server.v1_13_R2.BlockPosition;
10+
import net.minecraft.server.v1_14_R1.BlockPosition;
1111
import org.bukkit.*;
1212
import org.bukkit.block.Block;
1313
import org.bukkit.configuration.file.FileConfiguration;
14-
import org.bukkit.craftbukkit.v1_13_R2.entity.CraftPlayer;
14+
import org.bukkit.craftbukkit.v1_14_R1.entity.CraftPlayer;
1515
import org.bukkit.entity.Player;
1616
import org.bukkit.event.EventHandler;
1717
import org.bukkit.event.Listener;

‎src/main/java/de/flo56958/MineTinker/Listeners/PlayerListener.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
import org.bukkit.ChatColor;
99
import org.bukkit.Material;
1010
import org.bukkit.block.BlockFace;
11-
import org.bukkit.craftbukkit.v1_13_R2.inventory.CraftInventory;
11+
import org.bukkit.craftbukkit.v1_14_R1.inventory.CraftInventory;
1212
import org.bukkit.event.EventHandler;
1313
import org.bukkit.event.EventPriority;
1414
import org.bukkit.event.Listener;

‎src/main/java/de/flo56958/MineTinker/Modifiers/ModManager.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,13 @@
66
import de.flo56958.MineTinker.Modifiers.Types.*;
77
import de.flo56958.MineTinker.Utilities.ChatWriter;
88
import de.flo56958.MineTinker.Utilities.ConfigurationManager;
9-
import net.minecraft.server.v1_13_R2.*;
9+
import net.minecraft.server.v1_14_R1.*;
1010
import org.bukkit.Bukkit;
1111
import org.bukkit.Material;
1212
import org.bukkit.NamespacedKey;
1313
import org.bukkit.Sound;
1414
import org.bukkit.configuration.file.FileConfiguration;
15-
import org.bukkit.craftbukkit.v1_13_R2.inventory.CraftItemStack;
15+
import org.bukkit.craftbukkit.v1_14_R1.inventory.CraftItemStack;
1616
import org.bukkit.entity.Player;
1717
import org.bukkit.event.Cancellable;
1818
import org.bukkit.inventory.ItemFlag;
@@ -436,7 +436,7 @@ public boolean isToolViable(ItemStack tool) {
436436
public boolean isWandViable(ItemStack wand) { return wand != null && hasNBTTag(wand, "IdentifierBuilderswand"); }
437437

438438
public void setNBTTag(ItemStack is, String key, NBTBase value) {
439-
net.minecraft.server.v1_13_R2.ItemStack nmsItem = CraftItemStack.asNMSCopy(is);
439+
net.minecraft.server.v1_14_R1.ItemStack nmsItem = CraftItemStack.asNMSCopy(is);
440440
NBTTagCompound comp = nmsItem.getTag();
441441
if (comp == null) { comp = new NBTTagCompound(); }
442442
comp.set(key, value);
@@ -447,7 +447,7 @@ public void setNBTTag(ItemStack is, String key, NBTBase value) {
447447
}
448448

449449
private void removeNBTTag(ItemStack is, String key) {
450-
net.minecraft.server.v1_13_R2.ItemStack nmsItem = CraftItemStack.asNMSCopy(is);
450+
net.minecraft.server.v1_14_R1.ItemStack nmsItem = CraftItemStack.asNMSCopy(is);
451451
NBTTagCompound comp = nmsItem.getTag();
452452
if (comp == null) { comp = new NBTTagCompound(); }
453453
comp.remove(key);
@@ -458,7 +458,7 @@ private void removeNBTTag(ItemStack is, String key) {
458458
}
459459

460460
private NBTBase getNBTTag(ItemStack is, String key) {
461-
net.minecraft.server.v1_13_R2.ItemStack nmsItem = CraftItemStack.asNMSCopy(is);
461+
net.minecraft.server.v1_14_R1.ItemStack nmsItem = CraftItemStack.asNMSCopy(is);
462462
NBTTagCompound comp = nmsItem.getTag();
463463
if (comp == null) { return null; }
464464
return comp.get(key);

‎src/main/java/de/flo56958/MineTinker/Modifiers/Types/Power.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,14 +11,14 @@
1111
import de.flo56958.MineTinker.Modifiers.Enchantable;
1212
import de.flo56958.MineTinker.Modifiers.Modifier;
1313
import de.flo56958.MineTinker.Utilities.*;
14-
import net.minecraft.server.v1_13_R2.BlockPosition;
14+
import net.minecraft.server.v1_14_R1.BlockPosition;
1515
import org.bukkit.Bukkit;
1616
import org.bukkit.ChatColor;
1717
import org.bukkit.Material;
1818
import org.bukkit.block.Block;
1919
import org.bukkit.block.BlockFace;
2020
import org.bukkit.configuration.file.FileConfiguration;
21-
import org.bukkit.craftbukkit.v1_13_R2.entity.CraftPlayer;
21+
import org.bukkit.craftbukkit.v1_14_R1.entity.CraftPlayer;
2222
import org.bukkit.entity.Player;
2323
import org.bukkit.event.EventHandler;
2424
import org.bukkit.event.Listener;

‎src/main/java/de/flo56958/MineTinker/Modifiers/Types/Soulbound.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
import de.flo56958.MineTinker.Utilities.ConfigurationManager;
99
import de.flo56958.MineTinker.Utilities.ItemGenerator;
1010
import de.flo56958.MineTinker.Utilities.Modifiers_Config;
11-
import net.minecraft.server.v1_13_R2.NBTTagInt;
11+
import net.minecraft.server.v1_14_R1.NBTTagInt;
1212
import org.bukkit.Bukkit;
1313
import org.bukkit.ChatColor;
1414
import org.bukkit.Material;

‎src/main/java/de/flo56958/MineTinker/Modifiers/Types/Timber.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,14 +12,14 @@
1212
import de.flo56958.MineTinker.Utilities.ConfigurationManager;
1313
import de.flo56958.MineTinker.Utilities.ItemGenerator;
1414
import de.flo56958.MineTinker.Utilities.Modifiers_Config;
15-
import net.minecraft.server.v1_13_R2.BlockPosition;
15+
import net.minecraft.server.v1_14_R1.BlockPosition;
1616
import org.bukkit.Bukkit;
1717
import org.bukkit.ChatColor;
1818
import org.bukkit.Location;
1919
import org.bukkit.Material;
2020
import org.bukkit.block.Block;
2121
import org.bukkit.configuration.file.FileConfiguration;
22-
import org.bukkit.craftbukkit.v1_13_R2.entity.CraftPlayer;
22+
import org.bukkit.craftbukkit.v1_14_R1.entity.CraftPlayer;
2323
import org.bukkit.entity.Player;
2424
import org.bukkit.event.EventHandler;
2525
import org.bukkit.event.Listener;

‎src/main/java/de/flo56958/MineTinker/Utilities/ChatWriter.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
package de.flo56958.MineTinker.Utilities;
22

33
import de.flo56958.MineTinker.Main;
4-
import net.minecraft.server.v1_13_R2.ChatComponentText;
5-
import net.minecraft.server.v1_13_R2.ChatMessageType;
6-
import net.minecraft.server.v1_13_R2.PacketPlayOutChat;
7-
import net.minecraft.server.v1_13_R2.PlayerConnection;
4+
import net.minecraft.server.v1_14_R1.ChatComponentText;
5+
import net.minecraft.server.v1_14_R1.ChatMessageType;
6+
import net.minecraft.server.v1_14_R1.PacketPlayOutChat;
7+
import net.minecraft.server.v1_14_R1.PlayerConnection;
88
import org.bukkit.Bukkit;
99
import org.bukkit.ChatColor;
1010
import org.bukkit.command.CommandSender;
11-
import org.bukkit.craftbukkit.v1_13_R2.entity.CraftPlayer;
11+
import org.bukkit.craftbukkit.v1_14_R1.entity.CraftPlayer;
1212
import org.bukkit.entity.Player;
1313
import org.bukkit.scheduler.BukkitRunnable;
1414

‎src/main/resources/plugin.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
name: MineTinker
22
author: Flo56958
3-
version: a16
3+
version: a16.1
44
main: de.flo56958.MineTinker.Main
55
prefix: MineTinker
66

0 commit comments

Comments
 (0)