Skip to content

Commit 1ed0892

Browse files
committed
Added support for 1.16.1
1 parent b34ce40 commit 1ed0892

File tree

6 files changed

+18
-17
lines changed

6 files changed

+18
-17
lines changed

.gitignore

+2
Original file line numberDiff line numberDiff line change
@@ -4,3 +4,5 @@
44
*.iml
55

66
v1_15_2/target/
7+
8+
v1_16_1/target/

v1_16_1/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
<groupId>me.PauMAVA</groupId>
88
<artifactId>TheTowersRemastered</artifactId>
9-
<version>1.1</version>
9+
<version>1.2</version>
1010
<build>
1111
<sourceDirectory>src</sourceDirectory>
1212
<resources>

v1_16_1/src/main/java/me/PauMAVA/TTR/match/TTRMatch.java

+10-6
Original file line numberDiff line numberDiff line change
@@ -20,17 +20,21 @@
2020

2121
import me.PauMAVA.TTR.TTRCore;
2222
import me.PauMAVA.TTR.teams.TTRTeam;
23-
import net.minecraft.server.v1_15_R1.Items;
24-
import net.minecraft.server.v1_15_R1.PacketPlayInClientCommand;
25-
import net.minecraft.server.v1_15_R1.PacketPlayInClientCommand.EnumClientCommand;
26-
import org.bukkit.*;
23+
import net.minecraft.server.v1_16_R1.PacketPlayInClientCommand;
24+
import net.minecraft.server.v1_16_R1.PacketPlayInClientCommand.EnumClientCommand;
25+
import org.bukkit.Bukkit;
26+
import org.bukkit.ChatColor;
27+
import org.bukkit.Difficulty;
28+
import org.bukkit.GameMode;
29+
import org.bukkit.Material;
30+
import org.bukkit.Color;
31+
import org.bukkit.Sound;
2732
import org.bukkit.attribute.Attribute;
2833
import org.bukkit.attribute.AttributeInstance;
29-
import org.bukkit.craftbukkit.v1_15_R1.entity.CraftPlayer;
34+
import org.bukkit.craftbukkit.v1_16_R1.entity.CraftPlayer;
3035
import org.bukkit.enchantments.Enchantment;
3136
import org.bukkit.entity.Player;
3237
import org.bukkit.inventory.ItemStack;
33-
import org.bukkit.inventory.meta.ItemMeta;
3438
import org.bukkit.inventory.meta.LeatherArmorMeta;
3539
import org.bukkit.scheduler.BukkitRunnable;
3640

v1_16_1/src/main/java/me/PauMAVA/TTR/ui/TTRCustomTab.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,11 @@
2020

2121
import io.netty.handler.codec.DecoderException;
2222
import me.PauMAVA.TTR.util.TTRPrefix;
23-
import net.minecraft.server.v1_15_R1.ChatComponentText;
24-
import net.minecraft.server.v1_15_R1.PacketPlayOutPlayerListHeaderFooter;
23+
import net.minecraft.server.v1_16_R1.ChatComponentText;
24+
import net.minecraft.server.v1_16_R1.PacketPlayOutPlayerListHeaderFooter;
2525
import org.bukkit.Bukkit;
2626
import org.bukkit.ChatColor;
27-
import org.bukkit.craftbukkit.v1_15_R1.entity.CraftPlayer;
27+
import org.bukkit.craftbukkit.v1_16_R1.entity.CraftPlayer;
2828
import org.bukkit.entity.Player;
2929
import org.bukkit.scheduler.BukkitRunnable;
3030

v1_16_1/src/main/java/me/PauMAVA/TTR/util/EventListener.java

-5
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,6 @@
2121
import me.PauMAVA.TTR.TTRCore;
2222
import me.PauMAVA.TTR.match.MatchStatus;
2323
import me.PauMAVA.TTR.ui.TeamSelector;
24-
import net.minecraft.server.v1_15_R1.PacketPlayInClientCommand;
25-
import org.bukkit.Bukkit;
2624
import org.bukkit.ChatColor;
2725
import org.bukkit.Location;
2826
import org.bukkit.Material;
@@ -34,16 +32,13 @@
3432
import org.bukkit.event.block.BlockPlaceEvent;
3533
import org.bukkit.event.entity.EntityDamageEvent;
3634
import org.bukkit.event.entity.PlayerDeathEvent;
37-
import org.bukkit.event.inventory.InventoryClickEvent;
3835
import org.bukkit.event.player.PlayerDropItemEvent;
3936
import org.bukkit.event.player.PlayerInteractEvent;
4037
import org.bukkit.event.player.PlayerJoinEvent;
4138
import org.bukkit.event.player.PlayerQuitEvent;
4239
import org.bukkit.inventory.Inventory;
4340
import org.bukkit.inventory.ItemStack;
4441

45-
import java.lang.reflect.Field;
46-
4742
public class EventListener implements Listener {
4843

4944
@EventHandler

v1_16_1/src/main/java/me/PauMAVA/TTR/util/PacketIntercepter.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@
2424
import io.netty.channel.ChannelPromise;
2525
import me.PauMAVA.TTR.TTRCore;
2626
import me.PauMAVA.TTR.chat.TTRChatManager;
27-
import net.minecraft.server.v1_15_R1.PacketPlayInChat;
28-
import org.bukkit.craftbukkit.v1_15_R1.entity.CraftPlayer;
27+
import net.minecraft.server.v1_16_R1.PacketPlayInChat;
28+
import org.bukkit.craftbukkit.v1_16_R1.entity.CraftPlayer;
2929
import org.bukkit.entity.Player;
3030

3131
public class PacketIntercepter {

0 commit comments

Comments
 (0)