diff --git a/API/api/pom.xml b/API/api/pom.xml index 9a5a4d5..c43baa3 100644 --- a/API/api/pom.xml +++ b/API/api/pom.xml @@ -5,7 +5,7 @@ tc.oc api-parent ../pom.xml - 1.11-SNAPSHOT + 1.12.0 api diff --git a/API/bukkit/pom.xml b/API/bukkit/pom.xml index acfe812..27b2513 100644 --- a/API/bukkit/pom.xml +++ b/API/bukkit/pom.xml @@ -5,7 +5,7 @@ tc.oc api-parent ../pom.xml - 1.11-SNAPSHOT + 1.12.0 api-bukkit diff --git a/API/bungee/pom.xml b/API/bungee/pom.xml index 69d78c4..fc14c3b 100644 --- a/API/bungee/pom.xml +++ b/API/bungee/pom.xml @@ -5,7 +5,7 @@ tc.oc api-parent ../pom.xml - 1.11-SNAPSHOT + 1.12.0 api-bungee diff --git a/API/minecraft/pom.xml b/API/minecraft/pom.xml index cdb239e..d3bfdd8 100644 --- a/API/minecraft/pom.xml +++ b/API/minecraft/pom.xml @@ -5,7 +5,7 @@ tc.oc api-parent ../pom.xml - 1.11-SNAPSHOT + 1.12.0 api-minecraft diff --git a/API/ocn/pom.xml b/API/ocn/pom.xml index 5616e4d..f2d3b0f 100644 --- a/API/ocn/pom.xml +++ b/API/ocn/pom.xml @@ -5,7 +5,7 @@ tc.oc api-parent ../pom.xml - 1.11-SNAPSHOT + 1.12.0 api-ocn diff --git a/API/pom.xml b/API/pom.xml index 05b29cb..cecd91c 100644 --- a/API/pom.xml +++ b/API/pom.xml @@ -5,7 +5,7 @@ tc.oc ProjectAres ../pom.xml - 1.11-SNAPSHOT + 1.12.0 api-parent diff --git a/Commons/bukkit/pom.xml b/Commons/bukkit/pom.xml index 467baae..7c8e093 100644 --- a/Commons/bukkit/pom.xml +++ b/Commons/bukkit/pom.xml @@ -8,7 +8,7 @@ commons tc.oc ../pom.xml - 1.11-SNAPSHOT + 1.12.0 commons-bukkit @@ -44,11 +44,11 @@ com.github.rmsy.Channels Channels - 1.9-SNAPSHOT + 1.12.2.0 - org.bukkit - bukkit + tc.oc + sportbukkit diff --git a/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/chat/LinkComponent.java b/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/chat/LinkComponent.java index f4949b5..e32bc39 100644 --- a/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/chat/LinkComponent.java +++ b/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/chat/LinkComponent.java @@ -91,4 +91,9 @@ public class LinkComponent extends ImmutableComponent implements RenderableCompo } return new Component(display); } + + @Override + public BaseComponent duplicateWithoutFormatting() { + return duplicate(); + } } diff --git a/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/chat/PlayerComponent.java b/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/chat/PlayerComponent.java index e82c187..2712fcf 100644 --- a/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/chat/PlayerComponent.java +++ b/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/chat/PlayerComponent.java @@ -53,6 +53,11 @@ public class PlayerComponent extends ImmutableComponent { return new PlayerComponent(this); } + @Override + public BaseComponent duplicateWithoutFormatting() { + return duplicate(); + } + @Override protected void toStringFirst(List fields) { super.toStringFirst(fields); diff --git a/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/chat/TemplateComponent.java b/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/chat/TemplateComponent.java index 41d9d46..5e955f7 100644 --- a/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/chat/TemplateComponent.java +++ b/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/chat/TemplateComponent.java @@ -29,6 +29,11 @@ public class TemplateComponent extends ImmutableComponent implements RenderableC return new TemplateComponent(message, with); } + @Override + public BaseComponent duplicateWithoutFormatting() { + return duplicate(); + } + @Override public BaseComponent render(ComponentRenderContext context, CommandSender viewer) { return new Component(Components.format(message.format(viewer), diff --git a/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/localization/LocalizedMessageMap.java b/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/localization/LocalizedMessageMap.java index 0dc8fc6..defb23e 100644 --- a/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/localization/LocalizedMessageMap.java +++ b/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/localization/LocalizedMessageMap.java @@ -89,5 +89,10 @@ public class LocalizedMessageMap extends AbstractMap { .orElseThrow(() -> new IllegalStateException("Can't find localized message " + key + " for locale " + locale)); } + + @Override + public BaseComponent duplicateWithoutFormatting() { + return duplicate(); + } } } diff --git a/Commons/bukkit/src/test/java/tc/oc/commons/bukkit/util/PotionClassificationTest.java b/Commons/bukkit/src/test/java/tc/oc/commons/bukkit/util/PotionClassificationTest.java deleted file mode 100644 index b839ab6..0000000 --- a/Commons/bukkit/src/test/java/tc/oc/commons/bukkit/util/PotionClassificationTest.java +++ /dev/null @@ -1,125 +0,0 @@ -package tc.oc.commons.bukkit.util; - -import java.util.List; - -import com.google.common.collect.ImmutableList; -import org.bukkit.Bukkit; -import org.bukkit.CraftBukkitRuntime; -import org.bukkit.Material; -import org.bukkit.craftbukkit.potion.CraftPotionBrewer; -import org.bukkit.inventory.ItemStack; -import org.bukkit.inventory.meta.PotionMeta; -import org.bukkit.potion.Potion; -import org.bukkit.potion.PotionData; -import org.bukkit.potion.PotionEffect; -import org.bukkit.potion.PotionType; -import org.junit.Before; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.junit.runners.JUnit4; - -import static org.bukkit.potion.PotionEffectType.*; -import static org.junit.Assert.*; -import static tc.oc.commons.bukkit.util.PotionClassification.*; - -/** Tests for {@link PotionUtils} and {@link PotionClassification} */ -@RunWith(JUnit4.class) -public class PotionClassificationTest { - - @Before - public void setUp() { - CraftBukkitRuntime.load(); - if(Potion.getBrewer() == null) { - Potion.setPotionBrewer(new CraftPotionBrewer()); - } - } - - @Test - public void effectTypes() throws Exception { - assertEquals(BENEFICIAL, classify(HEAL)); - assertEquals(HARMFUL, classify(HARM)); - } - - @Test - public void classifyByMostEffects() throws Exception { - assertEquals(BENEFICIAL, classify(ImmutableList.of( - new PotionEffect(SPEED, 1, 0), - new PotionEffect(HARM, 1, 0), - new PotionEffect(LUCK, 1, 0) - ))); - - assertEquals(HARMFUL, classify(ImmutableList.of( - new PotionEffect(SLOW, 1, 0), - new PotionEffect(HEAL, 1, 0), - new PotionEffect(UNLUCK, 1, 0) - ))); - } - - @Test - public void classifyByDuration() throws Exception { - assertEquals(BENEFICIAL, classify(ImmutableList.of( - new PotionEffect(HEAL, 2, 0), - new PotionEffect(HARM, 1, 0) - ))); - - assertEquals(HARMFUL, classify(ImmutableList.of( - new PotionEffect(HEAL, 1, 0), - new PotionEffect(HARM, 2, 0) - ))); - } - - @Test - public void classifyByAmplifier() throws Exception { - assertEquals(BENEFICIAL, classify(ImmutableList.of( - new PotionEffect(HEAL, 1, 1), - new PotionEffect(HARM, 1, 0) - ))); - - assertEquals(HARMFUL, classify(ImmutableList.of( - new PotionEffect(HEAL, 1, 0), - new PotionEffect(HARM, 1, 1) - ))); - } - - @Test - public void negativeAmplifier() throws Exception { - assertEquals(BENEFICIAL, classify(ImmutableList.of( - new PotionEffect(HARM, 1, -1) - ))); - assertEquals(HARMFUL, classify(ImmutableList.of( - new PotionEffect(HEAL, 1, -1) - ))); - } - - @Test - public void vanillaBrews() throws Exception { - assertEquals(BENEFICIAL, classify(Bukkit.potionRegistry().get(Bukkit.key("healing")))); - assertEquals(BENEFICIAL, classify(new PotionData(PotionType.INSTANT_HEAL, false, false))); - assertEquals(HARMFUL, classify(Bukkit.potionRegistry().get(Bukkit.key("harming")))); - assertEquals(HARMFUL, classify(new PotionData(PotionType.INSTANT_DAMAGE, false, false))); - } - - @Test - public void potionItem() throws Exception { - final ItemStack item = new ItemStack(Material.POTION); - final PotionMeta meta = (PotionMeta) item.getItemMeta(); - meta.setPotionBrew(Bukkit.potionRegistry().get(Bukkit.key("healing"))); - item.setItemMeta(meta); - - } - - @Test - public void riftCaseTest() { - List effects = ImmutableList.of( - new PotionEffect(FAST_DIGGING, 3600, 3), - new PotionEffect(REGENERATION, 3600, 2), - new PotionEffect(DAMAGE_RESISTANCE, 3600, 1), - new PotionEffect(FIRE_RESISTANCE, 3600, 1), - new PotionEffect(SPEED, 3600, 1), - new PotionEffect(INCREASE_DAMAGE, 3600, 1) - ); - - assertEquals("Rift Baron potion was not classified as ", - PotionClassification.BENEFICIAL, classify(effects)); - } -} diff --git a/Commons/bungee/pom.xml b/Commons/bungee/pom.xml index 86e4dbf..b039068 100644 --- a/Commons/bungee/pom.xml +++ b/Commons/bungee/pom.xml @@ -8,7 +8,7 @@ commons tc.oc ../pom.xml - 1.11-SNAPSHOT + 1.12.0 commons-bungee diff --git a/Commons/core/pom.xml b/Commons/core/pom.xml index 430cdf1..b986219 100644 --- a/Commons/core/pom.xml +++ b/Commons/core/pom.xml @@ -8,7 +8,7 @@ commons tc.oc ../pom.xml - 1.11-SNAPSHOT + 1.12.0 commons-core diff --git a/Commons/pom.xml b/Commons/pom.xml index a146bd9..f97b4d1 100644 --- a/Commons/pom.xml +++ b/Commons/pom.xml @@ -8,7 +8,7 @@ tc.oc ProjectAres ../pom.xml - 1.11-SNAPSHOT + 1.12.0 commons diff --git a/Lobby/pom.xml b/Lobby/pom.xml index 2ab7772..87cac80 100644 --- a/Lobby/pom.xml +++ b/Lobby/pom.xml @@ -5,7 +5,7 @@ tc.oc ProjectAres ../pom.xml - 1.11-SNAPSHOT + 1.12.0 Lobby diff --git a/PGM/pom.xml b/PGM/pom.xml index 819a400..60861f8 100644 --- a/PGM/pom.xml +++ b/PGM/pom.xml @@ -5,7 +5,7 @@ tc.oc ProjectAres ../pom.xml - 1.11-SNAPSHOT + 1.12.0 @@ -31,16 +31,6 @@ ${project.version} - - - - - tc.oc - chatmoderator - 1.9-SNAPSHOT - - - diff --git a/PGM/src/main/java/tc/oc/pgm/channels/ChannelMatchModule.java b/PGM/src/main/java/tc/oc/pgm/channels/ChannelMatchModule.java index 9ce18ea..ae16145 100644 --- a/PGM/src/main/java/tc/oc/pgm/channels/ChannelMatchModule.java +++ b/PGM/src/main/java/tc/oc/pgm/channels/ChannelMatchModule.java @@ -14,7 +14,6 @@ import org.bukkit.event.Listener; import org.bukkit.permissions.Permission; import org.bukkit.permissions.PermissionDefault; import org.bukkit.plugin.Plugin; -import tc.oc.chatmoderator.ChatModeratorPlugin; import tc.oc.commons.bukkit.chat.ComponentRenderers; import tc.oc.commons.bukkit.util.NullCommandSender; import tc.oc.commons.bukkit.util.OnlinePlayerMapAdapter; @@ -101,8 +100,8 @@ public class ChannelMatchModule extends MatchModule implements Listener { String format = ComponentRenderers.toLegacyText(party.getChatPrefix(), NullCommandSender.INSTANCE) + "{1}§f: {3}"; - PartyChannel channel; - if (getMatch().getPluginManager().getPlugin("ChatModerator") == null) { + PartyChannel channel = new UnfilteredPartyChannel(format, createChannelPermission(party), party); + /*if (getMatch().getPluginManager().getPlugin("ChatModerator") == null) { channel = new UnfilteredPartyChannel(format, createChannelPermission(party), party); @@ -112,7 +111,7 @@ public class ChannelMatchModule extends MatchModule implements Listener { party, ChatModeratorPlugin.MINIMUM_SCORE_NO_SEND, ChatModeratorPlugin.PARTIALLY_OFFENSIVE_RATIO); - } + }*/ if(partyChannels.put((MultiPlayerParty) party, channel) != null) { throw new IllegalStateException("Party added multiple times"); diff --git a/PGM/src/main/java/tc/oc/pgm/channels/FilteredPartyChannel.java b/PGM/src/main/java/tc/oc/pgm/channels/FilteredPartyChannel.java deleted file mode 100644 index 4e04292..0000000 --- a/PGM/src/main/java/tc/oc/pgm/channels/FilteredPartyChannel.java +++ /dev/null @@ -1,21 +0,0 @@ -package tc.oc.pgm.channels; - -import com.google.common.base.Preconditions; -import org.bukkit.permissions.Permission; -import tc.oc.chatmoderator.channels.SimpleFilteredChannel; -import tc.oc.pgm.match.Party; - -public class FilteredPartyChannel extends SimpleFilteredChannel implements PartyChannel { - - private final Party party; - - public FilteredPartyChannel(String format, final Permission permission, final Party party, int minimumScoreNoSend, float partial) { - super(format, permission, minimumScoreNoSend, partial); - this.party = Preconditions.checkNotNull(party, "party"); - } - - @Override - public Party getParty() { - return this.party; - } -} diff --git a/PGM/src/main/java/tc/oc/pgm/goals/GoalComponent.java b/PGM/src/main/java/tc/oc/pgm/goals/GoalComponent.java index 61f2626..ffe6a1c 100644 --- a/PGM/src/main/java/tc/oc/pgm/goals/GoalComponent.java +++ b/PGM/src/main/java/tc/oc/pgm/goals/GoalComponent.java @@ -69,6 +69,11 @@ public class GoalComponent extends ImmutableComponent implements RenderableCompo return new GoalComponent(goal, competitor, showStatus); } + @Override + public BaseComponent duplicateWithoutFormatting() { + return duplicate(); + } + @Override public BaseComponent render(ComponentRenderContext context, CommandSender viewer) { final Match match = goal.getMatch(); diff --git a/PGM/src/main/java/tc/oc/pgm/modules/ArrowRemovalMatchModule.java b/PGM/src/main/java/tc/oc/pgm/modules/ArrowRemovalMatchModule.java index aaedc21..4102000 100644 --- a/PGM/src/main/java/tc/oc/pgm/modules/ArrowRemovalMatchModule.java +++ b/PGM/src/main/java/tc/oc/pgm/modules/ArrowRemovalMatchModule.java @@ -20,7 +20,7 @@ public class ArrowRemovalMatchModule extends MatchModule implements Listener { @Repeatable(interval = @Time(seconds = 1)) public void repeat() { for(Arrow arrow : getMatch().getWorld().getEntitiesByClass(Arrow.class)) { - if(arrow.getTicksLived() >= this.maxTicks && arrow.getPickupRule() != Arrow.PickupRule.ALLOWED) arrow.remove(); + if(arrow.getTicksLived() >= this.maxTicks && arrow.getPickupStatus() != Arrow.PickupStatus.ALLOWED) arrow.remove(); } } } diff --git a/PGM/src/main/java/tc/oc/pgm/modules/FriendlyFireRefundMatchModule.java b/PGM/src/main/java/tc/oc/pgm/modules/FriendlyFireRefundMatchModule.java index 1e965af..d9f8152 100644 --- a/PGM/src/main/java/tc/oc/pgm/modules/FriendlyFireRefundMatchModule.java +++ b/PGM/src/main/java/tc/oc/pgm/modules/FriendlyFireRefundMatchModule.java @@ -26,7 +26,7 @@ public class FriendlyFireRefundMatchModule extends MatchModule implements Listen public void handleFriendlyFire(EntityDamageByEntityEvent event) { if(event.isCancelled() && event.getDamager() instanceof Arrow) { Arrow arrow = (Arrow) event.getDamager(); - if(arrow.getPickupRule() == Arrow.PickupRule.ALLOWED && arrow.getShooter() != null && arrow.getShooter() instanceof Player){ + if(arrow.getPickupStatus() == Arrow.PickupStatus.ALLOWED && arrow.getShooter() != null && arrow.getShooter() instanceof Player){ Player owner = (Player) arrow.getShooter(); owner.getInventory().addItem(new ItemStack(Material.ARROW)); arrow.remove(); diff --git a/PGM/src/test/java/tc/oc/pgm/filter/ItemMatcherTest.java b/PGM/src/test/java/tc/oc/pgm/filter/ItemMatcherTest.java deleted file mode 100644 index 9934bfa..0000000 --- a/PGM/src/test/java/tc/oc/pgm/filter/ItemMatcherTest.java +++ /dev/null @@ -1,160 +0,0 @@ -package tc.oc.pgm.filter; - -import org.bukkit.CraftBukkitRuntime; -import org.bukkit.DyeColor; -import org.bukkit.Material; -import org.bukkit.craftbukkit.inventory.CraftItemStack; -import org.bukkit.inventory.ImItemStack; -import org.bukkit.inventory.ItemStack; -import org.bukkit.inventory.meta.PotionMeta; -import org.bukkit.material.Wool; -import org.bukkit.potion.PotionData; -import org.bukkit.potion.PotionType; -import org.junit.Before; -import org.junit.Test; -import tc.oc.pgm.filters.ItemMatcher; -import tc.oc.pgm.kits.tag.ItemTags; -import tc.oc.pgm.projectile.Projectiles; - -import static org.junit.Assert.*; - -public class ItemMatcherTest { - - @Before - public void setUp() throws Exception { - CraftBukkitRuntime.load(); - } - - private void assertMatches(ItemStack item, ItemStack query) { - final ItemMatcher matcher = new ItemMatcher(item); - - if(!matcher.test(query)) { - fail("Item should match: reference=" + item + " query=" + query); - } - - final CraftItemStack nms = CraftItemStack.asCraftMirror(CraftItemStack.asNMSCopy(query)); - if(!matcher.test(nms)) { - fail("Converted item should match: reference=" + item + " query=" + query); - } - } - - private void refuteMatches(ItemStack item, ItemStack query) { - final ItemMatcher matcher = new ItemMatcher(item); - - if(matcher.test(query)) { - fail("Item should not match: reference=" + item + " query=" + query); - } - - final CraftItemStack nms = CraftItemStack.asCraftMirror(CraftItemStack.asNMSCopy(query)); - if(matcher.test(nms)) { - fail("Converted item should not match: reference=" + item + " query=" + query); - } - } - - @Test - public void simpleItemMatches() throws Throwable { - ImItemStack item = ItemStack.builder(Material.BEDROCK) - .immutable(); - assertMatches(item, item); - } - - @Test - public void itemWithDataMatches() throws Throwable { - ImItemStack item = ItemStack.builder(new Wool(DyeColor.PINK)) - .immutable(); - assertMatches(item, item); - } - - @Test - public void itemWithMetaMatches() throws Throwable { - ImItemStack item = ItemStack.builder(Material.BEDROCK) - .meta(meta -> meta.setDisplayName("Hi!")) - .immutable(); - assertMatches(item, item); - } - - @Test - public void itemWithTypedMetaMatches() throws Throwable { - ImItemStack item = ItemStack.builder(Material.POTION) - .meta(PotionMeta.class, meta -> meta.setBasePotionData(new PotionData(PotionType.LUCK, false, false))) - .immutable(); - assertMatches(item, item); - } - - @Test - public void itemWithCustomProjectileMatches() throws Throwable { - ImItemStack item = ItemStack.builder(Material.STICK) - .meta(meta -> Projectiles.setProjectileId(meta, "woot")) - .immutable(); - assertMatches(item, item); - } - - @Test - public void differentMaterialsDontMatch() throws Throwable { - refuteMatches(new ItemStack(Material.BEDROCK), - new ItemStack(Material.APPLE)); - } - - @Test - public void differentDataDoesntMatch() throws Throwable { - refuteMatches(new ItemStack(new Wool(DyeColor.PINK)), - new ItemStack(new Wool(DyeColor.BLUE))); - } - - @Test - public void differentMetaDoesntMatch() throws Throwable { - refuteMatches(ItemStack.builder(Material.BEDROCK).meta(meta -> meta.setDisplayName("Hi!")).immutable(), - ItemStack.builder(Material.BEDROCK).meta(meta -> meta.setDisplayName("Bye!")).immutable()); - } - - @Test - public void differentProjectileDoesntMatch() throws Throwable { - refuteMatches(ItemStack.builder(Material.STICK).meta(meta -> Projectiles.setProjectileId(meta, "woot")).immutable(), - ItemStack.builder(Material.STICK).meta(meta -> Projectiles.setProjectileId(meta, "doink")).immutable()); - } - - @Test - public void nullDoesntMatch() throws Throwable { - assertFalse(new ItemMatcher(new ItemStack(Material.BEDROCK)).test(null)); - } - - @Test - public void biggerStackMatches() throws Throwable { - assertMatches(new ItemStack(Material.BEDROCK, 3), - new ItemStack(Material.BEDROCK, 4)); - } - - @Test - public void smallerStackDoesNotMatch() throws Throwable { - refuteMatches(new ItemStack(Material.BEDROCK, 3), - new ItemStack(Material.BEDROCK, 2)); - } - - @Test - public void durabilityIgnoredOnDamageableItem() throws Throwable { - assertMatches(new ItemStack(Material.STONE_SWORD, 1, (short) 123), - new ItemStack(Material.STONE_SWORD, 1, (short) 456)); - } - - @Test - public void durabilityMattersOnDataItem() throws Throwable { - refuteMatches(new ItemStack(Material.WOOL, 1, (short) 1), - new ItemStack(Material.WOOL, 1, (short) 2)); - } - - @Test - public void lockFlagIgnored() throws Throwable { - ItemStack ref = new ItemStack(Material.BEDROCK); - ItemStack query = ref.clone(); - ItemTags.LOCKED.set(query, true); - assertMatches(ref, query); - } - - @Test - public void preventSharingFlagIgnored() throws Throwable { - ItemStack ref = new ItemStack(Material.BEDROCK); - ItemStack query = ref.clone(); - ItemTags.PREVENT_SHARING.set(query, true); - assertMatches(ref, query); - } -} diff --git a/Tourney/pom.xml b/Tourney/pom.xml index f0d63bc..8f5dd62 100644 --- a/Tourney/pom.xml +++ b/Tourney/pom.xml @@ -5,7 +5,7 @@ tc.oc ProjectAres ../pom.xml - 1.11-SNAPSHOT + 1.12.0 net.anxuiz diff --git a/Util/bukkit/pom.xml b/Util/bukkit/pom.xml index e58ea45..924162e 100644 --- a/Util/bukkit/pom.xml +++ b/Util/bukkit/pom.xml @@ -8,7 +8,7 @@ util tc.oc ../pom.xml - 1.11-SNAPSHOT + 1.12.0 util-bukkit @@ -47,7 +47,7 @@ tc.oc raven-bukkit - 1.11-SNAPSHOT + 1.12.2.0 diff --git a/Util/bukkit/src/main/java/tc/oc/commons/bukkit/chat/HeaderComponent.java b/Util/bukkit/src/main/java/tc/oc/commons/bukkit/chat/HeaderComponent.java index d7f3717..6d1e42a 100644 --- a/Util/bukkit/src/main/java/tc/oc/commons/bukkit/chat/HeaderComponent.java +++ b/Util/bukkit/src/main/java/tc/oc/commons/bukkit/chat/HeaderComponent.java @@ -53,6 +53,11 @@ public class HeaderComponent extends ImmutableComponent implements RenderableCom return new HeaderComponent(lineColor, width, content == null ? null : content.duplicate()); } + @Override + public BaseComponent duplicateWithoutFormatting() { + return duplicate(); + } + public ChatColor getLineColor() { return lineColor; } diff --git a/Util/bukkit/src/main/java/tc/oc/commons/bukkit/chat/ListComponent.java b/Util/bukkit/src/main/java/tc/oc/commons/bukkit/chat/ListComponent.java index 5b5675b..29931ba 100644 --- a/Util/bukkit/src/main/java/tc/oc/commons/bukkit/chat/ListComponent.java +++ b/Util/bukkit/src/main/java/tc/oc/commons/bukkit/chat/ListComponent.java @@ -44,6 +44,11 @@ public class ListComponent extends ImmutableComponent implements RenderableCompo return new ListComponent(elements); } + @Override + public BaseComponent duplicateWithoutFormatting() { + return duplicate(); + } + @Override public BaseComponent render(ComponentRenderContext context, CommandSender viewer) { if(expanded == null) { diff --git a/Util/bukkit/src/main/java/tc/oc/commons/bukkit/chat/WarningComponent.java b/Util/bukkit/src/main/java/tc/oc/commons/bukkit/chat/WarningComponent.java index 818c62a..a63bd81 100644 --- a/Util/bukkit/src/main/java/tc/oc/commons/bukkit/chat/WarningComponent.java +++ b/Util/bukkit/src/main/java/tc/oc/commons/bukkit/chat/WarningComponent.java @@ -32,6 +32,11 @@ public class WarningComponent extends ImmutableComponent implements RenderableCo return new WarningComponent(content.duplicate()); } + @Override + public BaseComponent duplicateWithoutFormatting() { + return duplicate(); + } + @Override public BaseComponent render(ComponentRenderContext context, CommandSender viewer) { return Components.warning(context.render(content, viewer)); diff --git a/Util/bukkit/src/main/java/tc/oc/commons/bukkit/util/NMSHacks.java b/Util/bukkit/src/main/java/tc/oc/commons/bukkit/util/NMSHacks.java index 714723f..8e7e304 100644 --- a/Util/bukkit/src/main/java/tc/oc/commons/bukkit/util/NMSHacks.java +++ b/Util/bukkit/src/main/java/tc/oc/commons/bukkit/util/NMSHacks.java @@ -408,7 +408,7 @@ public class NMSHacks { super(new EntityZombie(((CraftWorld) world).getHandle())); entity.setInvisible(invisible); - entity.setAI(true); + entity.setNoAI(true); } } @@ -684,7 +684,7 @@ public class NMSHacks { // Add/replace health to zero boolean replaced = false; - DataWatcher.Item zeroHealth = new DataWatcher.Item<>(EntityPlayer.class, EntityLiving.HEALTH, 0f); + DataWatcher.Item zeroHealth = new DataWatcher.Item<>(EntityLiving.HEALTH, 0f); if(packet.b != null) { for(int i = 0; i < packet.b.size(); i++) { diff --git a/Util/bukkit/src/main/java/tc/oc/commons/bukkit/util/PacketTracer.java b/Util/bukkit/src/main/java/tc/oc/commons/bukkit/util/PacketTracer.java index b7934fa..395d139 100644 --- a/Util/bukkit/src/main/java/tc/oc/commons/bukkit/util/PacketTracer.java +++ b/Util/bukkit/src/main/java/tc/oc/commons/bukkit/util/PacketTracer.java @@ -185,7 +185,7 @@ public class PacketTracer extends PacketDataSerializer { @Override protected void encode(ChannelHandlerContext context, Packet packet, ByteBuf buffer) throws Exception { final NetworkManager networkManager = context.pipeline().get(NetworkManager.class); - final Integer id = context.channel().attr(NetworkManager.c).get().a(EnumProtocolDirection.CLIENTBOUND, packet, networkManager.protocolVersion); + final Integer id = context.channel().attr(NetworkManager.c).get().a(EnumProtocolDirection.CLIENTBOUND, packet); if (id == null) { throw new IOException("Cannot encode unregistered packet class " + packet.getClass()); } else { @@ -216,7 +216,7 @@ public class PacketTracer extends PacketDataSerializer { final PacketTracer dumper = new PacketTracer(buffer, logger, client); final int id = dumper.g(); // read VarInt final NetworkManager networkManager = context.pipeline().get(NetworkManager.class); - final Packet packet = context.channel().attr(NetworkManager.c).get().a(EnumProtocolDirection.SERVERBOUND, id, networkManager.protocolVersion); + final Packet packet = context.channel().attr(NetworkManager.c).get().a(EnumProtocolDirection.SERVERBOUND, id); if (packet == null) { throw new IOException("Cannot decode unregistered packet ID " + id); diff --git a/Util/bungee/pom.xml b/Util/bungee/pom.xml index 106af56..dfdd6dc 100644 --- a/Util/bungee/pom.xml +++ b/Util/bungee/pom.xml @@ -8,7 +8,7 @@ util tc.oc ../pom.xml - 1.11-SNAPSHOT + 1.12.0 util-bungee @@ -23,7 +23,7 @@ tc.oc raven-bungee - 1.11-SNAPSHOT + 1.12.0 diff --git a/Util/core/pom.xml b/Util/core/pom.xml index 4f5e8a4..a173957 100644 --- a/Util/core/pom.xml +++ b/Util/core/pom.xml @@ -8,7 +8,7 @@ util tc.oc ../pom.xml - 1.11-SNAPSHOT + 1.12.0 util-core @@ -98,7 +98,7 @@ tc.oc raven-minecraft-core - 1.11-SNAPSHOT + 1.0.0 org.slf4j @@ -130,7 +130,7 @@ tc.oc - minecraft-api + minecraft tc.oc @@ -158,8 +158,8 @@ tc.oc - test-util - 1.0-SNAPSHOT + util + 1.0.1 diff --git a/Util/pom.xml b/Util/pom.xml index b43bffd..2f5aabf 100644 --- a/Util/pom.xml +++ b/Util/pom.xml @@ -8,7 +8,7 @@ tc.oc ProjectAres ../pom.xml - 1.11-SNAPSHOT + 1.12.0 diff --git a/pom.xml b/pom.xml index f0b6765..ca46477 100644 --- a/pom.xml +++ b/pom.xml @@ -2,13 +2,13 @@ 4.0.0 - 1.11-SNAPSHOT + 1.12.0 UTF-8 tc.oc ProjectAres - 1.11-SNAPSHOT + 1.12.0 pom @@ -19,26 +19,11 @@ - pa-snapshots - https://repo.extension.ws/content/repositories/snapshots - - - pa-releases - https://repo.extension.ws/content/repositories/releases + octc-universe + https://maven.pkg.github.com/Electroid - - - pa-deployment - https://repo.extension.ws/content/repositories/releases - - - pa-deployment - https://repo.extension.ws/content/repositories/snapshots - - - Util API @@ -108,7 +93,7 @@ tc.oc gson - 2.5-SNAPSHOT + 2.5 org.javassist @@ -176,23 +161,23 @@ tc.oc - minecraft-api - 1.11-SNAPSHOT + minecraft + 1.0.1 tc.oc bungeecord-chat - 1.11-SNAPSHOT + 1.12.0 com.sk89q command-framework-core - 1.9-SNAPSHOT + 1.0.0 me.anxuiz settings - 1.9-SNAPSHOT + 1.0.0 @@ -200,22 +185,22 @@ tc.oc sportbukkit-api - 1.11.1-R0.1-SNAPSHOT + 1.12.2.0 tc.oc sportbukkit - 1.11.1-R0.1-SNAPSHOT + 1.12.2.0 com.sk89q command-framework-bukkit - 1.9-SNAPSHOT + 1.12.2.0 me.anxuiz bukkit-settings - 1.9-SNAPSHOT + 1.12.2.0 @@ -223,12 +208,12 @@ tc.oc bungeecord-api - 1.11-SNAPSHOT + 1.12.0 com.sk89q command-framework-bungee - 1.9-SNAPSHOT + 1.12.0