Upstream/Jobs
1
0
Fork 0
mirror of https://github.com/Zrips/Jobs.git synced 2025-02-27 09:43:22 +01:00
Code Issues Projects Releases Wiki Activity

Cleanup

Browse Source
This commit is contained in:
Zrips 2024-05-08 12:44:24 +03:00
parent 0a46298b7d
commit cb5337f6f6
16 changed files with 147 additions and 519 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
libs/CMILib1.4.6.2.jar
View File

Binary file not shown.

BIN
libs/StackMob-5.5.3.jar
View File

Binary file not shown.

BIN
libs/WildStackerAPI-2023.2.jar
View File

Binary file not shown.

BIN
libs/mcMMO-2.1.175-SNAPSHOT.jar
View File

Binary file not shown.

BIN
libs/mypet-3.11-20210318.180552-1.jar
View File

Binary file not shown.

BIN
libs/mypet-3.12.jar Normal file
View File

Binary file not shown.

113
pom.xml
View File

@ -5,7 +5,7 @@
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>Jobs</groupId> <groupId>Jobs</groupId>
<artifactId>jobs</artifactId> <artifactId>jobs</artifactId>
<version>5.2.2.5</version> <version>5.2.3.0</version>
<name>Jobs</name> <name>Jobs</name>
<url>http://maven.apache.org</url> <url>http://maven.apache.org</url>
@ -17,32 +17,16 @@
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>io.papermc.paper</groupId> <groupId>org.spigotmc</groupId>
<artifactId>paper-api</artifactId> <artifactId>spigot-api</artifactId>
<version>1.20.4-R0.1-SNAPSHOT</version> <version>1.20.6-R0.1-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.spigotmc</groupId>
<artifactId>spigot</artifactId>
<version>1.20.6-R0.1-SNAPSHOT</version>
<scope>provided</scope> <scope>provided</scope>
<exclusions>
<exclusion>
<groupId>org.ow2.asm</groupId>
<artifactId>asm-commons</artifactId>
</exclusion>
<exclusion>
<groupId>com.google.code.findbugs</groupId>
<artifactId>jsr305</artifactId>
</exclusion>
<exclusion>
<groupId>com.googlecode.json-simple</groupId>
<artifactId>json-simple</artifactId>
</exclusion>
<exclusion>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</exclusion>
<exclusion>
<groupId>org.ow2.asm</groupId>
<artifactId>asm</artifactId>
</exclusion>
</exclusions>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.mojang</groupId> <groupId>com.mojang</groupId>
@ -54,9 +38,7 @@
<dependency> <dependency>
<groupId>com.gmail.nossr50.mcMMO</groupId> <groupId>com.gmail.nossr50.mcMMO</groupId>
<artifactId>mcMMO</artifactId> <artifactId>mcMMO</artifactId>
<version>2.1.175-SNAPSHOT</version> <version>2.2.004</version>
<scope>system</scope>
<systemPath>${basedir}/libs/mcMMO-2.1.175-SNAPSHOT.jar</systemPath>
</dependency> </dependency>
<!-- Vault --> <!-- Vault -->
<dependency> <dependency>
@ -76,38 +58,12 @@
</exclusions> </exclusions>
</dependency> </dependency>
<!-- MythicMobs --> <!-- MythicMobs -->
<dependency>
<groupId>io.lumine.xikage</groupId>
<artifactId>MythicMobs</artifactId>
<version>4.11.0</version>
<scope>provided</scope>
</dependency>
<dependency> <dependency>
<groupId>io.lumine</groupId> <groupId>io.lumine</groupId>
<artifactId>Mythic-Dist</artifactId> <artifactId>Mythic-Dist</artifactId>
<version>5.1.0-SNAPSHOT</version> <version>5.6.1</version>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
<!-- WorldGuard old version -->
<dependency>
<groupId>com.sk89q</groupId>
<artifactId>worldguard</artifactId>
<version>6.1</version>
<exclusions>
<exclusion>
<groupId>com.sk89q</groupId>
<artifactId>commandbook</artifactId>
</exclusion>
<exclusion>
<groupId>org.bukkit</groupId>
<artifactId>bukkit</artifactId>
</exclusion>
<exclusion>
<groupId>com.sk89q.spigot</groupId>
<artifactId>bukkit-classloader-check</artifactId>
</exclusion>
</exclusions>
</dependency>
<!-- WorldGuard new version --> <!-- WorldGuard new version -->
<dependency> <dependency>
<groupId>com.sk89q.worldguard</groupId> <groupId>com.sk89q.worldguard</groupId>
@ -195,27 +151,21 @@
</dependency> </dependency>
<!-- CMILib --> <!-- CMILib -->
<dependency> <dependency>
<groupId>net.Zrips</groupId> <groupId>com.github.Zrips</groupId>
<artifactId>CMILib</artifactId> <artifactId>CMILib</artifactId>
<version>latest</version> <version>1.4.7.4</version>
<scope>system</scope>
<systemPath>${basedir}/libs/CMILib1.4.6.2.jar</systemPath>
</dependency> </dependency>
<!-- WildStacker --> <!-- WildStacker -->
<dependency> <dependency>
<groupId>com.bgsoftware</groupId> <groupId>com.bgsoftware</groupId>
<artifactId>WildStackerAPI</artifactId> <artifactId>WildStackerAPI</artifactId>
<version>latest</version> <version>3.8.0</version>
<scope>system</scope>
<systemPath>${basedir}/libs/WildStackerAPI-2023.2.jar</systemPath>
</dependency> </dependency>
<!-- StackMob --> <!-- StackMob -->
<dependency> <dependency>
<groupId>com.github.Nathat23</groupId> <groupId>uk.antiperson.stackmob</groupId>
<artifactId>StackMob-5</artifactId> <artifactId>StackMob</artifactId>
<version>5.5.3</version> <version>5.8.2</version>
<scope>system</scope>
<systemPath>${basedir}/libs/StackMob-5.5.3.jar</systemPath>
</dependency> </dependency>
<!-- MyPet --> <!-- MyPet -->
<dependency> <dependency>
@ -224,10 +174,14 @@
<version>3.11-SNAPSHOT</version> <version>3.11-SNAPSHOT</version>
<scope>system</scope> <scope>system</scope>
<!-- Temporary solution for replacing repository --> <!-- Temporary solution for replacing repository -->
<systemPath>${basedir}/libs/mypet-3.11-20210318.180552-1.jar</systemPath> <systemPath>${basedir}/libs/mypet-3.12.jar</systemPath>
</dependency> </dependency>
</dependencies> </dependencies>
<repositories> <repositories>
<repository>
<id>CodeMC</id>
<url>https://repo.codemc.org/repository/maven-public/</url>
</repository>
<!-- MythicMobs --> <!-- MythicMobs -->
<repository> <repository>
<id>nexus</id> <id>nexus</id>
@ -243,14 +197,13 @@
<id>jitpack.io</id> <id>jitpack.io</id>
<url>https://jitpack.io</url> <url>https://jitpack.io</url>
</repository> </repository>
<!-- papermc -->
<repository> <repository>
<id>papermc</id> <id>neetgames</id>
<url>https://papermc.io/repo/repository/maven-public/</url> <url>https://nexus.neetgames.com/repository/maven-releases/</url>
</repository> </repository>
<repository> <repository>
<id>minecraft-repo</id> <id>spigot-repo</id>
<url>https://libraries.minecraft.net/</url> <url>https://hub.spigotmc.org/nexus/content/repositories/snapshots/</url>
</repository> </repository>
<!-- PlaceholderAPI --> <!-- PlaceholderAPI -->
<repository> <repository>
@ -258,6 +211,10 @@
<url> <url>
https://repo.extendedclip.com/content/repositories/placeholderapi/</url> https://repo.extendedclip.com/content/repositories/placeholderapi/</url>
</repository> </repository>
<repository>
<id>bg-repo</id>
<url>https://repo.bg-software.com/repository/api/</url>
</repository>
<!-- MyPet --> <!-- MyPet -->
<!--<repository> <id>mypet-repo</id> <url>https://repo.mypet-plugin.de/</url> <!--<repository> <id>mypet-repo</id> <url>https://repo.mypet-plugin.de/</url>
</repositor> --> </repositor> -->
@ -283,14 +240,6 @@
<target>1.8</target> <target>1.8</target>
</configuration> </configuration>
</plugin> </plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<version>2.3.1</version>
<configuration>
<outputDirectory>D:/MC/Server 1.20/plugins</outputDirectory>
</configuration>
</plugin>
</plugins> </plugins>
</build> </build>
</project> </project>

8
src/main/java/com/gamingmesh/jobs/Jobs.java
View File

@ -108,7 +108,6 @@ import com.gamingmesh.jobs.stuff.Util;
import com.gamingmesh.jobs.stuff.VersionChecker; import com.gamingmesh.jobs.stuff.VersionChecker;
import com.gamingmesh.jobs.stuff.complement.Complement; import com.gamingmesh.jobs.stuff.complement.Complement;
import com.gamingmesh.jobs.stuff.complement.Complement1; import com.gamingmesh.jobs.stuff.complement.Complement1;
import com.gamingmesh.jobs.stuff.complement.Complement2;
import com.gamingmesh.jobs.stuff.complement.JobsChatEvent; import com.gamingmesh.jobs.stuff.complement.JobsChatEvent;
import com.gamingmesh.jobs.tasks.BufferedPaymentThread; import com.gamingmesh.jobs.tasks.BufferedPaymentThread;
import com.gamingmesh.jobs.tasks.DatabaseSaveThread; import com.gamingmesh.jobs.tasks.DatabaseSaveThread;
@ -766,12 +765,7 @@ public final class Jobs extends JavaPlugin {
HookManager.loadHooks(); HookManager.loadHooks();
registerListeners(); registerListeners();
if (Version.isCurrentEqualOrHigher(Version.v1_16_R3) && kyoriSupported) { complement = new Complement1();
complement = new Complement2();
//getServer().getPluginManager().registerEvents(new KyoriChatEvent(this), this);
} else {
complement = new Complement1();
}
if (HookVault.isVaultEnable()) { if (HookVault.isVaultEnable()) {
// register economy // register economy

11
src/main/java/com/gamingmesh/jobs/config/ShopManager.java
View File

@ -36,7 +36,6 @@ import net.Zrips.CMILib.Items.CMIAsyncHead;
import net.Zrips.CMILib.Items.CMIItemStack; import net.Zrips.CMILib.Items.CMIItemStack;
import net.Zrips.CMILib.Items.CMIMaterial; import net.Zrips.CMILib.Items.CMIMaterial;
import net.Zrips.CMILib.Locale.LC; import net.Zrips.CMILib.Locale.LC;
import net.Zrips.CMILib.Logs.CMIDebug;
import net.Zrips.CMILib.Messages.CMIMessages; import net.Zrips.CMILib.Messages.CMIMessages;
@SuppressWarnings("deprecation") @SuppressWarnings("deprecation")
@ -260,12 +259,12 @@ public class ShopManager {
Jobs.getJobsDAO().savePoints(jPlayer); Jobs.getJobsDAO().savePoints(jPlayer);
player.sendMessage(Jobs.getLanguage().getMessage("command.shop.info.Paid", "%amount%", item.getPointPrice())); player.sendMessage(Jobs.getLanguage().getMessage("command.shop.info.Paid", "%amount%", item.getPointPrice()));
} }
if (item.getVaultPrice() > 0) { if (item.getVaultPrice() > 0) {
jPlayer.withdraw(item.getVaultPrice()); jPlayer.withdraw(item.getVaultPrice());
player.sendMessage(Jobs.getLanguage().getMessage("command.shop.info.Paid", "%amount%", Jobs.getEconomy().getEconomy().format(item.getVaultPrice()))); player.sendMessage(Jobs.getLanguage().getMessage("command.shop.info.Paid", "%amount%", Jobs.getEconomy().getEconomy().format(item.getVaultPrice())));
} }
openShopGui(player, page); openShopGui(player, page);
} }
}; };
@ -518,14 +517,14 @@ public class ShopManager {
String potionData = ""; String potionData = "";
if (itemSection.contains("potion-type")) { if (itemSection.contains("potion-type")) {
PotionType type; PotionType type = null;
try { try {
type = PotionType.valueOf(itemSection.getString("potion-type", "speed").toUpperCase()); type = PotionType.valueOf(itemSection.getString("potion-type", "speed").toUpperCase());
} catch (IllegalArgumentException ex) { } catch (IllegalArgumentException ex) {
type = PotionType.SPEED;
} }
potionData += type.toString() + ":false:false"; if (type != null)
potionData += type.toString() + ":false:false";
} }
String itemSring = mat.toString(); String itemSring = mat.toString();

127
src/main/java/com/gamingmesh/jobs/hooks/HookManager.java
View File

@ -9,7 +9,6 @@ import com.gamingmesh.jobs.hooks.McMMO.McMMO2_X_listener;
import com.gamingmesh.jobs.hooks.McMMO.McMMOManager; import com.gamingmesh.jobs.hooks.McMMO.McMMOManager;
import com.gamingmesh.jobs.hooks.MyPet.MyPetManager; import com.gamingmesh.jobs.hooks.MyPet.MyPetManager;
import com.gamingmesh.jobs.hooks.MythicMobs.MythicMobInterface; import com.gamingmesh.jobs.hooks.MythicMobs.MythicMobInterface;
import com.gamingmesh.jobs.hooks.MythicMobs.MythicMobs4;
import com.gamingmesh.jobs.hooks.MythicMobs.MythicMobs5; import com.gamingmesh.jobs.hooks.MythicMobs.MythicMobs5;
import com.gamingmesh.jobs.hooks.WorldGuard.WorldGuardManager; import com.gamingmesh.jobs.hooks.WorldGuard.WorldGuardManager;
import com.gamingmesh.jobs.hooks.stackMob.StackMobHandler; import com.gamingmesh.jobs.hooks.stackMob.StackMobHandler;
@ -31,118 +30,112 @@ public class HookManager {
private static PluginManager pm; private static PluginManager pm;
public static void loadHooks() { public static void loadHooks() {
pm = PLUGIN.getServer().getPluginManager(); pm = PLUGIN.getServer().getPluginManager();
setMyPetManager(); setMyPetManager();
setWorldGuard(); setWorldGuard();
setMythicManager(); setMythicManager();
setStackMobHandler(); setStackMobHandler();
setWildStackerHandler(); setWildStackerHandler();
} }
public static StackMobHandler getStackMobHandler() { public static StackMobHandler getStackMobHandler() {
if (stackMobHandler == null) { if (stackMobHandler == null) {
setStackMobHandler(); setStackMobHandler();
} }
return stackMobHandler; return stackMobHandler;
} }
public static WildStackerHandler getWildStackerHandler() { public static WildStackerHandler getWildStackerHandler() {
if (wildStackerHandler == null) { if (wildStackerHandler == null) {
setWildStackerHandler(); setWildStackerHandler();
} }
return wildStackerHandler; return wildStackerHandler;
} }
public static MyPetManager getMyPetManager() { public static MyPetManager getMyPetManager() {
if (myPetManager == null) { if (myPetManager == null) {
setMyPetManager(); setMyPetManager();
} }
return myPetManager; return myPetManager;
} }
public static WorldGuardManager getWorldGuardManager() { public static WorldGuardManager getWorldGuardManager() {
if (worldGuardManager == null) { if (worldGuardManager == null) {
worldGuardManager = new WorldGuardManager(); worldGuardManager = new WorldGuardManager();
} }
return worldGuardManager; return worldGuardManager;
} }
public static McMMOManager getMcMMOManager() { public static McMMOManager getMcMMOManager() {
if (McMMOManager == null) if (McMMOManager == null)
McMMOManager = new McMMOManager(); McMMOManager = new McMMOManager();
return McMMOManager; return McMMOManager;
} }
public static MythicMobInterface getMythicManager() { public static MythicMobInterface getMythicManager() {
return MythicManager; return MythicManager;
} }
public static boolean checkMythicMobs() { public static boolean checkMythicMobs() {
return Jobs.getGCManager().MythicMobsEnabled && MythicManager != null && MythicManager.check(); return Jobs.getGCManager().MythicMobsEnabled && MythicManager != null && MythicManager.check();
} }
private static boolean setWorldGuard() { private static boolean setWorldGuard() {
if (JobsHook.WorldGuard.isEnabled()) { if (JobsHook.WorldGuard.isEnabled()) {
worldGuardManager = new WorldGuardManager(); worldGuardManager = new WorldGuardManager();
CMIMessages.consoleMessage("&eWorldGuard detected."); CMIMessages.consoleMessage("&eWorldGuard detected.");
return true; return true;
} }
return false; return false;
} }
private static void setMythicManager() { private static void setMythicManager() {
if (!JobsHook.MythicMobs.isPresent()) if (!JobsHook.MythicMobs.isPresent())
return; return;
try { try {
Class.forName("io.lumine.xikage.mythicmobs.api.bukkit.BukkitAPIHelper"); Class.forName("io.lumine.mythic.bukkit.BukkitAPIHelper");
MythicManager = new MythicMobs4(PLUGIN); MythicManager = new MythicMobs5(PLUGIN);
CMIMessages.consoleMessage("&eMythicMobs 4.x detected."); CMIMessages.consoleMessage("&eMythicMobs 5.x detected.");
} catch (ClassNotFoundException ex) { } catch (ClassNotFoundException e) {
try { CMIMessages.consoleMessage("&cYour MythicMobs version is not supported by Jobs! Supported versions: 4.9.1+");
Class.forName("io.lumine.mythic.bukkit.BukkitAPIHelper"); }
MythicManager = new MythicMobs5(PLUGIN);
CMIMessages.consoleMessage("&eMythicMobs 5.x detected.");
} catch (ClassNotFoundException e) {
CMIMessages.consoleMessage("&cYour MythicMobs version is not supported by Jobs! Supported versions: 4.9.1+");
}
}
} }
public static void setMcMMOlistener() { public static void setMcMMOlistener() {
try { try {
Class.forName("com.gmail.nossr50.datatypes.skills.SuperAbilityType"); Class.forName("com.gmail.nossr50.datatypes.skills.SuperAbilityType");
pm.registerEvents(new McMMO2_X_listener(), PLUGIN); pm.registerEvents(new McMMO2_X_listener(), PLUGIN);
CMIMessages.consoleMessage("&eRegistered McMMO 2.x listener"); CMIMessages.consoleMessage("&eRegistered McMMO 2.x listener");
} catch (ClassNotFoundException e) { } catch (ClassNotFoundException e) {
pm.registerEvents(new McMMO1_X_listener(), PLUGIN); pm.registerEvents(new McMMO1_X_listener(), PLUGIN);
CMIMessages.consoleMessage("&eRegistered McMMO 1.x listener"); CMIMessages.consoleMessage("&eRegistered McMMO 1.x listener");
} }
} }
private static void setMyPetManager() { private static void setMyPetManager() {
if (JobsHook.MyPet.isEnabled()) { if (JobsHook.MyPet.isEnabled()) {
myPetManager = new MyPetManager(); myPetManager = new MyPetManager();
CMIMessages.consoleMessage("&eMyPet detected."); CMIMessages.consoleMessage("&eMyPet detected.");
} }
} }
private static void setStackMobHandler() { private static void setStackMobHandler() {
if (JobsHook.StackMob.isEnabled()) { if (JobsHook.StackMob.isEnabled()) {
stackMobHandler = new StackMobHandler(); stackMobHandler = new StackMobHandler();
} }
} }
private static void setWildStackerHandler() { private static void setWildStackerHandler() {
if (JobsHook.WildStacker.isEnabled()) { if (JobsHook.WildStacker.isEnabled()) {
wildStackerHandler = new WildStackerHandler(); wildStackerHandler = new WildStackerHandler();
} }
} }
} }

75
src/main/java/com/gamingmesh/jobs/hooks/MythicMobs/MythicMobs4.java
View File

@ -1,75 +0,0 @@
package com.gamingmesh.jobs.hooks.MythicMobs;
import org.bukkit.entity.LivingEntity;
import org.bukkit.plugin.Plugin;
import com.gamingmesh.jobs.Jobs;
import io.lumine.xikage.mythicmobs.MythicMobs;
import io.lumine.xikage.mythicmobs.api.bukkit.BukkitAPIHelper;
import io.lumine.xikage.mythicmobs.mobs.MythicMob;
import net.Zrips.CMILib.Messages.CMIMessages;
public class MythicMobs4 implements MythicMobInterface {
public BukkitAPIHelper apiHelper;
private Jobs plugin;
public MythicMobs4(Jobs plugin) {
this.plugin = plugin;
}
@Override
public void registerListener() {
plugin.getServer().getPluginManager().registerEvents(new MythicMobs4Listener(), plugin);
}
@Override
public boolean isMythicMob(LivingEntity lVictim) {
return apiHelper != null && lVictim != null && apiHelper.isMythicMob(lVictim);
}
@Override
public boolean check() {
Plugin mm = plugin.getServer().getPluginManager().getPlugin("MythicMobs");
if (mm == null)
return false;
try {
Class.forName("io.lumine.xikage.mythicmobs.api.bukkit.events.MythicMobDeathEvent");
Class.forName("io.lumine.xikage.mythicmobs.mobs.MythicMob");
Class.forName("io.lumine.xikage.mythicmobs.MythicMobs");
} catch (ClassNotFoundException e) {
// Disabling
CMIMessages.consoleMessage("&e[Jobs] &6MythicMobs was found - &cBut your version is outdated, please update for full support.");
return false;
}
apiHelper = ((MythicMobs) mm).getAPIHelper();
CMIMessages.consoleMessage("&e[Jobs] &6MythicMobs was found - Enabling capabilities.");
return true;
}
static boolean failed = false;
@Override
public String getDisplayName(String id) {
if (failed || apiHelper == null)
return "";
MythicMob mm = apiHelper.getMythicMob(id);
try {
if (mm != null && mm.getDisplayName() != null)
return mm.getDisplayName().toString();
} catch (Throwable e) {
if (!failed) {
failed = true;
e.printStackTrace();
CMIMessages.consoleMessage("&cEncountered error when checking MythicMob entity name. Support for mythicMobs will be suspended for time beying. Please report this issue.");
}
}
return "";
}
}

61
src/main/java/com/gamingmesh/jobs/hooks/MythicMobs/MythicMobs4Listener.java
View File

@ -1,61 +0,0 @@
package com.gamingmesh.jobs.hooks.MythicMobs;
import org.bukkit.entity.Entity;
import org.bukkit.entity.LivingEntity;
import org.bukkit.entity.Player;
import org.bukkit.event.EventHandler;
import org.bukkit.event.Listener;
import org.bukkit.event.entity.EntityDamageByEntityEvent;
import com.gamingmesh.jobs.Jobs;
import com.gamingmesh.jobs.actions.MMKillInfo;
import com.gamingmesh.jobs.container.ActionType;
import com.gamingmesh.jobs.container.JobsPlayer;
import com.gamingmesh.jobs.listeners.JobsPaymentListener;
import io.lumine.xikage.mythicmobs.api.bukkit.events.MythicMobDeathEvent;
import io.lumine.xikage.mythicmobs.mobs.MythicMob;
public final class MythicMobs4Listener implements Listener {
@EventHandler
public void onMythicMobDeath(MythicMobDeathEvent event) {
// Entity that died must be living
if (!(event.getEntity() instanceof LivingEntity))
return;
if (!Jobs.getGCManager().canPerformActionInWorld(event.getEntity().getWorld()))
return;
Player pDamager = null;
// Checking if killer is player
Entity ent = null;
if (event.getKiller() instanceof Player)
pDamager = (Player) event.getKiller();
// Checking if killer is tamed animal
else if (event.getEntity().getLastDamageCause() instanceof EntityDamageByEntityEvent) {
ent = ((EntityDamageByEntityEvent) event.getEntity().getLastDamageCause()).getDamager();
} else
return;
if (pDamager == null)
return;
// check if in creative
if (!JobsPaymentListener.payIfCreative(pDamager))
return;
if (!Jobs.getPermissionHandler().hasWorldPermission(pDamager, pDamager.getLocation().getWorld().getName()))
return;
JobsPlayer jDamager = Jobs.getPlayerManager().getJobsPlayer(pDamager);
if (jDamager == null)
return;
// pay
MythicMob lVictim = event.getMobType();
if (lVictim != null) {
Jobs.action(jDamager, new MMKillInfo(lVictim.getInternalName(), ActionType.MMKILL), ent);
}
}
}

122
src/main/java/com/gamingmesh/jobs/hooks/WorldGuard/WorldGuardManager.java
View File

@ -15,7 +15,6 @@ import com.gamingmesh.jobs.container.RestrictedArea;
import com.sk89q.worldedit.bukkit.BukkitAdapter; import com.sk89q.worldedit.bukkit.BukkitAdapter;
import com.sk89q.worldguard.WorldGuard; import com.sk89q.worldguard.WorldGuard;
import com.sk89q.worldguard.bukkit.WorldGuardPlugin; import com.sk89q.worldguard.bukkit.WorldGuardPlugin;
import com.sk89q.worldguard.protection.ApplicableRegionSet;
import com.sk89q.worldguard.protection.managers.RegionManager; import com.sk89q.worldguard.protection.managers.RegionManager;
import com.sk89q.worldguard.protection.regions.ProtectedRegion; import com.sk89q.worldguard.protection.regions.ProtectedRegion;
import com.sk89q.worldguard.protection.regions.RegionContainer; import com.sk89q.worldguard.protection.regions.RegionContainer;
@ -23,109 +22,70 @@ import com.sk89q.worldguard.protection.regions.RegionContainer;
public class WorldGuardManager { public class WorldGuardManager {
private WorldGuardPlugin wg; private WorldGuardPlugin wg;
private boolean useOld = false;
public WorldGuardManager() { public WorldGuardManager() {
Plugin pl = Bukkit.getServer().getPluginManager().getPlugin("WorldGuard"); Plugin pl = Bukkit.getServer().getPluginManager().getPlugin("WorldGuard");
if (pl instanceof WorldGuardPlugin) { if (pl instanceof WorldGuardPlugin) {
wg = (WorldGuardPlugin) pl; wg = (WorldGuardPlugin) pl;
}
if (pl.getDescription().getVersion().equals("6.1")) {
useOld = true;
}
}
} }
public WorldGuardPlugin getPlugin() { public WorldGuardPlugin getPlugin() {
return wg; return wg;
} }
public List<RestrictedArea> getArea(Location loc) { public List<RestrictedArea> getArea(Location loc) {
try { try {
if (useOld) { RegionContainer container = WorldGuard.getInstance().getPlatform().getRegionContainer();
RegionManager manager = wg.getRegionContainer().get(loc.getWorld()); RegionManager regions = container.get(BukkitAdapter.adapt(loc.getWorld()));
if (manager != null) { if (regions != null) {
ApplicableRegionSet regions = manager.getApplicableRegions(loc); for (ProtectedRegion one : regions.getRegions().values()) {
List<RestrictedArea> rest = Jobs.getRestrictedAreaManager().getRestrictedAreasByName(one.getId());
for (ProtectedRegion one : regions.getRegions()) { if (!rest.isEmpty())
List<RestrictedArea> rest = Jobs.getRestrictedAreaManager().getRestrictedAreasByName(one.getId()); return rest;
}
}
} catch (Throwable e) {
}
if (!rest.isEmpty()) return new ArrayList<>();
return rest;
}
}
} else {
RegionContainer container = WorldGuard.getInstance().getPlatform().getRegionContainer();
RegionManager regions = container.get(BukkitAdapter.adapt(loc.getWorld()));
if (regions != null) {
for (ProtectedRegion one : regions.getRegions().values()) {
List<RestrictedArea> rest = Jobs.getRestrictedAreaManager().getRestrictedAreasByName(one.getId());
if (!rest.isEmpty())
return rest;
}
}
}
} catch (Throwable e) {
}
return new ArrayList<>();
} }
public boolean inArea(Location loc, String name) { public boolean inArea(Location loc, String name) {
if (useOld) {
RegionManager manager = wg.getRegionContainer().get(loc.getWorld());
if (manager != null) { RegionContainer container = WorldGuard.getInstance().getPlatform().getRegionContainer();
ApplicableRegionSet regions = manager.getApplicableRegions(loc); RegionManager regions = container.get(BukkitAdapter.adapt(loc.getWorld()));
for (ProtectedRegion one : regions.getRegions()) { if (regions != null) {
if (one.getId().equalsIgnoreCase(name) && one.contains(loc.getBlockX(), loc.getBlockY(), loc.getBlockZ())) for (ProtectedRegion one : regions.getRegions().values()) {
return true; if (one.getId().equalsIgnoreCase(name) && one.contains(loc.getBlockX(), loc.getBlockY(), loc.getBlockZ()))
} return true;
} }
} else { }
RegionContainer container = WorldGuard.getInstance().getPlatform().getRegionContainer();
RegionManager regions = container.get(BukkitAdapter.adapt(loc.getWorld()));
if (regions != null) { return false;
for (ProtectedRegion one : regions.getRegions().values()) {
if (one.getId().equalsIgnoreCase(name) && one.contains(loc.getBlockX(), loc.getBlockY(), loc.getBlockZ()))
return true;
}
}
}
return false;
} }
public ProtectedRegion getProtectedRegionByName(String name) { public ProtectedRegion getProtectedRegionByName(String name) {
for (World one : Bukkit.getServer().getWorlds()) { for (World one : Bukkit.getServer().getWorlds()) {
Map<String, ProtectedRegion> regions = null; Map<String, ProtectedRegion> regions = null;
if (useOld) { RegionContainer container = WorldGuard.getInstance().getPlatform().getRegionContainer();
RegionManager manager = wg.getRegionContainer().get(one); RegionManager manager = container.get(BukkitAdapter.adapt(one));
if (manager != null) if (manager != null)
regions = manager.getRegions(); regions = manager.getRegions();
} else {
RegionContainer container = WorldGuard.getInstance().getPlatform().getRegionContainer();
RegionManager manager = container.get(BukkitAdapter.adapt(one));
if (manager != null) if (regions != null) {
regions = manager.getRegions(); for (Entry<String, ProtectedRegion> map : regions.entrySet()) {
} if (map.getKey().equalsIgnoreCase(name))
return map.getValue();
}
}
}
if (regions != null) { return null;
for (Entry<String, ProtectedRegion> map : regions.entrySet()) {
if (map.getKey().equalsIgnoreCase(name))
return map.getValue();
}
}
}
return null;
} }
} }

15
src/main/java/com/gamingmesh/jobs/listeners/JobsPaymentListener.java
View File

@ -252,7 +252,7 @@ public final class JobsPaymentListener implements Listener {
public void onCowMilking(PlayerInteractEntityEvent event) { public void onCowMilking(PlayerInteractEntityEvent event) {
Entity entity = event.getRightClicked(); Entity entity = event.getRightClicked();
CMIEntityType type = CMIEntityType.getByType(entity.getType()); CMIEntityType type = CMIEntityType.get(entity.getType());
if (type != CMIEntityType.COW && type != CMIEntityType.MUSHROOM_COW && type != CMIEntityType.GOAT) if (type != CMIEntityType.COW && type != CMIEntityType.MUSHROOM_COW && type != CMIEntityType.GOAT)
return; return;
@ -264,7 +264,7 @@ public final class JobsPaymentListener implements Listener {
return; return;
} }
if (itemInHand.getType() == Material.BOWL && entity.getType() != EntityType.MUSHROOM_COW) { if (itemInHand.getType() == Material.BOWL && type != CMIEntityType.MUSHROOM_COW) {
return; return;
} }
@ -1661,11 +1661,14 @@ public final class JobsPaymentListener implements Listener {
if (!Jobs.getGCManager().canPerformActionInWorld(e)) if (!Jobs.getGCManager().canPerformActionInWorld(e))
return; return;
EntityType type = event.getEntityType(); CMIEntityType type = CMIEntityType.get(event.getEntityType());
if (type != EntityType.PRIMED_TNT && type != EntityType.MINECART_TNT && type != CMIEntityType.ENDER_CRYSTAL.getType())
if (type != CMIEntityType.TNT && type != CMIEntityType.TNT_MINECART && type != CMIEntityType.ENDER_CRYSTAL)
return; return;
if (!Jobs.getGCManager().isUseTntFinder() && type != CMIEntityType.ENDER_CRYSTAL.getType()) if (!Jobs.getGCManager().isUseTntFinder() && type != CMIEntityType.ENDER_CRYSTAL)
return; return;
double closest = 60.0; double closest = 60.0;
@ -1697,7 +1700,7 @@ public final class JobsPaymentListener implements Listener {
if (jPlayer == null) if (jPlayer == null)
return; return;
if (!Jobs.getGCManager().isUseTntFinder() && type == CMIEntityType.ENDER_CRYSTAL.getType()) { if (!Jobs.getGCManager().isUseTntFinder() && type == CMIEntityType.ENDER_CRYSTAL) {
UUID eUUID = e.getUniqueId(); UUID eUUID = e.getUniqueId();
Entity killed = punchedEndCrystals.getIfPresent(eUUID); Entity killed = punchedEndCrystals.getIfPresent(eUUID);

47
src/main/java/com/gamingmesh/jobs/stuff/complement/Complement2.java
View File

@ -1,47 +0,0 @@
package com.gamingmesh.jobs.stuff.complement;
import org.bukkit.block.Sign;
import org.bukkit.entity.Player;
import org.bukkit.event.block.SignChangeEvent;
import net.kyori.adventure.text.Component;
import net.kyori.adventure.text.TextComponent;
import net.kyori.adventure.text.serializer.legacy.LegacyComponentSerializer;
public class Complement2 implements Complement {
protected String serialize(Component component) {
return LegacyComponentSerializer.legacyAmpersand().serialize(component);
}
protected TextComponent deserialize(String t) {
return LegacyComponentSerializer.legacyAmpersand().deserialize(t);
}
@Override
public String getLine(SignChangeEvent event, int line) {
Component l = event.line(line);
return l == null ? "" : serialize(l);
}
@Override
public void setLine(SignChangeEvent event, int line, String text) {
event.line(line, deserialize(text));
}
@Override
public String getLine(Sign sign, int line) {
return serialize(sign.line(line));
}
@Override
public String getDisplayName(Player player) {
return serialize(player.displayName());
}
@Override
public void setLine(Sign sign, int line, String text) {
sign.line(line, deserialize(text));
}
}

87
src/main/java/com/gamingmesh/jobs/stuff/complement/KyoriChatEvent.java
View File

@ -1,87 +0,0 @@
package com.gamingmesh.jobs.stuff.complement;
import org.bukkit.event.EventHandler;
import org.bukkit.event.EventPriority;
import org.bukkit.event.Listener;
import com.gamingmesh.jobs.Jobs;
import com.gamingmesh.jobs.container.JobsPlayer;
import com.gamingmesh.jobs.stuff.Util;
import io.papermc.paper.chat.ChatRenderer;
import io.papermc.paper.event.player.AsyncChatEvent;
import net.Zrips.CMILib.Version.Schedulers.CMIScheduler;
import net.kyori.adventure.text.TextReplacementConfig;
public final class KyoriChatEvent extends Complement2 implements Listener {
private Jobs plugin;
public KyoriChatEvent(Jobs plugin) {
this.plugin = plugin;
}
@EventHandler(priority = EventPriority.NORMAL)
public void asyncChatEvent(final AsyncChatEvent event) {
if (event.isCancelled() || Util.getJobsEditorMap().isEmpty())
return;
final String msg = Util.getJobsEditorMap().remove(event.getPlayer().getUniqueId());
if (msg != null) {
CMIScheduler.get().runTask(() -> event.getPlayer().performCommand(msg + serialize(event.message())));
event.setCancelled(true);
}
}
// Adding to chat prefix job name
@EventHandler(priority = EventPriority.LOWEST, ignoreCancelled = true)
public void onPlayerChat(AsyncChatEvent event) {
if (!Jobs.getGCManager().getModifyChat())
return;
JobsPlayer jPlayer = Jobs.getPlayerManager().getJobsPlayer(event.getPlayer());
String honorific = jPlayer != null ? jPlayer.getDisplayHonorific() : "";
if (honorific.equals(" "))
honorific = "";
// TODO displayName returns the player display name not the chat component from
// chat plugins, like Essentials
// Now there is a parameter "player", so literally we need to add 800+ chat plugins
// to this plugin as dependency?
// 3rd attempt: now we tried to use text replacement config builder to match the variable
// result: instead of replacing the variable, now the chat message never been sent
//event.composer((player, displayName, msg) -> msg
//.replaceText(TextReplacementConfig.builder().match("{jobs}").once().replacement(h).build()));
event.message(ChatRenderer.defaultRenderer().render(event.getPlayer(), event.getPlayer().displayName(), event.message(), event.getPlayer()).replaceText(TextReplacementConfig.builder().match(
"\\{jobs\\}").replacement(honorific).build()));
// 4th attempt: composeChat -> doing nothing
// event.message(ChatComposer.DEFAULT.composeChat(event.getPlayer(), event.getPlayer().displayName(), event.message())
// .replaceText(TextReplacementConfig.builder().match("\\{jobs\\}").replacement(honorific).build()));
}
// Changing chat prefix variable to job name
@EventHandler(priority = EventPriority.LOW, ignoreCancelled = true)
public void onPlayerChatLow(AsyncChatEvent event) {
onPlayerChatHigh(event);
}
// Changing chat prefix variable to job name
@EventHandler(priority = EventPriority.HIGH, ignoreCancelled = true)
public void onPlayerChatHigh(AsyncChatEvent event) {
if (Jobs.getGCManager().getModifyChat())
return;
JobsPlayer jPlayer = Jobs.getPlayerManager().getJobsPlayer(event.getPlayer());
String honorific = jPlayer != null ? jPlayer.getDisplayHonorific() : "";
if (honorific.equals(" "))
honorific = "";
event.message(ChatRenderer.defaultRenderer().render(event.getPlayer(), event.getPlayer().displayName(), event.message(), event.getPlayer()).replaceText(TextReplacementConfig.builder().match(
"\\{jobs\\}").replacement(honorific).build()));
// event.message(ChatComposer.DEFAULT
// .composeChat(event.getPlayer(), event.getPlayer().displayName(), event.message())
// .replaceText(TextReplacementConfig.builder().match("\\{jobs\\}").replacement(honorific).build()));
}
}