Skip to content
This repository was archived by the owner on Jul 20, 2020. It is now read-only.

Commit a7912f9

Browse files
ElectroidElectroid
committed
Update to Minecraft 1.12
1 parent b7d7f11 commit a7912f9

File tree

34 files changed

+91
-383
lines changed

34 files changed

+91
-383
lines changed

‎API/api/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<groupId>tc.oc</groupId>
66
<artifactId>api-parent</artifactId>
77
<relativePath>../pom.xml</relativePath>
8-
<version>1.11-SNAPSHOT</version>
8+
<version>1.12.0</version>
99
</parent>
1010

1111
<artifactId>api</artifactId>

‎API/bukkit/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<groupId>tc.oc</groupId>
66
<artifactId>api-parent</artifactId>
77
<relativePath>../pom.xml</relativePath>
8-
<version>1.11-SNAPSHOT</version>
8+
<version>1.12.0</version>
99
</parent>
1010

1111
<artifactId>api-bukkit</artifactId>

‎API/bungee/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<groupId>tc.oc</groupId>
66
<artifactId>api-parent</artifactId>
77
<relativePath>../pom.xml</relativePath>
8-
<version>1.11-SNAPSHOT</version>
8+
<version>1.12.0</version>
99
</parent>
1010

1111
<artifactId>api-bungee</artifactId>

‎API/minecraft/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<groupId>tc.oc</groupId>
66
<artifactId>api-parent</artifactId>
77
<relativePath>../pom.xml</relativePath>
8-
<version>1.11-SNAPSHOT</version>
8+
<version>1.12.0</version>
99
</parent>
1010

1111
<artifactId>api-minecraft</artifactId>

‎API/ocn/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<groupId>tc.oc</groupId>
66
<artifactId>api-parent</artifactId>
77
<relativePath>../pom.xml</relativePath>
8-
<version>1.11-SNAPSHOT</version>
8+
<version>1.12.0</version>
99
</parent>
1010

1111
<artifactId>api-ocn</artifactId>

‎API/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<groupId>tc.oc</groupId>
66
<artifactId>ProjectAres</artifactId>
77
<relativePath>../pom.xml</relativePath>
8-
<version>1.11-SNAPSHOT</version>
8+
<version>1.12.0</version>
99
</parent>
1010

1111
<artifactId>api-parent</artifactId>

‎Commons/bukkit/pom.xml

+4-4
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<artifactId>commons</artifactId>
99
<groupId>tc.oc</groupId>
1010
<relativePath>../pom.xml</relativePath>
11-
<version>1.11-SNAPSHOT</version>
11+
<version>1.12.0</version>
1212
</parent>
1313

1414
<artifactId>commons-bukkit</artifactId>
@@ -44,11 +44,11 @@
4444
<dependency>
4545
<groupId>com.github.rmsy.Channels</groupId>
4646
<artifactId>Channels</artifactId>
47-
<version>1.9-SNAPSHOT</version>
47+
<version>1.12.2.0</version>
4848
<exclusions>
4949
<exclusion>
50-
<groupId>org.bukkit</groupId>
51-
<artifactId>bukkit</artifactId>
50+
<groupId>tc.oc</groupId>
51+
<artifactId>sportbukkit</artifactId>
5252
</exclusion>
5353
</exclusions>
5454
</dependency>

‎Commons/bukkit/src/main/java/tc/oc/commons/bukkit/chat/LinkComponent.java

+5
Original file line numberDiff line numberDiff line change
@@ -91,4 +91,9 @@ private BaseComponent displayLink(URI uri) {
9191
}
9292
return new Component(display);
9393
}
94+
95+
@Override
96+
public BaseComponent duplicateWithoutFormatting() {
97+
return duplicate();
98+
}
9499
}

‎Commons/bukkit/src/main/java/tc/oc/commons/bukkit/chat/PlayerComponent.java

+5
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,11 @@ public BaseComponent duplicate() {
5353
return new PlayerComponent(this);
5454
}
5555

56+
@Override
57+
public BaseComponent duplicateWithoutFormatting() {
58+
return duplicate();
59+
}
60+
5661
@Override
5762
protected void toStringFirst(List<String> fields) {
5863
super.toStringFirst(fields);

‎Commons/bukkit/src/main/java/tc/oc/commons/bukkit/chat/TemplateComponent.java

+5
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,11 @@ public BaseComponent duplicate() {
2929
return new TemplateComponent(message, with);
3030
}
3131

32+
@Override
33+
public BaseComponent duplicateWithoutFormatting() {
34+
return duplicate();
35+
}
36+
3237
@Override
3338
public BaseComponent render(ComponentRenderContext context, CommandSender viewer) {
3439
return new Component(Components.format(message.format(viewer),

‎Commons/bukkit/src/main/java/tc/oc/commons/bukkit/localization/LocalizedMessageMap.java

+5
Original file line numberDiff line numberDiff line change
@@ -89,5 +89,10 @@ public BaseComponent render(ComponentRenderContext context, CommandSender viewer
8989
.orElseThrow(() -> new IllegalStateException("Can't find localized message " + key +
9090
" for locale " + locale));
9191
}
92+
93+
@Override
94+
public BaseComponent duplicateWithoutFormatting() {
95+
return duplicate();
96+
}
9297
}
9398
}

‎Commons/bukkit/src/test/java/tc/oc/commons/bukkit/util/PotionClassificationTest.java

-125
This file was deleted.

‎Commons/bungee/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<artifactId>commons</artifactId>
99
<groupId>tc.oc</groupId>
1010
<relativePath>../pom.xml</relativePath>
11-
<version>1.11-SNAPSHOT</version>
11+
<version>1.12.0</version>
1212
</parent>
1313

1414
<artifactId>commons-bungee</artifactId>

‎Commons/core/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<artifactId>commons</artifactId>
99
<groupId>tc.oc</groupId>
1010
<relativePath>../pom.xml</relativePath>
11-
<version>1.11-SNAPSHOT</version>
11+
<version>1.12.0</version>
1212
</parent>
1313

1414
<artifactId>commons-core</artifactId>

‎Commons/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<groupId>tc.oc</groupId>
99
<artifactId>ProjectAres</artifactId>
1010
<relativePath>../pom.xml</relativePath>
11-
<version>1.11-SNAPSHOT</version>
11+
<version>1.12.0</version>
1212
</parent>
1313

1414
<artifactId>commons</artifactId>

‎Lobby/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<groupId>tc.oc</groupId>
66
<artifactId>ProjectAres</artifactId>
77
<relativePath>../pom.xml</relativePath>
8-
<version>1.11-SNAPSHOT</version>
8+
<version>1.12.0</version>
99
</parent>
1010

1111
<artifactId>Lobby</artifactId>

‎PGM/pom.xml

+1-11
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<groupId>tc.oc</groupId>
66
<artifactId>ProjectAres</artifactId>
77
<relativePath>../pom.xml</relativePath>
8-
<version>1.11-SNAPSHOT</version>
8+
<version>1.12.0</version>
99
</parent>
1010

1111
<!-- Parent Project Information -->
@@ -31,16 +31,6 @@
3131
<version>${project.version}</version>
3232
</dependency>
3333

34-
35-
<!-- Bukkit plugins -->
36-
37-
<dependency>
38-
<groupId>tc.oc</groupId>
39-
<artifactId>chatmoderator</artifactId>
40-
<version>1.9-SNAPSHOT</version>
41-
</dependency>
42-
43-
4434
<!-- Testing -->
4535

4636
<dependency>

‎PGM/src/main/java/tc/oc/pgm/channels/ChannelMatchModule.java

+3-4
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414
import org.bukkit.permissions.Permission;
1515
import org.bukkit.permissions.PermissionDefault;
1616
import org.bukkit.plugin.Plugin;
17-
import tc.oc.chatmoderator.ChatModeratorPlugin;
1817
import tc.oc.commons.bukkit.chat.ComponentRenderers;
1918
import tc.oc.commons.bukkit.util.NullCommandSender;
2019
import tc.oc.commons.bukkit.util.OnlinePlayerMapAdapter;
@@ -101,8 +100,8 @@ protected void createChannel(Party party) {
101100

102101
String format = ComponentRenderers.toLegacyText(party.getChatPrefix(), NullCommandSender.INSTANCE) + "{1}§f: {3}";
103102

104-
PartyChannel channel;
105-
if (getMatch().getPluginManager().getPlugin("ChatModerator") == null) {
103+
PartyChannel channel = new UnfilteredPartyChannel(format, createChannelPermission(party), party);
104+
/*if (getMatch().getPluginManager().getPlugin("ChatModerator") == null) {
106105
channel = new UnfilteredPartyChannel(format,
107106
createChannelPermission(party),
108107
party);
@@ -112,7 +111,7 @@ protected void createChannel(Party party) {
112111
party,
113112
ChatModeratorPlugin.MINIMUM_SCORE_NO_SEND,
114113
ChatModeratorPlugin.PARTIALLY_OFFENSIVE_RATIO);
115-
}
114+
}*/
116115

117116
if(partyChannels.put((MultiPlayerParty) party, channel) != null) {
118117
throw new IllegalStateException("Party added multiple times");

‎PGM/src/main/java/tc/oc/pgm/channels/FilteredPartyChannel.java

-21
This file was deleted.

‎PGM/src/main/java/tc/oc/pgm/goals/GoalComponent.java

+5
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,11 @@ public GoalComponent duplicate() {
6969
return new GoalComponent(goal, competitor, showStatus);
7070
}
7171

72+
@Override
73+
public BaseComponent duplicateWithoutFormatting() {
74+
return duplicate();
75+
}
76+
7277
@Override
7378
public BaseComponent render(ComponentRenderContext context, CommandSender viewer) {
7479
final Match match = goal.getMatch();

‎PGM/src/main/java/tc/oc/pgm/modules/ArrowRemovalMatchModule.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ public class ArrowRemovalMatchModule extends MatchModule implements Listener {
2020
@Repeatable(interval = @Time(seconds = 1))
2121
public void repeat() {
2222
for(Arrow arrow : getMatch().getWorld().getEntitiesByClass(Arrow.class)) {
23-
if(arrow.getTicksLived() >= this.maxTicks && arrow.getPickupRule() != Arrow.PickupRule.ALLOWED) arrow.remove();
23+
if(arrow.getTicksLived() >= this.maxTicks && arrow.getPickupStatus() != Arrow.PickupStatus.ALLOWED) arrow.remove();
2424
}
2525
}
2626
}

‎PGM/src/main/java/tc/oc/pgm/modules/FriendlyFireRefundMatchModule.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ public FriendlyFireRefundMatchModule(Match match) {
2626
public void handleFriendlyFire(EntityDamageByEntityEvent event) {
2727
if(event.isCancelled() && event.getDamager() instanceof Arrow) {
2828
Arrow arrow = (Arrow) event.getDamager();
29-
if(arrow.getPickupRule() == Arrow.PickupRule.ALLOWED && arrow.getShooter() != null && arrow.getShooter() instanceof Player){
29+
if(arrow.getPickupStatus() == Arrow.PickupStatus.ALLOWED && arrow.getShooter() != null && arrow.getShooter() instanceof Player){
3030
Player owner = (Player) arrow.getShooter();
3131
owner.getInventory().addItem(new ItemStack(Material.ARROW));
3232
arrow.remove();

0 commit comments

Comments
 (0)