Rx3/Quakecraft
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to Spigot-1.16.5

Browse Source 
Update Vault / WorldEdit / WorldGuard version
Update Plugin
Fix CR/LF
This commit is contained in:
Arnaud G. GIBERT
2021-04-24 11:11:25 +02:00
parent aabf6db1ae
commit 0506ebc2c2
18 changed files with 2791 additions and 2759 deletions
Download Patch File Download Diff File Expand all files Collapse all files

332
src/com/Geekpower14/Quake/Versions/GetMaterials.java
View File

@@ -1,166 +1,166 @@
/*
* To change this license header, choose License Headers in Project Properties.
* To change this template file, choose Tools | Templates
* and open the template in the editor.
*/
package com.Geekpower14.Quake.Versions;
import com.Geekpower14.Quake.Quake;
import org.bukkit.Material;
/**
*
* @author Bl4ckSkull666
*/
public class GetMaterials {
private static Material _sign = null;
private static Material _bed = null;
private static Material _hoeDiamand = null;
private static Material _leatherChestPlate = null;
private static Material _jackOLantern = null;
private static Material _emerald = null;
public static Material GetSign() {
if(_sign == null) {
if(Quake.getPlugin()._config.isString("materials.sign")) {
String mat = Quake.getPlugin()._config.getString("materials.sign");
for(Material m: Material.values()) {
if(m.name().equalsIgnoreCase(mat)) {
_sign = m;
break;
}
}
}
if(_sign == null) {
for(Material m: Material.values()) {
if(m.name().equalsIgnoreCase("SIGN") || m.name().equalsIgnoreCase("OAK_SIGN")) {
_sign = m;
break;
}
}
}
}
return _sign;
}
public static Material GetBed() {
if(_bed == null) {
if(Quake.getPlugin()._config.isString("materials.bed")) {
String mat = Quake.getPlugin()._config.getString("materials.bed");
for(Material m: Material.values()) {
if(m.name().equalsIgnoreCase(mat)) {
_bed = m;
break;
}
}
}
if(_bed == null) {
for(Material m: Material.values()) {
if(m.name().equalsIgnoreCase("BED") || m.name().equalsIgnoreCase("RED_BED")) {
_bed = m;
break;
}
}
}
}
return _bed;
}
public static Material GetDiamandHoe() {
if(_hoeDiamand == null) {
if(Quake.getPlugin()._config.isString("materials.diamond_hoe")) {
String mat = Quake.getPlugin()._config.getString("materials.diamond_hoe");
for(Material m: Material.values()) {
if(m.name().equalsIgnoreCase(mat)) {
_hoeDiamand = m;
break;
}
}
}
if(_hoeDiamand == null) {
for(Material m: Material.values()) {
if(m.name().equalsIgnoreCase("DIAMOND_HOE")) {
_hoeDiamand = m;
break;
}
}
}
}
return _hoeDiamand;
}
public static Material GetLeatherChestplate() {
if(_leatherChestPlate == null) {
if(Quake.getPlugin()._config.isString("materials.leather_chestplate")) {
String mat = Quake.getPlugin()._config.getString("materials.leather_chestplate");
for(Material m: Material.values()) {
if(m.name().equalsIgnoreCase(mat)) {
_leatherChestPlate = m;
break;
}
}
}
if(_leatherChestPlate == null) {
for(Material m: Material.values()) {
if(m.name().equalsIgnoreCase("LEATHER_CHESTPLATE")) {
_leatherChestPlate = m;
break;
}
}
}
}
return _leatherChestPlate;
}
public static Material GetJackOLantern() {
if(_jackOLantern == null) {
if(Quake.getPlugin()._config.isString("materials.jack_o_lantern")) {
String mat = Quake.getPlugin()._config.getString("materials.jack_o_lantern");
for(Material m: Material.values()) {
if(m.name().equalsIgnoreCase(mat)) {
_jackOLantern = m;
break;
}
}
}
if(_jackOLantern == null) {
for(Material m: Material.values()) {
if(m.name().equalsIgnoreCase("JACK_O_LANTERN")) {
_jackOLantern = m;
break;
}
}
}
}
return _jackOLantern;
}
public static Material GetEmerald() {
if(_emerald == null) {
if(Quake.getPlugin()._config.isString("materials.emerald")) {
String mat = Quake.getPlugin()._config.getString("materials.emerald");
for(Material m: Material.values()) {
if(m.name().equalsIgnoreCase(mat)) {
_emerald = m;
break;
}
}
}
if(_emerald == null) {
for(Material m: Material.values()) {
if(m.name().equalsIgnoreCase("EMERALD")) {
_emerald = m;
break;
}
}
}
}
return _emerald;
}
}
/*
* To change this license header, choose License Headers in Project Properties.
* To change this template file, choose Tools | Templates
* and open the template in the editor.
*/
package com.Geekpower14.Quake.Versions;
import com.Geekpower14.Quake.Quake;
import org.bukkit.Material;
/**
*
* @author Bl4ckSkull666
*/
public class GetMaterials {
private static Material _sign = null;
private static Material _bed = null;
private static Material _hoeDiamand = null;
private static Material _leatherChestPlate = null;
private static Material _jackOLantern = null;
private static Material _emerald = null;
public static Material GetSign() {
if(_sign == null) {
if(Quake.getPlugin()._config.isString("materials.sign")) {
String mat = Quake.getPlugin()._config.getString("materials.sign");
for(Material m: Material.values()) {
if(m.name().equalsIgnoreCase(mat)) {
_sign = m;
break;
}
}
}
if(_sign == null) {
for(Material m: Material.values()) {
if(m.name().equalsIgnoreCase("SIGN") || m.name().equalsIgnoreCase("OAK_SIGN")) {
_sign = m;
break;
}
}
}
}
return _sign;
}
public static Material GetBed() {
if(_bed == null) {
if(Quake.getPlugin()._config.isString("materials.bed")) {
String mat = Quake.getPlugin()._config.getString("materials.bed");
for(Material m: Material.values()) {
if(m.name().equalsIgnoreCase(mat)) {
_bed = m;
break;
}
}
}
if(_bed == null) {
for(Material m: Material.values()) {
if(m.name().equalsIgnoreCase("BED") || m.name().equalsIgnoreCase("RED_BED")) {
_bed = m;
break;
}
}
}
}
return _bed;
}
public static Material GetDiamandHoe() {
if(_hoeDiamand == null) {
if(Quake.getPlugin()._config.isString("materials.diamond_hoe")) {
String mat = Quake.getPlugin()._config.getString("materials.diamond_hoe");
for(Material m: Material.values()) {
if(m.name().equalsIgnoreCase(mat)) {
_hoeDiamand = m;
break;
}
}
}
if(_hoeDiamand == null) {
for(Material m: Material.values()) {
if(m.name().equalsIgnoreCase("DIAMOND_HOE")) {
_hoeDiamand = m;
break;
}
}
}
}
return _hoeDiamand;
}
public static Material GetLeatherChestplate() {
if(_leatherChestPlate == null) {
if(Quake.getPlugin()._config.isString("materials.leather_chestplate")) {
String mat = Quake.getPlugin()._config.getString("materials.leather_chestplate");
for(Material m: Material.values()) {
if(m.name().equalsIgnoreCase(mat)) {
_leatherChestPlate = m;
break;
}
}
}
if(_leatherChestPlate == null) {
for(Material m: Material.values()) {
if(m.name().equalsIgnoreCase("LEATHER_CHESTPLATE")) {
_leatherChestPlate = m;
break;
}
}
}
}
return _leatherChestPlate;
}
public static Material GetJackOLantern() {
if(_jackOLantern == null) {
if(Quake.getPlugin()._config.isString("materials.jack_o_lantern")) {
String mat = Quake.getPlugin()._config.getString("materials.jack_o_lantern");
for(Material m: Material.values()) {
if(m.name().equalsIgnoreCase(mat)) {
_jackOLantern = m;
break;
}
}
}
if(_jackOLantern == null) {
for(Material m: Material.values()) {
if(m.name().equalsIgnoreCase("JACK_O_LANTERN")) {
_jackOLantern = m;
break;
}
}
}
}
return _jackOLantern;
}
public static Material GetEmerald() {
if(_emerald == null) {
if(Quake.getPlugin()._config.isString("materials.emerald")) {
String mat = Quake.getPlugin()._config.getString("materials.emerald");
for(Material m: Material.values()) {
if(m.name().equalsIgnoreCase(mat)) {
_emerald = m;
break;
}
}
}
if(_emerald == null) {
for(Material m: Material.values()) {
if(m.name().equalsIgnoreCase("EMERALD")) {
_emerald = m;
break;
}
}
}
}
return _emerald;
}
}

84
src/com/Geekpower14/Quake/Versions/GetSounds.java
View File

@@ -1,42 +1,42 @@
/*
* To change this license header, choose License Headers in Project Properties.
* To change this template file, choose Tools | Templates
* and open the template in the editor.
*/
package com.Geekpower14.Quake.Versions;
import com.Geekpower14.Quake.Quake;
import org.bukkit.Sound;
/**
*
* @author Bl4ckSkull666
*/
public class GetSounds {
private static Sound _pling = null;
public static Sound GetNotePling() {
if(_pling == null) {
if(Quake.getPlugin()._config.isString("sounds.pling")) {
String search = Quake.getPlugin()._config.getString("sounds.pling");
for(Sound s: Sound.values()) {
if(s.name().equalsIgnoreCase(search)) {
_pling = s;
break;
}
}
}
if(_pling == null) {
for(Sound s: Sound.values()) {
if(s.name().equalsIgnoreCase("NOTE_PLING") ||
s.name().equalsIgnoreCase("BLOCK_NOTE_PLING") ||
s.name().equalsIgnoreCase("BLOCK_NOTE_BLOCK_PLING")) {
_pling = s;
break;
}
}
}
}
return _pling;
}
}
/*
* To change this license header, choose License Headers in Project Properties.
* To change this template file, choose Tools | Templates
* and open the template in the editor.
*/
package com.Geekpower14.Quake.Versions;
import com.Geekpower14.Quake.Quake;
import org.bukkit.Sound;
/**
*
* @author Bl4ckSkull666
*/
public class GetSounds {
private static Sound _pling = null;
public static Sound GetNotePling() {
if(_pling == null) {
if(Quake.getPlugin()._config.isString("sounds.pling")) {
String search = Quake.getPlugin()._config.getString("sounds.pling");
for(Sound s: Sound.values()) {
if(s.name().equalsIgnoreCase(search)) {
_pling = s;
break;
}
}
}
if(_pling == null) {
for(Sound s: Sound.values()) {
if(s.name().equalsIgnoreCase("NOTE_PLING") ||
s.name().equalsIgnoreCase("BLOCK_NOTE_PLING") ||
s.name().equalsIgnoreCase("BLOCK_NOTE_BLOCK_PLING")) {
_pling = s;
break;
}
}
}
}
return _pling;
}
}

50
src/com/Geekpower14/Quake/Versions/R1_14_1.java
View File

@@ -1,25 +1,25 @@
package com.Geekpower14.Quake.Versions;
import com.Geekpower14.Quake.Arena.Arena;
import net.minecraft.server.v1_14_R1.PacketPlayInClientCommand;
import org.bukkit.Sound;
import org.bukkit.craftbukkit.v1_14_R1.entity.CraftPlayer;
import org.bukkit.entity.Player;
/*
* To change this license header, choose License Headers in Project Properties.
* To change this template file, choose Tools | Templates
* and open the template in the editor.
*/
/**
*
* @author Bl4ckSkull666
*/
public class R1_14_1 {
public static void Respawn(Player p) throws Exception {
PacketPlayInClientCommand ppicc = new PacketPlayInClientCommand(PacketPlayInClientCommand.EnumClientCommand.PERFORM_RESPAWN);
((CraftPlayer)p).getHandle().playerConnection.a(ppicc);
}
}
package com.Geekpower14.Quake.Versions;
import com.Geekpower14.Quake.Arena.Arena;
import net.minecraft.server.v1_14_R1.PacketPlayInClientCommand;
import org.bukkit.Sound;
import org.bukkit.craftbukkit.v1_14_R1.entity.CraftPlayer;
import org.bukkit.entity.Player;
/*
* To change this license header, choose License Headers in Project Properties.
* To change this template file, choose Tools | Templates
* and open the template in the editor.
*/
/**
*
* @author Bl4ckSkull666
*/
public class R1_14_1 {
public static void Respawn(Player p) throws Exception {
PacketPlayInClientCommand ppicc = new PacketPlayInClientCommand(PacketPlayInClientCommand.EnumClientCommand.PERFORM_RESPAWN);
((CraftPlayer)p).getHandle().playerConnection.a(ppicc);
}
}

27
src/com/Geekpower14/Quake/Versions/R1_16_3.java Normal file
View File

@@ -0,0 +1,27 @@
package com.Geekpower14.Quake.Versions;
import com.Geekpower14.Quake.Arena.Arena;
//import net.minecraft.server.v1_14_R1.PacketPlayInClientCommand;
import net.minecraft.server.v1_16_R3.PacketPlayInClientCommand;
import org.bukkit.Sound;
//import org.bukkit.craftbukkit.v1_14_R1.entity.CraftPlayer;
import org.bukkit.craftbukkit.v1_16_R3.entity.CraftPlayer;
import org.bukkit.entity.Player;
/*
* To change this license header, choose License Headers in Project Properties.
* To change this template file, choose Tools | Templates
* and open the template in the editor.
*/
/**
*
* @author Bl4ckSkull666
*/
public class R1_16_3 {
public static void Respawn(Player p) throws Exception {
PacketPlayInClientCommand ppicc = new PacketPlayInClientCommand(PacketPlayInClientCommand.EnumClientCommand.PERFORM_RESPAWN);
((CraftPlayer)p).getHandle().playerConnection.a(ppicc);
}
}

61
src/com/Geekpower14/Quake/Versions/SelectVersion.java
View File

@@ -1,28 +1,33 @@
/*
* To change this license header, choose License Headers in Project Properties.
* To change this template file, choose Tools | Templates
* and open the template in the editor.
*/
package com.Geekpower14.Quake.Versions;
import org.bukkit.Bukkit;
import org.bukkit.entity.Player;
/**
*
* @author Bl4ckSkull666
*/
public class SelectVersion {
private static String getVersion() {
String p = Bukkit.getServer().getClass().getPackage().getName();
return p.substring(p.lastIndexOf('.') + 1);
}
public static void Respawn(Player p) throws Exception {
switch(getVersion()) {
case "v1_14_R1":
R1_14_1.Respawn(p);
break;
}
}
}
/*
* To change this license header, choose License Headers in Project Properties.
* To change this template file, choose Tools | Templates
* and open the template in the editor.
*/
package com.Geekpower14.Quake.Versions;
import org.bukkit.Bukkit;
import org.bukkit.entity.Player;
/**
*
* @author Bl4ckSkull666
*/
public class SelectVersion {
private static String getVersion() {
String p = Bukkit.getServer().getClass().getPackage().getName();
return p.substring(p.lastIndexOf('.') + 1);
}
public static void Respawn(Player p) throws Exception {
switch(getVersion()) {
case "v1_14_R1":
R1_14_1.Respawn(p);
break;
}
switch(getVersion()) {
case "v1_16_R3":
R1_16_3.Respawn(p);
break;
}
}
}