Update to Minecraft 1.12
This commit is contained in:
parent
b7d7f1188f
commit
a7912f9cbf
|
@ -5,7 +5,7 @@
|
|||
<groupId>tc.oc</groupId>
|
||||
<artifactId>api-parent</artifactId>
|
||||
<relativePath>../pom.xml</relativePath>
|
||||
<version>1.11-SNAPSHOT</version>
|
||||
<version>1.12.0</version>
|
||||
</parent>
|
||||
|
||||
<artifactId>api</artifactId>
|
||||
|
|
|
@ -5,7 +5,7 @@
|
|||
<groupId>tc.oc</groupId>
|
||||
<artifactId>api-parent</artifactId>
|
||||
<relativePath>../pom.xml</relativePath>
|
||||
<version>1.11-SNAPSHOT</version>
|
||||
<version>1.12.0</version>
|
||||
</parent>
|
||||
|
||||
<artifactId>api-bukkit</artifactId>
|
||||
|
|
|
@ -5,7 +5,7 @@
|
|||
<groupId>tc.oc</groupId>
|
||||
<artifactId>api-parent</artifactId>
|
||||
<relativePath>../pom.xml</relativePath>
|
||||
<version>1.11-SNAPSHOT</version>
|
||||
<version>1.12.0</version>
|
||||
</parent>
|
||||
|
||||
<artifactId>api-bungee</artifactId>
|
||||
|
|
|
@ -5,7 +5,7 @@
|
|||
<groupId>tc.oc</groupId>
|
||||
<artifactId>api-parent</artifactId>
|
||||
<relativePath>../pom.xml</relativePath>
|
||||
<version>1.11-SNAPSHOT</version>
|
||||
<version>1.12.0</version>
|
||||
</parent>
|
||||
|
||||
<artifactId>api-minecraft</artifactId>
|
||||
|
|
|
@ -5,7 +5,7 @@
|
|||
<groupId>tc.oc</groupId>
|
||||
<artifactId>api-parent</artifactId>
|
||||
<relativePath>../pom.xml</relativePath>
|
||||
<version>1.11-SNAPSHOT</version>
|
||||
<version>1.12.0</version>
|
||||
</parent>
|
||||
|
||||
<artifactId>api-ocn</artifactId>
|
||||
|
|
|
@ -5,7 +5,7 @@
|
|||
<groupId>tc.oc</groupId>
|
||||
<artifactId>ProjectAres</artifactId>
|
||||
<relativePath>../pom.xml</relativePath>
|
||||
<version>1.11-SNAPSHOT</version>
|
||||
<version>1.12.0</version>
|
||||
</parent>
|
||||
|
||||
<artifactId>api-parent</artifactId>
|
||||
|
|
|
@ -8,7 +8,7 @@
|
|||
<artifactId>commons</artifactId>
|
||||
<groupId>tc.oc</groupId>
|
||||
<relativePath>../pom.xml</relativePath>
|
||||
<version>1.11-SNAPSHOT</version>
|
||||
<version>1.12.0</version>
|
||||
</parent>
|
||||
|
||||
<artifactId>commons-bukkit</artifactId>
|
||||
|
@ -44,11 +44,11 @@
|
|||
<dependency>
|
||||
<groupId>com.github.rmsy.Channels</groupId>
|
||||
<artifactId>Channels</artifactId>
|
||||
<version>1.9-SNAPSHOT</version>
|
||||
<version>1.12.2.0</version>
|
||||
<exclusions>
|
||||
<exclusion>
|
||||
<groupId>org.bukkit</groupId>
|
||||
<artifactId>bukkit</artifactId>
|
||||
<groupId>tc.oc</groupId>
|
||||
<artifactId>sportbukkit</artifactId>
|
||||
</exclusion>
|
||||
</exclusions>
|
||||
</dependency>
|
||||
|
|
|
@ -91,4 +91,9 @@ public class LinkComponent extends ImmutableComponent implements RenderableCompo
|
|||
}
|
||||
return new Component(display);
|
||||
}
|
||||
|
||||
@Override
|
||||
public BaseComponent duplicateWithoutFormatting() {
|
||||
return duplicate();
|
||||
}
|
||||
}
|
||||
|
|
|
@ -53,6 +53,11 @@ public class PlayerComponent extends ImmutableComponent {
|
|||
return new PlayerComponent(this);
|
||||
}
|
||||
|
||||
@Override
|
||||
public BaseComponent duplicateWithoutFormatting() {
|
||||
return duplicate();
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void toStringFirst(List<String> fields) {
|
||||
super.toStringFirst(fields);
|
||||
|
|
|
@ -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),
|
||||
|
|
|
@ -89,5 +89,10 @@ public class LocalizedMessageMap extends AbstractMap<String, BaseComponent> {
|
|||
.orElseThrow(() -> new IllegalStateException("Can't find localized message " + key +
|
||||
" for locale " + locale));
|
||||
}
|
||||
|
||||
@Override
|
||||
public BaseComponent duplicateWithoutFormatting() {
|
||||
return duplicate();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -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<PotionEffect> 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 <BENEFICIAL>",
|
||||
PotionClassification.BENEFICIAL, classify(effects));
|
||||
}
|
||||
}
|
|
@ -8,7 +8,7 @@
|
|||
<artifactId>commons</artifactId>
|
||||
<groupId>tc.oc</groupId>
|
||||
<relativePath>../pom.xml</relativePath>
|
||||
<version>1.11-SNAPSHOT</version>
|
||||
<version>1.12.0</version>
|
||||
</parent>
|
||||
|
||||
<artifactId>commons-bungee</artifactId>
|
||||
|
|
|
@ -8,7 +8,7 @@
|
|||
<artifactId>commons</artifactId>
|
||||
<groupId>tc.oc</groupId>
|
||||
<relativePath>../pom.xml</relativePath>
|
||||
<version>1.11-SNAPSHOT</version>
|
||||
<version>1.12.0</version>
|
||||
</parent>
|
||||
|
||||
<artifactId>commons-core</artifactId>
|
||||
|
|
|
@ -8,7 +8,7 @@
|
|||
<groupId>tc.oc</groupId>
|
||||
<artifactId>ProjectAres</artifactId>
|
||||
<relativePath>../pom.xml</relativePath>
|
||||
<version>1.11-SNAPSHOT</version>
|
||||
<version>1.12.0</version>
|
||||
</parent>
|
||||
|
||||
<artifactId>commons</artifactId>
|
||||
|
|
|
@ -5,7 +5,7 @@
|
|||
<groupId>tc.oc</groupId>
|
||||
<artifactId>ProjectAres</artifactId>
|
||||
<relativePath>../pom.xml</relativePath>
|
||||
<version>1.11-SNAPSHOT</version>
|
||||
<version>1.12.0</version>
|
||||
</parent>
|
||||
|
||||
<artifactId>Lobby</artifactId>
|
||||
|
|
12
PGM/pom.xml
12
PGM/pom.xml
|
@ -5,7 +5,7 @@
|
|||
<groupId>tc.oc</groupId>
|
||||
<artifactId>ProjectAres</artifactId>
|
||||
<relativePath>../pom.xml</relativePath>
|
||||
<version>1.11-SNAPSHOT</version>
|
||||
<version>1.12.0</version>
|
||||
</parent>
|
||||
|
||||
<!-- Parent Project Information -->
|
||||
|
@ -31,16 +31,6 @@
|
|||
<version>${project.version}</version>
|
||||
</dependency>
|
||||
|
||||
|
||||
<!-- Bukkit plugins -->
|
||||
|
||||
<dependency>
|
||||
<groupId>tc.oc</groupId>
|
||||
<artifactId>chatmoderator</artifactId>
|
||||
<version>1.9-SNAPSHOT</version>
|
||||
</dependency>
|
||||
|
||||
|
||||
<!-- Testing -->
|
||||
|
||||
<dependency>
|
||||
|
|
|
@ -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");
|
||||
|
|
|
@ -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;
|
||||
}
|
||||
}
|
|
@ -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();
|
||||
|
|
|
@ -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();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -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();
|
||||
|
|
|
@ -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);
|
||||
}
|
||||
}
|
|
@ -5,7 +5,7 @@
|
|||
<groupId>tc.oc</groupId>
|
||||
<artifactId>ProjectAres</artifactId>
|
||||
<relativePath>../pom.xml</relativePath>
|
||||
<version>1.11-SNAPSHOT</version>
|
||||
<version>1.12.0</version>
|
||||
</parent>
|
||||
|
||||
<groupId>net.anxuiz</groupId>
|
||||
|
|
|
@ -8,7 +8,7 @@
|
|||
<artifactId>util</artifactId>
|
||||
<groupId>tc.oc</groupId>
|
||||
<relativePath>../pom.xml</relativePath>
|
||||
<version>1.11-SNAPSHOT</version>
|
||||
<version>1.12.0</version>
|
||||
</parent>
|
||||
|
||||
<artifactId>util-bukkit</artifactId>
|
||||
|
@ -47,7 +47,7 @@
|
|||
<dependency>
|
||||
<groupId>tc.oc</groupId>
|
||||
<artifactId>raven-bukkit</artifactId>
|
||||
<version>1.11-SNAPSHOT</version>
|
||||
<version>1.12.2.0</version>
|
||||
</dependency>
|
||||
|
||||
<dependency>
|
||||
|
|
|
@ -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;
|
||||
}
|
||||
|
|
|
@ -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) {
|
||||
|
|
|
@ -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));
|
||||
|
|
|
@ -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<Float> zeroHealth = new DataWatcher.Item<>(EntityPlayer.class, EntityLiving.HEALTH, 0f);
|
||||
DataWatcher.Item<Float> zeroHealth = new DataWatcher.Item<>(EntityLiving.HEALTH, 0f);
|
||||
|
||||
if(packet.b != null) {
|
||||
for(int i = 0; i < packet.b.size(); i++) {
|
||||
|
|
|
@ -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);
|
||||
|
|
|
@ -8,7 +8,7 @@
|
|||
<artifactId>util</artifactId>
|
||||
<groupId>tc.oc</groupId>
|
||||
<relativePath>../pom.xml</relativePath>
|
||||
<version>1.11-SNAPSHOT</version>
|
||||
<version>1.12.0</version>
|
||||
</parent>
|
||||
|
||||
<artifactId>util-bungee</artifactId>
|
||||
|
@ -23,7 +23,7 @@
|
|||
<dependency>
|
||||
<groupId>tc.oc</groupId>
|
||||
<artifactId>raven-bungee</artifactId>
|
||||
<version>1.11-SNAPSHOT</version>
|
||||
<version>1.12.0</version>
|
||||
</dependency>
|
||||
|
||||
<dependency>
|
||||
|
|
|
@ -8,7 +8,7 @@
|
|||
<artifactId>util</artifactId>
|
||||
<groupId>tc.oc</groupId>
|
||||
<relativePath>../pom.xml</relativePath>
|
||||
<version>1.11-SNAPSHOT</version>
|
||||
<version>1.12.0</version>
|
||||
</parent>
|
||||
|
||||
<artifactId>util-core</artifactId>
|
||||
|
@ -98,7 +98,7 @@
|
|||
<dependency>
|
||||
<groupId>tc.oc</groupId>
|
||||
<artifactId>raven-minecraft-core</artifactId>
|
||||
<version>1.11-SNAPSHOT</version>
|
||||
<version>1.0.0</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.slf4j</groupId>
|
||||
|
@ -130,7 +130,7 @@
|
|||
|
||||
<dependency>
|
||||
<groupId>tc.oc</groupId>
|
||||
<artifactId>minecraft-api</artifactId>
|
||||
<artifactId>minecraft</artifactId>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>tc.oc</groupId>
|
||||
|
@ -158,8 +158,8 @@
|
|||
|
||||
<dependency>
|
||||
<groupId>tc.oc</groupId>
|
||||
<artifactId>test-util</artifactId>
|
||||
<version>1.0-SNAPSHOT</version>
|
||||
<artifactId>util</artifactId>
|
||||
<version>1.0.1</version>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
|
||||
|
|
|
@ -8,7 +8,7 @@
|
|||
<groupId>tc.oc</groupId>
|
||||
<artifactId>ProjectAres</artifactId>
|
||||
<relativePath>../pom.xml</relativePath>
|
||||
<version>1.11-SNAPSHOT</version>
|
||||
<version>1.12.0</version>
|
||||
<!-- Don't use $global.version because we want to be able to use this in other projects -->
|
||||
</parent>
|
||||
|
||||
|
|
47
pom.xml
47
pom.xml
|
@ -2,13 +2,13 @@
|
|||
<modelVersion>4.0.0</modelVersion>
|
||||
|
||||
<properties>
|
||||
<global.version>1.11-SNAPSHOT</global.version>
|
||||
<global.version>1.12.0</global.version>
|
||||
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
|
||||
</properties>
|
||||
|
||||
<groupId>tc.oc</groupId>
|
||||
<artifactId>ProjectAres</artifactId>
|
||||
<version>1.11-SNAPSHOT</version>
|
||||
<version>1.12.0</version>
|
||||
<packaging>pom</packaging>
|
||||
|
||||
<scm>
|
||||
|
@ -19,26 +19,11 @@
|
|||
|
||||
<repositories>
|
||||
<repository>
|
||||
<id>pa-snapshots</id>
|
||||
<url>https://repo.extension.ws/content/repositories/snapshots</url>
|
||||
</repository>
|
||||
<repository>
|
||||
<id>pa-releases</id>
|
||||
<url>https://repo.extension.ws/content/repositories/releases</url>
|
||||
<id>octc-universe</id>
|
||||
<url>https://maven.pkg.github.com/Electroid</url>
|
||||
</repository>
|
||||
</repositories>
|
||||
|
||||
<distributionManagement>
|
||||
<repository>
|
||||
<id>pa-deployment</id>
|
||||
<url>https://repo.extension.ws/content/repositories/releases</url>
|
||||
</repository>
|
||||
<snapshotRepository>
|
||||
<id>pa-deployment</id>
|
||||
<url>https://repo.extension.ws/content/repositories/snapshots</url>
|
||||
</snapshotRepository>
|
||||
</distributionManagement>
|
||||
|
||||
<modules>
|
||||
<module>Util</module>
|
||||
<module>API</module>
|
||||
|
@ -108,7 +93,7 @@
|
|||
<!-- Our fork -->
|
||||
<groupId>tc.oc</groupId>
|
||||
<artifactId>gson</artifactId>
|
||||
<version>2.5-SNAPSHOT</version>
|
||||
<version>2.5</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.javassist</groupId>
|
||||
|
@ -176,23 +161,23 @@
|
|||
<!-- Bukkit/Bungee shared -->
|
||||
<dependency>
|
||||
<groupId>tc.oc</groupId>
|
||||
<artifactId>minecraft-api</artifactId>
|
||||
<version>1.11-SNAPSHOT</version>
|
||||
<artifactId>minecraft</artifactId>
|
||||
<version>1.0.1</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>tc.oc</groupId>
|
||||
<artifactId>bungeecord-chat</artifactId>
|
||||
<version>1.11-SNAPSHOT</version>
|
||||
<version>1.12.0</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>com.sk89q</groupId>
|
||||
<artifactId>command-framework-core</artifactId>
|
||||
<version>1.9-SNAPSHOT</version>
|
||||
<version>1.0.0</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>me.anxuiz</groupId>
|
||||
<artifactId>settings</artifactId>
|
||||
<version>1.9-SNAPSHOT</version>
|
||||
<version>1.0.0</version>
|
||||
</dependency>
|
||||
|
||||
|
||||
|
@ -200,22 +185,22 @@
|
|||
<dependency>
|
||||
<groupId>tc.oc</groupId>
|
||||
<artifactId>sportbukkit-api</artifactId>
|
||||
<version>1.11.1-R0.1-SNAPSHOT</version>
|
||||
<version>1.12.2.0</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>tc.oc</groupId>
|
||||
<artifactId>sportbukkit</artifactId>
|
||||
<version>1.11.1-R0.1-SNAPSHOT</version>
|
||||
<version>1.12.2.0</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>com.sk89q</groupId>
|
||||
<artifactId>command-framework-bukkit</artifactId>
|
||||
<version>1.9-SNAPSHOT</version>
|
||||
<version>1.12.2.0</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>me.anxuiz</groupId>
|
||||
<artifactId>bukkit-settings</artifactId>
|
||||
<version>1.9-SNAPSHOT</version>
|
||||
<version>1.12.2.0</version>
|
||||
</dependency>
|
||||
|
||||
|
||||
|
@ -223,12 +208,12 @@
|
|||
<dependency>
|
||||
<groupId>tc.oc</groupId>
|
||||
<artifactId>bungeecord-api</artifactId>
|
||||
<version>1.11-SNAPSHOT</version>
|
||||
<version>1.12.0</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>com.sk89q</groupId>
|
||||
<artifactId>command-framework-bungee</artifactId>
|
||||
<version>1.9-SNAPSHOT</version>
|
||||
<version>1.12.0</version>
|
||||
</dependency>
|
||||
|
||||
</dependencies>
|
||||
|
|
Loading…
Reference in New Issue