mirror of
https://github.com/ViaVersion/ViaForge.git
synced 2024-11-16 11:05:13 +01:00
Compare commits
No commits in common. "master" and "v3.3.2" have entirely different histories.
2
.github/FUNDING.yml
vendored
2
.github/FUNDING.yml
vendored
@ -1,2 +0,0 @@
|
|||||||
github: FlorianMichael
|
|
||||||
custom: ["https://florianmichael.de/donate"]
|
|
53
.github/ISSUE_TEMPLATE/bug_report.yml
vendored
53
.github/ISSUE_TEMPLATE/bug_report.yml
vendored
@ -1,53 +0,0 @@
|
|||||||
name: Bug Report
|
|
||||||
description: Report a bug in ViaForge
|
|
||||||
labels: [bug]
|
|
||||||
|
|
||||||
body:
|
|
||||||
- type: markdown
|
|
||||||
attributes:
|
|
||||||
value: |
|
|
||||||
**Before reporting a bug, please see if using latest build from https://github.com/ViaVersion/ViaForge/actions fixes your issue.**
|
|
||||||
Whenever you see fit, you can upload images or videos to any of the text fields.
|
|
||||||
|
|
||||||
- type: textarea
|
|
||||||
attributes:
|
|
||||||
label: General Information
|
|
||||||
description: |
|
|
||||||
Please provide a list of all installed mods
|
|
||||||
placeholder: |
|
|
||||||
Example: "ViaForge, Optifine, Xaeros Minimap, WorldEdit, WorldGuard, etc."
|
|
||||||
validations:
|
|
||||||
required: true
|
|
||||||
|
|
||||||
- type: textarea
|
|
||||||
attributes:
|
|
||||||
label: Bug Description
|
|
||||||
description: |
|
|
||||||
Describe the unexpected behavior.
|
|
||||||
If you want to attach screenshots, use the comment field at the bottom of the page.
|
|
||||||
placeholder: |
|
|
||||||
Example: "Joining server xy causes my game to crash."
|
|
||||||
validations:
|
|
||||||
required: true
|
|
||||||
|
|
||||||
- type: textarea
|
|
||||||
attributes:
|
|
||||||
label: Steps to Reproduce
|
|
||||||
description: |
|
|
||||||
List the steps on how we can reproduce the issue. Make sure I can easily understand what you mean with each step.
|
|
||||||
placeholder: |
|
|
||||||
Example:
|
|
||||||
1. Joining server xy with version 1.14.4
|
|
||||||
2. Game crashes
|
|
||||||
validations:
|
|
||||||
required: true
|
|
||||||
|
|
||||||
- type: textarea
|
|
||||||
attributes:
|
|
||||||
label: Expected Behavior
|
|
||||||
description: |
|
|
||||||
Describe what exactly you expected to happen.
|
|
||||||
placeholder: |
|
|
||||||
Example: "the game should not crash when I join server xy."
|
|
||||||
validations:
|
|
||||||
required: true
|
|
10
.github/dependabot.yml
vendored
10
.github/dependabot.yml
vendored
@ -1,10 +0,0 @@
|
|||||||
version: 2
|
|
||||||
updates:
|
|
||||||
- package-ecosystem: "gradle"
|
|
||||||
directory: "/"
|
|
||||||
schedule:
|
|
||||||
interval: "daily"
|
|
||||||
- package-ecosystem: "github-actions"
|
|
||||||
directory: "/"
|
|
||||||
schedule:
|
|
||||||
interval: "weekly"
|
|
BIN
.github/images/ViaVersion.png
vendored
BIN
.github/images/ViaVersion.png
vendored
Binary file not shown.
Before Width: | Height: | Size: 93 KiB |
33
.github/workflows/build.yml
vendored
33
.github/workflows/build.yml
vendored
@ -1,33 +0,0 @@
|
|||||||
name: Build
|
|
||||||
on: [pull_request, push, workflow_dispatch]
|
|
||||||
|
|
||||||
jobs:
|
|
||||||
build:
|
|
||||||
runs-on: ubuntu-22.04
|
|
||||||
steps:
|
|
||||||
- name: Checkout Repository
|
|
||||||
uses: actions/checkout@v4
|
|
||||||
- name: Validate Gradle Wrapper
|
|
||||||
uses: gradle/actions/wrapper-validation@v4
|
|
||||||
- name: Set up JDK 21
|
|
||||||
uses: actions/setup-java@v4
|
|
||||||
with:
|
|
||||||
java-version: 21
|
|
||||||
distribution: 'temurin'
|
|
||||||
check-latest: true
|
|
||||||
- name: Cache Dependencies
|
|
||||||
uses: actions/cache@v4
|
|
||||||
with:
|
|
||||||
path: |
|
|
||||||
~/.gradle/caches
|
|
||||||
~/.gradle/wrapper
|
|
||||||
key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }}
|
|
||||||
restore-keys: |
|
|
||||||
${{ runner.os }}-gradle-
|
|
||||||
- name: Build with Gradle
|
|
||||||
run: ./gradlew shadowJar
|
|
||||||
- name: Upload Build Artifacts
|
|
||||||
uses: actions/upload-artifact@v4
|
|
||||||
with:
|
|
||||||
name: ViaForge All-in-One
|
|
||||||
path: viaforge-mc*/build/libs/
|
|
30
.github/workflows/main.yml
vendored
Normal file
30
.github/workflows/main.yml
vendored
Normal file
@ -0,0 +1,30 @@
|
|||||||
|
name: ViaForge build
|
||||||
|
on: [pull_request, push, workflow_dispatch]
|
||||||
|
|
||||||
|
jobs:
|
||||||
|
build:
|
||||||
|
strategy:
|
||||||
|
matrix:
|
||||||
|
java: ["8"]
|
||||||
|
os: ["ubuntu-22.04"]
|
||||||
|
runs-on: ${{ matrix.os }}
|
||||||
|
steps:
|
||||||
|
- name: Checkout the repository
|
||||||
|
uses: actions/checkout@v3
|
||||||
|
- name: Validate Gradle wrapper
|
||||||
|
uses: gradle/wrapper-validation-action@v1
|
||||||
|
- name: Setup JDK ${{ matrix.java }}
|
||||||
|
uses: actions/setup-java@v3
|
||||||
|
with:
|
||||||
|
java-version: ${{ matrix.java }}
|
||||||
|
distribution: 'temurin'
|
||||||
|
- name: Make Gradle wrapper runnable on Unix
|
||||||
|
run: chmod +x ./gradlew
|
||||||
|
- name: Build
|
||||||
|
run: ./gradlew build
|
||||||
|
- name: Upload Build Artifacts
|
||||||
|
if: ${{ runner.os == 'Linux' && matrix.java == '8' }}
|
||||||
|
uses: actions/upload-artifact@v3
|
||||||
|
with:
|
||||||
|
name: ViaForge-1.12.2
|
||||||
|
path: build/libs/
|
14
.github/workflows/update-gradle-wrapper.yml
vendored
14
.github/workflows/update-gradle-wrapper.yml
vendored
@ -1,14 +0,0 @@
|
|||||||
name: Update Gradle Wrapper
|
|
||||||
on:
|
|
||||||
workflow_dispatch:
|
|
||||||
schedule:
|
|
||||||
- cron: "0 0 * * 0"
|
|
||||||
|
|
||||||
jobs:
|
|
||||||
update-gradle-wrapper:
|
|
||||||
runs-on: ubuntu-24.04
|
|
||||||
steps:
|
|
||||||
- name: Checkout Repository
|
|
||||||
uses: actions/checkout@v4
|
|
||||||
- name: Update Gradle Wrapper
|
|
||||||
uses: gradle-update/update-gradle-wrapper-action@v2
|
|
9
.gitignore
vendored
9
.gitignore
vendored
@ -1,5 +1,4 @@
|
|||||||
# Eclipse
|
# eclipse
|
||||||
|
|
||||||
bin
|
bin
|
||||||
*.launch
|
*.launch
|
||||||
.settings
|
.settings
|
||||||
@ -7,18 +6,18 @@ bin
|
|||||||
.classpath
|
.classpath
|
||||||
.project
|
.project
|
||||||
|
|
||||||
# Idea
|
# idea
|
||||||
out
|
out
|
||||||
*.ipr
|
*.ipr
|
||||||
*.iws
|
*.iws
|
||||||
*.iml
|
*.iml
|
||||||
.idea
|
.idea
|
||||||
|
|
||||||
# Gradle
|
# gradle
|
||||||
build
|
build
|
||||||
.gradle
|
.gradle
|
||||||
|
|
||||||
# Others
|
# other
|
||||||
eclipse
|
eclipse
|
||||||
run
|
run
|
||||||
|
|
||||||
|
@ -1,6 +0,0 @@
|
|||||||
<component name="CopyrightManager">
|
|
||||||
<copyright>
|
|
||||||
<option name="notice" value="This file is part of ViaForge - https://github.com/FlorianMichael/ViaForge Copyright (C) 2021-&#36;today.year FlorianMichael/EnZaXD <florian.michael07@gmail.com> and contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program. If not, see <http://www.gnu.org/licenses/>." />
|
|
||||||
<option name="myName" value="GPL-3.0" />
|
|
||||||
</copyright>
|
|
||||||
</component>
|
|
@ -1,8 +0,0 @@
|
|||||||
<component name="CopyrightManager">
|
|
||||||
<settings default="GPL_3_0">
|
|
||||||
<module2copyright>
|
|
||||||
<element module="Project Files" copyright="GPL-3.0" />
|
|
||||||
</module2copyright>
|
|
||||||
<LanguageOptions name="__TEMPLATE__" />
|
|
||||||
</settings>
|
|
||||||
</component>
|
|
@ -1,39 +0,0 @@
|
|||||||
# Contributing guidelines for the project
|
|
||||||
|
|
||||||
## Setting up a Workspace
|
|
||||||
ViaFabricPlus uses Gradle, to make sure that it is installed properly you can check [Gradle's website](https://gradle.org/install/).
|
|
||||||
1. Clone the repository using `git clone https://github.com/ViaVersion/ViaForge`.
|
|
||||||
2. CD into the local repository.
|
|
||||||
3. Run `./gradlew build`.
|
|
||||||
4. Open the folder as a Gradle project in your preferred IDE.
|
|
||||||
5. Run the mod.
|
|
||||||
|
|
||||||
## Add a new feature or fix a bug
|
|
||||||
1. Create a new branch for your feature/bugfix (e.g. `feature/fix-xyz` or `fix/fix-xyz`)
|
|
||||||
2. Implement your feature/bugfix and make sure it works correctly
|
|
||||||
3. Clean your code and make sure it is readable and understandable (e.g. use proper variable names)
|
|
||||||
4. Use the Google java code style (https://google.github.io/styleguide/javaguide.html) and format your code accordingly
|
|
||||||
5. Create a pull request and wait for it to be reviewed and merged.
|
|
||||||
6. You're done, congrats!
|
|
||||||
|
|
||||||
## Add support for a new Minecraft version
|
|
||||||
1. Create a new branch for the new version (e.g. `update/1.20.6`)
|
|
||||||
2. Create a new `viaforge-mc<version>` folder in the root directory of the project
|
|
||||||
3. Add a `gradle.properties` file with the `forge_version` set (Available at https://files.minecraftforge.net/)
|
|
||||||
4. Register it inside the `settings.gradle` file
|
|
||||||
5. Copy the code from the previous version and update it accordingly
|
|
||||||
|
|
||||||
### Build logic
|
|
||||||
The `build.gradle` file contains the shared build code for all submodules. Build code for only specific versions
|
|
||||||
of the game can be wrapped with checks using the `versionId` integer which will be parsed from the `forge_version`.
|
|
||||||
|
|
||||||
An example would be:
|
|
||||||
````groovy
|
|
||||||
if (versionId >= 1_13_2) {
|
|
||||||
// We don't need to package mixins into Forge 1.13+ jars, since Forge already has it
|
|
||||||
exclude("org/spongepowered/**")
|
|
||||||
}
|
|
||||||
````
|
|
||||||
|
|
||||||
### Notes
|
|
||||||
Shared source code is inside the ``src/main/java`` root folder, while version-specific code is inside the ``/viaforge-mc<version>`` folders.
|
|
75
README.md
75
README.md
@ -1,55 +1,40 @@
|
|||||||
<div align="center">
|
# ViaForge
|
||||||
<img src="https://raw.githubusercontent.com/ViaVersion/ViaForge/master/src/main/resources/icon.png" width="150">
|
Client-side Implementation of ViaVersion for Forge
|
||||||
<h1>ViaForge</h1>
|
|
||||||
<a href="https://files.minecraftforge.net/net/minecraftforge/forge"><img src="https://img.shields.io/badge/Mod%20Loader-Forge-lightyellow?logo=data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAYCAYAAACbU/80AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAALySURBVEhLtZZPaBNBFMbzz42NtoII0aCiRQURVGIFEak3URFEEHqUCkVsPZSKoHjQiwjiQb1UFOlBUXoS0XjowYte1JutF6kKUtYIUQpN1k3zz9+bndos3TabNPng4817b+Z7Mzs7sxtoFKVSaV25XO6BD4vF4nodbi4QD+nmfxDbWqlUnsFfUIHYNZ12gUluI32R/Ed4Uof9g0EGPKVdBUS7nLIumMTbdT7BmLNwjHjOSSuklIAfMLhDN6V9Hx7XrvhrEJtyNOdBfBjzBP5RATcKcDSbzQa1zNJA7A7slTYrGmTwd/Z5tUoCcq+V7NL4DVP07Udjh23b/ooLGHSMwVPY/UJRw97V6QDuJYl54Af9RuBpijb2YqbT6RCr3YTIIQTHEEpiTVEndlj6ENuDW5RYNcj3KZHlAqGD8CrsolgHthv9HPYz+2hIH/y3qqobD5RAM0CxPgTfY3drfx/+NPaG9s+oklUgNm6a5oKj2zAQvI6uje0Xn/Yu2hNsUbJQKBj4k1JYI0/uOfGVavBykM/nIxSRfb7taKvVjUrOsqw425CQNrFeUu+wA7BTYvXC82jkcrlEKBTqjkajbcFg0JIQBfIcpQ+xWEy9AyBMcbEV+vzFrtAUTZXQmKsxrfu54DkBisXpLIVKTkT1s3kqVyKRiGyHraLzhTx1qtAGL6D5yHFrgAmcU8+d/YdWFUuwUQxpeRc8Z05neZPvwQEVqB+zcAKdT9ivLEhOz5hhGF9U1i8YdBS+QOgnnIW1ICfmFnfHzkwmU2tb/APRtbCTI/ZYF/KCfPmO6CGtAadgC0Xki+eFYd2tteDxtlMs7dR04bzuUhcauTblsxx1mi5s17Y14PYLs/q9rDTlLHgBLN6TIfps0EOaB4Tl0zwO/dwDM3CES0tuxZrwdVQQvIm57HgKb4i9ZGLfaK8Kh8MHsD0wLkkgN+RGbj7TcReH3wkkMfIzQrMyyXfilUpUgUe/mfgJmrLyGSb3lInNXdmLIBD4Bw72x5r0eQ99AAAAAElFTkSuQmCC"></a>
|
|
||||||
<img src="https://img.shields.io/badge/Enviroment-Client-purple">
|
|
||||||
<a href="https://discord.gg/viaversion"><img src="https://img.shields.io/discord/316206679014244363?color=0098DB&label=Discord&logo=discord&logoColor=0098DB"></a> <br />
|
|
||||||
<a href="https://modrinth.com/mod/viaforge"><img src="https://img.shields.io/badge/dynamic/json?color=158000&label=downloads&prefix=+%20&query=downloads&url=https://api.modrinth.com/v2/project/Z6se2s8f&logo=modrinth"></a>
|
|
||||||
<a href="https://curseforge.com/minecraft/mc-mods/viaforge"><img src="https://cf.way2muchnoise.eu/full_418933_downloads.svg"></a>
|
|
||||||
<a href="https://github.com/ViaVersion/ViaForge/actions/workflows/build.yml"><img src="https://github.com/ViaVersion/ViaForge/actions/workflows/build.yml/badge.svg?branch=master"></a>
|
|
||||||
|
|
||||||
#### Client-side Implementation of the Via* projects for Minecraft Forge
|
## Contact
|
||||||
</div>
|
If you encounter any issues, please report them on the
|
||||||
|
[issue tracker](https://github.com/FlorianMichael/ViaForge/issues).
|
||||||
|
If you just want to talk or need help with ViaForge feel free to join the ViaVersion
|
||||||
|
[Discord](https://discord.gg/viaversion).
|
||||||
|
|
||||||
## Supported Server versions
|
## For users
|
||||||
- Release (1.0.0 - 1.21.3)
|
### Where can I download the latest version?
|
||||||
- Beta (b1.0 - b1.8.1)
|
CurseForge: https://www.curseforge.com/minecraft/mc-mods/viaforge
|
||||||
- Alpha (a1.0.15 - a1.2.6)
|
Modrinth: https://modrinth.com/mod/viaforge
|
||||||
- Classic (c0.0.15 - c0.30 including [CPE](https://wiki.vg/Classic_Protocol_Extension))
|
|
||||||
- April Fools (3D Shareware, 20w14infinite)
|
|
||||||
- Combat Snapshots (Combat Test 8c)
|
|
||||||
|
|
||||||
## How to (Users)
|
### Can you add new textures and blocks from higher versions?
|
||||||
|
No, because it is too time-consuming
|
||||||
|
|
||||||
ViaForge can be installed on 1.12.2, 1.16.5, 1.17.1, 1.18.2, 1.19.2, 1.19.4, 1.20.4 and 1.20.6 Forge client versions. <br>
|
### ViaVersion throws an error, or I can't access a server, what should I do?
|
||||||
|
First of all see if it's because of an installed mod, otherwise come to the support Discord and tell me logs, mc version etc.
|
||||||
|
|
||||||
The ``legacy-1.8`` also supports Minecraft 1.8.9.
|
### Certain collisions or other items bug, can you fix it?
|
||||||
|
No
|
||||||
|
|
||||||
Dev builds: https://ci.viaversion.com/view/Platforms/job/ViaForge/
|
## For developers
|
||||||
|
### How does it work?
|
||||||
|
![](images/via-expl.png)
|
||||||
|
|
||||||
If you encounter any issues, please report them on either:
|
### Project Structure
|
||||||
- [the issue tracker](https://github.com/ViaVersion/ViaForge/issues)
|
All ViaForge versions from Minecraft version 1.12 onwards are on the `master` branch. <br>
|
||||||
- [the ViaVersion Discord](https://discord.gg/viaversion)
|
The names of the submodules indicate the version, they are always given in the format `mc-<version name without .>`. <br>
|
||||||
|
`Minecraft 1.12.2` - `mc1122`
|
||||||
|
|
||||||
## How to (Developers)
|
### ViaForge for Minecraft 1.8
|
||||||
|
Since ForgeGradle for Minecraft 1.8 is too old, it has its own branch called `legacy-1.8`
|
||||||
|
|
||||||
See [this project](https://github.com/ViaVersionMCP/ViaMCP) for a copy-paste solution to include ViaForge into your MCP based project.
|
### I want ViaForge in my own utility mod
|
||||||
|
Just take a look at my other Project called `ViaMCP`: https://github.com/FlorianMichael/ViaMCP
|
||||||
|
|
||||||
### How to build
|
## Other Via related Projects
|
||||||
1. Clone the repository with `git clone`.
|
ViaFabric - Clientside Via implementation for Fabric: https://www.curseforge.com/minecraft/mc-mods/viafabric
|
||||||
2. Run `./gradlew build` in the root directory of the repository.
|
|
||||||
3. The compiled jar files can be found in `viaforge-mc<version>/build/libs`.
|
|
||||||
|
|
||||||
Note: Build scripts are made to be run using Java 21.
|
|
||||||
|
|
||||||
## Other ViaVersion Mods / Platforms
|
|
||||||
|
|
||||||
ViaBungee - https://hangar.papermc.io/ViaVersion/ViaBungee (ensure Bungee is updated to latest) <br>
|
|
||||||
ViaSponge - https://modrinth.com/project/viasponge <br>
|
|
||||||
ViaFabric - https://modrinth.com/mod/viafabric <br>
|
|
||||||
ViaFabricPlus - https://modrinth.com/mod/viafabricplus (Includes additional modifications to make the experience better) <br>
|
|
||||||
ViaForge - https://modrinth.com/mod/viaforge/ <br>
|
|
||||||
ViaProxy (App) - https://github.com/ViaVersion/ViaProxy/#readme <br>
|
|
||||||
ViaaaS (Proxy) - https://github.com/ViaVersion/ViaaaS#readme <br>
|
|
||||||
|
|
||||||
For a more detailed summary see https://viaversion.com
|
|
||||||
|
216
build.gradle
216
build.gradle
@ -1,215 +1,3 @@
|
|||||||
buildscript {
|
plugins {
|
||||||
repositories {
|
id "java"
|
||||||
gradlePluginPortal()
|
|
||||||
|
|
||||||
maven { url = "https://maven.minecraftforge.net/" }
|
|
||||||
maven { url = "https://repo.spongepowered.org/repository/maven-public/" }
|
|
||||||
}
|
|
||||||
|
|
||||||
dependencies {
|
|
||||||
classpath "com.gradleup.shadow:shadow-gradle-plugin:8.3.5"
|
|
||||||
classpath "net.minecraftforge.gradle:ForgeGradle:6.+"
|
|
||||||
classpath "org.spongepowered:mixingradle:0.7-SNAPSHOT"
|
|
||||||
classpath "xyz.wagyourtail.jvmdowngrader:gradle-plugin:1.2.1"
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
allprojects {
|
|
||||||
apply plugin: "java-library"
|
|
||||||
apply plugin: "com.gradleup.shadow"
|
|
||||||
apply plugin: "xyz.wagyourtail.jvmdowngrader"
|
|
||||||
|
|
||||||
java {
|
|
||||||
// Minecraft 1.17+ required Java 17 to compile,
|
|
||||||
// Minecraft 1.20.5+ required Java 21 to compile
|
|
||||||
toolchain.languageVersion = JavaLanguageVersion.of(21)
|
|
||||||
}
|
|
||||||
|
|
||||||
// Configuration used to include dependencies to the final jars
|
|
||||||
configurations {
|
|
||||||
library
|
|
||||||
implementation.extendsFrom(library)
|
|
||||||
}
|
|
||||||
|
|
||||||
repositories {
|
|
||||||
maven {
|
|
||||||
url = "https://maven.minecraftforge.net/"
|
|
||||||
}
|
|
||||||
maven {
|
|
||||||
url = "https://repo.spongepowered.org/repository/maven-public"
|
|
||||||
}
|
|
||||||
maven {
|
|
||||||
url = "https://repo.viaversion.com"
|
|
||||||
metadataSources {
|
|
||||||
// Prevent Gradle from checking against correct Java version, needed since we downgrade libraries
|
|
||||||
// on include
|
|
||||||
mavenPom()
|
|
||||||
artifact()
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
dependencies {
|
|
||||||
// For common source code
|
|
||||||
compileOnly "io.netty:netty-all:4.1.115.Final"
|
|
||||||
|
|
||||||
library "com.viaversion:viaversion-common:5.1.1"
|
|
||||||
library "com.viaversion:viabackwards-common:5.1.1"
|
|
||||||
library "com.viaversion:viarewind-common:4.0.3"
|
|
||||||
library ("net.raphimc:ViaLegacy:3.0.6-SNAPSHOT") {
|
|
||||||
exclude group: "com.google.code.gson", module: "gson"
|
|
||||||
}
|
|
||||||
library "net.raphimc:viaaprilfools-common:3.0.5-SNAPSHOT"
|
|
||||||
library ("net.raphimc:ViaLoader:3.0.5-SNAPSHOT") {
|
|
||||||
exclude group: "com.google.guava"
|
|
||||||
exclude group: "org.slf4j"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
subprojects {
|
|
||||||
apply plugin: "net.minecraftforge.gradle"
|
|
||||||
apply plugin: "org.spongepowered.mixin"
|
|
||||||
|
|
||||||
// Define the jar output attributes for all platforms
|
|
||||||
base {
|
|
||||||
group = project.maven_group
|
|
||||||
archivesName = project.name
|
|
||||||
version = project.maven_version
|
|
||||||
description = project.maven_description
|
|
||||||
}
|
|
||||||
|
|
||||||
def mcVersion = project.forge_version.split("-")[0]
|
|
||||||
|
|
||||||
// Used to execute code only for specific submodules
|
|
||||||
def versionId = Integer.parseInt(mcVersion.replace(".", ""))
|
|
||||||
|
|
||||||
compileJava.options.encoding = "UTF-8"
|
|
||||||
|
|
||||||
minecraft {
|
|
||||||
if (versionId >= 1_16_5) {
|
|
||||||
mappings channel: "official", version: mcVersion
|
|
||||||
}
|
|
||||||
runs {
|
|
||||||
client {
|
|
||||||
workingDirectory project.file("run")
|
|
||||||
|
|
||||||
property "forge.logging.markers", "REGISTRIES"
|
|
||||||
property "forge.logging.console.level", "debug"
|
|
||||||
|
|
||||||
// mixin
|
|
||||||
property "mixin.debug.export", "true"
|
|
||||||
property "mixin.hotSwap", "true"
|
|
||||||
property "fml.coreMods.load", "de.florianmichael.viaforge.mixin.MixinLoader" // Only required for MC 1.12, but modern Forges skips this anyway
|
|
||||||
args "-mixin.config=" + "mixins." + project.getProperty('name') + ".json"
|
|
||||||
|
|
||||||
// source set
|
|
||||||
mods {
|
|
||||||
"${project.name}" {
|
|
||||||
source sourceSets.main
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
sourceSets.main.resources {
|
|
||||||
srcDir "src/generated/resources"
|
|
||||||
}
|
|
||||||
|
|
||||||
dependencies {
|
|
||||||
minecraft "net.minecraftforge:forge:${forge_version}"
|
|
||||||
if (versionId >= 1_17_1) {
|
|
||||||
// Minecraft 1.17+ already includes slf4j, so we don't need to include it
|
|
||||||
compileOnly "org.slf4j:slf4j-api:${slf4j_version}"
|
|
||||||
} else {
|
|
||||||
library "org.slf4j:slf4j-api:${slf4j_version}"
|
|
||||||
}
|
|
||||||
|
|
||||||
library "org.spongepowered:mixin:${mixin_version}"
|
|
||||||
annotationProcessor "org.spongepowered:mixin:${mixin_version}:processor"
|
|
||||||
|
|
||||||
library project(":") // Include the base project, to get Common-ViaForge
|
|
||||||
}
|
|
||||||
|
|
||||||
// Replace the version in the mcmod.info and mods.toml files with the project version
|
|
||||||
// Since this depends on the platform version, we can't define it in the global scope :(
|
|
||||||
tasks {
|
|
||||||
processResources {
|
|
||||||
for (final def file in ["mcmod.info", "META-INF/mods.toml"]) {
|
|
||||||
filesMatching(file) {
|
|
||||||
expand (
|
|
||||||
"version": project.version,
|
|
||||||
"description": project.description
|
|
||||||
)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
mixin {
|
|
||||||
add sourceSets.main, "mixins.${project.name}.refmap.json"
|
|
||||||
}
|
|
||||||
|
|
||||||
jar {
|
|
||||||
manifest.attributes(
|
|
||||||
"Specification-Title": "viaforge",
|
|
||||||
"Specification-Vendor": "viaforge",
|
|
||||||
"Specification-Version": project.version,
|
|
||||||
"Implementation-Title": project.name,
|
|
||||||
"Implementation-Version": project.version,
|
|
||||||
"Implementation-Vendor" :"viaforge",
|
|
||||||
"Implementation-Timestamp": new Date().format("yyyy-MM-dd"-"HH:mm:ssZ"),
|
|
||||||
"TweakClass": "org.spongepowered.asm.launch.MixinTweaker",
|
|
||||||
"TweakOrder": "0",
|
|
||||||
"FMLCorePluginContainsFMLMod": "true", // Only required for MC 1.12, but modern Forges skips this anyway
|
|
||||||
"FMLCorePlugin": "de.florianmichael.viaforge.mixin.MixinLoader", // Counterpart to the above
|
|
||||||
"MixinConfigs": "mixins.${project.name}.json",
|
|
||||||
"ForceLoadAsMod": "true"
|
|
||||||
)
|
|
||||||
enabled = false
|
|
||||||
}
|
|
||||||
|
|
||||||
shadowJar {
|
|
||||||
if (versionId >= 1_17_1) {
|
|
||||||
archiveFileName = jar.archiveFileName
|
|
||||||
} else {
|
|
||||||
destinationDirectory = temporaryDir
|
|
||||||
}
|
|
||||||
configurations = [project.configurations.library] // Include the dependencies from the include configuration
|
|
||||||
duplicatesStrategy DuplicatesStrategy.EXCLUDE
|
|
||||||
|
|
||||||
// Prevent conflicts with Forge's weird service loading
|
|
||||||
exclude("META-INF/maven/**")
|
|
||||||
exclude("META-INF/versions/**")
|
|
||||||
|
|
||||||
if (versionId >= 1_13_2) {
|
|
||||||
// We don't need to package mixins into Forge 1.13+ jars, since Forge already has it
|
|
||||||
exclude("org/spongepowered/**")
|
|
||||||
}
|
|
||||||
if (versionId >= 1_16_5) {
|
|
||||||
// Get rid of the services folder, since Forge 1.16+ would conflict with some of the ForgeDev Environment's services
|
|
||||||
// And since we don't need them for Mixins anyway, we can just exclude them from the shadowJar
|
|
||||||
exclude("META-INF/services/**")
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
downgradeJar {
|
|
||||||
inputFile = shadowJar.archiveFile
|
|
||||||
destinationDirectory = temporaryDir
|
|
||||||
}
|
|
||||||
|
|
||||||
shadeDowngradedApi {
|
|
||||||
archiveFileName = jar.archiveFileName
|
|
||||||
}
|
|
||||||
|
|
||||||
reobf {
|
|
||||||
shadowJar {}
|
|
||||||
}
|
|
||||||
|
|
||||||
jar.dependsOn("shadowJar")
|
|
||||||
if (versionId < 1_17_1) {
|
|
||||||
// Downgrade the jar to Java 8 for Minecraft 1.16.5 and below
|
|
||||||
jar.dependsOn("shadeDowngradedApi")
|
|
||||||
}
|
|
||||||
}
|
|
@ -1,11 +1,19 @@
|
|||||||
# Gradle Properties
|
# java
|
||||||
org.gradle.jvmargs=-Xmx3G -XX:+UseG1GC
|
org.gradle.jvmargs=-Xmx3G
|
||||||
org.gradle.daemon=false
|
org.gradle.daemon=false
|
||||||
|
|
||||||
# Project Details
|
# forge
|
||||||
maven_group=de.florianmichael
|
mod_id=viaforge
|
||||||
maven_version=3.8.1-SNAPSHOT
|
mod_name=ViaForge
|
||||||
maven_description=Client-side Implementation of the Via* projects for Minecraft Forge
|
mod_version=3.3.2
|
||||||
|
mod_base_package=de.florianmichael
|
||||||
|
|
||||||
slf4j_version=2.0.7
|
# mixin
|
||||||
mixin_version=0.8.3
|
mixin_version=0.8.3
|
||||||
|
|
||||||
|
# via-version
|
||||||
|
vialoader_version=2.2.5-SNAPSHOT
|
||||||
|
viaversion_version=4.7.0
|
||||||
|
viabackwards_version=4.7.0
|
||||||
|
viarewind_version=2.0.4-SNAPSHOT
|
||||||
|
snake_yml_version=2.0
|
||||||
|
BIN
gradle/wrapper/gradle-wrapper.jar
vendored
BIN
gradle/wrapper/gradle-wrapper.jar
vendored
Binary file not shown.
5
gradle/wrapper/gradle-wrapper.properties
vendored
5
gradle/wrapper/gradle-wrapper.properties
vendored
@ -1,8 +1,5 @@
|
|||||||
distributionBase=GRADLE_USER_HOME
|
distributionBase=GRADLE_USER_HOME
|
||||||
distributionPath=wrapper/dists
|
distributionPath=wrapper/dists
|
||||||
distributionSha256Sum=57dafb5c2622c6cc08b993c85b7c06956a2f53536432a30ead46166dbca0f1e9
|
distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-all.zip
|
||||||
distributionUrl=https\://services.gradle.org/distributions/gradle-8.11-bin.zip
|
|
||||||
networkTimeout=10000
|
|
||||||
validateDistributionUrl=true
|
|
||||||
zipStoreBase=GRADLE_USER_HOME
|
zipStoreBase=GRADLE_USER_HOME
|
||||||
zipStorePath=wrapper/dists
|
zipStorePath=wrapper/dists
|
||||||
|
54
gradlew
vendored
54
gradlew
vendored
@ -1,7 +1,7 @@
|
|||||||
#!/bin/sh
|
#!/bin/sh
|
||||||
|
|
||||||
#
|
#
|
||||||
# Copyright © 2015-2021 the original authors.
|
# Copyright © 2015-2021 the original authors.
|
||||||
#
|
#
|
||||||
# Licensed under the Apache License, Version 2.0 (the "License");
|
# Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
# you may not use this file except in compliance with the License.
|
# you may not use this file except in compliance with the License.
|
||||||
@ -15,8 +15,6 @@
|
|||||||
# See the License for the specific language governing permissions and
|
# See the License for the specific language governing permissions and
|
||||||
# limitations under the License.
|
# limitations under the License.
|
||||||
#
|
#
|
||||||
# SPDX-License-Identifier: Apache-2.0
|
|
||||||
#
|
|
||||||
|
|
||||||
##############################################################################
|
##############################################################################
|
||||||
#
|
#
|
||||||
@ -34,10 +32,10 @@
|
|||||||
# Busybox and similar reduced shells will NOT work, because this script
|
# Busybox and similar reduced shells will NOT work, because this script
|
||||||
# requires all of these POSIX shell features:
|
# requires all of these POSIX shell features:
|
||||||
# * functions;
|
# * functions;
|
||||||
# * expansions «$var», «${var}», «${var:-default}», «${var+SET}»,
|
# * expansions «$var», «${var}», «${var:-default}», «${var+SET}»,
|
||||||
# «${var#prefix}», «${var%suffix}», and «$( cmd )»;
|
# «${var#prefix}», «${var%suffix}», and «$( cmd )»;
|
||||||
# * compound commands having a testable exit status, especially «case»;
|
# * compound commands having a testable exit status, especially «case»;
|
||||||
# * various built-in commands including «command», «set», and «ulimit».
|
# * various built-in commands including «command», «set», and «ulimit».
|
||||||
#
|
#
|
||||||
# Important for patching:
|
# Important for patching:
|
||||||
#
|
#
|
||||||
@ -57,7 +55,7 @@
|
|||||||
# Darwin, MinGW, and NonStop.
|
# Darwin, MinGW, and NonStop.
|
||||||
#
|
#
|
||||||
# (3) This script is generated from the Groovy template
|
# (3) This script is generated from the Groovy template
|
||||||
# https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
|
# https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
|
||||||
# within the Gradle project.
|
# within the Gradle project.
|
||||||
#
|
#
|
||||||
# You can find Gradle at https://github.com/gradle/gradle/.
|
# You can find Gradle at https://github.com/gradle/gradle/.
|
||||||
@ -82,12 +80,13 @@ do
|
|||||||
esac
|
esac
|
||||||
done
|
done
|
||||||
|
|
||||||
# This is normally unused
|
APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
|
||||||
# shellcheck disable=SC2034
|
|
||||||
|
APP_NAME="Gradle"
|
||||||
APP_BASE_NAME=${0##*/}
|
APP_BASE_NAME=${0##*/}
|
||||||
# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
|
|
||||||
APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s
|
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
|
||||||
' "$PWD" ) || exit
|
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
|
||||||
|
|
||||||
# Use the maximum available, or set MAX_FD != -1 to use that value.
|
# Use the maximum available, or set MAX_FD != -1 to use that value.
|
||||||
MAX_FD=maximum
|
MAX_FD=maximum
|
||||||
@ -134,29 +133,22 @@ location of your Java installation."
|
|||||||
fi
|
fi
|
||||||
else
|
else
|
||||||
JAVACMD=java
|
JAVACMD=java
|
||||||
if ! command -v java >/dev/null 2>&1
|
which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
|
||||||
then
|
|
||||||
die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
|
|
||||||
|
|
||||||
Please set the JAVA_HOME variable in your environment to match the
|
Please set the JAVA_HOME variable in your environment to match the
|
||||||
location of your Java installation."
|
location of your Java installation."
|
||||||
fi
|
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Increase the maximum file descriptors if we can.
|
# Increase the maximum file descriptors if we can.
|
||||||
if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
|
if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
|
||||||
case $MAX_FD in #(
|
case $MAX_FD in #(
|
||||||
max*)
|
max*)
|
||||||
# In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
|
|
||||||
# shellcheck disable=SC2039,SC3045
|
|
||||||
MAX_FD=$( ulimit -H -n ) ||
|
MAX_FD=$( ulimit -H -n ) ||
|
||||||
warn "Could not query maximum file descriptor limit"
|
warn "Could not query maximum file descriptor limit"
|
||||||
esac
|
esac
|
||||||
case $MAX_FD in #(
|
case $MAX_FD in #(
|
||||||
'' | soft) :;; #(
|
'' | soft) :;; #(
|
||||||
*)
|
*)
|
||||||
# In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
|
|
||||||
# shellcheck disable=SC2039,SC3045
|
|
||||||
ulimit -n "$MAX_FD" ||
|
ulimit -n "$MAX_FD" ||
|
||||||
warn "Could not set maximum file descriptor limit to $MAX_FD"
|
warn "Could not set maximum file descriptor limit to $MAX_FD"
|
||||||
esac
|
esac
|
||||||
@ -201,15 +193,11 @@ if "$cygwin" || "$msys" ; then
|
|||||||
done
|
done
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
# Collect all arguments for the java command;
|
||||||
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
|
# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
|
||||||
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
|
# shell script including quotes and variable substitutions, so put them in
|
||||||
|
# double quotes to make sure that they get re-expanded; and
|
||||||
# Collect all arguments for the java command:
|
# * put everything else in single quotes, so that it's not re-expanded.
|
||||||
# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
|
|
||||||
# and any embedded shellness will be escaped.
|
|
||||||
# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
|
|
||||||
# treated as '${Hostname}' itself on the command line.
|
|
||||||
|
|
||||||
set -- \
|
set -- \
|
||||||
"-Dorg.gradle.appname=$APP_BASE_NAME" \
|
"-Dorg.gradle.appname=$APP_BASE_NAME" \
|
||||||
@ -217,12 +205,6 @@ set -- \
|
|||||||
org.gradle.wrapper.GradleWrapperMain \
|
org.gradle.wrapper.GradleWrapperMain \
|
||||||
"$@"
|
"$@"
|
||||||
|
|
||||||
# Stop when "xargs" is not available.
|
|
||||||
if ! command -v xargs >/dev/null 2>&1
|
|
||||||
then
|
|
||||||
die "xargs is not available"
|
|
||||||
fi
|
|
||||||
|
|
||||||
# Use "xargs" to parse quoted args.
|
# Use "xargs" to parse quoted args.
|
||||||
#
|
#
|
||||||
# With -n1 it outputs one arg per line, with the quotes and backslashes removed.
|
# With -n1 it outputs one arg per line, with the quotes and backslashes removed.
|
||||||
|
183
gradlew.bat
vendored
183
gradlew.bat
vendored
@ -1,94 +1,89 @@
|
|||||||
@rem
|
@rem
|
||||||
@rem Copyright 2015 the original author or authors.
|
@rem Copyright 2015 the original author or authors.
|
||||||
@rem
|
@rem
|
||||||
@rem Licensed under the Apache License, Version 2.0 (the "License");
|
@rem Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
@rem you may not use this file except in compliance with the License.
|
@rem you may not use this file except in compliance with the License.
|
||||||
@rem You may obtain a copy of the License at
|
@rem You may obtain a copy of the License at
|
||||||
@rem
|
@rem
|
||||||
@rem https://www.apache.org/licenses/LICENSE-2.0
|
@rem https://www.apache.org/licenses/LICENSE-2.0
|
||||||
@rem
|
@rem
|
||||||
@rem Unless required by applicable law or agreed to in writing, software
|
@rem Unless required by applicable law or agreed to in writing, software
|
||||||
@rem distributed under the License is distributed on an "AS IS" BASIS,
|
@rem distributed under the License is distributed on an "AS IS" BASIS,
|
||||||
@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||||
@rem See the License for the specific language governing permissions and
|
@rem See the License for the specific language governing permissions and
|
||||||
@rem limitations under the License.
|
@rem limitations under the License.
|
||||||
@rem
|
@rem
|
||||||
@rem SPDX-License-Identifier: Apache-2.0
|
|
||||||
@rem
|
@if "%DEBUG%" == "" @echo off
|
||||||
|
@rem ##########################################################################
|
||||||
@if "%DEBUG%"=="" @echo off
|
@rem
|
||||||
@rem ##########################################################################
|
@rem Gradle startup script for Windows
|
||||||
@rem
|
@rem
|
||||||
@rem Gradle startup script for Windows
|
@rem ##########################################################################
|
||||||
@rem
|
|
||||||
@rem ##########################################################################
|
@rem Set local scope for the variables with windows NT shell
|
||||||
|
if "%OS%"=="Windows_NT" setlocal
|
||||||
@rem Set local scope for the variables with windows NT shell
|
|
||||||
if "%OS%"=="Windows_NT" setlocal
|
set DIRNAME=%~dp0
|
||||||
|
if "%DIRNAME%" == "" set DIRNAME=.
|
||||||
set DIRNAME=%~dp0
|
set APP_BASE_NAME=%~n0
|
||||||
if "%DIRNAME%"=="" set DIRNAME=.
|
set APP_HOME=%DIRNAME%
|
||||||
@rem This is normally unused
|
|
||||||
set APP_BASE_NAME=%~n0
|
@rem Resolve any "." and ".." in APP_HOME to make it shorter.
|
||||||
set APP_HOME=%DIRNAME%
|
for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
|
||||||
|
|
||||||
@rem Resolve any "." and ".." in APP_HOME to make it shorter.
|
@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
|
||||||
for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
|
set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
|
||||||
|
|
||||||
@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
|
@rem Find java.exe
|
||||||
set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
|
if defined JAVA_HOME goto findJavaFromJavaHome
|
||||||
|
|
||||||
@rem Find java.exe
|
set JAVA_EXE=java.exe
|
||||||
if defined JAVA_HOME goto findJavaFromJavaHome
|
%JAVA_EXE% -version >NUL 2>&1
|
||||||
|
if "%ERRORLEVEL%" == "0" goto execute
|
||||||
set JAVA_EXE=java.exe
|
|
||||||
%JAVA_EXE% -version >NUL 2>&1
|
echo.
|
||||||
if %ERRORLEVEL% equ 0 goto execute
|
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
|
||||||
|
echo.
|
||||||
echo. 1>&2
|
echo Please set the JAVA_HOME variable in your environment to match the
|
||||||
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
|
echo location of your Java installation.
|
||||||
echo. 1>&2
|
|
||||||
echo Please set the JAVA_HOME variable in your environment to match the 1>&2
|
goto fail
|
||||||
echo location of your Java installation. 1>&2
|
|
||||||
|
:findJavaFromJavaHome
|
||||||
goto fail
|
set JAVA_HOME=%JAVA_HOME:"=%
|
||||||
|
set JAVA_EXE=%JAVA_HOME%/bin/java.exe
|
||||||
:findJavaFromJavaHome
|
|
||||||
set JAVA_HOME=%JAVA_HOME:"=%
|
if exist "%JAVA_EXE%" goto execute
|
||||||
set JAVA_EXE=%JAVA_HOME%/bin/java.exe
|
|
||||||
|
echo.
|
||||||
if exist "%JAVA_EXE%" goto execute
|
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
|
||||||
|
echo.
|
||||||
echo. 1>&2
|
echo Please set the JAVA_HOME variable in your environment to match the
|
||||||
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
|
echo location of your Java installation.
|
||||||
echo. 1>&2
|
|
||||||
echo Please set the JAVA_HOME variable in your environment to match the 1>&2
|
goto fail
|
||||||
echo location of your Java installation. 1>&2
|
|
||||||
|
:execute
|
||||||
goto fail
|
@rem Setup the command line
|
||||||
|
|
||||||
:execute
|
set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
|
||||||
@rem Setup the command line
|
|
||||||
|
|
||||||
set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
|
@rem Execute Gradle
|
||||||
|
"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
|
||||||
|
|
||||||
@rem Execute Gradle
|
:end
|
||||||
"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
|
@rem End local scope for the variables with windows NT shell
|
||||||
|
if "%ERRORLEVEL%"=="0" goto mainEnd
|
||||||
:end
|
|
||||||
@rem End local scope for the variables with windows NT shell
|
:fail
|
||||||
if %ERRORLEVEL% equ 0 goto mainEnd
|
rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
|
||||||
|
rem the _cmd.exe /c_ return code!
|
||||||
:fail
|
if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
|
||||||
rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
|
exit /b 1
|
||||||
rem the _cmd.exe /c_ return code!
|
|
||||||
set EXIT_CODE=%ERRORLEVEL%
|
:mainEnd
|
||||||
if %EXIT_CODE% equ 0 set EXIT_CODE=1
|
if "%OS%"=="Windows_NT" endlocal
|
||||||
if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
|
|
||||||
exit /b %EXIT_CODE%
|
:omega
|
||||||
|
|
||||||
:mainEnd
|
|
||||||
if "%OS%"=="Windows_NT" endlocal
|
|
||||||
|
|
||||||
:omega
|
|
||||||
|
BIN
images/via-expl.png
Normal file
BIN
images/via-expl.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 25 KiB |
147
mc1122/build.gradle
Normal file
147
mc1122/build.gradle
Normal file
@ -0,0 +1,147 @@
|
|||||||
|
buildscript {
|
||||||
|
repositories {
|
||||||
|
mavenCentral()
|
||||||
|
gradlePluginPortal()
|
||||||
|
|
||||||
|
maven { url = "https://maven.minecraftforge.net/" }
|
||||||
|
maven { url = "https://repo.spongepowered.org/repository/maven-public/" }
|
||||||
|
maven { url = "https://jitpack.io/" }
|
||||||
|
maven { url = "https://files.minecraftforge.net/maven" }
|
||||||
|
maven { url = "https://plugins.gradle.org/m2" }
|
||||||
|
}
|
||||||
|
|
||||||
|
dependencies {
|
||||||
|
classpath "net.minecraftforge.gradle:ForgeGradle:5.1.+"
|
||||||
|
classpath "org.spongepowered:mixingradle:0.7-SNAPSHOT"
|
||||||
|
classpath "com.github.johnrengelman:shadow:7.0.0"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
apply plugin: "net.minecraftforge.gradle"
|
||||||
|
apply plugin: "org.spongepowered.mixin"
|
||||||
|
apply plugin: "com.github.johnrengelman.shadow"
|
||||||
|
apply plugin: "java"
|
||||||
|
|
||||||
|
version = "1.12.2-${mod_version}"
|
||||||
|
group = "${mod_base_package}.${mod_id}"
|
||||||
|
archivesBaseName = mod_id
|
||||||
|
|
||||||
|
java.toolchain.languageVersion = JavaLanguageVersion.of(8)
|
||||||
|
compileJava.options.encoding = "UTF-8"
|
||||||
|
|
||||||
|
minecraft {
|
||||||
|
mappings channel: "stable", version: "39-1.12"
|
||||||
|
|
||||||
|
runs {
|
||||||
|
client {
|
||||||
|
workingDirectory project.file("run")
|
||||||
|
|
||||||
|
property 'forge.logging.markers', 'REGISTRIES'
|
||||||
|
property "forge.logging.console.level", "debug"
|
||||||
|
|
||||||
|
// mixin
|
||||||
|
property 'mixin.debug.export', 'true'
|
||||||
|
property "mixin.hotSwap", "true"
|
||||||
|
property "fml.coreMods.load", "de.florianmichael.viaforge.mixin.MixinLoader"
|
||||||
|
|
||||||
|
if (project.hasProperty('mc_uuid'))
|
||||||
|
args '--uuid', project.getProperty('mc_uuid')
|
||||||
|
|
||||||
|
if (project.hasProperty('mc_username'))
|
||||||
|
args '--username', project.getProperty('mc_username')
|
||||||
|
|
||||||
|
if (project.hasProperty('mc_accessToken'))
|
||||||
|
args '--accessToken', project.getProperty('mc_accessToken')
|
||||||
|
|
||||||
|
args '-mixin.config=' + 'mixins.' + project.getProperty('mod_id') + '.json'
|
||||||
|
|
||||||
|
mods {
|
||||||
|
"${mod_id}" {
|
||||||
|
source sourceSets.main
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
sourceSets.main.resources {
|
||||||
|
srcDir "src/generated/resources"
|
||||||
|
}
|
||||||
|
|
||||||
|
repositories {
|
||||||
|
maven {
|
||||||
|
url = "https://repo.spongepowered.org/repository/maven-public"
|
||||||
|
}
|
||||||
|
maven {
|
||||||
|
url = "https://repo.viaversion.com"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
configurations {
|
||||||
|
include
|
||||||
|
implementation.extendsFrom(include)
|
||||||
|
}
|
||||||
|
|
||||||
|
def viaLibs = [
|
||||||
|
"com.viaversion:viaversion:${project.viaversion_version}",
|
||||||
|
"com.viaversion:viabackwards:${project.viabackwards_version}",
|
||||||
|
"com.viaversion:viarewind-core:${project.viarewind_version}",
|
||||||
|
"org.yaml:snakeyaml:${project.snake_yml_version}",
|
||||||
|
|
||||||
|
"net.raphimc:ViaLoader:${project.vialoader_version}"
|
||||||
|
]
|
||||||
|
|
||||||
|
dependencies {
|
||||||
|
minecraft "net.minecraftforge:forge:1.12.2-14.23.5.2859"
|
||||||
|
|
||||||
|
include "org.spongepowered:mixin:${mixin_version}"
|
||||||
|
|
||||||
|
for (final def via in viaLibs) {
|
||||||
|
implementation(via)
|
||||||
|
}
|
||||||
|
|
||||||
|
annotationProcessor "org.spongepowered:mixin:${mixin_version}:processor"
|
||||||
|
annotationProcessor "org.spongepowered:mixin:${mixin_version}:processor"
|
||||||
|
}
|
||||||
|
|
||||||
|
mixin {
|
||||||
|
add sourceSets.main, "mixins.${mod_id}.refmap.json"
|
||||||
|
}
|
||||||
|
|
||||||
|
jar {
|
||||||
|
manifest.attributes(
|
||||||
|
"Specification-Title": "viaforge",
|
||||||
|
"Specification-Vendor": "viaforge",
|
||||||
|
"Specification-Version": "1",
|
||||||
|
"Implementation-Title": project.name,
|
||||||
|
"Implementation-Version": "${archiveVersion}",
|
||||||
|
"Implementation-Vendor" :"viaforge",
|
||||||
|
"Implementation-Timestamp": new Date().format("yyyy-MM-dd"-"HH:mm:ssZ"),
|
||||||
|
"TweakClass": "org.spongepowered.asm.launch.MixinTweaker",
|
||||||
|
"TweakOrder": "0",
|
||||||
|
"FMLCorePluginContainsFMLMod": "true",
|
||||||
|
"FMLCorePlugin": "de.florianmichael.viaforge.mixin.MixinLoader",
|
||||||
|
"MixinConfigs": "mixins.${mod_id}.json",
|
||||||
|
"ForceLoadAsMod": "true"
|
||||||
|
)
|
||||||
|
enabled = false
|
||||||
|
}
|
||||||
|
|
||||||
|
shadowJar {
|
||||||
|
archiveFileName = jar.archiveFileName
|
||||||
|
compileJava.options.encoding = "UTF-8"
|
||||||
|
exclude "native-binaries/*"
|
||||||
|
|
||||||
|
dependencies {
|
||||||
|
for (final def lib in viaLibs) {
|
||||||
|
include(dependency(lib))
|
||||||
|
}
|
||||||
|
include(dependency("org.spongepowered:mixin:${mixin_version}"))
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
reobf {
|
||||||
|
shadowJar {}
|
||||||
|
}
|
||||||
|
|
||||||
|
jar.dependsOn("shadowJar")
|
@ -0,0 +1,63 @@
|
|||||||
|
/*
|
||||||
|
* This file is part of ViaForge - https://github.com/FlorianMichael/ViaForge
|
||||||
|
* Copyright (C) 2021-2023 FlorianMichael/EnZaXD and contributors
|
||||||
|
*
|
||||||
|
* This program is free software: you can redistribute it and/or modify
|
||||||
|
* it under the terms of the GNU General Public License as published by
|
||||||
|
* the Free Software Foundation, either version 3 of the License, or
|
||||||
|
* (at your option) any later version.
|
||||||
|
*
|
||||||
|
* This program is distributed in the hope that it will be useful,
|
||||||
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
* GNU General Public License for more details.
|
||||||
|
*
|
||||||
|
* You should have received a copy of the GNU General Public License
|
||||||
|
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
*/
|
||||||
|
package de.florianmichael.viaforge;
|
||||||
|
|
||||||
|
import com.viaversion.viaversion.api.Via;
|
||||||
|
import com.viaversion.viaversion.api.connection.UserConnection;
|
||||||
|
import com.viaversion.viaversion.api.protocol.version.VersionProvider;
|
||||||
|
import com.viaversion.viaversion.protocols.base.BaseVersionProvider;
|
||||||
|
import net.minecraft.client.Minecraft;
|
||||||
|
import net.minecraftforge.fml.common.Mod;
|
||||||
|
import net.minecraftforge.fml.common.event.FMLPreInitializationEvent;
|
||||||
|
import net.raphimc.vialoader.ViaLoader;
|
||||||
|
import net.raphimc.vialoader.impl.platform.ViaBackwardsPlatformImpl;
|
||||||
|
import net.raphimc.vialoader.impl.platform.ViaRewindPlatformImpl;
|
||||||
|
import net.raphimc.vialoader.impl.viaversion.VLLoader;
|
||||||
|
import net.raphimc.vialoader.util.VersionEnum;
|
||||||
|
|
||||||
|
@Mod(modid = "viaforge", name = "ViaForge", version = "3.3.2")
|
||||||
|
public class ViaForge {
|
||||||
|
public final static VersionEnum NATIVE_VERSION = VersionEnum.r1_12_2;
|
||||||
|
|
||||||
|
public static VersionEnum targetVersion = VersionEnum.r1_12_2;
|
||||||
|
|
||||||
|
@Mod.EventHandler
|
||||||
|
public void init(FMLPreInitializationEvent event) {
|
||||||
|
ViaLoader.init(
|
||||||
|
null,
|
||||||
|
new VLLoader() {
|
||||||
|
@Override
|
||||||
|
public void load() {
|
||||||
|
super.load();
|
||||||
|
Via.getManager().getProviders().use(VersionProvider.class, new BaseVersionProvider() {
|
||||||
|
@Override
|
||||||
|
public int getClosestServerProtocol(UserConnection connection) throws Exception {
|
||||||
|
if (connection.isClientSide() && !Minecraft.getMinecraft().isSingleplayer()) {
|
||||||
|
return targetVersion.getVersion();
|
||||||
|
}
|
||||||
|
return super.getClosestServerProtocol(connection);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
},
|
||||||
|
null,
|
||||||
|
null,
|
||||||
|
ViaBackwardsPlatformImpl::new, ViaRewindPlatformImpl::new
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
@ -1,6 +1,6 @@
|
|||||||
/*
|
/*
|
||||||
* This file is part of ViaForge - https://github.com/FlorianMichael/ViaForge
|
* This file is part of ViaForge - https://github.com/FlorianMichael/ViaForge
|
||||||
* Copyright (C) 2021-2024 FlorianMichael/EnZaXD <florian.michael07@gmail.com> and contributors
|
* Copyright (C) 2021-2023 FlorianMichael/EnZaXD and contributors
|
||||||
*
|
*
|
||||||
* This program is free software: you can redistribute it and/or modify
|
* This program is free software: you can redistribute it and/or modify
|
||||||
* it under the terms of the GNU General Public License as published by
|
* it under the terms of the GNU General Public License as published by
|
||||||
@ -15,16 +15,15 @@
|
|||||||
* You should have received a copy of the GNU General Public License
|
* You should have received a copy of the GNU General Public License
|
||||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
*/
|
*/
|
||||||
|
package de.florianmichael.viaforge;
|
||||||
package de.florianmichael.viaforge.common.protocoltranslator.netty;
|
|
||||||
|
|
||||||
import com.viaversion.viaversion.api.connection.UserConnection;
|
import com.viaversion.viaversion.api.connection.UserConnection;
|
||||||
import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
|
|
||||||
import net.raphimc.vialoader.netty.VLLegacyPipeline;
|
import net.raphimc.vialoader.netty.VLLegacyPipeline;
|
||||||
|
import net.raphimc.vialoader.util.VersionEnum;
|
||||||
|
|
||||||
public class ViaForgeVLLegacyPipeline extends VLLegacyPipeline {
|
public class ViaForgeVLLegacyPipeline extends VLLegacyPipeline {
|
||||||
|
|
||||||
public ViaForgeVLLegacyPipeline(UserConnection user, ProtocolVersion version) {
|
public ViaForgeVLLegacyPipeline(UserConnection user, VersionEnum version) {
|
||||||
super(user, version);
|
super(user, version);
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -57,5 +56,4 @@ public class ViaForgeVLLegacyPipeline extends VLLegacyPipeline {
|
|||||||
protected String lengthPrependerName() {
|
protected String lengthPrependerName() {
|
||||||
return "prepender";
|
return "prepender";
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
@ -0,0 +1,108 @@
|
|||||||
|
/*
|
||||||
|
* This file is part of ViaForge - https://github.com/FlorianMichael/ViaForge
|
||||||
|
* Copyright (C) 2021-2023 FlorianMichael/EnZaXD and contributors
|
||||||
|
*
|
||||||
|
* This program is free software: you can redistribute it and/or modify
|
||||||
|
* it under the terms of the GNU General Public License as published by
|
||||||
|
* the Free Software Foundation, either version 3 of the License, or
|
||||||
|
* (at your option) any later version.
|
||||||
|
*
|
||||||
|
* This program is distributed in the hope that it will be useful,
|
||||||
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
* GNU General Public License for more details.
|
||||||
|
*
|
||||||
|
* You should have received a copy of the GNU General Public License
|
||||||
|
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
*/
|
||||||
|
package de.florianmichael.viaforge.gui;
|
||||||
|
|
||||||
|
import com.mojang.realmsclient.gui.ChatFormatting;
|
||||||
|
import de.florianmichael.viaforge.ViaForge;
|
||||||
|
import net.minecraft.client.Minecraft;
|
||||||
|
import net.minecraft.client.gui.GuiButton;
|
||||||
|
import net.minecraft.client.gui.GuiScreen;
|
||||||
|
import net.minecraft.client.gui.GuiSlot;
|
||||||
|
import net.raphimc.vialoader.util.VersionEnum;
|
||||||
|
import org.lwjgl.opengl.GL11;
|
||||||
|
|
||||||
|
import java.io.IOException;
|
||||||
|
|
||||||
|
public class GuiProtocolSelector extends GuiScreen {
|
||||||
|
|
||||||
|
private final GuiScreen parent;
|
||||||
|
private SlotList list;
|
||||||
|
|
||||||
|
public GuiProtocolSelector(GuiScreen parent) {
|
||||||
|
this.parent = parent;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void initGui() {
|
||||||
|
super.initGui();
|
||||||
|
buttonList.add(new GuiButton(1, width / 2 - 100, height - 27, 200, 20, "Back"));
|
||||||
|
list = new SlotList(mc, width, height, 32, height - 32, 10);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
protected void actionPerformed(GuiButton p_actionPerformed_1_) throws IOException {
|
||||||
|
list.actionPerformed(p_actionPerformed_1_);
|
||||||
|
|
||||||
|
if (p_actionPerformed_1_.id == 1) mc.displayGuiScreen(parent);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void handleMouseInput() throws IOException {
|
||||||
|
list.handleMouseInput();
|
||||||
|
super.handleMouseInput();
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void drawScreen(int p_drawScreen_1_, int p_drawScreen_2_, float p_drawScreen_3_) {
|
||||||
|
list.drawScreen(p_drawScreen_1_, p_drawScreen_2_, p_drawScreen_3_);
|
||||||
|
|
||||||
|
GL11.glPushMatrix();
|
||||||
|
GL11.glScalef(2.0F, 2.0F, 2.0F);
|
||||||
|
this.drawCenteredString(this.fontRenderer, ChatFormatting.GOLD + "ViaForge", this.width / 4, 6, 16777215);
|
||||||
|
GL11.glPopMatrix();
|
||||||
|
|
||||||
|
drawString(this.fontRenderer, "by https://github.com/FlorianMichael/ViaForge", 1, 1, -1);
|
||||||
|
drawString(this.fontRenderer, "Discord: EnZaXD#6257", 1, 11, -1);
|
||||||
|
|
||||||
|
super.drawScreen(p_drawScreen_1_, p_drawScreen_2_, p_drawScreen_3_);
|
||||||
|
}
|
||||||
|
|
||||||
|
class SlotList extends GuiSlot {
|
||||||
|
|
||||||
|
public SlotList(Minecraft p_i1052_1_, int p_i1052_2_, int p_i1052_3_, int p_i1052_4_, int p_i1052_5_, int p_i1052_6_) {
|
||||||
|
super(p_i1052_1_, p_i1052_2_, p_i1052_3_, p_i1052_4_, p_i1052_5_, p_i1052_6_);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
protected int getSize() {
|
||||||
|
return VersionEnum.OFFICIAL_SUPPORTED_PROTOCOLS.size();
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
protected void elementClicked(int i, boolean b, int i1, int i2) {
|
||||||
|
ViaForge.targetVersion = VersionEnum.OFFICIAL_SUPPORTED_PROTOCOLS.get(i);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
protected boolean isSelected(int i) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
protected void drawBackground() {
|
||||||
|
drawDefaultBackground();
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
protected void drawSlot(int i, int i1, int i2, int i3, int i4, int i5, float v) {
|
||||||
|
final VersionEnum version = VersionEnum.OFFICIAL_SUPPORTED_PROTOCOLS.get(i);
|
||||||
|
|
||||||
|
drawCenteredString(mc.fontRenderer,(ViaForge.targetVersion.getVersion() == version.getVersion() ? ChatFormatting.GREEN.toString() : ChatFormatting.DARK_RED.toString()) + version.getName(), width / 2, i2, -1);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
@ -1,6 +1,6 @@
|
|||||||
/*
|
/*
|
||||||
* This file is part of ViaForge - https://github.com/FlorianMichael/ViaForge
|
* This file is part of ViaForge - https://github.com/FlorianMichael/ViaForge
|
||||||
* Copyright (C) 2021-2024 FlorianMichael/EnZaXD <florian.michael07@gmail.com> and contributors
|
* Copyright (C) 2021-2023 FlorianMichael/EnZaXD and contributors
|
||||||
*
|
*
|
||||||
* This program is free software: you can redistribute it and/or modify
|
* This program is free software: you can redistribute it and/or modify
|
||||||
* it under the terms of the GNU General Public License as published by
|
* it under the terms of the GNU General Public License as published by
|
||||||
@ -15,7 +15,6 @@
|
|||||||
* You should have received a copy of the GNU General Public License
|
* You should have received a copy of the GNU General Public License
|
||||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
package de.florianmichael.viaforge.mixin;
|
package de.florianmichael.viaforge.mixin;
|
||||||
|
|
||||||
import net.minecraftforge.fml.relauncher.IFMLLoadingPlugin;
|
import net.minecraftforge.fml.relauncher.IFMLLoadingPlugin;
|
||||||
@ -28,8 +27,9 @@ import java.util.Map;
|
|||||||
public class MixinLoader implements IFMLLoadingPlugin {
|
public class MixinLoader implements IFMLLoadingPlugin {
|
||||||
|
|
||||||
public MixinLoader() {
|
public MixinLoader() {
|
||||||
|
System.out.println("Starting MixinBootstrap from IFMLLoadingPlugin");
|
||||||
MixinBootstrap.init();
|
MixinBootstrap.init();
|
||||||
Mixins.addConfiguration("mixins.viaforge-mc1122.json");
|
Mixins.addConfiguration("mixins.viaforge.json");
|
||||||
MixinEnvironment.getDefaultEnvironment().setSide(MixinEnvironment.Side.CLIENT);
|
MixinEnvironment.getDefaultEnvironment().setSide(MixinEnvironment.Side.CLIENT);
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -49,12 +49,10 @@ public class MixinLoader implements IFMLLoadingPlugin {
|
|||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void injectData(Map<String, Object> data) {
|
public void injectData(Map<String, Object> data) { }
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public String getAccessTransformerClass() {
|
public String getAccessTransformerClass() {
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
@ -1,6 +1,6 @@
|
|||||||
/*
|
/*
|
||||||
* This file is part of ViaForge - https://github.com/FlorianMichael/ViaForge
|
* This file is part of ViaForge - https://github.com/FlorianMichael/ViaForge
|
||||||
* Copyright (C) 2021-2024 FlorianMichael/EnZaXD <florian.michael07@gmail.com> and contributors
|
* Copyright (C) 2021-2023 FlorianMichael/EnZaXD and contributors
|
||||||
*
|
*
|
||||||
* This program is free software: you can redistribute it and/or modify
|
* This program is free software: you can redistribute it and/or modify
|
||||||
* it under the terms of the GNU General Public License as published by
|
* it under the terms of the GNU General Public License as published by
|
||||||
@ -15,25 +15,27 @@
|
|||||||
* You should have received a copy of the GNU General Public License
|
* You should have received a copy of the GNU General Public License
|
||||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
*/
|
*/
|
||||||
|
package de.florianmichael.viaforge.mixin.impl;
|
||||||
|
|
||||||
package de.florianmichael.viaforge.mixin.connect;
|
import de.florianmichael.viaforge.gui.GuiProtocolSelector;
|
||||||
|
import net.minecraft.client.gui.*;
|
||||||
import de.florianmichael.viaforge.common.ViaForgeCommon;
|
|
||||||
import de.florianmichael.viaforge.common.protocoltranslator.netty.VFNetworkManager;
|
|
||||||
import io.netty.channel.Channel;
|
|
||||||
import io.netty.channel.ChannelHandler;
|
|
||||||
import org.spongepowered.asm.mixin.Mixin;
|
import org.spongepowered.asm.mixin.Mixin;
|
||||||
import org.spongepowered.asm.mixin.injection.At;
|
import org.spongepowered.asm.mixin.injection.At;
|
||||||
import org.spongepowered.asm.mixin.injection.Inject;
|
import org.spongepowered.asm.mixin.injection.Inject;
|
||||||
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
|
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
|
||||||
|
|
||||||
@Mixin(targets = "net.minecraft.network.Connection$1")
|
@Mixin(GuiMainMenu.class)
|
||||||
public class MixinConnection_1 {
|
public class MixinGuiMainMenu extends GuiScreen {
|
||||||
|
|
||||||
@Inject(method = "initChannel", at = @At("TAIL"))
|
@Inject(method = "initGui", at = @At("RETURN"))
|
||||||
private void hookViaPipeline(Channel p_129552_, CallbackInfo ci) {
|
public void hookCustomButton(CallbackInfo ci) {
|
||||||
final ChannelHandler connection = p_129552_.pipeline().get("packet_handler");
|
buttonList.add(new GuiButton(1337, 5, 6, 98, 20, "ViaForge"));
|
||||||
ViaForgeCommon.getManager().inject(p_129552_, (VFNetworkManager) connection);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Inject(method = "actionPerformed", at = @At("RETURN"))
|
||||||
|
public void handleCustomButtonAction(GuiButton p_actionPerformed_1_, CallbackInfo ci) {
|
||||||
|
if (p_actionPerformed_1_.id == 1337) {
|
||||||
|
mc.displayGuiScreen(new GuiProtocolSelector(this));
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
@ -1,6 +1,6 @@
|
|||||||
/*
|
/*
|
||||||
* This file is part of ViaForge - https://github.com/FlorianMichael/ViaForge
|
* This file is part of ViaForge - https://github.com/FlorianMichael/ViaForge
|
||||||
* Copyright (C) 2021-2024 FlorianMichael/EnZaXD <florian.michael07@gmail.com> and contributors
|
* Copyright (C) 2021-2023 FlorianMichael/EnZaXD and contributors
|
||||||
*
|
*
|
||||||
* This program is free software: you can redistribute it and/or modify
|
* This program is free software: you can redistribute it and/or modify
|
||||||
* it under the terms of the GNU General Public License as published by
|
* it under the terms of the GNU General Public License as published by
|
||||||
@ -15,12 +15,8 @@
|
|||||||
* You should have received a copy of the GNU General Public License
|
* You should have received a copy of the GNU General Public License
|
||||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
package de.florianmichael.viaforge.mixin.impl;
|
package de.florianmichael.viaforge.mixin.impl;
|
||||||
|
|
||||||
import com.viaversion.viaversion.util.Pair;
|
|
||||||
import de.florianmichael.viaforge.common.ViaForgeCommon;
|
|
||||||
import de.florianmichael.viaforge.common.platform.ViaForgeConfig;
|
|
||||||
import de.florianmichael.viaforge.gui.GuiProtocolSelector;
|
import de.florianmichael.viaforge.gui.GuiProtocolSelector;
|
||||||
import net.minecraft.client.gui.GuiButton;
|
import net.minecraft.client.gui.GuiButton;
|
||||||
import net.minecraft.client.gui.GuiMultiplayer;
|
import net.minecraft.client.gui.GuiMultiplayer;
|
||||||
@ -34,22 +30,14 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
|
|||||||
public class MixinGuiMultiplayer extends GuiScreen {
|
public class MixinGuiMultiplayer extends GuiScreen {
|
||||||
|
|
||||||
@Inject(method = "initGui", at = @At("RETURN"))
|
@Inject(method = "initGui", at = @At("RETURN"))
|
||||||
public void hookViaForgeButton(CallbackInfo ci) {
|
public void hookCustomButton(CallbackInfo ci) {
|
||||||
final ViaForgeConfig config = ViaForgeCommon.getManager().getConfig();
|
buttonList.add(new GuiButton(1337, 5, 6, 98, 20, "ViaForge"));
|
||||||
if (config.isShowMultiplayerButton()) {
|
|
||||||
final Pair<Integer, Integer> pos = config.getViaForgeButtonPosition().getPosition(this.width, this.height);
|
|
||||||
|
|
||||||
buttonList.add(new GuiButton(1_000_000_000, pos.key(), pos.value(), 100, 20, "ViaForge"));
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@Inject(method = "actionPerformed", at = @At("RETURN"))
|
@Inject(method = "actionPerformed", at = @At("RETURN"))
|
||||||
public void handleViaForgeButtonClicking(GuiButton p_actionPerformed_1_, CallbackInfo ci) {
|
public void handleCustomButtonAction(GuiButton p_actionPerformed_1_, CallbackInfo ci) {
|
||||||
if (ViaForgeCommon.getManager().getConfig().isShowMultiplayerButton()) {
|
if (p_actionPerformed_1_.id == 1337) {
|
||||||
if (p_actionPerformed_1_.id == 1_000_000_000) {
|
mc.displayGuiScreen(new GuiProtocolSelector(this));
|
||||||
mc.displayGuiScreen(new GuiProtocolSelector(this));
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
@ -1,6 +1,6 @@
|
|||||||
/*
|
/*
|
||||||
* This file is part of ViaForge - https://github.com/FlorianMichael/ViaForge
|
* This file is part of ViaForge - https://github.com/FlorianMichael/ViaForge
|
||||||
* Copyright (C) 2021-2024 FlorianMichael/EnZaXD <florian.michael07@gmail.com> and contributors
|
* Copyright (C) 2021-2023 FlorianMichael/EnZaXD and contributors
|
||||||
*
|
*
|
||||||
* This program is free software: you can redistribute it and/or modify
|
* This program is free software: you can redistribute it and/or modify
|
||||||
* it under the terms of the GNU General Public License as published by
|
* it under the terms of the GNU General Public License as published by
|
||||||
@ -15,12 +15,8 @@
|
|||||||
* You should have received a copy of the GNU General Public License
|
* You should have received a copy of the GNU General Public License
|
||||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
package de.florianmichael.viaforge.mixin.impl;
|
package de.florianmichael.viaforge.mixin.impl;
|
||||||
|
|
||||||
import com.viaversion.viaversion.util.Pair;
|
|
||||||
import de.florianmichael.viaforge.common.ViaForgeCommon;
|
|
||||||
import de.florianmichael.viaforge.common.platform.ViaForgeConfig;
|
|
||||||
import de.florianmichael.viaforge.gui.GuiProtocolSelector;
|
import de.florianmichael.viaforge.gui.GuiProtocolSelector;
|
||||||
import net.minecraft.client.gui.GuiButton;
|
import net.minecraft.client.gui.GuiButton;
|
||||||
import net.minecraft.client.gui.GuiScreen;
|
import net.minecraft.client.gui.GuiScreen;
|
||||||
@ -34,22 +30,14 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
|
|||||||
public class MixinGuiScreenServerList extends GuiScreen {
|
public class MixinGuiScreenServerList extends GuiScreen {
|
||||||
|
|
||||||
@Inject(method = "initGui", at = @At("RETURN"))
|
@Inject(method = "initGui", at = @At("RETURN"))
|
||||||
public void hookViaForgeButton(CallbackInfo ci) {
|
public void hookCustomButton(CallbackInfo ci) {
|
||||||
final ViaForgeConfig config = ViaForgeCommon.getManager().getConfig();
|
buttonList.add(new GuiButton(1337, 5, 6, 98, 20, "ViaForge"));
|
||||||
if (config.isShowDirectConnectButton()) {
|
|
||||||
final Pair<Integer, Integer> pos = config.getViaForgeButtonPosition().getPosition(this.width, this.height);
|
|
||||||
|
|
||||||
buttonList.add(new GuiButton(1_000_000_000, pos.key(), pos.value(), 100, 20, "ViaForge"));
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@Inject(method = "actionPerformed", at = @At("RETURN"))
|
@Inject(method = "actionPerformed", at = @At("RETURN"))
|
||||||
public void handleViaForgeButtonClicking(GuiButton p_actionPerformed_1_, CallbackInfo ci) {
|
public void handleCustomButtonAction(GuiButton p_actionPerformed_1_, CallbackInfo ci) {
|
||||||
if (ViaForgeCommon.getManager().getConfig().isShowDirectConnectButton()) {
|
if (p_actionPerformed_1_.id == 1337) {
|
||||||
if (p_actionPerformed_1_.id == 1_000_000_000) {
|
mc.displayGuiScreen(new GuiProtocolSelector(this));
|
||||||
mc.displayGuiScreen(new GuiProtocolSelector(this));
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
@ -1,6 +1,6 @@
|
|||||||
/*
|
/*
|
||||||
* This file is part of ViaForge - https://github.com/FlorianMichael/ViaForge
|
* This file is part of ViaForge - https://github.com/FlorianMichael/ViaForge
|
||||||
* Copyright (C) 2021-2024 FlorianMichael/EnZaXD <florian.michael07@gmail.com> and contributors
|
* Copyright (C) 2021-2023 FlorianMichael/EnZaXD and contributors
|
||||||
*
|
*
|
||||||
* This program is free software: you can redistribute it and/or modify
|
* This program is free software: you can redistribute it and/or modify
|
||||||
* it under the terms of the GNU General Public License as published by
|
* it under the terms of the GNU General Public License as published by
|
||||||
@ -15,25 +15,24 @@
|
|||||||
* You should have received a copy of the GNU General Public License
|
* You should have received a copy of the GNU General Public License
|
||||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
*/
|
*/
|
||||||
|
package de.florianmichael.viaforge.mixin.impl;
|
||||||
|
|
||||||
package de.florianmichael.viaforge.mixin.connect;
|
|
||||||
|
|
||||||
import de.florianmichael.viaforge.common.ViaForgeCommon;
|
|
||||||
import de.florianmichael.viaforge.common.protocoltranslator.netty.VFNetworkManager;
|
|
||||||
import io.netty.channel.Channel;
|
import io.netty.channel.Channel;
|
||||||
import io.netty.channel.ChannelHandler;
|
import net.minecraft.network.NetworkManager;
|
||||||
|
import net.raphimc.vialoader.netty.CompressionReorderEvent;
|
||||||
import org.spongepowered.asm.mixin.Mixin;
|
import org.spongepowered.asm.mixin.Mixin;
|
||||||
|
import org.spongepowered.asm.mixin.Shadow;
|
||||||
import org.spongepowered.asm.mixin.injection.At;
|
import org.spongepowered.asm.mixin.injection.At;
|
||||||
import org.spongepowered.asm.mixin.injection.Inject;
|
import org.spongepowered.asm.mixin.injection.Inject;
|
||||||
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
|
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
|
||||||
|
|
||||||
@Mixin(targets = "net.minecraft.network.Connection$1")
|
@Mixin(NetworkManager.class)
|
||||||
public class MixinConnection_1 {
|
public class MixinNetworkManager {
|
||||||
|
|
||||||
@Inject(method = "initChannel", at = @At("TAIL"))
|
@Shadow private Channel channel;
|
||||||
private void hookViaPipeline(Channel p_129552_, CallbackInfo ci) {
|
|
||||||
final ChannelHandler connection = p_129552_.pipeline().get("packet_handler");
|
@Inject(method = "setCompressionThreshold", at = @At("RETURN"))
|
||||||
ViaForgeCommon.getManager().inject(p_129552_, (VFNetworkManager) connection);
|
public void reOrderPipeline(int p_setCompressionTreshold_1_, CallbackInfo ci) {
|
||||||
|
channel.pipeline().fireUserEventTriggered(CompressionReorderEvent.INSTANCE);
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
@ -1,6 +1,6 @@
|
|||||||
/*
|
/*
|
||||||
* This file is part of ViaForge - https://github.com/FlorianMichael/ViaForge
|
* This file is part of ViaForge - https://github.com/FlorianMichael/ViaForge
|
||||||
* Copyright (C) 2021-2024 FlorianMichael/EnZaXD <florian.michael07@gmail.com> and contributors
|
* Copyright (C) 2021-2023 FlorianMichael/EnZaXD and contributors
|
||||||
*
|
*
|
||||||
* This program is free software: you can redistribute it and/or modify
|
* This program is free software: you can redistribute it and/or modify
|
||||||
* it under the terms of the GNU General Public License as published by
|
* it under the terms of the GNU General Public License as published by
|
||||||
@ -15,14 +15,16 @@
|
|||||||
* You should have received a copy of the GNU General Public License
|
* You should have received a copy of the GNU General Public License
|
||||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
*/
|
*/
|
||||||
|
package de.florianmichael.viaforge.mixin.impl;
|
||||||
|
|
||||||
package de.florianmichael.viaforge.mixin.impl.connect;
|
import com.viaversion.viaversion.api.connection.UserConnection;
|
||||||
|
import com.viaversion.viaversion.connection.UserConnectionImpl;
|
||||||
import de.florianmichael.viaforge.common.ViaForgeCommon;
|
import com.viaversion.viaversion.protocol.ProtocolPipelineImpl;
|
||||||
import de.florianmichael.viaforge.common.protocoltranslator.netty.VFNetworkManager;
|
import de.florianmichael.viaforge.ViaForge;
|
||||||
|
import de.florianmichael.viaforge.ViaForgeVLLegacyPipeline;
|
||||||
import io.netty.channel.Channel;
|
import io.netty.channel.Channel;
|
||||||
import net.minecraft.network.NetworkManager;
|
import io.netty.channel.socket.SocketChannel;
|
||||||
import org.spongepowered.asm.mixin.*;
|
import org.spongepowered.asm.mixin.Mixin;
|
||||||
import org.spongepowered.asm.mixin.injection.At;
|
import org.spongepowered.asm.mixin.injection.At;
|
||||||
import org.spongepowered.asm.mixin.injection.Inject;
|
import org.spongepowered.asm.mixin.injection.Inject;
|
||||||
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
|
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
|
||||||
@ -30,13 +32,13 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
|
|||||||
@Mixin(targets = "net.minecraft.network.NetworkManager$5")
|
@Mixin(targets = "net.minecraft.network.NetworkManager$5")
|
||||||
public class MixinNetworkManager_5 {
|
public class MixinNetworkManager_5 {
|
||||||
|
|
||||||
@Final
|
|
||||||
@Mutable
|
|
||||||
NetworkManager val$networkmanager;
|
|
||||||
|
|
||||||
@Inject(method = "initChannel", at = @At(value = "TAIL"), remap = false)
|
@Inject(method = "initChannel", at = @At(value = "TAIL"), remap = false)
|
||||||
private void hookViaPipeline(Channel channel, CallbackInfo ci) {
|
private void onInitChannel(Channel channel, CallbackInfo ci) {
|
||||||
ViaForgeCommon.getManager().inject(channel, (VFNetworkManager) val$networkmanager);
|
if (channel instanceof SocketChannel && ViaForge.targetVersion != ViaForge.NATIVE_VERSION) {
|
||||||
}
|
final UserConnection user = new UserConnectionImpl(channel, true);
|
||||||
|
new ProtocolPipelineImpl(user);
|
||||||
|
|
||||||
|
channel.pipeline().addLast(new ViaForgeVLLegacyPipeline(user, ViaForge.targetVersion));
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
16
mc1122/src/main/resources/mcmod.info
Normal file
16
mc1122/src/main/resources/mcmod.info
Normal file
@ -0,0 +1,16 @@
|
|||||||
|
[
|
||||||
|
{
|
||||||
|
"modid": "viaforge",
|
||||||
|
"name": "ViaForge",
|
||||||
|
"description": "Client-side Implementation of ViaVersion for Forge",
|
||||||
|
"version": "1.0.0",
|
||||||
|
"mcversion": "[1.8,1.12.2]",
|
||||||
|
"url": "https://github.com/FlorianMichael/ViaForge",
|
||||||
|
"updateUrl": "",
|
||||||
|
"authorList": [],
|
||||||
|
"credits": "",
|
||||||
|
"logoFile": "",
|
||||||
|
"screenshots": [],
|
||||||
|
"dependencies": []
|
||||||
|
}
|
||||||
|
]
|
15
mc1122/src/main/resources/mixins.viaforge.json
Normal file
15
mc1122/src/main/resources/mixins.viaforge.json
Normal file
@ -0,0 +1,15 @@
|
|||||||
|
{
|
||||||
|
"required": true,
|
||||||
|
"minVersion": "0.7.5",
|
||||||
|
"compatibilityLevel": "JAVA_8",
|
||||||
|
"package": "de.florianmichael.viaforge.mixin.impl",
|
||||||
|
"refmap": "mixins.viaforge.refmap.json",
|
||||||
|
"mixins": [
|
||||||
|
"MixinNetworkManager",
|
||||||
|
"MixinNetworkManager_5",
|
||||||
|
"MixinGuiMainMenu",
|
||||||
|
"MixinGuiMultiplayer",
|
||||||
|
"MixinGuiScreenServerList"
|
||||||
|
],
|
||||||
|
"verbose": true
|
||||||
|
}
|
@ -1,14 +1,3 @@
|
|||||||
plugins {
|
|
||||||
id "org.gradle.toolchains.foojay-resolver-convention" version "0.8.0"
|
|
||||||
}
|
|
||||||
|
|
||||||
rootProject.name = "ViaForge"
|
rootProject.name = "ViaForge"
|
||||||
|
include 'mc1122'
|
||||||
|
|
||||||
include "viaforge-mc1122"
|
|
||||||
include "viaforge-mc1165"
|
|
||||||
include "viaforge-mc1171"
|
|
||||||
include "viaforge-mc1182"
|
|
||||||
include "viaforge-mc1192"
|
|
||||||
include "viaforge-mc1194"
|
|
||||||
include "viaforge-mc1204"
|
|
||||||
include "viaforge-mc1206"
|
|
@ -1,159 +0,0 @@
|
|||||||
/*
|
|
||||||
* This file is part of ViaForge - https://github.com/FlorianMichael/ViaForge
|
|
||||||
* Copyright (C) 2021-2024 FlorianMichael/EnZaXD <florian.michael07@gmail.com> and contributors
|
|
||||||
*
|
|
||||||
* This program is free software: you can redistribute it and/or modify
|
|
||||||
* it under the terms of the GNU General Public License as published by
|
|
||||||
* the Free Software Foundation, either version 3 of the License, or
|
|
||||||
* (at your option) any later version.
|
|
||||||
*
|
|
||||||
* This program is distributed in the hope that it will be useful,
|
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
||||||
* GNU General Public License for more details.
|
|
||||||
*
|
|
||||||
* You should have received a copy of the GNU General Public License
|
|
||||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
||||||
*/
|
|
||||||
|
|
||||||
package de.florianmichael.viaforge.common;
|
|
||||||
|
|
||||||
import com.viaversion.viaversion.api.Via;
|
|
||||||
import com.viaversion.viaversion.api.connection.UserConnection;
|
|
||||||
import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
|
|
||||||
import com.viaversion.viaversion.connection.UserConnectionImpl;
|
|
||||||
import com.viaversion.viaversion.protocol.ProtocolPipelineImpl;
|
|
||||||
import de.florianmichael.viaforge.common.platform.VFPlatform;
|
|
||||||
import de.florianmichael.viaforge.common.platform.ViaForgeConfig;
|
|
||||||
import de.florianmichael.viaforge.common.protocoltranslator.ViaForgeVLInjector;
|
|
||||||
import de.florianmichael.viaforge.common.protocoltranslator.ViaForgeVLLoader;
|
|
||||||
import de.florianmichael.viaforge.common.protocoltranslator.netty.VFNetworkManager;
|
|
||||||
import de.florianmichael.viaforge.common.protocoltranslator.netty.ViaForgeVLLegacyPipeline;
|
|
||||||
import io.netty.channel.Channel;
|
|
||||||
import io.netty.util.AttributeKey;
|
|
||||||
import net.raphimc.vialoader.ViaLoader;
|
|
||||||
import net.raphimc.vialoader.impl.platform.*;
|
|
||||||
import net.raphimc.vialoader.netty.CompressionReorderEvent;
|
|
||||||
|
|
||||||
import java.io.File;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* This class is used to manage the common code between the different ViaForge versions.
|
|
||||||
* It is used to inject the ViaVersion pipeline into the netty pipeline. It also manages the target version.
|
|
||||||
*/
|
|
||||||
public class ViaForgeCommon {
|
|
||||||
|
|
||||||
public static final AttributeKey<UserConnection> VF_VIA_USER = AttributeKey.valueOf("viaforge_via_user");
|
|
||||||
public static final AttributeKey<VFNetworkManager> VF_NETWORK_MANAGER = AttributeKey.valueOf("viaforge_network_manager");
|
|
||||||
|
|
||||||
private static ViaForgeCommon manager;
|
|
||||||
|
|
||||||
private final VFPlatform platform;
|
|
||||||
private ProtocolVersion targetVersion;
|
|
||||||
private ProtocolVersion previousVersion;
|
|
||||||
|
|
||||||
private ViaForgeConfig config;
|
|
||||||
|
|
||||||
public ViaForgeCommon(VFPlatform platform) {
|
|
||||||
this.platform = platform;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Initializes the manager.
|
|
||||||
*
|
|
||||||
* @param platform the platform fields
|
|
||||||
*/
|
|
||||||
public static void init(final VFPlatform platform) {
|
|
||||||
final ProtocolVersion version = ProtocolVersion.getProtocol(platform.getGameVersion()); // ViaForge will only load on post-netty versions
|
|
||||||
if (version == ProtocolVersion.unknown) {
|
|
||||||
throw new IllegalArgumentException("Unknown version " + platform.getGameVersion());
|
|
||||||
}
|
|
||||||
|
|
||||||
manager = new ViaForgeCommon(platform);
|
|
||||||
|
|
||||||
final File mainFolder = new File(platform.getLeadingDirectory(), "ViaForge");
|
|
||||||
|
|
||||||
ViaLoader.init(new ViaVersionPlatformImpl(mainFolder), new ViaForgeVLLoader(platform), new ViaForgeVLInjector(), null, ViaBackwardsPlatformImpl::new, ViaRewindPlatformImpl::new, ViaLegacyPlatformImpl::new, ViaAprilFoolsPlatformImpl::new);
|
|
||||||
manager.config = new ViaForgeConfig(new File(mainFolder, "viaforge.yml"), Via.getPlatform().getLogger());
|
|
||||||
|
|
||||||
final ProtocolVersion configVersion = ProtocolVersion.getClosest(manager.config.getClientSideVersion());
|
|
||||||
if (configVersion != null) {
|
|
||||||
manager.setTargetVersion(configVersion);
|
|
||||||
} else {
|
|
||||||
manager.setTargetVersion(version);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Injects the ViaVersion pipeline into the netty pipeline.
|
|
||||||
*
|
|
||||||
* @param channel the channel to inject the pipeline into
|
|
||||||
*/
|
|
||||||
public void inject(final Channel channel, final VFNetworkManager networkManager) {
|
|
||||||
if (networkManager.viaForge$getTrackedVersion().equals(getNativeVersion())) {
|
|
||||||
return; // Don't inject ViaVersion into pipeline if there is nothing to translate anyway
|
|
||||||
}
|
|
||||||
channel.attr(VF_NETWORK_MANAGER).set(networkManager);
|
|
||||||
|
|
||||||
final UserConnection user = new UserConnectionImpl(channel, true);
|
|
||||||
new ProtocolPipelineImpl(user);
|
|
||||||
|
|
||||||
channel.attr(VF_VIA_USER).set(user);
|
|
||||||
|
|
||||||
channel.pipeline().addLast(new ViaForgeVLLegacyPipeline(user, targetVersion));
|
|
||||||
channel.closeFuture().addListener(future -> {
|
|
||||||
if (previousVersion != null) {
|
|
||||||
restoreVersion();
|
|
||||||
}
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Reorders the compression channel.
|
|
||||||
*
|
|
||||||
* @param channel the channel to reorder the compression for
|
|
||||||
*/
|
|
||||||
public void reorderCompression(final Channel channel) {
|
|
||||||
// When Minecraft enables compression, we need to reorder the pipeline
|
|
||||||
// to match the counterparts of via-decoder <-> encoder and via-encoder <-> encoder
|
|
||||||
channel.pipeline().fireUserEventTriggered(CompressionReorderEvent.INSTANCE);
|
|
||||||
}
|
|
||||||
|
|
||||||
public ProtocolVersion getNativeVersion() {
|
|
||||||
return ProtocolVersion.getProtocol(platform.getGameVersion());
|
|
||||||
}
|
|
||||||
|
|
||||||
public ProtocolVersion getTargetVersion() {
|
|
||||||
return targetVersion;
|
|
||||||
}
|
|
||||||
|
|
||||||
public void restoreVersion() {
|
|
||||||
this.targetVersion = ProtocolVersion.getClosest(config.getClientSideVersion());
|
|
||||||
}
|
|
||||||
|
|
||||||
public void setTargetVersionSilent(final ProtocolVersion targetVersion) {
|
|
||||||
final ProtocolVersion oldVersion = this.targetVersion;
|
|
||||||
this.targetVersion = targetVersion;
|
|
||||||
if (oldVersion != targetVersion) {
|
|
||||||
previousVersion = oldVersion;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
public void setTargetVersion(final ProtocolVersion targetVersion) {
|
|
||||||
this.targetVersion = targetVersion;
|
|
||||||
config.setClientSideVersion(targetVersion.getName());
|
|
||||||
}
|
|
||||||
|
|
||||||
public VFPlatform getPlatform() {
|
|
||||||
return platform;
|
|
||||||
}
|
|
||||||
|
|
||||||
public ViaForgeConfig getConfig() {
|
|
||||||
return config;
|
|
||||||
}
|
|
||||||
|
|
||||||
public static ViaForgeCommon getManager() {
|
|
||||||
return manager;
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
@ -1,32 +0,0 @@
|
|||||||
/*
|
|
||||||
* This file is part of ViaForge - https://github.com/FlorianMichael/ViaForge
|
|
||||||
* Copyright (C) 2021-2024 FlorianMichael/EnZaXD <florian.michael07@gmail.com> and contributors
|
|
||||||
*
|
|
||||||
* This program is free software: you can redistribute it and/or modify
|
|
||||||
* it under the terms of the GNU General Public License as published by
|
|
||||||
* the Free Software Foundation, either version 3 of the License, or
|
|
||||||
* (at your option) any later version.
|
|
||||||
*
|
|
||||||
* This program is distributed in the hope that it will be useful,
|
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
||||||
* GNU General Public License for more details.
|
|
||||||
*
|
|
||||||
* You should have received a copy of the GNU General Public License
|
|
||||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
||||||
*/
|
|
||||||
|
|
||||||
package de.florianmichael.viaforge.common.gui;
|
|
||||||
|
|
||||||
import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* This interface is used to store the target version for a specific server in the server list.
|
|
||||||
*/
|
|
||||||
public interface ExtendedServerData {
|
|
||||||
|
|
||||||
ProtocolVersion viaForge$getVersion();
|
|
||||||
|
|
||||||
void viaForge$setVersion(final ProtocolVersion version);
|
|
||||||
|
|
||||||
}
|
|
@ -1,58 +0,0 @@
|
|||||||
/*
|
|
||||||
* This file is part of ViaForge - https://github.com/FlorianMichael/ViaForge
|
|
||||||
* Copyright (C) 2021-2024 FlorianMichael/EnZaXD <florian.michael07@gmail.com> and contributors
|
|
||||||
*
|
|
||||||
* This program is free software: you can redistribute it and/or modify
|
|
||||||
* it under the terms of the GNU General Public License as published by
|
|
||||||
* the Free Software Foundation, either version 3 of the License, or
|
|
||||||
* (at your option) any later version.
|
|
||||||
*
|
|
||||||
* This program is distributed in the hope that it will be useful,
|
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
||||||
* GNU General Public License for more details.
|
|
||||||
*
|
|
||||||
* You should have received a copy of the GNU General Public License
|
|
||||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
||||||
*/
|
|
||||||
|
|
||||||
package de.florianmichael.viaforge.common.platform;
|
|
||||||
|
|
||||||
import net.raphimc.vialegacy.protocol.release.r1_7_6_10tor1_8.provider.GameProfileFetcher;
|
|
||||||
|
|
||||||
import java.io.File;
|
|
||||||
import java.util.function.Supplier;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* This interface is used to access platform-specific fields.
|
|
||||||
*/
|
|
||||||
public interface VFPlatform {
|
|
||||||
|
|
||||||
/**
|
|
||||||
* @return the native version of the platform
|
|
||||||
*/
|
|
||||||
int getGameVersion();
|
|
||||||
|
|
||||||
/**
|
|
||||||
* @return if the client is in singleplayer
|
|
||||||
*/
|
|
||||||
Supplier<Boolean> isSingleplayer();
|
|
||||||
|
|
||||||
/**
|
|
||||||
* @return the leading directory of the platform
|
|
||||||
*/
|
|
||||||
File getLeadingDirectory();
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Sends the joinServer API request to Mojang's authentication servers.
|
|
||||||
*
|
|
||||||
* @param serverId the server id of the server
|
|
||||||
*/
|
|
||||||
void joinServer(final String serverId) throws Throwable;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* @return the game profile fetcher of the platform for ViaLegacy
|
|
||||||
*/
|
|
||||||
GameProfileFetcher getGameProfileFetcher();
|
|
||||||
|
|
||||||
}
|
|
@ -1,44 +0,0 @@
|
|||||||
/*
|
|
||||||
* This file is part of ViaForge - https://github.com/FlorianMichael/ViaForge
|
|
||||||
* Copyright (C) 2021-2024 FlorianMichael/EnZaXD <florian.michael07@gmail.com> and contributors
|
|
||||||
*
|
|
||||||
* This program is free software: you can redistribute it and/or modify
|
|
||||||
* it under the terms of the GNU General Public License as published by
|
|
||||||
* the Free Software Foundation, either version 3 of the License, or
|
|
||||||
* (at your option) any later version.
|
|
||||||
*
|
|
||||||
* This program is distributed in the hope that it will be useful,
|
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
||||||
* GNU General Public License for more details.
|
|
||||||
*
|
|
||||||
* You should have received a copy of the GNU General Public License
|
|
||||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
||||||
*/
|
|
||||||
|
|
||||||
package de.florianmichael.viaforge.common.platform;
|
|
||||||
|
|
||||||
import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
|
|
||||||
import de.florianmichael.viaforge.common.ViaForgeCommon;
|
|
||||||
|
|
||||||
import java.net.InetAddress;
|
|
||||||
import java.util.HashMap;
|
|
||||||
import java.util.Map;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Dirty, but needed to store the server specific version until building the netty pipeline.
|
|
||||||
*/
|
|
||||||
public class VersionTracker {
|
|
||||||
|
|
||||||
public static final Map<InetAddress, ProtocolVersion> SERVER_PROTOCOL_VERSIONS = new HashMap<>();
|
|
||||||
|
|
||||||
public static void storeServerProtocolVersion(InetAddress address, ProtocolVersion version) {
|
|
||||||
SERVER_PROTOCOL_VERSIONS.put(address, version);
|
|
||||||
ViaForgeCommon.getManager().setTargetVersionSilent(version);
|
|
||||||
}
|
|
||||||
|
|
||||||
public static ProtocolVersion getServerProtocolVersion(InetAddress address) {
|
|
||||||
return SERVER_PROTOCOL_VERSIONS.remove(address);
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
@ -1,148 +0,0 @@
|
|||||||
/*
|
|
||||||
* This file is part of ViaForge - https://github.com/FlorianMichael/ViaForge
|
|
||||||
* Copyright (C) 2021-2024 FlorianMichael/EnZaXD <florian.michael07@gmail.com> and contributors
|
|
||||||
*
|
|
||||||
* This program is free software: you can redistribute it and/or modify
|
|
||||||
* it under the terms of the GNU General Public License as published by
|
|
||||||
* the Free Software Foundation, either version 3 of the License, or
|
|
||||||
* (at your option) any later version.
|
|
||||||
*
|
|
||||||
* This program is distributed in the hope that it will be useful,
|
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
||||||
* GNU General Public License for more details.
|
|
||||||
*
|
|
||||||
* You should have received a copy of the GNU General Public License
|
|
||||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
||||||
*/
|
|
||||||
|
|
||||||
package de.florianmichael.viaforge.common.platform;
|
|
||||||
|
|
||||||
import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
|
|
||||||
import com.viaversion.viaversion.util.Config;
|
|
||||||
import com.viaversion.viaversion.util.Pair;
|
|
||||||
|
|
||||||
import java.io.File;
|
|
||||||
import java.net.URL;
|
|
||||||
import java.util.Collections;
|
|
||||||
import java.util.List;
|
|
||||||
import java.util.Map;
|
|
||||||
import java.util.logging.Logger;
|
|
||||||
|
|
||||||
public class ViaForgeConfig extends Config {
|
|
||||||
|
|
||||||
public static final String CLIENT_SIDE_VERSION = "client-side-version";
|
|
||||||
public static final String VERIFY_SESSION_IN_OLD_VERSIONS = "verify-session-in-old-versions";
|
|
||||||
public static final String ALLOW_BETACRAFT_AUTHENTICATION = "allow-betacraft-authentication";
|
|
||||||
public static final String SHOW_PROTOCOL_VERSION_IN_F3 = "show-protocol-version-in-f3";
|
|
||||||
|
|
||||||
public static final String SHOW_MAIN_MENU_BUTTON = "show-main-menu-button";
|
|
||||||
public static final String SHOW_MULTIPLAYER_BUTTON = "show-multiplayer-button";
|
|
||||||
public static final String SHOW_DIRECT_CONNECT_BUTTON = "show-direct-connect-button";
|
|
||||||
public static final String SHOW_ADD_SERVER_BUTTON = "show-add-server-button";
|
|
||||||
|
|
||||||
public static final String VIA_FORGE_BUTTON_POSITION = "via-forge-button-position";
|
|
||||||
public static final String ADD_SERVER_SCREEN_BUTTON_POSITION = "add-server-screen-button-position";
|
|
||||||
|
|
||||||
/**
|
|
||||||
* @param configFile The location of where the config is loaded/saved.
|
|
||||||
*/
|
|
||||||
public ViaForgeConfig(File configFile, Logger logger) {
|
|
||||||
super(configFile, logger);
|
|
||||||
reload();
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public URL getDefaultConfigURL() {
|
|
||||||
return getClass().getClassLoader().getResource("assets/viaforge/config.yml");
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
protected void handleConfig(Map<String, Object> config) {
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public List<String> getUnsupportedOptions() {
|
|
||||||
return Collections.emptyList();
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void set(String path, Object value) {
|
|
||||||
super.set(path, value);
|
|
||||||
save(); // Automatically save the config when something changes
|
|
||||||
}
|
|
||||||
|
|
||||||
public String getClientSideVersion() {
|
|
||||||
if (getInt(CLIENT_SIDE_VERSION, -1) != -1) { // Temporary fix for old configs
|
|
||||||
return ProtocolVersion.getProtocol(getInt(CLIENT_SIDE_VERSION, -1)).getName();
|
|
||||||
}
|
|
||||||
return getString(CLIENT_SIDE_VERSION, "");
|
|
||||||
}
|
|
||||||
|
|
||||||
public void setClientSideVersion(final String version) {
|
|
||||||
set(CLIENT_SIDE_VERSION, version);
|
|
||||||
}
|
|
||||||
|
|
||||||
public boolean isVerifySessionInOldVersions() {
|
|
||||||
return getBoolean(VERIFY_SESSION_IN_OLD_VERSIONS, true);
|
|
||||||
}
|
|
||||||
|
|
||||||
public boolean isAllowBetacraftAuthentication() {
|
|
||||||
return getBoolean(ALLOW_BETACRAFT_AUTHENTICATION, true);
|
|
||||||
}
|
|
||||||
|
|
||||||
public boolean isShowProtocolVersionInF3() {
|
|
||||||
return getBoolean(SHOW_PROTOCOL_VERSION_IN_F3, true);
|
|
||||||
}
|
|
||||||
|
|
||||||
public boolean isShowMainMenuButton() {
|
|
||||||
return getBoolean(SHOW_MAIN_MENU_BUTTON, true);
|
|
||||||
}
|
|
||||||
|
|
||||||
public boolean isShowMultiplayerButton() {
|
|
||||||
return getBoolean(SHOW_MULTIPLAYER_BUTTON, true);
|
|
||||||
}
|
|
||||||
|
|
||||||
public boolean isShowDirectConnectButton() {
|
|
||||||
return getBoolean(SHOW_DIRECT_CONNECT_BUTTON, true);
|
|
||||||
}
|
|
||||||
|
|
||||||
public boolean isShowAddServerButton() {
|
|
||||||
return getBoolean(SHOW_ADD_SERVER_BUTTON, true);
|
|
||||||
}
|
|
||||||
|
|
||||||
public ButtonPosition getViaForgeButtonPosition() {
|
|
||||||
return ButtonPosition.valueOf(getString(VIA_FORGE_BUTTON_POSITION, ButtonPosition.TOP_LEFT.name()));
|
|
||||||
}
|
|
||||||
|
|
||||||
public ButtonPosition getAddServerScreenButtonPosition() {
|
|
||||||
return ButtonPosition.valueOf(getString(ADD_SERVER_SCREEN_BUTTON_POSITION, ButtonPosition.TOP_LEFT.name()));
|
|
||||||
}
|
|
||||||
|
|
||||||
public enum ButtonPosition {
|
|
||||||
// Button width: 100
|
|
||||||
// Button height: 20
|
|
||||||
// Button margin for both coordinates: 5
|
|
||||||
TOP_LEFT((width, height) -> new Pair<>(5, 5)),
|
|
||||||
TOP_RIGHT((width, height) -> new Pair<>(width - 100 - 5, 5)),
|
|
||||||
BOTTOM_LEFT((width, height) -> new Pair<>(5, height - 20 - 5)),
|
|
||||||
BOTTOM_RIGHT((width, height) -> new Pair<>(width - 100 - 5, height - 20 - 5));
|
|
||||||
|
|
||||||
private final PositionInvoker invoker;
|
|
||||||
|
|
||||||
ButtonPosition(final PositionInvoker invoker) {
|
|
||||||
this.invoker = invoker;
|
|
||||||
}
|
|
||||||
|
|
||||||
public Pair<Integer, Integer> getPosition(int width, int height) {
|
|
||||||
return invoker.invoke(width, height);
|
|
||||||
}
|
|
||||||
|
|
||||||
public interface PositionInvoker {
|
|
||||||
|
|
||||||
Pair<Integer, Integer> invoke(int width, int height);
|
|
||||||
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
@ -1,36 +0,0 @@
|
|||||||
/*
|
|
||||||
* This file is part of ViaForge - https://github.com/FlorianMichael/ViaForge
|
|
||||||
* Copyright (C) 2021-2024 FlorianMichael/EnZaXD <florian.michael07@gmail.com> and contributors
|
|
||||||
*
|
|
||||||
* This program is free software: you can redistribute it and/or modify
|
|
||||||
* it under the terms of the GNU General Public License as published by
|
|
||||||
* the Free Software Foundation, either version 3 of the License, or
|
|
||||||
* (at your option) any later version.
|
|
||||||
*
|
|
||||||
* This program is distributed in the hope that it will be useful,
|
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
||||||
* GNU General Public License for more details.
|
|
||||||
*
|
|
||||||
* You should have received a copy of the GNU General Public License
|
|
||||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
||||||
*/
|
|
||||||
|
|
||||||
package de.florianmichael.viaforge.common.protocoltranslator;
|
|
||||||
|
|
||||||
import net.raphimc.vialoader.impl.viaversion.VLInjector;
|
|
||||||
import net.raphimc.vialoader.netty.VLLegacyPipeline;
|
|
||||||
|
|
||||||
public class ViaForgeVLInjector extends VLInjector {
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public String getDecoderName() {
|
|
||||||
return VLLegacyPipeline.VIA_DECODER_NAME;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public String getEncoderName() {
|
|
||||||
return VLLegacyPipeline.VIA_ENCODER_NAME;
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
@ -1,55 +0,0 @@
|
|||||||
/*
|
|
||||||
* This file is part of ViaForge - https://github.com/FlorianMichael/ViaForge
|
|
||||||
* Copyright (C) 2021-2024 FlorianMichael/EnZaXD <florian.michael07@gmail.com> and contributors
|
|
||||||
*
|
|
||||||
* This program is free software: you can redistribute it and/or modify
|
|
||||||
* it under the terms of the GNU General Public License as published by
|
|
||||||
* the Free Software Foundation, either version 3 of the License, or
|
|
||||||
* (at your option) any later version.
|
|
||||||
*
|
|
||||||
* This program is distributed in the hope that it will be useful,
|
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
||||||
* GNU General Public License for more details.
|
|
||||||
*
|
|
||||||
* You should have received a copy of the GNU General Public License
|
|
||||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
||||||
*/
|
|
||||||
|
|
||||||
package de.florianmichael.viaforge.common.protocoltranslator;
|
|
||||||
|
|
||||||
import com.viaversion.viaversion.api.Via;
|
|
||||||
import com.viaversion.viaversion.api.platform.providers.ViaProviders;
|
|
||||||
import com.viaversion.viaversion.api.protocol.version.VersionProvider;
|
|
||||||
import com.viaversion.viaversion.protocols.v1_8to1_9.provider.MovementTransmitterProvider;
|
|
||||||
import de.florianmichael.viaforge.common.platform.VFPlatform;
|
|
||||||
import de.florianmichael.viaforge.common.protocoltranslator.provider.*;
|
|
||||||
import net.raphimc.vialegacy.protocol.classic.c0_28_30toa1_0_15.provider.ClassicMPPassProvider;
|
|
||||||
import net.raphimc.vialegacy.protocol.release.r1_2_4_5tor1_3_1_2.provider.OldAuthProvider;
|
|
||||||
import net.raphimc.vialegacy.protocol.release.r1_6_4tor1_7_2_5.provider.EncryptionProvider;
|
|
||||||
import net.raphimc.vialegacy.protocol.release.r1_7_6_10tor1_8.provider.GameProfileFetcher;
|
|
||||||
import net.raphimc.vialoader.impl.viaversion.VLLoader;
|
|
||||||
|
|
||||||
public class ViaForgeVLLoader extends VLLoader {
|
|
||||||
|
|
||||||
private final VFPlatform platform;
|
|
||||||
|
|
||||||
public ViaForgeVLLoader(VFPlatform platform) {
|
|
||||||
this.platform = platform;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void load() {
|
|
||||||
super.load();
|
|
||||||
|
|
||||||
final ViaProviders providers = Via.getManager().getProviders();
|
|
||||||
|
|
||||||
providers.use(VersionProvider.class, new ViaForgeVersionProvider());
|
|
||||||
providers.use(MovementTransmitterProvider.class, new ViaForgeMovementTransmitterProvider());
|
|
||||||
providers.use(OldAuthProvider.class, new ViaForgeOldAuthProvider());
|
|
||||||
providers.use(GameProfileFetcher.class, platform.getGameProfileFetcher());
|
|
||||||
providers.use(EncryptionProvider.class, new ViaForgeEncryptionProvider());
|
|
||||||
providers.use(ClassicMPPassProvider.class, new ViaForgeClassicMPPassProvider());
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
@ -1,43 +0,0 @@
|
|||||||
/*
|
|
||||||
* This file is part of ViaForge - https://github.com/FlorianMichael/ViaForge
|
|
||||||
* Copyright (C) 2021-2024 FlorianMichael/EnZaXD <florian.michael07@gmail.com> and contributors
|
|
||||||
*
|
|
||||||
* This program is free software: you can redistribute it and/or modify
|
|
||||||
* it under the terms of the GNU General Public License as published by
|
|
||||||
* the Free Software Foundation, either version 3 of the License, or
|
|
||||||
* (at your option) any later version.
|
|
||||||
*
|
|
||||||
* This program is distributed in the hope that it will be useful,
|
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
||||||
* GNU General Public License for more details.
|
|
||||||
*
|
|
||||||
* You should have received a copy of the GNU General Public License
|
|
||||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
||||||
*/
|
|
||||||
|
|
||||||
package de.florianmichael.viaforge.common.protocoltranslator.netty;
|
|
||||||
|
|
||||||
import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
|
|
||||||
|
|
||||||
public interface VFNetworkManager {
|
|
||||||
|
|
||||||
/**
|
|
||||||
* API method to setup the decryption side of the pipeline.
|
|
||||||
* This method is called by the {@link de.florianmichael.viaforge.common.protocoltranslator.provider.ViaForgeEncryptionProvider} class.
|
|
||||||
*/
|
|
||||||
void viaForge$setupPreNettyDecryption();
|
|
||||||
|
|
||||||
/**
|
|
||||||
* @return the target version of the connection
|
|
||||||
*/
|
|
||||||
ProtocolVersion viaForge$getTrackedVersion();
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Sets the target version of the connection.
|
|
||||||
*
|
|
||||||
* @param version the target version
|
|
||||||
*/
|
|
||||||
void viaForge$setTrackedVersion(final ProtocolVersion version);
|
|
||||||
|
|
||||||
}
|
|
@ -1,88 +0,0 @@
|
|||||||
/*
|
|
||||||
* This file is part of ViaForge - https://github.com/FlorianMichael/ViaForge
|
|
||||||
* Copyright (C) 2021-2024 FlorianMichael/EnZaXD <florian.michael07@gmail.com> and contributors
|
|
||||||
*
|
|
||||||
* This program is free software: you can redistribute it and/or modify
|
|
||||||
* it under the terms of the GNU General Public License as published by
|
|
||||||
* the Free Software Foundation, either version 3 of the License, or
|
|
||||||
* (at your option) any later version.
|
|
||||||
*
|
|
||||||
* This program is distributed in the hope that it will be useful,
|
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
||||||
* GNU General Public License for more details.
|
|
||||||
*
|
|
||||||
* You should have received a copy of the GNU General Public License
|
|
||||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
||||||
*/
|
|
||||||
|
|
||||||
package de.florianmichael.viaforge.common.protocoltranslator.provider;
|
|
||||||
|
|
||||||
import com.viaversion.viaversion.api.Via;
|
|
||||||
import com.viaversion.viaversion.api.connection.UserConnection;
|
|
||||||
import de.florianmichael.viaforge.common.ViaForgeCommon;
|
|
||||||
import net.raphimc.vialegacy.protocol.classic.c0_28_30toa1_0_15.provider.ClassicMPPassProvider;
|
|
||||||
import net.raphimc.vialegacy.protocol.release.r1_2_4_5tor1_3_1_2.provider.OldAuthProvider;
|
|
||||||
import net.raphimc.vialegacy.protocol.release.r1_6_4tor1_7_2_5.storage.HandshakeStorage;
|
|
||||||
|
|
||||||
import java.io.InputStream;
|
|
||||||
import java.net.InetAddress;
|
|
||||||
import java.net.URL;
|
|
||||||
import java.security.MessageDigest;
|
|
||||||
import java.util.Formatter;
|
|
||||||
import java.util.Scanner;
|
|
||||||
import java.util.logging.Level;
|
|
||||||
|
|
||||||
public class ViaForgeClassicMPPassProvider extends ClassicMPPassProvider {
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public String getMpPass(UserConnection user) {
|
|
||||||
if (ViaForgeCommon.getManager().getConfig().isAllowBetacraftAuthentication()) {
|
|
||||||
final HandshakeStorage handshakeStorage = user.get(HandshakeStorage.class);
|
|
||||||
|
|
||||||
return getBetacraftMpPass(user, user.getProtocolInfo().getUsername(), handshakeStorage.getHostname(), handshakeStorage.getPort());
|
|
||||||
}
|
|
||||||
return super.getMpPass(user);
|
|
||||||
}
|
|
||||||
|
|
||||||
/*
|
|
||||||
Stolen from https://github.com/FlorianMichael/Classic4J/blob/main/src/main/java/de/florianmichael/classic4j/BetaCraftHandler.java :tm:
|
|
||||||
*/
|
|
||||||
|
|
||||||
private static String getBetacraftMpPass(final UserConnection user, final String username, final String ip, final int port) {
|
|
||||||
try {
|
|
||||||
final String server = InetAddress.getByName(ip).getHostAddress() + ":" + port;
|
|
||||||
|
|
||||||
Via.getManager().getProviders().get(OldAuthProvider.class).sendAuthRequest(user, sha1(server.getBytes()));
|
|
||||||
|
|
||||||
final InputStream connection = new URL("https://api.betacraft.uk/getmppass.jsp?user=" + username + "&server=" + server).openStream();
|
|
||||||
Scanner scanner = new Scanner(connection);
|
|
||||||
StringBuilder response = new StringBuilder();
|
|
||||||
while (scanner.hasNext()) {
|
|
||||||
response.append(scanner.next());
|
|
||||||
}
|
|
||||||
connection.close();
|
|
||||||
|
|
||||||
if (response.toString().contains("FAILED") || response.toString().contains("SERVER NOT FOUND")) return "0";
|
|
||||||
|
|
||||||
return response.toString();
|
|
||||||
} catch (Throwable t) {
|
|
||||||
Via.getPlatform().getLogger().log(Level.WARNING, "An unknown error occurred while authenticating with BetaCraft", t);
|
|
||||||
return "0";
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private static String sha1(final byte[] input) {
|
|
||||||
try {
|
|
||||||
Formatter formatter = new Formatter();
|
|
||||||
final byte[] hash = MessageDigest.getInstance("SHA-1").digest(input);
|
|
||||||
for (byte b : hash) {
|
|
||||||
formatter.format("%02x", b);
|
|
||||||
}
|
|
||||||
return formatter.toString();
|
|
||||||
} catch (Exception e) {
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
@ -1,32 +0,0 @@
|
|||||||
/*
|
|
||||||
* This file is part of ViaForge - https://github.com/FlorianMichael/ViaForge
|
|
||||||
* Copyright (C) 2021-2024 FlorianMichael/EnZaXD <florian.michael07@gmail.com> and contributors
|
|
||||||
*
|
|
||||||
* This program is free software: you can redistribute it and/or modify
|
|
||||||
* it under the terms of the GNU General Public License as published by
|
|
||||||
* the Free Software Foundation, either version 3 of the License, or
|
|
||||||
* (at your option) any later version.
|
|
||||||
*
|
|
||||||
* This program is distributed in the hope that it will be useful,
|
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
||||||
* GNU General Public License for more details.
|
|
||||||
*
|
|
||||||
* You should have received a copy of the GNU General Public License
|
|
||||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
||||||
*/
|
|
||||||
|
|
||||||
package de.florianmichael.viaforge.common.protocoltranslator.provider;
|
|
||||||
|
|
||||||
import com.viaversion.viaversion.api.connection.UserConnection;
|
|
||||||
import de.florianmichael.viaforge.common.ViaForgeCommon;
|
|
||||||
import net.raphimc.vialegacy.protocol.release.r1_6_4tor1_7_2_5.provider.EncryptionProvider;
|
|
||||||
|
|
||||||
public class ViaForgeEncryptionProvider extends EncryptionProvider {
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void enableDecryption(UserConnection user) {
|
|
||||||
user.getChannel().attr(ViaForgeCommon.VF_NETWORK_MANAGER).getAndRemove().viaForge$setupPreNettyDecryption();
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
@ -1,31 +0,0 @@
|
|||||||
/*
|
|
||||||
* This file is part of ViaForge - https://github.com/FlorianMichael/ViaForge
|
|
||||||
* Copyright (C) 2021-2024 FlorianMichael/EnZaXD <florian.michael07@gmail.com> and contributors
|
|
||||||
*
|
|
||||||
* This program is free software: you can redistribute it and/or modify
|
|
||||||
* it under the terms of the GNU General Public License as published by
|
|
||||||
* the Free Software Foundation, either version 3 of the License, or
|
|
||||||
* (at your option) any later version.
|
|
||||||
*
|
|
||||||
* This program is distributed in the hope that it will be useful,
|
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
||||||
* GNU General Public License for more details.
|
|
||||||
*
|
|
||||||
* You should have received a copy of the GNU General Public License
|
|
||||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
||||||
*/
|
|
||||||
|
|
||||||
package de.florianmichael.viaforge.common.protocoltranslator.provider;
|
|
||||||
|
|
||||||
import com.viaversion.viaversion.api.connection.UserConnection;
|
|
||||||
import com.viaversion.viaversion.protocols.v1_8to1_9.provider.MovementTransmitterProvider;
|
|
||||||
|
|
||||||
public class ViaForgeMovementTransmitterProvider extends MovementTransmitterProvider {
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void sendPlayer(UserConnection userConnection) {
|
|
||||||
// We are on the client side, so we can handle the idle packet properly
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
@ -1,36 +0,0 @@
|
|||||||
/*
|
|
||||||
* This file is part of ViaForge - https://github.com/FlorianMichael/ViaForge
|
|
||||||
* Copyright (C) 2021-2024 FlorianMichael/EnZaXD <florian.michael07@gmail.com> and contributors
|
|
||||||
*
|
|
||||||
* This program is free software: you can redistribute it and/or modify
|
|
||||||
* it under the terms of the GNU General Public License as published by
|
|
||||||
* the Free Software Foundation, either version 3 of the License, or
|
|
||||||
* (at your option) any later version.
|
|
||||||
*
|
|
||||||
* This program is distributed in the hope that it will be useful,
|
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
||||||
* GNU General Public License for more details.
|
|
||||||
*
|
|
||||||
* You should have received a copy of the GNU General Public License
|
|
||||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
||||||
*/
|
|
||||||
|
|
||||||
package de.florianmichael.viaforge.common.protocoltranslator.provider;
|
|
||||||
|
|
||||||
import com.viaversion.viaversion.api.connection.UserConnection;
|
|
||||||
import de.florianmichael.viaforge.common.ViaForgeCommon;
|
|
||||||
import net.raphimc.vialegacy.protocol.release.r1_2_4_5tor1_3_1_2.provider.OldAuthProvider;
|
|
||||||
|
|
||||||
public class ViaForgeOldAuthProvider extends OldAuthProvider {
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void sendAuthRequest(UserConnection user, String serverId) throws Throwable {
|
|
||||||
final ViaForgeCommon common = ViaForgeCommon.getManager();
|
|
||||||
if (!common.getConfig().isVerifySessionInOldVersions()) {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
common.getPlatform().joinServer(serverId);
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
@ -1,36 +0,0 @@
|
|||||||
/*
|
|
||||||
* This file is part of ViaForge - https://github.com/FlorianMichael/ViaForge
|
|
||||||
* Copyright (C) 2021-2024 FlorianMichael/EnZaXD <florian.michael07@gmail.com> and contributors
|
|
||||||
*
|
|
||||||
* This program is free software: you can redistribute it and/or modify
|
|
||||||
* it under the terms of the GNU General Public License as published by
|
|
||||||
* the Free Software Foundation, either version 3 of the License, or
|
|
||||||
* (at your option) any later version.
|
|
||||||
*
|
|
||||||
* This program is distributed in the hope that it will be useful,
|
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
||||||
* GNU General Public License for more details.
|
|
||||||
*
|
|
||||||
* You should have received a copy of the GNU General Public License
|
|
||||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
||||||
*/
|
|
||||||
|
|
||||||
package de.florianmichael.viaforge.common.protocoltranslator.provider;
|
|
||||||
|
|
||||||
import com.viaversion.viaversion.api.connection.UserConnection;
|
|
||||||
import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
|
|
||||||
import com.viaversion.viaversion.protocol.version.BaseVersionProvider;
|
|
||||||
import de.florianmichael.viaforge.common.ViaForgeCommon;
|
|
||||||
|
|
||||||
public class ViaForgeVersionProvider extends BaseVersionProvider {
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public ProtocolVersion getClosestServerProtocol(UserConnection connection) throws Exception {
|
|
||||||
if (connection.isClientSide() && !ViaForgeCommon.getManager().getPlatform().isSingleplayer().get()) {
|
|
||||||
return connection.getChannel().attr(ViaForgeCommon.VF_NETWORK_MANAGER).get().viaForge$getTrackedVersion();
|
|
||||||
}
|
|
||||||
return super.getClosestServerProtocol(connection);
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
@ -1,46 +0,0 @@
|
|||||||
# Thanks for downloading ViaForge!
|
|
||||||
# If you need help, you can join our Discord - https://viaversion.com/discord
|
|
||||||
#
|
|
||||||
# Disclaimer:
|
|
||||||
# It cannot be guaranteed that this mod is allowed on specific servers as it can possibly cause problems with anti-cheat plugins
|
|
||||||
# (USE ONLY WITH CAUTION!)
|
|
||||||
#
|
|
||||||
#----------------------------------------------------------#
|
|
||||||
# GLOBAL OPTIONS #
|
|
||||||
#----------------------------------------------------------#
|
|
||||||
#
|
|
||||||
# This option sets the protocol version to be used when connecting to servers. (can also be changed in-game)
|
|
||||||
client-side-version: -1
|
|
||||||
#
|
|
||||||
# Manually sends the joinServer request when connecting to <= 1.2.5 servers.
|
|
||||||
verify-session-in-old-versions: true
|
|
||||||
#
|
|
||||||
# Allow ViaForge to authenticate with BetaCraft's MP-Pass system for <= c0.30 servers.
|
|
||||||
allow-betacraft-authentication: true
|
|
||||||
#
|
|
||||||
# If enabled, ViaForge will show the current protocol version in the F3 menu.
|
|
||||||
show-protocol-version-in-f3: true
|
|
||||||
#
|
|
||||||
#----------------------------------------------------------#
|
|
||||||
# GUI OPTIONS #
|
|
||||||
#----------------------------------------------------------#
|
|
||||||
#
|
|
||||||
# This option indicates if the ViaForge button should be shown in the main menu.
|
|
||||||
show-main-menu-button: true
|
|
||||||
#
|
|
||||||
# This option indicates if the ViaForge button should be shown in the multiplayer.
|
|
||||||
show-multiplayer-button: true
|
|
||||||
#
|
|
||||||
# This option indicates if the ViaForge button should be shown in the direct connect screen.
|
|
||||||
show-direct-connect-button: true
|
|
||||||
#
|
|
||||||
# This option indicates if the ViaForge set version button should be shown in the server list.
|
|
||||||
show-add-server-button: true
|
|
||||||
#
|
|
||||||
# This option indicates where the ViaForge button should be located in all screens.
|
|
||||||
# Possible options: TOP_LEFT, TOP_RIGHT, BOTTOM_LEFT, BOTTOM_RIGHT
|
|
||||||
via-forge-button-position: "TOP_LEFT"
|
|
||||||
#
|
|
||||||
# This option indicates where the ViaForge set version button should be located in the add server screen.
|
|
||||||
# Possible options: TOP_LEFT, TOP_RIGHT, BOTTOM_LEFT, BOTTOM_RIGHT
|
|
||||||
add-server-screen-button-position: "TOP_LEFT"
|
|
Binary file not shown.
Before Width: | Height: | Size: 33 KiB |
@ -1,3 +0,0 @@
|
|||||||
minecraft {
|
|
||||||
mappings channel: "stable", version: "39-1.12"
|
|
||||||
}
|
|
@ -1 +0,0 @@
|
|||||||
forge_version=1.12.2-14.23.5.2859
|
|
@ -1,69 +0,0 @@
|
|||||||
/*
|
|
||||||
* This file is part of ViaForge - https://github.com/FlorianMichael/ViaForge
|
|
||||||
* Copyright (C) 2021-2024 FlorianMichael/EnZaXD <florian.michael07@gmail.com> and contributors
|
|
||||||
*
|
|
||||||
* This program is free software: you can redistribute it and/or modify
|
|
||||||
* it under the terms of the GNU General Public License as published by
|
|
||||||
* the Free Software Foundation, either version 3 of the License, or
|
|
||||||
* (at your option) any later version.
|
|
||||||
*
|
|
||||||
* This program is distributed in the hope that it will be useful,
|
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
||||||
* GNU General Public License for more details.
|
|
||||||
*
|
|
||||||
* You should have received a copy of the GNU General Public License
|
|
||||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
||||||
*/
|
|
||||||
|
|
||||||
package de.florianmichael.viaforge;
|
|
||||||
|
|
||||||
import de.florianmichael.viaforge.common.ViaForgeCommon;
|
|
||||||
import de.florianmichael.viaforge.common.platform.VFPlatform;
|
|
||||||
import de.florianmichael.viaforge.provider.ViaForgeGameProfileFetcher;
|
|
||||||
import net.minecraft.client.Minecraft;
|
|
||||||
import net.minecraft.realms.RealmsSharedConstants;
|
|
||||||
import net.minecraft.util.Session;
|
|
||||||
import net.minecraftforge.fml.common.Mod;
|
|
||||||
import net.minecraftforge.fml.common.event.FMLInitializationEvent;
|
|
||||||
import net.raphimc.vialegacy.protocol.release.r1_7_6_10tor1_8.provider.GameProfileFetcher;
|
|
||||||
|
|
||||||
import java.io.File;
|
|
||||||
import java.util.function.Supplier;
|
|
||||||
|
|
||||||
@Mod(modid = "viaforge", name = "ViaForge", acceptableRemoteVersions = "*", clientSideOnly=true, useMetadata=true)
|
|
||||||
public class ViaForge1122 implements VFPlatform {
|
|
||||||
|
|
||||||
@Mod.EventHandler
|
|
||||||
public void onInit(FMLInitializationEvent event) {
|
|
||||||
ViaForgeCommon.init(this);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public int getGameVersion() {
|
|
||||||
return RealmsSharedConstants.NETWORK_PROTOCOL_VERSION;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public Supplier<Boolean> isSingleplayer() {
|
|
||||||
return () -> Minecraft.getMinecraft().isSingleplayer();
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public File getLeadingDirectory() {
|
|
||||||
return Minecraft.getMinecraft().gameDir;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void joinServer(String serverId) throws Throwable {
|
|
||||||
final Session session = Minecraft.getMinecraft().getSession();
|
|
||||||
|
|
||||||
Minecraft.getMinecraft().getSessionService().joinServer(session.getProfile(), session.getToken(), serverId);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public GameProfileFetcher getGameProfileFetcher() {
|
|
||||||
return new ViaForgeGameProfileFetcher();
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
@ -1,176 +0,0 @@
|
|||||||
/*
|
|
||||||
* This file is part of ViaForge - https://github.com/FlorianMichael/ViaForge
|
|
||||||
* Copyright (C) 2021-2024 FlorianMichael/EnZaXD <florian.michael07@gmail.com> and contributors
|
|
||||||
*
|
|
||||||
* This program is free software: you can redistribute it and/or modify
|
|
||||||
* it under the terms of the GNU General Public License as published by
|
|
||||||
* the Free Software Foundation, either version 3 of the License, or
|
|
||||||
* (at your option) any later version.
|
|
||||||
*
|
|
||||||
* This program is distributed in the hope that it will be useful,
|
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
||||||
* GNU General Public License for more details.
|
|
||||||
*
|
|
||||||
* You should have received a copy of the GNU General Public License
|
|
||||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
||||||
*/
|
|
||||||
|
|
||||||
package de.florianmichael.viaforge.gui;
|
|
||||||
|
|
||||||
import com.mojang.realmsclient.gui.ChatFormatting;
|
|
||||||
import com.viaversion.viaversion.api.Via;
|
|
||||||
import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
|
|
||||||
import com.viaversion.viaversion.util.DumpUtil;
|
|
||||||
import de.florianmichael.viaforge.common.ViaForgeCommon;
|
|
||||||
import net.minecraft.client.Minecraft;
|
|
||||||
import net.minecraft.client.gui.GuiButton;
|
|
||||||
import net.minecraft.client.gui.GuiScreen;
|
|
||||||
import net.minecraft.client.gui.GuiSlot;
|
|
||||||
import net.raphimc.vialoader.util.ProtocolVersionList;
|
|
||||||
import org.lwjgl.input.Keyboard;
|
|
||||||
import org.lwjgl.opengl.GL11;
|
|
||||||
|
|
||||||
import java.io.IOException;
|
|
||||||
import java.util.UUID;
|
|
||||||
import java.util.concurrent.ExecutionException;
|
|
||||||
|
|
||||||
public class GuiProtocolSelector extends GuiScreen {
|
|
||||||
|
|
||||||
private final GuiScreen parent;
|
|
||||||
private final boolean simple;
|
|
||||||
private final FinishedCallback finishedCallback;
|
|
||||||
|
|
||||||
private SlotList list;
|
|
||||||
|
|
||||||
private String status;
|
|
||||||
private long time;
|
|
||||||
|
|
||||||
public GuiProtocolSelector(final GuiScreen parent) {
|
|
||||||
this(parent, false, (version, unused) -> {
|
|
||||||
// Default action is to set the target version and go back to the parent screen.
|
|
||||||
ViaForgeCommon.getManager().setTargetVersion(version);
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
public GuiProtocolSelector(final GuiScreen parent, final boolean simple, final FinishedCallback finishedCallback) {
|
|
||||||
this.parent = parent;
|
|
||||||
this.simple = simple;
|
|
||||||
this.finishedCallback = finishedCallback;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void initGui() {
|
|
||||||
super.initGui();
|
|
||||||
buttonList.add(new GuiButton(1, 5, height - 25, 20, 20, "<-"));
|
|
||||||
if (!this.simple) {
|
|
||||||
buttonList.add(new GuiButton(2, width - 105, 5, 100, 20, "Create dump"));
|
|
||||||
buttonList.add(new GuiButton(3, width - 105, height - 25, 100, 20, "Reload configs"));
|
|
||||||
}
|
|
||||||
|
|
||||||
list = new SlotList(mc, width, height, 3 + 3 /* start offset */ + (fontRenderer.FONT_HEIGHT + 2) * 3 /* title is 2 */, height - 30, fontRenderer.FONT_HEIGHT + 2);
|
|
||||||
}
|
|
||||||
|
|
||||||
public void setStatus(final String status) {
|
|
||||||
this.status = status;
|
|
||||||
this.time = System.currentTimeMillis();
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
protected void actionPerformed(GuiButton button) {
|
|
||||||
list.actionPerformed(button);
|
|
||||||
|
|
||||||
if (button.id == 1) {
|
|
||||||
mc.displayGuiScreen(parent);
|
|
||||||
} else if (button.id == 2) {
|
|
||||||
try {
|
|
||||||
GuiScreen.setClipboardString(DumpUtil.postDump(UUID.randomUUID()).get());
|
|
||||||
setStatus(ChatFormatting.GREEN + "Dump created and copied to clipboard");
|
|
||||||
} catch (InterruptedException | ExecutionException e) {
|
|
||||||
setStatus(ChatFormatting.RED + "Failed to create dump: " + e.getMessage());
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
Via.getManager().getConfigurationProvider().reloadConfigs();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
protected void keyTyped(char typedChar, int keyCode) {
|
|
||||||
if (keyCode == Keyboard.KEY_ESCAPE) {
|
|
||||||
mc.displayGuiScreen(parent);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void handleMouseInput() throws IOException {
|
|
||||||
list.handleMouseInput();
|
|
||||||
super.handleMouseInput();
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void drawScreen(int mouseX, int mouseY, float partialTicks) {
|
|
||||||
if (System.currentTimeMillis() - this.time >= 10_000) {
|
|
||||||
this.status = null;
|
|
||||||
}
|
|
||||||
|
|
||||||
list.drawScreen(mouseX, mouseY, partialTicks);
|
|
||||||
|
|
||||||
GL11.glPushMatrix();
|
|
||||||
GL11.glScalef(2.0F, 2.0F, 2.0F);
|
|
||||||
drawCenteredString(fontRenderer, ChatFormatting.GOLD + "ViaForge", width / 4, 3, 16777215);
|
|
||||||
GL11.glPopMatrix();
|
|
||||||
|
|
||||||
drawCenteredString(fontRenderer, "https://github.com/ViaVersion/ViaForge", width / 2, (fontRenderer.FONT_HEIGHT + 2) * 2 + 3, -1);
|
|
||||||
drawString(fontRenderer, status != null ? status : "Discord: florianmichael", 3, 3, -1);
|
|
||||||
|
|
||||||
super.drawScreen(mouseX, mouseY, partialTicks);
|
|
||||||
}
|
|
||||||
|
|
||||||
class SlotList extends GuiSlot {
|
|
||||||
|
|
||||||
public SlotList(Minecraft client, int width, int height, int top, int bottom, int slotHeight) {
|
|
||||||
super(client, width, height, top, bottom, slotHeight);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
protected int getSize() {
|
|
||||||
return ProtocolVersionList.getProtocolsNewToOld().size();
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
protected void elementClicked(int index, boolean b, int i1, int i2) {
|
|
||||||
finishedCallback.finished(ProtocolVersionList.getProtocolsNewToOld().get(index), parent);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
protected boolean isSelected(int index) {
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
protected void drawBackground() {
|
|
||||||
drawDefaultBackground();
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
protected void drawSlot(int index, int x, int y, int slotHeight, int mouseX, int mouseY, float partialTicks) {
|
|
||||||
final ProtocolVersion targetVersion = ViaForgeCommon.getManager().getTargetVersion();
|
|
||||||
final ProtocolVersion version = ProtocolVersionList.getProtocolsNewToOld().get(index);
|
|
||||||
|
|
||||||
String color;
|
|
||||||
if (targetVersion == version) {
|
|
||||||
color = GuiProtocolSelector.this.simple ? ChatFormatting.GOLD.toString() : ChatFormatting.GREEN.toString();
|
|
||||||
} else {
|
|
||||||
color = GuiProtocolSelector.this.simple ? ChatFormatting.WHITE.toString() : ChatFormatting.DARK_RED.toString();
|
|
||||||
}
|
|
||||||
|
|
||||||
drawCenteredString(mc.fontRenderer,(color) + version.getName(), width / 2, y, -1);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
public interface FinishedCallback {
|
|
||||||
|
|
||||||
void finished(final ProtocolVersion version, final GuiScreen parent);
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
@ -1,55 +0,0 @@
|
|||||||
/*
|
|
||||||
* This file is part of ViaForge - https://github.com/FlorianMichael/ViaForge
|
|
||||||
* Copyright (C) 2021-2024 FlorianMichael/EnZaXD <florian.michael07@gmail.com> and contributors
|
|
||||||
*
|
|
||||||
* This program is free software: you can redistribute it and/or modify
|
|
||||||
* it under the terms of the GNU General Public License as published by
|
|
||||||
* the Free Software Foundation, either version 3 of the License, or
|
|
||||||
* (at your option) any later version.
|
|
||||||
*
|
|
||||||
* This program is distributed in the hope that it will be useful,
|
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
||||||
* GNU General Public License for more details.
|
|
||||||
*
|
|
||||||
* You should have received a copy of the GNU General Public License
|
|
||||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
||||||
*/
|
|
||||||
|
|
||||||
package de.florianmichael.viaforge.mixin.impl;
|
|
||||||
|
|
||||||
import com.viaversion.viaversion.util.Pair;
|
|
||||||
import de.florianmichael.viaforge.common.ViaForgeCommon;
|
|
||||||
import de.florianmichael.viaforge.common.platform.ViaForgeConfig;
|
|
||||||
import de.florianmichael.viaforge.gui.GuiProtocolSelector;
|
|
||||||
import net.minecraft.client.gui.GuiButton;
|
|
||||||
import net.minecraft.client.gui.GuiMainMenu;
|
|
||||||
import net.minecraft.client.gui.GuiScreen;
|
|
||||||
import org.spongepowered.asm.mixin.Mixin;
|
|
||||||
import org.spongepowered.asm.mixin.injection.At;
|
|
||||||
import org.spongepowered.asm.mixin.injection.Inject;
|
|
||||||
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
|
|
||||||
|
|
||||||
@Mixin(GuiMainMenu.class)
|
|
||||||
public class MixinGuiMainMenu extends GuiScreen {
|
|
||||||
|
|
||||||
@Inject(method = "initGui", at = @At("RETURN"))
|
|
||||||
public void hookViaForgeButton(CallbackInfo ci) {
|
|
||||||
final ViaForgeConfig config = ViaForgeCommon.getManager().getConfig();
|
|
||||||
if (config.isShowMainMenuButton()) {
|
|
||||||
final Pair<Integer, Integer> pos = config.getViaForgeButtonPosition().getPosition(this.width, this.height);
|
|
||||||
|
|
||||||
buttonList.add(new GuiButton(1_000_000_000, pos.key(), pos.value(), 100, 20, "ViaForge"));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@Inject(method = "actionPerformed", at = @At("RETURN"))
|
|
||||||
public void handleViaForgeButtonClicking(GuiButton p_actionPerformed_1_, CallbackInfo ci) {
|
|
||||||
if (ViaForgeCommon.getManager().getConfig().isShowMainMenuButton()) {
|
|
||||||
if (p_actionPerformed_1_.id == 1_000_000_000) {
|
|
||||||
mc.displayGuiScreen(new GuiProtocolSelector(this));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
@ -1,45 +0,0 @@
|
|||||||
/*
|
|
||||||
* This file is part of ViaForge - https://github.com/FlorianMichael/ViaForge
|
|
||||||
* Copyright (C) 2021-2024 FlorianMichael/EnZaXD <florian.michael07@gmail.com> and contributors
|
|
||||||
*
|
|
||||||
* This program is free software: you can redistribute it and/or modify
|
|
||||||
* it under the terms of the GNU General Public License as published by
|
|
||||||
* the Free Software Foundation, either version 3 of the License, or
|
|
||||||
* (at your option) any later version.
|
|
||||||
*
|
|
||||||
* This program is distributed in the hope that it will be useful,
|
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
||||||
* GNU General Public License for more details.
|
|
||||||
*
|
|
||||||
* You should have received a copy of the GNU General Public License
|
|
||||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
||||||
*/
|
|
||||||
|
|
||||||
package de.florianmichael.viaforge.mixin.impl;
|
|
||||||
|
|
||||||
import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
|
|
||||||
import de.florianmichael.viaforge.common.ViaForgeCommon;
|
|
||||||
import net.minecraft.client.gui.GuiOverlayDebug;
|
|
||||||
import org.spongepowered.asm.mixin.Mixin;
|
|
||||||
import org.spongepowered.asm.mixin.injection.At;
|
|
||||||
import org.spongepowered.asm.mixin.injection.Inject;
|
|
||||||
import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
|
|
||||||
|
|
||||||
import java.util.List;
|
|
||||||
|
|
||||||
@Mixin(GuiOverlayDebug.class)
|
|
||||||
public class MixinGuiOverlayDebug {
|
|
||||||
|
|
||||||
@Inject(method = "getDebugInfoRight", at = @At(value = "TAIL"))
|
|
||||||
public void addViaForgeVersion(CallbackInfoReturnable<List<String>> cir) {
|
|
||||||
final ViaForgeCommon common = ViaForgeCommon.getManager();
|
|
||||||
final ProtocolVersion version = ViaForgeCommon.getManager().getTargetVersion();
|
|
||||||
|
|
||||||
if (common.getConfig().isShowProtocolVersionInF3() && version != common.getNativeVersion() && !common.getPlatform().isSingleplayer().get()) {
|
|
||||||
cir.getReturnValue().add("");
|
|
||||||
cir.getReturnValue().add("ViaForge: " + version.toString());
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
@ -1,68 +0,0 @@
|
|||||||
/*
|
|
||||||
* This file is part of ViaForge - https://github.com/FlorianMichael/ViaForge
|
|
||||||
* Copyright (C) 2021-2024 FlorianMichael/EnZaXD <florian.michael07@gmail.com> and contributors
|
|
||||||
*
|
|
||||||
* This program is free software: you can redistribute it and/or modify
|
|
||||||
* it under the terms of the GNU General Public License as published by
|
|
||||||
* the Free Software Foundation, either version 3 of the License, or
|
|
||||||
* (at your option) any later version.
|
|
||||||
*
|
|
||||||
* This program is distributed in the hope that it will be useful,
|
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
||||||
* GNU General Public License for more details.
|
|
||||||
*
|
|
||||||
* You should have received a copy of the GNU General Public License
|
|
||||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
||||||
*/
|
|
||||||
|
|
||||||
package de.florianmichael.viaforge.mixin.impl;
|
|
||||||
|
|
||||||
import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
|
|
||||||
import com.viaversion.viaversion.util.Pair;
|
|
||||||
import de.florianmichael.viaforge.common.ViaForgeCommon;
|
|
||||||
import de.florianmichael.viaforge.common.gui.ExtendedServerData;
|
|
||||||
import de.florianmichael.viaforge.common.platform.ViaForgeConfig;
|
|
||||||
import de.florianmichael.viaforge.gui.GuiProtocolSelector;
|
|
||||||
import net.minecraft.client.gui.GuiButton;
|
|
||||||
import net.minecraft.client.gui.GuiScreen;
|
|
||||||
import net.minecraft.client.gui.GuiScreenAddServer;
|
|
||||||
import net.minecraft.client.multiplayer.ServerData;
|
|
||||||
import org.spongepowered.asm.mixin.Final;
|
|
||||||
import org.spongepowered.asm.mixin.Mixin;
|
|
||||||
import org.spongepowered.asm.mixin.Shadow;
|
|
||||||
import org.spongepowered.asm.mixin.injection.At;
|
|
||||||
import org.spongepowered.asm.mixin.injection.Inject;
|
|
||||||
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
|
|
||||||
|
|
||||||
@Mixin(GuiScreenAddServer.class)
|
|
||||||
public class MixinGuiScreenAddServer extends GuiScreen {
|
|
||||||
|
|
||||||
@Shadow @Final private ServerData serverData;
|
|
||||||
|
|
||||||
@Inject(method = "initGui", at = @At("RETURN"))
|
|
||||||
public void initGui(CallbackInfo ci) {
|
|
||||||
final ViaForgeConfig config = ViaForgeCommon.getManager().getConfig();
|
|
||||||
|
|
||||||
if (config.isShowAddServerButton()) {
|
|
||||||
final Pair<Integer, Integer> pos = config.getAddServerScreenButtonPosition().getPosition(this.width, this.height);
|
|
||||||
|
|
||||||
final ProtocolVersion target = ((ExtendedServerData) serverData).viaForge$getVersion();
|
|
||||||
buttonList.add(new GuiButton(1_000_000_000, pos.key(), pos.value(), 100, 20, target != null ? target.getName() : "Set Version"));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@Inject(method = "actionPerformed", at = @At("HEAD"))
|
|
||||||
public void actionPerformed(GuiButton button, CallbackInfo ci) {
|
|
||||||
if (ViaForgeCommon.getManager().getConfig().isShowAddServerButton()) {
|
|
||||||
if (button.id == 1_000_000_000) {
|
|
||||||
mc.displayGuiScreen(new GuiProtocolSelector(this, true, (version, parent) -> {
|
|
||||||
// Set version and go back to the parent screen.
|
|
||||||
((ExtendedServerData) serverData).viaForge$setVersion(version);
|
|
||||||
mc.displayGuiScreen(parent);
|
|
||||||
}));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
@ -1,70 +0,0 @@
|
|||||||
/*
|
|
||||||
* This file is part of ViaForge - https://github.com/FlorianMichael/ViaForge
|
|
||||||
* Copyright (C) 2021-2024 FlorianMichael/EnZaXD <florian.michael07@gmail.com> and contributors
|
|
||||||
*
|
|
||||||
* This program is free software: you can redistribute it and/or modify
|
|
||||||
* it under the terms of the GNU General Public License as published by
|
|
||||||
* the Free Software Foundation, either version 3 of the License, or
|
|
||||||
* (at your option) any later version.
|
|
||||||
*
|
|
||||||
* This program is distributed in the hope that it will be useful,
|
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
||||||
* GNU General Public License for more details.
|
|
||||||
*
|
|
||||||
* You should have received a copy of the GNU General Public License
|
|
||||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
||||||
*/
|
|
||||||
|
|
||||||
package de.florianmichael.viaforge.mixin.impl;
|
|
||||||
|
|
||||||
import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
|
|
||||||
import de.florianmichael.viaforge.common.gui.ExtendedServerData;
|
|
||||||
import net.minecraft.client.multiplayer.ServerData;
|
|
||||||
import net.minecraft.nbt.NBTTagCompound;
|
|
||||||
import org.spongepowered.asm.mixin.Mixin;
|
|
||||||
import org.spongepowered.asm.mixin.Unique;
|
|
||||||
import org.spongepowered.asm.mixin.injection.At;
|
|
||||||
import org.spongepowered.asm.mixin.injection.Inject;
|
|
||||||
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
|
|
||||||
import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
|
|
||||||
import org.spongepowered.asm.mixin.injection.callback.LocalCapture;
|
|
||||||
|
|
||||||
@Mixin(ServerData.class)
|
|
||||||
public class MixinServerData implements ExtendedServerData {
|
|
||||||
|
|
||||||
@Unique
|
|
||||||
private ProtocolVersion viaForge$version;
|
|
||||||
|
|
||||||
@Inject(method = "getNBTCompound", at = @At(value = "INVOKE", target = "Lnet/minecraft/nbt/NBTTagCompound;setString(Ljava/lang/String;Ljava/lang/String;)V", ordinal = 0), locals = LocalCapture.CAPTURE_FAILHARD)
|
|
||||||
public void saveVersion(CallbackInfoReturnable<NBTTagCompound> cir, NBTTagCompound nbttagcompound) {
|
|
||||||
if (viaForge$version != null) {
|
|
||||||
nbttagcompound.setString("viaForge$version", viaForge$version.getName());
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@Inject(method = "getServerDataFromNBTCompound", at = @At(value = "TAIL"))
|
|
||||||
private static void getVersion(NBTTagCompound nbtCompound, CallbackInfoReturnable<ServerData> cir) {
|
|
||||||
if (nbtCompound.hasKey("viaForge$version")) {
|
|
||||||
((ExtendedServerData) cir.getReturnValue()).viaForge$setVersion(ProtocolVersion.getClosest(nbtCompound.getString("viaForge$version")));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@Inject(method = "copyFrom", at = @At("HEAD"))
|
|
||||||
public void track(ServerData serverDataIn, CallbackInfo ci) {
|
|
||||||
if (serverDataIn instanceof ExtendedServerData) {
|
|
||||||
viaForge$version = ((ExtendedServerData) serverDataIn).viaForge$getVersion();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public ProtocolVersion viaForge$getVersion() {
|
|
||||||
return viaForge$version;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void viaForge$setVersion(ProtocolVersion version) {
|
|
||||||
viaForge$version = version;
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
@ -1,47 +0,0 @@
|
|||||||
/*
|
|
||||||
* This file is part of ViaForge - https://github.com/FlorianMichael/ViaForge
|
|
||||||
* Copyright (C) 2021-2024 FlorianMichael/EnZaXD <florian.michael07@gmail.com> and contributors
|
|
||||||
*
|
|
||||||
* This program is free software: you can redistribute it and/or modify
|
|
||||||
* it under the terms of the GNU General Public License as published by
|
|
||||||
* the Free Software Foundation, either version 3 of the License, or
|
|
||||||
* (at your option) any later version.
|
|
||||||
*
|
|
||||||
* This program is distributed in the hope that it will be useful,
|
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
||||||
* GNU General Public License for more details.
|
|
||||||
*
|
|
||||||
* You should have received a copy of the GNU General Public License
|
|
||||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
||||||
*/
|
|
||||||
|
|
||||||
package de.florianmichael.viaforge.mixin.impl.connect;
|
|
||||||
|
|
||||||
import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
|
|
||||||
import de.florianmichael.viaforge.common.ViaForgeCommon;
|
|
||||||
import de.florianmichael.viaforge.common.gui.ExtendedServerData;
|
|
||||||
import de.florianmichael.viaforge.common.platform.VersionTracker;
|
|
||||||
import net.minecraft.client.Minecraft;
|
|
||||||
import org.spongepowered.asm.mixin.Mixin;
|
|
||||||
import org.spongepowered.asm.mixin.injection.At;
|
|
||||||
import org.spongepowered.asm.mixin.injection.Redirect;
|
|
||||||
|
|
||||||
import java.net.InetAddress;
|
|
||||||
import java.net.UnknownHostException;
|
|
||||||
|
|
||||||
@Mixin(targets = "net.minecraft.client.multiplayer.GuiConnecting$1")
|
|
||||||
public class MixinGuiConnecting_1 {
|
|
||||||
|
|
||||||
@Redirect(method = "run", at = @At(value = "INVOKE", target = "Ljava/net/InetAddress;getByName(Ljava/lang/String;)Ljava/net/InetAddress;"))
|
|
||||||
public InetAddress trackServerVersion(String s) throws UnknownHostException {
|
|
||||||
final InetAddress address = InetAddress.getByName(s);
|
|
||||||
ProtocolVersion version = ((ExtendedServerData) Minecraft.getMinecraft().getCurrentServerData()).viaForge$getVersion();
|
|
||||||
if (version == null) {
|
|
||||||
version = ViaForgeCommon.getManager().getTargetVersion();
|
|
||||||
}
|
|
||||||
VersionTracker.storeServerProtocolVersion(address, version);
|
|
||||||
return address;
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
@ -1,58 +0,0 @@
|
|||||||
/*
|
|
||||||
* This file is part of ViaForge - https://github.com/FlorianMichael/ViaForge
|
|
||||||
* Copyright (C) 2021-2024 FlorianMichael/EnZaXD <florian.michael07@gmail.com> and contributors
|
|
||||||
*
|
|
||||||
* This program is free software: you can redistribute it and/or modify
|
|
||||||
* it under the terms of the GNU General Public License as published by
|
|
||||||
* the Free Software Foundation, either version 3 of the License, or
|
|
||||||
* (at your option) any later version.
|
|
||||||
*
|
|
||||||
* This program is distributed in the hope that it will be useful,
|
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
||||||
* GNU General Public License for more details.
|
|
||||||
*
|
|
||||||
* You should have received a copy of the GNU General Public License
|
|
||||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
||||||
*/
|
|
||||||
|
|
||||||
package de.florianmichael.viaforge.mixin.impl.connect;
|
|
||||||
|
|
||||||
import com.mojang.authlib.GameProfile;
|
|
||||||
import com.mojang.authlib.exceptions.AuthenticationException;
|
|
||||||
import com.mojang.authlib.minecraft.MinecraftSessionService;
|
|
||||||
import com.viaversion.viaversion.api.connection.UserConnection;
|
|
||||||
import de.florianmichael.viaforge.common.ViaForgeCommon;
|
|
||||||
import de.florianmichael.viaforge.common.protocoltranslator.netty.VFNetworkManager;
|
|
||||||
import net.minecraft.client.network.NetHandlerLoginClient;
|
|
||||||
import net.minecraft.network.NetworkManager;
|
|
||||||
import net.raphimc.vialegacy.api.LegacyProtocolVersion;
|
|
||||||
import net.raphimc.vialegacy.protocol.release.r1_6_4tor1_7_2_5.storage.ProtocolMetadataStorage;
|
|
||||||
import org.spongepowered.asm.mixin.Final;
|
|
||||||
import org.spongepowered.asm.mixin.Mixin;
|
|
||||||
import org.spongepowered.asm.mixin.Shadow;
|
|
||||||
import org.spongepowered.asm.mixin.injection.At;
|
|
||||||
import org.spongepowered.asm.mixin.injection.Redirect;
|
|
||||||
|
|
||||||
@SuppressWarnings("DataFlowIssue")
|
|
||||||
@Mixin(NetHandlerLoginClient.class)
|
|
||||||
public class MixinNetHandlerLoginClient {
|
|
||||||
|
|
||||||
@Shadow @Final private NetworkManager networkManager;
|
|
||||||
|
|
||||||
@Redirect(method = "handleEncryptionRequest", at = @At(value = "INVOKE", target = "Lcom/mojang/authlib/minecraft/MinecraftSessionService;joinServer(Lcom/mojang/authlib/GameProfile;Ljava/lang/String;Ljava/lang/String;)V"))
|
|
||||||
public void onlyJoinServerIfPremium(MinecraftSessionService instance, GameProfile profile, String authenticationToken, String serverId) throws AuthenticationException {
|
|
||||||
final VFNetworkManager mixinNetworkManager = (VFNetworkManager) networkManager;
|
|
||||||
if (mixinNetworkManager.viaForge$getTrackedVersion().olderThanOrEqualTo(LegacyProtocolVersion.r1_6_4)) {
|
|
||||||
final UserConnection user = networkManager.channel().attr(ViaForgeCommon.VF_VIA_USER).get();
|
|
||||||
if (user != null && user.has(ProtocolMetadataStorage.class) && !user.get(ProtocolMetadataStorage.class).authenticate) {
|
|
||||||
// We are in the 1.7 -> 1.6 protocol, so we need to skip the joinServer call
|
|
||||||
// if the server is in offline mode, due the packet changes <-> networking changes
|
|
||||||
// Minecraft's networking code is bad for us.
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
instance.joinServer(profile, authenticationToken, serverId);
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
@ -1,102 +0,0 @@
|
|||||||
/*
|
|
||||||
* This file is part of ViaForge - https://github.com/FlorianMichael/ViaForge
|
|
||||||
* Copyright (C) 2021-2024 FlorianMichael/EnZaXD <florian.michael07@gmail.com> and contributors
|
|
||||||
*
|
|
||||||
* This program is free software: you can redistribute it and/or modify
|
|
||||||
* it under the terms of the GNU General Public License as published by
|
|
||||||
* the Free Software Foundation, either version 3 of the License, or
|
|
||||||
* (at your option) any later version.
|
|
||||||
*
|
|
||||||
* This program is distributed in the hope that it will be useful,
|
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
||||||
* GNU General Public License for more details.
|
|
||||||
*
|
|
||||||
* You should have received a copy of the GNU General Public License
|
|
||||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
||||||
*/
|
|
||||||
|
|
||||||
package de.florianmichael.viaforge.mixin.impl.connect;
|
|
||||||
|
|
||||||
import de.florianmichael.viaforge.common.ViaForgeCommon;
|
|
||||||
import de.florianmichael.viaforge.common.platform.VersionTracker;
|
|
||||||
import de.florianmichael.viaforge.common.protocoltranslator.netty.VFNetworkManager;
|
|
||||||
import io.netty.channel.Channel;
|
|
||||||
import net.minecraft.network.NettyEncryptingDecoder;
|
|
||||||
import net.minecraft.network.NettyEncryptingEncoder;
|
|
||||||
import net.minecraft.network.NetworkManager;
|
|
||||||
import net.minecraft.util.CryptManager;
|
|
||||||
import net.minecraft.util.LazyLoadBase;
|
|
||||||
import net.raphimc.vialegacy.api.LegacyProtocolVersion;
|
|
||||||
import net.raphimc.vialoader.netty.VLLegacyPipeline;
|
|
||||||
import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
|
|
||||||
import org.spongepowered.asm.mixin.Mixin;
|
|
||||||
import org.spongepowered.asm.mixin.Shadow;
|
|
||||||
import org.spongepowered.asm.mixin.Unique;
|
|
||||||
import org.spongepowered.asm.mixin.injection.At;
|
|
||||||
import org.spongepowered.asm.mixin.injection.Inject;
|
|
||||||
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
|
|
||||||
import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
|
|
||||||
import org.spongepowered.asm.mixin.injection.callback.LocalCapture;
|
|
||||||
|
|
||||||
import javax.crypto.Cipher;
|
|
||||||
import javax.crypto.SecretKey;
|
|
||||||
import java.net.InetAddress;
|
|
||||||
|
|
||||||
@Mixin(NetworkManager.class)
|
|
||||||
public class MixinNetworkManager implements VFNetworkManager {
|
|
||||||
|
|
||||||
@Shadow private Channel channel;
|
|
||||||
|
|
||||||
@Shadow private boolean isEncrypted;
|
|
||||||
@Unique
|
|
||||||
private Cipher viaForge$decryptionCipher;
|
|
||||||
|
|
||||||
@Unique
|
|
||||||
private ProtocolVersion viaForge$targetVersion;
|
|
||||||
|
|
||||||
@Inject(method = "setCompressionThreshold", at = @At("RETURN"))
|
|
||||||
public void reorderPipeline(int p_setCompressionTreshold_1_, CallbackInfo ci) {
|
|
||||||
ViaForgeCommon.getManager().reorderCompression(channel);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Inject(method = "enableEncryption", at = @At("HEAD"), cancellable = true)
|
|
||||||
private void storeEncryptionCiphers(SecretKey key, CallbackInfo ci) {
|
|
||||||
if (viaForge$targetVersion != null && viaForge$targetVersion.olderThanOrEqualTo(LegacyProtocolVersion.r1_6_4)) {
|
|
||||||
// Minecraft's encryption code is bad for us, we need to reorder the pipeline
|
|
||||||
ci.cancel();
|
|
||||||
|
|
||||||
// Minecraft 1.6.4 supports tile encryption which means the server can only enable one side of the encryption
|
|
||||||
// So we only enable the encryption side and later enable the decryption side if the 1.7 -> 1.6 protocol
|
|
||||||
// tells us to do, therefore we need to store the cipher instance.
|
|
||||||
this.viaForge$decryptionCipher = CryptManager.createNetCipherInstance(2, key);
|
|
||||||
|
|
||||||
// Enabling the encryption side
|
|
||||||
this.isEncrypted = true;
|
|
||||||
this.channel.pipeline().addBefore(VLLegacyPipeline.VIALEGACY_PRE_NETTY_LENGTH_REMOVER_NAME, "encrypt", new NettyEncryptingEncoder(CryptManager.createNetCipherInstance(1, key)));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@Inject(method = "createNetworkManagerAndConnect", at = @At(value = "INVOKE", target = "Lio/netty/bootstrap/Bootstrap;group(Lio/netty/channel/EventLoopGroup;)Lio/netty/bootstrap/AbstractBootstrap;"), locals = LocalCapture.CAPTURE_FAILHARD)
|
|
||||||
private static void setTargetVersion(InetAddress address, int serverPort, boolean useNativeTransport, CallbackInfoReturnable<NetworkManager> cir, NetworkManager networkmanager, Class oclass, LazyLoadBase lazyloadbase) {
|
|
||||||
final VFNetworkManager mixinNetworkManager = (VFNetworkManager) networkmanager;
|
|
||||||
mixinNetworkManager.viaForge$setTrackedVersion(VersionTracker.getServerProtocolVersion(address));
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void viaForge$setupPreNettyDecryption() {
|
|
||||||
// Enabling the decryption side for 1.6.4 if the 1.7 -> 1.6 protocol tells us to do
|
|
||||||
this.channel.pipeline().addBefore(VLLegacyPipeline.VIALEGACY_PRE_NETTY_LENGTH_REMOVER_NAME, "decrypt", new NettyEncryptingDecoder(this.viaForge$decryptionCipher));
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public ProtocolVersion viaForge$getTrackedVersion() {
|
|
||||||
return viaForge$targetVersion;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void viaForge$setTrackedVersion(ProtocolVersion version) {
|
|
||||||
viaForge$targetVersion = version;
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
@ -1,60 +0,0 @@
|
|||||||
/*
|
|
||||||
* This file is part of ViaForge - https://github.com/FlorianMichael/ViaForge
|
|
||||||
* Copyright (C) 2021-2024 FlorianMichael/EnZaXD <florian.michael07@gmail.com> and contributors
|
|
||||||
*
|
|
||||||
* This program is free software: you can redistribute it and/or modify
|
|
||||||
* it under the terms of the GNU General Public License as published by
|
|
||||||
* the Free Software Foundation, either version 3 of the License, or
|
|
||||||
* (at your option) any later version.
|
|
||||||
*
|
|
||||||
* This program is distributed in the hope that it will be useful,
|
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
||||||
* GNU General Public License for more details.
|
|
||||||
*
|
|
||||||
* You should have received a copy of the GNU General Public License
|
|
||||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
||||||
*/
|
|
||||||
|
|
||||||
package de.florianmichael.viaforge.mixin.impl.connect;
|
|
||||||
|
|
||||||
import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
|
|
||||||
import de.florianmichael.viaforge.common.ViaForgeCommon;
|
|
||||||
import de.florianmichael.viaforge.common.gui.ExtendedServerData;
|
|
||||||
import de.florianmichael.viaforge.common.platform.VersionTracker;
|
|
||||||
import net.minecraft.client.multiplayer.ServerData;
|
|
||||||
import net.minecraft.client.network.ServerPinger;
|
|
||||||
import net.minecraft.network.NetworkManager;
|
|
||||||
import org.spongepowered.asm.mixin.Mixin;
|
|
||||||
import org.spongepowered.asm.mixin.Unique;
|
|
||||||
import org.spongepowered.asm.mixin.injection.At;
|
|
||||||
import org.spongepowered.asm.mixin.injection.Inject;
|
|
||||||
import org.spongepowered.asm.mixin.injection.Redirect;
|
|
||||||
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
|
|
||||||
|
|
||||||
import java.net.InetAddress;
|
|
||||||
|
|
||||||
@Mixin(ServerPinger.class)
|
|
||||||
public class MixinServerPinger {
|
|
||||||
|
|
||||||
@Unique
|
|
||||||
private ServerData viaForge$serverData;
|
|
||||||
|
|
||||||
@Inject(method = "ping", at = @At("HEAD"))
|
|
||||||
public void trackServerData(ServerData server, CallbackInfo ci) {
|
|
||||||
viaForge$serverData = server;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Redirect(method = "ping", at = @At(value = "INVOKE", target = "Lnet/minecraft/network/NetworkManager;createNetworkManagerAndConnect(Ljava/net/InetAddress;IZ)Lnet/minecraft/network/NetworkManager;"))
|
|
||||||
public NetworkManager trackVersion(InetAddress address, int i, boolean b) {
|
|
||||||
ProtocolVersion version = ((ExtendedServerData) viaForge$serverData).viaForge$getVersion();
|
|
||||||
if (version == null) {
|
|
||||||
version = ViaForgeCommon.getManager().getTargetVersion();
|
|
||||||
}
|
|
||||||
VersionTracker.storeServerProtocolVersion(address, version);
|
|
||||||
viaForge$serverData = null;
|
|
||||||
|
|
||||||
return NetworkManager.createNetworkManagerAndConnect(address, i, b);
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
@ -1,56 +0,0 @@
|
|||||||
/*
|
|
||||||
* This file is part of ViaForge - https://github.com/FlorianMichael/ViaForge
|
|
||||||
* Copyright (C) 2021-2024 FlorianMichael/EnZaXD <florian.michael07@gmail.com> and contributors
|
|
||||||
*
|
|
||||||
* This program is free software: you can redistribute it and/or modify
|
|
||||||
* it under the terms of the GNU General Public License as published by
|
|
||||||
* the Free Software Foundation, either version 3 of the License, or
|
|
||||||
* (at your option) any later version.
|
|
||||||
*
|
|
||||||
* This program is distributed in the hope that it will be useful,
|
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
||||||
* GNU General Public License for more details.
|
|
||||||
*
|
|
||||||
* You should have received a copy of the GNU General Public License
|
|
||||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
||||||
*/
|
|
||||||
|
|
||||||
package de.florianmichael.viaforge.mixin.impl.fixes;
|
|
||||||
|
|
||||||
import com.mojang.authlib.GameProfile;
|
|
||||||
import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
|
|
||||||
import de.florianmichael.viaforge.common.ViaForgeCommon;
|
|
||||||
import net.minecraft.client.entity.AbstractClientPlayer;
|
|
||||||
import net.minecraft.client.entity.EntityPlayerSP;
|
|
||||||
import net.minecraft.world.World;
|
|
||||||
import org.spongepowered.asm.mixin.Mixin;
|
|
||||||
import org.spongepowered.asm.mixin.Shadow;
|
|
||||||
import org.spongepowered.asm.mixin.injection.At;
|
|
||||||
import org.spongepowered.asm.mixin.injection.Redirect;
|
|
||||||
|
|
||||||
@Mixin(EntityPlayerSP.class)
|
|
||||||
public class MixinEntityPlayerSP extends AbstractClientPlayer {
|
|
||||||
|
|
||||||
@Shadow private boolean prevOnGround;
|
|
||||||
|
|
||||||
public MixinEntityPlayerSP(World worldIn, GameProfile playerProfile) {
|
|
||||||
super(worldIn, playerProfile);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Redirect(method = "onUpdateWalkingPlayer", at = @At(value = "FIELD", target = "Lnet/minecraft/client/entity/EntityPlayerSP;prevOnGround:Z", ordinal = 0))
|
|
||||||
public boolean emulateIdlePacket(EntityPlayerSP instance) {
|
|
||||||
if (ViaForgeCommon.getManager().getTargetVersion().olderThanOrEqualTo(ProtocolVersion.v1_8)) {
|
|
||||||
// <= 1.8 spams the idle packet instead of only sending it when the ground state changes
|
|
||||||
// So we invert the original logic:
|
|
||||||
// if (prevOnGround != onGround) sendPacket
|
|
||||||
// To be like:
|
|
||||||
// if (!onGround != onGround) sendPacket
|
|
||||||
// Which is the same as:
|
|
||||||
// if (true) sendPacket
|
|
||||||
return !onGround;
|
|
||||||
}
|
|
||||||
return prevOnGround;
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
@ -1,77 +0,0 @@
|
|||||||
/*
|
|
||||||
* This file is part of ViaForge - https://github.com/FlorianMichael/ViaForge
|
|
||||||
* Copyright (C) 2021-2024 FlorianMichael/EnZaXD <florian.michael07@gmail.com> and contributors
|
|
||||||
*
|
|
||||||
* This program is free software: you can redistribute it and/or modify
|
|
||||||
* it under the terms of the GNU General Public License as published by
|
|
||||||
* the Free Software Foundation, either version 3 of the License, or
|
|
||||||
* (at your option) any later version.
|
|
||||||
*
|
|
||||||
* This program is distributed in the hope that it will be useful,
|
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
||||||
* GNU General Public License for more details.
|
|
||||||
*
|
|
||||||
* You should have received a copy of the GNU General Public License
|
|
||||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
||||||
*/
|
|
||||||
|
|
||||||
package de.florianmichael.viaforge.provider;
|
|
||||||
|
|
||||||
import com.mojang.authlib.Agent;
|
|
||||||
import com.mojang.authlib.GameProfileRepository;
|
|
||||||
import com.mojang.authlib.HttpAuthenticationService;
|
|
||||||
import com.mojang.authlib.ProfileLookupCallback;
|
|
||||||
import com.mojang.authlib.minecraft.MinecraftSessionService;
|
|
||||||
import com.mojang.authlib.properties.Property;
|
|
||||||
import com.mojang.authlib.yggdrasil.ProfileNotFoundException;
|
|
||||||
import com.mojang.authlib.yggdrasil.YggdrasilAuthenticationService;
|
|
||||||
import net.raphimc.vialegacy.protocol.release.r1_7_6_10tor1_8.model.GameProfile;
|
|
||||||
import net.raphimc.vialegacy.protocol.release.r1_7_6_10tor1_8.provider.GameProfileFetcher;
|
|
||||||
|
|
||||||
import java.net.Proxy;
|
|
||||||
import java.util.UUID;
|
|
||||||
import java.util.concurrent.CompletableFuture;
|
|
||||||
|
|
||||||
public class ViaForgeGameProfileFetcher extends GameProfileFetcher {
|
|
||||||
|
|
||||||
public static final HttpAuthenticationService AUTHENTICATION_SERVICE = new YggdrasilAuthenticationService(Proxy.NO_PROXY, "");
|
|
||||||
public static final MinecraftSessionService SESSION_SERVICE = AUTHENTICATION_SERVICE.createMinecraftSessionService();
|
|
||||||
public static final GameProfileRepository GAME_PROFILE_REPOSITORY = AUTHENTICATION_SERVICE.createProfileRepository();
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public UUID loadMojangUUID(String playerName) throws Exception {
|
|
||||||
final CompletableFuture<com.mojang.authlib.GameProfile> future = new CompletableFuture<>();
|
|
||||||
GAME_PROFILE_REPOSITORY.findProfilesByNames(new String[]{playerName}, Agent.MINECRAFT, new ProfileLookupCallback() {
|
|
||||||
@Override
|
|
||||||
public void onProfileLookupSucceeded(com.mojang.authlib.GameProfile profile) {
|
|
||||||
future.complete(profile);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void onProfileLookupFailed(com.mojang.authlib.GameProfile profile, Exception exception) {
|
|
||||||
future.completeExceptionally(exception);
|
|
||||||
}
|
|
||||||
});
|
|
||||||
if (!future.isDone()) {
|
|
||||||
future.completeExceptionally(new ProfileNotFoundException());
|
|
||||||
}
|
|
||||||
return future.get().getId();
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public GameProfile loadGameProfile(UUID uuid) {
|
|
||||||
final com.mojang.authlib.GameProfile inProfile = new com.mojang.authlib.GameProfile(uuid, null);
|
|
||||||
final com.mojang.authlib.GameProfile mojangProfile = SESSION_SERVICE.fillProfileProperties(inProfile, true);
|
|
||||||
if (mojangProfile.equals(inProfile)) throw new ProfileNotFoundException();
|
|
||||||
|
|
||||||
final GameProfile gameProfile = new GameProfile(mojangProfile.getName(), mojangProfile.getId());
|
|
||||||
for (final java.util.Map.Entry<String, Property> entry : mojangProfile.getProperties().entries()) {
|
|
||||||
final Property prop = entry.getValue();
|
|
||||||
gameProfile.addProperty(new GameProfile.Property(prop.getName(), prop.getValue(), prop.getSignature()));
|
|
||||||
}
|
|
||||||
|
|
||||||
return gameProfile;
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
@ -1,15 +0,0 @@
|
|||||||
[
|
|
||||||
{
|
|
||||||
"modid": "viaforge",
|
|
||||||
"name": "ViaForge",
|
|
||||||
"description": "${description}",
|
|
||||||
"version": "${version}",
|
|
||||||
"mcversion": "[1.12,)",
|
|
||||||
"url": "https://github.com/ViaVersion/ViaForge",
|
|
||||||
"authorList": [
|
|
||||||
"FlorianMichael/EnZaXD"
|
|
||||||
],
|
|
||||||
"credits": "https://github.com/FlorianMichael/",
|
|
||||||
"logoFile": "icon.png"
|
|
||||||
}
|
|
||||||
]
|
|
@ -1,22 +0,0 @@
|
|||||||
{
|
|
||||||
"required": true,
|
|
||||||
"minVersion": "0.7.5",
|
|
||||||
"compatibilityLevel": "JAVA_8",
|
|
||||||
"package": "de.florianmichael.viaforge.mixin.impl",
|
|
||||||
"refmap": "mixins.viaforge-mc1122.refmap.json",
|
|
||||||
"client": [
|
|
||||||
"connect.MixinGuiConnecting_1",
|
|
||||||
"MixinGuiMainMenu",
|
|
||||||
"MixinGuiMultiplayer",
|
|
||||||
"MixinGuiOverlayDebug",
|
|
||||||
"MixinGuiScreenAddServer",
|
|
||||||
"MixinGuiScreenServerList",
|
|
||||||
"connect.MixinNetHandlerLoginClient",
|
|
||||||
"connect.MixinNetworkManager",
|
|
||||||
"connect.MixinNetworkManager_5",
|
|
||||||
"MixinServerData",
|
|
||||||
"connect.MixinServerPinger",
|
|
||||||
"fixes.MixinEntityPlayerSP"
|
|
||||||
],
|
|
||||||
"verbose": true
|
|
||||||
}
|
|
@ -1 +0,0 @@
|
|||||||
forge_version=1.16.5-36.2.39
|
|
@ -1,73 +0,0 @@
|
|||||||
/*
|
|
||||||
* This file is part of ViaForge - https://github.com/FlorianMichael/ViaForge
|
|
||||||
* Copyright (C) 2021-2024 FlorianMichael/EnZaXD <florian.michael07@gmail.com> and contributors
|
|
||||||
*
|
|
||||||
* This program is free software: you can redistribute it and/or modify
|
|
||||||
* it under the terms of the GNU General Public License as published by
|
|
||||||
* the Free Software Foundation, either version 3 of the License, or
|
|
||||||
* (at your option) any later version.
|
|
||||||
*
|
|
||||||
* This program is distributed in the hope that it will be useful,
|
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
||||||
* GNU General Public License for more details.
|
|
||||||
*
|
|
||||||
* You should have received a copy of the GNU General Public License
|
|
||||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
||||||
*/
|
|
||||||
|
|
||||||
package de.florianmichael.viaforge;
|
|
||||||
|
|
||||||
import de.florianmichael.viaforge.common.ViaForgeCommon;
|
|
||||||
import de.florianmichael.viaforge.common.platform.VFPlatform;
|
|
||||||
import de.florianmichael.viaforge.provider.ViaForgeGameProfileFetcher;
|
|
||||||
import net.minecraft.client.Minecraft;
|
|
||||||
import net.minecraft.util.Session;
|
|
||||||
import net.minecraft.util.SharedConstants;
|
|
||||||
import net.minecraftforge.fml.common.Mod;
|
|
||||||
import net.minecraftforge.fml.event.lifecycle.FMLCommonSetupEvent;
|
|
||||||
import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext;
|
|
||||||
import net.raphimc.vialegacy.protocol.release.r1_7_6_10tor1_8.provider.GameProfileFetcher;
|
|
||||||
|
|
||||||
import java.io.File;
|
|
||||||
import java.util.function.Supplier;
|
|
||||||
|
|
||||||
@Mod("viaforge")
|
|
||||||
public class ViaForge1165 implements VFPlatform {
|
|
||||||
|
|
||||||
public ViaForge1165() {
|
|
||||||
FMLJavaModLoadingContext.get().getModEventBus().addListener(this::onInit);
|
|
||||||
}
|
|
||||||
|
|
||||||
public void onInit(FMLCommonSetupEvent event) {
|
|
||||||
ViaForgeCommon.init(this);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public int getGameVersion() {
|
|
||||||
return SharedConstants.getProtocolVersion();
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public Supplier<Boolean> isSingleplayer() {
|
|
||||||
return () -> Minecraft.getInstance().hasSingleplayerServer();
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public File getLeadingDirectory() {
|
|
||||||
return Minecraft.getInstance().gameDirectory;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void joinServer(String serverId) throws Throwable {
|
|
||||||
final Session session = Minecraft.getInstance().getUser();
|
|
||||||
|
|
||||||
Minecraft.getInstance().getMinecraftSessionService().joinServer(session.getGameProfile(), session.getAccessToken(), serverId);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public GameProfileFetcher getGameProfileFetcher() {
|
|
||||||
return new ViaForgeGameProfileFetcher();
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
@ -1,167 +0,0 @@
|
|||||||
/*
|
|
||||||
* This file is part of ViaForge - https://github.com/FlorianMichael/ViaForge
|
|
||||||
* Copyright (C) 2021-2024 FlorianMichael/EnZaXD <florian.michael07@gmail.com> and contributors
|
|
||||||
*
|
|
||||||
* This program is free software: you can redistribute it and/or modify
|
|
||||||
* it under the terms of the GNU General Public License as published by
|
|
||||||
* the Free Software Foundation, either version 3 of the License, or
|
|
||||||
* (at your option) any later version.
|
|
||||||
*
|
|
||||||
* This program is distributed in the hope that it will be useful,
|
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
||||||
* GNU General Public License for more details.
|
|
||||||
*
|
|
||||||
* You should have received a copy of the GNU General Public License
|
|
||||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
||||||
*/
|
|
||||||
|
|
||||||
package de.florianmichael.viaforge.gui;
|
|
||||||
|
|
||||||
import com.mojang.blaze3d.matrix.MatrixStack;
|
|
||||||
import com.viaversion.viaversion.api.Via;
|
|
||||||
import com.viaversion.viaversion.util.DumpUtil;
|
|
||||||
import de.florianmichael.viaforge.common.ViaForgeCommon;
|
|
||||||
import net.minecraft.client.Minecraft;
|
|
||||||
import net.minecraft.client.gui.screen.Screen;
|
|
||||||
import net.minecraft.client.gui.widget.button.Button;
|
|
||||||
import net.minecraft.client.gui.widget.list.AbstractList;
|
|
||||||
import net.minecraft.client.gui.widget.list.ExtendedList;
|
|
||||||
import net.minecraft.util.text.StringTextComponent;
|
|
||||||
import net.minecraft.util.text.TextFormatting;
|
|
||||||
import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
|
|
||||||
import net.raphimc.vialoader.util.ProtocolVersionList;
|
|
||||||
import org.lwjgl.glfw.GLFW;
|
|
||||||
import org.lwjgl.opengl.GL11;
|
|
||||||
|
|
||||||
import java.util.UUID;
|
|
||||||
import java.util.concurrent.ExecutionException;
|
|
||||||
|
|
||||||
public class GuiProtocolSelector extends Screen {
|
|
||||||
|
|
||||||
public final Screen parent;
|
|
||||||
public final boolean simple;
|
|
||||||
public final FinishedCallback finishedCallback;
|
|
||||||
|
|
||||||
private SlotList list;
|
|
||||||
|
|
||||||
private String status;
|
|
||||||
private long time;
|
|
||||||
|
|
||||||
public static void open(final Minecraft minecraft) { // Bypass for some weird bytecode instructions errors in Forge
|
|
||||||
minecraft.setScreen(new GuiProtocolSelector(minecraft.screen));
|
|
||||||
}
|
|
||||||
|
|
||||||
public GuiProtocolSelector(final Screen parent) {
|
|
||||||
this(parent, false, (version, unused) -> {
|
|
||||||
// Default action is to set the target version and go back to the parent screen.
|
|
||||||
ViaForgeCommon.getManager().setTargetVersion(version);
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
public GuiProtocolSelector(final Screen parent, final boolean simple, final FinishedCallback finishedCallback) {
|
|
||||||
super(new StringTextComponent("ViaForge Protocol Selector"));
|
|
||||||
this.parent = parent;
|
|
||||||
this.simple = simple;
|
|
||||||
this.finishedCallback = finishedCallback;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void init() {
|
|
||||||
super.init();
|
|
||||||
addButton(new Button(5, height - 25, 20, 20, new StringTextComponent("<-"), b -> minecraft.setScreen(parent)));
|
|
||||||
if (!this.simple) {
|
|
||||||
addButton(new Button(width - 105, 5, 100, 20, new StringTextComponent("Create dump"), b -> {
|
|
||||||
try {
|
|
||||||
minecraft.keyboardHandler.setClipboard(DumpUtil.postDump(UUID.randomUUID()).get());
|
|
||||||
setStatus(TextFormatting.GREEN + "Dump created and copied to clipboard");
|
|
||||||
} catch (InterruptedException | ExecutionException e) {
|
|
||||||
setStatus(TextFormatting.RED + "Failed to create dump: " + e.getMessage());
|
|
||||||
}
|
|
||||||
}));
|
|
||||||
addButton(new Button(width - 105, height - 25, 100, 20, new StringTextComponent("Reload configs"), b -> Via.getManager().getConfigurationProvider().reloadConfigs()));
|
|
||||||
}
|
|
||||||
|
|
||||||
addWidget(list = new SlotList(minecraft, width, height, 3 + 3 /* start offset */ + (font.lineHeight + 2) * 3 /* title is 2 */, height - 30, font.lineHeight + 2));
|
|
||||||
}
|
|
||||||
|
|
||||||
public void setStatus(final String status) {
|
|
||||||
this.status = status;
|
|
||||||
this.time = System.currentTimeMillis();
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public boolean keyPressed(int keyCode, int scanCode, int actions) {
|
|
||||||
if (keyCode == GLFW.GLFW_KEY_ESCAPE) {
|
|
||||||
minecraft.setScreen(parent);
|
|
||||||
}
|
|
||||||
return super.keyPressed(keyCode, scanCode, actions);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void render(MatrixStack matrices, int p_230430_2_, int p_230430_3_, float p_230430_4_) {
|
|
||||||
if (System.currentTimeMillis() - this.time >= 10_000) {
|
|
||||||
this.status = null;
|
|
||||||
}
|
|
||||||
|
|
||||||
renderBackground(matrices);
|
|
||||||
list.render(matrices, p_230430_2_, p_230430_3_, p_230430_4_);
|
|
||||||
|
|
||||||
super.render(matrices, p_230430_2_, p_230430_3_, p_230430_4_);
|
|
||||||
|
|
||||||
GL11.glPushMatrix();
|
|
||||||
GL11.glScalef(2.0F, 2.0F, 2.0F);
|
|
||||||
drawCenteredString(matrices, font, TextFormatting.GOLD + "ViaForge", width / 4, 3, 16777215);
|
|
||||||
GL11.glPopMatrix();
|
|
||||||
|
|
||||||
drawCenteredString(matrices, font, "https://github.com/ViaVersion/ViaForge", width / 2, (font.lineHeight + 2) * 2 + 3, -1);
|
|
||||||
drawString(matrices, font, status != null ? status : "Discord: florianmichael", 3, 3, -1);
|
|
||||||
}
|
|
||||||
|
|
||||||
class SlotList extends ExtendedList<SlotList.SlotEntry> {
|
|
||||||
|
|
||||||
public SlotList(Minecraft client, int width, int height, int top, int bottom, int slotHeight) {
|
|
||||||
super(client, width, height, top, bottom, slotHeight);
|
|
||||||
|
|
||||||
for (ProtocolVersion version : ProtocolVersionList.getProtocolsNewToOld()) {
|
|
||||||
addEntry(new SlotEntry(version));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
public class SlotEntry extends AbstractList.AbstractListEntry<SlotEntry> {
|
|
||||||
|
|
||||||
private final ProtocolVersion ProtocolVersion;
|
|
||||||
|
|
||||||
public SlotEntry(ProtocolVersion ProtocolVersion) {
|
|
||||||
this.ProtocolVersion = ProtocolVersion;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public boolean mouseClicked(double mouseX, double mouseY, int button) {
|
|
||||||
GuiProtocolSelector.this.finishedCallback.finished(ProtocolVersion, GuiProtocolSelector.this.parent);
|
|
||||||
return super.mouseClicked(mouseX, mouseY, button);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void render(MatrixStack matrices, int p_230432_2_, int y, int p_230432_4_, int p_230432_5_, int p_230432_6_, int p_230432_7_, int p_230432_8_, boolean p_230432_9_, float p_230432_10_) {
|
|
||||||
final ProtocolVersion targetVersion = ViaForgeCommon.getManager().getTargetVersion();
|
|
||||||
|
|
||||||
String color;
|
|
||||||
if (targetVersion == ProtocolVersion) {
|
|
||||||
color = GuiProtocolSelector.this.simple ? TextFormatting.GOLD.toString() : TextFormatting.GREEN.toString();
|
|
||||||
} else {
|
|
||||||
color = GuiProtocolSelector.this.simple ? TextFormatting.WHITE.toString() : TextFormatting.DARK_RED.toString();
|
|
||||||
}
|
|
||||||
|
|
||||||
drawCenteredString(matrices, Minecraft.getInstance().font, color + ProtocolVersion.getName(), width / 2, y, -1);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
public interface FinishedCallback {
|
|
||||||
|
|
||||||
void finished(final ProtocolVersion version, final Screen parent);
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
@ -1,67 +0,0 @@
|
|||||||
/*
|
|
||||||
* This file is part of ViaForge - https://github.com/FlorianMichael/ViaForge
|
|
||||||
* Copyright (C) 2021-2024 FlorianMichael/EnZaXD <florian.michael07@gmail.com> and contributors
|
|
||||||
*
|
|
||||||
* This program is free software: you can redistribute it and/or modify
|
|
||||||
* it under the terms of the GNU General Public License as published by
|
|
||||||
* the Free Software Foundation, either version 3 of the License, or
|
|
||||||
* (at your option) any later version.
|
|
||||||
*
|
|
||||||
* This program is distributed in the hope that it will be useful,
|
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
||||||
* GNU General Public License for more details.
|
|
||||||
*
|
|
||||||
* You should have received a copy of the GNU General Public License
|
|
||||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
||||||
*/
|
|
||||||
|
|
||||||
package de.florianmichael.viaforge.mixin;
|
|
||||||
|
|
||||||
import com.viaversion.viaversion.util.Pair;
|
|
||||||
import de.florianmichael.viaforge.common.ViaForgeCommon;
|
|
||||||
import de.florianmichael.viaforge.common.gui.ExtendedServerData;
|
|
||||||
import de.florianmichael.viaforge.common.platform.ViaForgeConfig;
|
|
||||||
import de.florianmichael.viaforge.gui.GuiProtocolSelector;
|
|
||||||
import net.minecraft.client.gui.screen.AddServerScreen;
|
|
||||||
import net.minecraft.client.gui.screen.Screen;
|
|
||||||
import net.minecraft.client.gui.widget.button.Button;
|
|
||||||
import net.minecraft.client.multiplayer.ServerData;
|
|
||||||
import net.minecraft.util.text.ITextComponent;
|
|
||||||
import net.minecraft.util.text.StringTextComponent;
|
|
||||||
import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
|
|
||||||
import org.spongepowered.asm.mixin.Final;
|
|
||||||
import org.spongepowered.asm.mixin.Mixin;
|
|
||||||
import org.spongepowered.asm.mixin.Shadow;
|
|
||||||
import org.spongepowered.asm.mixin.injection.At;
|
|
||||||
import org.spongepowered.asm.mixin.injection.Inject;
|
|
||||||
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
|
|
||||||
|
|
||||||
@Mixin(AddServerScreen.class)
|
|
||||||
public class MixinAddServerScreen extends Screen {
|
|
||||||
|
|
||||||
@Shadow @Final private ServerData serverData;
|
|
||||||
|
|
||||||
public MixinAddServerScreen(ITextComponent title) {
|
|
||||||
super(title);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Inject(method = "init", at = @At("RETURN"))
|
|
||||||
public void initGui(CallbackInfo ci) {
|
|
||||||
final ViaForgeConfig config = ViaForgeCommon.getManager().getConfig();
|
|
||||||
|
|
||||||
if (config.isShowAddServerButton()) {
|
|
||||||
final Pair<Integer, Integer> pos = config.getAddServerScreenButtonPosition().getPosition(this.width, this.height);
|
|
||||||
|
|
||||||
final ProtocolVersion target = ((ExtendedServerData) serverData).viaForge$getVersion();
|
|
||||||
addButton(new Button(pos.key(), pos.value(), 100, 20, new StringTextComponent(target != null ? target.getName() : "Set Version"), b -> {
|
|
||||||
minecraft.setScreen(new GuiProtocolSelector(this, true, (version, parent) -> {
|
|
||||||
// Set version and go back to the parent screen.
|
|
||||||
((ExtendedServerData) serverData).viaForge$setVersion(version);
|
|
||||||
minecraft.setScreen(parent);
|
|
||||||
}));
|
|
||||||
}));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
@ -1,45 +0,0 @@
|
|||||||
/*
|
|
||||||
* This file is part of ViaForge - https://github.com/FlorianMichael/ViaForge
|
|
||||||
* Copyright (C) 2021-2024 FlorianMichael/EnZaXD <florian.michael07@gmail.com> and contributors
|
|
||||||
*
|
|
||||||
* This program is free software: you can redistribute it and/or modify
|
|
||||||
* it under the terms of the GNU General Public License as published by
|
|
||||||
* the Free Software Foundation, either version 3 of the License, or
|
|
||||||
* (at your option) any later version.
|
|
||||||
*
|
|
||||||
* This program is distributed in the hope that it will be useful,
|
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
||||||
* GNU General Public License for more details.
|
|
||||||
*
|
|
||||||
* You should have received a copy of the GNU General Public License
|
|
||||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
||||||
*/
|
|
||||||
|
|
||||||
package de.florianmichael.viaforge.mixin;
|
|
||||||
|
|
||||||
import de.florianmichael.viaforge.common.ViaForgeCommon;
|
|
||||||
import net.minecraft.client.gui.overlay.DebugOverlayGui;
|
|
||||||
import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
|
|
||||||
import org.spongepowered.asm.mixin.Mixin;
|
|
||||||
import org.spongepowered.asm.mixin.injection.At;
|
|
||||||
import org.spongepowered.asm.mixin.injection.Inject;
|
|
||||||
import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
|
|
||||||
|
|
||||||
import java.util.List;
|
|
||||||
|
|
||||||
@Mixin(DebugOverlayGui.class)
|
|
||||||
public class MixinDebugOverlayGui {
|
|
||||||
|
|
||||||
@Inject(method = "getSystemInformation", at = @At(value = "TAIL"))
|
|
||||||
public void addViaForgeVersion(CallbackInfoReturnable<List<String>> cir) {
|
|
||||||
final ViaForgeCommon common = ViaForgeCommon.getManager();
|
|
||||||
final ProtocolVersion version = ViaForgeCommon.getManager().getTargetVersion();
|
|
||||||
|
|
||||||
if (common.getConfig().isShowProtocolVersionInF3() && version != common.getNativeVersion() && !common.getPlatform().isSingleplayer().get()) {
|
|
||||||
cir.getReturnValue().add("");
|
|
||||||
cir.getReturnValue().add("ViaForge: " + version.toString());
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
@ -1,52 +0,0 @@
|
|||||||
/*
|
|
||||||
* This file is part of ViaForge - https://github.com/FlorianMichael/ViaForge
|
|
||||||
* Copyright (C) 2021-2024 FlorianMichael/EnZaXD <florian.michael07@gmail.com> and contributors
|
|
||||||
*
|
|
||||||
* This program is free software: you can redistribute it and/or modify
|
|
||||||
* it under the terms of the GNU General Public License as published by
|
|
||||||
* the Free Software Foundation, either version 3 of the License, or
|
|
||||||
* (at your option) any later version.
|
|
||||||
*
|
|
||||||
* This program is distributed in the hope that it will be useful,
|
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
||||||
* GNU General Public License for more details.
|
|
||||||
*
|
|
||||||
* You should have received a copy of the GNU General Public License
|
|
||||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
||||||
*/
|
|
||||||
|
|
||||||
package de.florianmichael.viaforge.mixin;
|
|
||||||
|
|
||||||
import com.viaversion.viaversion.util.Pair;
|
|
||||||
import de.florianmichael.viaforge.common.ViaForgeCommon;
|
|
||||||
import de.florianmichael.viaforge.common.platform.ViaForgeConfig;
|
|
||||||
import de.florianmichael.viaforge.gui.GuiProtocolSelector;
|
|
||||||
import net.minecraft.client.gui.screen.MainMenuScreen;
|
|
||||||
import net.minecraft.client.gui.screen.Screen;
|
|
||||||
import net.minecraft.client.gui.widget.button.Button;
|
|
||||||
import net.minecraft.util.text.ITextComponent;
|
|
||||||
import net.minecraft.util.text.StringTextComponent;
|
|
||||||
import org.spongepowered.asm.mixin.Mixin;
|
|
||||||
import org.spongepowered.asm.mixin.injection.At;
|
|
||||||
import org.spongepowered.asm.mixin.injection.Inject;
|
|
||||||
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
|
|
||||||
|
|
||||||
@Mixin(MainMenuScreen.class)
|
|
||||||
public class MixinMainMenuScreen extends Screen {
|
|
||||||
|
|
||||||
public MixinMainMenuScreen(ITextComponent title) {
|
|
||||||
super(title);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Inject(method = "init", at = @At("RETURN"))
|
|
||||||
public void hookViaForgeButton(CallbackInfo ci) {
|
|
||||||
final ViaForgeConfig config = ViaForgeCommon.getManager().getConfig();
|
|
||||||
if (config.isShowMainMenuButton()) {
|
|
||||||
final Pair<Integer, Integer> pos = config.getViaForgeButtonPosition().getPosition(this.width, this.height);
|
|
||||||
|
|
||||||
addButton(new Button(pos.key(), pos.value(), 100, 20, new StringTextComponent("ViaForge"), buttons -> GuiProtocolSelector.open(minecraft)));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
@ -1,52 +0,0 @@
|
|||||||
/*
|
|
||||||
* This file is part of ViaForge - https://github.com/FlorianMichael/ViaForge
|
|
||||||
* Copyright (C) 2021-2024 FlorianMichael/EnZaXD <florian.michael07@gmail.com> and contributors
|
|
||||||
*
|
|
||||||
* This program is free software: you can redistribute it and/or modify
|
|
||||||
* it under the terms of the GNU General Public License as published by
|
|
||||||
* the Free Software Foundation, either version 3 of the License, or
|
|
||||||
* (at your option) any later version.
|
|
||||||
*
|
|
||||||
* This program is distributed in the hope that it will be useful,
|
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
||||||
* GNU General Public License for more details.
|
|
||||||
*
|
|
||||||
* You should have received a copy of the GNU General Public License
|
|
||||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
||||||
*/
|
|
||||||
|
|
||||||
package de.florianmichael.viaforge.mixin;
|
|
||||||
|
|
||||||
import com.viaversion.viaversion.util.Pair;
|
|
||||||
import de.florianmichael.viaforge.common.ViaForgeCommon;
|
|
||||||
import de.florianmichael.viaforge.common.platform.ViaForgeConfig;
|
|
||||||
import de.florianmichael.viaforge.gui.GuiProtocolSelector;
|
|
||||||
import net.minecraft.client.gui.screen.MultiplayerScreen;
|
|
||||||
import net.minecraft.client.gui.screen.Screen;
|
|
||||||
import net.minecraft.client.gui.widget.button.Button;
|
|
||||||
import net.minecraft.util.text.ITextComponent;
|
|
||||||
import net.minecraft.util.text.StringTextComponent;
|
|
||||||
import org.spongepowered.asm.mixin.Mixin;
|
|
||||||
import org.spongepowered.asm.mixin.injection.At;
|
|
||||||
import org.spongepowered.asm.mixin.injection.Inject;
|
|
||||||
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
|
|
||||||
|
|
||||||
@Mixin(MultiplayerScreen.class)
|
|
||||||
public class MixinMultiplayerScreen extends Screen {
|
|
||||||
|
|
||||||
public MixinMultiplayerScreen(ITextComponent title) {
|
|
||||||
super(title);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Inject(method = "init", at = @At("RETURN"))
|
|
||||||
public void hookViaForgeButton(CallbackInfo ci) {
|
|
||||||
final ViaForgeConfig config = ViaForgeCommon.getManager().getConfig();
|
|
||||||
if (config.isShowMainMenuButton()) {
|
|
||||||
final Pair<Integer, Integer> pos = config.getViaForgeButtonPosition().getPosition(this.width, this.height);
|
|
||||||
|
|
||||||
addButton(new Button(pos.key(), pos.value(), 100, 20, new StringTextComponent("ViaForge"), buttons -> GuiProtocolSelector.open(minecraft)));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
@ -1,70 +0,0 @@
|
|||||||
/*
|
|
||||||
* This file is part of ViaForge - https://github.com/FlorianMichael/ViaForge
|
|
||||||
* Copyright (C) 2021-2024 FlorianMichael/EnZaXD <florian.michael07@gmail.com> and contributors
|
|
||||||
*
|
|
||||||
* This program is free software: you can redistribute it and/or modify
|
|
||||||
* it under the terms of the GNU General Public License as published by
|
|
||||||
* the Free Software Foundation, either version 3 of the License, or
|
|
||||||
* (at your option) any later version.
|
|
||||||
*
|
|
||||||
* This program is distributed in the hope that it will be useful,
|
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
||||||
* GNU General Public License for more details.
|
|
||||||
*
|
|
||||||
* You should have received a copy of the GNU General Public License
|
|
||||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
||||||
*/
|
|
||||||
|
|
||||||
package de.florianmichael.viaforge.mixin;
|
|
||||||
|
|
||||||
import de.florianmichael.viaforge.common.gui.ExtendedServerData;
|
|
||||||
import net.minecraft.client.multiplayer.ServerData;
|
|
||||||
import net.minecraft.nbt.CompoundNBT;
|
|
||||||
import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
|
|
||||||
import org.spongepowered.asm.mixin.Mixin;
|
|
||||||
import org.spongepowered.asm.mixin.Unique;
|
|
||||||
import org.spongepowered.asm.mixin.injection.At;
|
|
||||||
import org.spongepowered.asm.mixin.injection.Inject;
|
|
||||||
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
|
|
||||||
import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
|
|
||||||
import org.spongepowered.asm.mixin.injection.callback.LocalCapture;
|
|
||||||
|
|
||||||
@Mixin(ServerData.class)
|
|
||||||
public class MixinServerData implements ExtendedServerData {
|
|
||||||
|
|
||||||
@Unique
|
|
||||||
private ProtocolVersion viaForge$version;
|
|
||||||
|
|
||||||
@Inject(method = "write", at = @At(value = "INVOKE", target = "Lnet/minecraft/nbt/CompoundNBT;putString(Ljava/lang/String;Ljava/lang/String;)V", ordinal = 0), locals = LocalCapture.CAPTURE_FAILHARD)
|
|
||||||
public void saveVersion(CallbackInfoReturnable<CompoundNBT> cir, CompoundNBT compoundnbt) {
|
|
||||||
if (viaForge$version != null) {
|
|
||||||
compoundnbt.putString("viaForge$version", viaForge$version.getName());
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@Inject(method = "read", at = @At(value = "TAIL"))
|
|
||||||
private static void getVersion(CompoundNBT compoundnbt, CallbackInfoReturnable<ServerData> cir) {
|
|
||||||
if (compoundnbt.contains("viaForge$version")) {
|
|
||||||
((ExtendedServerData) cir.getReturnValue()).viaForge$setVersion(ProtocolVersion.getClosest(compoundnbt.getString("viaForge$version")));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@Inject(method = "copyFrom", at = @At("HEAD"))
|
|
||||||
public void track(ServerData serverDataIn, CallbackInfo ci) {
|
|
||||||
if (serverDataIn instanceof ExtendedServerData) {
|
|
||||||
viaForge$version = ((ExtendedServerData) serverDataIn).viaForge$getVersion();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public ProtocolVersion viaForge$getVersion() {
|
|
||||||
return viaForge$version;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void viaForge$setVersion(ProtocolVersion version) {
|
|
||||||
viaForge$version = version;
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
@ -1,52 +0,0 @@
|
|||||||
/*
|
|
||||||
* This file is part of ViaForge - https://github.com/FlorianMichael/ViaForge
|
|
||||||
* Copyright (C) 2021-2024 FlorianMichael/EnZaXD <florian.michael07@gmail.com> and contributors
|
|
||||||
*
|
|
||||||
* This program is free software: you can redistribute it and/or modify
|
|
||||||
* it under the terms of the GNU General Public License as published by
|
|
||||||
* the Free Software Foundation, either version 3 of the License, or
|
|
||||||
* (at your option) any later version.
|
|
||||||
*
|
|
||||||
* This program is distributed in the hope that it will be useful,
|
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
||||||
* GNU General Public License for more details.
|
|
||||||
*
|
|
||||||
* You should have received a copy of the GNU General Public License
|
|
||||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
||||||
*/
|
|
||||||
|
|
||||||
package de.florianmichael.viaforge.mixin;
|
|
||||||
|
|
||||||
import com.viaversion.viaversion.util.Pair;
|
|
||||||
import de.florianmichael.viaforge.common.ViaForgeCommon;
|
|
||||||
import de.florianmichael.viaforge.common.platform.ViaForgeConfig;
|
|
||||||
import de.florianmichael.viaforge.gui.GuiProtocolSelector;
|
|
||||||
import net.minecraft.client.gui.screen.Screen;
|
|
||||||
import net.minecraft.client.gui.screen.ServerListScreen;
|
|
||||||
import net.minecraft.client.gui.widget.button.Button;
|
|
||||||
import net.minecraft.util.text.ITextComponent;
|
|
||||||
import net.minecraft.util.text.StringTextComponent;
|
|
||||||
import org.spongepowered.asm.mixin.Mixin;
|
|
||||||
import org.spongepowered.asm.mixin.injection.At;
|
|
||||||
import org.spongepowered.asm.mixin.injection.Inject;
|
|
||||||
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
|
|
||||||
|
|
||||||
@Mixin(ServerListScreen.class)
|
|
||||||
public class MixinServerListScreen extends Screen {
|
|
||||||
|
|
||||||
public MixinServerListScreen(ITextComponent title) {
|
|
||||||
super(title);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Inject(method = "init", at = @At("RETURN"))
|
|
||||||
public void hookViaForgeButton(CallbackInfo ci) {
|
|
||||||
final ViaForgeConfig config = ViaForgeCommon.getManager().getConfig();
|
|
||||||
if (config.isShowDirectConnectButton()) {
|
|
||||||
final Pair<Integer, Integer> pos = config.getViaForgeButtonPosition().getPosition(this.width, this.height);
|
|
||||||
|
|
||||||
addButton(new Button(pos.key(), pos.value(), 100, 20, new StringTextComponent("ViaForge"), b -> GuiProtocolSelector.open(minecraft)));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
@ -1,58 +0,0 @@
|
|||||||
/*
|
|
||||||
* This file is part of ViaForge - https://github.com/FlorianMichael/ViaForge
|
|
||||||
* Copyright (C) 2021-2024 FlorianMichael/EnZaXD <florian.michael07@gmail.com> and contributors
|
|
||||||
*
|
|
||||||
* This program is free software: you can redistribute it and/or modify
|
|
||||||
* it under the terms of the GNU General Public License as published by
|
|
||||||
* the Free Software Foundation, either version 3 of the License, or
|
|
||||||
* (at your option) any later version.
|
|
||||||
*
|
|
||||||
* This program is distributed in the hope that it will be useful,
|
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
||||||
* GNU General Public License for more details.
|
|
||||||
*
|
|
||||||
* You should have received a copy of the GNU General Public License
|
|
||||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
||||||
*/
|
|
||||||
|
|
||||||
package de.florianmichael.viaforge.mixin.connect;
|
|
||||||
|
|
||||||
import com.mojang.authlib.GameProfile;
|
|
||||||
import com.mojang.authlib.exceptions.AuthenticationException;
|
|
||||||
import com.mojang.authlib.minecraft.MinecraftSessionService;
|
|
||||||
import com.viaversion.viaversion.api.connection.UserConnection;
|
|
||||||
import de.florianmichael.viaforge.common.ViaForgeCommon;
|
|
||||||
import de.florianmichael.viaforge.common.protocoltranslator.netty.VFNetworkManager;
|
|
||||||
import net.minecraft.client.network.login.ClientLoginNetHandler;
|
|
||||||
import net.minecraft.network.NetworkManager;
|
|
||||||
import net.raphimc.vialegacy.api.LegacyProtocolVersion;
|
|
||||||
import net.raphimc.vialegacy.protocol.release.r1_6_4tor1_7_2_5.storage.ProtocolMetadataStorage;
|
|
||||||
import org.spongepowered.asm.mixin.Final;
|
|
||||||
import org.spongepowered.asm.mixin.Mixin;
|
|
||||||
import org.spongepowered.asm.mixin.Shadow;
|
|
||||||
import org.spongepowered.asm.mixin.injection.At;
|
|
||||||
import org.spongepowered.asm.mixin.injection.Redirect;
|
|
||||||
|
|
||||||
@SuppressWarnings("DataFlowIssue")
|
|
||||||
@Mixin(ClientLoginNetHandler.class)
|
|
||||||
public class MixinClientLoginNetHandler {
|
|
||||||
|
|
||||||
@Shadow @Final private NetworkManager connection;
|
|
||||||
|
|
||||||
@Redirect(method = "authenticateServer", at = @At(value = "INVOKE", target = "Lcom/mojang/authlib/minecraft/MinecraftSessionService;joinServer(Lcom/mojang/authlib/GameProfile;Ljava/lang/String;Ljava/lang/String;)V"))
|
|
||||||
public void onlyJoinServerIfPremium(MinecraftSessionService instance, GameProfile profile, String authenticationToken, String serverId) throws AuthenticationException {
|
|
||||||
final VFNetworkManager mixinConnection = (VFNetworkManager) connection;
|
|
||||||
if (mixinConnection.viaForge$getTrackedVersion().olderThanOrEqualTo(LegacyProtocolVersion.r1_6_4)) {
|
|
||||||
final UserConnection user = connection.channel().attr(ViaForgeCommon.VF_VIA_USER).get();
|
|
||||||
if (user != null && user.has(ProtocolMetadataStorage.class) && !user.get(ProtocolMetadataStorage.class).authenticate) {
|
|
||||||
// We are in the 1.7 -> 1.6 protocol, so we need to skip the joinServer call
|
|
||||||
// if the server is in offline mode, due the packet changes <-> networking changes
|
|
||||||
// Minecraft's networking code is bad for us.
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
instance.joinServer(profile, authenticationToken, serverId);
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
@ -1,48 +0,0 @@
|
|||||||
/*
|
|
||||||
* This file is part of ViaForge - https://github.com/FlorianMichael/ViaForge
|
|
||||||
* Copyright (C) 2021-2024 FlorianMichael/EnZaXD <florian.michael07@gmail.com> and contributors
|
|
||||||
*
|
|
||||||
* This program is free software: you can redistribute it and/or modify
|
|
||||||
* it under the terms of the GNU General Public License as published by
|
|
||||||
* the Free Software Foundation, either version 3 of the License, or
|
|
||||||
* (at your option) any later version.
|
|
||||||
*
|
|
||||||
* This program is distributed in the hope that it will be useful,
|
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
||||||
* GNU General Public License for more details.
|
|
||||||
*
|
|
||||||
* You should have received a copy of the GNU General Public License
|
|
||||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
||||||
*/
|
|
||||||
|
|
||||||
package de.florianmichael.viaforge.mixin.connect;
|
|
||||||
|
|
||||||
import de.florianmichael.viaforge.common.ViaForgeCommon;
|
|
||||||
import de.florianmichael.viaforge.common.gui.ExtendedServerData;
|
|
||||||
import de.florianmichael.viaforge.common.platform.VersionTracker;
|
|
||||||
import net.minecraft.client.Minecraft;
|
|
||||||
import net.minecraft.network.NetworkManager;
|
|
||||||
import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
|
|
||||||
import org.spongepowered.asm.mixin.Mixin;
|
|
||||||
import org.spongepowered.asm.mixin.injection.At;
|
|
||||||
import org.spongepowered.asm.mixin.injection.Redirect;
|
|
||||||
|
|
||||||
import java.net.InetAddress;
|
|
||||||
import java.net.UnknownHostException;
|
|
||||||
|
|
||||||
@Mixin(targets = "net.minecraft.client.gui.screen.ConnectingScreen$1")
|
|
||||||
public class MixinConnectingScreen_1 {
|
|
||||||
|
|
||||||
@Redirect(method = "run", at = @At(value = "INVOKE", target = "Ljava/net/InetAddress;getByName(Ljava/lang/String;)Ljava/net/InetAddress;"))
|
|
||||||
public InetAddress trackServerVersion(String s) throws UnknownHostException {
|
|
||||||
final InetAddress address = InetAddress.getByName(s);
|
|
||||||
ProtocolVersion version = ((ExtendedServerData) Minecraft.getInstance().getCurrentServer()).viaForge$getVersion();
|
|
||||||
if (version == null) {
|
|
||||||
version = ViaForgeCommon.getManager().getTargetVersion();
|
|
||||||
}
|
|
||||||
VersionTracker.storeServerProtocolVersion(address, version);
|
|
||||||
return address;
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
@ -1,100 +0,0 @@
|
|||||||
/*
|
|
||||||
* This file is part of ViaForge - https://github.com/FlorianMichael/ViaForge
|
|
||||||
* Copyright (C) 2021-2024 FlorianMichael/EnZaXD <florian.michael07@gmail.com> and contributors
|
|
||||||
*
|
|
||||||
* This program is free software: you can redistribute it and/or modify
|
|
||||||
* it under the terms of the GNU General Public License as published by
|
|
||||||
* the Free Software Foundation, either version 3 of the License, or
|
|
||||||
* (at your option) any later version.
|
|
||||||
*
|
|
||||||
* This program is distributed in the hope that it will be useful,
|
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
||||||
* GNU General Public License for more details.
|
|
||||||
*
|
|
||||||
* You should have received a copy of the GNU General Public License
|
|
||||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
||||||
*/
|
|
||||||
|
|
||||||
package de.florianmichael.viaforge.mixin.connect;
|
|
||||||
|
|
||||||
import de.florianmichael.viaforge.common.ViaForgeCommon;
|
|
||||||
import de.florianmichael.viaforge.common.platform.VersionTracker;
|
|
||||||
import de.florianmichael.viaforge.common.protocoltranslator.netty.VFNetworkManager;
|
|
||||||
import io.netty.channel.Channel;
|
|
||||||
import net.minecraft.network.NettyEncryptingDecoder;
|
|
||||||
import net.minecraft.network.NettyEncryptingEncoder;
|
|
||||||
import net.minecraft.network.NetworkManager;
|
|
||||||
import net.minecraft.util.LazyValue;
|
|
||||||
import net.raphimc.vialegacy.api.LegacyProtocolVersion;
|
|
||||||
import net.raphimc.vialoader.netty.VLLegacyPipeline;
|
|
||||||
import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
|
|
||||||
import org.spongepowered.asm.mixin.Mixin;
|
|
||||||
import org.spongepowered.asm.mixin.Shadow;
|
|
||||||
import org.spongepowered.asm.mixin.Unique;
|
|
||||||
import org.spongepowered.asm.mixin.injection.At;
|
|
||||||
import org.spongepowered.asm.mixin.injection.Inject;
|
|
||||||
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
|
|
||||||
import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
|
|
||||||
import org.spongepowered.asm.mixin.injection.callback.LocalCapture;
|
|
||||||
|
|
||||||
import javax.crypto.Cipher;
|
|
||||||
import java.net.InetAddress;
|
|
||||||
|
|
||||||
@Mixin(NetworkManager.class)
|
|
||||||
public class MixinNetworkManager implements VFNetworkManager {
|
|
||||||
|
|
||||||
@Shadow private Channel channel;
|
|
||||||
|
|
||||||
@Shadow private boolean encrypted;
|
|
||||||
@Unique
|
|
||||||
private Cipher viaForge$decryptionCipher;
|
|
||||||
|
|
||||||
@Unique
|
|
||||||
private ProtocolVersion viaForge$targetVersion;
|
|
||||||
|
|
||||||
@Inject(method = "setupCompression", at = @At("RETURN"))
|
|
||||||
public void reorderPipeline(int p_setCompressionTreshold_1_, CallbackInfo ci) {
|
|
||||||
ViaForgeCommon.getManager().reorderCompression(channel);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Inject(method = "setEncryptionKey", at = @At("HEAD"), cancellable = true)
|
|
||||||
private void storeEncryptionCiphers(Cipher p_244777_1_, Cipher p_244777_2_, CallbackInfo ci) {
|
|
||||||
if (viaForge$targetVersion != null && viaForge$targetVersion.olderThanOrEqualTo(LegacyProtocolVersion.r1_6_4)) {
|
|
||||||
// Minecraft's encryption code is bad for us, we need to reorder the pipeline
|
|
||||||
ci.cancel();
|
|
||||||
|
|
||||||
// Minecraft 1.6.4 supports tile encryption which means the server can only enable one side of the encryption
|
|
||||||
// So we only enable the encryption side and later enable the decryption side if the 1.7 -> 1.6 protocol
|
|
||||||
// tells us to do, therefore we need to store the cipher instance.
|
|
||||||
this.viaForge$decryptionCipher = p_244777_1_;
|
|
||||||
|
|
||||||
// Enabling the encryption side
|
|
||||||
this.encrypted = true;
|
|
||||||
this.channel.pipeline().addBefore(VLLegacyPipeline.VIALEGACY_PRE_NETTY_LENGTH_REMOVER_NAME, "encrypt", new NettyEncryptingEncoder(p_244777_2_));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@Inject(method = "connectToServer", at = @At(value = "INVOKE", target = "Lio/netty/bootstrap/Bootstrap;group(Lio/netty/channel/EventLoopGroup;)Lio/netty/bootstrap/AbstractBootstrap;"), locals = LocalCapture.CAPTURE_FAILHARD)
|
|
||||||
private static void setTargetVersion(InetAddress address, int serverPort, boolean useNativeTransport, CallbackInfoReturnable<NetworkManager> cir, NetworkManager networkmanager, Class oclass, LazyValue lazyvalue) {
|
|
||||||
final VFNetworkManager mixinNetworkManager = (VFNetworkManager) networkmanager;
|
|
||||||
mixinNetworkManager.viaForge$setTrackedVersion(VersionTracker.getServerProtocolVersion(address));
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void viaForge$setupPreNettyDecryption() {
|
|
||||||
// Enabling the decryption side for 1.6.4 if the 1.7 -> 1.6 protocol tells us to do
|
|
||||||
this.channel.pipeline().addBefore(VLLegacyPipeline.VIALEGACY_PRE_NETTY_LENGTH_REMOVER_NAME, "decrypt", new NettyEncryptingDecoder(this.viaForge$decryptionCipher));
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public ProtocolVersion viaForge$getTrackedVersion() {
|
|
||||||
return viaForge$targetVersion;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void viaForge$setTrackedVersion(ProtocolVersion version) {
|
|
||||||
viaForge$targetVersion = version;
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
@ -1,44 +0,0 @@
|
|||||||
/*
|
|
||||||
* This file is part of ViaForge - https://github.com/FlorianMichael/ViaForge
|
|
||||||
* Copyright (C) 2021-2024 FlorianMichael/EnZaXD <florian.michael07@gmail.com> and contributors
|
|
||||||
*
|
|
||||||
* This program is free software: you can redistribute it and/or modify
|
|
||||||
* it under the terms of the GNU General Public License as published by
|
|
||||||
* the Free Software Foundation, either version 3 of the License, or
|
|
||||||
* (at your option) any later version.
|
|
||||||
*
|
|
||||||
* This program is distributed in the hope that it will be useful,
|
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
||||||
* GNU General Public License for more details.
|
|
||||||
*
|
|
||||||
* You should have received a copy of the GNU General Public License
|
|
||||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
||||||
*/
|
|
||||||
|
|
||||||
package de.florianmichael.viaforge.mixin.connect;
|
|
||||||
|
|
||||||
import de.florianmichael.viaforge.common.ViaForgeCommon;
|
|
||||||
import de.florianmichael.viaforge.common.protocoltranslator.netty.VFNetworkManager;
|
|
||||||
import io.netty.channel.Channel;
|
|
||||||
import net.minecraft.network.NetworkManager;
|
|
||||||
import org.spongepowered.asm.mixin.Final;
|
|
||||||
import org.spongepowered.asm.mixin.Mixin;
|
|
||||||
import org.spongepowered.asm.mixin.Mutable;
|
|
||||||
import org.spongepowered.asm.mixin.injection.At;
|
|
||||||
import org.spongepowered.asm.mixin.injection.Inject;
|
|
||||||
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
|
|
||||||
|
|
||||||
@Mixin(targets = "net.minecraft.network.NetworkManager$1")
|
|
||||||
public class MixinNetworkManager_1 {
|
|
||||||
|
|
||||||
@Final
|
|
||||||
@Mutable
|
|
||||||
NetworkManager val$networkmanager;
|
|
||||||
|
|
||||||
@Inject(method = "initChannel", at = @At(value = "TAIL"), remap = false)
|
|
||||||
private void hookViaPipeline(Channel channel, CallbackInfo ci) {
|
|
||||||
ViaForgeCommon.getManager().inject(channel, (VFNetworkManager) val$networkmanager);
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
@ -1,60 +0,0 @@
|
|||||||
/*
|
|
||||||
* This file is part of ViaForge - https://github.com/FlorianMichael/ViaForge
|
|
||||||
* Copyright (C) 2021-2024 FlorianMichael/EnZaXD <florian.michael07@gmail.com> and contributors
|
|
||||||
*
|
|
||||||
* This program is free software: you can redistribute it and/or modify
|
|
||||||
* it under the terms of the GNU General Public License as published by
|
|
||||||
* the Free Software Foundation, either version 3 of the License, or
|
|
||||||
* (at your option) any later version.
|
|
||||||
*
|
|
||||||
* This program is distributed in the hope that it will be useful,
|
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
||||||
* GNU General Public License for more details.
|
|
||||||
*
|
|
||||||
* You should have received a copy of the GNU General Public License
|
|
||||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
||||||
*/
|
|
||||||
|
|
||||||
package de.florianmichael.viaforge.mixin.connect;
|
|
||||||
|
|
||||||
import de.florianmichael.viaforge.common.ViaForgeCommon;
|
|
||||||
import de.florianmichael.viaforge.common.gui.ExtendedServerData;
|
|
||||||
import de.florianmichael.viaforge.common.platform.VersionTracker;
|
|
||||||
import net.minecraft.client.multiplayer.ServerData;
|
|
||||||
import net.minecraft.client.network.ServerPinger;
|
|
||||||
import net.minecraft.network.NetworkManager;
|
|
||||||
import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
|
|
||||||
import org.spongepowered.asm.mixin.Mixin;
|
|
||||||
import org.spongepowered.asm.mixin.Unique;
|
|
||||||
import org.spongepowered.asm.mixin.injection.At;
|
|
||||||
import org.spongepowered.asm.mixin.injection.Inject;
|
|
||||||
import org.spongepowered.asm.mixin.injection.Redirect;
|
|
||||||
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
|
|
||||||
|
|
||||||
import java.net.InetAddress;
|
|
||||||
|
|
||||||
@Mixin(ServerPinger.class)
|
|
||||||
public class MixinServerPinger {
|
|
||||||
|
|
||||||
@Unique
|
|
||||||
private ServerData viaForge$serverData;
|
|
||||||
|
|
||||||
@Inject(method = "pingServer", at = @At("HEAD"))
|
|
||||||
public void trackServerData(ServerData server, Runnable p_147224_2_, CallbackInfo ci) {
|
|
||||||
viaForge$serverData = server;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Redirect(method = "pingServer", at = @At(value = "INVOKE", target = "Lnet/minecraft/network/NetworkManager;connectToServer(Ljava/net/InetAddress;IZ)Lnet/minecraft/network/NetworkManager;"))
|
|
||||||
public NetworkManager trackVersion(InetAddress address, int i, boolean b) {
|
|
||||||
ProtocolVersion version = ((ExtendedServerData) viaForge$serverData).viaForge$getVersion();
|
|
||||||
if (version == null) {
|
|
||||||
version = ViaForgeCommon.getManager().getTargetVersion();
|
|
||||||
}
|
|
||||||
VersionTracker.storeServerProtocolVersion(address, version);
|
|
||||||
viaForge$serverData = null;
|
|
||||||
|
|
||||||
return NetworkManager.connectToServer(address, i, b);
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
@ -1,56 +0,0 @@
|
|||||||
/*
|
|
||||||
* This file is part of ViaForge - https://github.com/FlorianMichael/ViaForge
|
|
||||||
* Copyright (C) 2021-2024 FlorianMichael/EnZaXD <florian.michael07@gmail.com> and contributors
|
|
||||||
*
|
|
||||||
* This program is free software: you can redistribute it and/or modify
|
|
||||||
* it under the terms of the GNU General Public License as published by
|
|
||||||
* the Free Software Foundation, either version 3 of the License, or
|
|
||||||
* (at your option) any later version.
|
|
||||||
*
|
|
||||||
* This program is distributed in the hope that it will be useful,
|
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
||||||
* GNU General Public License for more details.
|
|
||||||
*
|
|
||||||
* You should have received a copy of the GNU General Public License
|
|
||||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
||||||
*/
|
|
||||||
|
|
||||||
package de.florianmichael.viaforge.mixin.fixes;
|
|
||||||
|
|
||||||
import com.mojang.authlib.GameProfile;
|
|
||||||
import de.florianmichael.viaforge.common.ViaForgeCommon;
|
|
||||||
import net.minecraft.client.entity.player.AbstractClientPlayerEntity;
|
|
||||||
import net.minecraft.client.entity.player.ClientPlayerEntity;
|
|
||||||
import net.minecraft.client.world.ClientWorld;
|
|
||||||
import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
|
|
||||||
import org.spongepowered.asm.mixin.Mixin;
|
|
||||||
import org.spongepowered.asm.mixin.Shadow;
|
|
||||||
import org.spongepowered.asm.mixin.injection.At;
|
|
||||||
import org.spongepowered.asm.mixin.injection.Redirect;
|
|
||||||
|
|
||||||
@Mixin(ClientPlayerEntity.class)
|
|
||||||
public class MixinClientPlayerEntity extends AbstractClientPlayerEntity {
|
|
||||||
|
|
||||||
@Shadow private boolean lastOnGround;
|
|
||||||
|
|
||||||
public MixinClientPlayerEntity(ClientWorld world, GameProfile profile) {
|
|
||||||
super(world, profile);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Redirect(method = "sendPosition", at = @At(value = "FIELD", target = "Lnet/minecraft/client/entity/player/ClientPlayerEntity;lastOnGround:Z", ordinal = 0))
|
|
||||||
public boolean emulateIdlePacket(ClientPlayerEntity instance) {
|
|
||||||
if (ViaForgeCommon.getManager().getTargetVersion().olderThanOrEqualTo(ProtocolVersion.v1_8)) {
|
|
||||||
// <= 1.8 spams the idle packet instead of only sending it when the ground state changes
|
|
||||||
// So we invert the original logic:
|
|
||||||
// if (prevOnGround != onGround) sendPacket
|
|
||||||
// To be like:
|
|
||||||
// if (!onGround != onGround) sendPacket
|
|
||||||
// Which is the same as:
|
|
||||||
// if (true) sendPacket
|
|
||||||
return !onGround;
|
|
||||||
}
|
|
||||||
return lastOnGround;
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
@ -1,77 +0,0 @@
|
|||||||
/*
|
|
||||||
* This file is part of ViaForge - https://github.com/FlorianMichael/ViaForge
|
|
||||||
* Copyright (C) 2021-2024 FlorianMichael/EnZaXD <florian.michael07@gmail.com> and contributors
|
|
||||||
*
|
|
||||||
* This program is free software: you can redistribute it and/or modify
|
|
||||||
* it under the terms of the GNU General Public License as published by
|
|
||||||
* the Free Software Foundation, either version 3 of the License, or
|
|
||||||
* (at your option) any later version.
|
|
||||||
*
|
|
||||||
* This program is distributed in the hope that it will be useful,
|
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
||||||
* GNU General Public License for more details.
|
|
||||||
*
|
|
||||||
* You should have received a copy of the GNU General Public License
|
|
||||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
||||||
*/
|
|
||||||
|
|
||||||
package de.florianmichael.viaforge.provider;
|
|
||||||
|
|
||||||
import com.mojang.authlib.Agent;
|
|
||||||
import com.mojang.authlib.GameProfileRepository;
|
|
||||||
import com.mojang.authlib.HttpAuthenticationService;
|
|
||||||
import com.mojang.authlib.ProfileLookupCallback;
|
|
||||||
import com.mojang.authlib.minecraft.MinecraftSessionService;
|
|
||||||
import com.mojang.authlib.properties.Property;
|
|
||||||
import com.mojang.authlib.yggdrasil.ProfileNotFoundException;
|
|
||||||
import com.mojang.authlib.yggdrasil.YggdrasilAuthenticationService;
|
|
||||||
import net.raphimc.vialegacy.protocol.release.r1_7_6_10tor1_8.provider.GameProfileFetcher;
|
|
||||||
import net.raphimc.vialegacy.protocol.release.r1_7_6_10tor1_8.model.GameProfile;
|
|
||||||
|
|
||||||
import java.net.Proxy;
|
|
||||||
import java.util.UUID;
|
|
||||||
import java.util.concurrent.CompletableFuture;
|
|
||||||
|
|
||||||
public class ViaForgeGameProfileFetcher extends GameProfileFetcher {
|
|
||||||
|
|
||||||
public static final HttpAuthenticationService AUTHENTICATION_SERVICE = new YggdrasilAuthenticationService(Proxy.NO_PROXY, "");
|
|
||||||
public static final MinecraftSessionService SESSION_SERVICE = AUTHENTICATION_SERVICE.createMinecraftSessionService();
|
|
||||||
public static final GameProfileRepository GAME_PROFILE_REPOSITORY = AUTHENTICATION_SERVICE.createProfileRepository();
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public UUID loadMojangUUID(String playerName) throws Exception {
|
|
||||||
final CompletableFuture<com.mojang.authlib.GameProfile> future = new CompletableFuture<>();
|
|
||||||
GAME_PROFILE_REPOSITORY.findProfilesByNames(new String[]{playerName}, Agent.MINECRAFT, new ProfileLookupCallback() {
|
|
||||||
@Override
|
|
||||||
public void onProfileLookupSucceeded(com.mojang.authlib.GameProfile profile) {
|
|
||||||
future.complete(profile);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void onProfileLookupFailed(com.mojang.authlib.GameProfile profile, Exception exception) {
|
|
||||||
future.completeExceptionally(exception);
|
|
||||||
}
|
|
||||||
});
|
|
||||||
if (!future.isDone()) {
|
|
||||||
future.completeExceptionally(new ProfileNotFoundException());
|
|
||||||
}
|
|
||||||
return future.get().getId();
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public GameProfile loadGameProfile(UUID uuid) throws Exception {
|
|
||||||
final com.mojang.authlib.GameProfile inProfile = new com.mojang.authlib.GameProfile(uuid, null);
|
|
||||||
final com.mojang.authlib.GameProfile mojangProfile = SESSION_SERVICE.fillProfileProperties(inProfile, true);
|
|
||||||
if (mojangProfile.equals(inProfile)) throw new ProfileNotFoundException();
|
|
||||||
|
|
||||||
final GameProfile gameProfile = new GameProfile(mojangProfile.getName(), mojangProfile.getId());
|
|
||||||
for (final java.util.Map.Entry<String, Property> entry : mojangProfile.getProperties().entries()) {
|
|
||||||
final Property prop = entry.getValue();
|
|
||||||
gameProfile.addProperty(new GameProfile.Property(prop.getName(), prop.getValue(), prop.getSignature()));
|
|
||||||
}
|
|
||||||
|
|
||||||
return gameProfile;
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
@ -1,16 +0,0 @@
|
|||||||
modLoader="javafml"
|
|
||||||
loaderVersion="[36,)"
|
|
||||||
|
|
||||||
license="GPL-3.0 license"
|
|
||||||
issueTrackerURL="https://github.com/ViaVersion/ViaForge/issues"
|
|
||||||
showAsResourcePack=false
|
|
||||||
|
|
||||||
[[mods]]
|
|
||||||
modId="viaforge"
|
|
||||||
version="${version}"
|
|
||||||
displayName="ViaForge"
|
|
||||||
displayURL="https://github.com/FlorianMichael"
|
|
||||||
logoFile="icon.png"
|
|
||||||
credits="Github contributors"
|
|
||||||
authors="FlorianMichael/EnZaXD"
|
|
||||||
description="${description}"
|
|
@ -1,24 +0,0 @@
|
|||||||
{
|
|
||||||
"required": true,
|
|
||||||
"minVersion": "0.7.5",
|
|
||||||
"compatibilityLevel": "JAVA_8",
|
|
||||||
"package": "de.florianmichael.viaforge.mixin",
|
|
||||||
"client": [
|
|
||||||
"MixinAddServerScreen",
|
|
||||||
"connect.MixinClientLoginNetHandler",
|
|
||||||
"connect.MixinConnectingScreen_1",
|
|
||||||
"MixinDebugOverlayGui",
|
|
||||||
"MixinMainMenuScreen",
|
|
||||||
"MixinMultiplayerScreen",
|
|
||||||
"connect.MixinNetworkManager",
|
|
||||||
"connect.MixinNetworkManager_1",
|
|
||||||
"MixinServerData",
|
|
||||||
"MixinServerListScreen",
|
|
||||||
"connect.MixinServerPinger",
|
|
||||||
"fixes.MixinClientPlayerEntity"
|
|
||||||
],
|
|
||||||
"injectors": {
|
|
||||||
"defaultRequire": 1
|
|
||||||
},
|
|
||||||
"refmap": "mixins.viaforge-mc1165.refmap.json"
|
|
||||||
}
|
|
@ -1 +0,0 @@
|
|||||||
forge_version=1.17.1-37.1.1
|
|
@ -1,73 +0,0 @@
|
|||||||
/*
|
|
||||||
* This file is part of ViaForge - https://github.com/FlorianMichael/ViaForge
|
|
||||||
* Copyright (C) 2021-2024 FlorianMichael/EnZaXD <florian.michael07@gmail.com> and contributors
|
|
||||||
*
|
|
||||||
* This program is free software: you can redistribute it and/or modify
|
|
||||||
* it under the terms of the GNU General Public License as published by
|
|
||||||
* the Free Software Foundation, either version 3 of the License, or
|
|
||||||
* (at your option) any later version.
|
|
||||||
*
|
|
||||||
* This program is distributed in the hope that it will be useful,
|
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
||||||
* GNU General Public License for more details.
|
|
||||||
*
|
|
||||||
* You should have received a copy of the GNU General Public License
|
|
||||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
||||||
*/
|
|
||||||
|
|
||||||
package de.florianmichael.viaforge;
|
|
||||||
|
|
||||||
import de.florianmichael.viaforge.common.ViaForgeCommon;
|
|
||||||
import de.florianmichael.viaforge.common.platform.VFPlatform;
|
|
||||||
import de.florianmichael.viaforge.provider.ViaForgeGameProfileFetcher;
|
|
||||||
import net.minecraft.SharedConstants;
|
|
||||||
import net.minecraft.client.Minecraft;
|
|
||||||
import net.minecraft.client.User;
|
|
||||||
import net.minecraftforge.fml.common.Mod;
|
|
||||||
import net.minecraftforge.fml.event.lifecycle.FMLCommonSetupEvent;
|
|
||||||
import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext;
|
|
||||||
import net.raphimc.vialegacy.protocol.release.r1_7_6_10tor1_8.provider.GameProfileFetcher;
|
|
||||||
|
|
||||||
import java.io.File;
|
|
||||||
import java.util.function.Supplier;
|
|
||||||
|
|
||||||
@Mod("viaforge")
|
|
||||||
public class ViaForge1171 implements VFPlatform {
|
|
||||||
|
|
||||||
public ViaForge1171() {
|
|
||||||
FMLJavaModLoadingContext.get().getModEventBus().addListener(this::onInit);
|
|
||||||
}
|
|
||||||
|
|
||||||
public void onInit(FMLCommonSetupEvent event) {
|
|
||||||
ViaForgeCommon.init(this);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public int getGameVersion() {
|
|
||||||
return SharedConstants.getProtocolVersion();
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public Supplier<Boolean> isSingleplayer() {
|
|
||||||
return () -> Minecraft.getInstance().hasSingleplayerServer();
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public File getLeadingDirectory() {
|
|
||||||
return Minecraft.getInstance().gameDirectory;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void joinServer(String serverId) throws Throwable {
|
|
||||||
final User session = Minecraft.getInstance().getUser();
|
|
||||||
|
|
||||||
Minecraft.getInstance().getMinecraftSessionService().joinServer(session.getGameProfile(), session.getAccessToken(), serverId);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public GameProfileFetcher getGameProfileFetcher() {
|
|
||||||
return new ViaForgeGameProfileFetcher();
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
@ -1,171 +0,0 @@
|
|||||||
/*
|
|
||||||
* This file is part of ViaForge - https://github.com/FlorianMichael/ViaForge
|
|
||||||
* Copyright (C) 2021-2024 FlorianMichael/EnZaXD <florian.michael07@gmail.com> and contributors
|
|
||||||
*
|
|
||||||
* This program is free software: you can redistribute it and/or modify
|
|
||||||
* it under the terms of the GNU General Public License as published by
|
|
||||||
* the Free Software Foundation, either version 3 of the License, or
|
|
||||||
* (at your option) any later version.
|
|
||||||
*
|
|
||||||
* This program is distributed in the hope that it will be useful,
|
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
||||||
* GNU General Public License for more details.
|
|
||||||
*
|
|
||||||
* You should have received a copy of the GNU General Public License
|
|
||||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
||||||
*/
|
|
||||||
|
|
||||||
package de.florianmichael.viaforge.gui;
|
|
||||||
|
|
||||||
import com.mojang.blaze3d.vertex.PoseStack;
|
|
||||||
import com.viaversion.viaversion.api.Via;
|
|
||||||
import com.viaversion.viaversion.util.DumpUtil;
|
|
||||||
import de.florianmichael.viaforge.common.ViaForgeCommon;
|
|
||||||
import net.minecraft.ChatFormatting;
|
|
||||||
import net.minecraft.client.Minecraft;
|
|
||||||
import net.minecraft.client.gui.components.Button;
|
|
||||||
import net.minecraft.client.gui.components.ObjectSelectionList;
|
|
||||||
import net.minecraft.client.gui.screens.Screen;
|
|
||||||
import net.minecraft.network.chat.Component;
|
|
||||||
import net.minecraft.network.chat.TextComponent;
|
|
||||||
import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
|
|
||||||
import net.raphimc.vialoader.util.ProtocolVersionList;
|
|
||||||
import org.lwjgl.glfw.GLFW;
|
|
||||||
|
|
||||||
import java.util.UUID;
|
|
||||||
import java.util.concurrent.ExecutionException;
|
|
||||||
|
|
||||||
public class GuiProtocolSelector extends Screen {
|
|
||||||
|
|
||||||
public final Screen parent;
|
|
||||||
public final boolean simple;
|
|
||||||
public final FinishedCallback finishedCallback;
|
|
||||||
|
|
||||||
private SlotList list;
|
|
||||||
|
|
||||||
private String status;
|
|
||||||
private long time;
|
|
||||||
|
|
||||||
public static void open(final Minecraft minecraft) { // Bypass for some weird bytecode instructions errors in Forge
|
|
||||||
minecraft.setScreen(new GuiProtocolSelector(minecraft.screen));
|
|
||||||
}
|
|
||||||
|
|
||||||
public GuiProtocolSelector(final Screen parent) {
|
|
||||||
this(parent, false, (version, unused) -> {
|
|
||||||
// Default action is to set the target version and go back to the parent screen.
|
|
||||||
ViaForgeCommon.getManager().setTargetVersion(version);
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
public GuiProtocolSelector(final Screen parent, final boolean simple, final FinishedCallback finishedCallback) {
|
|
||||||
super(new TextComponent("ViaForge Protocol Selector"));
|
|
||||||
this.parent = parent;
|
|
||||||
this.simple = simple;
|
|
||||||
this.finishedCallback = finishedCallback;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void init() {
|
|
||||||
super.init();
|
|
||||||
addRenderableWidget(new Button(5, height - 25, 20, 20, new TextComponent("<-"), b -> minecraft.setScreen(parent)));
|
|
||||||
if (!this.simple) {
|
|
||||||
addRenderableWidget(new Button(width - 105, 5, 100, 20, new TextComponent("Create dump"), b -> {
|
|
||||||
try {
|
|
||||||
minecraft.keyboardHandler.setClipboard(DumpUtil.postDump(UUID.randomUUID()).get());
|
|
||||||
setStatus(ChatFormatting.GREEN + "Dump created and copied to clipboard");
|
|
||||||
} catch (InterruptedException | ExecutionException e) {
|
|
||||||
setStatus(ChatFormatting.RED + "Failed to create dump: " + e.getMessage());
|
|
||||||
}
|
|
||||||
}));
|
|
||||||
addRenderableWidget(new Button(width - 105, height - 25, 100, 20, new TextComponent("Reload configs"), b -> Via.getManager().getConfigurationProvider().reloadConfigs()));
|
|
||||||
}
|
|
||||||
|
|
||||||
addWidget(list = new SlotList(minecraft, width, height, 3 + 3 /* start offset */ + (font.lineHeight + 2) * 3 /* title is 2 */, height - 30, font.lineHeight + 2));
|
|
||||||
}
|
|
||||||
|
|
||||||
public void setStatus(final String status) {
|
|
||||||
this.status = status;
|
|
||||||
this.time = System.currentTimeMillis();
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public boolean keyPressed(int keyCode, int scanCode, int actions) {
|
|
||||||
if (keyCode == GLFW.GLFW_KEY_ESCAPE) {
|
|
||||||
minecraft.setScreen(parent);
|
|
||||||
}
|
|
||||||
return super.keyPressed(keyCode, scanCode, actions);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void render(PoseStack matrices, int p_230430_2_, int p_230430_3_, float p_230430_4_) {
|
|
||||||
if (System.currentTimeMillis() - this.time >= 10_000) {
|
|
||||||
this.status = null;
|
|
||||||
}
|
|
||||||
|
|
||||||
renderBackground(matrices);
|
|
||||||
this.list.render(matrices, p_230430_2_, p_230430_3_, p_230430_4_);
|
|
||||||
|
|
||||||
super.render(matrices, p_230430_2_, p_230430_3_, p_230430_4_);
|
|
||||||
|
|
||||||
matrices.pushPose();
|
|
||||||
matrices.scale(2.0F, 2.0F, 2.0F);
|
|
||||||
drawCenteredString(matrices, font, ChatFormatting.GOLD + "ViaForge", width / 4, 3, 16777215);
|
|
||||||
matrices.popPose();
|
|
||||||
|
|
||||||
drawCenteredString(matrices, font, "https://github.com/ViaVersion/ViaForge", width / 2, (font.lineHeight + 2) * 2 + 3, -1);
|
|
||||||
drawString(matrices, font, status != null ? status : "Discord: florianmichael", 3, 3, -1);
|
|
||||||
}
|
|
||||||
|
|
||||||
class SlotList extends ObjectSelectionList<SlotList.SlotEntry> {
|
|
||||||
|
|
||||||
public SlotList(Minecraft client, int width, int height, int top, int bottom, int slotHeight) {
|
|
||||||
super(client, width, height, top, bottom, slotHeight);
|
|
||||||
|
|
||||||
for (ProtocolVersion version : ProtocolVersionList.getProtocolsNewToOld()) {
|
|
||||||
addEntry(new SlotEntry(version));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
public class SlotEntry extends ObjectSelectionList.Entry<SlotEntry> {
|
|
||||||
|
|
||||||
private final ProtocolVersion ProtocolVersion;
|
|
||||||
|
|
||||||
public SlotEntry(ProtocolVersion ProtocolVersion) {
|
|
||||||
this.ProtocolVersion = ProtocolVersion;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public boolean mouseClicked(double mouseX, double mouseY, int button) {
|
|
||||||
GuiProtocolSelector.this.finishedCallback.finished(ProtocolVersion, GuiProtocolSelector.this.parent);
|
|
||||||
return super.mouseClicked(mouseX, mouseY, button);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public Component getNarration() {
|
|
||||||
return new TextComponent(ProtocolVersion.getName());
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void render(PoseStack matrices, int p_93524_, int y, int p_93526_, int p_93527_, int p_93528_, int p_93529_, int p_93530_, boolean p_93531_, float p_93532_) {
|
|
||||||
final ProtocolVersion targetVersion = ViaForgeCommon.getManager().getTargetVersion();
|
|
||||||
|
|
||||||
String color;
|
|
||||||
if (targetVersion == ProtocolVersion) {
|
|
||||||
color = GuiProtocolSelector.this.simple ? ChatFormatting.GOLD.toString() : ChatFormatting.GREEN.toString();
|
|
||||||
} else {
|
|
||||||
color = GuiProtocolSelector.this.simple ? ChatFormatting.WHITE.toString() : ChatFormatting.DARK_RED.toString();
|
|
||||||
}
|
|
||||||
|
|
||||||
drawCenteredString(matrices, Minecraft.getInstance().font, color + ProtocolVersion.getName(), width / 2, y, -1);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
public interface FinishedCallback {
|
|
||||||
|
|
||||||
void finished(final ProtocolVersion version, final Screen parent);
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
@ -1,45 +0,0 @@
|
|||||||
/*
|
|
||||||
* This file is part of ViaForge - https://github.com/FlorianMichael/ViaForge
|
|
||||||
* Copyright (C) 2021-2024 FlorianMichael/EnZaXD <florian.michael07@gmail.com> and contributors
|
|
||||||
*
|
|
||||||
* This program is free software: you can redistribute it and/or modify
|
|
||||||
* it under the terms of the GNU General Public License as published by
|
|
||||||
* the Free Software Foundation, either version 3 of the License, or
|
|
||||||
* (at your option) any later version.
|
|
||||||
*
|
|
||||||
* This program is distributed in the hope that it will be useful,
|
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
||||||
* GNU General Public License for more details.
|
|
||||||
*
|
|
||||||
* You should have received a copy of the GNU General Public License
|
|
||||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
||||||
*/
|
|
||||||
|
|
||||||
package de.florianmichael.viaforge.mixin;
|
|
||||||
|
|
||||||
import de.florianmichael.viaforge.common.ViaForgeCommon;
|
|
||||||
import net.minecraft.client.gui.components.DebugScreenOverlay;
|
|
||||||
import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
|
|
||||||
import org.spongepowered.asm.mixin.Mixin;
|
|
||||||
import org.spongepowered.asm.mixin.injection.At;
|
|
||||||
import org.spongepowered.asm.mixin.injection.Inject;
|
|
||||||
import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
|
|
||||||
|
|
||||||
import java.util.List;
|
|
||||||
|
|
||||||
@Mixin(DebugScreenOverlay.class)
|
|
||||||
public class MixinDebugScreenOverlay {
|
|
||||||
|
|
||||||
@Inject(method = "getSystemInformation", at = @At(value = "TAIL"))
|
|
||||||
public void addViaForgeVersion(CallbackInfoReturnable<List<String>> cir) {
|
|
||||||
final ViaForgeCommon common = ViaForgeCommon.getManager();
|
|
||||||
final ProtocolVersion version = ViaForgeCommon.getManager().getTargetVersion();
|
|
||||||
|
|
||||||
if (common.getConfig().isShowProtocolVersionInF3() && version != common.getNativeVersion() && !common.getPlatform().isSingleplayer().get()) {
|
|
||||||
cir.getReturnValue().add("");
|
|
||||||
cir.getReturnValue().add("ViaForge: " + version.toString());
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
@ -1,52 +0,0 @@
|
|||||||
/*
|
|
||||||
* This file is part of ViaForge - https://github.com/FlorianMichael/ViaForge
|
|
||||||
* Copyright (C) 2021-2024 FlorianMichael/EnZaXD <florian.michael07@gmail.com> and contributors
|
|
||||||
*
|
|
||||||
* This program is free software: you can redistribute it and/or modify
|
|
||||||
* it under the terms of the GNU General Public License as published by
|
|
||||||
* the Free Software Foundation, either version 3 of the License, or
|
|
||||||
* (at your option) any later version.
|
|
||||||
*
|
|
||||||
* This program is distributed in the hope that it will be useful,
|
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
||||||
* GNU General Public License for more details.
|
|
||||||
*
|
|
||||||
* You should have received a copy of the GNU General Public License
|
|
||||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
||||||
*/
|
|
||||||
|
|
||||||
package de.florianmichael.viaforge.mixin;
|
|
||||||
|
|
||||||
import com.viaversion.viaversion.util.Pair;
|
|
||||||
import de.florianmichael.viaforge.common.ViaForgeCommon;
|
|
||||||
import de.florianmichael.viaforge.common.platform.ViaForgeConfig;
|
|
||||||
import de.florianmichael.viaforge.gui.GuiProtocolSelector;
|
|
||||||
import net.minecraft.client.gui.components.Button;
|
|
||||||
import net.minecraft.client.gui.screens.DirectJoinServerScreen;
|
|
||||||
import net.minecraft.client.gui.screens.Screen;
|
|
||||||
import net.minecraft.network.chat.Component;
|
|
||||||
import net.minecraft.network.chat.TextComponent;
|
|
||||||
import org.spongepowered.asm.mixin.Mixin;
|
|
||||||
import org.spongepowered.asm.mixin.injection.At;
|
|
||||||
import org.spongepowered.asm.mixin.injection.Inject;
|
|
||||||
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
|
|
||||||
|
|
||||||
@Mixin(DirectJoinServerScreen.class)
|
|
||||||
public class MixinDirectJoinServerScreen extends Screen {
|
|
||||||
|
|
||||||
public MixinDirectJoinServerScreen(Component title) {
|
|
||||||
super(title);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Inject(method = "init", at = @At("RETURN"))
|
|
||||||
public void hookViaForgeButton(CallbackInfo ci) {
|
|
||||||
final ViaForgeConfig config = ViaForgeCommon.getManager().getConfig();
|
|
||||||
if (config.isShowDirectConnectButton()) {
|
|
||||||
final Pair<Integer, Integer> pos = config.getViaForgeButtonPosition().getPosition(this.width, this.height);
|
|
||||||
|
|
||||||
addRenderableWidget(new Button(pos.key(), pos.value(), 100, 20, new TextComponent("ViaForge"), b -> GuiProtocolSelector.open(minecraft)));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
@ -1,69 +0,0 @@
|
|||||||
/*
|
|
||||||
* This file is part of ViaForge - https://github.com/FlorianMichael/ViaForge
|
|
||||||
* Copyright (C) 2021-2024 FlorianMichael/EnZaXD <florian.michael07@gmail.com> and contributors
|
|
||||||
*
|
|
||||||
* This program is free software: you can redistribute it and/or modify
|
|
||||||
* it under the terms of the GNU General Public License as published by
|
|
||||||
* the Free Software Foundation, either version 3 of the License, or
|
|
||||||
* (at your option) any later version.
|
|
||||||
*
|
|
||||||
* This program is distributed in the hope that it will be useful,
|
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
||||||
* GNU General Public License for more details.
|
|
||||||
*
|
|
||||||
* You should have received a copy of the GNU General Public License
|
|
||||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
||||||
*/
|
|
||||||
|
|
||||||
package de.florianmichael.viaforge.mixin;
|
|
||||||
|
|
||||||
import com.viaversion.viaversion.util.Pair;
|
|
||||||
import de.florianmichael.viaforge.common.ViaForgeCommon;
|
|
||||||
import de.florianmichael.viaforge.common.gui.ExtendedServerData;
|
|
||||||
import de.florianmichael.viaforge.common.platform.ViaForgeConfig;
|
|
||||||
import de.florianmichael.viaforge.gui.GuiProtocolSelector;
|
|
||||||
import net.minecraft.client.gui.components.Button;
|
|
||||||
import net.minecraft.client.gui.screens.EditServerScreen;
|
|
||||||
import net.minecraft.client.gui.screens.Screen;
|
|
||||||
import net.minecraft.client.multiplayer.ServerData;
|
|
||||||
import net.minecraft.network.chat.Component;
|
|
||||||
import net.minecraft.network.chat.TextComponent;
|
|
||||||
import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
|
|
||||||
import org.spongepowered.asm.mixin.Final;
|
|
||||||
import org.spongepowered.asm.mixin.Mixin;
|
|
||||||
import org.spongepowered.asm.mixin.Shadow;
|
|
||||||
import org.spongepowered.asm.mixin.injection.At;
|
|
||||||
import org.spongepowered.asm.mixin.injection.Inject;
|
|
||||||
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
|
|
||||||
|
|
||||||
@Mixin(EditServerScreen.class)
|
|
||||||
public class MixinEditServerScreen extends Screen {
|
|
||||||
|
|
||||||
@Shadow
|
|
||||||
@Final
|
|
||||||
private ServerData serverData;
|
|
||||||
|
|
||||||
public MixinEditServerScreen(Component title) {
|
|
||||||
super(title);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Inject(method = "init", at = @At("RETURN"))
|
|
||||||
public void initGui(CallbackInfo ci) {
|
|
||||||
final ViaForgeConfig config = ViaForgeCommon.getManager().getConfig();
|
|
||||||
|
|
||||||
if (config.isShowAddServerButton()) {
|
|
||||||
final Pair<Integer, Integer> pos = config.getAddServerScreenButtonPosition().getPosition(this.width, this.height);
|
|
||||||
|
|
||||||
final ProtocolVersion target = ((ExtendedServerData) serverData).viaForge$getVersion();
|
|
||||||
addRenderableWidget(new Button(pos.key(), pos.value(), 100, 20, new TextComponent(target != null ? target.getName() : "Set Version"), b -> {
|
|
||||||
minecraft.setScreen(new GuiProtocolSelector(this, true, (version, parent) -> {
|
|
||||||
// Set version and go back to the parent screen.
|
|
||||||
((ExtendedServerData) serverData).viaForge$setVersion(version);
|
|
||||||
minecraft.setScreen(parent);
|
|
||||||
}));
|
|
||||||
}));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
@ -1,52 +0,0 @@
|
|||||||
/*
|
|
||||||
* This file is part of ViaForge - https://github.com/FlorianMichael/ViaForge
|
|
||||||
* Copyright (C) 2021-2024 FlorianMichael/EnZaXD <florian.michael07@gmail.com> and contributors
|
|
||||||
*
|
|
||||||
* This program is free software: you can redistribute it and/or modify
|
|
||||||
* it under the terms of the GNU General Public License as published by
|
|
||||||
* the Free Software Foundation, either version 3 of the License, or
|
|
||||||
* (at your option) any later version.
|
|
||||||
*
|
|
||||||
* This program is distributed in the hope that it will be useful,
|
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
||||||
* GNU General Public License for more details.
|
|
||||||
*
|
|
||||||
* You should have received a copy of the GNU General Public License
|
|
||||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
||||||
*/
|
|
||||||
|
|
||||||
package de.florianmichael.viaforge.mixin;
|
|
||||||
|
|
||||||
import com.viaversion.viaversion.util.Pair;
|
|
||||||
import de.florianmichael.viaforge.common.ViaForgeCommon;
|
|
||||||
import de.florianmichael.viaforge.common.platform.ViaForgeConfig;
|
|
||||||
import de.florianmichael.viaforge.gui.GuiProtocolSelector;
|
|
||||||
import net.minecraft.client.gui.components.Button;
|
|
||||||
import net.minecraft.client.gui.screens.Screen;
|
|
||||||
import net.minecraft.client.gui.screens.multiplayer.JoinMultiplayerScreen;
|
|
||||||
import net.minecraft.network.chat.Component;
|
|
||||||
import net.minecraft.network.chat.TextComponent;
|
|
||||||
import org.spongepowered.asm.mixin.Mixin;
|
|
||||||
import org.spongepowered.asm.mixin.injection.At;
|
|
||||||
import org.spongepowered.asm.mixin.injection.Inject;
|
|
||||||
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
|
|
||||||
|
|
||||||
@Mixin(JoinMultiplayerScreen.class)
|
|
||||||
public class MixinJoinMultiplayerScreen extends Screen {
|
|
||||||
|
|
||||||
public MixinJoinMultiplayerScreen(Component title) {
|
|
||||||
super(title);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Inject(method = "init", at = @At("RETURN"))
|
|
||||||
public void hookViaForgeButton(CallbackInfo ci) {
|
|
||||||
final ViaForgeConfig config = ViaForgeCommon.getManager().getConfig();
|
|
||||||
if (config.isShowMainMenuButton()) {
|
|
||||||
final Pair<Integer, Integer> pos = config.getViaForgeButtonPosition().getPosition(this.width, this.height);
|
|
||||||
|
|
||||||
addRenderableWidget(new Button(pos.key(), pos.value(), 100, 20, new TextComponent("ViaForge"), buttons -> GuiProtocolSelector.open(minecraft)));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
@ -1,70 +0,0 @@
|
|||||||
/*
|
|
||||||
* This file is part of ViaForge - https://github.com/FlorianMichael/ViaForge
|
|
||||||
* Copyright (C) 2021-2024 FlorianMichael/EnZaXD <florian.michael07@gmail.com> and contributors
|
|
||||||
*
|
|
||||||
* This program is free software: you can redistribute it and/or modify
|
|
||||||
* it under the terms of the GNU General Public License as published by
|
|
||||||
* the Free Software Foundation, either version 3 of the License, or
|
|
||||||
* (at your option) any later version.
|
|
||||||
*
|
|
||||||
* This program is distributed in the hope that it will be useful,
|
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
||||||
* GNU General Public License for more details.
|
|
||||||
*
|
|
||||||
* You should have received a copy of the GNU General Public License
|
|
||||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
||||||
*/
|
|
||||||
|
|
||||||
package de.florianmichael.viaforge.mixin;
|
|
||||||
|
|
||||||
import de.florianmichael.viaforge.common.gui.ExtendedServerData;
|
|
||||||
import net.minecraft.client.multiplayer.ServerData;
|
|
||||||
import net.minecraft.nbt.CompoundTag;
|
|
||||||
import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
|
|
||||||
import org.spongepowered.asm.mixin.Mixin;
|
|
||||||
import org.spongepowered.asm.mixin.Unique;
|
|
||||||
import org.spongepowered.asm.mixin.injection.At;
|
|
||||||
import org.spongepowered.asm.mixin.injection.Inject;
|
|
||||||
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
|
|
||||||
import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
|
|
||||||
import org.spongepowered.asm.mixin.injection.callback.LocalCapture;
|
|
||||||
|
|
||||||
@Mixin(ServerData.class)
|
|
||||||
public class MixinServerData implements ExtendedServerData {
|
|
||||||
|
|
||||||
@Unique
|
|
||||||
private ProtocolVersion viaForge$version;
|
|
||||||
|
|
||||||
@Inject(method = "write", at = @At(value = "INVOKE", target = "Lnet/minecraft/nbt/CompoundTag;putString(Ljava/lang/String;Ljava/lang/String;)V", ordinal = 0), locals = LocalCapture.CAPTURE_FAILHARD)
|
|
||||||
public void saveVersion(CallbackInfoReturnable<CompoundTag> cir, CompoundTag compoundtag) {
|
|
||||||
if (viaForge$version != null) {
|
|
||||||
compoundtag.putString("viaForge$version", viaForge$version.getName());
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@Inject(method = "read", at = @At(value = "TAIL"))
|
|
||||||
private static void getVersion(CompoundTag compoundnbt, CallbackInfoReturnable<ServerData> cir) {
|
|
||||||
if (compoundnbt.contains("viaForge$version")) {
|
|
||||||
((ExtendedServerData) cir.getReturnValue()).viaForge$setVersion(ProtocolVersion.getClosest(compoundnbt.getString("viaForge$version")));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@Inject(method = "copyFrom", at = @At("HEAD"))
|
|
||||||
public void track(ServerData serverDataIn, CallbackInfo ci) {
|
|
||||||
if (serverDataIn instanceof ExtendedServerData) {
|
|
||||||
viaForge$version = ((ExtendedServerData) serverDataIn).viaForge$getVersion();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public ProtocolVersion viaForge$getVersion() {
|
|
||||||
return viaForge$version;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void viaForge$setVersion(ProtocolVersion version) {
|
|
||||||
viaForge$version = version;
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
@ -1,52 +0,0 @@
|
|||||||
/*
|
|
||||||
* This file is part of ViaForge - https://github.com/FlorianMichael/ViaForge
|
|
||||||
* Copyright (C) 2021-2024 FlorianMichael/EnZaXD <florian.michael07@gmail.com> and contributors
|
|
||||||
*
|
|
||||||
* This program is free software: you can redistribute it and/or modify
|
|
||||||
* it under the terms of the GNU General Public License as published by
|
|
||||||
* the Free Software Foundation, either version 3 of the License, or
|
|
||||||
* (at your option) any later version.
|
|
||||||
*
|
|
||||||
* This program is distributed in the hope that it will be useful,
|
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
||||||
* GNU General Public License for more details.
|
|
||||||
*
|
|
||||||
* You should have received a copy of the GNU General Public License
|
|
||||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
||||||
*/
|
|
||||||
|
|
||||||
package de.florianmichael.viaforge.mixin;
|
|
||||||
|
|
||||||
import com.viaversion.viaversion.util.Pair;
|
|
||||||
import de.florianmichael.viaforge.common.ViaForgeCommon;
|
|
||||||
import de.florianmichael.viaforge.common.platform.ViaForgeConfig;
|
|
||||||
import de.florianmichael.viaforge.gui.GuiProtocolSelector;
|
|
||||||
import net.minecraft.client.gui.components.Button;
|
|
||||||
import net.minecraft.client.gui.screens.Screen;
|
|
||||||
import net.minecraft.client.gui.screens.TitleScreen;
|
|
||||||
import net.minecraft.network.chat.Component;
|
|
||||||
import net.minecraft.network.chat.TextComponent;
|
|
||||||
import org.spongepowered.asm.mixin.Mixin;
|
|
||||||
import org.spongepowered.asm.mixin.injection.At;
|
|
||||||
import org.spongepowered.asm.mixin.injection.Inject;
|
|
||||||
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
|
|
||||||
|
|
||||||
@Mixin(TitleScreen.class)
|
|
||||||
public class MixinTitleScreen extends Screen {
|
|
||||||
|
|
||||||
public MixinTitleScreen(Component title) {
|
|
||||||
super(title);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Inject(method = "init", at = @At("RETURN"))
|
|
||||||
public void hookViaForgeButton(CallbackInfo ci) {
|
|
||||||
final ViaForgeConfig config = ViaForgeCommon.getManager().getConfig();
|
|
||||||
if (config.isShowMainMenuButton()) {
|
|
||||||
final Pair<Integer, Integer> pos = config.getViaForgeButtonPosition().getPosition(this.width, this.height);
|
|
||||||
|
|
||||||
addRenderableWidget(new Button(pos.key(), pos.value(), 100, 20, new TextComponent("ViaForge"), buttons -> GuiProtocolSelector.open(minecraft)));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
@ -1,58 +0,0 @@
|
|||||||
/*
|
|
||||||
* This file is part of ViaForge - https://github.com/FlorianMichael/ViaForge
|
|
||||||
* Copyright (C) 2021-2024 FlorianMichael/EnZaXD <florian.michael07@gmail.com> and contributors
|
|
||||||
*
|
|
||||||
* This program is free software: you can redistribute it and/or modify
|
|
||||||
* it under the terms of the GNU General Public License as published by
|
|
||||||
* the Free Software Foundation, either version 3 of the License, or
|
|
||||||
* (at your option) any later version.
|
|
||||||
*
|
|
||||||
* This program is distributed in the hope that it will be useful,
|
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
||||||
* GNU General Public License for more details.
|
|
||||||
*
|
|
||||||
* You should have received a copy of the GNU General Public License
|
|
||||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
||||||
*/
|
|
||||||
|
|
||||||
package de.florianmichael.viaforge.mixin.connect;
|
|
||||||
|
|
||||||
import com.mojang.authlib.GameProfile;
|
|
||||||
import com.mojang.authlib.exceptions.AuthenticationException;
|
|
||||||
import com.mojang.authlib.minecraft.MinecraftSessionService;
|
|
||||||
import com.viaversion.viaversion.api.connection.UserConnection;
|
|
||||||
import de.florianmichael.viaforge.common.ViaForgeCommon;
|
|
||||||
import de.florianmichael.viaforge.common.protocoltranslator.netty.VFNetworkManager;
|
|
||||||
import net.minecraft.client.multiplayer.ClientHandshakePacketListenerImpl;
|
|
||||||
import net.minecraft.network.Connection;
|
|
||||||
import net.raphimc.vialegacy.api.LegacyProtocolVersion;
|
|
||||||
import net.raphimc.vialegacy.protocol.release.r1_6_4tor1_7_2_5.storage.ProtocolMetadataStorage;
|
|
||||||
import org.spongepowered.asm.mixin.Final;
|
|
||||||
import org.spongepowered.asm.mixin.Mixin;
|
|
||||||
import org.spongepowered.asm.mixin.Shadow;
|
|
||||||
import org.spongepowered.asm.mixin.injection.At;
|
|
||||||
import org.spongepowered.asm.mixin.injection.Redirect;
|
|
||||||
|
|
||||||
@SuppressWarnings("DataFlowIssue")
|
|
||||||
@Mixin(ClientHandshakePacketListenerImpl.class)
|
|
||||||
public class MixinClientHandshakePacketListenerImpl {
|
|
||||||
|
|
||||||
@Shadow @Final private Connection connection;
|
|
||||||
|
|
||||||
@Redirect(method = "authenticateServer", at = @At(value = "INVOKE", target = "Lcom/mojang/authlib/minecraft/MinecraftSessionService;joinServer(Lcom/mojang/authlib/GameProfile;Ljava/lang/String;Ljava/lang/String;)V"))
|
|
||||||
public void onlyJoinServerIfPremium(MinecraftSessionService instance, GameProfile profile, String authenticationToken, String serverId) throws AuthenticationException {
|
|
||||||
final VFNetworkManager mixinConnection = (VFNetworkManager) connection;
|
|
||||||
if (mixinConnection.viaForge$getTrackedVersion().olderThanOrEqualTo(LegacyProtocolVersion.r1_6_4)) {
|
|
||||||
final UserConnection user = connection.channel().attr(ViaForgeCommon.VF_VIA_USER).get();
|
|
||||||
if (user != null && user.has(ProtocolMetadataStorage.class) && !user.get(ProtocolMetadataStorage.class).authenticate) {
|
|
||||||
// We are in the 1.7 -> 1.6 protocol, so we need to skip the joinServer call
|
|
||||||
// if the server is in offline mode, due the packet changes <-> networking changes
|
|
||||||
// Minecraft's networking code is bad for us.
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
instance.joinServer(profile, authenticationToken, serverId);
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
@ -1,47 +0,0 @@
|
|||||||
/*
|
|
||||||
* This file is part of ViaForge - https://github.com/FlorianMichael/ViaForge
|
|
||||||
* Copyright (C) 2021-2024 FlorianMichael/EnZaXD <florian.michael07@gmail.com> and contributors
|
|
||||||
*
|
|
||||||
* This program is free software: you can redistribute it and/or modify
|
|
||||||
* it under the terms of the GNU General Public License as published by
|
|
||||||
* the Free Software Foundation, either version 3 of the License, or
|
|
||||||
* (at your option) any later version.
|
|
||||||
*
|
|
||||||
* This program is distributed in the hope that it will be useful,
|
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
||||||
* GNU General Public License for more details.
|
|
||||||
*
|
|
||||||
* You should have received a copy of the GNU General Public License
|
|
||||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
||||||
*/
|
|
||||||
|
|
||||||
package de.florianmichael.viaforge.mixin.connect;
|
|
||||||
|
|
||||||
import de.florianmichael.viaforge.common.ViaForgeCommon;
|
|
||||||
import de.florianmichael.viaforge.common.gui.ExtendedServerData;
|
|
||||||
import de.florianmichael.viaforge.common.platform.VersionTracker;
|
|
||||||
import net.minecraft.client.Minecraft;
|
|
||||||
import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
|
|
||||||
import org.spongepowered.asm.mixin.Mixin;
|
|
||||||
import org.spongepowered.asm.mixin.injection.At;
|
|
||||||
import org.spongepowered.asm.mixin.injection.Redirect;
|
|
||||||
|
|
||||||
import java.net.InetSocketAddress;
|
|
||||||
import java.util.Optional;
|
|
||||||
|
|
||||||
@Mixin(targets = "net.minecraft.client.gui.screens.ConnectScreen$1")
|
|
||||||
public class MixinConnectScreen_1 {
|
|
||||||
|
|
||||||
@Redirect(method = "run", at = @At(value = "INVOKE", target = "Ljava/util/Optional;get()Ljava/lang/Object;"))
|
|
||||||
public Object trackServerVersion(Optional instance) {
|
|
||||||
final InetSocketAddress address = (InetSocketAddress) instance.get();
|
|
||||||
ProtocolVersion version = ((ExtendedServerData) Minecraft.getInstance().getCurrentServer()).viaForge$getVersion();
|
|
||||||
if (version == null) {
|
|
||||||
version = ViaForgeCommon.getManager().getTargetVersion();
|
|
||||||
}
|
|
||||||
VersionTracker.storeServerProtocolVersion(address.getAddress(), version);
|
|
||||||
return address;
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
@ -1,102 +0,0 @@
|
|||||||
/*
|
|
||||||
* This file is part of ViaForge - https://github.com/FlorianMichael/ViaForge
|
|
||||||
* Copyright (C) 2021-2024 FlorianMichael/EnZaXD <florian.michael07@gmail.com> and contributors
|
|
||||||
*
|
|
||||||
* This program is free software: you can redistribute it and/or modify
|
|
||||||
* it under the terms of the GNU General Public License as published by
|
|
||||||
* the Free Software Foundation, either version 3 of the License, or
|
|
||||||
* (at your option) any later version.
|
|
||||||
*
|
|
||||||
* This program is distributed in the hope that it will be useful,
|
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
||||||
* GNU General Public License for more details.
|
|
||||||
*
|
|
||||||
* You should have received a copy of the GNU General Public License
|
|
||||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
||||||
*/
|
|
||||||
|
|
||||||
package de.florianmichael.viaforge.mixin.connect;
|
|
||||||
|
|
||||||
import de.florianmichael.viaforge.common.ViaForgeCommon;
|
|
||||||
import de.florianmichael.viaforge.common.platform.VersionTracker;
|
|
||||||
import de.florianmichael.viaforge.common.protocoltranslator.netty.VFNetworkManager;
|
|
||||||
import io.netty.channel.Channel;
|
|
||||||
import io.netty.channel.EventLoopGroup;
|
|
||||||
import io.netty.channel.socket.SocketChannel;
|
|
||||||
import net.minecraft.network.CipherDecoder;
|
|
||||||
import net.minecraft.network.CipherEncoder;
|
|
||||||
import net.minecraft.network.Connection;
|
|
||||||
import net.minecraft.util.LazyLoadedValue;
|
|
||||||
import net.raphimc.vialegacy.api.LegacyProtocolVersion;
|
|
||||||
import net.raphimc.vialoader.netty.VLLegacyPipeline;
|
|
||||||
import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
|
|
||||||
import org.spongepowered.asm.mixin.Mixin;
|
|
||||||
import org.spongepowered.asm.mixin.Shadow;
|
|
||||||
import org.spongepowered.asm.mixin.Unique;
|
|
||||||
import org.spongepowered.asm.mixin.injection.At;
|
|
||||||
import org.spongepowered.asm.mixin.injection.Inject;
|
|
||||||
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
|
|
||||||
import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
|
|
||||||
import org.spongepowered.asm.mixin.injection.callback.LocalCapture;
|
|
||||||
|
|
||||||
import javax.crypto.Cipher;
|
|
||||||
import java.net.InetSocketAddress;
|
|
||||||
|
|
||||||
@Mixin(Connection.class)
|
|
||||||
public class MixinConnection implements VFNetworkManager {
|
|
||||||
|
|
||||||
@Shadow private Channel channel;
|
|
||||||
|
|
||||||
@Shadow private boolean encrypted;
|
|
||||||
@Unique
|
|
||||||
private Cipher viaForge$decryptionCipher;
|
|
||||||
|
|
||||||
@Unique
|
|
||||||
private ProtocolVersion viaForge$targetVersion;
|
|
||||||
|
|
||||||
@Inject(method = "setupCompression", at = @At("RETURN"))
|
|
||||||
public void reorderPipeline(int p_129485_, boolean p_182682_, CallbackInfo ci) {
|
|
||||||
ViaForgeCommon.getManager().reorderCompression(channel);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Inject(method = "setEncryptionKey", at = @At("HEAD"), cancellable = true)
|
|
||||||
private void storeEncryptionCiphers(Cipher p_244777_1_, Cipher p_244777_2_, CallbackInfo ci) {
|
|
||||||
if (viaForge$targetVersion != null && viaForge$targetVersion.olderThanOrEqualTo(LegacyProtocolVersion.r1_6_4)) {
|
|
||||||
// Minecraft's encryption code is bad for us, we need to reorder the pipeline
|
|
||||||
ci.cancel();
|
|
||||||
|
|
||||||
// Minecraft 1.6.4 supports tile encryption which means the server can only enable one side of the encryption
|
|
||||||
// So we only enable the encryption side and later enable the decryption side if the 1.7 -> 1.6 protocol
|
|
||||||
// tells us to do, therefore we need to store the cipher instance.
|
|
||||||
this.viaForge$decryptionCipher = p_244777_1_;
|
|
||||||
|
|
||||||
// Enabling the encryption side
|
|
||||||
this.encrypted = true;
|
|
||||||
this.channel.pipeline().addBefore(VLLegacyPipeline.VIALEGACY_PRE_NETTY_LENGTH_REMOVER_NAME, "encrypt", new CipherEncoder(p_244777_2_));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@Inject(method = "connectToServer", at = @At(value = "INVOKE", target = "Lio/netty/bootstrap/Bootstrap;group(Lio/netty/channel/EventLoopGroup;)Lio/netty/bootstrap/AbstractBootstrap;"), locals = LocalCapture.CAPTURE_FAILHARD)
|
|
||||||
private static void setTargetVersion(InetSocketAddress p_178301_, boolean p_178302_, CallbackInfoReturnable<Connection> cir, Connection connection, Class<? extends SocketChannel> oclass, LazyLoadedValue<? extends EventLoopGroup> lazyloadedvalue) {
|
|
||||||
final VFNetworkManager mixinConnection = (VFNetworkManager) connection;
|
|
||||||
mixinConnection.viaForge$setTrackedVersion(VersionTracker.getServerProtocolVersion(p_178301_.getAddress()));
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void viaForge$setupPreNettyDecryption() {
|
|
||||||
// Enabling the decryption side for 1.6.4 if the 1.7 -> 1.6 protocol tells us to do
|
|
||||||
this.channel.pipeline().addBefore(VLLegacyPipeline.VIALEGACY_PRE_NETTY_LENGTH_REMOVER_NAME, "decrypt", new CipherDecoder(this.viaForge$decryptionCipher));
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public ProtocolVersion viaForge$getTrackedVersion() {
|
|
||||||
return viaForge$targetVersion;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void viaForge$setTrackedVersion(ProtocolVersion version) {
|
|
||||||
viaForge$targetVersion = version;
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
@ -1,60 +0,0 @@
|
|||||||
/*
|
|
||||||
* This file is part of ViaForge - https://github.com/FlorianMichael/ViaForge
|
|
||||||
* Copyright (C) 2021-2024 FlorianMichael/EnZaXD <florian.michael07@gmail.com> and contributors
|
|
||||||
*
|
|
||||||
* This program is free software: you can redistribute it and/or modify
|
|
||||||
* it under the terms of the GNU General Public License as published by
|
|
||||||
* the Free Software Foundation, either version 3 of the License, or
|
|
||||||
* (at your option) any later version.
|
|
||||||
*
|
|
||||||
* This program is distributed in the hope that it will be useful,
|
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
||||||
* GNU General Public License for more details.
|
|
||||||
*
|
|
||||||
* You should have received a copy of the GNU General Public License
|
|
||||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
||||||
*/
|
|
||||||
|
|
||||||
package de.florianmichael.viaforge.mixin.connect;
|
|
||||||
|
|
||||||
import de.florianmichael.viaforge.common.ViaForgeCommon;
|
|
||||||
import de.florianmichael.viaforge.common.gui.ExtendedServerData;
|
|
||||||
import de.florianmichael.viaforge.common.platform.VersionTracker;
|
|
||||||
import net.minecraft.client.multiplayer.ServerData;
|
|
||||||
import net.minecraft.client.multiplayer.ServerStatusPinger;
|
|
||||||
import net.minecraft.network.Connection;
|
|
||||||
import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
|
|
||||||
import org.spongepowered.asm.mixin.Mixin;
|
|
||||||
import org.spongepowered.asm.mixin.Unique;
|
|
||||||
import org.spongepowered.asm.mixin.injection.At;
|
|
||||||
import org.spongepowered.asm.mixin.injection.Inject;
|
|
||||||
import org.spongepowered.asm.mixin.injection.Redirect;
|
|
||||||
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
|
|
||||||
|
|
||||||
import java.net.InetSocketAddress;
|
|
||||||
|
|
||||||
@Mixin(ServerStatusPinger.class)
|
|
||||||
public class MixinServerStatusPinger {
|
|
||||||
|
|
||||||
@Unique
|
|
||||||
private ServerData viaForge$serverData;
|
|
||||||
|
|
||||||
@Inject(method = "pingServer", at = @At("HEAD"))
|
|
||||||
public void trackServerData(ServerData server, Runnable p_147224_2_, CallbackInfo ci) {
|
|
||||||
viaForge$serverData = server;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Redirect(method = "pingServer", at = @At(value = "INVOKE", target = "Lnet/minecraft/network/Connection;connectToServer(Ljava/net/InetSocketAddress;Z)Lnet/minecraft/network/Connection;"))
|
|
||||||
public Connection trackVersion(InetSocketAddress oclass, boolean lazyloadedvalue) {
|
|
||||||
ProtocolVersion version = ((ExtendedServerData) viaForge$serverData).viaForge$getVersion();
|
|
||||||
if (version == null) {
|
|
||||||
version = ViaForgeCommon.getManager().getTargetVersion();
|
|
||||||
}
|
|
||||||
VersionTracker.storeServerProtocolVersion(oclass.getAddress(), version);
|
|
||||||
viaForge$serverData = null;
|
|
||||||
|
|
||||||
return Connection.connectToServer(oclass, lazyloadedvalue);
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
@ -1,56 +0,0 @@
|
|||||||
/*
|
|
||||||
* This file is part of ViaForge - https://github.com/FlorianMichael/ViaForge
|
|
||||||
* Copyright (C) 2021-2024 FlorianMichael/EnZaXD <florian.michael07@gmail.com> and contributors
|
|
||||||
*
|
|
||||||
* This program is free software: you can redistribute it and/or modify
|
|
||||||
* it under the terms of the GNU General Public License as published by
|
|
||||||
* the Free Software Foundation, either version 3 of the License, or
|
|
||||||
* (at your option) any later version.
|
|
||||||
*
|
|
||||||
* This program is distributed in the hope that it will be useful,
|
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
||||||
* GNU General Public License for more details.
|
|
||||||
*
|
|
||||||
* You should have received a copy of the GNU General Public License
|
|
||||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
||||||
*/
|
|
||||||
|
|
||||||
package de.florianmichael.viaforge.mixin.fixes;
|
|
||||||
|
|
||||||
import com.mojang.authlib.GameProfile;
|
|
||||||
import de.florianmichael.viaforge.common.ViaForgeCommon;
|
|
||||||
import net.minecraft.client.multiplayer.ClientLevel;
|
|
||||||
import net.minecraft.client.player.AbstractClientPlayer;
|
|
||||||
import net.minecraft.client.player.LocalPlayer;
|
|
||||||
import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
|
|
||||||
import org.spongepowered.asm.mixin.Mixin;
|
|
||||||
import org.spongepowered.asm.mixin.Shadow;
|
|
||||||
import org.spongepowered.asm.mixin.injection.At;
|
|
||||||
import org.spongepowered.asm.mixin.injection.Redirect;
|
|
||||||
|
|
||||||
@Mixin(LocalPlayer.class)
|
|
||||||
public class MixinLocalPlayer extends AbstractClientPlayer {
|
|
||||||
|
|
||||||
@Shadow private boolean lastOnGround;
|
|
||||||
|
|
||||||
public MixinLocalPlayer(ClientLevel level, GameProfile profile) {
|
|
||||||
super(level, profile);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Redirect(method = "sendPosition", at = @At(value = "FIELD", target = "Lnet/minecraft/client/player/LocalPlayer;lastOnGround:Z", ordinal = 0))
|
|
||||||
public boolean emulateIdlePacket(LocalPlayer instance) {
|
|
||||||
if (ViaForgeCommon.getManager().getTargetVersion().olderThanOrEqualTo(ProtocolVersion.v1_8)) {
|
|
||||||
// <= 1.8 spams the idle packet instead of only sending it when the ground state changes
|
|
||||||
// So we invert the original logic:
|
|
||||||
// if (prevOnGround != onGround) sendPacket
|
|
||||||
// To be like:
|
|
||||||
// if (!onGround != onGround) sendPacket
|
|
||||||
// Which is the same as:
|
|
||||||
// if (true) sendPacket
|
|
||||||
return !onGround;
|
|
||||||
}
|
|
||||||
return lastOnGround;
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
@ -1,77 +0,0 @@
|
|||||||
/*
|
|
||||||
* This file is part of ViaForge - https://github.com/FlorianMichael/ViaForge
|
|
||||||
* Copyright (C) 2021-2024 FlorianMichael/EnZaXD <florian.michael07@gmail.com> and contributors
|
|
||||||
*
|
|
||||||
* This program is free software: you can redistribute it and/or modify
|
|
||||||
* it under the terms of the GNU General Public License as published by
|
|
||||||
* the Free Software Foundation, either version 3 of the License, or
|
|
||||||
* (at your option) any later version.
|
|
||||||
*
|
|
||||||
* This program is distributed in the hope that it will be useful,
|
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
||||||
* GNU General Public License for more details.
|
|
||||||
*
|
|
||||||
* You should have received a copy of the GNU General Public License
|
|
||||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
||||||
*/
|
|
||||||
|
|
||||||
package de.florianmichael.viaforge.provider;
|
|
||||||
|
|
||||||
import com.mojang.authlib.Agent;
|
|
||||||
import com.mojang.authlib.GameProfileRepository;
|
|
||||||
import com.mojang.authlib.HttpAuthenticationService;
|
|
||||||
import com.mojang.authlib.ProfileLookupCallback;
|
|
||||||
import com.mojang.authlib.minecraft.MinecraftSessionService;
|
|
||||||
import com.mojang.authlib.properties.Property;
|
|
||||||
import com.mojang.authlib.yggdrasil.ProfileNotFoundException;
|
|
||||||
import com.mojang.authlib.yggdrasil.YggdrasilAuthenticationService;
|
|
||||||
import net.raphimc.vialegacy.protocol.release.r1_7_6_10tor1_8.model.GameProfile;
|
|
||||||
import net.raphimc.vialegacy.protocol.release.r1_7_6_10tor1_8.provider.GameProfileFetcher;
|
|
||||||
|
|
||||||
import java.net.Proxy;
|
|
||||||
import java.util.UUID;
|
|
||||||
import java.util.concurrent.CompletableFuture;
|
|
||||||
|
|
||||||
public class ViaForgeGameProfileFetcher extends GameProfileFetcher {
|
|
||||||
|
|
||||||
public static final HttpAuthenticationService AUTHENTICATION_SERVICE = new YggdrasilAuthenticationService(Proxy.NO_PROXY, "");
|
|
||||||
public static final MinecraftSessionService SESSION_SERVICE = AUTHENTICATION_SERVICE.createMinecraftSessionService();
|
|
||||||
public static final GameProfileRepository GAME_PROFILE_REPOSITORY = AUTHENTICATION_SERVICE.createProfileRepository();
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public UUID loadMojangUUID(String playerName) throws Exception {
|
|
||||||
final CompletableFuture<com.mojang.authlib.GameProfile> future = new CompletableFuture<>();
|
|
||||||
GAME_PROFILE_REPOSITORY.findProfilesByNames(new String[]{playerName}, Agent.MINECRAFT, new ProfileLookupCallback() {
|
|
||||||
@Override
|
|
||||||
public void onProfileLookupSucceeded(com.mojang.authlib.GameProfile profile) {
|
|
||||||
future.complete(profile);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void onProfileLookupFailed(com.mojang.authlib.GameProfile profile, Exception exception) {
|
|
||||||
future.completeExceptionally(exception);
|
|
||||||
}
|
|
||||||
});
|
|
||||||
if (!future.isDone()) {
|
|
||||||
future.completeExceptionally(new ProfileNotFoundException());
|
|
||||||
}
|
|
||||||
return future.get().getId();
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public GameProfile loadGameProfile(UUID uuid) throws Exception {
|
|
||||||
final com.mojang.authlib.GameProfile inProfile = new com.mojang.authlib.GameProfile(uuid, null);
|
|
||||||
final com.mojang.authlib.GameProfile mojangProfile = SESSION_SERVICE.fillProfileProperties(inProfile, true);
|
|
||||||
if (mojangProfile.equals(inProfile)) throw new ProfileNotFoundException();
|
|
||||||
|
|
||||||
final GameProfile gameProfile = new GameProfile(mojangProfile.getName(), mojangProfile.getId());
|
|
||||||
for (final java.util.Map.Entry<String, Property> entry : mojangProfile.getProperties().entries()) {
|
|
||||||
final Property prop = entry.getValue();
|
|
||||||
gameProfile.addProperty(new GameProfile.Property(prop.getName(), prop.getValue(), prop.getSignature()));
|
|
||||||
}
|
|
||||||
|
|
||||||
return gameProfile;
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
@ -1,16 +0,0 @@
|
|||||||
modLoader="javafml"
|
|
||||||
loaderVersion="[37,)"
|
|
||||||
|
|
||||||
license="GPL-3.0 license"
|
|
||||||
issueTrackerURL="https://github.com/ViaVersion/ViaForge/issues"
|
|
||||||
showAsResourcePack=false
|
|
||||||
|
|
||||||
[[mods]]
|
|
||||||
modId="viaforge"
|
|
||||||
version="${version}"
|
|
||||||
displayName="ViaForge"
|
|
||||||
displayURL="https://github.com/FlorianMichael"
|
|
||||||
logoFile="icon.png"
|
|
||||||
credits="Github contributors"
|
|
||||||
authors="FlorianMichael/EnZaXD"
|
|
||||||
description="${description}"
|
|
@ -1,25 +0,0 @@
|
|||||||
{
|
|
||||||
"required": true,
|
|
||||||
"minVersion": "0.7.5",
|
|
||||||
"compatibilityLevel": "JAVA_8",
|
|
||||||
"package": "de.florianmichael.viaforge.mixin",
|
|
||||||
"client": [
|
|
||||||
"connect.MixinClientHandshakePacketListenerImpl",
|
|
||||||
"connect.MixinConnection",
|
|
||||||
"connect.MixinConnection_1",
|
|
||||||
"MixinDebugScreenOverlay",
|
|
||||||
"MixinDirectJoinServerScreen",
|
|
||||||
"MixinEditServerScreen",
|
|
||||||
"MixinJoinMultiplayerScreen",
|
|
||||||
"MixinServerData",
|
|
||||||
"connect.MixinServerStatusPinger",
|
|
||||||
"MixinTitleScreen",
|
|
||||||
"fixes.MixinLocalPlayer",
|
|
||||||
"connect.MixinConnection_1",
|
|
||||||
"connect.MixinConnectScreen_1"
|
|
||||||
],
|
|
||||||
"injectors": {
|
|
||||||
"defaultRequire": 1
|
|
||||||
},
|
|
||||||
"refmap": "mixins.viaforge-mc1171.refmap.json"
|
|
||||||
}
|
|
@ -1 +0,0 @@
|
|||||||
forge_version=1.18.2-40.2.0
|
|
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue
Block a user