Skip to content

TCPShield v2.5 - #38

Closed
paulzhng wants to merge 15 commits into
masterfrom
v2.5
Closed

TCPShield v2.5 #38
paulzhng wants to merge 15 commits into
masterfrom
v2.5

Conversation

@paulzhng

@paulzhngpaulzhng commented Feb 27, 2021

Copy link
Copy Markdown
Contributor

This PR adds support for Geyser, Fabric and Paper without ProtocolLib and removes the illegal access message in some cases.

Geyser

Geyser support only targets Floodgate 2.0 (still in beta).
Huge, huge thanks to the whole GeyserMC team and specifically Tim203 for their incredible support on this journey.

Native Paper

Native paper support depends on a PR only merged recently so it only supports Paper 1.16 build #503 or higher.

Illegal Access

The illegal access message is removed in cases where it isn't needed. The final field is now queried lazily (when it's needed).

Fabric

see #40

@paulzhng
paulzhng requested a review from a userFebruary 27, 2021 15:14
@paulzhngpaulzhng mentioned this pull request Mar 9, 2021
@paulzhng

Copy link
Copy Markdown
ContributorAuthor

Pending until Floodgate 2.0 is released

@Prof-Bloodstone

Copy link
Copy Markdown

Hey,
I know this will be fixed when you officially release it, but for other folks who might decide to run this before it's released (for example because of dropped dependency on ProtocolLib on Paper):.

  1. The paper-api dependency version doesn't exist anymore, should just pin yourself to latest snapshot.
  2. You are missing repositories for floodgate - they are available at https://repo.opencollab.dev/maven-{releases,snapshots}
  3. The floodgate dependency has wrong group and package - should be org.geysermc.floodgate:spigot

Patch which takes it all together and makes it compileable on current floodgate snapshot:

diff --git a/build.gradle b/build.gradle
index be900c4..423b3ac 100644
--- a/build.gradle+++ b/build.gradle@@ -44,6 +44,12 @@ repositories {
maven {
url = 'https://maven.fabricmc.net/'
}
+ maven {+ url = 'https://repo.opencollab.dev/maven-snapshots'+ }+ maven {+ url = 'https://repo.opencollab.dev/maven-releases'+ }
flatDir {
dirs '/libs'
}
@@ -55,7 +61,7 @@ dependencies {
compileOnly group: 'com.comphenix.protocol', name: 'ProtocolLib', version: '4.4.0'
// Paper
- compileOnly group: 'com.destroystokyo.paper', name: 'paper-api', version: '1.16.5-R0.1-20210227.144841-85'+ compileOnly group: 'com.destroystokyo.paper', name: 'paper-api', version: '1.16.5-R0.1-SNAPSHOT'
// BungeeCord
compileOnly group: 'net.md-5', name: 'bungeecord-api', version: '1.14-SNAPSHOT'
@@ -72,7 +78,7 @@ dependencies {
testImplementation group: 'org.junit.jupiter', name: 'junit-jupiter-api', version: '5.7.0-M1'
testRuntimeOnly group: 'org.junit.jupiter', name: 'junit-jupiter-engine', version: '5.7.0-M1'
- compileOnly 'org.geyser:floodgate-spigot:2.0'+ compileOnly 'org.geysermc.floodgate:spigot:2.0-SNAPSHOT'
}
test {
@@ -167,4 +173,4 @@ void updateJson() {
}
}
-build.dependsOn updateVersion
\ No newline at end of file
+build.dependsOn updateVersion


return new ConfigData(onlyAllowProxyConnections, debugMode);
} catch (Exception e) {
throw new TCPShieldInitializationException("Couldn't load config in config/tclshield.yml!");

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Typo tclshield - could probably use path extracted from configLocation

@Camotoy

Copy link
Copy Markdown

Floodgate can just reference the API module api; using the Spigot dependency is unnecessary here.

@DylanKeir
DylanKeir requested review from DylanKeir and removed request for a userAugust 27, 2021 06:23
@DylanKeirDylanKeir self-assigned this Aug 27, 2021
@TCPShieldTCPShield deleted a comment from DylanKeirAug 27, 2021
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants

@paulzhng@Prof-Bloodstone@Camotoy@DylanKeir@Draylar
, '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" + '
TCPShield v2.5 by paulzhng · Pull Request #38 · TCPShield/RealIP · GitHub
Skip to content

TCPShield v2.5 - #38

Closed
paulzhng wants to merge 15 commits into
masterfrom
v2.5
Closed

TCPShield v2.5 #38
paulzhng wants to merge 15 commits into
masterfrom
v2.5

Conversation

@paulzhng

@paulzhngpaulzhng commented Feb 27, 2021

Copy link
Copy Markdown
Contributor

This PR adds support for Geyser, Fabric and Paper without ProtocolLib and removes the illegal access message in some cases.

Geyser

Geyser support only targets Floodgate 2.0 (still in beta).
Huge, huge thanks to the whole GeyserMC team and specifically Tim203 for their incredible support on this journey.

Native Paper

Native paper support depends on a PR only merged recently so it only supports Paper 1.16 build #503 or higher.

Illegal Access

The illegal access message is removed in cases where it isn't needed. The final field is now queried lazily (when it's needed).

Fabric

see #40

@paulzhng
paulzhng requested a review from a userFebruary 27, 2021 15:14
@paulzhngpaulzhng mentioned this pull request Mar 9, 2021
@paulzhng

Copy link
Copy Markdown
ContributorAuthor

Pending until Floodgate 2.0 is released

@Prof-Bloodstone

Copy link
Copy Markdown

Hey,
I know this will be fixed when you officially release it, but for other folks who might decide to run this before it's released (for example because of dropped dependency on ProtocolLib on Paper):.

  1. The paper-api dependency version doesn't exist anymore, should just pin yourself to latest snapshot.
  2. You are missing repositories for floodgate - they are available at https://repo.opencollab.dev/maven-{releases,snapshots}
  3. The floodgate dependency has wrong group and package - should be org.geysermc.floodgate:spigot

Patch which takes it all together and makes it compileable on current floodgate snapshot:

diff --git a/build.gradle b/build.gradle
index be900c4..423b3ac 100644
--- a/build.gradle+++ b/build.gradle@@ -44,6 +44,12 @@ repositories {
maven {
url = 'https://maven.fabricmc.net/'
}
+ maven {+ url = 'https://repo.opencollab.dev/maven-snapshots'+ }+ maven {+ url = 'https://repo.opencollab.dev/maven-releases'+ }
flatDir {
dirs '/libs'
}
@@ -55,7 +61,7 @@ dependencies {
compileOnly group: 'com.comphenix.protocol', name: 'ProtocolLib', version: '4.4.0'
// Paper
- compileOnly group: 'com.destroystokyo.paper', name: 'paper-api', version: '1.16.5-R0.1-20210227.144841-85'+ compileOnly group: 'com.destroystokyo.paper', name: 'paper-api', version: '1.16.5-R0.1-SNAPSHOT'
// BungeeCord
compileOnly group: 'net.md-5', name: 'bungeecord-api', version: '1.14-SNAPSHOT'
@@ -72,7 +78,7 @@ dependencies {
testImplementation group: 'org.junit.jupiter', name: 'junit-jupiter-api', version: '5.7.0-M1'
testRuntimeOnly group: 'org.junit.jupiter', name: 'junit-jupiter-engine', version: '5.7.0-M1'
- compileOnly 'org.geyser:floodgate-spigot:2.0'+ compileOnly 'org.geysermc.floodgate:spigot:2.0-SNAPSHOT'
}
test {
@@ -167,4 +173,4 @@ void updateJson() {
}
}
-build.dependsOn updateVersion
\ No newline at end of file
+build.dependsOn updateVersion


return new ConfigData(onlyAllowProxyConnections, debugMode);
} catch (Exception e) {
throw new TCPShieldInitializationException("Couldn't load config in config/tclshield.yml!");

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Typo tclshield - could probably use path extracted from configLocation

@Camotoy

Copy link
Copy Markdown

Floodgate can just reference the API module api; using the Spigot dependency is unnecessary here.

@DylanKeir
DylanKeir requested review from DylanKeir and removed request for a userAugust 27, 2021 06:23
@DylanKeirDylanKeir self-assigned this Aug 27, 2021
@TCPShieldTCPShield deleted a comment from DylanKeirAug 27, 2021
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants

@paulzhng@Prof-Bloodstone@Camotoy@DylanKeir@Draylar
, '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('^' + ".*" + ' TCPShield v2.5 by paulzhng · Pull Request #38 · TCPShield/RealIP · GitHub
Skip to content

TCPShield v2.5 - #38

Closed
paulzhng wants to merge 15 commits into
masterfrom
v2.5
Closed

TCPShield v2.5 #38
paulzhng wants to merge 15 commits into
masterfrom
v2.5

Conversation

@paulzhng

@paulzhngpaulzhng commented Feb 27, 2021

Copy link
Copy Markdown
Contributor

This PR adds support for Geyser, Fabric and Paper without ProtocolLib and removes the illegal access message in some cases.

Geyser

Geyser support only targets Floodgate 2.0 (still in beta).
Huge, huge thanks to the whole GeyserMC team and specifically Tim203 for their incredible support on this journey.

Native Paper

Native paper support depends on a PR only merged recently so it only supports Paper 1.16 build #503 or higher.

Illegal Access

The illegal access message is removed in cases where it isn't needed. The final field is now queried lazily (when it's needed).

Fabric

see #40

@paulzhng
paulzhng requested a review from a userFebruary 27, 2021 15:14
@paulzhngpaulzhng mentioned this pull request Mar 9, 2021
@paulzhng

Copy link
Copy Markdown
ContributorAuthor

Pending until Floodgate 2.0 is released

@Prof-Bloodstone

Copy link
Copy Markdown

Hey,
I know this will be fixed when you officially release it, but for other folks who might decide to run this before it's released (for example because of dropped dependency on ProtocolLib on Paper):.

  1. The paper-api dependency version doesn't exist anymore, should just pin yourself to latest snapshot.
  2. You are missing repositories for floodgate - they are available at https://repo.opencollab.dev/maven-{releases,snapshots}
  3. The floodgate dependency has wrong group and package - should be org.geysermc.floodgate:spigot

Patch which takes it all together and makes it compileable on current floodgate snapshot:

diff --git a/build.gradle b/build.gradle
index be900c4..423b3ac 100644
--- a/build.gradle+++ b/build.gradle@@ -44,6 +44,12 @@ repositories {
maven {
url = 'https://maven.fabricmc.net/'
}
+ maven {+ url = 'https://repo.opencollab.dev/maven-snapshots'+ }+ maven {+ url = 'https://repo.opencollab.dev/maven-releases'+ }
flatDir {
dirs '/libs'
}
@@ -55,7 +61,7 @@ dependencies {
compileOnly group: 'com.comphenix.protocol', name: 'ProtocolLib', version: '4.4.0'
// Paper
- compileOnly group: 'com.destroystokyo.paper', name: 'paper-api', version: '1.16.5-R0.1-20210227.144841-85'+ compileOnly group: 'com.destroystokyo.paper', name: 'paper-api', version: '1.16.5-R0.1-SNAPSHOT'
// BungeeCord
compileOnly group: 'net.md-5', name: 'bungeecord-api', version: '1.14-SNAPSHOT'
@@ -72,7 +78,7 @@ dependencies {
testImplementation group: 'org.junit.jupiter', name: 'junit-jupiter-api', version: '5.7.0-M1'
testRuntimeOnly group: 'org.junit.jupiter', name: 'junit-jupiter-engine', version: '5.7.0-M1'
- compileOnly 'org.geyser:floodgate-spigot:2.0'+ compileOnly 'org.geysermc.floodgate:spigot:2.0-SNAPSHOT'
}
test {
@@ -167,4 +173,4 @@ void updateJson() {
}
}
-build.dependsOn updateVersion
\ No newline at end of file
+build.dependsOn updateVersion


return new ConfigData(onlyAllowProxyConnections, debugMode);
} catch (Exception e) {
throw new TCPShieldInitializationException("Couldn't load config in config/tclshield.yml!");

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Typo tclshield - could probably use path extracted from configLocation

@Camotoy

Copy link
Copy Markdown

Floodgate can just reference the API module api; using the Spigot dependency is unnecessary here.

@DylanKeir
DylanKeir requested review from DylanKeir and removed request for a userAugust 27, 2021 06:23
@DylanKeirDylanKeir self-assigned this Aug 27, 2021
@TCPShieldTCPShield deleted a comment from DylanKeirAug 27, 2021
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants

@paulzhng@Prof-Bloodstone@Camotoy@DylanKeir@Draylar
, '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('^' + ".*" + ' TCPShield v2.5 by paulzhng · Pull Request #38 · TCPShield/RealIP · GitHub
Skip to content

TCPShield v2.5 - #38

Closed
paulzhng wants to merge 15 commits into
masterfrom
v2.5
Closed

TCPShield v2.5 #38
paulzhng wants to merge 15 commits into
masterfrom
v2.5

Conversation

@paulzhng

@paulzhngpaulzhng commented Feb 27, 2021

Copy link
Copy Markdown
Contributor

This PR adds support for Geyser, Fabric and Paper without ProtocolLib and removes the illegal access message in some cases.

Geyser

Geyser support only targets Floodgate 2.0 (still in beta).
Huge, huge thanks to the whole GeyserMC team and specifically Tim203 for their incredible support on this journey.

Native Paper

Native paper support depends on a PR only merged recently so it only supports Paper 1.16 build #503 or higher.

Illegal Access

The illegal access message is removed in cases where it isn't needed. The final field is now queried lazily (when it's needed).

Fabric

see #40

@paulzhng
paulzhng requested a review from a userFebruary 27, 2021 15:14
@paulzhngpaulzhng mentioned this pull request Mar 9, 2021
@paulzhng

Copy link
Copy Markdown
ContributorAuthor

Pending until Floodgate 2.0 is released

@Prof-Bloodstone

Copy link
Copy Markdown

Hey,
I know this will be fixed when you officially release it, but for other folks who might decide to run this before it's released (for example because of dropped dependency on ProtocolLib on Paper):.

  1. The paper-api dependency version doesn't exist anymore, should just pin yourself to latest snapshot.
  2. You are missing repositories for floodgate - they are available at https://repo.opencollab.dev/maven-{releases,snapshots}
  3. The floodgate dependency has wrong group and package - should be org.geysermc.floodgate:spigot

Patch which takes it all together and makes it compileable on current floodgate snapshot:

diff --git a/build.gradle b/build.gradle
index be900c4..423b3ac 100644
--- a/build.gradle+++ b/build.gradle@@ -44,6 +44,12 @@ repositories {
maven {
url = 'https://maven.fabricmc.net/'
}
+ maven {+ url = 'https://repo.opencollab.dev/maven-snapshots'+ }+ maven {+ url = 'https://repo.opencollab.dev/maven-releases'+ }
flatDir {
dirs '/libs'
}
@@ -55,7 +61,7 @@ dependencies {
compileOnly group: 'com.comphenix.protocol', name: 'ProtocolLib', version: '4.4.0'
// Paper
- compileOnly group: 'com.destroystokyo.paper', name: 'paper-api', version: '1.16.5-R0.1-20210227.144841-85'+ compileOnly group: 'com.destroystokyo.paper', name: 'paper-api', version: '1.16.5-R0.1-SNAPSHOT'
// BungeeCord
compileOnly group: 'net.md-5', name: 'bungeecord-api', version: '1.14-SNAPSHOT'
@@ -72,7 +78,7 @@ dependencies {
testImplementation group: 'org.junit.jupiter', name: 'junit-jupiter-api', version: '5.7.0-M1'
testRuntimeOnly group: 'org.junit.jupiter', name: 'junit-jupiter-engine', version: '5.7.0-M1'
- compileOnly 'org.geyser:floodgate-spigot:2.0'+ compileOnly 'org.geysermc.floodgate:spigot:2.0-SNAPSHOT'
}
test {
@@ -167,4 +173,4 @@ void updateJson() {
}
}
-build.dependsOn updateVersion
\ No newline at end of file
+build.dependsOn updateVersion


return new ConfigData(onlyAllowProxyConnections, debugMode);
} catch (Exception e) {
throw new TCPShieldInitializationException("Couldn't load config in config/tclshield.yml!");

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Typo tclshield - could probably use path extracted from configLocation

@Camotoy

Copy link
Copy Markdown

Floodgate can just reference the API module api; using the Spigot dependency is unnecessary here.

@DylanKeir
DylanKeir requested review from DylanKeir and removed request for a userAugust 27, 2021 06:23
@DylanKeirDylanKeir self-assigned this Aug 27, 2021
@TCPShieldTCPShield deleted a comment from DylanKeirAug 27, 2021
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants

@paulzhng@Prof-Bloodstone@Camotoy@DylanKeir@Draylar
, '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" + ' TCPShield v2.5 by paulzhng · Pull Request #38 · TCPShield/RealIP · GitHub
Skip to content

TCPShield v2.5 - #38

Closed
paulzhng wants to merge 15 commits into
masterfrom
v2.5
Closed

TCPShield v2.5 #38
paulzhng wants to merge 15 commits into
masterfrom
v2.5

Conversation

@paulzhng

@paulzhngpaulzhng commented Feb 27, 2021

Copy link
Copy Markdown
Contributor

This PR adds support for Geyser, Fabric and Paper without ProtocolLib and removes the illegal access message in some cases.

Geyser

Geyser support only targets Floodgate 2.0 (still in beta).
Huge, huge thanks to the whole GeyserMC team and specifically Tim203 for their incredible support on this journey.

Native Paper

Native paper support depends on a PR only merged recently so it only supports Paper 1.16 build #503 or higher.

Illegal Access

The illegal access message is removed in cases where it isn't needed. The final field is now queried lazily (when it's needed).

Fabric

see #40

@paulzhng
paulzhng requested a review from a userFebruary 27, 2021 15:14
@paulzhngpaulzhng mentioned this pull request Mar 9, 2021
@paulzhng

Copy link
Copy Markdown
ContributorAuthor

Pending until Floodgate 2.0 is released

@Prof-Bloodstone

Copy link
Copy Markdown

Hey,
I know this will be fixed when you officially release it, but for other folks who might decide to run this before it's released (for example because of dropped dependency on ProtocolLib on Paper):.

  1. The paper-api dependency version doesn't exist anymore, should just pin yourself to latest snapshot.
  2. You are missing repositories for floodgate - they are available at https://repo.opencollab.dev/maven-{releases,snapshots}
  3. The floodgate dependency has wrong group and package - should be org.geysermc.floodgate:spigot

Patch which takes it all together and makes it compileable on current floodgate snapshot:

diff --git a/build.gradle b/build.gradle
index be900c4..423b3ac 100644
--- a/build.gradle+++ b/build.gradle@@ -44,6 +44,12 @@ repositories {
maven {
url = 'https://maven.fabricmc.net/'
}
+ maven {+ url = 'https://repo.opencollab.dev/maven-snapshots'+ }+ maven {+ url = 'https://repo.opencollab.dev/maven-releases'+ }
flatDir {
dirs '/libs'
}
@@ -55,7 +61,7 @@ dependencies {
compileOnly group: 'com.comphenix.protocol', name: 'ProtocolLib', version: '4.4.0'
// Paper
- compileOnly group: 'com.destroystokyo.paper', name: 'paper-api', version: '1.16.5-R0.1-20210227.144841-85'+ compileOnly group: 'com.destroystokyo.paper', name: 'paper-api', version: '1.16.5-R0.1-SNAPSHOT'
// BungeeCord
compileOnly group: 'net.md-5', name: 'bungeecord-api', version: '1.14-SNAPSHOT'
@@ -72,7 +78,7 @@ dependencies {
testImplementation group: 'org.junit.jupiter', name: 'junit-jupiter-api', version: '5.7.0-M1'
testRuntimeOnly group: 'org.junit.jupiter', name: 'junit-jupiter-engine', version: '5.7.0-M1'
- compileOnly 'org.geyser:floodgate-spigot:2.0'+ compileOnly 'org.geysermc.floodgate:spigot:2.0-SNAPSHOT'
}
test {
@@ -167,4 +173,4 @@ void updateJson() {
}
}
-build.dependsOn updateVersion
\ No newline at end of file
+build.dependsOn updateVersion


return new ConfigData(onlyAllowProxyConnections, debugMode);
} catch (Exception e) {
throw new TCPShieldInitializationException("Couldn't load config in config/tclshield.yml!");

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Typo tclshield - could probably use path extracted from configLocation

@Camotoy

Copy link
Copy Markdown

Floodgate can just reference the API module api; using the Spigot dependency is unnecessary here.

@DylanKeir
DylanKeir requested review from DylanKeir and removed request for a userAugust 27, 2021 06:23
@DylanKeirDylanKeir self-assigned this Aug 27, 2021
@TCPShieldTCPShield deleted a comment from DylanKeirAug 27, 2021
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants

@paulzhng@Prof-Bloodstone@Camotoy@DylanKeir@Draylar
, '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('^' + ".*" + ' TCPShield v2.5 by paulzhng · Pull Request #38 · TCPShield/RealIP · GitHub
Skip to content

TCPShield v2.5 - #38

Closed
paulzhng wants to merge 15 commits into
masterfrom
v2.5
Closed

TCPShield v2.5 #38
paulzhng wants to merge 15 commits into
masterfrom
v2.5

Conversation

@paulzhng

@paulzhngpaulzhng commented Feb 27, 2021

Copy link
Copy Markdown
Contributor

This PR adds support for Geyser, Fabric and Paper without ProtocolLib and removes the illegal access message in some cases.

Geyser

Geyser support only targets Floodgate 2.0 (still in beta).
Huge, huge thanks to the whole GeyserMC team and specifically Tim203 for their incredible support on this journey.

Native Paper

Native paper support depends on a PR only merged recently so it only supports Paper 1.16 build #503 or higher.

Illegal Access

The illegal access message is removed in cases where it isn't needed. The final field is now queried lazily (when it's needed).

Fabric

see #40

@paulzhng
paulzhng requested a review from a userFebruary 27, 2021 15:14
@paulzhngpaulzhng mentioned this pull request Mar 9, 2021
@paulzhng

Copy link
Copy Markdown
ContributorAuthor

Pending until Floodgate 2.0 is released

@Prof-Bloodstone

Copy link
Copy Markdown

Hey,
I know this will be fixed when you officially release it, but for other folks who might decide to run this before it's released (for example because of dropped dependency on ProtocolLib on Paper):.

  1. The paper-api dependency version doesn't exist anymore, should just pin yourself to latest snapshot.
  2. You are missing repositories for floodgate - they are available at https://repo.opencollab.dev/maven-{releases,snapshots}
  3. The floodgate dependency has wrong group and package - should be org.geysermc.floodgate:spigot

Patch which takes it all together and makes it compileable on current floodgate snapshot:

diff --git a/build.gradle b/build.gradle
index be900c4..423b3ac 100644
--- a/build.gradle+++ b/build.gradle@@ -44,6 +44,12 @@ repositories {
maven {
url = 'https://maven.fabricmc.net/'
}
+ maven {+ url = 'https://repo.opencollab.dev/maven-snapshots'+ }+ maven {+ url = 'https://repo.opencollab.dev/maven-releases'+ }
flatDir {
dirs '/libs'
}
@@ -55,7 +61,7 @@ dependencies {
compileOnly group: 'com.comphenix.protocol', name: 'ProtocolLib', version: '4.4.0'
// Paper
- compileOnly group: 'com.destroystokyo.paper', name: 'paper-api', version: '1.16.5-R0.1-20210227.144841-85'+ compileOnly group: 'com.destroystokyo.paper', name: 'paper-api', version: '1.16.5-R0.1-SNAPSHOT'
// BungeeCord
compileOnly group: 'net.md-5', name: 'bungeecord-api', version: '1.14-SNAPSHOT'
@@ -72,7 +78,7 @@ dependencies {
testImplementation group: 'org.junit.jupiter', name: 'junit-jupiter-api', version: '5.7.0-M1'
testRuntimeOnly group: 'org.junit.jupiter', name: 'junit-jupiter-engine', version: '5.7.0-M1'
- compileOnly 'org.geyser:floodgate-spigot:2.0'+ compileOnly 'org.geysermc.floodgate:spigot:2.0-SNAPSHOT'
}
test {
@@ -167,4 +173,4 @@ void updateJson() {
}
}
-build.dependsOn updateVersion
\ No newline at end of file
+build.dependsOn updateVersion


return new ConfigData(onlyAllowProxyConnections, debugMode);
} catch (Exception e) {
throw new TCPShieldInitializationException("Couldn't load config in config/tclshield.yml!");

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Typo tclshield - could probably use path extracted from configLocation

@Camotoy

Copy link
Copy Markdown

Floodgate can just reference the API module api; using the Spigot dependency is unnecessary here.

@DylanKeir
DylanKeir requested review from DylanKeir and removed request for a userAugust 27, 2021 06:23
@DylanKeirDylanKeir self-assigned this Aug 27, 2021
@TCPShieldTCPShield deleted a comment from DylanKeirAug 27, 2021
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants

@paulzhng@Prof-Bloodstone@Camotoy@DylanKeir@Draylar
, '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('^' + ".*" + ' TCPShield v2.5 by paulzhng · Pull Request #38 · TCPShield/RealIP · GitHub
Skip to content

TCPShield v2.5 - #38

Closed
paulzhng wants to merge 15 commits into
masterfrom
v2.5
Closed

TCPShield v2.5 #38
paulzhng wants to merge 15 commits into
masterfrom
v2.5

Conversation

@paulzhng

@paulzhngpaulzhng commented Feb 27, 2021

Copy link
Copy Markdown
Contributor

This PR adds support for Geyser, Fabric and Paper without ProtocolLib and removes the illegal access message in some cases.

Geyser

Geyser support only targets Floodgate 2.0 (still in beta).
Huge, huge thanks to the whole GeyserMC team and specifically Tim203 for their incredible support on this journey.

Native Paper

Native paper support depends on a PR only merged recently so it only supports Paper 1.16 build #503 or higher.

Illegal Access

The illegal access message is removed in cases where it isn't needed. The final field is now queried lazily (when it's needed).

Fabric

see #40

@paulzhng
paulzhng requested a review from a userFebruary 27, 2021 15:14
@paulzhngpaulzhng mentioned this pull request Mar 9, 2021
@paulzhng

Copy link
Copy Markdown
ContributorAuthor

Pending until Floodgate 2.0 is released

@Prof-Bloodstone

Copy link
Copy Markdown

Hey,
I know this will be fixed when you officially release it, but for other folks who might decide to run this before it's released (for example because of dropped dependency on ProtocolLib on Paper):.

  1. The paper-api dependency version doesn't exist anymore, should just pin yourself to latest snapshot.
  2. You are missing repositories for floodgate - they are available at https://repo.opencollab.dev/maven-{releases,snapshots}
  3. The floodgate dependency has wrong group and package - should be org.geysermc.floodgate:spigot

Patch which takes it all together and makes it compileable on current floodgate snapshot:

diff --git a/build.gradle b/build.gradle
index be900c4..423b3ac 100644
--- a/build.gradle+++ b/build.gradle@@ -44,6 +44,12 @@ repositories {
maven {
url = 'https://maven.fabricmc.net/'
}
+ maven {+ url = 'https://repo.opencollab.dev/maven-snapshots'+ }+ maven {+ url = 'https://repo.opencollab.dev/maven-releases'+ }
flatDir {
dirs '/libs'
}
@@ -55,7 +61,7 @@ dependencies {
compileOnly group: 'com.comphenix.protocol', name: 'ProtocolLib', version: '4.4.0'
// Paper
- compileOnly group: 'com.destroystokyo.paper', name: 'paper-api', version: '1.16.5-R0.1-20210227.144841-85'+ compileOnly group: 'com.destroystokyo.paper', name: 'paper-api', version: '1.16.5-R0.1-SNAPSHOT'
// BungeeCord
compileOnly group: 'net.md-5', name: 'bungeecord-api', version: '1.14-SNAPSHOT'
@@ -72,7 +78,7 @@ dependencies {
testImplementation group: 'org.junit.jupiter', name: 'junit-jupiter-api', version: '5.7.0-M1'
testRuntimeOnly group: 'org.junit.jupiter', name: 'junit-jupiter-engine', version: '5.7.0-M1'
- compileOnly 'org.geyser:floodgate-spigot:2.0'+ compileOnly 'org.geysermc.floodgate:spigot:2.0-SNAPSHOT'
}
test {
@@ -167,4 +173,4 @@ void updateJson() {
}
}
-build.dependsOn updateVersion
\ No newline at end of file
+build.dependsOn updateVersion


return new ConfigData(onlyAllowProxyConnections, debugMode);
} catch (Exception e) {
throw new TCPShieldInitializationException("Couldn't load config in config/tclshield.yml!");

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Typo tclshield - could probably use path extracted from configLocation

@Camotoy

Copy link
Copy Markdown

Floodgate can just reference the API module api; using the Spigot dependency is unnecessary here.

@DylanKeir
DylanKeir requested review from DylanKeir and removed request for a userAugust 27, 2021 06:23
@DylanKeirDylanKeir self-assigned this Aug 27, 2021
@TCPShieldTCPShield deleted a comment from DylanKeirAug 27, 2021
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants

@paulzhng@Prof-Bloodstone@Camotoy@DylanKeir@Draylar
, '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); } })(); })(); TCPShield v2.5 by paulzhng · Pull Request #38 · TCPShield/RealIP · GitHub
Skip to content

TCPShield v2.5 - #38

Closed
paulzhng wants to merge 15 commits into
masterfrom
v2.5
Closed

TCPShield v2.5 #38
paulzhng wants to merge 15 commits into
masterfrom
v2.5

Conversation

@paulzhng

@paulzhngpaulzhng commented Feb 27, 2021

Copy link
Copy Markdown
Contributor

This PR adds support for Geyser, Fabric and Paper without ProtocolLib and removes the illegal access message in some cases.

Geyser

Geyser support only targets Floodgate 2.0 (still in beta).
Huge, huge thanks to the whole GeyserMC team and specifically Tim203 for their incredible support on this journey.

Native Paper

Native paper support depends on a PR only merged recently so it only supports Paper 1.16 build #503 or higher.

Illegal Access

The illegal access message is removed in cases where it isn't needed. The final field is now queried lazily (when it's needed).

Fabric

see #40

@paulzhng
paulzhng requested a review from a userFebruary 27, 2021 15:14
@paulzhngpaulzhng mentioned this pull request Mar 9, 2021
@paulzhng

Copy link
Copy Markdown
ContributorAuthor

Pending until Floodgate 2.0 is released

@Prof-Bloodstone

Copy link
Copy Markdown

Hey,
I know this will be fixed when you officially release it, but for other folks who might decide to run this before it's released (for example because of dropped dependency on ProtocolLib on Paper):.

  1. The paper-api dependency version doesn't exist anymore, should just pin yourself to latest snapshot.
  2. You are missing repositories for floodgate - they are available at https://repo.opencollab.dev/maven-{releases,snapshots}
  3. The floodgate dependency has wrong group and package - should be org.geysermc.floodgate:spigot

Patch which takes it all together and makes it compileable on current floodgate snapshot:

diff --git a/build.gradle b/build.gradle
index be900c4..423b3ac 100644
--- a/build.gradle+++ b/build.gradle@@ -44,6 +44,12 @@ repositories {
maven {
url = 'https://maven.fabricmc.net/'
}
+ maven {+ url = 'https://repo.opencollab.dev/maven-snapshots'+ }+ maven {+ url = 'https://repo.opencollab.dev/maven-releases'+ }
flatDir {
dirs '/libs'
}
@@ -55,7 +61,7 @@ dependencies {
compileOnly group: 'com.comphenix.protocol', name: 'ProtocolLib', version: '4.4.0'
// Paper
- compileOnly group: 'com.destroystokyo.paper', name: 'paper-api', version: '1.16.5-R0.1-20210227.144841-85'+ compileOnly group: 'com.destroystokyo.paper', name: 'paper-api', version: '1.16.5-R0.1-SNAPSHOT'
// BungeeCord
compileOnly group: 'net.md-5', name: 'bungeecord-api', version: '1.14-SNAPSHOT'
@@ -72,7 +78,7 @@ dependencies {
testImplementation group: 'org.junit.jupiter', name: 'junit-jupiter-api', version: '5.7.0-M1'
testRuntimeOnly group: 'org.junit.jupiter', name: 'junit-jupiter-engine', version: '5.7.0-M1'
- compileOnly 'org.geyser:floodgate-spigot:2.0'+ compileOnly 'org.geysermc.floodgate:spigot:2.0-SNAPSHOT'
}
test {
@@ -167,4 +173,4 @@ void updateJson() {
}
}
-build.dependsOn updateVersion
\ No newline at end of file
+build.dependsOn updateVersion


return new ConfigData(onlyAllowProxyConnections, debugMode);
} catch (Exception e) {
throw new TCPShieldInitializationException("Couldn't load config in config/tclshield.yml!");

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Typo tclshield - could probably use path extracted from configLocation

@Camotoy

Copy link
Copy Markdown

Floodgate can just reference the API module api; using the Spigot dependency is unnecessary here.

@DylanKeir
DylanKeir requested review from DylanKeir and removed request for a userAugust 27, 2021 06:23
@DylanKeirDylanKeir self-assigned this Aug 27, 2021
@TCPShieldTCPShield deleted a comment from DylanKeirAug 27, 2021
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants

@paulzhng@Prof-Bloodstone@Camotoy@DylanKeir@Draylar