Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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: 8 additions & 2 deletions pom.xml
Original file line numberDiff line numberDiff line change
Expand Up@@ -6,7 +6,7 @@

<groupId>com.technovision</groupId>
<artifactId>homegui</artifactId>
<version>1.3</version>
<version>1.5</version>
<packaging>jar</packaging>

<name>Homegui</name>
Expand DownExpand Up@@ -40,6 +40,12 @@
</goals>
<configuration>
<createDependencyReducedPom>false</createDependencyReducedPom>
<relocations>
<relocation>
<pattern>com.cryptomorin.xseries</pattern>
<shadedPattern>com.technovision.homegui.libs.xseries</shadedPattern>
</relocation>
</relocations>
</configuration>
</execution>
</executions>
Expand DownExpand Up@@ -78,7 +84,7 @@
<dependency>
<groupId>com.github.cryptomorin</groupId>
<artifactId>XSeries</artifactId>
<version>6.0.1</version>
<version>13.7.1</version>
</dependency>
</dependencies>
</project>
18 changes: 14 additions & 4 deletions src/main/java/com/technovision/homegui/events/HomeEvents.java
Original file line numberDiff line numberDiff line change
Expand Up@@ -10,19 +10,29 @@
import org.bukkit.event.Listener;
import org.bukkit.event.inventory.ClickType;
import org.bukkit.event.inventory.InventoryClickEvent;
import org.bukkit.event.inventory.InventoryDragEvent;
import org.bukkit.event.inventory.InventoryType;
import org.bukkit.inventory.InventoryHolder;

public class HomeEvents implements Listener {

@EventHandler
public void onGuiDrag(InventoryDragEvent event) {
InventoryHolder holder = event.getInventory().getHolder();
if (holder instanceof HomeGUI || holder instanceof ChangeIconGUI) {
event.setCancelled(true);
}
}

@EventHandler
public void onGuiActivation(InventoryClickEvent event){
if (event.getInventory().getHolder() instanceof HomeGUI) {
if (event.getClickedInventory() == null) { return; }
event.setCancelled(true);
Player player = (Player) event.getWhoClicked();
if (event.getClickedInventory().getType() == InventoryType.PLAYER) { return; }
if (event.getCurrentItem() != null) {
if (event.getCurrentItem().getType() == Material.AIR) { return; }
event.setCancelled(true);
if (event.getClickedInventory().getType() == InventoryType.PLAYER) { return; }
String playerID = player.getUniqueId().toString();
int slotNum = event.getSlot();
String name = HomeGUI.allHomes.get(playerID).get(slotNum).getName();
Expand All@@ -44,11 +54,11 @@ public void onGuiActivation(InventoryClickEvent event){
}
} else if (event.getInventory().getHolder() instanceof ChangeIconGUI) {
if (event.getClickedInventory() == null) { return; }
event.setCancelled(true);
Player player = (Player) event.getWhoClicked();
if (event.getClickedInventory().getType() == InventoryType.PLAYER) { return; }
if (event.getCurrentItem() != null) {
if (event.getCurrentItem().getType() == Material.AIR) { return; }
event.setCancelled(true);
if (event.getClickedInventory().getType() == InventoryType.PLAYER) { return; }
if (event.isLeftClick()) {
String itemName = getFriendlyName(event.getCurrentItem().getType());
String playerID = event.getWhoClicked().getUniqueId().toString();
Expand Down
15 changes: 7 additions & 8 deletions src/main/java/com/technovision/homegui/gui/HomeGUI.java
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,6 +4,7 @@
import com.technovision.homegui.playerdata.EssentialsReader;
import com.technovision.homegui.playerdata.Home;
import org.bukkit.Bukkit;
import org.bukkit.configuration.file.YamlConfiguration;
import org.bukkit.inventory.Inventory;
import org.bukkit.inventory.InventoryHolder;
import org.bukkit.inventory.ItemStack;
Expand DownExpand Up@@ -34,21 +35,19 @@ private int calculateSize() {
if (size == 0) {return 9;}
if (size >= 54) { return 54; }
if (size % 9 == 0) { return size; }
int count = 0;
for (int i = size%9; i>0; i--) {
count++;
}
return (size - count) + 9;
return (size - (size % 9)) + 9;
}

private void initItems(String playerID) {
YamlConfiguration iconConfig = Homegui.dataReader.loadConfig(playerID);
String nameColor = Homegui.PLUGIN.getConfig().getString("home-color").replace("&", "§");
List<String> loreTemplate = Homegui.PLUGIN.getConfig().getStringList("home-lore");
String name;
for (Home home : homes) {
name = home.getName().substring(0, 1).toUpperCase() + home.getName().substring(1);
ItemStack item = Homegui.dataReader.getItem(playerID, home.getName());
String nameColor = Homegui.PLUGIN.getConfig().getString("home-color").replace("&", "§");
ItemStack item = Homegui.dataReader.getItem(iconConfig, home.getName());
name = nameColor + name;
List<String> lore = Homegui.PLUGIN.getConfig().getStringList("home-lore");
List<String> lore = new ArrayList<>(loreTemplate);
String location = "§f " + home.getX() + "x§7,§f " + home.getY() + "y§7,§f " + home.getZ() + "z";
for (int i = 0; i < lore.size(); i++) {
String newLine = lore.get(i).replace("{location}", location);
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -49,20 +49,24 @@ public void write(String playerUUID, String key, Material icon) {
}
}

public ItemStack getItem(String playerUUID, String homeName) {
public YamlConfiguration loadConfig(String playerUUID) {
File dataFile = getFile(playerUUID);
if (dataFile.exists()) {
YamlConfiguration dataFileConfig = YamlConfiguration.loadConfiguration(dataFile);
if (dataFileConfig.contains(homeName)) {
String name = dataFileConfig.get(homeName).toString();
return dataFile.exists() ? YamlConfiguration.loadConfiguration(dataFile) : null;
}

public ItemStack getItem(YamlConfiguration dataFileConfig, String homeName) {
if (dataFileConfig != null && dataFileConfig.contains(homeName)) {
String name = dataFileConfig.get(homeName).toString();
Material material = Material.getMaterial(name);
if (material != null) {
XMaterial item;
String materialName = Material.getMaterial(name).toString();
String materialName = material.toString();
if (materialName.equalsIgnoreCase("PISTON_MOVING_PIECE")) {
item = XMaterial.PISTON;
} else if (materialName.equalsIgnoreCase("BED")) {
item = XMaterial.RED_BED;
} else {
item = XMaterial.matchXMaterial(Material.getMaterial(name));
item = XMaterial.matchXMaterial(material);
}
return item.parseItem();
}
Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/plugin.yml
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
name: HomeGUI
version: 1.4
version: 1.5
main: com.technovision.homegui.Homegui
api-version: 1.13
depend: [Essentials]
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all \x3Cpre>\x3Ccode> 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" + ' Update XSeries to 13.7.1 and relocate its package to fix plugin confl… by tommasov03 · Pull Request #16 · TechnoVisionDev/HomeGUI · GitHub
Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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: 8 additions & 2 deletions pom.xml
Original file line numberDiff line numberDiff line change
Expand Up@@ -6,7 +6,7 @@

<groupId>com.technovision</groupId>
<artifactId>homegui</artifactId>
<version>1.3</version>
<version>1.5</version>
<packaging>jar</packaging>

<name>Homegui</name>
Expand DownExpand Up@@ -40,6 +40,12 @@
</goals>
<configuration>
<createDependencyReducedPom>false</createDependencyReducedPom>
<relocations>
<relocation>
<pattern>com.cryptomorin.xseries</pattern>
<shadedPattern>com.technovision.homegui.libs.xseries</shadedPattern>
</relocation>
</relocations>
</configuration>
</execution>
</executions>
Expand DownExpand Up@@ -78,7 +84,7 @@
<dependency>
<groupId>com.github.cryptomorin</groupId>
<artifactId>XSeries</artifactId>
<version>6.0.1</version>
<version>13.7.1</version>
</dependency>
</dependencies>
</project>
18 changes: 14 additions & 4 deletions src/main/java/com/technovision/homegui/events/HomeEvents.java
Original file line numberDiff line numberDiff line change
Expand Up@@ -10,19 +10,29 @@
import org.bukkit.event.Listener;
import org.bukkit.event.inventory.ClickType;
import org.bukkit.event.inventory.InventoryClickEvent;
import org.bukkit.event.inventory.InventoryDragEvent;
import org.bukkit.event.inventory.InventoryType;
import org.bukkit.inventory.InventoryHolder;

public class HomeEvents implements Listener {

@EventHandler
public void onGuiDrag(InventoryDragEvent event) {
InventoryHolder holder = event.getInventory().getHolder();
if (holder instanceof HomeGUI || holder instanceof ChangeIconGUI) {
event.setCancelled(true);
}
}

@EventHandler
public void onGuiActivation(InventoryClickEvent event){
if (event.getInventory().getHolder() instanceof HomeGUI) {
if (event.getClickedInventory() == null) { return; }
event.setCancelled(true);
Player player = (Player) event.getWhoClicked();
if (event.getClickedInventory().getType() == InventoryType.PLAYER) { return; }
if (event.getCurrentItem() != null) {
if (event.getCurrentItem().getType() == Material.AIR) { return; }
event.setCancelled(true);
if (event.getClickedInventory().getType() == InventoryType.PLAYER) { return; }
String playerID = player.getUniqueId().toString();
int slotNum = event.getSlot();
String name = HomeGUI.allHomes.get(playerID).get(slotNum).getName();
Expand All@@ -44,11 +54,11 @@ public void onGuiActivation(InventoryClickEvent event){
}
} else if (event.getInventory().getHolder() instanceof ChangeIconGUI) {
if (event.getClickedInventory() == null) { return; }
event.setCancelled(true);
Player player = (Player) event.getWhoClicked();
if (event.getClickedInventory().getType() == InventoryType.PLAYER) { return; }
if (event.getCurrentItem() != null) {
if (event.getCurrentItem().getType() == Material.AIR) { return; }
event.setCancelled(true);
if (event.getClickedInventory().getType() == InventoryType.PLAYER) { return; }
if (event.isLeftClick()) {
String itemName = getFriendlyName(event.getCurrentItem().getType());
String playerID = event.getWhoClicked().getUniqueId().toString();
Expand Down
15 changes: 7 additions & 8 deletions src/main/java/com/technovision/homegui/gui/HomeGUI.java
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,6 +4,7 @@
import com.technovision.homegui.playerdata.EssentialsReader;
import com.technovision.homegui.playerdata.Home;
import org.bukkit.Bukkit;
import org.bukkit.configuration.file.YamlConfiguration;
import org.bukkit.inventory.Inventory;
import org.bukkit.inventory.InventoryHolder;
import org.bukkit.inventory.ItemStack;
Expand DownExpand Up@@ -34,21 +35,19 @@ private int calculateSize() {
if (size == 0) {return 9;}
if (size >= 54) { return 54; }
if (size % 9 == 0) { return size; }
int count = 0;
for (int i = size%9; i>0; i--) {
count++;
}
return (size - count) + 9;
return (size - (size % 9)) + 9;
}

private void initItems(String playerID) {
YamlConfiguration iconConfig = Homegui.dataReader.loadConfig(playerID);
String nameColor = Homegui.PLUGIN.getConfig().getString("home-color").replace("&", "§");
List<String> loreTemplate = Homegui.PLUGIN.getConfig().getStringList("home-lore");
String name;
for (Home home : homes) {
name = home.getName().substring(0, 1).toUpperCase() + home.getName().substring(1);
ItemStack item = Homegui.dataReader.getItem(playerID, home.getName());
String nameColor = Homegui.PLUGIN.getConfig().getString("home-color").replace("&", "§");
ItemStack item = Homegui.dataReader.getItem(iconConfig, home.getName());
name = nameColor + name;
List<String> lore = Homegui.PLUGIN.getConfig().getStringList("home-lore");
List<String> lore = new ArrayList<>(loreTemplate);
String location = "§f " + home.getX() + "x§7,§f " + home.getY() + "y§7,§f " + home.getZ() + "z";
for (int i = 0; i < lore.size(); i++) {
String newLine = lore.get(i).replace("{location}", location);
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -49,20 +49,24 @@ public void write(String playerUUID, String key, Material icon) {
}
}

public ItemStack getItem(String playerUUID, String homeName) {
public YamlConfiguration loadConfig(String playerUUID) {
File dataFile = getFile(playerUUID);
if (dataFile.exists()) {
YamlConfiguration dataFileConfig = YamlConfiguration.loadConfiguration(dataFile);
if (dataFileConfig.contains(homeName)) {
String name = dataFileConfig.get(homeName).toString();
return dataFile.exists() ? YamlConfiguration.loadConfiguration(dataFile) : null;
}

public ItemStack getItem(YamlConfiguration dataFileConfig, String homeName) {
if (dataFileConfig != null && dataFileConfig.contains(homeName)) {
String name = dataFileConfig.get(homeName).toString();
Material material = Material.getMaterial(name);
if (material != null) {
XMaterial item;
String materialName = Material.getMaterial(name).toString();
String materialName = material.toString();
if (materialName.equalsIgnoreCase("PISTON_MOVING_PIECE")) {
item = XMaterial.PISTON;
} else if (materialName.equalsIgnoreCase("BED")) {
item = XMaterial.RED_BED;
} else {
item = XMaterial.matchXMaterial(Material.getMaterial(name));
item = XMaterial.matchXMaterial(material);
}
return item.parseItem();
}
Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/plugin.yml
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
name: HomeGUI
version: 1.4
version: 1.5
main: com.technovision.homegui.Homegui
api-version: 1.13
depend: [Essentials]
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('^' + ".*" + ' Update XSeries to 13.7.1 and relocate its package to fix plugin confl… by tommasov03 · Pull Request #16 · TechnoVisionDev/HomeGUI · GitHub
Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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: 8 additions & 2 deletions pom.xml
Original file line numberDiff line numberDiff line change
Expand Up@@ -6,7 +6,7 @@

<groupId>com.technovision</groupId>
<artifactId>homegui</artifactId>
<version>1.3</version>
<version>1.5</version>
<packaging>jar</packaging>

<name>Homegui</name>
Expand DownExpand Up@@ -40,6 +40,12 @@
</goals>
<configuration>
<createDependencyReducedPom>false</createDependencyReducedPom>
<relocations>
<relocation>
<pattern>com.cryptomorin.xseries</pattern>
<shadedPattern>com.technovision.homegui.libs.xseries</shadedPattern>
</relocation>
</relocations>
</configuration>
</execution>
</executions>
Expand DownExpand Up@@ -78,7 +84,7 @@
<dependency>
<groupId>com.github.cryptomorin</groupId>
<artifactId>XSeries</artifactId>
<version>6.0.1</version>
<version>13.7.1</version>
</dependency>
</dependencies>
</project>
18 changes: 14 additions & 4 deletions src/main/java/com/technovision/homegui/events/HomeEvents.java
Original file line numberDiff line numberDiff line change
Expand Up@@ -10,19 +10,29 @@
import org.bukkit.event.Listener;
import org.bukkit.event.inventory.ClickType;
import org.bukkit.event.inventory.InventoryClickEvent;
import org.bukkit.event.inventory.InventoryDragEvent;
import org.bukkit.event.inventory.InventoryType;
import org.bukkit.inventory.InventoryHolder;

public class HomeEvents implements Listener {

@EventHandler
public void onGuiDrag(InventoryDragEvent event) {
InventoryHolder holder = event.getInventory().getHolder();
if (holder instanceof HomeGUI || holder instanceof ChangeIconGUI) {
event.setCancelled(true);
}
}

@EventHandler
public void onGuiActivation(InventoryClickEvent event){
if (event.getInventory().getHolder() instanceof HomeGUI) {
if (event.getClickedInventory() == null) { return; }
event.setCancelled(true);
Player player = (Player) event.getWhoClicked();
if (event.getClickedInventory().getType() == InventoryType.PLAYER) { return; }
if (event.getCurrentItem() != null) {
if (event.getCurrentItem().getType() == Material.AIR) { return; }
event.setCancelled(true);
if (event.getClickedInventory().getType() == InventoryType.PLAYER) { return; }
String playerID = player.getUniqueId().toString();
int slotNum = event.getSlot();
String name = HomeGUI.allHomes.get(playerID).get(slotNum).getName();
Expand All@@ -44,11 +54,11 @@ public void onGuiActivation(InventoryClickEvent event){
}
} else if (event.getInventory().getHolder() instanceof ChangeIconGUI) {
if (event.getClickedInventory() == null) { return; }
event.setCancelled(true);
Player player = (Player) event.getWhoClicked();
if (event.getClickedInventory().getType() == InventoryType.PLAYER) { return; }
if (event.getCurrentItem() != null) {
if (event.getCurrentItem().getType() == Material.AIR) { return; }
event.setCancelled(true);
if (event.getClickedInventory().getType() == InventoryType.PLAYER) { return; }
if (event.isLeftClick()) {
String itemName = getFriendlyName(event.getCurrentItem().getType());
String playerID = event.getWhoClicked().getUniqueId().toString();
Expand Down
15 changes: 7 additions & 8 deletions src/main/java/com/technovision/homegui/gui/HomeGUI.java
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,6 +4,7 @@
import com.technovision.homegui.playerdata.EssentialsReader;
import com.technovision.homegui.playerdata.Home;
import org.bukkit.Bukkit;
import org.bukkit.configuration.file.YamlConfiguration;
import org.bukkit.inventory.Inventory;
import org.bukkit.inventory.InventoryHolder;
import org.bukkit.inventory.ItemStack;
Expand DownExpand Up@@ -34,21 +35,19 @@ private int calculateSize() {
if (size == 0) {return 9;}
if (size >= 54) { return 54; }
if (size % 9 == 0) { return size; }
int count = 0;
for (int i = size%9; i>0; i--) {
count++;
}
return (size - count) + 9;
return (size - (size % 9)) + 9;
}

private void initItems(String playerID) {
YamlConfiguration iconConfig = Homegui.dataReader.loadConfig(playerID);
String nameColor = Homegui.PLUGIN.getConfig().getString("home-color").replace("&", "§");
List<String> loreTemplate = Homegui.PLUGIN.getConfig().getStringList("home-lore");
String name;
for (Home home : homes) {
name = home.getName().substring(0, 1).toUpperCase() + home.getName().substring(1);
ItemStack item = Homegui.dataReader.getItem(playerID, home.getName());
String nameColor = Homegui.PLUGIN.getConfig().getString("home-color").replace("&", "§");
ItemStack item = Homegui.dataReader.getItem(iconConfig, home.getName());
name = nameColor + name;
List<String> lore = Homegui.PLUGIN.getConfig().getStringList("home-lore");
List<String> lore = new ArrayList<>(loreTemplate);
String location = "§f " + home.getX() + "x§7,§f " + home.getY() + "y§7,§f " + home.getZ() + "z";
for (int i = 0; i < lore.size(); i++) {
String newLine = lore.get(i).replace("{location}", location);
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -49,20 +49,24 @@ public void write(String playerUUID, String key, Material icon) {
}
}

public ItemStack getItem(String playerUUID, String homeName) {
public YamlConfiguration loadConfig(String playerUUID) {
File dataFile = getFile(playerUUID);
if (dataFile.exists()) {
YamlConfiguration dataFileConfig = YamlConfiguration.loadConfiguration(dataFile);
if (dataFileConfig.contains(homeName)) {
String name = dataFileConfig.get(homeName).toString();
return dataFile.exists() ? YamlConfiguration.loadConfiguration(dataFile) : null;
}

public ItemStack getItem(YamlConfiguration dataFileConfig, String homeName) {
if (dataFileConfig != null && dataFileConfig.contains(homeName)) {
String name = dataFileConfig.get(homeName).toString();
Material material = Material.getMaterial(name);
if (material != null) {
XMaterial item;
String materialName = Material.getMaterial(name).toString();
String materialName = material.toString();
if (materialName.equalsIgnoreCase("PISTON_MOVING_PIECE")) {
item = XMaterial.PISTON;
} else if (materialName.equalsIgnoreCase("BED")) {
item = XMaterial.RED_BED;
} else {
item = XMaterial.matchXMaterial(Material.getMaterial(name));
item = XMaterial.matchXMaterial(material);
}
return item.parseItem();
}
Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/plugin.yml
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
name: HomeGUI
version: 1.4
version: 1.5
main: com.technovision.homegui.Homegui
api-version: 1.13
depend: [Essentials]
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('^' + ".*" + ' Update XSeries to 13.7.1 and relocate its package to fix plugin confl… by tommasov03 · Pull Request #16 · TechnoVisionDev/HomeGUI · GitHub
Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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: 8 additions & 2 deletions pom.xml
Original file line numberDiff line numberDiff line change
Expand Up@@ -6,7 +6,7 @@

<groupId>com.technovision</groupId>
<artifactId>homegui</artifactId>
<version>1.3</version>
<version>1.5</version>
<packaging>jar</packaging>

<name>Homegui</name>
Expand DownExpand Up@@ -40,6 +40,12 @@
</goals>
<configuration>
<createDependencyReducedPom>false</createDependencyReducedPom>
<relocations>
<relocation>
<pattern>com.cryptomorin.xseries</pattern>
<shadedPattern>com.technovision.homegui.libs.xseries</shadedPattern>
</relocation>
</relocations>
</configuration>
</execution>
</executions>
Expand DownExpand Up@@ -78,7 +84,7 @@
<dependency>
<groupId>com.github.cryptomorin</groupId>
<artifactId>XSeries</artifactId>
<version>6.0.1</version>
<version>13.7.1</version>
</dependency>
</dependencies>
</project>
18 changes: 14 additions & 4 deletions src/main/java/com/technovision/homegui/events/HomeEvents.java
Original file line numberDiff line numberDiff line change
Expand Up@@ -10,19 +10,29 @@
import org.bukkit.event.Listener;
import org.bukkit.event.inventory.ClickType;
import org.bukkit.event.inventory.InventoryClickEvent;
import org.bukkit.event.inventory.InventoryDragEvent;
import org.bukkit.event.inventory.InventoryType;
import org.bukkit.inventory.InventoryHolder;

public class HomeEvents implements Listener {

@EventHandler
public void onGuiDrag(InventoryDragEvent event) {
InventoryHolder holder = event.getInventory().getHolder();
if (holder instanceof HomeGUI || holder instanceof ChangeIconGUI) {
event.setCancelled(true);
}
}

@EventHandler
public void onGuiActivation(InventoryClickEvent event){
if (event.getInventory().getHolder() instanceof HomeGUI) {
if (event.getClickedInventory() == null) { return; }
event.setCancelled(true);
Player player = (Player) event.getWhoClicked();
if (event.getClickedInventory().getType() == InventoryType.PLAYER) { return; }
if (event.getCurrentItem() != null) {
if (event.getCurrentItem().getType() == Material.AIR) { return; }
event.setCancelled(true);
if (event.getClickedInventory().getType() == InventoryType.PLAYER) { return; }
String playerID = player.getUniqueId().toString();
int slotNum = event.getSlot();
String name = HomeGUI.allHomes.get(playerID).get(slotNum).getName();
Expand All@@ -44,11 +54,11 @@ public void onGuiActivation(InventoryClickEvent event){
}
} else if (event.getInventory().getHolder() instanceof ChangeIconGUI) {
if (event.getClickedInventory() == null) { return; }
event.setCancelled(true);
Player player = (Player) event.getWhoClicked();
if (event.getClickedInventory().getType() == InventoryType.PLAYER) { return; }
if (event.getCurrentItem() != null) {
if (event.getCurrentItem().getType() == Material.AIR) { return; }
event.setCancelled(true);
if (event.getClickedInventory().getType() == InventoryType.PLAYER) { return; }
if (event.isLeftClick()) {
String itemName = getFriendlyName(event.getCurrentItem().getType());
String playerID = event.getWhoClicked().getUniqueId().toString();
Expand Down
15 changes: 7 additions & 8 deletions src/main/java/com/technovision/homegui/gui/HomeGUI.java
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,6 +4,7 @@
import com.technovision.homegui.playerdata.EssentialsReader;
import com.technovision.homegui.playerdata.Home;
import org.bukkit.Bukkit;
import org.bukkit.configuration.file.YamlConfiguration;
import org.bukkit.inventory.Inventory;
import org.bukkit.inventory.InventoryHolder;
import org.bukkit.inventory.ItemStack;
Expand DownExpand Up@@ -34,21 +35,19 @@ private int calculateSize() {
if (size == 0) {return 9;}
if (size >= 54) { return 54; }
if (size % 9 == 0) { return size; }
int count = 0;
for (int i = size%9; i>0; i--) {
count++;
}
return (size - count) + 9;
return (size - (size % 9)) + 9;
}

private void initItems(String playerID) {
YamlConfiguration iconConfig = Homegui.dataReader.loadConfig(playerID);
String nameColor = Homegui.PLUGIN.getConfig().getString("home-color").replace("&", "§");
List<String> loreTemplate = Homegui.PLUGIN.getConfig().getStringList("home-lore");
String name;
for (Home home : homes) {
name = home.getName().substring(0, 1).toUpperCase() + home.getName().substring(1);
ItemStack item = Homegui.dataReader.getItem(playerID, home.getName());
String nameColor = Homegui.PLUGIN.getConfig().getString("home-color").replace("&", "§");
ItemStack item = Homegui.dataReader.getItem(iconConfig, home.getName());
name = nameColor + name;
List<String> lore = Homegui.PLUGIN.getConfig().getStringList("home-lore");
List<String> lore = new ArrayList<>(loreTemplate);
String location = "§f " + home.getX() + "x§7,§f " + home.getY() + "y§7,§f " + home.getZ() + "z";
for (int i = 0; i < lore.size(); i++) {
String newLine = lore.get(i).replace("{location}", location);
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -49,20 +49,24 @@ public void write(String playerUUID, String key, Material icon) {
}
}

public ItemStack getItem(String playerUUID, String homeName) {
public YamlConfiguration loadConfig(String playerUUID) {
File dataFile = getFile(playerUUID);
if (dataFile.exists()) {
YamlConfiguration dataFileConfig = YamlConfiguration.loadConfiguration(dataFile);
if (dataFileConfig.contains(homeName)) {
String name = dataFileConfig.get(homeName).toString();
return dataFile.exists() ? YamlConfiguration.loadConfiguration(dataFile) : null;
}

public ItemStack getItem(YamlConfiguration dataFileConfig, String homeName) {
if (dataFileConfig != null && dataFileConfig.contains(homeName)) {
String name = dataFileConfig.get(homeName).toString();
Material material = Material.getMaterial(name);
if (material != null) {
XMaterial item;
String materialName = Material.getMaterial(name).toString();
String materialName = material.toString();
if (materialName.equalsIgnoreCase("PISTON_MOVING_PIECE")) {
item = XMaterial.PISTON;
} else if (materialName.equalsIgnoreCase("BED")) {
item = XMaterial.RED_BED;
} else {
item = XMaterial.matchXMaterial(Material.getMaterial(name));
item = XMaterial.matchXMaterial(material);
}
return item.parseItem();
}
Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/plugin.yml
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
name: HomeGUI
version: 1.4
version: 1.5
main: com.technovision.homegui.Homegui
api-version: 1.13
depend: [Essentials]
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" + ' Update XSeries to 13.7.1 and relocate its package to fix plugin confl… by tommasov03 · Pull Request #16 · TechnoVisionDev/HomeGUI · GitHub
Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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: 8 additions & 2 deletions pom.xml
Original file line numberDiff line numberDiff line change
Expand Up@@ -6,7 +6,7 @@

<groupId>com.technovision</groupId>
<artifactId>homegui</artifactId>
<version>1.3</version>
<version>1.5</version>
<packaging>jar</packaging>

<name>Homegui</name>
Expand DownExpand Up@@ -40,6 +40,12 @@
</goals>
<configuration>
<createDependencyReducedPom>false</createDependencyReducedPom>
<relocations>
<relocation>
<pattern>com.cryptomorin.xseries</pattern>
<shadedPattern>com.technovision.homegui.libs.xseries</shadedPattern>
</relocation>
</relocations>
</configuration>
</execution>
</executions>
Expand DownExpand Up@@ -78,7 +84,7 @@
<dependency>
<groupId>com.github.cryptomorin</groupId>
<artifactId>XSeries</artifactId>
<version>6.0.1</version>
<version>13.7.1</version>
</dependency>
</dependencies>
</project>
18 changes: 14 additions & 4 deletions src/main/java/com/technovision/homegui/events/HomeEvents.java
Original file line numberDiff line numberDiff line change
Expand Up@@ -10,19 +10,29 @@
import org.bukkit.event.Listener;
import org.bukkit.event.inventory.ClickType;
import org.bukkit.event.inventory.InventoryClickEvent;
import org.bukkit.event.inventory.InventoryDragEvent;
import org.bukkit.event.inventory.InventoryType;
import org.bukkit.inventory.InventoryHolder;

public class HomeEvents implements Listener {

@EventHandler
public void onGuiDrag(InventoryDragEvent event) {
InventoryHolder holder = event.getInventory().getHolder();
if (holder instanceof HomeGUI || holder instanceof ChangeIconGUI) {
event.setCancelled(true);
}
}

@EventHandler
public void onGuiActivation(InventoryClickEvent event){
if (event.getInventory().getHolder() instanceof HomeGUI) {
if (event.getClickedInventory() == null) { return; }
event.setCancelled(true);
Player player = (Player) event.getWhoClicked();
if (event.getClickedInventory().getType() == InventoryType.PLAYER) { return; }
if (event.getCurrentItem() != null) {
if (event.getCurrentItem().getType() == Material.AIR) { return; }
event.setCancelled(true);
if (event.getClickedInventory().getType() == InventoryType.PLAYER) { return; }
String playerID = player.getUniqueId().toString();
int slotNum = event.getSlot();
String name = HomeGUI.allHomes.get(playerID).get(slotNum).getName();
Expand All@@ -44,11 +54,11 @@ public void onGuiActivation(InventoryClickEvent event){
}
} else if (event.getInventory().getHolder() instanceof ChangeIconGUI) {
if (event.getClickedInventory() == null) { return; }
event.setCancelled(true);
Player player = (Player) event.getWhoClicked();
if (event.getClickedInventory().getType() == InventoryType.PLAYER) { return; }
if (event.getCurrentItem() != null) {
if (event.getCurrentItem().getType() == Material.AIR) { return; }
event.setCancelled(true);
if (event.getClickedInventory().getType() == InventoryType.PLAYER) { return; }
if (event.isLeftClick()) {
String itemName = getFriendlyName(event.getCurrentItem().getType());
String playerID = event.getWhoClicked().getUniqueId().toString();
Expand Down
15 changes: 7 additions & 8 deletions src/main/java/com/technovision/homegui/gui/HomeGUI.java
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,6 +4,7 @@
import com.technovision.homegui.playerdata.EssentialsReader;
import com.technovision.homegui.playerdata.Home;
import org.bukkit.Bukkit;
import org.bukkit.configuration.file.YamlConfiguration;
import org.bukkit.inventory.Inventory;
import org.bukkit.inventory.InventoryHolder;
import org.bukkit.inventory.ItemStack;
Expand DownExpand Up@@ -34,21 +35,19 @@ private int calculateSize() {
if (size == 0) {return 9;}
if (size >= 54) { return 54; }
if (size % 9 == 0) { return size; }
int count = 0;
for (int i = size%9; i>0; i--) {
count++;
}
return (size - count) + 9;
return (size - (size % 9)) + 9;
}

private void initItems(String playerID) {
YamlConfiguration iconConfig = Homegui.dataReader.loadConfig(playerID);
String nameColor = Homegui.PLUGIN.getConfig().getString("home-color").replace("&", "§");
List<String> loreTemplate = Homegui.PLUGIN.getConfig().getStringList("home-lore");
String name;
for (Home home : homes) {
name = home.getName().substring(0, 1).toUpperCase() + home.getName().substring(1);
ItemStack item = Homegui.dataReader.getItem(playerID, home.getName());
String nameColor = Homegui.PLUGIN.getConfig().getString("home-color").replace("&", "§");
ItemStack item = Homegui.dataReader.getItem(iconConfig, home.getName());
name = nameColor + name;
List<String> lore = Homegui.PLUGIN.getConfig().getStringList("home-lore");
List<String> lore = new ArrayList<>(loreTemplate);
String location = "§f " + home.getX() + "x§7,§f " + home.getY() + "y§7,§f " + home.getZ() + "z";
for (int i = 0; i < lore.size(); i++) {
String newLine = lore.get(i).replace("{location}", location);
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -49,20 +49,24 @@ public void write(String playerUUID, String key, Material icon) {
}
}

public ItemStack getItem(String playerUUID, String homeName) {
public YamlConfiguration loadConfig(String playerUUID) {
File dataFile = getFile(playerUUID);
if (dataFile.exists()) {
YamlConfiguration dataFileConfig = YamlConfiguration.loadConfiguration(dataFile);
if (dataFileConfig.contains(homeName)) {
String name = dataFileConfig.get(homeName).toString();
return dataFile.exists() ? YamlConfiguration.loadConfiguration(dataFile) : null;
}

public ItemStack getItem(YamlConfiguration dataFileConfig, String homeName) {
if (dataFileConfig != null && dataFileConfig.contains(homeName)) {
String name = dataFileConfig.get(homeName).toString();
Material material = Material.getMaterial(name);
if (material != null) {
XMaterial item;
String materialName = Material.getMaterial(name).toString();
String materialName = material.toString();
if (materialName.equalsIgnoreCase("PISTON_MOVING_PIECE")) {
item = XMaterial.PISTON;
} else if (materialName.equalsIgnoreCase("BED")) {
item = XMaterial.RED_BED;
} else {
item = XMaterial.matchXMaterial(Material.getMaterial(name));
item = XMaterial.matchXMaterial(material);
}
return item.parseItem();
}
Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/plugin.yml
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
name: HomeGUI
version: 1.4
version: 1.5
main: com.technovision.homegui.Homegui
api-version: 1.13
depend: [Essentials]
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('^' + ".*" + ' Update XSeries to 13.7.1 and relocate its package to fix plugin confl… by tommasov03 · Pull Request #16 · TechnoVisionDev/HomeGUI · GitHub
Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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: 8 additions & 2 deletions pom.xml
Original file line numberDiff line numberDiff line change
Expand Up@@ -6,7 +6,7 @@

<groupId>com.technovision</groupId>
<artifactId>homegui</artifactId>
<version>1.3</version>
<version>1.5</version>
<packaging>jar</packaging>

<name>Homegui</name>
Expand DownExpand Up@@ -40,6 +40,12 @@
</goals>
<configuration>
<createDependencyReducedPom>false</createDependencyReducedPom>
<relocations>
<relocation>
<pattern>com.cryptomorin.xseries</pattern>
<shadedPattern>com.technovision.homegui.libs.xseries</shadedPattern>
</relocation>
</relocations>
</configuration>
</execution>
</executions>
Expand DownExpand Up@@ -78,7 +84,7 @@
<dependency>
<groupId>com.github.cryptomorin</groupId>
<artifactId>XSeries</artifactId>
<version>6.0.1</version>
<version>13.7.1</version>
</dependency>
</dependencies>
</project>
18 changes: 14 additions & 4 deletions src/main/java/com/technovision/homegui/events/HomeEvents.java
Original file line numberDiff line numberDiff line change
Expand Up@@ -10,19 +10,29 @@
import org.bukkit.event.Listener;
import org.bukkit.event.inventory.ClickType;
import org.bukkit.event.inventory.InventoryClickEvent;
import org.bukkit.event.inventory.InventoryDragEvent;
import org.bukkit.event.inventory.InventoryType;
import org.bukkit.inventory.InventoryHolder;

public class HomeEvents implements Listener {

@EventHandler
public void onGuiDrag(InventoryDragEvent event) {
InventoryHolder holder = event.getInventory().getHolder();
if (holder instanceof HomeGUI || holder instanceof ChangeIconGUI) {
event.setCancelled(true);
}
}

@EventHandler
public void onGuiActivation(InventoryClickEvent event){
if (event.getInventory().getHolder() instanceof HomeGUI) {
if (event.getClickedInventory() == null) { return; }
event.setCancelled(true);
Player player = (Player) event.getWhoClicked();
if (event.getClickedInventory().getType() == InventoryType.PLAYER) { return; }
if (event.getCurrentItem() != null) {
if (event.getCurrentItem().getType() == Material.AIR) { return; }
event.setCancelled(true);
if (event.getClickedInventory().getType() == InventoryType.PLAYER) { return; }
String playerID = player.getUniqueId().toString();
int slotNum = event.getSlot();
String name = HomeGUI.allHomes.get(playerID).get(slotNum).getName();
Expand All@@ -44,11 +54,11 @@ public void onGuiActivation(InventoryClickEvent event){
}
} else if (event.getInventory().getHolder() instanceof ChangeIconGUI) {
if (event.getClickedInventory() == null) { return; }
event.setCancelled(true);
Player player = (Player) event.getWhoClicked();
if (event.getClickedInventory().getType() == InventoryType.PLAYER) { return; }
if (event.getCurrentItem() != null) {
if (event.getCurrentItem().getType() == Material.AIR) { return; }
event.setCancelled(true);
if (event.getClickedInventory().getType() == InventoryType.PLAYER) { return; }
if (event.isLeftClick()) {
String itemName = getFriendlyName(event.getCurrentItem().getType());
String playerID = event.getWhoClicked().getUniqueId().toString();
Expand Down
15 changes: 7 additions & 8 deletions src/main/java/com/technovision/homegui/gui/HomeGUI.java
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,6 +4,7 @@
import com.technovision.homegui.playerdata.EssentialsReader;
import com.technovision.homegui.playerdata.Home;
import org.bukkit.Bukkit;
import org.bukkit.configuration.file.YamlConfiguration;
import org.bukkit.inventory.Inventory;
import org.bukkit.inventory.InventoryHolder;
import org.bukkit.inventory.ItemStack;
Expand DownExpand Up@@ -34,21 +35,19 @@ private int calculateSize() {
if (size == 0) {return 9;}
if (size >= 54) { return 54; }
if (size % 9 == 0) { return size; }
int count = 0;
for (int i = size%9; i>0; i--) {
count++;
}
return (size - count) + 9;
return (size - (size % 9)) + 9;
}

private void initItems(String playerID) {
YamlConfiguration iconConfig = Homegui.dataReader.loadConfig(playerID);
String nameColor = Homegui.PLUGIN.getConfig().getString("home-color").replace("&", "§");
List<String> loreTemplate = Homegui.PLUGIN.getConfig().getStringList("home-lore");
String name;
for (Home home : homes) {
name = home.getName().substring(0, 1).toUpperCase() + home.getName().substring(1);
ItemStack item = Homegui.dataReader.getItem(playerID, home.getName());
String nameColor = Homegui.PLUGIN.getConfig().getString("home-color").replace("&", "§");
ItemStack item = Homegui.dataReader.getItem(iconConfig, home.getName());
name = nameColor + name;
List<String> lore = Homegui.PLUGIN.getConfig().getStringList("home-lore");
List<String> lore = new ArrayList<>(loreTemplate);
String location = "§f " + home.getX() + "x§7,§f " + home.getY() + "y§7,§f " + home.getZ() + "z";
for (int i = 0; i < lore.size(); i++) {
String newLine = lore.get(i).replace("{location}", location);
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -49,20 +49,24 @@ public void write(String playerUUID, String key, Material icon) {
}
}

public ItemStack getItem(String playerUUID, String homeName) {
public YamlConfiguration loadConfig(String playerUUID) {
File dataFile = getFile(playerUUID);
if (dataFile.exists()) {
YamlConfiguration dataFileConfig = YamlConfiguration.loadConfiguration(dataFile);
if (dataFileConfig.contains(homeName)) {
String name = dataFileConfig.get(homeName).toString();
return dataFile.exists() ? YamlConfiguration.loadConfiguration(dataFile) : null;
}

public ItemStack getItem(YamlConfiguration dataFileConfig, String homeName) {
if (dataFileConfig != null && dataFileConfig.contains(homeName)) {
String name = dataFileConfig.get(homeName).toString();
Material material = Material.getMaterial(name);
if (material != null) {
XMaterial item;
String materialName = Material.getMaterial(name).toString();
String materialName = material.toString();
if (materialName.equalsIgnoreCase("PISTON_MOVING_PIECE")) {
item = XMaterial.PISTON;
} else if (materialName.equalsIgnoreCase("BED")) {
item = XMaterial.RED_BED;
} else {
item = XMaterial.matchXMaterial(Material.getMaterial(name));
item = XMaterial.matchXMaterial(material);
}
return item.parseItem();
}
Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/plugin.yml
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
name: HomeGUI
version: 1.4
version: 1.5
main: com.technovision.homegui.Homegui
api-version: 1.13
depend: [Essentials]
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('^' + ".*" + ' Update XSeries to 13.7.1 and relocate its package to fix plugin confl… by tommasov03 · Pull Request #16 · TechnoVisionDev/HomeGUI · GitHub
Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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: 8 additions & 2 deletions pom.xml
Original file line numberDiff line numberDiff line change
Expand Up@@ -6,7 +6,7 @@

<groupId>com.technovision</groupId>
<artifactId>homegui</artifactId>
<version>1.3</version>
<version>1.5</version>
<packaging>jar</packaging>

<name>Homegui</name>
Expand DownExpand Up@@ -40,6 +40,12 @@
</goals>
<configuration>
<createDependencyReducedPom>false</createDependencyReducedPom>
<relocations>
<relocation>
<pattern>com.cryptomorin.xseries</pattern>
<shadedPattern>com.technovision.homegui.libs.xseries</shadedPattern>
</relocation>
</relocations>
</configuration>
</execution>
</executions>
Expand DownExpand Up@@ -78,7 +84,7 @@
<dependency>
<groupId>com.github.cryptomorin</groupId>
<artifactId>XSeries</artifactId>
<version>6.0.1</version>
<version>13.7.1</version>
</dependency>
</dependencies>
</project>
18 changes: 14 additions & 4 deletions src/main/java/com/technovision/homegui/events/HomeEvents.java
Original file line numberDiff line numberDiff line change
Expand Up@@ -10,19 +10,29 @@
import org.bukkit.event.Listener;
import org.bukkit.event.inventory.ClickType;
import org.bukkit.event.inventory.InventoryClickEvent;
import org.bukkit.event.inventory.InventoryDragEvent;
import org.bukkit.event.inventory.InventoryType;
import org.bukkit.inventory.InventoryHolder;

public class HomeEvents implements Listener {

@EventHandler
public void onGuiDrag(InventoryDragEvent event) {
InventoryHolder holder = event.getInventory().getHolder();
if (holder instanceof HomeGUI || holder instanceof ChangeIconGUI) {
event.setCancelled(true);
}
}

@EventHandler
public void onGuiActivation(InventoryClickEvent event){
if (event.getInventory().getHolder() instanceof HomeGUI) {
if (event.getClickedInventory() == null) { return; }
event.setCancelled(true);
Player player = (Player) event.getWhoClicked();
if (event.getClickedInventory().getType() == InventoryType.PLAYER) { return; }
if (event.getCurrentItem() != null) {
if (event.getCurrentItem().getType() == Material.AIR) { return; }
event.setCancelled(true);
if (event.getClickedInventory().getType() == InventoryType.PLAYER) { return; }
String playerID = player.getUniqueId().toString();
int slotNum = event.getSlot();
String name = HomeGUI.allHomes.get(playerID).get(slotNum).getName();
Expand All@@ -44,11 +54,11 @@ public void onGuiActivation(InventoryClickEvent event){
}
} else if (event.getInventory().getHolder() instanceof ChangeIconGUI) {
if (event.getClickedInventory() == null) { return; }
event.setCancelled(true);
Player player = (Player) event.getWhoClicked();
if (event.getClickedInventory().getType() == InventoryType.PLAYER) { return; }
if (event.getCurrentItem() != null) {
if (event.getCurrentItem().getType() == Material.AIR) { return; }
event.setCancelled(true);
if (event.getClickedInventory().getType() == InventoryType.PLAYER) { return; }
if (event.isLeftClick()) {
String itemName = getFriendlyName(event.getCurrentItem().getType());
String playerID = event.getWhoClicked().getUniqueId().toString();
Expand Down
15 changes: 7 additions & 8 deletions src/main/java/com/technovision/homegui/gui/HomeGUI.java
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,6 +4,7 @@
import com.technovision.homegui.playerdata.EssentialsReader;
import com.technovision.homegui.playerdata.Home;
import org.bukkit.Bukkit;
import org.bukkit.configuration.file.YamlConfiguration;
import org.bukkit.inventory.Inventory;
import org.bukkit.inventory.InventoryHolder;
import org.bukkit.inventory.ItemStack;
Expand DownExpand Up@@ -34,21 +35,19 @@ private int calculateSize() {
if (size == 0) {return 9;}
if (size >= 54) { return 54; }
if (size % 9 == 0) { return size; }
int count = 0;
for (int i = size%9; i>0; i--) {
count++;
}
return (size - count) + 9;
return (size - (size % 9)) + 9;
}

private void initItems(String playerID) {
YamlConfiguration iconConfig = Homegui.dataReader.loadConfig(playerID);
String nameColor = Homegui.PLUGIN.getConfig().getString("home-color").replace("&", "§");
List<String> loreTemplate = Homegui.PLUGIN.getConfig().getStringList("home-lore");
String name;
for (Home home : homes) {
name = home.getName().substring(0, 1).toUpperCase() + home.getName().substring(1);
ItemStack item = Homegui.dataReader.getItem(playerID, home.getName());
String nameColor = Homegui.PLUGIN.getConfig().getString("home-color").replace("&", "§");
ItemStack item = Homegui.dataReader.getItem(iconConfig, home.getName());
name = nameColor + name;
List<String> lore = Homegui.PLUGIN.getConfig().getStringList("home-lore");
List<String> lore = new ArrayList<>(loreTemplate);
String location = "§f " + home.getX() + "x§7,§f " + home.getY() + "y§7,§f " + home.getZ() + "z";
for (int i = 0; i < lore.size(); i++) {
String newLine = lore.get(i).replace("{location}", location);
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -49,20 +49,24 @@ public void write(String playerUUID, String key, Material icon) {
}
}

public ItemStack getItem(String playerUUID, String homeName) {
public YamlConfiguration loadConfig(String playerUUID) {
File dataFile = getFile(playerUUID);
if (dataFile.exists()) {
YamlConfiguration dataFileConfig = YamlConfiguration.loadConfiguration(dataFile);
if (dataFileConfig.contains(homeName)) {
String name = dataFileConfig.get(homeName).toString();
return dataFile.exists() ? YamlConfiguration.loadConfiguration(dataFile) : null;
}

public ItemStack getItem(YamlConfiguration dataFileConfig, String homeName) {
if (dataFileConfig != null && dataFileConfig.contains(homeName)) {
String name = dataFileConfig.get(homeName).toString();
Material material = Material.getMaterial(name);
if (material != null) {
XMaterial item;
String materialName = Material.getMaterial(name).toString();
String materialName = material.toString();
if (materialName.equalsIgnoreCase("PISTON_MOVING_PIECE")) {
item = XMaterial.PISTON;
} else if (materialName.equalsIgnoreCase("BED")) {
item = XMaterial.RED_BED;
} else {
item = XMaterial.matchXMaterial(Material.getMaterial(name));
item = XMaterial.matchXMaterial(material);
}
return item.parseItem();
}
Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/plugin.yml
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
name: HomeGUI
version: 1.4
version: 1.5
main: com.technovision.homegui.Homegui
api-version: 1.13
depend: [Essentials]
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); } })(); })(); Update XSeries to 13.7.1 and relocate its package to fix plugin confl… by tommasov03 · Pull Request #16 · TechnoVisionDev/HomeGUI · GitHub
Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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: 8 additions & 2 deletions pom.xml
Original file line numberDiff line numberDiff line change
Expand Up@@ -6,7 +6,7 @@

<groupId>com.technovision</groupId>
<artifactId>homegui</artifactId>
<version>1.3</version>
<version>1.5</version>
<packaging>jar</packaging>

<name>Homegui</name>
Expand DownExpand Up@@ -40,6 +40,12 @@
</goals>
<configuration>
<createDependencyReducedPom>false</createDependencyReducedPom>
<relocations>
<relocation>
<pattern>com.cryptomorin.xseries</pattern>
<shadedPattern>com.technovision.homegui.libs.xseries</shadedPattern>
</relocation>
</relocations>
</configuration>
</execution>
</executions>
Expand DownExpand Up@@ -78,7 +84,7 @@
<dependency>
<groupId>com.github.cryptomorin</groupId>
<artifactId>XSeries</artifactId>
<version>6.0.1</version>
<version>13.7.1</version>
</dependency>
</dependencies>
</project>
18 changes: 14 additions & 4 deletions src/main/java/com/technovision/homegui/events/HomeEvents.java
Original file line numberDiff line numberDiff line change
Expand Up@@ -10,19 +10,29 @@
import org.bukkit.event.Listener;
import org.bukkit.event.inventory.ClickType;
import org.bukkit.event.inventory.InventoryClickEvent;
import org.bukkit.event.inventory.InventoryDragEvent;
import org.bukkit.event.inventory.InventoryType;
import org.bukkit.inventory.InventoryHolder;

public class HomeEvents implements Listener {

@EventHandler
public void onGuiDrag(InventoryDragEvent event) {
InventoryHolder holder = event.getInventory().getHolder();
if (holder instanceof HomeGUI || holder instanceof ChangeIconGUI) {
event.setCancelled(true);
}
}

@EventHandler
public void onGuiActivation(InventoryClickEvent event){
if (event.getInventory().getHolder() instanceof HomeGUI) {
if (event.getClickedInventory() == null) { return; }
event.setCancelled(true);
Player player = (Player) event.getWhoClicked();
if (event.getClickedInventory().getType() == InventoryType.PLAYER) { return; }
if (event.getCurrentItem() != null) {
if (event.getCurrentItem().getType() == Material.AIR) { return; }
event.setCancelled(true);
if (event.getClickedInventory().getType() == InventoryType.PLAYER) { return; }
String playerID = player.getUniqueId().toString();
int slotNum = event.getSlot();
String name = HomeGUI.allHomes.get(playerID).get(slotNum).getName();
Expand All@@ -44,11 +54,11 @@ public void onGuiActivation(InventoryClickEvent event){
}
} else if (event.getInventory().getHolder() instanceof ChangeIconGUI) {
if (event.getClickedInventory() == null) { return; }
event.setCancelled(true);
Player player = (Player) event.getWhoClicked();
if (event.getClickedInventory().getType() == InventoryType.PLAYER) { return; }
if (event.getCurrentItem() != null) {
if (event.getCurrentItem().getType() == Material.AIR) { return; }
event.setCancelled(true);
if (event.getClickedInventory().getType() == InventoryType.PLAYER) { return; }
if (event.isLeftClick()) {
String itemName = getFriendlyName(event.getCurrentItem().getType());
String playerID = event.getWhoClicked().getUniqueId().toString();
Expand Down
15 changes: 7 additions & 8 deletions src/main/java/com/technovision/homegui/gui/HomeGUI.java
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,6 +4,7 @@
import com.technovision.homegui.playerdata.EssentialsReader;
import com.technovision.homegui.playerdata.Home;
import org.bukkit.Bukkit;
import org.bukkit.configuration.file.YamlConfiguration;
import org.bukkit.inventory.Inventory;
import org.bukkit.inventory.InventoryHolder;
import org.bukkit.inventory.ItemStack;
Expand DownExpand Up@@ -34,21 +35,19 @@ private int calculateSize() {
if (size == 0) {return 9;}
if (size >= 54) { return 54; }
if (size % 9 == 0) { return size; }
int count = 0;
for (int i = size%9; i>0; i--) {
count++;
}
return (size - count) + 9;
return (size - (size % 9)) + 9;
}

private void initItems(String playerID) {
YamlConfiguration iconConfig = Homegui.dataReader.loadConfig(playerID);
String nameColor = Homegui.PLUGIN.getConfig().getString("home-color").replace("&", "§");
List<String> loreTemplate = Homegui.PLUGIN.getConfig().getStringList("home-lore");
String name;
for (Home home : homes) {
name = home.getName().substring(0, 1).toUpperCase() + home.getName().substring(1);
ItemStack item = Homegui.dataReader.getItem(playerID, home.getName());
String nameColor = Homegui.PLUGIN.getConfig().getString("home-color").replace("&", "§");
ItemStack item = Homegui.dataReader.getItem(iconConfig, home.getName());
name = nameColor + name;
List<String> lore = Homegui.PLUGIN.getConfig().getStringList("home-lore");
List<String> lore = new ArrayList<>(loreTemplate);
String location = "§f " + home.getX() + "x§7,§f " + home.getY() + "y§7,§f " + home.getZ() + "z";
for (int i = 0; i < lore.size(); i++) {
String newLine = lore.get(i).replace("{location}", location);
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -49,20 +49,24 @@ public void write(String playerUUID, String key, Material icon) {
}
}

public ItemStack getItem(String playerUUID, String homeName) {
public YamlConfiguration loadConfig(String playerUUID) {
File dataFile = getFile(playerUUID);
if (dataFile.exists()) {
YamlConfiguration dataFileConfig = YamlConfiguration.loadConfiguration(dataFile);
if (dataFileConfig.contains(homeName)) {
String name = dataFileConfig.get(homeName).toString();
return dataFile.exists() ? YamlConfiguration.loadConfiguration(dataFile) : null;
}

public ItemStack getItem(YamlConfiguration dataFileConfig, String homeName) {
if (dataFileConfig != null && dataFileConfig.contains(homeName)) {
String name = dataFileConfig.get(homeName).toString();
Material material = Material.getMaterial(name);
if (material != null) {
XMaterial item;
String materialName = Material.getMaterial(name).toString();
String materialName = material.toString();
if (materialName.equalsIgnoreCase("PISTON_MOVING_PIECE")) {
item = XMaterial.PISTON;
} else if (materialName.equalsIgnoreCase("BED")) {
item = XMaterial.RED_BED;
} else {
item = XMaterial.matchXMaterial(Material.getMaterial(name));
item = XMaterial.matchXMaterial(material);
}
return item.parseItem();
}
Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/plugin.yml
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
name: HomeGUI
version: 1.4
version: 1.5
main: com.technovision.homegui.Homegui
api-version: 1.13
depend: [Essentials]
Expand Down