Skip to content

Update/toml json config#35

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
Paldiu wants to merge 7 commits into
base:Implementations
Choose a base branch
from
Open

Update/toml json config #35

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
c71ab84
Fully implement Discord bot
Paldiu Aug 28, 2023
51c9626
Merge remote-tracking branch 'origin/Implementations' into impl/disco…
Paldiu Aug 28, 2023
e71c167
Fix plugin-yml plugin errors & switch to night-config
Paldiu Aug 28, 2023
26f4e07
Replace TOML wrapper with generic support
Paldiu Aug 29, 2023
4681fc9
Minor tweaks to GenericConfig & ContextProvider
Paldiu Aug 31, 2023
85cc1f7
Bot Command Implementation
Paldiu Sep 5, 2023
df442ef
Merge branch 'Implementations' into update/toml-json-config
Paldiu Sep 10, 2023
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
88 changes: 51 additions & 37 deletions Patchwork/src/main/java/fns/patchwork/command/BukkitDelegate.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -32,6 +32,7 @@
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import java.util.Optional;
import java.util.Set;
import net.kyori.adventure.text.Component;
import org.bukkit.Bukkit;
Expand DownExpand Up@@ -156,50 +157,19 @@ private void processSubCommands(final @NotNull String @NotNull [] args,
if (argTypes.length > args.length)
return;

final Object[] objects = new Object[argTypes.length + 1];

for (int i = 0; i < argTypes.length; i++)
{
final Class<?> argType = argTypes[i];
final String arg = args[i];
final Player p = (sender instanceof Player player) ? player : null;

if (argType.equals(String.class))
{
if (i == argTypes.length - 1)
{
final String[] reasonArgs = Arrays.copyOfRange(args, i, args.length - 1);
final String reason = String.join(" ", reasonArgs);
objects[i] = reason;
}
else
{
continue;
}
}
final Object[] objects = new Object[argTypes.length + 1];

if (argType.equals(Location.class))
{
final String[] locationArgs = Arrays.copyOfRange(args, i, i + 3);
final String location = String.join(" ", locationArgs);
objects[i] = location;
}
parseArguments(args, provider, argTypes, objects);

final Object obj = provider.fromString(arg, argType);
if (obj == null)
{
FNS4J.getLogger("Datura")
.error("Failed to parse argument " + arg + " for type " + argType.getName());
return;
}
objects[i] = obj;
}
try
{
if (noConsole)
{
command.getSubcommands()
.get(node)
.invoke(command, (Player) sender, objects);
.invoke(command, p, objects);
}
else
{
Expand All@@ -215,11 +185,55 @@ private void processSubCommands(final @NotNull String @NotNull [] args,
}
}

private void parseArguments(@NotNull String @NotNull [] args,
ContextProvider provider,
Class<?>[] argTypes,
Object[] objects)
{
for (int i = 0; i < argTypes.length; i++)
{
final Class<?> argType = argTypes[i];
String arg = args[i];

boolean wasResolved = false;

if (argType.equals(String.class) && (i == argTypes.length - 1))
{
final String[] reasonArgs = Arrays.copyOfRange(args, i, args.length - 1);
final String reason = String.join(" ", reasonArgs);
objects[i] = reason;
wasResolved = true;
}

if (argType.equals(Location.class))
{
final String[] locationArgs = Arrays.copyOfRange(args, i, i + 3);
arg = String.join(" ", locationArgs);
}

if (!wasResolved)
{
final Optional<?> obj = provider.fromString(arg, argType);
if (obj.isEmpty())
{
FNS4J.getLogger("Datura")
.error("Failed to parse argument " + arg + " for type " + argType.getName());
continue;
}
objects[i] = obj.get();
}
}
}

@Override
public List<String> tabComplete(final CommandSender sender, final String alias, final String[] args)
public @NotNull List<String> tabComplete(final @NotNull CommandSender sender, final @NotNull String alias,
final String[] args)
{
final Set<Completion> completions = command.getCompletions();
final List<String> results = new ArrayList<>();
final Set<Completion> completions = command.getCompletions();

if (completions == null || completions.isEmpty())
return results;

if (args.length == 0)
{
Expand Down
3 changes: 2 additions & 1 deletion Patchwork/src/main/java/fns/patchwork/config/Configuration.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -25,6 +25,7 @@

import fns.patchwork.provider.Context;
import fns.patchwork.provider.ContextProvider;
import java.util.Collection;
import org.jetbrains.annotations.Unmodifiable;

import java.io.File;
Expand DownExpand Up@@ -87,7 +88,7 @@ public interface Configuration
* @param clazz The class of the type.
* @return The List object.
*/
<T> @Unmodifiable List<T> getList(String path, Class<T> clazz);
<T> @Unmodifiable Collection<T> getCollection(String path, Class<T> clazz);

/**
* Gets a List object from the associated path. The List that is returned will be the String values which are stored
Expand Down
Loading
, '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" + '
Update/toml json config by Paldiu · Pull Request #35 · SimplexDevelopment/FreedomNetworkSuite · GitHub
Skip to content
Update/toml json config#35

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

Paldiu
wants to merge
7
commits into

base:Implementations
Choose a base branch

from

 Open


Update/toml json config
#35
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


7 commits


Select commit
Hold shift + click to select a range
c71ab84

Fully implement Discord bot


Paldiu Aug 28, 2023
51c9626

Merge remote-tracking branch 'origin/Implementations' into impl/disco…


Paldiu Aug 28, 2023
e71c167

Fix plugin-yml plugin errors & switch to night-config


Paldiu Aug 28, 2023
26f4e07

Replace TOML wrapper with generic support


Paldiu Aug 29, 2023
4681fc9

Minor tweaks to GenericConfig & ContextProvider


Paldiu Aug 31, 2023
85cc1f7

Bot Command Implementation


Paldiu Sep 5, 2023
df442ef

Merge branch 'Implementations' into update/toml-json-config


Paldiu Sep 10, 2023

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


88 changes: 51 additions & 37 deletions
Patchwork/src/main/java/fns/patchwork/command/BukkitDelegate.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -32,6 +32,7 @@
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import java.util.Optional;
import java.util.Set;
import net.kyori.adventure.text.Component;
import org.bukkit.Bukkit;
Expand DownExpand Up@@ -156,50 +157,19 @@ private void processSubCommands(final @NotNull String @NotNull [] args,
 if (argTypes.length > args.length)
 return;

 final Object[] objects = new Object[argTypes.length + 1];

 for (int i = 0; i < argTypes.length; i++)
 {
 final Class<?> argType = argTypes[i];
 final String arg = args[i];
 final Player p = (sender instanceof Player player) ? player : null;

 if (argType.equals(String.class))
 {
 if (i == argTypes.length - 1)
 {
 final String[] reasonArgs = Arrays.copyOfRange(args, i, args.length - 1);
 final String reason = String.join(" ", reasonArgs);
 objects[i] = reason;
 }
 else
 {
 continue;
 }
 }
 final Object[] objects = new Object[argTypes.length + 1];

 if (argType.equals(Location.class))
 {
 final String[] locationArgs = Arrays.copyOfRange(args, i, i + 3);
 final String location = String.join(" ", locationArgs);
 objects[i] = location;
 }
 parseArguments(args, provider, argTypes, objects);

 final Object obj = provider.fromString(arg, argType);
 if (obj == null)
 {
 FNS4J.getLogger("Datura")
 .error("Failed to parse argument " + arg + " for type " + argType.getName());
 return;
 }
 objects[i] = obj;
 }
 try
 {
 if (noConsole)
 {
 command.getSubcommands()
 .get(node)
 .invoke(command, (Player) sender, objects);
 .invoke(command, p, objects);
 }
 else
 {
Expand All@@ -215,11 +185,55 @@ private void processSubCommands(final @NotNull String @NotNull [] args,
 }
 }

 private void parseArguments(@NotNull String @NotNull [] args,
 ContextProvider provider,
 Class<?>[] argTypes,
 Object[] objects)
 {
 for (int i = 0; i < argTypes.length; i++)
 {
 final Class<?> argType = argTypes[i];
 String arg = args[i];

 boolean wasResolved = false;

 if (argType.equals(String.class) && (i == argTypes.length - 1))
 {
 final String[] reasonArgs = Arrays.copyOfRange(args, i, args.length - 1);
 final String reason = String.join(" ", reasonArgs);
 objects[i] = reason;
 wasResolved = true;
 }

 if (argType.equals(Location.class))
 {
 final String[] locationArgs = Arrays.copyOfRange(args, i, i + 3);
 arg = String.join(" ", locationArgs);
 }

 if (!wasResolved)
 {
 final Optional<?> obj = provider.fromString(arg, argType);
 if (obj.isEmpty())
 {
 FNS4J.getLogger("Datura")
 .error("Failed to parse argument " + arg + " for type " + argType.getName());
 continue;
 }
 objects[i] = obj.get();
 }
 }
 }

 @Override
 public List<String> tabComplete(final CommandSender sender, final String alias, final String[] args)
 public @NotNull List<String> tabComplete(final @NotNull CommandSender sender, final @NotNull String alias,
 final String[] args)
 {
 final Set<Completion> completions = command.getCompletions();
 final List<String> results = new ArrayList<>();
 final Set<Completion> completions = command.getCompletions();

 if (completions == null || completions.isEmpty())
 return results;

 if (args.length == 0)
 {
Expand Down

3 changes: 2 additions & 1 deletion
Patchwork/src/main/java/fns/patchwork/config/Configuration.java

View file


Open in desktop

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

import fns.patchwork.provider.Context;
import fns.patchwork.provider.ContextProvider;
import java.util.Collection;
import org.jetbrains.annotations.Unmodifiable;

import java.io.File;
Expand DownExpand Up@@ -87,7 +88,7 @@ public interface Configuration
 * @param clazz The class of the type.
 * @return The List object.
 */
 <T> @Unmodifiable List<T> getList(String path, Class<T> clazz);
 <T> @Unmodifiable Collection<T> getCollection(String path, Class<T> clazz);

 /**
 * Gets a List object from the associated path. The List that is returned will be the String values which are stored
Expand Down
Loading

, '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/toml json config by Paldiu · Pull Request #35 · SimplexDevelopment/FreedomNetworkSuite · GitHub
Skip to content
Update/toml json config#35

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

Paldiu
wants to merge
7
commits into

base:Implementations
Choose a base branch

from

 Open


Update/toml json config
#35
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


7 commits


Select commit
Hold shift + click to select a range
c71ab84

Fully implement Discord bot


Paldiu Aug 28, 2023
51c9626

Merge remote-tracking branch 'origin/Implementations' into impl/disco…


Paldiu Aug 28, 2023
e71c167

Fix plugin-yml plugin errors & switch to night-config


Paldiu Aug 28, 2023
26f4e07

Replace TOML wrapper with generic support


Paldiu Aug 29, 2023
4681fc9

Minor tweaks to GenericConfig & ContextProvider


Paldiu Aug 31, 2023
85cc1f7

Bot Command Implementation


Paldiu Sep 5, 2023
df442ef

Merge branch 'Implementations' into update/toml-json-config


Paldiu Sep 10, 2023

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


88 changes: 51 additions & 37 deletions
Patchwork/src/main/java/fns/patchwork/command/BukkitDelegate.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -32,6 +32,7 @@
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import java.util.Optional;
import java.util.Set;
import net.kyori.adventure.text.Component;
import org.bukkit.Bukkit;
Expand DownExpand Up@@ -156,50 +157,19 @@ private void processSubCommands(final @NotNull String @NotNull [] args,
 if (argTypes.length > args.length)
 return;

 final Object[] objects = new Object[argTypes.length + 1];

 for (int i = 0; i < argTypes.length; i++)
 {
 final Class<?> argType = argTypes[i];
 final String arg = args[i];
 final Player p = (sender instanceof Player player) ? player : null;

 if (argType.equals(String.class))
 {
 if (i == argTypes.length - 1)
 {
 final String[] reasonArgs = Arrays.copyOfRange(args, i, args.length - 1);
 final String reason = String.join(" ", reasonArgs);
 objects[i] = reason;
 }
 else
 {
 continue;
 }
 }
 final Object[] objects = new Object[argTypes.length + 1];

 if (argType.equals(Location.class))
 {
 final String[] locationArgs = Arrays.copyOfRange(args, i, i + 3);
 final String location = String.join(" ", locationArgs);
 objects[i] = location;
 }
 parseArguments(args, provider, argTypes, objects);

 final Object obj = provider.fromString(arg, argType);
 if (obj == null)
 {
 FNS4J.getLogger("Datura")
 .error("Failed to parse argument " + arg + " for type " + argType.getName());
 return;
 }
 objects[i] = obj;
 }
 try
 {
 if (noConsole)
 {
 command.getSubcommands()
 .get(node)
 .invoke(command, (Player) sender, objects);
 .invoke(command, p, objects);
 }
 else
 {
Expand All@@ -215,11 +185,55 @@ private void processSubCommands(final @NotNull String @NotNull [] args,
 }
 }

 private void parseArguments(@NotNull String @NotNull [] args,
 ContextProvider provider,
 Class<?>[] argTypes,
 Object[] objects)
 {
 for (int i = 0; i < argTypes.length; i++)
 {
 final Class<?> argType = argTypes[i];
 String arg = args[i];

 boolean wasResolved = false;

 if (argType.equals(String.class) && (i == argTypes.length - 1))
 {
 final String[] reasonArgs = Arrays.copyOfRange(args, i, args.length - 1);
 final String reason = String.join(" ", reasonArgs);
 objects[i] = reason;
 wasResolved = true;
 }

 if (argType.equals(Location.class))
 {
 final String[] locationArgs = Arrays.copyOfRange(args, i, i + 3);
 arg = String.join(" ", locationArgs);
 }

 if (!wasResolved)
 {
 final Optional<?> obj = provider.fromString(arg, argType);
 if (obj.isEmpty())
 {
 FNS4J.getLogger("Datura")
 .error("Failed to parse argument " + arg + " for type " + argType.getName());
 continue;
 }
 objects[i] = obj.get();
 }
 }
 }

 @Override
 public List<String> tabComplete(final CommandSender sender, final String alias, final String[] args)
 public @NotNull List<String> tabComplete(final @NotNull CommandSender sender, final @NotNull String alias,
 final String[] args)
 {
 final Set<Completion> completions = command.getCompletions();
 final List<String> results = new ArrayList<>();
 final Set<Completion> completions = command.getCompletions();

 if (completions == null || completions.isEmpty())
 return results;

 if (args.length == 0)
 {
Expand Down

3 changes: 2 additions & 1 deletion
Patchwork/src/main/java/fns/patchwork/config/Configuration.java

View file


Open in desktop

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

import fns.patchwork.provider.Context;
import fns.patchwork.provider.ContextProvider;
import java.util.Collection;
import org.jetbrains.annotations.Unmodifiable;

import java.io.File;
Expand DownExpand Up@@ -87,7 +88,7 @@ public interface Configuration
 * @param clazz The class of the type.
 * @return The List object.
 */
 <T> @Unmodifiable List<T> getList(String path, Class<T> clazz);
 <T> @Unmodifiable Collection<T> getCollection(String path, Class<T> clazz);

 /**
 * Gets a List object from the associated path. The List that is returned will be the String values which are stored
Expand Down
Loading

, '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/toml json config by Paldiu · Pull Request #35 · SimplexDevelopment/FreedomNetworkSuite · GitHub
Skip to content
Update/toml json config#35

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

Paldiu
wants to merge
7
commits into

base:Implementations
Choose a base branch

from

 Open


Update/toml json config
#35
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


7 commits


Select commit
Hold shift + click to select a range
c71ab84

Fully implement Discord bot


Paldiu Aug 28, 2023
51c9626

Merge remote-tracking branch 'origin/Implementations' into impl/disco…


Paldiu Aug 28, 2023
e71c167

Fix plugin-yml plugin errors & switch to night-config


Paldiu Aug 28, 2023
26f4e07

Replace TOML wrapper with generic support


Paldiu Aug 29, 2023
4681fc9

Minor tweaks to GenericConfig & ContextProvider


Paldiu Aug 31, 2023
85cc1f7

Bot Command Implementation


Paldiu Sep 5, 2023
df442ef

Merge branch 'Implementations' into update/toml-json-config


Paldiu Sep 10, 2023

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


88 changes: 51 additions & 37 deletions
Patchwork/src/main/java/fns/patchwork/command/BukkitDelegate.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -32,6 +32,7 @@
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import java.util.Optional;
import java.util.Set;
import net.kyori.adventure.text.Component;
import org.bukkit.Bukkit;
Expand DownExpand Up@@ -156,50 +157,19 @@ private void processSubCommands(final @NotNull String @NotNull [] args,
 if (argTypes.length > args.length)
 return;

 final Object[] objects = new Object[argTypes.length + 1];

 for (int i = 0; i < argTypes.length; i++)
 {
 final Class<?> argType = argTypes[i];
 final String arg = args[i];
 final Player p = (sender instanceof Player player) ? player : null;

 if (argType.equals(String.class))
 {
 if (i == argTypes.length - 1)
 {
 final String[] reasonArgs = Arrays.copyOfRange(args, i, args.length - 1);
 final String reason = String.join(" ", reasonArgs);
 objects[i] = reason;
 }
 else
 {
 continue;
 }
 }
 final Object[] objects = new Object[argTypes.length + 1];

 if (argType.equals(Location.class))
 {
 final String[] locationArgs = Arrays.copyOfRange(args, i, i + 3);
 final String location = String.join(" ", locationArgs);
 objects[i] = location;
 }
 parseArguments(args, provider, argTypes, objects);

 final Object obj = provider.fromString(arg, argType);
 if (obj == null)
 {
 FNS4J.getLogger("Datura")
 .error("Failed to parse argument " + arg + " for type " + argType.getName());
 return;
 }
 objects[i] = obj;
 }
 try
 {
 if (noConsole)
 {
 command.getSubcommands()
 .get(node)
 .invoke(command, (Player) sender, objects);
 .invoke(command, p, objects);
 }
 else
 {
Expand All@@ -215,11 +185,55 @@ private void processSubCommands(final @NotNull String @NotNull [] args,
 }
 }

 private void parseArguments(@NotNull String @NotNull [] args,
 ContextProvider provider,
 Class<?>[] argTypes,
 Object[] objects)
 {
 for (int i = 0; i < argTypes.length; i++)
 {
 final Class<?> argType = argTypes[i];
 String arg = args[i];

 boolean wasResolved = false;

 if (argType.equals(String.class) && (i == argTypes.length - 1))
 {
 final String[] reasonArgs = Arrays.copyOfRange(args, i, args.length - 1);
 final String reason = String.join(" ", reasonArgs);
 objects[i] = reason;
 wasResolved = true;
 }

 if (argType.equals(Location.class))
 {
 final String[] locationArgs = Arrays.copyOfRange(args, i, i + 3);
 arg = String.join(" ", locationArgs);
 }

 if (!wasResolved)
 {
 final Optional<?> obj = provider.fromString(arg, argType);
 if (obj.isEmpty())
 {
 FNS4J.getLogger("Datura")
 .error("Failed to parse argument " + arg + " for type " + argType.getName());
 continue;
 }
 objects[i] = obj.get();
 }
 }
 }

 @Override
 public List<String> tabComplete(final CommandSender sender, final String alias, final String[] args)
 public @NotNull List<String> tabComplete(final @NotNull CommandSender sender, final @NotNull String alias,
 final String[] args)
 {
 final Set<Completion> completions = command.getCompletions();
 final List<String> results = new ArrayList<>();
 final Set<Completion> completions = command.getCompletions();

 if (completions == null || completions.isEmpty())
 return results;

 if (args.length == 0)
 {
Expand Down

3 changes: 2 additions & 1 deletion
Patchwork/src/main/java/fns/patchwork/config/Configuration.java

View file


Open in desktop

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

import fns.patchwork.provider.Context;
import fns.patchwork.provider.ContextProvider;
import java.util.Collection;
import org.jetbrains.annotations.Unmodifiable;

import java.io.File;
Expand DownExpand Up@@ -87,7 +88,7 @@ public interface Configuration
 * @param clazz The class of the type.
 * @return The List object.
 */
 <T> @Unmodifiable List<T> getList(String path, Class<T> clazz);
 <T> @Unmodifiable Collection<T> getCollection(String path, Class<T> clazz);

 /**
 * Gets a List object from the associated path. The List that is returned will be the String values which are stored
Expand Down
Loading

, '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/toml json config by Paldiu · Pull Request #35 · SimplexDevelopment/FreedomNetworkSuite · GitHub
Skip to content
Update/toml json config#35

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

Paldiu
wants to merge
7
commits into

base:Implementations
Choose a base branch

from

 Open


Update/toml json config
#35
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


7 commits


Select commit
Hold shift + click to select a range
c71ab84

Fully implement Discord bot


Paldiu Aug 28, 2023
51c9626

Merge remote-tracking branch 'origin/Implementations' into impl/disco…


Paldiu Aug 28, 2023
e71c167

Fix plugin-yml plugin errors & switch to night-config


Paldiu Aug 28, 2023
26f4e07

Replace TOML wrapper with generic support


Paldiu Aug 29, 2023
4681fc9

Minor tweaks to GenericConfig & ContextProvider


Paldiu Aug 31, 2023
85cc1f7

Bot Command Implementation


Paldiu Sep 5, 2023
df442ef

Merge branch 'Implementations' into update/toml-json-config


Paldiu Sep 10, 2023

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


88 changes: 51 additions & 37 deletions
Patchwork/src/main/java/fns/patchwork/command/BukkitDelegate.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -32,6 +32,7 @@
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import java.util.Optional;
import java.util.Set;
import net.kyori.adventure.text.Component;
import org.bukkit.Bukkit;
Expand DownExpand Up@@ -156,50 +157,19 @@ private void processSubCommands(final @NotNull String @NotNull [] args,
 if (argTypes.length > args.length)
 return;

 final Object[] objects = new Object[argTypes.length + 1];

 for (int i = 0; i < argTypes.length; i++)
 {
 final Class<?> argType = argTypes[i];
 final String arg = args[i];
 final Player p = (sender instanceof Player player) ? player : null;

 if (argType.equals(String.class))
 {
 if (i == argTypes.length - 1)
 {
 final String[] reasonArgs = Arrays.copyOfRange(args, i, args.length - 1);
 final String reason = String.join(" ", reasonArgs);
 objects[i] = reason;
 }
 else
 {
 continue;
 }
 }
 final Object[] objects = new Object[argTypes.length + 1];

 if (argType.equals(Location.class))
 {
 final String[] locationArgs = Arrays.copyOfRange(args, i, i + 3);
 final String location = String.join(" ", locationArgs);
 objects[i] = location;
 }
 parseArguments(args, provider, argTypes, objects);

 final Object obj = provider.fromString(arg, argType);
 if (obj == null)
 {
 FNS4J.getLogger("Datura")
 .error("Failed to parse argument " + arg + " for type " + argType.getName());
 return;
 }
 objects[i] = obj;
 }
 try
 {
 if (noConsole)
 {
 command.getSubcommands()
 .get(node)
 .invoke(command, (Player) sender, objects);
 .invoke(command, p, objects);
 }
 else
 {
Expand All@@ -215,11 +185,55 @@ private void processSubCommands(final @NotNull String @NotNull [] args,
 }
 }

 private void parseArguments(@NotNull String @NotNull [] args,
 ContextProvider provider,
 Class<?>[] argTypes,
 Object[] objects)
 {
 for (int i = 0; i < argTypes.length; i++)
 {
 final Class<?> argType = argTypes[i];
 String arg = args[i];

 boolean wasResolved = false;

 if (argType.equals(String.class) && (i == argTypes.length - 1))
 {
 final String[] reasonArgs = Arrays.copyOfRange(args, i, args.length - 1);
 final String reason = String.join(" ", reasonArgs);
 objects[i] = reason;
 wasResolved = true;
 }

 if (argType.equals(Location.class))
 {
 final String[] locationArgs = Arrays.copyOfRange(args, i, i + 3);
 arg = String.join(" ", locationArgs);
 }

 if (!wasResolved)
 {
 final Optional<?> obj = provider.fromString(arg, argType);
 if (obj.isEmpty())
 {
 FNS4J.getLogger("Datura")
 .error("Failed to parse argument " + arg + " for type " + argType.getName());
 continue;
 }
 objects[i] = obj.get();
 }
 }
 }

 @Override
 public List<String> tabComplete(final CommandSender sender, final String alias, final String[] args)
 public @NotNull List<String> tabComplete(final @NotNull CommandSender sender, final @NotNull String alias,
 final String[] args)
 {
 final Set<Completion> completions = command.getCompletions();
 final List<String> results = new ArrayList<>();
 final Set<Completion> completions = command.getCompletions();

 if (completions == null || completions.isEmpty())
 return results;

 if (args.length == 0)
 {
Expand Down

3 changes: 2 additions & 1 deletion
Patchwork/src/main/java/fns/patchwork/config/Configuration.java

View file


Open in desktop

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

import fns.patchwork.provider.Context;
import fns.patchwork.provider.ContextProvider;
import java.util.Collection;
import org.jetbrains.annotations.Unmodifiable;

import java.io.File;
Expand DownExpand Up@@ -87,7 +88,7 @@ public interface Configuration
 * @param clazz The class of the type.
 * @return The List object.
 */
 <T> @Unmodifiable List<T> getList(String path, Class<T> clazz);
 <T> @Unmodifiable Collection<T> getCollection(String path, Class<T> clazz);

 /**
 * Gets a List object from the associated path. The List that is returned will be the String values which are stored
Expand Down
Loading

, '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/toml json config by Paldiu · Pull Request #35 · SimplexDevelopment/FreedomNetworkSuite · GitHub
Skip to content
Update/toml json config#35

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

Paldiu
wants to merge
7
commits into

base:Implementations
Choose a base branch

from

 Open


Update/toml json config
#35
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


7 commits


Select commit
Hold shift + click to select a range
c71ab84

Fully implement Discord bot


Paldiu Aug 28, 2023
51c9626

Merge remote-tracking branch 'origin/Implementations' into impl/disco…


Paldiu Aug 28, 2023
e71c167

Fix plugin-yml plugin errors & switch to night-config


Paldiu Aug 28, 2023
26f4e07

Replace TOML wrapper with generic support


Paldiu Aug 29, 2023
4681fc9

Minor tweaks to GenericConfig & ContextProvider


Paldiu Aug 31, 2023
85cc1f7

Bot Command Implementation


Paldiu Sep 5, 2023
df442ef

Merge branch 'Implementations' into update/toml-json-config


Paldiu Sep 10, 2023

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


88 changes: 51 additions & 37 deletions
Patchwork/src/main/java/fns/patchwork/command/BukkitDelegate.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -32,6 +32,7 @@
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import java.util.Optional;
import java.util.Set;
import net.kyori.adventure.text.Component;
import org.bukkit.Bukkit;
Expand DownExpand Up@@ -156,50 +157,19 @@ private void processSubCommands(final @NotNull String @NotNull [] args,
 if (argTypes.length > args.length)
 return;

 final Object[] objects = new Object[argTypes.length + 1];

 for (int i = 0; i < argTypes.length; i++)
 {
 final Class<?> argType = argTypes[i];
 final String arg = args[i];
 final Player p = (sender instanceof Player player) ? player : null;

 if (argType.equals(String.class))
 {
 if (i == argTypes.length - 1)
 {
 final String[] reasonArgs = Arrays.copyOfRange(args, i, args.length - 1);
 final String reason = String.join(" ", reasonArgs);
 objects[i] = reason;
 }
 else
 {
 continue;
 }
 }
 final Object[] objects = new Object[argTypes.length + 1];

 if (argType.equals(Location.class))
 {
 final String[] locationArgs = Arrays.copyOfRange(args, i, i + 3);
 final String location = String.join(" ", locationArgs);
 objects[i] = location;
 }
 parseArguments(args, provider, argTypes, objects);

 final Object obj = provider.fromString(arg, argType);
 if (obj == null)
 {
 FNS4J.getLogger("Datura")
 .error("Failed to parse argument " + arg + " for type " + argType.getName());
 return;
 }
 objects[i] = obj;
 }
 try
 {
 if (noConsole)
 {
 command.getSubcommands()
 .get(node)
 .invoke(command, (Player) sender, objects);
 .invoke(command, p, objects);
 }
 else
 {
Expand All@@ -215,11 +185,55 @@ private void processSubCommands(final @NotNull String @NotNull [] args,
 }
 }

 private void parseArguments(@NotNull String @NotNull [] args,
 ContextProvider provider,
 Class<?>[] argTypes,
 Object[] objects)
 {
 for (int i = 0; i < argTypes.length; i++)
 {
 final Class<?> argType = argTypes[i];
 String arg = args[i];

 boolean wasResolved = false;

 if (argType.equals(String.class) && (i == argTypes.length - 1))
 {
 final String[] reasonArgs = Arrays.copyOfRange(args, i, args.length - 1);
 final String reason = String.join(" ", reasonArgs);
 objects[i] = reason;
 wasResolved = true;
 }

 if (argType.equals(Location.class))
 {
 final String[] locationArgs = Arrays.copyOfRange(args, i, i + 3);
 arg = String.join(" ", locationArgs);
 }

 if (!wasResolved)
 {
 final Optional<?> obj = provider.fromString(arg, argType);
 if (obj.isEmpty())
 {
 FNS4J.getLogger("Datura")
 .error("Failed to parse argument " + arg + " for type " + argType.getName());
 continue;
 }
 objects[i] = obj.get();
 }
 }
 }

 @Override
 public List<String> tabComplete(final CommandSender sender, final String alias, final String[] args)
 public @NotNull List<String> tabComplete(final @NotNull CommandSender sender, final @NotNull String alias,
 final String[] args)
 {
 final Set<Completion> completions = command.getCompletions();
 final List<String> results = new ArrayList<>();
 final Set<Completion> completions = command.getCompletions();

 if (completions == null || completions.isEmpty())
 return results;

 if (args.length == 0)
 {
Expand Down

3 changes: 2 additions & 1 deletion
Patchwork/src/main/java/fns/patchwork/config/Configuration.java

View file


Open in desktop

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

import fns.patchwork.provider.Context;
import fns.patchwork.provider.ContextProvider;
import java.util.Collection;
import org.jetbrains.annotations.Unmodifiable;

import java.io.File;
Expand DownExpand Up@@ -87,7 +88,7 @@ public interface Configuration
 * @param clazz The class of the type.
 * @return The List object.
 */
 <T> @Unmodifiable List<T> getList(String path, Class<T> clazz);
 <T> @Unmodifiable Collection<T> getCollection(String path, Class<T> clazz);

 /**
 * Gets a List object from the associated path. The List that is returned will be the String values which are stored
Expand Down
Loading

, '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/toml json config by Paldiu · Pull Request #35 · SimplexDevelopment/FreedomNetworkSuite · GitHub
Skip to content
Update/toml json config#35

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

Paldiu
wants to merge
7
commits into

base:Implementations
Choose a base branch

from

 Open


Update/toml json config
#35
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


7 commits


Select commit
Hold shift + click to select a range
c71ab84

Fully implement Discord bot


Paldiu Aug 28, 2023
51c9626

Merge remote-tracking branch 'origin/Implementations' into impl/disco…


Paldiu Aug 28, 2023
e71c167

Fix plugin-yml plugin errors & switch to night-config


Paldiu Aug 28, 2023
26f4e07

Replace TOML wrapper with generic support


Paldiu Aug 29, 2023
4681fc9

Minor tweaks to GenericConfig & ContextProvider


Paldiu Aug 31, 2023
85cc1f7

Bot Command Implementation


Paldiu Sep 5, 2023
df442ef

Merge branch 'Implementations' into update/toml-json-config


Paldiu Sep 10, 2023

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


88 changes: 51 additions & 37 deletions
Patchwork/src/main/java/fns/patchwork/command/BukkitDelegate.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -32,6 +32,7 @@
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import java.util.Optional;
import java.util.Set;
import net.kyori.adventure.text.Component;
import org.bukkit.Bukkit;
Expand DownExpand Up@@ -156,50 +157,19 @@ private void processSubCommands(final @NotNull String @NotNull [] args,
 if (argTypes.length > args.length)
 return;

 final Object[] objects = new Object[argTypes.length + 1];

 for (int i = 0; i < argTypes.length; i++)
 {
 final Class<?> argType = argTypes[i];
 final String arg = args[i];
 final Player p = (sender instanceof Player player) ? player : null;

 if (argType.equals(String.class))
 {
 if (i == argTypes.length - 1)
 {
 final String[] reasonArgs = Arrays.copyOfRange(args, i, args.length - 1);
 final String reason = String.join(" ", reasonArgs);
 objects[i] = reason;
 }
 else
 {
 continue;
 }
 }
 final Object[] objects = new Object[argTypes.length + 1];

 if (argType.equals(Location.class))
 {
 final String[] locationArgs = Arrays.copyOfRange(args, i, i + 3);
 final String location = String.join(" ", locationArgs);
 objects[i] = location;
 }
 parseArguments(args, provider, argTypes, objects);

 final Object obj = provider.fromString(arg, argType);
 if (obj == null)
 {
 FNS4J.getLogger("Datura")
 .error("Failed to parse argument " + arg + " for type " + argType.getName());
 return;
 }
 objects[i] = obj;
 }
 try
 {
 if (noConsole)
 {
 command.getSubcommands()
 .get(node)
 .invoke(command, (Player) sender, objects);
 .invoke(command, p, objects);
 }
 else
 {
Expand All@@ -215,11 +185,55 @@ private void processSubCommands(final @NotNull String @NotNull [] args,
 }
 }

 private void parseArguments(@NotNull String @NotNull [] args,
 ContextProvider provider,
 Class<?>[] argTypes,
 Object[] objects)
 {
 for (int i = 0; i < argTypes.length; i++)
 {
 final Class<?> argType = argTypes[i];
 String arg = args[i];

 boolean wasResolved = false;

 if (argType.equals(String.class) && (i == argTypes.length - 1))
 {
 final String[] reasonArgs = Arrays.copyOfRange(args, i, args.length - 1);
 final String reason = String.join(" ", reasonArgs);
 objects[i] = reason;
 wasResolved = true;
 }

 if (argType.equals(Location.class))
 {
 final String[] locationArgs = Arrays.copyOfRange(args, i, i + 3);
 arg = String.join(" ", locationArgs);
 }

 if (!wasResolved)
 {
 final Optional<?> obj = provider.fromString(arg, argType);
 if (obj.isEmpty())
 {
 FNS4J.getLogger("Datura")
 .error("Failed to parse argument " + arg + " for type " + argType.getName());
 continue;
 }
 objects[i] = obj.get();
 }
 }
 }

 @Override
 public List<String> tabComplete(final CommandSender sender, final String alias, final String[] args)
 public @NotNull List<String> tabComplete(final @NotNull CommandSender sender, final @NotNull String alias,
 final String[] args)
 {
 final Set<Completion> completions = command.getCompletions();
 final List<String> results = new ArrayList<>();
 final Set<Completion> completions = command.getCompletions();

 if (completions == null || completions.isEmpty())
 return results;

 if (args.length == 0)
 {
Expand Down

3 changes: 2 additions & 1 deletion
Patchwork/src/main/java/fns/patchwork/config/Configuration.java

View file


Open in desktop

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

import fns.patchwork.provider.Context;
import fns.patchwork.provider.ContextProvider;
import java.util.Collection;
import org.jetbrains.annotations.Unmodifiable;

import java.io.File;
Expand DownExpand Up@@ -87,7 +88,7 @@ public interface Configuration
 * @param clazz The class of the type.
 * @return The List object.
 */
 <T> @Unmodifiable List<T> getList(String path, Class<T> clazz);
 <T> @Unmodifiable Collection<T> getCollection(String path, Class<T> clazz);

 /**
 * Gets a List object from the associated path. The List that is returned will be the String values which are stored
Expand Down
Loading

, '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/toml json config by Paldiu · Pull Request #35 · SimplexDevelopment/FreedomNetworkSuite · GitHub
Skip to content
Update/toml json config#35

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

Paldiu
wants to merge
7
commits into

base:Implementations
Choose a base branch

from

 Open


Update/toml json config
#35
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


7 commits


Select commit
Hold shift + click to select a range
c71ab84

Fully implement Discord bot


Paldiu Aug 28, 2023
51c9626

Merge remote-tracking branch 'origin/Implementations' into impl/disco…


Paldiu Aug 28, 2023
e71c167

Fix plugin-yml plugin errors & switch to night-config


Paldiu Aug 28, 2023
26f4e07

Replace TOML wrapper with generic support


Paldiu Aug 29, 2023
4681fc9

Minor tweaks to GenericConfig & ContextProvider


Paldiu Aug 31, 2023
85cc1f7

Bot Command Implementation


Paldiu Sep 5, 2023
df442ef

Merge branch 'Implementations' into update/toml-json-config


Paldiu Sep 10, 2023

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


88 changes: 51 additions & 37 deletions
Patchwork/src/main/java/fns/patchwork/command/BukkitDelegate.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -32,6 +32,7 @@
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import java.util.Optional;
import java.util.Set;
import net.kyori.adventure.text.Component;
import org.bukkit.Bukkit;
Expand DownExpand Up@@ -156,50 +157,19 @@ private void processSubCommands(final @NotNull String @NotNull [] args,
 if (argTypes.length > args.length)
 return;

 final Object[] objects = new Object[argTypes.length + 1];

 for (int i = 0; i < argTypes.length; i++)
 {
 final Class<?> argType = argTypes[i];
 final String arg = args[i];
 final Player p = (sender instanceof Player player) ? player : null;

 if (argType.equals(String.class))
 {
 if (i == argTypes.length - 1)
 {
 final String[] reasonArgs = Arrays.copyOfRange(args, i, args.length - 1);
 final String reason = String.join(" ", reasonArgs);
 objects[i] = reason;
 }
 else
 {
 continue;
 }
 }
 final Object[] objects = new Object[argTypes.length + 1];

 if (argType.equals(Location.class))
 {
 final String[] locationArgs = Arrays.copyOfRange(args, i, i + 3);
 final String location = String.join(" ", locationArgs);
 objects[i] = location;
 }
 parseArguments(args, provider, argTypes, objects);

 final Object obj = provider.fromString(arg, argType);
 if (obj == null)
 {
 FNS4J.getLogger("Datura")
 .error("Failed to parse argument " + arg + " for type " + argType.getName());
 return;
 }
 objects[i] = obj;
 }
 try
 {
 if (noConsole)
 {
 command.getSubcommands()
 .get(node)
 .invoke(command, (Player) sender, objects);
 .invoke(command, p, objects);
 }
 else
 {
Expand All@@ -215,11 +185,55 @@ private void processSubCommands(final @NotNull String @NotNull [] args,
 }
 }

 private void parseArguments(@NotNull String @NotNull [] args,
 ContextProvider provider,
 Class<?>[] argTypes,
 Object[] objects)
 {
 for (int i = 0; i < argTypes.length; i++)
 {
 final Class<?> argType = argTypes[i];
 String arg = args[i];

 boolean wasResolved = false;

 if (argType.equals(String.class) && (i == argTypes.length - 1))
 {
 final String[] reasonArgs = Arrays.copyOfRange(args, i, args.length - 1);
 final String reason = String.join(" ", reasonArgs);
 objects[i] = reason;
 wasResolved = true;
 }

 if (argType.equals(Location.class))
 {
 final String[] locationArgs = Arrays.copyOfRange(args, i, i + 3);
 arg = String.join(" ", locationArgs);
 }

 if (!wasResolved)
 {
 final Optional<?> obj = provider.fromString(arg, argType);
 if (obj.isEmpty())
 {
 FNS4J.getLogger("Datura")
 .error("Failed to parse argument " + arg + " for type " + argType.getName());
 continue;
 }
 objects[i] = obj.get();
 }
 }
 }

 @Override
 public List<String> tabComplete(final CommandSender sender, final String alias, final String[] args)
 public @NotNull List<String> tabComplete(final @NotNull CommandSender sender, final @NotNull String alias,
 final String[] args)
 {
 final Set<Completion> completions = command.getCompletions();
 final List<String> results = new ArrayList<>();
 final Set<Completion> completions = command.getCompletions();

 if (completions == null || completions.isEmpty())
 return results;

 if (args.length == 0)
 {
Expand Down

3 changes: 2 additions & 1 deletion
Patchwork/src/main/java/fns/patchwork/config/Configuration.java

View file


Open in desktop

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

import fns.patchwork.provider.Context;
import fns.patchwork.provider.ContextProvider;
import java.util.Collection;
import org.jetbrains.annotations.Unmodifiable;

import java.io.File;
Expand DownExpand Up@@ -87,7 +88,7 @@ public interface Configuration
 * @param clazz The class of the type.
 * @return The List object.
 */
 <T> @Unmodifiable List<T> getList(String path, Class<T> clazz);
 <T> @Unmodifiable Collection<T> getCollection(String path, Class<T> clazz);

 /**
 * Gets a List object from the associated path. The List that is returned will be the String values which are stored
Expand Down
Loading