Skip to content

2.5.4: support LOCATION discover type, using with config values: loca…#24

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
MikkoAyaka wants to merge 1 commit into
base:main
Choose a base branch
from
Open

2.5.4: support LOCATION discover type, using with config values: loca… #24

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 9 additions & 1 deletion pom.xml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -6,7 +6,7 @@

<groupId>cx.ajneb97</groupId>
<artifactId>Codex</artifactId>
<version>2.5.3</version>
<version>2.5.4</version>

<properties>
<maven.compiler.source>21</maven.compiler.source>
Expand DownExpand Up@@ -144,6 +144,14 @@
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<source>9</source>
<target>9</target>
</configuration>
</plugin>
</plugins>
</build>
</project>
6 changes: 5 additions & 1 deletion src/main/java/cx/ajneb97/Codex.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -6,6 +6,7 @@
import cx.ajneb97.config.ConfigsManager;
import cx.ajneb97.database.MySQLConnection;
import cx.ajneb97.listeners.InventoryListener;
import cx.ajneb97.listeners.MovementListener;
import cx.ajneb97.listeners.PlayerListener;
import cx.ajneb97.listeners.dependencies.EliteMobsListener;
import cx.ajneb97.listeners.dependencies.MythicMobsListener;
Expand DownExpand Up@@ -43,10 +44,11 @@ public class Codex extends JavaPlugin {
private PlayerDataSaveTask playerDataSaveTask;
private UpdateCheckerManager updateCheckerManager;
private VerifyManager verifyManager;

private MovementListener movementListener;
public void onEnable(){
setVersion();
setPrefix();
this.movementListener = new MovementListener(this);
this.playerDataManager = new PlayerDataManager(this);
this.inventoryManager = new InventoryManager(this);
this.commonItemManager = new CommonItemManager(this);
Expand DownExpand Up@@ -90,6 +92,7 @@ public void onEnable(){
}

public void onDisable(){
movementListener.unregister();
configsManager.getPlayersConfigManager().saveConfigs();

Bukkit.getConsoleSender().sendMessage(prefix+MessagesManager.getColoredMessage("&eHas been disabled! &fVersion: "+version));
Expand All@@ -100,6 +103,7 @@ public void registerCommands(){

public void registerEvents(){
PluginManager pm = getServer().getPluginManager();
movementListener.register();
pm.registerEvents(new InventoryListener(this), this);
pm.registerEvents(new PlayerListener(this), this);
if(dependencyManager.getWorldGuardManager() != null){
Expand Down
2 changes: 2 additions & 0 deletions src/main/java/cx/ajneb97/config/CategoriesConfigManager.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -55,6 +55,8 @@ public void loadConfigs() {
discoveredOn.setMobName(config.getString(pathValue+".mob_name"));
discoveredOn.setMobType(config.getString(pathValue+".mob_type"));
discoveredOn.setRegionName(config.getString(pathValue+".region_name"));
discoveredOn.setLocation(config.getString(pathValue+".location"));
discoveredOn.setRange(config.getString(pathValue+".range"));
}

CommonItem customDiscoveryItemUnlocked = null;
Expand Down
27 changes: 27 additions & 0 deletions src/main/java/cx/ajneb97/listeners/MovementListener.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
package cx.ajneb97.listeners;

import cx.ajneb97.Codex;
import org.bukkit.Bukkit;

public class MovementListener {

private Codex plugin;
public MovementListener(Codex plugin){
this.plugin = plugin;
}

private int taskId = 0;

public void register() {
taskId = Bukkit.getScheduler().runTaskTimerAsynchronously(plugin, () -> {
Bukkit.getOnlinePlayers().forEach(player -> {
plugin.getDiscoveryManager().onLocationNear(player, player.getLocation());
});
}, 100, 100).getTaskId();
}

public void unregister() {
Bukkit.getScheduler().cancelTask(taskId);
}

}
20 changes: 20 additions & 0 deletions src/main/java/cx/ajneb97/managers/DiscoveryManager.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,6 +8,9 @@
import cx.ajneb97.model.structure.DiscoveredOn;
import cx.ajneb97.model.structure.Discovery;
import cx.ajneb97.utils.ActionUtils;
import org.bukkit.Bukkit;
import org.bukkit.Location;
import org.bukkit.World;
import org.bukkit.entity.Player;

import java.util.*;
Expand DownExpand Up@@ -117,6 +120,23 @@ public void onWorldGuardRegionEnter(Player player, String regionName){
}
}

public void onLocationNear(Player player, Location location){
ArrayList<Discovery> discoveries = getPossibleDiscoveries(DiscoveredOn.DiscoveredOnType.LOCATION);
for(Discovery discovery : discoveries){
DiscoveredOn discoveredOn = discovery.getDiscoveredOn();
List<String> locArgs = List.of(discoveredOn.getLocation().split(","));
World world = Bukkit.getWorld(locArgs.get(0));
if(world != location.getWorld()) continue;
Location discoveredLoc = new Location(world,Integer.parseInt(locArgs.get(1)),Integer.parseInt(locArgs.get(2)),Integer.parseInt(locArgs.get(3)));
if(discoveredLoc.distance(location) > Integer.parseInt(discoveredOn.getRange())) {
continue;
}
onDiscover(player,discovery.getCategoryName(),discovery.getId());

return;
}
}

public boolean onDiscover(Player player,String categoryName,String discoveryName){
Category category = plugin.getCategoryManager().getCategory(categoryName);
Discovery discovery = category.getDiscovery(discoveryName);
Expand Down
16 changes: 15 additions & 1 deletion src/main/java/cx/ajneb97/model/structure/DiscoveredOn.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -6,6 +6,8 @@ public class DiscoveredOn {
private String mobType;
private String mobName;
private String regionName;
private String location;
private String range;

public DiscoveredOn(DiscoveredOnType type) {
this.type = type;
Expand DownExpand Up@@ -39,6 +41,17 @@ public String getRegionName() {
return regionName;
}

public String getLocation() {
return location;
}
public String getRange() {
return range;
}

public void setLocation(String location) { this.location = location; }

public void setRange(String range) { this.range = range; }

public void setRegionName(String regionName) {
this.regionName = regionName;
}
Expand All@@ -47,6 +60,7 @@ public enum DiscoveredOnType{
MOB_KILL,
MYTHIC_MOB_KILL,
ELITE_MOB_KILL,
WORLDGUARD_REGION
WORLDGUARD_REGION,
LOCATION
}
}
4 changes: 3 additions & 1 deletion src/main/resources/plugin.yml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,9 @@ main: cx.ajneb97.Codex
version: ${project.version}
name: Codex
api-version: 1.13
author: Ajneb97
author:
- Ajneb97
- MikkoAyaka
softdepend: [WorldGuard,WorldEdit,PlaceholderAPI,MythicMobs]

commands:
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all 
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
2.5.4: support LOCATION discover type, using with config values: loca… by MikkoAyaka · Pull Request #24 · Ajneb97/Codex · GitHub
Skip to content
2.5.4: support LOCATION discover type, using with config values: loca…#24

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Open

MikkoAyaka
wants to merge
1
commit into

base:main
Choose a base branch

from

 Open


2.5.4: support LOCATION discover type, using with config values: loca…
#24
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


10 changes: 9 additions & 1 deletion
pom.xml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,7 +6,7 @@

 <groupId>cx.ajneb97</groupId>
 <artifactId>Codex</artifactId>
 <version>2.5.3</version>
 <version>2.5.4</version>

 <properties>
 <maven.compiler.source>21</maven.compiler.source>
Expand DownExpand Up@@ -144,6 +144,14 @@
 </execution>
 </executions>
 </plugin>
 <plugin>
 <groupId>org.apache.maven.plugins</groupId>
 <artifactId>maven-compiler-plugin</artifactId>
 <configuration>
 <source>9</source>
 <target>9</target>
 </configuration>
 </plugin>
 </plugins>
 </build>
</project>

6 changes: 5 additions & 1 deletion
src/main/java/cx/ajneb97/Codex.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,6 +6,7 @@
import cx.ajneb97.config.ConfigsManager;
import cx.ajneb97.database.MySQLConnection;
import cx.ajneb97.listeners.InventoryListener;
import cx.ajneb97.listeners.MovementListener;
import cx.ajneb97.listeners.PlayerListener;
import cx.ajneb97.listeners.dependencies.EliteMobsListener;
import cx.ajneb97.listeners.dependencies.MythicMobsListener;
Expand DownExpand Up@@ -43,10 +44,11 @@ public class Codex extends JavaPlugin {
 private PlayerDataSaveTask playerDataSaveTask;
 private UpdateCheckerManager updateCheckerManager;
 private VerifyManager verifyManager;

 private MovementListener movementListener;
 public void onEnable(){
 setVersion();
 setPrefix();
 this.movementListener = new MovementListener(this);
 this.playerDataManager = new PlayerDataManager(this);
 this.inventoryManager = new InventoryManager(this);
 this.commonItemManager = new CommonItemManager(this);
Expand DownExpand Up@@ -90,6 +92,7 @@ public void onEnable(){
 }

 public void onDisable(){
 movementListener.unregister();
 configsManager.getPlayersConfigManager().saveConfigs();

 Bukkit.getConsoleSender().sendMessage(prefix+MessagesManager.getColoredMessage("&eHas been disabled! &fVersion: "+version));
Expand All@@ -100,6 +103,7 @@ public void registerCommands(){

 public void registerEvents(){
 PluginManager pm = getServer().getPluginManager();
 movementListener.register();
 pm.registerEvents(new InventoryListener(this), this);
 pm.registerEvents(new PlayerListener(this), this);
 if(dependencyManager.getWorldGuardManager() != null){
Expand Down

2 changes: 2 additions & 0 deletions
src/main/java/cx/ajneb97/config/CategoriesConfigManager.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -55,6 +55,8 @@ public void loadConfigs() {
 discoveredOn.setMobName(config.getString(pathValue+".mob_name"));
 discoveredOn.setMobType(config.getString(pathValue+".mob_type"));
 discoveredOn.setRegionName(config.getString(pathValue+".region_name"));
 discoveredOn.setLocation(config.getString(pathValue+".location"));
 discoveredOn.setRange(config.getString(pathValue+".range"));
 }

 CommonItem customDiscoveryItemUnlocked = null;
Expand Down

27 changes: 27 additions & 0 deletions
src/main/java/cx/ajneb97/listeners/MovementListener.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
package cx.ajneb97.listeners;

import cx.ajneb97.Codex;
import org.bukkit.Bukkit;

public class MovementListener {

 private Codex plugin;
 public MovementListener(Codex plugin){
 this.plugin = plugin;
 }

 private int taskId = 0;

 public void register() {
 taskId = Bukkit.getScheduler().runTaskTimerAsynchronously(plugin, () -> {
 Bukkit.getOnlinePlayers().forEach(player -> {
 plugin.getDiscoveryManager().onLocationNear(player, player.getLocation());
 });
 }, 100, 100).getTaskId();
 }

 public void unregister() {
 Bukkit.getScheduler().cancelTask(taskId);
 }

}

20 changes: 20 additions & 0 deletions
src/main/java/cx/ajneb97/managers/DiscoveryManager.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -8,6 +8,9 @@
import cx.ajneb97.model.structure.DiscoveredOn;
import cx.ajneb97.model.structure.Discovery;
import cx.ajneb97.utils.ActionUtils;
import org.bukkit.Bukkit;
import org.bukkit.Location;
import org.bukkit.World;
import org.bukkit.entity.Player;

import java.util.*;
Expand DownExpand Up@@ -117,6 +120,23 @@ public void onWorldGuardRegionEnter(Player player, String regionName){
 }
 }

 public void onLocationNear(Player player, Location location){
 ArrayList<Discovery> discoveries = getPossibleDiscoveries(DiscoveredOn.DiscoveredOnType.LOCATION);
 for(Discovery discovery : discoveries){
 DiscoveredOn discoveredOn = discovery.getDiscoveredOn();
 List<String> locArgs = List.of(discoveredOn.getLocation().split(","));
 World world = Bukkit.getWorld(locArgs.get(0));
 if(world != location.getWorld()) continue;
 Location discoveredLoc = new Location(world,Integer.parseInt(locArgs.get(1)),Integer.parseInt(locArgs.get(2)),Integer.parseInt(locArgs.get(3)));
 if(discoveredLoc.distance(location) > Integer.parseInt(discoveredOn.getRange())) {
 continue;
 }
 onDiscover(player,discovery.getCategoryName(),discovery.getId());

 return;
 }
 }

 public boolean onDiscover(Player player,String categoryName,String discoveryName){
 Category category = plugin.getCategoryManager().getCategory(categoryName);
 Discovery discovery = category.getDiscovery(discoveryName);
Expand Down

16 changes: 15 additions & 1 deletion
src/main/java/cx/ajneb97/model/structure/DiscoveredOn.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,6 +6,8 @@ public class DiscoveredOn {
 private String mobType;
 private String mobName;
 private String regionName;
 private String location;
 private String range;

 public DiscoveredOn(DiscoveredOnType type) {
 this.type = type;
Expand DownExpand Up@@ -39,6 +41,17 @@ public String getRegionName() {
 return regionName;
 }

 public String getLocation() {
 return location;
 }
 public String getRange() {
 return range;
 }

 public void setLocation(String location) { this.location = location; }

 public void setRange(String range) { this.range = range; }

 public void setRegionName(String regionName) {
 this.regionName = regionName;
 }
Expand All@@ -47,6 +60,7 @@ public enum DiscoveredOnType{
 MOB_KILL,
 MYTHIC_MOB_KILL,
 ELITE_MOB_KILL,
 WORLDGUARD_REGION
 WORLDGUARD_REGION,
 LOCATION
 }
}

4 changes: 3 additions & 1 deletion
src/main/resources/plugin.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,9 @@ main: cx.ajneb97.Codex
version: ${project.version}
name: Codex
api-version: 1.13
author: Ajneb97
author:
 - Ajneb97
 - MikkoAyaka
softdepend: [WorldGuard,WorldEdit,PlaceholderAPI,MythicMobs]

commands:
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Force GitHub README to respect dark mode
(function() {
var style = document.createElement('style');
style.textContent = '
.markdown-body {
color-scheme: dark light;
}
.markdown-body pre { background: #161b22 !important; }
.markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }
.markdown-body table th, .markdown-body table td { border-color: #30363d !important; }
.markdown-body img { background: #0d1117; }
.markdown-body blockquote { border-left-color: #8b949e; }
.markdown-body hr { border-color: #30363d; }
';
document.head.appendChild(style);
})();
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
2.5.4: support LOCATION discover type, using with config values: loca… by MikkoAyaka · Pull Request #24 · Ajneb97/Codex · GitHub
Skip to content
2.5.4: support LOCATION discover type, using with config values: loca…#24

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Open

MikkoAyaka
wants to merge
1
commit into

base:main
Choose a base branch

from

 Open


2.5.4: support LOCATION discover type, using with config values: loca…
#24
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


10 changes: 9 additions & 1 deletion
pom.xml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,7 +6,7 @@

 <groupId>cx.ajneb97</groupId>
 <artifactId>Codex</artifactId>
 <version>2.5.3</version>
 <version>2.5.4</version>

 <properties>
 <maven.compiler.source>21</maven.compiler.source>
Expand DownExpand Up@@ -144,6 +144,14 @@
 </execution>
 </executions>
 </plugin>
 <plugin>
 <groupId>org.apache.maven.plugins</groupId>
 <artifactId>maven-compiler-plugin</artifactId>
 <configuration>
 <source>9</source>
 <target>9</target>
 </configuration>
 </plugin>
 </plugins>
 </build>
</project>

6 changes: 5 additions & 1 deletion
src/main/java/cx/ajneb97/Codex.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,6 +6,7 @@
import cx.ajneb97.config.ConfigsManager;
import cx.ajneb97.database.MySQLConnection;
import cx.ajneb97.listeners.InventoryListener;
import cx.ajneb97.listeners.MovementListener;
import cx.ajneb97.listeners.PlayerListener;
import cx.ajneb97.listeners.dependencies.EliteMobsListener;
import cx.ajneb97.listeners.dependencies.MythicMobsListener;
Expand DownExpand Up@@ -43,10 +44,11 @@ public class Codex extends JavaPlugin {
 private PlayerDataSaveTask playerDataSaveTask;
 private UpdateCheckerManager updateCheckerManager;
 private VerifyManager verifyManager;

 private MovementListener movementListener;
 public void onEnable(){
 setVersion();
 setPrefix();
 this.movementListener = new MovementListener(this);
 this.playerDataManager = new PlayerDataManager(this);
 this.inventoryManager = new InventoryManager(this);
 this.commonItemManager = new CommonItemManager(this);
Expand DownExpand Up@@ -90,6 +92,7 @@ public void onEnable(){
 }

 public void onDisable(){
 movementListener.unregister();
 configsManager.getPlayersConfigManager().saveConfigs();

 Bukkit.getConsoleSender().sendMessage(prefix+MessagesManager.getColoredMessage("&eHas been disabled! &fVersion: "+version));
Expand All@@ -100,6 +103,7 @@ public void registerCommands(){

 public void registerEvents(){
 PluginManager pm = getServer().getPluginManager();
 movementListener.register();
 pm.registerEvents(new InventoryListener(this), this);
 pm.registerEvents(new PlayerListener(this), this);
 if(dependencyManager.getWorldGuardManager() != null){
Expand Down

2 changes: 2 additions & 0 deletions
src/main/java/cx/ajneb97/config/CategoriesConfigManager.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -55,6 +55,8 @@ public void loadConfigs() {
 discoveredOn.setMobName(config.getString(pathValue+".mob_name"));
 discoveredOn.setMobType(config.getString(pathValue+".mob_type"));
 discoveredOn.setRegionName(config.getString(pathValue+".region_name"));
 discoveredOn.setLocation(config.getString(pathValue+".location"));
 discoveredOn.setRange(config.getString(pathValue+".range"));
 }

 CommonItem customDiscoveryItemUnlocked = null;
Expand Down

27 changes: 27 additions & 0 deletions
src/main/java/cx/ajneb97/listeners/MovementListener.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
package cx.ajneb97.listeners;

import cx.ajneb97.Codex;
import org.bukkit.Bukkit;

public class MovementListener {

 private Codex plugin;
 public MovementListener(Codex plugin){
 this.plugin = plugin;
 }

 private int taskId = 0;

 public void register() {
 taskId = Bukkit.getScheduler().runTaskTimerAsynchronously(plugin, () -> {
 Bukkit.getOnlinePlayers().forEach(player -> {
 plugin.getDiscoveryManager().onLocationNear(player, player.getLocation());
 });
 }, 100, 100).getTaskId();
 }

 public void unregister() {
 Bukkit.getScheduler().cancelTask(taskId);
 }

}

20 changes: 20 additions & 0 deletions
src/main/java/cx/ajneb97/managers/DiscoveryManager.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -8,6 +8,9 @@
import cx.ajneb97.model.structure.DiscoveredOn;
import cx.ajneb97.model.structure.Discovery;
import cx.ajneb97.utils.ActionUtils;
import org.bukkit.Bukkit;
import org.bukkit.Location;
import org.bukkit.World;
import org.bukkit.entity.Player;

import java.util.*;
Expand DownExpand Up@@ -117,6 +120,23 @@ public void onWorldGuardRegionEnter(Player player, String regionName){
 }
 }

 public void onLocationNear(Player player, Location location){
 ArrayList<Discovery> discoveries = getPossibleDiscoveries(DiscoveredOn.DiscoveredOnType.LOCATION);
 for(Discovery discovery : discoveries){
 DiscoveredOn discoveredOn = discovery.getDiscoveredOn();
 List<String> locArgs = List.of(discoveredOn.getLocation().split(","));
 World world = Bukkit.getWorld(locArgs.get(0));
 if(world != location.getWorld()) continue;
 Location discoveredLoc = new Location(world,Integer.parseInt(locArgs.get(1)),Integer.parseInt(locArgs.get(2)),Integer.parseInt(locArgs.get(3)));
 if(discoveredLoc.distance(location) > Integer.parseInt(discoveredOn.getRange())) {
 continue;
 }
 onDiscover(player,discovery.getCategoryName(),discovery.getId());

 return;
 }
 }

 public boolean onDiscover(Player player,String categoryName,String discoveryName){
 Category category = plugin.getCategoryManager().getCategory(categoryName);
 Discovery discovery = category.getDiscovery(discoveryName);
Expand Down

16 changes: 15 additions & 1 deletion
src/main/java/cx/ajneb97/model/structure/DiscoveredOn.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,6 +6,8 @@ public class DiscoveredOn {
 private String mobType;
 private String mobName;
 private String regionName;
 private String location;
 private String range;

 public DiscoveredOn(DiscoveredOnType type) {
 this.type = type;
Expand DownExpand Up@@ -39,6 +41,17 @@ public String getRegionName() {
 return regionName;
 }

 public String getLocation() {
 return location;
 }
 public String getRange() {
 return range;
 }

 public void setLocation(String location) { this.location = location; }

 public void setRange(String range) { this.range = range; }

 public void setRegionName(String regionName) {
 this.regionName = regionName;
 }
Expand All@@ -47,6 +60,7 @@ public enum DiscoveredOnType{
 MOB_KILL,
 MYTHIC_MOB_KILL,
 ELITE_MOB_KILL,
 WORLDGUARD_REGION
 WORLDGUARD_REGION,
 LOCATION
 }
}

4 changes: 3 additions & 1 deletion
src/main/resources/plugin.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,9 @@ main: cx.ajneb97.Codex
version: ${project.version}
name: Codex
api-version: 1.13
author: Ajneb97
author:
 - Ajneb97
 - MikkoAyaka
softdepend: [WorldGuard,WorldEdit,PlaceholderAPI,MythicMobs]

commands:
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Highlight search terms from Google/DuckDuckGo/Bing referrer
(function() {
var ref = document.referrer;
var terms = [];
if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {
var url = new URL(ref);
var q = url.searchParams.get('q') || url.searchParams.get('p');
if (q) {
terms = q.split(/\s+/).filter(function(t) { return t.length > 2; });
}
}
if (terms.length === 0) return;
var style = document.createElement('style');
style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';
document.head.appendChild(style);
function highlight(node) {
if (node.nodeType === 3) { // text node
var text = node.textContent;
var found = false;
terms.forEach(function(term) {
var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\]\\]/g, '\\') + ')', 'gi');
if (regex.test(text)) {
found = true;
var frag = document.createDocumentFragment();
var parts = text.split(regex);
parts.forEach(function(part, i) {
if (i % 2 === 0) {
frag.appendChild(document.createTextNode(part));
} else {
var span = document.createElement('span');
span.className = 'userscript-highlight';
span.textContent = part;
frag.appendChild(span);
}
});
node.parentNode.replaceChild(frag, node);
}
});
} else if (node.nodeType === 1 && node.childNodes) { // element
var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];
if (!skipTags.includes(node.tagName)) {
Array.from(node.childNodes).forEach(highlight);
}
}
}
highlight(document.body);
// Re-highlight on dynamic content
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1 || node.nodeType === 3) highlight(node);
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
2.5.4: support LOCATION discover type, using with config values: loca… by MikkoAyaka · Pull Request #24 · Ajneb97/Codex · GitHub
Skip to content
2.5.4: support LOCATION discover type, using with config values: loca…#24

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Open

MikkoAyaka
wants to merge
1
commit into

base:main
Choose a base branch

from

 Open


2.5.4: support LOCATION discover type, using with config values: loca…
#24
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


10 changes: 9 additions & 1 deletion
pom.xml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,7 +6,7 @@

 <groupId>cx.ajneb97</groupId>
 <artifactId>Codex</artifactId>
 <version>2.5.3</version>
 <version>2.5.4</version>

 <properties>
 <maven.compiler.source>21</maven.compiler.source>
Expand DownExpand Up@@ -144,6 +144,14 @@
 </execution>
 </executions>
 </plugin>
 <plugin>
 <groupId>org.apache.maven.plugins</groupId>
 <artifactId>maven-compiler-plugin</artifactId>
 <configuration>
 <source>9</source>
 <target>9</target>
 </configuration>
 </plugin>
 </plugins>
 </build>
</project>

6 changes: 5 additions & 1 deletion
src/main/java/cx/ajneb97/Codex.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,6 +6,7 @@
import cx.ajneb97.config.ConfigsManager;
import cx.ajneb97.database.MySQLConnection;
import cx.ajneb97.listeners.InventoryListener;
import cx.ajneb97.listeners.MovementListener;
import cx.ajneb97.listeners.PlayerListener;
import cx.ajneb97.listeners.dependencies.EliteMobsListener;
import cx.ajneb97.listeners.dependencies.MythicMobsListener;
Expand DownExpand Up@@ -43,10 +44,11 @@ public class Codex extends JavaPlugin {
 private PlayerDataSaveTask playerDataSaveTask;
 private UpdateCheckerManager updateCheckerManager;
 private VerifyManager verifyManager;

 private MovementListener movementListener;
 public void onEnable(){
 setVersion();
 setPrefix();
 this.movementListener = new MovementListener(this);
 this.playerDataManager = new PlayerDataManager(this);
 this.inventoryManager = new InventoryManager(this);
 this.commonItemManager = new CommonItemManager(this);
Expand DownExpand Up@@ -90,6 +92,7 @@ public void onEnable(){
 }

 public void onDisable(){
 movementListener.unregister();
 configsManager.getPlayersConfigManager().saveConfigs();

 Bukkit.getConsoleSender().sendMessage(prefix+MessagesManager.getColoredMessage("&eHas been disabled! &fVersion: "+version));
Expand All@@ -100,6 +103,7 @@ public void registerCommands(){

 public void registerEvents(){
 PluginManager pm = getServer().getPluginManager();
 movementListener.register();
 pm.registerEvents(new InventoryListener(this), this);
 pm.registerEvents(new PlayerListener(this), this);
 if(dependencyManager.getWorldGuardManager() != null){
Expand Down

2 changes: 2 additions & 0 deletions
src/main/java/cx/ajneb97/config/CategoriesConfigManager.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -55,6 +55,8 @@ public void loadConfigs() {
 discoveredOn.setMobName(config.getString(pathValue+".mob_name"));
 discoveredOn.setMobType(config.getString(pathValue+".mob_type"));
 discoveredOn.setRegionName(config.getString(pathValue+".region_name"));
 discoveredOn.setLocation(config.getString(pathValue+".location"));
 discoveredOn.setRange(config.getString(pathValue+".range"));
 }

 CommonItem customDiscoveryItemUnlocked = null;
Expand Down

27 changes: 27 additions & 0 deletions
src/main/java/cx/ajneb97/listeners/MovementListener.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
package cx.ajneb97.listeners;

import cx.ajneb97.Codex;
import org.bukkit.Bukkit;

public class MovementListener {

 private Codex plugin;
 public MovementListener(Codex plugin){
 this.plugin = plugin;
 }

 private int taskId = 0;

 public void register() {
 taskId = Bukkit.getScheduler().runTaskTimerAsynchronously(plugin, () -> {
 Bukkit.getOnlinePlayers().forEach(player -> {
 plugin.getDiscoveryManager().onLocationNear(player, player.getLocation());
 });
 }, 100, 100).getTaskId();
 }

 public void unregister() {
 Bukkit.getScheduler().cancelTask(taskId);
 }

}

20 changes: 20 additions & 0 deletions
src/main/java/cx/ajneb97/managers/DiscoveryManager.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -8,6 +8,9 @@
import cx.ajneb97.model.structure.DiscoveredOn;
import cx.ajneb97.model.structure.Discovery;
import cx.ajneb97.utils.ActionUtils;
import org.bukkit.Bukkit;
import org.bukkit.Location;
import org.bukkit.World;
import org.bukkit.entity.Player;

import java.util.*;
Expand DownExpand Up@@ -117,6 +120,23 @@ public void onWorldGuardRegionEnter(Player player, String regionName){
 }
 }

 public void onLocationNear(Player player, Location location){
 ArrayList<Discovery> discoveries = getPossibleDiscoveries(DiscoveredOn.DiscoveredOnType.LOCATION);
 for(Discovery discovery : discoveries){
 DiscoveredOn discoveredOn = discovery.getDiscoveredOn();
 List<String> locArgs = List.of(discoveredOn.getLocation().split(","));
 World world = Bukkit.getWorld(locArgs.get(0));
 if(world != location.getWorld()) continue;
 Location discoveredLoc = new Location(world,Integer.parseInt(locArgs.get(1)),Integer.parseInt(locArgs.get(2)),Integer.parseInt(locArgs.get(3)));
 if(discoveredLoc.distance(location) > Integer.parseInt(discoveredOn.getRange())) {
 continue;
 }
 onDiscover(player,discovery.getCategoryName(),discovery.getId());

 return;
 }
 }

 public boolean onDiscover(Player player,String categoryName,String discoveryName){
 Category category = plugin.getCategoryManager().getCategory(categoryName);
 Discovery discovery = category.getDiscovery(discoveryName);
Expand Down

16 changes: 15 additions & 1 deletion
src/main/java/cx/ajneb97/model/structure/DiscoveredOn.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,6 +6,8 @@ public class DiscoveredOn {
 private String mobType;
 private String mobName;
 private String regionName;
 private String location;
 private String range;

 public DiscoveredOn(DiscoveredOnType type) {
 this.type = type;
Expand DownExpand Up@@ -39,6 +41,17 @@ public String getRegionName() {
 return regionName;
 }

 public String getLocation() {
 return location;
 }
 public String getRange() {
 return range;
 }

 public void setLocation(String location) { this.location = location; }

 public void setRange(String range) { this.range = range; }

 public void setRegionName(String regionName) {
 this.regionName = regionName;
 }
Expand All@@ -47,6 +60,7 @@ public enum DiscoveredOnType{
 MOB_KILL,
 MYTHIC_MOB_KILL,
 ELITE_MOB_KILL,
 WORLDGUARD_REGION
 WORLDGUARD_REGION,
 LOCATION
 }
}

4 changes: 3 additions & 1 deletion
src/main/resources/plugin.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,9 @@ main: cx.ajneb97.Codex
version: ${project.version}
name: Codex
api-version: 1.13
author: Ajneb97
author:
 - Ajneb97
 - MikkoAyaka
softdepend: [WorldGuard,WorldEdit,PlaceholderAPI,MythicMobs]

commands:
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Strip utm_, fbclid, gclid, etc. from all links on page
(function() {
var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',
'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',
'ref', 'ref_src', 'source', 'medium', 'campaign'];
function cleanUrl(url) {
try {
var u = new URL(url, window.location.origin);
var changed = false;
trackingParams.forEach(function(p) {
if (u.searchParams.has(p)) {
u.searchParams.delete(p);
changed = true;
}
});
return changed ? u.toString() : url;
} catch (e) {
return url;
}
}
function cleanLinks() {
document.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
cleanLinks();
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1) {
if (node.tagName === 'A') cleanLinks();
node.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '
2.5.4: support LOCATION discover type, using with config values: loca… by MikkoAyaka · Pull Request #24 · Ajneb97/Codex · GitHub
Skip to content
2.5.4: support LOCATION discover type, using with config values: loca…#24

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Open

MikkoAyaka
wants to merge
1
commit into

base:main
Choose a base branch

from

 Open


2.5.4: support LOCATION discover type, using with config values: loca…
#24
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


10 changes: 9 additions & 1 deletion
pom.xml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,7 +6,7 @@

 <groupId>cx.ajneb97</groupId>
 <artifactId>Codex</artifactId>
 <version>2.5.3</version>
 <version>2.5.4</version>

 <properties>
 <maven.compiler.source>21</maven.compiler.source>
Expand DownExpand Up@@ -144,6 +144,14 @@
 </execution>
 </executions>
 </plugin>
 <plugin>
 <groupId>org.apache.maven.plugins</groupId>
 <artifactId>maven-compiler-plugin</artifactId>
 <configuration>
 <source>9</source>
 <target>9</target>
 </configuration>
 </plugin>
 </plugins>
 </build>
</project>

6 changes: 5 additions & 1 deletion
src/main/java/cx/ajneb97/Codex.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,6 +6,7 @@
import cx.ajneb97.config.ConfigsManager;
import cx.ajneb97.database.MySQLConnection;
import cx.ajneb97.listeners.InventoryListener;
import cx.ajneb97.listeners.MovementListener;
import cx.ajneb97.listeners.PlayerListener;
import cx.ajneb97.listeners.dependencies.EliteMobsListener;
import cx.ajneb97.listeners.dependencies.MythicMobsListener;
Expand DownExpand Up@@ -43,10 +44,11 @@ public class Codex extends JavaPlugin {
 private PlayerDataSaveTask playerDataSaveTask;
 private UpdateCheckerManager updateCheckerManager;
 private VerifyManager verifyManager;

 private MovementListener movementListener;
 public void onEnable(){
 setVersion();
 setPrefix();
 this.movementListener = new MovementListener(this);
 this.playerDataManager = new PlayerDataManager(this);
 this.inventoryManager = new InventoryManager(this);
 this.commonItemManager = new CommonItemManager(this);
Expand DownExpand Up@@ -90,6 +92,7 @@ public void onEnable(){
 }

 public void onDisable(){
 movementListener.unregister();
 configsManager.getPlayersConfigManager().saveConfigs();

 Bukkit.getConsoleSender().sendMessage(prefix+MessagesManager.getColoredMessage("&eHas been disabled! &fVersion: "+version));
Expand All@@ -100,6 +103,7 @@ public void registerCommands(){

 public void registerEvents(){
 PluginManager pm = getServer().getPluginManager();
 movementListener.register();
 pm.registerEvents(new InventoryListener(this), this);
 pm.registerEvents(new PlayerListener(this), this);
 if(dependencyManager.getWorldGuardManager() != null){
Expand Down

2 changes: 2 additions & 0 deletions
src/main/java/cx/ajneb97/config/CategoriesConfigManager.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -55,6 +55,8 @@ public void loadConfigs() {
 discoveredOn.setMobName(config.getString(pathValue+".mob_name"));
 discoveredOn.setMobType(config.getString(pathValue+".mob_type"));
 discoveredOn.setRegionName(config.getString(pathValue+".region_name"));
 discoveredOn.setLocation(config.getString(pathValue+".location"));
 discoveredOn.setRange(config.getString(pathValue+".range"));
 }

 CommonItem customDiscoveryItemUnlocked = null;
Expand Down

27 changes: 27 additions & 0 deletions
src/main/java/cx/ajneb97/listeners/MovementListener.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
package cx.ajneb97.listeners;

import cx.ajneb97.Codex;
import org.bukkit.Bukkit;

public class MovementListener {

 private Codex plugin;
 public MovementListener(Codex plugin){
 this.plugin = plugin;
 }

 private int taskId = 0;

 public void register() {
 taskId = Bukkit.getScheduler().runTaskTimerAsynchronously(plugin, () -> {
 Bukkit.getOnlinePlayers().forEach(player -> {
 plugin.getDiscoveryManager().onLocationNear(player, player.getLocation());
 });
 }, 100, 100).getTaskId();
 }

 public void unregister() {
 Bukkit.getScheduler().cancelTask(taskId);
 }

}

20 changes: 20 additions & 0 deletions
src/main/java/cx/ajneb97/managers/DiscoveryManager.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -8,6 +8,9 @@
import cx.ajneb97.model.structure.DiscoveredOn;
import cx.ajneb97.model.structure.Discovery;
import cx.ajneb97.utils.ActionUtils;
import org.bukkit.Bukkit;
import org.bukkit.Location;
import org.bukkit.World;
import org.bukkit.entity.Player;

import java.util.*;
Expand DownExpand Up@@ -117,6 +120,23 @@ public void onWorldGuardRegionEnter(Player player, String regionName){
 }
 }

 public void onLocationNear(Player player, Location location){
 ArrayList<Discovery> discoveries = getPossibleDiscoveries(DiscoveredOn.DiscoveredOnType.LOCATION);
 for(Discovery discovery : discoveries){
 DiscoveredOn discoveredOn = discovery.getDiscoveredOn();
 List<String> locArgs = List.of(discoveredOn.getLocation().split(","));
 World world = Bukkit.getWorld(locArgs.get(0));
 if(world != location.getWorld()) continue;
 Location discoveredLoc = new Location(world,Integer.parseInt(locArgs.get(1)),Integer.parseInt(locArgs.get(2)),Integer.parseInt(locArgs.get(3)));
 if(discoveredLoc.distance(location) > Integer.parseInt(discoveredOn.getRange())) {
 continue;
 }
 onDiscover(player,discovery.getCategoryName(),discovery.getId());

 return;
 }
 }

 public boolean onDiscover(Player player,String categoryName,String discoveryName){
 Category category = plugin.getCategoryManager().getCategory(categoryName);
 Discovery discovery = category.getDiscovery(discoveryName);
Expand Down

16 changes: 15 additions & 1 deletion
src/main/java/cx/ajneb97/model/structure/DiscoveredOn.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,6 +6,8 @@ public class DiscoveredOn {
 private String mobType;
 private String mobName;
 private String regionName;
 private String location;
 private String range;

 public DiscoveredOn(DiscoveredOnType type) {
 this.type = type;
Expand DownExpand Up@@ -39,6 +41,17 @@ public String getRegionName() {
 return regionName;
 }

 public String getLocation() {
 return location;
 }
 public String getRange() {
 return range;
 }

 public void setLocation(String location) { this.location = location; }

 public void setRange(String range) { this.range = range; }

 public void setRegionName(String regionName) {
 this.regionName = regionName;
 }
Expand All@@ -47,6 +60,7 @@ public enum DiscoveredOnType{
 MOB_KILL,
 MYTHIC_MOB_KILL,
 ELITE_MOB_KILL,
 WORLDGUARD_REGION
 WORLDGUARD_REGION,
 LOCATION
 }
}

4 changes: 3 additions & 1 deletion
src/main/resources/plugin.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,9 @@ main: cx.ajneb97.Codex
version: ${project.version}
name: Codex
api-version: 1.13
author: Ajneb97
author:
 - Ajneb97
 - MikkoAyaka
softdepend: [WorldGuard,WorldEdit,PlaceholderAPI,MythicMobs]

commands:
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Auto-enable theater mode on YouTube
(function() {
function tryTheater() {
var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]');
if (btn && !btn.classList.contains('activated')) {
btn.click();
}
}
// Try immediately
tryTheater();
// Try after navigation (SPA)
var lastUrl = location.href;
setInterval(function() {
if (location.href !== lastUrl) {
lastUrl = location.href;
setTimeout(tryTheater, 500);
}
}, 1000);
// Also try on player load
var observer = new MutationObserver(tryTheater);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
2.5.4: support LOCATION discover type, using with config values: loca… by MikkoAyaka · Pull Request #24 · Ajneb97/Codex · GitHub
Skip to content
2.5.4: support LOCATION discover type, using with config values: loca…#24

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Open

MikkoAyaka
wants to merge
1
commit into

base:main
Choose a base branch

from

 Open


2.5.4: support LOCATION discover type, using with config values: loca…
#24
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


10 changes: 9 additions & 1 deletion
pom.xml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,7 +6,7 @@

 <groupId>cx.ajneb97</groupId>
 <artifactId>Codex</artifactId>
 <version>2.5.3</version>
 <version>2.5.4</version>

 <properties>
 <maven.compiler.source>21</maven.compiler.source>
Expand DownExpand Up@@ -144,6 +144,14 @@
 </execution>
 </executions>
 </plugin>
 <plugin>
 <groupId>org.apache.maven.plugins</groupId>
 <artifactId>maven-compiler-plugin</artifactId>
 <configuration>
 <source>9</source>
 <target>9</target>
 </configuration>
 </plugin>
 </plugins>
 </build>
</project>

6 changes: 5 additions & 1 deletion
src/main/java/cx/ajneb97/Codex.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,6 +6,7 @@
import cx.ajneb97.config.ConfigsManager;
import cx.ajneb97.database.MySQLConnection;
import cx.ajneb97.listeners.InventoryListener;
import cx.ajneb97.listeners.MovementListener;
import cx.ajneb97.listeners.PlayerListener;
import cx.ajneb97.listeners.dependencies.EliteMobsListener;
import cx.ajneb97.listeners.dependencies.MythicMobsListener;
Expand DownExpand Up@@ -43,10 +44,11 @@ public class Codex extends JavaPlugin {
 private PlayerDataSaveTask playerDataSaveTask;
 private UpdateCheckerManager updateCheckerManager;
 private VerifyManager verifyManager;

 private MovementListener movementListener;
 public void onEnable(){
 setVersion();
 setPrefix();
 this.movementListener = new MovementListener(this);
 this.playerDataManager = new PlayerDataManager(this);
 this.inventoryManager = new InventoryManager(this);
 this.commonItemManager = new CommonItemManager(this);
Expand DownExpand Up@@ -90,6 +92,7 @@ public void onEnable(){
 }

 public void onDisable(){
 movementListener.unregister();
 configsManager.getPlayersConfigManager().saveConfigs();

 Bukkit.getConsoleSender().sendMessage(prefix+MessagesManager.getColoredMessage("&eHas been disabled! &fVersion: "+version));
Expand All@@ -100,6 +103,7 @@ public void registerCommands(){

 public void registerEvents(){
 PluginManager pm = getServer().getPluginManager();
 movementListener.register();
 pm.registerEvents(new InventoryListener(this), this);
 pm.registerEvents(new PlayerListener(this), this);
 if(dependencyManager.getWorldGuardManager() != null){
Expand Down

2 changes: 2 additions & 0 deletions
src/main/java/cx/ajneb97/config/CategoriesConfigManager.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -55,6 +55,8 @@ public void loadConfigs() {
 discoveredOn.setMobName(config.getString(pathValue+".mob_name"));
 discoveredOn.setMobType(config.getString(pathValue+".mob_type"));
 discoveredOn.setRegionName(config.getString(pathValue+".region_name"));
 discoveredOn.setLocation(config.getString(pathValue+".location"));
 discoveredOn.setRange(config.getString(pathValue+".range"));
 }

 CommonItem customDiscoveryItemUnlocked = null;
Expand Down

27 changes: 27 additions & 0 deletions
src/main/java/cx/ajneb97/listeners/MovementListener.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
package cx.ajneb97.listeners;

import cx.ajneb97.Codex;
import org.bukkit.Bukkit;

public class MovementListener {

 private Codex plugin;
 public MovementListener(Codex plugin){
 this.plugin = plugin;
 }

 private int taskId = 0;

 public void register() {
 taskId = Bukkit.getScheduler().runTaskTimerAsynchronously(plugin, () -> {
 Bukkit.getOnlinePlayers().forEach(player -> {
 plugin.getDiscoveryManager().onLocationNear(player, player.getLocation());
 });
 }, 100, 100).getTaskId();
 }

 public void unregister() {
 Bukkit.getScheduler().cancelTask(taskId);
 }

}

20 changes: 20 additions & 0 deletions
src/main/java/cx/ajneb97/managers/DiscoveryManager.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -8,6 +8,9 @@
import cx.ajneb97.model.structure.DiscoveredOn;
import cx.ajneb97.model.structure.Discovery;
import cx.ajneb97.utils.ActionUtils;
import org.bukkit.Bukkit;
import org.bukkit.Location;
import org.bukkit.World;
import org.bukkit.entity.Player;

import java.util.*;
Expand DownExpand Up@@ -117,6 +120,23 @@ public void onWorldGuardRegionEnter(Player player, String regionName){
 }
 }

 public void onLocationNear(Player player, Location location){
 ArrayList<Discovery> discoveries = getPossibleDiscoveries(DiscoveredOn.DiscoveredOnType.LOCATION);
 for(Discovery discovery : discoveries){
 DiscoveredOn discoveredOn = discovery.getDiscoveredOn();
 List<String> locArgs = List.of(discoveredOn.getLocation().split(","));
 World world = Bukkit.getWorld(locArgs.get(0));
 if(world != location.getWorld()) continue;
 Location discoveredLoc = new Location(world,Integer.parseInt(locArgs.get(1)),Integer.parseInt(locArgs.get(2)),Integer.parseInt(locArgs.get(3)));
 if(discoveredLoc.distance(location) > Integer.parseInt(discoveredOn.getRange())) {
 continue;
 }
 onDiscover(player,discovery.getCategoryName(),discovery.getId());

 return;
 }
 }

 public boolean onDiscover(Player player,String categoryName,String discoveryName){
 Category category = plugin.getCategoryManager().getCategory(categoryName);
 Discovery discovery = category.getDiscovery(discoveryName);
Expand Down

16 changes: 15 additions & 1 deletion
src/main/java/cx/ajneb97/model/structure/DiscoveredOn.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,6 +6,8 @@ public class DiscoveredOn {
 private String mobType;
 private String mobName;
 private String regionName;
 private String location;
 private String range;

 public DiscoveredOn(DiscoveredOnType type) {
 this.type = type;
Expand DownExpand Up@@ -39,6 +41,17 @@ public String getRegionName() {
 return regionName;
 }

 public String getLocation() {
 return location;
 }
 public String getRange() {
 return range;
 }

 public void setLocation(String location) { this.location = location; }

 public void setRange(String range) { this.range = range; }

 public void setRegionName(String regionName) {
 this.regionName = regionName;
 }
Expand All@@ -47,6 +60,7 @@ public enum DiscoveredOnType{
 MOB_KILL,
 MYTHIC_MOB_KILL,
 ELITE_MOB_KILL,
 WORLDGUARD_REGION
 WORLDGUARD_REGION,
 LOCATION
 }
}

4 changes: 3 additions & 1 deletion
src/main/resources/plugin.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,9 @@ main: cx.ajneb97.Codex
version: ${project.version}
name: Codex
api-version: 1.13
author: Ajneb97
author:
 - Ajneb97
 - MikkoAyaka
softdepend: [WorldGuard,WorldEdit,PlaceholderAPI,MythicMobs]

commands:
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Remove or un-stick sticky/fixed headers that block content
(function() {
function unstick() {
document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) {
if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {
el.style.position = 'static';
el.style.top = 'auto';
el.style.zIndex = 'auto';
}
});
}
unstick();
var observer = new MutationObserver(unstick);
observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });
})();
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
2.5.4: support LOCATION discover type, using with config values: loca… by MikkoAyaka · Pull Request #24 · Ajneb97/Codex · GitHub
Skip to content
2.5.4: support LOCATION discover type, using with config values: loca…#24

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Open

MikkoAyaka
wants to merge
1
commit into

base:main
Choose a base branch

from

 Open


2.5.4: support LOCATION discover type, using with config values: loca…
#24
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


10 changes: 9 additions & 1 deletion
pom.xml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,7 +6,7 @@

 <groupId>cx.ajneb97</groupId>
 <artifactId>Codex</artifactId>
 <version>2.5.3</version>
 <version>2.5.4</version>

 <properties>
 <maven.compiler.source>21</maven.compiler.source>
Expand DownExpand Up@@ -144,6 +144,14 @@
 </execution>
 </executions>
 </plugin>
 <plugin>
 <groupId>org.apache.maven.plugins</groupId>
 <artifactId>maven-compiler-plugin</artifactId>
 <configuration>
 <source>9</source>
 <target>9</target>
 </configuration>
 </plugin>
 </plugins>
 </build>
</project>

6 changes: 5 additions & 1 deletion
src/main/java/cx/ajneb97/Codex.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,6 +6,7 @@
import cx.ajneb97.config.ConfigsManager;
import cx.ajneb97.database.MySQLConnection;
import cx.ajneb97.listeners.InventoryListener;
import cx.ajneb97.listeners.MovementListener;
import cx.ajneb97.listeners.PlayerListener;
import cx.ajneb97.listeners.dependencies.EliteMobsListener;
import cx.ajneb97.listeners.dependencies.MythicMobsListener;
Expand DownExpand Up@@ -43,10 +44,11 @@ public class Codex extends JavaPlugin {
 private PlayerDataSaveTask playerDataSaveTask;
 private UpdateCheckerManager updateCheckerManager;
 private VerifyManager verifyManager;

 private MovementListener movementListener;
 public void onEnable(){
 setVersion();
 setPrefix();
 this.movementListener = new MovementListener(this);
 this.playerDataManager = new PlayerDataManager(this);
 this.inventoryManager = new InventoryManager(this);
 this.commonItemManager = new CommonItemManager(this);
Expand DownExpand Up@@ -90,6 +92,7 @@ public void onEnable(){
 }

 public void onDisable(){
 movementListener.unregister();
 configsManager.getPlayersConfigManager().saveConfigs();

 Bukkit.getConsoleSender().sendMessage(prefix+MessagesManager.getColoredMessage("&eHas been disabled! &fVersion: "+version));
Expand All@@ -100,6 +103,7 @@ public void registerCommands(){

 public void registerEvents(){
 PluginManager pm = getServer().getPluginManager();
 movementListener.register();
 pm.registerEvents(new InventoryListener(this), this);
 pm.registerEvents(new PlayerListener(this), this);
 if(dependencyManager.getWorldGuardManager() != null){
Expand Down

2 changes: 2 additions & 0 deletions
src/main/java/cx/ajneb97/config/CategoriesConfigManager.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -55,6 +55,8 @@ public void loadConfigs() {
 discoveredOn.setMobName(config.getString(pathValue+".mob_name"));
 discoveredOn.setMobType(config.getString(pathValue+".mob_type"));
 discoveredOn.setRegionName(config.getString(pathValue+".region_name"));
 discoveredOn.setLocation(config.getString(pathValue+".location"));
 discoveredOn.setRange(config.getString(pathValue+".range"));
 }

 CommonItem customDiscoveryItemUnlocked = null;
Expand Down

27 changes: 27 additions & 0 deletions
src/main/java/cx/ajneb97/listeners/MovementListener.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
package cx.ajneb97.listeners;

import cx.ajneb97.Codex;
import org.bukkit.Bukkit;

public class MovementListener {

 private Codex plugin;
 public MovementListener(Codex plugin){
 this.plugin = plugin;
 }

 private int taskId = 0;

 public void register() {
 taskId = Bukkit.getScheduler().runTaskTimerAsynchronously(plugin, () -> {
 Bukkit.getOnlinePlayers().forEach(player -> {
 plugin.getDiscoveryManager().onLocationNear(player, player.getLocation());
 });
 }, 100, 100).getTaskId();
 }

 public void unregister() {
 Bukkit.getScheduler().cancelTask(taskId);
 }

}

20 changes: 20 additions & 0 deletions
src/main/java/cx/ajneb97/managers/DiscoveryManager.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -8,6 +8,9 @@
import cx.ajneb97.model.structure.DiscoveredOn;
import cx.ajneb97.model.structure.Discovery;
import cx.ajneb97.utils.ActionUtils;
import org.bukkit.Bukkit;
import org.bukkit.Location;
import org.bukkit.World;
import org.bukkit.entity.Player;

import java.util.*;
Expand DownExpand Up@@ -117,6 +120,23 @@ public void onWorldGuardRegionEnter(Player player, String regionName){
 }
 }

 public void onLocationNear(Player player, Location location){
 ArrayList<Discovery> discoveries = getPossibleDiscoveries(DiscoveredOn.DiscoveredOnType.LOCATION);
 for(Discovery discovery : discoveries){
 DiscoveredOn discoveredOn = discovery.getDiscoveredOn();
 List<String> locArgs = List.of(discoveredOn.getLocation().split(","));
 World world = Bukkit.getWorld(locArgs.get(0));
 if(world != location.getWorld()) continue;
 Location discoveredLoc = new Location(world,Integer.parseInt(locArgs.get(1)),Integer.parseInt(locArgs.get(2)),Integer.parseInt(locArgs.get(3)));
 if(discoveredLoc.distance(location) > Integer.parseInt(discoveredOn.getRange())) {
 continue;
 }
 onDiscover(player,discovery.getCategoryName(),discovery.getId());

 return;
 }
 }

 public boolean onDiscover(Player player,String categoryName,String discoveryName){
 Category category = plugin.getCategoryManager().getCategory(categoryName);
 Discovery discovery = category.getDiscovery(discoveryName);
Expand Down

16 changes: 15 additions & 1 deletion
src/main/java/cx/ajneb97/model/structure/DiscoveredOn.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,6 +6,8 @@ public class DiscoveredOn {
 private String mobType;
 private String mobName;
 private String regionName;
 private String location;
 private String range;

 public DiscoveredOn(DiscoveredOnType type) {
 this.type = type;
Expand DownExpand Up@@ -39,6 +41,17 @@ public String getRegionName() {
 return regionName;
 }

 public String getLocation() {
 return location;
 }
 public String getRange() {
 return range;
 }

 public void setLocation(String location) { this.location = location; }

 public void setRange(String range) { this.range = range; }

 public void setRegionName(String regionName) {
 this.regionName = regionName;
 }
Expand All@@ -47,6 +60,7 @@ public enum DiscoveredOnType{
 MOB_KILL,
 MYTHIC_MOB_KILL,
 ELITE_MOB_KILL,
 WORLDGUARD_REGION
 WORLDGUARD_REGION,
 LOCATION
 }
}

4 changes: 3 additions & 1 deletion
src/main/resources/plugin.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,9 @@ main: cx.ajneb97.Codex
version: ${project.version}
name: Codex
api-version: 1.13
author: Ajneb97
author:
 - Ajneb97
 - MikkoAyaka
softdepend: [WorldGuard,WorldEdit,PlaceholderAPI,MythicMobs]

commands:
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Universal Dark Mode - works on any site
(function() {
var enabled = true;
function applyDarkMode() {
if (!enabled) return;
// Create style element if it doesn't exist
var style = document.getElementById('universal-dark-mode-style');
if (!style) {
style = document.createElement('style');
style.id = 'universal-dark-mode-style';
document.head.appendChild(style);
}
// Dark mode CSS - inverts colors but preserves images/video
style.textContent = '
/* Invert everything except media */
html {
filter: invert(1) hue-rotate(180deg) !important;
background: #1a1a2e !important;
}
/* Restore images, videos, iframes, canvas */
img, video, iframe, canvas, svg, picture, [style*="background-image"] {
filter: invert(1) hue-rotate(180deg) !important;
}
/* Preserve specific elements that should not be inverted */
.no-dark-mode, .no-dark-mode *,
[data-theme="light"], [data-theme="light"],
.ace_editor, .ace_editor *,
.CodeMirror, .CodeMirror *,
.monaco-editor, .monaco-editor *,
.markdown-body pre, .markdown-body pre *,
.highlight, .highlight *,
pre code, pre code * {
filter: none !important;
}
/* Fix common UI elements */
.modal, .popup, .dropdown-menu, .tooltip, .popover {
filter: invert(1) hue-rotate(180deg) !important;
background: #2d2d44 !important;
border-color: #444 !important;
}
/* Scrollbars */
::-webkit-scrollbar { background: #1a1a2e !important; }
::-webkit-scrollbar-thumb { background: #444 !important; }
::-webkit-scrollbar-thumb:hover { background: #555 !important; }
/* Selection */
::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
';
}
function removeDarkMode() {
var style = document.getElementById('universal-dark-mode-style');
if (style) style.remove();
}
// Toggle with Alt+Shift+D
document.addEventListener('keydown', function(e) {
if (e.altKey && e.shiftKey && e.key === 'D') {
e.preventDefault();
enabled = !enabled;
if (enabled) {
applyDarkMode();
console.log('[Universal Dark Mode] Enabled');
} else {
removeDarkMode();
console.log('[Universal Dark Mode] Disabled');
}
}
});
// Apply on load
applyDarkMode();
// Re-apply on dynamic content
var observer = new MutationObserver(function(mutations) {
if (enabled && !document.getElementById('universal-dark-mode-style')) {
applyDarkMode();
}
});
observer.observe(document.head, { childList: true });
console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');
})();
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();
2.5.4: support LOCATION discover type, using with config values: loca… by MikkoAyaka · Pull Request #24 · Ajneb97/Codex · GitHub
Skip to content
2.5.4: support LOCATION discover type, using with config values: loca…#24

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Open

MikkoAyaka
wants to merge
1
commit into

base:main
Choose a base branch

from

 Open


2.5.4: support LOCATION discover type, using with config values: loca…
#24
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


10 changes: 9 additions & 1 deletion
pom.xml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,7 +6,7 @@

 <groupId>cx.ajneb97</groupId>
 <artifactId>Codex</artifactId>
 <version>2.5.3</version>
 <version>2.5.4</version>

 <properties>
 <maven.compiler.source>21</maven.compiler.source>
Expand DownExpand Up@@ -144,6 +144,14 @@
 </execution>
 </executions>
 </plugin>
 <plugin>
 <groupId>org.apache.maven.plugins</groupId>
 <artifactId>maven-compiler-plugin</artifactId>
 <configuration>
 <source>9</source>
 <target>9</target>
 </configuration>
 </plugin>
 </plugins>
 </build>
</project>

6 changes: 5 additions & 1 deletion
src/main/java/cx/ajneb97/Codex.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,6 +6,7 @@
import cx.ajneb97.config.ConfigsManager;
import cx.ajneb97.database.MySQLConnection;
import cx.ajneb97.listeners.InventoryListener;
import cx.ajneb97.listeners.MovementListener;
import cx.ajneb97.listeners.PlayerListener;
import cx.ajneb97.listeners.dependencies.EliteMobsListener;
import cx.ajneb97.listeners.dependencies.MythicMobsListener;
Expand DownExpand Up@@ -43,10 +44,11 @@ public class Codex extends JavaPlugin {
 private PlayerDataSaveTask playerDataSaveTask;
 private UpdateCheckerManager updateCheckerManager;
 private VerifyManager verifyManager;

 private MovementListener movementListener;
 public void onEnable(){
 setVersion();
 setPrefix();
 this.movementListener = new MovementListener(this);
 this.playerDataManager = new PlayerDataManager(this);
 this.inventoryManager = new InventoryManager(this);
 this.commonItemManager = new CommonItemManager(this);
Expand DownExpand Up@@ -90,6 +92,7 @@ public void onEnable(){
 }

 public void onDisable(){
 movementListener.unregister();
 configsManager.getPlayersConfigManager().saveConfigs();

 Bukkit.getConsoleSender().sendMessage(prefix+MessagesManager.getColoredMessage("&eHas been disabled! &fVersion: "+version));
Expand All@@ -100,6 +103,7 @@ public void registerCommands(){

 public void registerEvents(){
 PluginManager pm = getServer().getPluginManager();
 movementListener.register();
 pm.registerEvents(new InventoryListener(this), this);
 pm.registerEvents(new PlayerListener(this), this);
 if(dependencyManager.getWorldGuardManager() != null){
Expand Down

2 changes: 2 additions & 0 deletions
src/main/java/cx/ajneb97/config/CategoriesConfigManager.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -55,6 +55,8 @@ public void loadConfigs() {
 discoveredOn.setMobName(config.getString(pathValue+".mob_name"));
 discoveredOn.setMobType(config.getString(pathValue+".mob_type"));
 discoveredOn.setRegionName(config.getString(pathValue+".region_name"));
 discoveredOn.setLocation(config.getString(pathValue+".location"));
 discoveredOn.setRange(config.getString(pathValue+".range"));
 }

 CommonItem customDiscoveryItemUnlocked = null;
Expand Down

27 changes: 27 additions & 0 deletions
src/main/java/cx/ajneb97/listeners/MovementListener.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
package cx.ajneb97.listeners;

import cx.ajneb97.Codex;
import org.bukkit.Bukkit;

public class MovementListener {

 private Codex plugin;
 public MovementListener(Codex plugin){
 this.plugin = plugin;
 }

 private int taskId = 0;

 public void register() {
 taskId = Bukkit.getScheduler().runTaskTimerAsynchronously(plugin, () -> {
 Bukkit.getOnlinePlayers().forEach(player -> {
 plugin.getDiscoveryManager().onLocationNear(player, player.getLocation());
 });
 }, 100, 100).getTaskId();
 }

 public void unregister() {
 Bukkit.getScheduler().cancelTask(taskId);
 }

}

20 changes: 20 additions & 0 deletions
src/main/java/cx/ajneb97/managers/DiscoveryManager.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -8,6 +8,9 @@
import cx.ajneb97.model.structure.DiscoveredOn;
import cx.ajneb97.model.structure.Discovery;
import cx.ajneb97.utils.ActionUtils;
import org.bukkit.Bukkit;
import org.bukkit.Location;
import org.bukkit.World;
import org.bukkit.entity.Player;

import java.util.*;
Expand DownExpand Up@@ -117,6 +120,23 @@ public void onWorldGuardRegionEnter(Player player, String regionName){
 }
 }

 public void onLocationNear(Player player, Location location){
 ArrayList<Discovery> discoveries = getPossibleDiscoveries(DiscoveredOn.DiscoveredOnType.LOCATION);
 for(Discovery discovery : discoveries){
 DiscoveredOn discoveredOn = discovery.getDiscoveredOn();
 List<String> locArgs = List.of(discoveredOn.getLocation().split(","));
 World world = Bukkit.getWorld(locArgs.get(0));
 if(world != location.getWorld()) continue;
 Location discoveredLoc = new Location(world,Integer.parseInt(locArgs.get(1)),Integer.parseInt(locArgs.get(2)),Integer.parseInt(locArgs.get(3)));
 if(discoveredLoc.distance(location) > Integer.parseInt(discoveredOn.getRange())) {
 continue;
 }
 onDiscover(player,discovery.getCategoryName(),discovery.getId());

 return;
 }
 }

 public boolean onDiscover(Player player,String categoryName,String discoveryName){
 Category category = plugin.getCategoryManager().getCategory(categoryName);
 Discovery discovery = category.getDiscovery(discoveryName);
Expand Down

16 changes: 15 additions & 1 deletion
src/main/java/cx/ajneb97/model/structure/DiscoveredOn.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,6 +6,8 @@ public class DiscoveredOn {
 private String mobType;
 private String mobName;
 private String regionName;
 private String location;
 private String range;

 public DiscoveredOn(DiscoveredOnType type) {
 this.type = type;
Expand DownExpand Up@@ -39,6 +41,17 @@ public String getRegionName() {
 return regionName;
 }

 public String getLocation() {
 return location;
 }
 public String getRange() {
 return range;
 }

 public void setLocation(String location) { this.location = location; }

 public void setRange(String range) { this.range = range; }

 public void setRegionName(String regionName) {
 this.regionName = regionName;
 }
Expand All@@ -47,6 +60,7 @@ public enum DiscoveredOnType{
 MOB_KILL,
 MYTHIC_MOB_KILL,
 ELITE_MOB_KILL,
 WORLDGUARD_REGION
 WORLDGUARD_REGION,
 LOCATION
 }
}

4 changes: 3 additions & 1 deletion
src/main/resources/plugin.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,9 @@ main: cx.ajneb97.Codex
version: ${project.version}
name: Codex
api-version: 1.13
author: Ajneb97
author:
 - Ajneb97
 - MikkoAyaka
softdepend: [WorldGuard,WorldEdit,PlaceholderAPI,MythicMobs]

commands:
Expand Down