From a33fd0d978c96484354b8a171e11c3c7cbeda6eb Mon Sep 17 00:00:00 2001 From: Telesphoreo Date: Sun, 16 Jan 2022 17:24:17 -0600 Subject: [PATCH] deadass just guessed the letters --- build.gradle | 27 +++++++------------ .../totalfreedommod/Pterodactyl.java | 3 +-- .../totalfreedommod/ServerInterface.java | 2 +- .../totalfreedommod/blocking/SignBlocker.java | 14 +++++----- .../command/Command_modifyitem.java | 5 ++-- 5 files changed, 22 insertions(+), 29 deletions(-) diff --git a/build.gradle b/build.gradle index c1403621..c00d5b53 100644 --- a/build.gradle +++ b/build.gradle @@ -3,8 +3,8 @@ plugins { id 'maven-publish' id 'idea' id 'checkstyle' - id 'com.github.johnrengelman.shadow' version '7.1.0' - id 'net.minecrell.plugin-yml.bukkit' version '0.5.0' + id 'com.github.johnrengelman.shadow' version '7.1.2' + id 'net.minecrell.plugin-yml.bukkit' version '0.5.1' } repositories { @@ -18,13 +18,7 @@ repositories { } } - maven { - url = uri('https://papermc.io/repo/repository/maven-public/') - content { - includeGroup('org.spigotmc') - includeGroup('io.papermc') - } - } + maven { url = uri("https://papermc.io/repo/repository/maven-public/") } maven { url = uri('https://repo.codemc.org/repository/maven-public/') @@ -87,7 +81,7 @@ repositories { maven { url = uri('https://repo.essentialsx.net/releases/') content { - includeGroup('net.ess3') + includeGroup('net.essentialsx') } } mavenCentral() @@ -97,18 +91,17 @@ dependencies { implementation('commons-io:commons-io:2.11.0') implementation('org.apache.commons:commons-lang3:3.12.0') implementation('commons-codec:commons-codec:1.15') - implementation('io.papermc:paperlib:1.0.6') implementation('org.bstats:bstats-base:2.2.1') implementation('org.bstats:bstats-bukkit:2.2.1') - implementation('org.reflections:reflections:0.10.1') + implementation('org.reflections:reflections:0.10.2') implementation('org.javassist:javassist:3.28.0-GA') implementation('org.jetbrains:annotations:22.0.0') - implementation('com.mattmalec:Pterodactyl4J:2.BETA_80') - compileOnly('org.spigotmc:spigot:1.17.1-R0.1-SNAPSHOT') - compileOnly('me.totalfreedom:bukkittelnet:4.6') - compileOnly('me.totalfreedom:TF-LibsDisguises:10.0.26-SNAPSHOT') + implementation('com.mattmalec:Pterodactyl4J:2.BETA_92') + compileOnly('org.spigotmc:spigot:1.18.1-R0.1-SNAPSHOT') + compileOnly('me.totalfreedom:BukkitTelnet:4.7') + compileOnly('me.totalfreedom:TF-LibsDisguises:10.0.27-SNAPSHOT') compileOnly('com.sk89q.worldedit:worldedit-bukkit:7.3.0-SNAPSHOT') - compileOnly('net.ess3:EssentialsX:2.18.2') + compileOnly('net.essentialsx:EssentialsX:2.19.2') compileOnly('net.dv8tion:JDA:4.3.0_277') compileOnly('net.coreprotect:coreprotect:20.1') compileOnly('com.sk89q.worldguard:worldguard-bukkit:7.0.6') diff --git a/src/main/java/me/totalfreedom/totalfreedommod/Pterodactyl.java b/src/main/java/me/totalfreedom/totalfreedommod/Pterodactyl.java index 08946be4..0a9ec325 100644 --- a/src/main/java/me/totalfreedom/totalfreedommod/Pterodactyl.java +++ b/src/main/java/me/totalfreedom/totalfreedommod/Pterodactyl.java @@ -1,7 +1,7 @@ package me.totalfreedom.totalfreedommod; +import com.google.common.base.Strings; import com.mattmalec.pterodactyl4j.Permission; -import com.mattmalec.pterodactyl4j.PowerAction; import com.mattmalec.pterodactyl4j.PteroAction; import com.mattmalec.pterodactyl4j.PteroBuilder; import com.mattmalec.pterodactyl4j.application.entities.ApplicationUser; @@ -10,7 +10,6 @@ import com.mattmalec.pterodactyl4j.application.managers.UserAction; import com.mattmalec.pterodactyl4j.client.entities.ClientServer; import com.mattmalec.pterodactyl4j.client.entities.ClientSubuser; import com.mattmalec.pterodactyl4j.client.entities.PteroClient; -import joptsimple.internal.Strings; import me.totalfreedom.totalfreedommod.admin.Admin; import me.totalfreedom.totalfreedommod.config.ConfigEntry; import me.totalfreedom.totalfreedommod.rank.Rank; diff --git a/src/main/java/me/totalfreedom/totalfreedommod/ServerInterface.java b/src/main/java/me/totalfreedom/totalfreedommod/ServerInterface.java index ab1727c1..84e68117 100644 --- a/src/main/java/me/totalfreedom/totalfreedommod/ServerInterface.java +++ b/src/main/java/me/totalfreedom/totalfreedommod/ServerInterface.java @@ -10,7 +10,7 @@ import org.bukkit.OfflinePlayer; public class ServerInterface extends FreedomService { - public static final String COMPILE_NMS_VERSION = "v1_17_R1"; + public static final String COMPILE_NMS_VERSION = "v1_18_R1"; public static void warnVersion() { diff --git a/src/main/java/me/totalfreedom/totalfreedommod/blocking/SignBlocker.java b/src/main/java/me/totalfreedom/totalfreedommod/blocking/SignBlocker.java index 3fabc837..339ca30a 100644 --- a/src/main/java/me/totalfreedom/totalfreedommod/blocking/SignBlocker.java +++ b/src/main/java/me/totalfreedom/totalfreedommod/blocking/SignBlocker.java @@ -4,7 +4,7 @@ import me.totalfreedom.totalfreedommod.FreedomService; import net.minecraft.nbt.NBTTagCompound; import org.bukkit.ChatColor; import org.bukkit.Tag; -import org.bukkit.craftbukkit.v1_17_R1.inventory.CraftItemStack; +import org.bukkit.craftbukkit.v1_18_R1.inventory.CraftItemStack; import org.bukkit.entity.Player; import org.bukkit.event.EventHandler; import org.bukkit.event.EventPriority; @@ -36,13 +36,13 @@ public class SignBlocker extends FreedomService { ItemStack sign = event.getItemInHand(); net.minecraft.world.item.ItemStack nmsSign = CraftItemStack.asNMSCopy(sign); - NBTTagCompound compound = (nmsSign.hasTag()) ? nmsSign.getTag() : new NBTTagCompound(); + NBTTagCompound compound = (nmsSign.b()) ? nmsSign.s() : new NBTTagCompound(); assert compound != null; - NBTTagCompound bet = compound.getCompound("BlockEntityTag"); - String line1 = bet.getString("Text1"); - String line2 = bet.getString("Text2"); - String line3 = bet.getString("Text3"); - String line4 = bet.getString("Text4"); + NBTTagCompound bet = compound.p("BlockEntityTag"); + String line1 = bet.l("Text1"); + String line2 = bet.l("Text2"); + String line3 = bet.l("Text3"); + String line4 = bet.l("Text4"); if (line1.contains("run_command") || line2.contains("run_command") || line3.contains("run_command") || line4.contains("run_command")) { player.sendMessage(ChatColor.GRAY + "You are not allowed to place command signs."); diff --git a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_modifyitem.java b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_modifyitem.java index ae5847d7..1d76101b 100644 --- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_modifyitem.java +++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_modifyitem.java @@ -1,4 +1,4 @@ -package me.totalfreedom.totalfreedommod.command; +/*package me.totalfreedom.totalfreedommod.command; import java.util.ArrayList; import java.util.List; @@ -11,7 +11,7 @@ import org.apache.commons.lang.StringUtils; import org.bukkit.Material; import org.bukkit.command.Command; import org.bukkit.command.CommandSender; -import org.bukkit.craftbukkit.v1_17_R1.inventory.CraftItemStack; +import org.bukkit.craftbukkit.v1_18_R1.inventory.CraftItemStack; import org.bukkit.enchantments.Enchantment; import org.bukkit.entity.Player; import org.bukkit.inventory.ItemStack; @@ -263,3 +263,4 @@ public class Command_modifyitem extends FreedomCommand } } } +*/ \ No newline at end of file