This commit is contained in:
creeper123123321 2021-05-14 07:13:49 -03:00
parent 80a71e5cd3
commit 64083ea4f3
5 changed files with 31 additions and 23 deletions

View File

@ -1,3 +1,4 @@
import com.googlecode.htmlcompressor.compressor.HtmlCompressor
import org.gradlewebtools.minify.minifier.js.JSMinifierOptions import org.gradlewebtools.minify.minifier.js.JSMinifierOptions
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
import java.nio.file.Files as JFiles import java.nio.file.Files as JFiles
@ -7,8 +8,6 @@ buildscript {
dependencies { classpath("com.github.hazendaz:htmlcompressor:1.7.1") } dependencies { classpath("com.github.hazendaz:htmlcompressor:1.7.1") }
} }
import com.googlecode.htmlcompressor.compressor.HtmlCompressor
plugins { plugins {
`java-library` `java-library`
application application
@ -58,8 +57,8 @@ repositories {
dependencies { dependencies {
implementation(kotlin("stdlib-jdk8")) implementation(kotlin("stdlib-jdk8"))
implementation("com.viaversion:viaversion:4.0.0-21w19a") { isTransitive = false } implementation("com.viaversion:viaversion:4.0.0-21w19a-SNAPSHOT") { isTransitive = false }
implementation("com.viaversion:viabackwards:4.0.0-21w19a") { isTransitive = false } implementation("com.viaversion:viabackwards:4.0.0-21w19a-SNAPSHOT") { isTransitive = false }
implementation("com.github.ViaVersion.ViaRewind:viarewind-all:dev-SNAPSHOT") { isTransitive = false } implementation("com.github.ViaVersion.ViaRewind:viarewind-all:dev-SNAPSHOT") { isTransitive = false }
implementation("com.google.guava:guava:30.1.1-jre") implementation("com.google.guava:guava:30.1.1-jre")
implementation("io.netty:netty-all:4.1.63.Final") implementation("io.netty:netty-all:4.1.63.Final")

View File

@ -2,7 +2,6 @@ package com.viaversion.aas
import com.viaversion.aas.util.StacklessException import com.viaversion.aas.util.StacklessException
import com.viaversion.viaversion.api.protocol.version.ProtocolVersion import com.viaversion.viaversion.api.protocol.version.ProtocolVersion
import java.util.*
class VIAaaSAddress { class VIAaaSAddress {
var serverAddress: String? = null var serverAddress: String? = null

View File

@ -4,7 +4,7 @@ import com.viaversion.viaversion.api.minecraft.BlockChangeRecord1_8
import com.viaversion.viaversion.api.protocol.packet.PacketWrapper import com.viaversion.viaversion.api.protocol.packet.PacketWrapper
import com.viaversion.viaversion.api.type.Type import com.viaversion.viaversion.api.type.Type
import com.viaversion.viaversion.api.type.types.CustomByteType import com.viaversion.viaversion.api.type.types.CustomByteType
import io.netty.buffer.ByteBuf import com.viaversion.viaversion.protocol.packet.PacketWrapperImpl
import java.io.IOException import java.io.IOException
import java.util.stream.IntStream import java.util.stream.IntStream
import java.util.zip.DataFormatException import java.util.zip.DataFormatException
@ -44,9 +44,7 @@ object ChunkPacketTransformer {
val chunk = Chunk1_8to1_7_6_10(uncompressedData, primaryBitMask, addBitMask, true, groundUp) val chunk = Chunk1_8to1_7_6_10(uncompressedData, primaryBitMask, addBitMask, true, groundUp)
packetWrapper.clearPacket() packetWrapper.clearPacket()
val field = PacketWrapper::class.java.getDeclaredField("inputBuffer") val buffer = (packetWrapper as PacketWrapperImpl).inputBuffer
field.isAccessible = true
val buffer = field[packetWrapper] as ByteBuf
buffer.clear() buffer.clear()
buffer.writeInt(chunkX) buffer.writeInt(chunkX)

View File

@ -36,9 +36,9 @@ use-strong-random: false
require-host-name: true require-host-name: true
# Host names of this instance, that will be used in the virtual host as a suffix. # Host names of this instance, that will be used in the virtual host as a suffix.
host-name: host-name:
- viaaas.localhost - viaaas.localhost
- via.localhost - via.localhost
- via-127-0-0-1.nip.io - via-127-0-0-1.nip.io
# Requires online mode for front-end connections. May be useful for stopping bots. # Requires online mode for front-end connections. May be useful for stopping bots.
force-online-mode: false force-online-mode: false
# Default port to be used when connecting to the backend server. # Default port to be used when connecting to the backend server.
@ -52,10 +52,10 @@ default-backend-port: 25565
block-local-address: true block-local-address: true
# If some server is in this list, it will be blocked. This has priority over allowed-back-addresses. # If some server is in this list, it will be blocked. This has priority over allowed-back-addresses.
blocked-back-addresses: blocked-back-addresses:
- "*.hypixel.net" - "*.hypixel.net"
# Only allows the backend address if it matches an address in this list. # Only allows the backend address if it matches an address in this list.
allowed-back-addresses: allowed-back-addresses:
- "*" - "*"
# #
###### ######
# Info # Info

View File

@ -17,13 +17,21 @@
style-src https://cdnjs.cloudflare.com/ 'self'; style-src https://cdnjs.cloudflare.com/ 'self';
img-src data: https://cdn.discordapp.com/ https://crafthead.net/ https://crafatar.com/; img-src data: https://cdn.discordapp.com/ https://crafthead.net/ https://crafatar.com/;
connect-src 'self' http://localhost:*/ https: wss:; connect-src 'self' http://localhost:*/ https: wss:;
script-src 'sha256-47DEQpj8HBSa+/TImW+5JCeuQeRkm5NMpJWZG3hSuFU=' 'self' https://ajax.cloudflare.com/ https://cdnjs.cloudflare.com/ https://alcdn.msauth.net/" http-equiv="Content-Security-Policy"> script-src 'sha256-47DEQpj8HBSa+/TImW+5JCeuQeRkm5NMpJWZG3hSuFU=' 'self' https://ajax.cloudflare.com/ https://cdnjs.cloudflare.com/ https://alcdn.msauth.net/"
http-equiv="Content-Security-Policy">
<meta content="no-referrer" name="referrer"> <meta content="no-referrer" name="referrer">
<meta content="noindex" name="robots"> <meta content="noindex" name="robots">
<meta content="#0468a1" name="theme-color"> <meta content="#0468a1" name="theme-color">
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/5.0.0-beta3/css/bootstrap.min.css" integrity="sha512-N415hCJJdJx+1UBfULt+i+ihvOn42V/kOjOpp1UTh4CZ70Hx5bDlKryWaqEKfY/8EYOu/C2MuyaluJryK1Lb5Q==" crossorigin="anonymous" /> <link rel="stylesheet"
<script src="https://cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/5.0.0-beta3/js/bootstrap.bundle.min.js" integrity="sha512-DSdiuNZtfUhehZHXtit9Sa/83i06YSnvT8Js8drwdkVCDMk3JwpIxdhf2oRUByUDB3wguN2iAzoTNfxFAuqGyA==" crossorigin="anonymous"></script> href="https://cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/5.0.0-beta3/css/bootstrap.min.css"
<script src="https://cdnjs.cloudflare.com/ajax/libs/jquery/3.6.0/jquery.slim.min.js" integrity="sha512-6ORWJX/LrnSjBzwefdNUyLCMTIsGoNP6NftMy2UAm1JBm6PRZCO1d7OHBStWpVFZLO+RerTvqX/Z9mBFfCJZ4A==" crossorigin="anonymous"></script> integrity="sha512-N415hCJJdJx+1UBfULt+i+ihvOn42V/kOjOpp1UTh4CZ70Hx5bDlKryWaqEKfY/8EYOu/C2MuyaluJryK1Lb5Q=="
crossorigin="anonymous"/>
<script src="https://cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/5.0.0-beta3/js/bootstrap.bundle.min.js"
integrity="sha512-DSdiuNZtfUhehZHXtit9Sa/83i06YSnvT8Js8drwdkVCDMk3JwpIxdhf2oRUByUDB3wguN2iAzoTNfxFAuqGyA=="
crossorigin="anonymous"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/jquery/3.6.0/jquery.slim.min.js"
integrity="sha512-6ORWJX/LrnSjBzwefdNUyLCMTIsGoNP6NftMy2UAm1JBm6PRZCO1d7OHBStWpVFZLO+RerTvqX/Z9mBFfCJZ4A=="
crossorigin="anonymous"></script>
<script crossorigin="anonymous" <script crossorigin="anonymous"
integrity="sha512-UNM1njAgOFUa74Z0bADwAq8gbTcqZC8Ej4xPSzpnh0l6KMevwvkBvbldF9uR++qKeJ+MOZHRjV1HZjoRvjDfNQ==" integrity="sha512-UNM1njAgOFUa74Z0bADwAq8gbTcqZC8Ej4xPSzpnh0l6KMevwvkBvbldF9uR++qKeJ+MOZHRjV1HZjoRvjDfNQ=="
src="https://cdnjs.cloudflare.com/ajax/libs/uuid/8.3.2/uuid.min.js"></script> src="https://cdnjs.cloudflare.com/ajax/libs/uuid/8.3.2/uuid.min.js"></script>
@ -39,22 +47,26 @@
<nav class="navbar navbar-expand-lg navbar-dark bg-dark"> <nav class="navbar navbar-expand-lg navbar-dark bg-dark">
<div class="container-fluid"> <div class="container-fluid">
<a class="navbar-brand" href="javascript:">VIAaaS</a> <a class="navbar-brand" href="javascript:">VIAaaS</a>
<button aria-controls="navbarSupportedContent" aria-expanded="false" aria-label="Toggle navigation" class="navbar-toggler" <button aria-controls="navbarSupportedContent" aria-expanded="false" aria-label="Toggle navigation"
class="navbar-toggler"
data-bs-target="#navbarSupportedContent" data-bs-toggle="collapse" type="button"> data-bs-target="#navbarSupportedContent" data-bs-toggle="collapse" type="button">
<span class="navbar-toggler-icon"></span> <span class="navbar-toggler-icon"></span>
</button> </button>
<div class="collapse navbar-collapse" id="navbarSupportedContent"> <div class="collapse navbar-collapse" id="navbarSupportedContent">
<ul class="navbar-nav nav" role="tablist"> <ul class="navbar-nav nav" role="tablist">
<li class="nav-item" role="presentation"> <li class="nav-item" role="presentation">
<a aria-controls="home" aria-selected="true" class="nav-link active" data-bs-toggle="tab" href="#home" <a aria-controls="home" aria-selected="true" class="nav-link active" data-bs-toggle="tab"
href="#home"
id="home-tab" role="tab">Status</a> id="home-tab" role="tab">Status</a>
</li> </li>
<li class="nav-item" role="presentation"> <li class="nav-item" role="presentation">
<a aria-controls="accounts" aria-selected="false" class="nav-link" data-bs-toggle="tab" href="#accounts" <a aria-controls="accounts" aria-selected="false" class="nav-link" data-bs-toggle="tab"
href="#accounts"
id="accounts-tab" role="tab">Accounts</a> id="accounts-tab" role="tab">Accounts</a>
</li> </li>
<li class="nav-item" role="presentation"> <li class="nav-item" role="presentation">
<a aria-controls="settings" aria-selected="false" class="nav-link" data-bs-toggle="tab" href="#settings" <a aria-controls="settings" aria-selected="false" class="nav-link" data-bs-toggle="tab"
href="#settings"
id="settings-tab" role="tab">Settings</a> id="settings-tab" role="tab">Settings</a>
</li> </li>
<li class="nav-item dropdown"> <li class="nav-item dropdown">