Skip to content

Commit b91d64d

Browse files
Ghost-chuMelonCode
authored andcommitted
Update to 1.14, move getGameProfile to gameProfile(Mojang: just move this over there.)
1 parent ebe80e8 commit b91d64d

3 files changed

Lines changed: 32 additions & 14 deletions

File tree

30.5 MB
Binary file not shown.

pom.xml

Lines changed: 27 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -20,25 +20,36 @@
2020
</repositories>
2121

2222
<build>
23-
<outputDirectory>target/classes</outputDirectory>
24-
<finalName>${project.name}-${project.version}</finalName>
25-
<defaultGoal>clean install</defaultGoal>
2623
<plugins>
2724
<plugin>
2825
<groupId>org.apache.maven.plugins</groupId>
2926
<artifactId>maven-compiler-plugin</artifactId>
30-
<version>2.0.2</version>
27+
<version>3.1</version>
3128
<configuration>
3229
<source>1.8</source>
3330
<target>1.8</target>
31+
<encoding>UTF-8</encoding>
3432
</configuration>
3533
</plugin>
34+
<plugin>
35+
<artifactId>maven-shade-plugin</artifactId>
36+
<configuration>
37+
<createDependencyReducedPom>false</createDependencyReducedPom>
38+
</configuration>
39+
<executions>
40+
<execution>
41+
<phase>package</phase>
42+
<goals>
43+
<goal>shade</goal>
44+
</goals>
45+
</execution>
46+
</executions>
47+
</plugin>
3648
</plugins>
37-
3849
<resources>
3950
<resource>
40-
<directory>src/main/resources</directory>
4151
<filtering>true</filtering>
52+
<directory>src/main/resources</directory>
4253
</resource>
4354
</resources>
4455
</build>
@@ -48,21 +59,28 @@
4859
<dependency>
4960
<groupId>org.spigotmc</groupId>
5061
<artifactId>spigot-api</artifactId>
51-
<version>1.13.2-R0.1-SNAPSHOT</version>
62+
<version>1.14.4-R0.1-SNAPSHOT</version>
5263
<scope>provided</scope>
5364
</dependency>
5465
<!--Bukkit API-->
5566
<dependency>
5667
<groupId>org.bukkit</groupId>
5768
<artifactId>bukkit</artifactId>
58-
<version>1.13.2-R0.1-SNAPSHOT</version>
69+
<version>1.14.4-R0.1-SNAPSHOT</version>
5970
<scope>provided</scope>
6071
</dependency>
6172
<!--BungeeCord API-->
6273
<dependency>
6374
<groupId>net.md-5</groupId>
6475
<artifactId>bungeecord-api</artifactId>
65-
<version>1.13-SNAPSHOT</version>
76+
<version>1.14-SNAPSHOT</version>
77+
</dependency>
78+
<!-- Spigot Binary-->
79+
<dependency>
80+
<groupId>org.spigotmc</groupId>
81+
<artifactId>spigot-binary</artifactId>
82+
<scope>system</scope>
83+
<systemPath>${basedir}/lib/Spigot-1.14.4-e5b1b5d-20190802-0923.jar</systemPath>
6684
</dependency>
6785
<!-- Apache Commons 3-->
6886
<dependency>

src/main/java/ru/meloncode/xmas/XMas.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
package ru.meloncode.xmas;
22

3-
import net.minecraft.server.v1_13_R2.BlockPosition;
4-
import net.minecraft.server.v1_13_R2.TileEntitySkull;
3+
import net.minecraft.server.v1_14_R1.BlockPosition;
4+
import net.minecraft.server.v1_14_R1.TileEntitySkull;
55
import org.bukkit.Location;
66
import org.bukkit.Material;
77
import org.bukkit.block.Block;
88
import org.bukkit.block.Skull;
9-
import org.bukkit.craftbukkit.v1_13_R2.CraftWorld;
9+
import org.bukkit.craftbukkit.v1_14_R1.CraftWorld;
1010
import org.bukkit.entity.Player;
1111
import org.bukkit.inventory.ItemStack;
1212
import ru.meloncode.xmas.utils.TextUtils;
@@ -46,8 +46,8 @@ public static void processPresent(Block block, Player player) {
4646
if (block.getType() == Material.PLAYER_HEAD) {
4747
Skull skull = (Skull) block.getState();
4848
TileEntitySkull skullTile = (TileEntitySkull) ((CraftWorld)skull.getWorld()).getHandle().getTileEntity(new BlockPosition(skull.getX(), skull.getY(), skull.getZ()));
49-
if(skullTile != null && skullTile.getGameProfile() != null) {
50-
if (Main.getHeads().contains(skullTile.getGameProfile().getName())) {
49+
if(skullTile != null && skullTile.gameProfile != null) {
50+
if (Main.getHeads().contains(skullTile.gameProfile.getName())) {
5151
Location loc = block.getLocation();
5252
if ((Main.RANDOM.nextFloat()) < Main.LUCK_CHANCE || !Main.LUCK_CHANCE_ENABLED) {
5353
loc.getWorld().dropItemNaturally(loc,

0 commit comments

Comments
 (0)